virtio: allow caller to override device id in vp_modern

To add a bit of vendor flexibility with various virtio based devices,
allow the caller to check for a different device id.  This adds a function
pointer field to struct virtio_pci_modern_device to specify an override
device id check.  If defined by the driver, this function will be called
to check that the PCI device is the vendor's expected device, and will
return the found device id to be stored in mdev->id.device.  This allows
vendors with alternative vendor device ids to use this library on their
own device BAR.

Note: A lot of the diff in this is simply indenting the existing code
into an else block.

Signed-off-by: Shannon Nelson <shannon.nelson@amd.com>
Acked-by: Jason Wang <jasowang@redhat.com>
Message-Id: <20230519215632.12343-2-shannon.nelson@amd.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

diff --git a/drivers/virtio/virtio_pci_modern_dev.c b/drivers/virtio/virtio_pci_modern_dev.c
index 869cb46bef9603597b44db5f72d19c186e6c056e..9b2d6614de674c8b5c020ac6d65619989081fbeb 100644 (file)
--- a/drivers/virtio/virtio_pci_modern_dev.c
+++ b/drivers/virtio/virtio_pci_modern_dev.c
@@ -218,21 +218,29 @@ int vp_modern_probe(struct virtio_pci_modern_device *mdev)
        int err, common, isr, notify, device;
        u32 notify_length;
        u32 notify_offset;
+       int devid;
 
        check_offsets();
 
-       /* We only own devices >= 0x1000 and <= 0x107f: leave the rest. */
-       if (pci_dev->device < 0x1000 || pci_dev->device > 0x107f)
-               return -ENODEV;
-
-       if (pci_dev->device < 0x1040) {
-               /* Transitional devices: use the PCI subsystem device id as
-                * virtio device id, same as legacy driver always did.
-                */
-               mdev->id.device = pci_dev->subsystem_device;
+       if (mdev->device_id_check) {
+               devid = mdev->device_id_check(pci_dev);
+               if (devid < 0)
+                       return devid;
+               mdev->id.device = devid;
        } else {
-               /* Modern devices: simply use PCI device id, but start from 0x1040. */
-               mdev->id.device = pci_dev->device - 0x1040;
+               /* We only own devices >= 0x1000 and <= 0x107f: leave the rest. */
+               if (pci_dev->device < 0x1000 || pci_dev->device > 0x107f)
+                       return -ENODEV;
+
+               if (pci_dev->device < 0x1040) {
+                       /* Transitional devices: use the PCI subsystem device id as
+                        * virtio device id, same as legacy driver always did.
+                        */
+                       mdev->id.device = pci_dev->subsystem_device;
+               } else {
+                       /* Modern devices: simply use PCI device id, but start from 0x1040. */
+                       mdev->id.device = pci_dev->device - 0x1040;
+               }
        }
        mdev->id.vendor = pci_dev->subsystem_vendor;
 

diff --git a/include/linux/virtio_pci_modern.h b/include/linux/virtio_pci_modern.h
index c4eeb79b01398eba88977e636f248096a07a8087..e7b1db1dd0bb0a61c24fa1eb0596861947a2f3bf 100644 (file)
--- a/include/linux/virtio_pci_modern.h
+++ b/include/linux/virtio_pci_modern.h
@@ -38,6 +38,9 @@ struct virtio_pci_modern_device {
        int modern_bars;
 
        struct virtio_device_id id;
+
+       /* optional check for vendor virtio device, returns dev_id or -ERRNO */
+       int (*device_id_check)(struct pci_dev *pdev);
 };
 
 /*