From: Greg Kroah-Hartman Date: Mon, 24 Feb 2025 14:11:30 +0000 (+0100) Subject: 6.12-stable patches X-Git-Tag: v6.6.80~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8cef69da0e534dc8626e23688eb805e249c155ee;p=thirdparty%2Fkernel%2Fstable-queue.git 6.12-stable patches added patches: arm64-dts-rockchip-change-eth-phy-mode-to-rgmii-id-for-orangepi-r1-plus-lts.patch drm-amdgpu-bump-version-for-rv-pco-compute-fix.patch drm-amdgpu-gfx9-manually-control-gfxoff-for-cs-on-rv.patch selftests-mm-build-with-o2.patch --- diff --git a/queue-6.12/arm64-dts-rockchip-change-eth-phy-mode-to-rgmii-id-for-orangepi-r1-plus-lts.patch b/queue-6.12/arm64-dts-rockchip-change-eth-phy-mode-to-rgmii-id-for-orangepi-r1-plus-lts.patch new file mode 100644 index 0000000000..b478fd2c9e --- /dev/null +++ b/queue-6.12/arm64-dts-rockchip-change-eth-phy-mode-to-rgmii-id-for-orangepi-r1-plus-lts.patch @@ -0,0 +1,41 @@ +From a6a7cba17c544fb95d5a29ab9d9ed4503029cb29 Mon Sep 17 00:00:00 2001 +From: Tianling Shen +Date: Sun, 19 Jan 2025 17:11:54 +0800 +Subject: arm64: dts: rockchip: change eth phy mode to rgmii-id for orangepi r1 plus lts + +From: Tianling Shen + +commit a6a7cba17c544fb95d5a29ab9d9ed4503029cb29 upstream. + +In general the delay should be added by the PHY instead of the MAC, +and this improves network stability on some boards which seem to +need different delay. + +Fixes: 387b3bbac5ea ("arm64: dts: rockchip: Add Xunlong OrangePi R1 Plus LTS") +Cc: stable@vger.kernel.org # 6.6+ +Signed-off-by: Tianling Shen +Link: https://lore.kernel.org/r/20250119091154.1110762-1-cnsztl@gmail.com +Signed-off-by: Heiko Stuebner +[Fix conflicts due to missing dtsi conversion] +Signed-off-by: Tianling Shen +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +--- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts +@@ -15,9 +15,11 @@ + }; + + &gmac2io { ++ /delete-property/ tx_delay; ++ /delete-property/ rx_delay; ++ + phy-handle = <&yt8531c>; +- tx_delay = <0x19>; +- rx_delay = <0x05>; ++ phy-mode = "rgmii-id"; + + mdio { + /delete-node/ ethernet-phy@1; diff --git a/queue-6.12/drm-amdgpu-bump-version-for-rv-pco-compute-fix.patch b/queue-6.12/drm-amdgpu-bump-version-for-rv-pco-compute-fix.patch new file mode 100644 index 0000000000..1d2a859db9 --- /dev/null +++ b/queue-6.12/drm-amdgpu-bump-version-for-rv-pco-compute-fix.patch @@ -0,0 +1,35 @@ +From 55ed2b1b50d029dd7e49a35f6628ca64db6d75d8 Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Fri, 31 Jan 2025 13:53:40 -0500 +Subject: drm/amdgpu: bump version for RV/PCO compute fix + +From: Alex Deucher + +commit 55ed2b1b50d029dd7e49a35f6628ca64db6d75d8 upstream. + +Bump the driver version for RV/PCO compute stability fix +so mesa can use this check to enable compute queues on +RV/PCO. + +Reviewed-by: Lijo Lazar +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org # 6.12.x +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c ++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +@@ -119,9 +119,10 @@ + * - 3.58.0 - Add GFX12 DCC support + * - 3.59.0 - Cleared VRAM + * - 3.60.0 - Add AMDGPU_TILING_GFX12_DCC_WRITE_COMPRESS_DISABLE (Vulkan requirement) ++ * - 3.61.0 - Contains fix for RV/PCO compute queues + */ + #define KMS_DRIVER_MAJOR 3 +-#define KMS_DRIVER_MINOR 60 ++#define KMS_DRIVER_MINOR 61 + #define KMS_DRIVER_PATCHLEVEL 0 + + /* diff --git a/queue-6.12/drm-amdgpu-gfx9-manually-control-gfxoff-for-cs-on-rv.patch b/queue-6.12/drm-amdgpu-gfx9-manually-control-gfxoff-for-cs-on-rv.patch new file mode 100644 index 0000000000..7d1ea45782 --- /dev/null +++ b/queue-6.12/drm-amdgpu-gfx9-manually-control-gfxoff-for-cs-on-rv.patch @@ -0,0 +1,86 @@ +From b35eb9128ebeec534eed1cefd6b9b1b7282cf5ba Mon Sep 17 00:00:00 2001 +From: Alex Deucher +Date: Tue, 28 Jan 2025 11:55:22 -0500 +Subject: drm/amdgpu/gfx9: manually control gfxoff for CS on RV +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Alex Deucher + +commit b35eb9128ebeec534eed1cefd6b9b1b7282cf5ba upstream. + +When mesa started using compute queues more often +we started seeing additional hangs with compute queues. +Disabling gfxoff seems to mitigate that. Manually +control gfxoff and gfx pg with command submissions to avoid +any issues related to gfxoff. KFD already does the same +thing for these chips. + +v2: limit to compute +v3: limit to APUs +v4: limit to Raven/PCO +v5: only update the compute ring_funcs +v6: Disable GFX PG +v7: adjust order + +Reviewed-by: Lijo Lazar +Suggested-by: Błażej Szczygieł +Suggested-by: Sergey Kovalenko +Link: https://gitlab.freedesktop.org/drm/amd/-/issues/3861 +Link: https://lists.freedesktop.org/archives/amd-gfx/2025-January/119116.html +Signed-off-by: Alex Deucher +Cc: stable@vger.kernel.org # 6.12.x +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 32 ++++++++++++++++++++++++++++++-- + 1 file changed, 30 insertions(+), 2 deletions(-) + +--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c ++++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +@@ -7415,6 +7415,34 @@ static void gfx_v9_0_ring_emit_cleaner_s + amdgpu_ring_write(ring, 0); /* RESERVED field, programmed to zero */ + } + ++static void gfx_v9_0_ring_begin_use_compute(struct amdgpu_ring *ring) ++{ ++ struct amdgpu_device *adev = ring->adev; ++ ++ amdgpu_gfx_enforce_isolation_ring_begin_use(ring); ++ ++ /* Raven and PCO APUs seem to have stability issues ++ * with compute and gfxoff and gfx pg. Disable gfx pg during ++ * submission and allow again afterwards. ++ */ ++ if (amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(9, 1, 0)) ++ gfx_v9_0_set_powergating_state(adev, AMD_PG_STATE_UNGATE); ++} ++ ++static void gfx_v9_0_ring_end_use_compute(struct amdgpu_ring *ring) ++{ ++ struct amdgpu_device *adev = ring->adev; ++ ++ /* Raven and PCO APUs seem to have stability issues ++ * with compute and gfxoff and gfx pg. Disable gfx pg during ++ * submission and allow again afterwards. ++ */ ++ if (amdgpu_ip_version(adev, GC_HWIP, 0) == IP_VERSION(9, 1, 0)) ++ gfx_v9_0_set_powergating_state(adev, AMD_PG_STATE_GATE); ++ ++ amdgpu_gfx_enforce_isolation_ring_end_use(ring); ++} ++ + static const struct amd_ip_funcs gfx_v9_0_ip_funcs = { + .name = "gfx_v9_0", + .early_init = gfx_v9_0_early_init, +@@ -7591,8 +7619,8 @@ static const struct amdgpu_ring_funcs gf + .emit_wave_limit = gfx_v9_0_emit_wave_limit, + .reset = gfx_v9_0_reset_kcq, + .emit_cleaner_shader = gfx_v9_0_ring_emit_cleaner_shader, +- .begin_use = amdgpu_gfx_enforce_isolation_ring_begin_use, +- .end_use = amdgpu_gfx_enforce_isolation_ring_end_use, ++ .begin_use = gfx_v9_0_ring_begin_use_compute, ++ .end_use = gfx_v9_0_ring_end_use_compute, + }; + + static const struct amdgpu_ring_funcs gfx_v9_0_ring_funcs_kiq = { diff --git a/queue-6.12/selftests-mm-build-with-o2.patch b/queue-6.12/selftests-mm-build-with-o2.patch new file mode 100644 index 0000000000..49077e37ca --- /dev/null +++ b/queue-6.12/selftests-mm-build-with-o2.patch @@ -0,0 +1,54 @@ +From 46036188ea1f5266df23a6149dea0df1c77cd1c7 Mon Sep 17 00:00:00 2001 +From: Kevin Brodsky +Date: Mon, 9 Dec 2024 09:50:10 +0000 +Subject: selftests/mm: build with -O2 + +From: Kevin Brodsky + +commit 46036188ea1f5266df23a6149dea0df1c77cd1c7 upstream. + +The mm kselftests are currently built with no optimisation (-O0). It's +unclear why, and besides being obviously suboptimal, this also prevents +the pkeys tests from working as intended. Let's build all the tests with +-O2. + +[kevin.brodsky@arm.com: silence unused-result warnings] + Link: https://lkml.kernel.org/r/20250107170110.2819685-1-kevin.brodsky@arm.com +Link: https://lkml.kernel.org/r/20241209095019.1732120-6-kevin.brodsky@arm.com +Signed-off-by: Kevin Brodsky +Cc: Aruna Ramakrishna +Cc: Catalin Marinas +Cc: Dave Hansen +Cc: Joey Gouly +Cc: Keith Lucas +Cc: Ryan Roberts +Cc: Shuah Khan +Signed-off-by: Andrew Morton +[ Yifei: This commit also fix the failure of pkey_sighandler_tests_64, + which is also in linux-6.12.y, thus backport this commit. ] +Signed-off-by: Yifei Liu +Signed-off-by: Greg Kroah-Hartman +--- + tools/testing/selftests/mm/Makefile | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +--- a/tools/testing/selftests/mm/Makefile ++++ b/tools/testing/selftests/mm/Makefile +@@ -33,9 +33,16 @@ endif + # LDLIBS. + MAKEFLAGS += --no-builtin-rules + +-CFLAGS = -Wall -I $(top_srcdir) $(EXTRA_CFLAGS) $(KHDR_INCLUDES) $(TOOLS_INCLUDES) ++CFLAGS = -Wall -O2 -I $(top_srcdir) $(EXTRA_CFLAGS) $(KHDR_INCLUDES) $(TOOLS_INCLUDES) + LDLIBS = -lrt -lpthread -lm + ++# Some distributions (such as Ubuntu) configure GCC so that _FORTIFY_SOURCE is ++# automatically enabled at -O1 or above. This triggers various unused-result ++# warnings where functions such as read() or write() are called and their ++# return value is not checked. Disable _FORTIFY_SOURCE to silence those ++# warnings. ++CFLAGS += -U_FORTIFY_SOURCE ++ + TEST_GEN_FILES = cow + TEST_GEN_FILES += compaction_test + TEST_GEN_FILES += gup_longterm diff --git a/queue-6.12/series b/queue-6.12/series index e09436ddaf..e8e72640e9 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -148,3 +148,7 @@ ftrace-do-not-add-duplicate-entries-in-subops-manager-ops.patch tracing-fix-using-ret-variable-in-tracing_set_tracer.patch net-pse-pd-fix-deadlock-in-current-limit-functions.patch sched_ext-fix-incorrect-assumption-about-migration-disabled-tasks-in-task_can_run_on_remote_rq.patch +selftests-mm-build-with-o2.patch +arm64-dts-rockchip-change-eth-phy-mode-to-rgmii-id-for-orangepi-r1-plus-lts.patch +drm-amdgpu-gfx9-manually-control-gfxoff-for-cs-on-rv.patch +drm-amdgpu-bump-version-for-rv-pco-compute-fix.patch