pci: agilex_rp: add pci root port support for agilex platform
cover pci: agilex_rp: add pci root port support for agilex platform
From: D M Sharath Kumar <[email protected]>
added new callback for
1) read,write to root port configuration registers
2) read,write to endpoint configuration registers
3) root port interrupt handler
agilex and newer platforms need to implemant the callback
and generic root port driver should work ( without much changes ) , legacy platforms (arria and startix) implement configuration read,write directly in wrapper api _altera_pcie_cfg_read/_altera_pcie_cfg_write
D M Sharath Kumar (1):
pci: agilex_pci: add pcie rootport support for agilex
drivers/pci/controller/pcie-altera.c | 278 ++++++++++++++++++++++++++- 1 file changed, 268 insertions(+), 10 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/1 pci: agilex_pci: add pcie rootport support for agilex
From: D M Sharath Kumar <[email protected]>
--- drivers/pci/controller/pcie-altera.c | 278 ++++++++++++++++++++++++++- 1 file changed, 268 insertions(+), 10 deletions(-)
drivers/pci/controller/pcie-altera.c +268 -10
@@ -3,6 +3,7 @@* Copyright Altera Corporation (C) 2013-2015. All rights reserved * * Author: Ley Foon Tan <[email protected]> +* Author: sharath <[email protected]> * Description: Altera PCIe host controller driver */
@@ -18,6 +19,7 @@#include <linux/pci.h> #include <linux/platform_device.h> #include <linux/slab.h> +#include <linux/bitops.h> #include "../pci.h"
@@ -79,9 +81,21 @@#define S10_TLP_FMTTYPE_CFGWR0 0x45#define S10_TLP_FMTTYPE_CFGWR1 0x44 +#define AGLX_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg)) +#define AGLX_RP_SECONDARY (pcie) \ + readb(AGLX_RP_CFG_ADDR(pcie, PCI_SECONDARY_BUS)) + +#define AGLX_BDF_REG 0x00002004 +#define AGLX_ROOT_PORT_IRQ_STATUS 0x14c +#define AGLX_ROOT_PORT_IRQ_ENABLE 0x150 +#define CFG_AER BIT(4) +static u32 port_conf_off; +enum altera_pcie_version {ALTERA_PCIE_V1 =0 ,ALTERA_PCIE_V2 , +ALTERA_PCIE_V3 ,/* AGILEX */ };struct altera_pcie {
@@ -93,6 +107,7 @@ struct altera_pcie {struct irq_domain *irq_domain;struct resource bus_range;const struct altera_pcie_data *pcie_data; +void __iomem *cs_base; };struct altera_pcie_ops {
@@ -104,6 +119,11 @@ struct altera_pcie_ops { int size, u32 *value);int (*rp_write_cfg)(struct altera_pcie *pcie,u8 busno,int where,int size,u32 value); +int (*ep_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*ep_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value); +void (*rp_isr)(struct irq_desc *desc); };struct altera_pcie_data {
@@ -133,6 +153,38 @@ static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)return readl_relaxed (pcie->cra_base + reg); } +static inline void cs_writel (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writel_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writew (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writew_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writeb (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writeb_relaxed (value, pcie->cs_base + reg); +} + +static inline u32 cs_readl (struct altera_pcie *pcie,const u32 reg) +{ +return readl_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readw (struct altera_pcie *pcie,const u32 reg) +{ +return readw_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readb (struct altera_pcie *pcie,const u32 reg) +{ +return readb_relaxed (pcie->cs_base + reg); +}static bool altera_pcie_link_up (struct altera_pcie *pcie) {return !!((cra_readl (pcie,RP_LTSSM ) &RP_LTSSM_MASK ) ==LTSSM_L0 );
@@ -147,6 +199,15 @@ static bool s10_altera_pcie_link_up(struct altera_pcie *pcie)return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); } +static bool aglx_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, + pcie->pcie_data->cap_offset + +PCI_EXP_LNKSTA ); + +return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); +} +/* * Altera PCIe port uses BAR0 of RC's configuration space as the translation * from PCI bus to native BUS. Entire DDR region is mapped into PCIe space
@@ -427,6 +488,126 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } +static int aglx_rp_read_cfg (struct altera_pcie *pcie,int where, +int size,u32 *value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + } + +if (where ==0x3d ) + *value =0x01 ; +if (where ==0x3c ) + *value |=0x0100 ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_rp_write_cfg (struct altera_pcie *pcie,u8 busno, +int where,int size,u32 value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : +writeb (value, addr); +break ; +case 2 : +writew (value, addr); +break ; +default : +writel (value, addr); +break ; + } + +/* +* Monitor changes to PCI_PRIMARY_BUS register on root port +* and update local copy of root bus number accordingly. +*/ +if (busno == pcie->root_bus_nr && where ==PCI_PRIMARY_BUS ) + pcie->root_bus_nr = value &0xff ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_ep_write_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value) +{ +cs_writel (pcie, ((busno <<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) { +/* type 1 */ +switch (size) { +case 1 : +cs_writeb (pcie, value, ((1 <<12 ) | where)); +break ; +case 2 : +cs_writew (pcie, value, ((1 <<12 ) | where)); +break ; +default : +cs_writel (pcie, value, ((1 <<12 ) | where)); +break ; + } + }else { +/* type 0 */ +switch (size) { +case 1 : +cs_writeb (pcie, value, where); +break ; +case 2 : +cs_writew (pcie, value, where); +break ; +default : +cs_writel (pcie, value, where); +break ; + } + } +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_ep_read_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value) +{ +cs_writel (pcie, ((busno <<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) { +/* type 0 */ +switch (size) { +case 1 : + *value =cs_readb (pcie, ((1 <<12 ) | where)); +break ; +case 2 : + *value =cs_readw (pcie, ((1 <<12 ) | where)); +break ; +default : + *value =cs_readl (pcie, ((1 <<12 ) | where)); +break ; + } + }else { +/* type 0 */ +switch (size) { +case 1 : + *value =cs_readb (pcie, where); +break ; +case 2 : + *value =cs_readw (pcie, where); +break ; +default : + *value =cs_readl (pcie, where); +break ; + } + } +return PCIBIOS_SUCCESSFUL ; +} +static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno,unsigned int devfn,int where,int size,u32 *value)
@@ -439,6 +620,10 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno,return pcie->pcie_data->ops->rp_read_cfg (pcie, where, size, value); +if (pcie->pcie_data->ops->ep_read_cfg) +return pcie->pcie_data->ops->ep_read_cfg (pcie, busno, devfn, + where, size, value); +switch (size) {case 1 : byte_en =1 << (where &3 );
@@ -483,6 +668,10 @@ static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, where, size, value); +if (pcie->pcie_data->ops->ep_write_cfg) +return pcie->pcie_data->ops->ep_write_cfg (pcie, busno, devfn, + where, size, value); +switch (size) {case 1 : data32 = (value &0xff ) << shift;
@@ -661,7 +850,30 @@ static void altera_pcie_isr(struct irq_desc *desc)dev_err_ratelimited (dev,"unexpected IRQ, INT%d\n" , bit); } } +chained_irq_exit (chip, desc); +} +static void aglx_isr (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); +struct altera_pcie *pcie; +struct device *dev; +u32 status; +int ret; + +chained_irq_enter (chip, desc); + pcie =irq_desc_get_handler_data (desc); + dev = &pcie->pdev->dev; + + status =readl ((pcie->hip_base + port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +if (status &CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ,\n" ); + } +writel (CFG_AER , (pcie->hip_base + port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS ));chained_irq_exit (chip, desc); }
@@ -692,11 +904,27 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) {struct platform_device *pdev = pcie->pdev; - pcie->cra_base =devm_platform_ioremap_resource_byname (pdev,"Cra" ); -if (IS_ERR (pcie->cra_base)) -return PTR_ERR (pcie->cra_base); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { + pcie->cra_base = +devm_platform_ioremap_resource_byname (pdev,"Cra" ); +if (IS_ERR (pcie->cra_base)) +return PTR_ERR (pcie->cra_base); + } -if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { +if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { + pcie->cs_base = +devm_platform_ioremap_resource_byname (pdev,"Cs" ); +if (IS_ERR (pcie->cs_base)) +return PTR_ERR (pcie->cs_base); +of_property_read_u32 (pcie->pdev->dev.of_node,"port_conf_stat" , + &port_conf_off); +dev_info (&pcie->pdev->dev,"port_conf_stat_off =%x\n" , + port_conf_off); + } + +if ((pcie->pcie_data->version ==ALTERA_PCIE_V2 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V3 )) { pcie->hip_base =devm_platform_ioremap_resource_byname (pdev,"Hip" );if (IS_ERR (pcie->hip_base))
@@ -708,7 +936,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)if (pcie->irq <0 )return pcie->irq; -irq_set_chained_handler_and_data (pcie->irq, altera_pcie_isr, pcie); +irq_set_chained_handler_and_data (pcie->irq, + pcie->pcie_data->ops->rp_isr, pcie);return 0 ; }
@@ -721,6 +950,7 @@ static const struct altera_pcie_ops altera_pcie_ops_1_0 = { .tlp_read_pkt = tlp_read_packet, .tlp_write_pkt = tlp_write_packet, .get_link_status = altera_pcie_link_up, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_ops altera_pcie_ops_2_0 = {
@@ -729,6 +959,16 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .get_link_status = s10_altera_pcie_link_up, .rp_read_cfg = s10_rp_read_cfg, .rp_write_cfg = s10_rp_write_cfg, + .rp_isr = altera_pcie_isr, +}; + +static const struct altera_pcie_ops altera_pcie_ops_3_0 = { + .rp_read_cfg = aglx_rp_read_cfg, + .rp_write_cfg = aglx_rp_write_cfg, + .get_link_status = aglx_altera_pcie_link_up, + .ep_read_cfg = aglx_ep_read_cfg, + .ep_write_cfg = aglx_ep_write_cfg, + .rp_isr = aglx_isr, };static const struct altera_pcie_data altera_pcie_1_0_data = {
@@ -751,11 +991,23 @@ static const struct altera_pcie_data altera_pcie_2_0_data = { .cfgwr1 = S10_TLP_FMTTYPE_CFGWR1, }; +static const struct altera_pcie_data altera_pcie_3_0_data = { + .ops = &altera_pcie_ops_3_0, + .version =ALTERA_PCIE_V3 , + .cap_offset =0x70 , + .cfgrd0 =0 , + .cfgrd1 =0 , + .cfgwr0 =0 , + .cfgwr1 =0 , +}; +static const struct of_device_id altera_pcie_of_match[] = { {.compatible ="altr,pcie-root-port-1.0" , .data = &altera_pcie_1_0_data }, {.compatible ="altr,pcie-root-port-2.0" , .data = &altera_pcie_2_0_data }, + {.compatible ="altr,pcie-root-port-3.0" , + .data = &altera_pcie_3_0_data }, {}, };
@@ -793,11 +1045,17 @@ static int altera_pcie_probe(struct platform_device *pdev)return ret; } -/* clear all interrupts */ -cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); -/* enable all interrupts */ -cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); -altera_pcie_host_init (pcie); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { +/* clear all interrupts */ +cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); +/* enable all interrupts */ +cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); +altera_pcie_host_init (pcie); + }else if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { +writel (CFG_AER , (pcie->hip_base + port_conf_off + +AGLX_ROOT_PORT_IRQ_ENABLE )); + } bridge->sysdata = pcie; bridge->busnr = pcie->root_bus_nr;
Signature · 1 line
2.34.1
Re: [PATCH 1/1] pci: agilex_pci: add pcie rootport support for agilex
Thanks for your patch. If/when you revise it, run "git log --oneline drivers/pci/controller/pcie-altera.c" and match the style of subject lines, e.g.,
PCI: altera: Add Intel Agilex support
Quoted 1 line · On Fri, Jun 16, 2023 at 12:03:13PM +0530, [email protected] wrote:
From: D M Sharath Kumar <[email protected]>
Also, please include a commit log.
Probably should also update the Kconfig help text to mention Agilex in addition to Altera.
Quoted 1 line
+#include <
linux/bitops.h>
I don't think this is needed.
Quoted 11 lines
drivers/pci/controller/pcie-altera.c +11
-0+static int aglx_rp_read_cfg (struct altera_pcie *pcie,int where, +int size,u32 *value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr);
drivers/pci/controller/pcie-altera.c static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, · line 511
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +10
-0+break ; +default : + *value =readl (addr); +break ; + } + +if (where ==0x3d ) + *value =0x01 ; +if (where ==0x3c ) + *value |=0x0100 ;
This magic needs a comment. Apparently it works around some hardware defect? What happens if this is a single byte read? Looks like it may set more than one byte of *value.
Quoted 21 lines
drivers/pci/controller/pcie-altera.c +21
-0+static int aglx_ep_write_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value) +{ +cs_writel (pcie, ((busno <<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) { +/* type 1 */ +switch (size) { +case 1 : +cs_writeb (pcie, value, ((1 <<12 ) | where)); +break ; +case 2 : +cs_writew (pcie, value, ((1 <<12 ) | where)); +break ; +default : +cs_writel (pcie, value, ((1 <<12 ) | where)); +break ; + } + }else { +/* type 0 */ +switch (size) { +case 1 :
drivers/pci/controller/pcie-altera.c static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, · line 573
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +10
-0+cs_writeb (pcie, value, where); +break ; +case 2 : +cs_writew (pcie, value, where); +break ; +default : +cs_writel (pcie, value, where); +break ; + } + }
These switches could be combined, e.g.,
if (busno > AGLX_RP_SECONDARY(pcie))
where |= 1 << 12;drivers/pci/controller/pcie-altera.c static void altera_pcie_isr(struct irq_desc *desc) · line 873
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +4
-0+if (status &CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ,\n" );
Spurious "," at end of line.
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +0
-0@@ -692,11 +904,27 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) {struct platform_device *pdev = pcie->pdev;
drivers/pci/controller/pcie-altera.c static int altera_pcie_parse_dt(struct altera_pcie *pcie) · line 913
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +7
-3- pcie->cra_base =devm_platform_ioremap_resource_byname (pdev,"Cra" ); -if (IS_ERR (pcie->cra_base)) -return PTR_ERR (pcie->cra_base); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { + pcie->cra_base = +devm_platform_ioremap_resource_byname (pdev,"Cra" ); +if (IS_ERR (pcie->cra_base)) +return PTR_ERR (pcie->cra_base); + }
Should be a separate introductory patch since it's not directly related to Agilex.
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +3
-1-if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { +if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { + pcie->cs_base = +devm_platform_ioremap_resource_byname (pdev,"Cs" );
drivers/pci/controller/pcie-altera.c static int altera_pcie_parse_dt(struct altera_pcie *pcie) · line 927
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +10
-0+if (IS_ERR (pcie->cs_base)) +return PTR_ERR (pcie->cs_base); +of_property_read_u32 (pcie->pdev->dev.of_node,"port_conf_stat" , + &port_conf_off); +dev_info (&pcie->pdev->dev,"port_conf_stat_off =%x\n" , + port_conf_off); + } + +if ((pcie->pcie_data->version ==ALTERA_PCIE_V2 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V3 )) {
Ditto.
drivers/pci/controller/pcie-altera.c static int altera_pcie_parse_dt(struct altera_pcie *pcie) · line 940
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +2
-1pcie->hip_base =devm_platform_ioremap_resource_byname (pdev,"Hip" );if (IS_ERR (pcie->hip_base))@@ -708,7 +936,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)if (pcie->irq <0 )return pcie->irq; -irq_set_chained_handler_and_data (pcie->irq, altera_pcie_isr, pcie); +irq_set_chained_handler_and_data (pcie->irq, + pcie->pcie_data->ops->rp_isr, pcie);
Ditto (including the new .rp_isr initializations below).
Quoted 13 lines
drivers/pci/controller/pcie-altera.c +1
-2@@ -721,6 +950,7 @@ static const struct altera_pcie_ops altera_pcie_ops_1_0 = { .tlp_read_pkt = tlp_read_packet, .tlp_write_pkt = tlp_write_packet, .get_link_status = altera_pcie_link_up, + .rp_isr = altera_pcie_isr, };@@ -793,11 +1045,17 @@ static int altera_pcie_probe(struct platform_device *pdev)return ret; } -/* clear all interrupts */ -cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS );
drivers/pci/controller/pcie-altera.c static int altera_pcie_probe(struct platform_device *pdev) · line 1054
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +7
-3-/* enable all interrupts */ -cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); -altera_pcie_host_init (pcie); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { +/* clear all interrupts */ +cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); +/* enable all interrupts */ +cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); +altera_pcie_host_init (pcie);
Ditto.
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +4
-0+ }else if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { +writel (CFG_AER , (pcie->hip_base + port_conf_off + +AGLX_ROOT_PORT_IRQ_ENABLE )); + } bridge->sysdata = pcie; bridge->busnr = pcie->root_bus_nr;Signature · 1 line
2.34.1
v2 cover PCI: Altera: add support to Agilex family
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
added new callback for
1) read,write to root port configuration registers
2) read,write to endpoint configuration registers
3) root port interrupt handler
agilex and newer platforms need to implemant the callback and generic root port driver should work ( without much changes ) , legacy platforms (arria and startix) implement configuration read,write directly in wrapper api _altera_pcie_cfg_read/_altera_pcie_cfg_write
changelog v2:
saperated into two patches
1.refactored the driver for easily portability to future Altera FPGA platforms
2.added support for "Agilex" FPGA
this driver supports PCI RP IP on Agilex FPGA, as these are FPGA its up to the user to add PCI RP or not ( as per his needs). we are not adding the device tree as part of this commit. we are expecting the add device tree changes only if he is adding PCI RP IP in his design
D M Sharath Kumar (2):
PCI: altera: refactor driver for supporting new platform
PCI: altera: add suport for Agilex Family FPGA
drivers/pci/controller/pcie-altera.c | 313 ++++++++++++++++++++++++--- 1 file changed, 283 insertions(+), 30 deletions(-)
Signature · 1 line
2.34.1
PATCH v2 1/2 PCI: altera: refactor driver for supporting new platform
From: D M Sharath Kumar <[email protected]>
--- drivers/pci/controller/pcie-altera.c | 100 +++++++++++++++++++-------- 1 file changed, 70 insertions(+), 30 deletions(-)
drivers/pci/controller/pcie-altera.c +70 -30
@@ -3,6 +3,7 @@* Copyright Altera Corporation (C) 2013-2015. All rights reserved * * Author: Ley Foon Tan <[email protected]> +* Author: sharath <[email protected]> * Description: Altera PCIe host controller driver */
@@ -100,10 +101,15 @@ struct altera_pcie_ops {void (*tlp_write_pkt)(struct altera_pcie *pcie,u32 *headers,u32 data,bool align);bool (*get_link_status)(struct altera_pcie *pcie); -int (*rp_read_cfg)(struct altera_pcie *pcie,int where, -int size,u32 *value); +int (*rp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value);int (*rp_write_cfg)(struct altera_pcie *pcie,u8 busno, -int where,int size,u32 value); +unsigned int devfn,int where,int size,u32 value); +int (*ep_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*ep_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value); +void (*rp_isr)(struct irq_desc *desc); };struct altera_pcie_data {
@@ -380,8 +386,8 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_read_cfg (struct altera_pcie *pcie,int where, -int size,u32 *value) +static int s10_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -400,7 +406,7 @@ static int s10_rp_read_cfg(struct altera_pcie *pcie, int where,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno, +static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -427,18 +433,13 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 *value) +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {int ret;u32 data;u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) -return pcie->pcie_data->ops->rp_read_cfg (pcie, where, - size, value); -switch (size) {case 1 : byte_en =1 << (where &3 );
@@ -471,18 +472,13 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 value) +static int arr_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) {u32 data32;u32 shift =8 * (where &3 );u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) -return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, - where, size, value); -switch (size) {case 1 : data32 = (value &0xff ) << shift;
@@ -500,6 +496,35 @@ static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,return tlp_cfg_dword_write (pcie, busno, devfn, (where & ~DWORD_MASK ), byte_en, data32); + +} + +static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 *value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) +return pcie->pcie_data->ops->rp_read_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->ep_read_cfg) +return pcie->pcie_data->ops->ep_read_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; +} + +static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) +return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->ep_write_cfg) +return pcie->pcie_data->ops->ep_write_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; } static int altera_pcie_cfg_read(struct pci_bus *bus, unsigned int devfn,
@@ -661,7 +686,6 @@ static void altera_pcie_isr(struct irq_desc *desc)dev_err_ratelimited (dev,"unexpected IRQ, INT%d\n" , bit); } } -chained_irq_exit (chip, desc); }
@@ -692,9 +716,13 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) {struct platform_device *pdev = pcie->pdev; - pcie->cra_base =devm_platform_ioremap_resource_byname (pdev,"Cra" ); -if (IS_ERR (pcie->cra_base)) -return PTR_ERR (pcie->cra_base); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { + pcie->cra_base = +devm_platform_ioremap_resource_byname (pdev,"Cra" ); +if (IS_ERR (pcie->cra_base)) +return PTR_ERR (pcie->cra_base); + }if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { pcie->hip_base =
@@ -708,7 +736,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)if (pcie->irq <0 )return pcie->irq; -irq_set_chained_handler_and_data (pcie->irq, altera_pcie_isr, pcie); +irq_set_chained_handler_and_data (pcie->irq, + pcie->pcie_data->ops->rp_isr, pcie);return 0 ; }
@@ -721,6 +750,11 @@ static const struct altera_pcie_ops altera_pcie_ops_1_0 = { .tlp_read_pkt = tlp_read_packet, .tlp_write_pkt = tlp_write_packet, .get_link_status = altera_pcie_link_up, + .rp_read_cfg = arr_read_cfg, + .rp_write_cfg = arr_write_cfg, + .ep_read_cfg = arr_read_cfg, + .ep_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_ops altera_pcie_ops_2_0 = {
@@ -729,6 +763,9 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .get_link_status = s10_altera_pcie_link_up, .rp_read_cfg = s10_rp_read_cfg, .rp_write_cfg = s10_rp_write_cfg, + .ep_read_cfg = arr_read_cfg, + .ep_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_data altera_pcie_1_0_data = {
@@ -793,11 +830,14 @@ static int altera_pcie_probe(struct platform_device *pdev)return ret; } -/* clear all interrupts */ -cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); -/* enable all interrupts */ -cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); -altera_pcie_host_init (pcie); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { +/* clear all interrupts */ +cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); +/* enable all interrupts */ +cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); +altera_pcie_host_init (pcie); + } bridge->sysdata = pcie; bridge->busnr = pcie->root_bus_nr;
Signature · 1 line
2.34.1
Re: [PATCH v2 1/2] PCI: altera: refactor driver for supporting new platform
Capitalize subject line to match history:
PCI: altera: Refactor driver for supporting new platform
Quoted 1 line · On Wed, Sep 06, 2023 at 04:39:17PM +0530, [email protected] wrote:
From: D M Sharath Kumar <[email protected]>
Needs a commit log. It's OK to repeat the subject line. Also helpful if you can hint about why it needs to be refactored. In this case, it looks like you'll need to have a different ISR for Agilex, and also something different about root bus vs downstream config accesses.
Quoted 5 lines
drivers/pci/controller/pcie-altera.c +0
-1@@ -100,10 +101,15 @@ struct altera_pcie_ops {void (*tlp_write_pkt)(struct altera_pcie *pcie,u32 *headers,u32 data,bool align);bool (*get_link_status)(struct altera_pcie *pcie); - int (*rp_read_cfg)(struct altera_pcie *pcie, int where,
drivers/pci/controller/pcie-altera.c struct altera_pcie_ops { · line 111
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +7
-2- int size, u32 *value); +int (*rp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value);int (*rp_write_cfg)(struct altera_pcie *pcie,u8 busno, -int where,int size,u32 value); +unsigned int devfn,int where,int size,u32 value); +int (*ep_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*ep_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value);
"ep_read_cfg" isn't the ideal name because it suggests "endpoint", but it may be either an endpoint or a switch upstream port. The rockchip driver uses "other", which isn't super descriptive either but might be better.
drivers/pci/controller/pcie-altera.c static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno, · line 508
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +8
-0+void (*rp_isr)(struct irq_desc *desc); }; +static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 *value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) +return pcie->pcie_data->ops->rp_read_cfg (pcie, busno, devfn, + where, size, value);
Several other drivers use pci_is_root_bus() instead of keeping track of root_bus_nr and watching for changes to it. Maybe simpler and more reliable? That would be best as a separate patch all by itself if you go that direction.
Quoted 6 lines
drivers/pci/controller/pcie-altera.c +6
-0+ +if (pcie->pcie_data->ops->ep_read_cfg) +return pcie->pcie_data->ops->ep_read_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; +}
RE: [PATCH v2 1/2] PCI: altera: refactor driver for supporting new platform
Quoted 16 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]>
Sent: Wednesday, September 6, 2023 10:38 PM
To: D M, Sharath Kumar <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v2 1/2] PCI: altera: refactor driver for supporting new platformCapitalize subject line to match history:
PCI: altera: Refactor driver for supporting new platform
Quoted 9 lines
Quoted 1 line · On Wed, Sep 06, 2023 at 04:39:17PM +0530, [email protected] wrote:
From: D M Sharath Kumar <[email protected]>
Needs a commit log. It's OK to repeat the subject line. Also helpful if you can hint about why it needs to be refactored. In this case, it looks like you'll need to have a different ISR for Agilex, and also something different about root bus vs downstream config accesses.
ok
Quoted 11 lines
Quoted 11 lines
drivers/pci/controller/pcie-altera.c +3
-3@@ -100,10 +101,15 @@ struct altera_pcie_ops {void (*tlp_write_pkt)(struct altera_pcie *pcie,u32 *headers,u32 data,bool align);bool (*get_link_status)(struct altera_pcie *pcie); -int (*rp_read_cfg)(struct altera_pcie *pcie,int where, -int size,u32 *value); +int (*rp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value);int (*rp_write_cfg)(struct altera_pcie *pcie,u8 busno, -int where,int size,u32 value); +unsigned int devfn,int where,int size,u32 value);
Quoted 9 lines
drivers/pci/controller/pcie-altera.c struct altera_pcie_ops { · line 111
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +4
-0+int (*ep_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*ep_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value);"
ep_read_cfg" isn't the ideal name because it suggests "endpoint", but it may be either an endpoint or a switch upstream port. The rockchip driver uses "other", which isn't super descriptive either but might be better.
Ok will change to "nonrp_read_cfg" ?
Quoted 11 lines
Review
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +6
-0+void (*rp_isr)(struct irq_desc *desc); }; +static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno, + unsigned int devfn, int where, int size, + u32 *value) +{ + if (busno == pcie->root_bus_nr && pcie->pcie_data->ops-
rp_read_cfg)(quoted diff) +1
-0+ return pcie->pcie_data->ops->rp_read_cfg(pcie, busno,devfn,
Quoted 7 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ where, size, value);Several other drivers use
pci_is_root_bus()instead of keeping track ofroot_bus_nrand watching for changes to it. Maybe simpler and more reliable? That would be best as a separate patch all by itself if you go that direction.
Will not take up as part of this commit
Quoted 7 lines
drivers/pci/controller/pcie-altera.c static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,
Quoted 3 lines
drivers/pci/controller/pcie-altera.c +3
-0+ +if (pcie->pcie_data->ops->ep_read_cfg) + return pcie->pcie_data->ops->ep_read_cfg(pcie, busno,devfn,
Quoted 3 lines
drivers/pci/controller/pcie-altera.c +3
-0+ where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; +}
Re: [PATCH v2 1/2] PCI: altera: refactor driver for supporting new platform
Quoted 13 lines · Sharath Kumar
Quoted 4 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]>
...Quoted 9 lines
drivers/pci/controller/pcie-altera.c struct altera_pcie_ops { · line 111
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +4
-0+int (*ep_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*ep_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value);"
ep_read_cfg" isn't the ideal name because it suggests "endpoint", but it may be either an endpoint or a switch upstream port. The rockchip driver uses "other", which isn't super descriptive either but might be better.
Quoted 1 line
Ok will change to "
nonrp_read_cfg" ?
I think the important point is not whether it's a Root Port or not, but whether it's on the root *bus* or not. In other words, I think the driver has to determine whether to generate a Type 0 (targeting something on the root bus) or a Type 1 (targeting something below a bridge) config transaction (see PCI-to-PCI Bridge spec r1.2, sec 3.1.2.1).
There can be non-Root Ports on the root bus, so "nonrp" doesn't seem quite right. "Other" would be OK, since that's already used by other drivers. Maybe "type0" and "type1" would be better and would fit well with the root_bus_nr check you use to distinguish them?
Quoted 16 lines
Quoted 16 lines
Review
Quoted 7 lines
drivers/pci/controller/pcie-altera.c +5
-0+static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno, + unsigned int devfn, int where, int size, + u32 *value) +{ + if (busno == pcie->root_bus_nr && pcie->pcie_data->ops-
rp_read_cfg)(quoted diff) +1
-0+ return pcie->pcie_data->ops->rp_read_cfg(pcie, busno,devfn,
drivers/pci/controller/pcie-altera.c static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +4
-0+ where, size, value); + +if (pcie->pcie_data->ops->ep_read_cfg) + return pcie->pcie_data->ops->ep_read_cfg(pcie, busno,devfn,
Quoted 3 lines
drivers/pci/controller/pcie-altera.c +3
-0+ where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; +}
RE: [PATCH v2 1/2] PCI: altera: refactor driver for supporting new platform
Quoted 34 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]>
Sent: Friday, September 8, 2023 6:14 PM
To: D M, Sharath Kumar <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v2 1/2] PCI: altera: refactor driver for supporting new platformQuoted 11 lines · Sharath Kumar
Quoted 11 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]> ...drivers/pci/controller/pcie-altera.c struct altera_pcie_ops { · line 111
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +4
-0+int (*ep_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*ep_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value);"
ep_read_cfg" isn't the ideal name because it suggests "endpoint", but it may be either an endpoint or a switch upstream port. The rockchip driver uses "other", which isn't super descriptive either butmight be better.
Quoted 2 lines
Quoted 1 line
Ok will change to "
nonrp_read_cfg" ?I think the important point is not whether it's a Root Port or not, but whether it's on the root *bus* or not. In other words, I think the driver has to determine whether to generate a Type 0 (targeting something on the root bus) or a Type 1 (targeting something below a
bridge) config transaction (see PCI-to-PCI Bridge spec r1.2, sec 3.1.2.1).
Quoted 5 lines
There can be non-Root Ports on the root bus, so "nonrp" doesn't seem quite right. "Other" would be OK, since that's already used by other drivers. Maybe "type0" and "type1" would be better and would fit well with the
root_bus_nrcheck you use to distinguish them?
Situation is
Root port configuration space - memory mapped
Non root port configuration space - indirect access/proprietary access
Type 0 for devices directly connected to root port
Type 1 for others
Quoted 15 lines
Quoted 15 lines
Quoted 15 lines
Review
Quoted 7 lines
drivers/pci/controller/pcie-altera.c +5
-0+static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno, + unsigned int devfn, int where, int size, + u32 *value) +{ + if (busno == pcie->root_bus_nr && pcie->pcie_data->ops-
rp_read_cfg)(quoted diff) +1
-0+ return pcie->pcie_data->ops->rp_read_cfg(pcie, busno,devfn,
drivers/pci/controller/pcie-altera.c static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +4
-0+ where, size, value); + +if (pcie->pcie_data->ops->ep_read_cfg) + return pcie->pcie_data->ops->ep_read_cfg(pcie, busno,devfn,
Quoted 2 lines
(quoted diff) +2
-0+ where, size, value); + return PCIBIOS_FUNC_NOT_SUPPORTED; }
Re: [PATCH v2 1/2] PCI: altera: refactor driver for supporting new platform
Quoted 29 lines · Sharath Kumar
Quoted 24 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]>Quoted 11 lines · Sharath Kumar
Quoted 11 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]> ...drivers/pci/controller/pcie-altera.c struct altera_pcie_ops { · line 111
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +4
-0+int (*ep_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*ep_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value);"
ep_read_cfg" isn't the ideal name because it suggests "endpoint", but it may be either an endpoint or a switch upstream port. The rockchip driver uses "other", which isn't super descriptive either butmight be better.
Quoted 2 lines
Quoted 1 line
Ok will change to "
nonrp_read_cfg" ?I think the important point is not whether it's a Root Port or not, but whether it's on the root *bus* or not. In other words, I think the driver has to determine whether to generate a Type 0 (targeting something on the root bus) or a Type 1 (targeting something below a
bridge) config transaction (see PCI-to-PCI Bridge spec r1.2, sec 3.1.2.1).Quoted 5 lines
There can be non-Root Ports on the root bus, so "nonrp" doesn't seem quite right. "Other" would be OK, since that's already used by other drivers. Maybe "type0" and "type1" would be better and would fit well with the
root_bus_nrcheck you use to distinguish them?
Quoted 5 lines
Situation is
Root port configuration space - memory mapped
Non root port configuration space - indirect access/proprietary access
Type 0 for devices directly connected to root port
Type 1 for others
"mm", "ind"?
PATCH v2 1/2 PCI: altera: refactor driver for supporting new platforms
From: D M Sharath Kumar <[email protected]>
added the below callbacks that eases is supporting newer platforms for read/write to root port configuration space registers for read/write to non root port (endpoint, switch) cfg space regs root port interrupt handler
--- drivers/pci/controller/pcie-altera.c | 100 +++++++++++++++++++-------- 1 file changed, 70 insertions(+), 30 deletions(-)
drivers/pci/controller/pcie-altera.c +70 -30
@@ -3,6 +3,7 @@* Copyright Altera Corporation (C) 2013-2015. All rights reserved * * Author: Ley Foon Tan <[email protected]> +* Author: sharath <[email protected]> * Description: Altera PCIe host controller driver */
@@ -99,10 +100,15 @@ struct altera_pcie_ops {void (*tlp_write_pkt)(struct altera_pcie *pcie,u32 *headers,u32 data,bool align);bool (*get_link_status)(struct altera_pcie *pcie); -int (*rp_read_cfg)(struct altera_pcie *pcie,int where, -int size,u32 *value); +int (*rp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value);int (*rp_write_cfg)(struct altera_pcie *pcie,u8 busno, -int where,int size,u32 value); +unsigned int devfn,int where,int size,u32 value); +int (*nonrp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*nonrp_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value); +void (*rp_isr)(struct irq_desc *desc); };struct altera_pcie_data {
@@ -379,8 +385,8 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_read_cfg (struct altera_pcie *pcie,int where, -int size,u32 *value) +static int s10_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -399,7 +405,7 @@ static int s10_rp_read_cfg(struct altera_pcie *pcie, int where,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno, +static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -426,18 +432,13 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 *value) +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {int ret;u32 data;u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) -return pcie->pcie_data->ops->rp_read_cfg (pcie, where, - size, value); -switch (size) {case 1 : byte_en =1 << (where &3 );
@@ -470,18 +471,13 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 value) +static int arr_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) {u32 data32;u32 shift =8 * (where &3 );u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) -return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, - where, size, value); -switch (size) {case 1 : data32 = (value &0xff ) << shift;
@@ -499,6 +495,35 @@ static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,return tlp_cfg_dword_write (pcie, busno, devfn, (where & ~DWORD_MASK ), byte_en, data32); + +} + +static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 *value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) +return pcie->pcie_data->ops->rp_read_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_read_cfg) +return pcie->pcie_data->ops->nonrp_read_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; +} + +static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) +return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_write_cfg) +return pcie->pcie_data->ops->nonrp_write_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; } static int altera_pcie_cfg_read(struct pci_bus *bus, unsigned int devfn,
@@ -660,7 +685,6 @@ static void altera_pcie_isr(struct irq_desc *desc)dev_err_ratelimited (dev,"unexpected IRQ, INT%d\n" , bit); } } -chained_irq_exit (chip, desc); }
@@ -691,9 +715,13 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) {struct platform_device *pdev = pcie->pdev; - pcie->cra_base =devm_platform_ioremap_resource_byname (pdev,"Cra" ); -if (IS_ERR (pcie->cra_base)) -return PTR_ERR (pcie->cra_base); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { + pcie->cra_base = +devm_platform_ioremap_resource_byname (pdev,"Cra" ); +if (IS_ERR (pcie->cra_base)) +return PTR_ERR (pcie->cra_base); + }if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { pcie->hip_base =
@@ -707,7 +735,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)if (pcie->irq <0 )return pcie->irq; -irq_set_chained_handler_and_data (pcie->irq, altera_pcie_isr, pcie); +irq_set_chained_handler_and_data (pcie->irq, + pcie->pcie_data->ops->rp_isr, pcie);return 0 ; }
@@ -720,6 +749,11 @@ static const struct altera_pcie_ops altera_pcie_ops_1_0 = { .tlp_read_pkt = tlp_read_packet, .tlp_write_pkt = tlp_write_packet, .get_link_status = altera_pcie_link_up, + .rp_read_cfg = arr_read_cfg, + .rp_write_cfg = arr_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_ops altera_pcie_ops_2_0 = {
@@ -728,6 +762,9 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .get_link_status = s10_altera_pcie_link_up, .rp_read_cfg = s10_rp_read_cfg, .rp_write_cfg = s10_rp_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_data altera_pcie_1_0_data = {
@@ -792,11 +829,14 @@ static int altera_pcie_probe(struct platform_device *pdev)return ret; } -/* clear all interrupts */ -cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); -/* enable all interrupts */ -cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); -altera_pcie_host_init (pcie); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { +/* clear all interrupts */ +cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); +/* enable all interrupts */ +cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); +altera_pcie_host_init (pcie); + } bridge->sysdata = pcie; bridge->busnr = pcie->root_bus_nr;
Signature · 1 line
2.34.1
v3 cover PCI: altera: add support to agilex family
In reply to Bjorn HelgaasFrom: D M Sharath Kumar <[email protected]>
added new callback for
1) read,write to root port configuration registers
2) read,write to endpoint configuration registers
3) root port interrupt handler
agilex and newer platforms need to implemant the callback and generic root port driver should work ( without much changes ) , legacy platforms (arria
and startix) implement configuration read,write directly in wrapper
api _altera_pcie_cfg_read/_altera_pcie_cfg_write
changelog v2:
saperated into two patches
1.refactored the driver for easily portability to future Altera FPGA platforms
2.added support for "Agilex" FPGA
this driver supports PCI RP IP on Agilex FPGA, as these are FPGA its up to the user to add PCI RP or not ( as per his needs). we are not adding the device tree as part of this commit. we are expecting the add device tree changes only if he is adding PCI RP IP in his design
changelog v3:
incorporate review comments from Bjorn Helgaas
D M Sharath Kumar (2):
PCI: altera: refactor driver for supporting new platforms
PCI: altera: add support for agilex family fpga
drivers/pci/controller/pcie-altera.c | 305 ++++++++++++++++++++++++--- 1 file changed, 275 insertions(+), 30 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/2 PCI: altera: refactor driver for supporting new platforms
From: D M Sharath Kumar <[email protected]>
added the below callbacks that eases is supporting newer platforms for read/write to root port configuration space registers for read/write to non root port (endpoint, switch) cfg space regs root port interrupt handler
--- drivers/pci/controller/pcie-altera.c | 100 +++++++++++++++++++-------- 1 file changed, 70 insertions(+), 30 deletions(-)
drivers/pci/controller/pcie-altera.c +70 -30
@@ -3,6 +3,7 @@* Copyright Altera Corporation (C) 2013-2015. All rights reserved * * Author: Ley Foon Tan <[email protected]> +* Author: sharath <[email protected]> * Description: Altera PCIe host controller driver */
@@ -99,10 +100,15 @@ struct altera_pcie_ops {void (*tlp_write_pkt)(struct altera_pcie *pcie,u32 *headers,u32 data,bool align);bool (*get_link_status)(struct altera_pcie *pcie); -int (*rp_read_cfg)(struct altera_pcie *pcie,int where, -int size,u32 *value); +int (*rp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value);int (*rp_write_cfg)(struct altera_pcie *pcie,u8 busno, -int where,int size,u32 value); +unsigned int devfn,int where,int size,u32 value); +int (*nonrp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*nonrp_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value); +void (*rp_isr)(struct irq_desc *desc); };struct altera_pcie_data {
@@ -379,8 +385,8 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_read_cfg (struct altera_pcie *pcie,int where, -int size,u32 *value) +static int s10_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -399,7 +405,7 @@ static int s10_rp_read_cfg(struct altera_pcie *pcie, int where,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno, +static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -426,18 +432,13 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 *value) +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {int ret;u32 data;u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) -return pcie->pcie_data->ops->rp_read_cfg (pcie, where, - size, value); -switch (size) {case 1 : byte_en =1 << (where &3 );
@@ -470,18 +471,13 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 value) +static int arr_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) {u32 data32;u32 shift =8 * (where &3 );u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) -return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, - where, size, value); -switch (size) {case 1 : data32 = (value &0xff ) << shift;
@@ -499,6 +495,35 @@ static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,return tlp_cfg_dword_write (pcie, busno, devfn, (where & ~DWORD_MASK ), byte_en, data32); + +} + +static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 *value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) +return pcie->pcie_data->ops->rp_read_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_read_cfg) +return pcie->pcie_data->ops->nonrp_read_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; +} + +static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) +return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_write_cfg) +return pcie->pcie_data->ops->nonrp_write_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; } static int altera_pcie_cfg_read(struct pci_bus *bus, unsigned int devfn,
@@ -660,7 +685,6 @@ static void altera_pcie_isr(struct irq_desc *desc)dev_err_ratelimited (dev,"unexpected IRQ, INT%d\n" , bit); } } -chained_irq_exit (chip, desc); }
@@ -691,9 +715,13 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) {struct platform_device *pdev = pcie->pdev; - pcie->cra_base =devm_platform_ioremap_resource_byname (pdev,"Cra" ); -if (IS_ERR (pcie->cra_base)) -return PTR_ERR (pcie->cra_base); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { + pcie->cra_base = +devm_platform_ioremap_resource_byname (pdev,"Cra" ); +if (IS_ERR (pcie->cra_base)) +return PTR_ERR (pcie->cra_base); + }if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { pcie->hip_base =
@@ -707,7 +735,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)if (pcie->irq <0 )return pcie->irq; -irq_set_chained_handler_and_data (pcie->irq, altera_pcie_isr, pcie); +irq_set_chained_handler_and_data (pcie->irq, + pcie->pcie_data->ops->rp_isr, pcie);return 0 ; }
@@ -720,6 +749,11 @@ static const struct altera_pcie_ops altera_pcie_ops_1_0 = { .tlp_read_pkt = tlp_read_packet, .tlp_write_pkt = tlp_write_packet, .get_link_status = altera_pcie_link_up, + .rp_read_cfg = arr_read_cfg, + .rp_write_cfg = arr_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_ops altera_pcie_ops_2_0 = {
@@ -728,6 +762,9 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .get_link_status = s10_altera_pcie_link_up, .rp_read_cfg = s10_rp_read_cfg, .rp_write_cfg = s10_rp_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_data altera_pcie_1_0_data = {
@@ -792,11 +829,14 @@ static int altera_pcie_probe(struct platform_device *pdev)return ret; } -/* clear all interrupts */ -cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); -/* enable all interrupts */ -cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); -altera_pcie_host_init (pcie); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { +/* clear all interrupts */ +cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); +/* enable all interrupts */ +cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); +altera_pcie_host_init (pcie); + } bridge->sysdata = pcie; bridge->busnr = pcie->root_bus_nr;
Signature · 1 line
2.34.1
PATCH v3 2/2 PCI: altera: add support for agilex family fpga
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
create new instance of struct altera_pcie_data for "altr,pcie-root-port-3.0"
provide corresponding callback
"port_conf_off" points to avmm port config register base
--- drivers/pci/controller/pcie-altera.c | 207 ++++++++++++++++++++++++++- 1 file changed, 206 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-altera.c +206 -1
@@ -79,9 +79,20 @@#define S10_TLP_FMTTYPE_CFGWR0 0x45#define S10_TLP_FMTTYPE_CFGWR1 0x44 +#define AGLX_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg)) +#define AGLX_RP_SECONDARY (pcie) \ + readb(AGLX_RP_CFG_ADDR(pcie, PCI_SECONDARY_BUS)) + +#define AGLX_BDF_REG 0x00002004 +#define AGLX_ROOT_PORT_IRQ_STATUS 0x14c +#define AGLX_ROOT_PORT_IRQ_ENABLE 0x150 +#define AGLX_CFG_AER (1<<4) +enum altera_pcie_version {ALTERA_PCIE_V1 =0 ,ALTERA_PCIE_V2 , +ALTERA_PCIE_V3 ,/* AGILEX p-tile, f-tile */ };struct altera_pcie {
@@ -93,6 +104,8 @@ struct altera_pcie {struct irq_domain *irq_domain;struct resource bus_range;const struct altera_pcie_data *pcie_data; +void __iomem *cs_base; +u32 port_conf_off; };struct altera_pcie_ops {
@@ -138,6 +151,39 @@ static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)return readl_relaxed (pcie->cra_base + reg); } +static inline void cs_writel (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writel_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writew (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writew_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writeb (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writeb_relaxed (value, pcie->cs_base + reg); +} + +static inline u32 cs_readl (struct altera_pcie *pcie,const u32 reg) +{ +return readl_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readw (struct altera_pcie *pcie,const u32 reg) +{ +return readw_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readb (struct altera_pcie *pcie,const u32 reg) +{ +return readb_relaxed (pcie->cs_base + reg); +} +static bool altera_pcie_link_up (struct altera_pcie *pcie) {return !!((cra_readl (pcie,RP_LTSSM ) &RP_LTSSM_MASK ) ==LTSSM_L0 );
@@ -152,6 +198,14 @@ static bool s10_altera_pcie_link_up(struct altera_pcie *pcie)return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); } +static bool aglx_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, + pcie->pcie_data->cap_offset +PCI_EXP_LNKSTA ); + +return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); +} +/* * Altera PCIe port uses BAR0 of RC's configuration space as the translation * from PCI bus to native BUS. Entire DDR region is mapped into PCIe space
@@ -432,6 +486,101 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn,return PCIBIOS_SUCCESSFUL ; } +static int aglx_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + } + +/* interrupt pin not programmed in hardware, set to INTA*/ +if (where ==PCI_INTERRUPT_PIN && size ==1 ) + *value =0x01 ; +else if (where ==PCI_INTERRUPT_LINE ) + *value |=0x0100 ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : +writeb (value, addr); +break ; +case 2 : +writew (value, addr); +break ; +default : +writel (value, addr); +break ; + } + +/* +* Monitor changes to PCI_PRIMARY_BUS register on root port +* and update local copy of root bus number accordingly. +*/ +if (busno == pcie->root_bus_nr && where ==PCI_PRIMARY_BUS ) + pcie->root_bus_nr = value &0xff ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_write_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : +cs_writeb (pcie, value, where); +break ; +case 2 : +cs_writew (pcie, value, where); +break ; +default : +cs_writel (pcie, value, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_read_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : + *value =cs_readb (pcie, where); +break ; +case 2 : + *value =cs_readw (pcie, where); +break ; +default : + *value =cs_readl (pcie, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 *value) {
@@ -688,6 +837,30 @@ static void altera_pcie_isr(struct irq_desc *desc)chained_irq_exit (chip, desc); } +static void aglx_isr (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); +struct altera_pcie *pcie; +struct device *dev; +u32 status; +int ret; + +chained_irq_enter (chip, desc); + pcie =irq_desc_get_handler_data (desc); + dev = &pcie->pdev->dev; + + status =readl ((pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +if (status &AGLX_CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ\n" ); + } +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +chained_irq_exit (chip, desc); +} +static int altera_pcie_init_irq_domain (struct altera_pcie *pcie) {struct device *dev = &pcie->pdev->dev;
@@ -723,13 +896,25 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)return PTR_ERR (pcie->cra_base); } -if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { +if ((pcie->pcie_data->version ==ALTERA_PCIE_V2 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V3 )) { pcie->hip_base =devm_platform_ioremap_resource_byname (pdev,"Hip" );if (IS_ERR (pcie->hip_base))return PTR_ERR (pcie->hip_base); } +if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { + pcie->cs_base = +devm_platform_ioremap_resource_byname (pdev,"Cs" ); +if (IS_ERR (pcie->cs_base)) +return PTR_ERR (pcie->cs_base); +of_property_read_u32 (pcie->pdev->dev.of_node,"port_conf_stat" , + &pcie->port_conf_off); +dev_dbg (&pcie->pdev->dev,"port_conf_stat_off =%#x\n" , + pcie->port_conf_off); + } +/* setup IRQ */ pcie->irq =platform_get_irq (pdev,0 );if (pcie->irq <0 )
@@ -767,6 +952,15 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .rp_isr = altera_pcie_isr, }; +static const struct altera_pcie_ops altera_pcie_ops_3_0 = { + .rp_read_cfg = aglx_rp_read_cfg, + .rp_write_cfg = aglx_rp_write_cfg, + .get_link_status = aglx_altera_pcie_link_up, + .nonrp_read_cfg = aglx_nonrp_read_cfg, + .nonrp_write_cfg = aglx_nonrp_write_cfg, + .rp_isr = aglx_isr, +}; +static const struct altera_pcie_data altera_pcie_1_0_data = { .ops = &altera_pcie_ops_1_0, .cap_offset =0x80 ,
@@ -787,11 +981,19 @@ static const struct altera_pcie_data altera_pcie_2_0_data = { .cfgwr1 = S10_TLP_FMTTYPE_CFGWR1, }; +static const struct altera_pcie_data altera_pcie_3_0_data = { + .ops = &altera_pcie_ops_3_0, + .version =ALTERA_PCIE_V3 , + .cap_offset =0x70 , +}; +static const struct of_device_id altera_pcie_of_match[] = { {.compatible ="altr,pcie-root-port-1.0" , .data = &altera_pcie_1_0_data }, {.compatible ="altr,pcie-root-port-2.0" , .data = &altera_pcie_2_0_data }, + {.compatible ="altr,pcie-root-port-3.0" , + .data = &altera_pcie_3_0_data }, {}, };
@@ -836,6 +1038,9 @@ static int altera_pcie_probe(struct platform_device *pdev)/* enable all interrupts */ cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE );altera_pcie_host_init (pcie); + }else if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_ENABLE )); } bridge->sysdata = pcie;
Signature · 1 line
2.34.1
RE: [PATCH v2 1/2] PCI: altera: refactor driver for supporting new platform
In reply to Bjorn HelgaasQuoted 47 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]>
Sent: Saturday, September 9, 2023 1:23 AM
To: D M, Sharath Kumar <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v2 1/2] PCI: altera: refactor driver for supporting new platformQuoted 8 lines · Sharath Kumar
Quoted 8 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]> On Fri, Sep 08, 2023 atQuoted 5 lines · Sharath Kumar
Quoted 5 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]> ...Review
Quoted 2 lines
(quoted diff) +2
-0+ int (*ep_read_cfg)(struct altera_pcie *pcie, u8 busno, + unsigned int devfn, int where, int size, u32*value);
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ int (*ep_write_cfg)(struct altera_pcie *pcie, u8 busno, + unsigned int devfn, int where, int size, u32value);
Quoted 16 lines
Quoted 16 lines
Quoted 5 lines
Quoted 5 lines
"
ep_read_cfg" isn't the ideal name because it suggests "endpoint", but it may be either an endpoint or a switch upstream port. The rockchip driver uses "other", which isn't super descriptive either butmight be better.
Quoted 2 lines
Quoted 1 line
Ok will change to "
nonrp_read_cfg" ?I think the important point is not whether it's a Root Port or not, but whether it's on the root *bus* or not. In other words, I think the driver has to determine whether to generate a Type 0 (targeting something on the root
bus) or a Type 1 (targeting something below a
bridge) config transaction (see PCI-to-PCI Bridge spec r1.2, sec 3.1.2.1).Quoted 2 lines
Quoted 2 lines
There can be non-Root Ports on the root bus, so "nonrp" doesn't seem quite right. "Other" would be OK, since that's already used by other
drivers.
Quoted 3 lines
Quoted 3 lines
Maybe "type0" and "type1" would be better and would fit well with the
root_bus_nrcheck you use to distinguish them?
Quoted 7 lines
Quoted 5 lines
Situation is
Root port configuration space - memory mapped Non root port configuration space - indirect access/proprietary access
Type 0 for devices directly connected to root port Type 1 for others"mm", "ind"?
Memory mapped - configuration registers available at pre defined address
Re: [PATCH v2 1/2] PCI: altera: refactor driver for supporting new platform
In reply to D M, Sharath KumarQuoted 32 lines · Sharath Kumar
Quoted 32 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]>
Sent: Friday, September 8, 2023 6:14 PM
To: D M, Sharath Kumar <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v2 1/2] PCI: altera: refactor driver for supporting new platformQuoted 11 lines · Sharath Kumar
Quoted 11 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]> ...drivers/pci/controller/pcie-altera.c struct altera_pcie_ops { · line 111
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +4
-0+int (*ep_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*ep_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value);"
ep_read_cfg" isn't the ideal name because it suggests "endpoint", but it may be either an endpoint or a switch upstream port. The rockchip driver uses "other", which isn't super descriptive either butmight be better.
Quoted 2 lines
Quoted 1 line
Ok will change to "
nonrp_read_cfg" ?I think the important point is not whether it's a Root Port or not, but whether it's on the root *bus* or not. In other words, I think the driver has to determine whether to generate a Type 0 (targeting something on the root bus) or a Type 1 (targeting something below a
bridge) config transaction (see PCI-to-PCI Bridge spec r1.2, sec 3.1.2.1).
Quoted 7 lines
Quoted 4 lines
There can be non-Root Ports on the root bus, so "nonrp" doesn't seem quite right. "Other" would be OK, since that's already used by other drivers. Maybe "type0" and "type1" would be better and would fit well with the
root_bus_nrcheck you use to distinguish them?Situation is
Root port configuration space - memory mapped
I don't quite believe the idea that the access method is based on whether it's a root port. For one thing, you decide whether to use the memory-mapped accessor or the indirect accessor based on whether the read targets the *root bus*, not whether it targets a root port. And obviously you don't *know* whether the device at a B/D/F address is a root port until after you read the PCIe type.
I think using names similar to other drivers will be helpful.
These all work on the root bus:
exynos_pcie_rd_own_conf
meson_pcie_rd_own_conf
rockchip_pcie_rd_own_conf
These work on non-root buses:
dw_pcie_rd_other_conf
rockchip_pcie_rd_other_conf
Quoted 19 lines
Non root port configuration space - indirect access/proprietary access
Type 0 for devices directly connected to root port
Type 1 for othersQuoted 15 lines
Quoted 15 lines
Quoted 15 lines
Review
Quoted 7 lines
drivers/pci/controller/pcie-altera.c +5
-0+static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno, + unsigned int devfn, int where, int size, + u32 *value) +{ + if (busno == pcie->root_bus_nr && pcie->pcie_data->ops-
rp_read_cfg)(quoted diff) +1
-0+ return pcie->pcie_data->ops->rp_read_cfg(pcie, busno,devfn,
drivers/pci/controller/pcie-altera.c static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +4
-0+ where, size, value); + +if (pcie->pcie_data->ops->ep_read_cfg) + return pcie->pcie_data->ops->ep_read_cfg(pcie, busno,devfn,
Quoted 2 lines
(quoted diff) +2
-0+ where, size, value); + return PCIBIOS_FUNC_NOT_SUPPORTED; }
Re: [PATCH v2 1/2] PCI: altera: refactor driver for supporting new platform
Quoted 41 lines · Bjorn Helgaas
Quoted 32 lines · Sharath Kumar
Quoted 32 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]>
Sent: Friday, September 8, 2023 6:14 PM
To: D M, Sharath Kumar <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v2 1/2] PCI: altera: refactor driver for supporting new platformQuoted 11 lines · Sharath Kumar
Quoted 11 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]> ...drivers/pci/controller/pcie-altera.c struct altera_pcie_ops { · line 111
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +4
-0+int (*ep_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*ep_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value);"
ep_read_cfg" isn't the ideal name because it suggests "endpoint", but it may be either an endpoint or a switch upstream port. The rockchip driver uses "other", which isn't super descriptive either butmight be better.
Quoted 2 lines
Quoted 1 line
Ok will change to "
nonrp_read_cfg" ?I think the important point is not whether it's a Root Port or not, but whether it's on the root *bus* or not. In other words, I think the driver has to determine whether to generate a Type 0 (targeting something on the root bus) or a Type 1 (targeting something below a
bridge) config transaction (see PCI-to-PCI Bridge spec r1.2, sec 3.1.2.1).Quoted 7 lines
Quoted 4 lines
There can be non-Root Ports on the root bus, so "nonrp" doesn't seem quite right. "Other" would be OK, since that's already used by other drivers. Maybe "type0" and "type1" would be better and would fit well with the
root_bus_nrcheck you use to distinguish them?Situation is
Root port configuration space - memory mapped
Quoted 6 lines
I don't quite believe the idea that the access method is based on whether it's a root port. For one thing, you decide whether to use the memory-mapped accessor or the indirect accessor based on whether the read targets the *root bus*, not whether it targets a root port. And obviously you don't *know* whether the device at a B/D/F address is a root port until after you read the PCIe type.
I see eight copies of "[PATCH v3 0/2]" on the list:
https://lore.kernel.org/linux-pci/[email protected]/T/#t
The duplication just causes confusion and slows things down.
I do think the naming as root port config accessors and endpoint config accessors is fundamentally broken and needs to be fixed. It's not a *functional* issue, but it is important to avoid misleading names.
Quoted 32 lines
I think using names similar to other drivers will be helpful.
These all work on the root bus:
exynos_pcie_rd_own_conf
meson_pcie_rd_own_conf
rockchip_pcie_rd_own_confThese work on non-root buses:
dw_pcie_rd_other_conf
rockchip_pcie_rd_other_confQuoted 19 lines
Non root port configuration space - indirect access/proprietary access
Type 0 for devices directly connected to root port
Type 1 for othersQuoted 15 lines
Quoted 15 lines
Quoted 15 lines
Review
Quoted 7 lines
drivers/pci/controller/pcie-altera.c +5
-0+static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno, + unsigned int devfn, int where, int size, + u32 *value) +{ + if (busno == pcie->root_bus_nr && pcie->pcie_data->ops-
rp_read_cfg)(quoted diff) +1
-0+ return pcie->pcie_data->ops->rp_read_cfg(pcie, busno,devfn,
drivers/pci/controller/pcie-altera.c static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +4
-0+ where, size, value); + +if (pcie->pcie_data->ops->ep_read_cfg) + return pcie->pcie_data->ops->ep_read_cfg(pcie, busno,devfn,
Quoted 2 lines
(quoted diff) +2
-0+ where, size, value); + return PCIBIOS_FUNC_NOT_SUPPORTED; }
v4 cover PCI: altera: add support to agilex family
From: D M Sharath Kumar <[email protected]>
added new callback for
1) read,write to root port configuration registers
2) read,write to endpoint configuration registers
3) root port interrupt handler
agilex and newer platforms need to implemant the callback and generic root port driver should work ( without much changes ) , legacy platforms (arria
and startix) implement configuration read,write directly in wrapper
api _altera_pcie_cfg_read/_altera_pcie_cfg_write
changelog v2:
saperated into two patches
1.refactored the driver for easily portability to future Altera FPGA platforms
2.added support for "Agilex" FPGA
this driver supports PCI RP IP on Agilex FPGA, as these are FPGA its up to the user to add PCI RP or not ( as per his needs). we are not adding the device tree as part of this commit. we are expecting the add device tree changes only if he is adding PCI RP IP in his design
changelog v3:
incorporate review comments from Bjorn Helgaas
changelog v4:
added below callback for root bus
alt_read/write_own_cfg
added below callback for non-root buses
alt_read/write_other_cfg
D M Sharath Kumar (2):
PCI: altera: refactor driver for supporting new platform
PCI: altera: add support for agilex family fpga
drivers/pci/controller/pcie-altera.c | 313 ++++++++++++++++++++++++--- 1 file changed, 280 insertions(+), 33 deletions(-)
Signature · 1 line
2.34.1
PATCH v4 1/2 PCI: altera: refactor driver for supporting new platform
From: D M Sharath Kumar <[email protected]>
added the below callbacks that eases is supporting newer platforms for read/write to root port configuration space registers for read/write to non root port (endpoint, switch) cfg space regs root port interrupt handler
--- drivers/pci/controller/pcie-altera.c | 108 +++++++++++++++++++-------- 1 file changed, 75 insertions(+), 33 deletions(-)
drivers/pci/controller/pcie-altera.c +75 -33
@@ -3,6 +3,7 @@* Copyright Altera Corporation (C) 2013-2015. All rights reserved * * Author: Ley Foon Tan <[email protected]> +* Author: sharath <[email protected]> * Description: Altera PCIe host controller driver */
@@ -99,10 +100,15 @@ struct altera_pcie_ops {void (*tlp_write_pkt)(struct altera_pcie *pcie,u32 *headers,u32 data,bool align);bool (*get_link_status)(struct altera_pcie *pcie); -int (*rp_read_cfg)(struct altera_pcie *pcie,int where, -int size,u32 *value); -int (*rp_write_cfg)(struct altera_pcie *pcie,u8 busno, -int where,int size,u32 value); +int (*alt_read_own_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*alt_write_own_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value); +int (*alt_read_other_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*alt_write_other_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value); +void (*rp_isr)(struct irq_desc *desc); };struct altera_pcie_data {
@@ -379,8 +385,8 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_read_cfg (struct altera_pcie *pcie,int where, -int size,u32 *value) +static int s10_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -399,7 +405,7 @@ static int s10_rp_read_cfg(struct altera_pcie *pcie, int where,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno, +static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -426,18 +432,13 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 *value) +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {int ret;u32 data;u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) -return pcie->pcie_data->ops->rp_read_cfg (pcie, where, - size, value); -switch (size) {case 1 : byte_en =1 << (where &3 );
@@ -470,18 +471,13 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 value) +static int arr_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) {u32 data32;u32 shift =8 * (where &3 );u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) -return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, - where, size, value); -switch (size) {case 1 : data32 = (value &0xff ) << shift;
@@ -499,6 +495,37 @@ static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,return tlp_cfg_dword_write (pcie, busno, devfn, (where & ~DWORD_MASK ), byte_en, data32); + +} + +static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 *value) +{ +if (busno == pcie->root_bus_nr && + pcie->pcie_data->ops->alt_read_own_cfg) +return pcie->pcie_data->ops->alt_read_own_cfg (pcie, busno, + devfn, where, size, value); + +if (pcie->pcie_data->ops->alt_read_other_cfg) +return pcie->pcie_data->ops->alt_read_other_cfg (pcie, busno, + devfn, where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; +} + +static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 value) +{ +if (busno == pcie->root_bus_nr && + pcie->pcie_data->ops->alt_write_own_cfg) +return pcie->pcie_data->ops->alt_write_own_cfg (pcie, busno, + devfn, where, size, value); + +if (pcie->pcie_data->ops->alt_write_other_cfg) +return pcie->pcie_data->ops->alt_write_other_cfg (pcie, busno, + devfn, where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; } static int altera_pcie_cfg_read(struct pci_bus *bus, unsigned int devfn,
@@ -660,7 +687,6 @@ static void altera_pcie_isr(struct irq_desc *desc)dev_err_ratelimited (dev,"unexpected IRQ, INT%d\n" , bit); } } -chained_irq_exit (chip, desc); }
@@ -691,9 +717,13 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) {struct platform_device *pdev = pcie->pdev; - pcie->cra_base =devm_platform_ioremap_resource_byname (pdev,"Cra" ); -if (IS_ERR (pcie->cra_base)) -return PTR_ERR (pcie->cra_base); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { + pcie->cra_base = +devm_platform_ioremap_resource_byname (pdev,"Cra" ); +if (IS_ERR (pcie->cra_base)) +return PTR_ERR (pcie->cra_base); + }if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { pcie->hip_base =
@@ -707,7 +737,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)if (pcie->irq <0 )return pcie->irq; -irq_set_chained_handler_and_data (pcie->irq, altera_pcie_isr, pcie); +irq_set_chained_handler_and_data (pcie->irq, + pcie->pcie_data->ops->rp_isr, pcie);return 0 ; }
@@ -720,14 +751,22 @@ static const struct altera_pcie_ops altera_pcie_ops_1_0 = { .tlp_read_pkt = tlp_read_packet, .tlp_write_pkt = tlp_write_packet, .get_link_status = altera_pcie_link_up, + .alt_read_own_cfg = arr_read_cfg, + .alt_write_own_cfg = arr_write_cfg, + .alt_read_other_cfg = arr_read_cfg, + .alt_write_other_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .tlp_read_pkt = s10_tlp_read_packet, .tlp_write_pkt = s10_tlp_write_packet, .get_link_status = s10_altera_pcie_link_up, - .rp_read_cfg = s10_rp_read_cfg, - .rp_write_cfg = s10_rp_write_cfg, + .alt_read_own_cfg = s10_rp_read_cfg, + .alt_write_own_cfg = s10_rp_write_cfg, + .alt_read_other_cfg = arr_read_cfg, + .alt_write_other_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_data altera_pcie_1_0_data = {
@@ -792,11 +831,14 @@ static int altera_pcie_probe(struct platform_device *pdev)return ret; } -/* clear all interrupts */ -cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); -/* enable all interrupts */ -cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); -altera_pcie_host_init (pcie); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { +/* clear all interrupts */ +cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); +/* enable all interrupts */ +cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); +altera_pcie_host_init (pcie); + } bridge->sysdata = pcie; bridge->busnr = pcie->root_bus_nr;
Signature · 1 line
2.34.1
PATCH v4 2/2 PCI: altera: add support for agilex family fpga
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
create new instance of struct altera_pcie_data for "altr,pcie-root-port-3.0"
provide corresponding callback
"port_conf_off" points to avmm port config register base
--- drivers/pci/controller/pcie-altera.c | 207 ++++++++++++++++++++++++++- 1 file changed, 206 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-altera.c +206 -1
@@ -79,9 +79,20 @@#define S10_TLP_FMTTYPE_CFGWR0 0x45#define S10_TLP_FMTTYPE_CFGWR1 0x44 +#define AGLX_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg)) +#define AGLX_RP_SECONDARY (pcie) \ + readb(AGLX_RP_CFG_ADDR(pcie, PCI_SECONDARY_BUS)) + +#define AGLX_BDF_REG 0x00002004 +#define AGLX_ROOT_PORT_IRQ_STATUS 0x14c +#define AGLX_ROOT_PORT_IRQ_ENABLE 0x150 +#define AGLX_CFG_AER (1<<4) +enum altera_pcie_version {ALTERA_PCIE_V1 =0 ,ALTERA_PCIE_V2 , +ALTERA_PCIE_V3 ,/* AGILEX p-tile, f-tile */ };struct altera_pcie {
@@ -93,6 +104,8 @@ struct altera_pcie {struct irq_domain *irq_domain;struct resource bus_range;const struct altera_pcie_data *pcie_data; +void __iomem *cs_base; +u32 port_conf_off; };struct altera_pcie_ops {
@@ -138,6 +151,39 @@ static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)return readl_relaxed (pcie->cra_base + reg); } +static inline void cs_writel (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writel_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writew (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writew_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writeb (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writeb_relaxed (value, pcie->cs_base + reg); +} + +static inline u32 cs_readl (struct altera_pcie *pcie,const u32 reg) +{ +return readl_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readw (struct altera_pcie *pcie,const u32 reg) +{ +return readw_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readb (struct altera_pcie *pcie,const u32 reg) +{ +return readb_relaxed (pcie->cs_base + reg); +} +static bool altera_pcie_link_up (struct altera_pcie *pcie) {return !!((cra_readl (pcie,RP_LTSSM ) &RP_LTSSM_MASK ) ==LTSSM_L0 );
@@ -152,6 +198,14 @@ static bool s10_altera_pcie_link_up(struct altera_pcie *pcie)return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); } +static bool aglx_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, + pcie->pcie_data->cap_offset +PCI_EXP_LNKSTA ); + +return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); +} +/* * Altera PCIe port uses BAR0 of RC's configuration space as the translation * from PCI bus to native BUS. Entire DDR region is mapped into PCIe space
@@ -432,6 +486,101 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn,return PCIBIOS_SUCCESSFUL ; } +static int aglx_read_own_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + } + +/* interrupt pin not programmed in hardware, set to INTA*/ +if (where ==PCI_INTERRUPT_PIN && size ==1 ) + *value =0x01 ; +else if (where ==PCI_INTERRUPT_LINE ) + *value |=0x0100 ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_write_own_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : +writeb (value, addr); +break ; +case 2 : +writew (value, addr); +break ; +default : +writel (value, addr); +break ; + } + +/* +* Monitor changes to PCI_PRIMARY_BUS register on root port +* and update local copy of root bus number accordingly. +*/ +if (busno == pcie->root_bus_nr && where ==PCI_PRIMARY_BUS ) + pcie->root_bus_nr = value &0xff ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_write_other_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : +cs_writeb (pcie, value, where); +break ; +case 2 : +cs_writew (pcie, value, where); +break ; +default : +cs_writel (pcie, value, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_read_other_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : + *value =cs_readb (pcie, where); +break ; +case 2 : + *value =cs_readw (pcie, where); +break ; +default : + *value =cs_readl (pcie, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 *value) {
@@ -690,6 +839,30 @@ static void altera_pcie_isr(struct irq_desc *desc)chained_irq_exit (chip, desc); } +static void aglx_isr (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); +struct altera_pcie *pcie; +struct device *dev; +u32 status; +int ret; + +chained_irq_enter (chip, desc); + pcie =irq_desc_get_handler_data (desc); + dev = &pcie->pdev->dev; + + status =readl ((pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +if (status &AGLX_CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ\n" ); + } +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +chained_irq_exit (chip, desc); +} +static int altera_pcie_init_irq_domain (struct altera_pcie *pcie) {struct device *dev = &pcie->pdev->dev;
@@ -725,13 +898,25 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)return PTR_ERR (pcie->cra_base); } -if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { +if ((pcie->pcie_data->version ==ALTERA_PCIE_V2 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V3 )) { pcie->hip_base =devm_platform_ioremap_resource_byname (pdev,"Hip" );if (IS_ERR (pcie->hip_base))return PTR_ERR (pcie->hip_base); } +if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { + pcie->cs_base = +devm_platform_ioremap_resource_byname (pdev,"Cs" ); +if (IS_ERR (pcie->cs_base)) +return PTR_ERR (pcie->cs_base); +of_property_read_u32 (pcie->pdev->dev.of_node,"port_conf_stat" , + &pcie->port_conf_off); +dev_dbg (&pcie->pdev->dev,"port_conf_stat_off =%#x\n" , + pcie->port_conf_off); + } +/* setup IRQ */ pcie->irq =platform_get_irq (pdev,0 );if (pcie->irq <0 )
@@ -769,6 +954,15 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .rp_isr = altera_pcie_isr, }; +static const struct altera_pcie_ops altera_pcie_ops_3_0 = { + .alt_read_own_cfg = aglx_read_own_cfg, + .alt_write_own_cfg = aglx_write_own_cfg, + .get_link_status = aglx_altera_pcie_link_up, + .alt_read_other_cfg = aglx_read_other_cfg, + .alt_write_other_cfg = aglx_write_other_cfg, + .rp_isr = aglx_isr, +}; +static const struct altera_pcie_data altera_pcie_1_0_data = { .ops = &altera_pcie_ops_1_0, .cap_offset =0x80 ,
@@ -789,11 +983,19 @@ static const struct altera_pcie_data altera_pcie_2_0_data = { .cfgwr1 = S10_TLP_FMTTYPE_CFGWR1, }; +static const struct altera_pcie_data altera_pcie_3_0_data = { + .ops = &altera_pcie_ops_3_0, + .version =ALTERA_PCIE_V3 , + .cap_offset =0x70 , +}; +static const struct of_device_id altera_pcie_of_match[] = { {.compatible ="altr,pcie-root-port-1.0" , .data = &altera_pcie_1_0_data }, {.compatible ="altr,pcie-root-port-2.0" , .data = &altera_pcie_2_0_data }, + {.compatible ="altr,pcie-root-port-3.0" , + .data = &altera_pcie_3_0_data }, {}, };
@@ -838,6 +1040,9 @@ static int altera_pcie_probe(struct platform_device *pdev)/* enable all interrupts */ cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE );altera_pcie_host_init (pcie); + }else if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_ENABLE )); } bridge->sysdata = pcie;
Signature · 1 line
2.34.1
Re: [PATCH v4 2/2] PCI: altera: add support for agilex family fpga
[+cc Joyce]
Quoted 6 lines · On Sun, Sep 17, 2023 at 10:35:46PM +0530, [email protected] wrote:
From: D M Sharath Kumar <[email protected]>
create new instance of struct
altera_pcie_datafor "altr,pcie-root-port-3.0"
provide corresponding callback
"port_conf_off" points to avmm port config register base
Please mention the hardware platform that this corresponds to.
drivers/pci/controller/pcie-altera.c static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn, · line 506
Quoted 1 line
drivers/pci/controller/pcie-altera.c +1
-0+/* interrupt pin not programmed in hardware, set to INTA*/
Add space before closing "*/".
drivers/pci/controller/pcie-altera.c static void altera_pcie_isr(struct irq_desc *desc) · line 859
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +4
-0+if (status &AGLX_CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ\n" );
Maybe include a hint about what the unexpected IRQ was? An IRQ number or "status" value?
drivers/pci/controller/pcie-altera.c static const struct altera_pcie_ops altera_pcie_ops_2_0 = { · line 963
Quoted 7 lines
drivers/pci/controller/pcie-altera.c +7
-0+static const struct altera_pcie_ops altera_pcie_ops_3_0 = { + .alt_read_own_cfg = aglx_read_own_cfg, + .alt_write_own_cfg = aglx_write_own_cfg, + .get_link_status = aglx_altera_pcie_link_up, + .alt_read_other_cfg = aglx_read_other_cfg, + .alt_write_other_cfg = aglx_write_other_cfg, + .rp_isr = aglx_isr,
Use the same order of function pointers in all of these structs and make it match the struct altera_pcie_ops definition. (Don't put .get_link_status in the middle of the config accessors.)
drivers/pci/controller/pcie-altera.c static const struct altera_pcie_data altera_pcie_2_0_data = { · line 998
Quoted 7 lines
static const struct
of_device_idaltera_pcie_of_match[] = {drivers/pci/controller/pcie-altera.c +2
-0{.compatible = "altr,pcie-root-port-1.0", .data = &altera_pcie_1_0_data }, {.compatible = "altr,pcie-root-port-2.0", .data = &altera_pcie_2_0_data }, + {.compatible = "altr,pcie-root-port-3.0", + .data = &altera_pcie_3_0_data },
Make the .data indentation match the rest.
PATCH v5 2/2 PCI: altera: add support for agilex7 family fpga
From: D M Sharath Kumar <[email protected]>
create new instance of struct altera_pcie_data for agilex7 "altr,pcie-root-port-3.0"
provide corresponding callback
"port_conf_off" points to avmm port config register base
--- drivers/pci/controller/pcie-altera.c | 207 ++++++++++++++++++++++++++- 1 file changed, 206 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-altera.c +206 -1
@@ -79,9 +79,20 @@#define S10_TLP_FMTTYPE_CFGWR0 0x45#define S10_TLP_FMTTYPE_CFGWR1 0x44 +#define AGLX_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg)) +#define AGLX_RP_SECONDARY (pcie) \ + readb(AGLX_RP_CFG_ADDR(pcie, PCI_SECONDARY_BUS)) + +#define AGLX_BDF_REG 0x00002004 +#define AGLX_ROOT_PORT_IRQ_STATUS 0x14c +#define AGLX_ROOT_PORT_IRQ_ENABLE 0x150 +#define AGLX_CFG_AER (1<<4) +enum altera_pcie_version {ALTERA_PCIE_V1 =0 ,ALTERA_PCIE_V2 , +ALTERA_PCIE_V3 , };struct altera_pcie {
@@ -93,6 +104,8 @@ struct altera_pcie {struct irq_domain *irq_domain;struct resource bus_range;const struct altera_pcie_data *pcie_data; +void __iomem *cs_base; +u32 port_conf_off; };struct altera_pcie_ops {
@@ -138,6 +151,39 @@ static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)return readl_relaxed (pcie->cra_base + reg); } +static inline void cs_writel (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writel_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writew (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writew_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writeb (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writeb_relaxed (value, pcie->cs_base + reg); +} + +static inline u32 cs_readl (struct altera_pcie *pcie,const u32 reg) +{ +return readl_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readw (struct altera_pcie *pcie,const u32 reg) +{ +return readw_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readb (struct altera_pcie *pcie,const u32 reg) +{ +return readb_relaxed (pcie->cs_base + reg); +} +static bool altera_pcie_link_up (struct altera_pcie *pcie) {return !!((cra_readl (pcie,RP_LTSSM ) &RP_LTSSM_MASK ) ==LTSSM_L0 );
@@ -152,6 +198,14 @@ static bool s10_altera_pcie_link_up(struct altera_pcie *pcie)return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); } +static bool aglx_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, + pcie->pcie_data->cap_offset +PCI_EXP_LNKSTA ); + +return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); +} +/* * Altera PCIe port uses BAR0 of RC's configuration space as the translation * from PCI bus to native BUS. Entire DDR region is mapped into PCIe space
@@ -432,6 +486,101 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn,return PCIBIOS_SUCCESSFUL ; } +static int aglx_read_own_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + } + +/* interrupt pin not programmed in hardware, set to INTA */ +if (where ==PCI_INTERRUPT_PIN && size ==1 && !(*value)) + *value =0x01 ; +else if (where ==PCI_INTERRUPT_LINE && !(*value &0xff00 )) + *value |=0x0100 ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_write_own_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : +writeb (value, addr); +break ; +case 2 : +writew (value, addr); +break ; +default : +writel (value, addr); +break ; + } + +/* +* Monitor changes to PCI_PRIMARY_BUS register on root port +* and update local copy of root bus number accordingly. +*/ +if (busno == pcie->root_bus_nr && where ==PCI_PRIMARY_BUS ) + pcie->root_bus_nr = value &0xff ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_write_other_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : +cs_writeb (pcie, value, where); +break ; +case 2 : +cs_writew (pcie, value, where); +break ; +default : +cs_writel (pcie, value, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_read_other_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : + *value =cs_readb (pcie, where); +break ; +case 2 : + *value =cs_readw (pcie, where); +break ; +default : + *value =cs_readl (pcie, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 *value) {
@@ -690,6 +839,30 @@ static void altera_pcie_isr(struct irq_desc *desc)chained_irq_exit (chip, desc); } +static void aglx_isr (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); +struct altera_pcie *pcie; +struct device *dev; +u32 status; +int ret; + +chained_irq_enter (chip, desc); + pcie =irq_desc_get_handler_data (desc); + dev = &pcie->pdev->dev; + + status =readl ((pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +if (status &AGLX_CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ %x\n" , status); + } +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +chained_irq_exit (chip, desc); +} +static int altera_pcie_init_irq_domain (struct altera_pcie *pcie) {struct device *dev = &pcie->pdev->dev;
@@ -725,13 +898,25 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)return PTR_ERR (pcie->cra_base); } -if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { +if ((pcie->pcie_data->version ==ALTERA_PCIE_V2 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V3 )) { pcie->hip_base =devm_platform_ioremap_resource_byname (pdev,"Hip" );if (IS_ERR (pcie->hip_base))return PTR_ERR (pcie->hip_base); } +if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { + pcie->cs_base = +devm_platform_ioremap_resource_byname (pdev,"Cs" ); +if (IS_ERR (pcie->cs_base)) +return PTR_ERR (pcie->cs_base); +of_property_read_u32 (pcie->pdev->dev.of_node,"port_conf_stat" , + &pcie->port_conf_off); +dev_dbg (&pcie->pdev->dev,"port_conf_stat_off =%#x\n" , + pcie->port_conf_off); + } +/* setup IRQ */ pcie->irq =platform_get_irq (pdev,0 );if (pcie->irq <0 )
@@ -769,6 +954,15 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .rp_isr = altera_pcie_isr, }; +static const struct altera_pcie_ops altera_pcie_ops_3_0 = { + .get_link_status = aglx_altera_pcie_link_up, + .alt_read_own_cfg = aglx_read_own_cfg, + .alt_write_own_cfg = aglx_write_own_cfg, + .alt_read_other_cfg = aglx_read_other_cfg, + .alt_write_other_cfg = aglx_write_other_cfg, + .rp_isr = aglx_isr, +}; +static const struct altera_pcie_data altera_pcie_1_0_data = { .ops = &altera_pcie_ops_1_0, .cap_offset =0x80 ,
@@ -789,11 +983,19 @@ static const struct altera_pcie_data altera_pcie_2_0_data = { .cfgwr1 = S10_TLP_FMTTYPE_CFGWR1, }; +static const struct altera_pcie_data altera_pcie_3_0_data = { + .ops = &altera_pcie_ops_3_0, + .version =ALTERA_PCIE_V3 , + .cap_offset =0x70 , +}; +static const struct of_device_id altera_pcie_of_match[] = { {.compatible ="altr,pcie-root-port-1.0" , .data = &altera_pcie_1_0_data }, {.compatible ="altr,pcie-root-port-2.0" , .data = &altera_pcie_2_0_data }, + {.compatible ="altr,pcie-root-port-3.0" ,/* agilex7 P,F tile */ + .data = &altera_pcie_3_0_data }, {}, };
@@ -838,6 +1040,9 @@ static int altera_pcie_probe(struct platform_device *pdev)/* enable all interrupts */ cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE );altera_pcie_host_init (pcie); + }else if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_ENABLE )); } bridge->sysdata = pcie;
Signature · 1 line
2.34.1
Re: [PATCH v4 0/2] PCI: altera: add support to agilex family
In reply to [email protected][+to Joyce, Altera PCIe maintainer]
Quoted 11 lines · On Sun, Sep 17, 2023 at 10:35:44PM +0530, [email protected] wrote:
From: D M Sharath Kumar <[email protected]>
added new callback for
1) read,write to root port configuration registers
2) read,write to endpoint configuration registers
3) root port interrupt handleragilex and newer platforms need to implemant the callback and generic root port driver should work ( without much changes ) , legacy platforms (arria
and startix) implement configuration read,write directly in wrapper
api _altera_pcie_cfg_read/_altera_pcie_cfg_write
Do these patches make the driver work on some new platform? Has it been tested? Please include the name of the new platform.
Saying this "... driver should work (without much changes)" does not sound like anything has actually been tested on hardware.
Quoted 10 lines
changelog v2:
saperated into two patches
1.refactored the driver for easily portability to future Altera FPGA platforms
2.added support for "Agilex" FPGAthis driver supports PCI RP IP on Agilex FPGA, as these are FPGA its up to the user to add PCI RP or not ( as per his needs). we are not adding the device tree as part of this commit. we are expecting the add device tree changes only if he is adding PCI RP IP in his design
Please cc: Joyce on any future postings, since she's listed as the maintainer for pcie-altera.c.
Joyce, please comment on these. We don't like to merge things affecting your file unless you approve.
Quoted 19 lines
changelog v3:
incorporate review comments from Bjorn Helgaaschangelog v4:
added below callback for root bus
alt_read/write_own_cfg
added below callback for non-root buses
alt_read/write_other_cfgD M Sharath Kumar (2):
PCI: altera: refactor driver for supporting new platform
PCI: altera: add support for agilex family fpgadrivers/pci/controller/pcie-altera.c | 313 ++++++++++++++++++++++++--- 1 file changed, 280 insertions(+), 33 deletions(-)Signature · 1 line
2.34.1
v5 cover PCI: altera: add support to agilex family
From: D M Sharath Kumar <[email protected]>
added new callback for
1) read,write to root port configuration registers
2) read,write to endpoint configuration registers
3) root port interrupt handler
agilex and newer platforms need to implemant the callback and generic root port driver should work ( without much changes ) , legacy platforms (arria
and startix) implement configuration read,write directly in wrapper
api _altera_pcie_cfg_read/_altera_pcie_cfg_write
changelog v2:
saperated into two patches
1.refactored the driver for easily portability to future Altera FPGA platforms
2.added support for "Agilex" FPGA
this driver supports PCI RP IP on Agilex FPGA, as these are FPGA its up to the user to add PCI RP or not ( as per his needs). we are not adding the device tree as part of this commit. we are expecting the add device tree changes only if he is adding PCI RP IP in his design
changelog v3:
incorporate review comments from Bjorn Helgaas
changelog v4:
added below callback for root bus
alt_read/write_own_cfg
added below callback for non-root buses
alt_read/write_other_cfg
changelog v5
the driver is tested on agilex7 and information is below
https://www.rocketboards.org/foswiki/Documentation/Agilex7PCIeRootPortDesign
incorporate review comments from Bjorn Helgaas
added comments on the supported family
{.compatible = "altr,pcie-root-port-3.0", /* agilex7 P,F tile */
printing the satusdev_err_ratelimited(dev, "unexpected IRQ %x\n", status);
indentation etc
D M Sharath Kumar (2):
PCI: altera: refactor driver for supporting new platform
PCI: altera: add support for agilex7 family fpga
drivers/pci/controller/pcie-altera.c | 313 ++++++++++++++++++++++++--- 1 file changed, 280 insertions(+), 33 deletions(-)
Signature · 1 line
2.34.1
v3 cover PCI: altera: add support to agilex family
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
added new callback for
1) read,write to root port configuration registers
2) read,write to endpoint configuration registers
3) root port interrupt handler
agilex and newer platforms need to implemant the callback and generic root port driver should work ( without much changes ) , legacy platforms (arria
and startix) implement configuration read,write directly in wrapper
api _altera_pcie_cfg_read/_altera_pcie_cfg_write
changelog v2:
saperated into two patches
1.refactored the driver for easily portability to future Altera FPGA platforms
2.added support for "Agilex" FPGA
this driver supports PCI RP IP on Agilex FPGA, as these are FPGA its up to the user to add PCI RP or not ( as per his needs). we are not adding the device tree as part of this commit. we are expecting the add device tree changes only if he is adding PCI RP IP in his design
changelog v3:
incorporate review comments from Bjorn Helgaas
D M Sharath Kumar (2):
PCI: altera: refactor driver for supporting new platforms
PCI: altera: add support for agilex family fpga
drivers/pci/controller/pcie-altera.c | 305 ++++++++++++++++++++++++--- 1 file changed, 275 insertions(+), 30 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/2 PCI: altera: refactor driver for supporting new platforms
From: D M Sharath Kumar <[email protected]>
added the below callbacks that eases is supporting newer platforms for read/write to root port configuration space registers for read/write to non root port (endpoint, switch) cfg space regs root port interrupt handler
--- drivers/pci/controller/pcie-altera.c | 100 +++++++++++++++++++-------- 1 file changed, 70 insertions(+), 30 deletions(-)
drivers/pci/controller/pcie-altera.c +70 -30
@@ -3,6 +3,7 @@* Copyright Altera Corporation (C) 2013-2015. All rights reserved * * Author: Ley Foon Tan <[email protected]> +* Author: sharath <[email protected]> * Description: Altera PCIe host controller driver */
@@ -99,10 +100,15 @@ struct altera_pcie_ops {void (*tlp_write_pkt)(struct altera_pcie *pcie,u32 *headers,u32 data,bool align);bool (*get_link_status)(struct altera_pcie *pcie); -int (*rp_read_cfg)(struct altera_pcie *pcie,int where, -int size,u32 *value); +int (*rp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value);int (*rp_write_cfg)(struct altera_pcie *pcie,u8 busno, -int where,int size,u32 value); +unsigned int devfn,int where,int size,u32 value); +int (*nonrp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*nonrp_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value); +void (*rp_isr)(struct irq_desc *desc); };struct altera_pcie_data {
@@ -379,8 +385,8 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_read_cfg (struct altera_pcie *pcie,int where, -int size,u32 *value) +static int s10_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -399,7 +405,7 @@ static int s10_rp_read_cfg(struct altera_pcie *pcie, int where,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno, +static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -426,18 +432,13 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 *value) +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {int ret;u32 data;u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) -return pcie->pcie_data->ops->rp_read_cfg (pcie, where, - size, value); -switch (size) {case 1 : byte_en =1 << (where &3 );
@@ -470,18 +471,13 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 value) +static int arr_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) {u32 data32;u32 shift =8 * (where &3 );u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) -return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, - where, size, value); -switch (size) {case 1 : data32 = (value &0xff ) << shift;
@@ -499,6 +495,35 @@ static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,return tlp_cfg_dword_write (pcie, busno, devfn, (where & ~DWORD_MASK ), byte_en, data32); + +} + +static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 *value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) +return pcie->pcie_data->ops->rp_read_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_read_cfg) +return pcie->pcie_data->ops->nonrp_read_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; +} + +static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) +return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_write_cfg) +return pcie->pcie_data->ops->nonrp_write_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; } static int altera_pcie_cfg_read(struct pci_bus *bus, unsigned int devfn,
@@ -660,7 +685,6 @@ static void altera_pcie_isr(struct irq_desc *desc)dev_err_ratelimited (dev,"unexpected IRQ, INT%d\n" , bit); } } -chained_irq_exit (chip, desc); }
@@ -691,9 +715,13 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) {struct platform_device *pdev = pcie->pdev; - pcie->cra_base =devm_platform_ioremap_resource_byname (pdev,"Cra" ); -if (IS_ERR (pcie->cra_base)) -return PTR_ERR (pcie->cra_base); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { + pcie->cra_base = +devm_platform_ioremap_resource_byname (pdev,"Cra" ); +if (IS_ERR (pcie->cra_base)) +return PTR_ERR (pcie->cra_base); + }if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { pcie->hip_base =
@@ -707,7 +735,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)if (pcie->irq <0 )return pcie->irq; -irq_set_chained_handler_and_data (pcie->irq, altera_pcie_isr, pcie); +irq_set_chained_handler_and_data (pcie->irq, + pcie->pcie_data->ops->rp_isr, pcie);return 0 ; }
@@ -720,6 +749,11 @@ static const struct altera_pcie_ops altera_pcie_ops_1_0 = { .tlp_read_pkt = tlp_read_packet, .tlp_write_pkt = tlp_write_packet, .get_link_status = altera_pcie_link_up, + .rp_read_cfg = arr_read_cfg, + .rp_write_cfg = arr_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_ops altera_pcie_ops_2_0 = {
@@ -728,6 +762,9 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .get_link_status = s10_altera_pcie_link_up, .rp_read_cfg = s10_rp_read_cfg, .rp_write_cfg = s10_rp_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_data altera_pcie_1_0_data = {
@@ -792,11 +829,14 @@ static int altera_pcie_probe(struct platform_device *pdev)return ret; } -/* clear all interrupts */ -cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); -/* enable all interrupts */ -cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); -altera_pcie_host_init (pcie); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { +/* clear all interrupts */ +cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); +/* enable all interrupts */ +cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); +altera_pcie_host_init (pcie); + } bridge->sysdata = pcie; bridge->busnr = pcie->root_bus_nr;
Signature · 1 line
2.34.1
PATCH v3 2/2 PCI: altera: add support for agilex family fpga
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
create new instance of struct altera_pcie_data for "altr,pcie-root-port-3.0"
provide corresponding callback
"port_conf_off" points to avmm port config register base
--- drivers/pci/controller/pcie-altera.c | 207 ++++++++++++++++++++++++++- 1 file changed, 206 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-altera.c +206 -1
@@ -79,9 +79,20 @@#define S10_TLP_FMTTYPE_CFGWR0 0x45#define S10_TLP_FMTTYPE_CFGWR1 0x44 +#define AGLX_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg)) +#define AGLX_RP_SECONDARY (pcie) \ + readb(AGLX_RP_CFG_ADDR(pcie, PCI_SECONDARY_BUS)) + +#define AGLX_BDF_REG 0x00002004 +#define AGLX_ROOT_PORT_IRQ_STATUS 0x14c +#define AGLX_ROOT_PORT_IRQ_ENABLE 0x150 +#define AGLX_CFG_AER (1<<4) +enum altera_pcie_version {ALTERA_PCIE_V1 =0 ,ALTERA_PCIE_V2 , +ALTERA_PCIE_V3 ,/* AGILEX p-tile, f-tile */ };struct altera_pcie {
@@ -93,6 +104,8 @@ struct altera_pcie {struct irq_domain *irq_domain;struct resource bus_range;const struct altera_pcie_data *pcie_data; +void __iomem *cs_base; +u32 port_conf_off; };struct altera_pcie_ops {
@@ -138,6 +151,39 @@ static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)return readl_relaxed (pcie->cra_base + reg); } +static inline void cs_writel (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writel_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writew (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writew_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writeb (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writeb_relaxed (value, pcie->cs_base + reg); +} + +static inline u32 cs_readl (struct altera_pcie *pcie,const u32 reg) +{ +return readl_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readw (struct altera_pcie *pcie,const u32 reg) +{ +return readw_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readb (struct altera_pcie *pcie,const u32 reg) +{ +return readb_relaxed (pcie->cs_base + reg); +} +static bool altera_pcie_link_up (struct altera_pcie *pcie) {return !!((cra_readl (pcie,RP_LTSSM ) &RP_LTSSM_MASK ) ==LTSSM_L0 );
@@ -152,6 +198,14 @@ static bool s10_altera_pcie_link_up(struct altera_pcie *pcie)return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); } +static bool aglx_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, + pcie->pcie_data->cap_offset +PCI_EXP_LNKSTA ); + +return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); +} +/* * Altera PCIe port uses BAR0 of RC's configuration space as the translation * from PCI bus to native BUS. Entire DDR region is mapped into PCIe space
@@ -432,6 +486,101 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn,return PCIBIOS_SUCCESSFUL ; } +static int aglx_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + } + +/* interrupt pin not programmed in hardware, set to INTA*/ +if (where ==PCI_INTERRUPT_PIN && size ==1 ) + *value =0x01 ; +else if (where ==PCI_INTERRUPT_LINE ) + *value |=0x0100 ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : +writeb (value, addr); +break ; +case 2 : +writew (value, addr); +break ; +default : +writel (value, addr); +break ; + } + +/* +* Monitor changes to PCI_PRIMARY_BUS register on root port +* and update local copy of root bus number accordingly. +*/ +if (busno == pcie->root_bus_nr && where ==PCI_PRIMARY_BUS ) + pcie->root_bus_nr = value &0xff ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_write_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : +cs_writeb (pcie, value, where); +break ; +case 2 : +cs_writew (pcie, value, where); +break ; +default : +cs_writel (pcie, value, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_read_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : + *value =cs_readb (pcie, where); +break ; +case 2 : + *value =cs_readw (pcie, where); +break ; +default : + *value =cs_readl (pcie, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 *value) {
@@ -688,6 +837,30 @@ static void altera_pcie_isr(struct irq_desc *desc)chained_irq_exit (chip, desc); } +static void aglx_isr (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); +struct altera_pcie *pcie; +struct device *dev; +u32 status; +int ret; + +chained_irq_enter (chip, desc); + pcie =irq_desc_get_handler_data (desc); + dev = &pcie->pdev->dev; + + status =readl ((pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +if (status &AGLX_CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ\n" ); + } +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +chained_irq_exit (chip, desc); +} +static int altera_pcie_init_irq_domain (struct altera_pcie *pcie) {struct device *dev = &pcie->pdev->dev;
@@ -723,13 +896,25 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)return PTR_ERR (pcie->cra_base); } -if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { +if ((pcie->pcie_data->version ==ALTERA_PCIE_V2 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V3 )) { pcie->hip_base =devm_platform_ioremap_resource_byname (pdev,"Hip" );if (IS_ERR (pcie->hip_base))return PTR_ERR (pcie->hip_base); } +if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { + pcie->cs_base = +devm_platform_ioremap_resource_byname (pdev,"Cs" ); +if (IS_ERR (pcie->cs_base)) +return PTR_ERR (pcie->cs_base); +of_property_read_u32 (pcie->pdev->dev.of_node,"port_conf_stat" , + &pcie->port_conf_off); +dev_dbg (&pcie->pdev->dev,"port_conf_stat_off =%#x\n" , + pcie->port_conf_off); + } +/* setup IRQ */ pcie->irq =platform_get_irq (pdev,0 );if (pcie->irq <0 )
@@ -767,6 +952,15 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .rp_isr = altera_pcie_isr, }; +static const struct altera_pcie_ops altera_pcie_ops_3_0 = { + .rp_read_cfg = aglx_rp_read_cfg, + .rp_write_cfg = aglx_rp_write_cfg, + .get_link_status = aglx_altera_pcie_link_up, + .nonrp_read_cfg = aglx_nonrp_read_cfg, + .nonrp_write_cfg = aglx_nonrp_write_cfg, + .rp_isr = aglx_isr, +}; +static const struct altera_pcie_data altera_pcie_1_0_data = { .ops = &altera_pcie_ops_1_0, .cap_offset =0x80 ,
@@ -787,11 +981,19 @@ static const struct altera_pcie_data altera_pcie_2_0_data = { .cfgwr1 = S10_TLP_FMTTYPE_CFGWR1, }; +static const struct altera_pcie_data altera_pcie_3_0_data = { + .ops = &altera_pcie_ops_3_0, + .version =ALTERA_PCIE_V3 , + .cap_offset =0x70 , +}; +static const struct of_device_id altera_pcie_of_match[] = { {.compatible ="altr,pcie-root-port-1.0" , .data = &altera_pcie_1_0_data }, {.compatible ="altr,pcie-root-port-2.0" , .data = &altera_pcie_2_0_data }, + {.compatible ="altr,pcie-root-port-3.0" , + .data = &altera_pcie_3_0_data }, {}, };
@@ -836,6 +1038,9 @@ static int altera_pcie_probe(struct platform_device *pdev)/* enable all interrupts */ cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE );altera_pcie_host_init (pcie); + }else if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_ENABLE )); } bridge->sysdata = pcie;
Signature · 1 line
2.34.1
Re: [PATCH v3 0/2] PCI: altera: add support to agilex family
In reply to [email protected]Quoted 18 lines · On 9/11/23 08:53, [email protected] wrote:
From: D M Sharath Kumar <[email protected]>
added new callback for
1) read,write to root port configuration registers
2) read,write to endpoint configuration registers
3) root port interrupt handleragilex and newer platforms need to implemant the callback and generic root port driver should work ( without much changes ) , legacy platforms (arria
and startix) implement configuration read,write directly in wrapper
api _altera_pcie_cfg_read/_altera_pcie_cfg_writechangelog v2:
saperated into two patches
1.refactored the driver for easily portability to future Altera FPGA platforms
2.added support for "Agilex" FPGA
Quoted 9 lines
this driver supports PCI RP IP on Agilex FPGA, as these are FPGA its up to the user to add PCI RP or not ( as per his needs). we are not adding the device tree as part of this commit. we are expecting the add device tree changes only if he is adding PCI RP IP in his design
changelog v3:
incorporate review comments from Bjorn Helgaas
You've sent 6 versions of this patchset in a 3-hour time span, what is going on?
Dinh
PATCH v2 2/2 PCI: altera: add suport for Agilex Family FPGA
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
--- drivers/pci/controller/pcie-altera.c | 215 ++++++++++++++++++++++++++- 1 file changed, 214 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-altera.c +214 -1
@@ -80,9 +80,21 @@#define S10_TLP_FMTTYPE_CFGWR0 0x45#define S10_TLP_FMTTYPE_CFGWR1 0x44 +#define AGLX_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg)) +#define AGLX_RP_SECONDARY (pcie) \ + readb(AGLX_RP_CFG_ADDR(pcie, PCI_SECONDARY_BUS)) + +#define AGLX_BDF_REG 0x00002004 +#define AGLX_ROOT_PORT_IRQ_STATUS 0x14c +#define AGLX_ROOT_PORT_IRQ_ENABLE 0x150 +#define CFG_AER (1<<4) +static u32 port_conf_off; +enum altera_pcie_version {ALTERA_PCIE_V1 =0 ,ALTERA_PCIE_V2 , +ALTERA_PCIE_V3 ,/* AGILEX p-tile, f-tile */ };struct altera_pcie {
@@ -94,6 +106,7 @@ struct altera_pcie {struct irq_domain *irq_domain;struct resource bus_range;const struct altera_pcie_data *pcie_data; +void __iomem *cs_base; };struct altera_pcie_ops {
@@ -139,6 +152,39 @@ static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)return readl_relaxed (pcie->cra_base + reg); } +static inline void cs_writel (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writel_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writew (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writew_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writeb (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writeb_relaxed (value, pcie->cs_base + reg); +} + +static inline u32 cs_readl (struct altera_pcie *pcie,const u32 reg) +{ +return readl_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readw (struct altera_pcie *pcie,const u32 reg) +{ +return readw_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readb (struct altera_pcie *pcie,const u32 reg) +{ +return readb_relaxed (pcie->cs_base + reg); +} +static bool altera_pcie_link_up (struct altera_pcie *pcie) {return !!((cra_readl (pcie,RP_LTSSM ) &RP_LTSSM_MASK ) ==LTSSM_L0 );
@@ -153,6 +199,14 @@ static bool s10_altera_pcie_link_up(struct altera_pcie *pcie)return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); } +static bool aglx_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, + pcie->pcie_data->cap_offset +PCI_EXP_LNKSTA ); + +return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); +} +/* * Altera PCIe port uses BAR0 of RC's configuration space as the translation * from PCI bus to native BUS. Entire DDR region is mapped into PCIe space
@@ -433,6 +487,106 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn,return PCIBIOS_SUCCESSFUL ; } +static int aglx_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + } + +/* interrupt pin not programmed in hardware +*/ +if (where ==0x3d ) + *value =0x01 ; +if (where ==0x3c ) + *value |=0x0100 ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : +writeb (value, addr); +break ; +case 2 : +writew (value, addr); +break ; +default : +writel (value, addr); +break ; + } + +/* +* Monitor changes to PCI_PRIMARY_BUS register on root port +* and update local copy of root bus number accordingly. +*/ +if (busno == pcie->root_bus_nr && where ==PCI_PRIMARY_BUS ) + pcie->root_bus_nr = value &0xff ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_ep_write_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) { +/* type 1 */ + where |= (1 <<12 ); + } + +switch (size) { +case 1 : +cs_writeb (pcie, value, where); +break ; +case 2 : +cs_writew (pcie, value, where); +break ; +default : +cs_writel (pcie, value, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_ep_read_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) { +/* type 1 */ + where |= (1 <<12 ); + } + +switch (size) { +case 1 : + *value =cs_readb (pcie, where); +break ; +case 2 : + *value =cs_readw (pcie, where); +break ; +default : + *value =cs_readl (pcie, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 *value) {
@@ -689,6 +843,30 @@ static void altera_pcie_isr(struct irq_desc *desc)chained_irq_exit (chip, desc); } +static void aglx_isr (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); +struct altera_pcie *pcie; +struct device *dev; +u32 status; +int ret; + +chained_irq_enter (chip, desc); + pcie =irq_desc_get_handler_data (desc); + dev = &pcie->pdev->dev; + + status =readl ((pcie->hip_base + port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +if (status &CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ,\n" ); + } +writel (CFG_AER , (pcie->hip_base + port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +chained_irq_exit (chip, desc); +} +static int altera_pcie_init_irq_domain (struct altera_pcie *pcie) {struct device *dev = &pcie->pdev->dev;
@@ -724,13 +902,24 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)return PTR_ERR (pcie->cra_base); } -if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { +if ((pcie->pcie_data->version ==ALTERA_PCIE_V2 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V3 )) { pcie->hip_base =devm_platform_ioremap_resource_byname (pdev,"Hip" );if (IS_ERR (pcie->hip_base))return PTR_ERR (pcie->hip_base); } +if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { + pcie->cs_base = +devm_platform_ioremap_resource_byname (pdev,"Cs" ); +if (IS_ERR (pcie->cs_base)) +return PTR_ERR (pcie->cs_base); +of_property_read_u32 (pcie->pdev->dev.of_node,"port_conf_stat" , + &port_conf_off); +dev_info (&pcie->pdev->dev,"port_conf_stat_off =%x\n" , port_conf_off); + } +/* setup IRQ */ pcie->irq =platform_get_irq (pdev,0 );if (pcie->irq <0 )
@@ -768,6 +957,15 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .rp_isr = altera_pcie_isr, }; +static const struct altera_pcie_ops altera_pcie_ops_3_0 = { + .rp_read_cfg = aglx_rp_read_cfg, + .rp_write_cfg = aglx_rp_write_cfg, + .get_link_status = aglx_altera_pcie_link_up, + .ep_read_cfg = aglx_ep_read_cfg, + .ep_write_cfg = aglx_ep_write_cfg, + .rp_isr = aglx_isr, +}; +static const struct altera_pcie_data altera_pcie_1_0_data = { .ops = &altera_pcie_ops_1_0, .cap_offset =0x80 ,
@@ -788,11 +986,23 @@ static const struct altera_pcie_data altera_pcie_2_0_data = { .cfgwr1 = S10_TLP_FMTTYPE_CFGWR1, }; +static const struct altera_pcie_data altera_pcie_3_0_data = { + .ops = &altera_pcie_ops_3_0, + .version =ALTERA_PCIE_V3 , + .cap_offset =0x70 , + .cfgrd0 =0 , + .cfgrd1 =0 , + .cfgwr0 =0 , + .cfgwr1 =0 , +}; +static const struct of_device_id altera_pcie_of_match[] = { {.compatible ="altr,pcie-root-port-1.0" , .data = &altera_pcie_1_0_data }, {.compatible ="altr,pcie-root-port-2.0" , .data = &altera_pcie_2_0_data }, + {.compatible ="altr,pcie-root-port-3.0" , + .data = &altera_pcie_3_0_data }, {}, };
@@ -837,6 +1047,9 @@ static int altera_pcie_probe(struct platform_device *pdev)/* enable all interrupts */ cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE );altera_pcie_host_init (pcie); + }else if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { +writel (CFG_AER , (pcie->hip_base + port_conf_off + +AGLX_ROOT_PORT_IRQ_ENABLE )); } bridge->sysdata = pcie;
Signature · 1 line
2.34.1
Re: [PATCH v2 2/2] PCI: altera: add suport for Agilex Family FPGA
Capitalize subject line similarly.
s/suport/support/
Quoted 1 line · On Wed, Sep 06, 2023 at 04:39:18PM +0530, [email protected] wrote:
From: D M Sharath Kumar <[email protected]>
Needs a commit log. It's ok to repeat the subject line.
drivers/pci/controller/pcie-altera.c line 91
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +4
-0+#define AGLX_BDF_REG 0x00002004 +#define AGLX_ROOT_PORT_IRQ_STATUS 0x14c +#define AGLX_ROOT_PORT_IRQ_ENABLE 0x150 +#define CFG_AER (1<<4)
This seems to be AGLX-specific so maybe should have a prefix?
Quoted 1 line
+static u32
port_conf_off;
port_conf_off looks like something that should be per-controller.
Quoted 9 lines
drivers/pci/controller/pcie-altera.c +9
-0+static int aglx_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ;
drivers/pci/controller/pcie-altera.c static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn, · line 508
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +10
-0+case 2 : + *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + } + +/* interrupt pin not programmed in hardware +*/
Use single-line comment style:
/* interrupt pin not programmed in hardware */
drivers/pci/controller/pcie-altera.c static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn, · line 512
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +4
-0+if (where ==0x3d ) + *value =0x01 ; +if (where ==0x3c ) + *value |=0x0100 ;
Use PCI_INTERRUPT_LINE and PCI_INTERRUPT_PIN.
Quoted 11 lines
drivers/pci/controller/pcie-altera.c +10
-0+return PCIBIOS_SUCCESSFUL ; +} +static void aglx_isr (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); +struct altera_pcie *pcie; +struct device *dev; +u32 status; +int ret; +
drivers/pci/controller/pcie-altera.c static void altera_pcie_isr(struct irq_desc *desc) · line 863
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +10
-0+chained_irq_enter (chip, desc); + pcie =irq_desc_get_handler_data (desc); + dev = &pcie->pdev->dev; + + status =readl ((pcie->hip_base + port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +if (status &CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ,\n" );
Remove the comma at end (or maybe you meant to add something else?) Looks like the place it was copied from had "unexpected IRQ, INT%d".
drivers/pci/controller/pcie-altera.c static int altera_pcie_parse_dt(struct altera_pcie *pcie) · line 920
Quoted 8 lines
drivers/pci/controller/pcie-altera.c +8
-0+if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { + pcie->cs_base = +devm_platform_ioremap_resource_byname (pdev,"Cs" ); +if (IS_ERR (pcie->cs_base)) +return PTR_ERR (pcie->cs_base); +of_property_read_u32 (pcie->pdev->dev.of_node,"port_conf_stat" , + &port_conf_off); +dev_info (&pcie->pdev->dev,"port_conf_stat_off =%x\n" , port_conf_off);
Is this a debug message? Doesn't look like something we need all the time. If you want it all the time, use %#x so it's clear that it's hex.
drivers/pci/controller/pcie-altera.c static const struct altera_pcie_data altera_pcie_2_0_data = {
Quoted 9 lines
drivers/pci/controller/pcie-altera.c +8
-0+static const struct altera_pcie_data altera_pcie_3_0_data = { + .ops = &altera_pcie_ops_3_0, + .version =ALTERA_PCIE_V3 , + .cap_offset =0x70 , + .cfgrd0 =0 , + .cfgrd1 =0 , + .cfgwr0 =0 , + .cfgwr1 =0 ,
cfgrd0, ..., cfgwr1 aren't used here, so no need to initialize them.
RE: [PATCH v2 2/2] PCI: altera: add suport for Agilex Family FPGA
Quoted 11 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]>
Sent: Wednesday, September 6, 2023 10:42 PM
To: D M, Sharath Kumar <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v2 2/2] PCI: altera: add suport for Agilex Family FPGA
Quoted 1 line
Capitalize subject line similarly.
ok
Quoted 2 lines
s/suport/support/
ok
Quoted 6 lines
Quoted 1 line · On Wed, Sep 06, 2023 at 04:39:18PM +0530, [email protected] wrote:
From: D M Sharath Kumar <[email protected]>
Needs a commit log. It's ok to repeat the subject line.
ok
Quoted 7 lines
drivers/pci/controller/pcie-altera.c line 91
Quoted 5 lines
drivers/pci/controller/pcie-altera.c +4
-0+#define AGLX_BDF_REG 0x00002004 +#define AGLX_ROOT_PORT_IRQ_STATUS 0x14c #define +AGLX_ROOT_PORT_IRQ_ENABLE 0x150 +#define CFG_AER (1<<4)This seems to be AGLX-specific so maybe should have a prefix?
Will change to AGLX_CFG_AER
Quoted 4 lines
Quoted 2 lines
+static u32
port_conf_off;
port_conf_offlooks like something that should be per-controller.
Specific to agilex, will rename to "aglx_port_conf_off"
Quoted 14 lines
Quoted 14 lines
drivers/pci/controller/pcie-altera.c +13
-0+static int aglx_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr); +break ; +default :
Quoted 8 lines
drivers/pci/controller/pcie-altera.c static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn, · line 508
Quoted 6 lines
drivers/pci/controller/pcie-altera.c +6
-0+ *value =readl (addr); +break ; + } + +/* interrupt pin not programmed in hardware +*/ Use single-line comment style:
ok
Quoted 9 lines
/* interrupt pin not programmed in hardware */
drivers/pci/controller/pcie-altera.c static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn, · line 512
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +4
-0+if (where ==0x3d ) + *value =0x01 ; +if (where ==0x3c ) + *value |=0x0100 ;Use
PCI_INTERRUPT_LINEandPCI_INTERRUPT_PIN.
ok
Quoted 16 lines
Quoted 16 lines
drivers/pci/controller/pcie-altera.c +14
-0+return PCIBIOS_SUCCESSFUL ; +} +static void aglx_isr (struct irq_desc *desc) { +struct irq_chip *chip =irq_desc_get_chip (desc); +struct altera_pcie *pcie; +struct device *dev; +u32 status; +int ret; + +chained_irq_enter (chip, desc); + pcie =irq_desc_get_handler_data (desc); + dev = &pcie->pdev->dev; + + status = readl((pcie->hip_base + port_conf_off
Quoted 8 lines
drivers/pci/controller/pcie-altera.c static void altera_pcie_isr(struct irq_desc *desc) · line 863
Quoted 5 lines
drivers/pci/controller/pcie-altera.c +5
-0+ + AGLX_ROOT_PORT_IRQ_STATUS)); +if (status &CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ,\n" );Remove the comma at end (or maybe you meant to add something else?) Looks like the place it was copied from had "unexpected IRQ, INT%d".
ok
Quoted 9 lines
drivers/pci/controller/pcie-altera.c static int altera_pcie_parse_dt(struct altera_pcie *pcie)
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +3
-0+if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { + pcie->cs_base = + devm_platform_ioremap_resource_byname(pdev,"Cs");
drivers/pci/controller/pcie-altera.c static int altera_pcie_parse_dt(struct altera_pcie *pcie)
Quoted 3 lines
drivers/pci/controller/pcie-altera.c +3
-0+if (IS_ERR (pcie->cs_base)) +return PTR_ERR (pcie->cs_base); + of_property_read_u32(pcie->pdev->dev.of_node,"
port_conf_stat",
Quoted 6 lines
Review
Quoted 3 lines
(quoted diff) +3
-0+ &port_conf_off); + dev_info(&pcie->pdev->dev, "port_conf_stat_off =%x\n", +port_conf_off);Is this a debug message? Doesn't look like something we need all the time. If you want it all the time, use %#x so it's clear that it's hex.
ok
Quoted 6 lines
Quoted 5 lines
drivers/pci/controller/pcie-altera.c +4
-0+static const struct altera_pcie_data altera_pcie_3_0_data = { + .ops = &altera_pcie_ops_3_0, + .version =ALTERA_PCIE_V3 , + .cap_offset =0x70 ,
Quoted 6 lines
drivers/pci/controller/pcie-altera.c static const struct altera_pcie_data altera_pcie_2_0_data = { · line 996
Quoted 4 lines
drivers/pci/controller/pcie-altera.c +4
-0+ .cfgrd0 = 0, + .cfgrd1 = 0, + .cfgwr0 = 0, + .cfgwr1 = 0,cfgrd0, ..., cfgwr1 aren't used here, so no need to initialize them.
ok
Re: [PATCH v2 2/2] PCI: altera: add suport for Agilex Family FPGA
Quoted 7 lines · Sharath Kumar
Quoted 6 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]>Quoted 1 line
+static u32
port_conf_off;
port_conf_offlooks like something that should be per-controller.Specific to agilex, will rename to "
aglx_port_conf_off"
This comment was not about the *name*, it was about the fact that it's a single instance that applies to *all* controllers. It might be the case that current hardware only supports a single controller, or that if you have multiple controllers they all use the same port_conf_off value, but for generality, values like this would normally be in the per-controller structure.
Bjorn
RE: [PATCH v2 2/2] PCI: altera: add suport for Agilex Family FPGA
Quoted 20 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]>
Sent: Friday, September 8, 2023 6:17 PM
To: D M, Sharath Kumar <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v2 2/2] PCI: altera: add suport for Agilex Family FPGAQuoted 7 lines · Sharath Kumar
Quoted 6 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]>Quoted 1 line
+static u32
port_conf_off;
port_conf_offlooks like something that should be per-controller.Specific to agilex, will rename to "
aglx_port_conf_off"
Quoted 7 lines
This comment was not about the *name*, it was about the fact that it's a single instance that applies to *all* controllers. It might be the case that current hardware only supports a single controller, or that if you have multiple controllers they all use the same
port_conf_offvalue, but for generality, values like this would normally be in the per-controller structure.Bjorn
This driver supports 3 controllers/family ( arria, startix, agilex ) This variable is only for agilex
What is ur suggestion ?
To add in controller data structure (struct altera_pcie_data) ?
Re: [PATCH v2 2/2] PCI: altera: add suport for Agilex Family FPGA
Quoted 24 lines · Sharath Kumar
Quoted 15 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]>
Sent: Friday, September 8, 2023 6:17 PM
To: D M, Sharath Kumar <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v2 2/2] PCI: altera: add suport for Agilex Family FPGAQuoted 5 lines · Sharath Kumar
Quoted 5 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]>Quoted 1 line
+static u32
port_conf_off;Quoted 8 lines
Quoted 2 lines
Quoted 1 line
port_conf_offlooks like something that should be per-controller.Specific to agilex, will rename to "
aglx_port_conf_off"This comment was not about the *name*, it was about the fact that it's a single instance that applies to *all* controllers. It might be the case that current hardware only supports a single controller, or that if you have multiple controllers they all use the same
port_conf_offvalue, but for generality, values like this would normally be in the per-controller structure.
Quoted 4 lines
This driver supports 3 controllers/family ( arria, startix, agilex ) This variable is only for agilex
What is ur suggestion ?
To add in controller data structure (structaltera_pcie_data) ?
That seems like a logical place.
RE: [PATCH v2 2/2] PCI: altera: add suport for Agilex Family FPGA
Quoted 36 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]>
Sent: Saturday, September 9, 2023 1:19 AM
To: D M, Sharath Kumar <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v2 2/2] PCI: altera: add suport for Agilex Family FPGAQuoted 16 lines · Sharath Kumar
Quoted 16 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]>
Sent: Friday, September 8, 2023 6:17 PM
To: D M, Sharath Kumar <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH v2 2/2] PCI: altera: add suport for Agilex Family FPGAQuoted 5 lines · Sharath Kumar
Quoted 5 lines
-----Original Message-----
From: Bjorn Helgaas <[email protected]>Quoted 1 line
+static u32
port_conf_off;Quoted 8 lines
Quoted 8 lines
Quoted 2 lines
Quoted 1 line
port_conf_offlooks like something that should be per-controller.Specific to agilex, will rename to "
aglx_port_conf_off"This comment was not about the *name*, it was about the fact that it's a single instance that applies to *all* controllers. It might be the case that current hardware only supports a single controller, or that if you have multiple controllers they all use the same
port_conf_offvalue, but for generality, values like this would normally be
Quoted 7 lines
in the per-controller structure.
Quoted 4 lines
This driver supports 3 controllers/family ( arria, startix, agilex ) This variable is only for agilex What is ur suggestion ? To add in controller data structure (struct
altera_pcie_data) ?That seems like a logical place.
ok
v3 cover PCI: altera: add support to agilex family
In reply to Bjorn HelgaasFrom: D M Sharath Kumar <[email protected]>
added new callback for
1) read,write to root port configuration registers
2) read,write to endpoint configuration registers
3) root port interrupt handler
agilex and newer platforms need to implemant the callback and generic root port driver should work ( without much changes ) , legacy platforms (arria
and startix) implement configuration read,write directly in wrapper
api _altera_pcie_cfg_read/_altera_pcie_cfg_write
changelog v2:
saperated into two patches
1.refactored the driver for easily portability to future Altera FPGA platforms
2.added support for "Agilex" FPGA
this driver supports PCI RP IP on Agilex FPGA, as these are FPGA its up to the user to add PCI RP or not ( as per his needs). we are not adding the device tree as part of this commit. we are expecting the add device tree changes only if he is adding PCI RP IP in his design
changelog v3:
incorporate review comments from Bjorn Helgaas
D M Sharath Kumar (2):
PCI: altera: refactor driver for supporting new platforms
PCI: altera: add support for agilex family fpga
drivers/pci/controller/pcie-altera.c | 305 ++++++++++++++++++++++++--- 1 file changed, 275 insertions(+), 30 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/2 PCI: altera: refactor driver for supporting new platforms
From: D M Sharath Kumar <[email protected]>
added the below callbacks that eases is supporting newer platforms for read/write to root port configuration space registers for read/write to non root port (endpoint, switch) cfg space regs root port interrupt handler
--- drivers/pci/controller/pcie-altera.c | 100 +++++++++++++++++++-------- 1 file changed, 70 insertions(+), 30 deletions(-)
drivers/pci/controller/pcie-altera.c +70 -30
@@ -3,6 +3,7 @@* Copyright Altera Corporation (C) 2013-2015. All rights reserved * * Author: Ley Foon Tan <[email protected]> +* Author: sharath <[email protected]> * Description: Altera PCIe host controller driver */
@@ -99,10 +100,15 @@ struct altera_pcie_ops {void (*tlp_write_pkt)(struct altera_pcie *pcie,u32 *headers,u32 data,bool align);bool (*get_link_status)(struct altera_pcie *pcie); -int (*rp_read_cfg)(struct altera_pcie *pcie,int where, -int size,u32 *value); +int (*rp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value);int (*rp_write_cfg)(struct altera_pcie *pcie,u8 busno, -int where,int size,u32 value); +unsigned int devfn,int where,int size,u32 value); +int (*nonrp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*nonrp_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value); +void (*rp_isr)(struct irq_desc *desc); };struct altera_pcie_data {
@@ -379,8 +385,8 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_read_cfg (struct altera_pcie *pcie,int where, -int size,u32 *value) +static int s10_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -399,7 +405,7 @@ static int s10_rp_read_cfg(struct altera_pcie *pcie, int where,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno, +static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -426,18 +432,13 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 *value) +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {int ret;u32 data;u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) -return pcie->pcie_data->ops->rp_read_cfg (pcie, where, - size, value); -switch (size) {case 1 : byte_en =1 << (where &3 );
@@ -470,18 +471,13 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 value) +static int arr_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) {u32 data32;u32 shift =8 * (where &3 );u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) -return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, - where, size, value); -switch (size) {case 1 : data32 = (value &0xff ) << shift;
@@ -499,6 +495,35 @@ static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,return tlp_cfg_dword_write (pcie, busno, devfn, (where & ~DWORD_MASK ), byte_en, data32); + +} + +static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 *value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) +return pcie->pcie_data->ops->rp_read_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_read_cfg) +return pcie->pcie_data->ops->nonrp_read_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; +} + +static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) +return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_write_cfg) +return pcie->pcie_data->ops->nonrp_write_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; } static int altera_pcie_cfg_read(struct pci_bus *bus, unsigned int devfn,
@@ -660,7 +685,6 @@ static void altera_pcie_isr(struct irq_desc *desc)dev_err_ratelimited (dev,"unexpected IRQ, INT%d\n" , bit); } } -chained_irq_exit (chip, desc); }
@@ -691,9 +715,13 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) {struct platform_device *pdev = pcie->pdev; - pcie->cra_base =devm_platform_ioremap_resource_byname (pdev,"Cra" ); -if (IS_ERR (pcie->cra_base)) -return PTR_ERR (pcie->cra_base); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { + pcie->cra_base = +devm_platform_ioremap_resource_byname (pdev,"Cra" ); +if (IS_ERR (pcie->cra_base)) +return PTR_ERR (pcie->cra_base); + }if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { pcie->hip_base =
@@ -707,7 +735,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)if (pcie->irq <0 )return pcie->irq; -irq_set_chained_handler_and_data (pcie->irq, altera_pcie_isr, pcie); +irq_set_chained_handler_and_data (pcie->irq, + pcie->pcie_data->ops->rp_isr, pcie);return 0 ; }
@@ -720,6 +749,11 @@ static const struct altera_pcie_ops altera_pcie_ops_1_0 = { .tlp_read_pkt = tlp_read_packet, .tlp_write_pkt = tlp_write_packet, .get_link_status = altera_pcie_link_up, + .rp_read_cfg = arr_read_cfg, + .rp_write_cfg = arr_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_ops altera_pcie_ops_2_0 = {
@@ -728,6 +762,9 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .get_link_status = s10_altera_pcie_link_up, .rp_read_cfg = s10_rp_read_cfg, .rp_write_cfg = s10_rp_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_data altera_pcie_1_0_data = {
@@ -792,11 +829,14 @@ static int altera_pcie_probe(struct platform_device *pdev)return ret; } -/* clear all interrupts */ -cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); -/* enable all interrupts */ -cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); -altera_pcie_host_init (pcie); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { +/* clear all interrupts */ +cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); +/* enable all interrupts */ +cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); +altera_pcie_host_init (pcie); + } bridge->sysdata = pcie; bridge->busnr = pcie->root_bus_nr;
Signature · 1 line
2.34.1
PATCH v3 2/2 PCI: altera: add support for agilex family fpga
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
create new instance of struct altera_pcie_data for "altr,pcie-root-port-3.0"
provide corresponding callback
"port_conf_off" points to avmm port config register base
--- drivers/pci/controller/pcie-altera.c | 207 ++++++++++++++++++++++++++- 1 file changed, 206 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-altera.c +206 -1
@@ -79,9 +79,20 @@#define S10_TLP_FMTTYPE_CFGWR0 0x45#define S10_TLP_FMTTYPE_CFGWR1 0x44 +#define AGLX_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg)) +#define AGLX_RP_SECONDARY (pcie) \ + readb(AGLX_RP_CFG_ADDR(pcie, PCI_SECONDARY_BUS)) + +#define AGLX_BDF_REG 0x00002004 +#define AGLX_ROOT_PORT_IRQ_STATUS 0x14c +#define AGLX_ROOT_PORT_IRQ_ENABLE 0x150 +#define AGLX_CFG_AER (1<<4) +enum altera_pcie_version {ALTERA_PCIE_V1 =0 ,ALTERA_PCIE_V2 , +ALTERA_PCIE_V3 ,/* AGILEX p-tile, f-tile */ };struct altera_pcie {
@@ -93,6 +104,8 @@ struct altera_pcie {struct irq_domain *irq_domain;struct resource bus_range;const struct altera_pcie_data *pcie_data; +void __iomem *cs_base; +u32 port_conf_off; };struct altera_pcie_ops {
@@ -138,6 +151,39 @@ static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)return readl_relaxed (pcie->cra_base + reg); } +static inline void cs_writel (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writel_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writew (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writew_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writeb (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writeb_relaxed (value, pcie->cs_base + reg); +} + +static inline u32 cs_readl (struct altera_pcie *pcie,const u32 reg) +{ +return readl_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readw (struct altera_pcie *pcie,const u32 reg) +{ +return readw_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readb (struct altera_pcie *pcie,const u32 reg) +{ +return readb_relaxed (pcie->cs_base + reg); +} +static bool altera_pcie_link_up (struct altera_pcie *pcie) {return !!((cra_readl (pcie,RP_LTSSM ) &RP_LTSSM_MASK ) ==LTSSM_L0 );
@@ -152,6 +198,14 @@ static bool s10_altera_pcie_link_up(struct altera_pcie *pcie)return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); } +static bool aglx_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, + pcie->pcie_data->cap_offset +PCI_EXP_LNKSTA ); + +return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); +} +/* * Altera PCIe port uses BAR0 of RC's configuration space as the translation * from PCI bus to native BUS. Entire DDR region is mapped into PCIe space
@@ -432,6 +486,101 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn,return PCIBIOS_SUCCESSFUL ; } +static int aglx_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + } + +/* interrupt pin not programmed in hardware, set to INTA*/ +if (where ==PCI_INTERRUPT_PIN && size ==1 ) + *value =0x01 ; +else if (where ==PCI_INTERRUPT_LINE ) + *value |=0x0100 ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : +writeb (value, addr); +break ; +case 2 : +writew (value, addr); +break ; +default : +writel (value, addr); +break ; + } + +/* +* Monitor changes to PCI_PRIMARY_BUS register on root port +* and update local copy of root bus number accordingly. +*/ +if (busno == pcie->root_bus_nr && where ==PCI_PRIMARY_BUS ) + pcie->root_bus_nr = value &0xff ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_write_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : +cs_writeb (pcie, value, where); +break ; +case 2 : +cs_writew (pcie, value, where); +break ; +default : +cs_writel (pcie, value, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_read_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : + *value =cs_readb (pcie, where); +break ; +case 2 : + *value =cs_readw (pcie, where); +break ; +default : + *value =cs_readl (pcie, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 *value) {
@@ -688,6 +837,30 @@ static void altera_pcie_isr(struct irq_desc *desc)chained_irq_exit (chip, desc); } +static void aglx_isr (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); +struct altera_pcie *pcie; +struct device *dev; +u32 status; +int ret; + +chained_irq_enter (chip, desc); + pcie =irq_desc_get_handler_data (desc); + dev = &pcie->pdev->dev; + + status =readl ((pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +if (status &AGLX_CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ\n" ); + } +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +chained_irq_exit (chip, desc); +} +static int altera_pcie_init_irq_domain (struct altera_pcie *pcie) {struct device *dev = &pcie->pdev->dev;
@@ -723,13 +896,25 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)return PTR_ERR (pcie->cra_base); } -if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { +if ((pcie->pcie_data->version ==ALTERA_PCIE_V2 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V3 )) { pcie->hip_base =devm_platform_ioremap_resource_byname (pdev,"Hip" );if (IS_ERR (pcie->hip_base))return PTR_ERR (pcie->hip_base); } +if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { + pcie->cs_base = +devm_platform_ioremap_resource_byname (pdev,"Cs" ); +if (IS_ERR (pcie->cs_base)) +return PTR_ERR (pcie->cs_base); +of_property_read_u32 (pcie->pdev->dev.of_node,"port_conf_stat" , + &pcie->port_conf_off); +dev_dbg (&pcie->pdev->dev,"port_conf_stat_off =%#x\n" , + pcie->port_conf_off); + } +/* setup IRQ */ pcie->irq =platform_get_irq (pdev,0 );if (pcie->irq <0 )
@@ -767,6 +952,15 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .rp_isr = altera_pcie_isr, }; +static const struct altera_pcie_ops altera_pcie_ops_3_0 = { + .rp_read_cfg = aglx_rp_read_cfg, + .rp_write_cfg = aglx_rp_write_cfg, + .get_link_status = aglx_altera_pcie_link_up, + .nonrp_read_cfg = aglx_nonrp_read_cfg, + .nonrp_write_cfg = aglx_nonrp_write_cfg, + .rp_isr = aglx_isr, +}; +static const struct altera_pcie_data altera_pcie_1_0_data = { .ops = &altera_pcie_ops_1_0, .cap_offset =0x80 ,
@@ -787,11 +981,19 @@ static const struct altera_pcie_data altera_pcie_2_0_data = { .cfgwr1 = S10_TLP_FMTTYPE_CFGWR1, }; +static const struct altera_pcie_data altera_pcie_3_0_data = { + .ops = &altera_pcie_ops_3_0, + .version =ALTERA_PCIE_V3 , + .cap_offset =0x70 , +}; +static const struct of_device_id altera_pcie_of_match[] = { {.compatible ="altr,pcie-root-port-1.0" , .data = &altera_pcie_1_0_data }, {.compatible ="altr,pcie-root-port-2.0" , .data = &altera_pcie_2_0_data }, + {.compatible ="altr,pcie-root-port-3.0" , + .data = &altera_pcie_3_0_data }, {}, };
@@ -836,6 +1038,9 @@ static int altera_pcie_probe(struct platform_device *pdev)/* enable all interrupts */ cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE );altera_pcie_host_init (pcie); + }else if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_ENABLE )); } bridge->sysdata = pcie;
Signature · 1 line
2.34.1
PATCH v2 2/2 PCI: altera: add support for agilex family fpga
In reply to Bjorn HelgaasFrom: D M Sharath Kumar <[email protected]>
create new instance of struct altera_pcie_data for "altr,pcie-root-port-3.0"
provide corresponding callback
"port_conf_off" points to avmm port config register base
--- drivers/pci/controller/pcie-altera.c | 207 ++++++++++++++++++++++++++- 1 file changed, 206 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-altera.c +206 -1
@@ -79,9 +79,20 @@#define S10_TLP_FMTTYPE_CFGWR0 0x45#define S10_TLP_FMTTYPE_CFGWR1 0x44 +#define AGLX_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg)) +#define AGLX_RP_SECONDARY (pcie) \ + readb(AGLX_RP_CFG_ADDR(pcie, PCI_SECONDARY_BUS)) + +#define AGLX_BDF_REG 0x00002004 +#define AGLX_ROOT_PORT_IRQ_STATUS 0x14c +#define AGLX_ROOT_PORT_IRQ_ENABLE 0x150 +#define AGLX_CFG_AER (1<<4) +enum altera_pcie_version {ALTERA_PCIE_V1 =0 ,ALTERA_PCIE_V2 , +ALTERA_PCIE_V3 ,/* AGILEX p-tile, f-tile */ };struct altera_pcie {
@@ -93,6 +104,8 @@ struct altera_pcie {struct irq_domain *irq_domain;struct resource bus_range;const struct altera_pcie_data *pcie_data; +void __iomem *cs_base; +u32 port_conf_off; };struct altera_pcie_ops {
@@ -138,6 +151,39 @@ static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)return readl_relaxed (pcie->cra_base + reg); } +static inline void cs_writel (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writel_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writew (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writew_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writeb (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writeb_relaxed (value, pcie->cs_base + reg); +} + +static inline u32 cs_readl (struct altera_pcie *pcie,const u32 reg) +{ +return readl_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readw (struct altera_pcie *pcie,const u32 reg) +{ +return readw_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readb (struct altera_pcie *pcie,const u32 reg) +{ +return readb_relaxed (pcie->cs_base + reg); +} +static bool altera_pcie_link_up (struct altera_pcie *pcie) {return !!((cra_readl (pcie,RP_LTSSM ) &RP_LTSSM_MASK ) ==LTSSM_L0 );
@@ -152,6 +198,14 @@ static bool s10_altera_pcie_link_up(struct altera_pcie *pcie)return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); } +static bool aglx_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, + pcie->pcie_data->cap_offset +PCI_EXP_LNKSTA ); + +return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); +} +/* * Altera PCIe port uses BAR0 of RC's configuration space as the translation * from PCI bus to native BUS. Entire DDR region is mapped into PCIe space
@@ -432,6 +486,101 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn,return PCIBIOS_SUCCESSFUL ; } +static int aglx_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + } + +/* interrupt pin not programmed in hardware, set to INTA*/ +if (where ==PCI_INTERRUPT_PIN && size ==1 ) + *value =0x01 ; +else if (where ==PCI_INTERRUPT_LINE ) + *value |=0x0100 ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : +writeb (value, addr); +break ; +case 2 : +writew (value, addr); +break ; +default : +writel (value, addr); +break ; + } + +/* +* Monitor changes to PCI_PRIMARY_BUS register on root port +* and update local copy of root bus number accordingly. +*/ +if (busno == pcie->root_bus_nr && where ==PCI_PRIMARY_BUS ) + pcie->root_bus_nr = value &0xff ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_write_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : +cs_writeb (pcie, value, where); +break ; +case 2 : +cs_writew (pcie, value, where); +break ; +default : +cs_writel (pcie, value, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_read_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : + *value =cs_readb (pcie, where); +break ; +case 2 : + *value =cs_readw (pcie, where); +break ; +default : + *value =cs_readl (pcie, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 *value) {
@@ -688,6 +837,30 @@ static void altera_pcie_isr(struct irq_desc *desc)chained_irq_exit (chip, desc); } +static void aglx_isr (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); +struct altera_pcie *pcie; +struct device *dev; +u32 status; +int ret; + +chained_irq_enter (chip, desc); + pcie =irq_desc_get_handler_data (desc); + dev = &pcie->pdev->dev; + + status =readl ((pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +if (status &AGLX_CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ\n" ); + } +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +chained_irq_exit (chip, desc); +} +static int altera_pcie_init_irq_domain (struct altera_pcie *pcie) {struct device *dev = &pcie->pdev->dev;
@@ -723,13 +896,25 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)return PTR_ERR (pcie->cra_base); } -if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { +if ((pcie->pcie_data->version ==ALTERA_PCIE_V2 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V3 )) { pcie->hip_base =devm_platform_ioremap_resource_byname (pdev,"Hip" );if (IS_ERR (pcie->hip_base))return PTR_ERR (pcie->hip_base); } +if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { + pcie->cs_base = +devm_platform_ioremap_resource_byname (pdev,"Cs" ); +if (IS_ERR (pcie->cs_base)) +return PTR_ERR (pcie->cs_base); +of_property_read_u32 (pcie->pdev->dev.of_node,"port_conf_stat" , + &pcie->port_conf_off); +dev_dbg (&pcie->pdev->dev,"port_conf_stat_off =%#x\n" , + pcie->port_conf_off); + } +/* setup IRQ */ pcie->irq =platform_get_irq (pdev,0 );if (pcie->irq <0 )
@@ -767,6 +952,15 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .rp_isr = altera_pcie_isr, }; +static const struct altera_pcie_ops altera_pcie_ops_3_0 = { + .rp_read_cfg = aglx_rp_read_cfg, + .rp_write_cfg = aglx_rp_write_cfg, + .get_link_status = aglx_altera_pcie_link_up, + .nonrp_read_cfg = aglx_nonrp_read_cfg, + .nonrp_write_cfg = aglx_nonrp_write_cfg, + .rp_isr = aglx_isr, +}; +static const struct altera_pcie_data altera_pcie_1_0_data = { .ops = &altera_pcie_ops_1_0, .cap_offset =0x80 ,
@@ -787,11 +981,19 @@ static const struct altera_pcie_data altera_pcie_2_0_data = { .cfgwr1 = S10_TLP_FMTTYPE_CFGWR1, }; +static const struct altera_pcie_data altera_pcie_3_0_data = { + .ops = &altera_pcie_ops_3_0, + .version =ALTERA_PCIE_V3 , + .cap_offset =0x70 , +}; +static const struct of_device_id altera_pcie_of_match[] = { {.compatible ="altr,pcie-root-port-1.0" , .data = &altera_pcie_1_0_data }, {.compatible ="altr,pcie-root-port-2.0" , .data = &altera_pcie_2_0_data }, + {.compatible ="altr,pcie-root-port-3.0" , + .data = &altera_pcie_3_0_data }, {}, };
@@ -836,6 +1038,9 @@ static int altera_pcie_probe(struct platform_device *pdev)/* enable all interrupts */ cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE );altera_pcie_host_init (pcie); + }else if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_ENABLE )); } bridge->sysdata = pcie;
Signature · 1 line
2.34.1
v3 cover PCI: altera: add support to agilex family
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
added new callback for
1) read,write to root port configuration registers
2) read,write to endpoint configuration registers
3) root port interrupt handler
agilex and newer platforms need to implemant the callback and generic root port driver should work ( without much changes ) , legacy platforms (arria
and startix) implement configuration read,write directly in wrapper
api _altera_pcie_cfg_read/_altera_pcie_cfg_write
changelog v2:
saperated into two patches
1.refactored the driver for easily portability to future Altera FPGA platforms
2.added support for "Agilex" FPGA
this driver supports PCI RP IP on Agilex FPGA, as these are FPGA its up to the user to add PCI RP or not ( as per his needs). we are not adding the device tree as part of this commit. we are expecting the add device tree changes only if he is adding PCI RP IP in his design
changelog v3:
incorporate review comments from Bjorn Helgaas
D M Sharath Kumar (2):
PCI: altera: refactor driver for supporting new platforms
PCI: altera: add support for agilex family fpga
drivers/pci/controller/pcie-altera.c | 305 ++++++++++++++++++++++++--- 1 file changed, 275 insertions(+), 30 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/2 PCI: altera: refactor driver for supporting new platforms
From: D M Sharath Kumar <[email protected]>
added the below callbacks that eases is supporting newer platforms for read/write to root port configuration space registers for read/write to non root port (endpoint, switch) cfg space regs root port interrupt handler
--- drivers/pci/controller/pcie-altera.c | 100 +++++++++++++++++++-------- 1 file changed, 70 insertions(+), 30 deletions(-)
drivers/pci/controller/pcie-altera.c +70 -30
@@ -3,6 +3,7 @@* Copyright Altera Corporation (C) 2013-2015. All rights reserved * * Author: Ley Foon Tan <[email protected]> +* Author: sharath <[email protected]> * Description: Altera PCIe host controller driver */
@@ -99,10 +100,15 @@ struct altera_pcie_ops {void (*tlp_write_pkt)(struct altera_pcie *pcie,u32 *headers,u32 data,bool align);bool (*get_link_status)(struct altera_pcie *pcie); -int (*rp_read_cfg)(struct altera_pcie *pcie,int where, -int size,u32 *value); +int (*rp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value);int (*rp_write_cfg)(struct altera_pcie *pcie,u8 busno, -int where,int size,u32 value); +unsigned int devfn,int where,int size,u32 value); +int (*nonrp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*nonrp_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value); +void (*rp_isr)(struct irq_desc *desc); };struct altera_pcie_data {
@@ -379,8 +385,8 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_read_cfg (struct altera_pcie *pcie,int where, -int size,u32 *value) +static int s10_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -399,7 +405,7 @@ static int s10_rp_read_cfg(struct altera_pcie *pcie, int where,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno, +static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -426,18 +432,13 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 *value) +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {int ret;u32 data;u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) -return pcie->pcie_data->ops->rp_read_cfg (pcie, where, - size, value); -switch (size) {case 1 : byte_en =1 << (where &3 );
@@ -470,18 +471,13 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 value) +static int arr_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) {u32 data32;u32 shift =8 * (where &3 );u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) -return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, - where, size, value); -switch (size) {case 1 : data32 = (value &0xff ) << shift;
@@ -499,6 +495,35 @@ static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,return tlp_cfg_dword_write (pcie, busno, devfn, (where & ~DWORD_MASK ), byte_en, data32); + +} + +static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 *value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) +return pcie->pcie_data->ops->rp_read_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_read_cfg) +return pcie->pcie_data->ops->nonrp_read_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; +} + +static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) +return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_write_cfg) +return pcie->pcie_data->ops->nonrp_write_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; } static int altera_pcie_cfg_read(struct pci_bus *bus, unsigned int devfn,
@@ -660,7 +685,6 @@ static void altera_pcie_isr(struct irq_desc *desc)dev_err_ratelimited (dev,"unexpected IRQ, INT%d\n" , bit); } } -chained_irq_exit (chip, desc); }
@@ -691,9 +715,13 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) {struct platform_device *pdev = pcie->pdev; - pcie->cra_base =devm_platform_ioremap_resource_byname (pdev,"Cra" ); -if (IS_ERR (pcie->cra_base)) -return PTR_ERR (pcie->cra_base); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { + pcie->cra_base = +devm_platform_ioremap_resource_byname (pdev,"Cra" ); +if (IS_ERR (pcie->cra_base)) +return PTR_ERR (pcie->cra_base); + }if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { pcie->hip_base =
@@ -707,7 +735,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)if (pcie->irq <0 )return pcie->irq; -irq_set_chained_handler_and_data (pcie->irq, altera_pcie_isr, pcie); +irq_set_chained_handler_and_data (pcie->irq, + pcie->pcie_data->ops->rp_isr, pcie);return 0 ; }
@@ -720,6 +749,11 @@ static const struct altera_pcie_ops altera_pcie_ops_1_0 = { .tlp_read_pkt = tlp_read_packet, .tlp_write_pkt = tlp_write_packet, .get_link_status = altera_pcie_link_up, + .rp_read_cfg = arr_read_cfg, + .rp_write_cfg = arr_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_ops altera_pcie_ops_2_0 = {
@@ -728,6 +762,9 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .get_link_status = s10_altera_pcie_link_up, .rp_read_cfg = s10_rp_read_cfg, .rp_write_cfg = s10_rp_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_data altera_pcie_1_0_data = {
@@ -792,11 +829,14 @@ static int altera_pcie_probe(struct platform_device *pdev)return ret; } -/* clear all interrupts */ -cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); -/* enable all interrupts */ -cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); -altera_pcie_host_init (pcie); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { +/* clear all interrupts */ +cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); +/* enable all interrupts */ +cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); +altera_pcie_host_init (pcie); + } bridge->sysdata = pcie; bridge->busnr = pcie->root_bus_nr;
Signature · 1 line
2.34.1
PATCH v3 2/2 PCI: altera: add support for agilex family fpga
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
create new instance of struct altera_pcie_data for "altr,pcie-root-port-3.0"
provide corresponding callback
"port_conf_off" points to avmm port config register base
--- drivers/pci/controller/pcie-altera.c | 207 ++++++++++++++++++++++++++- 1 file changed, 206 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-altera.c +206 -1
@@ -79,9 +79,20 @@#define S10_TLP_FMTTYPE_CFGWR0 0x45#define S10_TLP_FMTTYPE_CFGWR1 0x44 +#define AGLX_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg)) +#define AGLX_RP_SECONDARY (pcie) \ + readb(AGLX_RP_CFG_ADDR(pcie, PCI_SECONDARY_BUS)) + +#define AGLX_BDF_REG 0x00002004 +#define AGLX_ROOT_PORT_IRQ_STATUS 0x14c +#define AGLX_ROOT_PORT_IRQ_ENABLE 0x150 +#define AGLX_CFG_AER (1<<4) +enum altera_pcie_version {ALTERA_PCIE_V1 =0 ,ALTERA_PCIE_V2 , +ALTERA_PCIE_V3 ,/* AGILEX p-tile, f-tile */ };struct altera_pcie {
@@ -93,6 +104,8 @@ struct altera_pcie {struct irq_domain *irq_domain;struct resource bus_range;const struct altera_pcie_data *pcie_data; +void __iomem *cs_base; +u32 port_conf_off; };struct altera_pcie_ops {
@@ -138,6 +151,39 @@ static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)return readl_relaxed (pcie->cra_base + reg); } +static inline void cs_writel (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writel_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writew (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writew_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writeb (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writeb_relaxed (value, pcie->cs_base + reg); +} + +static inline u32 cs_readl (struct altera_pcie *pcie,const u32 reg) +{ +return readl_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readw (struct altera_pcie *pcie,const u32 reg) +{ +return readw_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readb (struct altera_pcie *pcie,const u32 reg) +{ +return readb_relaxed (pcie->cs_base + reg); +} +static bool altera_pcie_link_up (struct altera_pcie *pcie) {return !!((cra_readl (pcie,RP_LTSSM ) &RP_LTSSM_MASK ) ==LTSSM_L0 );
@@ -152,6 +198,14 @@ static bool s10_altera_pcie_link_up(struct altera_pcie *pcie)return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); } +static bool aglx_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, + pcie->pcie_data->cap_offset +PCI_EXP_LNKSTA ); + +return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); +} +/* * Altera PCIe port uses BAR0 of RC's configuration space as the translation * from PCI bus to native BUS. Entire DDR region is mapped into PCIe space
@@ -432,6 +486,101 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn,return PCIBIOS_SUCCESSFUL ; } +static int aglx_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + } + +/* interrupt pin not programmed in hardware, set to INTA*/ +if (where ==PCI_INTERRUPT_PIN && size ==1 ) + *value =0x01 ; +else if (where ==PCI_INTERRUPT_LINE ) + *value |=0x0100 ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : +writeb (value, addr); +break ; +case 2 : +writew (value, addr); +break ; +default : +writel (value, addr); +break ; + } + +/* +* Monitor changes to PCI_PRIMARY_BUS register on root port +* and update local copy of root bus number accordingly. +*/ +if (busno == pcie->root_bus_nr && where ==PCI_PRIMARY_BUS ) + pcie->root_bus_nr = value &0xff ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_write_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : +cs_writeb (pcie, value, where); +break ; +case 2 : +cs_writew (pcie, value, where); +break ; +default : +cs_writel (pcie, value, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_read_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : + *value =cs_readb (pcie, where); +break ; +case 2 : + *value =cs_readw (pcie, where); +break ; +default : + *value =cs_readl (pcie, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 *value) {
@@ -688,6 +837,30 @@ static void altera_pcie_isr(struct irq_desc *desc)chained_irq_exit (chip, desc); } +static void aglx_isr (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); +struct altera_pcie *pcie; +struct device *dev; +u32 status; +int ret; + +chained_irq_enter (chip, desc); + pcie =irq_desc_get_handler_data (desc); + dev = &pcie->pdev->dev; + + status =readl ((pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +if (status &AGLX_CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ\n" ); + } +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +chained_irq_exit (chip, desc); +} +static int altera_pcie_init_irq_domain (struct altera_pcie *pcie) {struct device *dev = &pcie->pdev->dev;
@@ -723,13 +896,25 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)return PTR_ERR (pcie->cra_base); } -if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { +if ((pcie->pcie_data->version ==ALTERA_PCIE_V2 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V3 )) { pcie->hip_base =devm_platform_ioremap_resource_byname (pdev,"Hip" );if (IS_ERR (pcie->hip_base))return PTR_ERR (pcie->hip_base); } +if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { + pcie->cs_base = +devm_platform_ioremap_resource_byname (pdev,"Cs" ); +if (IS_ERR (pcie->cs_base)) +return PTR_ERR (pcie->cs_base); +of_property_read_u32 (pcie->pdev->dev.of_node,"port_conf_stat" , + &pcie->port_conf_off); +dev_dbg (&pcie->pdev->dev,"port_conf_stat_off =%#x\n" , + pcie->port_conf_off); + } +/* setup IRQ */ pcie->irq =platform_get_irq (pdev,0 );if (pcie->irq <0 )
@@ -767,6 +952,15 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .rp_isr = altera_pcie_isr, }; +static const struct altera_pcie_ops altera_pcie_ops_3_0 = { + .rp_read_cfg = aglx_rp_read_cfg, + .rp_write_cfg = aglx_rp_write_cfg, + .get_link_status = aglx_altera_pcie_link_up, + .nonrp_read_cfg = aglx_nonrp_read_cfg, + .nonrp_write_cfg = aglx_nonrp_write_cfg, + .rp_isr = aglx_isr, +}; +static const struct altera_pcie_data altera_pcie_1_0_data = { .ops = &altera_pcie_ops_1_0, .cap_offset =0x80 ,
@@ -787,11 +981,19 @@ static const struct altera_pcie_data altera_pcie_2_0_data = { .cfgwr1 = S10_TLP_FMTTYPE_CFGWR1, }; +static const struct altera_pcie_data altera_pcie_3_0_data = { + .ops = &altera_pcie_ops_3_0, + .version =ALTERA_PCIE_V3 , + .cap_offset =0x70 , +}; +static const struct of_device_id altera_pcie_of_match[] = { {.compatible ="altr,pcie-root-port-1.0" , .data = &altera_pcie_1_0_data }, {.compatible ="altr,pcie-root-port-2.0" , .data = &altera_pcie_2_0_data }, + {.compatible ="altr,pcie-root-port-3.0" , + .data = &altera_pcie_3_0_data }, {}, };
@@ -836,6 +1038,9 @@ static int altera_pcie_probe(struct platform_device *pdev)/* enable all interrupts */ cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE );altera_pcie_host_init (pcie); + }else if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_ENABLE )); } bridge->sysdata = pcie;
Signature · 1 line
2.34.1
v3 cover PCI: altera: add support to agilex family
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
added new callback for
1) read,write to root port configuration registers
2) read,write to endpoint configuration registers
3) root port interrupt handler
agilex and newer platforms need to implemant the callback and generic root port driver should work ( without much changes ) , legacy platforms (arria
and startix) implement configuration read,write directly in wrapper
api _altera_pcie_cfg_read/_altera_pcie_cfg_write
changelog v2:
saperated into two patches
1.refactored the driver for easily portability to future Altera FPGA platforms
2.added support for "Agilex" FPGA
this driver supports PCI RP IP on Agilex FPGA, as these are FPGA its up to the user to add PCI RP or not ( as per his needs). we are not adding the device tree as part of this commit. we are expecting the add device tree changes only if he is adding PCI RP IP in his design
changelog v3:
incorporate review comments from Bjorn Helgaas
D M Sharath Kumar (2):
PCI: altera: refactor driver for supporting new platforms
PCI: altera: add support for agilex family fpga
drivers/pci/controller/pcie-altera.c | 305 ++++++++++++++++++++++++--- 1 file changed, 275 insertions(+), 30 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/2 PCI: altera: refactor driver for supporting new platforms
From: D M Sharath Kumar <[email protected]>
added the below callbacks that eases is supporting newer platforms for read/write to root port configuration space registers for read/write to non root port (endpoint, switch) cfg space regs root port interrupt handler
--- drivers/pci/controller/pcie-altera.c | 100 +++++++++++++++++++-------- 1 file changed, 70 insertions(+), 30 deletions(-)
drivers/pci/controller/pcie-altera.c +70 -30
@@ -3,6 +3,7 @@* Copyright Altera Corporation (C) 2013-2015. All rights reserved * * Author: Ley Foon Tan <[email protected]> +* Author: sharath <[email protected]> * Description: Altera PCIe host controller driver */
@@ -99,10 +100,15 @@ struct altera_pcie_ops {void (*tlp_write_pkt)(struct altera_pcie *pcie,u32 *headers,u32 data,bool align);bool (*get_link_status)(struct altera_pcie *pcie); -int (*rp_read_cfg)(struct altera_pcie *pcie,int where, -int size,u32 *value); +int (*rp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value);int (*rp_write_cfg)(struct altera_pcie *pcie,u8 busno, -int where,int size,u32 value); +unsigned int devfn,int where,int size,u32 value); +int (*nonrp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*nonrp_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value); +void (*rp_isr)(struct irq_desc *desc); };struct altera_pcie_data {
@@ -379,8 +385,8 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_read_cfg (struct altera_pcie *pcie,int where, -int size,u32 *value) +static int s10_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -399,7 +405,7 @@ static int s10_rp_read_cfg(struct altera_pcie *pcie, int where,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno, +static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -426,18 +432,13 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 *value) +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {int ret;u32 data;u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) -return pcie->pcie_data->ops->rp_read_cfg (pcie, where, - size, value); -switch (size) {case 1 : byte_en =1 << (where &3 );
@@ -470,18 +471,13 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 value) +static int arr_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) {u32 data32;u32 shift =8 * (where &3 );u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) -return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, - where, size, value); -switch (size) {case 1 : data32 = (value &0xff ) << shift;
@@ -499,6 +495,35 @@ static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,return tlp_cfg_dword_write (pcie, busno, devfn, (where & ~DWORD_MASK ), byte_en, data32); + +} + +static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 *value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) +return pcie->pcie_data->ops->rp_read_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_read_cfg) +return pcie->pcie_data->ops->nonrp_read_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; +} + +static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) +return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_write_cfg) +return pcie->pcie_data->ops->nonrp_write_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; } static int altera_pcie_cfg_read(struct pci_bus *bus, unsigned int devfn,
@@ -660,7 +685,6 @@ static void altera_pcie_isr(struct irq_desc *desc)dev_err_ratelimited (dev,"unexpected IRQ, INT%d\n" , bit); } } -chained_irq_exit (chip, desc); }
@@ -691,9 +715,13 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) {struct platform_device *pdev = pcie->pdev; - pcie->cra_base =devm_platform_ioremap_resource_byname (pdev,"Cra" ); -if (IS_ERR (pcie->cra_base)) -return PTR_ERR (pcie->cra_base); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { + pcie->cra_base = +devm_platform_ioremap_resource_byname (pdev,"Cra" ); +if (IS_ERR (pcie->cra_base)) +return PTR_ERR (pcie->cra_base); + }if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { pcie->hip_base =
@@ -707,7 +735,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)if (pcie->irq <0 )return pcie->irq; -irq_set_chained_handler_and_data (pcie->irq, altera_pcie_isr, pcie); +irq_set_chained_handler_and_data (pcie->irq, + pcie->pcie_data->ops->rp_isr, pcie);return 0 ; }
@@ -720,6 +749,11 @@ static const struct altera_pcie_ops altera_pcie_ops_1_0 = { .tlp_read_pkt = tlp_read_packet, .tlp_write_pkt = tlp_write_packet, .get_link_status = altera_pcie_link_up, + .rp_read_cfg = arr_read_cfg, + .rp_write_cfg = arr_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_ops altera_pcie_ops_2_0 = {
@@ -728,6 +762,9 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .get_link_status = s10_altera_pcie_link_up, .rp_read_cfg = s10_rp_read_cfg, .rp_write_cfg = s10_rp_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_data altera_pcie_1_0_data = {
@@ -792,11 +829,14 @@ static int altera_pcie_probe(struct platform_device *pdev)return ret; } -/* clear all interrupts */ -cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); -/* enable all interrupts */ -cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); -altera_pcie_host_init (pcie); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { +/* clear all interrupts */ +cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); +/* enable all interrupts */ +cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); +altera_pcie_host_init (pcie); + } bridge->sysdata = pcie; bridge->busnr = pcie->root_bus_nr;
Signature · 1 line
2.34.1
PATCH v3 2/2 PCI: altera: add support for agilex family fpga
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
create new instance of struct altera_pcie_data for "altr,pcie-root-port-3.0"
provide corresponding callback
"port_conf_off" points to avmm port config register base
--- drivers/pci/controller/pcie-altera.c | 207 ++++++++++++++++++++++++++- 1 file changed, 206 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-altera.c +206 -1
@@ -79,9 +79,20 @@#define S10_TLP_FMTTYPE_CFGWR0 0x45#define S10_TLP_FMTTYPE_CFGWR1 0x44 +#define AGLX_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg)) +#define AGLX_RP_SECONDARY (pcie) \ + readb(AGLX_RP_CFG_ADDR(pcie, PCI_SECONDARY_BUS)) + +#define AGLX_BDF_REG 0x00002004 +#define AGLX_ROOT_PORT_IRQ_STATUS 0x14c +#define AGLX_ROOT_PORT_IRQ_ENABLE 0x150 +#define AGLX_CFG_AER (1<<4) +enum altera_pcie_version {ALTERA_PCIE_V1 =0 ,ALTERA_PCIE_V2 , +ALTERA_PCIE_V3 ,/* AGILEX p-tile, f-tile */ };struct altera_pcie {
@@ -93,6 +104,8 @@ struct altera_pcie {struct irq_domain *irq_domain;struct resource bus_range;const struct altera_pcie_data *pcie_data; +void __iomem *cs_base; +u32 port_conf_off; };struct altera_pcie_ops {
@@ -138,6 +151,39 @@ static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)return readl_relaxed (pcie->cra_base + reg); } +static inline void cs_writel (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writel_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writew (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writew_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writeb (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writeb_relaxed (value, pcie->cs_base + reg); +} + +static inline u32 cs_readl (struct altera_pcie *pcie,const u32 reg) +{ +return readl_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readw (struct altera_pcie *pcie,const u32 reg) +{ +return readw_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readb (struct altera_pcie *pcie,const u32 reg) +{ +return readb_relaxed (pcie->cs_base + reg); +} +static bool altera_pcie_link_up (struct altera_pcie *pcie) {return !!((cra_readl (pcie,RP_LTSSM ) &RP_LTSSM_MASK ) ==LTSSM_L0 );
@@ -152,6 +198,14 @@ static bool s10_altera_pcie_link_up(struct altera_pcie *pcie)return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); } +static bool aglx_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, + pcie->pcie_data->cap_offset +PCI_EXP_LNKSTA ); + +return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); +} +/* * Altera PCIe port uses BAR0 of RC's configuration space as the translation * from PCI bus to native BUS. Entire DDR region is mapped into PCIe space
@@ -432,6 +486,101 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn,return PCIBIOS_SUCCESSFUL ; } +static int aglx_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + } + +/* interrupt pin not programmed in hardware, set to INTA*/ +if (where ==PCI_INTERRUPT_PIN && size ==1 ) + *value =0x01 ; +else if (where ==PCI_INTERRUPT_LINE ) + *value |=0x0100 ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : +writeb (value, addr); +break ; +case 2 : +writew (value, addr); +break ; +default : +writel (value, addr); +break ; + } + +/* +* Monitor changes to PCI_PRIMARY_BUS register on root port +* and update local copy of root bus number accordingly. +*/ +if (busno == pcie->root_bus_nr && where ==PCI_PRIMARY_BUS ) + pcie->root_bus_nr = value &0xff ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_write_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : +cs_writeb (pcie, value, where); +break ; +case 2 : +cs_writew (pcie, value, where); +break ; +default : +cs_writel (pcie, value, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_read_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : + *value =cs_readb (pcie, where); +break ; +case 2 : + *value =cs_readw (pcie, where); +break ; +default : + *value =cs_readl (pcie, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 *value) {
@@ -688,6 +837,30 @@ static void altera_pcie_isr(struct irq_desc *desc)chained_irq_exit (chip, desc); } +static void aglx_isr (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); +struct altera_pcie *pcie; +struct device *dev; +u32 status; +int ret; + +chained_irq_enter (chip, desc); + pcie =irq_desc_get_handler_data (desc); + dev = &pcie->pdev->dev; + + status =readl ((pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +if (status &AGLX_CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ\n" ); + } +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +chained_irq_exit (chip, desc); +} +static int altera_pcie_init_irq_domain (struct altera_pcie *pcie) {struct device *dev = &pcie->pdev->dev;
@@ -723,13 +896,25 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)return PTR_ERR (pcie->cra_base); } -if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { +if ((pcie->pcie_data->version ==ALTERA_PCIE_V2 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V3 )) { pcie->hip_base =devm_platform_ioremap_resource_byname (pdev,"Hip" );if (IS_ERR (pcie->hip_base))return PTR_ERR (pcie->hip_base); } +if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { + pcie->cs_base = +devm_platform_ioremap_resource_byname (pdev,"Cs" ); +if (IS_ERR (pcie->cs_base)) +return PTR_ERR (pcie->cs_base); +of_property_read_u32 (pcie->pdev->dev.of_node,"port_conf_stat" , + &pcie->port_conf_off); +dev_dbg (&pcie->pdev->dev,"port_conf_stat_off =%#x\n" , + pcie->port_conf_off); + } +/* setup IRQ */ pcie->irq =platform_get_irq (pdev,0 );if (pcie->irq <0 )
@@ -767,6 +952,15 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .rp_isr = altera_pcie_isr, }; +static const struct altera_pcie_ops altera_pcie_ops_3_0 = { + .rp_read_cfg = aglx_rp_read_cfg, + .rp_write_cfg = aglx_rp_write_cfg, + .get_link_status = aglx_altera_pcie_link_up, + .nonrp_read_cfg = aglx_nonrp_read_cfg, + .nonrp_write_cfg = aglx_nonrp_write_cfg, + .rp_isr = aglx_isr, +}; +static const struct altera_pcie_data altera_pcie_1_0_data = { .ops = &altera_pcie_ops_1_0, .cap_offset =0x80 ,
@@ -787,11 +981,19 @@ static const struct altera_pcie_data altera_pcie_2_0_data = { .cfgwr1 = S10_TLP_FMTTYPE_CFGWR1, }; +static const struct altera_pcie_data altera_pcie_3_0_data = { + .ops = &altera_pcie_ops_3_0, + .version =ALTERA_PCIE_V3 , + .cap_offset =0x70 , +}; +static const struct of_device_id altera_pcie_of_match[] = { {.compatible ="altr,pcie-root-port-1.0" , .data = &altera_pcie_1_0_data }, {.compatible ="altr,pcie-root-port-2.0" , .data = &altera_pcie_2_0_data }, + {.compatible ="altr,pcie-root-port-3.0" , + .data = &altera_pcie_3_0_data }, {}, };
@@ -836,6 +1038,9 @@ static int altera_pcie_probe(struct platform_device *pdev)/* enable all interrupts */ cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE );altera_pcie_host_init (pcie); + }else if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_ENABLE )); } bridge->sysdata = pcie;
Signature · 1 line
2.34.1
v3 cover PCI: altera: add support to agilex family
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
added new callback for
1) read,write to root port configuration registers
2) read,write to endpoint configuration registers
3) root port interrupt handler
agilex and newer platforms need to implemant the callback and generic root port driver should work ( without much changes ) , legacy platforms (arria
and startix) implement configuration read,write directly in wrapper
api _altera_pcie_cfg_read/_altera_pcie_cfg_write
changelog v2:
saperated into two patches
1.refactored the driver for easily portability to future Altera FPGA platforms
2.added support for "Agilex" FPGA
this driver supports PCI RP IP on Agilex FPGA, as these are FPGA its up to the user to add PCI RP or not ( as per his needs). we are not adding the device tree as part of this commit. we are expecting the add device tree changes only if he is adding PCI RP IP in his design
changelog v3:
incorporate review comments from Bjorn Helgaas
D M Sharath Kumar (2):
PCI: altera: refactor driver for supporting new platforms
PCI: altera: add support for agilex family fpga
drivers/pci/controller/pcie-altera.c | 305 ++++++++++++++++++++++++--- 1 file changed, 275 insertions(+), 30 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/2 PCI: altera: refactor driver for supporting new platforms
From: D M Sharath Kumar <[email protected]>
added the below callbacks that eases is supporting newer platforms for read/write to root port configuration space registers for read/write to non root port (endpoint, switch) cfg space regs root port interrupt handler
--- drivers/pci/controller/pcie-altera.c | 100 +++++++++++++++++++-------- 1 file changed, 70 insertions(+), 30 deletions(-)
drivers/pci/controller/pcie-altera.c +70 -30
@@ -3,6 +3,7 @@* Copyright Altera Corporation (C) 2013-2015. All rights reserved * * Author: Ley Foon Tan <[email protected]> +* Author: sharath <[email protected]> * Description: Altera PCIe host controller driver */
@@ -99,10 +100,15 @@ struct altera_pcie_ops {void (*tlp_write_pkt)(struct altera_pcie *pcie,u32 *headers,u32 data,bool align);bool (*get_link_status)(struct altera_pcie *pcie); -int (*rp_read_cfg)(struct altera_pcie *pcie,int where, -int size,u32 *value); +int (*rp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value);int (*rp_write_cfg)(struct altera_pcie *pcie,u8 busno, -int where,int size,u32 value); +unsigned int devfn,int where,int size,u32 value); +int (*nonrp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*nonrp_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value); +void (*rp_isr)(struct irq_desc *desc); };struct altera_pcie_data {
@@ -379,8 +385,8 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_read_cfg (struct altera_pcie *pcie,int where, -int size,u32 *value) +static int s10_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -399,7 +405,7 @@ static int s10_rp_read_cfg(struct altera_pcie *pcie, int where,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno, +static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -426,18 +432,13 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 *value) +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {int ret;u32 data;u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) -return pcie->pcie_data->ops->rp_read_cfg (pcie, where, - size, value); -switch (size) {case 1 : byte_en =1 << (where &3 );
@@ -470,18 +471,13 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 value) +static int arr_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) {u32 data32;u32 shift =8 * (where &3 );u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) -return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, - where, size, value); -switch (size) {case 1 : data32 = (value &0xff ) << shift;
@@ -499,6 +495,35 @@ static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,return tlp_cfg_dword_write (pcie, busno, devfn, (where & ~DWORD_MASK ), byte_en, data32); + +} + +static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 *value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) +return pcie->pcie_data->ops->rp_read_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_read_cfg) +return pcie->pcie_data->ops->nonrp_read_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; +} + +static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) +return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_write_cfg) +return pcie->pcie_data->ops->nonrp_write_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; } static int altera_pcie_cfg_read(struct pci_bus *bus, unsigned int devfn,
@@ -660,7 +685,6 @@ static void altera_pcie_isr(struct irq_desc *desc)dev_err_ratelimited (dev,"unexpected IRQ, INT%d\n" , bit); } } -chained_irq_exit (chip, desc); }
@@ -691,9 +715,13 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) {struct platform_device *pdev = pcie->pdev; - pcie->cra_base =devm_platform_ioremap_resource_byname (pdev,"Cra" ); -if (IS_ERR (pcie->cra_base)) -return PTR_ERR (pcie->cra_base); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { + pcie->cra_base = +devm_platform_ioremap_resource_byname (pdev,"Cra" ); +if (IS_ERR (pcie->cra_base)) +return PTR_ERR (pcie->cra_base); + }if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { pcie->hip_base =
@@ -707,7 +735,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)if (pcie->irq <0 )return pcie->irq; -irq_set_chained_handler_and_data (pcie->irq, altera_pcie_isr, pcie); +irq_set_chained_handler_and_data (pcie->irq, + pcie->pcie_data->ops->rp_isr, pcie);return 0 ; }
@@ -720,6 +749,11 @@ static const struct altera_pcie_ops altera_pcie_ops_1_0 = { .tlp_read_pkt = tlp_read_packet, .tlp_write_pkt = tlp_write_packet, .get_link_status = altera_pcie_link_up, + .rp_read_cfg = arr_read_cfg, + .rp_write_cfg = arr_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_ops altera_pcie_ops_2_0 = {
@@ -728,6 +762,9 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .get_link_status = s10_altera_pcie_link_up, .rp_read_cfg = s10_rp_read_cfg, .rp_write_cfg = s10_rp_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_data altera_pcie_1_0_data = {
@@ -792,11 +829,14 @@ static int altera_pcie_probe(struct platform_device *pdev)return ret; } -/* clear all interrupts */ -cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); -/* enable all interrupts */ -cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); -altera_pcie_host_init (pcie); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { +/* clear all interrupts */ +cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); +/* enable all interrupts */ +cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); +altera_pcie_host_init (pcie); + } bridge->sysdata = pcie; bridge->busnr = pcie->root_bus_nr;
Signature · 1 line
2.34.1
PATCH v3 2/2 PCI: altera: add support for agilex family fpga
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
create new instance of struct altera_pcie_data for "altr,pcie-root-port-3.0"
provide corresponding callback
"port_conf_off" points to avmm port config register base
--- drivers/pci/controller/pcie-altera.c | 207 ++++++++++++++++++++++++++- 1 file changed, 206 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-altera.c +206 -1
@@ -79,9 +79,20 @@#define S10_TLP_FMTTYPE_CFGWR0 0x45#define S10_TLP_FMTTYPE_CFGWR1 0x44 +#define AGLX_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg)) +#define AGLX_RP_SECONDARY (pcie) \ + readb(AGLX_RP_CFG_ADDR(pcie, PCI_SECONDARY_BUS)) + +#define AGLX_BDF_REG 0x00002004 +#define AGLX_ROOT_PORT_IRQ_STATUS 0x14c +#define AGLX_ROOT_PORT_IRQ_ENABLE 0x150 +#define AGLX_CFG_AER (1<<4) +enum altera_pcie_version {ALTERA_PCIE_V1 =0 ,ALTERA_PCIE_V2 , +ALTERA_PCIE_V3 ,/* AGILEX p-tile, f-tile */ };struct altera_pcie {
@@ -93,6 +104,8 @@ struct altera_pcie {struct irq_domain *irq_domain;struct resource bus_range;const struct altera_pcie_data *pcie_data; +void __iomem *cs_base; +u32 port_conf_off; };struct altera_pcie_ops {
@@ -138,6 +151,39 @@ static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)return readl_relaxed (pcie->cra_base + reg); } +static inline void cs_writel (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writel_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writew (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writew_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writeb (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writeb_relaxed (value, pcie->cs_base + reg); +} + +static inline u32 cs_readl (struct altera_pcie *pcie,const u32 reg) +{ +return readl_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readw (struct altera_pcie *pcie,const u32 reg) +{ +return readw_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readb (struct altera_pcie *pcie,const u32 reg) +{ +return readb_relaxed (pcie->cs_base + reg); +} +static bool altera_pcie_link_up (struct altera_pcie *pcie) {return !!((cra_readl (pcie,RP_LTSSM ) &RP_LTSSM_MASK ) ==LTSSM_L0 );
@@ -152,6 +198,14 @@ static bool s10_altera_pcie_link_up(struct altera_pcie *pcie)return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); } +static bool aglx_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, + pcie->pcie_data->cap_offset +PCI_EXP_LNKSTA ); + +return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); +} +/* * Altera PCIe port uses BAR0 of RC's configuration space as the translation * from PCI bus to native BUS. Entire DDR region is mapped into PCIe space
@@ -432,6 +486,101 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn,return PCIBIOS_SUCCESSFUL ; } +static int aglx_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + } + +/* interrupt pin not programmed in hardware, set to INTA*/ +if (where ==PCI_INTERRUPT_PIN && size ==1 ) + *value =0x01 ; +else if (where ==PCI_INTERRUPT_LINE ) + *value |=0x0100 ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : +writeb (value, addr); +break ; +case 2 : +writew (value, addr); +break ; +default : +writel (value, addr); +break ; + } + +/* +* Monitor changes to PCI_PRIMARY_BUS register on root port +* and update local copy of root bus number accordingly. +*/ +if (busno == pcie->root_bus_nr && where ==PCI_PRIMARY_BUS ) + pcie->root_bus_nr = value &0xff ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_write_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : +cs_writeb (pcie, value, where); +break ; +case 2 : +cs_writew (pcie, value, where); +break ; +default : +cs_writel (pcie, value, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_read_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : + *value =cs_readb (pcie, where); +break ; +case 2 : + *value =cs_readw (pcie, where); +break ; +default : + *value =cs_readl (pcie, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 *value) {
@@ -688,6 +837,30 @@ static void altera_pcie_isr(struct irq_desc *desc)chained_irq_exit (chip, desc); } +static void aglx_isr (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); +struct altera_pcie *pcie; +struct device *dev; +u32 status; +int ret; + +chained_irq_enter (chip, desc); + pcie =irq_desc_get_handler_data (desc); + dev = &pcie->pdev->dev; + + status =readl ((pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +if (status &AGLX_CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ\n" ); + } +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +chained_irq_exit (chip, desc); +} +static int altera_pcie_init_irq_domain (struct altera_pcie *pcie) {struct device *dev = &pcie->pdev->dev;
@@ -723,13 +896,25 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)return PTR_ERR (pcie->cra_base); } -if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { +if ((pcie->pcie_data->version ==ALTERA_PCIE_V2 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V3 )) { pcie->hip_base =devm_platform_ioremap_resource_byname (pdev,"Hip" );if (IS_ERR (pcie->hip_base))return PTR_ERR (pcie->hip_base); } +if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { + pcie->cs_base = +devm_platform_ioremap_resource_byname (pdev,"Cs" ); +if (IS_ERR (pcie->cs_base)) +return PTR_ERR (pcie->cs_base); +of_property_read_u32 (pcie->pdev->dev.of_node,"port_conf_stat" , + &pcie->port_conf_off); +dev_dbg (&pcie->pdev->dev,"port_conf_stat_off =%#x\n" , + pcie->port_conf_off); + } +/* setup IRQ */ pcie->irq =platform_get_irq (pdev,0 );if (pcie->irq <0 )
@@ -767,6 +952,15 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .rp_isr = altera_pcie_isr, }; +static const struct altera_pcie_ops altera_pcie_ops_3_0 = { + .rp_read_cfg = aglx_rp_read_cfg, + .rp_write_cfg = aglx_rp_write_cfg, + .get_link_status = aglx_altera_pcie_link_up, + .nonrp_read_cfg = aglx_nonrp_read_cfg, + .nonrp_write_cfg = aglx_nonrp_write_cfg, + .rp_isr = aglx_isr, +}; +static const struct altera_pcie_data altera_pcie_1_0_data = { .ops = &altera_pcie_ops_1_0, .cap_offset =0x80 ,
@@ -787,11 +981,19 @@ static const struct altera_pcie_data altera_pcie_2_0_data = { .cfgwr1 = S10_TLP_FMTTYPE_CFGWR1, }; +static const struct altera_pcie_data altera_pcie_3_0_data = { + .ops = &altera_pcie_ops_3_0, + .version =ALTERA_PCIE_V3 , + .cap_offset =0x70 , +}; +static const struct of_device_id altera_pcie_of_match[] = { {.compatible ="altr,pcie-root-port-1.0" , .data = &altera_pcie_1_0_data }, {.compatible ="altr,pcie-root-port-2.0" , .data = &altera_pcie_2_0_data }, + {.compatible ="altr,pcie-root-port-3.0" , + .data = &altera_pcie_3_0_data }, {}, };
@@ -836,6 +1038,9 @@ static int altera_pcie_probe(struct platform_device *pdev)/* enable all interrupts */ cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE );altera_pcie_host_init (pcie); + }else if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_ENABLE )); } bridge->sysdata = pcie;
Signature · 1 line
2.34.1
v3 cover PCI: altera: add support to agilex family
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
added new callback for
1) read,write to root port configuration registers
2) read,write to endpoint configuration registers
3) root port interrupt handler
agilex and newer platforms need to implemant the callback and generic root port driver should work ( without much changes ) , legacy platforms (arria
and startix) implement configuration read,write directly in wrapper
api _altera_pcie_cfg_read/_altera_pcie_cfg_write
changelog v2:
saperated into two patches
1.refactored the driver for easily portability to future Altera FPGA platforms
2.added support for "Agilex" FPGA
this driver supports PCI RP IP on Agilex FPGA, as these are FPGA its up to the user to add PCI RP or not ( as per his needs). we are not adding the device tree as part of this commit. we are expecting the add device tree changes only if he is adding PCI RP IP in his design
changelog v3:
incorporate review comments from Bjorn Helgaas
D M Sharath Kumar (2):
PCI: altera: refactor driver for supporting new platforms
PCI: altera: add support for agilex family fpga
drivers/pci/controller/pcie-altera.c | 305 ++++++++++++++++++++++++--- 1 file changed, 275 insertions(+), 30 deletions(-)
Signature · 1 line
2.34.1
v3 cover PCI: altera: add support to agilex family
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
added new callback for
1) read,write to root port configuration registers
2) read,write to endpoint configuration registers
3) root port interrupt handler
agilex and newer platforms need to implemant the callback and generic root port driver should work ( without much changes ) , legacy platforms (arria
and startix) implement configuration read,write directly in wrapper
api _altera_pcie_cfg_read/_altera_pcie_cfg_write
changelog v2:
saperated into two patches
1.refactored the driver for easily portability to future Altera FPGA platforms
2.added support for "Agilex" FPGA
this driver supports PCI RP IP on Agilex FPGA, as these are FPGA its up to the user to add PCI RP or not ( as per his needs). we are not adding the device tree as part of this commit. we are expecting the add device tree changes only if he is adding PCI RP IP in his design
changelog v3:
incorporate review comments from Bjorn Helgaas
D M Sharath Kumar (2):
PCI: altera: refactor driver for supporting new platforms
PCI: altera: add support for agilex family fpga
drivers/pci/controller/pcie-altera.c | 305 ++++++++++++++++++++++++--- 1 file changed, 275 insertions(+), 30 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/2 PCI: altera: refactor driver for supporting new platforms
From: D M Sharath Kumar <[email protected]>
added the below callbacks that eases is supporting newer platforms for read/write to root port configuration space registers for read/write to non root port (endpoint, switch) cfg space regs root port interrupt handler
--- drivers/pci/controller/pcie-altera.c | 100 +++++++++++++++++++-------- 1 file changed, 70 insertions(+), 30 deletions(-)
drivers/pci/controller/pcie-altera.c +70 -30
@@ -3,6 +3,7 @@* Copyright Altera Corporation (C) 2013-2015. All rights reserved * * Author: Ley Foon Tan <[email protected]> +* Author: sharath <[email protected]> * Description: Altera PCIe host controller driver */
@@ -99,10 +100,15 @@ struct altera_pcie_ops {void (*tlp_write_pkt)(struct altera_pcie *pcie,u32 *headers,u32 data,bool align);bool (*get_link_status)(struct altera_pcie *pcie); -int (*rp_read_cfg)(struct altera_pcie *pcie,int where, -int size,u32 *value); +int (*rp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value);int (*rp_write_cfg)(struct altera_pcie *pcie,u8 busno, -int where,int size,u32 value); +unsigned int devfn,int where,int size,u32 value); +int (*nonrp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*nonrp_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value); +void (*rp_isr)(struct irq_desc *desc); };struct altera_pcie_data {
@@ -379,8 +385,8 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_read_cfg (struct altera_pcie *pcie,int where, -int size,u32 *value) +static int s10_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -399,7 +405,7 @@ static int s10_rp_read_cfg(struct altera_pcie *pcie, int where,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno, +static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -426,18 +432,13 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 *value) +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {int ret;u32 data;u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) -return pcie->pcie_data->ops->rp_read_cfg (pcie, where, - size, value); -switch (size) {case 1 : byte_en =1 << (where &3 );
@@ -470,18 +471,13 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 value) +static int arr_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) {u32 data32;u32 shift =8 * (where &3 );u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) -return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, - where, size, value); -switch (size) {case 1 : data32 = (value &0xff ) << shift;
@@ -499,6 +495,35 @@ static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,return tlp_cfg_dword_write (pcie, busno, devfn, (where & ~DWORD_MASK ), byte_en, data32); + +} + +static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 *value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) +return pcie->pcie_data->ops->rp_read_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_read_cfg) +return pcie->pcie_data->ops->nonrp_read_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; +} + +static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) +return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_write_cfg) +return pcie->pcie_data->ops->nonrp_write_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; } static int altera_pcie_cfg_read(struct pci_bus *bus, unsigned int devfn,
@@ -660,7 +685,6 @@ static void altera_pcie_isr(struct irq_desc *desc)dev_err_ratelimited (dev,"unexpected IRQ, INT%d\n" , bit); } } -chained_irq_exit (chip, desc); }
@@ -691,9 +715,13 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) {struct platform_device *pdev = pcie->pdev; - pcie->cra_base =devm_platform_ioremap_resource_byname (pdev,"Cra" ); -if (IS_ERR (pcie->cra_base)) -return PTR_ERR (pcie->cra_base); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { + pcie->cra_base = +devm_platform_ioremap_resource_byname (pdev,"Cra" ); +if (IS_ERR (pcie->cra_base)) +return PTR_ERR (pcie->cra_base); + }if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { pcie->hip_base =
@@ -707,7 +735,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)if (pcie->irq <0 )return pcie->irq; -irq_set_chained_handler_and_data (pcie->irq, altera_pcie_isr, pcie); +irq_set_chained_handler_and_data (pcie->irq, + pcie->pcie_data->ops->rp_isr, pcie);return 0 ; }
@@ -720,6 +749,11 @@ static const struct altera_pcie_ops altera_pcie_ops_1_0 = { .tlp_read_pkt = tlp_read_packet, .tlp_write_pkt = tlp_write_packet, .get_link_status = altera_pcie_link_up, + .rp_read_cfg = arr_read_cfg, + .rp_write_cfg = arr_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_ops altera_pcie_ops_2_0 = {
@@ -728,6 +762,9 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .get_link_status = s10_altera_pcie_link_up, .rp_read_cfg = s10_rp_read_cfg, .rp_write_cfg = s10_rp_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_data altera_pcie_1_0_data = {
@@ -792,11 +829,14 @@ static int altera_pcie_probe(struct platform_device *pdev)return ret; } -/* clear all interrupts */ -cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); -/* enable all interrupts */ -cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); -altera_pcie_host_init (pcie); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { +/* clear all interrupts */ +cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); +/* enable all interrupts */ +cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); +altera_pcie_host_init (pcie); + } bridge->sysdata = pcie; bridge->busnr = pcie->root_bus_nr;
Signature · 1 line
2.34.1
PATCH v3 2/2 PCI: altera: add support for agilex family fpga
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
create new instance of struct altera_pcie_data for "altr,pcie-root-port-3.0"
provide corresponding callback
"port_conf_off" points to avmm port config register base
--- drivers/pci/controller/pcie-altera.c | 207 ++++++++++++++++++++++++++- 1 file changed, 206 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-altera.c +206 -1
@@ -79,9 +79,20 @@#define S10_TLP_FMTTYPE_CFGWR0 0x45#define S10_TLP_FMTTYPE_CFGWR1 0x44 +#define AGLX_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg)) +#define AGLX_RP_SECONDARY (pcie) \ + readb(AGLX_RP_CFG_ADDR(pcie, PCI_SECONDARY_BUS)) + +#define AGLX_BDF_REG 0x00002004 +#define AGLX_ROOT_PORT_IRQ_STATUS 0x14c +#define AGLX_ROOT_PORT_IRQ_ENABLE 0x150 +#define AGLX_CFG_AER (1<<4) +enum altera_pcie_version {ALTERA_PCIE_V1 =0 ,ALTERA_PCIE_V2 , +ALTERA_PCIE_V3 ,/* AGILEX p-tile, f-tile */ };struct altera_pcie {
@@ -93,6 +104,8 @@ struct altera_pcie {struct irq_domain *irq_domain;struct resource bus_range;const struct altera_pcie_data *pcie_data; +void __iomem *cs_base; +u32 port_conf_off; };struct altera_pcie_ops {
@@ -138,6 +151,39 @@ static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)return readl_relaxed (pcie->cra_base + reg); } +static inline void cs_writel (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writel_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writew (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writew_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writeb (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writeb_relaxed (value, pcie->cs_base + reg); +} + +static inline u32 cs_readl (struct altera_pcie *pcie,const u32 reg) +{ +return readl_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readw (struct altera_pcie *pcie,const u32 reg) +{ +return readw_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readb (struct altera_pcie *pcie,const u32 reg) +{ +return readb_relaxed (pcie->cs_base + reg); +} +static bool altera_pcie_link_up (struct altera_pcie *pcie) {return !!((cra_readl (pcie,RP_LTSSM ) &RP_LTSSM_MASK ) ==LTSSM_L0 );
@@ -152,6 +198,14 @@ static bool s10_altera_pcie_link_up(struct altera_pcie *pcie)return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); } +static bool aglx_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, + pcie->pcie_data->cap_offset +PCI_EXP_LNKSTA ); + +return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); +} +/* * Altera PCIe port uses BAR0 of RC's configuration space as the translation * from PCI bus to native BUS. Entire DDR region is mapped into PCIe space
@@ -432,6 +486,101 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn,return PCIBIOS_SUCCESSFUL ; } +static int aglx_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + } + +/* interrupt pin not programmed in hardware, set to INTA*/ +if (where ==PCI_INTERRUPT_PIN && size ==1 ) + *value =0x01 ; +else if (where ==PCI_INTERRUPT_LINE ) + *value |=0x0100 ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : +writeb (value, addr); +break ; +case 2 : +writew (value, addr); +break ; +default : +writel (value, addr); +break ; + } + +/* +* Monitor changes to PCI_PRIMARY_BUS register on root port +* and update local copy of root bus number accordingly. +*/ +if (busno == pcie->root_bus_nr && where ==PCI_PRIMARY_BUS ) + pcie->root_bus_nr = value &0xff ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_write_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : +cs_writeb (pcie, value, where); +break ; +case 2 : +cs_writew (pcie, value, where); +break ; +default : +cs_writel (pcie, value, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_read_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : + *value =cs_readb (pcie, where); +break ; +case 2 : + *value =cs_readw (pcie, where); +break ; +default : + *value =cs_readl (pcie, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 *value) {
@@ -688,6 +837,30 @@ static void altera_pcie_isr(struct irq_desc *desc)chained_irq_exit (chip, desc); } +static void aglx_isr (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); +struct altera_pcie *pcie; +struct device *dev; +u32 status; +int ret; + +chained_irq_enter (chip, desc); + pcie =irq_desc_get_handler_data (desc); + dev = &pcie->pdev->dev; + + status =readl ((pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +if (status &AGLX_CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ\n" ); + } +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +chained_irq_exit (chip, desc); +} +static int altera_pcie_init_irq_domain (struct altera_pcie *pcie) {struct device *dev = &pcie->pdev->dev;
@@ -723,13 +896,25 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)return PTR_ERR (pcie->cra_base); } -if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { +if ((pcie->pcie_data->version ==ALTERA_PCIE_V2 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V3 )) { pcie->hip_base =devm_platform_ioremap_resource_byname (pdev,"Hip" );if (IS_ERR (pcie->hip_base))return PTR_ERR (pcie->hip_base); } +if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { + pcie->cs_base = +devm_platform_ioremap_resource_byname (pdev,"Cs" ); +if (IS_ERR (pcie->cs_base)) +return PTR_ERR (pcie->cs_base); +of_property_read_u32 (pcie->pdev->dev.of_node,"port_conf_stat" , + &pcie->port_conf_off); +dev_dbg (&pcie->pdev->dev,"port_conf_stat_off =%#x\n" , + pcie->port_conf_off); + } +/* setup IRQ */ pcie->irq =platform_get_irq (pdev,0 );if (pcie->irq <0 )
@@ -767,6 +952,15 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .rp_isr = altera_pcie_isr, }; +static const struct altera_pcie_ops altera_pcie_ops_3_0 = { + .rp_read_cfg = aglx_rp_read_cfg, + .rp_write_cfg = aglx_rp_write_cfg, + .get_link_status = aglx_altera_pcie_link_up, + .nonrp_read_cfg = aglx_nonrp_read_cfg, + .nonrp_write_cfg = aglx_nonrp_write_cfg, + .rp_isr = aglx_isr, +}; +static const struct altera_pcie_data altera_pcie_1_0_data = { .ops = &altera_pcie_ops_1_0, .cap_offset =0x80 ,
@@ -787,11 +981,19 @@ static const struct altera_pcie_data altera_pcie_2_0_data = { .cfgwr1 = S10_TLP_FMTTYPE_CFGWR1, }; +static const struct altera_pcie_data altera_pcie_3_0_data = { + .ops = &altera_pcie_ops_3_0, + .version =ALTERA_PCIE_V3 , + .cap_offset =0x70 , +}; +static const struct of_device_id altera_pcie_of_match[] = { {.compatible ="altr,pcie-root-port-1.0" , .data = &altera_pcie_1_0_data }, {.compatible ="altr,pcie-root-port-2.0" , .data = &altera_pcie_2_0_data }, + {.compatible ="altr,pcie-root-port-3.0" , + .data = &altera_pcie_3_0_data }, {}, };
@@ -836,6 +1038,9 @@ static int altera_pcie_probe(struct platform_device *pdev)/* enable all interrupts */ cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE );altera_pcie_host_init (pcie); + }else if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_ENABLE )); } bridge->sysdata = pcie;
Signature · 1 line
2.34.1
v3 cover PCI: altera: add support to agilex family
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
added new callback for
1) read,write to root port configuration registers
2) read,write to endpoint configuration registers
3) root port interrupt handler
agilex and newer platforms need to implemant the callback and generic root port driver should work ( without much changes ) , legacy platforms (arria and startix) implement configuration read,write directly in wrapper api _altera_pcie_cfg_read/_altera_pcie_cfg_write
changelog v2:
saperated into two patches
1.refactored the driver for easily portability to future Altera FPGA platforms
2.added support for "Agilex" FPGA
this driver supports PCI RP IP on Agilex FPGA, as these are FPGA its up to the user to add PCI RP or not ( as per his needs). we are not adding the device tree as part of this commit. we are expecting the add device tree changes only if he is adding PCI RP IP in his design
changelog v3:
incorporate review comments from Bjorn Helgaas
D M Sharath Kumar (2):
PCI: altera: refactor driver for supporting new platforms
PCI: altera: add support for agilex family fpga
drivers/pci/controller/pcie-altera.c | 305 ++++++++++++++++++++++++--- 1 file changed, 275 insertions(+), 30 deletions(-)
Signature · 1 line
2.34.1
v3 cover PCI: altera: add support to agilex family
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
added new callback for
1) read,write to root port configuration registers
2) read,write to endpoint configuration registers
3) root port interrupt handler
agilex and newer platforms need to implemant the callback and generic root port driver should work ( without much changes ) , legacy platforms (arria
and startix) implement configuration read,write directly in wrapper
api _altera_pcie_cfg_read/_altera_pcie_cfg_write
changelog v2:
saperated into two patches
1.refactored the driver for easily portability to future Altera FPGA platforms
2.added support for "Agilex" FPGA
this driver supports PCI RP IP on Agilex FPGA, as these are FPGA its up to the user to add PCI RP or not ( as per his needs). we are not adding the device tree as part of this commit. we are expecting the add device tree changes only if he is adding PCI RP IP in his design
changelog v3:
incorporate review comments from Bjorn Helgaas
D M Sharath Kumar (2):
PCI: altera: refactor driver for supporting new platforms
PCI: altera: add support for agilex family fpga
drivers/pci/controller/pcie-altera.c | 305 ++++++++++++++++++++++++--- 1 file changed, 275 insertions(+), 30 deletions(-)
Signature · 1 line
2.34.1
PATCH v3 1/2 PCI: altera: refactor driver for supporting new platforms
From: D M Sharath Kumar <[email protected]>
added the below callbacks that eases is supporting newer platforms for read/write to root port configuration space registers for read/write to non root port (endpoint, switch) cfg space regs root port interrupt handler
--- drivers/pci/controller/pcie-altera.c | 100 +++++++++++++++++++-------- 1 file changed, 70 insertions(+), 30 deletions(-)
drivers/pci/controller/pcie-altera.c +70 -30
@@ -3,6 +3,7 @@* Copyright Altera Corporation (C) 2013-2015. All rights reserved * * Author: Ley Foon Tan <[email protected]> +* Author: sharath <[email protected]> * Description: Altera PCIe host controller driver */
@@ -99,10 +100,15 @@ struct altera_pcie_ops {void (*tlp_write_pkt)(struct altera_pcie *pcie,u32 *headers,u32 data,bool align);bool (*get_link_status)(struct altera_pcie *pcie); -int (*rp_read_cfg)(struct altera_pcie *pcie,int where, -int size,u32 *value); +int (*rp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value);int (*rp_write_cfg)(struct altera_pcie *pcie,u8 busno, -int where,int size,u32 value); +unsigned int devfn,int where,int size,u32 value); +int (*nonrp_read_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value); +int (*nonrp_write_cfg)(struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value); +void (*rp_isr)(struct irq_desc *desc); };struct altera_pcie_data {
@@ -379,8 +385,8 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_read_cfg (struct altera_pcie *pcie,int where, -int size,u32 *value) +static int s10_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -399,7 +405,7 @@ static int s10_rp_read_cfg(struct altera_pcie *pcie, int where,return PCIBIOS_SUCCESSFUL ; } -static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno, +static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 value) {void __iomem *addr =S10_RP_CFG_ADDR (pcie, where);
@@ -426,18 +432,13 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 *value) +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) {int ret;u32 data;u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) -return pcie->pcie_data->ops->rp_read_cfg (pcie, where, - size, value); -switch (size) {case 1 : byte_en =1 << (where &3 );
@@ -470,18 +471,13 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno,return PCIBIOS_SUCCESSFUL ; } -static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, -unsigned int devfn,int where,int size, -u32 value) +static int arr_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) {u32 data32;u32 shift =8 * (where &3 );u8 byte_en; -if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) -return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, - where, size, value); -switch (size) {case 1 : data32 = (value &0xff ) << shift;
@@ -499,6 +495,35 @@ static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,return tlp_cfg_dword_write (pcie, busno, devfn, (where & ~DWORD_MASK ), byte_en, data32); + +} + +static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 *value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_read_cfg) +return pcie->pcie_data->ops->rp_read_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_read_cfg) +return pcie->pcie_data->ops->nonrp_read_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; +} + +static int _altera_pcie_cfg_write (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size, +u32 value) +{ +if (busno == pcie->root_bus_nr && pcie->pcie_data->ops->rp_write_cfg) +return pcie->pcie_data->ops->rp_write_cfg (pcie, busno, devfn, + where, size, value); + +if (pcie->pcie_data->ops->nonrp_write_cfg) +return pcie->pcie_data->ops->nonrp_write_cfg (pcie, busno, devfn, + where, size, value); +return PCIBIOS_FUNC_NOT_SUPPORTED ; } static int altera_pcie_cfg_read(struct pci_bus *bus, unsigned int devfn,
@@ -660,7 +685,6 @@ static void altera_pcie_isr(struct irq_desc *desc)dev_err_ratelimited (dev,"unexpected IRQ, INT%d\n" , bit); } } -chained_irq_exit (chip, desc); }
@@ -691,9 +715,13 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) {struct platform_device *pdev = pcie->pdev; - pcie->cra_base =devm_platform_ioremap_resource_byname (pdev,"Cra" ); -if (IS_ERR (pcie->cra_base)) -return PTR_ERR (pcie->cra_base); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { + pcie->cra_base = +devm_platform_ioremap_resource_byname (pdev,"Cra" ); +if (IS_ERR (pcie->cra_base)) +return PTR_ERR (pcie->cra_base); + }if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { pcie->hip_base =
@@ -707,7 +735,8 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)if (pcie->irq <0 )return pcie->irq; -irq_set_chained_handler_and_data (pcie->irq, altera_pcie_isr, pcie); +irq_set_chained_handler_and_data (pcie->irq, + pcie->pcie_data->ops->rp_isr, pcie);return 0 ; }
@@ -720,6 +749,11 @@ static const struct altera_pcie_ops altera_pcie_ops_1_0 = { .tlp_read_pkt = tlp_read_packet, .tlp_write_pkt = tlp_write_packet, .get_link_status = altera_pcie_link_up, + .rp_read_cfg = arr_read_cfg, + .rp_write_cfg = arr_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_ops altera_pcie_ops_2_0 = {
@@ -728,6 +762,9 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .get_link_status = s10_altera_pcie_link_up, .rp_read_cfg = s10_rp_read_cfg, .rp_write_cfg = s10_rp_write_cfg, + .nonrp_read_cfg = arr_read_cfg, + .nonrp_write_cfg = arr_write_cfg, + .rp_isr = altera_pcie_isr, };static const struct altera_pcie_data altera_pcie_1_0_data = {
@@ -792,11 +829,14 @@ static int altera_pcie_probe(struct platform_device *pdev)return ret; } -/* clear all interrupts */ -cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); -/* enable all interrupts */ -cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); -altera_pcie_host_init (pcie); +if ((pcie->pcie_data->version ==ALTERA_PCIE_V1 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V2 )) { +/* clear all interrupts */ +cra_writel (pcie,P2A_INT_STS_ALL ,P2A_INT_STATUS ); +/* enable all interrupts */ +cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE ); +altera_pcie_host_init (pcie); + } bridge->sysdata = pcie; bridge->busnr = pcie->root_bus_nr;
Signature · 1 line
2.34.1
PATCH v3 2/2 PCI: altera: add support for agilex family fpga
In reply to [email protected]From: D M Sharath Kumar <[email protected]>
create new instance of struct altera_pcie_data for "altr,pcie-root-port-3.0"
provide corresponding callback
"port_conf_off" points to avmm port config register base
--- drivers/pci/controller/pcie-altera.c | 207 ++++++++++++++++++++++++++- 1 file changed, 206 insertions(+), 1 deletion(-)
drivers/pci/controller/pcie-altera.c +206 -1
@@ -79,9 +79,20 @@#define S10_TLP_FMTTYPE_CFGWR0 0x45#define S10_TLP_FMTTYPE_CFGWR1 0x44 +#define AGLX_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg)) +#define AGLX_RP_SECONDARY (pcie) \ + readb(AGLX_RP_CFG_ADDR(pcie, PCI_SECONDARY_BUS)) + +#define AGLX_BDF_REG 0x00002004 +#define AGLX_ROOT_PORT_IRQ_STATUS 0x14c +#define AGLX_ROOT_PORT_IRQ_ENABLE 0x150 +#define AGLX_CFG_AER (1<<4) +enum altera_pcie_version {ALTERA_PCIE_V1 =0 ,ALTERA_PCIE_V2 , +ALTERA_PCIE_V3 ,/* AGILEX p-tile, f-tile */ };struct altera_pcie {
@@ -93,6 +104,8 @@ struct altera_pcie {struct irq_domain *irq_domain;struct resource bus_range;const struct altera_pcie_data *pcie_data; +void __iomem *cs_base; +u32 port_conf_off; };struct altera_pcie_ops {
@@ -138,6 +151,39 @@ static inline u32 cra_readl(struct altera_pcie *pcie, const u32 reg)return readl_relaxed (pcie->cra_base + reg); } +static inline void cs_writel (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writel_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writew (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writew_relaxed (value, pcie->cs_base + reg); +} + +static inline void cs_writeb (struct altera_pcie *pcie,const u32 value, +const u32 reg) +{ +writeb_relaxed (value, pcie->cs_base + reg); +} + +static inline u32 cs_readl (struct altera_pcie *pcie,const u32 reg) +{ +return readl_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readw (struct altera_pcie *pcie,const u32 reg) +{ +return readw_relaxed (pcie->cs_base + reg); +} + +static inline u32 cs_readb (struct altera_pcie *pcie,const u32 reg) +{ +return readb_relaxed (pcie->cs_base + reg); +} +static bool altera_pcie_link_up (struct altera_pcie *pcie) {return !!((cra_readl (pcie,RP_LTSSM ) &RP_LTSSM_MASK ) ==LTSSM_L0 );
@@ -152,6 +198,14 @@ static bool s10_altera_pcie_link_up(struct altera_pcie *pcie)return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); } +static bool aglx_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, + pcie->pcie_data->cap_offset +PCI_EXP_LNKSTA ); + +return !!(readw (addr) &PCI_EXP_LNKSTA_DLLLA ); +} +/* * Altera PCIe port uses BAR0 of RC's configuration space as the translation * from PCI bus to native BUS. Entire DDR region is mapped into PCIe space
@@ -432,6 +486,101 @@ static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 busno, u32 devfn,return PCIBIOS_SUCCESSFUL ; } +static int aglx_rp_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 *value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + } + +/* interrupt pin not programmed in hardware, set to INTA*/ +if (where ==PCI_INTERRUPT_PIN && size ==1 ) + *value =0x01 ; +else if (where ==PCI_INTERRUPT_LINE ) + *value |=0x0100 ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_rp_write_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn, +int where,int size,u32 value) +{ +void __iomem *addr =AGLX_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : +writeb (value, addr); +break ; +case 2 : +writew (value, addr); +break ; +default : +writel (value, addr); +break ; + } + +/* +* Monitor changes to PCI_PRIMARY_BUS register on root port +* and update local copy of root bus number accordingly. +*/ +if (busno == pcie->root_bus_nr && where ==PCI_PRIMARY_BUS ) + pcie->root_bus_nr = value &0xff ; + +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_write_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : +cs_writeb (pcie, value, where); +break ; +case 2 : +cs_writew (pcie, value, where); +break ; +default : +cs_writel (pcie, value, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} + +static int aglx_nonrp_read_cfg (struct altera_pcie *pcie,u8 busno, +unsigned int devfn,int where,int size,u32 *value) +{ +cs_writel (pcie, ((busno<<8 ) | devfn),AGLX_BDF_REG ); +if (busno >AGLX_RP_SECONDARY (pcie)) + where |= (1 <<12 );/* type 1 */ + +switch (size) { +case 1 : + *value =cs_readb (pcie, where); +break ; +case 2 : + *value =cs_readw (pcie, where); +break ; +default : + *value =cs_readl (pcie, where); +break ; + } +return PCIBIOS_SUCCESSFUL ; +} +static int arr_read_cfg (struct altera_pcie *pcie,u8 busno,u32 devfn,int where,int size,u32 *value) {
@@ -688,6 +837,30 @@ static void altera_pcie_isr(struct irq_desc *desc)chained_irq_exit (chip, desc); } +static void aglx_isr (struct irq_desc *desc) +{ +struct irq_chip *chip =irq_desc_get_chip (desc); +struct altera_pcie *pcie; +struct device *dev; +u32 status; +int ret; + +chained_irq_enter (chip, desc); + pcie =irq_desc_get_handler_data (desc); + dev = &pcie->pdev->dev; + + status =readl ((pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +if (status &AGLX_CFG_AER ) { + ret =generic_handle_domain_irq (pcie->irq_domain,0 ); +if (ret) +dev_err_ratelimited (dev,"unexpected IRQ\n" ); + } +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_STATUS )); +chained_irq_exit (chip, desc); +} +static int altera_pcie_init_irq_domain (struct altera_pcie *pcie) {struct device *dev = &pcie->pdev->dev;
@@ -723,13 +896,25 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)return PTR_ERR (pcie->cra_base); } -if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { +if ((pcie->pcie_data->version ==ALTERA_PCIE_V2 ) || + (pcie->pcie_data->version ==ALTERA_PCIE_V3 )) { pcie->hip_base =devm_platform_ioremap_resource_byname (pdev,"Hip" );if (IS_ERR (pcie->hip_base))return PTR_ERR (pcie->hip_base); } +if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { + pcie->cs_base = +devm_platform_ioremap_resource_byname (pdev,"Cs" ); +if (IS_ERR (pcie->cs_base)) +return PTR_ERR (pcie->cs_base); +of_property_read_u32 (pcie->pdev->dev.of_node,"port_conf_stat" , + &pcie->port_conf_off); +dev_dbg (&pcie->pdev->dev,"port_conf_stat_off =%#x\n" , + pcie->port_conf_off); + } +/* setup IRQ */ pcie->irq =platform_get_irq (pdev,0 );if (pcie->irq <0 )
@@ -767,6 +952,15 @@ static const struct altera_pcie_ops altera_pcie_ops_2_0 = { .rp_isr = altera_pcie_isr, }; +static const struct altera_pcie_ops altera_pcie_ops_3_0 = { + .rp_read_cfg = aglx_rp_read_cfg, + .rp_write_cfg = aglx_rp_write_cfg, + .get_link_status = aglx_altera_pcie_link_up, + .nonrp_read_cfg = aglx_nonrp_read_cfg, + .nonrp_write_cfg = aglx_nonrp_write_cfg, + .rp_isr = aglx_isr, +}; +static const struct altera_pcie_data altera_pcie_1_0_data = { .ops = &altera_pcie_ops_1_0, .cap_offset =0x80 ,
@@ -787,11 +981,19 @@ static const struct altera_pcie_data altera_pcie_2_0_data = { .cfgwr1 = S10_TLP_FMTTYPE_CFGWR1, }; +static const struct altera_pcie_data altera_pcie_3_0_data = { + .ops = &altera_pcie_ops_3_0, + .version =ALTERA_PCIE_V3 , + .cap_offset =0x70 , +}; +static const struct of_device_id altera_pcie_of_match[] = { {.compatible ="altr,pcie-root-port-1.0" , .data = &altera_pcie_1_0_data }, {.compatible ="altr,pcie-root-port-2.0" , .data = &altera_pcie_2_0_data }, + {.compatible ="altr,pcie-root-port-3.0" , + .data = &altera_pcie_3_0_data }, {}, };
@@ -836,6 +1038,9 @@ static int altera_pcie_probe(struct platform_device *pdev)/* enable all interrupts */ cra_writel (pcie,P2A_INT_ENA_ALL ,P2A_INT_ENABLE );altera_pcie_host_init (pcie); + }else if (pcie->pcie_data->version ==ALTERA_PCIE_V3 ) { +writel (AGLX_CFG_AER , (pcie->hip_base + pcie->port_conf_off + +AGLX_ROOT_PORT_IRQ_ENABLE )); } bridge->sysdata = pcie;
Signature · 1 line
2.34.1