From 811d2ec22a665a218214c1139c5762af31f51197 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Sun, 17 Apr 2022 07:55:39 -0500 Subject: [PATCH] kernel-5.17.3-302 * Sun Apr 17 2022 Justin M. Forbes [5.17.3-302] - Revert "net: bcmgenet: Use stronger register read/writes to assure ordering" (Justin M. Forbes) Resolves: rhbz#2053729 Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 3 +++ kernel.spec | 9 ++++++--- patch-5.17-redhat.patch | 25 ++++++++++++++++++++++++- sources | 4 ++-- 4 files changed, 35 insertions(+), 6 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index 979f83892..3d19caace 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,6 @@ +"https://gitlab.com/cki-project/kernel-ark/-/commit"/ea0c997fe80f42ae5f3028581d1bad74c4a55dc3 + ea0c997fe80f42ae5f3028581d1bad74c4a55dc3 Revert "net: bcmgenet: Use stronger register read/writes to assure ordering" + "https://gitlab.com/cki-project/kernel-ark/-/commit"/10744450395503f1c584313b322f52e8f8542ef0 10744450395503f1c584313b322f52e8f8542ef0 ALSA: memalloc: Add fallback SG-buffer allocations for x86 diff --git a/kernel.spec b/kernel.spec index df3c0f1a6..bcb354a26 100755 --- a/kernel.spec +++ b/kernel.spec @@ -87,7 +87,7 @@ Summary: The Linux kernel # the --with-release option overrides this setting.) %define debugbuildsenabled 1 -%global distro_build 301 +%global distro_build 302 %if 0%{?fedora} %define secure_boot_arch x86_64 @@ -132,13 +132,13 @@ Summary: The Linux kernel %define rpmversion 5.17.3 %define patchversion 5.17 -%define pkgrelease 301 +%define pkgrelease 302 # This is needed to do merge window version magic %define patchlevel 17 # allow pkg_release to have configurable %%{?dist} tag -%define specrelease 301%{?buildid}%{?dist} +%define specrelease 302%{?buildid}%{?dist} %define pkg_release %{specrelease} @@ -3015,6 +3015,9 @@ fi # # %changelog +* Sun Apr 17 2022 Justin M. Forbes [5.17.3-302] +- Revert "net: bcmgenet: Use stronger register read/writes to assure ordering" (Justin M. Forbes) + * Wed Apr 13 2022 Justin M. Forbes [5.17.3-0] - ALSA: memalloc: Add fallback SG-buffer allocations for x86 (Takashi Iwai) - Turn AMD_PSTATE back to module so users can choose (Justin M. Forbes) diff --git a/patch-5.17-redhat.patch b/patch-5.17-redhat.patch index 81145ccd8..032f61386 100644 --- a/patch-5.17-redhat.patch +++ b/patch-5.17-redhat.patch @@ -26,6 +26,7 @@ drivers/hwtracing/coresight/coresight-etm4x-core.c | 19 ++++ drivers/input/rmi4/rmi_driver.c | 124 ++++++++++++--------- drivers/iommu/iommu.c | 22 ++++ + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 4 +- drivers/nvme/host/core.c | 22 +++- drivers/nvme/host/multipath.c | 19 ++-- drivers/nvme/host/nvme.h | 4 + @@ -56,7 +57,7 @@ security/lockdown/lockdown.c | 1 + security/security.c | 6 + sound/core/memalloc.c | 111 +++++++++++++++++- - 58 files changed, 884 insertions(+), 208 deletions(-) + 59 files changed, 886 insertions(+), 210 deletions(-) diff --git a/Documentation/core-api/dma-attributes.rst b/Documentation/core-api/dma-attributes.rst index 1887d92e8e92..17706dc91ec9 100644 @@ -1355,6 +1356,28 @@ index 107dcf5938d6..225a9797e39d 100644 /* * Changes the default domain of an iommu group that has *only* one device * +diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c +index bd5998012a87..2da804f84b48 100644 +--- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c ++++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c +@@ -76,7 +76,7 @@ static inline void bcmgenet_writel(u32 value, void __iomem *offset) + if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) + __raw_writel(value, offset); + else +- writel(value, offset); ++ writel_relaxed(value, offset); + } + + static inline u32 bcmgenet_readl(void __iomem *offset) +@@ -84,7 +84,7 @@ static inline u32 bcmgenet_readl(void __iomem *offset) + if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) + return __raw_readl(offset); + else +- return readl(offset); ++ return readl_relaxed(offset); + } + + static inline void dmadesc_set_length_status(struct bcmgenet_priv *priv, diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 6215d50ed3e7..10f1629e0940 100644 --- a/drivers/nvme/host/core.c diff --git a/sources b/sources index 697b89e5f..e172f4b98 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (linux-5.17.3.tar.xz) = 94cf35f451ee0d17a36f4d45e99a284e13951f70449f69789b453fc3a053a474519fca3bed0ee84da203b1a9baabb26e7e663034c355f2293fc7704b9b95b23d -SHA512 (kernel-abi-stablelists-5.17.3-301.tar.bz2) = 1133168d7ff8b657821d1b0aa8955f60b897ec9b5f0088d07d0b971e09a9ee4e85f1e7448ca1d11808ed101a2e1256e16948e5024680617036737cf2898f08ce -SHA512 (kernel-kabi-dw-5.17.3-301.tar.bz2) = ecf167b10b6d039e1714eb51b175faf48a151c94f716749597d86c93c392cadf9b06694df8a16e186d28ce03b3642ddb0cde13cfe4af826a1a868bc3f069c111 +SHA512 (kernel-abi-stablelists-5.17.3-302.tar.bz2) = 7205c3340a1788f6dca4f3d07660cc0d6b532887e77519eaf80defba48d2841c19f7816307f4487f89f4e4823393e9c2e0cb030cebf2a444ad84976a56bd4ae1 +SHA512 (kernel-kabi-dw-5.17.3-302.tar.bz2) = ecf167b10b6d039e1714eb51b175faf48a151c94f716749597d86c93c392cadf9b06694df8a16e186d28ce03b3642ddb0cde13cfe4af826a1a868bc3f069c111