virtio: pci: Add and fix consistency checks
Subsystems (15)
v3 cover virtio: pci: Add and fix consistency checks
The virtio PCI drivers forgo a number of consistency checks, particularly around pointer validation and bounds checking. This series focuses on the modern driver to add those checks.
The start of the series adds and fixes some basic bounds checks. Later patches ensure PCI addresses fall within the expected regions rather than any arbitrary address. This is acheived by introducing range parameters to a few of the dm_pci_* functions that allow the ranges to be checked.
The series also adds a few new configs to allow parts of virtio and PCI to be disabled where the features may be unused and the current implementations don't have the needed consistencty checks.
Changelog:
v2:
- Refactor dm_pci_* functions, not adding new ones
- Reorder patches per request in v1
v3:
- Use CI to test more targets
- Move EA config patch to end for dropping if needed
Andrew Scull (18):
virtio: pci: Allow exclusion of legacy driver
virtio: pci: Fix discovery of device config length
virtio: pci: Bounds check device config access
virtio: pci: Bounds check notification writes
virtio: pci: Check virtio common config size
virtio: pci: Check virtio capability is in bounds
virtio: pci: Read entire capability into memory
pci: Fix use of flags in dm_pci_map_bar()
pci: Check region ranges are addressable
pci: Range check address conversions
test: pci: Test PCI address conversion functions
pci: Map bars with offset and length
pci: Match region flags using a mask
pci: Update dm_pci_bus_to_virt() parameters
pci: Add mask parameter to dm_pci_map_bar()
virtio: pci: Check virtio configs are mapped
virtio: pci: Make use of dm_pci_map_bar()
pci: Add config for Enhanced Allocation
arch/sandbox/dts/test.dts | 2 +- arch/x86/cpu/baytrail/cpu.c | 2 +- drivers/ata/ahci.c | 9 +- drivers/ata/sata_sil.c | 6 +- drivers/bios_emulator/atibios.c | 4 +- drivers/gpio/octeon_gpio.c | 2 +- drivers/i2c/designware_i2c_pci.c | 3 +- drivers/i2c/intel_i2c.c | 2 +- drivers/i2c/octeon_i2c.c | 2 +- drivers/mmc/octeontx_hsmmc.c | 2 +- drivers/mmc/pci_mmc.c | 2 +- drivers/mtd/nand/raw/octeontx_bch.c | 6 +- drivers/mtd/nand/raw/octeontx_nand.c | 2 +- drivers/net/bnxt/bnxt.c | 9 +- drivers/net/e1000.c | 4 +- drivers/net/fsl_enetc.c | 2 +- drivers/net/fsl_enetc_mdio.c | 2 +- drivers/net/mscc_eswitch/felix_switch.c | 4 +- drivers/net/octeontx/bgx.c | 2 +- drivers/net/octeontx/nic_main.c | 2 +- drivers/net/octeontx/nicvf_main.c | 2 +- drivers/net/octeontx/smi.c | 2 +- drivers/net/octeontx2/cgx.c | 2 +- drivers/net/octeontx2/rvu_af.c | 2 +- drivers/net/octeontx2/rvu_pf.c | 3 +- drivers/net/pch_gbe.c | 2 +- drivers/nvme/nvme_pci.c | 4 +- drivers/pci/Kconfig | 7 + drivers/pci/pci-uclass.c | 185 +++++++++++------------- drivers/spi/octeon_spi.c | 2 +- drivers/usb/host/ehci-pci.c | 3 +- drivers/usb/host/ohci-pci.c | 2 +- drivers/usb/host/xhci-pci.c | 3 +- drivers/virtio/Kconfig | 9 ++ drivers/virtio/Makefile | 3 +- drivers/virtio/virtio_pci_legacy.c | 3 +- drivers/virtio/virtio_pci_modern.c | 143 ++++++++++++------ include/pci.h | 46 ++++-- test/dm/pci.c | 118 ++++++++++++++- 39 files changed, 401 insertions(+), 209 deletions(-)
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
PATCH v3 1/18 virtio: pci: Allow exclusion of legacy driver
Add a new config to control whether the driver for legacy virtio PCI devices is included in the build. VIRTIO_PCI_LEGACY is included by default when VIRTIO_PCI is selected, but it can also be independently toggled.
--- drivers/virtio/Kconfig | 9 +++++++++ drivers/virtio/Makefile | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-)
drivers/virtio/Kconfig +9 -0
@@ -37,6 +37,15 @@ config VIRTIO_PCI This driver provides support for virtio based paravirtual device drivers over PCI. +config VIRTIO_PCI_LEGACY + bool "PCI driver for legacy virtio devices" + depends on PCI + select VIRTIO + default VIRTIO_PCI + help + This driver provides support for legacy virtio based paravirtual + device drivers over PCI. + config VIRTIO_SANDBOX bool "Sandbox driver for virtio devices" depends on SANDBOX
drivers/virtio/Makefile +2 -1
@@ -5,7 +5,8 @@ obj-y += virtio-uclass.o virtio_ring.o obj-$(CONFIG_VIRTIO_MMIO) += virtio_mmio.o -obj-$(CONFIG_VIRTIO_PCI) += virtio_pci_legacy.o virtio_pci_modern.o +obj-$(CONFIG_VIRTIO_PCI) += virtio_pci_modern.o +obj-$(CONFIG_VIRTIO_PCI_LEGACY) += virtio_pci_legacy.o obj-$(CONFIG_VIRTIO_SANDBOX) += virtio_sandbox.o obj-$(CONFIG_VIRTIO_NET) += virtio_net.o obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
Re: [PATCH v3 01/18] virtio: pci: Allow exclusion of legacy driver
Quoted 7 lines · Andrew Scull
Add a new config to control whether the driver for legacy virtio PCI devices is included in the build.
VIRTIO_PCI_LEGACYis included by default whenVIRTIO_PCIis selected, but it can also be independently toggled.Signed-off-by Andrew Scull <[email protected]>Reviewed-by Bin Meng <[email protected]>
For the series, applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH v3 2/18 virtio: pci: Fix discovery of device config length
In reply to Andrew ScullThe length of the device config was erroneously being taken from the notify capability. Correct this by finding the length in the device capability.
--- drivers/virtio/virtio_pci_modern.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/virtio/virtio_pci_modern.c +1 -1
@@ -497,7 +497,7 @@ static int virtio_pci_probe(struct udevice *udev)*/ device =virtio_pci_find_capability (udev,VIRTIO_PCI_CAP_DEVICE_CFG );if (device) { - offset = notify + offsetof(struct virtio_pci_cap , length); + offset = device + offsetof(struct virtio_pci_cap , length);dm_pci_read_config32 (udev, offset, &priv->device_len); }
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
PATCH v3 3/18 virtio: pci: Bounds check device config access
In reply to Andrew ScullThe device config is optional, so check it was present and mapped before trying to use the pointer. Bounds violations are an error, not just a warning, so bail if the checks fail.
--- drivers/virtio/virtio_pci_modern.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/virtio/virtio_pci_modern.c +12 -4
@@ -114,7 +114,11 @@ static int virtio_pci_get_config(struct udevice *udev, unsigned int offset,__le16 w;__le32 l; -WARN_ON (offset + len > priv->device_len); +if (!priv->device) +return -ENOSYS ; + +if (offset + len > priv->device_len) +return -EINVAL ;switch (len) {case 1 :
@@ -136,7 +140,7 @@ static int virtio_pci_get_config(struct udevice *udev, unsigned int offset,memcpy (buf +sizeof (l), &l,sizeof (l));break ;default : -WARN_ON (true); +return -EINVAL ; }return 0 ;
@@ -150,7 +154,11 @@ static int virtio_pci_set_config(struct udevice *udev, unsigned int offset,__le16 w;__le32 l; -WARN_ON (offset + len > priv->device_len); +if (!priv->device) +return -ENOSYS ; + +if (offset + len > priv->device_len) +return -EINVAL ;switch (len) {case 1 :
@@ -172,7 +180,7 @@ static int virtio_pci_set_config(struct udevice *udev, unsigned int offset,iowrite32 (le32_to_cpu (l), priv->device + offset +sizeof (l));break ;default : -WARN_ON (true); +return -EINVAL ; }return 0 ;
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
PATCH v3 4/18 virtio: pci: Bounds check notification writes
In reply to Andrew ScullMake sure virtio notifications are written within their allocated buffer.
--- drivers/virtio/virtio_pci_modern.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
drivers/virtio/virtio_pci_modern.c +15 -2
@@ -94,6 +94,7 @@* * @common: pci transport device common register block base * @notify_base: pci transport device notify register block base +* @notify_len: pci transport device notify register block length * @device: pci transport device device-specific register block base * @device_len: pci transport device device-specific register block length * @notify_offset_multiplier: multiply queue_notify_off by this value
@@ -101,6 +102,7 @@struct virtio_pci_priv {struct virtio_pci_common_cfg __iomem *common;void __iomem *notify_base; +u32 notify_len;void __iomem *device;u32 device_len;u32 notify_offset_multiplier;
@@ -372,12 +374,20 @@ static int virtio_pci_notify(struct udevice *udev, struct virtqueue *vq)/* get offset of notification word for this vq */ off =ioread16 (&priv->common->queue_notify_off); +/* +* Check the effective offset is in bounds and leaves space for the +* notification, which is just a single 16-bit value since +* VIRTIO_F_NOTIFICATION_DATA isn't negotiated by the drivers. +*/ + off *= priv->notify_offset_multiplier; +if (off > priv->notify_len -sizeof (u16)) +return -EIO ; +/* * We write the queue's selector into the notification register * to signal the other end */ -iowrite16 (vq->index, - priv->notify_base + off * priv->notify_offset_multiplier); +iowrite16 (vq->index, priv->notify_base + off);return 0 ; }
@@ -499,6 +509,9 @@ static int virtio_pci_probe(struct udevice *udev)return -EINVAL ; } + offset = notify + offsetof(struct virtio_pci_cap , length); +dm_pci_read_config32 (udev, offset, &priv->notify_len); +/* * Device capability is only mandatory for devices that have * device-specific configuration.
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
PATCH v3 5/18 virtio: pci: Check virtio common config size
In reply to Andrew ScullCheck that the common config is at least as large as the struct it is expected to contain. Only then is it safe to cast the pointer and be safe from out-of-bounds accesses.
--- drivers/virtio/virtio_pci_modern.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/virtio/virtio_pci_modern.c +8 -0
@@ -480,6 +480,7 @@ static int virtio_pci_probe(struct udevice *udev)u16 subvendor;u8 revision;int common, notify, device; +u32 common_length;int offset;/* We only own devices >= 0x1040 and <= 0x107f: leave the rest. */
@@ -501,6 +502,13 @@ static int virtio_pci_probe(struct udevice *udev)return -ENODEV ; } + offset = common + offsetof(struct virtio_pci_cap , length); +dm_pci_read_config32 (udev, offset, &common_length); +if (common_length <sizeof (struct virtio_pci_common_cfg )) { +printf ("(%s): virtio common config too small\n" , udev->name); +return -EINVAL ; + } +/* If common is there, notify should be too */ notify =virtio_pci_find_capability (udev,VIRTIO_PCI_CAP_NOTIFY_CFG );if (!notify) {
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
PATCH v3 6/18 virtio: pci: Check virtio capability is in bounds
In reply to Andrew ScullEnsure the virtio PCI capabilities are contained within the bounds of the device's configuration space. The expected size of the capability is passed when searching for the capability to enforce this check.
--- drivers/virtio/virtio_pci_modern.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-)
drivers/virtio/virtio_pci_modern.c +16 -4
@@ -397,18 +397,27 @@ static int virtio_pci_notify(struct udevice *udev, struct virtqueue *vq)* * @udev: the transport device * @cfg_type: the VIRTIO_PCI_CAP_* value we seek +* @cap_size: expected size of the capability * * Return: offset of the configuration structure */ -static int virtio_pci_find_capability (struct udevice *udev,u8 cfg_type) +static int virtio_pci_find_capability (struct udevice *udev,u8 cfg_type, +size_t cap_size) {int pos;int offset;u8 type, bar; +assert (cap_size >=sizeof (struct virtio_pci_cap )); +assert (cap_size <=PCI_CFG_SPACE_SIZE ); +for (pos =dm_pci_find_capability (udev,PCI_CAP_ID_VNDR ); pos >0 ; pos =dm_pci_find_next_capability (udev, pos,PCI_CAP_ID_VNDR )) { +/* Ensure the capability is within bounds */ +if (PCI_CFG_SPACE_SIZE - cap_size < pos) +return 0 ; + offset = pos + offsetof(struct virtio_pci_cap , cfg_type);dm_pci_read_config8 (udev, offset, &type); offset = pos + offsetof(struct virtio_pci_cap , bar);
@@ -496,7 +505,8 @@ static int virtio_pci_probe(struct udevice *udev) uc_priv->vendor = subvendor;/* Check for a common config: if not, use legacy mode (bar 0) */ - common =virtio_pci_find_capability (udev,VIRTIO_PCI_CAP_COMMON_CFG ); + common =virtio_pci_find_capability (udev,VIRTIO_PCI_CAP_COMMON_CFG , +sizeof (struct virtio_pci_cap ));if (!common) {printf ("(%s): leaving for legacy driver\n" , udev->name);return -ENODEV ;
@@ -510,7 +520,8 @@ static int virtio_pci_probe(struct udevice *udev) }/* If common is there, notify should be too */ - notify =virtio_pci_find_capability (udev,VIRTIO_PCI_CAP_NOTIFY_CFG ); + notify =virtio_pci_find_capability (udev,VIRTIO_PCI_CAP_NOTIFY_CFG , +sizeof (struct virtio_pci_notify_cap ));if (!notify) {printf ("(%s): missing capabilities %i/%i\n" , udev->name, common, notify);
@@ -524,7 +535,8 @@ static int virtio_pci_probe(struct udevice *udev)* Device capability is only mandatory for devices that have * device-specific configuration. */ - device =virtio_pci_find_capability (udev,VIRTIO_PCI_CAP_DEVICE_CFG ); + device =virtio_pci_find_capability (udev,VIRTIO_PCI_CAP_DEVICE_CFG , +sizeof (struct virtio_pci_cap ));if (device) { offset = device + offsetof(struct virtio_pci_cap , length);dm_pci_read_config32 (udev, offset, &priv->device_len);
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
PATCH v3 7/18 virtio: pci: Read entire capability into memory
In reply to Andrew ScullRead the virtio PCI capability out of the device configuration space to a struct rather than accessing fields directly from the configuration space as they are needed. This both makes access to the fields easier and avoids re-reading fields.
Re-reading fields could result in time-of-check to time-of-use problems, should the value in the configuration space change. The range check of the bar field and the later call to dm_pci_read_bar32() is an example of where this could happen.
--- drivers/virtio/virtio_pci_modern.c | 72 ++++++++++++++++-------------- 1 file changed, 38 insertions(+), 34 deletions(-)
drivers/virtio/virtio_pci_modern.c +38 -34
@@ -398,19 +398,23 @@ static int virtio_pci_notify(struct udevice *udev, struct virtqueue *vq)* @udev: the transport device * @cfg_type: the VIRTIO_PCI_CAP_* value we seek * @cap_size: expected size of the capability +* @cap: capability read from the config space * * Return: offset of the configuration structure */ static int virtio_pci_find_capability (struct udevice *udev,u8 cfg_type, -size_t cap_size) +size_t cap_size, +struct virtio_pci_cap *cap) {int pos;int offset; -u8 type, bar;assert (cap_size >=sizeof (struct virtio_pci_cap ));assert (cap_size <=PCI_CFG_SPACE_SIZE ); +if (!cap) +return 0 ; +for (pos =dm_pci_find_capability (udev,PCI_CAP_ID_VNDR ); pos >0 ; pos =dm_pci_find_next_capability (udev, pos,PCI_CAP_ID_VNDR )) {
@@ -418,16 +422,26 @@ static int virtio_pci_find_capability(struct udevice *udev, u8 cfg_type,if (PCI_CFG_SPACE_SIZE - cap_size < pos)return 0 ; + offset = pos + offsetof(struct virtio_pci_cap , cap_vndr); +dm_pci_read_config8 (udev, offset, &cap->cap_vndr); + offset = pos + offsetof(struct virtio_pci_cap , cap_next); +dm_pci_read_config8 (udev, offset, &cap->cap_next); + offset = pos + offsetof(struct virtio_pci_cap , cap_len); +dm_pci_read_config8 (udev, offset, &cap->cap_len); offset = pos + offsetof(struct virtio_pci_cap , cfg_type); -dm_pci_read_config8 (udev, offset, &type); +dm_pci_read_config8 (udev, offset, &cap->cfg_type); offset = pos + offsetof(struct virtio_pci_cap , bar); -dm_pci_read_config8 (udev, offset, &bar); +dm_pci_read_config8 (udev, offset, &cap->bar); + offset = pos + offsetof(struct virtio_pci_cap , offset); +dm_pci_read_config32 (udev, offset, &cap->offset); + offset = pos + offsetof(struct virtio_pci_cap , length); +dm_pci_read_config32 (udev, offset, &cap->length);/* Ignore structures with reserved BAR values */ -if (bar >0x5 ) +if (cap->bar >0x5 )continue ; -if (type == cfg_type) +if (cap->cfg_type == cfg_type)return pos; }
@@ -438,33 +452,24 @@ static int virtio_pci_find_capability(struct udevice *udev, u8 cfg_type,* virtio_pci_map_capability - map base address of the capability * * @udev: the transport device -* @off: offset of the configuration structure +* @cap: capability to map * * Return: base address of the capability */ -static void __iomem *virtio_pci_map_capability (struct udevice *udev,int off) +static void __iomem *virtio_pci_map_capability (struct udevice *udev, +const struct virtio_pci_cap *cap) { -u8 bar; -u32 offset;ulong base;void __iomem *p; -if (!off) -return NULL ; - - offset = off + offsetof(struct virtio_pci_cap , bar); -dm_pci_read_config8 (udev, offset, &bar); - offset = off + offsetof(struct virtio_pci_cap , offset); -dm_pci_read_config32 (udev, 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. */ - base =dm_pci_read_bar32 (udev, bar); - p = (void __iomem *)base + offset; + base =dm_pci_read_bar32 (udev, cap->bar); + p = (void __iomem *)base + cap->offset;return p; }
@@ -489,7 +494,7 @@ static int virtio_pci_probe(struct udevice *udev)u16 subvendor;u8 revision;int common, notify, device; -u32 common_length; +struct virtio_pci_cap common_cap, notify_cap, device_cap;int offset;/* We only own devices >= 0x1040 and <= 0x107f: leave the rest. */
@@ -506,46 +511,45 @@ static int virtio_pci_probe(struct udevice *udev)/* Check for a common config: if not, use legacy mode (bar 0) */ common =virtio_pci_find_capability (udev,VIRTIO_PCI_CAP_COMMON_CFG , -sizeof (struct virtio_pci_cap )); +sizeof (struct virtio_pci_cap ), + &common_cap);if (!common) {printf ("(%s): leaving for legacy driver\n" , udev->name);return -ENODEV ; } - offset = common + offsetof(struct virtio_pci_cap , length); -dm_pci_read_config32 (udev, offset, &common_length); -if (common_length <sizeof (struct virtio_pci_common_cfg )) { +if (common_cap.length <sizeof (struct virtio_pci_common_cfg )) {printf ("(%s): virtio common config too small\n" , udev->name);return -EINVAL ; }/* If common is there, notify should be too */ notify =virtio_pci_find_capability (udev,VIRTIO_PCI_CAP_NOTIFY_CFG , -sizeof (struct virtio_pci_notify_cap )); +sizeof (struct virtio_pci_notify_cap ), + ¬ify_cap);if (!notify) {printf ("(%s): missing capabilities %i/%i\n" , udev->name, common, notify);return -EINVAL ; } - offset = notify + offsetof(struct virtio_pci_cap , length); -dm_pci_read_config32 (udev, offset, &priv->notify_len); + priv->notify_len = notify_cap.length;/* * Device capability is only mandatory for devices that have * device-specific configuration. */ device =virtio_pci_find_capability (udev,VIRTIO_PCI_CAP_DEVICE_CFG , -sizeof (struct virtio_pci_cap )); +sizeof (struct virtio_pci_cap ), + &device_cap);if (device) { - offset = device + offsetof(struct virtio_pci_cap , length); -dm_pci_read_config32 (udev, offset, &priv->device_len); + priv->device_len = device_cap.length; + priv->device =virtio_pci_map_capability (udev, &device_cap); }/* Map configuration structures */ - priv->common =virtio_pci_map_capability (udev, common); - priv->notify_base =virtio_pci_map_capability (udev, notify); - priv->device =virtio_pci_map_capability (udev, device); + priv->common =virtio_pci_map_capability (udev, &common_cap); + priv->notify_base =virtio_pci_map_capability (udev, ¬ify_cap);debug ("(%p): common @ %p, notify base @ %p, device @ %p\n" , udev, priv->common, priv->notify_base, priv->device);
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
PATCH v3 8/18 pci: Fix use of flags in dm_pci_map_bar()
In reply to Andrew ScullThe flags parameter of dm_pci_map_bar() is used for PCI region flags rather than memory mapping flags. Fix the type to match that of the region flags and stop using the regions flags as memory mapping flags.
--- drivers/pci/pci-uclass.c | 10 +++++----- include/pci.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
drivers/pci/pci-uclass.c +5 -5
@@ -1533,8 +1533,8 @@ static phys_addr_t dm_pci_map_ea_virt(struct udevice *dev, int ea_off,return addr; } -static void *dm_pci_map_ea_bar (struct udevice *dev,int bar,int flags, -int ea_off,struct pci_child_plat *pdata) +static void *dm_pci_map_ea_bar (struct udevice *dev,int bar,int ea_off, +struct pci_child_plat *pdata) {int ea_cnt, i, entry_size;int bar_id = (bar -PCI_BASE_ADDRESS_0 ) >>2 ;
@@ -1577,13 +1577,13 @@ static void *dm_pci_map_ea_bar(struct udevice *dev, int bar, int flags, addr +=dm_pci_map_ea_virt (dev, ea_off, pdata);/* size ignored for now */ -return map_physmem (addr,0 , flags); +return map_physmem (addr,0 ,MAP_NOCACHE ); }return 0 ; } -void *dm_pci_map_bar (struct udevice *dev,int bar,int flags) +void *dm_pci_map_bar (struct udevice *dev,int bar,unsigned long flags) {struct pci_child_plat *pdata =dev_get_parent_plat (dev);struct udevice *udev = dev;
@@ -1608,7 +1608,7 @@ void *dm_pci_map_bar(struct udevice *dev, int bar, int flags)*/ ea_off =dm_pci_find_capability (udev,PCI_CAP_ID_EA );if (ea_off) -return dm_pci_map_ea_bar (udev, bar, flags, ea_off, pdata); +return dm_pci_map_ea_bar (udev, bar, ea_off, pdata);/* read BAR address */ dm_pci_read_config32 (udev, bar, &bar_response);
include/pci.h +1 -1
@@ -1349,7 +1349,7 @@ pci_addr_t dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t addr,* @flags: Flags for the region type (PCI_REGION_...) * @return: pointer to the virtual address to use or 0 on error */ -void *dm_pci_map_bar (struct udevice *dev,int bar,int flags); +void *dm_pci_map_bar (struct udevice *dev,int bar,unsigned long flags);/** * dm_pci_find_next_capability() - find a capability starting from an offset
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
Re: [PATCH v3 08/18] pci: Fix use of flags in dm_pci_map_bar()
Quoted 11 lines · Andrew Scull
The flags parameter of
dm_pci_map_bar()is used for PCI region flags rather than memory mapping flags. Fix the type to match that of the region flags and stop using the regions flags as memory mapping flags.Signed-off-by Andrew Scull <[email protected]>--- drivers/pci/pci-uclass.c | 10 +++++----- include/pci.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-)
PATCH v3 9/18 pci: Check region ranges are addressable
In reply to Andrew ScullWhen parsing the ranges DT node, check that both extremes of the regions are addressable without overflow. This assumption can then be safely made when processing the regions.
--- drivers/pci/pci-uclass.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)
drivers/pci/pci-uclass.c +16 -1
@@ -1013,7 +1013,22 @@ static void decode_regions(struct pci_controller *hose, ofnode parent_node,if (!IS_ENABLED (CONFIG_SYS_PCI_64BIT ) && type ==PCI_REGION_MEM &&upper_32_bits (pci_addr)) { -debug (" - beyond the 32-bit boundary, ignoring\n" ); +debug (" - pci_addr beyond the 32-bit boundary, ignoring\n" ); +continue ; + } + +if (!IS_ENABLED (CONFIG_PHYS_64BIT ) &&upper_32_bits (addr)) { +debug (" - addr beyond the 32-bit boundary, ignoring\n" ); +continue ; + } + +if (~((pci_addr_t )0 ) - pci_addr < size) { +debug (" - PCI range exceeds max address, ignoring\n" ); +continue ; + } + +if (~((phys_addr_t )0 ) - addr < size) { +debug (" - phys range exceeds max address, ignoring\n" );continue ; }
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
PATCH v3 10/18 pci: Range check address conversions
In reply to Andrew ScullWhen converting between PCI bus and physical addresses, include a length parameter that can be used to check that the entire range fits within one of the PCI regions. This prevents an address being returned that might be only partially valid for the range it is going to be used for.
Where the range check is not wanted, passing a length of 0 will have the same behaviour as before this change.
--- drivers/pci/pci-uclass.c | 57 ++++++++++++++++++++++++---------------- include/pci.h | 20 +++++++------- 2 files changed, 46 insertions(+), 31 deletions(-)
drivers/pci/pci-uclass.c +35 -22
@@ -1390,12 +1390,13 @@ void dm_pci_write_bar32(struct udevice *dev, int barnum, u32 addr)dm_pci_write_config32 (dev, bar, addr); } -static int _dm_pci_bus_to_phys (struct udevice *ctlr, -pci_addr_t bus_addr,unsigned long flags, +static int _dm_pci_bus_to_phys (struct udevice *ctlr,pci_addr_t bus_addr, +size_t len,unsigned long flags,unsigned long skip_mask,phys_addr_t *pa) {struct pci_controller *hose =dev_get_uclass_priv (ctlr);struct pci_region *res; +pci_addr_t offset;int i;if (hose->region_count ==0 ) {
@@ -1412,18 +1413,25 @@ static int _dm_pci_bus_to_phys(struct udevice *ctlr,if (res->flags & skip_mask)continue ; -if (bus_addr >= res->bus_start && - (bus_addr - res->bus_start) < res->size) { - *pa = (bus_addr - res->bus_start + res->phys_start); -return 0 ; - } +if (bus_addr < res->bus_start) +continue ; + + offset = bus_addr - res->bus_start; +if (offset >= res->size) +continue ; + +if (len > res->size - offset) +continue ; + + *pa = res->phys_start + offset; +return 0 ; }return 1 ; }phys_addr_t dm_pci_bus_to_phys (struct udevice *dev,pci_addr_t bus_addr, -unsigned long flags) +size_t len,unsigned long flags) {phys_addr_t phys_addr =0 ;struct udevice *ctlr;
@@ -1437,14 +1445,14 @@ phys_addr_t dm_pci_bus_to_phys(struct udevice *dev, pci_addr_t bus_addr,* on matches that don't have PCI_REGION_SYS_MEMORY set */ if ((flags &PCI_REGION_TYPE ) ==PCI_REGION_MEM ) { - ret =_dm_pci_bus_to_phys (ctlr, bus_addr, + ret =_dm_pci_bus_to_phys (ctlr, bus_addr, len, flags,PCI_REGION_SYS_MEMORY , &phys_addr);if (!ret)return phys_addr; } - ret =_dm_pci_bus_to_phys (ctlr, bus_addr, flags,0 , &phys_addr); + ret =_dm_pci_bus_to_phys (ctlr, bus_addr, len, flags,0 , &phys_addr);if (ret)puts ("pci_hose_bus_to_phys: invalid physical address\n" );
@@ -1453,12 +1461,12 @@ phys_addr_t dm_pci_bus_to_phys(struct udevice *dev, pci_addr_t bus_addr, }static int _dm_pci_phys_to_bus (struct udevice *dev,phys_addr_t phys_addr, -unsigned long flags,unsigned long skip_mask, -pci_addr_t *ba) +size_t len,unsigned long flags, +unsigned long skip_mask,pci_addr_t *ba) {struct pci_region *res;struct udevice *ctlr; -pci_addr_t bus_addr; +phys_addr_t offset;int i;struct pci_controller *hose;
@@ -1480,20 +1488,25 @@ static int _dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t phys_addr,if (res->flags & skip_mask)continue ; - bus_addr = phys_addr - res->phys_start + res->bus_start; +if (phys_addr < res->phys_start) +continue ; -if (bus_addr >= res->bus_start && - (bus_addr - res->bus_start) < res->size) { - *ba = bus_addr; -return 0 ; - } + offset = phys_addr - res->phys_start; +if (offset >= res->size) +continue ; + +if (len > res->size - offset) +continue ; + + *ba = res->bus_start + offset; +return 0 ; }return 1 ; }pci_addr_t dm_pci_phys_to_bus (struct udevice *dev,phys_addr_t phys_addr, -unsigned long flags) +size_t len,unsigned long flags) {pci_addr_t bus_addr =0 ;int ret;
@@ -1503,13 +1516,13 @@ pci_addr_t dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t phys_addr,* on matches that don't have PCI_REGION_SYS_MEMORY set */ if ((flags &PCI_REGION_TYPE ) ==PCI_REGION_MEM ) { - ret =_dm_pci_phys_to_bus (dev, phys_addr, flags, + ret =_dm_pci_phys_to_bus (dev, phys_addr, len, flags,PCI_REGION_SYS_MEMORY , &bus_addr);if (!ret)return bus_addr; } - ret =_dm_pci_phys_to_bus (dev, phys_addr, flags,0 , &bus_addr); + ret =_dm_pci_phys_to_bus (dev, phys_addr, len, flags,0 , &bus_addr);if (ret)puts ("pci_hose_phys_to_bus: invalid physical address\n" );
include/pci.h +11 -9
@@ -1313,14 +1313,15 @@ void dm_pci_write_bar32(struct udevice *dev, int barnum, u32 addr);u32 dm_pci_read_bar32 (const struct udevice *dev,int barnum);/** -* dm_pci_bus_to_phys() - convert a PCI bus address to a physical address +* dm_pci_bus_to_phys() - convert a PCI bus address range to a physical address * * @dev: Device containing the PCI address * @addr: PCI address to convert +* @len: Length of the address range * @flags: Flags for the region type (PCI_REGION_...) * Return: physical address corresponding to that PCI bus address */ -phys_addr_t dm_pci_bus_to_phys (struct udevice *dev,pci_addr_t addr, +phys_addr_t dm_pci_bus_to_phys (struct udevice *dev,pci_addr_t addr,size_t len,unsigned long flags);/**
@@ -1328,10 +1329,11 @@ phys_addr_t dm_pci_bus_to_phys(struct udevice *dev, pci_addr_t addr,* * @dev: Device containing the bus address * @addr: Physical address to convert +* @len: Length of the address range * @flags: Flags for the region type (PCI_REGION_...) * Return: PCI bus address corresponding to that physical address */ -pci_addr_t dm_pci_phys_to_bus (struct udevice *dev,phys_addr_t addr, +pci_addr_t dm_pci_phys_to_bus (struct udevice *dev,phys_addr_t addr,size_t len,unsigned long flags);/**
@@ -1453,19 +1455,19 @@ int dm_pci_find_ext_capability(struct udevice *dev, int cap);int dm_pci_flr (struct udevice *dev);#define dm_pci_virt_to_bus (dev, addr, flags) \ - dm_pci_phys_to_bus(dev, (virt_to_phys(addr)), (flags)) + dm_pci_phys_to_bus(dev, (virt_to_phys(addr)), 0, (flags))#define dm_pci_bus_to_virt (dev, addr, flags, len, map_flags) \ - map_physmem(dm_pci_bus_to_phys(dev, (addr), (flags)), \ + map_physmem(dm_pci_bus_to_phys(dev, (addr), (len), (flags)), \ (len), (map_flags))#define dm_pci_phys_to_mem (dev, addr) \ - dm_pci_phys_to_bus((dev), (addr), PCI_REGION_MEM) + dm_pci_phys_to_bus((dev), (addr), 0, PCI_REGION_MEM)#define dm_pci_mem_to_phys (dev, addr) \ - dm_pci_bus_to_phys((dev), (addr), PCI_REGION_MEM) + dm_pci_bus_to_phys((dev), (addr), 0, PCI_REGION_MEM)#define dm_pci_phys_to_io (dev, addr) \ - dm_pci_phys_to_bus((dev), (addr), PCI_REGION_IO) + dm_pci_phys_to_bus((dev), (addr), 0, PCI_REGION_IO)#define dm_pci_io_to_phys (dev, addr) \ - dm_pci_bus_to_phys((dev), (addr), PCI_REGION_IO) + dm_pci_bus_to_phys((dev), (addr), 0, PCI_REGION_IO)#define dm_pci_virt_to_mem (dev, addr) \ dm_pci_virt_to_bus((dev), (addr), PCI_REGION_MEM)
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
PATCH v3 11/18 test: pci: Test PCI address conversion functions
In reply to Andrew ScullAdd tests for the functions dm_pci_bus_to_phys() and dm_pci_phys_to_bus() which convert between PCI bus addresses and physical addresses based on the ranges declared for the PCI controller.
The ranges of bus#1 are used for the tests, adding a translation to one of the ranges to cover more cases.
--- arch/sandbox/dts/test.dts | 2 +- test/dm/pci.c | 102 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 1 deletion(-)
arch/sandbox/dts/test.dts +1 -1
@@ -971,7 +971,7 @@ #address-cells = <3>; #size-cells = <2>; ranges = <0x02000000 0 0x30000000 0x30000000 0 0x2000 // MEM0 - 0x02000000 0 0x31000000 0x31000000 0 0x2000 // MEM1 + 0x02000000 0 0x31000000 0x3e000000 0 0x2000 // MEM1 0x01000000 0 0x40000000 0x40000000 0 0x2000>; sandbox,dev-info = <0x08 0x00 0x1234 0x5678 0x0c 0x00 0x1234 0x5678
test/dm/pci.c +102 -0
105 lines not on this page · raw message
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
Re: [PATCH v3 11/18] test: pci: Test PCI address conversion functions
Quoted 5 lines · Andrew Scull
Add tests for the functions
dm_pci_bus_to_phys()anddm_pci_phys_to_bus()which convert between PCI bus addresses and physical addresses based on the ranges declared for the PCI controller.
Quoted 9 lines
The ranges of bus#1 are used for the tests, adding a translation to one of the ranges to cover more cases.
Signed-off-by Andrew Scull <[email protected]>--- arch/sandbox/dts/test.dts | 2 +- test/dm/pci.c | 102 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 103 insertions(+), 1 deletion(-)
PATCH v3 12/18 pci: Map bars with offset and length
In reply to Andrew ScullEvolve dm_pci_map_bar() to include an offset and length parameter. These allow a portion of the memory to be mapped and range checks to be applied.
Passing both the offset and length as zero results in the previous behaviour and this is used to migrate the previous callers.
--- arch/x86/cpu/baytrail/cpu.c | 2 +- drivers/ata/ahci.c | 8 ++++---- drivers/ata/sata_sil.c | 4 ++-- drivers/gpio/octeon_gpio.c | 2 +- drivers/i2c/designware_i2c_pci.c | 2 +- drivers/i2c/intel_i2c.c | 2 +- drivers/i2c/octeon_i2c.c | 2 +- drivers/mmc/octeontx_hsmmc.c | 2 +- drivers/mmc/pci_mmc.c | 2 +- drivers/mtd/nand/raw/octeontx_bch.c | 4 ++-- drivers/mtd/nand/raw/octeontx_nand.c | 2 +- drivers/net/bnxt/bnxt.c | 6 +++--- drivers/net/e1000.c | 2 +- drivers/net/fsl_enetc.c | 2 +- drivers/net/fsl_enetc_mdio.c | 2 +- drivers/net/mscc_eswitch/felix_switch.c | 4 ++-- drivers/net/octeontx/bgx.c | 2 +- drivers/net/octeontx/nic_main.c | 2 +- drivers/net/octeontx/nicvf_main.c | 2 +- drivers/net/octeontx/smi.c | 2 +- drivers/net/octeontx2/cgx.c | 2 +- drivers/net/octeontx2/rvu_af.c | 2 +- drivers/net/octeontx2/rvu_pf.c | 2 +- drivers/net/pch_gbe.c | 2 +- drivers/nvme/nvme_pci.c | 4 ++-- drivers/pci/pci-uclass.c | 27 ++++++++++++++++--------- drivers/spi/octeon_spi.c | 2 +- drivers/usb/host/ehci-pci.c | 2 +- drivers/usb/host/ohci-pci.c | 2 +- drivers/usb/host/xhci-pci.c | 2 +- drivers/virtio/virtio_pci_legacy.c | 2 +- include/pci.h | 5 ++++- test/dm/pci.c | 12 +++++------ 33 files changed, 67 insertions(+), 55 deletions(-)
arch/x86/cpu/baytrail/cpu.c +1 -1
@@ -56,7 +56,7 @@ static int baytrail_uart_init(void *ctx, struct event *event)for (i =0 ; i <2 ; i++) { ret =dm_pci_bus_find_bdf (PCI_BDF (0 ,0x1e ,3 + i), &dev);if (!ret) { - base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 , + base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM );hsuart_clock_set (base); }
drivers/ata/ahci.c +4 -4
@@ -416,8 +416,8 @@ static int ahci_init_one(struct ahci_uc_priv *uc_priv, struct udevice *dev) uc_priv->udma_mask =0x7f ;/*Fixme,assume to support UDMA6 */ #if !defined(CONFIG_DM_SCSI ) - uc_priv->mmio_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_5 , -PCI_REGION_MEM ); + uc_priv->mmio_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_5 ,0 ,0 , +PCI_REGION_MEM );/* Take from kernel: * JMicron-specific fixup:
@@ -1148,7 +1148,7 @@ int ahci_probe_scsi_pci(struct udevice *ahci_dev)ulong base;u16 vendor, device; - base = (ulong )dm_pci_map_bar (ahci_dev,PCI_BASE_ADDRESS_5 , + base = (ulong )dm_pci_map_bar (ahci_dev,PCI_BASE_ADDRESS_5 ,0 ,0 ,PCI_REGION_MEM );/*
@@ -1163,7 +1163,7 @@ int ahci_probe_scsi_pci(struct udevice *ahci_dev)if (vendor ==PCI_VENDOR_ID_CAVIUM && device ==PCI_DEVICE_ID_CAVIUM_SATA ) - base = (uintptr_t )dm_pci_map_bar (ahci_dev,PCI_BASE_ADDRESS_0 , + base = (uintptr_t )dm_pci_map_bar (ahci_dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM );return ahci_probe_scsi (ahci_dev, base); }
drivers/ata/sata_sil.c +2 -2
@@ -699,9 +699,9 @@ static int sil_pci_probe(struct udevice *dev)/* Read out all BARs */ sata_info.iobase[0 ] = (ulong )dm_pci_map_bar (dev, -PCI_BASE_ADDRESS_0 ,PCI_REGION_MEM ); +PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); sata_info.iobase[1 ] = (ulong )dm_pci_map_bar (dev, -PCI_BASE_ADDRESS_2 ,PCI_REGION_MEM ); +PCI_BASE_ADDRESS_2 ,0 ,0 ,PCI_REGION_MEM );/* mask out the unused bits */ sata_info.iobase[0 ] &=0xffffff80 ;
drivers/gpio/octeon_gpio.c +1 -1
@@ -183,7 +183,7 @@ static int octeon_gpio_probe(struct udevice *dev) priv->data = (const struct octeon_gpio_data *)dev_get_driver_data (dev);if (priv->data->probe ==PROBE_PCI ) { - priv->base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 , + priv->base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); uc_priv->gpio_count =readq (priv->base + priv->data->reg_offs + GPIO_CONST) &
drivers/i2c/designware_i2c_pci.c +1 -1
@@ -59,7 +59,7 @@ static int designware_i2c_pci_of_to_plat(struct udevice *dev) priv->regs = (struct i2c_regs *)dm_pci_read_bar32 (dev,0 ); }else { priv->regs = (struct i2c_regs *) -dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,PCI_REGION_MEM ); +dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); }if (!priv->regs)return -EINVAL ;
drivers/i2c/intel_i2c.c +1 -1
@@ -251,7 +251,7 @@ static int intel_i2c_probe(struct udevice *dev)ulong base;/* Save base address from PCI BAR */ - priv->base = (ulong )dm_pci_map_bar (dev,PCI_BASE_ADDRESS_4 , + priv->base = (ulong )dm_pci_map_bar (dev,PCI_BASE_ADDRESS_4 ,0 ,0 ,PCI_REGION_IO ); base = priv->base;
drivers/i2c/octeon_i2c.c +1 -1
@@ -792,7 +792,7 @@ static int octeon_i2c_probe(struct udevice *dev)debug ("TWSI PCI device: %x\n" , bdf); - twsi->base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 , + twsi->base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); }else { twsi->base =dev_remap_addr (dev);
drivers/mmc/octeontx_hsmmc.c +1 -1
@@ -3822,7 +3822,7 @@ static int octeontx_mmc_host_probe(struct udevice *dev)/* Octeon TX & TX2 use PCI based probing */ if (device_is_compatible (dev,"cavium,thunder-8890-mmc" )) { - host->base_addr =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 , + host->base_addr =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM );if (!host->base_addr) { pr_err("%s: Error: MMC base address not found\n",
drivers/mmc/pci_mmc.c +1 -1
@@ -50,7 +50,7 @@ static int pci_mmc_probe(struct udevice *dev) desc =mmc_get_blk_desc (&plat->mmc); desc->removable = !(plat->cfg.host_caps &MMC_CAP_NONREMOVABLE ); - host->ioaddr = (void *)dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 , + host->ioaddr = (void *)dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); host->name = dev->name; host->cd_gpio = priv->cd_gpio;
drivers/mtd/nand/raw/octeontx_bch.c +2 -2
@@ -176,7 +176,7 @@ static int octeontx_pci_bchpf_probe(struct udevice *dev)if (!bch)return -ENOMEM ; - bch->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,PCI_REGION_MEM ); + bch->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); bch->dev = dev;debug ("%s: base address: %p\n" , __func__, bch->reg_base);
@@ -361,7 +361,7 @@ static int octeontx_pci_bchvf_probe(struct udevice *dev) vf->dev = dev;/* Map PF's configuration registers */ - vf->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,PCI_REGION_MEM ); + vf->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM );debug ("%s: reg base: %p\n" , __func__, vf->reg_base); err = octeontx_cmd_queue_initialize(dev, QID_BCH, QDEPTH - 1, 0,
drivers/mtd/nand/raw/octeontx_nand.c +1 -1
@@ -2098,7 +2098,7 @@ static int octeontx_pci_nand_probe(struct udevice *dev) tn->dev = dev;INIT_LIST_HEAD (&tn->chips); - tn->base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,PCI_REGION_MEM ); + tn->base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM );if (!tn->base) { ret = -EINVAL ; goto release;
drivers/net/bnxt/bnxt.c +3 -3
@@ -28,9 +28,9 @@ static void bnxt_bring_pci(struct bnxt *bp)dm_pci_read_config16 (bp->pdev,PCI_SUBSYSTEM_ID , &bp->subsystem_device);dm_pci_read_config16 (bp->pdev,PCI_COMMAND , &bp->cmd_reg);dm_pci_read_config8 (bp->pdev,PCI_INTERRUPT_LINE , &bp->irq); - bp->bar0 =dm_pci_map_bar (bp->pdev,PCI_BASE_ADDRESS_0 ,PCI_REGION_MEM ); - bp->bar1 =dm_pci_map_bar (bp->pdev,PCI_BASE_ADDRESS_2 ,PCI_REGION_MEM ); - bp->bar2 =dm_pci_map_bar (bp->pdev,PCI_BASE_ADDRESS_4 ,PCI_REGION_MEM ); + bp->bar0 =dm_pci_map_bar (bp->pdev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); + bp->bar1 =dm_pci_map_bar (bp->pdev,PCI_BASE_ADDRESS_2 ,0 ,0 ,PCI_REGION_MEM ); + bp->bar2 =dm_pci_map_bar (bp->pdev,PCI_BASE_ADDRESS_4 ,0 ,0 ,PCI_REGION_MEM ); cmd_reg = bp->cmd_reg |PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER ; cmd_reg |=PCI_COMMAND_INTX_DISABLE ;/* disable intr */ dm_pci_write_config16 (bp->pdev,PCI_COMMAND , cmd_reg);
drivers/net/e1000.c +1 -1
@@ -5549,7 +5549,7 @@ static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno, hw->eeprom_semaphore_present = true;#endif #ifdef CONFIG_DM_ETH - hw->hw_addr =dm_pci_map_bar (devno,PCI_BASE_ADDRESS_0 , + hw->hw_addr =dm_pci_map_bar (devno,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM );#else hw->hw_addr = pci_map_bar(devno, PCI_BASE_ADDRESS_0,
drivers/net/fsl_enetc.c +1 -1
@@ -344,7 +344,7 @@ static int enetc_probe(struct udevice *dev) }/* initialize register */ - priv->regs_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ); + priv->regs_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,0 );if (!priv->regs_base) {enetc_dbg (dev,"failed to map BAR0\n" );return -EINVAL ;
drivers/net/fsl_enetc_mdio.c +1 -1
@@ -125,7 +125,7 @@ static int enetc_mdio_probe(struct udevice *dev) {struct enetc_mdio_priv *priv =dev_get_priv (dev); - priv->regs_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ); + priv->regs_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,0 );if (!priv->regs_base) {enetc_dbg (dev,"failed to map BAR0\n" );return -EINVAL ;
drivers/net/mscc_eswitch/felix_switch.c +2 -2
@@ -292,13 +292,13 @@ static int felix_probe(struct udevice *dev)return -ENODEV ; } - priv->imdio_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ); + priv->imdio_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,0 );if (!priv->imdio_base) {dev_err (dev,"failed to map BAR0\n" );return -EINVAL ; } - priv->regs_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_4 ,0 ); + priv->regs_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_4 ,0 ,0 ,0 );if (!priv->regs_base) {dev_err (dev,"failed to map BAR4\n" );return -EINVAL ;
drivers/net/octeontx/bgx.c +1 -1
@@ -1458,7 +1458,7 @@ int octeontx_bgx_probe(struct udevice *dev)int bgx_idx, node;int inc =1 ; - bgx->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 , + bgx->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM );if (!bgx->reg_base) {debug ("No PCI region found\n" );
drivers/net/octeontx/nic_main.c +1 -1
@@ -713,7 +713,7 @@ int nic_initialize(struct udevice *dev)return -ENOMEM ;/* MAP PF's configuration registers */ - nic->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 , + nic->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM );if (!nic->reg_base) {printf ("Cannot map config register space, aborting\n" );
drivers/net/octeontx/nicvf_main.c +1 -1
@@ -509,7 +509,7 @@ int nicvf_initialize(struct udevice *dev)/* Enable TSO support */ nicvf->hw_tso = true; - nicvf->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 , + nicvf->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM );debug ("nicvf->reg_base: %p\n" , nicvf->reg_base);
drivers/net/octeontx/smi.c +1 -1
@@ -322,7 +322,7 @@ int octeontx_smi_probe(struct udevice *dev)u64 baseaddr;debug ("SMI PCI device: %x\n" , bdf); -if (!dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,PCI_REGION_MEM )) { +if (!dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM )) {printf ("Failed to map PCI region for bdf %x\n" , bdf);return -1 ; }
drivers/net/octeontx2/cgx.c +1 -1
@@ -253,7 +253,7 @@ int cgx_probe(struct udevice *dev)struct cgx *cgx =dev_get_priv (dev);int err; - cgx->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 , + cgx->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); cgx->dev = dev; cgx->cgx_id = ((u64)(cgx->reg_base) >>24 ) &0x7 ;
drivers/net/octeontx2/rvu_af.c +1 -1
@@ -127,7 +127,7 @@ int rvu_af_probe(struct udevice *dev) {struct rvu_af *af_ptr =dev_get_priv (dev); - af_ptr->af_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 , + af_ptr->af_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM );debug ("%s RVU AF BAR %p\n" , __func__, af_ptr->af_base); af_ptr->dev = dev;
drivers/net/octeontx2/rvu_pf.c +1 -1
@@ -58,7 +58,7 @@ int rvu_pf_probe(struct udevice *dev)debug ("%s: name: %s\n" , __func__, dev->name); - rvu->pf_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_2 ,PCI_REGION_MEM ); + rvu->pf_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_2 ,0 ,0 ,PCI_REGION_MEM ); rvu->pfid =dev_seq (dev) +1 ;// RVU PF's start from 1; rvu->dev = dev;if (!rvu_af_dev) {
drivers/net/pch_gbe.c +1 -1
@@ -449,7 +449,7 @@ static int pch_gbe_probe(struct udevice *dev) priv->dev = dev; - iobase =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_1 ,PCI_REGION_MEM ); + iobase =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_1 ,0 ,0 ,PCI_REGION_MEM ); plat->iobase = (ulong )iobase; priv->mac_regs = (struct pch_gbe_regs *)iobase;
drivers/nvme/nvme_pci.c +2 -2
@@ -28,8 +28,8 @@ static int nvme_probe(struct udevice *udev)sprintf (ndev->vendor,"0x%.4x" , pplat->vendor); ndev->instance =trailing_strtol (udev->name); - ndev->bar =dm_pci_map_bar (udev,PCI_BASE_ADDRESS_0 , -PCI_REGION_MEM ); + ndev->bar =dm_pci_map_bar (udev,PCI_BASE_ADDRESS_0 ,0 ,0 , +PCI_REGION_MEM );return nvme_init (udev); }
drivers/pci/pci-uclass.c +18 -9
@@ -1561,7 +1561,8 @@ static phys_addr_t dm_pci_map_ea_virt(struct udevice *dev, int ea_off,return addr; } -static void *dm_pci_map_ea_bar (struct udevice *dev,int bar,int ea_off, +static void *dm_pci_map_ea_bar (struct udevice *dev,int bar,size_t offset, +size_t len,int ea_off,struct pci_child_plat *pdata) {int ea_cnt, i, entry_size;
@@ -1604,14 +1605,18 @@ static void *dm_pci_map_ea_bar(struct udevice *dev, int bar, int ea_off,if (IS_ENABLED (CONFIG_PCI_SRIOV )) addr +=dm_pci_map_ea_virt (dev, ea_off, pdata); +if (~((phys_addr_t )0 ) - addr < offset) +return NULL ; +/* size ignored for now */ -return map_physmem (addr,0 ,MAP_NOCACHE ); +return map_physmem (addr + offset, len,MAP_NOCACHE ); }return 0 ; } -void *dm_pci_map_bar (struct udevice *dev,int bar,unsigned long flags) +void *dm_pci_map_bar (struct udevice *dev,int bar,size_t offset,size_t len, +unsigned long flags) {struct pci_child_plat *pdata =dev_get_parent_plat (dev);struct udevice *udev = dev;
@@ -1636,19 +1641,23 @@ void *dm_pci_map_bar(struct udevice *dev, int bar, unsigned long flags)*/ ea_off =dm_pci_find_capability (udev,PCI_CAP_ID_EA );if (ea_off) -return dm_pci_map_ea_bar (udev, bar, ea_off, pdata); +return dm_pci_map_ea_bar (udev, bar, offset, len, ea_off, pdata);/* read BAR address */ dm_pci_read_config32 (udev, bar, &bar_response); pci_bus_addr = (pci_addr_t)(bar_response & ~0xf ); +if (~((pci_addr_t )0 ) - pci_bus_addr < offset) +return NULL ; +/* -* Pass "0" as the length argument to pci_bus_to_virt. The arg -* isn't actually used on any platform because U-Boot assumes a static -* linear mapping. In the future, this could read the BAR size -* and pass that as the size if needed. +* Forward the length argument to dm_pci_bus_to_virt. The length will +* be used to check that the entire address range has been declared as +* a PCI range, but a better check would be to probe for the size of +* the bar and prevent overflow more locally. */ -return dm_pci_bus_to_virt (udev, pci_bus_addr, flags,0 ,MAP_NOCACHE ); +return dm_pci_bus_to_virt (udev, pci_bus_addr + offset, flags, len, +MAP_NOCACHE ); }static int _dm_pci_find_next_capability (struct udevice *dev,u8 pos,int cap)
drivers/spi/octeon_spi.c +1 -1
@@ -568,7 +568,7 @@ static int octeon_spi_probe(struct udevice *dev)pci_dev_t bdf =dm_pci_get_bdf (dev);debug ("SPI PCI device: %x\n" , bdf); - priv->base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 , + priv->base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM );/* Add base offset */ priv->base +=0x1000 ;
drivers/usb/host/ehci-pci.c +1 -1
@@ -36,7 +36,7 @@ static int ehci_pci_init(struct udevice *dev, struct ehci_hccr **ret_hccr,return ret; hccr = (struct ehci_hccr *)dm_pci_map_bar (dev, -PCI_BASE_ADDRESS_0 ,PCI_REGION_MEM ); +PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); hcor = (struct ehci_hcor *)((uintptr_t ) hccr +HC_LENGTH (ehci_readl (&hccr->cr_capbase)));
drivers/usb/host/ohci-pci.c +1 -1
@@ -18,7 +18,7 @@ static int ohci_pci_probe(struct udevice *dev) {struct ohci_regs *regs; - regs =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,PCI_REGION_MEM ); + regs =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM );return ohci_register (dev, regs); }
drivers/usb/host/xhci-pci.c +1 -1
@@ -27,7 +27,7 @@ static int xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr,u32 cmd; hccr = (struct xhci_hccr *)dm_pci_map_bar (dev, -PCI_BASE_ADDRESS_0 ,PCI_REGION_MEM ); +PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM );if (!hccr) {printf ("xhci-pci init cannot map PCI mem bar\n" );return -EIO ;
drivers/virtio/virtio_pci_legacy.c +1 -1
@@ -319,7 +319,7 @@ static int virtio_pci_probe(struct udevice *udev) uc_priv->device = subdevice; uc_priv->vendor = subvendor; - priv->ioaddr =dm_pci_map_bar (udev,PCI_BASE_ADDRESS_0 ,PCI_REGION_IO ); + priv->ioaddr =dm_pci_map_bar (udev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_IO );if (!priv->ioaddr)return -ENXIO ; debug("(%s): virtio legacy device reg base %04lx\n",
include/pci.h +4 -1
@@ -1348,10 +1348,13 @@ pci_addr_t dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t addr, size_t len,* * @dev: Device to check * @bar: Bar register offset (PCI_BASE_ADDRESS_...) +* @offset: Offset from the base to map +* @len: Length to map * @flags: Flags for the region type (PCI_REGION_...) * @return: pointer to the virtual address to use or 0 on error */ -void *dm_pci_map_bar (struct udevice *dev,int bar,unsigned long flags); +void *dm_pci_map_bar (struct udevice *dev,int bar,size_t offset,size_t len, +unsigned long flags);/** * dm_pci_find_next_capability() - find a capability starting from an offset
test/dm/pci.c +6 -6
@@ -268,27 +268,27 @@ static int dm_test_pci_ea(struct unit_test_state *uts)ut_asserteq (PCI_CAP_ID_EA_OFFSET , cap);/* test swap case in BAR 1 */ - bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_0 ,0 ); + bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_0 ,0 ,0 ,0 );ut_assertnonnull (bar); *(int *)bar =2 ;/* swap upper/lower */ - bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_1 ,0 ); + bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_1 ,0 ,0 ,0 );ut_assertnonnull (bar);strcpy (bar,"ea TEST" );unmap_sysmem (bar); - bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_1 ,0 ); + bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_1 ,0 ,0 ,0 );ut_assertnonnull (bar);ut_asserteq_str ("EA test" , bar);/* test magic values in BARs2, 4; BAR 3 is n/a */ - bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_2 ,0 ); + bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_2 ,0 ,0 ,0 );ut_assertnonnull (bar);ut_asserteq (PCI_EA_BAR2_MAGIC , *(u32 *)bar); - bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_3 ,0 ); + bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_3 ,0 ,0 ,0 );ut_assertnull (bar); - bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_4 ,0 ); + bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_4 ,0 ,0 ,0 );ut_assertnonnull (bar);ut_asserteq (PCI_EA_BAR4_MAGIC , *(u32 *)bar);
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
Re: [PATCH v3 12/18] pci: Map bars with offset and length
Quoted 36 lines · Andrew Scull
Evolve
dm_pci_map_bar()to include an offset and length parameter. These allow a portion of the memory to be mapped and range checks to be applied.Passing both the offset and length as zero results in the previous behaviour and this is used to migrate the previous callers.
Signed-off-by Andrew Scull <[email protected]>--- arch/x86/cpu/baytrail/cpu.c | 2 +- drivers/ata/ahci.c | 8 ++++---- drivers/ata/sata_sil.c | 4 ++-- drivers/gpio/octeon_gpio.c | 2 +- drivers/i2c/designware_i2c_pci.c | 2 +- drivers/i2c/intel_i2c.c | 2 +- drivers/i2c/octeon_i2c.c | 2 +- drivers/mmc/octeontx_hsmmc.c | 2 +- drivers/mmc/pci_mmc.c | 2 +- drivers/mtd/nand/raw/octeontx_bch.c | 4 ++-- drivers/mtd/nand/raw/octeontx_nand.c | 2 +- drivers/net/bnxt/bnxt.c | 6 +++--- drivers/net/e1000.c | 2 +- drivers/net/fsl_enetc.c | 2 +- drivers/net/fsl_enetc_mdio.c | 2 +- drivers/net/mscc_eswitch/felix_switch.c | 4 ++-- drivers/net/octeontx/bgx.c | 2 +- drivers/net/octeontx/nic_main.c | 2 +- drivers/net/octeontx/nicvf_main.c | 2 +- drivers/net/octeontx/smi.c | 2 +- drivers/net/octeontx2/cgx.c | 2 +- drivers/net/octeontx2/rvu_af.c | 2 +- drivers/net/octeontx2/rvu_pf.c | 2 +- drivers/net/pch_gbe.c | 2 +- drivers/nvme/nvme_pci.c | 4 ++-- drivers/pci/pci-uclass.c | 27 ++++++++++++++++---------
Quoted 9 lines
drivers/spi/octeon_spi.c | 2 +- drivers/usb/host/ehci-pci.c | 2 +- drivers/usb/host/ohci-pci.c | 2 +- drivers/usb/host/xhci-pci.c | 2 +- drivers/virtio/virtio_pci_legacy.c | 2 +- include/pci.h | 5 ++++- test/dm/pci.c | 12 +++++------ 33 files changed, 67 insertions(+), 55 deletions(-)
PATCH v3 13/18 pci: Match region flags using a mask
In reply to Andrew ScullWhen converting addresses, apply a mask to the region flags during lookup. This allows the caller to specify which flags are important and which are not, for example to exclude system memory regions.
The behaviour of the function is changed such that they don't preferentially search for a non-system memory region. However, system memory regions are added after other regions in decode_regions() leading to a similar outcome.
--- drivers/pci/pci-uclass.c | 110 +++++++++------------------------------ include/pci.h | 18 ++++--- test/dm/pci.c | 60 +++++++++++---------- 3 files changed, 67 insertions(+), 121 deletions(-)
drivers/pci/pci-uclass.c +25 -85
@@ -1390,27 +1390,27 @@ void dm_pci_write_bar32(struct udevice *dev, int barnum, u32 addr)dm_pci_write_config32 (dev, bar, addr); } -static int _dm_pci_bus_to_phys (struct udevice *ctlr,pci_addr_t bus_addr, -size_t len,unsigned long flags, -unsigned long skip_mask,phys_addr_t *pa) +phys_addr_t dm_pci_bus_to_phys (struct udevice *dev,pci_addr_t bus_addr, +size_t len,unsigned long mask, +unsigned long flags) { -struct pci_controller *hose =dev_get_uclass_priv (ctlr); +struct udevice *ctlr; +struct pci_controller *hose;struct pci_region *res;pci_addr_t offset;int i; -if (hose->region_count ==0 ) { - *pa = bus_addr; -return 0 ; - } +/* The root controller has the region information */ + ctlr =pci_get_controller (dev); + hose =dev_get_uclass_priv (ctlr); + +if (hose->region_count ==0 ) +return bus_addr;for (i =0 ; i < hose->region_count; i++) { res = &hose->regions[i]; -if (((res->flags ^ flags) &PCI_REGION_TYPE ) !=0 ) -continue ; - -if (res->flags & skip_mask) +if ((res->flags & mask) != flags)continue ;if (bus_addr < res->bus_start)
@@ -1423,69 +1423,34 @@ static int _dm_pci_bus_to_phys(struct udevice *ctlr, pci_addr_t bus_addr,if (len > res->size - offset)continue ; - *pa = res->phys_start + offset; -return 0 ; +return res->phys_start + offset; } -return 1 ; +puts ("pci_hose_bus_to_phys: invalid physical address\n" ); +return 0 ; } -phys_addr_t dm_pci_bus_to_phys (struct udevice *dev,pci_addr_t bus_addr, -size_t len,unsigned long flags) +pci_addr_t dm_pci_phys_to_bus (struct udevice *dev,phys_addr_t phys_addr, +size_t len,unsigned long mask, +unsigned long flags) { -phys_addr_t phys_addr =0 ;struct udevice *ctlr; -int ret; - -/* The root controller has the region information */ - ctlr =pci_get_controller (dev); - -/* -* if PCI_REGION_MEM is set we do a two pass search with preference -* on matches that don't have PCI_REGION_SYS_MEMORY set -*/ -if ((flags &PCI_REGION_TYPE ) ==PCI_REGION_MEM ) { - ret =_dm_pci_bus_to_phys (ctlr, bus_addr, len, - flags,PCI_REGION_SYS_MEMORY , - &phys_addr); -if (!ret) -return phys_addr; - } - - ret =_dm_pci_bus_to_phys (ctlr, bus_addr, len, flags,0 , &phys_addr); - -if (ret) -puts ("pci_hose_bus_to_phys: invalid physical address\n" ); - -return phys_addr; -} - -static int _dm_pci_phys_to_bus (struct udevice *dev,phys_addr_t phys_addr, -size_t len,unsigned long flags, -unsigned long skip_mask,pci_addr_t *ba) -{ +struct pci_controller *hose;struct pci_region *res; -struct udevice *ctlr;phys_addr_t offset;int i; -struct pci_controller *hose;/* The root controller has the region information */ ctlr =pci_get_controller (dev); hose =dev_get_uclass_priv (ctlr); -if (hose->region_count ==0 ) { - *ba = phys_addr; -return 0 ; - } +if (hose->region_count ==0 ) +return phys_addr;for (i =0 ; i < hose->region_count; i++) { res = &hose->regions[i]; -if (((res->flags ^ flags) &PCI_REGION_TYPE ) !=0 ) -continue ; - -if (res->flags & skip_mask) +if ((res->flags & mask) != flags)continue ;if (phys_addr < res->phys_start)
@@ -1498,36 +1463,11 @@ static int _dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t phys_addr,if (len > res->size - offset)continue ; - *ba = res->bus_start + offset; -return 0 ; - } - -return 1 ; -} - -pci_addr_t dm_pci_phys_to_bus (struct udevice *dev,phys_addr_t phys_addr, -size_t len,unsigned long flags) -{ -pci_addr_t bus_addr =0 ; -int ret; - -/* -* if PCI_REGION_MEM is set we do a two pass search with preference -* on matches that don't have PCI_REGION_SYS_MEMORY set -*/ -if ((flags &PCI_REGION_TYPE ) ==PCI_REGION_MEM ) { - ret =_dm_pci_phys_to_bus (dev, phys_addr, len, flags, -PCI_REGION_SYS_MEMORY , &bus_addr); -if (!ret) -return bus_addr; +return res->bus_start + offset; } - ret =_dm_pci_phys_to_bus (dev, phys_addr, len, flags,0 , &bus_addr); - -if (ret) -puts ("pci_hose_phys_to_bus: invalid physical address\n" ); - -return bus_addr; +puts ("pci_hose_phys_to_bus: invalid physical address\n" ); +return 0 ; } static phys_addr_t dm_pci_map_ea_virt(struct udevice *dev, int ea_off,
include/pci.h +10 -8
@@ -1318,11 +1318,12 @@ u32 dm_pci_read_bar32(const struct udevice *dev, int barnum);* @dev: Device containing the PCI address * @addr: PCI address to convert * @len: Length of the address range +* @mask: Mask to match flags for the region type * @flags: Flags for the region type (PCI_REGION_...) * Return: physical address corresponding to that PCI bus address */ phys_addr_t dm_pci_bus_to_phys (struct udevice *dev,pci_addr_t addr,size_t len, -unsigned long flags); +unsigned long mask,unsigned long flags);/** * dm_pci_phys_to_bus() - convert a physical address to a PCI bus address
@@ -1330,11 +1331,12 @@ phys_addr_t dm_pci_bus_to_phys(struct udevice *dev, pci_addr_t addr, size_t len,* @dev: Device containing the bus address * @addr: Physical address to convert * @len: Length of the address range +* @mask: Mask to match flags for the region type * @flags: Flags for the region type (PCI_REGION_...) * Return: PCI bus address corresponding to that physical address */ pci_addr_t dm_pci_phys_to_bus (struct udevice *dev,phys_addr_t addr,size_t len, -unsigned long flags); +unsigned long mask,unsigned long flags);/** * dm_pci_map_bar() - get a virtual address associated with a BAR region
@@ -1458,19 +1460,19 @@ int dm_pci_find_ext_capability(struct udevice *dev, int cap);int dm_pci_flr (struct udevice *dev);#define dm_pci_virt_to_bus (dev, addr, flags) \ - dm_pci_phys_to_bus(dev, (virt_to_phys(addr)), 0, (flags)) + dm_pci_phys_to_bus(dev, (virt_to_phys(addr)), 0, PCI_REGION_TYPE, (flags))#define dm_pci_bus_to_virt (dev, addr, flags, len, map_flags) \ - map_physmem(dm_pci_bus_to_phys(dev, (addr), (len), (flags)), \ + map_physmem(dm_pci_bus_to_phys(dev, (addr), (len), PCI_REGION_TYPE, (flags)), \ (len), (map_flags))#define dm_pci_phys_to_mem (dev, addr) \ - dm_pci_phys_to_bus((dev), (addr), 0, PCI_REGION_MEM) + dm_pci_phys_to_bus((dev), (addr), 0, PCI_REGION_TYPE, PCI_REGION_MEM)#define dm_pci_mem_to_phys (dev, addr) \ - dm_pci_bus_to_phys((dev), (addr), 0, PCI_REGION_MEM) + dm_pci_bus_to_phys((dev), (addr), 0, PCI_REGION_TYPE, PCI_REGION_MEM)#define dm_pci_phys_to_io (dev, addr) \ - dm_pci_phys_to_bus((dev), (addr), 0, PCI_REGION_IO) + dm_pci_phys_to_bus((dev), (addr), 0, PCI_REGION_TYPE, PCI_REGION_IO)#define dm_pci_io_to_phys (dev, addr) \ - dm_pci_bus_to_phys((dev), (addr), 0, PCI_REGION_IO) + dm_pci_bus_to_phys((dev), (addr), 0, PCI_REGION_TYPE, PCI_REGION_IO)#define dm_pci_virt_to_mem (dev, addr) \ dm_pci_virt_to_bus((dev), (addr), PCI_REGION_MEM)
test/dm/pci.c +32 -28
122 lines not on this page · raw message
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
PATCH v3 14/18 pci: Update dm_pci_bus_to_virt() parameters
In reply to Andrew ScullAdd mask parameter and reorder length parameter to match the other PCI address conversion functions. Using PCI_REGION_TYPE as the mask gives the old behaviour.
It's converted from a macro to an inline function as the length parameter is now used twice, but should only be calculated once.
--- drivers/bios_emulator/atibios.c | 4 ++-- drivers/pci/pci-uclass.c | 4 ++-- include/pci.h | 16 +++++++++++----- 3 files changed, 15 insertions(+), 9 deletions(-)
drivers/bios_emulator/atibios.c +2 -2
@@ -368,8 +368,8 @@ void *PCI_mapBIOSImage(struct udevice *pcidev)return NULL ; } - BIOSImage =dm_pci_bus_to_virt (pcidev, BIOSImageBus, -PCI_REGION_MEM ,0 ,MAP_NOCACHE ); + BIOSImage =dm_pci_bus_to_virt (pcidev, BIOSImageBus,0 ,PCI_REGION_TYPE , +PCI_REGION_MEM ,MAP_NOCACHE );/*Change the PCI BAR registers to map it onto the bus.*/ dm_pci_write_config32 (pcidev, BIOSImageBAR,0 );
drivers/pci/pci-uclass.c +2 -2
@@ -1596,8 +1596,8 @@ void *dm_pci_map_bar(struct udevice *dev, int bar, size_t offset, size_t len,* a PCI range, but a better check would be to probe for the size of * the bar and prevent overflow more locally. */ -return dm_pci_bus_to_virt (udev, pci_bus_addr + offset, flags, len, -MAP_NOCACHE ); +return dm_pci_bus_to_virt (udev, pci_bus_addr + offset, len, +PCI_REGION_TYPE , flags,MAP_NOCACHE ); }static int _dm_pci_find_next_capability (struct udevice *dev,u8 pos,int cap)
include/pci.h +11 -5
@@ -1461,9 +1461,13 @@ int dm_pci_flr(struct udevice *dev);#define dm_pci_virt_to_bus (dev, addr, flags) \ dm_pci_phys_to_bus(dev, (virt_to_phys(addr)), 0, PCI_REGION_TYPE, (flags)) -#define dm_pci_bus_to_virt (dev, addr, flags, len, map_flags) \ - map_physmem(dm_pci_bus_to_phys(dev, (addr), (len), PCI_REGION_TYPE, (flags)), \ - (len), (map_flags)) +#define dm_pci_bus_to_virt (dev, addr, len, mask, flags, map_flags) \ +({ \ + size_t _len = (len); \ + phys_addr_t phys_addr = dm_pci_bus_to_phys((dev), (addr), _len, \ + (mask), (flags)); \ + map_physmem(phys_addr, _len, (map_flags)); \ +})#define dm_pci_phys_to_mem (dev, addr) \ dm_pci_phys_to_bus((dev), (addr), 0, PCI_REGION_TYPE, PCI_REGION_MEM)
@@ -1477,11 +1481,13 @@ int dm_pci_flr(struct udevice *dev);#define dm_pci_virt_to_mem (dev, addr) \ dm_pci_virt_to_bus((dev), (addr), PCI_REGION_MEM)#define dm_pci_mem_to_virt (dev, addr, len, map_flags) \ - dm_pci_bus_to_virt((dev), (addr), PCI_REGION_MEM, (len), (map_flags)) + dm_pci_bus_to_virt((dev), (addr), (len), PCI_REGION_TYPE, \ + PCI_REGION_MEM, (map_flags))#define dm_pci_virt_to_io (dev, addr) \ dm_pci_virt_to_bus((dev), (addr), PCI_REGION_IO)#define dm_pci_io_to_virt (dev, addr, len, map_flags) \ - dm_pci_bus_to_virt((dev), (addr), PCI_REGION_IO, (len), (map_flags)) + dm_pci_bus_to_virt((dev), (addr), (len), PCI_REGION_TYPE, \ + PCI_REGION_IO, (map_flags))/** * dm_pci_find_device() - find a device by vendor/device ID
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
Re: [PATCH v3 14/18] pci: Update dm_pci_bus_to_virt() parameters
Quoted 8 lines · Andrew Scull
Add mask parameter and reorder length parameter to match the other PCI address conversion functions. Using
PCI_REGION_TYPEas the mask gives the old behaviour.It's converted from a macro to an inline function as the length parameter is now used twice, but should only be calculated once.
Quoted 7 lines
Signed-off-by Andrew Scull <[email protected]>--- drivers/bios_emulator/atibios.c | 4 ++-- drivers/pci/pci-uclass.c | 4 ++-- include/pci.h | 16 +++++++++++----- 3 files changed, 15 insertions(+), 9 deletions(-)
PATCH v3 15/18 pci: Add mask parameter to dm_pci_map_bar()
In reply to Andrew ScullAdd a mask parameter to control the lookup of the PCI region from which the mapping can be made.
--- arch/x86/cpu/baytrail/cpu.c | 2 +- drivers/ata/ahci.c | 7 ++++--- drivers/ata/sata_sil.c | 6 ++++-- drivers/gpio/octeon_gpio.c | 2 +- drivers/i2c/designware_i2c_pci.c | 3 ++- drivers/i2c/intel_i2c.c | 2 +- drivers/i2c/octeon_i2c.c | 2 +- drivers/mmc/octeontx_hsmmc.c | 2 +- drivers/mmc/pci_mmc.c | 2 +- drivers/mtd/nand/raw/octeontx_bch.c | 6 ++++-- drivers/mtd/nand/raw/octeontx_nand.c | 2 +- drivers/net/bnxt/bnxt.c | 9 ++++++--- drivers/net/e1000.c | 2 +- drivers/net/fsl_enetc.c | 2 +- drivers/net/fsl_enetc_mdio.c | 2 +- drivers/net/mscc_eswitch/felix_switch.c | 4 ++-- drivers/net/octeontx/bgx.c | 2 +- drivers/net/octeontx/nic_main.c | 2 +- drivers/net/octeontx/nicvf_main.c | 2 +- drivers/net/octeontx/smi.c | 2 +- drivers/net/octeontx2/cgx.c | 2 +- drivers/net/octeontx2/rvu_af.c | 2 +- drivers/net/octeontx2/rvu_pf.c | 3 ++- drivers/net/pch_gbe.c | 2 +- drivers/nvme/nvme_pci.c | 2 +- drivers/pci/pci-uclass.c | 6 +++--- drivers/spi/octeon_spi.c | 2 +- drivers/usb/host/ehci-pci.c | 3 ++- drivers/usb/host/ohci-pci.c | 2 +- drivers/usb/host/xhci-pci.c | 3 ++- drivers/virtio/virtio_pci_legacy.c | 3 ++- include/pci.h | 3 ++- test/dm/pci.c | 12 ++++++------ 33 files changed, 61 insertions(+), 47 deletions(-)
arch/x86/cpu/baytrail/cpu.c +1 -1
@@ -56,7 +56,7 @@ static int baytrail_uart_init(void *ctx, struct event *event)for (i =0 ; i <2 ; i++) { ret =dm_pci_bus_find_bdf (PCI_BDF (0 ,0x1e ,3 + i), &dev);if (!ret) { - base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 , + base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM );hsuart_clock_set (base); }
drivers/ata/ahci.c +4 -3
@@ -417,7 +417,7 @@ static int ahci_init_one(struct ahci_uc_priv *uc_priv, struct udevice *dev)#if !defined(CONFIG_DM_SCSI ) uc_priv->mmio_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_5 ,0 ,0 , -PCI_REGION_MEM ); +PCI_REGION_TYPE ,PCI_REGION_MEM );/* Take from kernel: * JMicron-specific fixup:
@@ -1149,7 +1149,7 @@ int ahci_probe_scsi_pci(struct udevice *ahci_dev)u16 vendor, device; base = (ulong )dm_pci_map_bar (ahci_dev,PCI_BASE_ADDRESS_5 ,0 ,0 , -PCI_REGION_MEM ); +PCI_REGION_TYPE ,PCI_REGION_MEM );/* * Note:
@@ -1163,7 +1163,8 @@ int ahci_probe_scsi_pci(struct udevice *ahci_dev)if (vendor ==PCI_VENDOR_ID_CAVIUM && device ==PCI_DEVICE_ID_CAVIUM_SATA ) - base = (uintptr_t )dm_pci_map_bar (ahci_dev,PCI_BASE_ADDRESS_0 ,0 ,0 , + base = (uintptr_t )dm_pci_map_bar (ahci_dev,PCI_BASE_ADDRESS_0 , +0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM );return ahci_probe_scsi (ahci_dev, base); }
drivers/ata/sata_sil.c +4 -2
@@ -699,9 +699,11 @@ static int sil_pci_probe(struct udevice *dev)/* Read out all BARs */ sata_info.iobase[0 ] = (ulong )dm_pci_map_bar (dev, -PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); +PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE , +PCI_REGION_MEM ); sata_info.iobase[1 ] = (ulong )dm_pci_map_bar (dev, -PCI_BASE_ADDRESS_2 ,0 ,0 ,PCI_REGION_MEM ); +PCI_BASE_ADDRESS_2 ,0 ,0 ,PCI_REGION_TYPE , +PCI_REGION_MEM );/* mask out the unused bits */ sata_info.iobase[0 ] &=0xffffff80 ;
drivers/gpio/octeon_gpio.c +1 -1
@@ -183,7 +183,7 @@ static int octeon_gpio_probe(struct udevice *dev) priv->data = (const struct octeon_gpio_data *)dev_get_driver_data (dev);if (priv->data->probe ==PROBE_PCI ) { - priv->base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 , + priv->base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM ); uc_priv->gpio_count =readq (priv->base + priv->data->reg_offs + GPIO_CONST) &
drivers/i2c/designware_i2c_pci.c +2 -1
@@ -59,7 +59,8 @@ static int designware_i2c_pci_of_to_plat(struct udevice *dev) priv->regs = (struct i2c_regs *)dm_pci_read_bar32 (dev,0 ); }else { priv->regs = (struct i2c_regs *) -dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); +dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 , +PCI_REGION_TYPE ,PCI_REGION_MEM ); }if (!priv->regs)return -EINVAL ;
drivers/i2c/intel_i2c.c +1 -1
@@ -251,7 +251,7 @@ static int intel_i2c_probe(struct udevice *dev)ulong base;/* Save base address from PCI BAR */ - priv->base = (ulong )dm_pci_map_bar (dev,PCI_BASE_ADDRESS_4 ,0 ,0 , + priv->base = (ulong )dm_pci_map_bar (dev,PCI_BASE_ADDRESS_4 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_IO ); base = priv->base;
drivers/i2c/octeon_i2c.c +1 -1
@@ -792,7 +792,7 @@ static int octeon_i2c_probe(struct udevice *dev)debug ("TWSI PCI device: %x\n" , bdf); - twsi->base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 , + twsi->base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM ); }else { twsi->base =dev_remap_addr (dev);
drivers/mmc/octeontx_hsmmc.c +1 -1
@@ -3822,7 +3822,7 @@ static int octeontx_mmc_host_probe(struct udevice *dev)/* Octeon TX & TX2 use PCI based probing */ if (device_is_compatible (dev,"cavium,thunder-8890-mmc" )) { - host->base_addr =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 , + host->base_addr =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM );if (!host->base_addr) { pr_err("%s: Error: MMC base address not found\n",
drivers/mmc/pci_mmc.c +1 -1
@@ -50,7 +50,7 @@ static int pci_mmc_probe(struct udevice *dev) desc =mmc_get_blk_desc (&plat->mmc); desc->removable = !(plat->cfg.host_caps &MMC_CAP_NONREMOVABLE ); - host->ioaddr = (void *)dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 , + host->ioaddr = (void *)dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM ); host->name = dev->name; host->cd_gpio = priv->cd_gpio;
drivers/mtd/nand/raw/octeontx_bch.c +4 -2
@@ -176,7 +176,8 @@ static int octeontx_pci_bchpf_probe(struct udevice *dev)if (!bch)return -ENOMEM ; - bch->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); + bch->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 , +PCI_REGION_TYPE ,PCI_REGION_MEM ); bch->dev = dev;debug ("%s: base address: %p\n" , __func__, bch->reg_base);
@@ -361,7 +362,8 @@ static int octeontx_pci_bchvf_probe(struct udevice *dev) vf->dev = dev;/* Map PF's configuration registers */ - vf->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); + vf->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 , +PCI_REGION_TYPE ,PCI_REGION_MEM );debug ("%s: reg base: %p\n" , __func__, vf->reg_base); err = octeontx_cmd_queue_initialize(dev, QID_BCH, QDEPTH - 1, 0,
drivers/mtd/nand/raw/octeontx_nand.c +1 -1
@@ -2098,7 +2098,7 @@ static int octeontx_pci_nand_probe(struct udevice *dev) tn->dev = dev;INIT_LIST_HEAD (&tn->chips); - tn->base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); + tn->base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM );if (!tn->base) { ret = -EINVAL ; goto release;
drivers/net/bnxt/bnxt.c +6 -3
@@ -28,9 +28,12 @@ static void bnxt_bring_pci(struct bnxt *bp)dm_pci_read_config16 (bp->pdev,PCI_SUBSYSTEM_ID , &bp->subsystem_device);dm_pci_read_config16 (bp->pdev,PCI_COMMAND , &bp->cmd_reg);dm_pci_read_config8 (bp->pdev,PCI_INTERRUPT_LINE , &bp->irq); - bp->bar0 =dm_pci_map_bar (bp->pdev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); - bp->bar1 =dm_pci_map_bar (bp->pdev,PCI_BASE_ADDRESS_2 ,0 ,0 ,PCI_REGION_MEM ); - bp->bar2 =dm_pci_map_bar (bp->pdev,PCI_BASE_ADDRESS_4 ,0 ,0 ,PCI_REGION_MEM ); + bp->bar0 =dm_pci_map_bar (bp->pdev,PCI_BASE_ADDRESS_0 ,0 ,0 , +PCI_REGION_TYPE ,PCI_REGION_MEM ); + bp->bar1 =dm_pci_map_bar (bp->pdev,PCI_BASE_ADDRESS_2 ,0 ,0 , +PCI_REGION_TYPE ,PCI_REGION_MEM ); + bp->bar2 =dm_pci_map_bar (bp->pdev,PCI_BASE_ADDRESS_4 ,0 ,0 , +PCI_REGION_TYPE ,PCI_REGION_MEM ); cmd_reg = bp->cmd_reg |PCI_COMMAND_MEMORY |PCI_COMMAND_MASTER ; cmd_reg |=PCI_COMMAND_INTX_DISABLE ;/* disable intr */ dm_pci_write_config16 (bp->pdev,PCI_COMMAND , cmd_reg);
drivers/net/e1000.c +1 -1
@@ -5550,7 +5550,7 @@ static int e1000_init_one(struct e1000_hw *hw, int cardnum, pci_dev_t devno,#endif #ifdef CONFIG_DM_ETH hw->hw_addr =dm_pci_map_bar (devno,PCI_BASE_ADDRESS_0 ,0 ,0 , -PCI_REGION_MEM ); +PCI_REGION_TYPE ,PCI_REGION_MEM );#else hw->hw_addr =pci_map_bar (devno,PCI_BASE_ADDRESS_0 ,PCI_REGION_MEM );
drivers/net/fsl_enetc.c +1 -1
@@ -344,7 +344,7 @@ static int enetc_probe(struct udevice *dev) }/* initialize register */ - priv->regs_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,0 ); + priv->regs_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,0 );if (!priv->regs_base) {enetc_dbg (dev,"failed to map BAR0\n" );return -EINVAL ;
drivers/net/fsl_enetc_mdio.c +1 -1
@@ -125,7 +125,7 @@ static int enetc_mdio_probe(struct udevice *dev) {struct enetc_mdio_priv *priv =dev_get_priv (dev); - priv->regs_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,0 ); + priv->regs_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,0 );if (!priv->regs_base) {enetc_dbg (dev,"failed to map BAR0\n" );return -EINVAL ;
drivers/net/mscc_eswitch/felix_switch.c +2 -2
@@ -292,13 +292,13 @@ static int felix_probe(struct udevice *dev)return -ENODEV ; } - priv->imdio_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,0 ); + priv->imdio_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,0 );if (!priv->imdio_base) {dev_err (dev,"failed to map BAR0\n" );return -EINVAL ; } - priv->regs_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_4 ,0 ,0 ,0 ); + priv->regs_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_4 ,0 ,0 ,PCI_REGION_TYPE ,0 );if (!priv->regs_base) {dev_err (dev,"failed to map BAR4\n" );return -EINVAL ;
drivers/net/octeontx/bgx.c +1 -1
@@ -1458,7 +1458,7 @@ int octeontx_bgx_probe(struct udevice *dev)int bgx_idx, node;int inc =1 ; - bgx->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 , + bgx->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM );if (!bgx->reg_base) {debug ("No PCI region found\n" );
drivers/net/octeontx/nic_main.c +1 -1
@@ -713,7 +713,7 @@ int nic_initialize(struct udevice *dev)return -ENOMEM ;/* MAP PF's configuration registers */ - nic->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 , + nic->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM );if (!nic->reg_base) {printf ("Cannot map config register space, aborting\n" );
drivers/net/octeontx/nicvf_main.c +1 -1
@@ -509,7 +509,7 @@ int nicvf_initialize(struct udevice *dev)/* Enable TSO support */ nicvf->hw_tso = true; - nicvf->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 , + nicvf->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM );debug ("nicvf->reg_base: %p\n" , nicvf->reg_base);
drivers/net/octeontx/smi.c +1 -1
@@ -322,7 +322,7 @@ int octeontx_smi_probe(struct udevice *dev)u64 baseaddr;debug ("SMI PCI device: %x\n" , bdf); -if (!dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM )) { +if (!dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM )) {printf ("Failed to map PCI region for bdf %x\n" , bdf);return -1 ; }
drivers/net/octeontx2/cgx.c +1 -1
@@ -253,7 +253,7 @@ int cgx_probe(struct udevice *dev)struct cgx *cgx =dev_get_priv (dev);int err; - cgx->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 , + cgx->reg_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM ); cgx->dev = dev; cgx->cgx_id = ((u64)(cgx->reg_base) >>24 ) &0x7 ;
drivers/net/octeontx2/rvu_af.c +1 -1
@@ -127,7 +127,7 @@ int rvu_af_probe(struct udevice *dev) {struct rvu_af *af_ptr =dev_get_priv (dev); - af_ptr->af_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 , + af_ptr->af_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM );debug ("%s RVU AF BAR %p\n" , __func__, af_ptr->af_base); af_ptr->dev = dev;
drivers/net/octeontx2/rvu_pf.c +2 -1
@@ -58,7 +58,8 @@ int rvu_pf_probe(struct udevice *dev)debug ("%s: name: %s\n" , __func__, dev->name); - rvu->pf_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_2 ,0 ,0 ,PCI_REGION_MEM ); + rvu->pf_base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_2 ,0 ,0 , +PCI_REGION_TYPE ,PCI_REGION_MEM ); rvu->pfid =dev_seq (dev) +1 ;// RVU PF's start from 1; rvu->dev = dev;if (!rvu_af_dev) {
drivers/net/pch_gbe.c +1 -1
@@ -449,7 +449,7 @@ static int pch_gbe_probe(struct udevice *dev) priv->dev = dev; - iobase =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_1 ,0 ,0 ,PCI_REGION_MEM ); + iobase =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_1 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM ); plat->iobase = (ulong )iobase; priv->mac_regs = (struct pch_gbe_regs *)iobase;
drivers/nvme/nvme_pci.c +1 -1
@@ -29,7 +29,7 @@ static int nvme_probe(struct udevice *udev) ndev->instance =trailing_strtol (udev->name); ndev->bar =dm_pci_map_bar (udev,PCI_BASE_ADDRESS_0 ,0 ,0 , -PCI_REGION_MEM ); +PCI_REGION_TYPE ,PCI_REGION_MEM );return nvme_init (udev); }
drivers/pci/pci-uclass.c +3 -3
@@ -1556,7 +1556,7 @@ static void *dm_pci_map_ea_bar(struct udevice *dev, int bar, size_t offset, }void *dm_pci_map_bar (struct udevice *dev,int bar,size_t offset,size_t len, -unsigned long flags) +unsigned long mask,unsigned long flags) {struct pci_child_plat *pdata =dev_get_parent_plat (dev);struct udevice *udev = dev;
@@ -1596,8 +1596,8 @@ void *dm_pci_map_bar(struct udevice *dev, int bar, size_t offset, size_t len,* a PCI range, but a better check would be to probe for the size of * the bar and prevent overflow more locally. */ -return dm_pci_bus_to_virt (udev, pci_bus_addr + offset, len, -PCI_REGION_TYPE , flags,MAP_NOCACHE ); +return dm_pci_bus_to_virt (udev, pci_bus_addr + offset, len, mask, flags, +MAP_NOCACHE ); }static int _dm_pci_find_next_capability (struct udevice *dev,u8 pos,int cap)
drivers/spi/octeon_spi.c +1 -1
@@ -568,7 +568,7 @@ static int octeon_spi_probe(struct udevice *dev)pci_dev_t bdf =dm_pci_get_bdf (dev);debug ("SPI PCI device: %x\n" , bdf); - priv->base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 , + priv->base =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM );/* Add base offset */ priv->base +=0x1000 ;
drivers/usb/host/ehci-pci.c +2 -1
@@ -36,7 +36,8 @@ static int ehci_pci_init(struct udevice *dev, struct ehci_hccr **ret_hccr,return ret; hccr = (struct ehci_hccr *)dm_pci_map_bar (dev, -PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); +PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE , +PCI_REGION_MEM ); hcor = (struct ehci_hcor *)((uintptr_t ) hccr +HC_LENGTH (ehci_readl (&hccr->cr_capbase)));
drivers/usb/host/ohci-pci.c +1 -1
@@ -18,7 +18,7 @@ static int ohci_pci_probe(struct udevice *dev) {struct ohci_regs *regs; - regs =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); + regs =dm_pci_map_bar (dev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,PCI_REGION_MEM );return ohci_register (dev, regs); }
drivers/usb/host/xhci-pci.c +2 -1
@@ -27,7 +27,8 @@ static int xhci_pci_init(struct udevice *dev, struct xhci_hccr **ret_hccr,u32 cmd; hccr = (struct xhci_hccr *)dm_pci_map_bar (dev, -PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_MEM ); +PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE , +PCI_REGION_MEM );if (!hccr) {printf ("xhci-pci init cannot map PCI mem bar\n" );return -EIO ;
drivers/virtio/virtio_pci_legacy.c +2 -1
@@ -319,7 +319,8 @@ static int virtio_pci_probe(struct udevice *udev) uc_priv->device = subdevice; uc_priv->vendor = subvendor; - priv->ioaddr =dm_pci_map_bar (udev,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_IO ); + priv->ioaddr =dm_pci_map_bar (udev,PCI_BASE_ADDRESS_0 ,0 ,0 , +PCI_REGION_TYPE ,PCI_REGION_IO );if (!priv->ioaddr)return -ENXIO ; debug("(%s): virtio legacy device reg base %04lx\n",
include/pci.h +2 -1
@@ -1352,11 +1352,12 @@ pci_addr_t dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t addr, size_t len,* @bar: Bar register offset (PCI_BASE_ADDRESS_...) * @offset: Offset from the base to map * @len: Length to map +* @mask: Mask to match flags for the region type * @flags: Flags for the region type (PCI_REGION_...) * @return: pointer to the virtual address to use or 0 on error */ void *dm_pci_map_bar (struct udevice *dev,int bar,size_t offset,size_t len, -unsigned long flags); +unsigned long mask,unsigned long flags);/** * dm_pci_find_next_capability() - find a capability starting from an offset
test/dm/pci.c +6 -6
@@ -268,27 +268,27 @@ static int dm_test_pci_ea(struct unit_test_state *uts)ut_asserteq (PCI_CAP_ID_EA_OFFSET , cap);/* test swap case in BAR 1 */ - bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_0 ,0 ,0 ,0 ); + bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_0 ,0 ,0 ,PCI_REGION_TYPE ,0 );ut_assertnonnull (bar); *(int *)bar =2 ;/* swap upper/lower */ - bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_1 ,0 ,0 ,0 ); + bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_1 ,0 ,0 ,PCI_REGION_TYPE ,0 );ut_assertnonnull (bar);strcpy (bar,"ea TEST" );unmap_sysmem (bar); - bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_1 ,0 ,0 ,0 ); + bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_1 ,0 ,0 ,PCI_REGION_TYPE ,0 );ut_assertnonnull (bar);ut_asserteq_str ("EA test" , bar);/* test magic values in BARs2, 4; BAR 3 is n/a */ - bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_2 ,0 ,0 ,0 ); + bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_2 ,0 ,0 ,PCI_REGION_TYPE ,0 );ut_assertnonnull (bar);ut_asserteq (PCI_EA_BAR2_MAGIC , *(u32 *)bar); - bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_3 ,0 ,0 ,0 ); + bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_3 ,0 ,0 ,PCI_REGION_TYPE ,0 );ut_assertnull (bar); - bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_4 ,0 ,0 ,0 ); + bar =dm_pci_map_bar (swap,PCI_BASE_ADDRESS_4 ,0 ,0 ,PCI_REGION_TYPE ,0 );ut_assertnonnull (bar);ut_asserteq (PCI_EA_BAR4_MAGIC , *(u32 *)bar);
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
Re: [PATCH v3 15/18] pci: Add mask parameter to dm_pci_map_bar()
Quoted 32 lines · Andrew Scull
Add a mask parameter to control the lookup of the PCI region from which the mapping can be made.
Signed-off-by Andrew Scull <[email protected]>--- arch/x86/cpu/baytrail/cpu.c | 2 +- drivers/ata/ahci.c | 7 ++++--- drivers/ata/sata_sil.c | 6 ++++-- drivers/gpio/octeon_gpio.c | 2 +- drivers/i2c/designware_i2c_pci.c | 3 ++- drivers/i2c/intel_i2c.c | 2 +- drivers/i2c/octeon_i2c.c | 2 +- drivers/mmc/octeontx_hsmmc.c | 2 +- drivers/mmc/pci_mmc.c | 2 +- drivers/mtd/nand/raw/octeontx_bch.c | 6 ++++-- drivers/mtd/nand/raw/octeontx_nand.c | 2 +- drivers/net/bnxt/bnxt.c | 9 ++++++--- drivers/net/e1000.c | 2 +- drivers/net/fsl_enetc.c | 2 +- drivers/net/fsl_enetc_mdio.c | 2 +- drivers/net/mscc_eswitch/felix_switch.c | 4 ++-- drivers/net/octeontx/bgx.c | 2 +- drivers/net/octeontx/nic_main.c | 2 +- drivers/net/octeontx/nicvf_main.c | 2 +- drivers/net/octeontx/smi.c | 2 +- drivers/net/octeontx2/cgx.c | 2 +- drivers/net/octeontx2/rvu_af.c | 2 +- drivers/net/octeontx2/rvu_pf.c | 3 ++- drivers/net/pch_gbe.c | 2 +- drivers/nvme/nvme_pci.c | 2 +- drivers/pci/pci-uclass.c | 6 +++---
Quoted 9 lines
drivers/spi/octeon_spi.c | 2 +- drivers/usb/host/ehci-pci.c | 3 ++- drivers/usb/host/ohci-pci.c | 2 +- drivers/usb/host/xhci-pci.c | 3 ++- drivers/virtio/virtio_pci_legacy.c | 3 ++- include/pci.h | 3 ++- test/dm/pci.c | 12 ++++++------ 33 files changed, 61 insertions(+), 47 deletions(-)
PATCH v3 16/18 virtio: pci: Check virtio configs are mapped
In reply to Andrew ScullPrepare for calls to virtio_pci_map_capability() failing by returning NULL on error. If this happens, later accesses to the pointers would be unsafe so cause the probe to fail if such an error occurs.
--- drivers/virtio/virtio_pci_modern.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
drivers/virtio/virtio_pci_modern.c +17 -3
@@ -533,7 +533,19 @@ static int virtio_pci_probe(struct udevice *udev)return -EINVAL ; } +/* Map configuration structures */ + priv->common =virtio_pci_map_capability (udev, &common_cap); +if (!priv->common) { +printf ("(%s): could not map common config\n" , udev->name); +return -EINVAL ; + } + priv->notify_len = notify_cap.length; + priv->notify_base =virtio_pci_map_capability (udev, ¬ify_cap); +if (!priv->notify_base) { +printf ("(%s): could not map notify config\n" , udev->name); +return -EINVAL ; + }/* * Device capability is only mandatory for devices that have
@@ -545,11 +557,13 @@ static int virtio_pci_probe(struct udevice *udev)if (device) { priv->device_len = device_cap.length; priv->device =virtio_pci_map_capability (udev, &device_cap); +if (!priv->device) { +printf ("(%s): could not map device config\n" , + udev->name); +return -EINVAL ; + } } -/* Map configuration structures */ - priv->common =virtio_pci_map_capability (udev, &common_cap); - priv->notify_base =virtio_pci_map_capability (udev, ¬ify_cap);debug ("(%p): common @ %p, notify base @ %p, device @ %p\n" , udev, priv->common, priv->notify_base, priv->device);
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
PATCH v3 17/18 virtio: pci: Make use of dm_pci_map_bar()
In reply to Andrew ScullThe 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.
--- drivers/virtio/virtio_pci_modern.c | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-)
drivers/virtio/virtio_pci_modern.c +8 -10
@@ -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,const struct virtio_pci_cap *cap) { -ulong base; -void __iomem *p; -/* -* 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. +* Find the corresponding memory region that isn't system memory but is +* writable. */ - base =dm_pci_read_bar32 (udev, cap->bar); - p = (void __iomem *)base + cap->offset; +unsigned long mask = +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)
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog
PATCH v3 18/18 pci: Add config for Enhanced Allocation
In reply to Andrew ScullAdd a config to control whether Enhanced Allocation is supported by the driver.
--- drivers/pci/Kconfig | 7 +++++++ drivers/pci/pci-uclass.c | 12 ++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-)
drivers/pci/Kconfig +7 -0
@@ -67,6 +67,13 @@ config PCI_SRIOV if available on a PCI Physical Function device and probe for applicable drivers. +config PCI_ENHANCED_ALLOCATION + bool "Enable support for Enhanced Allocation of resources" + default y + help + Enable support for Enhanced Allocation which can be used by supported + devices in place of traditional BARS for allocation of resources. + config PCI_ARID bool "Enable Alternate Routing-ID support for PCI" help
drivers/pci/pci-uclass.c +10 -2
@@ -645,7 +645,11 @@ int dm_pci_hose_probe_bus(struct udevice *bus)return log_msg_ret ("probe" , -EINVAL ); } - ea_pos =dm_pci_find_capability (bus,PCI_CAP_ID_EA ); +if (IS_ENABLED (CONFIG_PCI_ENHANCED_ALLOCATION )) + ea_pos =dm_pci_find_capability (bus,PCI_CAP_ID_EA ); +else + ea_pos =0 ; +if (ea_pos) {dm_pci_read_config8 (bus, ea_pos +sizeof (u32) +sizeof (u8), ®);
@@ -1579,7 +1583,11 @@ void *dm_pci_map_bar(struct udevice *dev, int bar, size_t offset, size_t len,* Incase of virtual functions, pdata will help read VF BEI * and EA entry size. */ - ea_off =dm_pci_find_capability (udev,PCI_CAP_ID_EA ); +if (IS_ENABLED (CONFIG_PCI_ENHANCED_ALLOCATION )) + ea_off =dm_pci_find_capability (udev,PCI_CAP_ID_EA ); +else + ea_off =0 ; +if (ea_off)return dm_pci_map_ea_bar (udev, bar, offset, len, ea_off, pdata);
Signature · 1 line
2.36.0.rc2.479.g8af0fa9b8e-goog