4.14-stable patches

added patches:
	mmc-vub300-fix-an-error-code.patch
	parisc-power-add-power-soft-off-when-running-on-qemu.patch

diff --git a/queue-4.14/mmc-vub300-fix-an-error-code.patch b/queue-4.14/mmc-vub300-fix-an-error-code.patch
new file mode 100644 (file)
index 0000000..1d0a90a
--- /dev/null
+++ b/queue-4.14/mmc-vub300-fix-an-error-code.patch
@@ -0,0 +1,31 @@
+From b44f9da81783fda72632ef9b0d05ea3f3ca447a5 Mon Sep 17 00:00:00 2001
+From: Dan Carpenter <dan.carpenter@linaro.org>
+Date: Thu, 2 Nov 2023 10:51:06 +0300
+Subject: mmc: vub300: fix an error code
+
+From: Dan Carpenter <dan.carpenter@linaro.org>
+
+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 <dan.carpenter@linaro.org>
+Cc: stable@vger.kernel.org
+Link: https://lore.kernel.org/r/0769d30c-ad80-421b-bf5d-7d6f5d85604e@moroto.mountain
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/mmc/host/vub300.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/mmc/host/vub300.c
++++ b/drivers/mmc/host/vub300.c
+@@ -2321,6 +2321,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-4.14/parisc-power-add-power-soft-off-when-running-on-qemu.patch b/queue-4.14/parisc-power-add-power-soft-off-when-running-on-qemu.patch
new file mode 100644 (file)
index 0000000..3cc8ec0
--- /dev/null
+++ b/queue-4.14/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 <deller@gmx.de>
+Date: Tue, 17 Oct 2023 22:19:53 +0200
+Subject: parisc/power: Add power soft-off when running on qemu
+
+From: Helge Deller <deller@gmx.de>
+
+commit d0c219472980d15f5cbc5c8aec736848bda3f235 upstream.
+
+Signed-off-by: Helge Deller <deller@gmx.de>
+Cc: stable@vger.kernel.org # v6.0+
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/parisc/power.c |   16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+--- a/drivers/parisc/power.c
++++ b/drivers/parisc/power.c
+@@ -193,6 +193,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)
+ {
+@@ -222,7 +230,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-4.14/series b/queue-4.14/series
index 4785485dcb70951258aaf5ef25619c9c9afd3c6b..c763bc55f23fa1f1a65eeb07e59ef6c57d4bc0c7 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -31,5 +31,7 @@ audit-don-t-take-task_lock-in-audit_exe_compare-code-path.patch
 audit-don-t-warn_on_once-current-mm-in-audit_exe_compare.patch
 hvc-xen-fix-error-path-in-xen_hvc_init-to-always-register-frontend-driver.patch
 pci-sysfs-protect-driver-s-d3cold-preference-from-user-space.patch
+parisc-power-add-power-soft-off-when-running-on-qemu.patch
+mmc-vub300-fix-an-error-code.patch
 mmc-meson-gx-remove-setting-of-cmd_cfg_error.patch
 genirq-generic_chip-make-irq_remove_generic_chip-irqdomain-aware.patch