-----Original Message-----
From: Murali Karicheri [mailto:[email protected]]
Sent: Tuesday, July 01, 2014 3:15 AM
To: [email protected]; [email protected];
[email protected]
Cc: Murali Karicheri; Santosh Shilimkar; Russell King; Grant Likely; Rob
Herring;
Mohit KUMAR DCG; Jingoo Han; Bjorn Helgaas; Pratyush ANAND; Richard
Zhu; Kishon Vijay Abraham I; Marek Vasut; Arnd Bergmann; Pawel Moll;
Mark Rutland; Ian Campbell; Kumar Gala; Randy Dunlap
Subject: [PATCH v3 1/5] PCI: designware: add rd[wr]_other_conf API
v3.65 version of the designware h/w, requires application space registers to
be configured to access the remote EP config space.
To support this, add rd[wr]_other_conf API in the pcie_host_opts
Signed-off-by: Murali Karicheri<[email protected]>
CC: Santosh Shilimkar<[email protected]>
CC: Russell King<[email protected]>
CC: Grant Likely<[email protected]>
CC: Rob Herring<[email protected]>
CC: Mohit Kumar<[email protected]>
CC: Jingoo Han<[email protected]>
CC: Bjorn Helgaas<[email protected]>
CC: Pratyush Anand<[email protected]>
CC: Richard Zhu<[email protected]>
CC: Kishon Vijay Abraham I<[email protected]>
CC: Marek Vasut<[email protected]>
CC: Arnd Bergmann<[email protected]>
CC: Pawel Moll<[email protected]>
CC: Mark Rutland<[email protected]>
CC: Ian Campbell<[email protected]>
CC: Kumar Gala<[email protected]>
CC: Randy Dunlap<[email protected]>
CC: Grant Likely<[email protected]>
---
drivers/pci/host/pcie-designware.c | 12 ++++++++++--
drivers/pci/host/pcie-designware.h | 4 ++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-
designware.c
index 1eaf4df..d8f3af7 100644
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@ -656,7 +656,11 @@ static int dw_pcie_rd_conf(struct pci_bus *bus, u32
devfn, int where,
}
if (bus->number != pp->root_bus_nr)
- ret = dw_pcie_rd_other_conf(pp, bus, devfn,
+ if (pp->ops->rd_other_conf)
+ ret = pp->ops->rd_other_conf(pp, bus, devfn,
+ where, size, val);
+ else
+ ret = dw_pcie_rd_other_conf(pp, bus, devfn,
where, size, val);
else
ret = dw_pcie_rd_own_conf(pp, where, size, val); @@ -
679,7 +683,11 @@ static int dw_pcie_wr_conf(struct pci_bus *bus, u32
devfn,
return PCIBIOS_DEVICE_NOT_FOUND;
if (bus->number != pp->root_bus_nr)
- ret = dw_pcie_wr_other_conf(pp, bus, devfn,
+ if (pp->ops->wr_other_conf)
+ ret = pp->ops->wr_other_conf(pp, bus, devfn,
+ where, size, val);
+ else
+ ret = dw_pcie_wr_other_conf(pp, bus, devfn,
where, size, val);
else
ret = dw_pcie_wr_own_conf(pp, where, size, val); diff --git
a/drivers/pci/host/pcie-designware.h b/drivers/pci/host/pcie-designware.h
index 77f592f..8121901 100644
--- a/drivers/pci/host/pcie-designware.h
+++ b/drivers/pci/host/pcie-designware.h
@@ -61,6 +61,10 @@ struct pcie_host_ops {
u32 val, void __iomem *dbi_base);
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);
int (*link_up)(struct pcie_port *pp);
void (*host_init)(struct pcie_port *pp); };
