From 8515db6f24729a0114623fbab7101841eec3c274 Mon Sep 17 00:00:00 2001 From: Jan200101 Date: Mon, 23 Aug 2021 19:37:35 +0200 Subject: kernel 5.13.12 --- SOURCES/amd-gpu-handle-vnc-instances.patch | 66 --------------------------- SOURCES/patch-5.13-redhat.patch | 71 +----------------------------- SPECS/kernel.spec | 47 +++++++++++++++----- 3 files changed, 37 insertions(+), 147 deletions(-) delete mode 100644 SOURCES/amd-gpu-handle-vnc-instances.patch diff --git a/SOURCES/amd-gpu-handle-vnc-instances.patch b/SOURCES/amd-gpu-handle-vnc-instances.patch deleted file mode 100644 index 3d9bf08..0000000 --- a/SOURCES/amd-gpu-handle-vnc-instances.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 7cbe08a930a132d84b4cf79953b00b074ec7a2a7 Mon Sep 17 00:00:00 2001 -From: Alex Deucher -Date: Mon, 9 Aug 2021 11:22:20 -0400 -Subject: [PATCH] drm/amdgpu: handle VCN instances when harvesting (v2) - -There may be multiple instances and only one is harvested. - -v2: fix typo in commit message - -Fixes: 83a0b8639185 ("drm/amdgpu: add judgement when add ip blocks (v2)") -Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1673 -Reviewed-by: Guchun Chen -Reviewed-by: James Zhu -Signed-off-by: Alex Deucher -Cc: stable@vger.kernel.org ---- - drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c -index 43e7b61d1c5c..ada7bc19118a 100644 ---- a/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c -+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c -@@ -299,6 +299,9 @@ int amdgpu_discovery_reg_base_init(struct amdgpu_device *adev) - ip->major, ip->minor, - ip->revision); - -+ if (le16_to_cpu(ip->hw_id) == VCN_HWID) -+ adev->vcn.num_vcn_inst++; -+ - for (k = 0; k < num_base_address; k++) { - /* - * convert the endianness of base addresses in place, -@@ -385,7 +388,7 @@ void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev) - { - struct binary_header *bhdr; - struct harvest_table *harvest_info; -- int i; -+ int i, vcn_harvest_count = 0; - - bhdr = (struct binary_header *)adev->mman.discovery_bin; - harvest_info = (struct harvest_table *)(adev->mman.discovery_bin + -@@ -397,8 +400,7 @@ void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev) - - switch (le32_to_cpu(harvest_info->list[i].hw_id)) { - case VCN_HWID: -- adev->harvest_ip_mask |= AMD_HARVEST_IP_VCN_MASK; -- adev->harvest_ip_mask |= AMD_HARVEST_IP_JPEG_MASK; -+ vcn_harvest_count++; - break; - case DMU_HWID: - adev->harvest_ip_mask |= AMD_HARVEST_IP_DMU_MASK; -@@ -407,6 +409,10 @@ void amdgpu_discovery_harvest_ip(struct amdgpu_device *adev) - break; - } - } -+ if (vcn_harvest_count == adev->vcn.num_vcn_inst) { -+ adev->harvest_ip_mask |= AMD_HARVEST_IP_VCN_MASK; -+ adev->harvest_ip_mask |= AMD_HARVEST_IP_JPEG_MASK; -+ } - } - - int amdgpu_discovery_get_gfx_info(struct amdgpu_device *adev) --- -GitLab - diff --git a/SOURCES/patch-5.13-redhat.patch b/SOURCES/patch-5.13-redhat.patch index d25c40d..8272316 100644 --- a/SOURCES/patch-5.13-redhat.patch +++ b/SOURCES/patch-5.13-redhat.patch @@ -31,7 +31,6 @@ drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 1 + drivers/nvme/host/pci.c | 28 +- drivers/pci/quirks.c | 24 + - drivers/pinctrl/intel/pinctrl-tigerlake.c | 26 +- drivers/platform/x86/amd-pmc.c | 204 +++++++- drivers/scsi/smartpqi/smartpqi_init.c | 16 + drivers/usb/core/hub.c | 7 + @@ -42,7 +41,6 @@ include/linux/rmi.h | 1 + include/linux/security.h | 5 + init/Kconfig | 2 +- - kernel/bpf/hashtab.c | 4 +- kernel/crash_core.c | 28 +- kernel/module_signing.c | 9 +- security/integrity/platform_certs/load_uefi.c | 6 +- @@ -74,7 +72,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 -- - 76 files changed, 957 insertions(+), 2366 deletions(-) + 74 files changed, 942 insertions(+), 2351 deletions(-) diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst index 75a9dd98e76e..3ff3291551f9 100644 @@ -99,7 +97,7 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Makefile b/Makefile -index eaf1df54ad12..96c289777a99 100644 +index 2458a4abcbcc..93ddceb5d254 100644 --- a/Makefile +++ b/Makefile @@ -508,6 +508,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE @@ -1541,56 +1539,6 @@ index 6d74386eadc2..2333c1e4ae05 100644 /* * Intersil/Techwell TW686[4589]-based video capture cards have an empty (zero) * class code. Fix it. -diff --git a/drivers/pinctrl/intel/pinctrl-tigerlake.c b/drivers/pinctrl/intel/pinctrl-tigerlake.c -index 75b6d66955bf..3ddaeffc0415 100644 ---- a/drivers/pinctrl/intel/pinctrl-tigerlake.c -+++ b/drivers/pinctrl/intel/pinctrl-tigerlake.c -@@ -701,32 +701,32 @@ static const struct pinctrl_pin_desc tglh_pins[] = { - - static const struct intel_padgroup tglh_community0_gpps[] = { - TGL_GPP(0, 0, 24, 0), /* GPP_A */ -- TGL_GPP(1, 25, 44, 128), /* GPP_R */ -- TGL_GPP(2, 45, 70, 32), /* GPP_B */ -- TGL_GPP(3, 71, 78, INTEL_GPIO_BASE_NOMAP), /* vGPIO_0 */ -+ TGL_GPP(1, 25, 44, 32), /* GPP_R */ -+ TGL_GPP(2, 45, 70, 64), /* GPP_B */ -+ TGL_GPP(3, 71, 78, 96), /* vGPIO_0 */ - }; - - static const struct intel_padgroup tglh_community1_gpps[] = { -- TGL_GPP(0, 79, 104, 96), /* GPP_D */ -- TGL_GPP(1, 105, 128, 64), /* GPP_C */ -- TGL_GPP(2, 129, 136, 160), /* GPP_S */ -- TGL_GPP(3, 137, 153, 192), /* GPP_G */ -- TGL_GPP(4, 154, 180, 224), /* vGPIO */ -+ TGL_GPP(0, 79, 104, 128), /* GPP_D */ -+ TGL_GPP(1, 105, 128, 160), /* GPP_C */ -+ TGL_GPP(2, 129, 136, 192), /* GPP_S */ -+ TGL_GPP(3, 137, 153, 224), /* GPP_G */ -+ TGL_GPP(4, 154, 180, 256), /* vGPIO */ - }; - - static const struct intel_padgroup tglh_community3_gpps[] = { -- TGL_GPP(0, 181, 193, 256), /* GPP_E */ -- TGL_GPP(1, 194, 217, 288), /* GPP_F */ -+ TGL_GPP(0, 181, 193, 288), /* GPP_E */ -+ TGL_GPP(1, 194, 217, 320), /* GPP_F */ - }; - - static const struct intel_padgroup tglh_community4_gpps[] = { -- TGL_GPP(0, 218, 241, 320), /* GPP_H */ -+ TGL_GPP(0, 218, 241, 352), /* GPP_H */ - TGL_GPP(1, 242, 251, 384), /* GPP_J */ -- TGL_GPP(2, 252, 266, 352), /* GPP_K */ -+ TGL_GPP(2, 252, 266, 416), /* GPP_K */ - }; - - static const struct intel_padgroup tglh_community5_gpps[] = { -- TGL_GPP(0, 267, 281, 416), /* GPP_I */ -+ TGL_GPP(0, 267, 281, 448), /* GPP_I */ - TGL_GPP(1, 282, 290, INTEL_GPIO_BASE_NOMAP), /* JTAG */ - }; - diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c index ca95c2a52e26..e38e8288468f 100644 --- a/drivers/platform/x86/amd-pmc.c @@ -2161,21 +2109,6 @@ index a61c92066c2e..94107b1d0e3e 100644 select IO_WQ default y help -diff --git a/kernel/bpf/hashtab.c b/kernel/bpf/hashtab.c -index d7ebb12ffffc..49857e8cd6ce 100644 ---- a/kernel/bpf/hashtab.c -+++ b/kernel/bpf/hashtab.c -@@ -1464,8 +1464,8 @@ __htab_map_lookup_and_delete_batch(struct bpf_map *map, - /* We cannot do copy_from_user or copy_to_user inside - * the rcu_read_lock. Allocate enough space here. - */ -- keys = kvmalloc(key_size * bucket_size, GFP_USER | __GFP_NOWARN); -- values = kvmalloc(value_size * bucket_size, GFP_USER | __GFP_NOWARN); -+ keys = kvmalloc_array(key_size, bucket_size, GFP_USER | __GFP_NOWARN); -+ values = kvmalloc_array(value_size, bucket_size, GFP_USER | __GFP_NOWARN); - if (!keys || !values) { - ret = -ENOMEM; - goto after_loop; diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 684a6061a13a..220579c0e963 100644 --- a/kernel/crash_core.c diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 0cb756c..9eb6333 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -116,7 +116,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.13 -%define rpmversion 5.13.11 +%define rpmversion 5.13.12 %define stableversion 5.13 %define pkgrelease 201 @@ -646,7 +646,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.13.11.tar.xz +Source0: linux-5.13.12.tar.xz Source1: Makefile.rhelver @@ -802,8 +802,6 @@ Source4001: rpminspect.yaml Patch1: patch-%{stableversion}-redhat.patch -Patch101: amd-gpu-handle-vnc-instances.patch - # linux-fsync patches Patch200: zen.patch Patch201: futex2.patch @@ -1323,8 +1321,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.13.11 -c -mv linux-5.13.11 linux-%{KVERREL} +%setup -q -n kernel-5.13.12 -c +mv linux-5.13.12 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -1333,8 +1331,6 @@ cp -a %{SOURCE1} . ApplyOptionalPatch patch-%{stableversion}-redhat.patch -ApplyOptionalPatch amd-gpu-handle-vnc-instances.patch - # linux-fsync patches ApplyOptionalPatch zen.patch ApplyOptionalPatch futex2.patch @@ -2902,12 +2898,39 @@ fi # # %changelog -* Mon Aug 23 2021 Jan Drögehoff - 5.13.11-201.fsync -- Linux v5.13.11 futex2 zen openrgb +* Mon Aug 23 2021 Jan Drögehoff - 5.13.12-201.fsync +- Linux v5.13.12 futex2 zen openrgb -* Tue Aug 17 2021 Justin M. Forbes [5.13.11-200] -- kernel-5.13.11-0 (Justin M. Forbes) +* Wed Aug 18 2021 Justin M. Forbes [5.13.12-200] +- kernel-5.13.12-0 (Justin M. Forbes) + +* Tue Aug 17 2021 Justin M. Forbes [5.13.11-0] - bpf: Fix integer overflow involving bucket_size (Tatsuhiko Yasumatsu) +- kernel-5.13.10-0 (Justin M. Forbes) +- Fix up backport of Dell XPS 9710 quirk (Justin M. Forbes) +- ASoC: Intel: sof_sdw_max98373: remove useless inits (Pierre-Louis Bossart) +- ASoC: Intel: update sof_pcm512x quirks (Pierre-Louis Bossart) +- ASoC: SOF: Intel: Use DMI string to search for adl_mx98373_rt5682 variant (jairaj arava) +- ASoC: Intel: sof_sdw: add quirk for Dell XPS 9710 (Pierre-Louis Bossart) +- kernel-5.13.9-0 (Justin M. Forbes) +- drm/i915/dp: Use max params for older panels (Kai-Heng Feng) +- pinctrl: tigerlake: Fix GPIO mapping for newer version of software (Andy Shevchenko) +- kernel-5.13.8-0 (Justin M. Forbes) +- Re-enable sermouse for x86 (rhbz 1974002) (Justin M. Forbes) +- Revert CRYPTO_ECDH and CRYPTO_ECDA from builtin to module to fix fips (Justin M. Forbes) +- drm/rockchip: remove existing generic drivers to take over the device (Javier Martinez Canillas) +- powerpc/pseries: Fix regression while building external modules (Srikar Dronamraju) +- kernel-5.13.7-0 (Justin M. Forbes) +- 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) * Thu Aug 12 2021 Justin M. Forbes [5.13.10-0] - Fix up backport of Dell XPS 9710 quirk (Justin M. Forbes) -- cgit v1.2.3