Add Stratix 10 PCIe Root Port support
Subsystems (4)
v4 cover Add Stratix 10 PCIe Root Port support
Add PCIe Root Port support for Stratix 10 device and also update device tree binding documentation.
v3 -> v4:
---------
- Separate Kconfig change to a patch
- Change cast to mask
v2 -> v3:
---------
- Rename Stratix10 to Stratix 10.
- Change bool s10_flag to enum version.
v1 -> v2:
---------
- Add define S10_TLP_FMTTYPE_* macros.
- Remove initialize structure members to NULL/zero.
- Rename *_funcs to *_data.
- Update comment and fix coding style warning from checkpatch.pl.
- Rename StratixXX to stratix10.
History:
--------
[v1]: https://lkml.org/lkml/2018/12/26/68
[v2]: https://lkml.org/lkml/2018/12/31/46
[v3]: https://lkml.org/lkml/2019/1/2/16
Ley Foon Tan (3):
PCI: altera: Add Stratix 10 PCIe support
PCI: altera: Enable driver on ARM64
dt-bindings: PCI: altera: Add altr,pcie-root-port-2.0
.../devicetree/bindings/pci/altera-pcie.txt | 4 +- drivers/pci/controller/Kconfig | 2 +- drivers/pci/controller/pcie-altera.c | 246 ++++++++++++++++++-- 3 files changed, 226 insertions(+), 26 deletions(-)
PATCH v4 1/3 PCI: altera: Add Stratix 10 PCIe support
Add PCIe Root Port support for Stratix 10 device.
Main differences:
- HIP interface to access Root Port configuration register.
- TLP programming flow:
- One REG0 register
- Don't need to check alignment
--- drivers/pci/controller/pcie-altera.c | 246 ++++++++++++++++++++++++++++++---- 1 files changed, 222 insertions(+), 24 deletions(-)
drivers/pci/controller/pcie-altera.c +222 -24
@@ -11,6 +11,7 @@#include <linux/irqchip/chained_irq.h> #include <linux/init.h> #include <linux/of_address.h> +#include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/of_pci.h> #include <linux/pci.h>
@@ -37,7 +38,12 @@#define RP_LTSSM_MASK 0x1f#define LTSSM_L0 0xf -#define PCIE_CAP_OFFSET 0x80 +#define S10_RP_TX_CNTRL 0x2004 +#define S10_RP_RXCPL_REG 0x2008 +#define S10_RP_RXCPL_STATUS 0x200C +#define S10_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg) + (1 << 20)) +/* TLP configuration type 0 and 1 */ #define TLP_FMTTYPE_CFGRD0 0x04/* Configuration Read Type 0 */ #define TLP_FMTTYPE_CFGWR0 0x44/* Configuration Write Type 0 */
@@ -49,18 +55,19 @@#define RP_DEVFN 0#define TLP_REQ_ID (bus, devfn) (((bus) << 8) | (devfn))#define TLP_CFGRD_DW0 (pcie, bus) \ - ((((bus == pcie->root_bus_nr) ? TLP_FMTTYPE_CFGRD0 \ - : TLP_FMTTYPE_CFGRD1) << 24) | \ - TLP_PAYLOAD_SIZE) + ((((bus == pcie->root_bus_nr) ? pcie->pcie_data->cfgrd0 \ + : pcie->pcie_data->cfgrd1) << 24) | \ + TLP_PAYLOAD_SIZE)#define TLP_CFGWR_DW0 (pcie, bus) \ - ((((bus == pcie->root_bus_nr) ? TLP_FMTTYPE_CFGWR0 \ - : TLP_FMTTYPE_CFGWR1) << 24) | \ - TLP_PAYLOAD_SIZE) + ((((bus == pcie->root_bus_nr) ? pcie->pcie_data->cfgwr0 \ + : pcie->pcie_data->cfgwr1) << 24) | \ + TLP_PAYLOAD_SIZE)#define TLP_CFG_DW1 (pcie, tag, be) \ - (((TLP_REQ_ID(pcie->root_bus_nr, RP_DEVFN)) << 16) | (tag << 8) | (be)) + (((TLP_REQ_ID(pcie->root_bus_nr, RP_DEVFN)) << 16) | (tag << 8) | (be))#define TLP_CFG_DW2 (bus, devfn, offset) \ (((bus) << 24) | ((devfn) << 16) | (offset))#define TLP_COMP_STATUS (s) (((s) >> 13) & 7) +#define TLP_BYTE_COUNT (s) (((s) >> 0) & 0xfff)#define TLP_HDR_SIZE 3#define TLP_LOOP 500
@@ -69,14 +76,43 @@#define DWORD_MASK 3 +#define S10_TLP_FMTTYPE_CFGRD0 0x05 +#define S10_TLP_FMTTYPE_CFGRD1 0x04 +#define S10_TLP_FMTTYPE_CFGWR0 0x45 +#define S10_TLP_FMTTYPE_CFGWR1 0x44 + +enum altera_pcie_version { +ALTERA_PCIE_V1 =0 , +ALTERA_PCIE_V2 , +}; +struct altera_pcie {struct platform_device *pdev; -void __iomem *cra_base;/* DT Cra */ +void __iomem *cra_base; +void __iomem *hip_base;int irq;u8 root_bus_nr;struct irq_domain *irq_domain;struct resource bus_range;struct list_head resources; +const struct altera_pcie_data *pcie_data; +}; + +struct altera_pcie_data { +int (*tlp_read_pkt)(struct altera_pcie *pcie,u32 *value); +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 bus,int where, +int size,u32 value); +enum altera_pcie_version version; +u32 cap_offset;/* PCIe capability structure register offset */ +u32 cfgrd0; +u32 cfgrd1; +u32 cfgwr0; +u32 cfgwr1; };struct tlp_rp_regpair_t {
@@ -101,6 +137,15 @@ static bool altera_pcie_link_up(struct altera_pcie *pcie)return !!((cra_readl (pcie,RP_LTSSM ) &RP_LTSSM_MASK ) ==LTSSM_L0 ); } +static bool s10_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =S10_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
@@ -128,12 +173,18 @@ static void tlp_write_tx(struct altera_pcie *pcie,cra_writel (pcie, tlp_rp_regdata->ctrl,RP_TX_CNTRL ); } +static void s10_tlp_write_tx (struct altera_pcie *pcie,u32 reg0,u32 ctrl) +{ +cra_writel (pcie, reg0,RP_TX_REG0 ); +cra_writel (pcie, ctrl,S10_RP_TX_CNTRL ); +} +static bool altera_pcie_valid_device (struct altera_pcie *pcie,struct pci_bus *bus,int dev) {/* If there is no link, then there is no device */ if (bus->number != pcie->root_bus_nr) { -if (!altera_pcie_link_up (pcie)) +if (!pcie->pcie_data->get_link_status (pcie))return false; }
@@ -183,6 +234,46 @@ static int tlp_read_packet(struct altera_pcie *pcie, u32 *value)return PCIBIOS_DEVICE_NOT_FOUND ; } +static int s10_tlp_read_packet (struct altera_pcie *pcie,u32 *value) +{ +int i; +u32 ctrl; +u32 comp_status; +u32 dw[4 ]; +u32 count =0 ; + +for (i =0 ; i <TLP_LOOP ; i++) { + ctrl =cra_readl (pcie,S10_RP_RXCPL_STATUS ); +if (!(ctrl &RP_RXCPL_SOP )) +continue ; + +/* Read first DW */ + dw[count++] =cra_readl (pcie,S10_RP_RXCPL_REG ); + +/* Poll for EOP */ +for (i =0 ; i <TLP_LOOP ; i++) { + ctrl =cra_readl (pcie,S10_RP_RXCPL_STATUS ); + dw[count++] =cra_readl (pcie,S10_RP_RXCPL_REG ); +if (ctrl &RP_RXCPL_EOP ) { + comp_status =TLP_COMP_STATUS (dw[1 ]); +if (comp_status) +return PCIBIOS_DEVICE_NOT_FOUND ; + +if (value && +TLP_BYTE_COUNT (dw[1 ]) ==sizeof (u32) && + count >=3 ) + *value = dw[3 ]; + +return PCIBIOS_SUCCESSFUL ; + } + } + +udelay (5 ); + } + +return PCIBIOS_DEVICE_NOT_FOUND ; +} +static void tlp_write_packet (struct altera_pcie *pcie,u32 *headers,u32 data,bool align) {
@@ -210,6 +301,15 @@ static void tlp_write_packet(struct altera_pcie *pcie, u32 *headers,tlp_write_tx (pcie, &tlp_rp_regdata); } +static void s10_tlp_write_packet (struct altera_pcie *pcie,u32 *headers, +u32 data,bool dummy) +{ +s10_tlp_write_tx (pcie, headers[0 ],RP_TX_SOP ); +s10_tlp_write_tx (pcie, headers[1 ],0 ); +s10_tlp_write_tx (pcie, headers[2 ],0 ); +s10_tlp_write_tx (pcie, data,RP_TX_EOP ); +} +static int tlp_cfg_dword_read (struct altera_pcie *pcie,u8 bus,u32 devfn,int where,u8 byte_en,u32 *value) {
@@ -219,9 +319,9 @@ static int tlp_cfg_dword_read(struct altera_pcie *pcie, u8 bus, u32 devfn, headers[1 ] =TLP_CFG_DW1 (pcie,TLP_READ_TAG , byte_en); headers[2 ] =TLP_CFG_DW2 (bus, devfn, where); -tlp_write_packet (pcie, headers,0 , false); + pcie->pcie_data->tlp_write_pkt (pcie, headers,0 , false); -return tlp_read_packet (pcie, value); +return pcie->pcie_data->tlp_read_pkt (pcie, value); } static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,
@@ -236,11 +336,11 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,/* check alignment to Qword */ if ((where &0x7 ) ==0 ) -tlp_write_packet (pcie, headers, value, true); + pcie->pcie_data->tlp_write_pkt (pcie, headers, value, true);else -tlp_write_packet (pcie, headers, value, false); + pcie->pcie_data->tlp_write_pkt (pcie, headers, value, false); - ret =tlp_read_packet (pcie,NULL ); + ret = pcie->pcie_data->tlp_read_pkt (pcie,NULL );if (ret !=PCIBIOS_SUCCESSFUL )return ret;
@@ -254,6 +354,53 @@ 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) +{ +void *addr =S10_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + } + +return PCIBIOS_SUCCESSFUL ; +} + +static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 bus,int where, +int size,u32 value) +{ +void *addr =S10_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 (bus == pcie->root_bus_nr && where ==PCI_PRIMARY_BUS ) + pcie->root_bus_nr = value &0xff ; + +return PCIBIOS_SUCCESSFUL ; +} +static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno,unsigned int devfn,int where,int size,u32 *value)
@@ -262,6 +409,9 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno,u32 data;u8 byte_en; +if (busno == pcie->root_bus_nr && pcie->pcie_data->rp_read_cfg) +return pcie->pcie_data->rp_read_cfg (pcie, where, size, value); +switch (size) {case 1 : byte_en =1 << (where &3 );
@@ -302,6 +452,10 @@ static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,u32 shift =8 * (where &3 );u8 byte_en; +if (busno == pcie->root_bus_nr && pcie->pcie_data->rp_write_cfg) +return pcie->pcie_data->rp_write_cfg (pcie, busno, where, + size, value); +switch (size) {case 1 : data32 = (value &0xff ) << shift;
@@ -365,7 +519,8 @@ static int altera_read_cap_word(struct altera_pcie *pcie, u8 busno,int ret; ret =_altera_pcie_cfg_read (pcie, busno, devfn, -PCIE_CAP_OFFSET + offset,sizeof (*value), + pcie->pcie_data->cap_offset + offset, +sizeof (*value), &data); *value = data;return ret;
@@ -375,7 +530,8 @@ static int altera_write_cap_word(struct altera_pcie *pcie, u8 busno, unsigned int devfn, int offset, u16 value) { return _altera_pcie_cfg_write(pcie, busno, devfn, - PCIE_CAP_OFFSET + offset, sizeof(value), + pcie->pcie_data->cap_offset + offset, + sizeof(value),value ); }
@@ -403,7 +559,7 @@ static void altera_wait_link_retrain(struct altera_pcie *pcie)/* Wait for link is up */ start_jiffies = jiffies;for (;;) { -if (altera_pcie_link_up (pcie)) +if (pcie->pcie_data->get_link_status (pcie))break ;if (time_after (jiffies, start_jiffies +LINK_UP_TIMEOUT )) {
@@ -418,7 +574,7 @@ static void altera_pcie_retrain(struct altera_pcie *pcie) {u16 linkcap, linkstat, linkctl; -if (!altera_pcie_link_up (pcie)) +if (!pcie->pcie_data->get_link_status (pcie))return ;/*
@@ -540,12 +696,20 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)struct device *dev = &pcie->pdev->dev;struct platform_device *pdev = pcie->pdev;struct resource *cra; +struct resource *hip; cra =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"Cra" ); pcie->cra_base =devm_ioremap_resource (dev, cra);if (IS_ERR (pcie->cra_base))return PTR_ERR (pcie->cra_base); +if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { + hip =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"Hip" ); + pcie->hip_base =devm_ioremap_resource (&pdev->dev, hip); +if (IS_ERR (pcie->hip_base)) +return PTR_ERR (pcie->hip_base); + } +/* setup IRQ */ pcie->irq =platform_get_irq (pdev,0 );if (pcie->irq <0 ) {
@@ -562,6 +726,38 @@ static void altera_pcie_host_init(struct altera_pcie *pcie)altera_pcie_retrain (pcie); } +static struct altera_pcie_data pci_1_0_data = { + .tlp_read_pkt = tlp_read_packet, + .tlp_write_pkt = tlp_write_packet, + .get_link_status = altera_pcie_link_up, + .cap_offset =0x80 , + .version =ALTERA_PCIE_V1 , + .cfgrd0 =TLP_FMTTYPE_CFGRD0 , + .cfgrd1 =TLP_FMTTYPE_CFGRD1 , + .cfgwr0 =TLP_FMTTYPE_CFGWR0 , + .cfgwr1 =TLP_FMTTYPE_CFGWR1 , +}; + +static struct altera_pcie_data pci_2_0_data = { + .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, + .version =ALTERA_PCIE_V2 , + .cap_offset =0x70 , + .cfgrd0 =S10_TLP_FMTTYPE_CFGRD0 , + .cfgrd1 =S10_TLP_FMTTYPE_CFGRD1 , + .cfgwr0 =S10_TLP_FMTTYPE_CFGWR0 , + .cfgwr1 =S10_TLP_FMTTYPE_CFGWR1 , +}; + +static const struct of_device_id altera_pcie_of_match[] = { + { .compatible ="altr,pcie-root-port-1.0" , .data = &pci_1_0_data }, + { .compatible ="altr,pcie-root-port-2.0" , .data = &pci_2_0_data }, + {}, +}; +static int altera_pcie_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;
@@ -570,6 +766,7 @@ static int altera_pcie_probe(struct platform_device *pdev)struct pci_bus *child;struct pci_host_bridge *bridge;int ret; +const struct of_device_id *match; bridge =devm_pci_alloc_host_bridge (dev,sizeof (*pcie));if (!bridge)
@@ -578,6 +775,12 @@ static int altera_pcie_probe(struct platform_device *pdev) pcie =pci_host_bridge_priv (bridge); pcie->pdev = pdev; + match =of_match_device (altera_pcie_of_match, &pdev->dev); +if (!match) +return -ENODEV ; + + pcie->pcie_data = match->data; + ret =altera_pcie_parse_dt (pcie);if (ret) {dev_err (dev,"Parsing DT failed\n" );
@@ -628,11 +831,6 @@ static int altera_pcie_probe(struct platform_device *pdev)return ret; } -static const struct of_device_id altera_pcie_of_match[] = { - { .compatible ="altr,pcie-root-port-1.0" , }, - {}, -}; -static struct platform_driver altera_pcie_driver = { .probe = altera_pcie_probe, .driver = {
Signature · 1 line
1.7.1
Re: [PATCH v4 1/3] PCI: altera: Add Stratix 10 PCIe support
Quoted 3 lines · Ley Foon Tan
Add PCIe Root Port support for Stratix 10 device.
Main differences:
Main differences with what ? We need to rewrite this commit log.
Quoted 91 lines
- HIP interface to access Root Port configuration register.
- TLP programming flow:
- One REG0 register
- Don't need to check alignmentSigned-off-by Ley Foon Tan <[email protected]>--- drivers/pci/controller/pcie-altera.c | 246 ++++++++++++++++++++++++++++++---- 1 files changed, 222 insertions(+), 24 deletions(-)drivers/pci/controller/pcie-altera.c +31
-9@@ -11,6 +11,7 @@#include <linux/irqchip/chained_irq.h> #include <linux/init.h> #include <linux/of_address.h> +#include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/of_pci.h> #include <linux/pci.h> @@ -37,7 +38,12 @@#define RP_LTSSM_MASK 0x1f#define LTSSM_L0 0xf -#define PCIE_CAP_OFFSET 0x80 +#define S10_RP_TX_CNTRL 0x2004 +#define S10_RP_RXCPL_REG 0x2008 +#define S10_RP_RXCPL_STATUS 0x200C +#define S10_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg) + (1 << 20)) +/* TLP configuration type 0 and 1 */ #define TLP_FMTTYPE_CFGRD0 0x04/* Configuration Read Type 0 */ #define TLP_FMTTYPE_CFGWR0 0x44/* Configuration Write Type 0 */ @@ -49,18 +55,19 @@#define RP_DEVFN 0#define TLP_REQ_ID (bus, devfn) (((bus) << 8) | (devfn))#define TLP_CFGRD_DW0 (pcie, bus) \ - ((((bus == pcie->root_bus_nr) ? TLP_FMTTYPE_CFGRD0 \ - : TLP_FMTTYPE_CFGRD1) << 24) | \ - TLP_PAYLOAD_SIZE) + ((((bus == pcie->root_bus_nr) ? pcie->pcie_data->cfgrd0 \ + : pcie->pcie_data->cfgrd1) << 24) | \ + TLP_PAYLOAD_SIZE)#define TLP_CFGWR_DW0 (pcie, bus) \ - ((((bus == pcie->root_bus_nr) ? TLP_FMTTYPE_CFGWR0 \ - : TLP_FMTTYPE_CFGWR1) << 24) | \ - TLP_PAYLOAD_SIZE) + ((((bus == pcie->root_bus_nr) ? pcie->pcie_data->cfgwr0 \ + : pcie->pcie_data->cfgwr1) << 24) | \ + TLP_PAYLOAD_SIZE)#define TLP_CFG_DW1 (pcie, tag, be) \ - (((TLP_REQ_ID(pcie->root_bus_nr, RP_DEVFN)) << 16) | (tag << 8) | (be)) + (((TLP_REQ_ID(pcie->root_bus_nr, RP_DEVFN)) << 16) | (tag << 8) | (be))#define TLP_CFG_DW2 (bus, devfn, offset) \ (((bus) << 24) | ((devfn) << 16) | (offset))#define TLP_COMP_STATUS (s) (((s) >> 13) & 7) +#define TLP_BYTE_COUNT (s) (((s) >> 0) & 0xfff)#define TLP_HDR_SIZE 3#define TLP_LOOP 500@@ -69,14 +76,43 @@#define DWORD_MASK 3 +#define S10_TLP_FMTTYPE_CFGRD0 0x05 +#define S10_TLP_FMTTYPE_CFGRD1 0x04 +#define S10_TLP_FMTTYPE_CFGWR0 0x45 +#define S10_TLP_FMTTYPE_CFGWR1 0x44 + +enum altera_pcie_version { +ALTERA_PCIE_V1 =0 , +ALTERA_PCIE_V2 , +}; +struct altera_pcie {struct platform_device *pdev; -void __iomem *cra_base;/* DT Cra */ +void __iomem *cra_base; +void __iomem *hip_base;int irq;u8 root_bus_nr;struct irq_domain *irq_domain;struct resource bus_range;struct list_head resources; +const struct altera_pcie_data *pcie_data; +}; + +struct altera_pcie_data {
drivers/pci/controller/pcie-altera.c line 111
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +10
-0+int (*tlp_read_pkt)(struct altera_pcie *pcie,u32 *value); +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 bus,int where, +int size,u32 value); +enum altera_pcie_version version; +u32 cap_offset;/* PCIe capability structure register offset */
This is a duplication of struct pci_dev.pcie_cap right ?
Quoted 57 lines
drivers/pci/controller/pcie-altera.c +30
-1+u32 cfgrd0; +u32 cfgrd1; +u32 cfgwr0; +u32 cfgwr1; };struct tlp_rp_regpair_t {@@ -101,6 +137,15 @@ static bool altera_pcie_link_up(struct altera_pcie *pcie)return !!((cra_readl (pcie,RP_LTSSM ) &RP_LTSSM_MASK ) ==LTSSM_L0 ); } +static bool s10_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =S10_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 @@ -128,12 +173,18 @@ static void tlp_write_tx(struct altera_pcie *pcie,cra_writel (pcie, tlp_rp_regdata->ctrl,RP_TX_CNTRL ); } +static void s10_tlp_write_tx (struct altera_pcie *pcie,u32 reg0,u32 ctrl) +{ +cra_writel (pcie, reg0,RP_TX_REG0 ); +cra_writel (pcie, ctrl,S10_RP_TX_CNTRL ); +} +static bool altera_pcie_valid_device (struct altera_pcie *pcie,struct pci_bus *bus,int dev) {/* If there is no link, then there is no device */ if (bus->number != pcie->root_bus_nr) { -if (!altera_pcie_link_up (pcie)) +if (!pcie->pcie_data->get_link_status (pcie))return false; }@@ -183,6 +234,46 @@ static int tlp_read_packet(struct altera_pcie *pcie, u32 *value)return PCIBIOS_DEVICE_NOT_FOUND ; } +static int s10_tlp_read_packet (struct altera_pcie *pcie,u32 *value) +{ +int i; +u32 ctrl; +u32 comp_status; +u32 dw[4 ]; +u32 count =0 ; + +for (i =0 ; i <TLP_LOOP ; i++) { + ctrl =cra_readl (pcie,S10_RP_RXCPL_STATUS );
drivers/pci/controller/pcie-altera.c static int tlp_read_packet(struct altera_pcie *pcie, u32 *value) · line 256
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +10
-0+if (!(ctrl &RP_RXCPL_SOP )) +continue ; + +/* Read first DW */ + dw[count++] =cra_readl (pcie,S10_RP_RXCPL_REG ); + +/* Poll for EOP */ +for (i =0 ; i <TLP_LOOP ; i++) { + ctrl =cra_readl (pcie,S10_RP_RXCPL_STATUS ); + dw[count++] =cra_readl (pcie,S10_RP_RXCPL_REG );
I think you'd better add a check on count lest it can overflow dw[].
Quoted 76 lines
drivers/pci/controller/pcie-altera.c +40
-5+if (ctrl &RP_RXCPL_EOP ) { + comp_status =TLP_COMP_STATUS (dw[1 ]); +if (comp_status) +return PCIBIOS_DEVICE_NOT_FOUND ; + +if (value && +TLP_BYTE_COUNT (dw[1 ]) ==sizeof (u32) && + count >=3 ) + *value = dw[3 ]; + +return PCIBIOS_SUCCESSFUL ; + } + } + +udelay (5 ); + } + +return PCIBIOS_DEVICE_NOT_FOUND ; +} +static void tlp_write_packet (struct altera_pcie *pcie,u32 *headers,u32 data,bool align) {@@ -210,6 +301,15 @@ static void tlp_write_packet(struct altera_pcie *pcie, u32 *headers,tlp_write_tx (pcie, &tlp_rp_regdata); } +static void s10_tlp_write_packet (struct altera_pcie *pcie,u32 *headers, +u32 data,bool dummy) +{ +s10_tlp_write_tx (pcie, headers[0 ],RP_TX_SOP ); +s10_tlp_write_tx (pcie, headers[1 ],0 ); +s10_tlp_write_tx (pcie, headers[2 ],0 ); +s10_tlp_write_tx (pcie, data,RP_TX_EOP ); +} +static int tlp_cfg_dword_read (struct altera_pcie *pcie,u8 bus,u32 devfn,int where,u8 byte_en,u32 *value) {@@ -219,9 +319,9 @@ static int tlp_cfg_dword_read(struct altera_pcie *pcie, u8 bus, u32 devfn, headers[1 ] =TLP_CFG_DW1 (pcie,TLP_READ_TAG , byte_en); headers[2 ] =TLP_CFG_DW2 (bus, devfn, where); -tlp_write_packet (pcie, headers,0 , false); + pcie->pcie_data->tlp_write_pkt (pcie, headers,0 , false); -return tlp_read_packet (pcie, value); +return pcie->pcie_data->tlp_read_pkt (pcie, value); } static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,@@ -236,11 +336,11 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,/* check alignment to Qword */ if ((where &0x7 ) ==0 ) -tlp_write_packet (pcie, headers, value, true); + pcie->pcie_data->tlp_write_pkt (pcie, headers, value, true);else -tlp_write_packet (pcie, headers, value, false); + pcie->pcie_data->tlp_write_pkt (pcie, headers, value, false); - ret =tlp_read_packet (pcie,NULL ); + ret = pcie->pcie_data->tlp_read_pkt (pcie,NULL );if (ret !=PCIBIOS_SUCCESSFUL )return ret;@@ -254,6 +354,53 @@ 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) +{ +void *addr =S10_RP_CFG_ADDR (pcie, where); + +switch (size) {
drivers/pci/controller/pcie-altera.c static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn, · line 372
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +10
-0+case 1 : + *value =readb (addr); +break ; +case 2 : + *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + }
This boilerplace could be avoided if you used generic config accessors (ie pci_generic_config_read()/write()).
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +10
-0+ +return PCIBIOS_SUCCESSFUL ; +} + +static int s10_rp_write_cfg (struct altera_pcie *pcie,u8 bus,int where, +int size,u32 value) +{ +void *addr =S10_RP_CFG_ADDR (pcie, where); + +switch (size) {
drivers/pci/controller/pcie-altera.c static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn, · line 392
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +10
-0+case 1 : +writeb (value, addr); +break ; +case 2 : +writew (value, addr); +break ; +default : +writel (value, addr); +break ; + }
Ditto.
Quoted 113 lines
drivers/pci/controller/pcie-altera.c +47
-4+ +/* +* Monitor changes to PCI_PRIMARY_BUS register on root port +* and update local copy of root bus number accordingly. +*/ +if (bus == pcie->root_bus_nr && where ==PCI_PRIMARY_BUS ) + pcie->root_bus_nr = value &0xff ; + +return PCIBIOS_SUCCESSFUL ; +} +static int _altera_pcie_cfg_read (struct altera_pcie *pcie,u8 busno,unsigned int devfn,int where,int size,u32 *value)@@ -262,6 +409,9 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno,u32 data;u8 byte_en; +if (busno == pcie->root_bus_nr && pcie->pcie_data->rp_read_cfg) +return pcie->pcie_data->rp_read_cfg (pcie, where, size, value); +switch (size) {case 1 : byte_en =1 << (where &3 );@@ -302,6 +452,10 @@ static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno,u32 shift =8 * (where &3 );u8 byte_en; +if (busno == pcie->root_bus_nr && pcie->pcie_data->rp_write_cfg) +return pcie->pcie_data->rp_write_cfg (pcie, busno, where, + size, value); +switch (size) {case 1 : data32 = (value &0xff ) << shift;@@ -365,7 +519,8 @@ static int altera_read_cap_word(struct altera_pcie *pcie, u8 busno,int ret; ret =_altera_pcie_cfg_read (pcie, busno, devfn, -PCIE_CAP_OFFSET + offset,sizeof (*value), + pcie->pcie_data->cap_offset + offset, +sizeof (*value), &data); *value = data;return ret;@@ -375,7 +530,8 @@ static int altera_write_cap_word(struct altera_pcie *pcie, u8 busno, unsigned int devfn, int offset, u16 value) { return _altera_pcie_cfg_write(pcie, busno, devfn, - PCIE_CAP_OFFSET + offset, sizeof(value), + pcie->pcie_data->cap_offset + offset, + sizeof(value),value ); }@@ -403,7 +559,7 @@ static void altera_wait_link_retrain(struct altera_pcie *pcie)/* Wait for link is up */ start_jiffies = jiffies;for (;;) { -if (altera_pcie_link_up (pcie)) +if (pcie->pcie_data->get_link_status (pcie))break ;if (time_after (jiffies, start_jiffies +LINK_UP_TIMEOUT )) {@@ -418,7 +574,7 @@ static void altera_pcie_retrain(struct altera_pcie *pcie) {u16 linkcap, linkstat, linkctl; -if (!altera_pcie_link_up (pcie)) +if (!pcie->pcie_data->get_link_status (pcie))return ;/* @@ -540,12 +696,20 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie)struct device *dev = &pcie->pdev->dev;struct platform_device *pdev = pcie->pdev;struct resource *cra; +struct resource *hip; cra =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"Cra" ); pcie->cra_base =devm_ioremap_resource (dev, cra);if (IS_ERR (pcie->cra_base))return PTR_ERR (pcie->cra_base); +if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { + hip =platform_get_resource_byname (pdev,IORESOURCE_MEM ,"Hip" ); + pcie->hip_base =devm_ioremap_resource (&pdev->dev, hip); +if (IS_ERR (pcie->hip_base)) +return PTR_ERR (pcie->hip_base); + } +/* setup IRQ */ pcie->irq =platform_get_irq (pdev,0 );if (pcie->irq <0 ) {@@ -562,6 +726,38 @@ static void altera_pcie_host_init(struct altera_pcie *pcie)altera_pcie_retrain (pcie); } +static struct altera_pcie_data pci_1_0_data = { + .tlp_read_pkt = tlp_read_packet, + .tlp_write_pkt = tlp_write_packet, + .get_link_status = altera_pcie_link_up, + .cap_offset =0x80 , + .version =ALTERA_PCIE_V1 , + .cfgrd0 =TLP_FMTTYPE_CFGRD0 , + .cfgrd1 =TLP_FMTTYPE_CFGRD1 , + .cfgwr0 =TLP_FMTTYPE_CFGWR0 , + .cfgwr1 =TLP_FMTTYPE_CFGWR1 , +}; + +static struct altera_pcie_data pci_2_0_data = { + .tlp_read_pkt = s10_tlp_read_packet, + .tlp_write_pkt = s10_tlp_write_packet,
drivers/pci/controller/pcie-altera.c static void altera_pcie_host_init(struct altera_pcie *pcie) · line 753
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +10
-0+ .get_link_status = s10_altera_pcie_link_up, + .rp_read_cfg = s10_rp_read_cfg, + .rp_write_cfg = s10_rp_write_cfg, + .version = ALTERA_PCIE_V2, + .cap_offset = 0x70, + .cfgrd0 = S10_TLP_FMTTYPE_CFGRD0, + .cfgrd1 = S10_TLP_FMTTYPE_CFGRD1, + .cfgwr0 = S10_TLP_FMTTYPE_CFGWR0, + .cfgwr1 = S10_TLP_FMTTYPE_CFGWR1, +};
I wonder if it is not better to have two different struct pci_ops (and have a pointer to them in struct altera_pcie_data) instead of all these parameters (most of which are there to differentiate struct pci_ops methods).
See also my comments above.
In the end I guess it depends on how many host bridges will be based on this IP as design, what you did is OK but it is worth thinking about it.
Lorenzo
Quoted 46 lines
drivers/pci/controller/pcie-altera.c +14
-5+ +static const struct of_device_id altera_pcie_of_match[] = { + { .compatible ="altr,pcie-root-port-1.0" , .data = &pci_1_0_data }, + { .compatible ="altr,pcie-root-port-2.0" , .data = &pci_2_0_data }, + {}, +}; +static int altera_pcie_probe (struct platform_device *pdev) {struct device *dev = &pdev->dev;@@ -570,6 +766,7 @@ static int altera_pcie_probe(struct platform_device *pdev)struct pci_bus *child;struct pci_host_bridge *bridge;int ret; +const struct of_device_id *match; bridge =devm_pci_alloc_host_bridge (dev,sizeof (*pcie));if (!bridge)@@ -578,6 +775,12 @@ static int altera_pcie_probe(struct platform_device *pdev) pcie =pci_host_bridge_priv (bridge); pcie->pdev = pdev; + match =of_match_device (altera_pcie_of_match, &pdev->dev); +if (!match) +return -ENODEV ; + + pcie->pcie_data = match->data; + ret =altera_pcie_parse_dt (pcie);if (ret) {dev_err (dev,"Parsing DT failed\n" );@@ -628,11 +831,6 @@ static int altera_pcie_probe(struct platform_device *pdev)return ret; } -static const struct of_device_id altera_pcie_of_match[] = { - { .compatible ="altr,pcie-root-port-1.0" , }, - {}, -}; -static struct platform_driver altera_pcie_driver = { .probe = altera_pcie_probe, .driver = {Signature · 1 line
1.7.1
Re: [PATCH v4 1/3] PCI: altera: Add Stratix 10 PCIe support
Quoted 6 lines · Lorenzo Pieralisi
Quoted 4 lines · Ley Foon Tan
Add PCIe Root Port support for Stratix 10 device.
Main differences:
Main differences with what ? We need to rewrite this commit log.
Differences compare with Cyclone V and Arria 10 devices. I will rewrite this.
Quoted 117 lines
Quoted 117 lines
- HIP interface to access Root Port configuration register.
- TLP programming flow:
- One REG0 register
- Don't need to check alignmentSigned-off-by Ley Foon Tan <[email protected]>---
drivers/pci/controller/pcie-altera.c | 246
++++++++++++++++++++++++++++++----1 files changed, 222 insertions(+), 24 deletions(-)drivers/pci/controller/pcie-altera.c +1
-0@@ -11,6 +11,7 @@ #include <linux/irqchip/chained_irq.h> #include <linux/init.h> #include <linux/of_address.h> +#include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/of_pci.h> #include <linux/pci.h>@@ -37,7 +38,12 @@ #define RP_LTSSM_MASK 0x1f #define LTSSM_L0 0xfdrivers/pci/controller/pcie-altera.c +6
-1-#define PCIE_CAP_OFFSET 0x80 +#define S10_RP_TX_CNTRL 0x2004 +#define S10_RP_RXCPL_REG 0x2008 +#define S10_RP_RXCPL_STATUS 0x200C +#define S10_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg) + (1 << 20)) +/* TLP configuration type 0 and 1 */
#defineTLP_FMTTYPE_CFGRD00x04/*
Configuration Read Type 0 */
#defineTLP_FMTTYPE_CFGWR00x44/*
Configuration Write Type 0 */drivers/pci/controller/pcie-altera.c +4
-6@@ -49,18 +55,19 @@ #define RP_DEVFN 0 #define TLP_REQ_ID(bus, devfn) (((bus) << 8) | (devfn)) #define TLP_CFGRD_DW0(pcie, bus) \ - ((((bus == pcie->root_bus_nr) ? TLP_FMTTYPE_CFGRD0 \ - : TLP_FMTTYPE_CFGRD1) << 24) | \ - TLP_PAYLOAD_SIZE) + ((((bus == pcie->root_bus_nr) ? pcie->pcie_data->cfgrd0 \ + : pcie->pcie_data->cfgrd1) << 24) | \ + TLP_PAYLOAD_SIZE) #define TLP_CFGWR_DW0(pcie, bus) \ - ((((bus == pcie->root_bus_nr) ? TLP_FMTTYPE_CFGWR0 \ - : TLP_FMTTYPE_CFGWR1) << 24) | \ - TLP_PAYLOAD_SIZE) + ((((bus == pcie->root_bus_nr) ? pcie->pcie_data->cfgwr0\drivers/pci/controller/pcie-altera.c +1
-0+ : pcie->pcie_data->cfgwr1) << 24)| \
drivers/pci/controller/pcie-altera.c +1
-0+ TLP_PAYLOAD_SIZE)#define
TLP_CFG_DW1(pcie, tag, be)\
- (((TLP_REQ_ID(pcie->root_bus_nr, RP_DEVFN)) << 16) | (tag <<
8) | (be))drivers/pci/controller/pcie-altera.c +1
-0+ (((TLP_REQ_ID(pcie->root_bus_nr, RP_DEVFN)) << 16) | (tag<< 8) | (be))
#defineTLP_CFG_DW2(bus, devfn, offset)\
(((bus) << 24) | ((devfn) << 16) | (offset))
#defineTLP_COMP_STATUS(s)(((s) >> 13) & 7)
+#defineTLP_BYTE_COUNT(s)(((s) >> 0) &0xfff)
#defineTLP_HDR_SIZE3
#defineTLP_LOOP500drivers/pci/controller/pcie-altera.c +0
-0@@ -69,14 +76,43 @@
#defineDWORD_MASK3drivers/pci/controller/pcie-altera.c +10
-0+#define S10_TLP_FMTTYPE_CFGRD0 0x05 +#define S10_TLP_FMTTYPE_CFGRD1 0x04 +#define S10_TLP_FMTTYPE_CFGWR0 0x45 +#define S10_TLP_FMTTYPE_CFGWR1 0x44 + +enum altera_pcie_version { +ALTERA_PCIE_V1 =0 , +ALTERA_PCIE_V2 , +}; +struct
altera_pcie{
structplatform_device*pdev;drivers/pci/controller/pcie-altera.c +2
-1-void __iomem *cra_base;/* DT Cra */ +void __iomem *cra_base; +void __iomem *hip_base;int irq;
u8root_bus_nr;
structirq_domain*irq_domain;
struct resourcebus_range;
structlist_headresources;drivers/pci/controller/pcie-altera.c +6
-0+const struct altera_pcie_data *pcie_data; +}; + +struct altera_pcie_data { +int (*tlp_read_pkt)(struct altera_pcie *pcie,u32 *value); + void (*tlp_write_pkt)(struct altera_pcie *pcie, u32*headers,
drivers/pci/controller/pcie-altera.c +3
-0+ u32 data, bool align); +bool (*get_link_status)(struct altera_pcie *pcie); + int (*rp_read_cfg)(struct altera_pcie *pcie, int where,
Quoted 8 lines
Quoted 7 lines
drivers/pci/controller/pcie-altera.c +2
-0+ int size, u32 *value); + int (*rp_write_cfg)(struct altera_pcie *pcie, u8 bus, intwhere,
drivers/pci/controller/pcie-altera.c +3
-0+ int size, u32 value); +enum altera_pcie_version version; +u32 cap_offset;/* PCIe capability structure register offset */
This is a duplication of struct pci_dev.pcie_cap right ?
This is register offset in PCIe Rootport IP to access PCIe Cap structure register of directly RP. This allow us to access PCIe cap struct register without pci_dev.
Quoted 72 lines
Quoted 72 lines
drivers/pci/controller/pcie-altera.c +4
-0+u32 cfgrd0; +u32 cfgrd1; +u32 cfgwr0; +u32 cfgwr1;};
structtlp_rp_regpair_t{drivers/pci/controller/pcie-altera.c +0
-0@@ -101,6 +137,15 @@ static bool altera_pcie_link_up(struct altera_pcie *pcie)return !!((cra_readl(pcie,
RP_LTSSM) &RP_LTSSM_MASK) ==LTSSM_L0);
}drivers/pci/controller/pcie-altera.c +9
-0+static bool s10_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =S10_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 spacedrivers/pci/controller/pcie-altera.c +0
-0@@ -128,12 +173,18 @@ static void tlp_write_tx(struct altera_pcie *pcie, cra_writel(pcie, tlp_rp_regdata->ctrl, RP_TX_CNTRL); }
+static voids10_tlp_write_tx(struct altera_pcie *pcie, u32 reg0, u32 ctrl)drivers/pci/controller/pcie-altera.c +5
-0+{ +cra_writel (pcie, reg0,RP_TX_REG0 ); +cra_writel (pcie, ctrl,S10_RP_TX_CNTRL ); +} +static bool
altera_pcie_valid_device(struct altera_pcie *pcie, struct pci_bus *bus, int dev){
/* If there is no link, then there is no device */ if (bus->number!=pcie->root_bus_nr) {drivers/pci/controller/pcie-altera.c +1
-1-if (!altera_pcie_link_up (pcie)) +if (!pcie->pcie_data->get_link_status (pcie))return false;
}drivers/pci/controller/pcie-altera.c +0
-0@@ -183,6 +234,46 @@ static int tlp_read_packet(struct altera_pcie *pcie, u32 *value) return PCIBIOS_DEVICE_NOT_FOUND; }
+static ints10_tlp_read_packet(struct altera_pcie *pcie, u32 *value)drivers/pci/controller/pcie-altera.c +14
-0+{ +int i; +u32 ctrl; +u32 comp_status; +u32 dw[4 ]; +u32 count =0 ; + +for (i =0 ; i <TLP_LOOP ; i++) { + ctrl =cra_readl (pcie,S10_RP_RXCPL_STATUS ); +if (!(ctrl &RP_RXCPL_SOP )) +continue ; + +/* Read first DW */ + dw[count++] =cra_readl (pcie,S10_RP_RXCPL_REG );
Quoted 8 lines
Quoted 7 lines
drivers/pci/controller/pcie-altera.c +4
-0+ +/* Poll for EOP */ +for (i =0 ; i <TLP_LOOP ; i++) { + ctrl = cra_readl(pcie,
S10_RP_RXCPL_STATUS);drivers/pci/controller/pcie-altera.c +1
-0+ dw[count++] = cra_readl(pcie,
S10_RP_RXCPL_REG);I think you'd better add a check on count lest it can overflow dw[].
Okay, will check that.
Quoted 95 lines
Quoted 95 lines
drivers/pci/controller/pcie-altera.c +2
-0+if (ctrl &RP_RXCPL_EOP ) { + comp_status =
TLP_COMP_STATUS(dw[1]);drivers/pci/controller/pcie-altera.c +2
-0+if (comp_status) +return
PCIBIOS_DEVICE_NOT_FOUND;drivers/pci/controller/pcie-altera.c +3
-0+ +if (value && + TLP_BYTE_COUNT(dw[1]) ==sizeof(u32) &&
drivers/pci/controller/pcie-altera.c +13
-0+ count >= 3) + *value = dw[3 ]; + +return PCIBIOS_SUCCESSFUL ; + } + } + +udelay (5 ); + } + +return PCIBIOS_DEVICE_NOT_FOUND ; +} +static void tlp_write_packet(struct
altera_pcie*pcie, u32 *headers,
u32 data, bool align) {drivers/pci/controller/pcie-altera.c +0
-0@@ -210,6 +301,15 @@ static void tlp_write_packet(struct altera_pcie *pcie, u32 *headers, tlp_write_tx(pcie, &tlp_rp_regdata); }
+static void s10_tlp_write_packet(structaltera_pcie*pcie, u32 *headers,drivers/pci/controller/pcie-altera.c +8
-0+ u32 data, bool dummy) +{ +s10_tlp_write_tx (pcie, headers[0 ],RP_TX_SOP ); +s10_tlp_write_tx (pcie, headers[1 ],0 ); +s10_tlp_write_tx (pcie, headers[2 ],0 ); +s10_tlp_write_tx (pcie, data,RP_TX_EOP ); +} +static int tlp_cfg_dword_read(struct
altera_pcie*pcie, u8 bus, u32 devfn,
int where, u8byte_en, u32 *value) {drivers/pci/controller/pcie-altera.c +0
-0@@ -219,9 +319,9 @@ static int tlp_cfg_dword_read(struct altera_pcie *pcie, u8 bus, u32 devfn, headers[1] = TLP_CFG_DW1(pcie, TLP_READ_TAG, byte_en); headers[2] = TLP_CFG_DW2(bus, devfn, where);drivers/pci/controller/pcie-altera.c +1
-1-tlp_write_packet (pcie, headers,0 , false); + pcie->pcie_data->tlp_write_pkt (pcie, headers,0 , false);drivers/pci/controller/pcie-altera.c +1
-1-return tlp_read_packet (pcie, value); +return pcie->pcie_data->tlp_read_pkt (pcie, value);}
static int tlp_cfg_dword_write(structaltera_pcie*pcie, u8 bus, u32 devfn,drivers/pci/controller/pcie-altera.c +0
-0@@ -236,11 +336,11 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,
/* check alignment to Qword */
if ((where &0x7) == 0)drivers/pci/controller/pcie-altera.c +1
-1-tlp_write_packet (pcie, headers, value, true); + pcie->pcie_data->tlp_write_pkt(pcie, headers,value, true);
elsedrivers/pci/controller/pcie-altera.c +1
-1-tlp_write_packet (pcie, headers, value, false); + pcie->pcie_data->tlp_write_pkt(pcie, headers,value, false);
drivers/pci/controller/pcie-altera.c +1
-1- ret =tlp_read_packet (pcie,NULL ); + ret = pcie->pcie_data->tlp_read_pkt (pcie,NULL );if (ret !=
PCIBIOS_SUCCESSFUL)
return ret;drivers/pci/controller/pcie-altera.c +0
-0@@ -254,6 +354,53 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn, return PCIBIOS_SUCCESSFUL; }drivers/pci/controller/pcie-altera.c +10
-0+static int s10_rp_read_cfg (struct altera_pcie *pcie,int where, + int size, u32 *value) +{ +void *addr =S10_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 :
Quoted 8 lines
drivers/pci/controller/pcie-altera.c static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn, · line 372
Quoted 6 lines
drivers/pci/controller/pcie-altera.c +6
-0+ *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + }This boilerplace could be avoided if you used generic config accessors (ie pci_generic_config_read()/write()).
Okay. I will change this.
Quoted 16 lines
Quoted 16 lines
drivers/pci/controller/pcie-altera.c +5
-0+ +return PCIBIOS_SUCCESSFUL ; +} + +static int s10_rp_write_cfg(struct altera_pcie *pcie, u8 bus, intwhere,
drivers/pci/controller/pcie-altera.c +8
-0+ int size, u32 value) +{ +void *addr =S10_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : +writeb (value, addr); +break ;
Quoted 8 lines
drivers/pci/controller/pcie-altera.c static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn, · line 392
Quoted 7 lines
drivers/pci/controller/pcie-altera.c +7
-0+case 2 : +writew (value, addr); +break ; +default : +writel (value, addr); +break ; + }Ditto.
Noted.
Quoted 157 lines
Quoted 140 lines
drivers/pci/controller/pcie-altera.c +3
-0+ +/* +* Monitor changes to PCI_PRIMARY_BUS register on root port
drivers/pci/controller/pcie-altera.c +8
-0+* and update local copy of root bus number accordingly. +*/ +if (bus == pcie->root_bus_nr && where ==PCI_PRIMARY_BUS ) + pcie->root_bus_nr = value &0xff ; + +return PCIBIOS_SUCCESSFUL ; +} +static int _altera_pcie_cfg_read(struct
altera_pcie*pcie, u8 busno,
unsigned int devfn, int where, int size,
u32 *value)drivers/pci/controller/pcie-altera.c +0
-0@@ -262,6 +409,9 @@ static int _altera_pcie_cfg_read(struct altera_pcie *pcie, u8 busno, u32 data; u8 byte_en;drivers/pci/controller/pcie-altera.c +1
-0+ if (busno == pcie->root_bus_nr && pcie->pcie_data-Quoted 1 line
rp_read_cfg)drivers/pci/controller/pcie-altera.c +1
-0+ return pcie->pcie_data->rp_read_cfg(pcie, where,size, value);
+
switch (size) {
case 1:
byte_en= 1 << (where & 3);drivers/pci/controller/pcie-altera.c +0
-0@@ -302,6 +452,10 @@ static int _altera_pcie_cfg_write(struct altera_pcie *pcie, u8 busno, u32 shift = 8 * (where & 3); u8 byte_en;drivers/pci/controller/pcie-altera.c +1
-0+ if (busno == pcie->root_bus_nr && pcie->pcie_data-Quoted 1 line
rp_write_cfg)drivers/pci/controller/pcie-altera.c +1
-0+ return pcie->pcie_data->rp_write_cfg(pcie, busno,where,
drivers/pci/controller/pcie-altera.c +1
-0+ size,value);
+
switch (size) {
case 1:
data32 = (value &0xff) << shift;drivers/pci/controller/pcie-altera.c +0
-0@@ -365,7 +519,8 @@ static int altera_read_cap_word(struct altera_pcie *pcie, u8 busno, int ret;
ret = _altera_pcie_cfg_read(pcie, busno, devfn,drivers/pci/controller/pcie-altera.c +0
-1- PCIE_CAP_OFFSET + offset,
sizeof(*value),drivers/pci/controller/pcie-altera.c +1
-0+ pcie->pcie_data->cap_offset +offset,
drivers/pci/controller/pcie-altera.c +1
-0+ sizeof(*value),&data);
*value = data;
return ret;drivers/pci/controller/pcie-altera.c +3
-1@@ -375,7 +530,8 @@ static int altera_write_cap_word(struct altera_pcie *pcie, u8 busno, unsigned int devfn, int offset, u16 value) { return _altera_pcie_cfg_write(pcie, busno, devfn, - PCIE_CAP_OFFSET + offset, sizeof(value), + pcie->pcie_data->cap_offset + offset, + sizeof(value),value);
}drivers/pci/controller/pcie-altera.c +1
-1@@ -403,7 +559,7 @@ static void altera_wait_link_retrain(struct altera_pcie *pcie) /* Wait for link is up */ start_jiffies = jiffies; for (;;) { -if (altera_pcie_link_up (pcie)) +if (pcie->pcie_data->get_link_status (pcie)) break;
if (time_after(jiffies, start_jiffies + LINK_UP_TIMEOUT)) {drivers/pci/controller/pcie-altera.c +0
-0@@ -418,7 +574,7 @@ static void altera_pcie_retrain(struct altera_pcie *pcie) { u16 linkcap, linkstat, linkctl;drivers/pci/controller/pcie-altera.c +1
-1-if (!altera_pcie_link_up (pcie)) +if (!pcie->pcie_data->get_link_status (pcie))return;
/*drivers/pci/controller/pcie-altera.c +1
-0@@ -540,12 +696,20 @@ static int altera_pcie_parse_dt(struct altera_pcie *pcie) struct device *dev = &pcie->pdev->dev; struct platform_device *pdev = pcie->pdev; struct resource *cra; +struct resource *hip;
cra =platform_get_resource_byname(pdev, IORESOURCE_MEM, "Cra");
pcie->cra_base=devm_ioremap_resource(dev, cra); if (IS_ERR(pcie->cra_base))
returnPTR_ERR(pcie->cra_base);drivers/pci/controller/pcie-altera.c +2
-0+if (pcie->pcie_data->version ==ALTERA_PCIE_V2 ) { + hip = platform_get_resource_byname(pdev,
IORESOURCE_MEM, "Hip");drivers/pci/controller/pcie-altera.c +1
-0+ pcie->hip_base = devm_ioremap_resource(&pdev->dev,hip);
drivers/pci/controller/pcie-altera.c +4
-0+if (IS_ERR (pcie->hip_base)) +return PTR_ERR (pcie->hip_base); + } +/* setup IRQ */
pcie->irq=platform_get_irq(pdev, 0);
if (pcie->irq< 0) {drivers/pci/controller/pcie-altera.c +0
-0@@ -562,6 +726,38 @@ static void altera_pcie_host_init(struct altera_pcie *pcie) altera_pcie_retrain(pcie); }drivers/pci/controller/pcie-altera.c +15
-0+static struct altera_pcie_data pci_1_0_data = { + .tlp_read_pkt = tlp_read_packet, + .tlp_write_pkt = tlp_write_packet, + .get_link_status = altera_pcie_link_up, + .cap_offset =0x80 , + .version =ALTERA_PCIE_V1 , + .cfgrd0 =TLP_FMTTYPE_CFGRD0 , + .cfgrd1 =TLP_FMTTYPE_CFGRD1 , + .cfgwr0 =TLP_FMTTYPE_CFGWR0 , + .cfgwr1 =TLP_FMTTYPE_CFGWR1 , +}; + +static struct altera_pcie_data pci_2_0_data = { + .tlp_read_pkt = s10_tlp_read_packet, + .tlp_write_pkt = s10_tlp_write_packet,drivers/pci/controller/pcie-altera.c static void altera_pcie_host_init(struct altera_pcie *pcie) · line 753
Quoted 10 lines
drivers/pci/controller/pcie-altera.c +10
-0+ .get_link_status = s10_altera_pcie_link_up, + .rp_read_cfg = s10_rp_read_cfg, + .rp_write_cfg = s10_rp_write_cfg, + .version = ALTERA_PCIE_V2, + .cap_offset = 0x70, + .cfgrd0 = S10_TLP_FMTTYPE_CFGRD0, + .cfgrd1 = S10_TLP_FMTTYPE_CFGRD1, + .cfgwr0 = S10_TLP_FMTTYPE_CFGWR0, + .cfgwr1 = S10_TLP_FMTTYPE_CFGWR1, +};I wonder if it is not better to have two different struct
pci_ops(and
have a pointer to them in structaltera_pcie_data) instead of all these
parameters (most of which are there to differentiate structpci_opsmethods).
Quoted 7 lines
See also my comments above.
In the end I guess it depends on how many host bridges will be based on
this IP as design, what you did is OK but it is worth thinking about it.
We have 2 versions of HW based on this IP as for now. May have new version in future.
I can move all callback functions to struct pci_ops and have a pointer in struct altera_pcie_data.
Thanks.
Regards
Ley Foon
Re: [PATCH v4 1/3] PCI: altera: Add Stratix 10 PCIe support
Quoted 324 lines · Ley Foon Tan
Quoted 6 lines · Lorenzo Pieralisi
Quoted 4 lines · Ley Foon Tan
Add PCIe Root Port support for Stratix 10 device.
Main differences:
Main differences with what ? We need to rewrite this commit log.
Differences compare with Cyclone V and Arria 10 devices. I will rewrite this.
Quoted 117 lines
Quoted 117 lines
- HIP interface to access Root Port configuration register.
- TLP programming flow:
- One REG0 register
- Don't need to check alignmentSigned-off-by Ley Foon Tan <[email protected]>--- drivers/pci/controller/pcie-altera.c | 246 ++++++++++++++++++++++++++++++---- 1 files changed, 222 insertions(+), 24 deletions(-)drivers/pci/controller/pcie-altera.c +7
-1@@ -11,6 +11,7 @@#include <linux/irqchip/chained_irq.h> #include <linux/init.h> #include <linux/of_address.h> +#include <linux/of_device.h> #include <linux/of_irq.h> #include <linux/of_pci.h> #include <linux/pci.h> @@ -37,7 +38,12 @@#define RP_LTSSM_MASK 0x1f#define LTSSM_L0 0xf -#define PCIE_CAP_OFFSET 0x80 +#define S10_RP_TX_CNTRL 0x2004 +#define S10_RP_RXCPL_REG 0x2008 +#define S10_RP_RXCPL_STATUS 0x200C +#define S10_RP_CFG_ADDR (pcie, reg) \ + (((pcie)->hip_base) + (reg) + (1 << 20)) +/* TLP configuration type 0 and 1 */ #define TLP_FMTTYPE_CFGRD0 0x04/* Configuration Read Type 0 */
#defineTLP_FMTTYPE_CFGWR00x44/*
Configuration Write Type 0 */drivers/pci/controller/pcie-altera.c +5
-6@@ -49,18 +55,19 @@#define RP_DEVFN 0#define TLP_REQ_ID (bus, devfn) (((bus) << 8) | (devfn))#define TLP_CFGRD_DW0 (pcie, bus) \ - ((((bus == pcie->root_bus_nr) ?TLP_FMTTYPE_CFGRD0 \ - :TLP_FMTTYPE_CFGRD1 ) <<24 ) | \ -TLP_PAYLOAD_SIZE ) + ((((bus == pcie->root_bus_nr) ? pcie->pcie_data->cfgrd0 \ + : pcie->pcie_data->cfgrd1) <<24 ) | \ + TLP_PAYLOAD_SIZE)#define TLP_CFGWR_DW0 (pcie, bus) \ - ((((bus == pcie->root_bus_nr) ?TLP_FMTTYPE_CFGWR0 \ - :TLP_FMTTYPE_CFGWR1 ) <<24 ) | \ -TLP_PAYLOAD_SIZE ) + ((((bus == pcie->root_bus_nr) ? pcie->pcie_data->cfgwr0 \ + : pcie->pcie_data->cfgwr1) << 24)| \
drivers/pci/controller/pcie-altera.c +1
-1+ TLP_PAYLOAD_SIZE)#define TLP_CFG_DW1 (pcie, tag, be) \ - (((TLP_REQ_ID(pcie->root_bus_nr, RP_DEVFN)) << 16) | (tag <<8) | (be))
+ (((TLP_REQ_ID(pcie->root_bus_nr, RP_DEVFN)) << 16) | (tag
<< 8) | (be))#define TLP_CFG_DW2(bus, devfn, offset) \ (((bus) << 24) | ((devfn) << 16) |(offset))
#defineTLP_COMP_STATUS(s)(((s) >> 13) & 7)drivers/pci/controller/pcie-altera.c +22
-1+#define TLP_BYTE_COUNT (s) (((s) >> 0) & 0xfff)#define TLP_HDR_SIZE 3#define TLP_LOOP 500@@ -69,14 +76,43 @@#define DWORD_MASK 3 +#define S10_TLP_FMTTYPE_CFGRD0 0x05 +#define S10_TLP_FMTTYPE_CFGRD1 0x04 +#define S10_TLP_FMTTYPE_CFGWR0 0x45 +#define S10_TLP_FMTTYPE_CFGWR1 0x44 + +enum altera_pcie_version { +ALTERA_PCIE_V1 =0 , +ALTERA_PCIE_V2 , +}; +struct altera_pcie {struct platform_device *pdev; -void __iomem *cra_base;/* DT Cra */ +void __iomem *cra_base; +void __iomem *hip_base;int irq;u8 root_bus_nr;struct irq_domain *irq_domain;struct resource bus_range;struct list_head resources; +const struct altera_pcie_data *pcie_data; +}; + +struct altera_pcie_data { +int (*tlp_read_pkt)(struct altera_pcie *pcie,u32 *value); +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,Quoted 8 lines
Quoted 7 lines
drivers/pci/controller/pcie-altera.c +5
-0+ int size, u32 *value); +int (*rp_write_cfg)(struct altera_pcie *pcie,u8 bus,int where, +int size,u32 value); +enum altera_pcie_version version; +u32 cap_offset;/* PCIe capability structure register offset */
This is a duplication of struct pci_dev.pcie_cap right ?
This is register offset in PCIe Rootport IP to access PCIe Cap structure register of directly RP. This allow us to access PCIe cap struct register without
pci_dev.Quoted 72 lines
Quoted 72 lines
drivers/pci/controller/pcie-altera.c +13
-0+u32 cfgrd0; +u32 cfgrd1; +u32 cfgwr0; +u32 cfgwr1; };struct tlp_rp_regpair_t {@@ -101,6 +137,15 @@ static bool altera_pcie_link_up(struct altera_pcie *pcie)return !!((cra_readl (pcie,RP_LTSSM ) &RP_LTSSM_MASK ) ==LTSSM_L0 ); } +static bool s10_altera_pcie_link_up (struct altera_pcie *pcie) +{ +void __iomem *addr =S10_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 spacedrivers/pci/controller/pcie-altera.c +7
-1@@ -128,12 +173,18 @@ static void tlp_write_tx(struct altera_pcie *pcie,cra_writel (pcie, tlp_rp_regdata->ctrl,RP_TX_CNTRL ); } +static void s10_tlp_write_tx (struct altera_pcie *pcie,u32 reg0,u32 ctrl) +{ +cra_writel (pcie, reg0,RP_TX_REG0 ); +cra_writel (pcie, ctrl,S10_RP_TX_CNTRL ); +} +static bool altera_pcie_valid_device (struct altera_pcie *pcie,struct pci_bus *bus,int dev) {/* If there is no link, then there is no device */ if (bus->number != pcie->root_bus_nr) { -if (!altera_pcie_link_up (pcie)) +if (!pcie->pcie_data->get_link_status (pcie))return false;}drivers/pci/controller/pcie-altera.c +15
-0@@ -183,6 +234,46 @@ static int tlp_read_packet(struct altera_pcie *pcie, u32 *value)return PCIBIOS_DEVICE_NOT_FOUND ; } +static int s10_tlp_read_packet (struct altera_pcie *pcie,u32 *value) +{ +int i; +u32 ctrl; +u32 comp_status; +u32 dw[4 ]; +u32 count =0 ; + +for (i =0 ; i <TLP_LOOP ; i++) { + ctrl =cra_readl (pcie,S10_RP_RXCPL_STATUS ); +if (!(ctrl &RP_RXCPL_SOP )) +continue ; + +/* Read first DW */ + dw[count++] =cra_readl (pcie,S10_RP_RXCPL_REG );Quoted 8 lines
Quoted 7 lines
drivers/pci/controller/pcie-altera.c +5
-0+ +/* Poll for EOP */ +for (i =0 ; i <TLP_LOOP ; i++) { + ctrl =cra_readl (pcie,S10_RP_RXCPL_STATUS ); + dw[count++] = cra_readl(pcie,
S10_RP_RXCPL_REG);I think you'd better add a check on count lest it can overflow dw[].
Okay, will check that.
Quoted 95 lines
Quoted 95 lines
drivers/pci/controller/pcie-altera.c +2
-0+if (ctrl &RP_RXCPL_EOP ) { + comp_status =
TLP_COMP_STATUS(dw[1]);drivers/pci/controller/pcie-altera.c +2
-0+if (comp_status) +return
PCIBIOS_DEVICE_NOT_FOUND;drivers/pci/controller/pcie-altera.c +3
-0+ +if (value && + TLP_BYTE_COUNT(dw[1]) ==sizeof(u32) &&
drivers/pci/controller/pcie-altera.c +13
-0+ count >= 3) + *value = dw[3 ]; + +return PCIBIOS_SUCCESSFUL ; + } + } + +udelay (5 ); + } + +return PCIBIOS_DEVICE_NOT_FOUND ; +} + static void tlp_write_packet(struct altera_pcie *pcie, u32*headers,
u32 data, bool align)
{drivers/pci/controller/pcie-altera.c +9
-0@@ -210,6 +301,15 @@ static void tlp_write_packet(struct altera_pcie *pcie, u32 *headers,tlp_write_tx (pcie, &tlp_rp_regdata); } +static void s10_tlp_write_packet (struct altera_pcie *pcie,u32 *headers, +u32 data,bool dummy) +{ +s10_tlp_write_tx (pcie, headers[0 ],RP_TX_SOP ); +s10_tlp_write_tx (pcie, headers[1 ],0 ); +s10_tlp_write_tx (pcie, headers[2 ],0 ); +s10_tlp_write_tx (pcie, data,RP_TX_EOP ); +} + static int tlp_cfg_dword_read(struct altera_pcie *pcie, u8 bus,u32 devfn,
int where, u8byte_en, u32 *value)
{drivers/pci/controller/pcie-altera.c +2
-2@@ -219,9 +319,9 @@ static int tlp_cfg_dword_read(struct altera_pcie *pcie, u8 bus, u32 devfn, headers[1 ] =TLP_CFG_DW1 (pcie,TLP_READ_TAG , byte_en); headers[2 ] =TLP_CFG_DW2 (bus, devfn, where); -tlp_write_packet (pcie, headers,0 , false); + pcie->pcie_data->tlp_write_pkt (pcie, headers,0 , false); -return tlp_read_packet (pcie, value); +return pcie->pcie_data->tlp_read_pkt (pcie, value); }static int tlp_cfg_dword_write(struct
altera_pcie*pcie, u8 bus,
u32 devfn,drivers/pci/controller/pcie-altera.c +3
-3@@ -236,11 +336,11 @@ static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn,/* check alignment to Qword */ if ((where & 0x7) == 0) - tlp_write_packet(pcie, headers, value, true); + pcie->pcie_data->tlp_write_pkt(pcie, headers, value, true); else -tlp_write_packet (pcie ,headers ,value ,false ); + pcie->pcie_data->tlp_write_pkt(pcie, headers,value ,false ); - ret =tlp_read_packet (pcie,NULL ); + ret = pcie->pcie_data->tlp_read_pkt (pcie,NULL );if (ret != PCIBIOS_SUCCESSFUL) return ret;drivers/pci/controller/pcie-altera.c +10
-0@@ -254,6 +354,53 @@ 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) +{ +void *addr =S10_RP_CFG_ADDR (pcie, where); + +switch (size) { +case 1 : + *value =readb (addr); +break ; +case 2 :Quoted 8 lines
drivers/pci/controller/pcie-altera.c static int tlp_cfg_dword_write(struct altera_pcie *pcie, u8 bus, u32 devfn, · line 372
Quoted 6 lines
drivers/pci/controller/pcie-altera.c +6
-0+ *value =readw (addr); +break ; +default : + *value =readl (addr); +break ; + }This boilerplace could be avoided if you used generic config accessors (ie pci_generic_config_read()/write()).
Quoted 1 line
Okay. I will change this.
I just remembered that, we can't use pci_generic_config_read/write() here because we need access to
Root port PCIe capabilities struct register to retrain PCIe link before struct pci_bus *bus is available. pci_generic_config_read/write() function needs struct pci_bus *bus.
Regards
Ley Foon
PATCH v4 2/3 PCI: altera: Enable driver on ARM64
In reply to Ley Foon TanEnable PCIE_ALTERA on ARM64 platform.
--- drivers/pci/controller/Kconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/pci/controller/Kconfig +1 -1
@@ -175,7 +175,7 @@ config PCIE_IPROC_MSI config PCIE_ALTERA bool "Altera PCIe controller" - depends on ARM || NIOS2 || COMPILE_TEST + depends on ARM || NIOS2 || ARM64 || COMPILE_TEST help Say Y here if you want to enable PCIe controller support on Altera FPGA.
Signature · 1 line
1.7.1
PATCH v4 3/3 dt-bindings: PCI: altera: Add altr,pcie-root-port-2.0
In reply to Ley Foon TanAdd support for altr,pcie-root-port-2.0.
--- .../devicetree/bindings/pci/altera-pcie.txt | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
Documentation/devicetree/bindings/pci/altera-pcie.txt +3 -1
@@ -1,11 +1,13 @@ * Altera PCIe controller Required properties: -- compatible : should contain "altr,pcie-root-port-1.0" +- compatible : should contain "altr,pcie-root-port-1.0" or "altr,pcie-root-port-2.0" - reg: a list of physical base address and length for TXS and CRA. + For "altr,pcie-root-port-2.0", additional HIP base address and length. - reg-names: must include the following entries: "Txs": TX slave port region "Cra": Control register access region + "Hip": Hard IP region (if "altr,pcie-root-port-2.0") - interrupts: specifies the interrupt source of the parent interrupt controller. The format of the interrupt specifier depends on the parent interrupt controller.
Signature · 1 line
1.7.1