[PATCH master 1/2] virtio: pci: fix 64-bit incompatibility

[PATCH master 1/2] virtio: pci: fix 64-bit incompatibility

[Ahmad Fatoum]

device_len is size_t, but written by pci_read_config_dword as a u32.
Change the type to fix this.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 drivers/virtio/virtio_pci_common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/virtio/virtio_pci_common.h b/drivers/virtio/virtio_pci_common.h
index 32f0f451ab49..8f97d1218838 100644
--- a/drivers/virtio/virtio_pci_common.h
+++ b/drivers/virtio/virtio_pci_common.h
@@ -47,7 +47,7 @@ struct virtio_pci_device {
 	void __iomem *notify_base;
 
 	/* So we can sanity-check accesses. */
-	size_t device_len;
+	u32 device_len;
 
 	/* Multiply queue_notify_off by this value. (non-legacy mode). */
 	u32 notify_offset_multiplier;
-- 
2.30.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

[PATCH master 2/2] virtio: pci: remove inaccurate comment on 64-bit bar addr incompatibility

[Ahmad Fatoum]

pci_iomap returns the bar base address, which can already be > 4G on
barebox. The comment originates from U-Boot, where indeed only the lower
32-bit are read. We don't have this limitation and qemu -M q35 places
bars for VirtIO devices at >= 0x8_0000_0000 and they worked correctly,
so drop the inaccurate comment.

Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
 drivers/virtio/virtio_pci_modern.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/drivers/virtio/virtio_pci_modern.c b/drivers/virtio/virtio_pci_modern.c
index 180c14771aad..d828bee69e62 100644
--- a/drivers/virtio/virtio_pci_modern.c
+++ b/drivers/virtio/virtio_pci_modern.c
@@ -335,13 +335,6 @@ static void __iomem *virtio_pci_map_capability(struct pci_dev *dev, int off)
 	offset = off + offsetof(struct virtio_pci_cap, offset);
 	pci_read_config_dword(dev, offset, &offset);
 
-	/*
-	 * TODO: adding 64-bit BAR support
-	 *
-	 * Per spec, the BAR is permitted to be either 32-bit or 64-bit.
-	 * For simplicity, only read the BAR address as 32-bit.
-	 */
-
         return pci_iomap(dev, bar) + offset;
 }
 
-- 
2.30.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

Re: [PATCH master 1/2] virtio: pci: fix 64-bit incompatibility

[Sascha Hauer]

On Sat, Apr 10, 2021 at 12:49:10PM +0200, Ahmad Fatoum wrote:
> device_len is size_t, but written by pci_read_config_dword as a u32.
> Change the type to fix this.
> 
> Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
> ---
>  drivers/virtio/virtio_pci_common.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Applied, thanks

Sascha

> 
> diff --git a/drivers/virtio/virtio_pci_common.h b/drivers/virtio/virtio_pci_common.h
> index 32f0f451ab49..8f97d1218838 100644
> --- a/drivers/virtio/virtio_pci_common.h
> +++ b/drivers/virtio/virtio_pci_common.h
> @@ -47,7 +47,7 @@ struct virtio_pci_device {
>  	void __iomem *notify_base;
>  
>  	/* So we can sanity-check accesses. */
> -	size_t device_len;
> +	u32 device_len;
>  
>  	/* Multiply queue_notify_off by this value. (non-legacy mode). */
>  	u32 notify_offset_multiplier;
> -- 
> 2.30.0
> 
> 
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox