Skip to contentSkip to conversation

virtio: mmio: Return error codes on probe failures

PATCH In review Kuan-Wei Chiu 3 participants 3 messages Apr 7 – Apr 22 virtio core

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 virtio: mmio: Return error codes on probe failures

Currently, virtio_mmio_probe() returns 0 when it encounters an invalid magic value, an unsupported version, or a dummy device (ID 0). In U-Boot's driver model, returning 0 indicates a successful probe. This causes the system to incorrectly register and activate invalid or placeholder devices, potentially leading to undefined behavior or crashes later on.

Update the probe function to return appropriate error codes (-ENODEV for invalid magic values and dummy devices, and -ENXIO for unsupported versions). This fix correctly instructs the DM to abort the binding process.

Fixes fdc4aca89ecb ("virtio: Add virtio over mmio transport driver")
---
 drivers/virtio/virtio_mmio.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/virtio/virtio_mmio.c +3 -3
index 1cd737aca24..62afe609ec0 100644
@@ -354,7 +354,7 @@ static int virtio_mmio_probe(struct udevice *udev)
 	magic = readl(priv->base + VIRTIO_MMIO_MAGIC_VALUE);
 	if (magic != ('v' | 'i' << 8 | 'r' << 16 | 't' << 24)) {
 		debug("(%s): wrong magic value 0x%08x!\n", udev->name, magic);
-		return 0;
+		return -ENODEV;
 	}
 
 	/* Check device version */
@@ -362,7 +362,7 @@ static int virtio_mmio_probe(struct udevice *udev)
 	if (priv->version < 1 || priv->version > 2) {
 		debug("(%s): version %d not supported!\n",
 		      udev->name, priv->version);
-		return 0;
+		return -ENXIO;
 	}
 
 	/* Check device ID */
@@ -372,7 +372,7 @@ static int virtio_mmio_probe(struct udevice *udev)
 		 * virtio-mmio device with an ID 0 is a (dummy) placeholder
 		 * with no function. End probing now with no error reported.
 		 */
-		return 0;
+		return -ENODEV;
 	}
 	uc_priv->vendor = readl(priv->base + VIRTIO_MMIO_VENDOR_ID);
 
Signature · 1 line
2.53.0.1213.gd9a14994de-goog
Acked-by on v1 1/1
#1 lore raw

Hi Kuan-Wei,

Quoted 51 lines · Kuan-Wei Chiu

Currently, virtio_mmio_probe() returns 0 when it encounters an invalid magic value, an unsupported version, or a dummy device (ID 0). In U-Boot's driver model, returning 0 indicates a successful probe. This causes the system to incorrectly register and activate invalid or placeholder devices, potentially leading to undefined behavior or crashes later on.

Update the probe function to return appropriate error codes (-ENODEV for invalid magic values and dummy devices, and -ENXIO for unsupported versions). This fix correctly instructs the DM to abort the binding process.

Fixes fdc4aca89ecb ("virtio: Add virtio over mmio transport driver")
---
 drivers/virtio/virtio_mmio.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/virtio/virtio_mmio.c +3 -4
index 1cd737aca24..62afe609ec0 100644
@@ -354,7 +354,7 @@ static int virtio_mmio_probe(struct udevice *udev)
        magic = readl(priv->base + VIRTIO_MMIO_MAGIC_VALUE);
        if (magic != ('v' | 'i' << 8 | 'r' << 16 | 't' << 24)) {
                debug("(%s): wrong magic value 0x%08x!\n", udev->name, magic);
-               return 0;
+               return -ENODEV;
        }
 
        /* Check device version */
@@ -362,7 +362,7 @@ static int virtio_mmio_probe(struct udevice *udev)
        if (priv->version < 1 || priv->version > 2) {
                debug("(%s): version %d not supported!\n",
                      udev->name, priv->version);
-               return 0;
+               return -ENXIO;
        }
 
        /* Check device ID */
@@ -372,7 +372,7 @@ static int virtio_mmio_probe(struct udevice *udev)
                 * virtio-mmio device with an ID 0 is a (dummy) placeholder
                 * with no function. End probing now with no error reported.
                 */
-               return 0;
+               return -ENODEV;
        }
        uc_priv->vendor = readl(priv->base + VIRTIO_MMIO_VENDOR_ID);
 
--
Quoted 2 lines

2.53.0.1213.gd9a14994de-goog

I'm surprised I didn't notice this when working out the endian issues on m68k. I have build/boot tested on m68k and the change looks correct to me.

Since I'm not the maintainer for this thing I guess:

#2 lore raw
In reply to Kuan-Wei Chiu
Quoted 8 lines · Kuan-Wei Chiu

Currently, virtio_mmio_probe() returns 0 when it encounters an invalid magic value, an unsupported version, or a dummy device (ID 0). In U-Boot's driver model, returning 0 indicates a successful probe. This causes the system to incorrectly register and activate invalid or placeholder devices, potentially leading to undefined behavior or crashes later on.

[...]

Applied to u-boot/master, thanks!

[1/1] virtio: mmio: Return error codes on probe failures

      commit: 70101c3217aec849d509040554ef0cf7c0f1ef56
Signature · 1 line
Tom