From: Greg Kroah-Hartman Date: Sat, 9 Sep 2023 12:56:13 +0000 (+0100) Subject: 5.4-stable patches X-Git-Tag: v6.1.53~88 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abbdbc75b3471b70138f227296859ef1b6e5a2b5;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: backlight-bd6107-compare-against-struct-fb_info.device.patch backlight-gpio_backlight-compare-against-struct-fb_info.device.patch backlight-lv5207lp-compare-against-struct-fb_info.device.patch xtensa-pmu-fix-base-address-for-the-newer-hardware.patch --- diff --git a/queue-5.4/backlight-bd6107-compare-against-struct-fb_info.device.patch b/queue-5.4/backlight-bd6107-compare-against-struct-fb_info.device.patch new file mode 100644 index 00000000000..29c092d6e45 --- /dev/null +++ b/queue-5.4/backlight-bd6107-compare-against-struct-fb_info.device.patch @@ -0,0 +1,48 @@ +From 992bdddaabfba19bdc77c1c7a4977b2aa41ec891 Mon Sep 17 00:00:00 2001 +From: Thomas Zimmermann +Date: Tue, 13 Jun 2023 13:06:36 +0200 +Subject: backlight/bd6107: Compare against struct fb_info.device + +From: Thomas Zimmermann + +commit 992bdddaabfba19bdc77c1c7a4977b2aa41ec891 upstream. + +Struct bd6107_platform_data refers to a platform device within +the Linux device hierarchy. The test in bd6107_backlight_check_fb() +compares it against the fbdev device in struct fb_info.dev, which +is different. Fix the test by comparing to struct fb_info.device. + +Fixes a bug in the backlight driver and prepares fbdev for making +struct fb_info.dev optional. + +v2: + * move renames into separate patch (Javier, Sam, Michael) + +Fixes: 67b43e590415 ("backlight: Add ROHM BD6107 backlight driver") +Signed-off-by: Thomas Zimmermann +Cc: Laurent Pinchart +Cc: Lee Jones +Cc: Daniel Thompson +Cc: Jingoo Han +Cc: dri-devel@lists.freedesktop.org +Cc: # v3.12+ +Reviewed-by: Javier Martinez Canillas +Reviewed-by: Sam Ravnborg +Reviewed-by: Daniel Thompson +Link: https://patchwork.freedesktop.org/patch/msgid/20230613110953.24176-2-tzimmermann@suse.de +Signed-off-by: Greg Kroah-Hartman +--- + drivers/video/backlight/bd6107.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/video/backlight/bd6107.c ++++ b/drivers/video/backlight/bd6107.c +@@ -107,7 +107,7 @@ static int bd6107_backlight_check_fb(str + { + struct bd6107 *bd = bl_get_data(backlight); + +- return bd->pdata->fbdev == NULL || bd->pdata->fbdev == info->dev; ++ return bd->pdata->fbdev == NULL || bd->pdata->fbdev == info->device; + } + + static const struct backlight_ops bd6107_backlight_ops = { diff --git a/queue-5.4/backlight-gpio_backlight-compare-against-struct-fb_info.device.patch b/queue-5.4/backlight-gpio_backlight-compare-against-struct-fb_info.device.patch new file mode 100644 index 00000000000..30d6888ce95 --- /dev/null +++ b/queue-5.4/backlight-gpio_backlight-compare-against-struct-fb_info.device.patch @@ -0,0 +1,50 @@ +From 7b91d017f77c1bda56f27c2f4bbb70de7c6eca08 Mon Sep 17 00:00:00 2001 +From: Thomas Zimmermann +Date: Tue, 13 Jun 2023 13:06:38 +0200 +Subject: backlight/gpio_backlight: Compare against struct fb_info.device + +From: Thomas Zimmermann + +commit 7b91d017f77c1bda56f27c2f4bbb70de7c6eca08 upstream. + +Struct gpio_backlight_platform_data refers to a platform device within +the Linux device hierarchy. The test in gpio_backlight_check_fb() +compares it against the fbdev device in struct fb_info.dev, which +is different. Fix the test by comparing to struct fb_info.device. + +Fixes a bug in the backlight driver and prepares fbdev for making +struct fb_info.dev optional. + +v2: + * move renames into separate patch (Javier, Sam, Michael) + +Signed-off-by: Thomas Zimmermann +Fixes: 8b770e3c9824 ("backlight: Add GPIO-based backlight driver") +Cc: Laurent Pinchart +Cc: Rich Felker +Cc: John Paul Adrian Glaubitz +Cc: Lee Jones +Cc: Daniel Thompson +Cc: Jingoo Han +Cc: linux-sh@vger.kernel.org +Cc: dri-devel@lists.freedesktop.org +Cc: # v3.12+ +Reviewed-by: Sam Ravnborg +Reviewed-by: Daniel Thompson +Link: https://patchwork.freedesktop.org/patch/msgid/20230613110953.24176-4-tzimmermann@suse.de +Signed-off-by: Greg Kroah-Hartman +--- + drivers/video/backlight/gpio_backlight.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/video/backlight/gpio_backlight.c ++++ b/drivers/video/backlight/gpio_backlight.c +@@ -46,7 +46,7 @@ static int gpio_backlight_check_fb(struc + { + struct gpio_backlight *gbl = bl_get_data(bl); + +- return gbl->fbdev == NULL || gbl->fbdev == info->dev; ++ return gbl->fbdev == NULL || gbl->fbdev == info->device; + } + + static const struct backlight_ops gpio_backlight_ops = { diff --git a/queue-5.4/backlight-lv5207lp-compare-against-struct-fb_info.device.patch b/queue-5.4/backlight-lv5207lp-compare-against-struct-fb_info.device.patch new file mode 100644 index 00000000000..7761036b65f --- /dev/null +++ b/queue-5.4/backlight-lv5207lp-compare-against-struct-fb_info.device.patch @@ -0,0 +1,52 @@ +From 1ca8819320fd84e7d95b04e7668efc5f9fe9fa5c Mon Sep 17 00:00:00 2001 +From: Thomas Zimmermann +Date: Tue, 13 Jun 2023 13:06:40 +0200 +Subject: backlight/lv5207lp: Compare against struct fb_info.device + +From: Thomas Zimmermann + +commit 1ca8819320fd84e7d95b04e7668efc5f9fe9fa5c upstream. + +Struct lv5207lp_platform_data refers to a platform device within +the Linux device hierarchy. The test in lv5207lp_backlight_check_fb() +compares it against the fbdev device in struct fb_info.dev, which +is different. Fix the test by comparing to struct fb_info.device. + +Fixes a bug in the backlight driver and prepares fbdev for making +struct fb_info.dev optional. + +v2: + * move renames into separate patch (Javier, Sam, Michael) + +Fixes: 82e5c40d88f9 ("backlight: Add Sanyo LV5207LP backlight driver") +Signed-off-by: Thomas Zimmermann +Cc: Laurent Pinchart +Cc: Yoshinori Sato +Cc: Rich Felker +Cc: John Paul Adrian Glaubitz +Cc: Lee Jones +Cc: Daniel Thompson +Cc: Jingoo Han +Cc: linux-sh@vger.kernel.org +Cc: dri-devel@lists.freedesktop.org +Cc: # v3.12+ +Reviewed-by: Javier Martinez Canillas +Reviewed-by: Sam Ravnborg +Reviewed-by: Daniel Thompson +Link: https://patchwork.freedesktop.org/patch/msgid/20230613110953.24176-6-tzimmermann@suse.de +Signed-off-by: Greg Kroah-Hartman +--- + drivers/video/backlight/lv5207lp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/video/backlight/lv5207lp.c ++++ b/drivers/video/backlight/lv5207lp.c +@@ -72,7 +72,7 @@ static int lv5207lp_backlight_check_fb(s + { + struct lv5207lp *lv = bl_get_data(backlight); + +- return lv->pdata->fbdev == NULL || lv->pdata->fbdev == info->dev; ++ return lv->pdata->fbdev == NULL || lv->pdata->fbdev == info->device; + } + + static const struct backlight_ops lv5207lp_backlight_ops = { diff --git a/queue-5.4/series b/queue-5.4/series index 6cce693703c..0ddfe31931c 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -213,3 +213,7 @@ pm-devfreq-fix-leak-in-devfreq_dev_release.patch alsa-pcm-fix-missing-fixup-call-in-compat-hw_refine-ioctl.patch ipmi_si-fix-a-memleak-in-try_smi_init.patch arm-omap2-fix-warray-bounds-warning-in-_pwrdm_state_switch.patch +backlight-gpio_backlight-compare-against-struct-fb_info.device.patch +backlight-bd6107-compare-against-struct-fb_info.device.patch +backlight-lv5207lp-compare-against-struct-fb_info.device.patch +xtensa-pmu-fix-base-address-for-the-newer-hardware.patch diff --git a/queue-5.4/xtensa-pmu-fix-base-address-for-the-newer-hardware.patch b/queue-5.4/xtensa-pmu-fix-base-address-for-the-newer-hardware.patch new file mode 100644 index 00000000000..bfead129c49 --- /dev/null +++ b/queue-5.4/xtensa-pmu-fix-base-address-for-the-newer-hardware.patch @@ -0,0 +1,69 @@ +From 687eb3c42f4ad81e7c947c50e2d865f692064291 Mon Sep 17 00:00:00 2001 +From: Max Filippov +Date: Mon, 24 Jul 2023 00:58:24 -0700 +Subject: xtensa: PMU: fix base address for the newer hardware + +From: Max Filippov + +commit 687eb3c42f4ad81e7c947c50e2d865f692064291 upstream. + +With introduction of ERI access control in RG.0 base address of the PMU +unit registers has changed. Add support for the new PMU configuration. + +Cc: stable@vger.kernel.org +Signed-off-by: Max Filippov +Signed-off-by: Greg Kroah-Hartman +--- + arch/xtensa/include/asm/core.h | 9 +++++++++ + arch/xtensa/kernel/perf_event.c | 17 +++++++++++++---- + 2 files changed, 22 insertions(+), 4 deletions(-) + +--- a/arch/xtensa/include/asm/core.h ++++ b/arch/xtensa/include/asm/core.h +@@ -18,4 +18,13 @@ + #define XCHAL_SPANNING_WAY 0 + #endif + ++#ifndef XCHAL_HW_MIN_VERSION ++#if defined(XCHAL_HW_MIN_VERSION_MAJOR) && defined(XCHAL_HW_MIN_VERSION_MINOR) ++#define XCHAL_HW_MIN_VERSION (XCHAL_HW_MIN_VERSION_MAJOR * 100 + \ ++ XCHAL_HW_MIN_VERSION_MINOR) ++#else ++#define XCHAL_HW_MIN_VERSION 0 ++#endif ++#endif ++ + #endif +--- a/arch/xtensa/kernel/perf_event.c ++++ b/arch/xtensa/kernel/perf_event.c +@@ -13,17 +13,26 @@ + #include + #include + ++#include + #include + #include + ++#define XTENSA_HWVERSION_RG_2015_0 260000 ++ ++#if XCHAL_HW_MIN_VERSION >= XTENSA_HWVERSION_RG_2015_0 ++#define XTENSA_PMU_ERI_BASE 0x00101000 ++#else ++#define XTENSA_PMU_ERI_BASE 0x00001000 ++#endif ++ + /* Global control/status for all perf counters */ +-#define XTENSA_PMU_PMG 0x1000 ++#define XTENSA_PMU_PMG XTENSA_PMU_ERI_BASE + /* Perf counter values */ +-#define XTENSA_PMU_PM(i) (0x1080 + (i) * 4) ++#define XTENSA_PMU_PM(i) (XTENSA_PMU_ERI_BASE + 0x80 + (i) * 4) + /* Perf counter control registers */ +-#define XTENSA_PMU_PMCTRL(i) (0x1100 + (i) * 4) ++#define XTENSA_PMU_PMCTRL(i) (XTENSA_PMU_ERI_BASE + 0x100 + (i) * 4) + /* Perf counter status registers */ +-#define XTENSA_PMU_PMSTAT(i) (0x1180 + (i) * 4) ++#define XTENSA_PMU_PMSTAT(i) (XTENSA_PMU_ERI_BASE + 0x180 + (i) * 4) + + #define XTENSA_PMU_PMG_PMEN 0x1 +