Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-30 08:07:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

pci: Update dm_pci_bus_to_virt() parameters

Browse source 
Add 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.

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:12 +00:00 • committed by Tom Rini
parent 7739d93d82
commit a822d1dee4
3 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/bios_emulator/atibios.c
View file

@ -368,8 +368,8 @@ void *PCI_mapBIOSImage(struct udevice *pcidev)
return NULL; return NULL;
} }
BIOSImage = dm_pci_bus_to_virt(pcidev, BIOSImageBus, BIOSImage = dm_pci_bus_to_virt(pcidev, BIOSImageBus, 0, PCI_REGION_TYPE,
PCI_REGION_MEM, 0, MAP_NOCACHE); PCI_REGION_MEM, MAP_NOCACHE);
/*Change the PCI BAR registers to map it onto the bus.*/ /*Change the PCI BAR registers to map it onto the bus.*/
dm_pci_write_config32(pcidev, BIOSImageBAR, 0); dm_pci_write_config32(pcidev, BIOSImageBAR, 0);

4
drivers/pci/pci-uclass.c
View file

@ -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 * a PCI range, but a better check would be to probe for the size of
* the bar and prevent overflow more locally. * the bar and prevent overflow more locally.
*/ */
return dm_pci_bus_to_virt(udev, pci_bus_addr + offset, flags, len, return dm_pci_bus_to_virt(udev, pci_bus_addr + offset, len,
MAP_NOCACHE); PCI_REGION_TYPE, flags, MAP_NOCACHE);
} }
static int _dm_pci_find_next_capability(struct udevice *dev, u8 pos, int cap) static int _dm_pci_find_next_capability(struct udevice *dev, u8 pos, int cap)

16
include/pci.h
View file

@ -1461,9 +1461,13 @@ int dm_pci_flr(struct udevice *dev);
#define dm_pci_virt_to_bus(dev, addr, flags) \ #define dm_pci_virt_to_bus(dev, addr, flags) \
dm_pci_phys_to_bus(dev, (virt_to_phys(addr)), 0, PCI_REGION_TYPE, (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) \ #define dm_pci_bus_to_virt(dev, addr, len, mask, flags, map_flags) \
map_physmem(dm_pci_bus_to_phys(dev, (addr), (len), PCI_REGION_TYPE, (flags)), \ ({ \
(len), (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) \ #define dm_pci_phys_to_mem(dev, addr) \
dm_pci_phys_to_bus((dev), (addr), 0, PCI_REGION_TYPE, PCI_REGION_MEM) 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) \ #define dm_pci_virt_to_mem(dev, addr) \
dm_pci_virt_to_bus((dev), (addr), PCI_REGION_MEM) dm_pci_virt_to_bus((dev), (addr), PCI_REGION_MEM)
#define dm_pci_mem_to_virt(dev, addr, len, map_flags) \ #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) \ #define dm_pci_virt_to_io(dev, addr) \
dm_pci_virt_to_bus((dev), (addr), PCI_REGION_IO) dm_pci_virt_to_bus((dev), (addr), PCI_REGION_IO)
#define dm_pci_io_to_virt(dev, addr, len, map_flags) \ #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 * dm_pci_find_device() - find a device by vendor/device ID