PCI: Cleanup pci-keystone driver
Subsystems (4)
v2 cover PCI: Cleanup pci-keystone driver
The PCIe controller in AM654 uses Synopsys core revision 4.90a and uses the same TI wrapper as used in keystone2 with certain modification. Hence AM654 will use the same pci wrapper driver pci-keystone.c
In preparation for adding AM654 support, cleanup pci-keystone driver here.
Most of the cleanups here are trivial with major modification being merging pci-keystone-dw.c and pci-keystone.c
Cleaning-up irq handling in the RFC series is dropped here as it has few comments to be addressed.
Changes from v1:
*) remove phy_reset in the cleanup PHY handling patch. It will be sent
while adding AM654 support
*) Add a separate patch for using ERR_IRQ_STATUS instead of
ERR_IRQ_STATUS_RAW
*) Split outbound window configuration into two patches. One which
gets the number of outbound windows from DT and the other cleansup outbound window configuration.
Kishon Vijay Abraham I (21):
PCI: keystone: Use quirk to limit MRRS for K2G
PCI: keystone: Use quirk to set MRRS for PCI host bridge
PCI: keystone: Move dw_pcie_setup_rc out of ks_pcie_establish_link()
PCI: keystone: Do not initiate link training multiple times
PCI: keystone: Remove unused argument from ks_dw_pcie_host_init()
PCI: keystone: Merge pci-keystone-dw.c and pci-keystone.c
PCI: keystone: Remove redundant platform_set_drvdata
PCI: keystone: Use uniform function naming convention
dt-bindings: PCI: keystone: Add bindings to get device control module
PCI: keystone: Use syscon APIs to get device id from control module
PCI: keystone: Cleanup PHY handling
PCI: keystone: Invoke pm_runtime APIs to enable clock
PCI: keystone: Cleanup configuration space access
PCI: keystone: Get number of outbound windows from DT
PCI: keystone: Cleanup outbound window configuration
PCI: keystone: Cleanup set_dbi_mode and get_dbi_mode
PCI: keystone: Cleanup ks_pcie_link_up()
PCI: keystone: Use ERR_IRQ_STATUS instead of ERR_IRQ_STATUS_RAW to get
interrupt status
PCI: keystone: Add debug error message for all errors
PCI: keystone: Reorder header file in alphabetical order
PCI: keystone: Cleanup macros defined in pci-keystone.c
.../devicetree/bindings/pci/pci-keystone.txt | 3 + MAINTAINERS | 2 +- drivers/pci/controller/dwc/Makefile | 2 +- drivers/pci/controller/dwc/pci-keystone-dw.c | 484 ----------- drivers/pci/controller/dwc/pci-keystone.c | 788 +++++++++++++++--- drivers/pci/controller/dwc/pci-keystone.h | 57 -- drivers/pci/controller/dwc/pcie-designware.h | 4 + 7 files changed, 686 insertions(+), 654 deletions(-) delete mode 100644 drivers/pci/controller/dwc/pci-keystone-dw.c delete mode 100644 drivers/pci/controller/dwc/pci-keystone.h
Signature · 1 line
2.17.1
PATCH v2 1/21 PCI: keystone: Use quirk to limit MRRS for K2G
PCI controller in K2G also has a limitation that memory read request size (MRRS) must not exceed 256 bytes. Use the quirk to limit MRRS (added for K2HK, K2L and K2E) for K2G as well.
--- drivers/pci/controller/dwc/pci-keystone.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/pci/controller/dwc/pci-keystone.c +3 -0
@@ -36,6 +36,7 @@#define PCIE_RC_K2HK 0xb008#define PCIE_RC_K2E 0xb009#define PCIE_RC_K2L 0xb00a +#define PCIE_RC_K2G 0xb00b#define to_keystone_pcie (x) dev_get_drvdata((x)->dev)
@@ -50,6 +51,8 @@ static void quirk_limit_mrrs(struct pci_dev *dev) .class = PCI_CLASS_BRIDGE_PCI << 8, .class_mask = ~0, }, { PCI_DEVICE(PCI_VENDOR_ID_TI, PCIE_RC_K2L), .class = PCI_CLASS_BRIDGE_PCI << 8, .class_mask = ~0, }, + { PCI_DEVICE(PCI_VENDOR_ID_TI, PCIE_RC_K2G), + .class = PCI_CLASS_BRIDGE_PCI << 8, .class_mask = ~0, }, { 0, }, };
Signature · 1 line
2.17.1
PATCH v2 2/21 PCI: keystone: Use quirk to set MRRS for PCI host bridge
In reply to Kishon Vijay Abraham IReuse the already existing quirk to set MRRS for PCI host bridge instead of explicitly setting MRRS in ks_pcie_host_init.
--- drivers/pci/controller/dwc/pci-keystone.c | 37 +++++++++-------------- 1 file changed, 15 insertions(+), 22 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +15 -22
@@ -43,7 +43,7 @@static void quirk_limit_mrrs (struct pci_dev *dev) {struct pci_bus *bus = dev->bus; -struct pci_dev *bridge = bus->self; +struct pci_dev *bridge;static const struct pci_device_id rc_pci_devids[] = { {PCI_DEVICE (PCI_VENDOR_ID_TI ,PCIE_RC_K2HK ), .class =PCI_CLASS_BRIDGE_PCI <<8 , .class_mask = ~0 , },
@@ -57,7 +57,7 @@ static void quirk_limit_mrrs(struct pci_dev *dev) };if (pci_is_root_bus (bus)) -return ; + bridge = dev;/* look for the host bridge */ while (!pci_is_root_bus (bus)) {
@@ -65,18 +65,19 @@ static void quirk_limit_mrrs(struct pci_dev *dev) bus = bus->parent; } -if (bridge) { -/* -* Keystone PCI controller has a h/w limitation of -* 256 bytes maximum read request size. It can't handle -* anything higher than this. So force this limit on -* all downstream devices. -*/ -if (pci_match_id (rc_pci_devids, bridge)) { -if (pcie_get_readrq (dev) >256 ) { -dev_info (&dev->dev,"limiting MRRS to 256\n" ); -pcie_set_readrq (dev,256 ); - } +if (!bridge) +return ; + +/* +* Keystone PCI controller has a h/w limitation of +* 256 bytes maximum read request size. It can't handle +* anything higher than this. So force this limit on +* all downstream devices. +*/ +if (pci_match_id (rc_pci_devids, bridge)) { +if (pcie_get_readrq (dev) >256 ) { +dev_info (&dev->dev,"limiting MRRS to 256\n" ); +pcie_set_readrq (dev,256 ); } } }
@@ -264,7 +265,6 @@ static int __init ks_pcie_host_init(struct pcie_port *pp) {struct dw_pcie *pci =to_dw_pcie_from_pp (pp);struct keystone_pcie *ks_pcie =to_keystone_pcie (pci); -u32 val;ks_pcie_establish_link (ks_pcie);ks_dw_pcie_setup_rc_app_regs (ks_pcie);
@@ -275,13 +275,6 @@ static int __init ks_pcie_host_init(struct pcie_port *pp)/* update the Vendor ID */ writew (ks_pcie->device_id, pci->dbi_base +PCI_DEVICE_ID ); -/* update the DEV_STAT_CTRL to publish right mrrs */ - val =readl (pci->dbi_base +PCIE_CAP_BASE +PCI_EXP_DEVCTL ); - val &= ~PCI_EXP_DEVCTL_READRQ ; -/* set the mrrs to 256 bytes */ - val |=BIT (12 ); -writel (val, pci->dbi_base +PCIE_CAP_BASE +PCI_EXP_DEVCTL ); -/* * PCIe access errors that result into OCP errors are caught by ARM as * "External aborts"
Signature · 1 line
2.17.1
PATCH v2 3/21 PCI: keystone: Move dw_pcie_setup_rc out of ks_pcie_establish_link()
In reply to Kishon Vijay Abraham INo functional change. Move dw_pcie_setup_rc out of ks_pcie_establish_link() so that ks_pcie_establish_link can be used only to start the link.
--- drivers/pci/controller/dwc/pci-keystone.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +2 -3
@@ -86,12 +86,9 @@ DECLARE_PCI_FIXUP_ENABLE(PCI_ANY_ID, PCI_ANY_ID, quirk_limit_mrrs);static int ks_pcie_establish_link (struct keystone_pcie *ks_pcie) {struct dw_pcie *pci = ks_pcie->pci; -struct pcie_port *pp = &pci->pp;struct device *dev = pci->dev;unsigned int retries; -dw_pcie_setup_rc (pp); -if (dw_pcie_link_up (pci)) {dev_info (dev,"Link already up\n" );return 0 ;
@@ -266,6 +263,8 @@ static int __init ks_pcie_host_init(struct pcie_port *pp)struct dw_pcie *pci =to_dw_pcie_from_pp (pp);struct keystone_pcie *ks_pcie =to_keystone_pcie (pci); +dw_pcie_setup_rc (pp); +ks_pcie_establish_link (ks_pcie);ks_dw_pcie_setup_rc_app_regs (ks_pcie);ks_pcie_setup_interrupts (ks_pcie);
Signature · 1 line
2.17.1
PATCH v2 4/21 PCI: keystone: Do not initiate link training multiple times
In reply to Kishon Vijay Abraham Icommit 886bc5ceb5cc3ad4b219502d72 ("PCI: designware: Add generic dw_pcie_wait_for_link()") while adding a generic dw_pcie_wait_for_link() performed a special handling (initiate link training multiple times) for keystone which is not required. This also resulted in unncessarily waiting for more time to establish the link even when no PCI device is connected.
Remove it and make it look similar to other dwc based PCIe drivers.
--- drivers/pci/controller/dwc/pci-keystone.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +4 -6
@@ -87,19 +87,17 @@ static int ks_pcie_establish_link(struct keystone_pcie *ks_pcie) {struct dw_pcie *pci = ks_pcie->pci;struct device *dev = pci->dev; -unsigned int retries;if (dw_pcie_link_up (pci)) {dev_info (dev,"Link already up\n" );return 0 ; } +ks_dw_pcie_initiate_link_train (ks_pcie); +/* check if the link is up or not */ -for (retries =0 ; retries <5 ; retries++) { -ks_dw_pcie_initiate_link_train (ks_pcie); -if (!dw_pcie_wait_for_link (pci)) -return 0 ; - } +if (!dw_pcie_wait_for_link (pci)) +return 0 ;dev_err (dev,"phy link never came up\n" );return -ETIMEDOUT ;
Signature · 1 line
2.17.1
PATCH v2 5/21 PCI: keystone: Remove unused argument from ks_dw_pcie_host_init()
In reply to Kishon Vijay Abraham INo functional change. Remove unused "msi_intc_np" argument from ks_dw_pcie_host_init().
--- drivers/pci/controller/dwc/pci-keystone-dw.c | 3 +-- drivers/pci/controller/dwc/pci-keystone.c | 2 +- drivers/pci/controller/dwc/pci-keystone.h | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-)
drivers/pci/controller/dwc/pci-keystone-dw.c +1 -2
@@ -439,8 +439,7 @@ void ks_dw_pcie_initiate_link_train(struct keystone_pcie *ks_pcie)* and call dw_pcie_v3_65_host_init() API to initialize the Keystone * PCI host controller. */ -int __init ks_dw_pcie_host_init (struct keystone_pcie *ks_pcie, -struct device_node *msi_intc_np) +int __init ks_dw_pcie_host_init (struct keystone_pcie *ks_pcie) {struct dw_pcie *pci = ks_pcie->pci;struct pcie_port *pp = &pci->pp;
drivers/pci/controller/dwc/pci-keystone.c +1 -1
@@ -341,7 +341,7 @@ static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie, } pp->ops = &keystone_pcie_host_ops; - ret =ks_dw_pcie_host_init (ks_pcie, ks_pcie->msi_intc_np); + ret =ks_dw_pcie_host_init (ks_pcie);if (ret) {dev_err (dev,"failed to initialize host\n" );return ret;
drivers/pci/controller/dwc/pci-keystone.h +1 -2
@@ -41,8 +41,7 @@ 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_enable_error_irq (struct keystone_pcie *ks_pcie);irqreturn_t ks_dw_pcie_handle_error_irq (struct keystone_pcie *ks_pcie); -int ks_dw_pcie_host_init (struct keystone_pcie *ks_pcie, -struct device_node *msi_intc_np); +int ks_dw_pcie_host_init (struct keystone_pcie *ks_pcie);int ks_dw_pcie_wr_other_conf (struct pcie_port *pp,struct pci_bus *bus,unsigned int devfn,int where,int size,u32 val); int ks_dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus,
Signature · 1 line
2.17.1
PATCH v2 6/21 PCI: keystone: Merge pci-keystone-dw.c and pci-keystone.c
In reply to Kishon Vijay Abraham INo functional change. Having two different files for keystone PCI driver doesn't serve any purpose. Merge pci-keystone-dw.c and pci-keystone.c into a single pci-keystone.c file and remove pci-keystone.h
--- MAINTAINERS | 2 +- drivers/pci/controller/dwc/Makefile | 2 +- drivers/pci/controller/dwc/pci-keystone-dw.c | 483 ------------------ drivers/pci/controller/dwc/pci-keystone.c | 489 ++++++++++++++++++- drivers/pci/controller/dwc/pci-keystone.h | 56 --- 5 files changed, 490 insertions(+), 542 deletions(-) delete mode 100644 drivers/pci/controller/dwc/pci-keystone-dw.c delete mode 100644 drivers/pci/controller/dwc/pci-keystone.h
MAINTAINERS +1 -1
@@ -11189,7 +11189,7 @@ M: Murali Karicheri <[email protected]> L: linux-pci at vger.kernel.org L: linux-arm-kernel at lists.infradead.org (moderated for non-subscribers) S: Maintained -F: drivers/pci/controller/dwc/*keystone* +F: drivers/pci/controller/dwc/pci-keystone.c PCI ENDPOINT SUBSYSTEM M: Kishon Vijay Abraham I <[email protected]>
drivers/pci/controller/dwc/Makefile +1 -1
@@ -7,7 +7,7 @@ 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 -obj-$(CONFIG_PCI_KEYSTONE) += pci-keystone-dw.o pci-keystone.o +obj-$(CONFIG_PCI_KEYSTONE) += pci-keystone.o obj-$(CONFIG_PCI_LAYERSCAPE) += pci-layerscape.o obj-$(CONFIG_PCIE_QCOM) += pcie-qcom.o obj-$(CONFIG_PCIE_ARMADA_8K) += pcie-armada8k.o
drivers/pci/controller/dwc/pci-keystone-dw.c deleted +0 -483
483 lines not on this page · raw message
drivers/pci/controller/dwc/pci-keystone.c +488 -1
507 lines not on this page · raw message
drivers/pci/controller/dwc/pci-keystone.h deleted +0 -56
56 lines not on this page · raw message
Signature · 1 line
2.17.1
PATCH v2 7/21 PCI: keystone: Remove redundant platform_set_drvdata
In reply to Kishon Vijay Abraham INo functional change. Remove redundant platform_set_drvdata invocation in ks_pcie_probe().
--- drivers/pci/controller/dwc/pci-keystone.c | 2 -- 1 file changed, 2 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +0 -2
@@ -912,8 +912,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev)if (ret)return ret; -platform_set_drvdata (pdev, ks_pcie); - ret =ks_add_pcie_port (ks_pcie, pdev);if (ret <0 ) goto fail_clk;
Signature · 1 line
2.17.1
PATCH v2 8/21 PCI: keystone: Use uniform function naming convention
In reply to Kishon Vijay Abraham INo functional change. Some function names begin with ks_dw_pcie_* and some function names begin with ks_pcie_*. Modify it so that all function names begin with ks_pcie_*.
--- drivers/pci/controller/dwc/pci-keystone.c | 221 +++++++++++----------- 1 file changed, 111 insertions(+), 110 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +111 -110
@@ -118,7 +118,7 @@ static inline void update_reg_offset_bit_pos(u32 offset, u32 *reg_offset, *bit_pos = offset >>3 ; } -static phys_addr_t ks_dw_pcie_get_msi_addr (struct pcie_port *pp) +static phys_addr_t ks_pcie_get_msi_addr (struct pcie_port *pp) {struct dw_pcie *pci =to_dw_pcie_from_pp (pp);struct keystone_pcie *ks_pcie =to_keystone_pcie (pci);
@@ -126,17 +126,18 @@ static phys_addr_t ks_dw_pcie_get_msi_addr(struct pcie_port *pp)return ks_pcie->app.start +MSI_IRQ ; } -static u32 ks_dw_app_readl (struct keystone_pcie *ks_pcie,u32 offset) +static u32 ks_pcie_app_readl (struct keystone_pcie *ks_pcie,u32 offset) {return readl (ks_pcie->va_app_base + offset); } -static void ks_dw_app_writel (struct keystone_pcie *ks_pcie,u32 offset,u32 val) +static void ks_pcie_app_writel (struct keystone_pcie *ks_pcie,u32 offset, +u32 val) {writel (val, ks_pcie->va_app_base + offset); } -static void ks_dw_pcie_handle_msi_irq (struct keystone_pcie *ks_pcie,int offset) +static void ks_pcie_handle_msi_irq (struct keystone_pcie *ks_pcie,int offset) {struct dw_pcie *pci = ks_pcie->pci;struct pcie_port *pp = &pci->pp;
@@ -144,7 +145,7 @@ static void ks_dw_pcie_handle_msi_irq(struct keystone_pcie *ks_pcie, int offset)u32 pending, vector;int src, virq; - pending =ks_dw_app_readl (ks_pcie,MSI0_IRQ_STATUS + (offset <<4 )); + pending =ks_pcie_app_readl (ks_pcie,MSI0_IRQ_STATUS + (offset <<4 ));/* * MSI0 status bit 0-3 shows vectors 0, 8, 16, 24, MSI1 status bit
@@ -161,7 +162,7 @@ static void ks_dw_pcie_handle_msi_irq(struct keystone_pcie *ks_pcie, int offset) } } -static void ks_dw_pcie_msi_irq_ack (int irq,struct pcie_port *pp) +static void ks_pcie_msi_irq_ack (int irq,struct pcie_port *pp) {u32 reg_offset, bit_pos;struct keystone_pcie *ks_pcie;
@@ -171,55 +172,55 @@ static void ks_dw_pcie_msi_irq_ack(int irq, struct pcie_port *pp) ks_pcie =to_keystone_pcie (pci);update_reg_offset_bit_pos (irq, ®_offset, &bit_pos); -ks_dw_app_writel (ks_pcie,MSI0_IRQ_STATUS + (reg_offset <<4 ), -BIT (bit_pos)); -ks_dw_app_writel (ks_pcie,IRQ_EOI , reg_offset +MSI_IRQ_OFFSET ); +ks_pcie_app_writel (ks_pcie,MSI0_IRQ_STATUS + (reg_offset <<4 ), +BIT (bit_pos)); +ks_pcie_app_writel (ks_pcie,IRQ_EOI , reg_offset +MSI_IRQ_OFFSET ); } -static void ks_dw_pcie_msi_set_irq (struct pcie_port *pp,int irq) +static void ks_pcie_msi_set_irq (struct pcie_port *pp,int irq) {u32 reg_offset, bit_pos;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, ®_offset, &bit_pos); -ks_dw_app_writel (ks_pcie,MSI0_IRQ_ENABLE_SET + (reg_offset <<4 ), -BIT (bit_pos)); +ks_pcie_app_writel (ks_pcie,MSI0_IRQ_ENABLE_SET + (reg_offset <<4 ), +BIT (bit_pos)); } -static void ks_dw_pcie_msi_clear_irq (struct pcie_port *pp,int irq) +static void ks_pcie_msi_clear_irq (struct pcie_port *pp,int irq) {u32 reg_offset, bit_pos;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, ®_offset, &bit_pos); -ks_dw_app_writel (ks_pcie,MSI0_IRQ_ENABLE_CLR + (reg_offset <<4 ), -BIT (bit_pos)); +ks_pcie_app_writel (ks_pcie,MSI0_IRQ_ENABLE_CLR + (reg_offset <<4 ), +BIT (bit_pos)); } -static int ks_dw_pcie_msi_host_init (struct pcie_port *pp) +static int ks_pcie_msi_host_init (struct pcie_port *pp) {return dw_pcie_allocate_domains (pp); } -static void ks_dw_pcie_enable_legacy_irqs (struct keystone_pcie *ks_pcie) +static void ks_pcie_enable_legacy_irqs (struct keystone_pcie *ks_pcie) {int i;for (i =0 ; i <PCI_NUM_INTX ; i++) -ks_dw_app_writel (ks_pcie,IRQ_ENABLE_SET + (i <<4 ),0x1 ); +ks_pcie_app_writel (ks_pcie,IRQ_ENABLE_SET + (i <<4 ),0x1 ); } -static void ks_dw_pcie_handle_legacy_irq (struct keystone_pcie *ks_pcie, -int offset) +static void ks_pcie_handle_legacy_irq (struct keystone_pcie *ks_pcie, +int offset) {struct dw_pcie *pci = ks_pcie->pci;struct device *dev = pci->dev;u32 pending;int virq; - pending =ks_dw_app_readl (ks_pcie,IRQ_STATUS + (offset <<4 )); + pending =ks_pcie_app_readl (ks_pcie,IRQ_STATUS + (offset <<4 ));if (BIT (0 ) & pending) { virq =irq_linear_revmap (ks_pcie->legacy_irq_domain, offset);
@@ -228,19 +229,19 @@ static void ks_dw_pcie_handle_legacy_irq(struct keystone_pcie *ks_pcie, }/* EOI the INTx interrupt */ -ks_dw_app_writel (ks_pcie,IRQ_EOI , offset); +ks_pcie_app_writel (ks_pcie,IRQ_EOI , offset); } -static void ks_dw_pcie_enable_error_irq (struct keystone_pcie *ks_pcie) +static void ks_pcie_enable_error_irq (struct keystone_pcie *ks_pcie) { -ks_dw_app_writel (ks_pcie,ERR_IRQ_ENABLE_SET ,ERR_IRQ_ALL ); +ks_pcie_app_writel (ks_pcie,ERR_IRQ_ENABLE_SET ,ERR_IRQ_ALL ); } -static irqreturn_t ks_dw_pcie_handle_error_irq (struct keystone_pcie *ks_pcie) +static irqreturn_t ks_pcie_handle_error_irq (struct keystone_pcie *ks_pcie) {u32 status; - status =ks_dw_app_readl (ks_pcie,ERR_IRQ_STATUS_RAW ) &ERR_IRQ_ALL ; + status =ks_pcie_app_readl (ks_pcie,ERR_IRQ_STATUS_RAW ) &ERR_IRQ_ALL ;if (!status)return IRQ_NONE ;
@@ -249,83 +250,83 @@ static irqreturn_t ks_dw_pcie_handle_error_irq(struct keystone_pcie *ks_pcie) status);/* Ack the IRQ; status bits are RW1C */ -ks_dw_app_writel (ks_pcie,ERR_IRQ_STATUS , status); +ks_pcie_app_writel (ks_pcie,ERR_IRQ_STATUS , status);return IRQ_HANDLED ; } -static void ks_dw_pcie_ack_legacy_irq (struct irq_data *d) +static void ks_pcie_ack_legacy_irq (struct irq_data *d) { } -static void ks_dw_pcie_mask_legacy_irq (struct irq_data *d) +static void ks_pcie_mask_legacy_irq (struct irq_data *d) { } -static void ks_dw_pcie_unmask_legacy_irq (struct irq_data *d) +static void ks_pcie_unmask_legacy_irq (struct irq_data *d) { } -static struct irq_chip ks_dw_pcie_legacy_irq_chip = { +static struct irq_chip ks_pcie_legacy_irq_chip = { .name ="Keystone-PCI-Legacy-IRQ" , - .irq_ack = ks_dw_pcie_ack_legacy_irq, - .irq_mask = ks_dw_pcie_mask_legacy_irq, - .irq_unmask = ks_dw_pcie_unmask_legacy_irq, + .irq_ack = ks_pcie_ack_legacy_irq, + .irq_mask = ks_pcie_mask_legacy_irq, + .irq_unmask = ks_pcie_unmask_legacy_irq, }; -static int ks_dw_pcie_init_legacy_irq_map (struct irq_domain *d, -unsigned int irq, -irq_hw_number_t hw_irq) +static int ks_pcie_init_legacy_irq_map (struct irq_domain *d, +unsigned int irq, +irq_hw_number_t hw_irq) { -irq_set_chip_and_handler (irq, &ks_dw_pcie_legacy_irq_chip, +irq_set_chip_and_handler (irq, &ks_pcie_legacy_irq_chip, handle_level_irq);irq_set_chip_data (irq, d->host_data);return 0 ; } -static const struct irq_domain_ops ks_dw_pcie_legacy_irq_domain_ops = { - .map = ks_dw_pcie_init_legacy_irq_map, +static const struct irq_domain_ops ks_pcie_legacy_irq_domain_ops = { + .map = ks_pcie_init_legacy_irq_map, .xlate = irq_domain_xlate_onetwocell, };/** -* ks_dw_pcie_set_dbi_mode() - Set DBI mode to access overlaid BAR mask +* ks_pcie_set_dbi_mode() - Set DBI mode to access overlaid BAR mask * registers * * Since modification of dbi_cs2 involves different clock domain, read the * status back to ensure the transition is complete. */ -static void ks_dw_pcie_set_dbi_mode (struct keystone_pcie *ks_pcie) +static void ks_pcie_set_dbi_mode (struct keystone_pcie *ks_pcie) {u32 val; - val =ks_dw_app_readl (ks_pcie,CMD_STATUS ); -ks_dw_app_writel (ks_pcie,CMD_STATUS ,DBI_CS2_EN_VAL | val); + val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); +ks_pcie_app_writel (ks_pcie,CMD_STATUS ,DBI_CS2_EN_VAL | val);do { - val =ks_dw_app_readl (ks_pcie,CMD_STATUS ); + val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); }while (!(val &DBI_CS2_EN_VAL )); }/** -* ks_dw_pcie_clear_dbi_mode() - Disable DBI mode +* ks_pcie_clear_dbi_mode() - Disable DBI mode * * Since modification of dbi_cs2 involves different clock domain, read the * status back to ensure the transition is complete. */ -static void ks_dw_pcie_clear_dbi_mode (struct keystone_pcie *ks_pcie) +static void ks_pcie_clear_dbi_mode (struct keystone_pcie *ks_pcie) {u32 val; - val =ks_dw_app_readl (ks_pcie,CMD_STATUS ); -ks_dw_app_writel (ks_pcie,CMD_STATUS , ~DBI_CS2_EN_VAL & val); + val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); +ks_pcie_app_writel (ks_pcie,CMD_STATUS , ~DBI_CS2_EN_VAL & val);do { - val =ks_dw_app_readl (ks_pcie,CMD_STATUS ); + val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); }while (val &DBI_CS2_EN_VAL ); } -static void ks_dw_pcie_setup_rc_app_regs (struct keystone_pcie *ks_pcie) +static void ks_pcie_setup_rc_app_regs (struct keystone_pcie *ks_pcie) {struct dw_pcie *pci = ks_pcie->pci;struct pcie_port *pp = &pci->pp;
@@ -334,26 +335,26 @@ static void ks_dw_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie)u32 val;/* Disable BARs for inbound access */ -ks_dw_pcie_set_dbi_mode (ks_pcie); +ks_pcie_set_dbi_mode (ks_pcie);dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_0 ,0 );dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_1 ,0 ); -ks_dw_pcie_clear_dbi_mode (ks_pcie); +ks_pcie_clear_dbi_mode (ks_pcie);/* Set outbound translation size per window division */ -ks_dw_app_writel (ks_pcie,OB_SIZE ,CFG_PCIM_WIN_SZ_IDX &0x7 ); +ks_pcie_app_writel (ks_pcie,OB_SIZE ,CFG_PCIM_WIN_SZ_IDX &0x7 ); tr_size = (1 << (CFG_PCIM_WIN_SZ_IDX &0x7 )) *SZ_1M ;/* Using Direct 1:1 mapping of RC <-> PCI memory space */ for (i =0 ; (i <CFG_PCIM_WIN_CNT ) && (start < end); i++) { -ks_dw_app_writel (ks_pcie,OB_OFFSET_INDEX (i), start |1 ); -ks_dw_app_writel (ks_pcie,OB_OFFSET_HI (i),0 ); +ks_pcie_app_writel (ks_pcie,OB_OFFSET_INDEX (i), start |1 ); +ks_pcie_app_writel (ks_pcie,OB_OFFSET_HI (i),0 ); start += tr_size; }/* Enable OB translation */ - val =ks_dw_app_readl (ks_pcie,CMD_STATUS ); -ks_dw_app_writel (ks_pcie,CMD_STATUS ,OB_XLAT_EN_VAL | val); + val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); +ks_pcie_app_writel (ks_pcie,CMD_STATUS ,OB_XLAT_EN_VAL | val); }/**
@@ -394,13 +395,13 @@ static void __iomem *ks_pcie_cfg_setup(struct keystone_pcie *ks_pcie, u8 bus,if (bus !=1 ) regval |=BIT (24 ); -ks_dw_app_writel (ks_pcie,CFG_SETUP , regval); +ks_pcie_app_writel (ks_pcie,CFG_SETUP , regval);return pp->va_cfg0_base; } -static int ks_dw_pcie_rd_other_conf (struct pcie_port *pp,struct pci_bus *bus, -unsigned int devfn,int where,int size, -u32 *val) +static int ks_pcie_rd_other_conf (struct pcie_port *pp,struct pci_bus *bus, +unsigned int devfn,int where,int size, +u32 *val) {struct dw_pcie *pci =to_dw_pcie_from_pp (pp);struct keystone_pcie *ks_pcie =to_keystone_pcie (pci);
@@ -412,9 +413,9 @@ static int ks_dw_pcie_rd_other_conf(struct pcie_port *pp, struct pci_bus *bus,return dw_pcie_read (addr + where, size, val); } -static int ks_dw_pcie_wr_other_conf (struct pcie_port *pp,struct pci_bus *bus, -unsigned int devfn,int where,int size, -u32 val) +static int ks_pcie_wr_other_conf (struct pcie_port *pp,struct pci_bus *bus, +unsigned int devfn,int where,int size, +u32 val) {struct dw_pcie *pci =to_dw_pcie_from_pp (pp);struct keystone_pcie *ks_pcie =to_keystone_pcie (pci);
@@ -427,23 +428,23 @@ static int ks_dw_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus, }/** -* ks_dw_pcie_v3_65_scan_bus() - keystone scan_bus post initialization +* ks_pcie_v3_65_scan_bus() - keystone scan_bus post initialization * * This sets BAR0 to enable inbound access for MSI_IRQ register */ -static void ks_dw_pcie_v3_65_scan_bus (struct pcie_port *pp) +static void ks_pcie_v3_65_scan_bus (struct pcie_port *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 */ -ks_dw_pcie_set_dbi_mode (ks_pcie); +ks_pcie_set_dbi_mode (ks_pcie);/* Enable BAR0 */ dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_0 ,1 );dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_0 ,SZ_4K -1 ); -ks_dw_pcie_clear_dbi_mode (ks_pcie); +ks_pcie_clear_dbi_mode (ks_pcie);/* * For BAR0, just setting bus address for inbound writes (MSI) should
@@ -453,9 +454,9 @@ static void ks_dw_pcie_v3_65_scan_bus(struct pcie_port *pp) }/** -* ks_dw_pcie_link_up() - Check if link up +* ks_pcie_link_up() - Check if link up */ -static int ks_dw_pcie_link_up (struct dw_pcie *pci) +static int ks_pcie_link_up (struct dw_pcie *pci) {u32 val;
@@ -463,28 +464,28 @@ static int ks_dw_pcie_link_up(struct dw_pcie *pci)return (val <SSM_STATE_MASK ) ==LTSSM_STATE_L0 ; } -static void ks_dw_pcie_initiate_link_train (struct keystone_pcie *ks_pcie) +static void ks_pcie_initiate_link_train (struct keystone_pcie *ks_pcie) {u32 val;/* Disable Link training */ - val =ks_dw_app_readl (ks_pcie,CMD_STATUS ); + val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); val &= ~LTSSM_EN_VAL ; -ks_dw_app_writel (ks_pcie,CMD_STATUS ,LTSSM_EN_VAL | val); +ks_pcie_app_writel (ks_pcie,CMD_STATUS ,LTSSM_EN_VAL | val);/* Initiate Link Training */ - val =ks_dw_app_readl (ks_pcie,CMD_STATUS ); -ks_dw_app_writel (ks_pcie,CMD_STATUS ,LTSSM_EN_VAL | val); + val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); +ks_pcie_app_writel (ks_pcie,CMD_STATUS ,LTSSM_EN_VAL | val); }/** -* ks_dw_pcie_host_init() - initialize host for v3_65 dw hardware +* ks_pcie_dw_host_init() - initialize host for v3_65 dw hardware * * Ioremap the register resources, initialize legacy irq domain * and call dw_pcie_v3_65_host_init() API to initialize the Keystone * PCI host controller. */ -static int __init ks_dw_pcie_host_init (struct keystone_pcie *ks_pcie) +static int __init ks_pcie_dw_host_init (struct keystone_pcie *ks_pcie) {struct dw_pcie *pci = ks_pcie->pci;struct pcie_port *pp = &pci->pp;
@@ -517,7 +518,7 @@ static int __init ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie) ks_pcie->legacy_irq_domain =irq_domain_add_linear (ks_pcie->legacy_intc_np,PCI_NUM_INTX , - &ks_dw_pcie_legacy_irq_domain_ops, + &ks_pcie_legacy_irq_domain_ops,NULL );if (!ks_pcie->legacy_irq_domain) {dev_err (dev,"Failed to add irq domain for legacy irqs\n" );
@@ -527,7 +528,7 @@ static int __init ks_dw_pcie_host_init(struct keystone_pcie *ks_pcie)return dw_pcie_host_init (pp); } -static void quirk_limit_mrrs (struct pci_dev *dev) +static void ks_pcie_quirk (struct pci_dev *dev) {struct pci_bus *bus = dev->bus;struct pci_dev *bridge;
@@ -568,7 +569,7 @@ static void quirk_limit_mrrs(struct pci_dev *dev) } } } -DECLARE_PCI_FIXUP_ENABLE (PCI_ANY_ID ,PCI_ANY_ID , quirk_limit_mrrs); +DECLARE_PCI_FIXUP_ENABLE (PCI_ANY_ID ,PCI_ANY_ID , ks_pcie_quirk);static int ks_pcie_establish_link (struct keystone_pcie *ks_pcie) {
@@ -580,7 +581,7 @@ static int ks_pcie_establish_link(struct keystone_pcie *ks_pcie)return 0 ; } -ks_dw_pcie_initiate_link_train (ks_pcie); +ks_pcie_initiate_link_train (ks_pcie);/* check if the link is up or not */ if (!dw_pcie_wait_for_link (pci))
@@ -607,7 +608,7 @@ static void ks_pcie_msi_irq_handler(struct irq_desc *desc)* ack operation. */ chained_irq_enter (chip, desc); -ks_dw_pcie_handle_msi_irq (ks_pcie, offset); +ks_pcie_handle_msi_irq (ks_pcie, offset);chained_irq_exit (chip, desc); }
@@ -636,7 +637,7 @@ static void ks_pcie_legacy_irq_handler(struct irq_desc *desc)* ack operation. */ chained_irq_enter (chip, desc); -ks_dw_pcie_handle_legacy_irq (ks_pcie, irq_offset); +ks_pcie_handle_legacy_irq (ks_pcie, irq_offset);chained_irq_exit (chip, desc); }
@@ -708,7 +709,7 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie) ks_pcie_legacy_irq_handler, ks_pcie); } -ks_dw_pcie_enable_legacy_irqs (ks_pcie); +ks_pcie_enable_legacy_irqs (ks_pcie);/* MSI IRQ */ if (IS_ENABLED (CONFIG_PCI_MSI )) {
@@ -720,7 +721,7 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie) }if (ks_pcie->error_irq >0 ) -ks_dw_pcie_enable_error_irq (ks_pcie); +ks_pcie_enable_error_irq (ks_pcie); }/*
@@ -728,8 +729,8 @@ static void ks_pcie_setup_interrupts(struct keystone_pcie *ks_pcie)* bus error instead of returning 0xffffffff. This handler always returns 0 * for this kind of faults. */ -static int keystone_pcie_fault (unsigned long addr,unsigned int fsr, -struct pt_regs *regs) +static int ks_pcie_fault (unsigned long addr,unsigned int fsr, +struct pt_regs *regs) {unsigned long instr = *(unsigned long *)instruction_pointer (regs);
@@ -751,7 +752,7 @@ static int __init ks_pcie_host_init(struct pcie_port *pp)dw_pcie_setup_rc (pp);ks_pcie_establish_link (ks_pcie); -ks_dw_pcie_setup_rc_app_regs (ks_pcie); +ks_pcie_setup_rc_app_regs (ks_pcie);ks_pcie_setup_interrupts (ks_pcie);writew (PCI_IO_RANGE_TYPE_32 | (PCI_IO_RANGE_TYPE_32 <<8 ), pci->dbi_base +PCI_IO_BASE );
@@ -763,33 +764,33 @@ static int __init ks_pcie_host_init(struct pcie_port *pp)* PCIe access errors that result into OCP errors are caught by ARM as * "External aborts" */ -hook_fault_code (17 , keystone_pcie_fault,SIGBUS ,0 , +hook_fault_code (17 , ks_pcie_fault,SIGBUS ,0 ,"Asynchronous external abort" );return 0 ; } -static const struct dw_pcie_host_ops keystone_pcie_host_ops = { - .rd_other_conf = ks_dw_pcie_rd_other_conf, - .wr_other_conf = ks_dw_pcie_wr_other_conf, +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, - .msi_set_irq = ks_dw_pcie_msi_set_irq, - .msi_clear_irq = ks_dw_pcie_msi_clear_irq, - .get_msi_addr = ks_dw_pcie_get_msi_addr, - .msi_host_init = ks_dw_pcie_msi_host_init, - .msi_irq_ack = ks_dw_pcie_msi_irq_ack, - .scan_bus = ks_dw_pcie_v3_65_scan_bus, + .msi_set_irq = ks_pcie_msi_set_irq, + .msi_clear_irq = ks_pcie_msi_clear_irq, + .get_msi_addr = ks_pcie_get_msi_addr, + .msi_host_init = ks_pcie_msi_host_init, + .msi_irq_ack = ks_pcie_msi_irq_ack, + .scan_bus = ks_pcie_v3_65_scan_bus, }; -static irqreturn_t pcie_err_irq_handler (int irq,void *priv) +static irqreturn_t ks_pcie_err_irq_handler (int irq,void *priv) {struct keystone_pcie *ks_pcie = priv; -return ks_dw_pcie_handle_error_irq (ks_pcie); +return ks_pcie_handle_error_irq (ks_pcie); } -static int __init ks_add_pcie_port (struct keystone_pcie *ks_pcie, -struct platform_device *pdev) +static int __init ks_pcie_add_pcie_port (struct keystone_pcie *ks_pcie, +struct platform_device *pdev) {struct dw_pcie *pci = ks_pcie->pci;struct pcie_port *pp = &pci->pp;
@@ -818,7 +819,7 @@ static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie,if (ks_pcie->error_irq <=0 )dev_info (dev,"no error IRQ defined\n" );else { - ret =request_irq (ks_pcie->error_irq, pcie_err_irq_handler, + ret =request_irq (ks_pcie->error_irq, ks_pcie_err_irq_handler,IRQF_SHARED ,"pcie-error-irq" , ks_pcie);if (ret <0 ) { dev_err(dev, "failed to request error IRQ %d\n",
@@ -827,8 +828,8 @@ static int __init ks_add_pcie_port(struct keystone_pcie *ks_pcie, } } - pp->ops = &keystone_pcie_host_ops; - ret =ks_dw_pcie_host_init (ks_pcie); + pp->ops = &ks_pcie_host_ops; + ret =ks_pcie_dw_host_init (ks_pcie);if (ret) {dev_err (dev,"failed to initialize host\n" );return ret;
@@ -845,8 +846,8 @@ 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 const struct dw_pcie_ops ks_pcie_dw_pcie_ops = { + .link_up = ks_pcie_link_up, }; static int __exit ks_pcie_remove(struct platform_device *pdev)
@@ -877,7 +878,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev)return -ENOMEM ; pci->dev = dev; - pci->ops = &dw_pcie_ops; + pci->ops = &ks_pcie_dw_pcie_ops; ks_pcie->pci = pci;
@@ -912,7 +913,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev)if (ret)return ret; - ret =ks_add_pcie_port (ks_pcie, pdev); + ret =ks_pcie_add_pcie_port (ks_pcie, pdev);if (ret <0 ) goto fail_clk;
Signature · 1 line
2.17.1
PATCH v2 9/21 dt-bindings: PCI: keystone: Add bindings to get device control module
In reply to Kishon Vijay Abraham IAdd bindings to get device control module which has the device id and vendor id to be configured in the keystone PCIe controller.
--- Documentation/devicetree/bindings/pci/pci-keystone.txt | 3 +++ 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/pci/pci-keystone.txt +3 -0
@@ -19,6 +19,9 @@ pcie_msi_intc : Interrupt controller device node for MSI IRQ chip interrupt-cells: should be set to 1 interrupts: GIC interrupt lines connected to PCI MSI interrupt lines +ti,syscon-pcie-id : phandle to the device control module required to set device + id and vendor id. + Example: pcie_msi_intc: msi-interrupt-controller { interrupt-controller;
Signature · 1 line
2.17.1
PATCH v2 10/21 PCI: keystone: Use SYSCON APIs to get device ID from control module
In reply to Kishon Vijay Abraham IControl module registers should be read using syscon APIs. pci-keystone.c uses platform_get_resource to get control module registers. Fix it here by using syscon APIs to get device id from control module.
--- drivers/pci/controller/dwc/pci-keystone.c | 45 ++++++++++++++++------- 1 file changed, 32 insertions(+), 13 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +32 -13
@@ -15,12 +15,14 @@#include <linux/interrupt.h> #include <linux/irqdomain.h> #include <linux/init.h> +#include <linux/mfd/syscon.h> #include <linux/msi.h> #include <linux/of_irq.h> #include <linux/of.h> #include <linux/of_pci.h> #include <linux/platform_device.h> #include <linux/phy/phy.h> +#include <linux/regmap.h> #include <linux/resource.h> #include <linux/signal.h>
@@ -28,6 +30,9 @@#define DRIVER_NAME "keystone-pcie" +#define PCIE_VENDORID_MASK 0xffff +#define PCIE_DEVICEID_SHIFT 16 +/* DEV_STAT_CTRL */ #define PCIE_CAP_BASE 0x70
@@ -744,10 +749,34 @@ static int ks_pcie_fault(unsigned long addr, unsigned int fsr,return 0 ; } +static int __init ks_pcie_init_id (struct keystone_pcie *ks_pcie) +{ +int ret; +unsigned int id; +struct regmap *devctrl_regs; +struct dw_pcie *pci = ks_pcie->pci; +struct device *dev = pci->dev; +struct device_node *np = dev->of_node; + + devctrl_regs =syscon_regmap_lookup_by_phandle (np,"ti,syscon-pcie-id" ); +if (IS_ERR (devctrl_regs)) +return PTR_ERR (devctrl_regs); + + ret =regmap_read (devctrl_regs,0 , &id); +if (ret) +return ret; + +dw_pcie_writew_dbi (pci,PCI_VENDOR_ID , id &PCIE_VENDORID_MASK ); +dw_pcie_writew_dbi (pci,PCI_DEVICE_ID , id >>PCIE_DEVICEID_SHIFT ); + +return 0 ; +} +static int __init ks_pcie_host_init (struct pcie_port *pp) {struct dw_pcie *pci =to_dw_pcie_from_pp (pp);struct keystone_pcie *ks_pcie =to_keystone_pcie (pci); +int ret;dw_pcie_setup_rc (pp);
@@ -757,8 +786,9 @@ static int __init ks_pcie_host_init(struct pcie_port *pp)writew (PCI_IO_RANGE_TYPE_32 | (PCI_IO_RANGE_TYPE_32 <<8 ), pci->dbi_base +PCI_IO_BASE ); -/* update the Vendor ID */ -writew (ks_pcie->device_id, pci->dbi_base +PCI_DEVICE_ID ); + ret =ks_pcie_init_id (ks_pcie); +if (ret <0 ) +return ret;/* * PCIe access errors that result into OCP errors are caught by ARM as
@@ -864,8 +894,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev)struct device *dev = &pdev->dev;struct dw_pcie *pci;struct keystone_pcie *ks_pcie; -struct resource *res; -void __iomem *reg_p;struct phy *phy;int ret;
@@ -893,15 +921,6 @@ static int __init ks_pcie_probe(struct platform_device *pdev)return ret; } -/* index 2 is to read PCI DEVICE_ID */ - res =platform_get_resource (pdev,IORESOURCE_MEM ,2 ); - reg_p =devm_ioremap_resource (dev, res); -if (IS_ERR (reg_p)) -return PTR_ERR (reg_p); - ks_pcie->device_id =readl (reg_p) >>16 ; -devm_iounmap (dev, reg_p); -devm_release_mem_region (dev, res->start,resource_size (res)); - ks_pcie->np = dev->of_node;platform_set_drvdata (pdev, ks_pcie); ks_pcie->clk =devm_clk_get (dev,"pcie" );
Signature · 1 line
2.17.1
PATCH v2 11/21 PCI: keystone: Cleanup PHY handling
In reply to Kishon Vijay Abraham ICleanup PHY handling by using devm_phy_optional_get to get PHYs if the PHYs are optional, creating a device link between the PHY device and the controller device and disable PHY on error cases here.
--- drivers/pci/controller/dwc/pci-keystone.c | 122 +++++++++++++++++++--- 1 file changed, 106 insertions(+), 16 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +106 -16
@@ -105,6 +105,9 @@ struct keystone_pcie {int num_msi_host_irqs;int msi_host_irqs[MAX_MSI_HOST_IRQS ]; +int num_lanes; +struct phy **phy; +struct device_link **link;struct device_node *msi_intc_np;struct irq_domain *legacy_irq_domain;struct device_node *np;
@@ -880,22 +883,57 @@ static const struct dw_pcie_ops ks_pcie_dw_pcie_ops = { .link_up = ks_pcie_link_up, }; -static int __exit ks_pcie_remove(struct platform_device *pdev) +static void ks_pcie_disable_phy (struct keystone_pcie *ks_pcie) { -struct keystone_pcie *ks_pcie =platform_get_drvdata (pdev); +int num_lanes = ks_pcie->num_lanes; -clk_disable_unprepare (ks_pcie->clk); +while (num_lanes--) { +phy_power_off (ks_pcie->phy[num_lanes]); +phy_exit (ks_pcie->phy[num_lanes]); + } +} + +static int ks_pcie_enable_phy (struct keystone_pcie *ks_pcie) +{ +int i; +int ret; +int num_lanes = ks_pcie->num_lanes; + +for (i =0 ; i < num_lanes; i++) { + ret =phy_init (ks_pcie->phy[i]); +if (ret <0 ) + goto err_phy; + + ret =phy_power_on (ks_pcie->phy[i]); +if (ret <0 ) { +phy_exit (ks_pcie->phy[i]); + goto err_phy; + } + }return 0 ; + +err_phy: +while (--i >=0 ) { +phy_power_off (ks_pcie->phy[i]); +phy_exit (ks_pcie->phy[i]); + } + +return ret; }static int __init ks_pcie_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev; +struct device_node *np = dev->of_node;struct dw_pcie *pci;struct keystone_pcie *ks_pcie; -struct phy *phy; +struct device_link **link; +struct phy **phy; +u32 num_lanes; +char name[10 ];int ret; +int i; ks_pcie =devm_kzalloc (dev,sizeof (*ks_pcie),GFP_KERNEL );if (!ks_pcie)
@@ -908,29 +946,59 @@ static int __init ks_pcie_probe(struct platform_device *pdev) pci->dev = dev; pci->ops = &ks_pcie_dw_pcie_ops; - ks_pcie->pci = pci; + ret =of_property_read_u32 (np,"num-lanes" , &num_lanes); +if (ret) + num_lanes =1 ; -/* initialize SerDes Phy if present */ - phy =devm_phy_get (dev,"pcie-phy" ); -if (PTR_ERR_OR_ZERO (phy) == -EPROBE_DEFER ) -return PTR_ERR (phy); + phy =devm_kzalloc (dev,sizeof (*phy) * num_lanes,GFP_KERNEL ); +if (!phy) +return -ENOMEM ; -if (!IS_ERR_OR_NULL (phy)) { - ret =phy_init (phy); -if (ret <0 ) -return ret; + link =devm_kzalloc (dev,sizeof (*link) * num_lanes,GFP_KERNEL ); +if (!link) +return -ENOMEM ; + +for (i =0 ; i < num_lanes; i++) { +snprintf (name,sizeof (name),"pcie-phy%d" , i); + phy[i] =devm_phy_optional_get (dev, name); +if (IS_ERR (phy[i])) { + ret =PTR_ERR (phy[i]); + goto err_link; + } + +if (!phy[i]) +continue ; + + link[i] =device_link_add (dev, &phy[i]->dev,DL_FLAG_STATELESS ); +if (!link[i]) { + ret = -EINVAL ; + goto err_link; + } + } + + ks_pcie->np = np; + ks_pcie->pci = pci; + ks_pcie->link = link; + ks_pcie->num_lanes = num_lanes; + ks_pcie->phy = phy; + + ret =ks_pcie_enable_phy (ks_pcie); +if (ret) { +dev_err (dev,"failed to enable phy\n" ); + goto err_link; } - ks_pcie->np = dev->of_node;platform_set_drvdata (pdev, ks_pcie); ks_pcie->clk =devm_clk_get (dev,"pcie" );if (IS_ERR (ks_pcie->clk)) {dev_err (dev,"Failed to get pcie rc clock\n" ); -return PTR_ERR (ks_pcie->clk); + ret =PTR_ERR (ks_pcie->clk); + goto err_phy; } + ret =clk_prepare_enable (ks_pcie->clk);if (ret) -return ret; + goto err_phy; ret =ks_pcie_add_pcie_port (ks_pcie, pdev);if (ret <0 )
@@ -940,9 +1008,31 @@ static int __init ks_pcie_probe(struct platform_device *pdev) fail_clk:clk_disable_unprepare (ks_pcie->clk); +err_phy: +ks_pcie_disable_phy (ks_pcie); + +err_link: +while (--i >=0 && link[i]) +device_link_del (link[i]); +return ret; } +static int __exit ks_pcie_remove(struct platform_device *pdev) +{ +struct keystone_pcie *ks_pcie =platform_get_drvdata (pdev); +struct device_link **link = ks_pcie->link; +int num_lanes = ks_pcie->num_lanes; + +clk_disable_unprepare (ks_pcie->clk); +ks_pcie_disable_phy (ks_pcie); + +while (num_lanes--) +device_link_del (link[num_lanes]); + +return 0 ; +} +static struct platform_driver ks_pcie_driver__refdata = { .probe = ks_pcie_probe, .remove =__exit_p (ks_pcie_remove),
Signature · 1 line
2.17.1
PATCH v2 12/21 PCI: keystone: Invoke pm_runtime APIs to enable clock
In reply to Kishon Vijay Abraham IInvoke pm_runtime APIs to enable clocks and remove explicit clock enabling using clk_prepare_enable().
--- drivers/pci/controller/dwc/pci-keystone.c | 28 ++++++++++------------- 1 file changed, 12 insertions(+), 16 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +12 -16
@@ -96,7 +96,6 @@struct keystone_pcie {struct dw_pcie *pci; -struct clk *clk;/* PCI Device ID */ u32 device_id;int num_legacy_host_irqs;
@@ -989,26 +988,22 @@ static int __init ks_pcie_probe(struct platform_device *pdev) }platform_set_drvdata (pdev, ks_pcie); - ks_pcie->clk =devm_clk_get (dev,"pcie" ); -if (IS_ERR (ks_pcie->clk)) { -dev_err (dev,"Failed to get pcie rc clock\n" ); - ret =PTR_ERR (ks_pcie->clk); - goto err_phy; +pm_runtime_enable (dev); + ret =pm_runtime_get_sync (dev); +if (ret <0 ) { +dev_err (dev,"pm_runtime_get_sync failed\n" ); + goto err_get_sync; } - ret =clk_prepare_enable (ks_pcie->clk); -if (ret) - goto err_phy; - ret =ks_pcie_add_pcie_port (ks_pcie, pdev);if (ret <0 ) - goto fail_clk; + goto err_get_sync;return 0 ; -fail_clk: -clk_disable_unprepare (ks_pcie->clk); -err_phy: +err_get_sync: +pm_runtime_put (dev); +pm_runtime_disable (dev);ks_pcie_disable_phy (ks_pcie); err_link:
@@ -1023,10 +1018,11 @@ static int __exit ks_pcie_remove(struct platform_device *pdev)struct keystone_pcie *ks_pcie =platform_get_drvdata (pdev);struct device_link **link = ks_pcie->link;int num_lanes = ks_pcie->num_lanes; +struct device *dev = &pdev->dev; -clk_disable_unprepare (ks_pcie->clk); +pm_runtime_put (dev); +pm_runtime_disable (dev);ks_pcie_disable_phy (ks_pcie); -while (num_lanes--)device_link_del (link[num_lanes]);
Signature · 1 line
2.17.1
PATCH v2 13/21 PCI: keystone: Cleanup configuration space access
In reply to Kishon Vijay Abraham ICleanup configuration space access by removing ks_pcie_cfg_setup which has an unncessary check of "if (bus == 0)" which will never be the case of *_other_conf() and adding macros for configuring the CFG_SETUP register required for accessing the configuration space of the device.
--- drivers/pci/controller/dwc/pci-keystone.c | 70 +++++++---------------- 1 file changed, 20 insertions(+), 50 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +20 -50
@@ -45,7 +45,13 @@/* Application registers */ #define CMD_STATUS 0x004 +#define CFG_SETUP 0x008 +#define CFG_BUS (x) (((x) & 0xff) << 16) +#define CFG_DEVICE (x) (((x) & 0x1f) << 8) +#define CFG_FUNC (x) ((x) & 0x7) +#define CFG_TYPE1 BIT(24) +#define OB_SIZE 0x030#define CFG_PCIM_WIN_SZ_IDX 3#define CFG_PCIM_WIN_CNT 32
@@ -364,60 +370,21 @@ static void ks_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie)ks_pcie_app_writel (ks_pcie,CMD_STATUS ,OB_XLAT_EN_VAL | val); } -/** -* ks_pcie_cfg_setup() - Set up configuration space address for a device -* -* @ks_pcie: ptr to keystone_pcie structure -* @bus: Bus number the device is residing on -* @devfn: device, function number info -* -* Forms and returns the address of configuration space mapped in PCIESS -* address space 0. Also configures CFG_SETUP for remote configuration space -* access. -* -* The address space has two regions to access configuration - local and remote. -* We access local region for bus 0 (as RC is attached on bus 0) and remote -* region for others with TYPE 1 access when bus > 1. As for device on bus = 1, -* we will do TYPE 0 access as it will be on our secondary bus (logical). -* CFG_SETUP is needed only for remote configuration access. -*/ -static void __iomem *ks_pcie_cfg_setup (struct keystone_pcie *ks_pcie,u8 bus, -unsigned int devfn) -{ -u8 device =PCI_SLOT (devfn), function =PCI_FUNC (devfn); -struct dw_pcie *pci = ks_pcie->pci; -struct pcie_port *pp = &pci->pp; -u32 regval; - -if (bus ==0 ) -return pci->dbi_base; - - regval = (bus <<16 ) | (device <<8 ) | function; - -/* -* Since Bus#1 will be a virtual bus, we need to have TYPE0 -* access only. -* TYPE 1 -*/ -if (bus !=1 ) - regval |=BIT (24 ); - -ks_pcie_app_writel (ks_pcie,CFG_SETUP , regval); -return pp->va_cfg0_base; -} -static int ks_pcie_rd_other_conf (struct pcie_port *pp,struct pci_bus *bus,unsigned int devfn,int where,int size,u32 *val) {struct dw_pcie *pci =to_dw_pcie_from_pp (pp);struct keystone_pcie *ks_pcie =to_keystone_pcie (pci); -u8 bus_num = bus->number; -void __iomem *addr; +u32 reg; - addr =ks_pcie_cfg_setup (ks_pcie, bus_num, devfn); + reg =CFG_BUS (bus->number) |CFG_DEVICE (PCI_SLOT (devfn)) | +CFG_FUNC (PCI_FUNC (devfn)); +if (bus->parent->number != pp->root_bus_nr) + reg |=CFG_TYPE1 ; +ks_pcie_app_writel (ks_pcie,CFG_SETUP , reg); -return dw_pcie_read (addr + where, size, val); +return dw_pcie_read (pp->va_cfg0_base + where, size, val); } static int ks_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus,
@@ -426,12 +393,15 @@ static int ks_pcie_wr_other_conf(struct pcie_port *pp, struct pci_bus *bus, {struct dw_pcie *pci =to_dw_pcie_from_pp (pp);struct keystone_pcie *ks_pcie =to_keystone_pcie (pci); -u8 bus_num = bus->number; -void __iomem *addr; +u32 reg; - addr =ks_pcie_cfg_setup (ks_pcie, bus_num, devfn); + reg =CFG_BUS (bus->number) |CFG_DEVICE (PCI_SLOT (devfn)) | +CFG_FUNC (PCI_FUNC (devfn)); +if (bus->parent->number != pp->root_bus_nr) + reg |=CFG_TYPE1 ; +ks_pcie_app_writel (ks_pcie,CFG_SETUP , reg); -return dw_pcie_write (addr + where, size, val); +return dw_pcie_write (pp->va_cfg0_base + where, size, val); }/**
Signature · 1 line
2.17.1
PATCH v2 14/21 PCI: keystone: Get number of outbound windows from DT
In reply to Kishon Vijay Abraham IInstead of having a fixed outbound window count, get the number of outbound windows from device tree.
--- drivers/pci/controller/dwc/pci-keystone.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +11 -2
@@ -54,7 +54,6 @@#define OB_SIZE 0x030#define CFG_PCIM_WIN_SZ_IDX 3 -#define CFG_PCIM_WIN_CNT 32#define SPACE0_REMOTE_CFG_OFFSET 0x1000#define OB_OFFSET_INDEX (n) (0x200 + (8 * (n)))#define OB_OFFSET_HI (n) (0x204 + (8 * (n)))
@@ -111,6 +110,7 @@ struct keystone_pcie {int num_msi_host_irqs;int msi_host_irqs[MAX_MSI_HOST_IRQS ];int num_lanes; +u32 num_viewport;struct phy **phy;struct device_link **link;struct device_node *msi_intc_np;
@@ -341,6 +341,7 @@ static void ks_pcie_clear_dbi_mode(struct keystone_pcie *ks_pcie)static void ks_pcie_setup_rc_app_regs (struct keystone_pcie *ks_pcie) { +u32 num_viewport = ks_pcie->num_viewport;struct dw_pcie *pci = ks_pcie->pci;struct pcie_port *pp = &pci->pp;u32 start = pp->mem->start, end = pp->mem->end;
@@ -359,7 +360,7 @@ static void ks_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie) tr_size = (1 << (CFG_PCIM_WIN_SZ_IDX &0x7 )) *SZ_1M ;/* Using Direct 1:1 mapping of RC <-> PCI memory space */ -for (i =0 ; (i <CFG_PCIM_WIN_CNT ) && (start < end); i++) { +for (i =0 ; (i < num_viewport) && (start < end); i++) {ks_pcie_app_writel (ks_pcie,OB_OFFSET_INDEX (i), start |1 );ks_pcie_app_writel (ks_pcie,OB_OFFSET_HI (i),0 ); start += tr_size;
@@ -898,6 +899,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev)struct dw_pcie *pci;struct keystone_pcie *ks_pcie;struct device_link **link; +u32 num_viewport;struct phy **phy;u32 num_lanes;char name[10 ];
@@ -915,6 +917,12 @@ static int __init ks_pcie_probe(struct platform_device *pdev) pci->dev = dev; pci->ops = &ks_pcie_dw_pcie_ops; + ret =of_property_read_u32 (np,"num-viewport" , &num_viewport); +if (ret <0 ) { +dev_err (dev,"unable to read *num-viewport* property\n" ); +return ret; + } + ret =of_property_read_u32 (np,"num-lanes" , &num_lanes);if (ret) num_lanes =1 ;
@@ -949,6 +957,7 @@ static int __init ks_pcie_probe(struct platform_device *pdev) ks_pcie->pci = pci; ks_pcie->link = link; ks_pcie->num_lanes = num_lanes; + ks_pcie->num_viewport = num_viewport; ks_pcie->phy = phy; ret =ks_pcie_enable_phy (ks_pcie);
Signature · 1 line
2.17.1
PATCH v2 15/21 PCI: keystone: Cleanup outbound window configuration
In reply to Kishon Vijay Abraham IOutbound translation window is configured in order to access the PCIe card's MEM space. Cleanup outbound translation configuration here by using BIT() macros, adding a macro for window size and using lower_32_bits/upper_32_bits macros for configuring the 64 bit offset in the outbound translation region.
--- drivers/pci/controller/dwc/pci-keystone.c | 32 ++++++++++++----------- 1 file changed, 17 insertions(+), 15 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +17 -15
@@ -41,7 +41,7 @@#define LTSSM_STATE_MASK 0x1f#define LTSSM_STATE_L0 0x11#define DBI_CS2_EN_VAL 0x20 -#define OB_XLAT_EN_VAL 2 +#define OB_XLAT_EN_VAL BIT(1)/* Application registers */ #define CMD_STATUS 0x004
@@ -53,10 +53,11 @@#define CFG_TYPE1 BIT(24)#define OB_SIZE 0x030 -#define CFG_PCIM_WIN_SZ_IDX 3#define SPACE0_REMOTE_CFG_OFFSET 0x1000#define OB_OFFSET_INDEX (n) (0x200 + (8 * (n)))#define OB_OFFSET_HI (n) (0x204 + (8 * (n))) +#define OB_ENABLEN BIT(0) +#define OB_WIN_SIZE 8/* 8MB */ /* IRQ register defines */ #define IRQ_EOI 0x050
@@ -341,12 +342,13 @@ static void ks_pcie_clear_dbi_mode(struct keystone_pcie *ks_pcie)static void ks_pcie_setup_rc_app_regs (struct keystone_pcie *ks_pcie) { +u32 val;u32 num_viewport = ks_pcie->num_viewport;struct dw_pcie *pci = ks_pcie->pci;struct pcie_port *pp = &pci->pp; -u32 start = pp->mem->start, end = pp->mem->end; -int i, tr_size; -u32 val; +u64 start = pp->mem->start; +u64 end = pp->mem->end; +int i;/* Disable BARs for inbound access */ ks_pcie_set_dbi_mode (ks_pcie);
@@ -354,21 +356,21 @@ static void ks_pcie_setup_rc_app_regs(struct keystone_pcie *ks_pcie)dw_pcie_writel_dbi (pci,PCI_BASE_ADDRESS_1 ,0 );ks_pcie_clear_dbi_mode (ks_pcie); -/* Set outbound translation size per window division */ -ks_pcie_app_writel (ks_pcie,OB_SIZE ,CFG_PCIM_WIN_SZ_IDX &0x7 ); - - tr_size = (1 << (CFG_PCIM_WIN_SZ_IDX &0x7 )) *SZ_1M ; + val =ilog2 (OB_WIN_SIZE ); +ks_pcie_app_writel (ks_pcie,OB_SIZE , val);/* Using Direct 1:1 mapping of RC <-> PCI memory space */ -for (i =0 ; (i < num_viewport) && (start < end); i++) { -ks_pcie_app_writel (ks_pcie,OB_OFFSET_INDEX (i), start |1 ); -ks_pcie_app_writel (ks_pcie,OB_OFFSET_HI (i),0 ); - start += tr_size; +for (i =0 ; i < num_viewport && (start < end); i++) { +ks_pcie_app_writel (ks_pcie,OB_OFFSET_INDEX (i), +lower_32_bits (start) |OB_ENABLEN ); +ks_pcie_app_writel (ks_pcie,OB_OFFSET_HI (i), +upper_32_bits (start)); + start +=OB_WIN_SIZE ; } -/* Enable OB translation */ val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); -ks_pcie_app_writel (ks_pcie,CMD_STATUS ,OB_XLAT_EN_VAL | val); + val |=OB_XLAT_EN_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,
Signature · 1 line
2.17.1
PATCH v2 16/21 PCI: keystone: Cleanup set_dbi_mode and get_dbi_mode
In reply to Kishon Vijay Abraham INo functional change. Use BIT() macro for DBI_CS2 and cleanup set_dbimode and get_dbi_mode
--- drivers/pci/controller/dwc/pci-keystone.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +7 -5
@@ -40,7 +40,7 @@#define LTSSM_EN_VAL BIT(0)#define LTSSM_STATE_MASK 0x1f#define LTSSM_STATE_L0 0x11 -#define DBI_CS2_EN_VAL 0x20 +#define DBI_CS2 BIT(5)#define OB_XLAT_EN_VAL BIT(1)/* Application registers */
@@ -315,11 +315,12 @@ static void ks_pcie_set_dbi_mode(struct keystone_pcie *ks_pcie)u32 val; val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); -ks_pcie_app_writel (ks_pcie,CMD_STATUS ,DBI_CS2_EN_VAL | val); + val |=DBI_CS2 ; +ks_pcie_app_writel (ks_pcie,CMD_STATUS , val);do { val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); - }while (!(val &DBI_CS2_EN_VAL )); + }while (!(val &DBI_CS2 )); }/**
@@ -333,11 +334,12 @@ static void ks_pcie_clear_dbi_mode(struct keystone_pcie *ks_pcie)u32 val; val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); -ks_pcie_app_writel (ks_pcie,CMD_STATUS , ~DBI_CS2_EN_VAL & val); + val &= ~DBI_CS2 ; +ks_pcie_app_writel (ks_pcie,CMD_STATUS , val);do { val =ks_pcie_app_readl (ks_pcie,CMD_STATUS ); - }while (val &DBI_CS2_EN_VAL ); + }while (val &DBI_CS2 ); }static void ks_pcie_setup_rc_app_regs (struct keystone_pcie *ks_pcie)
Signature · 1 line
2.17.1
PATCH v2 17/21 PCI: keystone: Cleanup ks_pcie_link_up()
In reply to Kishon Vijay Abraham Iks_pcie_link_up() uses registers from the designware core to get the status of the link. Move the register defines to pcie-designware.h and cleanup ks_pcie_link_up().
--- drivers/pci/controller/dwc/pci-keystone.c | 11 +++-------- drivers/pci/controller/dwc/pcie-designware.h | 4 ++++ 2 files changed, 7 insertions(+), 8 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +3 -8
@@ -38,8 +38,6 @@/* Application register defines */ #define LTSSM_EN_VAL BIT(0) -#define LTSSM_STATE_MASK 0x1f -#define LTSSM_STATE_L0 0x11#define DBI_CS2 BIT(5)#define OB_XLAT_EN_VAL BIT(1)
@@ -87,11 +85,7 @@#define ERR_IRQ_ENABLE_SET 0x1c8#define ERR_IRQ_ENABLE_CLR 0x1cc -/* Config space registers */ -#define DEBUG0 0x728 -#define MAX_MSI_HOST_IRQS 8 -/* PCIE controller device IDs */ #define PCIE_RC_K2HK 0xb008#define PCIE_RC_K2E 0xb009
@@ -442,8 +436,9 @@ static int ks_pcie_link_up(struct dw_pcie *pci) {u32 val; - val =dw_pcie_readl_dbi (pci,DEBUG0 ); -return (val <SSM_STATE_MASK ) ==LTSSM_STATE_L0 ; + val =dw_pcie_readl_dbi (pci,PCIE_PORT_DEBUG0 ); + val &=PORT_LOGIC_LTSSM_STATE_MASK ; +return (val ==PORT_LOGIC_LTSSM_STATE_L0 ); }static void ks_pcie_initiate_link_train (struct keystone_pcie *ks_pcie)
drivers/pci/controller/dwc/pcie-designware.h +4 -0
@@ -36,6 +36,10 @@#define PORT_LINK_MODE_4_LANES (0x7 << 16)#define PORT_LINK_MODE_8_LANES (0xf << 16) +#define PCIE_PORT_DEBUG0 0x728 +#define PORT_LOGIC_LTSSM_STATE_MASK 0x1f +#define PORT_LOGIC_LTSSM_STATE_L0 0x11 +#define PCIE_LINK_WIDTH_SPEED_CONTROL 0x80C#define PORT_LOGIC_SPEED_CHANGE (0x1 << 17)#define PORT_LOGIC_LINK_WIDTH_MASK (0x1f << 8)
Signature · 1 line
2.17.1
PATCH v2 18/21 PCI: keystone: Use ERR_IRQ_STATUS instead of ERR_IRQ_STATUS_RAW to get interrupt status
In reply to Kishon Vijay Abraham IUse ERR_IRQ_STATUS instead of ERR_IRQ_STATUS_RAW to get interrupt status. ERR_IRQ_STATUS_RAW has the status of the interrupts before masking whereas ERR_IRQ_STATUS has the status of the interrupts after masking. Since all the interrupts are unmasked here, use ERR_IRQ_STATUS.
--- drivers/pci/controller/dwc/pci-keystone.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +1 -2
@@ -80,7 +80,6 @@#define ERR_IRQ_ALL (ERR_AER | ERR_AXI | ERR_CORR | \ ERR_NONFATAL | ERR_FATAL | ERR_SYS)#define ERR_FATAL_IRQ (ERR_FATAL | ERR_AXI) -#define ERR_IRQ_STATUS_RAW 0x1c0#define ERR_IRQ_STATUS 0x1c4#define ERR_IRQ_ENABLE_SET 0x1c8#define ERR_IRQ_ENABLE_CLR 0x1cc
@@ -249,7 +248,7 @@ static irqreturn_t ks_pcie_handle_error_irq(struct keystone_pcie *ks_pcie) {u32 status; - status =ks_pcie_app_readl (ks_pcie,ERR_IRQ_STATUS_RAW ) &ERR_IRQ_ALL ; + status =ks_pcie_app_readl (ks_pcie,ERR_IRQ_STATUS );if (!status)return IRQ_NONE ;
Signature · 1 line
2.17.1
PATCH v2 19/21 PCI: keystone: Add debug error message for all errors
In reply to Kishon Vijay Abraham Icommit 025dd3daeda77f61a280da87ae701 ("PCI: keystone: Add error IRQ handler") added dev_err() message only for ERR_AXI and ERR_FATAL. Add debug error message for ERR_SYS, ERR_NONFATAL, ERR_CORR and ERR_AER here.
While at that avoid using ERR_IRQ_STATUS_RAW and use ERR_IRQ_STATUS instead.
--- drivers/pci/controller/dwc/pci-keystone.c | 32 ++++++++++++++++------- 1 file changed, 23 insertions(+), 9 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +23 -9
@@ -79,7 +79,6 @@#define ERR_SYS BIT(0)/* System (fatal, non-fatal, or correctable) */ #define ERR_IRQ_ALL (ERR_AER | ERR_AXI | ERR_CORR | \ ERR_NONFATAL | ERR_FATAL | ERR_SYS) -#define ERR_FATAL_IRQ (ERR_FATAL | ERR_AXI)#define ERR_IRQ_STATUS 0x1c4#define ERR_IRQ_ENABLE_SET 0x1c8#define ERR_IRQ_ENABLE_CLR 0x1cc
@@ -246,18 +245,33 @@ static void ks_pcie_enable_error_irq(struct keystone_pcie *ks_pcie)static irqreturn_t ks_pcie_handle_error_irq (struct keystone_pcie *ks_pcie) { -u32 status; +u32 reg; +struct device *dev = ks_pcie->pci->dev; - status =ks_pcie_app_readl (ks_pcie,ERR_IRQ_STATUS ); -if (!status) + reg =ks_pcie_app_readl (ks_pcie,ERR_IRQ_STATUS ); +if (!reg)return IRQ_NONE ; -if (status &ERR_FATAL_IRQ ) -dev_err (ks_pcie->pci->dev,"fatal error (status %#010x)\n" , - status); +if (reg &ERR_SYS ) +dev_err (dev,"System Error\n" ); + +if (reg &ERR_FATAL ) +dev_err (dev,"Fatal Error\n" ); + +if (reg &ERR_NONFATAL ) +dev_dbg (dev,"Non Fatal Error\n" ); + +if (reg &ERR_CORR ) +dev_dbg (dev,"Correctable Error\n" ); + +if (reg &ERR_AXI ) +dev_err (dev,"AXI tag lookup fatal Error\n" ); + +if (reg &ERR_AER ) +dev_err (dev,"ECRC Error\n" ); + +ks_pcie_app_writel (ks_pcie,ERR_IRQ_STATUS , reg); -/* Ack the IRQ; status bits are RW1C */ -ks_pcie_app_writel (ks_pcie,ERR_IRQ_STATUS , status);return IRQ_HANDLED ; }
Signature · 1 line
2.17.1
PATCH v2 20/21 PCI: keystone: Reorder header file in alphabetical order
In reply to Kishon Vijay Abraham INo functional change. Reorder header file in alphabetical order.
--- drivers/pci/controller/dwc/pci-keystone.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +4 -4
@@ -9,19 +9,19 @@* Implementation based on pci-exynos.c and pcie-designware.c */ -#include <linux/irqchip/chained_irq.h> #include <linux/clk.h> #include <linux/delay.h> +#include <linux/init.h> #include <linux/interrupt.h> +#include <linux/irqchip/chained_irq.h> #include <linux/irqdomain.h> -#include <linux/init.h> #include <linux/mfd/syscon.h> #include <linux/msi.h> -#include <linux/of_irq.h> #include <linux/of.h> +#include <linux/of_irq.h> #include <linux/of_pci.h> -#include <linux/platform_device.h> #include <linux/phy/phy.h> +#include <linux/platform_device.h> #include <linux/regmap.h> #include <linux/resource.h> #include <linux/signal.h>
Signature · 1 line
2.17.1
PATCH v2 21/21 PCI: keystone: Cleanup macros defined in pci-keystone.c
In reply to Kishon Vijay Abraham INo functional change. Cleanup macros defined in pci-keystone.c by removing unused macros, grouping the macros and aligning it properly.
--- drivers/pci/controller/dwc/pci-keystone.c | 41 +++++++++-------------- 1 file changed, 16 insertions(+), 25 deletions(-)
drivers/pci/controller/dwc/pci-keystone.c +16 -25
@@ -28,21 +28,14 @@#include "pcie-designware.h" -#define DRIVER_NAME "keystone-pcie" -#define PCIE_VENDORID_MASK 0xffff#define PCIE_DEVICEID_SHIFT 16 -/* DEV_STAT_CTRL */ -#define PCIE_CAP_BASE 0x70 - -/* Application register defines */ -#define LTSSM_EN_VAL BIT(0) -#define DBI_CS2 BIT(5) -#define OB_XLAT_EN_VAL BIT(1) -/* Application registers */ #define CMD_STATUS 0x004 +#define LTSSM_EN_VAL BIT(0) +#define OB_XLAT_EN_VAL BIT(1) +#define DBI_CS2 BIT(5)#define CFG_SETUP 0x008#define CFG_BUS (x) (((x) & 0xff) << 16)
@@ -70,27 +63,25 @@#define IRQ_STATUS 0x184#define MSI_IRQ_OFFSET 4 -/* Error IRQ bits */ -#define ERR_AER BIT(5)/* ECRC error */ -#define ERR_AXI BIT(4)/* AXI tag lookup fatal error */ -#define ERR_CORR BIT(3)/* Correctable error */ -#define ERR_NONFATAL BIT(2)/* Non-fatal error */ -#define ERR_FATAL BIT(1)/* Fatal error */ -#define ERR_SYS BIT(0)/* System (fatal, non-fatal, or correctable) */ -#define ERR_IRQ_ALL (ERR_AER | ERR_AXI | ERR_CORR | \ - ERR_NONFATAL | ERR_FATAL | ERR_SYS)#define ERR_IRQ_STATUS 0x1c4#define ERR_IRQ_ENABLE_SET 0x1c8 -#define ERR_IRQ_ENABLE_CLR 0x1cc +#define ERR_AER BIT(5)/* ECRC error */ +#define ERR_AXI BIT(4)/* AXI tag lookup fatal error */ +#define ERR_CORR BIT(3)/* Correctable error */ +#define ERR_NONFATAL BIT(2)/* Non-fatal error */ +#define ERR_FATAL BIT(1)/* Fatal error */ +#define ERR_SYS BIT(0)/* System error */ +#define ERR_IRQ_ALL (ERR_AER | ERR_AXI | ERR_CORR | \ + ERR_NONFATAL | ERR_FATAL | ERR_SYS)#define MAX_MSI_HOST_IRQS 8/* PCIE controller device IDs */ -#define PCIE_RC_K2HK 0xb008 -#define PCIE_RC_K2E 0xb009 -#define PCIE_RC_K2L 0xb00a -#define PCIE_RC_K2G 0xb00b +#define PCIE_RC_K2HK 0xb008 +#define PCIE_RC_K2E 0xb009 +#define PCIE_RC_K2L 0xb00a +#define PCIE_RC_K2G 0xb00b -#define to_keystone_pcie (x) dev_get_drvdata((x)->dev) +#define to_keystone_pcie (x) dev_get_drvdata((x)->dev)struct keystone_pcie {struct dw_pcie *pci;
Signature · 1 line
2.17.1
Lorenzo Pieralisi
AppliedQuoted 46 lines · Kishon Vijay Abraham I
The PCIe controller in AM654 uses Synopsys core revision 4.90a and uses the same TI wrapper as used in keystone2 with certain modification. Hence AM654 will use the same pci wrapper driver
pci-keystone.cIn preparation for adding AM654 support, cleanup pci-keystone driver here.
Most of the cleanups here are trivial with major modification being merging
pci-keystone-dw.candpci-keystone.cCleaning-up irq handling in the RFC series is dropped here as it has few comments to be addressed.
Changes from v1:
*) removephy_resetin the cleanup PHY handling patch. It will be sent
while adding AM654 support
*) Add a separate patch for usingERR_IRQ_STATUSinstead of
ERR_IRQ_STATUS_RAW
*) Split outbound window configuration into two patches. One which
gets the number of outbound windows from DT and the other cleansup outbound window configuration.Kishon Vijay Abraham I (21):
PCI: keystone: Use quirk to limit MRRS for K2G
PCI: keystone: Use quirk to set MRRS for PCI host bridge
PCI: keystone: Movedw_pcie_setup_rcout ofks_pcie_establish_link()
PCI: keystone: Do not initiate link training multiple times
PCI: keystone: Remove unused argument fromks_dw_pcie_host_init()
PCI: keystone: Mergepci-keystone-dw.candpci-keystone.c
PCI: keystone: Remove redundantplatform_set_drvdata
PCI: keystone: Use uniform function naming convention
dt-bindings: PCI: keystone: Add bindings to get device control module
PCI: keystone: Use syscon APIs to get device id from control module
PCI: keystone: Cleanup PHY handling
PCI: keystone: Invokepm_runtimeAPIs to enable clock
PCI: keystone: Cleanup configuration space access
PCI: keystone: Get number of outbound windows from DT
PCI: keystone: Cleanup outbound window configuration
PCI: keystone: Cleanupset_dbi_modeandget_dbi_mode
PCI: keystone: Cleanupks_pcie_link_up()
PCI: keystone: UseERR_IRQ_STATUSinstead ofERR_IRQ_STATUS_RAWto get
interrupt status
PCI: keystone: Add debug error message for all errors
PCI: keystone: Reorder header file in alphabetical order
PCI: keystone: Cleanup macros defined inpci-keystone.c
Quoted 10 lines
.../devicetree/bindings/pci/pci-keystone.txt | 3 + MAINTAINERS | 2 +- drivers/pci/controller/dwc/Makefile | 2 +- drivers/pci/controller/dwc/pci-keystone-dw.c | 484 ----------- drivers/pci/controller/dwc/pci-keystone.c | 788 +++++++++++++++--- drivers/pci/controller/dwc/pci-keystone.h | 57 -- drivers/pci/controller/dwc/pcie-designware.h | 4 + 7 files changed, 686 insertions(+), 654 deletions(-) delete mode 100644 drivers/pci/controller/dwc/pci-keystone-dw.c delete mode 100644 drivers/pci/controller/dwc/pci-keystone.h
I have applied the series to pci/keystone, tentatively for v4.20.
Thanks,
Lorenzo