From: Greg Kroah-Hartman Date: Mon, 30 Dec 2024 14:55:51 +0000 (+0100) Subject: 6.12-stable patches X-Git-Tag: v6.1.123~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6f55b1e2c97f5b60ef63541806d27cd71fce7ca7;p=thirdparty%2Fkernel%2Fstable-queue.git 6.12-stable patches added patches: alsa-sh-fix-wrong-argument-order-for-copy_from_iter.patch alsa-ump-shut-up-truncated-string-warning.patch --- diff --git a/queue-6.12/alsa-sh-fix-wrong-argument-order-for-copy_from_iter.patch b/queue-6.12/alsa-sh-fix-wrong-argument-order-for-copy_from_iter.patch new file mode 100644 index 00000000000..00f30c26c2f --- /dev/null +++ b/queue-6.12/alsa-sh-fix-wrong-argument-order-for-copy_from_iter.patch @@ -0,0 +1,34 @@ +From 66a0a2b0473c39ae85c44628d14e4366fdc0aa0d Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Fri, 20 Dec 2024 12:44:16 +0100 +Subject: ALSA: sh: Fix wrong argument order for copy_from_iter() + +From: Takashi Iwai + +commit 66a0a2b0473c39ae85c44628d14e4366fdc0aa0d upstream. + +Fix a brown paper bag bug I introduced at converting to the standard +iter helper; the arguments were wrongly passed and have to be +swapped. + +Fixes: 9b5f8ee43e48 ("ALSA: sh: Use standard helper for buffer accesses") +Reported-by: kernel test robot +Closes: https://lore.kernel.org/oe-kbuild-all/202412140019.jat5Dofr-lkp@intel.com/ +Link: https://patch.msgid.link/20241220114417.5898-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/sh/sh_dac_audio.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/sh/sh_dac_audio.c ++++ b/sound/sh/sh_dac_audio.c +@@ -163,7 +163,7 @@ static int snd_sh_dac_pcm_copy(struct sn + /* channel is not used (interleaved data) */ + struct snd_sh_dac *chip = snd_pcm_substream_chip(substream); + +- if (copy_from_iter(chip->data_buffer + pos, src, count) != count) ++ if (copy_from_iter(chip->data_buffer + pos, count, src) != count) + return -EFAULT; + chip->buffer_end = chip->data_buffer + pos + count; + diff --git a/queue-6.12/alsa-ump-shut-up-truncated-string-warning.patch b/queue-6.12/alsa-ump-shut-up-truncated-string-warning.patch new file mode 100644 index 00000000000..053c238e125 --- /dev/null +++ b/queue-6.12/alsa-ump-shut-up-truncated-string-warning.patch @@ -0,0 +1,39 @@ +From ed990c07af70d286f5736021c6e25d8df6f2f7b0 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Sat, 30 Nov 2024 10:00:08 +0100 +Subject: ALSA: ump: Shut up truncated string warning + +From: Takashi Iwai + +commit ed990c07af70d286f5736021c6e25d8df6f2f7b0 upstream. + +The recent change for the legacy substream name update brought a +compile warning for some compilers due to the nature of snprintf(). +Use scnprintf() to shut up the warning since the truncation is +intentional. + +Fixes: e29e504e7890 ("ALSA: ump: Indicate the inactive group in legacy substream names") +Reported-by: kernel test robot +Closes: https://lore.kernel.org/oe-kbuild-all/202411300103.FrGuTAYp-lkp@intel.com/ +Link: https://patch.msgid.link/20241130090009.19849-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/core/ump.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +--- a/sound/core/ump.c ++++ b/sound/core/ump.c +@@ -1262,9 +1262,9 @@ static void fill_substream_names(struct + name = ump->groups[idx].name; + if (!*name) + name = ump->info.name; +- snprintf(s->name, sizeof(s->name), "Group %d (%.16s)%s", +- idx + 1, name, +- ump->groups[idx].active ? "" : " [Inactive]"); ++ scnprintf(s->name, sizeof(s->name), "Group %d (%.16s)%s", ++ idx + 1, name, ++ ump->groups[idx].active ? "" : " [Inactive]"); + } + } + diff --git a/queue-6.12/series b/queue-6.12/series index 4d043db5dad..8b654472a5e 100644 --- a/queue-6.12/series +++ b/queue-6.12/series @@ -47,7 +47,6 @@ watchdog-it87_wdt-add-pwrgd-enable-quirk-for-qotom-q.patch watchdog-rzg2l_wdt-power-on-the-watchdog-domain-in-t.patch revert-watchdog-s3c2410_wdt-use-exynos_get_pmu_regma.patch watchdog-mediatek-add-support-for-mt6735-toprgu-wdt.patch -watchdog-s3c2410_wdt-add-support-for-exynosautov920-.patch scsi-qla1280-fix-hw-revision-numbering-for-isp1020-1.patch scsi-megaraid_sas-fix-for-a-potential-deadlock.patch udf-skip-parent-dir-link-count-update-if-corrupted.patch @@ -111,3 +110,5 @@ bluetooth-btusb-mediatek-move-bluetooth-power-off-command-position.patch bluetooth-btusb-mediatek-add-callback-function-in-btusb_disconnect.patch bluetooth-btusb-mediatek-add-intf-release-flow-when-usb-disconnect.patch bluetooth-btusb-mediatek-change-the-conditions-for-iso-interface.patch +alsa-ump-shut-up-truncated-string-warning.patch +alsa-sh-fix-wrong-argument-order-for-copy_from_iter.patch diff --git a/queue-6.12/watchdog-s3c2410_wdt-add-support-for-exynosautov920-.patch b/queue-6.12/watchdog-s3c2410_wdt-add-support-for-exynosautov920-.patch deleted file mode 100644 index 3e376485f6f..00000000000 --- a/queue-6.12/watchdog-s3c2410_wdt-add-support-for-exynosautov920-.patch +++ /dev/null @@ -1,105 +0,0 @@ -From b4a1ba400db8ba3c210bc37b0f5838dc89535b68 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 21 Oct 2024 15:39:02 +0900 -Subject: watchdog: s3c2410_wdt: add support for exynosautov920 SoC - -From: Byoungtae Cho - -[ Upstream commit a5cb13980e00e9c4fbc382d68eda250ab6a14d7c ] - -Adds the compatibles and drvdata for the ExynosAuto V920 SoC. This SoC -is almost similar to ExynosAutoV9, but some CPU configurations are quite -different, so it should be added. Plus it also support DBGACK like as -GS101 SoC. - -Signed-off-by: Byoungtae Cho -Signed-off-by: Taewan Kim -Reviewed-by: Krzysztof Kozlowski -Reviewed-by: Guenter Roeck -Link: https://lore.kernel.org/r/20241021063903.793166-3-trunixs.kim@samsung.com -Signed-off-by: Guenter Roeck -Signed-off-by: Wim Van Sebroeck -Signed-off-by: Sasha Levin ---- - drivers/watchdog/s3c2410_wdt.c | 37 +++++++++++++++++++++++++++++++++- - 1 file changed, 36 insertions(+), 1 deletion(-) - -diff --git a/drivers/watchdog/s3c2410_wdt.c b/drivers/watchdog/s3c2410_wdt.c -index 349d30462c8c..30450e99e5e9 100644 ---- a/drivers/watchdog/s3c2410_wdt.c -+++ b/drivers/watchdog/s3c2410_wdt.c -@@ -63,6 +63,10 @@ - #define EXYNOS850_CLUSTER1_NONCPU_INT_EN 0x1644 - #define EXYNOSAUTOV9_CLUSTER1_NONCPU_OUT 0x1520 - #define EXYNOSAUTOV9_CLUSTER1_NONCPU_INT_EN 0x1544 -+#define EXYNOSAUTOV920_CLUSTER0_NONCPU_OUT 0x1420 -+#define EXYNOSAUTOV920_CLUSTER0_NONCPU_INT_EN 0x1444 -+#define EXYNOSAUTOV920_CLUSTER1_NONCPU_OUT 0x1720 -+#define EXYNOSAUTOV920_CLUSTER1_NONCPU_INT_EN 0x1744 - - #define EXYNOS850_CLUSTER0_WDTRESET_BIT 24 - #define EXYNOS850_CLUSTER1_WDTRESET_BIT 23 -@@ -303,6 +307,32 @@ static const struct s3c2410_wdt_variant drv_data_gs101_cl1 = { - QUIRK_HAS_DBGACK_BIT, - }; - -+static const struct s3c2410_wdt_variant drv_data_exynosautov920_cl0 = { -+ .mask_reset_reg = EXYNOSAUTOV920_CLUSTER0_NONCPU_INT_EN, -+ .mask_bit = 2, -+ .mask_reset_inv = true, -+ .rst_stat_reg = EXYNOS5_RST_STAT_REG_OFFSET, -+ .rst_stat_bit = EXYNOSAUTOV9_CLUSTER0_WDTRESET_BIT, -+ .cnt_en_reg = EXYNOSAUTOV920_CLUSTER0_NONCPU_OUT, -+ .cnt_en_bit = 7, -+ .quirks = QUIRK_HAS_WTCLRINT_REG | QUIRK_HAS_PMU_MASK_RESET | -+ QUIRK_HAS_PMU_RST_STAT | QUIRK_HAS_PMU_CNT_EN | -+ QUIRK_HAS_DBGACK_BIT, -+}; -+ -+static const struct s3c2410_wdt_variant drv_data_exynosautov920_cl1 = { -+ .mask_reset_reg = EXYNOSAUTOV920_CLUSTER1_NONCPU_INT_EN, -+ .mask_bit = 2, -+ .mask_reset_inv = true, -+ .rst_stat_reg = EXYNOS5_RST_STAT_REG_OFFSET, -+ .rst_stat_bit = EXYNOSAUTOV9_CLUSTER1_WDTRESET_BIT, -+ .cnt_en_reg = EXYNOSAUTOV920_CLUSTER1_NONCPU_OUT, -+ .cnt_en_bit = 7, -+ .quirks = QUIRK_HAS_WTCLRINT_REG | QUIRK_HAS_PMU_MASK_RESET | -+ QUIRK_HAS_PMU_RST_STAT | QUIRK_HAS_PMU_CNT_EN | -+ QUIRK_HAS_DBGACK_BIT, -+}; -+ - static const struct of_device_id s3c2410_wdt_match[] = { - { .compatible = "google,gs101-wdt", - .data = &drv_data_gs101_cl0 }, -@@ -320,6 +350,8 @@ static const struct of_device_id s3c2410_wdt_match[] = { - .data = &drv_data_exynos850_cl0 }, - { .compatible = "samsung,exynosautov9-wdt", - .data = &drv_data_exynosautov9_cl0 }, -+ { .compatible = "samsung,exynosautov920-wdt", -+ .data = &drv_data_exynosautov920_cl0 }, - {}, - }; - MODULE_DEVICE_TABLE(of, s3c2410_wdt_match); -@@ -643,7 +675,8 @@ s3c2410_get_wdt_drv_data(struct platform_device *pdev, struct s3c2410_wdt *wdt) - /* Choose Exynos850/ExynosAutov9 driver data w.r.t. cluster index */ - if (variant == &drv_data_exynos850_cl0 || - variant == &drv_data_exynosautov9_cl0 || -- variant == &drv_data_gs101_cl0) { -+ variant == &drv_data_gs101_cl0 || -+ variant == &drv_data_exynosautov920_cl0) { - u32 index; - int err; - -@@ -662,6 +695,8 @@ s3c2410_get_wdt_drv_data(struct platform_device *pdev, struct s3c2410_wdt *wdt) - variant = &drv_data_exynosautov9_cl1; - else if (variant == &drv_data_gs101_cl0) - variant = &drv_data_gs101_cl1; -+ else if (variant == &drv_data_exynosautov920_cl0) -+ variant = &drv_data_exynosautov920_cl1; - break; - default: - return dev_err_probe(dev, -EINVAL, "wrong cluster index: %u\n", index); --- -2.39.5 -