imx: imx8qm/qxp: check whether m4 partition booted

[oweals/u-boot.git] / drivers / pci / pci_mvebu.c

diff --git a/drivers/pci/pci_mvebu.c b/drivers/pci/pci_mvebu.c
index 6026fa67f92e5fb2e5c2de8742c48287ba047e56..483a87db7dd621cffd4600dbda7d19db7e9dc165 100644 (file)
--- a/drivers/pci/pci_mvebu.c
+++ b/drivers/pci/pci_mvebu.c
@@ -11,6 +11,7 @@
 
 #include <common.h>
 #include <dm.h>
+#include <malloc.h>
 #include <dm/device-internal.h>
 #include <dm/lists.h>
 #include <dm/of_access.h>
@@ -136,7 +137,7 @@ static inline struct mvebu_pcie *hose_to_pcie(struct pci_controller *hose)
        return container_of(hose, struct mvebu_pcie, hose);
 }
 
-static int mvebu_pcie_read_config(struct udevice *bus, pci_dev_t bdf,
+static int mvebu_pcie_read_config(const struct udevice *bus, pci_dev_t bdf,
                                  uint offset, ulong *valuep,
                                  enum pci_size_t size)
 {
@@ -313,10 +314,6 @@ static int mvebu_pcie_probe(struct udevice *dev)
        reg |= BIT(10);         /* disable interrupts */
        writel(reg, pcie->base + PCIE_CMD_OFF);
 
-       /* Set BAR0 to internal registers */
-       writel(SOC_REGS_PHY_BASE, pcie->base + PCIE_BAR_LO_OFF(0));
-       writel(0, pcie->base + PCIE_BAR_HI_OFF(0));
-
        /* PCI memory space */
        pci_set_region(hose->regions + 0, pcie->mem.start,
                       pcie->mem.start, PCIE_MEM_SIZE, PCI_REGION_MEM);
@@ -326,6 +323,10 @@ static int mvebu_pcie_probe(struct udevice *dev)
                       PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);
        hose->region_count = 2;
 
+       /* Set BAR0 to internal registers */
+       writel(SOC_REGS_PHY_BASE, pcie->base + PCIE_BAR_LO_OFF(0));
+       writel(0, pcie->base + PCIE_BAR_HI_OFF(0));
+
        bus++;
 
        return 0;
@@ -369,6 +370,12 @@ static int mvebu_get_tgt_attr(ofnode node, int devfn,
        if (!range)
                return -EINVAL;
 
+       /*
+        * Linux uses of_n_addr_cells() to get the number of address cells
+        * here. Currently this function is only available in U-Boot when
+        * CONFIG_OF_LIVE is enabled. Until this is enabled for MVEBU in
+        * general, lets't hardcode the "pna" value in the U-Boot code.
+        */
        pna = 2; /* hardcoded for now because of lack of of_n_addr_cells() */
        rangesz = pna + na + ns;
        nranges = rlen / sizeof(__be32) / rangesz;