dm: Conversion of code to the new driver model PCI API

Most driver model PCI functions have a dm_ prefix. At some point, when the old code is converted to driver model and the old functions are removed, we will drop that prefix.

For consistency, we should use the dm_ prefix for all driver model functions. Update pci_get_bdf() accordingly.

Signed-off-by Simon Glass <[email protected]>

---

Most driver model PCI functions have a dm_ prefix. At some point, when the old code is converted to driver model and the old functions are removed, we will drop that prefix.

For consistency, we should use the dm_ prefix for all driver model functions. Update pci_bus_find_bdf() accordingly.

Signed-off-by Simon Glass <[email protected]>

---

At present we are using legacy functions even in the auto-configuration code used by driver model. Add a new pci_auto.c version which uses the correct API.

Create a new pci_internal.h header to hold functions that are used within the PCI subsystem, but are not exported to other drivers.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Add a new pci_internal.h header file for internal PCI functions
- Drop unnecessary comment at the top of pci_auto.c
- Fix the indentation of the 'bar' for() loop

Add a function which scans the driver model device information rather than scanning the PCI bus again.

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Bin Meng <[email protected]>

---

Changes in v2: None

Adjust the SCSI command to use driver model for its PCI interface.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Use dm_pci_get_bdf()

Add a function which scans the driver model device information rather than scanning the PCI bus again.

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Bin Meng <[email protected]>

---

Changes in v2: None

Use the driver model version of the function to find the BAR. This updates the fdtdec function, of which ns16550 is the only user.

The fdtdec_get_pci_bdf() function is dropped for several reasons:
- with driver model we should use 'struct udevice *' rather than passing the device tree offset explicitly
- there are no other users in the tree
- the function parses for information which is already available in the PCI device structure (specifically struct pci_child_platdata which is available at dev_get_parent_platdata(dev)

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Put this code behind CONFIG_DM_PCI to avoid PowerPC build errors

 drivers/serial/ns16550.c |  5 ++---
 include/fdtdec.h         | 23 +++----------------
 lib/fdtdec.c             | 57 +++++-------------------------------------------
 3 files changed, 10 insertions(+), 75 deletions(-)

drivers/serial/ns16550.c +2 -3

index d5bcbc3..28259e6 100644
@@ -368,7 +368,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
 
        /* try Processor Local Bus device first */
        addr = dev_get_addr(dev);
-#ifdef CONFIG_PCI
+#if defined(CONFIG_PCI) && defined(CONFIG_DM_PCI)
        if (addr == FDT_ADDR_T_NONE) {
                /* then try pci device */
                struct fdt_pci_addr pci_addr;

@@ -389,8 +389,7 @@ int ns16550_serial_ofdata_to_platdata(struct udevice *dev)
                                return ret;
                }
 
-               ret = fdtdec_get_pci_bar32(gd->fdt_blob, dev->of_offset,
-                                          &pci_addr, &bar);
+               ret = fdtdec_get_pci_bar32(dev, &pci_addr, &bar);
                if (ret)
                        return ret;
 

include/fdtdec.h +3 -20

index 7fe657d..018d151 100644
@@ -444,32 +444,15 @@ int fdtdec_get_pci_vendev(const void *blob, int node,
 
 /**
  * Look at the pci address of a device node that represents a PCI device
- * and parse the bus, device and function number from it. For some cases
- * like the bus number encoded in reg property is not correct after pci
- * enumeration, this function looks through the node's compatible strings
- * to get these numbers extracted instead.
- *
- * @param blob         FDT blob
- * @param node         node to examine
- * @param addr         pci address in the form of fdt_pci_addr
- * @param bdf          returns bus, device, function triplet
- * @return 0 if ok, negative on error
- */
-int fdtdec_get_pci_bdf(const void *blob, int node,
-               struct fdt_pci_addr *addr, pci_dev_t *bdf);
-
-/**
- * Look at the pci address of a device node that represents a PCI device
  * and return base address of the pci device's registers.
  *
- * @param blob         FDT blob
- * @param node         node to examine
+ * @param dev          device to examine
  * @param addr         pci address in the form of fdt_pci_addr
  * @param bar          returns base address of the pci device's registers
  * @return 0 if ok, negative on error
  */
-int fdtdec_get_pci_bar32(const void *blob, int node,
-               struct fdt_pci_addr *addr, u32 *bar);
+int fdtdec_get_pci_bar32(struct udevice *dev, struct fdt_pci_addr *addr,
+                        u32 *bar);
 
 /**
  * Look up a 32-bit integer property in a node and return it. The property

lib/fdtdec.c +4 -51

index 82d0090..f6f23ae 100644
@@ -5,6 +5,7 @@
 
 #ifndef USE_HOSTCC
 #include <common.h>
+#include <dm.h>
 #include <errno.h>
 #include <serial.h>
 #include <libfdt.h>

@@ -189,7 +190,7 @@ fdt_addr_t fdtdec_get_addr(const void *blob, int node,
        return fdtdec_get_addr_size(blob, node, prop_name, NULL);
 }
 
-#ifdef CONFIG_PCI
+#if defined(CONFIG_PCI) && defined(CONFIG_DM_PCI)
 int fdtdec_get_pci_addr(const void *blob, int node, enum fdt_pci_space type,
                const char *prop_name, struct fdt_pci_addr *addr)
 {

@@ -282,58 +283,10 @@ int fdtdec_get_pci_vendev(const void *blob, int node, u16 *vendor, u16 *device)
        return -ENOENT;
 }
 
-int fdtdec_get_pci_bdf(const void *blob, int node,
-               struct fdt_pci_addr *addr, pci_dev_t *bdf)
+int fdtdec_get_pci_bar32(struct udevice *dev, struct fdt_pci_addr *addr,
+                        u32 *bar)
 {
-       u16 dt_vendor, dt_device, vendor, device;
-       int ret;
-
-       /* get vendor id & device id from the compatible string */
-       ret = fdtdec_get_pci_vendev(blob, node, &dt_vendor, &dt_device);
-       if (ret)
-               return ret;
-
-       /* extract the bdf from fdt_pci_addr */
-       *bdf = addr->phys_hi & 0xffff00;
-
-       /* read vendor id & device id based on bdf */
-       pci_read_config_word(*bdf, PCI_VENDOR_ID, &vendor);
-       pci_read_config_word(*bdf, PCI_DEVICE_ID, &device);
-
-       /*
-        * Note there are two places in the device tree to fully describe
-        * a pci device: one is via compatible string with a format of
-        * "pciVVVV,DDDD" and the other one is the bdf numbers encoded in
-        * the device node's reg address property. We read the vendor id
-        * and device id based on bdf and compare the values with the
-        * "VVVV,DDDD". If they are the same, then we are good to use bdf
-        * to read device's bar. But if they are different, we have to rely
-        * on the vendor id and device id extracted from the compatible
-        * string and locate the real bdf by pci_find_device(). This is
-        * because normally we may only know device's device number and
-        * function number when writing device tree. The bus number is
-        * dynamically assigned during the pci enumeration process.
-        */
-       if ((dt_vendor != vendor) || (dt_device != device)) {
-               *bdf = pci_find_device(dt_vendor, dt_device, 0);
-               if (*bdf == -1)
-                       return -ENODEV;
-       }
-
-       return 0;
-}
-
-int fdtdec_get_pci_bar32(const void *blob, int node,
-               struct fdt_pci_addr *addr, u32 *bar)
-{
-       pci_dev_t bdf;
        int barnum;
-       int ret;
-
-       /* get pci devices's bdf */
-       ret = fdtdec_get_pci_bdf(blob, node, addr, &bdf);
-       if (ret)
-               return ret;
 
        /* extract the bar number from fdt_pci_addr */
        barnum = addr->phys_hi & 0xff;

Use the driver-model PCI functions here where possible. For now we have to search for the device with pci_bus_find_bdf() but at some point we can put this in a proper driver and avoid this.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Use pci_bus_find_bdf()

 arch/x86/cpu/ivybridge/bd82x6x.c              |  6 ++++--
 arch/x86/cpu/ivybridge/gma.c                  | 15 +++++++--------
 arch/x86/include/asm/arch-ivybridge/bd82x6x.h |  3 +--
 3 files changed, 12 insertions(+), 12 deletions(-)

arch/x86/cpu/ivybridge/bd82x6x.c +4 -2

index 3e7a907..434dfd6 100644
@@ -86,8 +86,10 @@ static int bd82x6x_probe(struct udevice *dev)
                debug("%s: Cannot find GMA node\n", __func__);
                return -EINVAL;
        }
-       ret = gma_func0_init(PCH_VIDEO_DEV, pci_bus_to_hose(0), blob,
-                            gma_node);
+       ret = dm_pci_bus_find_bdf(PCH_VIDEO_DEV, &dev);
+       if (ret)
+               return ret;
+       ret = gma_func0_init(dev, blob, gma_node);
        if (ret)
                return ret;
 

arch/x86/cpu/ivybridge/gma.c +7 -8

index 89d4a5e..695578b 100644
@@ -728,8 +728,7 @@ static int int15_handler(void)
        return res;
 }
 
-int gma_func0_init(pci_dev_t dev, struct pci_controller *hose,
-                  const void *blob, int node)
+int gma_func0_init(struct udevice *dev, const void *blob, int node)
 {
 #ifdef CONFIG_VIDEO
        ulong start;

@@ -740,16 +739,16 @@ int gma_func0_init(pci_dev_t dev, struct pci_controller *hose,
        int ret;
 
        /* IGD needs to be Bus Master */
-       reg32 = x86_pci_read_config32(dev, PCI_COMMAND);
+       dm_pci_read_config32(dev, PCI_COMMAND, &reg32);
        reg32 |= PCI_COMMAND_MASTER | PCI_COMMAND_MEMORY | PCI_COMMAND_IO;
-       x86_pci_write_config32(dev, PCI_COMMAND, reg32);
+       dm_pci_write_config32(dev, PCI_COMMAND, reg32);
 
        /* Use write-combining for the graphics memory, 256MB */
-       base = pci_read_bar32(hose, dev, 2);
+       base = dm_pci_read_bar32(dev, 2);
        mtrr_add_request(MTRR_TYPE_WRCOMB, base, 256 << 20);
        mtrr_commit(true);
 
-       gtt_bar = (void *)pci_read_bar32(pci_bus_to_hose(0), dev, 0);
+       gtt_bar = (void *)dm_pci_read_bar32(dev, 0);
        debug("GT bar %p\n", gtt_bar);
        ret = gma_pm_init_pre_vbios(gtt_bar);
        if (ret)

@@ -757,8 +756,8 @@ int gma_func0_init(pci_dev_t dev, struct pci_controller *hose,
 
 #ifdef CONFIG_VIDEO
        start = get_timer(0);
-       ret = pci_run_vga_bios(dev, int15_handler, PCI_ROM_USE_NATIVE |
-                              PCI_ROM_ALLOW_FALLBACK);
+       ret = pci_run_vga_bios(dm_pci_get_bdf(dev), int15_handler,
+                              PCI_ROM_USE_NATIVE | PCI_ROM_ALLOW_FALLBACK);
        debug("BIOS ran in %lums\n", get_timer(start));
 #endif
        /* Post VBIOS init */

arch/x86/include/asm/arch-ivybridge/bd82x6x.h +0 -0

index 7786493..fcdf6e2 100644

Adjust this code to use driver model for devices where possible. Since existing users have not been converted the old code must remain.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Drop non-DM PCI code
- Use dm_pci_get_bdf()
- Use pci_bus_find_bdf()

 arch/x86/lib/bios_interrupts.c | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

arch/x86/lib/bios_interrupts.c +22 -11

index 47d9f59..e8ca6e6 100644
@@ -105,13 +105,15 @@ int int1a_handler(void)
        unsigned short func = (unsigned short)M.x86.R_EAX;
        int retval = 1;
        unsigned short devid, vendorid, devfn;
+       struct udevice *dev;
        /* Use short to get rid of gabage in upper half of 32-bit register */
        short devindex;
        unsigned char bus;
-       pci_dev_t dev;
+       pci_dev_t bdf;
        u32 dword;
        u16 word;
        u8 byte, reg;
+       int ret;
 
        switch (func) {
        case 0xb101: /* PCIBIOS Check */

@@ -131,17 +133,20 @@ int int1a_handler(void)
                devid = M.x86.R_ECX;
                vendorid = M.x86.R_EDX;
                devindex = M.x86.R_ESI;
-               dev = pci_find_device(vendorid, devid, devindex);
-               if (dev != -1) {
+               bdf = -1;
+               ret = dm_pci_find_device(vendorid, devid, devindex, &dev);
+               if (!ret) {
                        unsigned short busdevfn;
+
+                       bdf = dm_pci_get_bdf(dev);
                        M.x86.R_EAX &= 0xffff00ff; /* Clear AH */
                        M.x86.R_EAX |= PCIBIOS_SUCCESSFUL;
                        /*
                         * busnum is an unsigned char;
                         * devfn is an int, so we mask it off.
                         */
-                       busdevfn = (PCI_BUS(dev) << 8) | PCI_DEV(dev) << 3 |
-                               PCI_FUNC(dev);
+                       busdevfn = (PCI_BUS(bdf) << 8) | PCI_DEV(bdf) << 3 |
+                               PCI_FUNC(bdf);
                        debug("0x%x: return 0x%x\n", func, busdevfn);
                        M.x86.R_EBX = busdevfn;
                        retval = 1;

@@ -160,35 +165,40 @@ int int1a_handler(void)
                devfn = M.x86.R_EBX & 0xff;
                bus = M.x86.R_EBX >> 8;
                reg = M.x86.R_EDI;
-               dev = PCI_BDF(bus, devfn >> 3, devfn & 7);
+               bdf = PCI_BDF(bus, devfn >> 3, devfn & 7);
+
+               ret = dm_pci_bus_find_bdf(bdf, &dev);
+               if (ret) {
+                       debug("%s: Device %x not found\n", __func__, bdf);
+                       break;
+               }
 
                switch (func) {
                case 0xb108: /* Read Config Byte */
-                       byte = x86_pci_read_config8(dev, reg);
+                       dm_pci_read_config8(dev, reg, &byte);
                        M.x86.R_ECX = byte;
                        break;
                case 0xb109: /* Read Config Word */
-                       word = x86_pci_read_config16(dev, reg);
+                       dm_pci_read_config16(dev, reg, &word);
                        M.x86.R_ECX = word;
                        break;
                case 0xb10a: /* Read Config Dword */
-                       dword = x86_pci_read_config32(dev, reg);
+                       dm_pci_read_config32(dev, reg, &dword);
                        M.x86.R_ECX = dword;
                        break;
                case 0xb10b: /* Write Config Byte */
                        byte = M.x86.R_ECX;
-                       x86_pci_write_config8(dev, reg, byte);
+                       dm_pci_write_config8(dev, reg, byte);
                        break;
                case 0xb10c: /* Write Config Word */
                        word = M.x86.R_ECX;
-                       x86_pci_write_config16(dev, reg, word);
+                       dm_pci_write_config16(dev, reg, word);
                        break;
                case 0xb10d: /* Write Config Dword */

Adjust these files to use the driver-model PCI API instead of the legacy functions.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Rename pci_run_vga_bios() to dm_pci_run_vga_bios()
- Require driver model with pci_rom.c
- Use dev_get_parent_platdata() instead of re-reading values from the device

 arch/x86/cpu/ivybridge/gma.c |  4 ++--
 drivers/pci/Makefile         |  3 ++-
 drivers/pci/pci_rom.c        | 51 +++++++++++++++++++++-----------------------
 drivers/video/vesa_fb.c      | 10 ++++-----
 include/pci_rom.h            |  6 +++---
 5 files changed, 36 insertions(+), 38 deletions(-)

Adjust these files to use the driver-model PCI API instead of the legacy functions.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Rename pci_run_vga_bios() to dm_pci_run_vga_bios()
- Require driver model with pci_rom.c
- Use dev_get_parent_platdata() instead of re-reading values from the device

 arch/x86/cpu/ivybridge/gma.c |  4 ++--
 drivers/pci/Makefile         |  3 ++-
 drivers/pci/pci_rom.c        | 51 +++++++++++++++++++++-----------------------
 drivers/video/vesa_fb.c      | 10 ++++-----
 include/pci_rom.h            |  6 +++---
 5 files changed, 36 insertions(+), 38 deletions(-)

arch/x86/cpu/ivybridge/gma.c +2 -2

index 695578b..85a09c6 100644
@@ -756,8 +756,8 @@ int gma_func0_init(struct udevice *dev, const void *blob, int node)
 
 #ifdef CONFIG_VIDEO
        start = get_timer(0);
-       ret = pci_run_vga_bios(dm_pci_get_bdf(dev), int15_handler,
-                              PCI_ROM_USE_NATIVE | PCI_ROM_ALLOW_FALLBACK);
+       ret = dm_pci_run_vga_bios(dev, int15_handler,
+                                 PCI_ROM_USE_NATIVE | PCI_ROM_ALLOW_FALLBACK);
        debug("BIOS ran in %lums\n", get_timer(start));
 #endif
        /* Post VBIOS init */

drivers/pci/Makefile +2 -1

index 62232fc..f8be9bf 100644
@@ -6,6 +6,7 @@
 #
 
 ifneq ($(CONFIG_DM_PCI),)
+obj-y += pci_rom.o
 obj-$(CONFIG_PCI) += pci-uclass.o pci_auto.o
 obj-$(CONFIG_DM_PCI_COMPAT) += pci_compat.o
 obj-$(CONFIG_PCI_SANDBOX) += pci_sandbox.o

@@ -14,7 +15,7 @@ obj-$(CONFIG_X86) += pci_x86.o
 else
 obj-$(CONFIG_PCI) += pci.o pci_auto_old.o
 endif
-obj-$(CONFIG_PCI) += pci_auto_common.o pci_common.o pci_rom.o
+obj-$(CONFIG_PCI) += pci_auto_common.o pci_common.o
 
 obj-$(CONFIG_FSL_PCI_INIT) += fsl_pci_init.o
 obj-$(CONFIG_PCI_INDIRECT_BRIDGE) += pci_indirect.o

drivers/pci/pci_rom.c +24 -27

index d244543..5989bad 100644
@@ -25,6 +25,7 @@
 
 #include <common.h>
 #include <bios_emul.h>
+#include <dm.h>
 #include <errno.h>
 #include <malloc.h>
 #include <pci.h>

@@ -37,12 +38,12 @@
 #include <asm/acpi.h>
 #endif
 
-__weak bool board_should_run_oprom(pci_dev_t dev)
+__weak bool board_should_run_oprom(struct udevice *dev)
 {
        return true;
 }
 
-static bool should_load_oprom(pci_dev_t dev)
+static bool should_load_oprom(struct udevice *dev)
 {
 #ifdef CONFIG_HAVE_ACPI_RESUME
        if (acpi_get_slp_type() == 3)

@@ -61,21 +62,18 @@ __weak uint32_t board_map_oprom_vendev(uint32_t vendev)
        return vendev;
 }
 
-static int pci_rom_probe(pci_dev_t dev, uint class,
-                        struct pci_rom_header **hdrp)
+static int pci_rom_probe(struct udevice *dev, struct pci_rom_header **hdrp)
 {
+       struct pci_child_platdata *pplat = dev_get_parent_platdata(dev);
        struct pci_rom_header *rom_header;
        struct pci_rom_data *rom_data;
-       u16 vendor, device;
        u16 rom_vendor, rom_device;
        u32 rom_class;
        u32 vendev;
        u32 mapped_vendev;
        u32 rom_address;
 
-       pci_read_config_word(dev, PCI_VENDOR_ID, &vendor);
-       pci_read_config_word(dev, PCI_DEVICE_ID, &device);
-       vendev = vendor << 16 | device;
+       vendev = pplat->vendor << 16 | pplat->device;
        mapped_vendev = board_map_oprom_vendev(vendev);
        if (vendev != mapped_vendev)
                debug("Device ID mapped to %#08x\n", mapped_vendev);

@@ -84,15 +82,15 @@ static int pci_rom_probe(pci_dev_t dev, uint class,
        rom_address = CONFIG_VGA_BIOS_ADDR;
 #else
 
-       pci_read_config_dword(dev, PCI_ROM_ADDRESS, &rom_address);
+       dm_pci_read_config32(dev, PCI_ROM_ADDRESS, &rom_address);
        if (rom_address == 0x00000000 || rom_address == 0xffffffff) {
                debug("%s: rom_address=%x\n", __func__, rom_address);
                return -ENOENT;
        }
 
        /* Enable expansion ROM address decoding. */
-       pci_write_config_dword(dev, PCI_ROM_ADDRESS,
-                              rom_address | PCI_ROM_ADDRESS_ENABLE);
+       dm_pci_write_config32(dev, PCI_ROM_ADDRESS,
+                             rom_address | PCI_ROM_ADDRESS_ENABLE);
 #endif
        debug("Option ROM address %x\n", rom_address);
        rom_header = (struct pci_rom_header *)(unsigned long)rom_address;

@@ -106,7 +104,7 @@ static int pci_rom_probe(pci_dev_t dev, uint class,
                       le16_to_cpu(rom_header->signature));
 #ifndef CONFIG_VGA_BIOS_ADDR
                /* Disable expansion ROM address decoding */
-               pci_write_config_dword(dev, PCI_ROM_ADDRESS, rom_address);
+               dm_pci_write_config32(dev, PCI_ROM_ADDRESS, rom_address);
 #endif
                return -EINVAL;
        }

@@ -119,7 +117,7 @@ static int pci_rom_probe(pci_dev_t dev, uint class,
              rom_vendor, rom_device);
 
        /* If the device id is mapped, a mismatch is expected */
-       if ((vendor != rom_vendor || device != rom_device) &&
+       if ((pplat->vendor != rom_vendor || pplat->device != rom_device) &&
            (vendev == mapped_vendev)) {
                printf("ID mismatch: vendor ID %04x, device ID %04x\n",
                       rom_vendor, rom_device);

@@ -130,9 +128,9 @@ static int pci_rom_probe(pci_dev_t dev, uint class,
        debug("PCI ROM image, Class Code %06x, Code Type %02x\n",
              rom_class, rom_data->type);
 
-       if (class != rom_class) {
+       if (pplat->class != rom_class) {
                debug("Class Code mismatch ROM %06x, dev %06x\n",
-                     rom_class, class);
+                     rom_class, pplat->class);
        }
        *hdrp = rom_header;
 

@@ -259,27 +257,26 @@ void setup_video(struct screen_info *screen_info)
        screen_info->rsvd_pos = vesa->reserved_mask_pos;
 }
 
-int pci_run_vga_bios(pci_dev_t dev, int (*int15_handler)(void), int exec_method)
+int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void),
+                       int exec_method)
 {
+       struct pci_child_platdata *pplat = dev_get_parent_platdata(dev);
        struct pci_rom_header *rom, *ram;
        int vesa_mode = -1;
-       uint class;
        bool emulate;
        int ret;
 
        /* Only execute VGA ROMs */
-       pci_read_config_dword(dev, PCI_REVISION_ID, &class);
-       if (((class >> 16) ^ PCI_CLASS_DISPLAY_VGA) & 0xff00) {
-               debug("%s: Class %#x, should be %#x\n", __func__, class,
+       if (((pplat->class >> 8) ^ PCI_CLASS_DISPLAY_VGA) & 0xff00) {
+               debug("%s: Class %#x, should be %#x\n", __func__, pplat->class,
                      PCI_CLASS_DISPLAY_VGA);
                return -ENODEV;
        }
-       class >>= 8;
 
        if (!should_load_oprom(dev))
                return -ENXIO;
 
-       ret = pci_rom_probe(dev, class, &rom);
+       ret = pci_rom_probe(dev, &rom);
        if (ret)
                return ret;
 

@@ -322,12 +319,12 @@ int pci_run_vga_bios(pci_dev_t dev, int (*int15_handler)(void), int exec_method)
 #ifdef CONFIG_BIOSEMU
                BE_VGAInfo *info;
 
-               ret = biosemu_setup(dev, &info);
+               ret = biosemu_setup(dm_pci_get_bdf(dev), &info);
                if (ret)
                        return ret;
                biosemu_set_interrupt_handler(0x15, int15_handler);
-               ret = biosemu_run(dev, (uchar *)ram, 1 << 16, info, true,
-                                 vesa_mode, &mode_info);
+               ret = biosemu_run(dm_pci_get_bdf(dev), (uchar *)ram, 1 << 16,
+                                 info, true, vesa_mode, &mode_info);
                if (ret)
                        return ret;
 #endif

@@ -335,8 +332,8 @@ int pci_run_vga_bios(pci_dev_t dev, int (*int15_handler)(void), int exec_method)
 #ifdef CONFIG_X86
                bios_set_interrupt_handler(0x15, int15_handler);
 
-               bios_run_on_x86(dev, (unsigned long)ram, vesa_mode,
-                               &mode_info);
+               bios_run_on_x86(dm_pci_get_bdf(dev), (unsigned long)ram,
+                               vesa_mode, &mode_info);
 #endif
        }
        debug("Final vesa mode %#x\n", mode_info.video_mode);

drivers/video/vesa_fb.c +5 -5

index a19651f..021c1d6 100644
@@ -19,8 +19,8 @@ GraphicDevice ctfb;
 void *video_hw_init(void)
 {
        GraphicDevice *gdev = &ctfb;
+       struct udevice *dev;
        int bits_per_pixel;
-       pci_dev_t dev;
        int ret;
 
        printf("Video: ");

@@ -33,14 +33,14 @@ void *video_hw_init(void)
                return NULL;
        }
        if (vbe_get_video_info(gdev)) {
-               dev = pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, 0);
-               if (dev < 0) {
+               ret = dm_pci_find_class(PCI_CLASS_DISPLAY_VGA << 8, 0, &dev);
+               if (ret) {
                        printf("no card detected\n");
                        return NULL;
                }
                bootstage_start(BOOTSTAGE_ID_ACCUM_LCD, "vesa display");
-               ret = pci_run_vga_bios(dev, NULL, PCI_ROM_USE_NATIVE |
-                                      PCI_ROM_ALLOW_FALLBACK);
+               ret = dm_pci_run_vga_bios(dev, NULL, PCI_ROM_USE_NATIVE |
+                                         PCI_ROM_ALLOW_FALLBACK);
                bootstage_accum(BOOTSTAGE_ID_ACCUM_LCD);
                if (ret) {
                        printf("failed to run video BIOS: %d\n", ret);

include/pci_rom.h +1 -1

index 2f1665d..95c6d07 100644
@@ -44,14 +44,14 @@ enum pci_rom_emul {
 };
 
  /**
- * pci_run_vga_bios() - Run the VGA BIOS in an x86 PC
+ * dm_pci_run_vga_bios() - Run the VGA BIOS in an x86 PC
  *
  * @dev:       Video device containing the BIOS
  * @int15_handler:     Function to call to handle int 0x15

This function should take a struct udevice rather than pci_dev_t. Update it.

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Bin Meng <[email protected]>

---

Changes in v2: None

 arch/x86/lib/bios.c   | 3 ++-
 drivers/pci/pci_rom.c | 4 ++--
 include/bios_emul.h   | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

arch/x86/lib/bios.c +2 -1

index 1d75cfc..9324bdb 100644
@@ -242,9 +242,10 @@ static void vbe_set_graphics(int vesa_mode, struct vbe_mode_info *mode_info)
        vbe_set_mode(mode_info);
 }
 
-void bios_run_on_x86(pci_dev_t pcidev, unsigned long addr, int vesa_mode,
+void bios_run_on_x86(struct udevice *dev, unsigned long addr, int vesa_mode,
                     struct vbe_mode_info *mode_info)
 {
+       pci_dev_t pcidev = dm_pci_get_bdf(dev);
        u32 num_dev;
 
        num_dev = PCI_BUS(pcidev) << 8 | PCI_DEV(pcidev) << 3 |

drivers/pci/pci_rom.c +2 -2

index 5989bad..c4112cb 100644
@@ -332,8 +332,8 @@ int dm_pci_run_vga_bios(struct udevice *dev, int (*int15_handler)(void),
 #ifdef CONFIG_X86
                bios_set_interrupt_handler(0x15, int15_handler);
 
-               bios_run_on_x86(dm_pci_get_bdf(dev), (unsigned long)ram,
-                               vesa_mode, &mode_info);
+               bios_run_on_x86(dev, (unsigned long)ram, vesa_mode,
+                               &mode_info);
 #endif
        }
        debug("Final vesa mode %#x\n", mode_info.video_mode);

include/bios_emul.h +0 -0

index 3643b82..80979ed 100644

Move these functions into the compatibility file so that they are not available by default.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Move the functions into pci_common.c so they can be used by old code
- Reword the commit message for clarity

 drivers/pci/pci_common.c | 2 ++
 1 file changed, 2 insertions(+)

drivers/pci/pci_common.c +1 -0

index 2a14902..a4573b0 100644
@@ -313,6 +313,7 @@ pci_addr_t pci_hose_phys_to_bus(struct pci_controller *hose,
        return bus_addr;
 }
 
+#if !defined(CONFIG_DM_PCI) || defined(CONFIG_DM_PCI_COMPAT)
 pci_dev_t pci_find_device(unsigned int vendor, unsigned int device, int index)
 {
        struct pci_device_id ids[2] = { {}, {0, 0} };

Move this function into the compatibility file so that it is not available by default.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Move the functions into pci_common.c so they can be used by old code

 drivers/pci/pci_common.c | 84 ++++++++++++++++++++++++------------------------
 1 file changed, 42 insertions(+), 42 deletions(-)

drivers/pci/pci_common.c +34 -42

index a4573b0..b388a1c 100644
@@ -79,48 +79,6 @@ const char *pci_class_str(u8 class)
        };
 }
 
-pci_dev_t pci_find_class(uint find_class, int index)
-{
-       int bus;
-       int devnum;
-       pci_dev_t bdf;
-       uint32_t class;
-
-       for (bus = 0; bus <= pci_last_busno(); bus++) {
-               for (devnum = 0; devnum < PCI_MAX_PCI_DEVICES - 1; devnum++) {
-                       pci_read_config_dword(PCI_BDF(bus, devnum, 0),
-                                             PCI_CLASS_REVISION, &class);
-                       if (class >> 16 == 0xffff)
-                               continue;
-
-                       for (bdf = PCI_BDF(bus, devnum, 0);
-                                       bdf <= PCI_BDF(bus, devnum,
-                                               PCI_MAX_PCI_FUNCTIONS - 1);
-                                       bdf += PCI_BDF(0, 0, 1)) {
-                               pci_read_config_dword(bdf, PCI_CLASS_REVISION,
-                                                     &class);
-                               class >>= 8;
-
-                               if (class != find_class)
-                                       continue;
-                               /*
-                                * Decrement the index. We want to return the
-                                * correct device, so index is 0 for the first
-                                * matching device, 1 for the second, etc.
-                                */
-                               if (index) {
-                                       index--;
-                                       continue;
-                               }
-                               /* Return index'th controller. */
-                               return bdf;
-                       }
-               }
-       }
-
-       return -ENODEV;
-}
-
 __weak int pci_skip_dev(struct pci_controller *hose, pci_dev_t dev)
 {
        /*

@@ -364,4 +322,46 @@ pci_dev_t pci_hose_find_devices(struct pci_controller *hose, int busnum,
 
        return -1;
 }
+
+pci_dev_t pci_find_class(uint find_class, int index)
+{
+       int bus;
+       int devnum;
+       pci_dev_t bdf;
+       uint32_t class;
+
+       for (bus = 0; bus <= pci_last_busno(); bus++) {
+               for (devnum = 0; devnum < PCI_MAX_PCI_DEVICES - 1; devnum++) {
+                       pci_read_config_dword(PCI_BDF(bus, devnum, 0),
+                                             PCI_CLASS_REVISION, &class);
+                       if (class >> 16 == 0xffff)
+                               continue;
+
+                       for (bdf = PCI_BDF(bus, devnum, 0);
+                                       bdf <= PCI_BDF(bus, devnum,
+                                               PCI_MAX_PCI_FUNCTIONS - 1);
+                                       bdf += PCI_BDF(0, 0, 1)) {
+                               pci_read_config_dword(bdf, PCI_CLASS_REVISION,
+                                                     &class);
+                               class >>= 8;
+
+                               if (class != find_class)
+                                       continue;
+                               /*
+                                * Decrement the index. We want to return the
+                                * correct device, so index is 0 for the first
+                                * matching device, 1 for the second, etc.
+                                */
+                               if (index) {
+                                       index--;
+                                       continue;
+                               }

Adjust all Tegra boards to use driver model for Ethernet, now that the required drivers are converted.

Signed-off-by Simon Glass <[email protected]>

Reviewed-by Bin Meng <[email protected]>

Applied to u-boot-dm/next.

Quoted 2 lines · Simon Glass

Applied to u-boot-dm/next.

This change has removed/disabled/... PCIe support on at least Jetson TK1. I haven't checked the other Tegra boards.

Hi Stephen,

Quoted 2 lines · Stephen Warren

Quoted 1 line · Simon Glass

Quoted 5 lines

Quoted 1 line

Applied to u-boot-dm/next.

This change has removed/disabled/... PCIe support on at least Jetson TK1. I haven't checked the other Tegra boards.

My local copy works OK.

I suspect something else (perhaps a later or
earlier change) has broken this.

The problem is that PCI is no-longer probed on start-up. With driver model I'm trying to make things start when needed. It doesn't work with networking as it is currently implemented.

I'll send some patches to probe PCI from the network code, and tidy up a few things. My jetson-tk1 is a bit broken (the PMIC settings) but I've reproduced the problem on beaver.

Quoted 12 lines · Simon Glass

Hi Stephen,

Quoted 8 lines · Stephen Warren

Quoted 3 lines · Simon Glass

Applied to u-boot-dm/next.

Quoted 5 lines

Quoted 2 lines

This change has removed/disabled/... PCIe support on at least Jetson TK1. I haven't checked the other Tegra boards.

My local copy works OK.

What did you test? My test was to look at the U-Boot boot logs and verify that the RTL8169#0 device was probed, and that "dhcp zImage" worked as expected once the prompt appeared.

Quoted 2 lines

I suspect something else (perhaps a later or
earlier change) has broken this.

This change is definitely the cause. If I check out this change, the NIC doesn't work. If I check out the previous change, the NIC does work. If I check out u-boot/master, the NIC does not work. If I then revert this change, the NIC does work.

Quoted 5 lines

The problem is that PCI is no-longer probed on start-up. With driver model I'm trying to make things start when needed. It doesn't work with networking as it is currently implemented.

Isn't that going to be a regression; users will have to type extra commands to get PCIe NICs working if they don't automatically probe, won't they? I don't think that having PCI probed when it's first used is a good solution, since that means that any environment variables that are set during probing (such as ethact, ethaddr) won't be set, which will be a regression for any scripts that use them.

Quoted 4 lines

I'll send some patches to probe PCI from the network code, and tidy up a few things. My jetson-tk1 is a bit broken (the PMIC settings) but I've reproduced the problem on beaver.

Applied to u-boot-dm/next.

Quoted 2 lines · Simon Glass

Applied to u-boot-dm/next.

I've found another strange problem, at least triggered/exposed by this patch:

On at least either Dalmore or Jetson TK1, using USB Ethernet (hence with RTL8169 support disabled in include/configs/jetson-tk1.h[1]), I find that if I execute the following commands at or after this patch, then the system reboots during DHCP operation:

save mmc 1:1 $loadaddr /dfu_dummy.bin 0x3c0
usb start
setenv autoload no
dhcp

yields:

====================
Tegra124 (Jetson TK1) # dhcp
Waiting for Ethernet connection... done.
BOOTP broadcast 1
DHCP client bound to address 10.20.204.50 (1 ms)
data abort

pc : [<fff6f1d4>]          lr : [<fff59fd0>]

reloc pc : [<801291d4>] lr : [<80113fd0>]
sp : fda4e720 ip : 450088df fp : fda60048
r10: fffa4fe3 r9 : fda53ee0 r8 : 00000000
r7 : 00000000 r6 : 00000000 r5 : 00000000 r4 : fda60048
r3 : 00000383 r2 : 00000000 r1 : 00000000 r0 : e10f354b
Flags: NzCv IRQs off FIQs off Mode SVC_32
Resetting CPU ...

resetting ...
====================

However, if I execute those commands at the commit before this patch, then everything is OK.

The "save" command is definitely required to trigger this issue. The partition being saved to is a 1024MiB ext4 filesystem that's almost empty. If I omit the save, or save to a 1024MiB FAT filesystem instead, there's no error. This leads me to suspect some kind of memory corruption rather than a direct problem with this patch. Due to ext4 interaction, also CCing ?ukasz in case he has any quick ideas.

I'll go track down the PC where the error occurs and try and add some debug spew etc. to see what's up. Any other ideas appreciated though.

(This is the problem with writing test systems; they show up bugs!)

[1] i.e. I have this change made locally so that no PCIe Ethernet device exists, which causes the USB Ethernet to be used by default:

include/configs/jetson-tk1.h +0 -0

index 23b2e436167c..af26b055b70b 100644

Hi Stephen,

Quoted 64 lines · Stephen Warren

Quoted 2 lines · Simon Glass

Applied to u-boot-dm/next.

I've found another strange problem, at least triggered/exposed by this patch:

On at least either Dalmore or Jetson TK1, using USB Ethernet (hence with RTL8169 support disabled in include/configs/jetson-tk1.h[1]), I find that if I execute the following commands at or after this patch, then the system reboots during DHCP operation:

save mmc 1:1 $loadaddr /dfu_dummy.bin 0x3c0
usb start
setenv autoload no
dhcp

yields:

====================
Tegra124 (Jetson TK1) # dhcp
Waiting for Ethernet connection... done.
BOOTP broadcast 1
DHCP client bound to address 10.20.204.50 (1 ms)
data abort

pc : [<fff6f1d4>]          lr : [<fff59fd0>]

reloc pc : [<801291d4>] lr : [<80113fd0>]
sp : fda4e720 ip : 450088df fp : fda60048
r10: fffa4fe3 r9 : fda53ee0 r8 : 00000000
r7 : 00000000 r6 : 00000000 r5 : 00000000 r4 : fda60048
r3 : 00000383 r2 : 00000000 r1 : 00000000 r0 : e10f354b
Flags: NzCv IRQs off FIQs off Mode SVC_32
Resetting CPU ...

resetting ...
====================

However, if I execute those commands at the commit before this patch, then everything is OK.

The "save" command is definitely required to trigger this issue. The partition being saved to is a 1024MiB ext4 filesystem that's almost empty. If I omit the save, or save to a 1024MiB FAT filesystem instead, there's no error. This leads me to suspect some kind of memory corruption rather than a direct problem with this patch. Due to ext4 interaction, also CCing ?ukasz in case he has any quick ideas.

I'll go track down the PC where the error occurs and try and add some debug spew etc. to see what's up. Any other ideas appreciated though.

(This is the problem with writing test systems; they show up bugs!)

[1] i.e. I have this change made locally so that no PCIe Ethernet device exists, which causes the USB Ethernet to be used by default:

include/configs/jetson-tk1.h +0 -0

index 23b2e436167c..af26b055b70b 100644

include/configs/jetson-tk1.h line 67

Quoted 7 lines

include/configs/jetson-tk1.h +0 -1

@@ -62,7 +62,6 @@
  #define CONFIG_CMD_PCI
 
  /* PCI networking support */
-#define CONFIG_RTL8169
 
  /* General networking support */
  #define CONFIG_CMD_DHCP

I have seen some odd things on Seaboard which is a bit more forgiving with RAM at 0 (although not Jetson-TK1, right?). It can sometimes mask an issue where a driver has not auto-allocated space, but the driver is using it anyway (i.e. using a NULL pointer as its private data).

I can't see anything wrong from inspection. The per-child data (struct usb_device) appears to be cache-aligned as expected.

Which USB Ethernet driver are you using?

Quoted 95 lines · Simon Glass

Hi Stephen,

Quoted 74 lines · Stephen Warren

Quoted 3 lines · Simon Glass

Applied to u-boot-dm/next.

I've found another strange problem, at least triggered/exposed by this patch:

On at least either Dalmore or Jetson TK1, using USB Ethernet (hence with RTL8169 support disabled in include/configs/jetson-tk1.h[1]), I find that if
I execute the following commands at or after this patch, then the system reboots during DHCP operation:

save mmc 1:1 $loadaddr /dfu_dummy.bin 0x3c0
usb start
setenv autoload no
dhcp

yields:

====================
Tegra124 (Jetson TK1) # dhcp
Waiting for Ethernet connection... done.
BOOTP broadcast 1
DHCP client bound to address 10.20.204.50 (1 ms)
data abort

pc : [<fff6f1d4>]          lr : [<fff59fd0>]

reloc pc : [<801291d4>] lr : [<80113fd0>]
sp : fda4e720 ip : 450088df fp : fda60048
r10: fffa4fe3 r9 : fda53ee0 r8 : 00000000
r7 : 00000000 r6 : 00000000 r5 : 00000000 r4 : fda60048
r3 : 00000383 r2 : 00000000 r1 : 00000000 r0 : e10f354b
Flags: NzCv IRQs off FIQs off Mode SVC_32
Resetting CPU ...

resetting ...
====================

However, if I execute those commands at the commit before this patch, then
everything is OK.

The "save" command is definitely required to trigger this issue. The partition being saved to is a 1024MiB ext4 filesystem that's almost empty.
If I omit the save, or save to a 1024MiB FAT filesystem instead, there's no
error. This leads me to suspect some kind of memory corruption rather than a
direct problem with this patch. Due to ext4 interaction, also CCing ?ukasz
in case he has any quick ideas.

I'll go track down the PC where the error occurs and try and add some debug
spew etc. to see what's up. Any other ideas appreciated though.

(This is the problem with writing test systems; they show up bugs!)

[1] i.e. I have this change made locally so that no PCIe Ethernet device exists, which causes the USB Ethernet to be used by default:

include/configs/jetson-tk1.h +0 -0

index 23b2e436167c..af26b055b70b 100644

include/configs/jetson-tk1.h line 67

Quoted 7 lines

include/configs/jetson-tk1.h +0 -1

@@ -62,7 +62,6 @@
  #define CONFIG_CMD_PCI
 
  /* PCI networking support */
-#define CONFIG_RTL8169
 
  /* General networking support */
  #define CONFIG_CMD_DHCP

I have seen some odd things on Seaboard which is a bit more forgiving with RAM at 0 (although not Jetson-TK1, right?). It can sometimes mask an issue where a driver has not auto-allocated space, but the driver is using it anyway (i.e. using a NULL pointer as its private data).

I can't see anything wrong from inspection. The per-child data (struct usb_device) appears to be cache-aligned as expected.

Quoted 1 line

Which USB Ethernet driver are you using?

asix.

It looks like something inside the dhcp command is trashing something in the hush shell "pipe" state...

BTW, can sandbox support USB Ethernet and MMC (or perhaps any block device that I can "save" on)? I'd be curious if the problem could repro there, what with its better debugging tools. However, if the issue is fluky malloc heap layout due to command history, I guess we'd have to be pretty lucky...

At present the PCI address map functions use the old API. Add new functions for this so that drivers can be converted.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Add missing code in dm_pci_phys_to_bus()
- Rename _dm_pci_hose_bus_to_phys() to _dm_pci_bus_to_phys()

 drivers/pci/pci-uclass.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++
 include/pci.h            |  59 ++++++++++++++++++++
 2 files changed, 195 insertions(+)

drivers/pci/pci-uclass.c +1 -0

index 7a886f2..80e234b 100644
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <inttypes.h>
 #include <pci.h>
+#include <asm/io.h>
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <dm/device-internal.h>

drivers/pci/pci-uclass.c +32 -0

+{
+       struct pci_controller *hose = dev_get_uclass_priv(ctlr);
+       struct pci_region *res;
+       int i;
+
+       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)
+                       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;
+               }
+       }
+
+       return 1;
+}
+
+phys_addr_t dm_pci_bus_to_phys(struct udevice *dev, pci_addr_t bus_addr,
+                              unsigned long flags)
+{
+       phys_addr_t phys_addr = 0;
+       struct udevice *ctlr;
+       int ret;
+
+       /* The root controller has the region information */

drivers/pci/pci-uclass.c +90 -0

+               if (!ret)
+                       return phys_addr;
+       }
+
+       ret = _dm_pci_bus_to_phys(ctlr, bus_addr, flags, 0, &phys_addr);
+
+       if (ret)
+               puts("pci_hose_bus_to_phys: invalid physical address\n");
+
+       return phys_addr;
+}
+
+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)
+{
+       struct pci_region *res;
+       struct udevice *ctlr;
+       pci_addr_t bus_addr;
+       int i;
+       struct pci_controller *hose;
+
+       /* The root controller has the region information */
+       ctlr = pci_get_controller(dev);
+       hose = dev_get_uclass_priv(ctlr);
+
+       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)
+                       continue;
+
+               bus_addr = phys_addr - res->phys_start + res->bus_start;
+
+               if (bus_addr >= res->bus_start &&
+                   (bus_addr - res->bus_start) < res->size) {
+                       *ba = bus_addr;
+                       return 0;
+               }
+       }
+
+       return 1;
+}
+
+pci_addr_t dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t phys_addr,
+                             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, 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);
+
+       if (ret)
+               puts("pci_hose_phys_to_bus: invalid physical address\n");
+
+       return bus_addr;
+}
+
+void *dm_pci_map_bar(struct udevice *dev, int bar, int flags)
+{
+       pci_addr_t pci_bus_addr;
+       u32 bar_response;
+
+       /* read BAR address */
+       dm_pci_read_config32(dev, bar, &bar_response);
+       pci_bus_addr = (pci_addr_t)(bar_response & ~0xf);
+
+       /*
+        * Pass "0" as the length argument to pci_bus_to_virt.  The arg
+        * isn't actualy 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.
+        */
+       return dm_pci_bus_to_virt(dev, pci_bus_addr, flags, 0, MAP_NOCACHE);
+}
+
 UCLASS_DRIVER(pci) = {
        .id             = UCLASS_PCI,
        .name           = "pci",

include/pci.h +13 -0

index dcbe978..2be49be 100644
@@ -1176,6 +1176,65 @@ int pci_get_regions(struct udevice *dev, struct pci_region **iop,
 u32 dm_pci_read_bar32(struct udevice *dev, int barnum);
 
 /**
+ * dm_pci_bus_to_phys() - convert a PCI bus address to a physical address
+ *
+ * @dev:       Device containing the PCI address
+ * @addr:      PCI address to convert
+ * @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,
+                              unsigned long flags);
+
+/**
+ * dm_pci_phys_to_bus() - convert a physical address to a PCI bus address
+ *

include/pci.h +22 -0

+ */
+void *dm_pci_map_bar(struct udevice *dev, int bar, int flags);
+
+#define dm_pci_virt_to_bus(dev, addr, flags) \
+       dm_pci_phys_to_bus(dev, (virt_to_phys(addr)), (flags))
+#define dm_pci_bus_to_virt(dev, addr, flags, len, map_flags) \
+       map_physmem(dm_pci_bus_to_phys(dev, (addr), (flags)), \
+                   (len), (map_flags))
+
+#define dm_pci_phys_to_mem(dev, addr) \
+       dm_pci_phys_to_bus((dev), (addr), PCI_REGION_MEM)
+#define dm_pci_mem_to_phys(dev, addr) \
+       dm_pci_bus_to_phys((dev), (addr), PCI_REGION_MEM)
+#define dm_pci_phys_to_io(dev, addr) \
+       dm_pci_phys_to_bus((dev), (addr), PCI_REGION_IO)
+#define dm_pci_io_to_phys(dev, addr) \
+       dm_pci_bus_to_phys((dev), (addr), PCI_REGION_IO)
+
+#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))

Hi Simon,

Quoted 27 lines · Simon Glass

At present the PCI address map functions use the old API. Add new functions for this so that drivers can be converted.

Signed-off-by Simon Glass <[email protected]>

---

Changes in v2:
- Add missing code in dm_pci_phys_to_bus()
- Rename _dm_pci_hose_bus_to_phys() to _dm_pci_bus_to_phys()

 drivers/pci/pci-uclass.c | 136 +++++++++++++++++++++++++++++++++++++++++++++++
 include/pci.h            |  59 ++++++++++++++++++++
 2 files changed, 195 insertions(+)

drivers/pci/pci-uclass.c +1 -0

index 7a886f2..80e234b 100644
@@ -11,6 +11,7 @@
 #include <fdtdec.h>
 #include <inttypes.h>
 #include <pci.h>
+#include <asm/io.h>
 #include <dm/lists.h>
 #include <dm/root.h>
 #include <dm/device-internal.h>

drivers/pci/pci-uclass.c u32 dm_pci_read_bar32(struct udevice *dev, int barnum) · line 1074

Quoted 6 lines

drivers/pci/pci-uclass.c +3 -0

@@ -1068,6 +1069,141 @@ u32 dm_pci_read_bar32(struct udevice *dev, int barnum)
                return addr & PCI_BASE_ADDRESS_MEM_MASK;
 }
 
+static int _dm_pci_bus_to_phys(struct udevice *ctlr,
+                                   pci_addr_t bus_addr, unsigned long flags,
+                                   unsigned long skip_mask, phys_addr_t *pa)

nits: the indention of the above 2 lines looks wrong.

Quoted 32 lines

drivers/pci/pci-uclass.c +32 -0

+{
+       struct pci_controller *hose = dev_get_uclass_priv(ctlr);
+       struct pci_region *res;
+       int i;
+
+       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)
+                       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;
+               }
+       }
+
+       return 1;
+}
+
+phys_addr_t dm_pci_bus_to_phys(struct udevice *dev, pci_addr_t bus_addr,
+                              unsigned long flags)
+{
+       phys_addr_t phys_addr = 0;
+       struct udevice *ctlr;
+       int ret;
+
+       /* The root controller has the region information */

drivers/pci/pci-uclass.c u32 dm_pci_read_bar32(struct udevice *dev, int barnum) · line 1116

Quoted 10 lines

drivers/pci/pci-uclass.c +10 -0

+       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,
+                                              flags, PCI_REGION_SYS_MEMORY,
+                                              &phys_addr);

nits: the indention of the above 2 lines looks wrong.

Quoted 114 lines

drivers/pci/pci-uclass.c +90 -0

+               if (!ret)
+                       return phys_addr;
+       }
+
+       ret = _dm_pci_bus_to_phys(ctlr, bus_addr, flags, 0, &phys_addr);
+
+       if (ret)
+               puts("pci_hose_bus_to_phys: invalid physical address\n");
+
+       return phys_addr;
+}
+
+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)
+{
+       struct pci_region *res;
+       struct udevice *ctlr;
+       pci_addr_t bus_addr;
+       int i;
+       struct pci_controller *hose;
+
+       /* The root controller has the region information */
+       ctlr = pci_get_controller(dev);
+       hose = dev_get_uclass_priv(ctlr);
+
+       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)
+                       continue;
+
+               bus_addr = phys_addr - res->phys_start + res->bus_start;
+
+               if (bus_addr >= res->bus_start &&
+                   (bus_addr - res->bus_start) < res->size) {
+                       *ba = bus_addr;
+                       return 0;
+               }
+       }
+
+       return 1;
+}
+
+pci_addr_t dm_pci_phys_to_bus(struct udevice *dev, phys_addr_t phys_addr,
+                             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, 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);
+
+       if (ret)
+               puts("pci_hose_phys_to_bus: invalid physical address\n");
+
+       return bus_addr;
+}
+
+void *dm_pci_map_bar(struct udevice *dev, int bar, int flags)
+{
+       pci_addr_t pci_bus_addr;
+       u32 bar_response;
+
+       /* read BAR address */
+       dm_pci_read_config32(dev, bar, &bar_response);
+       pci_bus_addr = (pci_addr_t)(bar_response & ~0xf);
+
+       /*
+        * Pass "0" as the length argument to pci_bus_to_virt.  The arg
+        * isn't actualy 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.
+        */
+       return dm_pci_bus_to_virt(dev, pci_bus_addr, flags, 0, MAP_NOCACHE);
+}
+
 UCLASS_DRIVER(pci) = {
        .id             = UCLASS_PCI,
        .name           = "pci",

include/pci.h +13 -0

index dcbe978..2be49be 100644
@@ -1176,6 +1176,65 @@ int pci_get_regions(struct udevice *dev, struct pci_region **iop,
 u32 dm_pci_read_bar32(struct udevice *dev, int barnum);
 
 /**
+ * dm_pci_bus_to_phys() - convert a PCI bus address to a physical address
+ *
+ * @dev:       Device containing the PCI address
+ * @addr:      PCI address to convert
+ * @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,
+                              unsigned long flags);
+
+/**
+ * dm_pci_phys_to_bus() - convert a physical address to a PCI bus address
+ *

include/pci.h int pci_get_regions(struct udevice *dev, struct pci_region **iop, · line 1201

Quoted 10 lines

include/pci.h +10 -0

+ * @dev:       Device containing the bus address
+ * @addr:      Physical address to convert
+ * @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,
+                             unsigned long flags);
+
+/**
+ * dm_pci_map_bar() - get a physical address associated with a BAR region

It should be virtual address, not physical address.

include/pci.h int pci_get_regions(struct udevice *dev, struct pci_region **iop, · line 1209

Quoted 8 lines

include/pci.h +8 -0

+ *
+ * Looks up a base address register and finds the physical memory address
+ * that corresponds to it
+ *
+ * @dev:       Device to check
+ * @bar:       Bar number to read (numbered from 0)
+ * @flags:     Flags for the region type (PCI_REGION_...)
+ * @return: pointer to the physical address to use

virtual address.

Quoted 22 lines

include/pci.h +22 -0

+ */
+void *dm_pci_map_bar(struct udevice *dev, int bar, int flags);
+
+#define dm_pci_virt_to_bus(dev, addr, flags) \
+       dm_pci_phys_to_bus(dev, (virt_to_phys(addr)), (flags))
+#define dm_pci_bus_to_virt(dev, addr, flags, len, map_flags) \
+       map_physmem(dm_pci_bus_to_phys(dev, (addr), (flags)), \
+                   (len), (map_flags))
+
+#define dm_pci_phys_to_mem(dev, addr) \
+       dm_pci_phys_to_bus((dev), (addr), PCI_REGION_MEM)
+#define dm_pci_mem_to_phys(dev, addr) \
+       dm_pci_bus_to_phys((dev), (addr), PCI_REGION_MEM)
+#define dm_pci_phys_to_io(dev, addr) \
+       dm_pci_phys_to_bus((dev), (addr), PCI_REGION_IO)
+#define dm_pci_io_to_phys(dev, addr) \
+       dm_pci_bus_to_phys((dev), (addr), PCI_REGION_IO)
+
+#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))

include/pci.h int pci_get_regions(struct udevice *dev, struct pci_region **iop,

Quoted 10 lines

include/pci.h +6 -1

+#define dm_pci_virt_to_io(dev, addr) \
+       dm_dm_pci_virt_to_bus((dev), (addr), PCI_REGION_IO)
+#define dm_pci_io_to_virt(dev, addr, len, map_flags) \
+       dm_dm_pci_bus_to_virt((dev), (addr), PCI_REGION_IO, (len), (map_flags))
+
+/**
  * dm_pci_find_device() - find a device by vendor/device ID
  *
  * @vendor:    Vendor ID
--

Other than above nits,