diff options
| author | Tom Rini <trini@konsulko.com> | 2021-02-21 11:16:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-02-21 11:16:38 -0500 |
| commit | 72993e8e03845f82c3ccf7c72f205c9afd8da6d6 (patch) | |
| tree | e8419be5fd3d4405a078621ac61a345e1d006e7d | |
| parent | ea966d24ef3a9f7f32712a518a07374f9ae43905 (diff) | |
| parent | c98cc9b2e8754587770d33bbd0189fefec39965a (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
- RCar Gen3 updates
| -rw-r--r-- | configs/rcar3_salvator-x_defconfig | 1 | ||||
| -rw-r--r-- | drivers/pci/pci-rcar-gen3.c | 30 |
2 files changed, 24 insertions, 7 deletions
diff --git a/configs/rcar3_salvator-x_defconfig b/configs/rcar3_salvator-x_defconfig index ff6e0e945e..6109a23a31 100644 --- a/configs/rcar3_salvator-x_defconfig +++ b/configs/rcar3_salvator-x_defconfig @@ -71,6 +71,7 @@ CONFIG_DM_ETH=y CONFIG_RENESAS_RAVB=y CONFIG_PCI=y CONFIG_DM_PCI=y +CONFIG_PCI_REGION_MULTI_ENTRY=y CONFIG_PCI_RCAR_GEN3=y CONFIG_DM_REGULATOR=y CONFIG_DM_REGULATOR_FIXED=y diff --git a/drivers/pci/pci-rcar-gen3.c b/drivers/pci/pci-rcar-gen3.c index 0d5b01f9f8..34a561ef8b 100644 --- a/drivers/pci/pci-rcar-gen3.c +++ b/drivers/pci/pci-rcar-gen3.c @@ -23,6 +23,7 @@ #include <pci.h> #include <wait_bit.h> #include <linux/bitops.h> +#include <linux/log2.h> #define PCIECAR 0x000010 #define PCIECCTLR 0x000018 @@ -151,6 +152,16 @@ static int rcar_pcie_config_access(const struct udevice *udev, struct rcar_gen3_pcie_priv *priv = dev_get_plat(udev); u32 reg = where & ~3; + /* Root bus */ + if (PCI_DEV(bdf) == 0) { + if (access_type == RCAR_PCI_ACCESS_READ) + *data = readl(priv->regs + PCICONF(where / 4)); + else + writel(*data, priv->regs + PCICONF(where / 4)); + + return 0; + } + /* Clear errors */ clrbits_le32(priv->regs + PCIEERRFR, 0); @@ -187,11 +198,14 @@ static int rcar_gen3_pcie_addr_valid(pci_dev_t d, uint where) { u32 slot; + if (PCI_BUS(d)) + return -EINVAL; + if (PCI_FUNC(d)) return -EINVAL; slot = PCI_DEV(d); - if (slot != 1) + if (slot > 1) return -EINVAL; return 0; @@ -334,17 +348,19 @@ static int rcar_gen3_pcie_probe(struct udevice *dev) if (hose->regions[i].phys_start == 0) continue; - mask = (hose->regions[i].size - 1) & ~0xf; + mask = (roundup_pow_of_two(hose->regions[i].size) - 1) & ~0xf; mask |= LAR_ENABLE; - writel(hose->regions[i].phys_start, priv->regs + PCIEPRAR(0)); - writel(hose->regions[i].phys_start, priv->regs + PCIELAR(0)); + writel(rounddown_pow_of_two(hose->regions[i].phys_start), + priv->regs + PCIEPRAR(0)); + writel(rounddown_pow_of_two(hose->regions[i].phys_start), + priv->regs + PCIELAR(0)); writel(mask, priv->regs + PCIELAMR(0)); break; } - writel(0, priv->regs + PCIEPRAR(4)); - writel(0, priv->regs + PCIELAR(4)); - writel(0, priv->regs + PCIELAMR(4)); + writel(0, priv->regs + PCIEPRAR(1)); + writel(0, priv->regs + PCIELAR(1)); + writel(0, priv->regs + PCIELAMR(1)); ret = rcar_gen3_pcie_hw_init(dev); if (ret) |