nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

PCI: dwc: keystone: Use pci_ops for config space accessors

Browse source 
Now that DWC drivers can setup their own pci_ops for the root and child
buses, convert the TI Keystone driver to use the standard pci_ops for
config accesses.

Link: https://lore.kernel.org/r/20200821035420.380495-7-robh@kernel.org
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Murali Karicheri <m-karicheri2@ti.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Rob Herring 2020-08-20 21:53:46 -06:00 committed by Lorenzo Pieralisi
parent fffbb0ba8e
commit 10a797c6e5
1 changed files with 18 additions and 22 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

40
drivers/pci/controller/dwc/pci-keystone.c
View file

@ -430,10 +430,10 @@ static void ks_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie)
ks_pcie_app_writel(ks_pcie, CMD_STATUS, val); ks_pcie_app_writel(ks_pcie, CMD_STATUS, val);
} }
static int ks_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus, static void __iomem *ks_pcie_other_map_bus(struct pci_bus *bus,
unsigned int devfn, int where, int size, unsigned int devfn, int where)
u32 *val)
{ {
struct pcie_port *pp = bus->sysdata;
struct dw_pcie *pci = to_dw_pcie_from_pp(pp); struct dw_pcie *pci = to_dw_pcie_from_pp(pp);
struct keystone_pcie *ks_pcie = to_keystone_pcie(pci); struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);
u32 reg; u32 reg;
@ -444,25 +444,14 @@ static int ks_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus,
reg |= CFG_TYPE1; reg |= CFG_TYPE1;
ks_pcie_app_writel(ks_pcie, CFG_SETUP, reg); ks_pcie_app_writel(ks_pcie, CFG_SETUP, reg);
return dw_pcie_read(pp->va_cfg0_base + where, size, val); return pp->va_cfg0_base + where;
} }
static int ks_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus, static struct pci_ops ks_child_pcie_ops = {
unsigned int devfn, int where, int size, .map_bus = ks_pcie_other_map_bus,
u32 val) .read = pci_generic_config_read,
{ .write = pci_generic_config_write,
struct dw_pcie *pci = to_dw_pcie_from_pp(pp); };
struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);
u32 reg;
reg = CFG_BUS(bus->number) | CFG_DEVICE(PCI_SLOT(devfn)) |
CFG_FUNC(PCI_FUNC(devfn));
if (!pci_is_root_bus(bus->parent))
reg |= CFG_TYPE1;
ks_pcie_app_writel(ks_pcie, CFG_SETUP, reg);
return dw_pcie_write(pp->va_cfg0_base + where, size, val);
}
/** /**
* ks_pcie_v3_65_scan_bus() - keystone scan_bus post initialization * ks_pcie_v3_65_scan_bus() - keystone scan_bus post initialization
@ -490,6 +479,12 @@ static void ks_pcie_v3_65_scan_bus(struct pcie_port *pp)
dw_pcie_writel_dbi(pci, PCI_BASE_ADDRESS_0, ks_pcie->app.start); dw_pcie_writel_dbi(pci, PCI_BASE_ADDRESS_0, ks_pcie->app.start);
} }
static struct pci_ops ks_pcie_ops = {
.map_bus = dw_pcie_own_conf_map_bus,
.read = pci_generic_config_read,
.write = pci_generic_config_write,
};
/** /**
* ks_pcie_link_up() - Check if link up * ks_pcie_link_up() - Check if link up
*/ */
@ -807,6 +802,9 @@ static int __init ks_pcie_host_init(struct pcie_port *pp)
struct keystone_pcie *ks_pcie = to_keystone_pcie(pci); struct keystone_pcie *ks_pcie = to_keystone_pcie(pci);
int ret; int ret;
pp->bridge->ops = &ks_pcie_ops;
pp->bridge->child_ops = &ks_child_pcie_ops;
ret = ks_pcie_config_legacy_irq(ks_pcie); ret = ks_pcie_config_legacy_irq(ks_pcie);
if (ret) if (ret)
return ret; return ret;
@ -842,8 +840,6 @@ static int __init ks_pcie_host_init(struct pcie_port *pp)
} }
static const struct dw_pcie_host_ops ks_pcie_host_ops = { static const struct dw_pcie_host_ops ks_pcie_host_ops = {
.rd_other_conf = ks_pcie_rd_other_conf,
.wr_other_conf = ks_pcie_wr_other_conf,
.host_init = ks_pcie_host_init, .host_init = ks_pcie_host_init,
.msi_host_init = ks_pcie_msi_host_init, .msi_host_init = ks_pcie_msi_host_init,
.scan_bus = ks_pcie_v3_65_scan_bus, .scan_bus = ks_pcie_v3_65_scan_bus,