| 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 |
| @@ -2161,6 +2161,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, |
| @@ -2173,6 +2174,7 @@ static struct virtio_device_id rproc_ser |
| #endif |
| { 0 }, |
| }; |
| +MODULE_DEVICE_TABLE(virtio, rproc_serial_id_table); |
| |
| static unsigned int rproc_serial_features[] = { |
| }; |
| @@ -2325,6 +2327,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"); |