diff options
28 files changed, 84 insertions, 97 deletions
diff --git a/Patchlist.changelog b/Patchlist.changelog index 5e75d84ab..da0061ce8 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,9 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/e833c34e56563b0292493c62921e7132a16ceef0 + e833c34e56563b0292493c62921e7132a16ceef0 iwlwifi Add support for ax201 in Samsung Galaxy Book Flex2 Alpha + +https://gitlab.com/cki-project/kernel-ark/-/commit/7c85609231b2dbb3ea6fa0d9ffb52e9177fd8212 + 7c85609231b2dbb3ea6fa0d9ffb52e9177fd8212 Revert "usb: renesas-xhci: Fix handling of unknown ROM state" + https://gitlab.com/cki-project/kernel-ark/-/commit/93766a4c0701e9f633071beb75237e11413dcebd 93766a4c0701e9f633071beb75237e11413dcebd platform/x86: amd-pmc: Fix missing unlock on error in amd_pmc_send_cmd() diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index 99cef4350..80a8482e5 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -6842,6 +6842,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 0a295e4bc..428e16529 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -5477,6 +5477,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index a45547433..57978267d 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -6817,6 +6817,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 39e4dee9e..bd1cab2d4 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -5454,6 +5454,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel-armv7hl-debug-fedora.config b/kernel-armv7hl-debug-fedora.config index add46f7fa..e9036636a 100644 --- a/kernel-armv7hl-debug-fedora.config +++ b/kernel-armv7hl-debug-fedora.config @@ -7009,6 +7009,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-armv7hl-fedora.config b/kernel-armv7hl-fedora.config index 68023721b..655328e4a 100644 --- a/kernel-armv7hl-fedora.config +++ b/kernel-armv7hl-fedora.config @@ -6985,6 +6985,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-armv7hl-lpae-debug-fedora.config b/kernel-armv7hl-lpae-debug-fedora.config index 2703b8089..3961f2fc8 100644 --- a/kernel-armv7hl-lpae-debug-fedora.config +++ b/kernel-armv7hl-lpae-debug-fedora.config @@ -6799,6 +6799,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-armv7hl-lpae-fedora.config b/kernel-armv7hl-lpae-fedora.config index 4c7e8f04a..012558183 100644 --- a/kernel-armv7hl-lpae-fedora.config +++ b/kernel-armv7hl-lpae-fedora.config @@ -6775,6 +6775,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-i686-debug-fedora.config b/kernel-i686-debug-fedora.config index e370a243b..429903a8d 100644 --- a/kernel-i686-debug-fedora.config +++ b/kernel-i686-debug-fedora.config @@ -6181,6 +6181,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set CONFIG_SND_SOC_SSM4567=m diff --git a/kernel-i686-fedora.config b/kernel-i686-fedora.config index 50e73dd37..6ca51ba6c 100644 --- a/kernel-i686-fedora.config +++ b/kernel-i686-fedora.config @@ -6157,6 +6157,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set CONFIG_SND_SOC_SSM4567=m diff --git a/kernel-ppc64le-debug-fedora.config b/kernel-ppc64le-debug-fedora.config index 851d132e9..4d7a1c7f3 100644 --- a/kernel-ppc64le-debug-fedora.config +++ b/kernel-ppc64le-debug-fedora.config @@ -5794,6 +5794,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index be39d9730..72afe23a9 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -5263,6 +5263,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel-ppc64le-fedora.config b/kernel-ppc64le-fedora.config index f3ff4ffd8..cc644a0d4 100644 --- a/kernel-ppc64le-fedora.config +++ b/kernel-ppc64le-fedora.config @@ -5769,6 +5769,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 20c2aea38..205873ec4 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -5244,6 +5244,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel-s390x-debug-fedora.config b/kernel-s390x-debug-fedora.config index a7bfcde48..0dad1ea54 100644 --- a/kernel-s390x-debug-fedora.config +++ b/kernel-s390x-debug-fedora.config @@ -5746,6 +5746,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index be11f9800..119d4ada2 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -5208,6 +5208,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel-s390x-fedora.config b/kernel-s390x-fedora.config index 802205b38..98f7a252a 100644 --- a/kernel-s390x-fedora.config +++ b/kernel-s390x-fedora.config @@ -5721,6 +5721,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_SSM4567 is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 77011b2e5..dc43a49bb 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -5189,6 +5189,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index e0a95b6f3..59cc5ac63 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -5217,6 +5217,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE=m CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel-x86_64-debug-fedora.config b/kernel-x86_64-debug-fedora.config index 190da0f7d..535fa8622 100644 --- a/kernel-x86_64-debug-fedora.config +++ b/kernel-x86_64-debug-fedora.config @@ -6231,6 +6231,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set CONFIG_SND_SOC_SSM4567=m diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index b2952b6dc..6153e9f4f 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -5483,6 +5483,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel-x86_64-fedora.config b/kernel-x86_64-fedora.config index 8522e3c7c..bc8ff6bcd 100644 --- a/kernel-x86_64-fedora.config +++ b/kernel-x86_64-fedora.config @@ -6207,6 +6207,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y CONFIG_SND_SOC_SPDIF=m # CONFIG_SND_SOC_SSM2305 is not set +CONFIG_SND_SOC_SSM2518=m # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set CONFIG_SND_SOC_SSM4567=m diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index 84fee67ba..61a08dbc2 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -5461,6 +5461,7 @@ CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y CONFIG_SND_SOC_SOF_TOPLEVEL=y # CONFIG_SND_SOC_SPDIF is not set # CONFIG_SND_SOC_SSM2305 is not set +# CONFIG_SND_SOC_SSM2518 is not set # CONFIG_SND_SOC_SSM2602_I2C is not set # CONFIG_SND_SOC_SSM2602_SPI is not set # CONFIG_SND_SOC_STA32X is not set diff --git a/kernel.spec b/kernel.spec index f84049f34..b9d265f00 100755 --- a/kernel.spec +++ b/kernel.spec @@ -114,12 +114,12 @@ Summary: The Linux kernel %else %define primary_target rhel %endif -%define fedorabase 5.13.4 +%define fedorabase 5.13.6 # The kernel tarball/base version %define kversion 5.13 -%define rpmversion 5.13.5 +%define rpmversion 5.13.6 %define stableversion 5.13 %define pkgrelease 200 @@ -649,7 +649,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.13.5.tar.xz +Source0: linux-5.13.6.tar.xz Source1: Makefile.rhelver @@ -804,7 +804,6 @@ Source4001: rpminspect.yaml %if !%{nopatches} Patch1: patch-%{stableversion}-redhat.patch -Patch2: usb-renesas-xhci-fix-handling-of-unknown-rom-state.patch %endif # empty final patch to facilitate testing of kernel patches @@ -1319,8 +1318,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.13.5 -c -mv linux-5.13.5 linux-%{KVERREL} +%setup -q -n kernel-5.13.6 -c +mv linux-5.13.6 linux-%{KVERREL} cd linux-%{KVERREL} # cp -a %{SOURCE1} . @@ -1328,7 +1327,6 @@ cd linux-%{KVERREL} %if !%{nopatches} ApplyOptionalPatch patch-%{stableversion}-redhat.patch -ApplyOptionalPatch usb-renesas-xhci-fix-handling-of-unknown-rom-state.patch %endif ApplyOptionalPatch linux-kernel-test.patch @@ -2893,7 +2891,32 @@ fi # # %changelog -* Tue Jul 20 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.4-200] +* Wed Jul 28 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.6-200] +- kernel-5.13.6-0 (Justin M. Forbes) +- kernel-5.13.5-0 (Justin M. Forbes) +- iwlwifi Add support for ax201 in Samsung Galaxy Book Flex2 Alpha (Justin M. Forbes) +- Revert "usb: renesas-xhci: Fix handling of unknown ROM state" (Justin M. Forbes) +- RHEL configs need this too (Justin M. Forbes) +- kernel-5.13.4-0 (Justin M. Forbes) +- Config update for 5.13.4 (Justin M. Forbes) +- kernel-5.13.3-0 (Justin M. Forbes) +- Don't tag a release as [redhat] (Justin M. Forbes) +- platform/x86: amd-pmc: Fix missing unlock on error in amd_pmc_send_cmd() (Yang Yingliang) + +* Wed Jul 28 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.6-0] +- kernel-5.13.5-0 (Justin M. Forbes) +- iwlwifi Add support for ax201 in Samsung Galaxy Book Flex2 Alpha (Justin M. Forbes) +- Revert "usb: renesas-xhci: Fix handling of unknown ROM state" (Justin M. Forbes) +- RHEL configs need this too (Justin M. Forbes) +- kernel-5.13.4-0 (Justin M. Forbes) +- Config update for 5.13.4 (Justin M. Forbes) +- kernel-5.13.3-0 (Justin M. Forbes) +- Don't tag a release as [redhat] (Justin M. Forbes) +- platform/x86: amd-pmc: Fix missing unlock on error in amd_pmc_send_cmd() (Yang Yingliang) + +* Sun Jul 25 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.13.5-0] +- iwlwifi Add support for ax201 in Samsung Galaxy Book Flex2 Alpha (Justin M. Forbes) +- Revert "usb: renesas-xhci: Fix handling of unknown ROM state" (Justin M. Forbes) - RHEL configs need this too (Justin M. Forbes) - kernel-5.13.4-0 (Justin M. Forbes) - Config update for 5.13.4 (Justin M. Forbes) diff --git a/patch-5.13-redhat.patch b/patch-5.13-redhat.patch index ba1f8f92e..9f9fc2d42 100644 --- a/patch-5.13-redhat.patch +++ b/patch-5.13-redhat.patch @@ -3,7 +3,6 @@ arch/arm/Kconfig | 4 +- arch/arm64/Kconfig | 3 +- .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 2 +- - arch/arm64/boot/dts/rockchip/rk3399.dtsi | 2 +- arch/arm64/kernel/acpi.c | 2 +- arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + @@ -27,6 +26,7 @@ drivers/input/rmi4/rmi_driver.c | 124 +++-- drivers/iommu/iommu.c | 22 + drivers/net/wireguard/main.c | 6 + + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 1 + drivers/nvme/host/pci.c | 28 +- drivers/pci/quirks.c | 24 + drivers/platform/x86/amd-pmc.c | 248 +++++++++- @@ -65,7 +65,7 @@ tools/testing/selftests/bpf/progs/linked_vars2.c | 55 --- .../selftests/bpf/progs/test_static_linked1.c | 30 -- .../selftests/bpf/progs/test_static_linked2.c | 31 -- - 67 files changed, 909 insertions(+), 2354 deletions(-) + 67 files changed, 909 insertions(+), 2353 deletions(-) diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst index 75a9dd98e76e..3ff3291551f9 100644 @@ -90,7 +90,7 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Makefile b/Makefile -index 975acb16046d..e6b00e6d0094 100644 +index 96967f895193..dccbf438edf2 100644 --- a/Makefile +++ b/Makefile @@ -508,6 +508,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE @@ -151,19 +151,6 @@ index 2b5f001ff4a6..dcdb3cd75be7 100644 }; &cpu_b0 { -diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -index 634a91af8e83..4b854eb21f72 100644 ---- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi -+++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi -@@ -227,7 +227,7 @@ pcie0: pcie@f8000000 { - <&pcie_phy 2>, <&pcie_phy 3>; - phy-names = "pcie-phy-0", "pcie-phy-1", - "pcie-phy-2", "pcie-phy-3"; -- ranges = <0x83000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x1e00000>, -+ ranges = <0x82000000 0x0 0xfa000000 0x0 0xfa000000 0x0 0x1e00000>, - <0x81000000 0x0 0xfbe00000 0x0 0xfbe00000 0x0 0x100000>; - resets = <&cru SRST_PCIE_CORE>, <&cru SRST_PCIE_MGMT>, - <&cru SRST_PCIE_MGMT_STICKY>, <&cru SRST_PCIE_PIPE>, diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index cada0b816c8a..0fc840d6b0fb 100644 --- a/arch/arm64/kernel/acpi.c @@ -809,7 +796,7 @@ index 467e94259679..9b6f5b8e5397 100644 obj-$(CONFIG_EFI_RCI2_TABLE) += rci2-table.o obj-$(CONFIG_EFI_EMBEDDED_FIRMWARE) += embedded-firmware.o diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c -index 4b7ee3fa9224..64b31d852d20 100644 +index 847f33ffc4ae..363037f8eaf8 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c @@ -31,6 +31,7 @@ @@ -1404,11 +1391,23 @@ index 75dbe77b0b4b..4bd6dd722f44 100644 ret = wg_allowedips_slab_init(); if (ret < 0) goto err_allowedips; +diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +index d94bd8d732e9..7775395bef6f 100644 +--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c ++++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c +@@ -556,6 +556,7 @@ static const struct iwl_dev_info iwl_dev_info_table[] = { + IWL_DEV_INFO(0xA0F0, 0x1652, killer1650i_2ax_cfg_qu_b0_hr_b0, NULL), + IWL_DEV_INFO(0xA0F0, 0x2074, iwl_ax201_cfg_qu_hr, NULL), + IWL_DEV_INFO(0xA0F0, 0x4070, iwl_ax201_cfg_qu_hr, NULL), ++ IWL_DEV_INFO(0xA0F0, 0x6074, iwl_ax201_cfg_qu_hr, NULL), + IWL_DEV_INFO(0x02F0, 0x0070, iwl_ax201_cfg_quz_hr, NULL), + IWL_DEV_INFO(0x02F0, 0x0074, iwl_ax201_cfg_quz_hr, NULL), + IWL_DEV_INFO(0x02F0, 0x6074, iwl_ax201_cfg_quz_hr, NULL), diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c -index 42ad75ff1348..5a72bdf5ad03 100644 +index fb1c5ae0da39..b7cf30213ac2 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c -@@ -2828,32 +2828,6 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev) +@@ -2830,32 +2830,6 @@ static unsigned long check_vendor_combination_bug(struct pci_dev *pdev) return 0; } @@ -1441,7 +1440,7 @@ index 42ad75ff1348..5a72bdf5ad03 100644 static void nvme_async_probe(void *data, async_cookie_t cookie) { struct nvme_dev *dev = data; -@@ -2903,7 +2877,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) +@@ -2905,7 +2879,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) quirks |= check_vendor_combination_bug(pdev); @@ -1917,10 +1916,10 @@ index 5db16509b6e1..5b8b5e3edd39 100644 PCI_DEVICE_SUB(PCI_VENDOR_ID_ADAPTEC2, 0x028f, PCI_VENDOR_ID_DELL, 0x1fe0) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index df8e69e60aaf..fb851c5130e1 100644 +index 4e123336e410..22d98f536d90 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5587,6 +5587,13 @@ static void hub_event(struct work_struct *work) +@@ -5635,6 +5635,13 @@ static void hub_event(struct work_struct *work) (u16) hub->change_bits[0], (u16) hub->event_bits[0]); @@ -1,3 +1,3 @@ -SHA512 (linux-5.13.4.tar.xz) = 702e263302f46ce18d169134faac13dd730bb2d24d9b38f24eae028175e3b966f448faaea21f395a73229ffc0260d6bf4c96d4ed38d99bc898005d41db41aa86 -SHA512 (kernel-abi-whitelists-5.13.4-200.tar.bz2) = 53305e66f8674e8bcad9a407fb1405285e9008a07d42443e975faf04de18d10018125781420141d18930e09124d541d9df3ff2aa3cc09dc3284f8d23a734144f -SHA512 (kernel-kabi-dw-5.13.4-200.tar.bz2) = 45e8649f488ea6cf43df549fce9c50842d3d0e49b51fc01a4d1196bbcc39f2889ebb8b24fe55026de49b0cc20c393d2203c64043a8b1366d5968f8aa8ba4ae4d +SHA512 (linux-5.13.6.tar.xz) = 1e2cd327165a6fda5348c60b99beab684531e9843f6e3acdedd35471855fb2d8e1425bb9f57899b7b69be2697dc8936c46fc5d5719caaa7d46300effa675dc7c +SHA512 (kernel-abi-whitelists-5.13.6-200.tar.bz2) = 994efa4b6d9e6a7994eacb71a5034d7663efa7972c9c64e3569dd4b203cdbcb476ea74f0678bcf565a1962549e7775cce62e83f9044f02b54520e09ef6bccf61 +SHA512 (kernel-kabi-dw-5.13.6-200.tar.bz2) = eba0499a6eefd5482cc5966455d617698b7f2103101ed596076f0f215e341cf0640d2dadf476cfbc436a8b8836dedc88493f890f6366cc31694d12d8a5bfe0bd diff --git a/usb-renesas-xhci-fix-handling-of-unknown-rom-state.patch b/usb-renesas-xhci-fix-handling-of-unknown-rom-state.patch deleted file mode 100644 index f82ebc082..000000000 --- a/usb-renesas-xhci-fix-handling-of-unknown-rom-state.patch +++ /dev/null @@ -1,64 +0,0 @@ -commit 926bb4ece936dcb83421e55f08eb3055628bca2f -Author: Moritz Fischer <mdf@kernel.org> -Date: Sat Jul 17 15:33:32 2021 -0700 - - usb: renesas-xhci: Fix handling of unknown ROM state - - Justin, - - On Sat, Jul 17, 2021 at 08:39:19AM -0500, Justin Forbes wrote: - > On Mon, Jul 12, 2021 at 2:31 AM Greg Kroah-Hartman - > <gregkh@linuxfoundation.org> wrote: - > > - > > From: Moritz Fischer <mdf@kernel.org> - > > - > > commit d143825baf15f204dac60acdf95e428182aa3374 upstream. - > > - > > The ROM load sometimes seems to return an unknown status - > > (RENESAS_ROM_STATUS_NO_RESULT) instead of success / fail. - > > - > > If the ROM load indeed failed this leads to failures when trying to - > > communicate with the controller later on. - > > - > > Attempt to load firmware using RAM load in those cases. - > > - > > Fixes: 2478be82de44 ("usb: renesas-xhci: Add ROM loader for uPD720201") - > > Cc: stable@vger.kernel.org - > > Cc: Mathias Nyman <mathias.nyman@intel.com> - > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - > > Cc: Vinod Koul <vkoul@kernel.org> - > > Tested-by: Vinod Koul <vkoul@kernel.org> - > > Reviewed-by: Vinod Koul <vkoul@kernel.org> - > > Signed-off-by: Moritz Fischer <mdf@kernel.org> - > > Link: https://lore.kernel.org/r/20210615153758.253572-1-mdf@kernel.org - > > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - > > - > - > After sending out 5.12.17 for testing, we had a user complain that all - > of their USB devices disappeared with the error: - > - > Jul 15 23:18:53 kernel: xhci_hcd 0000:04:00.0: Direct firmware load - > for renesas_usb_fw.mem failed with error -2 - > Jul 15 23:18:53 kernel: xhci_hcd 0000:04:00.0: request_firmware failed: -2 - > Jul 15 23:18:53 kernel: xhci_hcd: probe of 0000:04:00.0 failed with error -2 - - This looks like it fails finding the actual firmware file (ENOENT). Any - chance you could give this a whirl on top of the original patch? - -diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c -index 18c2bbddf080..cde8f6f1ec5d 100644 ---- a/drivers/usb/host/xhci-pci.c -+++ b/drivers/usb/host/xhci-pci.c -@@ -379,7 +379,11 @@ static int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) - driver_data = (struct xhci_driver_data *)id->driver_data; - if (driver_data && driver_data->quirks & XHCI_RENESAS_FW_QUIRK) { - retval = renesas_xhci_check_request_fw(dev, id); -- if (retval) -+ /* -+ * If firmware wasn't found there's still a chance this might work without -+ * loading firmware on some systems, so let's try at least. -+ */ -+ if (retval && retval != -ENOENT) - return retval; - } - |