brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-09-27 23:20:26 +09:00
Code Issues Projects Releases Wiki Activity

pci: pci_mvebu: Define an IO region as well

Browse Source 
Configure an IO region and window for PNP identical to how MEM region is
set up. Linux does this only if the DT defines a pcie-io-aperture
property for the SOC, but since all supported boards do this should not
be needed.

Signed-off-by: Phil Sutter <phil@nwl.cc>
Reviewed-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Phil Sutter 2021-01-03 23:06:46 +01:00 committed by Stefan Roese
parent c1b1263b16
commit ba8ae03eab
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/pci/pci_mvebu.c
View File

@ -73,6 +73,7 @@ struct mvebu_pcie {
void __iomem *membase; void __iomem *membase;
struct resource mem; struct resource mem;
void __iomem *iobase; void __iomem *iobase;
struct resource io;
u32 port; u32 port;
u32 lane; u32 lane;
int devfn; int devfn;
@ -81,6 +82,8 @@ struct mvebu_pcie {
char name[16]; char name[16];
unsigned int mem_target; unsigned int mem_target;
unsigned int mem_attr; unsigned int mem_attr;
unsigned int io_target;
unsigned int io_attr;
}; };
/* /*
@ -90,6 +93,7 @@ struct mvebu_pcie {
*/ */
static void __iomem *mvebu_pcie_membase = (void __iomem *)MBUS_PCI_MEM_BASE; static void __iomem *mvebu_pcie_membase = (void __iomem *)MBUS_PCI_MEM_BASE;
#define PCIE_MEM_SIZE (128 << 20) #define PCIE_MEM_SIZE (128 << 20)
static void __iomem *mvebu_pcie_iobase = (void __iomem *)MBUS_PCI_IO_BASE;
static inline bool mvebu_pcie_link_up(struct mvebu_pcie *pcie) static inline bool mvebu_pcie_link_up(struct mvebu_pcie *pcie)
{ {
@ -306,12 +310,24 @@ static int mvebu_pcie_probe(struct udevice *dev)
(u32)pcie->mem.start, PCIE_MEM_SIZE); (u32)pcie->mem.start, PCIE_MEM_SIZE);
} }
pcie->io.start = (u32)mvebu_pcie_iobase;
pcie->io.end = pcie->io.start + MBUS_PCI_IO_SIZE - 1;
mvebu_pcie_iobase += MBUS_PCI_IO_SIZE;
if (mvebu_mbus_add_window_by_id(pcie->io_target, pcie->io_attr,
(phys_addr_t)pcie->io.start,
MBUS_PCI_IO_SIZE)) {
printf("PCIe unable to add mbus window for IO at %08x+%08x\n",
(u32)pcie->io.start, MBUS_PCI_IO_SIZE);
}
/* Setup windows and configure host bridge */ /* Setup windows and configure host bridge */
mvebu_pcie_setup_wins(pcie); mvebu_pcie_setup_wins(pcie);
/* Master + slave enable. */ /* Master + slave enable. */
reg = readl(pcie->base + PCIE_CMD_OFF); reg = readl(pcie->base + PCIE_CMD_OFF);
reg |= PCI_COMMAND_MEMORY; reg |= PCI_COMMAND_MEMORY;
reg |= PCI_COMMAND_IO;
reg |= PCI_COMMAND_MASTER; reg |= PCI_COMMAND_MASTER;
reg |= BIT(10); /* disable interrupts */ reg |= BIT(10); /* disable interrupts */
writel(reg, pcie->base + PCIE_CMD_OFF); writel(reg, pcie->base + PCIE_CMD_OFF);
@ -323,7 +339,9 @@ static int mvebu_pcie_probe(struct udevice *dev)
0, 0, 0, 0,
gd->ram_size, gd->ram_size,
PCI_REGION_MEM | PCI_REGION_SYS_MEMORY); PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);
hose->region_count = 2; pci_set_region(hose->regions + 2, pcie->io.start,
pcie->io.start, MBUS_PCI_IO_SIZE, PCI_REGION_IO);
hose->region_count = 3;
/* Set BAR0 to internal registers */ /* Set BAR0 to internal registers */
writel(SOC_REGS_PHY_BASE, pcie->base + PCIE_BAR_LO_OFF(0)); writel(SOC_REGS_PHY_BASE, pcie->base + PCIE_BAR_LO_OFF(0));
@ -442,6 +460,14 @@ static int mvebu_pcie_of_to_plat(struct udevice *dev)
goto err; goto err;
} }
ret = mvebu_get_tgt_attr(dev_ofnode(dev->parent), pcie->devfn,
IORESOURCE_IO,
&pcie->io_target, &pcie->io_attr);
if (ret < 0) {
printf("%s: cannot get tgt/attr for IO window\n", pcie->name);
goto err;
}
/* Parse PCIe controller register base from DT */ /* Parse PCIe controller register base from DT */
ret = mvebu_pcie_port_parse_dt(dev_ofnode(dev), pcie); ret = mvebu_pcie_port_parse_dt(dev_ofnode(dev), pcie);
if (ret < 0) if (ret < 0)