From 504b2983a97a982b8de3cd5e18608825f918301f Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Tue, 18 Apr 2023 21:32:01 +0200 Subject: kernel 6.2.11 --- SOURCES/acso.patch | 48 ++++++++++++++++++++---------------------- SOURCES/patch-6.2-redhat.patch | 33 ++++++----------------------- SPECS/kernel.spec | 15 +++++++------ 3 files changed, 38 insertions(+), 58 deletions(-) diff --git a/SOURCES/acso.patch b/SOURCES/acso.patch index a780298..424fab4 100644 --- a/SOURCES/acso.patch +++ b/SOURCES/acso.patch @@ -48,24 +48,23 @@ your customers the hassle of this boot option. Signed-off-by: Mark Weiman Signed-off-by: Alexandre Frade --- - .../admin-guide/kernel-parameters.txt | 9 ++ + .../admin-guide/kernel-parameters.txt | 8 ++ drivers/pci/quirks.c | 102 ++++++++++++++++++ - 2 files changed, 111 insertions(+) + 2 files changed, 110 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index c48937820..61e30d250 100644 +index 6cfa6e3996cf..fdbe34c0fbf3 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt -@@ -4045,6 +4045,15 @@ +@@ -4178,6 +4178,14 @@ nomsi [MSI] If the PCI_MSI kernel config parameter is enabled, this kernel boot option can be used to disable the use of MSI interrupts system-wide. -+ pcie_acs_override = -+ [PCIE] Override missing PCIe ACS support for: ++ pci_acs_override [PCIE] Override missing PCIe ACS support for: + downstream + All downstream ports - full ACS capabilities + multifunction -+ All multifunction devices - multifunction ACS subset ++ Add multifunction devices - multifunction ACS subset + id:nnnn:nnnn + Specific device - full ACS capabilities + Specified as vid:did (vendor/device ID) in hex @@ -73,12 +72,12 @@ index c48937820..61e30d250 100644 Safety option to keep boot IRQs enabled. This should never be necessary. diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c -index 41aeaa235..fcbfd845b 100644 +index 494fa46f5767..41150eb8bd4c 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -3613,6 +3613,106 @@ static void quirk_nvidia_no_bus_reset(struct pci_dev *dev) - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID, - quirk_nvidia_no_bus_reset); +@@ -194,6 +194,106 @@ static int __init pci_apply_final_quirks(void) + } + fs_initcall_sync(pci_apply_final_quirks); +static bool acs_on_downstream; +static bool acs_on_multifunction; @@ -120,11 +119,10 @@ index 41aeaa235..fcbfd845b 100644 + goto next; + } + acs_on_ids[max_acs_id].vendor = val; -+ -+ p += strcspn(p, ":"); -+ if (*p != ':') { -+ pr_warn("PCIe ACS invalid ID\n"); -+ goto next; ++ p += strcspn(p, ":"); ++ if (*p != ':') { ++ pr_warn("PCIe ACS invalid ID\n"); ++ goto next; + } + + p++; @@ -164,7 +162,7 @@ index 41aeaa235..fcbfd845b 100644 + acs_on_ids[i].device == dev->device) + return 1; + -+ switch (pci_pcie_type(dev)) { ++switch (pci_pcie_type(dev)) { + case PCI_EXP_TYPE_DOWNSTREAM: + case PCI_EXP_TYPE_ROOT_PORT: + if (acs_on_downstream) @@ -180,18 +178,18 @@ index 41aeaa235..fcbfd845b 100644 + + return -ENOTTY; +} ++ /* - * Some Atheros AR9xxx and QCA988x chips do not behave after a bus reset. - * The device will throw a Link Down error on AER-capable systems and -@@ -4966,6 +5066,8 @@ static const struct pci_dev_acs_enabled { - { PCI_VENDOR_ID_NXP, 0x8d9b, pci_quirk_nxp_rp_acs }, - /* Zhaoxin Root/Downstream Ports */ + * Decoding should be disabled for a PCI device during BAR sizing to avoid + * conflict. But doing so may cause problems on host bridge and perhaps other +@@ -5002,6 +5102,8 @@ static const struct pci_dev_acs_enabled { { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs }, -+ /* PCIe ACS overrides */ + /* Wangxun nics */ + { PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs }, ++ /* allow acs for any */ + { PCI_ANY_ID, PCI_ANY_ID, pcie_acs_overrides }, { 0 } }; -- -2.37.0.3.g30cc8d0f14 - +2.39.2 diff --git a/SOURCES/patch-6.2-redhat.patch b/SOURCES/patch-6.2-redhat.patch index c6546eb..217aa22 100644 --- a/SOURCES/patch-6.2-redhat.patch +++ b/SOURCES/patch-6.2-redhat.patch @@ -26,7 +26,6 @@ drivers/iommu/iommu.c | 22 + drivers/pci/quirks.c | 24 + drivers/usb/core/hub.c | 7 + - drivers/usb/host/xhci-pci.c | 7 +- include/linux/efi.h | 22 +- include/linux/lsm_hook_defs.h | 2 + include/linux/lsm_hooks.h | 6 + @@ -39,7 +38,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + - 41 files changed, 1637 insertions(+), 181 deletions(-) + 40 files changed, 1634 insertions(+), 177 deletions(-) diff --git a/Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml b/Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml new file mode 100644 @@ -124,7 +123,7 @@ index 000000000000..1b2a1baa26f9 + +... diff --git a/Makefile b/Makefile -index 6ec0ec452e46..40a89b4c3682 100644 +index 416490daa76a..f65904d89130 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,10 @@ $(if $(filter __%, $(MAKECMDGOALS)), \ @@ -1437,7 +1436,7 @@ index 84e7ba5314d3..efc96776f761 100644 data->xport.ops = &hid_rmi_ops; diff --git a/drivers/hwtracing/coresight/coresight-etm4x-core.c b/drivers/hwtracing/coresight/coresight-etm4x-core.c -index 77bca6932f01..27f5455aef6c 100644 +index a65b41017cec..f0ebfbba1f2f 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x-core.c +++ b/drivers/hwtracing/coresight/coresight-etm4x-core.c @@ -9,6 +9,7 @@ @@ -1448,7 +1447,7 @@ index 77bca6932f01..27f5455aef6c 100644 #include #include #include -@@ -2216,6 +2217,16 @@ static const struct amba_id etm4_ids[] = { +@@ -2212,6 +2213,16 @@ static const struct amba_id etm4_ids[] = { {}, }; @@ -1465,7 +1464,7 @@ index 77bca6932f01..27f5455aef6c 100644 MODULE_DEVICE_TABLE(amba, etm4_ids); static struct amba_driver etm4x_amba_driver = { -@@ -2249,6 +2260,11 @@ static int __init etm4x_init(void) +@@ -2245,6 +2256,11 @@ static int __init etm4x_init(void) { int ret; @@ -1477,7 +1476,7 @@ index 77bca6932f01..27f5455aef6c 100644 ret = etm4_pm_setup(); /* etm4_pm_setup() does its own cleanup - exit on error */ -@@ -2275,6 +2291,9 @@ static int __init etm4x_init(void) +@@ -2271,6 +2287,9 @@ static int __init etm4x_init(void) static void __exit etm4x_exit(void) { @@ -1772,26 +1771,6 @@ index 97a0f8faea6e..d837548d2024 100644 /* Lock the device, then check to see if we were * disconnected while waiting for the lock to succeed. */ usb_lock_device(hdev); -diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index fb988e4ea924..6db07ca419c3 100644 ---- a/drivers/usb/host/xhci-pci.c -+++ b/drivers/usb/host/xhci-pci.c -@@ -771,12 +771,11 @@ static struct pci_driver xhci_pci_driver = { - /* suspend and resume implemented later */ - - .shutdown = usb_hcd_pci_shutdown, -- .driver = { - #ifdef CONFIG_PM -- .pm = &usb_hcd_pci_pm_ops, --#endif -- .probe_type = PROBE_PREFER_ASYNCHRONOUS, -+ .driver = { -+ .pm = &usb_hcd_pci_pm_ops - }, -+#endif - }; - - static int __init xhci_pci_init(void) diff --git a/include/linux/efi.h b/include/linux/efi.h index ac22f7ca195a..e680835ad387 100644 --- a/include/linux/efi.h diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index d5f42cc..beabad8 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -148,17 +148,17 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 %define buildid .fsync -%define specversion 6.2.10 +%define specversion 6.2.11 %define patchversion 6.2 %define pkgrelease 200 %define kversion 6 -%define tarfile_release 6.2.10 +%define tarfile_release 6.2.11 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag %define specrelease 201%{?buildid}%{?dist} # This defines the kabi tarball version -%define kabiversion 6.2.10 +%define kabiversion 6.2.11 # If this variable is set to 1, a bpf selftests build failure will cause a # fatal kernel package build error @@ -1549,7 +1549,7 @@ ApplyOptionalPatch tkg.patch ApplyOptionalPatch fsync.patch ApplyOptionalPatch OpenRGB.patch ApplyOptionalPatch amdgpu-si-cik-default.patch -#ApplyOptionalPatch acso.patch +ApplyOptionalPatch acso.patch # device specific patches ApplyOptionalPatch linux-surface.patch @@ -3388,8 +3388,11 @@ fi # # %changelog -* Mon Apr 10 2023 Jan Drögehoff - 6.2.10-201.fsync -- kernel-fsync v6.2.10 +* Tue Apr 18 2023 Jan Drögehoff - 6.2.11-201.1 +- kernel-fsync v6.2.11 + +* Thu Apr 13 2023 Augusto Caringi [6.2.11-0] +- Linux v6.2.11 * Thu Apr 06 2023 Augusto Caringi [6.2.10-0] - fedora: arm: Enable DRM_PANEL_HIMAX_HX8394 (Peter Robinson) -- cgit v1.2.3