]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
6.6-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Nov 2025 00:40:30 +0000 (09:40 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 11 Nov 2025 00:40:30 +0000 (09:40 +0900)
added patches:
drm-amd-display-fix-black-screen-with-hdmi-outputs.patch
drm-amdgpu-fix-function-header-names-in-amdgpu_connectors.c.patch
extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch
riscv-stacktrace-fix-backtracing-through-exceptions.patch
selftests-netdevsim-set-test-timeout-to-10-minutes.patch

queue-6.6/drm-amd-display-fix-black-screen-with-hdmi-outputs.patch [new file with mode: 0644]
queue-6.6/drm-amdgpu-fix-function-header-names-in-amdgpu_connectors.c.patch [new file with mode: 0644]
queue-6.6/extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch [new file with mode: 0644]
queue-6.6/riscv-stacktrace-fix-backtracing-through-exceptions.patch [new file with mode: 0644]
queue-6.6/selftests-netdevsim-set-test-timeout-to-10-minutes.patch [new file with mode: 0644]
queue-6.6/series

diff --git a/queue-6.6/drm-amd-display-fix-black-screen-with-hdmi-outputs.patch b/queue-6.6/drm-amd-display-fix-black-screen-with-hdmi-outputs.patch
new file mode 100644 (file)
index 0000000..a27f9ed
--- /dev/null
@@ -0,0 +1,44 @@
+From fdc93beeadc2439e5e85d056a8fe681dcced09da Mon Sep 17 00:00:00 2001
+From: Alex Hung <alex.hung@amd.com>
+Date: Wed, 22 Oct 2025 16:19:34 -0600
+Subject: drm/amd/display: Fix black screen with HDMI outputs
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Alex Hung <alex.hung@amd.com>
+
+commit fdc93beeadc2439e5e85d056a8fe681dcced09da upstream.
+
+[Why & How]
+This fixes the black screen issue on certain APUs with HDMI,
+accompanied by the following messages:
+
+amdgpu 0000:c4:00.0: amdgpu: [drm] Failed to setup vendor info
+                     frame on connector DP-1: -22
+amdgpu 0000:c4:00.0: [drm] Cannot find any crtc or sizes [drm]
+                     Cannot find any crtc or sizes
+
+Fixes: 489f0f600ce2 ("drm/amd/display: Fix DVI-D/HDMI adapters")
+Suggested-by: Timur Kristóf <timur.kristof@gmail.com>
+Reviewed-by: Harry Wentland <harry.wentland@amd.com>
+Signed-off-by: Alex Hung <alex.hung@amd.com>
+Signed-off-by: Ray Wu <ray.wu@amd.com>
+Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+(cherry picked from commit 678c901443a6d2e909e3b51331a20f9d8f84ce82)
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/display/dc/link/link_detection.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/gpu/drm/amd/display/dc/link/link_detection.c
++++ b/drivers/gpu/drm/amd/display/dc/link/link_detection.c
+@@ -1114,6 +1114,7 @@ static bool detect_link_and_local_sink(s
+                   !sink->edid_caps.edid_hdmi)
+                       sink->sink_signal = SIGNAL_TYPE_DVI_SINGLE_LINK;
+               else if (dc_is_dvi_signal(sink->sink_signal) &&
++                       dc_is_dvi_signal(link->connector_signal) &&
+                        aud_support->hdmi_audio_native &&
+                        sink->edid_caps.edid_hdmi)
+                       sink->sink_signal = SIGNAL_TYPE_HDMI_TYPE_A;
diff --git a/queue-6.6/drm-amdgpu-fix-function-header-names-in-amdgpu_connectors.c.patch b/queue-6.6/drm-amdgpu-fix-function-header-names-in-amdgpu_connectors.c.patch
new file mode 100644 (file)
index 0000000..eada40a
--- /dev/null
@@ -0,0 +1,64 @@
+From 38ab33dbea594700c8d6cc81eec0a54e95d3eb2f Mon Sep 17 00:00:00 2001
+From: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
+Date: Sun, 31 Aug 2025 15:29:56 +0530
+Subject: drm/amdgpu: Fix function header names in amdgpu_connectors.c
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
+
+commit 38ab33dbea594700c8d6cc81eec0a54e95d3eb2f upstream.
+
+Align the function headers for `amdgpu_max_hdmi_pixel_clock` and
+`amdgpu_connector_dvi_mode_valid` with the function implementations so
+they match the expected kdoc style.
+
+Fixes the below:
+drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:1199: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst
+ * Returns the maximum supported HDMI (TMDS) pixel clock in KHz.
+drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c:1212: warning: This comment starts with '/**', but isn't a kernel-doc comment. Refer Documentation/doc-guide/kernel-doc.rst
+ * Validates the given display mode on DVI and HDMI connectors.
+
+Fixes: 585b2f685c56 ("drm/amdgpu: Respect max pixel clock for HDMI and DVI-D (v2)")
+Cc: Christian König <christian.koenig@amd.com>
+Cc: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Srinivasan Shanmugam <srinivasan.shanmugam@amd.com>
+Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c |   15 ++++++++++++---
+ 1 file changed, 12 insertions(+), 3 deletions(-)
+
+--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
++++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
+@@ -1206,7 +1206,10 @@ static void amdgpu_connector_dvi_force(s
+ }
+ /**
+- * Returns the maximum supported HDMI (TMDS) pixel clock in KHz.
++ * amdgpu_max_hdmi_pixel_clock - Return max supported HDMI (TMDS) pixel clock
++ * @adev: pointer to amdgpu_device
++ *
++ * Return: maximum supported HDMI (TMDS) pixel clock in KHz.
+  */
+ static int amdgpu_max_hdmi_pixel_clock(const struct amdgpu_device *adev)
+ {
+@@ -1219,8 +1222,14 @@ static int amdgpu_max_hdmi_pixel_clock(c
+ }
+ /**
+- * Validates the given display mode on DVI and HDMI connectors,
+- * including analog signals on DVI-I.
++ * amdgpu_connector_dvi_mode_valid - Validate a mode on DVI/HDMI connectors
++ * @connector: DRM connector to validate the mode on
++ * @mode: display mode to validate
++ *
++ * Validate the given display mode on DVI and HDMI connectors, including
++ * analog signals on DVI-I.
++ *
++ * Return: drm_mode_status indicating whether the mode is valid.
+  */
+ static enum drm_mode_status amdgpu_connector_dvi_mode_valid(struct drm_connector *connector,
+                                           struct drm_display_mode *mode)
diff --git a/queue-6.6/extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch b/queue-6.6/extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch
new file mode 100644 (file)
index 0000000..d5e0ea2
--- /dev/null
@@ -0,0 +1,36 @@
+From 92bac7d4de9c07933f6b76d8f1c7f8240f911f4f Mon Sep 17 00:00:00 2001
+From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+Date: Fri, 9 May 2025 09:17:04 +0200
+Subject: extcon: adc-jack: Cleanup wakeup source only if it was enabled
+
+From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+
+commit 92bac7d4de9c07933f6b76d8f1c7f8240f911f4f upstream.
+
+Driver in the probe enables wakeup source conditionally, so the cleanup
+path should do the same - do not release the wakeup source memory if it
+was not allocated.
+
+Link: https://lore.kernel.org/lkml/20250509071703.39442-2-krzysztof.kozlowski@linaro.org/
+Reported-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
+Closes: https://lore.kernel.org/r/22aaebb7-553b-4571-8a43-58a523241082@wanadoo.fr/
+Fixes: 78b6a991eb6c ("extcon: adc-jack: Fix wakeup source leaks on device unbind")
+Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
+Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/extcon/extcon-adc-jack.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/extcon/extcon-adc-jack.c
++++ b/drivers/extcon/extcon-adc-jack.c
+@@ -162,7 +162,8 @@ static int adc_jack_remove(struct platfo
+ {
+       struct adc_jack_data *data = platform_get_drvdata(pdev);
+-      device_init_wakeup(&pdev->dev, false);
++      if (data->wakeup_source)
++              device_init_wakeup(&pdev->dev, false);
+       free_irq(data->irq, data);
+       cancel_work_sync(&data->handler.work);
diff --git a/queue-6.6/riscv-stacktrace-fix-backtracing-through-exceptions.patch b/queue-6.6/riscv-stacktrace-fix-backtracing-through-exceptions.patch
new file mode 100644 (file)
index 0000000..8c87014
--- /dev/null
@@ -0,0 +1,64 @@
+From 51356ce60e5915a6bd812873186ed54e45c2699d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= <cleger@rivosinc.com>
+Date: Mon, 9 Dec 2024 16:57:12 +0100
+Subject: riscv: stacktrace: fix backtracing through exceptions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Clément Léger <cleger@rivosinc.com>
+
+commit 51356ce60e5915a6bd812873186ed54e45c2699d upstream.
+
+Prior to commit 5d5fc33ce58e ("riscv: Improve exception and system call
+latency"), backtrace through exception worked since ra was filled with
+ret_from_exception symbol address and the stacktrace code checked 'pc' to
+be equal to that symbol. Now that handle_exception uses regular 'call'
+instructions, this isn't working anymore and backtrace stops at
+handle_exception(). Since there are multiple call site to C code in the
+exception handling path, rather than checking multiple potential return
+addresses, add a new symbol at the end of exception handling and check pc
+to be in that range.
+
+Fixes: 5d5fc33ce58e ("riscv: Improve exception and system call latency")
+Signed-off-by: Clément Léger <cleger@rivosinc.com>
+Tested-by: Alexandre Ghiti <alexghiti@rivosinc.com>
+Reviewed-by: Alexandre Ghiti <alexghiti@rivosinc.com>
+Link: https://lore.kernel.org/r/20241209155714.1239665-1-cleger@rivosinc.com
+Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/riscv/kernel/entry.S      |    1 +
+ arch/riscv/kernel/stacktrace.c |    4 +++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+--- a/arch/riscv/kernel/entry.S
++++ b/arch/riscv/kernel/entry.S
+@@ -174,6 +174,7 @@ SYM_CODE_START_NOALIGN(ret_from_exceptio
+ #else
+       sret
+ #endif
++SYM_INNER_LABEL(ret_from_exception_end, SYM_L_GLOBAL)
+ SYM_CODE_END(ret_from_exception)
+ ASM_NOKPROBE(ret_from_exception)
+--- a/arch/riscv/kernel/stacktrace.c
++++ b/arch/riscv/kernel/stacktrace.c
+@@ -33,6 +33,7 @@
+ })
+ extern asmlinkage void handle_exception(void);
++extern unsigned long ret_from_exception_end;
+ static inline int fp_is_valid(unsigned long fp, unsigned long sp)
+ {
+@@ -88,7 +89,8 @@ void notrace walk_stackframe(struct task
+                       pc = READ_ONCE_TASK_STACK(task, frame->ra);
+                       pc = ftrace_graph_ret_addr(current, &graph_idx, pc,
+                                                  &frame->ra);
+-                      if (pc == (unsigned long)handle_exception) {
++                      if (pc >= (unsigned long)handle_exception &&
++                          pc < (unsigned long)&ret_from_exception_end) {
+                               if (unlikely(!__kernel_text_address(pc) || !fn(arg, pc)))
+                                       break;
diff --git a/queue-6.6/selftests-netdevsim-set-test-timeout-to-10-minutes.patch b/queue-6.6/selftests-netdevsim-set-test-timeout-to-10-minutes.patch
new file mode 100644 (file)
index 0000000..2a8166f
--- /dev/null
@@ -0,0 +1,32 @@
+From afbf75e8da8ce8a0698212953d350697bb4355a6 Mon Sep 17 00:00:00 2001
+From: Jakub Kicinski <kuba@kernel.org>
+Date: Mon, 25 Mar 2024 08:56:11 -0700
+Subject: selftests: netdevsim: set test timeout to 10 minutes
+
+From: Jakub Kicinski <kuba@kernel.org>
+
+commit afbf75e8da8ce8a0698212953d350697bb4355a6 upstream.
+
+The longest running netdevsim test, nexthop.sh, currently takes
+5 min to finish. Around 260s to be exact, and 310s on a debug kernel.
+The default timeout in selftest is 45sec, so we need an explicit
+config. Give ourselves some headroom and use 10min.
+
+Commit under Fixes isn't really to "blame" but prior to that
+netdevsim tests weren't integrated with kselftest infra
+so blaming the tests themselves doesn't seem right, either.
+
+Fixes: 8ff25dac88f6 ("netdevsim: add Makefile for selftests")
+Signed-off-by: Jakub Kicinski <kuba@kernel.org>
+Reviewed-by: Simon Horman <horms@kernel.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/testing/selftests/drivers/net/netdevsim/settings |    1 +
+ 1 file changed, 1 insertion(+)
+ create mode 100644 tools/testing/selftests/drivers/net/netdevsim/settings
+
+--- /dev/null
++++ b/tools/testing/selftests/drivers/net/netdevsim/settings
+@@ -0,0 +1 @@
++timeout=600
index 03065ed1f1799c4ed34bfe996d8ef3eea1ddeaae..5bf14e002816f0d2d69498c75d1b017567583c3a 100644 (file)
@@ -369,3 +369,8 @@ smb-client-fix-potential-uaf-in-smb2_close_cached_fid.patch
 virtio-net-fix-received-length-check-in-big-packets.patch
 lib-crypto-curve25519-hacl64-fix-older-clang-kasan-workaround-for-gcc.patch
 scsi-ufs-ufs-pci-fix-s0ix-s3-for-intel-controllers.patch
+extcon-adc-jack-cleanup-wakeup-source-only-if-it-was-enabled.patch
+drm-amdgpu-fix-function-header-names-in-amdgpu_connectors.c.patch
+drm-amd-display-fix-black-screen-with-hdmi-outputs.patch
+riscv-stacktrace-fix-backtracing-through-exceptions.patch
+selftests-netdevsim-set-test-timeout-to-10-minutes.patch