2023-12-02 08:51:06

by Siddharth Vadapalli

Subject: [PATCH v4] PCI: Cadence: Clear the ARI Capability Next Function Number of the last function

From: Jasko-EXT Wojciech <[email protected]>

Next Function Number field in ARI Capability Register for last function
must be zero by default as per the PCIe specification, indicating there
is no next higher number function but that's not happening in our case,
so this patch clears the Next Function Number field for last function used.

Signed-off-by: Jasko-EXT Wojciech <[email protected]>
Signed-off-by: Achal Verma <[email protected]>
Reviewed-by: Vignesh Raghavendra <[email protected]>
Signed-off-by: Siddharth Vadapalli <[email protected]>
---

Hello,

This patch is based on linux-next tagged next-20231201.

v3:
https://patchwork.kernel.org/project/linux-pci/patch/[email protected]/
Changes since v3: - Rebased on next-20231201.
- Collected Reviewed-by tag from Vignesh Raghavendra <[email protected]>.

Regards,
Siddharth.

drivers/pci/controller/cadence/pcie-cadence-ep.c | 14 +++++++++++++-
drivers/pci/controller/cadence/pcie-cadence.h | 6 ++++++
2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/controller/cadence/pcie-cadence-ep.c b/drivers/pci/controller/cadence/pcie-cadence-ep.c
index 3142feb8ac19..2dd4d7027659 100644
--- a/drivers/pci/controller/cadence/pcie-cadence-ep.c
+++ b/drivers/pci/controller/cadence/pcie-cadence-ep.c
@@ -566,7 +566,8 @@ static int cdns_pcie_ep_start(struct pci_epc *epc)
struct cdns_pcie *pcie = &ep->pcie;
struct device *dev = pcie->dev;
int max_epfs = sizeof(epc->function_num_map) * 8;
- int ret, value, epf;
+ int ret, epf, last_fn;
+ u32 reg, value;

/*
* BIT(0) is hardwired to 1, hence function 0 is always enabled
@@ -574,6 +575,17 @@ static int cdns_pcie_ep_start(struct pci_epc *epc)
*/
cdns_pcie_writel(pcie, CDNS_PCIE_LM_EP_FUNC_CFG, epc->function_num_map);

+ /*
+ * Next function field in ARI_CAP_AND_CTR register for last function
+ * should be 0.
+ * Clearing Next Function Number field for the last function used.
+ */
+ last_fn = find_last_bit(&epc->function_num_map, BITS_PER_LONG);
+ reg = CDNS_PCIE_CORE_PF_I_ARI_CAP_AND_CTRL(last_fn);
+ value = cdns_pcie_readl(pcie, reg);
+ value &= ~CDNS_PCIE_ARI_CAP_NFN_MASK;
+ cdns_pcie_writel(pcie, reg, value);
+
if (ep->quirk_disable_flr) {
for (epf = 0; epf < max_epfs; epf++) {
if (!(epc->function_num_map & BIT(epf)))
diff --git a/drivers/pci/controller/cadence/pcie-cadence.h b/drivers/pci/controller/cadence/pcie-cadence.h
index 373cb50fcd15..9c16745582eb 100644
--- a/drivers/pci/controller/cadence/pcie-cadence.h
+++ b/drivers/pci/controller/cadence/pcie-cadence.h
@@ -130,6 +130,12 @@
#define CDNS_PCIE_EP_FUNC_DEV_CAP_OFFSET 0xc0
#define CDNS_PCIE_EP_FUNC_SRIOV_CAP_OFFSET 0x200

+/*
+ * Endpoint PF Registers
+ */
+#define CDNS_PCIE_CORE_PF_I_ARI_CAP_AND_CTRL(fn) (0x144 + (fn) * 0x1000)
+#define CDNS_PCIE_ARI_CAP_NFN_MASK GENMASK(15, 8)
+
/*
* Root Port Registers (PCI configuration space for the root port function)
*/
--
2.34.1

2024-03-10 18:34:37

by Krzysztof Wilczyński

Subject: Re: [PATCH v4] PCI: Cadence: Clear the ARI Capability Next Function Number of the last function

Hello,

> Next Function Number field in ARI Capability Register for last function
> must be zero by default as per the PCIe specification, indicating there
> is no next higher number function but that's not happening in our case,
> so this patch clears the Next Function Number field for last function used.
>
> Signed-off-by: Jasko-EXT Wojciech <[email protected]>
> Signed-off-by: Achal Verma <[email protected]>
> Reviewed-by: Vignesh Raghavendra <[email protected]>
> Signed-off-by: Siddharth Vadapalli <[email protected]>

Applied to controller/cadence, thank you!

[1/1] PCI: cadence: Clear the ARI Capability Next Function Number of the last function
https://git.kernel.org/pci/pci/c/667a006d73fb

Krzysztof