virtio: pci: Make use of dm_pci_map_bar()

The virtio PCI capabilities describe regions of memory that should be
mapped. Map those with dm_pci_map_bar() which will ensure they are valid
PCI regions.

Signed-off-by: Andrew Scull <ascull@google.com>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Andrew Scull
2022-04-21 16:11:15 +00:00
committed by Tom Rini
parent c763e1e023
commit 0699a78c0c

View File

@@ -459,19 +459,17 @@ static int virtio_pci_find_capability(struct udevice *udev, u8 cfg_type,
static void __iomem *virtio_pci_map_capability(struct udevice *udev, static void __iomem *virtio_pci_map_capability(struct udevice *udev,
const struct virtio_pci_cap *cap) const struct virtio_pci_cap *cap)
{ {
ulong base;
void __iomem *p;
/* /*
* TODO: adding 64-bit BAR support * Find the corresponding memory region that isn't system memory but is
* * writable.
* Per spec, the BAR is permitted to be either 32-bit or 64-bit.
* For simplicity, only read the BAR address as 32-bit.
*/ */
base = dm_pci_read_bar32(udev, cap->bar); unsigned long mask =
p = (void __iomem *)base + cap->offset; PCI_REGION_TYPE | PCI_REGION_SYS_MEMORY | PCI_REGION_RO;
unsigned long flags = PCI_REGION_MEM;
u8 *p = dm_pci_map_bar(udev, PCI_BASE_ADDRESS_0 + cap->bar, cap->offset,
cap->length, mask, flags);
return p; return (void __iomem *)p;
} }
static int virtio_pci_bind(struct udevice *udev) static int virtio_pci_bind(struct udevice *udev)