]> git.baikalelectronics.ru Git - uboot.git/commitdiff
drivers: pci: pcie_dw_common: fix Werror compilation error
authorGreen Wan <green.wan@sifive.com>
Wed, 19 May 2021 11:16:15 +0000 (04:16 -0700)
committerLeo Yu-Chi Liang <ycliang@andestech.com>
Mon, 31 May 2021 08:35:55 +0000 (16:35 +0800)
Fix compilation error when Werror is turned on. The warning could
possible break some CI builds.

Signed-off-by: Green Wan <green.wan@sifive.com>
Reviewed-by: Leo Yu-Chi Liang <ycliang@andestech.com>
drivers/pci/pcie_dw_common.c

index 785fd3aad007a39baf54c9d4d704836cb01c9d6a..e66fb1490a5abdd4e20eb5bb360aac9e5351213f 100644 (file)
@@ -213,7 +213,7 @@ int pcie_dw_read_config(const struct udevice *bus, pci_dev_t bdf,
 
        va_address = set_cfg_address(pcie, bdf, offset);
 
-       value = readl(va_address);
+       value = readl((void __iomem *)va_address);
 
        debug("(addr,val)=(0x%04x, 0x%08lx)\n", offset, value);
        *valuep = pci_conv_32_to_size(value, offset, size);
@@ -257,9 +257,9 @@ int pcie_dw_write_config(struct udevice *bus, pci_dev_t bdf,
 
        va_address = set_cfg_address(pcie, bdf, offset);
 
-       old = readl(va_address);
+       old = readl((void __iomem *)va_address);
        value = pci_conv_size_to_32(old, value, offset, size);
-       writel(value, va_address);
+       writel(value, (void __iomem *)va_address);
 
        return pcie_dw_prog_outbound_atu_unroll(pcie, PCIE_ATU_REGION_INDEX1,
                                                 PCIE_ATU_TYPE_IO, pcie->io.phys_start,
@@ -333,33 +333,37 @@ void pcie_dw_setup_host(struct pcie_dw *pci)
                }
        }
 
-       dev_dbg(pci->dev, "Config space: [0x%p - 0x%p, size 0x%llx]\n",
-               pci->cfg_base, pci->cfg_base + pci->cfg_size,
-               pci->cfg_size);
+       dev_dbg(pci->dev, "Config space: [0x%llx - 0x%llx, size 0x%llx]\n",
+               (u64)pci->cfg_base, (u64)pci->cfg_base + pci->cfg_size,
+               (u64)pci->cfg_size);
 
-       dev_dbg(pci->dev, "IO space: [0x%llx - 0x%llx, size 0x%lx]\n",
-               pci->io.phys_start, pci->io.phys_start + pci->io.size,
-               pci->io.size);
+       dev_dbg(pci->dev, "IO space: [0x%llx - 0x%llx, size 0x%llx]\n",
+               (u64)pci->io.phys_start, (u64)pci->io.phys_start + pci->io.size,
+               (u64)pci->io.size);
 
-       dev_dbg(pci->dev, "IO bus:   [0x%lx - 0x%lx, size 0x%lx]\n",
-               pci->io.bus_start, pci->io.bus_start + pci->io.size,
-               pci->io.size);
+       dev_dbg(pci->dev, "IO bus:   [0x%llx - 0x%llx, size 0x%llx]\n",
+               (u64)pci->io.bus_start, (u64)pci->io.bus_start + pci->io.size,
+               (u64)pci->io.size);
 
-       dev_dbg(pci->dev, "MEM space: [0x%llx - 0x%llx, size 0x%lx]\n",
-               pci->mem.phys_start, pci->mem.phys_start + pci->mem.size,
-               pci->mem.size);
+       dev_dbg(pci->dev, "MEM space: [0x%llx - 0x%llx, size 0x%llx]\n",
+               (u64)pci->mem.phys_start,
+               (u64)pci->mem.phys_start + pci->mem.size,
+               (u64)pci->mem.size);
 
-       dev_dbg(pci->dev, "MEM bus:   [0x%lx - 0x%lx, size 0x%lx]\n",
-               pci->mem.bus_start, pci->mem.bus_start + pci->mem.size,
-               pci->mem.size);
+       dev_dbg(pci->dev, "MEM bus:   [0x%llx - 0x%llx, size 0x%llx]\n",
+               (u64)pci->mem.bus_start,
+               (u64)pci->mem.bus_start + pci->mem.size,
+               (u64)pci->mem.size);
 
        if (pci->prefetch.size) {
-               dev_dbg(pci->dev, "PREFETCH space: [0x%llx - 0x%llx, size 0x%lx]\n",
-                       pci->prefetch.phys_start, pci->prefetch.phys_start + pci->prefetch.size,
-                       pci->prefetch.size);
-
-               dev_dbg(pci->dev, "PREFETCH bus:   [0x%lx - 0x%lx, size 0x%lx]\n",
-                       pci->prefetch.bus_start, pci->prefetch.bus_start + pci->prefetch.size,
-                       pci->prefetch.size);
+               dev_dbg(pci->dev, "PREFETCH space: [0x%llx - 0x%llx, size 0x%llx]\n",
+                       (u64)pci->prefetch.phys_start,
+                       (u64)pci->prefetch.phys_start + pci->prefetch.size,
+                       (u64)pci->prefetch.size);
+
+               dev_dbg(pci->dev, "PREFETCH bus:   [0x%llx - 0x%llx, size 0x%llx]\n",
+                       (u64)pci->prefetch.bus_start,
+                       (u64)pci->prefetch.bus_start + pci->prefetch.size,
+                       (u64)pci->prefetch.size);
        }
 }