mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-28 07:13:34 +00:00
Code Issues Releases Wiki Activity

PCI: aardvark: Implement re-issuing config requests on CRS response

Browse source 
Commit 43f5c77bcb ("PCI: aardvark: Fix reporting CRS value") fixed
handling of CRS response and when CRSSVE flag was not enabled it marked CRS
response as failed transaction (due to simplicity).

But pci-aardvark.c driver is already waiting up to the PIO_RETRY_CNT count
for PIO config response and so we can with a small change implement
re-issuing of config requests as described in PCIe base specification.

This change implements re-issuing of config requests when response is CRS.
Set upper bound of wait cycles to around PIO_RETRY_CNT, afterwards the
transaction is marked as failed and an all-ones value is returned as
before.

We do this by returning appropriate error codes from function
advk_pcie_check_pio_status(). On CRS we return -EAGAIN and caller then
reissues transaction.

Link: https://lore.kernel.org/r/20211005180952.6812-10-kabel@kernel.org
Signed-off-by: Pali Rohár <pali@kernel.org>
Signed-off-by: Marek Behún <kabel@kernel.org>
Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Reviewed-by: Marek Behún <kabel@kernel.org>
This commit is contained in:
Pali Rohár 2021-10-05 20:09:48 +02:00 committed by Lorenzo Pieralisi
parent 67cb2a4c93
commit 223dec14a0
1 changed files with 43 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
drivers/pci/controller/pci-aardvark.c
View file

@ -603,6 +603,7 @@ static int advk_pcie_check_pio_status(struct advk_pcie *pcie, bool allow_crs, u3
u32 reg; u32 reg;
unsigned int status; unsigned int status;
char *strcomp_status, *str_posted; char *strcomp_status, *str_posted;
int ret;
reg = advk_readl(pcie, PIO_STAT); reg = advk_readl(pcie, PIO_STAT);
status = (reg & PIO_COMPLETION_STATUS_MASK) >> status = (reg & PIO_COMPLETION_STATUS_MASK) >>
@ -627,6 +628,7 @@ static int advk_pcie_check_pio_status(struct advk_pcie *pcie, bool allow_crs, u3
case PIO_COMPLETION_STATUS_OK: case PIO_COMPLETION_STATUS_OK:
if (reg & PIO_ERR_STATUS) { if (reg & PIO_ERR_STATUS) {
strcomp_status = "COMP_ERR"; strcomp_status = "COMP_ERR";
ret = -EFAULT;
break; break;
} }
/* Get the read result */ /* Get the read result */
@ -634,9 +636,11 @@ static int advk_pcie_check_pio_status(struct advk_pcie *pcie, bool allow_crs, u3
*val = advk_readl(pcie, PIO_RD_DATA); *val = advk_readl(pcie, PIO_RD_DATA);
/* No error */ /* No error */
strcomp_status = NULL; strcomp_status = NULL;
ret = 0;
break; break;
case PIO_COMPLETION_STATUS_UR: case PIO_COMPLETION_STATUS_UR:
strcomp_status = "UR"; strcomp_status = "UR";
ret = -EOPNOTSUPP;
break; break;
case PIO_COMPLETION_STATUS_CRS: case PIO_COMPLETION_STATUS_CRS:
if (allow_crs && val) { if (allow_crs && val) {
@ -654,6 +658,7 @@ static int advk_pcie_check_pio_status(struct advk_pcie *pcie, bool allow_crs, u3
*/ */
*val = CFG_RD_CRS_VAL; *val = CFG_RD_CRS_VAL;
strcomp_status = NULL; strcomp_status = NULL;
ret = 0;
break; break;
} }
/* PCIe r4.0, sec 2.3.2, says: /* PCIe r4.0, sec 2.3.2, says:
@ -669,21 +674,24 @@ static int advk_pcie_check_pio_status(struct advk_pcie *pcie, bool allow_crs, u3
* Request and taking appropriate action, e.g., complete the * Request and taking appropriate action, e.g., complete the
* Request to the host as a failed transaction. * Request to the host as a failed transaction.
* *
* To simplify implementation do not re-issue the Configuration * So return -EAGAIN and caller (pci-aardvark.c driver) will
* Request and complete the Request as a failed transaction. * re-issue request again up to the PIO_RETRY_CNT retries.
*/ */
strcomp_status = "CRS"; strcomp_status = "CRS";
ret = -EAGAIN;
break; break;
case PIO_COMPLETION_STATUS_CA: case PIO_COMPLETION_STATUS_CA:
strcomp_status = "CA"; strcomp_status = "CA";
ret = -ECANCELED;
break; break;
default: default:
strcomp_status = "Unknown"; strcomp_status = "Unknown";
ret = -EINVAL;
break; break;
} }
if (!strcomp_status) if (!strcomp_status)
return 0; return ret;
if (reg & PIO_NON_POSTED_REQ) if (reg & PIO_NON_POSTED_REQ)
str_posted = "Non-posted"; str_posted = "Non-posted";
@ -693,7 +701,7 @@ static int advk_pcie_check_pio_status(struct advk_pcie *pcie, bool allow_crs, u3
dev_dbg(dev, "%s PIO Response Status: %s, %#x @ %#x\n", dev_dbg(dev, "%s PIO Response Status: %s, %#x @ %#x\n",
str_posted, strcomp_status, reg, advk_readl(pcie, PIO_ADDR_LS)); str_posted, strcomp_status, reg, advk_readl(pcie, PIO_ADDR_LS));
return -EFAULT; return ret;
} }
static int advk_pcie_wait_pio(struct advk_pcie *pcie) static int advk_pcie_wait_pio(struct advk_pcie *pcie)
@ -701,13 +709,13 @@ static int advk_pcie_wait_pio(struct advk_pcie *pcie)
struct device *dev = &pcie->pdev->dev; struct device *dev = &pcie->pdev->dev;
int i; int i;
for (i = 0; i < PIO_RETRY_CNT; i++) { for (i = 1; i <= PIO_RETRY_CNT; i++) {
u32 start, isr; u32 start, isr;
start = advk_readl(pcie, PIO_START); start = advk_readl(pcie, PIO_START);
isr = advk_readl(pcie, PIO_ISR); isr = advk_readl(pcie, PIO_ISR);
if (!start && isr) if (!start && isr)
return 0; return i;
udelay(PIO_RETRY_DELAY); udelay(PIO_RETRY_DELAY);
} }
@ -898,6 +906,7 @@ static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn,
int where, int size, u32 *val) int where, int size, u32 *val)
{ {
struct advk_pcie *pcie = bus->sysdata; struct advk_pcie *pcie = bus->sysdata;
int retry_count;
bool allow_crs; bool allow_crs;
u32 reg; u32 reg;
int ret; int ret;
@ -940,16 +949,22 @@ static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn,
/* Program the data strobe */ /* Program the data strobe */
advk_writel(pcie, 0xf, PIO_WR_DATA_STRB); advk_writel(pcie, 0xf, PIO_WR_DATA_STRB);
/* Clear PIO DONE ISR and start the transfer */ retry_count = 0;
advk_writel(pcie, 1, PIO_ISR); do {
advk_writel(pcie, 1, PIO_START); /* Clear PIO DONE ISR and start the transfer */
advk_writel(pcie, 1, PIO_ISR);
advk_writel(pcie, 1, PIO_START);
ret = advk_pcie_wait_pio(pcie); ret = advk_pcie_wait_pio(pcie);
if (ret < 0) if (ret < 0)
goto try_crs; goto try_crs;
retry_count += ret;
/* Check PIO status and get the read result */
ret = advk_pcie_check_pio_status(pcie, allow_crs, val);
} while (ret == -EAGAIN && retry_count < PIO_RETRY_CNT);
/* Check PIO status and get the read result */
ret = advk_pcie_check_pio_status(pcie, allow_crs, val);
if (ret < 0) if (ret < 0)
goto fail; goto fail;
@ -981,6 +996,7 @@ static int advk_pcie_wr_conf(struct pci_bus *bus, u32 devfn,
struct advk_pcie *pcie = bus->sysdata; struct advk_pcie *pcie = bus->sysdata;
u32 reg; u32 reg;
u32 data_strobe = 0x0; u32 data_strobe = 0x0;
int retry_count;
int offset; int offset;
int ret; int ret;
@ -1022,19 +1038,22 @@ static int advk_pcie_wr_conf(struct pci_bus *bus, u32 devfn,
/* Program the data strobe */ /* Program the data strobe */
advk_writel(pcie, data_strobe, PIO_WR_DATA_STRB); advk_writel(pcie, data_strobe, PIO_WR_DATA_STRB);
/* Clear PIO DONE ISR and start the transfer */ retry_count = 0;
advk_writel(pcie, 1, PIO_ISR); do {
advk_writel(pcie, 1, PIO_START); /* Clear PIO DONE ISR and start the transfer */
advk_writel(pcie, 1, PIO_ISR);
advk_writel(pcie, 1, PIO_START);
ret = advk_pcie_wait_pio(pcie); ret = advk_pcie_wait_pio(pcie);
if (ret < 0) if (ret < 0)
return PCIBIOS_SET_FAILED; return PCIBIOS_SET_FAILED;
ret = advk_pcie_check_pio_status(pcie, false, NULL); retry_count += ret;
if (ret < 0)
return PCIBIOS_SET_FAILED;
return PCIBIOS_SUCCESSFUL; ret = advk_pcie_check_pio_status(pcie, false, NULL);
} while (ret == -EAGAIN && retry_count < PIO_RETRY_CNT);
return ret < 0 ? PCIBIOS_SET_FAILED : PCIBIOS_SUCCESSFUL;
} }
static struct pci_ops advk_pcie_ops = { static struct pci_ops advk_pcie_ops = {