Add support to use custom read and write accessors. Platforms that
doesn't support half word or byte access or any other constraint
while accessing registers can use this feature to populate custom
read and write accessors. These custom accessors are used for both
standard register access and configuration space register access.
This is in preparation for adding PCIe support in TI's J721E SoC which
uses Cadence PCIe core.
Signed-off-by: Kishon Vijay Abraham I <kishon@xxxxxx>
---
drivers/pci/controller/pcie-cadence-ep.c | 15 +++
drivers/pci/controller/pcie-cadence-host.c | 20 +++-
drivers/pci/controller/pcie-cadence.h | 105 +++++++++++++++++++--
3 files changed, 131 insertions(+), 9 deletions(-)
diff --git a/drivers/pci/controller/pcie-cadence-ep.c b/drivers/pci/controller/pcie-cadence-ep.c
index def7820cb824..64ab5c53afb1 100644
--- a/drivers/pci/controller/pcie-cadence-ep.c
+++ b/drivers/pci/controller/pcie-cadence-ep.c
@@ -6,6 +6,7 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/of.h>
+#include <linux/of_device.h>
#include <linux/pci-epc.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
@@ -434,6 +435,8 @@ static int cdns_pcie_ep_probe(struct platform_device *pdev)
{
struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
+ const struct cdns_pcie_ep_data *data;
+ const struct of_device_id *match;
struct cdns_pcie_ep *ep;
struct cdns_pcie *pcie;
struct pci_epc *epc;
@@ -441,6 +444,10 @@ static int cdns_pcie_ep_probe(struct platform_device *pdev)
int ret;
int phy_count;
+ match = of_match_device(of_match_ptr(cdns_pcie_ep_of_match), dev);
+ if (!match)
+ return -EINVAL;
+
ep = devm_kzalloc(dev, sizeof(*ep), GFP_KERNEL);
if (!ep)
return -ENOMEM;
@@ -448,6 +455,14 @@ static int cdns_pcie_ep_probe(struct platform_device *pdev)
pcie = &ep->pcie;
pcie->is_rc = false;
+ data = (struct cdns_pcie_ep_data *)match->data;
+ if (data) {
+ if (data->read)
+ pcie->read = data->read;
+ if (data->write)
+ pcie->write = data->write;
+ }
+
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "reg");
pcie->reg_base = devm_ioremap_resource(dev, res);
if (IS_ERR(pcie->reg_base)) {
diff --git a/drivers/pci/controller/pcie-cadence-host.c b/drivers/pci/controller/pcie-cadence-host.c
index 97e251090b4f..75cf3c312ed2 100644
--- a/drivers/pci/controller/pcie-cadence-host.c
+++ b/drivers/pci/controller/pcie-cadence-host.c
@@ -5,6 +5,7 @@
#include <linux/kernel.h>
#include <linux/of_address.h>
+#include <linux/of_device.h>
#include <linux/of_pci.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
@@ -235,8 +236,11 @@ static int cdns_pcie_host_init(struct device *dev,
static int cdns_pcie_host_probe(struct platform_device *pdev)
{
+ struct pci_ops *ops = &cdns_pcie_host_ops;
+ const struct cdns_pcie_host_data *data;
struct device *dev = &pdev->dev;
struct device_node *np = dev->of_node;
+ const struct of_device_id *match;
struct pci_host_bridge *bridge;
struct list_head resources;
struct cdns_pcie_rc *rc;
@@ -245,6 +249,10 @@ static int cdns_pcie_host_probe(struct platform_device *pdev)
int ret;
int phy_count;
+ match = of_match_device(of_match_ptr(cdns_pcie_host_of_match), dev);
+ if (!match)
+ return -EINVAL;
+
bridge = devm_pci_alloc_host_bridge(dev, sizeof(*rc));
if (!bridge)
return -ENOMEM;
@@ -255,6 +263,16 @@ static int cdns_pcie_host_probe(struct platform_device *pdev)
pcie = &rc->pcie;
pcie->is_rc = true;
+ data = (struct cdns_pcie_host_data *)match->data;
+ if (data) {
+ if (data->read)
+ pcie->read = data->read;
+ if (data->write)
+ pcie->write = data->write;
+ if (data->ops)
+ ops = data->ops;
+ }
+
rc->max_regions = 32;
of_property_read_u32(np, "cdns,max-outbound-regions", &rc->max_regions);
@@ -310,7 +328,7 @@ static int cdns_pcie_host_probe(struct platform_device *pdev)
list_splice_init(&resources, &bridge->windows);
bridge->dev.parent = dev;
bridge->busnr = pcie->bus;
- bridge->ops = &cdns_pcie_host_ops;
+ bridge->ops = ops;
bridge->map_irq = of_irq_parse_and_map_pci;
bridge->swizzle_irq = pci_common_swizzle;
diff --git a/drivers/pci/controller/pcie-cadence.h b/drivers/pci/controller/pcie-cadence.h
index ae6bf2a2b3d3..0134c1b1ad65 100644
--- a/drivers/pci/controller/pcie-cadence.h
+++ b/drivers/pci/controller/pcie-cadence.h
@@ -236,26 +236,65 @@ struct cdns_pcie {
int phy_count;
struct phy **phy;
struct device_link **link;
+ u32 (*read)(void __iomem *addr, int size);
+ void (*write)(void __iomem *addr, int size, u32 value);
+};
+
+struct cdns_pcie_host_data {
+ struct pci_ops *ops;
+ u32 (*read)(void __iomem *addr, int size);
+ void (*write)(void __iomem *addr, int size, u32 value);
+};
+
+struct cdns_pcie_ep_data {
+ u32 (*read)(void __iomem *addr, int size);
+ void (*write)(void __iomem *addr, int size, u32 value);
};
/* Register access */
static inline void cdns_pcie_writeb(struct cdns_pcie *pcie, u32 reg, u8 value)
{
+ void __iomem *addr = pcie->reg_base + reg;
+
+ if (pcie->write) {
+ pcie->write(addr, 0x1, value);
+ return;
+ }
+
writeb(value, pcie->reg_base + reg);
}
static inline void cdns_pcie_writew(struct cdns_pcie *pcie, u32 reg, u16 value)
{
+ void __iomem *addr = pcie->reg_base + reg;
+
+ if (pcie->write) {
+ pcie->write(addr, 0x2, value);
+ return;
+ }
+
writew(value, pcie->reg_base + reg);
}
static inline void cdns_pcie_writel(struct cdns_pcie *pcie, u32 reg, u32 value)
{
+ void __iomem *addr = pcie->reg_base + reg;
+
+ if (pcie->write) {
+ pcie->write(addr, 0x4, value);
+ return;
+ }
+
writel(value, pcie->reg_base + reg);
}
static inline u32 cdns_pcie_readl(struct cdns_pcie *pcie, u32 reg)
{
+ void __iomem *addr = pcie->reg_base + reg;
+
+ if (pcie->read)
+ return pcie->read(addr, 0x4);
+
return readl(pcie->reg_base + reg);
}
@@ -263,47 +302,97 @@ static inline u32 cdns_pcie_readl(struct cdns_pcie *pcie, u32 reg)
static inline void cdns_pcie_rp_writeb(struct cdns_pcie *pcie,
u32 reg, u8 value)
{
- writeb(value, pcie->reg_base + CDNS_PCIE_RP_BASE + reg);
+ void __iomem *addr = pcie->reg_base + CDNS_PCIE_RP_BASE + reg;
+
+ if (pcie->write) {
+ pcie->write(addr, 0x1, value);
+ return;
+ }
+
+ writeb(value, addr);
}
static inline void cdns_pcie_rp_writew(struct cdns_pcie *pcie,
u32 reg, u16 value)
{
- writew(value, pcie->reg_base + CDNS_PCIE_RP_BASE + reg);
+ void __iomem *addr = pcie->reg_base + CDNS_PCIE_RP_BASE + reg;
+
+ if (pcie->write) {
+ pcie->write(addr, 0x2, value);
+ return;
+ }
+
+ writew(value, addr);
}
/* Endpoint Function register access */
static inline void cdns_pcie_ep_fn_writeb(struct cdns_pcie *pcie, u8 fn,
u32 reg, u8 value)
{
- writeb(value, pcie->reg_base + CDNS_PCIE_EP_FUNC_BASE(fn) + reg);
+ void __iomem *addr = pcie->reg_base + CDNS_PCIE_EP_FUNC_BASE(fn) + reg;
+
+ if (pcie->write) {
+ pcie->write(addr, 0x1, value);
+ return;
+ }
+
+ writeb(value, addr);
}
static inline void cdns_pcie_ep_fn_writew(struct cdns_pcie *pcie, u8 fn,
u32 reg, u16 value)
{
- writew(value, pcie->reg_base + CDNS_PCIE_EP_FUNC_BASE(fn) + reg);
+ void __iomem *addr = pcie->reg_base + CDNS_PCIE_EP_FUNC_BASE(fn) + reg;
+
+ if (pcie->write) {
+ pcie->write(addr, 0x2, value);
+ return;
+ }
+
+ writew(value, addr);
}
static inline void cdns_pcie_ep_fn_writel(struct cdns_pcie *pcie, u8 fn,
u32 reg, u32 value)
{
- writel(value, pcie->reg_base + CDNS_PCIE_EP_FUNC_BASE(fn) + reg);
+ void __iomem *addr = pcie->reg_base + CDNS_PCIE_EP_FUNC_BASE(fn) + reg;
+
+ if (pcie->write) {
+ pcie->write(addr, 0x4, value);
+ return;
+ }
+
+ writel(value, addr);
}
static inline u8 cdns_pcie_ep_fn_readb(struct cdns_pcie *pcie, u8 fn, u32 reg)
{
- return readb(pcie->reg_base + CDNS_PCIE_EP_FUNC_BASE(fn) + reg);
+ void __iomem *addr = pcie->reg_base + CDNS_PCIE_EP_FUNC_BASE(fn) + reg;
+
+ if (pcie->read)
+ return pcie->read(addr, 0x1);
+
+ return readb(addr);
}
static inline u16 cdns_pcie_ep_fn_readw(struct cdns_pcie *pcie, u8 fn, u32 reg)
{
- return readw(pcie->reg_base + CDNS_PCIE_EP_FUNC_BASE(fn) + reg);
+ void __iomem *addr = pcie->reg_base + CDNS_PCIE_EP_FUNC_BASE(fn) + reg;
+
+ if (pcie->read)
+ return pcie->read(addr, 0x2);
+
+ return readw(addr);
}
static inline u32 cdns_pcie_ep_fn_readl(struct cdns_pcie *pcie, u8 fn, u32 reg)
{
- return readl(pcie->reg_base + CDNS_PCIE_EP_FUNC_BASE(fn) + reg);
+ void __iomem *addr = pcie->reg_base + CDNS_PCIE_EP_FUNC_BASE(fn) + reg;
+
+ if (pcie->read)
+ return pcie->read(addr, 0x4);
+
+ return readl(addr);
}
void cdns_pcie_set_outbound_region(struct cdns_pcie *pcie, u8 fn,
--
2.17.1
