From: Greg Kroah-Hartman Date: Wed, 22 Nov 2023 19:45:52 +0000 (+0000) Subject: 5.4-stable patches X-Git-Tag: v4.14.331~115 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fdf7fe2293b5d09969b7bd828f830e97b7319ff6;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: clk-qcom-ipq8074-drop-the-clk_set_rate_parent-flag-from-pll-clocks.patch mmc-vub300-fix-an-error-code.patch parisc-pdc-add-width-field-to-struct-pdc_model.patch parisc-power-add-power-soft-off-when-running-on-qemu.patch --- diff --git a/queue-5.4/clk-qcom-ipq8074-drop-the-clk_set_rate_parent-flag-from-pll-clocks.patch b/queue-5.4/clk-qcom-ipq8074-drop-the-clk_set_rate_parent-flag-from-pll-clocks.patch new file mode 100644 index 00000000000..d32cedc95b1 --- /dev/null +++ b/queue-5.4/clk-qcom-ipq8074-drop-the-clk_set_rate_parent-flag-from-pll-clocks.patch @@ -0,0 +1,77 @@ +From e641a070137dd959932c7c222e000d9d941167a2 Mon Sep 17 00:00:00 2001 +From: Kathiravan Thirumoorthy +Date: Thu, 14 Sep 2023 12:29:51 +0530 +Subject: clk: qcom: ipq8074: drop the CLK_SET_RATE_PARENT flag from PLL clocks +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Kathiravan Thirumoorthy + +commit e641a070137dd959932c7c222e000d9d941167a2 upstream. + +GPLL, NSS crypto PLL clock rates are fixed and shouldn't be scaled based +on the request from dependent clocks. Doing so will result in the +unexpected behaviour. So drop the CLK_SET_RATE_PARENT flag from the PLL +clocks. + +Cc: stable@vger.kernel.org +Fixes: b8e7e519625f ("clk: qcom: ipq8074: add remaining PLL’s") +Signed-off-by: Kathiravan Thirumoorthy +Link: https://lore.kernel.org/r/20230913-gpll_cleanup-v2-1-c8ceb1a37680@quicinc.com +Signed-off-by: Bjorn Andersson +Signed-off-by: Greg Kroah-Hartman +--- + drivers/clk/qcom/gcc-ipq8074.c | 6 ------ + 1 file changed, 6 deletions(-) + +--- a/drivers/clk/qcom/gcc-ipq8074.c ++++ b/drivers/clk/qcom/gcc-ipq8074.c +@@ -423,7 +423,6 @@ static struct clk_fixed_factor gpll0_out + }, + .num_parents = 1, + .ops = &clk_fixed_factor_ops, +- .flags = CLK_SET_RATE_PARENT, + }, + }; + +@@ -470,7 +469,6 @@ static struct clk_alpha_pll_postdiv gpll + }, + .num_parents = 1, + .ops = &clk_alpha_pll_postdiv_ro_ops, +- .flags = CLK_SET_RATE_PARENT, + }, + }; + +@@ -503,7 +501,6 @@ static struct clk_alpha_pll_postdiv gpll + }, + .num_parents = 1, + .ops = &clk_alpha_pll_postdiv_ro_ops, +- .flags = CLK_SET_RATE_PARENT, + }, + }; + +@@ -537,7 +534,6 @@ static struct clk_alpha_pll_postdiv gpll + }, + .num_parents = 1, + .ops = &clk_alpha_pll_postdiv_ro_ops, +- .flags = CLK_SET_RATE_PARENT, + }, + }; + +@@ -551,7 +547,6 @@ static struct clk_fixed_factor gpll6_out + }, + .num_parents = 1, + .ops = &clk_fixed_factor_ops, +- .flags = CLK_SET_RATE_PARENT, + }, + }; + +@@ -616,7 +611,6 @@ static struct clk_alpha_pll_postdiv nss_ + }, + .num_parents = 1, + .ops = &clk_alpha_pll_postdiv_ro_ops, +- .flags = CLK_SET_RATE_PARENT, + }, + }; + diff --git a/queue-5.4/mmc-vub300-fix-an-error-code.patch b/queue-5.4/mmc-vub300-fix-an-error-code.patch new file mode 100644 index 00000000000..d84cd0d79ad --- /dev/null +++ b/queue-5.4/mmc-vub300-fix-an-error-code.patch @@ -0,0 +1,31 @@ +From b44f9da81783fda72632ef9b0d05ea3f3ca447a5 Mon Sep 17 00:00:00 2001 +From: Dan Carpenter +Date: Thu, 2 Nov 2023 10:51:06 +0300 +Subject: mmc: vub300: fix an error code + +From: Dan Carpenter + +commit b44f9da81783fda72632ef9b0d05ea3f3ca447a5 upstream. + +This error path should return -EINVAL instead of success. + +Fixes: 88095e7b473a ("mmc: Add new VUB300 USB-to-SD/SDIO/MMC driver") +Signed-off-by: Dan Carpenter +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/0769d30c-ad80-421b-bf5d-7d6f5d85604e@moroto.mountain +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mmc/host/vub300.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/mmc/host/vub300.c ++++ b/drivers/mmc/host/vub300.c +@@ -2318,6 +2318,7 @@ static int vub300_probe(struct usb_inter + vub300->read_only = + (0x0010 & vub300->system_port_status.port_flags) ? 1 : 0; + } else { ++ retval = -EINVAL; + goto error5; + } + usb_set_intfdata(interface, vub300); diff --git a/queue-5.4/parisc-pdc-add-width-field-to-struct-pdc_model.patch b/queue-5.4/parisc-pdc-add-width-field-to-struct-pdc_model.patch new file mode 100644 index 00000000000..f1f12324e5e --- /dev/null +++ b/queue-5.4/parisc-pdc-add-width-field-to-struct-pdc_model.patch @@ -0,0 +1,28 @@ +From 6240553b52c475d9fc9674de0521b77e692f3764 Mon Sep 17 00:00:00 2001 +From: Helge Deller +Date: Sun, 22 Oct 2023 11:48:11 +0200 +Subject: parisc/pdc: Add width field to struct pdc_model + +From: Helge Deller + +commit 6240553b52c475d9fc9674de0521b77e692f3764 upstream. + +PDC2.0 specifies the additional PSW-bit field. + +Signed-off-by: Helge Deller +Cc: stable@vger.kernel.org +Signed-off-by: Greg Kroah-Hartman +--- + arch/parisc/include/uapi/asm/pdc.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/arch/parisc/include/uapi/asm/pdc.h ++++ b/arch/parisc/include/uapi/asm/pdc.h +@@ -465,6 +465,7 @@ struct pdc_model { /* for PDC_MODEL */ + unsigned long arch_rev; + unsigned long pot_key; + unsigned long curr_key; ++ unsigned long width; /* default of PSW_W bit (1=enabled) */ + }; + + struct pdc_cache_cf { /* for PDC_CACHE (I/D-caches) */ diff --git a/queue-5.4/parisc-power-add-power-soft-off-when-running-on-qemu.patch b/queue-5.4/parisc-power-add-power-soft-off-when-running-on-qemu.patch new file mode 100644 index 00000000000..db7d7ecb7e9 --- /dev/null +++ b/queue-5.4/parisc-power-add-power-soft-off-when-running-on-qemu.patch @@ -0,0 +1,48 @@ +From d0c219472980d15f5cbc5c8aec736848bda3f235 Mon Sep 17 00:00:00 2001 +From: Helge Deller +Date: Tue, 17 Oct 2023 22:19:53 +0200 +Subject: parisc/power: Add power soft-off when running on qemu + +From: Helge Deller + +commit d0c219472980d15f5cbc5c8aec736848bda3f235 upstream. + +Signed-off-by: Helge Deller +Cc: stable@vger.kernel.org # v6.0+ +Signed-off-by: Greg Kroah-Hartman +--- + drivers/parisc/power.c | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) + +--- a/drivers/parisc/power.c ++++ b/drivers/parisc/power.c +@@ -192,6 +192,14 @@ static struct notifier_block parisc_pani + .priority = INT_MAX, + }; + ++/* qemu soft power-off function */ ++static int qemu_power_off(struct sys_off_data *data) ++{ ++ /* this turns the system off via SeaBIOS */ ++ *(int *)data->cb_data = 0; ++ pdc_soft_power_button(1); ++ return NOTIFY_DONE; ++} + + static int __init power_init(void) + { +@@ -221,7 +229,13 @@ static int __init power_init(void) + soft_power_reg); + } + +- power_task = kthread_run(kpowerswd, (void*)soft_power_reg, KTHREAD_NAME); ++ power_task = NULL; ++ if (running_on_qemu && soft_power_reg) ++ register_sys_off_handler(SYS_OFF_MODE_POWER_OFF, SYS_OFF_PRIO_DEFAULT, ++ qemu_power_off, (void *)soft_power_reg); ++ else ++ power_task = kthread_run(kpowerswd, (void*)soft_power_reg, ++ KTHREAD_NAME); + if (IS_ERR(power_task)) { + printk(KERN_ERR DRIVER_NAME ": thread creation failed. Driver not loaded.\n"); + pdc_soft_power_button(0); diff --git a/queue-5.4/series b/queue-5.4/series index cf733c51bdb..21ee3c2dccd 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -80,3 +80,7 @@ mmc-meson-gx-remove-setting-of-cmd_cfg_error.patch genirq-generic_chip-make-irq_remove_generic_chip-irqdomain-aware.patch pci-keystone-don-t-discard-.remove-callback.patch pci-keystone-don-t-discard-.probe-callback.patch +parisc-pdc-add-width-field-to-struct-pdc_model.patch +parisc-power-add-power-soft-off-when-running-on-qemu.patch +clk-qcom-ipq8074-drop-the-clk_set_rate_parent-flag-from-pll-clocks.patch +mmc-vub300-fix-an-error-code.patch