dwc MSI fixes, ARTPEC-6 EP mode support, ARTPEC-7 SoC support
Subsystems (4)
v3 cover dwc MSI fixes, ARTPEC-6 EP mode support, ARTPEC-7 SoC support
This is a series that adds:
- PCI endpoint mode support in the ARTPEC-6 driver.
- ARTPEC-7 SoC support in the ARTPEC-6 driver (the SoCs are very similar).
- Small fixes for MSI in designware-ep and designware-host, needed to get endpoint mode support working for ARTPEC-6.
- Cleanups in pci-dra7xx to better prepare for endpoint mode in other DWC based PCIe drivers.
New in V3:
Fixed all review comments, for detailed changes, see the changelog in each patch.
Niklas Cassel (17):
PCI: dwc: Use DMA-API for allocating MSI data
PCI: designware-ep: dw_pcie_ep_set_msi() should only set MMC bits
PCI: designware-ep: Read-only registers need DBI_RO_WR_EN to be
writable
PCI: designware-ep: Pre-allocate memory for MSI in dw_pcie_ep_init
PCI: designware-ep: Remove static keyword from dw_pcie_ep_reset_bar()
PCI: designware-ep: Add generic function for raising MSI irq
PCI: dwc: dra7xx: Refactor Kconfig and Makefile handling for host/ep
mode
PCI: dwc: dra7xx: Assign pp->ops in dra7xx_add_pcie_port() rather than
in probe
PCI: dwc: dra7xx: Add ifdefs for host/ep specific code
PCI: dwc: artpec6: Remove unused defines
PCI: dwc: artpec6: Use BIT and GENMASK macros
PCI: dwc: artpec6: Split artpec6_pcie_establish_link to smaller
functions
bindings: PCI: artpec: Add support for endpoint mode
PCI: dwc: artpec6: Add support for endpoint mode
PCI: dwc: Make cpu_addr_fixup take struct dw_pcie as argument
bindings: PCI: artpec: Add support for the ARTPEC-7 SoC
PCI: dwc: artpec6: Add support for the ARTPEC-7 SoC
.../devicetree/bindings/pci/axis,artpec6-pcie.txt | 5 +- drivers/pci/dwc/Kconfig | 68 ++-- drivers/pci/dwc/Makefile | 4 +- drivers/pci/dwc/pci-dra7xx.c | 214 ++++++----- drivers/pci/dwc/pcie-artpec6.c | 416 ++++++++++++++++++--- drivers/pci/dwc/pcie-designware-ep.c | 58 ++- drivers/pci/dwc/pcie-designware-host.c | 15 +- drivers/pci/dwc/pcie-designware.c | 2 +- drivers/pci/dwc/pcie-designware.h | 22 +- 9 files changed, 613 insertions(+), 191 deletions(-)
Signature · 1 line
2.14.2
PATCH v3 1/17 PCI: dwc: Use DMA-API for allocating MSI data
Since it is a PCIe endpoint device, rather than the CPU, that is supposed to write to this location, the proper way to get the address to this this location is really to use the DMA API, rather than virt_to_phys.
Using virt_to_phys might work on some systems, but by using the DMA API, we know that it will work on all systems.
This is essentially the same thing as allocating a buffer in a driver, to which the endpoint will write to. To do this, we use the DMA API.
---
V3:
* No change.
drivers/pci/dwc/pcie-designware-host.c | 15 ++++++++++++--- drivers/pci/dwc/pcie-designware.h | 3 ++- 2 files changed, 14 insertions(+), 4 deletions(-)
drivers/pci/dwc/pcie-designware-host.c +12 -3
@@ -83,10 +83,19 @@ irqreturn_t dw_handle_msi_irq(struct pcie_port *pp)void dw_pcie_msi_init (struct pcie_port *pp) { +struct dw_pcie *pci =to_dw_pcie_from_pp (pp); +struct device *dev = pci->dev; +struct page *page;u64 msi_target; - pp->msi_data =__get_free_pages (GFP_KERNEL ,0 ); - msi_target =virt_to_phys ((void *)pp->msi_data); + page =alloc_page (GFP_KERNEL |GFP_DMA32 ); + pp->msi_data =dma_map_page (dev, page,0 ,PAGE_SIZE ,DMA_FROM_DEVICE ); +if (dma_mapping_error (dev, pp->msi_data)) { +dev_err (dev,"failed to map MSI data\n" ); +__free_page (page); +return ; + } + msi_target = (u64 )pp->msi_data;/* program the msi_data */ dw_pcie_wr_own_conf(pp, PCIE_MSI_ADDR_LO, 4,
@@ -187,7 +196,7 @@ static void dw_msi_setup_msg(struct pcie_port *pp, unsigned int irq, u32 pos)if (pp->ops->get_msi_addr) msi_target = pp->ops->get_msi_addr (pp);else - msi_target =virt_to_phys ((void *)pp->msi_data); + msi_target = (u64 )pp->msi_data; msg.address_lo = (u32)(msi_target &0xffffffff ); msg.address_hi = (u32)(msi_target >>32 &0xffffffff );
drivers/pci/dwc/pcie-designware.h +2 -1
@@ -14,6 +14,7 @@#ifndef _PCIE_DESIGNWARE_H#define _PCIE_DESIGNWARE_H +#include <linux/dma-mapping.h> #include <linux/irq.h> #include <linux/msi.h> #include <linux/pci.h>
@@ -168,7 +169,7 @@ struct pcie_port {const struct dw_pcie_host_ops *ops;int msi_irq;struct irq_domain *irq_domain; -unsigned long msi_data; +dma_addr_t msi_data;DECLARE_BITMAP (msi_irq_in_use,MAX_MSI_IRQS ); };
Signature · 1 line
2.14.2
PATCH v3 2/17 PCI: designware-ep: dw_pcie_ep_set_msi() should only set MMC bits
In reply to Niklas CasselPreviously, dw_pcie_ep_set_msi() wrote all bits in the Message Control register, thus overwriting the PCI_MSI_FLAGS_64BIT bit.
By clearing the PCI_MSI_FLAGS_64BIT bit, we break MSI
on systems where the RC has set a 64 bit MSI address.
---
V3:
* No change.
drivers/pci/dwc/pcie-designware-ep.c | 4 +++- drivers/pci/dwc/pcie-designware.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/pci/dwc/pcie-designware-ep.c +3 -1
@@ -220,7 +220,9 @@ static int dw_pcie_ep_set_msi(struct pci_epc *epc, u8 encode_int)struct dw_pcie_ep *ep =epc_get_drvdata (epc);struct dw_pcie *pci =to_dw_pcie_from_ep (ep); - val = (encode_int <<MSI_CAP_MMC_SHIFT ); + val =dw_pcie_readw_dbi (pci,MSI_MESSAGE_CONTROL ); + val &= ~MSI_CAP_MMC_MASK ; + val |= (encode_int <<MSI_CAP_MMC_SHIFT ) &MSI_CAP_MMC_MASK ;dw_pcie_writew_dbi (pci,MSI_MESSAGE_CONTROL , val);return 0 ;
drivers/pci/dwc/pcie-designware.h +1 -0
@@ -101,6 +101,7 @@#define MSI_MESSAGE_CONTROL 0x52#define MSI_CAP_MMC_SHIFT 1 +#define MSI_CAP_MMC_MASK (7 << MSI_CAP_MMC_SHIFT)#define MSI_CAP_MME_SHIFT 4#define MSI_CAP_MME_MASK (7 << MSI_CAP_MME_SHIFT)#define MSI_MESSAGE_ADDR_L32 0x54
Signature · 1 line
2.14.2
PATCH v3 3/17 PCI: designware-ep: Read-only registers need DBI_RO_WR_EN to be writable
In reply to Niklas CasselCertain registers that pcie-designware-ep tries to write are read-only registers. However, these registers can become read/write if we first enable the DBI_RO_WR_EN bit.
---
V3:
* No change.
drivers/pci/dwc/pcie-designware-ep.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/pci/dwc/pcie-designware-ep.c +8 -0
@@ -35,8 +35,10 @@ static void dw_pcie_ep_reset_bar(struct dw_pcie *pci, enum pci_barno bar)u32 reg; reg =PCI_BASE_ADDRESS_0 + (4 * bar); +dw_pcie_dbi_ro_wr_en (pci);dw_pcie_writel_dbi2 (pci, reg,0x0 );dw_pcie_writel_dbi (pci, reg,0x0 ); +dw_pcie_dbi_ro_wr_dis (pci); } static int dw_pcie_ep_write_header(struct pci_epc *epc,
@@ -45,6 +47,7 @@ static int dw_pcie_ep_write_header(struct pci_epc *epc,struct dw_pcie_ep *ep =epc_get_drvdata (epc);struct dw_pcie *pci =to_dw_pcie_from_ep (ep); +dw_pcie_dbi_ro_wr_en (pci);dw_pcie_writew_dbi (pci,PCI_VENDOR_ID , hdr->vendorid);dw_pcie_writew_dbi (pci,PCI_DEVICE_ID , hdr->deviceid);dw_pcie_writeb_dbi (pci,PCI_REVISION_ID , hdr->revid);
@@ -58,6 +61,7 @@ static int dw_pcie_ep_write_header(struct pci_epc *epc,dw_pcie_writew_dbi (pci,PCI_SUBSYSTEM_ID , hdr->subsys_id);dw_pcie_writeb_dbi (pci,PCI_INTERRUPT_PIN , hdr->interrupt_pin); +dw_pcie_dbi_ro_wr_dis (pci);return 0 ; }
@@ -142,8 +146,10 @@ static int dw_pcie_ep_set_bar(struct pci_epc *epc, enum pci_barno bar,if (ret)return ret; +dw_pcie_dbi_ro_wr_en (pci);dw_pcie_writel_dbi2 (pci, reg, size -1 );dw_pcie_writel_dbi (pci, reg, flags); +dw_pcie_dbi_ro_wr_dis (pci);return 0 ; }
@@ -223,7 +229,9 @@ static int dw_pcie_ep_set_msi(struct pci_epc *epc, u8 encode_int) val =dw_pcie_readw_dbi (pci,MSI_MESSAGE_CONTROL ); val &= ~MSI_CAP_MMC_MASK ; val |= (encode_int <<MSI_CAP_MMC_SHIFT ) &MSI_CAP_MMC_MASK ; +dw_pcie_dbi_ro_wr_en (pci);dw_pcie_writew_dbi (pci,MSI_MESSAGE_CONTROL , val); +dw_pcie_dbi_ro_wr_dis (pci);return 0 ; }
Signature · 1 line
2.14.2
PATCH v3 4/17 PCI: designware-ep: Pre-allocate memory for MSI in dw_pcie_ep_init
In reply to Niklas CasselCertain SoCs need to map the MSI address in raise_irq. To map an address, you first need to call pci_epc_mem_alloc_addr, however, pci_epc_mem_alloc_addr calls ioremap (which can sleep).
Since raise_irq is only called from atomic context, we can't call pci_epc_mem_alloc_addr from raise_irq, instead we pre-allocate a page in dw_pcie_ep_init, so this page can later be used to map/unmap the MSI address in raise_irq.
---
V3:
* Use ep->page_size rather than PAGE_SIZE.
drivers/pci/dwc/pcie-designware-ep.c | 10 ++++++++++ drivers/pci/dwc/pcie-designware.h | 2 ++ 2 files changed, 12 insertions(+)
drivers/pci/dwc/pcie-designware-ep.c +10 -0
@@ -286,6 +286,9 @@ void dw_pcie_ep_exit(struct dw_pcie_ep *ep) {struct pci_epc *epc = ep->epc; +pci_epc_mem_free_addr (epc, ep->msi_mem_phys, ep->msi_mem, + ep->page_size); +pci_epc_mem_exit (epc); }
@@ -341,6 +344,13 @@ int dw_pcie_ep_init(struct dw_pcie_ep *ep)return ret; } + ep->msi_mem =pci_epc_mem_alloc_addr (epc, &ep->msi_mem_phys, + ep->page_size); +if (!ep->msi_mem) { +dev_err (dev,"Failed to reserve memory for MSI\n" ); +return -ENOMEM ; + } + ep->epc = epc;epc_set_drvdata (epc, ep);dw_pcie_setup (pci);
drivers/pci/dwc/pcie-designware.h +2 -0
@@ -198,6 +198,8 @@ struct dw_pcie_ep {unsigned long ob_window_map;u32 num_ib_windows;u32 num_ob_windows; +void __iomem *msi_mem; +phys_addr_t msi_mem_phys; };struct dw_pcie_ops {
Signature · 1 line
2.14.2
PATCH v3 5/17 PCI: designware-ep: Remove static keyword from dw_pcie_ep_reset_bar()
In reply to Niklas CasselThis way pci-dra7xx.c does not need its own copy of dw_pcie_ep_reset_bar().
---
V3:
* Added Kishon's ack.
drivers/pci/dwc/pci-dra7xx.c | 9 --------- drivers/pci/dwc/pcie-designware-ep.c | 2 +- drivers/pci/dwc/pcie-designware.h | 5 +++++ 3 files changed, 6 insertions(+), 10 deletions(-)
drivers/pci/dwc/pci-dra7xx.c +0 -9
@@ -336,15 +336,6 @@ static irqreturn_t dra7xx_pcie_irq_handler(int irq, void *arg)return IRQ_HANDLED ; } -static void dw_pcie_ep_reset_bar (struct dw_pcie *pci,enum pci_barno bar) -{ -u32 reg; - - reg =PCI_BASE_ADDRESS_0 + (4 * bar); -dw_pcie_writel_dbi2 (pci, reg,0x0 ); -dw_pcie_writel_dbi (pci, reg,0x0 ); -} -static void dra7xx_pcie_ep_init (struct dw_pcie_ep *ep) {struct dw_pcie *pci =to_dw_pcie_from_ep (ep);
drivers/pci/dwc/pcie-designware-ep.c +1 -1
@@ -30,7 +30,7 @@ void dw_pcie_ep_linkup(struct dw_pcie_ep *ep)pci_epc_linkup (epc); } -static void dw_pcie_ep_reset_bar (struct dw_pcie *pci,enum pci_barno bar) +void dw_pcie_ep_reset_bar (struct dw_pcie *pci,enum pci_barno bar) {u32 reg;
drivers/pci/dwc/pcie-designware.h +5 -0
@@ -338,6 +338,7 @@ static inline int dw_pcie_host_init(struct pcie_port *pp)void dw_pcie_ep_linkup (struct dw_pcie_ep *ep);int dw_pcie_ep_init (struct dw_pcie_ep *ep);void dw_pcie_ep_exit (struct dw_pcie_ep *ep); +void dw_pcie_ep_reset_bar (struct dw_pcie *pci,enum pci_barno bar);#else static inline void dw_pcie_ep_linkup (struct dw_pcie_ep *ep) {
@@ -351,5 +352,9 @@ static inline int dw_pcie_ep_init(struct dw_pcie_ep *ep)static inline void dw_pcie_ep_exit (struct dw_pcie_ep *ep) { } + +static inline void dw_pcie_ep_reset_bar (struct dw_pcie *pci,enum pci_barno bar) +{ +}#endif #endif /* _PCIE_DESIGNWARE_H */
Signature · 1 line
2.14.2
PATCH v3 6/17 PCI: designware-ep: Add generic function for raising MSI irq
In reply to Niklas CasselThis function can be used by all DWC based controllers to raise a MSI irq. However, certain controllers, like DRA7xx, has a special convenience register for raising MSI irqs that doesn't require you to explicitly map the MSI address.
---
V3:
* No change.
drivers/pci/dwc/pcie-designware-ep.c | 34 ++++++++++++++++++++++++++++++++++ drivers/pci/dwc/pcie-designware.h | 9 +++++++++ 2 files changed, 43 insertions(+)
drivers/pci/dwc/pcie-designware-ep.c +34 -0
@@ -282,6 +282,40 @@ static const struct pci_epc_ops epc_ops = { .stop = dw_pcie_ep_stop, }; +int dw_pcie_ep_raise_msi_irq (struct dw_pcie_ep *ep, +u8 interrupt_num) +{ +struct dw_pcie *pci =to_dw_pcie_from_ep (ep); +struct pci_epc *epc = ep->epc; +u16 msg_ctrl, msg_data; +u32 msg_addr_lower, msg_addr_upper; +u64 msg_addr; +bool has_upper; +int ret; + +/* Raise MSI per the PCI Local Bus Specification Revision 3.0, 6.8.1. */ + msg_ctrl =dw_pcie_readw_dbi (pci,MSI_MESSAGE_CONTROL ); + has_upper = !!(msg_ctrl &PCI_MSI_FLAGS_64BIT ); + msg_addr_lower =dw_pcie_readl_dbi (pci,MSI_MESSAGE_ADDR_L32 ); +if (has_upper) { + msg_addr_upper =dw_pcie_readl_dbi (pci,MSI_MESSAGE_ADDR_U32 ); + msg_data =dw_pcie_readw_dbi (pci,MSI_MESSAGE_DATA_64 ); + }else { + msg_addr_upper =0 ; + msg_data =dw_pcie_readw_dbi (pci,MSI_MESSAGE_DATA_32 ); + } + msg_addr = ((u64 ) msg_addr_upper) <<32 | msg_addr_lower; + ret =dw_pcie_ep_map_addr (epc, ep->msi_mem_phys, msg_addr,PAGE_SIZE ); +if (ret) +return ret; + +writel (msg_data | (interrupt_num -1 ), ep->msi_mem); + +dw_pcie_ep_unmap_addr (epc, ep->msi_mem_phys); + +return 0 ; +} +void dw_pcie_ep_exit (struct dw_pcie_ep *ep) {struct pci_epc *epc = ep->epc;
drivers/pci/dwc/pcie-designware.h +9 -0
@@ -106,6 +106,8 @@#define MSI_CAP_MME_MASK (7 << MSI_CAP_MME_SHIFT)#define MSI_MESSAGE_ADDR_L32 0x54#define MSI_MESSAGE_ADDR_U32 0x58 +#define MSI_MESSAGE_DATA_32 0x58 +#define MSI_MESSAGE_DATA_64 0x5C/* * Maximum number of MSI IRQs can be 256 per controller. But keep
@@ -338,6 +340,7 @@ static inline int dw_pcie_host_init(struct pcie_port *pp)void dw_pcie_ep_linkup (struct dw_pcie_ep *ep);int dw_pcie_ep_init (struct dw_pcie_ep *ep);void dw_pcie_ep_exit (struct dw_pcie_ep *ep); +int dw_pcie_ep_raise_msi_irq (struct dw_pcie_ep *ep,u8 interrupt_num);void dw_pcie_ep_reset_bar (struct dw_pcie *pci,enum pci_barno bar);#else static inline void dw_pcie_ep_linkup (struct dw_pcie_ep *ep)
@@ -353,6 +356,12 @@ static inline void dw_pcie_ep_exit(struct dw_pcie_ep *ep) { } +static inline int dw_pcie_ep_raise_msi_irq (struct dw_pcie_ep *ep, +u8 interrupt_num) +{ +return 0 ; +} +static inline void dw_pcie_ep_reset_bar (struct dw_pcie *pci,enum pci_barno bar) { }
Signature · 1 line
2.14.2
PATCH v3 7/17 PCI: dwc: dra7xx: Refactor Kconfig and Makefile handling for host/ep mode
In reply to Niklas CasselThe previous handling was a bit unorthodox and would have been a bit bloated once more DWC based controllers added support for ep mode.
---
V3:
* Added Kishon's ack.
drivers/pci/dwc/Kconfig | 45 ++++++++++++++++++++++----------------------- drivers/pci/dwc/Makefile | 4 +--- 2 files changed, 23 insertions(+), 26 deletions(-)
drivers/pci/dwc/Kconfig +22 -23
@@ -15,39 +15,38 @@ config PCIE_DW_EP select PCIE_DW config PCI_DRA7XX - bool "TI DRA7xx PCIe controller" - depends on SOC_DRA7XX || COMPILE_TEST - depends on (PCI && PCI_MSI_IRQ_DOMAIN) || PCI_ENDPOINT - depends on OF && HAS_IOMEM && TI_PIPE3 - help - Enables support for the PCIe controller in the DRA7xx SoC. There - are two instances of PCIe controller in DRA7xx. This controller can - work either as EP or RC. In order to enable host-specific features - PCI_DRA7XX_HOST must be selected and in order to enable device- - specific features PCI_DRA7XX_EP must be selected. This uses - the DesignWare core. - -if PCI_DRA7XX + bool config PCI_DRA7XX_HOST - bool "PCI DRA7xx Host Mode" - depends on PCI - depends on PCI_MSI_IRQ_DOMAIN + bool "TI DRA7xx PCIe controller Host Mode" + depends on SOC_DRA7XX || COMPILE_TEST + depends on PCI && PCI_MSI_IRQ_DOMAIN + depends on OF && HAS_IOMEM && TI_PIPE3 select PCIE_DW_HOST + select PCI_DRA7XX default y help - Enables support for the PCIe controller in the DRA7xx SoC to work in - host mode. + Enables support for the PCIe controller in the DRA7xx SoC to work in + host mode. There are two instances of PCIe controller in DRA7xx. + This controller can work either as EP or RC. In order to enable + host-specific features PCI_DRA7XX_HOST must be selected and in order + to enable device-specific features PCI_DRA7XX_EP must be selected. + This uses the DesignWare core. config PCI_DRA7XX_EP - bool "PCI DRA7xx Endpoint Mode" + bool "TI DRA7xx PCIe controller Endpoint Mode" + depends on SOC_DRA7XX || COMPILE_TEST depends on PCI_ENDPOINT + depends on OF && HAS_IOMEM && TI_PIPE3 select PCIE_DW_EP + select PCI_DRA7XX help - Enables support for the PCIe controller in the DRA7xx SoC to work in - endpoint mode. - -endif + Enables support for the PCIe controller in the DRA7xx SoC to work in + endpoint mode. There are two instances of PCIe controller in DRA7xx. + This controller can work either as EP or RC. In order to enable + host-specific features PCI_DRA7XX_HOST must be selected and in order + to enable device-specific features PCI_DRA7XX_EP must be selected. + This uses the DesignWare core. config PCIE_DW_PLAT bool "Platform bus based DesignWare PCIe Controller"
drivers/pci/dwc/Makefile +1 -3
@@ -2,9 +2,7 @@ obj-$(CONFIG_PCIE_DW) += pcie-designware.o obj-$(CONFIG_PCIE_DW_HOST) += pcie-designware-host.o obj-$(CONFIG_PCIE_DW_EP) += pcie-designware-ep.o obj-$(CONFIG_PCIE_DW_PLAT) += pcie-designware-plat.o -ifneq ($(filter y,$(CONFIG_PCI_DRA7XX_HOST) $(CONFIG_PCI_DRA7XX_EP)),) - obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o -endif +obj-$(CONFIG_PCI_DRA7XX) += pci-dra7xx.o obj-$(CONFIG_PCI_EXYNOS) += pci-exynos.o obj-$(CONFIG_PCI_IMX6) += pci-imx6.o obj-$(CONFIG_PCIE_SPEAR13XX) += pcie-spear13xx.o
Signature · 1 line
2.14.2
PATCH v3 8/17 PCI: dwc: dra7xx: Assign pp->ops in dra7xx_add_pcie_port() rather than in probe
In reply to Niklas CasselThis matches how other drivers like exynos, imx7, keystone, armada8k, artpec6, designware-plat, hisi, kirin and spear13xx does it.
This is probably a remainder since when dev and ops were assigned as members to pp. Since we now assign them as members to struct dw_pcie, the pp->ops assignment should definitely be in dra7xx_add_pcie_port().
This is also needed to be able to compile host/ep mode specific code independently.
---
V3:
* Added Kishon's ack.
drivers/pci/dwc/pci-dra7xx.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/pci/dwc/pci-dra7xx.c +2 -4
@@ -460,6 +460,8 @@ static int __init dra7xx_add_pcie_port(struct dra7xx_pcie *dra7xx,if (!pci->dbi_base)return -ENOMEM ; + pp->ops = &dra7xx_pcie_host_ops; + ret =dw_pcie_host_init (pp);if (ret) {dev_err (dev,"failed to initialize host\n" );
@@ -588,7 +590,6 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev)void __iomem *base;struct resource *res;struct dw_pcie *pci; -struct pcie_port *pp;struct dra7xx_pcie *dra7xx;struct device *dev = &pdev->dev;struct device_node *np = dev->of_node;
@@ -616,9 +617,6 @@ static int __init dra7xx_pcie_probe(struct platform_device *pdev) pci->dev = dev; pci->ops = &dw_pcie_ops; - pp = &pci->pp; - pp->ops = &dra7xx_pcie_host_ops; - irq =platform_get_irq (pdev,0 );if (irq <0 ) {dev_err (dev,"missing IRQ resource: %d\n" , irq);
Signature · 1 line
2.14.2
PATCH v3 9/17 PCI: dwc: dra7xx: Add ifdefs for host/ep specific code
In reply to Niklas CasselThis way you will not build and include unused code when only building for one mode.
Moved dra7xx_pcie_enable_wrapper_interrupts() and dra7xx_add_pcie_port() in order to keep all host specific code inside a single ifdef block.
Moved dra7xx_pcie_ep_unaligned_memaccess() in order to keep all ep specific code inside a single ifdef block.
---
V3:
* Fixed commit message.
* Moved functions in order to have just a single ifdef for host, and a single ifdef for ep.
* Removed ifdefs around match table and match table data.
* Removed ifdefs in probe, use dummy implementations instead.
drivers/pci/dwc/pci-dra7xx.c | 201 ++++++++++++++++++++++++------------------- 1 file changed, 111 insertions(+), 90 deletions(-)
drivers/pci/dwc/pci-dra7xx.c +111 -90
@@ -171,6 +171,15 @@ static int dra7xx_pcie_establish_link(struct dw_pcie *pci)return 0 ; } +static void dra7xx_pcie_enable_wrapper_interrupts (struct dra7xx_pcie *dra7xx) +{ +dra7xx_pcie_writel (dra7xx,PCIECTRL_DRA7XX_CONF_IRQSTATUS_MAIN , +INTERRUPTS ); +dra7xx_pcie_writel (dra7xx,PCIECTRL_DRA7XX_CONF_IRQENABLE_SET_MAIN , +INTERRUPTS ); +} + +#ifdef CONFIG_PCI_DRA7XX_HOST static void dra7xx_pcie_enable_msi_interrupts (struct dra7xx_pcie *dra7xx) { dra7xx_pcie_writel(dra7xx, PCIECTRL_DRA7XX_CONF_IRQSTATUS_MSI,
@@ -181,14 +190,6 @@ static void dra7xx_pcie_enable_msi_interrupts(struct dra7xx_pcie *dra7xx) MSI | LEG_EP_INTERRUPTS); } -static void dra7xx_pcie_enable_wrapper_interrupts (struct dra7xx_pcie *dra7xx) -{ -dra7xx_pcie_writel (dra7xx,PCIECTRL_DRA7XX_CONF_IRQSTATUS_MAIN , -INTERRUPTS ); -dra7xx_pcie_writel (dra7xx,PCIECTRL_DRA7XX_CONF_IRQENABLE_SET_MAIN , -INTERRUPTS ); -} -static void dra7xx_pcie_enable_interrupts (struct dra7xx_pcie *dra7xx) {dra7xx_pcie_enable_wrapper_interrupts (dra7xx);
@@ -277,6 +278,56 @@ static irqreturn_t dra7xx_pcie_msi_irq_handler(int irq, void *arg)return IRQ_HANDLED ; } +static int __init dra7xx_add_pcie_port (struct dra7xx_pcie *dra7xx, +struct platform_device *pdev) +{ +int ret; +struct dw_pcie *pci = dra7xx->pci; +struct pcie_port *pp = &pci->pp; +struct device *dev = pci->dev; +struct resource *res; + + pp->irq =platform_get_irq (pdev,1 ); +if (pp->irq <0 ) { +dev_err (dev,"missing IRQ resource\n" ); +return pp->irq; + } + + ret =devm_request_irq (dev, pp->irq, dra7xx_pcie_msi_irq_handler, +IRQF_SHARED |IRQF_NO_THREAD , +"dra7-pcie-msi" , dra7xx); +if (ret) { +dev_err (dev,"failed to request irq\n" ); +return ret; + } + + ret =dra7xx_pcie_init_irq_domain (pp); +if (ret <0 ) +return ret; + + res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"rc_dbics" ); + pci->dbi_base =devm_ioremap (dev, res->start,resource_size (res)); +if (!pci->dbi_base) +return -ENOMEM ; + + pp->ops = &dra7xx_pcie_host_ops; + + ret =dw_pcie_host_init (pp); +if (ret) { +dev_err (dev,"failed to initialize host\n" ); +return ret; + } + +return 0 ; +} +#else +static inline int __init dra7xx_add_pcie_port (struct dra7xx_pcie *dra7xx, +struct platform_device *pdev) +{ +return -ENODEV ; +} +#endif +static irqreturn_t dra7xx_pcie_irq_handler (int irq,void *arg) {struct dra7xx_pcie *dra7xx = arg;
@@ -336,6 +387,7 @@ static irqreturn_t dra7xx_pcie_irq_handler(int irq, void *arg)return IRQ_HANDLED ; } +#ifdef CONFIG_PCI_DRA7XX_EP static void dra7xx_pcie_ep_init (struct dw_pcie_ep *ep) {struct dw_pcie *pci =to_dw_pcie_from_ep (ep);
@@ -390,6 +442,48 @@ static struct dw_pcie_ep_ops pcie_ep_ops = { .raise_irq = dra7xx_pcie_raise_irq, }; +/* +* dra7xx_pcie_ep_unaligned_memaccess: workaround for AM572x/AM571x Errata i870 +* @dra7xx: the dra7xx device where the workaround should be applied +* +* Access to the PCIe slave port that are not 32-bit aligned will result +* in incorrect mapping to TLP Address and Byte enable fields. Therefore, +* byte and half-word accesses are not possible to byte offset 0x1, 0x2, or +* 0x3. +* +* To avoid this issue set PCIE_SS1_AXI2OCP_LEGACY_MODE_ENABLE to 1. +*/ +static int dra7xx_pcie_ep_unaligned_memaccess (struct device *dev) +{ +int ret; +struct device_node *np = dev->of_node; +struct of_phandle_args args; +struct regmap *regmap; + + regmap =syscon_regmap_lookup_by_phandle (np, +"ti,syscon-unaligned-access" ); +if (IS_ERR (regmap)) { +dev_dbg (dev,"can't get ti,syscon-unaligned-access\n" ); +return -EINVAL ; + } + + ret =of_parse_phandle_with_fixed_args (np,"ti,syscon-unaligned-access" , +2 ,0 , &args); +if (ret) { +dev_err (dev,"failed to parse ti,syscon-unaligned-access\n" ); +return ret; + } + + ret =regmap_update_bits (regmap, args.args[0 ], args.args[1 ], + args.args[1 ]); +if (ret) +dev_err (dev,"failed to enable unaligned access\n" ); + +of_node_put (args.np); + +return ret; +} +static int __init dra7xx_add_pcie_ep (struct dra7xx_pcie *dra7xx,struct platform_device *pdev) {
@@ -427,49 +521,18 @@ static int __init dra7xx_add_pcie_ep(struct dra7xx_pcie *dra7xx,return 0 ; } - -static int __init dra7xx_add_pcie_port (struct dra7xx_pcie *dra7xx, -struct platform_device *pdev) +#else +static inline int dra7xx_pcie_ep_unaligned_memaccess (struct device *dev) { -int ret; -struct dw_pcie *pci = dra7xx->pci; -struct pcie_port *pp = &pci->pp; -struct device *dev = pci->dev; -struct resource *res; - - pp->irq =platform_get_irq (pdev,1 ); -if (pp->irq <0 ) { -dev_err (dev,"missing IRQ resource\n" ); -return pp->irq; - } - - ret =devm_request_irq (dev, pp->irq, dra7xx_pcie_msi_irq_handler, -IRQF_SHARED |IRQF_NO_THREAD , -"dra7-pcie-msi" , dra7xx); -if (ret) { -dev_err (dev,"failed to request irq\n" ); -return ret; - } - - ret =dra7xx_pcie_init_irq_domain (pp); -if (ret <0 ) -return ret; - - res =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"rc_dbics" ); - pci->dbi_base =devm_ioremap (dev, res->start,resource_size (res)); -if (!pci->dbi_base) -return -ENOMEM ; - - pp->ops = &dra7xx_pcie_host_ops; - - ret =dw_pcie_host_init (pp); -if (ret) { -dev_err (dev,"failed to initialize host\n" ); -return ret; - } +return -ENODEV ; +} -return 0 ; +static inline int __init dra7xx_add_pcie_ep (struct dra7xx_pcie *dra7xx, +struct platform_device *pdev) +{ +return -ENODEV ; } +#endif static const struct dw_pcie_ops dw_pcie_ops = { .cpu_addr_fixup = dra7xx_pcie_cpu_addr_fixup,
@@ -537,48 +600,6 @@ static const struct of_device_id of_dra7xx_pcie_match[] = { {}, }; -/* -* dra7xx_pcie_ep_unaligned_memaccess: workaround for AM572x/AM571x Errata i870 -* @dra7xx: the dra7xx device where the workaround should be applied -* -* Access to the PCIe slave port that are not 32-bit aligned will result -* in incorrect mapping to TLP Address and Byte enable fields. Therefore, -* byte and half-word accesses are not possible to byte offset 0x1, 0x2, or -* 0x3. -* -* To avoid this issue set PCIE_SS1_AXI2OCP_LEGACY_MODE_ENABLE to 1. -*/ -static int dra7xx_pcie_ep_unaligned_memaccess (struct device *dev) -{ -int ret; -struct device_node *np = dev->of_node; -struct of_phandle_args args; -struct regmap *regmap; - - regmap =syscon_regmap_lookup_by_phandle (np, -"ti,syscon-unaligned-access" ); -if (IS_ERR (regmap)) { -dev_dbg (dev,"can't get ti,syscon-unaligned-access\n" ); -return -EINVAL ; - } - - ret =of_parse_phandle_with_fixed_args (np,"ti,syscon-unaligned-access" , -2 ,0 , &args); -if (ret) { -dev_err (dev,"failed to parse ti,syscon-unaligned-access\n" ); -return ret; - } - - ret =regmap_update_bits (regmap, args.args[0 ], args.args[1 ], - args.args[1 ]); -if (ret) -dev_err (dev,"failed to enable unaligned access\n" ); - -of_node_put (args.np); - -return ret; -} -static int __init dra7xx_pcie_probe (struct platform_device *pdev) {u32 reg;
Signature · 1 line
2.14.2
PATCH v3 10/17 PCI: dwc: artpec6: Remove unused defines
In reply to Niklas CasselCommit b015b37e6693 ("PCI: artpec6: Stop enabling writes to DBI read-only registers") removed the only write using these defines, but it did not remove the defines.
Remove the defines since they are now unused.
---
V3:
* No change.
drivers/pci/dwc/pcie-artpec6.c | 3 --- 1 file changed, 3 deletions(-)
drivers/pci/dwc/pcie-artpec6.c +0 -3
@@ -37,9 +37,6 @@ struct artpec6_pcie {#define PCIE_PHY_DEBUG_R0 (PL_OFFSET + 0x28)#define PCIE_PHY_DEBUG_R1 (PL_OFFSET + 0x2c) -#define MISC_CONTROL_1_OFF (PL_OFFSET + 0x1bc) -#define DBI_RO_WR_EN 1 -/* ARTPEC-6 specific registers */ #define PCIECFG 0x18#define PCIECFG_DBG_OEN (1 << 24)
Signature · 1 line
2.14.2
PATCH v3 11/17 PCI: dwc: artpec6: Use BIT and GENMASK macros
In reply to Niklas CasselThis greatly improves readability.
---
V3:
* No change.
drivers/pci/dwc/pcie-artpec6.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-)
drivers/pci/dwc/pcie-artpec6.c +17 -17
@@ -39,28 +39,28 @@ struct artpec6_pcie {/* ARTPEC-6 specific registers */ #define PCIECFG 0x18 -#define PCIECFG_DBG_OEN (1 << 24) -#define PCIECFG_CORE_RESET_REQ (1 << 21) -#define PCIECFG_LTSSM_ENABLE (1 << 20) -#define PCIECFG_CLKREQ_B (1 << 11) -#define PCIECFG_REFCLK_ENABLE (1 << 10) -#define PCIECFG_PLL_ENABLE (1 << 9) -#define PCIECFG_PCLK_ENABLE (1 << 8) -#define PCIECFG_RISRCREN (1 << 4) -#define PCIECFG_MODE_TX_DRV_EN (1 << 3) -#define PCIECFG_CISRREN (1 << 2) -#define PCIECFG_MACRO_ENABLE (1 << 0) +#define PCIECFG_DBG_OEN BIT(24) +#define PCIECFG_CORE_RESET_REQ BIT(21) +#define PCIECFG_LTSSM_ENABLE BIT(20) +#define PCIECFG_CLKREQ_B BIT(11) +#define PCIECFG_REFCLK_ENABLE BIT(10) +#define PCIECFG_PLL_ENABLE BIT(9) +#define PCIECFG_PCLK_ENABLE BIT(8) +#define PCIECFG_RISRCREN BIT(4) +#define PCIECFG_MODE_TX_DRV_EN BIT(3) +#define PCIECFG_CISRREN BIT(2) +#define PCIECFG_MACRO_ENABLE BIT(0)#define NOCCFG 0x40 -#define NOCCFG_ENABLE_CLK_PCIE (1 << 4) -#define NOCCFG_POWER_PCIE_IDLEACK (1 << 3) -#define NOCCFG_POWER_PCIE_IDLE (1 << 2) -#define NOCCFG_POWER_PCIE_IDLEREQ (1 << 1) +#define NOCCFG_ENABLE_CLK_PCIE BIT(4) +#define NOCCFG_POWER_PCIE_IDLEACK BIT(3) +#define NOCCFG_POWER_PCIE_IDLE BIT(2) +#define NOCCFG_POWER_PCIE_IDLEREQ BIT(1)#define PHY_STATUS 0x118 -#define PHY_COSPLLLOCK (1 << 0) +#define PHY_COSPLLLOCK BIT(0) -#define ARTPEC6_CPU_TO_BUS_ADDR 0x0fffffff +#define ARTPEC6_CPU_TO_BUS_ADDR GENMASK(27, 0)static u32 artpec6_pcie_readl (struct artpec6_pcie *artpec6_pcie,u32 offset) {
Signature · 1 line
2.14.2
PATCH v3 12/17 PCI: dwc: artpec6: Split artpec6_pcie_establish_link to smaller functions
In reply to Niklas CasselThis is done to better match other drivers such as dra7xx and imx6, but also to prepare for endpoint mode support.
---
V3:
* No change.
drivers/pci/dwc/pcie-artpec6.c | 53 +++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 24 deletions(-)
drivers/pci/dwc/pcie-artpec6.c +29 -24
@@ -80,18 +80,23 @@ static u64 artpec6_pcie_cpu_addr_fixup(u64 pci_addr)return pci_addr &ARTPEC6_CPU_TO_BUS_ADDR ; } -static int artpec6_pcie_establish_link (struct artpec6_pcie *artpec6_pcie) +static int artpec6_pcie_establish_link (struct dw_pcie *pci) { -struct dw_pcie *pci = artpec6_pcie->pci; -struct pcie_port *pp = &pci->pp; +struct artpec6_pcie *artpec6_pcie =to_artpec6_pcie (pci);u32 val; -unsigned int retries; -/* Hold DW core in reset */ val =artpec6_pcie_readl (artpec6_pcie,PCIECFG ); - val |=PCIECFG_CORE_RESET_REQ ; + val |=PCIECFG_LTSSM_ENABLE ;artpec6_pcie_writel (artpec6_pcie,PCIECFG , val); +return 0 ; +} + +static void artpec6_pcie_init_phy (struct artpec6_pcie *artpec6_pcie) +{ +u32 val; +unsigned int retries; + val =artpec6_pcie_readl (artpec6_pcie,PCIECFG ); val |=PCIECFG_RISRCREN |/* Receiver term. 50 Ohm */ PCIECFG_MODE_TX_DRV_EN |
@@ -131,30 +136,25 @@ static int artpec6_pcie_establish_link(struct artpec6_pcie *artpec6_pcie) val =readl (artpec6_pcie->phy_base +PHY_STATUS ); retries--; }while (retries && !(val &PHY_COSPLLLOCK )); +} + +static void artpec6_pcie_assert_core_reset (struct artpec6_pcie *artpec6_pcie) +{ +u32 val; -/* Take DW core out of reset */ val =artpec6_pcie_readl (artpec6_pcie,PCIECFG ); - val &= ~PCIECFG_CORE_RESET_REQ ; + val |=PCIECFG_CORE_RESET_REQ ;artpec6_pcie_writel (artpec6_pcie,PCIECFG , val); -usleep_range (100 ,200 ); +} -/* setup root complex */ -dw_pcie_setup_rc (pp); +static void artpec6_pcie_deassert_core_reset (struct artpec6_pcie *artpec6_pcie) +{ +u32 val; -/* assert LTSSM enable */ val =artpec6_pcie_readl (artpec6_pcie,PCIECFG ); - val |=PCIECFG_LTSSM_ENABLE ; + val &= ~PCIECFG_CORE_RESET_REQ ;artpec6_pcie_writel (artpec6_pcie,PCIECFG , val); - -/* check if the link is up or not */ -if (!dw_pcie_wait_for_link (pci)) -return 0 ; - -dev_dbg (pci->dev,"DEBUG_R0: 0x%08x, DEBUG_R1: 0x%08x\n" , -dw_pcie_readl_dbi (pci,PCIE_PHY_DEBUG_R0 ), -dw_pcie_readl_dbi (pci,PCIE_PHY_DEBUG_R1 )); - -return -ETIMEDOUT ; +usleep_range (100 ,200 ); }static void artpec6_pcie_enable_interrupts (struct artpec6_pcie *artpec6_pcie)
@@ -171,7 +171,12 @@ static int artpec6_pcie_host_init(struct pcie_port *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_assert_core_reset (artpec6_pcie); +artpec6_pcie_init_phy (artpec6_pcie); +artpec6_pcie_deassert_core_reset (artpec6_pcie); +dw_pcie_setup_rc (pp); +artpec6_pcie_establish_link (pci); +dw_pcie_wait_for_link (pci);artpec6_pcie_enable_interrupts (artpec6_pcie);return 0 ;
Signature · 1 line
2.14.2
PATCH v3 13/17 bindings: PCI: artpec: Add support for endpoint mode
In reply to Niklas Cassel---
V3:
* No change.
Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt +2 -1
@@ -4,7 +4,8 @@ This PCIe host controller is based on the Synopsys DesignWare PCIe IP and thus inherits all the common properties defined in designware-pcie.txt. Required properties: -- compatible: "axis,artpec6-pcie", "snps,dw-pcie" +- compatible: "axis,artpec6-pcie", "snps,dw-pcie" for ARTPEC-6 in RC mode; + "axis,artpec6-pcie-ep", "snps,dw-pcie" for ARTPEC-6 in EP mode; - reg: base addresses and lengths of the PCIe controller (DBI), the PHY controller, and configuration address space. - reg-names: Must include the following entries:
Signature · 1 line
2.14.2
PATCH v3 14/17 PCI: dwc: artpec6: Add support for endpoint mode
In reply to Niklas Cassel---
V3:
* Removed ifdefs around match table and match table data.
* Removed ifdefs in probe, use dummy implementations instead.
drivers/pci/dwc/Kconfig | 23 ++++-- drivers/pci/dwc/pcie-artpec6.c | 162 +++++++++++++++++++++++++++++++++++++++-- 2 files changed, 174 insertions(+), 11 deletions(-)
drivers/pci/dwc/Kconfig +18 -5
@@ -148,15 +148,28 @@ config PCIE_ARMADA_8K DesignWare core functions to implement the driver. config PCIE_ARTPEC6 - bool "Axis ARTPEC-6 PCIe controller" - depends on PCI + bool + +config PCIE_ARTPEC6_HOST + bool "Axis ARTPEC-6 PCIe controller Host Mode" depends on MACH_ARTPEC6 - depends on PCI_MSI_IRQ_DOMAIN + depends on PCI && PCI_MSI_IRQ_DOMAIN select PCIEPORTBUS select PCIE_DW_HOST + select PCIE_ARTPEC6 + help + Enables support for the PCIe controller in the ARTPEC-6 SoC to work in + host mode. This uses the DesignWare core. + +config PCIE_ARTPEC6_EP + bool "Axis ARTPEC-6 PCIe controller Endpoint Mode" + depends on MACH_ARTPEC6 + depends on PCI_ENDPOINT + select PCIE_DW_EP + select PCIE_ARTPEC6 help - Say Y here to enable PCIe controller support on Axis ARTPEC-6 - SoCs. This PCIe controller uses the DesignWare core. + Enables support for the PCIe controller in the ARTPEC-6 SoC to work in + endpoint mode. This uses the DesignWare core. config PCIE_KIRIN depends on OF && ARM64
drivers/pci/dwc/pcie-artpec6.c +156 -6
226 lines not on this page · raw message
Signature · 1 line
2.14.2
Re: [PATCH v3 14/17] PCI: dwc: artpec6: Add support for endpoint mode
Quoted 1 line · Niklas Cassel
Signed-off-by Niklas Cassel <[email protected]>
It seems like you are missing a changelog text. Please explain what your work is good for
in any patch you send.
Quoted 3 lines
V3:
* Removed ifdefs around match table and match table data.
* Removed ifdefs in probe, use dummy implementations instead.
I think there is room for more of the same ;-)
Quoted 6 lines
drivers/pci/dwc/pcie-artpec6.c +1
-0+#ifdef CONFIG_PCIE_ARTPEC6_HOST static void artpec6_pcie_enable_interrupts (struct artpec6_pcie *artpec6_pcie) {struct dw_pcie *pci = artpec6_pcie->pci;
drivers/pci/dwc/pcie-artpec6.c static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie, · line 266
Quoted 10 lines
drivers/pci/dwc/pcie-artpec6.c +7
-0@@ -231,11 +257,92 @@ static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie, return 0; } +#else +static inline int artpec6_add_pcie_port (struct artpec6_pcie *artpec6_pcie, +struct platform_device *pdev) +{ +return -ENODEV ; +} +#endif
Can you try replacing the #ifdef with
if (!IS_ENABLED(CONFIG_PCIE_ARTPEC6_HOST))
return -ENODEV;at the start of artpec6_pcie_enable_interrupts? I think that would improve readability here.
drivers/pci/dwc/pcie-artpec6.c static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie, · line 313
Quoted 8 lines
drivers/pci/dwc/pcie-artpec6.c +8
-0+static int artpec6_add_pcie_ep (struct artpec6_pcie *artpec6_pcie, +struct platform_device *pdev) +{ +int ret; +struct dw_pcie_ep *ep; +struct resource *res; +struct device *dev = &pdev->dev; +struct dw_pcie *pci = artpec6_pcie->pci;
The same trick should work here with the other symbol.
Arnd
Re: [PATCH v3 14/17] PCI: dwc: artpec6: Add support for endpoint mode
Quoted 6 lines · Arnd Bergmann
Quoted 1 line · Niklas Cassel
Signed-off-by Niklas Cassel <[email protected]>It seems like you are missing a changelog text. Please explain what your work is good for
in any patch you send.
You are correct, this patch is missing a changelog text. I will send a V4 of the patch series for this.
Quoted 28 lines
Quoted 4 lines
V3:
* Removed ifdefs around match table and match table data.
* Removed ifdefs in probe, use dummy implementations instead.I think there is room for more of the same ;-)
Quoted 6 lines
drivers/pci/dwc/pcie-artpec6.c +1
-0+#ifdef CONFIG_PCIE_ARTPEC6_HOST static void artpec6_pcie_enable_interrupts (struct artpec6_pcie *artpec6_pcie) {struct dw_pcie *pci = artpec6_pcie->pci;drivers/pci/dwc/pcie-artpec6.c static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie, · line 266
Quoted 10 lines
drivers/pci/dwc/pcie-artpec6.c +7
-0@@ -231,11 +257,92 @@ static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie, return 0; } +#else +static inline int artpec6_add_pcie_port (struct artpec6_pcie *artpec6_pcie, +struct platform_device *pdev) +{ +return -ENODEV ; +} +#endif Can you try replacing the #ifdef with
Quoted 6 lines
if (!IS_ENABLED(CONFIG_PCIE_ARTPEC6_HOST)) return -ENODEV;at the start of
artpec6_pcie_enable_interrupts? I think that would improve readability here.
artpec6_pcie_enable_interrupts is a void function, so I guess that you meant at the start of artpec6_add_pcie_port. That would not really help since artpec6_add_pcie_port calls artpec6_pcie_msi_handler, and uses artpec6_pcie_host_ops, which is still inside the CONFIG_PCIE_ARTPEC6_HOST ifdef block.
Please note that there are several functions, as well as artpec6_pcie_host_ops inside the CONFIG_PCIE_ARTPEC6_HOST ifdef block.
The reason for this is because Bjorn was surprised that this driver at V1 didn't have any ifdefs, even though it supports two different modes: HOST and EP. I suspected that his reasoning was that if you compile the driver with only one of the modes, it is wasteful to compile and include the functions that belong to the mode that we are not using in the vmlinux.
Quoted 10 lines
drivers/pci/dwc/pcie-artpec6.c static int artpec6_add_pcie_port(struct artpec6_pcie *artpec6_pcie, · line 313
Quoted 8 lines
drivers/pci/dwc/pcie-artpec6.c +8
-0+static int artpec6_add_pcie_ep (struct artpec6_pcie *artpec6_pcie, +struct platform_device *pdev) +{ +int ret; +struct dw_pcie_ep *ep; +struct resource *res; +struct device *dev = &pdev->dev; +struct dw_pcie *pci = artpec6_pcie->pci;The same trick should work here with the other symbol.
While artpec6_add_pcie_ep doesn't call any other function in this file, it does use pcie_ep_ops, which does reference other functions in this file (which are inside the ifdef block).
Regards,
Niklas
Re: [PATCH v3 14/17] PCI: dwc: artpec6: Add support for endpoint mode
Quoted 10 lines · Niklas Cassel
Quoted 8 lines · Arnd Bergmann
Can you try replacing the #ifdef with
if (!IS_ENABLED(CONFIG_PCIE_ARTPEC6_HOST)) return -ENODEV;
Quoted 6 lines
Quoted 3 lines
at the start of
artpec6_pcie_enable_interrupts? I think that would improve readability here.
artpec6_pcie_enable_interruptsis a void function, so I guess that you meant at the start ofartpec6_add_pcie_port.
Right, sorry about that.
Quoted 7 lines
That would not really help since
artpec6_add_pcie_portcallsartpec6_pcie_msi_handler, and usesartpec6_pcie_host_ops, which is still inside theCONFIG_PCIE_ARTPEC6_HOSTifdef block.Please note that there are several functions, as well as
artpec6_pcie_host_opsinside theCONFIG_PCIE_ARTPEC6_HOSTifdef block.
What I meant is that you can remove the #ifdef entirely if you add
if (!IS_ENABLED(CONFIG_PCIE_ARTPEC6_HOST))
return -ENODEV;to artpec6_pcie_probe(). Anything after that statement will get silently dropped by the compiler, including static functions and structures that are referenced indirectly from there.
Arnd
Re: [PATCH v3 14/17] PCI: dwc: artpec6: Add support for endpoint mode
Quoted 11 lines · Arnd Bergmann
Quoted 1 line · Niklas Cassel
On 11/02/2017 10:13 AM, Arnd Bergmann wrote:
What I meant is that you can remove the #ifdef entirely if you add
if (!IS_ENABLED(CONFIG_PCIE_ARTPEC6_HOST)) return -ENODEV;to
artpec6_pcie_probe(). Anything after that statement will get silently dropped by the compiler, including static functions and structures that are referenced indirectly from there.
Wow, this actually helps gcc with dead code elimination. It was even possible to add those !IS_ENABLED the two different case labels in the switch statement.
I get no unwanted symbols when looking at the vmlinux in gdb.
Great suggestion Arnd :)
Regards,
Niklas
PATCH v3 15/17 PCI: dwc: Make cpu_addr_fixup take struct dw_pcie as argument
In reply to Niklas CasselThere is no need to hard code the cpu to bus address fixup mask. The PCIe controller has a global address on the AXI bus, however, from the perspective of the PCIe controller, its base starts at 0x0, so the local address is 0x0. To get the bus address, simply subtract the global address from the cpu address. The global address is taken from device tree.
Also for ARTPEC-7, hard coding the cpu to bus address fixup mask is not possible, since it uses a High Address Bits Look Up Table, which means that it can, at runtime, map the PCIe window to an arbitrary address in the 32-bit address space.
This also fixes a bug for ARTPEC-6, where the cpu to bus address fixup mask previously was off by one (GENMASK(27, 0), rather than GENMASK(28, 0)), which is another reason why the it is a good idea to calculate the mask by using values from device tree.
---
V3:
* No change.
drivers/pci/dwc/pci-dra7xx.c | 2 +- drivers/pci/dwc/pcie-artpec6.c | 18 ++++++++++++++---- drivers/pci/dwc/pcie-designware.c | 2 +- drivers/pci/dwc/pcie-designware.h | 2 +- 4 files changed, 17 insertions(+), 7 deletions(-)
drivers/pci/dwc/pci-dra7xx.c +1 -1
@@ -109,7 +109,7 @@ static inline void dra7xx_pcie_writel(struct dra7xx_pcie *pcie, u32 offset,writel (value, pcie->base + offset); } -static u64 dra7xx_pcie_cpu_addr_fixup (u64 pci_addr) +static u64 dra7xx_pcie_cpu_addr_fixup (struct dw_pcie *pci,u64 pci_addr) {return pci_addr &DRA7XX_CPU_TO_BUS_ADDR ; }
drivers/pci/dwc/pcie-artpec6.c +14 -4
@@ -69,8 +69,6 @@ static const struct of_device_id artpec6_pcie_of_match[];#define PHY_STATUS 0x118#define PHY_COSPLLLOCK BIT(0) -#define ARTPEC6_CPU_TO_BUS_ADDR GENMASK(27, 0) -static u32 artpec6_pcie_readl (struct artpec6_pcie *artpec6_pcie,u32 offset) {u32 val;
@@ -84,9 +82,21 @@ static void artpec6_pcie_writel(struct artpec6_pcie *artpec6_pcie, u32 offset, uregmap_write (artpec6_pcie->regmap, offset, val); } -static u64 artpec6_pcie_cpu_addr_fixup (u64 pci_addr) +static u64 artpec6_pcie_cpu_addr_fixup (struct dw_pcie *pci,u64 pci_addr) { -return pci_addr &ARTPEC6_CPU_TO_BUS_ADDR ; +struct artpec6_pcie *artpec6_pcie =to_artpec6_pcie (pci); +struct pcie_port *pp = &pci->pp; +struct dw_pcie_ep *ep = &pci->ep; + +switch (artpec6_pcie->mode) { +case DW_PCIE_RC_TYPE : +return pci_addr - pp->cfg0_base; +case DW_PCIE_EP_TYPE : +return pci_addr - ep->phys_base; +default : +dev_err (pci->dev,"UNKNOWN device type\n" ); + } +return pci_addr; }static int artpec6_pcie_establish_link (struct dw_pcie *pci)
drivers/pci/dwc/pcie-designware.c +1 -1
@@ -149,7 +149,7 @@ void dw_pcie_prog_outbound_atu(struct dw_pcie *pci, int index, int type,u32 retries, val;if (pci->ops->cpu_addr_fixup) - cpu_addr = pci->ops->cpu_addr_fixup (cpu_addr); + cpu_addr = pci->ops->cpu_addr_fixup (pci, cpu_addr);if (pci->iatu_unroll_enabled) { dw_pcie_prog_outbound_atu_unroll(pci, index, type, cpu_addr,
drivers/pci/dwc/pcie-designware.h +1 -1
@@ -205,7 +205,7 @@ struct dw_pcie_ep { };struct dw_pcie_ops { -u64 (*cpu_addr_fixup)(u64 cpu_addr); +u64 (*cpu_addr_fixup)(struct dw_pcie *pcie,u64 cpu_addr);u32 (*read_dbi)(struct dw_pcie *pcie,void __iomem *base,u32 reg,size_t size); void (*write_dbi)(struct dw_pcie *pcie, void __iomem *base, u32 reg,
Signature · 1 line
2.14.2
PATCH v3 16/17 bindings: PCI: artpec: Add support for the ARTPEC-7 SoC
In reply to Niklas CasselThe ARTPEC-6 SoC and the ARTPEC-7 SoC are very similar. Unfortunately, some fields in the PCIECFG and PCIESTAT register have changed.
---
V3:
* No change.
Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt +2 -0
@@ -6,6 +6,8 @@ and thus inherits all the common properties defined in designware-pcie.txt. Required properties: - compatible: "axis,artpec6-pcie", "snps,dw-pcie" for ARTPEC-6 in RC mode; "axis,artpec6-pcie-ep", "snps,dw-pcie" for ARTPEC-6 in EP mode; + "axis,artpec7-pcie", "snps,dw-pcie" for ARTPEC-7 in RC mode; + "axis,artpec7-pcie-ep", "snps,dw-pcie" for ARTPEC-7 in EP mode; - reg: base addresses and lengths of the PCIe controller (DBI), the PHY controller, and configuration address space. - reg-names: Must include the following entries:
Signature · 1 line
2.14.2
PATCH v3 17/17 PCI: dwc: artpec6: Add support for the ARTPEC-7 SoC
In reply to Niklas CasselThe ARTPEC-6 SoC and the ARTPEC-7 SoC are very similar. Unfortunately, some fields in the PCIECFG and PCIESTAT register have changed.
---
V3:
* Now when there are no ifdefs around the match table entries, sort them by SoC.
drivers/pci/dwc/pcie-artpec6.c | 162 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 159 insertions(+), 3 deletions(-)
drivers/pci/dwc/pcie-artpec6.c +159 -3
@@ -27,14 +27,21 @@#define to_artpec6_pcie (x) dev_get_drvdata((x)->dev) +enum artpec_pcie_variants { +ARTPEC6 , +ARTPEC7 , +}; +struct artpec6_pcie {struct dw_pcie *pci;struct regmap *regmap;/* DT axis,syscon-pcie */ void __iomem *phy_base;/* DT phy */ +enum artpec_pcie_variants variant;enum dw_pcie_device_mode mode; };struct artpec_pcie_of_data { +enum artpec_pcie_variants variant;enum dw_pcie_device_mode mode; };
@@ -45,6 +52,13 @@ static const struct of_device_id artpec6_pcie_of_match[];#define PCIE_PHY_DEBUG_R0 (PL_OFFSET + 0x28)#define PCIE_PHY_DEBUG_R1 (PL_OFFSET + 0x2c) +#define ACK_F_ASPM_CTRL_OFF (PL_OFFSET + 0xc) +#define ACK_N_FTS_MASK GENMASK(15, 8) +#define ACK_N_FTS (x) (((x) << 8) & ACK_N_FTS_MASK) + +#define FAST_TRAINING_SEQ_MASK GENMASK(7, 0) +#define FAST_TRAINING_SEQ (x) (((x) << 0) & FAST_TRAINING_SEQ_MASK) +/* ARTPEC-6 specific registers */ #define PCIECFG 0x18#define PCIECFG_DBG_OEN BIT(24)
@@ -59,6 +73,13 @@ static const struct of_device_id artpec6_pcie_of_match[];#define PCIECFG_MODE_TX_DRV_EN BIT(3)#define PCIECFG_CISRREN BIT(2)#define PCIECFG_MACRO_ENABLE BIT(0) +/* ARTPEC-7 specific fields */ +#define PCIECFG_REFCLKSEL BIT(23) +#define PCIECFG_NOC_RESET BIT(3) + +#define PCIESTAT 0x1c +/* ARTPEC-7 specific fields */ +#define PCIESTAT_EXTREFCLK BIT(3)#define NOCCFG 0x40#define NOCCFG_ENABLE_CLK_PCIE BIT(4)
@@ -69,6 +90,12 @@ static const struct of_device_id artpec6_pcie_of_match[];#define PHY_STATUS 0x118#define PHY_COSPLLLOCK BIT(0) +#define PHY_TX_ASIC_OUT 0x1014 +#define PHY_TX_ASIC_OUT_TX_ACK BIT(0) + +#define PHY_RX_ASIC_OUT 0x101b +#define PHY_RX_ASIC_OUT_ACK BIT(0) +static u32 artpec6_pcie_readl (struct artpec6_pcie *artpec6_pcie,u32 offset) {u32 val;
@@ -127,7 +154,7 @@ static const struct dw_pcie_ops dw_pcie_ops = { .stop_link = artpec6_pcie_stop_link, }; -static void artpec6_pcie_init_phy (struct artpec6_pcie *artpec6_pcie) +static void artpec6_pcie_init_phy_a6 (struct artpec6_pcie *artpec6_pcie) {u32 val;unsigned int retries;
@@ -173,12 +200,109 @@ static void artpec6_pcie_init_phy(struct artpec6_pcie *artpec6_pcie) }while (retries && !(val &PHY_COSPLLLOCK )); } +static void artpec6_pcie_init_phy_a7 (struct artpec6_pcie *artpec6_pcie) +{ +struct dw_pcie *pci = artpec6_pcie->pci; +u32 val; +u16 phy_status_tx, phy_status_rx; +unsigned int retries; +bool extrefclk; + +/* Check if external reference clock is connected */ + val =artpec6_pcie_readl (artpec6_pcie,PCIESTAT ); + extrefclk = !!(val &PCIESTAT_EXTREFCLK ); +dev_dbg (pci->dev,"Using reference clock: %s\n" , + extrefclk ?"external" :"internal" ); + + val =artpec6_pcie_readl (artpec6_pcie,PCIECFG ); + val |=PCIECFG_RISRCREN |/* Receiver term. 50 Ohm */ +PCIECFG_PCLK_ENABLE ; +if (extrefclk) + val |=PCIECFG_REFCLKSEL ; +else + val &= ~PCIECFG_REFCLKSEL ; +artpec6_pcie_writel (artpec6_pcie,PCIECFG , val); +usleep_range (10 ,20 ); + + val =artpec6_pcie_readl (artpec6_pcie,NOCCFG ); + val |=NOCCFG_ENABLE_CLK_PCIE ; +artpec6_pcie_writel (artpec6_pcie,NOCCFG , val); +usleep_range (20 ,30 ); + + val =artpec6_pcie_readl (artpec6_pcie,NOCCFG ); + val &= ~NOCCFG_POWER_PCIE_IDLEREQ ; +artpec6_pcie_writel (artpec6_pcie,NOCCFG , val); + + retries =50 ; +do { +usleep_range (1000 ,2000 ); + val =artpec6_pcie_readl (artpec6_pcie,NOCCFG ); + retries--; + }while (retries && + (val & (NOCCFG_POWER_PCIE_IDLEACK |NOCCFG_POWER_PCIE_IDLE ))); + + retries =50 ; +do { +usleep_range (1000 ,2000 ); + phy_status_tx =readw (artpec6_pcie->phy_base +PHY_TX_ASIC_OUT ); + phy_status_rx =readw (artpec6_pcie->phy_base +PHY_RX_ASIC_OUT ); + retries--; + }while (retries && ((phy_status_tx &PHY_TX_ASIC_OUT_TX_ACK ) || + (phy_status_rx &PHY_RX_ASIC_OUT_ACK ))); +} + +static void artpec6_pcie_init_phy (struct artpec6_pcie *artpec6_pcie) +{ +switch (artpec6_pcie->variant) { +case ARTPEC6 : +artpec6_pcie_init_phy_a6 (artpec6_pcie); +break ; +case ARTPEC7 : +artpec6_pcie_init_phy_a7 (artpec6_pcie); +break ; + } +} + +static void artpec6_pcie_set_nfts (struct artpec6_pcie *artpec6_pcie) +{ +struct dw_pcie *pci = artpec6_pcie->pci; +u32 val; + +if (artpec6_pcie->variant !=ARTPEC7 ) +return ; + +/* +* Increase the N_FTS (Number of Fast Training Sequences) +* to be transmitted when transitioning from L0s to L0. +*/ + val =dw_pcie_readl_dbi (pci,ACK_F_ASPM_CTRL_OFF ); + val &= ~ACK_N_FTS_MASK ; + val |=ACK_N_FTS (180 ); +dw_pcie_writel_dbi (pci,ACK_F_ASPM_CTRL_OFF , val); + +/* +* Set the Number of Fast Training Sequences that the core +* advertises as its N_FTS during Gen2 or Gen3 link training. +*/ + val =dw_pcie_readl_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL ); + val &= ~FAST_TRAINING_SEQ_MASK ; + val |=FAST_TRAINING_SEQ (180 ); +dw_pcie_writel_dbi (pci,PCIE_LINK_WIDTH_SPEED_CONTROL , val); +} +static void artpec6_pcie_assert_core_reset (struct artpec6_pcie *artpec6_pcie) {u32 val; val =artpec6_pcie_readl (artpec6_pcie,PCIECFG ); - val |=PCIECFG_CORE_RESET_REQ ; +switch (artpec6_pcie->variant) { +case ARTPEC6 : + val |=PCIECFG_CORE_RESET_REQ ; +break ; +case ARTPEC7 : + val &= ~PCIECFG_NOC_RESET ; +break ; + }artpec6_pcie_writel (artpec6_pcie,PCIECFG , val); }
@@ -187,7 +311,14 @@ static void artpec6_pcie_deassert_core_reset(struct artpec6_pcie *artpec6_pcie)u32 val; val =artpec6_pcie_readl (artpec6_pcie,PCIECFG ); - val &= ~PCIECFG_CORE_RESET_REQ ; +switch (artpec6_pcie->variant) { +case ARTPEC6 : + val &= ~PCIECFG_CORE_RESET_REQ ; +break ; +case ARTPEC7 : + val |=PCIECFG_NOC_RESET ; +break ; + }artpec6_pcie_writel (artpec6_pcie,PCIECFG , val);usleep_range (100 ,200 ); }
@@ -210,6 +341,7 @@ static int artpec6_pcie_host_init(struct pcie_port *pp)artpec6_pcie_assert_core_reset (artpec6_pcie);artpec6_pcie_init_phy (artpec6_pcie);artpec6_pcie_deassert_core_reset (artpec6_pcie); +artpec6_pcie_set_nfts (artpec6_pcie);dw_pcie_setup_rc (pp);artpec6_pcie_establish_link (pci);dw_pcie_wait_for_link (pci);
@@ -285,6 +417,7 @@ static void artpec6_pcie_ep_init(struct dw_pcie_ep *ep)artpec6_pcie_assert_core_reset (artpec6_pcie);artpec6_pcie_init_phy (artpec6_pcie);artpec6_pcie_deassert_core_reset (artpec6_pcie); +artpec6_pcie_set_nfts (artpec6_pcie);for (bar =BAR_0 ; bar <=BAR_5 ; bar++)dw_pcie_ep_reset_bar (pci, bar);
@@ -363,6 +496,7 @@ static int artpec6_pcie_probe(struct platform_device *pdev)int ret;const struct of_device_id *match;const struct artpec_pcie_of_data *data; +enum artpec_pcie_variants variant;enum dw_pcie_device_mode mode; match =of_match_device (artpec6_pcie_of_match, dev);
@@ -370,6 +504,7 @@ static int artpec6_pcie_probe(struct platform_device *pdev)return -EINVAL ; data = (struct artpec_pcie_of_data *)match->data; + variant = (enum artpec_pcie_variants )data->variant; mode = (enum dw_pcie_device_mode )data->mode; artpec6_pcie =devm_kzalloc (dev,sizeof (*artpec6_pcie),GFP_KERNEL );
@@ -384,6 +519,7 @@ static int artpec6_pcie_probe(struct platform_device *pdev) pci->ops = &dw_pcie_ops; artpec6_pcie->pci = pci; + artpec6_pcie->variant = variant; artpec6_pcie->mode = mode; dbi_base =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"dbi" );
@@ -429,10 +565,22 @@ static int artpec6_pcie_probe(struct platform_device *pdev) }static const struct artpec_pcie_of_data artpec6_pcie_rc_of_data = { + .variant =ARTPEC6 , .mode =DW_PCIE_RC_TYPE , };static const struct artpec_pcie_of_data artpec6_pcie_ep_of_data = { + .variant =ARTPEC6 , + .mode =DW_PCIE_EP_TYPE , +}; + +static const struct artpec_pcie_of_data artpec7_pcie_rc_of_data = { + .variant =ARTPEC7 , + .mode =DW_PCIE_RC_TYPE , +}; + +static const struct artpec_pcie_of_data artpec7_pcie_ep_of_data = { + .variant =ARTPEC7 , .mode =DW_PCIE_EP_TYPE , };
@@ -445,6 +593,14 @@ static const struct of_device_id artpec6_pcie_of_match[] = { .compatible = "axis,artpec6-pcie-ep", .data = &artpec6_pcie_ep_of_data, }, + { + .compatible = "axis,artpec7-pcie", + .data = &artpec7_pcie_rc_of_data, + }, + { + .compatible = "axis,artpec7-pcie-ep", + .data = &artpec7_pcie_ep_of_data, + }, {}, };
Signature · 1 line
2.14.2