From 12df6520fd36804af465ffa4a7752ac90bccefdf Mon Sep 17 00:00:00 2001 From: Augusto Caringi Date: Fri, 8 Nov 2024 15:41:32 -0300 Subject: [PATCH] kernel-6.11.7-300 * Fri Nov 08 2024 Augusto Caringi [6.11.7-0] - Linux v6.11.7 Resolves: Signed-off-by: Augusto Caringi --- kernel.changelog | 4 ++ kernel.spec | 11 +++-- patch-6.11-redhat.patch | 89 +---------------------------------------- sources | 6 +-- 4 files changed, 16 insertions(+), 94 deletions(-) diff --git a/kernel.changelog b/kernel.changelog index aa3fda427..9df87eea0 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,3 +1,7 @@ +* Fri Nov 08 2024 Augusto Caringi [6.11.7-0] +- Linux v6.11.7 +Resolves: + * Fri Nov 01 2024 Augusto Caringi [6.11.6-0] - Linux v6.11.6 Resolves: diff --git a/kernel.spec b/kernel.spec index b9b213c74..02e834787 100644 --- a/kernel.spec +++ b/kernel.spec @@ -160,18 +160,18 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 # define buildid .local -%define specrpmversion 6.11.6 -%define specversion 6.11.6 +%define specrpmversion 6.11.7 +%define specversion 6.11.7 %define patchversion 6.11 %define pkgrelease 300 %define kversion 6 -%define tarfile_release 6.11.6 +%define tarfile_release 6.11.7 # This is needed to do merge window version magic %define patchlevel 11 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 300%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.11.6 +%define kabiversion 6.11.7 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -4128,6 +4128,9 @@ fi\ # # %changelog +* Fri Nov 08 2024 Augusto Caringi [6.11.7-0] +- Linux v6.11.7 + * Fri Nov 01 2024 Augusto Caringi [6.11.6-0] - Linux v6.11.6 diff --git a/patch-6.11-redhat.patch b/patch-6.11-redhat.patch index 8ba3b97ff..b104b4406 100644 --- a/patch-6.11-redhat.patch +++ b/patch-6.11-redhat.patch @@ -29,7 +29,6 @@ drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++ drivers/input/rmi4/rmi_driver.c | 124 +++++---- drivers/iommu/iommu.c | 22 ++ - drivers/net/wireless/realtek/rtw89/pci.c | 48 +++- drivers/pci/quirks.c | 24 ++ drivers/scsi/sd.c | 10 + drivers/usb/core/hub.c | 7 + @@ -45,10 +44,10 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 12 + - 47 files changed, 1020 insertions(+), 240 deletions(-) + 46 files changed, 979 insertions(+), 233 deletions(-) diff --git a/Makefile b/Makefile -index 318a5d60088e0..11471699fb194 100644 +index 692bbdf40fb5f..07f9ce1d24774 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,18 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1706,90 +1705,6 @@ index ed6c5cb60c5ae..70cb770b78bb3 100644 /** * iommu_setup_default_domain - Set the default_domain for the group * @group: Group to change -diff --git a/drivers/net/wireless/realtek/rtw89/pci.c b/drivers/net/wireless/realtek/rtw89/pci.c -index 02afeb3acce46..5aef7fa378788 100644 ---- a/drivers/net/wireless/realtek/rtw89/pci.c -+++ b/drivers/net/wireless/realtek/rtw89/pci.c -@@ -3026,24 +3026,54 @@ static void rtw89_pci_declaim_device(struct rtw89_dev *rtwdev, - pci_disable_device(pdev); - } - --static void rtw89_pci_cfg_dac(struct rtw89_dev *rtwdev) -+static bool rtw89_pci_chip_is_manual_dac(struct rtw89_dev *rtwdev) - { -- struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; - const struct rtw89_chip_info *chip = rtwdev->chip; - -- if (!rtwpci->enable_dac) -- return; -- - switch (chip->chip_id) { - case RTL8852A: - case RTL8852B: - case RTL8851B: - case RTL8852BT: -- break; -+ return true; - default: -- return; -+ return false; -+ } -+} -+ -+static bool rtw89_pci_is_dac_compatible_bridge(struct rtw89_dev *rtwdev) -+{ -+ struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; -+ struct pci_dev *bridge = pci_upstream_bridge(rtwpci->pdev); -+ -+ if (!rtw89_pci_chip_is_manual_dac(rtwdev)) -+ return true; -+ -+ if (!bridge) -+ return false; -+ -+ switch (bridge->vendor) { -+ case PCI_VENDOR_ID_INTEL: -+ return true; -+ case PCI_VENDOR_ID_ASMEDIA: -+ if (bridge->device == 0x2806) -+ return true; -+ break; - } - -+ return false; -+} -+ -+static void rtw89_pci_cfg_dac(struct rtw89_dev *rtwdev) -+{ -+ struct rtw89_pci *rtwpci = (struct rtw89_pci *)rtwdev->priv; -+ -+ if (!rtwpci->enable_dac) -+ return; -+ -+ if (!rtw89_pci_chip_is_manual_dac(rtwdev)) -+ return; -+ - rtw89_pci_config_byte_set(rtwdev, RTW89_PCIE_L1_CTRL, RTW89_PCIE_BIT_EN_64BITS); - } - -@@ -3061,6 +3091,9 @@ static int rtw89_pci_setup_mapping(struct rtw89_dev *rtwdev, - goto err; - } - -+ if (!rtw89_pci_is_dac_compatible_bridge(rtwdev)) -+ goto no_dac; -+ - ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(36)); - if (!ret) { - rtwpci->enable_dac = true; -@@ -3073,6 +3106,7 @@ static int rtw89_pci_setup_mapping(struct rtw89_dev *rtwdev, - goto err_release_regions; - } - } -+no_dac: - - resource_len = pci_resource_len(pdev, bar_id); - rtwpci->mmap = pci_iomap(pdev, bar_id, resource_len); diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index dccb60c1d9cc3..c7ec62f076c31 100644 --- a/drivers/pci/quirks.c diff --git a/sources b/sources index a9df2ee7f..d0e3a4459 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.11.6.tar.xz) = e882861b01e3808879d42fc6b3190fbcf27b5eba438a77b71a2f29de31af2fe9f048c50cbfc6c7fb92a717fe55f91cf3af951ffebc9af7d36b1e5ac42b8ec0b3 -SHA512 (kernel-abi-stablelists-6.11.6.tar.xz) = c36397ab093af834160327860b8a3140ae08d5f0d1d3d0a29c576a561200fc7984563d216acad4efc9cc757fc6984d41476bc60b0f2ba8a4a2a4d8d9ed8579d1 -SHA512 (kernel-kabi-dw-6.11.6.tar.xz) = de8f531db663d6c1dee2f1924b7f08872f65f133a893b964d5bc59269381ad77957af8cd3d2a06c59935128a49bdd4a74c987a63b32acba8acaf96fcbbb925c7 +SHA512 (linux-6.11.7.tar.xz) = a245634dbcbf63e49a017e7a3d226efdbfb56da1133daf276b03a352e7f13c004f99b54e15b02020f65620ac31aa448af0ab43e5b377aa23ebf99f7594df4acb +SHA512 (kernel-abi-stablelists-6.11.7.tar.xz) = f45041dcd0acfe99a5eebf9d69a500a483241ffb631c9f4a861df7d82cc44c9b7952fe77e6adf97751861371d17726160d40c6ed24e1843b97eb668e3119cdc2 +SHA512 (kernel-kabi-dw-6.11.7.tar.xz) = 9a61ec8bf21f67fb4892ee053dd7722033d068ed0d5fed5d1ecdba93ef72afb4549d1ef39e5a1faf3466d1194d95e2c15f44f337d40560f0f0eb2c425feb32a5