4.4-stable patches

added patches:
	virtio-virtio_console-add-missing-module_device_table-for-rproc-serial.patch

diff --git a/queue-4.4/series b/queue-4.4/series
index d5b36f2f85c0b5cf1cab1985316682a9ef695b65..416ae23befc6ed875a3106bf001e5704221b0ffe 100644 (file)
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -46,3 +46,4 @@ usb-serial-cypress_m8-enable-simply-automated-upb-pim.patch
 usb-serial-ch341-add-new-product-id-for-ch340.patch
 usb-serial-option-add-gosuncn-gm500-series.patch
 usb-serial-option-add-quectel-eg95-lte-modem.patch
+virtio-virtio_console-add-missing-module_device_table-for-rproc-serial.patch

diff --git a/queue-4.4/virtio-virtio_console-add-missing-module_device_table-for-rproc-serial.patch b/queue-4.4/virtio-virtio_console-add-missing-module_device_table-for-rproc-serial.patch
new file mode 100644 (file)
index 0000000..7af0598
--- /dev/null
+++ b/queue-4.4/virtio-virtio_console-add-missing-module_device_table-for-rproc-serial.patch
@@ -0,0 +1,51 @@
+From 897c44f0bae574c5fb318c759b060bebf9dd6013 Mon Sep 17 00:00:00 2001
+From: Alexander Lobakin <alobakin@pm.me>
+Date: Tue, 23 Jun 2020 11:09:33 +0000
+Subject: virtio: virtio_console: add missing MODULE_DEVICE_TABLE() for rproc serial
+
+From: Alexander Lobakin <alobakin@pm.me>
+
+commit 897c44f0bae574c5fb318c759b060bebf9dd6013 upstream.
+
+rproc_serial_id_table lacks an exposure to module devicetable, so
+when remoteproc firmware requests VIRTIO_ID_RPROC_SERIAL, no uevent
+is generated and no module autoloading occurs.
+Add missing MODULE_DEVICE_TABLE() annotation and move the existing
+one for VIRTIO_ID_CONSOLE right to the table itself.
+
+Fixes: 1b6370463e88 ("virtio_console: Add support for remoteproc serial")
+Cc: <stable@vger.kernel.org> # v3.8+
+Signed-off-by: Alexander Lobakin <alobakin@pm.me>
+Reviewed-by: Amit Shah <amit@kernel.org>
+Link: https://lore.kernel.org/r/x7C_CbeJtoGMy258nwAXASYz3xgFMFpyzmUvOyZzRnQrgWCREBjaqBOpAUS7ol4NnZYvSVwmTsCG0Ohyfvta-ygw6HMHcoeKK0C3QFiAO_Q=@pm.me
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/char/virtio_console.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/char/virtio_console.c
++++ b/drivers/char/virtio_console.c
+@@ -2155,6 +2155,7 @@ static struct virtio_device_id id_table[
+       { VIRTIO_ID_CONSOLE, VIRTIO_DEV_ANY_ID },
+       { 0 },
+ };
++MODULE_DEVICE_TABLE(virtio, id_table);
+ 
+ static unsigned int features[] = {
+       VIRTIO_CONSOLE_F_SIZE,
+@@ -2167,6 +2168,7 @@ static struct virtio_device_id rproc_ser
+ #endif
+       { 0 },
+ };
++MODULE_DEVICE_TABLE(virtio, rproc_serial_id_table);
+ 
+ static unsigned int rproc_serial_features[] = {
+ };
+@@ -2319,6 +2321,5 @@ static void __exit fini(void)
+ module_init(init);
+ module_exit(fini);
+ 
+-MODULE_DEVICE_TABLE(virtio, id_table);
+ MODULE_DESCRIPTION("Virtio console driver");
+ MODULE_LICENSE("GPL");