PCI: layerscape: Add Support for ls2088 PCIe EP mode
PATCH 1/2 PCI: layerscape: Add Support for ls2088 PCIe EP mode
From: Xiaowei Bao <[email protected]>
Signed-off-by hongbo.wang <[email protected]>
Signed-off-by Minghuan Lian <[email protected]>
Signed-off-by Xiaowei Bao <[email protected]>
--- drivers/pci/pcie_layerscape.c | 117 +++++++++++++++++++++++++++------------- drivers/pci/pcie_layerscape.h | 17 +++++-- 2 files changed, 92 insertions(+), 42 deletions(-)
drivers/pci/pcie_layerscape.c +79 -38
@@ -106,12 +106,17 @@ static void ls_pcie_atu_outbound_set(struct ls_pcie *pcie, int idx, int type,/* Use bar match mode and MEM type as default */ static void ls_pcie_atu_inbound_set (struct ls_pcie *pcie,int idx, -int bar,u64 phys) +int bar,u64 phys,u32 pf) { +u32 cr1 =0 ; + +if (pf) + cr1 |=PCIE_CTRL1_FUNC_NUM ; +dbi_writel (pcie,PCIE_ATU_REGION_INBOUND | idx,PCIE_ATU_VIEWPORT );dbi_writel (pcie, (u32 )phys,PCIE_ATU_LOWER_TARGET );dbi_writel (pcie, phys >>32 ,PCIE_ATU_UPPER_TARGET ); -dbi_writel (pcie,PCIE_ATU_TYPE_MEM ,PCIE_ATU_CR1 ); +dbi_writel (pcie,PCIE_ATU_TYPE_MEM | cr1,PCIE_ATU_CR1 );dbi_writel (pcie,PCIE_ATU_ENABLE |PCIE_ATU_BAR_MODE_ENABLE |PCIE_ATU_BAR_NUM (bar),PCIE_ATU_CR2 ); }
@@ -341,50 +346,61 @@ static void ls_pcie_setup_ctrl(struct ls_pcie *pcie)ls_pcie_disable_bars (pcie); } -static void ls_pcie_ep_setup_atu (struct ls_pcie *pcie) +static void ls_pcie_ep_setup_atu (struct ls_pcie *pcie,u32 pf) { -u64 phys =CONFIG_SYS_PCI_EP_MEMORY_BASE ; +pci_size_t atu_size =CONFIG_SYS_PCI_MEMORY_SIZE ; +u64 phys =0 ; + + phys =CONFIG_SYS_PCI_EP_MEMORY_BASE + pf *SZ_2M ; + phys =ALIGN (phys,PCIE_BAR0_SIZE );/* ATU 0 : INBOUND : map BAR0 */ -ls_pcie_atu_inbound_set (pcie,0 ,0 , phys); +ls_pcie_atu_inbound_set (pcie,0 + pf *BAR_NUM ,0 , phys, pf);/* ATU 1 : INBOUND : map BAR1 */ - phys +=PCIE_BAR1_SIZE ; -ls_pcie_atu_inbound_set (pcie,1 ,1 , phys); + phys =ALIGN (phys +PCIE_BAR0_SIZE ,PCIE_BAR1_SIZE ); +ls_pcie_atu_inbound_set (pcie,1 + pf *BAR_NUM ,1 , phys, pf);/* ATU 2 : INBOUND : map BAR2 */ - phys +=PCIE_BAR2_SIZE ; -ls_pcie_atu_inbound_set (pcie,2 ,2 , phys); -/* ATU 3 : INBOUND : map BAR4 */ - phys =CONFIG_SYS_PCI_EP_MEMORY_BASE +PCIE_BAR4_SIZE ; -ls_pcie_atu_inbound_set (pcie,3 ,4 , phys); + phys =ALIGN (phys +PCIE_BAR1_SIZE ,PCIE_BAR2_SIZE ); +ls_pcie_atu_inbound_set (pcie,2 + pf *BAR_NUM ,2 , phys, pf); +/* ATU 3 : INBOUND : map BAR2 */ + phys =ALIGN (phys +PCIE_BAR2_SIZE ,PCIE_BAR2_SIZE ); +ls_pcie_atu_inbound_set (pcie,3 + pf *BAR_NUM ,4 , phys, pf);/* ATU 0 : OUTBOUND : map MEM */ -ls_pcie_atu_outbound_set (pcie,0 , -PCIE_ATU_TYPE_MEM , - pcie->cfg_res.start, -0 , -CONFIG_SYS_PCI_MEMORY_SIZE ); +ls_pcie_atu_outbound_set (pcie,PCIE_ATU_REGION_INDEX0 , +PCIE_ATU_TYPE_MEM , (u64 )pcie->cfg_res.start, +0 , atu_size); + +/* ATU 1 : OUTBOUND : map MEM */ +ls_pcie_atu_outbound_set (pcie,PCIE_ATU_REGION_INDEX1 , +PCIE_ATU_TYPE_MEM , (u64 )pcie->cfg_res.start + + atu_size, atu_size, atu_size); }/* BAR0 and BAR1 are 32bit BAR2 and BAR4 are 64bit */ static void ls_pcie_ep_setup_bar (void *bar_base,int bar,u32 size) { +u32 mask; +/* The least inbound window is 4KiB */ -if (size <4 *1024 ) -return ; +if (size <SZ_4K ) + mask =0 ; +else + mask = size -1 ;switch (bar) {case 0 : -writel (size -1 , bar_base +PCI_BASE_ADDRESS_0 ); +writel (mask, bar_base +PCI_BASE_ADDRESS_0 );break ;case 1 : -writel (size -1 , bar_base +PCI_BASE_ADDRESS_1 ); +writel (mask, bar_base +PCI_BASE_ADDRESS_1 );break ;case 2 : -writel (size -1 , bar_base +PCI_BASE_ADDRESS_2 ); +writel (mask, bar_base +PCI_BASE_ADDRESS_2 );writel (0 , bar_base +PCI_BASE_ADDRESS_3 );break ;case 4 : -writel (size -1 , bar_base +PCI_BASE_ADDRESS_4 ); +writel (mask, bar_base +PCI_BASE_ADDRESS_4 );writel (0 , bar_base +PCI_BASE_ADDRESS_5 );break ;default :
@@ -394,13 +410,28 @@ static void ls_pcie_ep_setup_bar(void *bar_base, int bar, u32 size)static void ls_pcie_ep_setup_bars (void *bar_base) { -/* BAR0 - 32bit - 4K configuration */ +/* BAR0 - 32bit - configuration */ +ls_pcie_ep_setup_bar (bar_base,0 ,PCIE_BAR0_SIZE ); +/* BAR1 - 32bit - MSIX*/ +ls_pcie_ep_setup_bar (bar_base,1 ,PCIE_BAR1_SIZE ); +/* BAR2 - 64bit - MEM descriptor */ +ls_pcie_ep_setup_bar (bar_base,2 ,PCIE_BAR2_SIZE ); +/* BAR4 - 64bit - MEM*/ +ls_pcie_ep_setup_bar (bar_base,4 ,PCIE_BAR4_SIZE ); +} + +static void ls_pcie_ep_setup_vf_bars (void *bar_base) +{ +/* VF BAR0 MASK register@offset 0x19c*/ + bar_base +=PCIE_SRIOV_VFBAR0 -PCI_BASE_ADDRESS_0 ; + +/* VF-BAR0 - 32bit - configuration */ ls_pcie_ep_setup_bar (bar_base,0 ,PCIE_BAR0_SIZE ); -/* BAR1 - 32bit - 8K MSIX*/ +/* VF-BAR1 - 32bit - MSIX*/ ls_pcie_ep_setup_bar (bar_base,1 ,PCIE_BAR1_SIZE ); -/* BAR2 - 64bit - 4K MEM desciptor */ +/* VF-BAR2 - 64bit - MEM descriptor */ ls_pcie_ep_setup_bar (bar_base,2 ,PCIE_BAR2_SIZE ); -/* BAR4 - 64bit - 1M MEM*/ +/* VF-BAR4 - 64bit - MEM*/ ls_pcie_ep_setup_bar (bar_base,4 ,PCIE_BAR4_SIZE ); }
@@ -412,25 +443,33 @@ static void ls_pcie_ep_enable_cfg(struct ls_pcie *pcie)static void ls_pcie_setup_ep (struct ls_pcie *pcie) {u32 sriov; +u32 pf, vf; +void *bar_base =NULL ; sriov =readl (pcie->dbi +PCIE_SRIOV );if (PCI_EXT_CAP_ID (sriov) ==PCI_EXT_CAP_ID_SRIOV ) { -int pf, vf; - + pcie->sriov_flag =1 ;for (pf =0 ; pf <PCIE_PF_NUM ; pf++) { -for (vf =0 ; vf <=PCIE_VF_NUM ; vf++) { -ctrl_writel (pcie,PCIE_LCTRL0_VAL (pf, vf), -PCIE_PF_VF_CTRL ); - -ls_pcie_ep_setup_bars (pcie->dbi); -ls_pcie_ep_setup_atu (pcie); +if (pcie->cfg2_flag) { +for (vf =0 ; vf <=PCIE_VF_NUM ; vf++) { +ctrl_writel (pcie, +PCIE_LCTRL0_VAL (pf, vf), +PCIE_PF_VF_CTRL ); + } } + bar_base = pcie->dbi + +PCIE_MASK_OFFSET (pcie->cfg2_flag, pf); +ls_pcie_ep_setup_bars (bar_base); +ls_pcie_ep_setup_vf_bars (bar_base); + +ls_pcie_ep_setup_atu (pcie, pf); } -/* Disable CFG2 */ -ctrl_writel (pcie,0 ,PCIE_PF_VF_CTRL ); + +if (pcie->cfg2_flag)/* Disable CFG2 */ +ctrl_writel (pcie,0 ,PCIE_PF_VF_CTRL ); }else {ls_pcie_ep_setup_bars (pcie->dbi +PCIE_NO_SRIOV_BAR_BASE ); -ls_pcie_ep_setup_atu (pcie); +ls_pcie_ep_setup_atu (pcie,0 ); }ls_pcie_ep_enable_cfg (pcie);
@@ -502,6 +541,7 @@ static int ls_pcie_probe(struct udevice *dev)* for LS2088A series SoCs */ svr =get_svr (); + pcie->cfg2_flag =1 ; svr = (svr >>SVR_VAR_PER_SHIFT ) &0xFFFFFE ; if (svr == SVR_LS2088A || svr == SVR_LS2084A || svr == SVR_LS2048A || svr == SVR_LS2044A ||
@@ -511,6 +551,7 @@ static int ls_pcie_probe(struct udevice *dev)LS2088A_PCIE_PHYS_SIZE * pcie->idx; pcie->cfg_res.end = pcie->cfg_res.start + cfg_size; pcie->ctrl = pcie->lut +0x40000 ; + pcie->cfg2_flag =0 ; } pcie->cfg0 = map_physmem(pcie->cfg_res.start,
drivers/pci/pcie_layerscape.h +13 -4
@@ -9,6 +9,7 @@#define _PCIE_LAYERSCAPE_H_#include <pci.h> #include <dm.h> +#include <linux/sizes.h> #ifndef CONFIG_SYS_PCI_MEMORY_BUS #define CONFIG_SYS_PCI_MEMORY_BUS CONFIG_SYS_SDRAM_BASE
@@ -85,11 +86,17 @@#define PCIE_PF_NUM 2#define PCIE_VF_NUM 64 +#define BAR_NUM 4 -#define PCIE_BAR0_SIZE (4 * 1024)/* 4K */ -#define PCIE_BAR1_SIZE (8 * 1024)/* 8K for MSIX */ -#define PCIE_BAR2_SIZE (4 * 1024)/* 4K */ -#define PCIE_BAR4_SIZE (1 * 1024 * 1024)/* 1M */ +#define PCIE_BAR0_SIZE SZ_4K/* 4K */ +#define PCIE_BAR1_SIZE SZ_8K/* 8K for MSIX */ +#define PCIE_BAR2_SIZE SZ_4K/* 4K */ +#define PCIE_BAR4_SIZE SZ_1M/* 1M */ + +#define PCIE_SRIOV_VFBAR0 0x19C +#define PCIE_CTRL1_FUNC_NUM 0x00100000 + +#define PCIE_MASK_OFFSET (flag, pf) ((flag) ? 0 : (0x1000 + 0x20000 * (pf)))/* LUT registers */ #define PCIE_LUT_UDR (n) (0x800 + (n) * 8)
@@ -144,6 +151,8 @@ struct ls_pcie {bool big_endian;bool enabled;int next_lut_index; +uint sriov_flag; +uint cfg2_flag;int mode; };
Signature · 1 line
1.7.1
PATCH 2/2 pci: layerscape: Add the workaround for errata A-009460
From: Xiaowei Bao <[email protected]>
The VF_BARn_REG register's Prefetchable and Type bit fields are overwritten by a write to VF's BAR Mask register.
workaround: Before writing to the VF_BARn_MASK_REG register, write 0b to the PCIE_MISC_CONTROL_1_OFF register.
Signed-off-by Xiaowei Bao <[email protected]>
--- drivers/pci/pcie_layerscape.c | 9 +++++++++ drivers/pci/pcie_layerscape.h | 1 + 2 files changed, 10 insertions(+), 0 deletions(-)
drivers/pci/pcie_layerscape.c +9 -0
@@ -450,6 +450,15 @@ static void ls_pcie_setup_ep(struct ls_pcie *pcie)if (PCI_EXT_CAP_ID (sriov) ==PCI_EXT_CAP_ID_SRIOV ) { pcie->sriov_flag =1 ;for (pf =0 ; pf <PCIE_PF_NUM ; pf++) { +/* +* The VF_BARn_REG register's Prefetchable and Type bit +* fields are overwritten by a write to VF's BAR Mask +* register. Before writing to the VF_BARn_MASK_REG +* register, write 0b to the PCIE_MISC_CONTROL_1_OFF +* register. +*/ +writel (0 , pcie->dbi +PCIE_MISC_CONTROL_1_OFF ); +if (pcie->cfg2_flag) {for (vf =0 ; vf <=PCIE_VF_NUM ; vf++) { ctrl_writel(pcie,
drivers/pci/pcie_layerscape.h +1 -0
@@ -94,6 +94,7 @@#define PCIE_BAR4_SIZE SZ_1M/* 1M */ #define PCIE_SRIOV_VFBAR0 0x19C +#define PCIE_MISC_CONTROL_1_OFF 0x8BC#define PCIE_CTRL1_FUNC_NUM 0x00100000#define PCIE_MASK_OFFSET (flag, pf) ((flag) ? 0 : (0x1000 + 0x20000 * (pf)))
Signature · 1 line
1.7.1