Skip to content

L
linux
Commit 442ec4c0 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Bjorn Helgaas
Browse files
Options

PCI: dwc: all: Split struct pcie_port into host-only and core structures 

Keep only the host-specific members in struct pcie_port and move the common
members (i.e common to both host and endpoint) to struct dw_pcie.  This is
in preparation for adding endpoint mode support to designware driver.

While at that also fix checkpatch warnings.
Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
CC: Jingoo Han <jingoohan1@gmail.com>
CC: Richard Zhu <hongxing.zhu@nxp.com>
CC: Lucas Stach <l.stach@pengutronix.de>
CC: Murali Karicheri <m-karicheri2@ti.com>
CC: Minghuan Lian <minghuan.Lian@freescale.com>
CC: Mingkai Hu <mingkai.hu@freescale.com>
CC: Roy Zang <tie-fei.zang@freescale.com>
CC: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
CC: Niklas Cassel <niklas.cassel@axis.com>
CC: Jesper Nilsson <jesper.nilsson@axis.com>
CC: Joao Pinto <Joao.Pinto@synopsys.com>
CC: Zhou Wang <wangzhou1@hisilicon.com>
CC: Gabriele Paoloni <gabriele.paoloni@huawei.com>
CC: Stanimir Varbanov <svarbanov@mm-sol.com>
CC: Pratyush Anand <pratyush.anand@gmail.com>
parent 40f67fb2
Hide whitespace changes
Inline Side-by-side
Showing with 666 additions and 481 deletions
drivers/pci/dwc/pci-dra7xx.c
View file @ 442ec4c0
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
#define EXP_CAP_ID_OFFSET 0x70 #define EXP_CAP_ID_OFFSET 0x70
struct dra7xx_pcie { struct dra7xx_pcie {
struct pcie_port pp; struct dw_pcie *pci;
void __iomem *base; /* DT ti_conf */ void __iomem *base; /* DT ti_conf */
int phy_count; /* DT phy-names count */ int phy_count; /* DT phy-names count */
struct phy **phy; struct phy **phy;
...@@ -75,7 +75,7 @@ struct dra7xx_pcie { ...@@ -75,7 +75,7 @@ struct dra7xx_pcie {
struct irq_domain *irq_domain; struct irq_domain *irq_domain;
}; };
#define to_dra7xx_pcie(x) container_of((x), struct dra7xx_pcie, pp) #define to_dra7xx_pcie(x) dev_get_drvdata((x)->dev)
static inline u32 dra7xx_pcie_readl(struct dra7xx_pcie *pcie, u32 offset) static inline u32 dra7xx_pcie_readl(struct dra7xx_pcie *pcie, u32 offset)
{ {
...@@ -88,9 +88,9 @@ static inline void dra7xx_pcie_writel(struct dra7xx_pcie *pcie, u32 offset, ...@@ -88,9 +88,9 @@ static inline void dra7xx_pcie_writel(struct dra7xx_pcie *pcie, u32 offset,
writel(value, pcie->base + offset); writel(value, pcie->base + offset);
} }
static int dra7xx_pcie_link_up(struct pcie_port *pp) static int dra7xx_pcie_link_up(struct dw_pcie *pci)
{ {
struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pp); struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pci);
u32 reg = dra7xx_pcie_readl(dra7xx, PCIECTRL_DRA7XX_CONF_PHY_CS); u32 reg = dra7xx_pcie_readl(dra7xx, PCIECTRL_DRA7XX_CONF_PHY_CS);
return !!(reg & LINK_UP); return !!(reg & LINK_UP);
...@@ -98,32 +98,32 @@ static int dra7xx_pcie_link_up(struct pcie_port *pp) ...@@ -98,32 +98,32 @@ static int dra7xx_pcie_link_up(struct pcie_port *pp)
static int dra7xx_pcie_establish_link(struct dra7xx_pcie *dra7xx) static int dra7xx_pcie_establish_link(struct dra7xx_pcie *dra7xx)
{ {
struct pcie_port *pp = &dra7xx->pp; struct dw_pcie *pci = dra7xx->pci;
struct device *dev = pp->dev; struct device *dev = pci->dev;
u32 reg; u32 reg;
u32 exp_cap_off = EXP_CAP_ID_OFFSET; u32 exp_cap_off = EXP_CAP_ID_OFFSET;
if (dw_pcie_link_up(pp)) { if (dw_pcie_link_up(pci)) {
dev_err(dev, "link is already up\n"); dev_err(dev, "link is already up\n");
return 0; return 0;
} }
if (dra7xx->link_gen == 1) { if (dra7xx->link_gen == 1) {
dw_pcie_read(pp->dbi_base + exp_cap_off + PCI_EXP_LNKCAP, dw_pcie_read(pci->dbi_base + exp_cap_off + PCI_EXP_LNKCAP,
4, &reg); 4, &reg);
if ((reg & PCI_EXP_LNKCAP_SLS) != PCI_EXP_LNKCAP_SLS_2_5GB) { if ((reg & PCI_EXP_LNKCAP_SLS) != PCI_EXP_LNKCAP_SLS_2_5GB) {
reg &= ~((u32)PCI_EXP_LNKCAP_SLS); reg &= ~((u32)PCI_EXP_LNKCAP_SLS);
reg |= PCI_EXP_LNKCAP_SLS_2_5GB; reg |= PCI_EXP_LNKCAP_SLS_2_5GB;
dw_pcie_write(pp->dbi_base + exp_cap_off + dw_pcie_write(pci->dbi_base + exp_cap_off +
PCI_EXP_LNKCAP, 4, reg); PCI_EXP_LNKCAP, 4, reg);
} }
dw_pcie_read(pp->dbi_base + exp_cap_off + PCI_EXP_LNKCTL2, dw_pcie_read(pci->dbi_base + exp_cap_off + PCI_EXP_LNKCTL2,
2, &reg); 2, &reg);
if ((reg & PCI_EXP_LNKCAP_SLS) != PCI_EXP_LNKCAP_SLS_2_5GB) { if ((reg & PCI_EXP_LNKCAP_SLS) != PCI_EXP_LNKCAP_SLS_2_5GB) {
reg &= ~((u32)PCI_EXP_LNKCAP_SLS); reg &= ~((u32)PCI_EXP_LNKCAP_SLS);
reg |= PCI_EXP_LNKCAP_SLS_2_5GB; reg |= PCI_EXP_LNKCAP_SLS_2_5GB;
dw_pcie_write(pp->dbi_base + exp_cap_off + dw_pcie_write(pci->dbi_base + exp_cap_off +
PCI_EXP_LNKCTL2, 2, reg); PCI_EXP_LNKCTL2, 2, reg);
} }
} }
...@@ -132,7 +132,7 @@ static int dra7xx_pcie_establish_link(struct dra7xx_pcie *dra7xx) ...@@ -132,7 +132,7 @@ static int dra7xx_pcie_establish_link(struct dra7xx_pcie *dra7xx)
reg |= LTSSM_EN; reg |= LTSSM_EN;
dra7xx_pcie_writel(dra7xx, PCIECTRL_DRA7XX_CONF_DEVICE_CMD, reg); dra7xx_pcie_writel(dra7xx, PCIECTRL_DRA7XX_CONF_DEVICE_CMD, reg);
return dw_pcie_wait_for_link(pp); return dw_pcie_wait_for_link(pci);
} }
static void dra7xx_pcie_enable_interrupts(struct dra7xx_pcie *dra7xx) static void dra7xx_pcie_enable_interrupts(struct dra7xx_pcie *dra7xx)
...@@ -149,7 +149,8 @@ static void dra7xx_pcie_enable_interrupts(struct dra7xx_pcie *dra7xx) ...@@ -149,7 +149,8 @@ static void dra7xx_pcie_enable_interrupts(struct dra7xx_pcie *dra7xx)
static void dra7xx_pcie_host_init(struct pcie_port *pp) static void dra7xx_pcie_host_init(struct pcie_port *pp)
{ {
struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pci);
pp->io_base &= DRA7XX_CPU_TO_BUS_ADDR; pp->io_base &= DRA7XX_CPU_TO_BUS_ADDR;
pp->mem_base &= DRA7XX_CPU_TO_BUS_ADDR; pp->mem_base &= DRA7XX_CPU_TO_BUS_ADDR;
...@@ -163,8 +164,7 @@ static void dra7xx_pcie_host_init(struct pcie_port *pp) ...@@ -163,8 +164,7 @@ static void dra7xx_pcie_host_init(struct pcie_port *pp)
dra7xx_pcie_enable_interrupts(dra7xx); dra7xx_pcie_enable_interrupts(dra7xx);
} }
static struct pcie_host_ops dra7xx_pcie_host_ops = { static struct dw_pcie_host_ops dra7xx_pcie_host_ops = {
.link_up = dra7xx_pcie_link_up,
.host_init = dra7xx_pcie_host_init, .host_init = dra7xx_pcie_host_init,
}; };
...@@ -183,8 +183,9 @@ static const struct irq_domain_ops intx_domain_ops = { ...@@ -183,8 +183,9 @@ static const struct irq_domain_ops intx_domain_ops = {
static int dra7xx_pcie_init_irq_domain(struct pcie_port *pp) static int dra7xx_pcie_init_irq_domain(struct pcie_port *pp)
{ {
struct device *dev = pp->dev; struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pp); struct device *dev = pci->dev;
struct dra7xx_pcie *dra7xx = to_dra7xx_pcie(pci);
struct device_node *node = dev->of_node; struct device_node *node = dev->of_node;
struct device_node *pcie_intc_node = of_get_next_child(node, NULL); struct device_node *pcie_intc_node = of_get_next_child(node, NULL);
...@@ -206,7 +207,8 @@ static int dra7xx_pcie_init_irq_domain(struct pcie_port *pp) ...@@ -206,7 +207,8 @@ static int dra7xx_pcie_init_irq_domain(struct pcie_port *pp)
static irqreturn_t dra7xx_pcie_msi_irq_handler(int irq, void *arg) static irqreturn_t dra7xx_pcie_msi_irq_handler(int irq, void *arg)
{ {
struct dra7xx_pcie *dra7xx = arg; struct dra7xx_pcie *dra7xx = arg;
struct pcie_port *pp = &dra7xx->pp; struct dw_pcie *pci = dra7xx->pci;
struct pcie_port *pp = &pci->pp;
u32 reg; u32 reg;
reg = dra7xx_pcie_readl(dra7xx, PCIECTRL_DRA7XX_CONF_IRQSTATUS_MSI); reg = dra7xx_pcie_readl(dra7xx, PCIECTRL_DRA7XX_CONF_IRQSTATUS_MSI);
...@@ -233,7 +235,8 @@ static irqreturn_t dra7xx_pcie_msi_irq_handler(int irq, void *arg) ...@@ -233,7 +235,8 @@ static irqreturn_t dra7xx_pcie_msi_irq_handler(int irq, void *arg)
static irqreturn_t dra7xx_pcie_irq_handler(int irq, void *arg) static irqreturn_t dra7xx_pcie_irq_handler(int irq, void *arg)
{ {
struct dra7xx_pcie *dra7xx = arg; struct dra7xx_pcie *dra7xx = arg;
struct device *dev = dra7xx->pp.dev; struct dw_pcie *pci = dra7xx->pci;
struct device *dev = pci->dev;
u32 reg; u32 reg;
reg = dra7xx_pcie_readl(dra7xx, PCIECTRL_DRA7XX_CONF_IRQSTATUS_MAIN); reg = dra7xx_pcie_readl(dra7xx, PCIECTRL_DRA7XX_CONF_IRQSTATUS_MAIN);
...@@ -288,8 +291,9 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, ...@@ -288,8 +291,9 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,
struct platform_device *pdev) struct platform_device *pdev)
{ {
int ret; int ret;
struct pcie_port *pp = &dra7xx->pp; struct dw_pcie *pci = dra7xx->pci;
struct device *dev = pp->dev; struct pcie_port *pp = &pci->pp;
struct device *dev = pci->dev;
struct resource *res; struct resource *res;
pp->irq = platform_get_irq(pdev, 1); pp->irq = platform_get_irq(pdev, 1);
...@@ -311,8 +315,8 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, ...@@ -311,8 +315,8 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,
return ret; return ret;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbics"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbics");
pp->dbi_base = devm_ioremap(dev, res->start, resource_size(res)); pci->dbi_base = devm_ioremap(dev, res->start, resource_size(res));
if (!pp->dbi_base) if (!pci->dbi_base)
return -ENOMEM; return -ENOMEM;
ret = dw_pcie_host_init(pp); ret = dw_pcie_host_init(pp);
...@@ -324,6 +328,10 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx, ...@@ -324,6 +328,10 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,
return 0; return 0;
} }
static const struct dw_pcie_ops dw_pcie_ops = {
.link_up = dra7xx_pcie_link_up,
};
static void dra7xx_pcie_disable_phy(struct dra7xx_pcie *dra7xx) static void dra7xx_pcie_disable_phy(struct dra7xx_pcie *dra7xx)
{ {
int phy_count = dra7xx->phy_count; int phy_count = dra7xx->phy_count;
...@@ -373,8 +381,9 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) ...@@ -373,8 +381,9 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
struct phy **phy; struct phy **phy;
void __iomem *base; void __iomem *base;
struct resource *res; struct resource *res;
struct dra7xx_pcie *dra7xx; struct dw_pcie *pci;
struct pcie_port *pp; struct pcie_port *pp;
struct dra7xx_pcie *dra7xx;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
char name[10]; char name[10];
...@@ -384,8 +393,14 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) ...@@ -384,8 +393,14 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
if (!dra7xx) if (!dra7xx)
return -ENOMEM; return -ENOMEM;
pp = &dra7xx->pp; pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL);
pp->dev = dev; if (!pci)
return -ENOMEM;
pci->dev = dev;
pci->ops = &dw_pcie_ops;
pp = &pci->pp;
pp->ops = &dra7xx_pcie_host_ops; pp->ops = &dra7xx_pcie_host_ops;
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
...@@ -425,6 +440,7 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) ...@@ -425,6 +440,7 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
dra7xx->base = base; dra7xx->base = base;
dra7xx->phy = phy; dra7xx->phy = phy;
dra7xx->pci = pci;
dra7xx->phy_count = phy_count; dra7xx->phy_count = phy_count;
ret = dra7xx_pcie_enable_phy(dra7xx); ret = dra7xx_pcie_enable_phy(dra7xx);
...@@ -477,13 +493,13 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) ...@@ -477,13 +493,13 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)
static int dra7xx_pcie_suspend(struct device *dev) static int dra7xx_pcie_suspend(struct device *dev)
{ {
struct dra7xx_pcie *dra7xx = dev_get_drvdata(dev); struct dra7xx_pcie *dra7xx = dev_get_drvdata(dev);
struct pcie_port *pp = &dra7xx->pp; struct dw_pcie *pci = dra7xx->pci;
u32 val; u32 val;
/* clear MSE */ /* clear MSE */
val = dw_pcie_readl_rc(pp, PCI_COMMAND); val = dw_pcie_readl_dbi(pci, PCI_COMMAND);
val &= ~PCI_COMMAND_MEMORY; val &= ~PCI_COMMAND_MEMORY;
dw_pcie_writel_rc(pp, PCI_COMMAND, val); dw_pcie_writel_dbi(pci, PCI_COMMAND, val);
return 0; return 0;
} }
...@@ -491,13 +507,13 @@ static int dra7xx_pcie_suspend(struct device *dev) ...@@ -491,13 +507,13 @@ static int dra7xx_pcie_suspend(struct device *dev)
static int dra7xx_pcie_resume(struct device *dev) static int dra7xx_pcie_resume(struct device *dev)
{ {
struct dra7xx_pcie *dra7xx = dev_get_drvdata(dev); struct dra7xx_pcie *dra7xx = dev_get_drvdata(dev);
struct pcie_port *pp = &dra7xx->pp; struct dw_pcie *pci = dra7xx->pci;
u32 val; u32 val;
/* set MSE */ /* set MSE */
val = dw_pcie_readl_rc(pp, PCI_COMMAND); val = dw_pcie_readl_dbi(pci, PCI_COMMAND);
val |= PCI_COMMAND_MEMORY; val |= PCI_COMMAND_MEMORY;
dw_pcie_writel_rc(pp, PCI_COMMAND, val); dw_pcie_writel_dbi(pci, PCI_COMMAND, val);
return 0; return 0;
} }
......
drivers/pci/dwc/pci-exynos.c
View file @ 442ec4c0
...@@ -26,10 +26,10 @@ ...@@ -26,10 +26,10 @@
#include "pcie-designware.h" #include "pcie-designware.h"
#define to_exynos_pcie(x) container_of(x, struct exynos_pcie, pp) #define to_exynos_pcie(x) dev_get_drvdata((x)->dev)
struct exynos_pcie { struct exynos_pcie {
struct pcie_port pp; struct dw_pcie *pci;
void __iomem *elbi_base; /* DT 0th resource */ void __iomem *elbi_base; /* DT 0th resource */
void __iomem *phy_base; /* DT 1st resource */ void __iomem *phy_base; /* DT 1st resource */
void __iomem *block_base; /* DT 2nd resource */ void __iomem *block_base; /* DT 2nd resource */
...@@ -297,8 +297,8 @@ static void exynos_pcie_init_phy(struct exynos_pcie *exynos_pcie) ...@@ -297,8 +297,8 @@ static void exynos_pcie_init_phy(struct exynos_pcie *exynos_pcie)
static void exynos_pcie_assert_reset(struct exynos_pcie *exynos_pcie) static void exynos_pcie_assert_reset(struct exynos_pcie *exynos_pcie)
{ {
struct pcie_port *pp = &exynos_pcie->pp; struct dw_pcie *pci = exynos_pcie->pci;
struct device *dev = pp->dev; struct device *dev = pci->dev;
if (exynos_pcie->reset_gpio >= 0) if (exynos_pcie->reset_gpio >= 0)
devm_gpio_request_one(dev, exynos_pcie->reset_gpio, devm_gpio_request_one(dev, exynos_pcie->reset_gpio,
...@@ -307,11 +307,12 @@ static void exynos_pcie_assert_reset(struct exynos_pcie *exynos_pcie) ...@@ -307,11 +307,12 @@ static void exynos_pcie_assert_reset(struct exynos_pcie *exynos_pcie)
static int exynos_pcie_establish_link(struct exynos_pcie *exynos_pcie) static int exynos_pcie_establish_link(struct exynos_pcie *exynos_pcie)
{ {
struct pcie_port *pp = &exynos_pcie->pp; struct dw_pcie *pci = exynos_pcie->pci;
struct device *dev = pp->dev; struct pcie_port *pp = &pci->pp;
struct device *dev = pci->dev;
u32 val; u32 val;
if (dw_pcie_link_up(pp)) { if (dw_pcie_link_up(pci)) {
dev_err(dev, "Link already up\n"); dev_err(dev, "Link already up\n");
return 0; return 0;
} }
...@@ -336,7 +337,7 @@ static int exynos_pcie_establish_link(struct exynos_pcie *exynos_pcie) ...@@ -336,7 +337,7 @@ static int exynos_pcie_establish_link(struct exynos_pcie *exynos_pcie)
PCIE_APP_LTSSM_ENABLE); PCIE_APP_LTSSM_ENABLE);
/* check if the link is up or not */ /* check if the link is up or not */
if (!dw_pcie_wait_for_link(pp)) if (!dw_pcie_wait_for_link(pci))
return 0; return 0;
while (exynos_phy_readl(exynos_pcie, PCIE_PHY_PLL_LOCKED) == 0) { while (exynos_phy_readl(exynos_pcie, PCIE_PHY_PLL_LOCKED) == 0) {
...@@ -376,14 +377,16 @@ static irqreturn_t exynos_pcie_irq_handler(int irq, void *arg) ...@@ -376,14 +377,16 @@ static irqreturn_t exynos_pcie_irq_handler(int irq, void *arg)
static irqreturn_t exynos_pcie_msi_irq_handler(int irq, void *arg) static irqreturn_t exynos_pcie_msi_irq_handler(int irq, void *arg)
{ {
struct exynos_pcie *exynos_pcie = arg; struct exynos_pcie *exynos_pcie = arg;
struct pcie_port *pp = &exynos_pcie->pp; struct dw_pcie *pci = exynos_pcie->pci;
struct pcie_port *pp = &pci->pp;
return dw_handle_msi_irq(pp); return dw_handle_msi_irq(pp);
} }
static void exynos_pcie_msi_init(struct exynos_pcie *exynos_pcie) static void exynos_pcie_msi_init(struct exynos_pcie *exynos_pcie)
{ {
struct pcie_port *pp = &exynos_pcie->pp; struct dw_pcie *pci = exynos_pcie->pci;
struct pcie_port *pp = &pci->pp;
u32 val; u32 val;
dw_pcie_msi_init(pp); dw_pcie_msi_init(pp);
...@@ -402,34 +405,35 @@ static void exynos_pcie_enable_interrupts(struct exynos_pcie *exynos_pcie) ...@@ -402,34 +405,35 @@ static void exynos_pcie_enable_interrupts(struct exynos_pcie *exynos_pcie)
exynos_pcie_msi_init(exynos_pcie); exynos_pcie_msi_init(exynos_pcie);
} }
static u32 exynos_pcie_readl_rc(struct pcie_port *pp, u32 reg) static u32 exynos_pcie_readl_dbi(struct dw_pcie *pci, u32 reg)
{ {
struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp); struct exynos_pcie *exynos_pcie = to_exynos_pcie(pci);
u32 val; u32 val;
exynos_pcie_sideband_dbi_r_mode(exynos_pcie, true); exynos_pcie_sideband_dbi_r_mode(exynos_pcie, true);
val = readl(pp->dbi_base + reg); val = readl(pci->dbi_base + reg);
exynos_pcie_sideband_dbi_r_mode(exynos_pcie, false); exynos_pcie_sideband_dbi_r_mode(exynos_pcie, false);
return val; return val;
} }
static void exynos_pcie_writel_rc(struct pcie_port *pp, u32 reg, u32 val) static void exynos_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val)
{ {
struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp); struct exynos_pcie *exynos_pcie = to_exynos_pcie(pci);
exynos_pcie_sideband_dbi_w_mode(exynos_pcie, true); exynos_pcie_sideband_dbi_w_mode(exynos_pcie, true);
writel(val, pp->dbi_base + reg); writel(val, pci->dbi_base + reg);
exynos_pcie_sideband_dbi_w_mode(exynos_pcie, false); exynos_pcie_sideband_dbi_w_mode(exynos_pcie, false);
} }
static int exynos_pcie_rd_own_conf(struct pcie_port *pp, int where, int size, static int exynos_pcie_rd_own_conf(struct pcie_port *pp, int where, int size,
u32 *val) u32 *val)
{ {
struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct exynos_pcie *exynos_pcie = to_exynos_pcie(pci);
int ret; int ret;
exynos_pcie_sideband_dbi_r_mode(exynos_pcie, true); exynos_pcie_sideband_dbi_r_mode(exynos_pcie, true);
ret = dw_pcie_read(pp->dbi_base + where, size, val); ret = dw_pcie_read(pci->dbi_base + where, size, val);
exynos_pcie_sideband_dbi_r_mode(exynos_pcie, false); exynos_pcie_sideband_dbi_r_mode(exynos_pcie, false);
return ret; return ret;
} }
...@@ -437,18 +441,19 @@ static int exynos_pcie_rd_own_conf(struct pcie_port *pp, int where, int size, ...@@ -437,18 +441,19 @@ static int exynos_pcie_rd_own_conf(struct pcie_port *pp, int where, int size,
static int exynos_pcie_wr_own_conf(struct pcie_port *pp, int where, int size, static int exynos_pcie_wr_own_conf(struct pcie_port *pp, int where, int size,
u32 val) u32 val)
{ {
struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct exynos_pcie *exynos_pcie = to_exynos_pcie(pci);
int ret; int ret;
exynos_pcie_sideband_dbi_w_mode(exynos_pcie, true); exynos_pcie_sideband_dbi_w_mode(exynos_pcie, true);
ret = dw_pcie_write(pp->dbi_base + where, size, val); ret = dw_pcie_write(pci->dbi_base + where, size, val);
exynos_pcie_sideband_dbi_w_mode(exynos_pcie, false); exynos_pcie_sideband_dbi_w_mode(exynos_pcie, false);
return ret; return ret;
} }
static int exynos_pcie_link_up(struct pcie_port *pp) static int exynos_pcie_link_up(struct dw_pcie *pci)
{ {
struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp); struct exynos_pcie *exynos_pcie = to_exynos_pcie(pci);
u32 val; u32 val;
val = exynos_elb_readl(exynos_pcie, PCIE_ELBI_RDLH_LINKUP); val = exynos_elb_readl(exynos_pcie, PCIE_ELBI_RDLH_LINKUP);
...@@ -460,26 +465,25 @@ static int exynos_pcie_link_up(struct pcie_port *pp) ...@@ -460,26 +465,25 @@ static int exynos_pcie_link_up(struct pcie_port *pp)
static void exynos_pcie_host_init(struct pcie_port *pp) static void exynos_pcie_host_init(struct pcie_port *pp)
{ {
struct exynos_pcie *exynos_pcie = to_exynos_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct exynos_pcie *exynos_pcie = to_exynos_pcie(pci);
exynos_pcie_establish_link(exynos_pcie); exynos_pcie_establish_link(exynos_pcie);
exynos_pcie_enable_interrupts(exynos_pcie); exynos_pcie_enable_interrupts(exynos_pcie);
} }
static struct pcie_host_ops exynos_pcie_host_ops = { static struct dw_pcie_host_ops exynos_pcie_host_ops = {
.readl_rc = exynos_pcie_readl_rc,
.writel_rc = exynos_pcie_writel_rc,
.rd_own_conf = exynos_pcie_rd_own_conf, .rd_own_conf = exynos_pcie_rd_own_conf,
.wr_own_conf = exynos_pcie_wr_own_conf, .wr_own_conf = exynos_pcie_wr_own_conf,
.link_up = exynos_pcie_link_up,
.host_init = exynos_pcie_host_init, .host_init = exynos_pcie_host_init,
}; };
static int __init exynos_add_pcie_port(struct exynos_pcie *exynos_pcie, static int __init exynos_add_pcie_port(struct exynos_pcie *exynos_pcie,
struct platform_device *pdev) struct platform_device *pdev)
{ {
struct pcie_port *pp = &exynos_pcie->pp; struct dw_pcie *pci = exynos_pcie->pci;
struct device *dev = pp->dev; struct pcie_port *pp = &pci->pp;
struct device *dev = &pdev->dev;
int ret; int ret;
pp->irq = platform_get_irq(pdev, 1); pp->irq = platform_get_irq(pdev, 1);
...@@ -523,11 +527,17 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *exynos_pcie, ...@@ -523,11 +527,17 @@ static int __init exynos_add_pcie_port(struct exynos_pcie *exynos_pcie,
return 0; return 0;
} }
static const struct dw_pcie_ops dw_pcie_ops = {
.readl_dbi = exynos_pcie_readl_dbi,
.writel_dbi = exynos_pcie_writel_dbi,
.link_up = exynos_pcie_link_up,
};
static int __init exynos_pcie_probe(struct platform_device *pdev) static int __init exynos_pcie_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct dw_pcie *pci;
struct exynos_pcie *exynos_pcie; struct exynos_pcie *exynos_pcie;
struct pcie_port *pp;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct resource *elbi_base; struct resource *elbi_base;
struct resource *phy_base; struct resource *phy_base;
...@@ -538,8 +548,12 @@ static int __init exynos_pcie_probe(struct platform_device *pdev) ...@@ -538,8 +548,12 @@ static int __init exynos_pcie_probe(struct platform_device *pdev)
if (!exynos_pcie) if (!exynos_pcie)
return -ENOMEM; return -ENOMEM;
pp = &exynos_pcie->pp; pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL);
pp->dev = dev; if (!pci)
return -ENOMEM;
pci->dev = dev;
pci->ops = &dw_pcie_ops;
exynos_pcie->reset_gpio = of_get_named_gpio(np, "reset-gpio", 0); exynos_pcie->reset_gpio = of_get_named_gpio(np, "reset-gpio", 0);
......
drivers/pci/dwc/pci-imx6.c
View file @ 442ec4c0
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "pcie-designware.h" #include "pcie-designware.h"
#define to_imx6_pcie(x) container_of(x, struct imx6_pcie, pp) #define to_imx6_pcie(x) dev_get_drvdata((x)->dev)
enum imx6_pcie_variants { enum imx6_pcie_variants {
IMX6Q, IMX6Q,
...@@ -39,7 +39,7 @@ enum imx6_pcie_variants { ...@@ -39,7 +39,7 @@ enum imx6_pcie_variants {
}; };
struct imx6_pcie { struct imx6_pcie {
struct pcie_port pp; /* pp.dbi_base is DT 0th resource */ struct dw_pcie *pci;
int reset_gpio; int reset_gpio;
bool gpio_active_high; bool gpio_active_high;
struct clk *pcie_bus; struct clk *pcie_bus;
...@@ -97,13 +97,13 @@ struct imx6_pcie { ...@@ -97,13 +97,13 @@ struct imx6_pcie {
static int pcie_phy_poll_ack(struct imx6_pcie *imx6_pcie, int exp_val) static int pcie_phy_poll_ack(struct imx6_pcie *imx6_pcie, int exp_val)
{ {
struct pcie_port *pp = &imx6_pcie->pp; struct dw_pcie *pci = imx6_pcie->pci;
u32 val; u32 val;
u32 max_iterations = 10; u32 max_iterations = 10;
u32 wait_counter = 0; u32 wait_counter = 0;
do { do {
val = dw_pcie_readl_rc(pp, PCIE_PHY_STAT); val = dw_pcie_readl_dbi(pci, PCIE_PHY_STAT);
val = (val >> PCIE_PHY_STAT_ACK_LOC) & 0x1; val = (val >> PCIE_PHY_STAT_ACK_LOC) & 0x1;
wait_counter++; wait_counter++;
...@@ -118,22 +118,22 @@ static int pcie_phy_poll_ack(struct imx6_pcie *imx6_pcie, int exp_val) ...@@ -118,22 +118,22 @@ static int pcie_phy_poll_ack(struct imx6_pcie *imx6_pcie, int exp_val)
static int pcie_phy_wait_ack(struct imx6_pcie *imx6_pcie, int addr) static int pcie_phy_wait_ack(struct imx6_pcie *imx6_pcie, int addr)
{ {
struct pcie_port *pp = &imx6_pcie->pp; struct dw_pcie *pci = imx6_pcie->pci;
u32 val; u32 val;
int ret; int ret;
val = addr << PCIE_PHY_CTRL_DATA_LOC; val = addr << PCIE_PHY_CTRL_DATA_LOC;
dw_pcie_writel_rc(pp, PCIE_PHY_CTRL, val); dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, val);
val |= (0x1 << PCIE_PHY_CTRL_CAP_ADR_LOC); val |= (0x1 << PCIE_PHY_CTRL_CAP_ADR_LOC);
dw_pcie_writel_rc(pp, PCIE_PHY_CTRL, val); dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, val);
ret = pcie_phy_poll_ack(imx6_pcie, 1); ret = pcie_phy_poll_ack(imx6_pcie, 1);
if (ret) if (ret)
return ret; return ret;
val = addr << PCIE_PHY_CTRL_DATA_LOC; val = addr << PCIE_PHY_CTRL_DATA_LOC;
dw_pcie_writel_rc(pp, PCIE_PHY_CTRL, val); dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, val);
return pcie_phy_poll_ack(imx6_pcie, 0); return pcie_phy_poll_ack(imx6_pcie, 0);
} }
...@@ -141,7 +141,7 @@ static int pcie_phy_wait_ack(struct imx6_pcie *imx6_pcie, int addr) ...@@ -141,7 +141,7 @@ static int pcie_phy_wait_ack(struct imx6_pcie *imx6_pcie, int addr)
/* Read from the 16-bit PCIe PHY control registers (not memory-mapped) */ /* Read from the 16-bit PCIe PHY control registers (not memory-mapped) */
static int pcie_phy_read(struct imx6_pcie *imx6_pcie, int addr, int *data) static int pcie_phy_read(struct imx6_pcie *imx6_pcie, int addr, int *data)
{ {
struct pcie_port *pp = &imx6_pcie->pp; struct dw_pcie *pci = imx6_pcie->pci;
u32 val, phy_ctl; u32 val, phy_ctl;
int ret; int ret;
...@@ -151,24 +151,24 @@ static int pcie_phy_read(struct imx6_pcie *imx6_pcie, int addr, int *data) ...@@ -151,24 +151,24 @@ static int pcie_phy_read(struct imx6_pcie *imx6_pcie, int addr, int *data)
/* assert Read signal */ /* assert Read signal */
phy_ctl = 0x1 << PCIE_PHY_CTRL_RD_LOC; phy_ctl = 0x1 << PCIE_PHY_CTRL_RD_LOC;
dw_pcie_writel_rc(pp, PCIE_PHY_CTRL, phy_ctl); dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, phy_ctl);
ret = pcie_phy_poll_ack(imx6_pcie, 1); ret = pcie_phy_poll_ack(imx6_pcie, 1);
if (ret) if (ret)
return ret; return ret;
val = dw_pcie_readl_rc(pp, PCIE_PHY_STAT); val = dw_pcie_readl_dbi(pci, PCIE_PHY_STAT);
*data = val & 0xffff; *data = val & 0xffff;
/* deassert Read signal */ /* deassert Read signal */
dw_pcie_writel_rc(pp, PCIE_PHY_CTRL, 0x00); dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, 0x00);
return pcie_phy_poll_ack(imx6_pcie, 0); return pcie_phy_poll_ack(imx6_pcie, 0);
} }
static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data) static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data)
{ {
struct pcie_port *pp = &imx6_pcie->pp; struct dw_pcie *pci = imx6_pcie->pci;
u32 var; u32 var;
int ret; int ret;
...@@ -179,11 +179,11 @@ static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data) ...@@ -179,11 +179,11 @@ static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data)
return ret; return ret;
var = data << PCIE_PHY_CTRL_DATA_LOC; var = data << PCIE_PHY_CTRL_DATA_LOC;
dw_pcie_writel_rc(pp, PCIE_PHY_CTRL, var); dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, var);
/* capture data */ /* capture data */
var |= (0x1 << PCIE_PHY_CTRL_CAP_DAT_LOC); var |= (0x1 << PCIE_PHY_CTRL_CAP_DAT_LOC);
dw_pcie_writel_rc(pp, PCIE_PHY_CTRL, var); dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, var);
ret = pcie_phy_poll_ack(imx6_pcie, 1); ret = pcie_phy_poll_ack(imx6_pcie, 1);
if (ret) if (ret)
...@@ -191,7 +191,7 @@ static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data) ...@@ -191,7 +191,7 @@ static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data)
/* deassert cap data */ /* deassert cap data */
var = data << PCIE_PHY_CTRL_DATA_LOC; var = data << PCIE_PHY_CTRL_DATA_LOC;
dw_pcie_writel_rc(pp, PCIE_PHY_CTRL, var); dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, var);
/* wait for ack de-assertion */ /* wait for ack de-assertion */
ret = pcie_phy_poll_ack(imx6_pcie, 0); ret = pcie_phy_poll_ack(imx6_pcie, 0);
...@@ -200,7 +200,7 @@ static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data) ...@@ -200,7 +200,7 @@ static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data)
/* assert wr signal */ /* assert wr signal */
var = 0x1 << PCIE_PHY_CTRL_WR_LOC; var = 0x1 << PCIE_PHY_CTRL_WR_LOC;
dw_pcie_writel_rc(pp, PCIE_PHY_CTRL, var); dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, var);
/* wait for ack */ /* wait for ack */
ret = pcie_phy_poll_ack(imx6_pcie, 1); ret = pcie_phy_poll_ack(imx6_pcie, 1);
...@@ -209,14 +209,14 @@ static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data) ...@@ -209,14 +209,14 @@ static int pcie_phy_write(struct imx6_pcie *imx6_pcie, int addr, int data)
/* deassert wr signal */ /* deassert wr signal */
var = data << PCIE_PHY_CTRL_DATA_LOC; var = data << PCIE_PHY_CTRL_DATA_LOC;
dw_pcie_writel_rc(pp, PCIE_PHY_CTRL, var); dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, var);
/* wait for ack de-assertion */ /* wait for ack de-assertion */
ret = pcie_phy_poll_ack(imx6_pcie, 0); ret = pcie_phy_poll_ack(imx6_pcie, 0);
if (ret) if (ret)
return ret; return ret;
dw_pcie_writel_rc(pp, PCIE_PHY_CTRL, 0x0); dw_pcie_writel_dbi(pci, PCIE_PHY_CTRL, 0x0);
return 0; return 0;
} }
...@@ -247,7 +247,7 @@ static int imx6q_pcie_abort_handler(unsigned long addr, ...@@ -247,7 +247,7 @@ static int imx6q_pcie_abort_handler(unsigned long addr,
static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
{ {
struct pcie_port *pp = &imx6_pcie->pp; struct dw_pcie *pci = imx6_pcie->pci;
u32 val, gpr1, gpr12; u32 val, gpr1, gpr12;
switch (imx6_pcie->variant) { switch (imx6_pcie->variant) {
...@@ -284,10 +284,10 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) ...@@ -284,10 +284,10 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
if ((gpr1 & IMX6Q_GPR1_PCIE_REF_CLK_EN) && if ((gpr1 & IMX6Q_GPR1_PCIE_REF_CLK_EN) &&
(gpr12 & IMX6Q_GPR12_PCIE_CTL_2)) { (gpr12 & IMX6Q_GPR12_PCIE_CTL_2)) {
val = dw_pcie_readl_rc(pp, PCIE_PL_PFLR); val = dw_pcie_readl_dbi(pci, PCIE_PL_PFLR);
val &= ~PCIE_PL_PFLR_LINK_STATE_MASK; val &= ~PCIE_PL_PFLR_LINK_STATE_MASK;
val |= PCIE_PL_PFLR_FORCE_LINK; val |= PCIE_PL_PFLR_FORCE_LINK;
dw_pcie_writel_rc(pp, PCIE_PL_PFLR, val); dw_pcie_writel_dbi(pci, PCIE_PL_PFLR, val);
regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
IMX6Q_GPR12_PCIE_CTL_2, 0 << 10); IMX6Q_GPR12_PCIE_CTL_2, 0 << 10);
...@@ -303,8 +303,8 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie) ...@@ -303,8 +303,8 @@ static void imx6_pcie_assert_core_reset(struct imx6_pcie *imx6_pcie)
static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie) static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie)
{ {
struct pcie_port *pp = &imx6_pcie->pp; struct dw_pcie *pci = imx6_pcie->pci;
struct device *dev = pp->dev; struct device *dev = pci->dev;
int ret = 0; int ret = 0;
switch (imx6_pcie->variant) { switch (imx6_pcie->variant) {
...@@ -340,8 +340,8 @@ static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie) ...@@ -340,8 +340,8 @@ static int imx6_pcie_enable_ref_clk(struct imx6_pcie *imx6_pcie)
static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie) static void imx6_pcie_deassert_core_reset(struct imx6_pcie *imx6_pcie)
{ {
struct pcie_port *pp = &imx6_pcie->pp; struct dw_pcie *pci = imx6_pcie->pci;
struct device *dev = pp->dev; struct device *dev = pci->dev;
int ret; int ret;
ret = clk_prepare_enable(imx6_pcie->pcie_phy); ret = clk_prepare_enable(imx6_pcie->pcie_phy);
...@@ -440,28 +440,28 @@ static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie) ...@@ -440,28 +440,28 @@ static void imx6_pcie_init_phy(struct imx6_pcie *imx6_pcie)
static int imx6_pcie_wait_for_link(struct imx6_pcie *imx6_pcie) static int imx6_pcie_wait_for_link(struct imx6_pcie *imx6_pcie)
{ {
struct pcie_port *pp = &imx6_pcie->pp; struct dw_pcie *pci = imx6_pcie->pci;
struct device *dev = pp->dev; struct device *dev = pci->dev;
/* check if the link is up or not */ /* check if the link is up or not */
if (!dw_pcie_wait_for_link(pp)) if (!dw_pcie_wait_for_link(pci))
return 0; return 0;
dev_dbg(dev, "DEBUG_R0: 0x%08x, DEBUG_R1: 0x%08x\n", dev_dbg(dev, "DEBUG_R0: 0x%08x, DEBUG_R1: 0x%08x\n",
dw_pcie_readl_rc(pp, PCIE_PHY_DEBUG_R0), dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R0),
dw_pcie_readl_rc(pp, PCIE_PHY_DEBUG_R1)); dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R1));
return -ETIMEDOUT; return -ETIMEDOUT;
} }
static int imx6_pcie_wait_for_speed_change(struct imx6_pcie *imx6_pcie) static int imx6_pcie_wait_for_speed_change(struct imx6_pcie *imx6_pcie)
{ {
struct pcie_port *pp = &imx6_pcie->pp; struct dw_pcie *pci = imx6_pcie->pci;
struct device *dev = pp->dev; struct device *dev = pci->dev;
u32 tmp; u32 tmp;
unsigned int retries; unsigned int retries;
for (retries = 0; retries < 200; retries++) { for (retries = 0; retries < 200; retries++) {
tmp = dw_pcie_readl_rc(pp, PCIE_LINK_WIDTH_SPEED_CONTROL); tmp = dw_pcie_readl_dbi(pci, PCIE_LINK_WIDTH_SPEED_CONTROL);
/* Test if the speed change finished. */ /* Test if the speed change finished. */
if (!(tmp & PORT_LOGIC_SPEED_CHANGE)) if (!(tmp & PORT_LOGIC_SPEED_CHANGE))
return 0; return 0;
...@@ -475,15 +475,16 @@ static int imx6_pcie_wait_for_speed_change(struct imx6_pcie *imx6_pcie) ...@@ -475,15 +475,16 @@ static int imx6_pcie_wait_for_speed_change(struct imx6_pcie *imx6_pcie)
static irqreturn_t imx6_pcie_msi_handler(int irq, void *arg) static irqreturn_t imx6_pcie_msi_handler(int irq, void *arg)
{ {
struct imx6_pcie *imx6_pcie = arg; struct imx6_pcie *imx6_pcie = arg;
struct pcie_port *pp = &imx6_pcie->pp; struct dw_pcie *pci = imx6_pcie->pci;
struct pcie_port *pp = &pci->pp;
return dw_handle_msi_irq(pp); return dw_handle_msi_irq(pp);
} }
static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie) static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)
{ {
struct pcie_port *pp = &imx6_pcie->pp; struct dw_pcie *pci = imx6_pcie->pci;
struct device *dev = pp->dev; struct device *dev = pci->dev;
u32 tmp; u32 tmp;
int ret; int ret;
...@@ -492,10 +493,10 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie) ...@@ -492,10 +493,10 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)
* started in Gen2 mode, there is a possibility the devices on the * started in Gen2 mode, there is a possibility the devices on the
* bus will not be detected at all. This happens with PCIe switches. * bus will not be detected at all. This happens with PCIe switches.
*/ */
tmp = dw_pcie_readl_rc(pp, PCIE_RC_LCR); tmp = dw_pcie_readl_dbi(pci, PCIE_RC_LCR);
tmp &= ~PCIE_RC_LCR_MAX_LINK_SPEEDS_MASK; tmp &= ~PCIE_RC_LCR_MAX_LINK_SPEEDS_MASK;
tmp |= PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN1; tmp |= PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN1;
dw_pcie_writel_rc(pp, PCIE_RC_LCR, tmp); dw_pcie_writel_dbi(pci, PCIE_RC_LCR, tmp);
/* Start LTSSM. */ /* Start LTSSM. */
regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12, regmap_update_bits(imx6_pcie->iomuxc_gpr, IOMUXC_GPR12,
...@@ -509,10 +510,10 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie) ...@@ -509,10 +510,10 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)
if (imx6_pcie->link_gen == 2) { if (imx6_pcie->link_gen == 2) {
/* Allow Gen2 mode after the link is up. */ /* Allow Gen2 mode after the link is up. */
tmp = dw_pcie_readl_rc(pp, PCIE_RC_LCR); tmp = dw_pcie_readl_dbi(pci, PCIE_RC_LCR);
tmp &= ~PCIE_RC_LCR_MAX_LINK_SPEEDS_MASK; tmp &= ~PCIE_RC_LCR_MAX_LINK_SPEEDS_MASK;
tmp |= PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN2; tmp |= PCIE_RC_LCR_MAX_LINK_SPEEDS_GEN2;
dw_pcie_writel_rc(pp, PCIE_RC_LCR, tmp); dw_pcie_writel_dbi(pci, PCIE_RC_LCR, tmp);
} else { } else {
dev_info(dev, "Link: Gen2 disabled\n"); dev_info(dev, "Link: Gen2 disabled\n");
} }
...@@ -521,9 +522,9 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie) ...@@ -521,9 +522,9 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)
* Start Directed Speed Change so the best possible speed both link * Start Directed Speed Change so the best possible speed both link
* partners support can be negotiated. * partners support can be negotiated.
*/ */
tmp = dw_pcie_readl_rc(pp, PCIE_LINK_WIDTH_SPEED_CONTROL); tmp = dw_pcie_readl_dbi(pci, PCIE_LINK_WIDTH_SPEED_CONTROL);
tmp |= PORT_LOGIC_SPEED_CHANGE; tmp |= PORT_LOGIC_SPEED_CHANGE;
dw_pcie_writel_rc(pp, PCIE_LINK_WIDTH_SPEED_CONTROL, tmp); dw_pcie_writel_dbi(pci, PCIE_LINK_WIDTH_SPEED_CONTROL, tmp);
ret = imx6_pcie_wait_for_speed_change(imx6_pcie); ret = imx6_pcie_wait_for_speed_change(imx6_pcie);
if (ret) { if (ret) {
...@@ -538,21 +539,22 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie) ...@@ -538,21 +539,22 @@ static int imx6_pcie_establish_link(struct imx6_pcie *imx6_pcie)
goto err_reset_phy; goto err_reset_phy;
} }
tmp = dw_pcie_readl_rc(pp, PCIE_RC_LCSR); tmp = dw_pcie_readl_dbi(pci, PCIE_RC_LCSR);
dev_info(dev, "Link up, Gen%i\n", (tmp >> 16) & 0xf); dev_info(dev, "Link up, Gen%i\n", (tmp >> 16) & 0xf);
return 0; return 0;
err_reset_phy: err_reset_phy:
dev_dbg(dev, "PHY DEBUG_R0=0x%08x DEBUG_R1=0x%08x\n", dev_dbg(dev, "PHY DEBUG_R0=0x%08x DEBUG_R1=0x%08x\n",
dw_pcie_readl_rc(pp, PCIE_PHY_DEBUG_R0), dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R0),
dw_pcie_readl_rc(pp, PCIE_PHY_DEBUG_R1)); dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R1));
imx6_pcie_reset_phy(imx6_pcie); imx6_pcie_reset_phy(imx6_pcie);
return ret; return ret;
} }
static void imx6_pcie_host_init(struct pcie_port *pp) static void imx6_pcie_host_init(struct pcie_port *pp)
{ {
struct imx6_pcie *imx6_pcie = to_imx6_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct imx6_pcie *imx6_pcie = to_imx6_pcie(pci);
imx6_pcie_assert_core_reset(imx6_pcie); imx6_pcie_assert_core_reset(imx6_pcie);
imx6_pcie_init_phy(imx6_pcie); imx6_pcie_init_phy(imx6_pcie);
...@@ -564,22 +566,22 @@ static void imx6_pcie_host_init(struct pcie_port *pp) ...@@ -564,22 +566,22 @@ static void imx6_pcie_host_init(struct pcie_port *pp)
dw_pcie_msi_init(pp); dw_pcie_msi_init(pp);
} }
static int imx6_pcie_link_up(struct pcie_port *pp) static int imx6_pcie_link_up(struct dw_pcie *pci)
{ {
return dw_pcie_readl_rc(pp, PCIE_PHY_DEBUG_R1) & return dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R1) &
PCIE_PHY_DEBUG_R1_XMLH_LINK_UP; PCIE_PHY_DEBUG_R1_XMLH_LINK_UP;
} }
static struct pcie_host_ops imx6_pcie_host_ops = { static struct dw_pcie_host_ops imx6_pcie_host_ops = {
.link_up = imx6_pcie_link_up,
.host_init = imx6_pcie_host_init, .host_init = imx6_pcie_host_init,
}; };
static int __init imx6_add_pcie_port(struct imx6_pcie *imx6_pcie, static int __init imx6_add_pcie_port(struct imx6_pcie *imx6_pcie,
struct platform_device *pdev) struct platform_device *pdev)
{ {
struct pcie_port *pp = &imx6_pcie->pp; struct dw_pcie *pci = imx6_pcie->pci;
struct device *dev = pp->dev; struct pcie_port *pp = &pci->pp;
struct device *dev = &pdev->dev;
int ret; int ret;
if (IS_ENABLED(CONFIG_PCI_MSI)) { if (IS_ENABLED(CONFIG_PCI_MSI)) {
...@@ -611,11 +613,15 @@ static int __init imx6_add_pcie_port(struct imx6_pcie *imx6_pcie, ...@@ -611,11 +613,15 @@ static int __init imx6_add_pcie_port(struct imx6_pcie *imx6_pcie,
return 0; return 0;
} }
static const struct dw_pcie_ops dw_pcie_ops = {
.link_up = imx6_pcie_link_up,
};
static int __init imx6_pcie_probe(struct platform_device *pdev) static int __init imx6_pcie_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct dw_pcie *pci;
struct imx6_pcie *imx6_pcie; struct imx6_pcie *imx6_pcie;
struct pcie_port *pp;
struct resource *dbi_base; struct resource *dbi_base;
struct device_node *node = dev->of_node; struct device_node *node = dev->of_node;
int ret; int ret;
...@@ -624,8 +630,12 @@ static int __init imx6_pcie_probe(struct platform_device *pdev) ...@@ -624,8 +630,12 @@ static int __init imx6_pcie_probe(struct platform_device *pdev)
if (!imx6_pcie) if (!imx6_pcie)
return -ENOMEM; return -ENOMEM;
pp = &imx6_pcie->pp; pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL);
pp->dev = dev; if (!pci)
return -ENOMEM;
pci->dev = dev;
pci->ops = &dw_pcie_ops;
imx6_pcie->variant = imx6_pcie->variant =
(enum imx6_pcie_variants)of_device_get_match_data(dev); (enum imx6_pcie_variants)of_device_get_match_data(dev);
...@@ -635,9 +645,9 @@ static int __init imx6_pcie_probe(struct platform_device *pdev) ...@@ -635,9 +645,9 @@ static int __init imx6_pcie_probe(struct platform_device *pdev)
"imprecise external abort"); "imprecise external abort");
dbi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0); dbi_base = platform_get_resource(pdev, IORESOURCE_MEM, 0);
pp->dbi_base = devm_ioremap_resource(dev, dbi_base); pci->dbi_base = devm_ioremap_resource(dev, dbi_base);
if (IS_ERR(pp->dbi_base)) if (IS_ERR(pci->dbi_base))
return PTR_ERR(pp->dbi_base); return PTR_ERR(pci->dbi_base);
/* Fetch GPIOs */ /* Fetch GPIOs */
imx6_pcie->reset_gpio = of_get_named_gpio(node, "reset-gpio", 0); imx6_pcie->reset_gpio = of_get_named_gpio(node, "reset-gpio", 0);
......
drivers/pci/dwc/pci-keystone-dw.c
View file @ 442ec4c0
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
/* Config space registers */ /* Config space registers */
#define DEBUG0 0x728 #define DEBUG0 0x728
#define to_keystone_pcie(x) container_of(x, struct keystone_pcie, pp) #define to_keystone_pcie(x) dev_get_drvdata((x)->dev)
static inline void update_reg_offset_bit_pos(u32 offset, u32 *reg_offset, static inline void update_reg_offset_bit_pos(u32 offset, u32 *reg_offset,
u32 *bit_pos) u32 *bit_pos)
...@@ -83,7 +83,8 @@ static inline void update_reg_offset_bit_pos(u32 offset, u32 *reg_offset, ...@@ -83,7 +83,8 @@ static inline void update_reg_offset_bit_pos(u32 offset, u32 *reg_offset,
phys_addr_t ks_dw_pcie_get_msi_addr(struct pcie_port *pp) phys_addr_t ks_dw_pcie_get_msi_addr(struct pcie_port *pp)
{ {
struct keystone_pcie *ks_pcie = to_keystone_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);
return ks_pcie->app.start + MSI_IRQ; return ks_pcie->app.start + MSI_IRQ;
} }
...@@ -100,8 +101,9 @@ static void ks_dw_app_writel(struct keystone_pcie *ks_pcie, u32 offset, u32 val) ...@@ -100,8 +101,9 @@ static void ks_dw_app_writel(struct keystone_pcie *ks_pcie, u32 offset, u32 val)
void ks_dw_pcie_handle_msi_irq(struct keystone_pcie *ks_pcie, int offset) void ks_dw_pcie_handle_msi_irq(struct keystone_pcie *ks_pcie, int offset)
{ {
struct pcie_port *pp = &ks_pcie->pp; struct dw_pcie *pci = ks_pcie->pci;
struct device *dev = pp->dev; struct pcie_port *pp = &pci->pp;
struct device *dev = pci->dev;
u32 pending, vector; u32 pending, vector;
int src, virq; int src, virq;
...@@ -128,10 +130,12 @@ static void ks_dw_pcie_msi_irq_ack(struct irq_data *d) ...@@ -128,10 +130,12 @@ static void ks_dw_pcie_msi_irq_ack(struct irq_data *d)
struct keystone_pcie *ks_pcie; struct keystone_pcie *ks_pcie;
struct msi_desc *msi; struct msi_desc *msi;
struct pcie_port *pp; struct pcie_port *pp;
struct dw_pcie *pci;
msi = irq_data_get_msi_desc(d); msi = irq_data_get_msi_desc(d);
pp = (struct pcie_port *) msi_desc_to_pci_sysdata(msi); pp = (struct pcie_port *) msi_desc_to_pci_sysdata(msi);
ks_pcie = to_keystone_pcie(pp); pci = to_dw_pcie_from_pp(pp);
ks_pcie = to_keystone_pcie(pci);
offset = d->irq - irq_linear_revmap(pp->irq_domain, 0); offset = d->irq - irq_linear_revmap(pp->irq_domain, 0);
update_reg_offset_bit_pos(offset, &reg_offset, &bit_pos); update_reg_offset_bit_pos(offset, &reg_offset, &bit_pos);
...@@ -143,7 +147,8 @@ static void ks_dw_pcie_msi_irq_ack(struct irq_data *d) ...@@ -143,7 +147,8 @@ static void ks_dw_pcie_msi_irq_ack(struct irq_data *d)
void ks_dw_pcie_msi_set_irq(struct pcie_port *pp, int irq) void ks_dw_pcie_msi_set_irq(struct pcie_port *pp, int irq)
{ {
u32 reg_offset, bit_pos; u32 reg_offset, bit_pos;
struct keystone_pcie *ks_pcie = to_keystone_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);
update_reg_offset_bit_pos(irq, &reg_offset, &bit_pos); update_reg_offset_bit_pos(irq, &reg_offset, &bit_pos);
ks_dw_app_writel(ks_pcie, MSI0_IRQ_ENABLE_SET + (reg_offset << 4), ks_dw_app_writel(ks_pcie, MSI0_IRQ_ENABLE_SET + (reg_offset << 4),
...@@ -153,7 +158,8 @@ void ks_dw_pcie_msi_set_irq(struct pcie_port *pp, int irq) ...@@ -153,7 +158,8 @@ void ks_dw_pcie_msi_set_irq(struct pcie_port *pp, int irq)
void ks_dw_pcie_msi_clear_irq(struct pcie_port *pp, int irq) void ks_dw_pcie_msi_clear_irq(struct pcie_port *pp, int irq)
{ {
u32 reg_offset, bit_pos; u32 reg_offset, bit_pos;
struct keystone_pcie *ks_pcie = to_keystone_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);
update_reg_offset_bit_pos(irq, &reg_offset, &bit_pos); update_reg_offset_bit_pos(irq, &reg_offset, &bit_pos);
ks_dw_app_writel(ks_pcie, MSI0_IRQ_ENABLE_CLR + (reg_offset << 4), ks_dw_app_writel(ks_pcie, MSI0_IRQ_ENABLE_CLR + (reg_offset << 4),
...@@ -165,11 +171,13 @@ static void ks_dw_pcie_msi_irq_mask(struct irq_data *d) ...@@ -165,11 +171,13 @@ static void ks_dw_pcie_msi_irq_mask(struct irq_data *d)
struct keystone_pcie *ks_pcie; struct keystone_pcie *ks_pcie;
struct msi_desc *msi; struct msi_desc *msi;
struct pcie_port *pp; struct pcie_port *pp;
struct dw_pcie *pci;
u32 offset; u32 offset;
msi = irq_data_get_msi_desc(d); msi = irq_data_get_msi_desc(d);
pp = (struct pcie_port *) msi_desc_to_pci_sysdata(msi); pp = (struct pcie_port *) msi_desc_to_pci_sysdata(msi);
ks_pcie = to_keystone_pcie(pp); pci = to_dw_pcie_from_pp(pp);
ks_pcie = to_keystone_pcie(pci);
offset = d->irq - irq_linear_revmap(pp->irq_domain, 0); offset = d->irq - irq_linear_revmap(pp->irq_domain, 0);
/* Mask the end point if PVM implemented */ /* Mask the end point if PVM implemented */
...@@ -186,11 +194,13 @@ static void ks_dw_pcie_msi_irq_unmask(struct irq_data *d) ...@@ -186,11 +194,13 @@ static void ks_dw_pcie_msi_irq_unmask(struct irq_data *d)
struct keystone_pcie *ks_pcie; struct keystone_pcie *ks_pcie;
struct msi_desc *msi; struct msi_desc *msi;
struct pcie_port *pp; struct pcie_port *pp;
struct dw_pcie *pci;
u32 offset; u32 offset;
msi = irq_data_get_msi_desc(d); msi = irq_data_get_msi_desc(d);
pp = (struct pcie_port *) msi_desc_to_pci_sysdata(msi); pp = (struct pcie_port *) msi_desc_to_pci_sysdata(msi);
ks_pcie = to_keystone_pcie(pp); pci = to_dw_pcie_from_pp(pp);
ks_pcie = to_keystone_pcie(pci);
offset = d->irq - irq_linear_revmap(pp->irq_domain, 0); offset = d->irq - irq_linear_revmap(pp->irq_domain, 0);
/* Mask the end point if PVM implemented */ /* Mask the end point if PVM implemented */
...@@ -225,8 +235,9 @@ static const struct irq_domain_ops ks_dw_pcie_msi_domain_ops = { ...@@ -225,8 +235,9 @@ static const struct irq_domain_ops ks_dw_pcie_msi_domain_ops = {
int ks_dw_pcie_msi_host_init(struct pcie_port *pp, struct msi_controller *chip) int ks_dw_pcie_msi_host_init(struct pcie_port *pp, struct msi_controller *chip)
{ {
struct keystone_pcie *ks_pcie = to_keystone_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct device *dev = pp->dev; struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);
struct device *dev = pci->dev;
int i; int i;
pp->irq_domain = irq_domain_add_linear(ks_pcie->msi_intc_np, pp->irq_domain = irq_domain_add_linear(ks_pcie->msi_intc_np,
...@@ -254,8 +265,8 @@ void ks_dw_pcie_enable_legacy_irqs(struct keystone_pcie *ks_pcie) ...@@ -254,8 +265,8 @@ void ks_dw_pcie_enable_legacy_irqs(struct keystone_pcie *ks_pcie)
void ks_dw_pcie_handle_legacy_irq(struct keystone_pcie *ks_pcie, int offset) void ks_dw_pcie_handle_legacy_irq(struct keystone_pcie *ks_pcie, int offset)
{ {
struct pcie_port *pp = &ks_pcie->pp; struct dw_pcie *pci = ks_pcie->pci;
struct device *dev = pp->dev; struct device *dev = pci->dev;
u32 pending; u32 pending;
int virq; int virq;
...@@ -285,7 +296,7 @@ irqreturn_t ks_dw_pcie_handle_error_irq(struct keystone_pcie *ks_pcie) ...@@ -285,7 +296,7 @@ irqreturn_t ks_dw_pcie_handle_error_irq(struct keystone_pcie *ks_pcie)
return IRQ_NONE; return IRQ_NONE;
if (status & ERR_FATAL_IRQ) if (status & ERR_FATAL_IRQ)
dev_err(ks_pcie->pp.dev, "fatal error (status %#010x)\n", dev_err(ks_pcie->pci->dev, "fatal error (status %#010x)\n",
status); status);
/* Ack the IRQ; status bits are RW1C */ /* Ack the IRQ; status bits are RW1C */
...@@ -366,15 +377,16 @@ static void ks_dw_pcie_clear_dbi_mode(struct keystone_pcie *ks_pcie) ...@@ -366,15 +377,16 @@ static void ks_dw_pcie_clear_dbi_mode(struct keystone_pcie *ks_pcie)
void ks_dw_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie) void ks_dw_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie)
{ {
struct pcie_port *pp = &ks_pcie->pp; struct dw_pcie *pci = ks_pcie->pci;
struct pcie_port *pp = &pci->pp;
u32 start = pp->mem->start, end = pp->mem->end; u32 start = pp->mem->start, end = pp->mem->end;
int i, tr_size; int i, tr_size;
u32 val; u32 val;
/* Disable BARs for inbound access */ /* Disable BARs for inbound access */
ks_dw_pcie_set_dbi_mode(ks_pcie); ks_dw_pcie_set_dbi_mode(ks_pcie);
dw_pcie_writel_rc(pp, PCI_BASE_ADDRESS_0, 0); dw_pcie_writel_dbi(pci, PCI_BASE_ADDRESS_0, 0);
dw_pcie_writel_rc(pp, PCI_BASE_ADDRESS_1, 0); dw_pcie_writel_dbi(pci, PCI_BASE_ADDRESS_1, 0);
ks_dw_pcie_clear_dbi_mode(ks_pcie); ks_dw_pcie_clear_dbi_mode(ks_pcie);
/* Set outbound translation size per window division */ /* Set outbound translation size per window division */
...@@ -415,11 +427,12 @@ static void __iomem *ks_pcie_cfg_setup(struct keystone_pcie *ks_pcie, u8 bus, ...@@ -415,11 +427,12 @@ static void __iomem *ks_pcie_cfg_setup(struct keystone_pcie *ks_pcie, u8 bus,
unsigned int devfn) unsigned int devfn)
{ {
u8 device = PCI_SLOT(devfn), function = PCI_FUNC(devfn); u8 device = PCI_SLOT(devfn), function = PCI_FUNC(devfn);
struct pcie_port *pp = &ks_pcie->pp; struct dw_pcie *pci = ks_pcie->pci;
struct pcie_port *pp = &pci->pp;
u32 regval; u32 regval;
if (bus == 0) if (bus == 0)
return pp->dbi_base; return pci->dbi_base;
regval = (bus << 16) | (device << 8) | function; regval = (bus << 16) | (device << 8) | function;
...@@ -438,7 +451,8 @@ static void __iomem *ks_pcie_cfg_setup(struct keystone_pcie *ks_pcie, u8 bus, ...@@ -438,7 +451,8 @@ static void __iomem *ks_pcie_cfg_setup(struct keystone_pcie *ks_pcie, u8 bus,
int ks_dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus, int ks_dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus,
unsigned int devfn, int where, int size, u32 *val) unsigned int devfn, int where, int size, u32 *val)
{ {
struct keystone_pcie *ks_pcie = to_keystone_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);
u8 bus_num = bus->number; u8 bus_num = bus->number;
void __iomem *addr; void __iomem *addr;
...@@ -450,7 +464,8 @@ int ks_dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus, ...@@ -450,7 +464,8 @@ int ks_dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus,
int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus, int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,
unsigned int devfn, int where, int size, u32 val) unsigned int devfn, int where, int size, u32 val)
{ {
struct keystone_pcie *ks_pcie = to_keystone_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);
u8 bus_num = bus->number; u8 bus_num = bus->number;
void __iomem *addr; void __iomem *addr;
...@@ -466,14 +481,15 @@ int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus, ...@@ -466,14 +481,15 @@ int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,
*/ */
void ks_dw_pcie_v3_65_scan_bus(struct pcie_port *pp) void ks_dw_pcie_v3_65_scan_bus(struct pcie_port *pp)
{ {
struct keystone_pcie *ks_pcie = to_keystone_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);
/* Configure and set up BAR0 */ /* Configure and set up BAR0 */
ks_dw_pcie_set_dbi_mode(ks_pcie); ks_dw_pcie_set_dbi_mode(ks_pcie);
/* Enable BAR0 */ /* Enable BAR0 */
dw_pcie_writel_rc(pp, PCI_BASE_ADDRESS_0, 1); dw_pcie_writel_dbi(pci, PCI_BASE_ADDRESS_0, 1);
dw_pcie_writel_rc(pp, PCI_BASE_ADDRESS_0, SZ_4K - 1); dw_pcie_writel_dbi(pci, PCI_BASE_ADDRESS_0, SZ_4K - 1);
ks_dw_pcie_clear_dbi_mode(ks_pcie); ks_dw_pcie_clear_dbi_mode(ks_pcie);
...@@ -481,17 +497,17 @@ void ks_dw_pcie_v3_65_scan_bus(struct pcie_port *pp) ...@@ -481,17 +497,17 @@ void ks_dw_pcie_v3_65_scan_bus(struct pcie_port *pp)
* For BAR0, just setting bus address for inbound writes (MSI) should * For BAR0, just setting bus address for inbound writes (MSI) should
* be sufficient. Use physical address to avoid any conflicts. * be sufficient. Use physical address to avoid any conflicts.
*/ */
dw_pcie_writel_rc(pp, PCI_BASE_ADDRESS_0, ks_pcie->app.start); dw_pcie_writel_dbi(pci, PCI_BASE_ADDRESS_0, ks_pcie->app.start);
} }
/** /**
* ks_dw_pcie_link_up() - Check if link up * ks_dw_pcie_link_up() - Check if link up
*/ */
int ks_dw_pcie_link_up(struct pcie_port *pp) int ks_dw_pcie_link_up(struct dw_pcie *pci)
{ {
u32 val; u32 val;
val = dw_pcie_readl_rc(pp, DEBUG0); val = dw_pcie_readl_dbi(pci, DEBUG0);
return (val & LTSSM_STATE_MASK) == LTSSM_STATE_L0; return (val & LTSSM_STATE_MASK) == LTSSM_STATE_L0;
} }
...@@ -519,22 +535,23 @@ void ks_dw_pcie_initiate_link_train(struct keystone_pcie *ks_pcie) ...@@ -519,22 +535,23 @@ void ks_dw_pcie_initiate_link_train(struct keystone_pcie *ks_pcie)
int __init ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie, int __init ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie,
struct device_node *msi_intc_np) struct device_node *msi_intc_np)
{ {
struct pcie_port *pp = &ks_pcie->pp; struct dw_pcie *pci = ks_pcie->pci;
struct device *dev = pp->dev; struct pcie_port *pp = &pci->pp;
struct device *dev = pci->dev;
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct resource *res; struct resource *res;
/* Index 0 is the config reg. space address */ /* Index 0 is the config reg. space address */
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
pp->dbi_base = devm_ioremap_resource(dev, res); pci->dbi_base = devm_ioremap_resource(dev, res);
if (IS_ERR(pp->dbi_base)) if (IS_ERR(pci->dbi_base))
return PTR_ERR(pp->dbi_base); return PTR_ERR(pci->dbi_base);
/* /*
* We set these same and is used in pcie rd/wr_other_conf * We set these same and is used in pcie rd/wr_other_conf
* functions * functions
*/ */
pp->va_cfg0_base = pp->dbi_base + SPACE0_REMOTE_CFG_OFFSET; pp->va_cfg0_base = pci->dbi_base + SPACE0_REMOTE_CFG_OFFSET;
pp->va_cfg1_base = pp->va_cfg0_base; pp->va_cfg1_base = pp->va_cfg0_base;
/* Index 1 is the application reg. space address */ /* Index 1 is the application reg. space address */
......
drivers/pci/dwc/pci-keystone.c
View file @ 442ec4c0
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
#define PCIE_RC_K2E 0xb009 #define PCIE_RC_K2E 0xb009
#define PCIE_RC_K2L 0xb00a #define PCIE_RC_K2L 0xb00a
#define to_keystone_pcie(x) container_of(x, struct keystone_pcie, pp) #define to_keystone_pcie(x) dev_get_drvdata((x)->dev)
static void quirk_limit_mrrs(struct pci_dev *dev) static void quirk_limit_mrrs(struct pci_dev *dev)
{ {
...@@ -88,13 +88,14 @@ DECLARE_PCI_FIXUP_ENABLE(PCI_ANY_ID, PCI_ANY_ID, quirk_limit_mrrs); ...@@ -88,13 +88,14 @@ DECLARE_PCI_FIXUP_ENABLE(PCI_ANY_ID, PCI_ANY_ID, quirk_limit_mrrs);
static int ks_pcie_establish_link(struct keystone_pcie *ks_pcie) static int ks_pcie_establish_link(struct keystone_pcie *ks_pcie)
{ {
struct pcie_port *pp = &ks_pcie->pp; struct dw_pcie *pci = ks_pcie->pci;
struct device *dev = pp->dev; struct pcie_port *pp = &pci->pp;
struct device *dev = pci->dev;
unsigned int retries; unsigned int retries;
dw_pcie_setup_rc(pp); dw_pcie_setup_rc(pp);
if (dw_pcie_link_up(pp)) { if (dw_pcie_link_up(pci)) {
dev_err(dev, "Link already up\n"); dev_err(dev, "Link already up\n");
return 0; return 0;
} }
...@@ -102,7 +103,7 @@ static int ks_pcie_establish_link(struct keystone_pcie *ks_pcie) ...@@ -102,7 +103,7 @@ static int ks_pcie_establish_link(struct keystone_pcie *ks_pcie)
/* check if the link is up or not */ /* check if the link is up or not */
for (retries = 0; retries < 5; retries++) { for (retries = 0; retries < 5; retries++) {
ks_dw_pcie_initiate_link_train(ks_pcie); ks_dw_pcie_initiate_link_train(ks_pcie);
if (!dw_pcie_wait_for_link(pp)) if (!dw_pcie_wait_for_link(pci))
return 0; return 0;
} }
...@@ -115,8 +116,8 @@ static void ks_pcie_msi_irq_handler(struct irq_desc *desc) ...@@ -115,8 +116,8 @@ static void ks_pcie_msi_irq_handler(struct irq_desc *desc)
unsigned int irq = irq_desc_get_irq(desc); unsigned int irq = irq_desc_get_irq(desc);
struct keystone_pcie *ks_pcie = irq_desc_get_handler_data(desc); struct keystone_pcie *ks_pcie = irq_desc_get_handler_data(desc);
u32 offset = irq - ks_pcie->msi_host_irqs[0]; u32 offset = irq - ks_pcie->msi_host_irqs[0];
struct pcie_port *pp = &ks_pcie->pp; struct dw_pcie *pci = ks_pcie->pci;
struct device *dev = pp->dev; struct device *dev = pci->dev;
struct irq_chip *chip = irq_desc_get_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
dev_dbg(dev, "%s, irq %d\n", __func__, irq); dev_dbg(dev, "%s, irq %d\n", __func__, irq);
...@@ -143,8 +144,8 @@ static void ks_pcie_legacy_irq_handler(struct irq_desc *desc) ...@@ -143,8 +144,8 @@ static void ks_pcie_legacy_irq_handler(struct irq_desc *desc)
{ {
unsigned int irq = irq_desc_get_irq(desc); unsigned int irq = irq_desc_get_irq(desc);
struct keystone_pcie *ks_pcie = irq_desc_get_handler_data(desc); struct keystone_pcie *ks_pcie = irq_desc_get_handler_data(desc);
struct pcie_port *pp = &ks_pcie->pp; struct dw_pcie *pci = ks_pcie->pci;
struct device *dev = pp->dev; struct device *dev = pci->dev;
u32 irq_offset = irq - ks_pcie->legacy_host_irqs[0]; u32 irq_offset = irq - ks_pcie->legacy_host_irqs[0];
struct irq_chip *chip = irq_desc_get_chip(desc); struct irq_chip *chip = irq_desc_get_chip(desc);
...@@ -164,7 +165,7 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie, ...@@ -164,7 +165,7 @@ static int ks_pcie_get_irq_controller_info(struct keystone_pcie *ks_pcie,
char *controller, int *num_irqs) char *controller, int *num_irqs)
{ {
int temp, max_host_irqs, legacy = 1, *host_irqs; int temp, max_host_irqs, legacy = 1, *host_irqs;
struct device *dev = ks_pcie->pp.dev; struct device *dev = ks_pcie->pci->dev;
struct device_node *np_pcie = dev->of_node, **np_temp; struct device_node *np_pcie = dev->of_node, **np_temp;
if (!strcmp(controller, "msi-interrupt-controller")) if (!strcmp(controller, "msi-interrupt-controller"))
...@@ -262,24 +263,25 @@ static int keystone_pcie_fault(unsigned long addr, unsigned int fsr, ...@@ -262,24 +263,25 @@ static int keystone_pcie_fault(unsigned long addr, unsigned int fsr,
static void __init ks_pcie_host_init(struct pcie_port *pp) static void __init ks_pcie_host_init(struct pcie_port *pp)
{ {
struct keystone_pcie *ks_pcie = to_keystone_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);
u32 val; u32 val;
ks_pcie_establish_link(ks_pcie); ks_pcie_establish_link(ks_pcie);
ks_dw_pcie_setup_rc_app_regs(ks_pcie); ks_dw_pcie_setup_rc_app_regs(ks_pcie);
ks_pcie_setup_interrupts(ks_pcie); ks_pcie_setup_interrupts(ks_pcie);
writew(PCI_IO_RANGE_TYPE_32 | (PCI_IO_RANGE_TYPE_32 << 8), writew(PCI_IO_RANGE_TYPE_32 | (PCI_IO_RANGE_TYPE_32 << 8),
pp->dbi_base + PCI_IO_BASE); pci->dbi_base + PCI_IO_BASE);
/* update the Vendor ID */ /* update the Vendor ID */
writew(ks_pcie->device_id, pp->dbi_base + PCI_DEVICE_ID); writew(ks_pcie->device_id, pci->dbi_base + PCI_DEVICE_ID);
/* update the DEV_STAT_CTRL to publish right mrrs */ /* update the DEV_STAT_CTRL to publish right mrrs */
val = readl(pp->dbi_base + PCIE_CAP_BASE + PCI_EXP_DEVCTL); val = readl(pci->dbi_base + PCIE_CAP_BASE + PCI_EXP_DEVCTL);
val &= ~PCI_EXP_DEVCTL_READRQ; val &= ~PCI_EXP_DEVCTL_READRQ;
/* set the mrrs to 256 bytes */ /* set the mrrs to 256 bytes */
val |= BIT(12); val |= BIT(12);
writel(val, pp->dbi_base + PCIE_CAP_BASE + PCI_EXP_DEVCTL); writel(val, pci->dbi_base + PCIE_CAP_BASE + PCI_EXP_DEVCTL);
/* /*
* PCIe access errors that result into OCP errors are caught by ARM as * PCIe access errors that result into OCP errors are caught by ARM as
...@@ -289,10 +291,9 @@ static void __init ks_pcie_host_init(struct pcie_port *pp) ...@@ -289,10 +291,9 @@ static void __init ks_pcie_host_init(struct pcie_port *pp)
"Asynchronous external abort"); "Asynchronous external abort");
} }
static struct pcie_host_ops keystone_pcie_host_ops = { static struct dw_pcie_host_ops keystone_pcie_host_ops = {
.rd_other_conf = ks_dw_pcie_rd_other_conf, .rd_other_conf = ks_dw_pcie_rd_other_conf,
.wr_other_conf = ks_dw_pcie_wr_other_conf, .wr_other_conf = ks_dw_pcie_wr_other_conf,
.link_up = ks_dw_pcie_link_up,
.host_init = ks_pcie_host_init, .host_init = ks_pcie_host_init,
.msi_set_irq = ks_dw_pcie_msi_set_irq, .msi_set_irq = ks_dw_pcie_msi_set_irq,
.msi_clear_irq = ks_dw_pcie_msi_clear_irq, .msi_clear_irq = ks_dw_pcie_msi_clear_irq,
...@@ -311,8 +312,9 @@ static irqreturn_t pcie_err_irq_handler(int irq, void *priv) ...@@ -311,8 +312,9 @@ static irqreturn_t pcie_err_irq_handler(int irq, void *priv)
static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie, static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie,
struct platform_device *pdev) struct platform_device *pdev)
{ {
struct pcie_port *pp = &ks_pcie->pp; struct dw_pcie *pci = ks_pcie->pci;
struct device *dev = pp->dev; struct pcie_port *pp = &pci->pp;
struct device *dev = &pdev->dev;
int ret; int ret;
ret = ks_pcie_get_irq_controller_info(ks_pcie, ret = ks_pcie_get_irq_controller_info(ks_pcie,
...@@ -365,6 +367,10 @@ static const struct of_device_id ks_pcie_of_match[] = { ...@@ -365,6 +367,10 @@ static const struct of_device_id ks_pcie_of_match[] = {
{ }, { },
}; };
static const struct dw_pcie_ops dw_pcie_ops = {
.link_up = ks_dw_pcie_link_up,
};
static int __exit ks_pcie_remove(struct platform_device *pdev) static int __exit ks_pcie_remove(struct platform_device *pdev)
{ {
struct keystone_pcie *ks_pcie = platform_get_drvdata(pdev); struct keystone_pcie *ks_pcie = platform_get_drvdata(pdev);
...@@ -377,8 +383,8 @@ static int __exit ks_pcie_remove(struct platform_device *pdev) ...@@ -377,8 +383,8 @@ static int __exit ks_pcie_remove(struct platform_device *pdev)
static int __init ks_pcie_probe(struct platform_device *pdev) static int __init ks_pcie_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct dw_pcie *pci;
struct keystone_pcie *ks_pcie; struct keystone_pcie *ks_pcie;
struct pcie_port *pp;
struct resource *res; struct resource *res;
void __iomem *reg_p; void __iomem *reg_p;
struct phy *phy; struct phy *phy;
...@@ -388,8 +394,12 @@ static int __init ks_pcie_probe(struct platform_device *pdev) ...@@ -388,8 +394,12 @@ static int __init ks_pcie_probe(struct platform_device *pdev)
if (!ks_pcie) if (!ks_pcie)
return -ENOMEM; return -ENOMEM;
pp = &ks_pcie->pp; pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL);
pp->dev = dev; if (!pci)
return -ENOMEM;
pci->dev = dev;
pci->ops = &dw_pcie_ops;
/* initialize SerDes Phy if present */ /* initialize SerDes Phy if present */
phy = devm_phy_get(dev, "pcie-phy"); phy = devm_phy_get(dev, "pcie-phy");
......
drivers/pci/dwc/pci-keystone.h
View file @ 442ec4c0
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#define MAX_LEGACY_HOST_IRQS 4 #define MAX_LEGACY_HOST_IRQS 4
struct keystone_pcie { struct keystone_pcie {
struct pcie_port pp; /* pp.dbi_base is DT 0th res */ struct dw_pcie *pci;
struct clk *clk; struct clk *clk;
/* PCI Device ID */ /* PCI Device ID */
u32 device_id; u32 device_id;
...@@ -54,10 +54,10 @@ int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus, ...@@ -54,10 +54,10 @@ int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,
int ks_dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus, int ks_dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus,
unsigned int devfn, int where, int size, u32 *val); unsigned int devfn, int where, int size, u32 *val);
void ks_dw_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie); void ks_dw_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie);
int ks_dw_pcie_link_up(struct pcie_port *pp);
void ks_dw_pcie_initiate_link_train(struct keystone_pcie *ks_pcie); void ks_dw_pcie_initiate_link_train(struct keystone_pcie *ks_pcie);
void ks_dw_pcie_msi_set_irq(struct pcie_port *pp, int irq); void ks_dw_pcie_msi_set_irq(struct pcie_port *pp, int irq);
void ks_dw_pcie_msi_clear_irq(struct pcie_port *pp, int irq); void ks_dw_pcie_msi_clear_irq(struct pcie_port *pp, int irq);
void ks_dw_pcie_v3_65_scan_bus(struct pcie_port *pp); void ks_dw_pcie_v3_65_scan_bus(struct pcie_port *pp);
int ks_dw_pcie_msi_host_init(struct pcie_port *pp, int ks_dw_pcie_msi_host_init(struct pcie_port *pp,
struct msi_controller *chip); struct msi_controller *chip);
int ks_dw_pcie_link_up(struct dw_pcie *pci);
drivers/pci/dwc/pci-layerscape.c
View file @ 442ec4c0
...@@ -39,24 +39,26 @@ struct ls_pcie_drvdata { ...@@ -39,24 +39,26 @@ struct ls_pcie_drvdata {
u32 lut_offset; u32 lut_offset;
u32 ltssm_shift; u32 ltssm_shift;
u32 lut_dbg; u32 lut_dbg;
struct pcie_host_ops *ops; struct dw_pcie_host_ops *ops;
const struct dw_pcie_ops *dw_pcie_ops;
}; };
struct ls_pcie { struct ls_pcie {
struct pcie_port pp; /* pp.dbi_base is DT regs */ struct dw_pcie *pci;
void __iomem *lut; void __iomem *lut;
struct regmap *scfg; struct regmap *scfg;
const struct ls_pcie_drvdata *drvdata; const struct ls_pcie_drvdata *drvdata;
int index; int index;
}; };
#define to_ls_pcie(x) container_of(x, struct ls_pcie, pp) #define to_ls_pcie(x) dev_get_drvdata((x)->dev)
static bool ls_pcie_is_bridge(struct ls_pcie *pcie) static bool ls_pcie_is_bridge(struct ls_pcie *pcie)
{ {
struct dw_pcie *pci = pcie->pci;
u32 header_type; u32 header_type;
header_type = ioread8(pcie->pp.dbi_base + PCI_HEADER_TYPE); header_type = ioread8(pci->dbi_base + PCI_HEADER_TYPE);
header_type &= 0x7f; header_type &= 0x7f;
return header_type == PCI_HEADER_TYPE_BRIDGE; return header_type == PCI_HEADER_TYPE_BRIDGE;
...@@ -65,29 +67,34 @@ static bool ls_pcie_is_bridge(struct ls_pcie *pcie) ...@@ -65,29 +67,34 @@ static bool ls_pcie_is_bridge(struct ls_pcie *pcie)
/* Clear multi-function bit */ /* Clear multi-function bit */
static void ls_pcie_clear_multifunction(struct ls_pcie *pcie) static void ls_pcie_clear_multifunction(struct ls_pcie *pcie)
{ {
iowrite8(PCI_HEADER_TYPE_BRIDGE, pcie->pp.dbi_base + PCI_HEADER_TYPE); struct dw_pcie *pci = pcie->pci;
iowrite8(PCI_HEADER_TYPE_BRIDGE, pci->dbi_base + PCI_HEADER_TYPE);
} }
/* Fix class value */ /* Fix class value */
static void ls_pcie_fix_class(struct ls_pcie *pcie) static void ls_pcie_fix_class(struct ls_pcie *pcie)
{ {
iowrite16(PCI_CLASS_BRIDGE_PCI, pcie->pp.dbi_base + PCI_CLASS_DEVICE); struct dw_pcie *pci = pcie->pci;
iowrite16(PCI_CLASS_BRIDGE_PCI, pci->dbi_base + PCI_CLASS_DEVICE);
} }
/* Drop MSG TLP except for Vendor MSG */ /* Drop MSG TLP except for Vendor MSG */
static void ls_pcie_drop_msg_tlp(struct ls_pcie *pcie) static void ls_pcie_drop_msg_tlp(struct ls_pcie *pcie)
{ {
u32 val; u32 val;
struct dw_pcie *pci = pcie->pci;
val = ioread32(pcie->pp.dbi_base + PCIE_STRFMR1); val = ioread32(pci->dbi_base + PCIE_STRFMR1);
val &= 0xDFFFFFFF; val &= 0xDFFFFFFF;
iowrite32(val, pcie->pp.dbi_base + PCIE_STRFMR1); iowrite32(val, pci->dbi_base + PCIE_STRFMR1);
} }
static int ls1021_pcie_link_up(struct pcie_port *pp) static int ls1021_pcie_link_up(struct dw_pcie *pci)
{ {
u32 state; u32 state;
struct ls_pcie *pcie = to_ls_pcie(pp); struct ls_pcie *pcie = to_ls_pcie(pci);
if (!pcie->scfg) if (!pcie->scfg)
return 0; return 0;
...@@ -103,8 +110,9 @@ static int ls1021_pcie_link_up(struct pcie_port *pp) ...@@ -103,8 +110,9 @@ static int ls1021_pcie_link_up(struct pcie_port *pp)
static void ls1021_pcie_host_init(struct pcie_port *pp) static void ls1021_pcie_host_init(struct pcie_port *pp)
{ {
struct device *dev = pp->dev; struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct ls_pcie *pcie = to_ls_pcie(pp); struct ls_pcie *pcie = to_ls_pcie(pci);
struct device *dev = pci->dev;
u32 index[2]; u32 index[2];
pcie->scfg = syscon_regmap_lookup_by_phandle(dev->of_node, pcie->scfg = syscon_regmap_lookup_by_phandle(dev->of_node,
...@@ -127,9 +135,9 @@ static void ls1021_pcie_host_init(struct pcie_port *pp) ...@@ -127,9 +135,9 @@ static void ls1021_pcie_host_init(struct pcie_port *pp)
ls_pcie_drop_msg_tlp(pcie); ls_pcie_drop_msg_tlp(pcie);
} }
static int ls_pcie_link_up(struct pcie_port *pp) static int ls_pcie_link_up(struct dw_pcie *pci)
{ {
struct ls_pcie *pcie = to_ls_pcie(pp); struct ls_pcie *pcie = to_ls_pcie(pci);
u32 state; u32 state;
state = (ioread32(pcie->lut + pcie->drvdata->lut_dbg) >> state = (ioread32(pcie->lut + pcie->drvdata->lut_dbg) >>
...@@ -144,19 +152,21 @@ static int ls_pcie_link_up(struct pcie_port *pp) ...@@ -144,19 +152,21 @@ static int ls_pcie_link_up(struct pcie_port *pp)
static void ls_pcie_host_init(struct pcie_port *pp) static void ls_pcie_host_init(struct pcie_port *pp)
{ {
struct ls_pcie *pcie = to_ls_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct ls_pcie *pcie = to_ls_pcie(pci);
iowrite32(1, pcie->pp.dbi_base + PCIE_DBI_RO_WR_EN); iowrite32(1, pci->dbi_base + PCIE_DBI_RO_WR_EN);
ls_pcie_fix_class(pcie); ls_pcie_fix_class(pcie);
ls_pcie_clear_multifunction(pcie); ls_pcie_clear_multifunction(pcie);
ls_pcie_drop_msg_tlp(pcie); ls_pcie_drop_msg_tlp(pcie);
iowrite32(0, pcie->pp.dbi_base + PCIE_DBI_RO_WR_EN); iowrite32(0, pci->dbi_base + PCIE_DBI_RO_WR_EN);
} }
static int ls_pcie_msi_host_init(struct pcie_port *pp, static int ls_pcie_msi_host_init(struct pcie_port *pp,
struct msi_controller *chip) struct msi_controller *chip)
{ {
struct device *dev = pp->dev; struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct device *dev = pci->dev;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct device_node *msi_node; struct device_node *msi_node;
...@@ -175,20 +185,27 @@ static int ls_pcie_msi_host_init(struct pcie_port *pp, ...@@ -175,20 +185,27 @@ static int ls_pcie_msi_host_init(struct pcie_port *pp,
return 0; return 0;
} }
static struct pcie_host_ops ls1021_pcie_host_ops = { static struct dw_pcie_host_ops ls1021_pcie_host_ops = {
.link_up = ls1021_pcie_link_up,
.host_init = ls1021_pcie_host_init, .host_init = ls1021_pcie_host_init,
.msi_host_init = ls_pcie_msi_host_init, .msi_host_init = ls_pcie_msi_host_init,
}; };
static struct pcie_host_ops ls_pcie_host_ops = { static struct dw_pcie_host_ops ls_pcie_host_ops = {
.link_up = ls_pcie_link_up,
.host_init = ls_pcie_host_init, .host_init = ls_pcie_host_init,
.msi_host_init = ls_pcie_msi_host_init, .msi_host_init = ls_pcie_msi_host_init,
}; };
static const struct dw_pcie_ops dw_ls1021_pcie_ops = {
.link_up = ls1021_pcie_link_up,
};
static const struct dw_pcie_ops dw_ls_pcie_ops = {
.link_up = ls_pcie_link_up,
};
static struct ls_pcie_drvdata ls1021_drvdata = { static struct ls_pcie_drvdata ls1021_drvdata = {
.ops = &ls1021_pcie_host_ops, .ops = &ls1021_pcie_host_ops,
.dw_pcie_ops = &dw_ls1021_pcie_ops,
}; };
static struct ls_pcie_drvdata ls1043_drvdata = { static struct ls_pcie_drvdata ls1043_drvdata = {
...@@ -196,6 +213,7 @@ static struct ls_pcie_drvdata ls1043_drvdata = { ...@@ -196,6 +213,7 @@ static struct ls_pcie_drvdata ls1043_drvdata = {
.ltssm_shift = 24, .ltssm_shift = 24,
.lut_dbg = 0x7fc, .lut_dbg = 0x7fc,
.ops = &ls_pcie_host_ops, .ops = &ls_pcie_host_ops,
.dw_pcie_ops = &dw_ls_pcie_ops,
}; };
static struct ls_pcie_drvdata ls1046_drvdata = { static struct ls_pcie_drvdata ls1046_drvdata = {
...@@ -203,6 +221,7 @@ static struct ls_pcie_drvdata ls1046_drvdata = { ...@@ -203,6 +221,7 @@ static struct ls_pcie_drvdata ls1046_drvdata = {
.ltssm_shift = 24, .ltssm_shift = 24,
.lut_dbg = 0x407fc, .lut_dbg = 0x407fc,
.ops = &ls_pcie_host_ops, .ops = &ls_pcie_host_ops,
.dw_pcie_ops = &dw_ls_pcie_ops,
}; };
static struct ls_pcie_drvdata ls2080_drvdata = { static struct ls_pcie_drvdata ls2080_drvdata = {
...@@ -210,6 +229,7 @@ static struct ls_pcie_drvdata ls2080_drvdata = { ...@@ -210,6 +229,7 @@ static struct ls_pcie_drvdata ls2080_drvdata = {
.ltssm_shift = 0, .ltssm_shift = 0,
.lut_dbg = 0x7fc, .lut_dbg = 0x7fc,
.ops = &ls_pcie_host_ops, .ops = &ls_pcie_host_ops,
.dw_pcie_ops = &dw_ls_pcie_ops,
}; };
static const struct of_device_id ls_pcie_of_match[] = { static const struct of_device_id ls_pcie_of_match[] = {
...@@ -223,10 +243,13 @@ static const struct of_device_id ls_pcie_of_match[] = { ...@@ -223,10 +243,13 @@ static const struct of_device_id ls_pcie_of_match[] = {
static int __init ls_add_pcie_port(struct ls_pcie *pcie) static int __init ls_add_pcie_port(struct ls_pcie *pcie)
{ {
struct pcie_port *pp = &pcie->pp; struct dw_pcie *pci = pcie->pci;
struct device *dev = pp->dev; struct pcie_port *pp = &pci->pp;
struct device *dev = pci->dev;
int ret; int ret;
pp->ops = pcie->drvdata->ops;
ret = dw_pcie_host_init(pp); ret = dw_pcie_host_init(pp);
if (ret) { if (ret) {
dev_err(dev, "failed to initialize host\n"); dev_err(dev, "failed to initialize host\n");
...@@ -240,8 +263,8 @@ static int __init ls_pcie_probe(struct platform_device *pdev) ...@@ -240,8 +263,8 @@ static int __init ls_pcie_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
const struct of_device_id *match; const struct of_device_id *match;
struct dw_pcie *pci;
struct ls_pcie *pcie; struct ls_pcie *pcie;
struct pcie_port *pp;
struct resource *dbi_base; struct resource *dbi_base;
int ret; int ret;
...@@ -253,17 +276,21 @@ static int __init ls_pcie_probe(struct platform_device *pdev) ...@@ -253,17 +276,21 @@ static int __init ls_pcie_probe(struct platform_device *pdev)
if (!pcie) if (!pcie)
return -ENOMEM; return -ENOMEM;
pp = &pcie->pp; pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL);
pp->dev = dev; if (!pci)
return -ENOMEM;
pcie->drvdata = match->data; pcie->drvdata = match->data;
pp->ops = pcie->drvdata->ops;
pci->dev = dev;
pci->ops = pcie->drvdata->dw_pcie_ops;
dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs"); dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "regs");
pcie->pp.dbi_base = devm_ioremap_resource(dev, dbi_base); pci->dbi_base = devm_ioremap_resource(dev, dbi_base);
if (IS_ERR(pcie->pp.dbi_base)) if (IS_ERR(pci->dbi_base))
return PTR_ERR(pcie->pp.dbi_base); return PTR_ERR(pci->dbi_base);
pcie->lut = pcie->pp.dbi_base + pcie->drvdata->lut_offset; pcie->lut = pci->dbi_base + pcie->drvdata->lut_offset;
if (!ls_pcie_is_bridge(pcie)) if (!ls_pcie_is_bridge(pcie))
return -ENODEV; return -ENODEV;
......
drivers/pci/dwc/pcie-armada8k.c
View file @ 442ec4c0
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include "pcie-designware.h" #include "pcie-designware.h"
struct armada8k_pcie { struct armada8k_pcie {
struct pcie_port pp; /* pp.dbi_base is DT ctrl */ struct dw_pcie *pci;
struct clk *clk; struct clk *clk;
}; };
...@@ -67,76 +67,77 @@ struct armada8k_pcie { ...@@ -67,76 +67,77 @@ struct armada8k_pcie {
#define AX_USER_DOMAIN_MASK 0x3 #define AX_USER_DOMAIN_MASK 0x3
#define AX_USER_DOMAIN_SHIFT 4 #define AX_USER_DOMAIN_SHIFT 4
#define to_armada8k_pcie(x) container_of(x, struct armada8k_pcie, pp) #define to_armada8k_pcie(x) dev_get_drvdata((x)->dev)
static int armada8k_pcie_link_up(struct pcie_port *pp) static int armada8k_pcie_link_up(struct dw_pcie *pci)
{ {
u32 reg; u32 reg;
u32 mask = PCIE_GLB_STS_RDLH_LINK_UP | PCIE_GLB_STS_PHY_LINK_UP; u32 mask = PCIE_GLB_STS_RDLH_LINK_UP | PCIE_GLB_STS_PHY_LINK_UP;
reg = dw_pcie_readl_rc(pp, PCIE_GLOBAL_STATUS_REG); reg = dw_pcie_readl_dbi(pci, PCIE_GLOBAL_STATUS_REG);
if ((reg & mask) == mask) if ((reg & mask) == mask)
return 1; return 1;
dev_dbg(pp->dev, "No link detected (Global-Status: 0x%08x).\n", reg); dev_dbg(pci->dev, "No link detected (Global-Status: 0x%08x).\n", reg);
return 0; return 0;
} }
static void armada8k_pcie_establish_link(struct armada8k_pcie *pcie) static void armada8k_pcie_establish_link(struct armada8k_pcie *pcie)
{ {
struct pcie_port *pp = &pcie->pp; struct dw_pcie *pci = pcie->pci;
u32 reg; u32 reg;
if (!dw_pcie_link_up(pp)) { if (!dw_pcie_link_up(pci)) {
/* Disable LTSSM state machine to enable configuration */ /* Disable LTSSM state machine to enable configuration */
reg = dw_pcie_readl_rc(pp, PCIE_GLOBAL_CONTROL_REG); reg = dw_pcie_readl_dbi(pci, PCIE_GLOBAL_CONTROL_REG);
reg &= ~(PCIE_APP_LTSSM_EN); reg &= ~(PCIE_APP_LTSSM_EN);
dw_pcie_writel_rc(pp, PCIE_GLOBAL_CONTROL_REG, reg); dw_pcie_writel_dbi(pci, PCIE_GLOBAL_CONTROL_REG, reg);
} }
/* Set the device to root complex mode */ /* Set the device to root complex mode */
reg = dw_pcie_readl_rc(pp, PCIE_GLOBAL_CONTROL_REG); reg = dw_pcie_readl_dbi(pci, PCIE_GLOBAL_CONTROL_REG);
reg &= ~(PCIE_DEVICE_TYPE_MASK << PCIE_DEVICE_TYPE_SHIFT); reg &= ~(PCIE_DEVICE_TYPE_MASK << PCIE_DEVICE_TYPE_SHIFT);
reg |= PCIE_DEVICE_TYPE_RC << PCIE_DEVICE_TYPE_SHIFT; reg |= PCIE_DEVICE_TYPE_RC << PCIE_DEVICE_TYPE_SHIFT;
dw_pcie_writel_rc(pp, PCIE_GLOBAL_CONTROL_REG, reg); dw_pcie_writel_dbi(pci, PCIE_GLOBAL_CONTROL_REG, reg);
/* Set the PCIe master AxCache attributes */ /* Set the PCIe master AxCache attributes */
dw_pcie_writel_rc(pp, PCIE_ARCACHE_TRC_REG, ARCACHE_DEFAULT_VALUE); dw_pcie_writel_dbi(pci, PCIE_ARCACHE_TRC_REG, ARCACHE_DEFAULT_VALUE);
dw_pcie_writel_rc(pp, PCIE_AWCACHE_TRC_REG, AWCACHE_DEFAULT_VALUE); dw_pcie_writel_dbi(pci, PCIE_AWCACHE_TRC_REG, AWCACHE_DEFAULT_VALUE);
/* Set the PCIe master AxDomain attributes */ /* Set the PCIe master AxDomain attributes */
reg = dw_pcie_readl_rc(pp, PCIE_ARUSER_REG); reg = dw_pcie_readl_dbi(pci, PCIE_ARUSER_REG);
reg &= ~(AX_USER_DOMAIN_MASK << AX_USER_DOMAIN_SHIFT); reg &= ~(AX_USER_DOMAIN_MASK << AX_USER_DOMAIN_SHIFT);
reg |= DOMAIN_OUTER_SHAREABLE << AX_USER_DOMAIN_SHIFT; reg |= DOMAIN_OUTER_SHAREABLE << AX_USER_DOMAIN_SHIFT;
dw_pcie_writel_rc(pp, PCIE_ARUSER_REG, reg); dw_pcie_writel_dbi(pci, PCIE_ARUSER_REG, reg);
reg = dw_pcie_readl_rc(pp, PCIE_AWUSER_REG); reg = dw_pcie_readl_dbi(pci, PCIE_AWUSER_REG);
reg &= ~(AX_USER_DOMAIN_MASK << AX_USER_DOMAIN_SHIFT); reg &= ~(AX_USER_DOMAIN_MASK << AX_USER_DOMAIN_SHIFT);
reg |= DOMAIN_OUTER_SHAREABLE << AX_USER_DOMAIN_SHIFT; reg |= DOMAIN_OUTER_SHAREABLE << AX_USER_DOMAIN_SHIFT;
dw_pcie_writel_rc(pp, PCIE_AWUSER_REG, reg); dw_pcie_writel_dbi(pci, PCIE_AWUSER_REG, reg);
/* Enable INT A-D interrupts */ /* Enable INT A-D interrupts */
reg = dw_pcie_readl_rc(pp, PCIE_GLOBAL_INT_MASK1_REG); reg = dw_pcie_readl_dbi(pci, PCIE_GLOBAL_INT_MASK1_REG);
reg |= PCIE_INT_A_ASSERT_MASK | PCIE_INT_B_ASSERT_MASK | reg |= PCIE_INT_A_ASSERT_MASK | PCIE_INT_B_ASSERT_MASK |
PCIE_INT_C_ASSERT_MASK | PCIE_INT_D_ASSERT_MASK; PCIE_INT_C_ASSERT_MASK | PCIE_INT_D_ASSERT_MASK;
dw_pcie_writel_rc(pp, PCIE_GLOBAL_INT_MASK1_REG, reg); dw_pcie_writel_dbi(pci, PCIE_GLOBAL_INT_MASK1_REG, reg);
if (!dw_pcie_link_up(pp)) { if (!dw_pcie_link_up(pci)) {
/* Configuration done. Start LTSSM */ /* Configuration done. Start LTSSM */
reg = dw_pcie_readl_rc(pp, PCIE_GLOBAL_CONTROL_REG); reg = dw_pcie_readl_dbi(pci, PCIE_GLOBAL_CONTROL_REG);
reg |= PCIE_APP_LTSSM_EN; reg |= PCIE_APP_LTSSM_EN;
dw_pcie_writel_rc(pp, PCIE_GLOBAL_CONTROL_REG, reg); dw_pcie_writel_dbi(pci, PCIE_GLOBAL_CONTROL_REG, reg);
} }
/* Wait until the link becomes active again */ /* Wait until the link becomes active again */
if (dw_pcie_wait_for_link(pp)) if (dw_pcie_wait_for_link(pci))
dev_err(pp->dev, "Link not up after reconfiguration\n"); dev_err(pci->dev, "Link not up after reconfiguration\n");
} }
static void armada8k_pcie_host_init(struct pcie_port *pp) static void armada8k_pcie_host_init(struct pcie_port *pp)
{ {
struct armada8k_pcie *pcie = to_armada8k_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct armada8k_pcie *pcie = to_armada8k_pcie(pci);
dw_pcie_setup_rc(pp); dw_pcie_setup_rc(pp);
armada8k_pcie_establish_link(pcie); armada8k_pcie_establish_link(pcie);
...@@ -145,7 +146,7 @@ static void armada8k_pcie_host_init(struct pcie_port *pp) ...@@ -145,7 +146,7 @@ static void armada8k_pcie_host_init(struct pcie_port *pp)
static irqreturn_t armada8k_pcie_irq_handler(int irq, void *arg) static irqreturn_t armada8k_pcie_irq_handler(int irq, void *arg)
{ {
struct armada8k_pcie *pcie = arg; struct armada8k_pcie *pcie = arg;
struct pcie_port *pp = &pcie->pp; struct dw_pcie *pci = pcie->pci;
u32 val; u32 val;
/* /*
...@@ -153,21 +154,21 @@ static irqreturn_t armada8k_pcie_irq_handler(int irq, void *arg) ...@@ -153,21 +154,21 @@ static irqreturn_t armada8k_pcie_irq_handler(int irq, void *arg)
* PCI device. However, they are also latched into the PCIe * PCI device. However, they are also latched into the PCIe
* controller, so we simply discard them. * controller, so we simply discard them.
*/ */
val = dw_pcie_readl_rc(pp, PCIE_GLOBAL_INT_CAUSE1_REG); val = dw_pcie_readl_dbi(pci, PCIE_GLOBAL_INT_CAUSE1_REG);
dw_pcie_writel_rc(pp, PCIE_GLOBAL_INT_CAUSE1_REG, val); dw_pcie_writel_dbi(pci, PCIE_GLOBAL_INT_CAUSE1_REG, val);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static struct pcie_host_ops armada8k_pcie_host_ops = { static struct dw_pcie_host_ops armada8k_pcie_host_ops = {
.link_up = armada8k_pcie_link_up,
.host_init = armada8k_pcie_host_init, .host_init = armada8k_pcie_host_init,
}; };
static int armada8k_add_pcie_port(struct armada8k_pcie *pcie, static int armada8k_add_pcie_port(struct armada8k_pcie *pcie,
struct platform_device *pdev) struct platform_device *pdev)
{ {
struct pcie_port *pp = &pcie->pp; struct dw_pcie *pci = pcie->pci;
struct pcie_port *pp = &pci->pp;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
int ret; int ret;
...@@ -196,10 +197,14 @@ static int armada8k_add_pcie_port(struct armada8k_pcie *pcie, ...@@ -196,10 +197,14 @@ static int armada8k_add_pcie_port(struct armada8k_pcie *pcie,
return 0; return 0;
} }
static const struct dw_pcie_ops dw_pcie_ops = {
.link_up = armada8k_pcie_link_up,
};
static int armada8k_pcie_probe(struct platform_device *pdev) static int armada8k_pcie_probe(struct platform_device *pdev)
{ {
struct dw_pcie *pci;
struct armada8k_pcie *pcie; struct armada8k_pcie *pcie;
struct pcie_port *pp;
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct resource *base; struct resource *base;
int ret; int ret;
...@@ -208,21 +213,25 @@ static int armada8k_pcie_probe(struct platform_device *pdev) ...@@ -208,21 +213,25 @@ static int armada8k_pcie_probe(struct platform_device *pdev)
if (!pcie) if (!pcie)
return -ENOMEM; return -ENOMEM;
pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL);
if (!pci)
return -ENOMEM;
pci->dev = dev;
pci->ops = &dw_pcie_ops;
pcie->clk = devm_clk_get(dev, NULL); pcie->clk = devm_clk_get(dev, NULL);
if (IS_ERR(pcie->clk)) if (IS_ERR(pcie->clk))
return PTR_ERR(pcie->clk); return PTR_ERR(pcie->clk);
clk_prepare_enable(pcie->clk); clk_prepare_enable(pcie->clk);
pp = &pcie->pp;
pp->dev = dev;
/* Get the dw-pcie unit configuration/control registers base. */ /* Get the dw-pcie unit configuration/control registers base. */
base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl"); base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "ctrl");
pp->dbi_base = devm_ioremap_resource(dev, base); pci->dbi_base = devm_ioremap_resource(dev, base);
if (IS_ERR(pp->dbi_base)) { if (IS_ERR(pci->dbi_base)) {
dev_err(dev, "couldn't remap regs base %p\n", base); dev_err(dev, "couldn't remap regs base %p\n", base);
ret = PTR_ERR(pp->dbi_base); ret = PTR_ERR(pci->dbi_base);
goto fail; goto fail;
} }
......
drivers/pci/dwc/pcie-artpec6.c
View file @ 442ec4c0
...@@ -24,10 +24,10 @@ ...@@ -24,10 +24,10 @@
#include "pcie-designware.h" #include "pcie-designware.h"
#define to_artpec6_pcie(x) container_of(x, struct artpec6_pcie, pp) #define to_artpec6_pcie(x) dev_get_drvdata((x)->dev)
struct artpec6_pcie { struct artpec6_pcie {
struct pcie_port pp; /* pp.dbi_base is DT dbi */ struct dw_pcie *pci;
struct regmap *regmap; /* DT axis,syscon-pcie */ struct regmap *regmap; /* DT axis,syscon-pcie */
void __iomem *phy_base; /* DT phy */ void __iomem *phy_base; /* DT phy */
}; };
...@@ -80,7 +80,8 @@ static void artpec6_pcie_writel(struct artpec6_pcie *artpec6_pcie, u32 offset, u ...@@ -80,7 +80,8 @@ static void artpec6_pcie_writel(struct artpec6_pcie *artpec6_pcie, u32 offset, u
static int artpec6_pcie_establish_link(struct artpec6_pcie *artpec6_pcie) static int artpec6_pcie_establish_link(struct artpec6_pcie *artpec6_pcie)
{ {
struct pcie_port *pp = &artpec6_pcie->pp; struct dw_pcie *pci = artpec6_pcie->pci;
struct pcie_port *pp = &pci->pp;
u32 val; u32 val;
unsigned int retries; unsigned int retries;
...@@ -139,7 +140,7 @@ static int artpec6_pcie_establish_link(struct artpec6_pcie *artpec6_pcie) ...@@ -139,7 +140,7 @@ static int artpec6_pcie_establish_link(struct artpec6_pcie *artpec6_pcie)
* Enable writing to config regs. This is required as the Synopsys * Enable writing to config regs. This is required as the Synopsys
* driver changes the class code. That register needs DBI write enable. * driver changes the class code. That register needs DBI write enable.
*/ */
dw_pcie_writel_rc(pp, MISC_CONTROL_1_OFF, DBI_RO_WR_EN); dw_pcie_writel_dbi(pci, MISC_CONTROL_1_OFF, DBI_RO_WR_EN);
pp->io_base &= ARTPEC6_CPU_TO_BUS_ADDR; pp->io_base &= ARTPEC6_CPU_TO_BUS_ADDR;
pp->mem_base &= ARTPEC6_CPU_TO_BUS_ADDR; pp->mem_base &= ARTPEC6_CPU_TO_BUS_ADDR;
...@@ -155,19 +156,20 @@ static int artpec6_pcie_establish_link(struct artpec6_pcie *artpec6_pcie) ...@@ -155,19 +156,20 @@ static int artpec6_pcie_establish_link(struct artpec6_pcie *artpec6_pcie)
artpec6_pcie_writel(artpec6_pcie, PCIECFG, val); artpec6_pcie_writel(artpec6_pcie, PCIECFG, val);
/* check if the link is up or not */ /* check if the link is up or not */
if (!dw_pcie_wait_for_link(pp)) if (!dw_pcie_wait_for_link(pci))
return 0; return 0;
dev_dbg(pp->dev, "DEBUG_R0: 0x%08x, DEBUG_R1: 0x%08x\n", dev_dbg(pci->dev, "DEBUG_R0: 0x%08x, DEBUG_R1: 0x%08x\n",
dw_pcie_readl_rc(pp, PCIE_PHY_DEBUG_R0), dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R0),
dw_pcie_readl_rc(pp, PCIE_PHY_DEBUG_R1)); dw_pcie_readl_dbi(pci, PCIE_PHY_DEBUG_R1));
return -ETIMEDOUT; return -ETIMEDOUT;
} }
static void artpec6_pcie_enable_interrupts(struct artpec6_pcie *artpec6_pcie) static void artpec6_pcie_enable_interrupts(struct artpec6_pcie *artpec6_pcie)
{ {
struct pcie_port *pp = &artpec6_pcie->pp; struct dw_pcie *pci = artpec6_pcie->pci;
struct pcie_port *pp = &pci->pp;
if (IS_ENABLED(CONFIG_PCI_MSI)) if (IS_ENABLED(CONFIG_PCI_MSI))
dw_pcie_msi_init(pp); dw_pcie_msi_init(pp);
...@@ -175,20 +177,22 @@ static void artpec6_pcie_enable_interrupts(struct artpec6_pcie *artpec6_pcie) ...@@ -175,20 +177,22 @@ static void artpec6_pcie_enable_interrupts(struct artpec6_pcie *artpec6_pcie)
static void artpec6_pcie_host_init(struct pcie_port *pp) static void artpec6_pcie_host_init(struct pcie_port *pp)
{ {
struct artpec6_pcie *artpec6_pcie = to_artpec6_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct artpec6_pcie *artpec6_pcie = to_artpec6_pcie(pci);
artpec6_pcie_establish_link(artpec6_pcie); artpec6_pcie_establish_link(artpec6_pcie);
artpec6_pcie_enable_interrupts(artpec6_pcie); artpec6_pcie_enable_interrupts(artpec6_pcie);
} }
static struct pcie_host_ops artpec6_pcie_host_ops = { static struct dw_pcie_host_ops artpec6_pcie_host_ops = {
.host_init = artpec6_pcie_host_init, .host_init = artpec6_pcie_host_init,
}; };
static irqreturn_t artpec6_pcie_msi_handler(int irq, void *arg) static irqreturn_t artpec6_pcie_msi_handler(int irq, void *arg)
{ {
struct artpec6_pcie *artpec6_pcie = arg; struct artpec6_pcie *artpec6_pcie = arg;
struct pcie_port *pp = &artpec6_pcie->pp; struct dw_pcie *pci = artpec6_pcie->pci;
struct pcie_port *pp = &pci->pp;
return dw_handle_msi_irq(pp); return dw_handle_msi_irq(pp);
} }
...@@ -196,8 +200,9 @@ static irqreturn_t artpec6_pcie_msi_handler(int irq, void *arg) ...@@ -196,8 +200,9 @@ static irqreturn_t artpec6_pcie_msi_handler(int irq, void *arg)
static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie, static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie,
struct platform_device *pdev) struct platform_device *pdev)
{ {
struct pcie_port *pp = &artpec6_pcie->pp; struct dw_pcie *pci = artpec6_pcie->pci;
struct device *dev = pp->dev; struct pcie_port *pp = &pci->pp;
struct device *dev = pci->dev;
int ret; int ret;
if (IS_ENABLED(CONFIG_PCI_MSI)) { if (IS_ENABLED(CONFIG_PCI_MSI)) {
...@@ -232,8 +237,8 @@ static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie, ...@@ -232,8 +237,8 @@ static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie,
static int artpec6_pcie_probe(struct platform_device *pdev) static int artpec6_pcie_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct dw_pcie *pci;
struct artpec6_pcie *artpec6_pcie; struct artpec6_pcie *artpec6_pcie;
struct pcie_port *pp;
struct resource *dbi_base; struct resource *dbi_base;
struct resource *phy_base; struct resource *phy_base;
int ret; int ret;
...@@ -242,13 +247,16 @@ static int artpec6_pcie_probe(struct platform_device *pdev) ...@@ -242,13 +247,16 @@ static int artpec6_pcie_probe(struct platform_device *pdev)
if (!artpec6_pcie) if (!artpec6_pcie)
return -ENOMEM; return -ENOMEM;
pp = &artpec6_pcie->pp; pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL);
pp->dev = dev; if (!pci)
return -ENOMEM;
pci->dev = dev;
dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi"); dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");
pp->dbi_base = devm_ioremap_resource(dev, dbi_base); pci->dbi_base = devm_ioremap_resource(dev, dbi_base);
if (IS_ERR(pp->dbi_base)) if (IS_ERR(pci->dbi_base))
return PTR_ERR(pp->dbi_base); return PTR_ERR(pci->dbi_base);
phy_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy"); phy_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "phy");
artpec6_pcie->phy_base = devm_ioremap_resource(dev, phy_base); artpec6_pcie->phy_base = devm_ioremap_resource(dev, phy_base);
......
drivers/pci/dwc/pcie-designware-plat.c
View file @ 442ec4c0
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "pcie-designware.h" #include "pcie-designware.h"
struct dw_plat_pcie { struct dw_plat_pcie {
struct pcie_port pp; /* pp.dbi_base is DT 0th resource */ struct dw_pcie *pci;
}; };
static irqreturn_t dw_plat_pcie_msi_irq_handler(int irq, void *arg) static irqreturn_t dw_plat_pcie_msi_irq_handler(int irq, void *arg)
...@@ -37,21 +37,23 @@ static irqreturn_t dw_plat_pcie_msi_irq_handler(int irq, void *arg) ...@@ -37,21 +37,23 @@ static irqreturn_t dw_plat_pcie_msi_irq_handler(int irq, void *arg)
static void dw_plat_pcie_host_init(struct pcie_port *pp) static void dw_plat_pcie_host_init(struct pcie_port *pp)
{ {
struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
dw_pcie_setup_rc(pp); dw_pcie_setup_rc(pp);
dw_pcie_wait_for_link(pp); dw_pcie_wait_for_link(pci);
if (IS_ENABLED(CONFIG_PCI_MSI)) if (IS_ENABLED(CONFIG_PCI_MSI))
dw_pcie_msi_init(pp); dw_pcie_msi_init(pp);
} }
static struct pcie_host_ops dw_plat_pcie_host_ops = { static struct dw_pcie_host_ops dw_plat_pcie_host_ops = {
.host_init = dw_plat_pcie_host_init, .host_init = dw_plat_pcie_host_init,
}; };
static int dw_plat_add_pcie_port(struct pcie_port *pp, static int dw_plat_add_pcie_port(struct pcie_port *pp,
struct platform_device *pdev) struct platform_device *pdev)
{ {
struct device *dev = pp->dev; struct device *dev = &pdev->dev;
int ret; int ret;
pp->irq = platform_get_irq(pdev, 1); pp->irq = platform_get_irq(pdev, 1);
...@@ -88,7 +90,7 @@ static int dw_plat_pcie_probe(struct platform_device *pdev) ...@@ -88,7 +90,7 @@ static int dw_plat_pcie_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct dw_plat_pcie *dw_plat_pcie; struct dw_plat_pcie *dw_plat_pcie;
struct pcie_port *pp; struct dw_pcie *pci;
struct resource *res; /* Resource from DT */ struct resource *res; /* Resource from DT */
int ret; int ret;
...@@ -96,17 +98,20 @@ static int dw_plat_pcie_probe(struct platform_device *pdev) ...@@ -96,17 +98,20 @@ static int dw_plat_pcie_probe(struct platform_device *pdev)
if (!dw_plat_pcie) if (!dw_plat_pcie)
return -ENOMEM; return -ENOMEM;
pp = &dw_plat_pcie->pp; pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL);
pp->dev = dev; if (!pci)
return -ENOMEM;
pci->dev = dev;
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
pp->dbi_base = devm_ioremap_resource(dev, res); pci->dbi_base = devm_ioremap_resource(dev, res);
if (IS_ERR(pp->dbi_base)) if (IS_ERR(pci->dbi_base))
return PTR_ERR(pp->dbi_base); return PTR_ERR(pci->dbi_base);
platform_set_drvdata(pdev, dw_plat_pcie); platform_set_drvdata(pdev, dw_plat_pcie);
ret = dw_plat_add_pcie_port(pp, pdev); ret = dw_plat_add_pcie_port(&pci->pp, pdev);
if (ret < 0) if (ret < 0)
return ret; return ret;
......
drivers/pci/dwc/pcie-designware.c
View file @ 442ec4c0
...@@ -71,90 +71,97 @@ int dw_pcie_write(void __iomem *addr, int size, u32 val) ...@@ -71,90 +71,97 @@ int dw_pcie_write(void __iomem *addr, int size, u32 val)
return PCIBIOS_SUCCESSFUL; return PCIBIOS_SUCCESSFUL;
} }
u32 dw_pcie_readl_rc(struct pcie_port *pp, u32 reg) u32 dw_pcie_readl_dbi(struct dw_pcie *pci, u32 reg)
{ {
if (pp->ops->readl_rc) if (pci->ops->readl_dbi)
return pp->ops->readl_rc(pp, reg); return pci->ops->readl_dbi(pci, reg);
return readl(pp->dbi_base + reg); return readl(pci->dbi_base + reg);
} }
void dw_pcie_writel_rc(struct pcie_port *pp, u32 reg, u32 val) void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val)
{ {
if (pp->ops->writel_rc) if (pci->ops->writel_dbi)
pp->ops->writel_rc(pp, reg, val); pci->ops->writel_dbi(pci, reg, val);
else else
writel(val, pp->dbi_base + reg); writel(val, pci->dbi_base + reg);
} }
static u32 dw_pcie_readl_unroll(struct pcie_port *pp, u32 index, u32 reg) static u32 dw_pcie_readl_unroll(struct dw_pcie *pci, u32 index, u32 reg)
{ {
u32 offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index); u32 offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index);
return dw_pcie_readl_rc(pp, offset + reg); return dw_pcie_readl_dbi(pci, offset + reg);
} }
static void dw_pcie_writel_unroll(struct pcie_port *pp, u32 index, u32 reg, static void dw_pcie_writel_unroll(struct dw_pcie *pci, u32 index, u32 reg,
u32 val) u32 val)
{ {
u32 offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index); u32 offset = PCIE_GET_ATU_OUTB_UNR_REG_OFFSET(index);
dw_pcie_writel_rc(pp, offset + reg, val); dw_pcie_writel_dbi(pci, offset + reg, val);
} }
static int dw_pcie_rd_own_conf(struct pcie_port *pp, int where, int size, static int dw_pcie_rd_own_conf(struct pcie_port *pp, int where, int size,
u32 *val) u32 *val)
{ {
struct dw_pcie *pci;
if (pp->ops->rd_own_conf) if (pp->ops->rd_own_conf)
return pp->ops->rd_own_conf(pp, where, size, val); return pp->ops->rd_own_conf(pp, where, size, val);
return dw_pcie_read(pp->dbi_base + where, size, val); pci = to_dw_pcie_from_pp(pp);
return dw_pcie_read(pci->dbi_base + where, size, val);
} }
static int dw_pcie_wr_own_conf(struct pcie_port *pp, int where, int size, static int dw_pcie_wr_own_conf(struct pcie_port *pp, int where, int size,
u32 val) u32 val)
{ {
struct dw_pcie *pci;
if (pp->ops->wr_own_conf) if (pp->ops->wr_own_conf)
return pp->ops->wr_own_conf(pp, where, size, val); return pp->ops->wr_own_conf(pp, where, size, val);
return dw_pcie_write(pp->dbi_base + where, size, val); pci = to_dw_pcie_from_pp(pp);
return dw_pcie_write(pci->dbi_base + where, size, val);
} }
static void dw_pcie_prog_outbound_atu(struct pcie_port *pp, int index, static void dw_pcie_prog_outbound_atu(struct dw_pcie *pci, int index,
int type, u64 cpu_addr, u64 pci_addr, u32 size) int type, u64 cpu_addr, u64 pci_addr,
u32 size)
{ {
u32 retries, val; u32 retries, val;
if (pp->iatu_unroll_enabled) { if (pci->iatu_unroll_enabled) {
dw_pcie_writel_unroll(pp, index, PCIE_ATU_UNR_LOWER_BASE, dw_pcie_writel_unroll(pci, index, PCIE_ATU_UNR_LOWER_BASE,
lower_32_bits(cpu_addr)); lower_32_bits(cpu_addr));
dw_pcie_writel_unroll(pp, index, PCIE_ATU_UNR_UPPER_BASE, dw_pcie_writel_unroll(pci, index, PCIE_ATU_UNR_UPPER_BASE,
upper_32_bits(cpu_addr)); upper_32_bits(cpu_addr));
dw_pcie_writel_unroll(pp, index, PCIE_ATU_UNR_LIMIT, dw_pcie_writel_unroll(pci, index, PCIE_ATU_UNR_LIMIT,
lower_32_bits(cpu_addr + size - 1)); lower_32_bits(cpu_addr + size - 1));
dw_pcie_writel_unroll(pp, index, PCIE_ATU_UNR_LOWER_TARGET, dw_pcie_writel_unroll(pci, index, PCIE_ATU_UNR_LOWER_TARGET,
lower_32_bits(pci_addr)); lower_32_bits(pci_addr));
dw_pcie_writel_unroll(pp, index, PCIE_ATU_UNR_UPPER_TARGET, dw_pcie_writel_unroll(pci, index, PCIE_ATU_UNR_UPPER_TARGET,
upper_32_bits(pci_addr)); upper_32_bits(pci_addr));
dw_pcie_writel_unroll(pp, index, PCIE_ATU_UNR_REGION_CTRL1, dw_pcie_writel_unroll(pci, index, PCIE_ATU_UNR_REGION_CTRL1,
type); type);
dw_pcie_writel_unroll(pp, index, PCIE_ATU_UNR_REGION_CTRL2, dw_pcie_writel_unroll(pci, index, PCIE_ATU_UNR_REGION_CTRL2,
PCIE_ATU_ENABLE); PCIE_ATU_ENABLE);
} else { } else {
dw_pcie_writel_rc(pp, PCIE_ATU_VIEWPORT, dw_pcie_writel_dbi(pci, PCIE_ATU_VIEWPORT,
PCIE_ATU_REGION_OUTBOUND | index); PCIE_ATU_REGION_OUTBOUND | index);
dw_pcie_writel_rc(pp, PCIE_ATU_LOWER_BASE, dw_pcie_writel_dbi(pci, PCIE_ATU_LOWER_BASE,
lower_32_bits(cpu_addr)); lower_32_bits(cpu_addr));
dw_pcie_writel_rc(pp, PCIE_ATU_UPPER_BASE, dw_pcie_writel_dbi(pci, PCIE_ATU_UPPER_BASE,
upper_32_bits(cpu_addr)); upper_32_bits(cpu_addr));
dw_pcie_writel_rc(pp, PCIE_ATU_LIMIT, dw_pcie_writel_dbi(pci, PCIE_ATU_LIMIT,
lower_32_bits(cpu_addr + size - 1)); lower_32_bits(cpu_addr + size - 1));
dw_pcie_writel_rc(pp, PCIE_ATU_LOWER_TARGET, dw_pcie_writel_dbi(pci, PCIE_ATU_LOWER_TARGET,
lower_32_bits(pci_addr)); lower_32_bits(pci_addr));
dw_pcie_writel_rc(pp, PCIE_ATU_UPPER_TARGET, dw_pcie_writel_dbi(pci, PCIE_ATU_UPPER_TARGET,
upper_32_bits(pci_addr)); upper_32_bits(pci_addr));
dw_pcie_writel_rc(pp, PCIE_ATU_CR1, type); dw_pcie_writel_dbi(pci, PCIE_ATU_CR1, type);
dw_pcie_writel_rc(pp, PCIE_ATU_CR2, PCIE_ATU_ENABLE); dw_pcie_writel_dbi(pci, PCIE_ATU_CR2, PCIE_ATU_ENABLE);
} }
/* /*
...@@ -162,18 +169,18 @@ static void dw_pcie_prog_outbound_atu(struct pcie_port *pp, int index, ...@@ -162,18 +169,18 @@ static void dw_pcie_prog_outbound_atu(struct pcie_port *pp, int index,
* and I/O accesses. * and I/O accesses.
*/ */
for (retries = 0; retries < LINK_WAIT_MAX_IATU_RETRIES; retries++) { for (retries = 0; retries < LINK_WAIT_MAX_IATU_RETRIES; retries++) {
if (pp->iatu_unroll_enabled) if (pci->iatu_unroll_enabled)
val = dw_pcie_readl_unroll(pp, index, val = dw_pcie_readl_unroll(pci, index,
PCIE_ATU_UNR_REGION_CTRL2); PCIE_ATU_UNR_REGION_CTRL2);
else else
val = dw_pcie_readl_rc(pp, PCIE_ATU_CR2); val = dw_pcie_readl_dbi(pci, PCIE_ATU_CR2);
if (val == PCIE_ATU_ENABLE) if (val == PCIE_ATU_ENABLE)
return; return;
usleep_range(LINK_WAIT_IATU_MIN, LINK_WAIT_IATU_MAX); usleep_range(LINK_WAIT_IATU_MIN, LINK_WAIT_IATU_MAX);
} }
dev_err(pp->dev, "iATU is not being enabled\n"); dev_err(pci->dev, "iATU is not being enabled\n");
} }
static struct irq_chip dw_msi_irq_chip = { static struct irq_chip dw_msi_irq_chip = {
...@@ -390,32 +397,32 @@ static struct msi_controller dw_pcie_msi_chip = { ...@@ -390,32 +397,32 @@ static struct msi_controller dw_pcie_msi_chip = {
.teardown_irq = dw_msi_teardown_irq, .teardown_irq = dw_msi_teardown_irq,
}; };
int dw_pcie_wait_for_link(struct pcie_port *pp) int dw_pcie_wait_for_link(struct dw_pcie *pci)
{ {
int retries; int retries;
/* check if the link is up or not */ /* check if the link is up or not */
for (retries = 0; retries < LINK_WAIT_MAX_RETRIES; retries++) { for (retries = 0; retries < LINK_WAIT_MAX_RETRIES; retries++) {
if (dw_pcie_link_up(pp)) { if (dw_pcie_link_up(pci)) {
dev_info(pp->dev, "link up\n"); dev_info(pci->dev, "link up\n");
return 0; return 0;
} }
usleep_range(LINK_WAIT_USLEEP_MIN, LINK_WAIT_USLEEP_MAX); usleep_range(LINK_WAIT_USLEEP_MIN, LINK_WAIT_USLEEP_MAX);
} }
dev_err(pp->dev, "phy link never came up\n"); dev_err(pci->dev, "phy link never came up\n");
return -ETIMEDOUT; return -ETIMEDOUT;
} }
int dw_pcie_link_up(struct pcie_port *pp) int dw_pcie_link_up(struct dw_pcie *pci)
{ {
u32 val; u32 val;
if (pp->ops->link_up) if (pci->ops->link_up)
return pp->ops->link_up(pp); return pci->ops->link_up(pci);
val = readl(pp->dbi_base + PCIE_PHY_DEBUG_R1); val = readl(pci->dbi_base + PCIE_PHY_DEBUG_R1);
return ((val & PCIE_PHY_DEBUG_R1_LINK_UP) && return ((val & PCIE_PHY_DEBUG_R1_LINK_UP) &&
(!(val & PCIE_PHY_DEBUG_R1_LINK_IN_TRAINING))); (!(val & PCIE_PHY_DEBUG_R1_LINK_IN_TRAINING)));
} }
...@@ -433,11 +440,11 @@ static const struct irq_domain_ops msi_domain_ops = { ...@@ -433,11 +440,11 @@ static const struct irq_domain_ops msi_domain_ops = {
.map = dw_pcie_msi_map, .map = dw_pcie_msi_map,
}; };
static u8 dw_pcie_iatu_unroll_enabled(struct pcie_port *pp) static u8 dw_pcie_iatu_unroll_enabled(struct dw_pcie *pci)
{ {
u32 val; u32 val;
val = dw_pcie_readl_rc(pp, PCIE_ATU_VIEWPORT); val = dw_pcie_readl_dbi(pci, PCIE_ATU_VIEWPORT);
if (val == 0xffffffff) if (val == 0xffffffff)
return 1; return 1;
...@@ -446,7 +453,8 @@ static u8 dw_pcie_iatu_unroll_enabled(struct pcie_port *pp) ...@@ -446,7 +453,8 @@ static u8 dw_pcie_iatu_unroll_enabled(struct pcie_port *pp)
int dw_pcie_host_init(struct pcie_port *pp) int dw_pcie_host_init(struct pcie_port *pp)
{ {
struct device *dev = pp->dev; struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct device *dev = pci->dev;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct platform_device *pdev = to_platform_device(dev); struct platform_device *pdev = to_platform_device(dev);
struct pci_bus *bus, *child; struct pci_bus *bus, *child;
...@@ -508,10 +516,10 @@ int dw_pcie_host_init(struct pcie_port *pp) ...@@ -508,10 +516,10 @@ int dw_pcie_host_init(struct pcie_port *pp)
} }
} }
if (!pp->dbi_base) { if (!pci->dbi_base) {
pp->dbi_base = devm_ioremap(dev, pp->cfg->start, pci->dbi_base = devm_ioremap(dev, pp->cfg->start,
resource_size(pp->cfg)); resource_size(pp->cfg));
if (!pp->dbi_base) { if (!pci->dbi_base) {
dev_err(dev, "error with ioremap\n"); dev_err(dev, "error with ioremap\n");
ret = -ENOMEM; ret = -ENOMEM;
goto error; goto error;
...@@ -540,13 +548,13 @@ int dw_pcie_host_init(struct pcie_port *pp) ...@@ -540,13 +548,13 @@ int dw_pcie_host_init(struct pcie_port *pp)
} }
} }
ret = of_property_read_u32(np, "num-lanes", &pp->lanes); ret = of_property_read_u32(np, "num-lanes", &pci->lanes);
if (ret) if (ret)
pp->lanes = 0; pci->lanes = 0;
ret = of_property_read_u32(np, "num-viewport", &pp->num_viewport); ret = of_property_read_u32(np, "num-viewport", &pci->num_viewport);
if (ret) if (ret)
pp->num_viewport = 2; pci->num_viewport = 2;
if (IS_ENABLED(CONFIG_PCI_MSI)) { if (IS_ENABLED(CONFIG_PCI_MSI)) {
if (!pp->ops->msi_host_init) { if (!pp->ops->msi_host_init) {
...@@ -614,6 +622,7 @@ static int dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus, ...@@ -614,6 +622,7 @@ static int dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus,
u32 busdev, cfg_size; u32 busdev, cfg_size;
u64 cpu_addr; u64 cpu_addr;
void __iomem *va_cfg_base; void __iomem *va_cfg_base;
struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
if (pp->ops->rd_other_conf) if (pp->ops->rd_other_conf)
return pp->ops->rd_other_conf(pp, bus, devfn, where, size, val); return pp->ops->rd_other_conf(pp, bus, devfn, where, size, val);
...@@ -633,12 +642,12 @@ static int dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus, ...@@ -633,12 +642,12 @@ static int dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus,
va_cfg_base = pp->va_cfg1_base; va_cfg_base = pp->va_cfg1_base;
} }
dw_pcie_prog_outbound_atu(pp, PCIE_ATU_REGION_INDEX1, dw_pcie_prog_outbound_atu(pci, PCIE_ATU_REGION_INDEX1,
type, cpu_addr, type, cpu_addr,
busdev, cfg_size); busdev, cfg_size);
ret = dw_pcie_read(va_cfg_base + where, size, val); ret = dw_pcie_read(va_cfg_base + where, size, val);
if (pp->num_viewport <= 2) if (pci->num_viewport <= 2)
dw_pcie_prog_outbound_atu(pp, PCIE_ATU_REGION_INDEX1, dw_pcie_prog_outbound_atu(pci, PCIE_ATU_REGION_INDEX1,
PCIE_ATU_TYPE_IO, pp->io_base, PCIE_ATU_TYPE_IO, pp->io_base,
pp->io_bus_addr, pp->io_size); pp->io_bus_addr, pp->io_size);
...@@ -652,6 +661,7 @@ static int dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus, ...@@ -652,6 +661,7 @@ static int dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,
u32 busdev, cfg_size; u32 busdev, cfg_size;
u64 cpu_addr; u64 cpu_addr;
void __iomem *va_cfg_base; void __iomem *va_cfg_base;
struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
if (pp->ops->wr_other_conf) if (pp->ops->wr_other_conf)
return pp->ops->wr_other_conf(pp, bus, devfn, where, size, val); return pp->ops->wr_other_conf(pp, bus, devfn, where, size, val);
...@@ -671,12 +681,12 @@ static int dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus, ...@@ -671,12 +681,12 @@ static int dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,
va_cfg_base = pp->va_cfg1_base; va_cfg_base = pp->va_cfg1_base;
} }
dw_pcie_prog_outbound_atu(pp, PCIE_ATU_REGION_INDEX1, dw_pcie_prog_outbound_atu(pci, PCIE_ATU_REGION_INDEX1,
type, cpu_addr, type, cpu_addr,
busdev, cfg_size); busdev, cfg_size);
ret = dw_pcie_write(va_cfg_base + where, size, val); ret = dw_pcie_write(va_cfg_base + where, size, val);
if (pp->num_viewport <= 2) if (pci->num_viewport <= 2)
dw_pcie_prog_outbound_atu(pp, PCIE_ATU_REGION_INDEX1, dw_pcie_prog_outbound_atu(pci, PCIE_ATU_REGION_INDEX1,
PCIE_ATU_TYPE_IO, pp->io_base, PCIE_ATU_TYPE_IO, pp->io_base,
pp->io_bus_addr, pp->io_size); pp->io_bus_addr, pp->io_size);
...@@ -686,9 +696,11 @@ static int dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus, ...@@ -686,9 +696,11 @@ static int dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,
static int dw_pcie_valid_device(struct pcie_port *pp, struct pci_bus *bus, static int dw_pcie_valid_device(struct pcie_port *pp, struct pci_bus *bus,
int dev) int dev)
{ {
struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
/* If there is no link, then there is no device */ /* If there is no link, then there is no device */
if (bus->number != pp->root_bus_nr) { if (bus->number != pp->root_bus_nr) {
if (!dw_pcie_link_up(pp)) if (!dw_pcie_link_up(pci))
return 0; return 0;
} }
...@@ -737,11 +749,12 @@ static struct pci_ops dw_pcie_ops = { ...@@ -737,11 +749,12 @@ static struct pci_ops dw_pcie_ops = {
void dw_pcie_setup_rc(struct pcie_port *pp) void dw_pcie_setup_rc(struct pcie_port *pp)
{ {
u32 val; u32 val;
struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
/* set the number of lanes */ /* set the number of lanes */
val = dw_pcie_readl_rc(pp, PCIE_PORT_LINK_CONTROL); val = dw_pcie_readl_dbi(pci, PCIE_PORT_LINK_CONTROL);
val &= ~PORT_LINK_MODE_MASK; val &= ~PORT_LINK_MODE_MASK;
switch (pp->lanes) { switch (pci->lanes) {
case 1: case 1:
val |= PORT_LINK_MODE_1_LANES; val |= PORT_LINK_MODE_1_LANES;
break; break;
...@@ -755,15 +768,15 @@ void dw_pcie_setup_rc(struct pcie_port *pp) ...@@ -755,15 +768,15 @@ void dw_pcie_setup_rc(struct pcie_port *pp)
val |= PORT_LINK_MODE_8_LANES; val |= PORT_LINK_MODE_8_LANES;
break; break;
default: default:
dev_err(pp->dev, "num-lanes %u: invalid value\n", pp->lanes); dev_err(pci->dev, "num-lanes %u: invalid value\n", pci->lanes);
return; return;
} }
dw_pcie_writel_rc(pp, PCIE_PORT_LINK_CONTROL, val); dw_pcie_writel_dbi(pci, PCIE_PORT_LINK_CONTROL, val);
/* set link width speed control register */ /* set link width speed control register */
val = dw_pcie_readl_rc(pp, PCIE_LINK_WIDTH_SPEED_CONTROL); val = dw_pcie_readl_dbi(pci, PCIE_LINK_WIDTH_SPEED_CONTROL);
val &= ~PORT_LOGIC_LINK_WIDTH_MASK; val &= ~PORT_LOGIC_LINK_WIDTH_MASK;
switch (pp->lanes) { switch (pci->lanes) {
case 1: case 1:
val |= PORT_LOGIC_LINK_WIDTH_1_LANES; val |= PORT_LOGIC_LINK_WIDTH_1_LANES;
break; break;
...@@ -777,30 +790,30 @@ void dw_pcie_setup_rc(struct pcie_port *pp) ...@@ -777,30 +790,30 @@ void dw_pcie_setup_rc(struct pcie_port *pp)
val |= PORT_LOGIC_LINK_WIDTH_8_LANES; val |= PORT_LOGIC_LINK_WIDTH_8_LANES;
break; break;
} }
dw_pcie_writel_rc(pp, PCIE_LINK_WIDTH_SPEED_CONTROL, val); dw_pcie_writel_dbi(pci, PCIE_LINK_WIDTH_SPEED_CONTROL, val);
/* setup RC BARs */ /* setup RC BARs */
dw_pcie_writel_rc(pp, PCI_BASE_ADDRESS_0, 0x00000004); dw_pcie_writel_dbi(pci, PCI_BASE_ADDRESS_0, 0x00000004);
dw_pcie_writel_rc(pp, PCI_BASE_ADDRESS_1, 0x00000000); dw_pcie_writel_dbi(pci, PCI_BASE_ADDRESS_1, 0x00000000);
/* setup interrupt pins */ /* setup interrupt pins */
val = dw_pcie_readl_rc(pp, PCI_INTERRUPT_LINE); val = dw_pcie_readl_dbi(pci, PCI_INTERRUPT_LINE);
val &= 0xffff00ff; val &= 0xffff00ff;
val |= 0x00000100; val |= 0x00000100;
dw_pcie_writel_rc(pp, PCI_INTERRUPT_LINE, val); dw_pcie_writel_dbi(pci, PCI_INTERRUPT_LINE, val);
/* setup bus numbers */ /* setup bus numbers */
val = dw_pcie_readl_rc(pp, PCI_PRIMARY_BUS); val = dw_pcie_readl_dbi(pci, PCI_PRIMARY_BUS);
val &= 0xff000000; val &= 0xff000000;
val |= 0x00010100; val |= 0x00010100;
dw_pcie_writel_rc(pp, PCI_PRIMARY_BUS, val); dw_pcie_writel_dbi(pci, PCI_PRIMARY_BUS, val);
/* setup command register */ /* setup command register */
val = dw_pcie_readl_rc(pp, PCI_COMMAND); val = dw_pcie_readl_dbi(pci, PCI_COMMAND);
val &= 0xffff0000; val &= 0xffff0000;
val |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY | val |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
PCI_COMMAND_MASTER | PCI_COMMAND_SERR; PCI_COMMAND_MASTER | PCI_COMMAND_SERR;
dw_pcie_writel_rc(pp, PCI_COMMAND, val); dw_pcie_writel_dbi(pci, PCI_COMMAND, val);
/* /*
* If the platform provides ->rd_other_conf, it means the platform * If the platform provides ->rd_other_conf, it means the platform
...@@ -809,15 +822,15 @@ void dw_pcie_setup_rc(struct pcie_port *pp) ...@@ -809,15 +822,15 @@ void dw_pcie_setup_rc(struct pcie_port *pp)
*/ */
if (!pp->ops->rd_other_conf) { if (!pp->ops->rd_other_conf) {
/* get iATU unroll support */ /* get iATU unroll support */
pp->iatu_unroll_enabled = dw_pcie_iatu_unroll_enabled(pp); pci->iatu_unroll_enabled = dw_pcie_iatu_unroll_enabled(pci);
dev_dbg(pp->dev, "iATU unroll: %s\n", dev_dbg(pci->dev, "iATU unroll: %s\n",
pp->iatu_unroll_enabled ? "enabled" : "disabled"); pci->iatu_unroll_enabled ? "enabled" : "disabled");
dw_pcie_prog_outbound_atu(pp, PCIE_ATU_REGION_INDEX0, dw_pcie_prog_outbound_atu(pci, PCIE_ATU_REGION_INDEX0,
PCIE_ATU_TYPE_MEM, pp->mem_base, PCIE_ATU_TYPE_MEM, pp->mem_base,
pp->mem_bus_addr, pp->mem_size); pp->mem_bus_addr, pp->mem_size);
if (pp->num_viewport > 2) if (pci->num_viewport > 2)
dw_pcie_prog_outbound_atu(pp, PCIE_ATU_REGION_INDEX2, dw_pcie_prog_outbound_atu(pci, PCIE_ATU_REGION_INDEX2,
PCIE_ATU_TYPE_IO, pp->io_base, PCIE_ATU_TYPE_IO, pp->io_base,
pp->io_bus_addr, pp->io_size); pp->io_bus_addr, pp->io_size);
} }
......
drivers/pci/dwc/pcie-designware.h
View file @ 442ec4c0
...@@ -93,10 +93,27 @@ ...@@ -93,10 +93,27 @@
#define MAX_MSI_IRQS 32 #define MAX_MSI_IRQS 32
#define MAX_MSI_CTRLS (MAX_MSI_IRQS / 32) #define MAX_MSI_CTRLS (MAX_MSI_IRQS / 32)
struct pcie_port;
struct dw_pcie;
struct dw_pcie_host_ops {
int (*rd_own_conf)(struct pcie_port *pp, int where, int size, u32 *val);
int (*wr_own_conf)(struct pcie_port *pp, int where, int size, u32 val);
int (*rd_other_conf)(struct pcie_port *pp, struct pci_bus *bus,
unsigned int devfn, int where, int size, u32 *val);
int (*wr_other_conf)(struct pcie_port *pp, struct pci_bus *bus,
unsigned int devfn, int where, int size, u32 val);
void (*host_init)(struct pcie_port *pp);
void (*msi_set_irq)(struct pcie_port *pp, int irq);
void (*msi_clear_irq)(struct pcie_port *pp, int irq);
phys_addr_t (*get_msi_addr)(struct pcie_port *pp);
u32 (*get_msi_data)(struct pcie_port *pp, int pos);
void (*scan_bus)(struct pcie_port *pp);
int (*msi_host_init)(struct pcie_port *pp, struct msi_controller *chip);
};
struct pcie_port { struct pcie_port {
struct device *dev;
u8 root_bus_nr; u8 root_bus_nr;
void __iomem *dbi_base;
u64 cfg0_base; u64 cfg0_base;
void __iomem *va_cfg0_base; void __iomem *va_cfg0_base;
u32 cfg0_size; u32 cfg0_size;
...@@ -114,44 +131,40 @@ struct pcie_port { ...@@ -114,44 +131,40 @@ struct pcie_port {
struct resource *mem; struct resource *mem;
struct resource *busn; struct resource *busn;
int irq; int irq;
u32 lanes; struct dw_pcie_host_ops *ops;
u32 num_viewport;
struct pcie_host_ops *ops;
int msi_irq; int msi_irq;
struct irq_domain *irq_domain; struct irq_domain *irq_domain;
unsigned long msi_data; unsigned long msi_data;
u8 iatu_unroll_enabled;
DECLARE_BITMAP(msi_irq_in_use, MAX_MSI_IRQS); DECLARE_BITMAP(msi_irq_in_use, MAX_MSI_IRQS);
}; };
struct pcie_host_ops { struct dw_pcie_ops {
u32 (*readl_rc)(struct pcie_port *pp, u32 reg); u32 (*readl_dbi)(struct dw_pcie *pcie, u32 reg);
void (*writel_rc)(struct pcie_port *pp, u32 reg, u32 val); void (*writel_dbi)(struct dw_pcie *pcie, u32 reg, u32 val);
int (*rd_own_conf)(struct pcie_port *pp, int where, int size, u32 *val); int (*link_up)(struct dw_pcie *pcie);
int (*wr_own_conf)(struct pcie_port *pp, int where, int size, u32 val);
int (*rd_other_conf)(struct pcie_port *pp, struct pci_bus *bus,
unsigned int devfn, int where, int size, u32 *val);
int (*wr_other_conf)(struct pcie_port *pp, struct pci_bus *bus,
unsigned int devfn, int where, int size, u32 val);
int (*link_up)(struct pcie_port *pp);
void (*host_init)(struct pcie_port *pp);
void (*msi_set_irq)(struct pcie_port *pp, int irq);
void (*msi_clear_irq)(struct pcie_port *pp, int irq);
phys_addr_t (*get_msi_addr)(struct pcie_port *pp);
u32 (*get_msi_data)(struct pcie_port *pp, int pos);
void (*scan_bus)(struct pcie_port *pp);
int (*msi_host_init)(struct pcie_port *pp, struct msi_controller *chip);
}; };
u32 dw_pcie_readl_rc(struct pcie_port *pp, u32 reg); struct dw_pcie {
void dw_pcie_writel_rc(struct pcie_port *pp, u32 reg, u32 val); struct device *dev;
void __iomem *dbi_base;
u32 lanes;
u32 num_viewport;
u8 iatu_unroll_enabled;
struct pcie_port pp;
const struct dw_pcie_ops *ops;
};
#define to_dw_pcie_from_pp(port) container_of((port), struct dw_pcie, pp)
int dw_pcie_read(void __iomem *addr, int size, u32 *val); int dw_pcie_read(void __iomem *addr, int size, u32 *val);
int dw_pcie_write(void __iomem *addr, int size, u32 val); int dw_pcie_write(void __iomem *addr, int size, u32 val);
irqreturn_t dw_handle_msi_irq(struct pcie_port *pp); irqreturn_t dw_handle_msi_irq(struct pcie_port *pp);
void dw_pcie_msi_init(struct pcie_port *pp); void dw_pcie_msi_init(struct pcie_port *pp);
int dw_pcie_wait_for_link(struct pcie_port *pp);
int dw_pcie_link_up(struct pcie_port *pp);
void dw_pcie_setup_rc(struct pcie_port *pp); void dw_pcie_setup_rc(struct pcie_port *pp);
int dw_pcie_host_init(struct pcie_port *pp); int dw_pcie_host_init(struct pcie_port *pp);
u32 dw_pcie_readl_dbi(struct dw_pcie *pci, u32 reg);
void dw_pcie_writel_dbi(struct dw_pcie *pci, u32 reg, u32 val);
int dw_pcie_link_up(struct dw_pcie *pci);
int dw_pcie_wait_for_link(struct dw_pcie *pci);
#endif /* _PCIE_DESIGNWARE_H */ #endif /* _PCIE_DESIGNWARE_H */
drivers/pci/dwc/pcie-hisi.c
View file @ 442ec4c0
...@@ -127,7 +127,7 @@ struct pci_ecam_ops hisi_pcie_ops = { ...@@ -127,7 +127,7 @@ struct pci_ecam_ops hisi_pcie_ops = {
#define PCIE_LTSSM_LINKUP_STATE 0x11 #define PCIE_LTSSM_LINKUP_STATE 0x11
#define PCIE_LTSSM_STATE_MASK 0x3F #define PCIE_LTSSM_STATE_MASK 0x3F
#define to_hisi_pcie(x) container_of(x, struct hisi_pcie, pp) #define to_hisi_pcie(x) dev_get_drvdata((x)->dev)
struct hisi_pcie; struct hisi_pcie;
...@@ -136,7 +136,7 @@ struct pcie_soc_ops { ...@@ -136,7 +136,7 @@ struct pcie_soc_ops {
}; };
struct hisi_pcie { struct hisi_pcie {
struct pcie_port pp; /* pp.dbi_base is DT rc_dbi */ struct dw_pcie *pci;
struct regmap *subctrl; struct regmap *subctrl;
u32 port_id; u32 port_id;
struct pcie_soc_ops *soc_ops; struct pcie_soc_ops *soc_ops;
...@@ -149,10 +149,11 @@ static int hisi_pcie_cfg_read(struct pcie_port *pp, int where, int size, ...@@ -149,10 +149,11 @@ static int hisi_pcie_cfg_read(struct pcie_port *pp, int where, int size,
u32 reg; u32 reg;
u32 reg_val; u32 reg_val;
void *walker = &reg_val; void *walker = &reg_val;
struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
walker += (where & 0x3); walker += (where & 0x3);
reg = where & ~0x3; reg = where & ~0x3;
reg_val = dw_pcie_readl_rc(pp, reg); reg_val = dw_pcie_readl_dbi(pci, reg);
if (size == 1) if (size == 1)
*val = *(u8 __force *) walker; *val = *(u8 __force *) walker;
...@@ -173,19 +174,20 @@ static int hisi_pcie_cfg_write(struct pcie_port *pp, int where, int size, ...@@ -173,19 +174,20 @@ static int hisi_pcie_cfg_write(struct pcie_port *pp, int where, int size,
u32 reg_val; u32 reg_val;
u32 reg; u32 reg;
void *walker = &reg_val; void *walker = &reg_val;
struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
walker += (where & 0x3); walker += (where & 0x3);
reg = where & ~0x3; reg = where & ~0x3;
if (size == 4) if (size == 4)
dw_pcie_writel_rc(pp, reg, val); dw_pcie_writel_dbi(pci, reg, val);
else if (size == 2) { else if (size == 2) {
reg_val = dw_pcie_readl_rc(pp, reg); reg_val = dw_pcie_readl_dbi(pci, reg);
*(u16 __force *) walker = val; *(u16 __force *) walker = val;
dw_pcie_writel_rc(pp, reg, reg_val); dw_pcie_writel_dbi(pci, reg, reg_val);
} else if (size == 1) { } else if (size == 1) {
reg_val = dw_pcie_readl_rc(pp, reg); reg_val = dw_pcie_readl_dbi(pci, reg);
*(u8 __force *) walker = val; *(u8 __force *) walker = val;
dw_pcie_writel_rc(pp, reg, reg_val); dw_pcie_writel_dbi(pci, reg, reg_val);
} else } else
return PCIBIOS_BAD_REGISTER_NUMBER; return PCIBIOS_BAD_REGISTER_NUMBER;
...@@ -204,32 +206,32 @@ static int hisi_pcie_link_up_hip05(struct hisi_pcie *hisi_pcie) ...@@ -204,32 +206,32 @@ static int hisi_pcie_link_up_hip05(struct hisi_pcie *hisi_pcie)
static int hisi_pcie_link_up_hip06(struct hisi_pcie *hisi_pcie) static int hisi_pcie_link_up_hip06(struct hisi_pcie *hisi_pcie)
{ {
struct pcie_port *pp = &hisi_pcie->pp; struct dw_pcie *pci = hisi_pcie->pci;
u32 val; u32 val;
val = dw_pcie_readl_rc(pp, PCIE_SYS_STATE4); val = dw_pcie_readl_dbi(pci, PCIE_SYS_STATE4);
return ((val & PCIE_LTSSM_STATE_MASK) == PCIE_LTSSM_LINKUP_STATE); return ((val & PCIE_LTSSM_STATE_MASK) == PCIE_LTSSM_LINKUP_STATE);
} }
static int hisi_pcie_link_up(struct pcie_port *pp) static int hisi_pcie_link_up(struct dw_pcie *pci)
{ {
struct hisi_pcie *hisi_pcie = to_hisi_pcie(pp); struct hisi_pcie *hisi_pcie = to_hisi_pcie(pci);
return hisi_pcie->soc_ops->hisi_pcie_link_up(hisi_pcie); return hisi_pcie->soc_ops->hisi_pcie_link_up(hisi_pcie);
} }
static struct pcie_host_ops hisi_pcie_host_ops = { static struct dw_pcie_host_ops hisi_pcie_host_ops = {
.rd_own_conf = hisi_pcie_cfg_read, .rd_own_conf = hisi_pcie_cfg_read,
.wr_own_conf = hisi_pcie_cfg_write, .wr_own_conf = hisi_pcie_cfg_write,
.link_up = hisi_pcie_link_up,
}; };
static int hisi_add_pcie_port(struct hisi_pcie *hisi_pcie, static int hisi_add_pcie_port(struct hisi_pcie *hisi_pcie,
struct platform_device *pdev) struct platform_device *pdev)
{ {
struct pcie_port *pp = &hisi_pcie->pp; struct dw_pcie *pci = hisi_pcie->pci;
struct device *dev = pp->dev; struct pcie_port *pp = &pci->pp;
struct device *dev = &pdev->dev;
int ret; int ret;
u32 port_id; u32 port_id;
...@@ -254,11 +256,15 @@ static int hisi_add_pcie_port(struct hisi_pcie *hisi_pcie, ...@@ -254,11 +256,15 @@ static int hisi_add_pcie_port(struct hisi_pcie *hisi_pcie,
return 0; return 0;
} }
static const struct dw_pcie_ops dw_pcie_ops = {
.link_up = hisi_pcie_link_up,
};
static int hisi_pcie_probe(struct platform_device *pdev) static int hisi_pcie_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct dw_pcie *pci;
struct hisi_pcie *hisi_pcie; struct hisi_pcie *hisi_pcie;
struct pcie_port *pp;
const struct of_device_id *match; const struct of_device_id *match;
struct resource *reg; struct resource *reg;
struct device_driver *driver; struct device_driver *driver;
...@@ -268,8 +274,13 @@ static int hisi_pcie_probe(struct platform_device *pdev) ...@@ -268,8 +274,13 @@ static int hisi_pcie_probe(struct platform_device *pdev)
if (!hisi_pcie) if (!hisi_pcie)
return -ENOMEM; return -ENOMEM;
pp = &hisi_pcie->pp; pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL);
pp->dev = dev; if (!pci)
return -ENOMEM;
pci->dev = dev;
pci->ops = &dw_pcie_ops;
driver = dev->driver; driver = dev->driver;
match = of_match_device(driver->of_match_table, dev); match = of_match_device(driver->of_match_table, dev);
...@@ -283,9 +294,9 @@ static int hisi_pcie_probe(struct platform_device *pdev) ...@@ -283,9 +294,9 @@ static int hisi_pcie_probe(struct platform_device *pdev)
} }
reg = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbi"); reg = platform_get_resource_byname(pdev, IORESOURCE_MEM, "rc_dbi");
pp->dbi_base = devm_ioremap_resource(dev, reg); pci->dbi_base = devm_ioremap_resource(dev, reg);
if (IS_ERR(pp->dbi_base)) if (IS_ERR(pci->dbi_base))
return PTR_ERR(pp->dbi_base); return PTR_ERR(pci->dbi_base);
platform_set_drvdata(pdev, hisi_pcie); platform_set_drvdata(pdev, hisi_pcie);
......
drivers/pci/dwc/pcie-qcom.c
View file @ 442ec4c0
...@@ -103,7 +103,7 @@ struct qcom_pcie_ops { ...@@ -103,7 +103,7 @@ struct qcom_pcie_ops {
}; };
struct qcom_pcie { struct qcom_pcie {
struct pcie_port pp; /* pp.dbi_base is DT dbi */ struct dw_pcie *pci;
void __iomem *parf; /* DT parf */ void __iomem *parf; /* DT parf */
void __iomem *elbi; /* DT elbi */ void __iomem *elbi; /* DT elbi */
union qcom_pcie_resources res; union qcom_pcie_resources res;
...@@ -112,7 +112,7 @@ struct qcom_pcie { ...@@ -112,7 +112,7 @@ struct qcom_pcie {
struct qcom_pcie_ops *ops; struct qcom_pcie_ops *ops;
}; };
#define to_qcom_pcie(x) container_of(x, struct qcom_pcie, pp) #define to_qcom_pcie(x) dev_get_drvdata((x)->dev)
static void qcom_ep_reset_assert(struct qcom_pcie *pcie) static void qcom_ep_reset_assert(struct qcom_pcie *pcie)
{ {
...@@ -155,21 +155,23 @@ static void qcom_pcie_v2_ltssm_enable(struct qcom_pcie *pcie) ...@@ -155,21 +155,23 @@ static void qcom_pcie_v2_ltssm_enable(struct qcom_pcie *pcie)
static int qcom_pcie_establish_link(struct qcom_pcie *pcie) static int qcom_pcie_establish_link(struct qcom_pcie *pcie)
{ {
struct dw_pcie *pci = pcie->pci;
if (dw_pcie_link_up(&pcie->pp)) if (dw_pcie_link_up(pci))
return 0; return 0;
/* Enable Link Training state machine */ /* Enable Link Training state machine */
if (pcie->ops->ltssm_enable) if (pcie->ops->ltssm_enable)
pcie->ops->ltssm_enable(pcie); pcie->ops->ltssm_enable(pcie);
return dw_pcie_wait_for_link(&pcie->pp); return dw_pcie_wait_for_link(pci);
} }
static int qcom_pcie_get_resources_v0(struct qcom_pcie *pcie) static int qcom_pcie_get_resources_v0(struct qcom_pcie *pcie)
{ {
struct qcom_pcie_resources_v0 *res = &pcie->res.v0; struct qcom_pcie_resources_v0 *res = &pcie->res.v0;
struct device *dev = pcie->pp.dev; struct dw_pcie *pci = pcie->pci;
struct device *dev = pci->dev;
res->vdda = devm_regulator_get(dev, "vdda"); res->vdda = devm_regulator_get(dev, "vdda");
if (IS_ERR(res->vdda)) if (IS_ERR(res->vdda))
...@@ -218,7 +220,8 @@ static int qcom_pcie_get_resources_v0(struct qcom_pcie *pcie) ...@@ -218,7 +220,8 @@ static int qcom_pcie_get_resources_v0(struct qcom_pcie *pcie)
static int qcom_pcie_get_resources_v1(struct qcom_pcie *pcie) static int qcom_pcie_get_resources_v1(struct qcom_pcie *pcie)
{ {
struct qcom_pcie_resources_v1 *res = &pcie->res.v1; struct qcom_pcie_resources_v1 *res = &pcie->res.v1;
struct device *dev = pcie->pp.dev; struct dw_pcie *pci = pcie->pci;
struct device *dev = pci->dev;
res->vdda = devm_regulator_get(dev, "vdda"); res->vdda = devm_regulator_get(dev, "vdda");
if (IS_ERR(res->vdda)) if (IS_ERR(res->vdda))
...@@ -264,7 +267,8 @@ static void qcom_pcie_deinit_v0(struct qcom_pcie *pcie) ...@@ -264,7 +267,8 @@ static void qcom_pcie_deinit_v0(struct qcom_pcie *pcie)
static int qcom_pcie_init_v0(struct qcom_pcie *pcie) static int qcom_pcie_init_v0(struct qcom_pcie *pcie)
{ {
struct qcom_pcie_resources_v0 *res = &pcie->res.v0; struct qcom_pcie_resources_v0 *res = &pcie->res.v0;
struct device *dev = pcie->pp.dev; struct dw_pcie *pci = pcie->pci;
struct device *dev = pci->dev;
u32 val; u32 val;
int ret; int ret;
...@@ -386,7 +390,8 @@ static void qcom_pcie_deinit_v1(struct qcom_pcie *pcie) ...@@ -386,7 +390,8 @@ static void qcom_pcie_deinit_v1(struct qcom_pcie *pcie)
static int qcom_pcie_init_v1(struct qcom_pcie *pcie) static int qcom_pcie_init_v1(struct qcom_pcie *pcie)
{ {
struct qcom_pcie_resources_v1 *res = &pcie->res.v1; struct qcom_pcie_resources_v1 *res = &pcie->res.v1;
struct device *dev = pcie->pp.dev; struct dw_pcie *pci = pcie->pci;
struct device *dev = pci->dev;
int ret; int ret;
ret = reset_control_deassert(res->core); ret = reset_control_deassert(res->core);
...@@ -453,7 +458,8 @@ static int qcom_pcie_init_v1(struct qcom_pcie *pcie) ...@@ -453,7 +458,8 @@ static int qcom_pcie_init_v1(struct qcom_pcie *pcie)
static int qcom_pcie_get_resources_v2(struct qcom_pcie *pcie) static int qcom_pcie_get_resources_v2(struct qcom_pcie *pcie)
{ {
struct qcom_pcie_resources_v2 *res = &pcie->res.v2; struct qcom_pcie_resources_v2 *res = &pcie->res.v2;
struct device *dev = pcie->pp.dev; struct dw_pcie *pci = pcie->pci;
struct device *dev = pci->dev;
res->aux_clk = devm_clk_get(dev, "aux"); res->aux_clk = devm_clk_get(dev, "aux");
if (IS_ERR(res->aux_clk)) if (IS_ERR(res->aux_clk))
...@@ -478,7 +484,8 @@ static int qcom_pcie_get_resources_v2(struct qcom_pcie *pcie) ...@@ -478,7 +484,8 @@ static int qcom_pcie_get_resources_v2(struct qcom_pcie *pcie)
static int qcom_pcie_init_v2(struct qcom_pcie *pcie) static int qcom_pcie_init_v2(struct qcom_pcie *pcie)
{ {
struct qcom_pcie_resources_v2 *res = &pcie->res.v2; struct qcom_pcie_resources_v2 *res = &pcie->res.v2;
struct device *dev = pcie->pp.dev; struct dw_pcie *pci = pcie->pci;
struct device *dev = pci->dev;
u32 val; u32 val;
int ret; int ret;
...@@ -542,7 +549,8 @@ static int qcom_pcie_init_v2(struct qcom_pcie *pcie) ...@@ -542,7 +549,8 @@ static int qcom_pcie_init_v2(struct qcom_pcie *pcie)
static int qcom_pcie_post_init_v2(struct qcom_pcie *pcie) static int qcom_pcie_post_init_v2(struct qcom_pcie *pcie)
{ {
struct qcom_pcie_resources_v2 *res = &pcie->res.v2; struct qcom_pcie_resources_v2 *res = &pcie->res.v2;
struct device *dev = pcie->pp.dev; struct dw_pcie *pci = pcie->pci;
struct device *dev = pci->dev;
int ret; int ret;
ret = clk_prepare_enable(res->pipe_clk); ret = clk_prepare_enable(res->pipe_clk);
...@@ -554,10 +562,9 @@ static int qcom_pcie_post_init_v2(struct qcom_pcie *pcie) ...@@ -554,10 +562,9 @@ static int qcom_pcie_post_init_v2(struct qcom_pcie *pcie)
return 0; return 0;
} }
static int qcom_pcie_link_up(struct pcie_port *pp) static int qcom_pcie_link_up(struct dw_pcie *pci)
{ {
struct qcom_pcie *pcie = to_qcom_pcie(pp); u16 val = readw(pci->dbi_base + PCIE20_CAP + PCI_EXP_LNKSTA);
u16 val = readw(pcie->pp.dbi_base + PCIE20_CAP + PCI_EXP_LNKSTA);
return !!(val & PCI_EXP_LNKSTA_DLLLA); return !!(val & PCI_EXP_LNKSTA_DLLLA);
} }
...@@ -575,7 +582,8 @@ static void qcom_pcie_deinit_v2(struct qcom_pcie *pcie) ...@@ -575,7 +582,8 @@ static void qcom_pcie_deinit_v2(struct qcom_pcie *pcie)
static void qcom_pcie_host_init(struct pcie_port *pp) static void qcom_pcie_host_init(struct pcie_port *pp)
{ {
struct qcom_pcie *pcie = to_qcom_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct qcom_pcie *pcie = to_qcom_pcie(pci);
int ret; int ret;
qcom_ep_reset_assert(pcie); qcom_ep_reset_assert(pcie);
...@@ -613,19 +621,20 @@ static void qcom_pcie_host_init(struct pcie_port *pp) ...@@ -613,19 +621,20 @@ static void qcom_pcie_host_init(struct pcie_port *pp)
static int qcom_pcie_rd_own_conf(struct pcie_port *pp, int where, int size, static int qcom_pcie_rd_own_conf(struct pcie_port *pp, int where, int size,
u32 *val) u32 *val)
{ {
struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
/* the device class is not reported correctly from the register */ /* the device class is not reported correctly from the register */
if (where == PCI_CLASS_REVISION && size == 4) { if (where == PCI_CLASS_REVISION && size == 4) {
*val = readl(pp->dbi_base + PCI_CLASS_REVISION); *val = readl(pci->dbi_base + PCI_CLASS_REVISION);
*val &= 0xff; /* keep revision id */ *val &= 0xff; /* keep revision id */
*val |= PCI_CLASS_BRIDGE_PCI << 16; *val |= PCI_CLASS_BRIDGE_PCI << 16;
return PCIBIOS_SUCCESSFUL; return PCIBIOS_SUCCESSFUL;
} }
return dw_pcie_read(pp->dbi_base + where, size, val); return dw_pcie_read(pci->dbi_base + where, size, val);
} }
static struct pcie_host_ops qcom_pcie_dw_ops = { static struct dw_pcie_host_ops qcom_pcie_dw_ops = {
.link_up = qcom_pcie_link_up,
.host_init = qcom_pcie_host_init, .host_init = qcom_pcie_host_init,
.rd_own_conf = qcom_pcie_rd_own_conf, .rd_own_conf = qcom_pcie_rd_own_conf,
}; };
...@@ -652,19 +661,31 @@ static const struct qcom_pcie_ops ops_v2 = { ...@@ -652,19 +661,31 @@ static const struct qcom_pcie_ops ops_v2 = {
.ltssm_enable = qcom_pcie_v2_ltssm_enable, .ltssm_enable = qcom_pcie_v2_ltssm_enable,
}; };
static const struct dw_pcie_ops dw_pcie_ops = {
.link_up = qcom_pcie_link_up,
};
static int qcom_pcie_probe(struct platform_device *pdev) static int qcom_pcie_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct resource *res; struct resource *res;
struct qcom_pcie *pcie;
struct pcie_port *pp; struct pcie_port *pp;
struct dw_pcie *pci;
struct qcom_pcie *pcie;
int ret; int ret;
pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL); pcie = devm_kzalloc(dev, sizeof(*pcie), GFP_KERNEL);
if (!pcie) if (!pcie)
return -ENOMEM; return -ENOMEM;
pp = &pcie->pp; pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL);
if (!pci)
return -ENOMEM;
pci->dev = dev;
pci->ops = &dw_pcie_ops;
pp = &pci->pp;
pcie->ops = (struct qcom_pcie_ops *)of_device_get_match_data(dev); pcie->ops = (struct qcom_pcie_ops *)of_device_get_match_data(dev);
pcie->reset = devm_gpiod_get_optional(dev, "perst", GPIOD_OUT_LOW); pcie->reset = devm_gpiod_get_optional(dev, "perst", GPIOD_OUT_LOW);
...@@ -677,9 +698,9 @@ static int qcom_pcie_probe(struct platform_device *pdev) ...@@ -677,9 +698,9 @@ static int qcom_pcie_probe(struct platform_device *pdev)
return PTR_ERR(pcie->parf); return PTR_ERR(pcie->parf);
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");
pp->dbi_base = devm_ioremap_resource(dev, res); pci->dbi_base = devm_ioremap_resource(dev, res);
if (IS_ERR(pp->dbi_base)) if (IS_ERR(pci->dbi_base))
return PTR_ERR(pp->dbi_base); return PTR_ERR(pci->dbi_base);
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "elbi"); res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "elbi");
pcie->elbi = devm_ioremap_resource(dev, res); pcie->elbi = devm_ioremap_resource(dev, res);
...@@ -690,7 +711,6 @@ static int qcom_pcie_probe(struct platform_device *pdev) ...@@ -690,7 +711,6 @@ static int qcom_pcie_probe(struct platform_device *pdev)
if (IS_ERR(pcie->phy)) if (IS_ERR(pcie->phy))
return PTR_ERR(pcie->phy); return PTR_ERR(pcie->phy);
pp->dev = dev;
ret = pcie->ops->get_resources(pcie); ret = pcie->ops->get_resources(pcie);
if (ret) if (ret)
return ret; return ret;
......
drivers/pci/dwc/pcie-spear13xx.c
View file @ 442ec4c0
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include "pcie-designware.h" #include "pcie-designware.h"
struct spear13xx_pcie { struct spear13xx_pcie {
struct pcie_port pp; /* DT dbi is pp.dbi_base */ struct dw_pcie *pci;
void __iomem *app_base; void __iomem *app_base;
struct phy *phy; struct phy *phy;
struct clk *clk; struct clk *clk;
...@@ -70,17 +70,18 @@ struct pcie_app_reg { ...@@ -70,17 +70,18 @@ struct pcie_app_reg {
#define EXP_CAP_ID_OFFSET 0x70 #define EXP_CAP_ID_OFFSET 0x70
#define to_spear13xx_pcie(x) container_of(x, struct spear13xx_pcie, pp) #define to_spear13xx_pcie(x) dev_get_drvdata((x)->dev)
static int spear13xx_pcie_establish_link(struct spear13xx_pcie *spear13xx_pcie) static int spear13xx_pcie_establish_link(struct spear13xx_pcie *spear13xx_pcie)
{ {
struct pcie_port *pp = &spear13xx_pcie->pp; struct dw_pcie *pci = spear13xx_pcie->pci;
struct pcie_port *pp = &pci->pp;
struct pcie_app_reg *app_reg = spear13xx_pcie->app_base; struct pcie_app_reg *app_reg = spear13xx_pcie->app_base;
u32 val; u32 val;
u32 exp_cap_off = EXP_CAP_ID_OFFSET; u32 exp_cap_off = EXP_CAP_ID_OFFSET;
if (dw_pcie_link_up(pp)) { if (dw_pcie_link_up(pci)) {
dev_err(pp->dev, "link already up\n"); dev_err(pci->dev, "link already up\n");
return 0; return 0;
} }
...@@ -91,33 +92,33 @@ static int spear13xx_pcie_establish_link(struct spear13xx_pcie *spear13xx_pcie) ...@@ -91,33 +92,33 @@ static int spear13xx_pcie_establish_link(struct spear13xx_pcie *spear13xx_pcie)
* default value in capability register is 512 bytes. So force * default value in capability register is 512 bytes. So force
* it to 128 here. * it to 128 here.
*/ */
dw_pcie_read(pp->dbi_base + exp_cap_off + PCI_EXP_DEVCTL, 2, &val); dw_pcie_read(pci->dbi_base + exp_cap_off + PCI_EXP_DEVCTL, 2, &val);
val &= ~PCI_EXP_DEVCTL_READRQ; val &= ~PCI_EXP_DEVCTL_READRQ;
dw_pcie_write(pp->dbi_base + exp_cap_off + PCI_EXP_DEVCTL, 2, val); dw_pcie_write(pci->dbi_base + exp_cap_off + PCI_EXP_DEVCTL, 2, val);
dw_pcie_write(pp->dbi_base + PCI_VENDOR_ID, 2, 0x104A); dw_pcie_write(pci->dbi_base + PCI_VENDOR_ID, 2, 0x104A);
dw_pcie_write(pp->dbi_base + PCI_DEVICE_ID, 2, 0xCD80); dw_pcie_write(pci->dbi_base + PCI_DEVICE_ID, 2, 0xCD80);
/* /*
* if is_gen1 is set then handle it, so that some buggy card * if is_gen1 is set then handle it, so that some buggy card
* also works * also works
*/ */
if (spear13xx_pcie->is_gen1) { if (spear13xx_pcie->is_gen1) {
dw_pcie_read(pp->dbi_base + exp_cap_off + PCI_EXP_LNKCAP, dw_pcie_read(pci->dbi_base + exp_cap_off + PCI_EXP_LNKCAP,
4, &val); 4, &val);
if ((val & PCI_EXP_LNKCAP_SLS) != PCI_EXP_LNKCAP_SLS_2_5GB) { if ((val & PCI_EXP_LNKCAP_SLS) != PCI_EXP_LNKCAP_SLS_2_5GB) {
val &= ~((u32)PCI_EXP_LNKCAP_SLS); val &= ~((u32)PCI_EXP_LNKCAP_SLS);
val |= PCI_EXP_LNKCAP_SLS_2_5GB; val |= PCI_EXP_LNKCAP_SLS_2_5GB;
dw_pcie_write(pp->dbi_base + exp_cap_off + dw_pcie_write(pci->dbi_base + exp_cap_off +
PCI_EXP_LNKCAP, 4, val); PCI_EXP_LNKCAP, 4, val);
} }
dw_pcie_read(pp->dbi_base + exp_cap_off + PCI_EXP_LNKCTL2, dw_pcie_read(pci->dbi_base + exp_cap_off + PCI_EXP_LNKCTL2,
2, &val); 2, &val);
if ((val & PCI_EXP_LNKCAP_SLS) != PCI_EXP_LNKCAP_SLS_2_5GB) { if ((val & PCI_EXP_LNKCAP_SLS) != PCI_EXP_LNKCAP_SLS_2_5GB) {
val &= ~((u32)PCI_EXP_LNKCAP_SLS); val &= ~((u32)PCI_EXP_LNKCAP_SLS);
val |= PCI_EXP_LNKCAP_SLS_2_5GB; val |= PCI_EXP_LNKCAP_SLS_2_5GB;
dw_pcie_write(pp->dbi_base + exp_cap_off + dw_pcie_write(pci->dbi_base + exp_cap_off +
PCI_EXP_LNKCTL2, 2, val); PCI_EXP_LNKCTL2, 2, val);
} }
} }
...@@ -128,14 +129,15 @@ static int spear13xx_pcie_establish_link(struct spear13xx_pcie *spear13xx_pcie) ...@@ -128,14 +129,15 @@ static int spear13xx_pcie_establish_link(struct spear13xx_pcie *spear13xx_pcie)
| ((u32)1 << REG_TRANSLATION_ENABLE), | ((u32)1 << REG_TRANSLATION_ENABLE),
&app_reg->app_ctrl_0); &app_reg->app_ctrl_0);
return dw_pcie_wait_for_link(pp); return dw_pcie_wait_for_link(pci);
} }
static irqreturn_t spear13xx_pcie_irq_handler(int irq, void *arg) static irqreturn_t spear13xx_pcie_irq_handler(int irq, void *arg)
{ {
struct spear13xx_pcie *spear13xx_pcie = arg; struct spear13xx_pcie *spear13xx_pcie = arg;
struct pcie_app_reg *app_reg = spear13xx_pcie->app_base; struct pcie_app_reg *app_reg = spear13xx_pcie->app_base;
struct pcie_port *pp = &spear13xx_pcie->pp; struct dw_pcie *pci = spear13xx_pcie->pci;
struct pcie_port *pp = &pci->pp;
unsigned int status; unsigned int status;
status = readl(&app_reg->int_sts); status = readl(&app_reg->int_sts);
...@@ -152,7 +154,8 @@ static irqreturn_t spear13xx_pcie_irq_handler(int irq, void *arg) ...@@ -152,7 +154,8 @@ static irqreturn_t spear13xx_pcie_irq_handler(int irq, void *arg)
static void spear13xx_pcie_enable_interrupts(struct spear13xx_pcie *spear13xx_pcie) static void spear13xx_pcie_enable_interrupts(struct spear13xx_pcie *spear13xx_pcie)
{ {
struct pcie_port *pp = &spear13xx_pcie->pp; struct dw_pcie *pci = spear13xx_pcie->pci;
struct pcie_port *pp = &pci->pp;
struct pcie_app_reg *app_reg = spear13xx_pcie->app_base; struct pcie_app_reg *app_reg = spear13xx_pcie->app_base;
/* Enable MSI interrupt */ /* Enable MSI interrupt */
...@@ -163,9 +166,9 @@ static void spear13xx_pcie_enable_interrupts(struct spear13xx_pcie *spear13xx_pc ...@@ -163,9 +166,9 @@ static void spear13xx_pcie_enable_interrupts(struct spear13xx_pcie *spear13xx_pc
} }
} }
static int spear13xx_pcie_link_up(struct pcie_port *pp) static int spear13xx_pcie_link_up(struct dw_pcie *pci)
{ {
struct spear13xx_pcie *spear13xx_pcie = to_spear13xx_pcie(pp); struct spear13xx_pcie *spear13xx_pcie = to_spear13xx_pcie(pci);
struct pcie_app_reg *app_reg = spear13xx_pcie->app_base; struct pcie_app_reg *app_reg = spear13xx_pcie->app_base;
if (readl(&app_reg->app_status_1) & XMLH_LINK_UP) if (readl(&app_reg->app_status_1) & XMLH_LINK_UP)
...@@ -176,22 +179,23 @@ static int spear13xx_pcie_link_up(struct pcie_port *pp) ...@@ -176,22 +179,23 @@ static int spear13xx_pcie_link_up(struct pcie_port *pp)
static void spear13xx_pcie_host_init(struct pcie_port *pp) static void spear13xx_pcie_host_init(struct pcie_port *pp)
{ {
struct spear13xx_pcie *spear13xx_pcie = to_spear13xx_pcie(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct spear13xx_pcie *spear13xx_pcie = to_spear13xx_pcie(pci);
spear13xx_pcie_establish_link(spear13xx_pcie); spear13xx_pcie_establish_link(spear13xx_pcie);
spear13xx_pcie_enable_interrupts(spear13xx_pcie); spear13xx_pcie_enable_interrupts(spear13xx_pcie);
} }
static struct pcie_host_ops spear13xx_pcie_host_ops = { static struct dw_pcie_host_ops spear13xx_pcie_host_ops = {
.link_up = spear13xx_pcie_link_up,
.host_init = spear13xx_pcie_host_init, .host_init = spear13xx_pcie_host_init,
}; };
static int spear13xx_add_pcie_port(struct spear13xx_pcie *spear13xx_pcie, static int spear13xx_add_pcie_port(struct spear13xx_pcie *spear13xx_pcie,
struct platform_device *pdev) struct platform_device *pdev)
{ {
struct pcie_port *pp = &spear13xx_pcie->pp; struct dw_pcie *pci = spear13xx_pcie->pci;
struct device *dev = pp->dev; struct pcie_port *pp = &pci->pp;
struct device *dev = &pdev->dev;
int ret; int ret;
pp->irq = platform_get_irq(pdev, 0); pp->irq = platform_get_irq(pdev, 0);
...@@ -219,11 +223,15 @@ static int spear13xx_add_pcie_port(struct spear13xx_pcie *spear13xx_pcie, ...@@ -219,11 +223,15 @@ static int spear13xx_add_pcie_port(struct spear13xx_pcie *spear13xx_pcie,
return 0; return 0;
} }
static const struct dw_pcie_ops dw_pcie_ops = {
.link_up = spear13xx_pcie_link_up,
};
static int spear13xx_pcie_probe(struct platform_device *pdev) static int spear13xx_pcie_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct dw_pcie *pci;
struct spear13xx_pcie *spear13xx_pcie; struct spear13xx_pcie *spear13xx_pcie;
struct pcie_port *pp;
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
struct resource *dbi_base; struct resource *dbi_base;
int ret; int ret;
...@@ -232,6 +240,13 @@ static int spear13xx_pcie_probe(struct platform_device *pdev) ...@@ -232,6 +240,13 @@ static int spear13xx_pcie_probe(struct platform_device *pdev)
if (!spear13xx_pcie) if (!spear13xx_pcie)
return -ENOMEM; return -ENOMEM;
pci = devm_kzalloc(dev, sizeof(*pci), GFP_KERNEL);
if (!pci)
return -ENOMEM;
pci->dev = dev;
pci->ops = &dw_pcie_ops;
spear13xx_pcie->phy = devm_phy_get(dev, "pcie-phy"); spear13xx_pcie->phy = devm_phy_get(dev, "pcie-phy");
if (IS_ERR(spear13xx_pcie->phy)) { if (IS_ERR(spear13xx_pcie->phy)) {
ret = PTR_ERR(spear13xx_pcie->phy); ret = PTR_ERR(spear13xx_pcie->phy);
...@@ -255,17 +270,14 @@ static int spear13xx_pcie_probe(struct platform_device *pdev) ...@@ -255,17 +270,14 @@ static int spear13xx_pcie_probe(struct platform_device *pdev)
return ret; return ret;
} }
pp = &spear13xx_pcie->pp;
pp->dev = dev;
dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi"); dbi_base = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dbi");
pp->dbi_base = devm_ioremap_resource(dev, dbi_base); pci->dbi_base = devm_ioremap_resource(dev, dbi_base);
if (IS_ERR(pp->dbi_base)) { if (IS_ERR(pci->dbi_base)) {
dev_err(dev, "couldn't remap dbi base %p\n", dbi_base); dev_err(dev, "couldn't remap dbi base %p\n", dbi_base);
ret = PTR_ERR(pp->dbi_base); ret = PTR_ERR(pci->dbi_base);
goto fail_clk; goto fail_clk;
} }
spear13xx_pcie->app_base = pp->dbi_base + 0x2000; spear13xx_pcie->app_base = pci->dbi_base + 0x2000;
if (of_property_read_bool(np, "st,pcie-is-gen1")) if (of_property_read_bool(np, "st,pcie-is-gen1"))
spear13xx_pcie->is_gen1 = true; spear13xx_pcie->is_gen1 = true;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7