From: Greg Kroah-Hartman Date: Sat, 16 Sep 2023 11:42:07 +0000 (+0200) Subject: 6.5-stable patches X-Git-Tag: v5.10.195~50 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a660a5154103f3d740c8ea65155cfdcac1b6c93;p=thirdparty%2Fkernel%2Fstable-queue.git 6.5-stable patches added patches: drm-amd-display-temporary-disable-mst-dp-colorspace-property.patch linux-export-fix-reference-to-exported-functions-for-parisc64.patch watchdog-advantech_ec_wdt-fix-kconfig-dependencies.patch --- diff --git a/queue-6.5/drm-amd-display-temporary-disable-mst-dp-colorspace-property.patch b/queue-6.5/drm-amd-display-temporary-disable-mst-dp-colorspace-property.patch new file mode 100644 index 00000000000..a9341e518db --- /dev/null +++ b/queue-6.5/drm-amd-display-temporary-disable-mst-dp-colorspace-property.patch @@ -0,0 +1,40 @@ +From 69a959610229ec31b534eaa5f6ec75965f321bed Mon Sep 17 00:00:00 2001 +From: Fangzhi Zuo +Date: Thu, 20 Jul 2023 12:04:39 -0400 +Subject: drm/amd/display: Temporary Disable MST DP Colorspace Property + +From: Fangzhi Zuo + +commit 69a959610229ec31b534eaa5f6ec75965f321bed upstream. + +Create MST colorsapce property for downstream device would trigger +warning message "RIP: 0010:drm_mode_object_add+0x8e/0xa0 [drm]" + +After driver is loaded and drm device is registered, create +dp colorspace property triggers warning storm at +WARN_ON(!dev->driver->load && dev->registered && !obj_free_cb); + +Temporary disabling MST dp colorspace property for now. + +Reviewed-by: Aurabindo Pillai +Acked-by: Aurabindo Pillai +Signed-off-by: Fangzhi Zuo +Tested-by: Daniel Wheeler +Signed-off-by: Alex Deucher +Cc: Mario Limonciello +Signed-off-by: Greg Kroah-Hartman +--- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c ++++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +@@ -7295,7 +7295,7 @@ void amdgpu_dm_connector_init_helper(str + if (connector_type == DRM_MODE_CONNECTOR_HDMIA) { + if (!drm_mode_create_hdmi_colorspace_property(&aconnector->base, supported_colorspaces)) + drm_connector_attach_colorspace_property(&aconnector->base); +- } else if (connector_type == DRM_MODE_CONNECTOR_DisplayPort || ++ } else if ((connector_type == DRM_MODE_CONNECTOR_DisplayPort && !aconnector->mst_root) || + connector_type == DRM_MODE_CONNECTOR_eDP) { + if (!drm_mode_create_dp_colorspace_property(&aconnector->base, supported_colorspaces)) + drm_connector_attach_colorspace_property(&aconnector->base); diff --git a/queue-6.5/linux-export-fix-reference-to-exported-functions-for-parisc64.patch b/queue-6.5/linux-export-fix-reference-to-exported-functions-for-parisc64.patch new file mode 100644 index 00000000000..a6ce580a6cb --- /dev/null +++ b/queue-6.5/linux-export-fix-reference-to-exported-functions-for-parisc64.patch @@ -0,0 +1,61 @@ +From 08700ec705043eb0cee01b35cf5b9d63f0230d12 Mon Sep 17 00:00:00 2001 +From: Masahiro Yamada +Date: Wed, 6 Sep 2023 03:46:57 +0900 +Subject: linux/export: fix reference to exported functions for parisc64 + +From: Masahiro Yamada + +commit 08700ec705043eb0cee01b35cf5b9d63f0230d12 upstream. + +John David Anglin reported parisc has been broken since commit +ddb5cdbafaaa ("kbuild: generate KSYMTAB entries by modpost"). + +Like ia64, parisc64 uses a function descriptor. The function +references must be prefixed with P%. + +Also, symbols prefixed $$ from the library have the symbol type +STT_LOPROC instead of STT_FUNC. They should be handled as functions +too. + +Fixes: ddb5cdbafaaa ("kbuild: generate KSYMTAB entries by modpost") +Reported-by: John David Anglin +Tested-by: John David Anglin +Tested-by: Helge Deller +Closes: https://lore.kernel.org/linux-parisc/1901598a-e11d-f7dd-a5d9-9a69d06e6b6e@bell.net/T/#u +Signed-off-by: Masahiro Yamada +Signed-off-by: Helge Deller +Signed-off-by: Greg Kroah-Hartman +--- + include/linux/export-internal.h | 2 ++ + scripts/mod/modpost.c | 9 +++++++++ + 2 files changed, 11 insertions(+) + +--- a/include/linux/export-internal.h ++++ b/include/linux/export-internal.h +@@ -52,6 +52,8 @@ + + #ifdef CONFIG_IA64 + #define KSYM_FUNC(name) @fptr(name) ++#elif defined(CONFIG_PARISC) && defined(CONFIG_64BIT) ++#define KSYM_FUNC(name) P%name + #else + #define KSYM_FUNC(name) name + #endif +--- a/scripts/mod/modpost.c ++++ b/scripts/mod/modpost.c +@@ -1226,6 +1226,15 @@ static void check_export_symbol(struct m + */ + s->is_func = (ELF_ST_TYPE(sym->st_info) == STT_FUNC); + ++ /* ++ * For parisc64, symbols prefixed $$ from the library have the symbol type ++ * STT_LOPROC. They should be handled as functions too. ++ */ ++ if (elf->hdr->e_ident[EI_CLASS] == ELFCLASS64 && ++ elf->hdr->e_machine == EM_PARISC && ++ ELF_ST_TYPE(sym->st_info) == STT_LOPROC) ++ s->is_func = true; ++ + if (match(secname, PATTERNS(INIT_SECTIONS))) + warn("%s: %s: EXPORT_SYMBOL used for init symbol. Remove __init or EXPORT_SYMBOL.\n", + mod->name, name); diff --git a/queue-6.5/series b/queue-6.5/series index f2472c968bd..cbe9c3d1ca1 100644 --- a/queue-6.5/series +++ b/queue-6.5/series @@ -173,3 +173,6 @@ net-hns3-remove-gso-partial-feature-bit.patch net-enetc-distinguish-error-from-valid-pointers-in-e.patch sh-boards-fix-ceu-buffer-size-passed-to-dma_declare_.patch sh-push-switch-reorder-cleanup-operations-to-avoid-u.patch +linux-export-fix-reference-to-exported-functions-for-parisc64.patch +watchdog-advantech_ec_wdt-fix-kconfig-dependencies.patch +drm-amd-display-temporary-disable-mst-dp-colorspace-property.patch diff --git a/queue-6.5/watchdog-advantech_ec_wdt-fix-kconfig-dependencies.patch b/queue-6.5/watchdog-advantech_ec_wdt-fix-kconfig-dependencies.patch new file mode 100644 index 00000000000..d56f8d05188 --- /dev/null +++ b/queue-6.5/watchdog-advantech_ec_wdt-fix-kconfig-dependencies.patch @@ -0,0 +1,35 @@ +From 6eb28a38f6478a650c7e76b2d6910669615d8a62 Mon Sep 17 00:00:00 2001 +From: Florent CARLI +Date: Fri, 21 Jul 2023 10:13:47 +0200 +Subject: watchdog: advantech_ec_wdt: fix Kconfig dependencies + +From: Florent CARLI + +commit 6eb28a38f6478a650c7e76b2d6910669615d8a62 upstream. + +This driver uses the WATCHDOG_CORE framework and ISA_BUS_API. +This commit has these dependencies correctly selected. + +Signed-off-by: Florent CARLI +Co-authored-by: Yoann Congal +Reviewed-by: Guenter Roeck +Link: https://lore.kernel.org/r/20230721081347.52069-1-fcarli@gmail.com +Signed-off-by: Guenter Roeck +Signed-off-by: Wim Van Sebroeck +Cc: Yoann Congal +Signed-off-by: Greg Kroah-Hartman +--- + drivers/watchdog/Kconfig | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/watchdog/Kconfig ++++ b/drivers/watchdog/Kconfig +@@ -1075,6 +1075,8 @@ config ADVANTECH_WDT + config ADVANTECH_EC_WDT + tristate "Advantech Embedded Controller Watchdog Timer" + depends on X86 ++ select ISA_BUS_API ++ select WATCHDOG_CORE + help + This driver supports Advantech products with ITE based Embedded Controller. + It does not support Advantech products with other ECs or without EC.