Intel FPGA PCIe fixes
cover Intel FPGA PCIe fixes
This patchset fix issues in Intel FPGA PCIe driver.
- Fix TLP polling timeout
- Fix enumerating mult-function PCIe device issue
- Fix PCIe switch read config register issue
Ley Foon Tan (3):
pci: intel: Increase TLP polling counter
pci: intel: Fix error when enumerating multi-function PCIe device
pci: intel: Fix configuration type based on secondary number
drivers/pci/pcie_intel_fpga.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
Signature · 1 line
2.19.0
PATCH 1/3 pci: intel: Increase TLP polling counter
Some PCIe devices require longer time to response. Increase polling counter to 20000 (~100ms).
--- drivers/pci/pcie_intel_fpga.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/pcie_intel_fpga.c +1 -1
@@ -56,7 +56,7 @@#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 +#define TLP_LOOP 20000#define DWORD_MASK 3#define IS_ROOT_PORT (pcie, bdf) \
Signature · 1 line
2.19.0
PATCH 1/3 pci: intel: Increase TLP polling counter
Quoted 4 lines · Ley Foon Tan
Some PCIe devices require longer time to response. Increase polling counter to 20000 (~100ms).
Signed-off-by Ley Foon Tan <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190813/5860bb37/attachment.sig>
PATCH 2/3 pci: intel: Fix error when enumerating multi-function PCIe device
In reply to Ley Foon TanHardware return completion status non-zero when read from non exist function in multi-function PCIe device. Return error will cause PCIe enumeration fail.
Change it to return 0 and return value 0xffffffff when error.
--- drivers/pci/pcie_intel_fpga.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/pci/pcie_intel_fpga.c +4 -2
@@ -161,8 +161,10 @@ static int tlp_read_packet(struct intel_fpga_pcie *pcie, u32 *value) dw[count++] =cra_readl (pcie,RP_RXCPL_REG );if (ctrl &RP_RXCPL_EOP ) { comp_status =TLP_COMP_STATUS (dw[1 ]); -if (comp_status) -return -EFAULT ; +if (comp_status) { + *value =pci_get_ff (PCI_SIZE_32 ); +return 0 ; + } if (value && TLP_BYTE_COUNT(dw[1]) == sizeof(u32) &&
Signature · 1 line
2.19.0
PATCH 2/3 pci: intel: Fix error when enumerating multi-function PCIe device
Quoted 7 lines · Ley Foon Tan
Hardware return completion status non-zero when read from non exist function in multi-function PCIe device. Return error will cause PCIe enumeration fail.
Change it to return 0 and return value
0xffffffffwhen error.Signed-off-by Ley Foon Tan <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190813/9b68b019/attachment.sig>
PATCH 3/3 pci: intel: Fix configuration type based on secondary number
In reply to Ley Foon TanThis fix issue when access config from PCIe switch.
The PCIe controller need to send Type 0 config TLP if the targeting bus matches with the secondary bus number, which is when the TLP is targeting the immediate device on the link.
The PCIe controller send Type 1 config TLP if the targeting bus is larger than the secondary bus, which is when the TLP is targeting the device not immediate on the link.
--- drivers/pci/pcie_intel_fpga.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/pci/pcie_intel_fpga.c +6 -4
@@ -36,16 +36,18 @@#define RP_CFG_ADDR (pcie, reg) \ ((pcie->hip_base) + (reg) + (1 << 20)) +#define RP_SECONDARY (pcie) \ + readb(RP_CFG_ADDR(pcie, PCI_SECONDARY_BUS))#define TLP_REQ_ID (bus, devfn) (((bus) << 8) | (devfn))#define TLP_CFGRD_DW0 (pcie, bus) \ - ((((bus != pcie->first_busno) ? TLP_FMTTYPE_CFGRD0 \ - : TLP_FMTTYPE_CFGRD1) << 24) | \ + ((((bus > RP_SECONDARY(pcie)) ? TLP_FMTTYPE_CFGRD1 \ + : TLP_FMTTYPE_CFGRD0) << 24) | \ TLP_PAYLOAD_SIZE)#define TLP_CFGWR_DW0 (pcie, bus) \ - ((((bus != pcie->first_busno) ? TLP_FMTTYPE_CFGWR0 \ - : TLP_FMTTYPE_CFGWR1) << 24) | \ + ((((bus > RP_SECONDARY(pcie)) ? TLP_FMTTYPE_CFGWR1 \ + : TLP_FMTTYPE_CFGWR0) << 24) | \ TLP_PAYLOAD_SIZE)#define TLP_CFG_DW1 (pcie, tag, be) \
Signature · 1 line
2.19.0
PATCH 3/3 pci: intel: Fix configuration type based on secondary number
Quoted 11 lines · Ley Foon Tan
This fix issue when access config from PCIe switch.
The PCIe controller need to send Type 0 config TLP if the targeting bus matches with the secondary bus number, which is when the TLP is targeting the immediate device on the link.
The PCIe controller send Type 1 config TLP if the targeting bus is larger than the secondary bus, which is when the TLP is targeting the device not immediate on the link.
Signed-off-by Ley Foon Tan <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190813/ac72f5f7/attachment.sig>
cover Intel FPGA PCIe fixes
In reply to Ley Foon TanQuoted 6 lines · Ley Foon Tan
This patchset fix issues in Intel FPGA PCIe driver.
- Fix TLP polling timeout
- Fix enumerating mult-function PCIe device issue
- Fix PCIe switch read config register issue
Quoted 7 lines
Ley Foon Tan (3):
pci: intel: Increase TLP polling counter
pci: intel: Fix error when enumerating multi-function PCIe device
pci: intel: Fix configuration type based on secondary numberdrivers/pci/pcie_intel_fpga.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
Any comment on these patches?
Thanks
Regards
Ley Foon
cover Intel FPGA PCIe fixes
Quoted 13 lines · Ley Foon Tan
Quoted 11 lines · Ley Foon Tan
This patchset fix issues in Intel FPGA PCIe driver.
- Fix TLP polling timeout
- Fix enumerating mult-function PCIe device issue
- Fix PCIe switch read config register issueLey Foon Tan (3):
pci: intel: Increase TLP polling counter
pci: intel: Fix error when enumerating multi-function PCIe device
pci: intel: Fix configuration type based on secondary number
Quoted 5 lines
Quoted 2 lines
drivers/pci/pcie_intel_fpga.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)Any comment on these patches?
Thanks
Hi Tom and Michal
Can you help to merge these patches?
Thanks.
Regards
Ley Foon
cover Intel FPGA PCIe fixes
Quoted 14 lines · Ley Foon Tan
Quoted 13 lines · Ley Foon Tan
Quoted 11 lines · Ley Foon Tan
This patchset fix issues in Intel FPGA PCIe driver.
- Fix TLP polling timeout
- Fix enumerating mult-function PCIe device issue
- Fix PCIe switch read config register issueLey Foon Tan (3):
pci: intel: Increase TLP polling counter
pci: intel: Fix error when enumerating multi-function PCIe device
pci: intel: Fix configuration type based on secondary number
Quoted 8 lines
Quoted 5 lines
Quoted 2 lines
drivers/pci/pcie_intel_fpga.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)Any comment on these patches?
Thanks
Hi Tom and Michal
Can you help to merge these patches?
I saw these as "FPGA" and gave them to Michal, in patchwork. And I know he's digging out from a vacation backlog. Looking at the patches themselves, I can see they're more "PCI" than anything else, I'll put them in my queue. Thanks for the reminder!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190809/f78dcb63/attachment.sig>