On Thu, Jun 24, 2021 at 11:33:44PM +0200, Pali Rohár wrote:
[...]
> -static void advk_pcie_check_pio_status(struct advk_pcie *pcie)
> +static int advk_pcie_check_pio_status(struct advk_pcie *pcie, u32 *val)
> {
> struct device *dev = &pcie->pdev->dev;
> u32 reg;
> @@ -472,15 +476,50 @@ static void advk_pcie_check_pio_status(struct advk_pcie *pcie)
> status = (reg & PIO_COMPLETION_STATUS_MASK) >>
> PIO_COMPLETION_STATUS_SHIFT;
>
> - if (!status)
> - return;
> -
> + /*
> + * According to HW spec, the PIO status check sequence as below:
> + * 1) even if COMPLETION_STATUS(bit9:7) indicates successful,
> + * it still needs to check Error Status(bit11), only when this bit
> + * indicates no error happen, the operation is successful.
> + * 2) value Unsupported Request(1) of COMPLETION_STATUS(bit9:7) only
> + * means a PIO write error, and for PIO read it is successful with
> + * a read value of 0xFFFFFFFF.
> + * 3) value Completion Retry Status(CRS) of COMPLETION_STATUS(bit9:7)
> + * only means a PIO write error, and for PIO read it is successful
> + * with a read value of 0xFFFF0001.
> + * 4) value Completer Abort (CA) of COMPLETION_STATUS(bit9:7) means
> + * error for both PIO read and PIO write operation.
> + * 5) other errors are indicated as 'unknown'.
> + */
> switch (status) {
> + case PIO_COMPLETION_STATUS_OK:
> + if (reg & PIO_ERR_STATUS) {
> + strcomp_status = "COMP_ERR";
> + break;
> + }
> + /* Get the read result */
> + if (val)
> + *val = advk_readl(pcie, PIO_RD_DATA);
> + /* No error */
> + strcomp_status = NULL;
> + break;
> case PIO_COMPLETION_STATUS_UR:
> - strcomp_status = "UR";
> + if (val) {
> + /* For reading, UR is not an error status */
> + *val = CFG_RD_UR_VAL;
> + strcomp_status = NULL;
> + } else {
> + strcomp_status = "UR";
> + }
> break;
> case PIO_COMPLETION_STATUS_CRS:
> - strcomp_status = "CRS";
> + if (val) {
> + /* For reading, CRS is not an error status */
> + *val = CFG_RD_CRS_VAL;
Need Bjorn's input on this. I don't think this is what is expected from
from a root complex according to the PCI specifications (depending on
whether CSR software visibility is supported or not).
Here we are fabricating a CRS completion value for all PCI config read
transactions that are hitting a CRS completion status (and that's not
the expected behaviour according to the PCI specifications and I don't
think that's correct).
> + strcomp_status = NULL;
> + } else {
> + strcomp_status = "CRS";
> + }
> break;
> case PIO_COMPLETION_STATUS_CA:
> strcomp_status = "CA";
> @@ -490,6 +529,9 @@ static void advk_pcie_check_pio_status(struct advk_pcie *pcie)
> break;
> }
>
> + if (!strcomp_status)
> + return 0;
> +
> if (reg & PIO_NON_POSTED_REQ)
> str_posted = "Non-posted";
> else
> @@ -497,6 +539,8 @@ static void advk_pcie_check_pio_status(struct advk_pcie *pcie)
>
> dev_err(dev, "%s PIO Response Status: %s, %#x @ %#x\n",
> str_posted, strcomp_status, reg, advk_readl(pcie, PIO_ADDR_LS));
> +
> + return -EFAULT;
> }
>
> static int advk_pcie_wait_pio(struct advk_pcie *pcie)
> @@ -703,8 +747,17 @@ static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn,
> size, val);
>
> if (advk_pcie_pio_is_running(pcie)) {
> - *val = 0xffffffff;
> - return PCIBIOS_SET_FAILED;
> + /*
> + * For PCI_VENDOR_ID register, return Completion Retry Status
> + * so caller tries to issue the request again insted of failing
> + */
> + if (where == PCI_VENDOR_ID) {
> + *val = CFG_RD_CRS_VAL;
> + return PCIBIOS_SUCCESSFUL;
Mmmm..here we are faking a CRS completion value to coerce the kernel
into believing a CRS completion was received (which is not necessarily
true) ?
if advk_pcie_pio_is_running(pcie) == true, is that an HW error ?
Lorenzo
> + } else {
> + *val = 0xffffffff;
> + return PCIBIOS_SET_FAILED;
> + }
> }
>
> /* Program the control register */
> @@ -729,15 +782,27 @@ static int advk_pcie_rd_conf(struct pci_bus *bus, u32 devfn,
> advk_writel(pcie, 1, PIO_START);
>
> ret = advk_pcie_wait_pio(pcie);
> + if (ret < 0) {
> + /*
> + * For PCI_VENDOR_ID register, return Completion Retry Status
> + * so caller tries to issue the request again instead of failing
> + */
> + if (where == PCI_VENDOR_ID) {
> + *val = CFG_RD_CRS_VAL;
> + return PCIBIOS_SUCCESSFUL;
> + } else {
> + *val = 0xffffffff;
> + return PCIBIOS_SET_FAILED;
> + }
> + }
> +
> + /* Check PIO status and get the read result */
> + ret = advk_pcie_check_pio_status(pcie, val);
> if (ret < 0) {
> *val = 0xffffffff;
> return PCIBIOS_SET_FAILED;
> }
>
> - advk_pcie_check_pio_status(pcie);
> -
> - /* Get the read result */
> - *val = advk_readl(pcie, PIO_RD_DATA);
> if (size == 1)
> *val = (*val >> (8 * (where & 3))) & 0xff;
> else if (size == 2)
> @@ -801,7 +866,9 @@ static int advk_pcie_wr_conf(struct pci_bus *bus, u32 devfn,
> if (ret < 0)
> return PCIBIOS_SET_FAILED;
>
> - advk_pcie_check_pio_status(pcie);
> + ret = advk_pcie_check_pio_status(pcie, NULL);
> + if (ret < 0)
> + return PCIBIOS_SET_FAILED;
>
> return PCIBIOS_SUCCESSFUL;
> }
> --
> 2.20.1
>
