From: Greg Kroah-Hartman Date: Mon, 28 Oct 2024 06:08:46 +0000 (+0100) Subject: 6.11-stable patches X-Git-Tag: v5.15.170~9 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b177c8fdb19f2a2784bc541e2d50c6bb1a5483fd;p=thirdparty%2Fkernel%2Fstable-queue.git 6.11-stable patches added patches: acpi-prm-clean-up-guid-type-in-struct-prm_handler_info.patch asoc-qcom-select-missing-common-soundwire-module-code-on-sdm845.patch --- diff --git a/queue-6.11/acpi-prm-clean-up-guid-type-in-struct-prm_handler_info.patch b/queue-6.11/acpi-prm-clean-up-guid-type-in-struct-prm_handler_info.patch new file mode 100644 index 00000000000..a69925d14c0 --- /dev/null +++ b/queue-6.11/acpi-prm-clean-up-guid-type-in-struct-prm_handler_info.patch @@ -0,0 +1,55 @@ +From 3d1c651272cf1df8aac7d9b6d92d836d27bed50f Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Thu, 24 Oct 2024 11:07:15 +0300 +Subject: ACPI: PRM: Clean up guid type in struct prm_handler_info + +From: Dan Carpenter + +commit 3d1c651272cf1df8aac7d9b6d92d836d27bed50f upstream. + +Clang 19 prints a warning when we pass &th->guid to efi_pa_va_lookup(): + +drivers/acpi/prmt.c:156:29: error: passing 1-byte aligned argument to +4-byte aligned parameter 1 of 'efi_pa_va_lookup' may result in an +unaligned pointer access [-Werror,-Walign-mismatch] + 156 | (void *)efi_pa_va_lookup(&th->guid, handler_info->handler_address); + | ^ + +The problem is that efi_pa_va_lookup() takes a efi_guid_t and &th->guid +is a regular guid_t. The difference between the two types is the +alignment. efi_guid_t is a typedef. + + typedef guid_t efi_guid_t __aligned(__alignof__(u32)); + +It's possible that this a bug in Clang 19. Even though the alignment of +&th->guid is not explicitly specified, it will still end up being aligned +at 4 or 8 bytes. + +Anyway, as Ard points out, it's cleaner to change guid to efi_guid_t type +and that also makes the warning go away. + +Fixes: 088984c8d54c ("ACPI: PRM: Find EFI_MEMORY_RUNTIME block for PRM handler and context") +Reported-by: Linux Kernel Functional Testing +Suggested-by: Ard Biesheuvel +Signed-off-by: Dan Carpenter +Tested-by: Paul E. McKenney +Acked-by: Ard Biesheuvel +Link: https://patch.msgid.link/3777d71b-9e19-45f4-be4e-17bf4fa7a834@stanley.mountain +[ rjw: Subject edit ] +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman +--- + drivers/acpi/prmt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/acpi/prmt.c ++++ b/drivers/acpi/prmt.c +@@ -52,7 +52,7 @@ struct prm_context_buffer { + static LIST_HEAD(prm_module_list); + + struct prm_handler_info { +- guid_t guid; ++ efi_guid_t guid; + efi_status_t (__efiapi *handler_addr)(u64, void *); + u64 static_data_buffer_addr; + u64 acpi_param_buffer_addr; diff --git a/queue-6.11/asoc-qcom-select-missing-common-soundwire-module-code-on-sdm845.patch b/queue-6.11/asoc-qcom-select-missing-common-soundwire-module-code-on-sdm845.patch new file mode 100644 index 00000000000..25d96befa86 --- /dev/null +++ b/queue-6.11/asoc-qcom-select-missing-common-soundwire-module-code-on-sdm845.patch @@ -0,0 +1,33 @@ +From b930d8647869802a0d430aae6b1b05c3acb24a41 Mon Sep 17 00:00:00 2001 +From: Krzysztof Kozlowski +Date: Sat, 12 Oct 2024 12:09:57 +0200 +Subject: ASoC: qcom: Select missing common Soundwire module code on SDM845 + +From: Krzysztof Kozlowski + +commit b930d8647869802a0d430aae6b1b05c3acb24a41 upstream. + +SDM845 sound card driver uses qcom_snd_sdw_startup() from the common +Soundwire module, so select it to fix build failures: + + ERROR: modpost: "qcom_snd_sdw_startup" [sound/soc/qcom/snd-soc-sdm845.ko] undefined! + +Fixes: d0e806b0cc62 ("ASoC: qcom: sdm845: add missing soundwire runtime stream alloc") +Signed-off-by: Krzysztof Kozlowski +Link: https://patch.msgid.link/20241012100957.129103-1-krzysztof.kozlowski@linaro.org +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + sound/soc/qcom/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +--- a/sound/soc/qcom/Kconfig ++++ b/sound/soc/qcom/Kconfig +@@ -157,6 +157,7 @@ config SND_SOC_SDM845 + depends on COMMON_CLK + select SND_SOC_QDSP6 + select SND_SOC_QCOM_COMMON ++ select SND_SOC_QCOM_SDW + select SND_SOC_RT5663 + select SND_SOC_MAX98927 + imply SND_SOC_CROS_EC_CODEC diff --git a/queue-6.11/series b/queue-6.11/series index 021a58207fd..4f548c495cf 100644 --- a/queue-6.11/series +++ b/queue-6.11/series @@ -257,3 +257,5 @@ x86-support-user-address-masking-instead-of-non-speculative-conditional.patch x86-fix-whitespace-in-runtime-const-assembler-output.patch x86-fix-user-address-masking-non-canonical-speculation-issue.patch platform-x86-dell-wmi-ignore-suspend-notifications.patch +acpi-prm-clean-up-guid-type-in-struct-prm_handler_info.patch +asoc-qcom-select-missing-common-soundwire-module-code-on-sdm845.patch