Skip to contentSkip to conversation

Disable PTM for endpoint mode

PATCH Applied Vidya Sagar 4 participants 9 messages Sep 19, 2022 – Oct 28, 2022

Subsystems (3)

v1 of 2 Applied Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover Disable PTM for endpoint mode

This patch series contains patches to disable PTM for endpoint mode as the PCIe compliance tool requires the PTM be disabled for the endpoint mode.

Vidya Sagar (2):
PCI: Add PCI_PTM_CAP_RES macro
PCI: designware-ep: Disable PTM capabilities for EP mode

 .../pci/controller/dwc/pcie-designware-ep.c   | 19 ++++++++++++++++++-
 include/uapi/linux/pci_regs.h                 |  1 +
 2 files changed, 19 insertions(+), 1 deletion(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/2 PCI: Add PCI_PTM_CAP_RES macro

Add macro defining Responder capable bit in Precision Time Measurement capability register.

---
 include/uapi/linux/pci_regs.h | 1 +
 1 file changed, 1 insertion(+)
include/uapi/linux/pci_regs.h +1 -0
index 57b8e2ffb1dd..1c3591c8e09e 100644
@@ -1058,6 +1058,7 @@
 /* Precision Time Measurement */
 #define PCI_PTM_CAP			0x04	    /* PTM Capability */
 #define  PCI_PTM_CAP_REQ		0x00000001  /* Requester capable */
+#define  PCI_PTM_CAP_RES		0x00000002  /* Responder capable */
 #define  PCI_PTM_CAP_ROOT		0x00000004  /* Root capable */
 #define  PCI_PTM_GRANULARITY_MASK	0x0000FF00  /* Clock granularity */
 #define PCI_PTM_CTRL			0x08	    /* PTM Control */
Signature · 1 line
2.17.1
maintainer Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH V1 1/2] PCI: Add PCI_PTM_CAP_RES macro

Quoted 5 lines · On Mon, Sep 19, 2022 Vidya Sagar <[email protected]> wrote:

Add macro defining Responder capable bit in Precision Time Measurement capability register.

Best regards,
Jingoo Han

Quoted 19 lines
---
 include/uapi/linux/pci_regs.h | 1 +
 1 file changed, 1 insertion(+)
include/uapi/linux/pci_regs.h +1 -1
index 57b8e2ffb1dd..1c3591c8e09e 100644
@@ -1058,6 +1058,7 @@
 /* Precision Time Measurement */
 #define PCI_PTM_CAP                    0x04        /* PTM Capability */
 #define  PCI_PTM_CAP_REQ               0x00000001  /* Requester capable */
+#define  PCI_PTM_CAP_RES               0x00000002  /* Responder capable */
 #define  PCI_PTM_CAP_ROOT              0x00000004  /* Root capable */
 #define  PCI_PTM_GRANULARITY_MASK      0x0000FF00  /* Clock granularity */
 #define PCI_PTM_CTRL                   0x08        /* PTM Control */
--

2.17.1

#3 lore raw

PATCH 2/2 PCI: designware-ep: Disable PTM capabilities for EP mode

In reply to Vidya Sagar

Dual mode DesignWare PCIe IP has PTM capability enabled (if supported) even in the EP mode. The PCIe compliance for the EP mode expects PTM capabilities (ROOT_CAPABLE, RES_CAPABLE, CLK_GRAN) be disabled. Hence disable PTM for the EP mode.

---
 .../pci/controller/dwc/pcie-designware-ep.c   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/pci/controller/dwc/pcie-designware-ep.c +18 -1
index 7e9529ae3824..dc3057b18f36 100644
@@ -646,7 +646,7 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
 	struct dw_pcie_ep_func *ep_func;
 	struct device *dev = pci->dev;
 	struct pci_epc *epc = ep->epc;
-	unsigned int offset;
+	unsigned int offset, ptm_cap_base;
 	unsigned int nbars;
 	u8 hdr_type;
 	u8 func_no;
@@ -698,6 +698,7 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
 	}
 
 	offset = dw_pcie_ep_find_ext_capability(pci, PCI_EXT_CAP_ID_REBAR);
+	ptm_cap_base = dw_pcie_ep_find_ext_capability(pci, PCI_EXT_CAP_ID_PTM);
 
 	dw_pcie_dbi_ro_wr_en(pci);
 
@@ -710,6 +711,22 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
 			dw_pcie_writel_dbi(pci, offset + PCI_REBAR_CAP, 0x0);
 	}
 
+	/*
+	 * PTM responder capability can be disabled only after disabling
+	 * PTM root capability.
+	 */
+	if (ptm_cap_base) {
+		dw_pcie_dbi_ro_wr_en(pci);
+		reg = dw_pcie_readl_dbi(pci, ptm_cap_base + PCI_PTM_CAP);
+		reg &= ~PCI_PTM_CAP_ROOT;
+		dw_pcie_writel_dbi(pci, ptm_cap_base + PCI_PTM_CAP, reg);
+
+		reg = dw_pcie_readl_dbi(pci, ptm_cap_base + PCI_PTM_CAP);
+		reg &= ~(PCI_PTM_CAP_RES | PCI_PTM_GRANULARITY_MASK);
+		dw_pcie_writel_dbi(pci, ptm_cap_base + PCI_PTM_CAP, reg);
+		dw_pcie_dbi_ro_wr_dis(pci);
+	}
+
 	dw_pcie_setup(pci);
 	dw_pcie_dbi_ro_wr_dis(pci);
 
Signature · 1 line
2.17.1
maintainer Acked-by on v1 2/2
#4 lore raw

Re: [PATCH V1 2/2] PCI: designware-ep: Disable PTM capabilities for EP mode

Quoted 16 lines · Vidya Sagar

Dual mode DesignWare PCIe IP has PTM capability enabled (if supported) even in the EP mode. The PCIe compliance for the EP mode expects PTM capabilities (ROOT_CAPABLE, RES_CAPABLE, CLK_GRAN) be disabled. Hence disable PTM for the EP mode.

---
 .../pci/controller/dwc/pcie-designware-ep.c   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/pci/controller/dwc/pcie-designware-ep.c +0 -0
index 7e9529ae3824..dc3057b18f36 100644

drivers/pci/controller/dwc/pcie-designware-ep.c int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep) · line 649

Quoted 5 lines
drivers/pci/controller/dwc/pcie-designware-ep.c +1 -1
@@ -646,7 +646,7 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
        struct dw_pcie_ep_func *ep_func;
        struct device *dev = pci->dev;
        struct pci_epc *epc = ep->epc;
-       unsigned int offset;
+       unsigned int offset, ptm_cap_base;

Is there any reason to mix these 2 variables into 1 line? If not, please add a new line for ptm_cap_base.

       unsigned int offset;
       unsigned int ptm_cap_base;

Also, it looks ok. When you send a new patch, just add my Acked-by.

Best regards,
Jingoo Han

Quoted 37 lines
drivers/pci/controller/dwc/pcie-designware-ep.c +17 -1
        unsigned int nbars;
        u8 hdr_type;
        u8 func_no;
@@ -698,6 +698,7 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
        }
 
        offset = dw_pcie_ep_find_ext_capability(pci, PCI_EXT_CAP_ID_REBAR);
+       ptm_cap_base = dw_pcie_ep_find_ext_capability(pci, PCI_EXT_CAP_ID_PTM);
 
        dw_pcie_dbi_ro_wr_en(pci);
 
@@ -710,6 +711,22 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
                        dw_pcie_writel_dbi(pci, offset + PCI_REBAR_CAP, 0x0);
        }
 
+       /*
+        * PTM responder capability can be disabled only after disabling
+        * PTM root capability.
+        */
+       if (ptm_cap_base) {
+               dw_pcie_dbi_ro_wr_en(pci);
+               reg = dw_pcie_readl_dbi(pci, ptm_cap_base + PCI_PTM_CAP);
+               reg &= ~PCI_PTM_CAP_ROOT;
+               dw_pcie_writel_dbi(pci, ptm_cap_base + PCI_PTM_CAP, reg);
+
+               reg = dw_pcie_readl_dbi(pci, ptm_cap_base + PCI_PTM_CAP);
+               reg &= ~(PCI_PTM_CAP_RES | PCI_PTM_GRANULARITY_MASK);
+               dw_pcie_writel_dbi(pci, ptm_cap_base + PCI_PTM_CAP, reg);
+               dw_pcie_dbi_ro_wr_dis(pci);
+       }
+
        dw_pcie_setup(pci);
        dw_pcie_dbi_ro_wr_dis(pci);
 
--

2.17.1

#5 lore raw

Re: [PATCH V1 2/2] PCI: designware-ep: Disable PTM capabilities for EP mode

In reply to Vidya Sagar
Quoted 4 lines · Vidya Sagar

Dual mode DesignWare PCIe IP has PTM capability enabled (if supported) even in the EP mode. The PCIe compliance for the EP mode expects PTM capabilities (ROOT_CAPABLE, RES_CAPABLE, CLK_GRAN) be disabled. Hence disable PTM for the EP mode.

"PCIe compliance" - what is this referring to ?

Was this reported to Synopsys ?

Thanks,
Lorenzo

Quoted 52 lines
---
 .../pci/controller/dwc/pcie-designware-ep.c   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/pci/controller/dwc/pcie-designware-ep.c +18 -1
index 7e9529ae3824..dc3057b18f36 100644
@@ -646,7 +646,7 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
 	struct dw_pcie_ep_func *ep_func;
 	struct device *dev = pci->dev;
 	struct pci_epc *epc = ep->epc;
-	unsigned int offset;
+	unsigned int offset, ptm_cap_base;
 	unsigned int nbars;
 	u8 hdr_type;
 	u8 func_no;
@@ -698,6 +698,7 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
 	}
 
 	offset = dw_pcie_ep_find_ext_capability(pci, PCI_EXT_CAP_ID_REBAR);
+	ptm_cap_base = dw_pcie_ep_find_ext_capability(pci, PCI_EXT_CAP_ID_PTM);
 
 	dw_pcie_dbi_ro_wr_en(pci);
 
@@ -710,6 +711,22 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
 			dw_pcie_writel_dbi(pci, offset + PCI_REBAR_CAP, 0x0);
 	}
 
+	/*
+	 * PTM responder capability can be disabled only after disabling
+	 * PTM root capability.
+	 */
+	if (ptm_cap_base) {
+		dw_pcie_dbi_ro_wr_en(pci);
+		reg = dw_pcie_readl_dbi(pci, ptm_cap_base + PCI_PTM_CAP);
+		reg &= ~PCI_PTM_CAP_ROOT;
+		dw_pcie_writel_dbi(pci, ptm_cap_base + PCI_PTM_CAP, reg);
+
+		reg = dw_pcie_readl_dbi(pci, ptm_cap_base + PCI_PTM_CAP);
+		reg &= ~(PCI_PTM_CAP_RES | PCI_PTM_GRANULARITY_MASK);
+		dw_pcie_writel_dbi(pci, ptm_cap_base + PCI_PTM_CAP, reg);
+		dw_pcie_dbi_ro_wr_dis(pci);
+	}
+
 	dw_pcie_setup(pci);
 	dw_pcie_dbi_ro_wr_dis(pci);
 
Signature · 1 line
2.17.1
maintainer
#6 lore raw

Re: [PATCH V1 2/2] PCI: designware-ep: Disable PTM capabilities for EP mode

Quoted 8 lines · On Thu, Oct 27, 2022 Lorenzo Pieralisi <[email protected]> wrote:
Quoted 4 lines · Vidya Sagar

Dual mode DesignWare PCIe IP has PTM capability enabled (if supported) even in the EP mode. The PCIe compliance for the EP mode expects PTM capabilities (ROOT_CAPABLE, RES_CAPABLE, CLK_GRAN) be disabled. Hence disable PTM for the EP mode.

"PCIe compliance" - what is this referring to ?

Hi Lorenzo,

You can refer to the following link:
https://pcisig.com/developers/compliance-program

PCIe compliance means 'PCIe Compliance test "Compliance tests allow for product testing against PCI-SIG test modules". Usually, USB specs and PCIe specs define compliance tests where product manufacturers need to pass specific test procedures. For example, in USB cases, USB.org says that "To qualify for the right to display the certified USB logo in conjunction with a product, the product must pass USB-IF compliance testing for product quality."

To Vidiya,
If my understanding is not correct, please let us know what you intended.

Quoted 2 lines

Was this reported to Synopsys ?

To Vidiya,
Would you confirm that?

Thank you.

Best regards,
Jingoo Han

Quoted 56 lines

Thanks,
Lorenzo

Quoted 52 lines
---
 .../pci/controller/dwc/pcie-designware-ep.c   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/pci/controller/dwc/pcie-designware-ep.c +18 -2
index 7e9529ae3824..dc3057b18f36 100644
@@ -646,7 +646,7 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
      struct dw_pcie_ep_func *ep_func;
      struct device *dev = pci->dev;
      struct pci_epc *epc = ep->epc;
-     unsigned int offset;
+     unsigned int offset, ptm_cap_base;
      unsigned int nbars;
      u8 hdr_type;
      u8 func_no;
@@ -698,6 +698,7 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
      }
 
      offset = dw_pcie_ep_find_ext_capability(pci, PCI_EXT_CAP_ID_REBAR);
+     ptm_cap_base = dw_pcie_ep_find_ext_capability(pci, PCI_EXT_CAP_ID_PTM);
 
      dw_pcie_dbi_ro_wr_en(pci);
 
@@ -710,6 +711,22 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
                      dw_pcie_writel_dbi(pci, offset + PCI_REBAR_CAP, 0x0);
      }
 
+     /*
+      * PTM responder capability can be disabled only after disabling
+      * PTM root capability.
+      */
+     if (ptm_cap_base) {
+             dw_pcie_dbi_ro_wr_en(pci);
+             reg = dw_pcie_readl_dbi(pci, ptm_cap_base + PCI_PTM_CAP);
+             reg &= ~PCI_PTM_CAP_ROOT;
+             dw_pcie_writel_dbi(pci, ptm_cap_base + PCI_PTM_CAP, reg);
+
+             reg = dw_pcie_readl_dbi(pci, ptm_cap_base + PCI_PTM_CAP);
+             reg &= ~(PCI_PTM_CAP_RES | PCI_PTM_GRANULARITY_MASK);
+             dw_pcie_writel_dbi(pci, ptm_cap_base + PCI_PTM_CAP, reg);
+             dw_pcie_dbi_ro_wr_dis(pci);
+     }
+
      dw_pcie_setup(pci);
      dw_pcie_dbi_ro_wr_dis(pci);
 
--

2.17.1

#7 lore raw

Re: [PATCH V1 2/2] PCI: designware-ep: Disable PTM capabilities for EP mode

In reply to Vidya Sagar
Quoted 39 lines · Vidya Sagar

Dual mode DesignWare PCIe IP has PTM capability enabled (if supported) even in the EP mode. The PCIe compliance for the EP mode expects PTM capabilities (ROOT_CAPABLE, RES_CAPABLE, CLK_GRAN) be disabled. Hence disable PTM for the EP mode.

---
 .../pci/controller/dwc/pcie-designware-ep.c   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)
drivers/pci/controller/dwc/pcie-designware-ep.c +6 -1
index 7e9529ae3824..dc3057b18f36 100644
@@ -646,7 +646,7 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
 	struct dw_pcie_ep_func *ep_func;
 	struct device *dev = pci->dev;
 	struct pci_epc *epc = ep->epc;
-	unsigned int offset;
+	unsigned int offset, ptm_cap_base;
 	unsigned int nbars;
 	u8 hdr_type;
 	u8 func_no;
@@ -698,6 +698,7 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
 	}
 
 	offset = dw_pcie_ep_find_ext_capability(pci, PCI_EXT_CAP_ID_REBAR);
+	ptm_cap_base = dw_pcie_ep_find_ext_capability(pci, PCI_EXT_CAP_ID_PTM);
 
 	dw_pcie_dbi_ro_wr_en(pci);
 
@@ -710,6 +711,22 @@ int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep)
 			dw_pcie_writel_dbi(pci, offset + PCI_REBAR_CAP, 0x0);
 	}
 
+	/*
+	 * PTM responder capability can be disabled only after disabling
+	 * PTM root capability.
+	 */

drivers/pci/controller/dwc/pcie-designware-ep.c int dw_pcie_ep_init_complete(struct dw_pcie_ep *ep) · line 727

Quoted 10 lines
drivers/pci/controller/dwc/pcie-designware-ep.c +10 -0
+	if (ptm_cap_base) {
+		dw_pcie_dbi_ro_wr_en(pci);
+		reg = dw_pcie_readl_dbi(pci, ptm_cap_base + PCI_PTM_CAP);
+		reg &= ~PCI_PTM_CAP_ROOT;
+		dw_pcie_writel_dbi(pci, ptm_cap_base + PCI_PTM_CAP, reg);
+
+		reg = dw_pcie_readl_dbi(pci, ptm_cap_base + PCI_PTM_CAP);
+		reg &= ~(PCI_PTM_CAP_RES | PCI_PTM_GRANULARITY_MASK);
+		dw_pcie_writel_dbi(pci, ptm_cap_base + PCI_PTM_CAP, reg);
+		dw_pcie_dbi_ro_wr_dis(pci);

Per spec, PTM Responder Capable, PTM Root Capable, and Local Clock Granularity may only be set for Root Ports, RCRBs, and Switches (PCIe r6.0, sec 7.9.15.2).

And this is just a matter of making an Endpoint comply with the spec, i.e., configures the Endpoint so it doesn't advertise that it can be a PTM Responder, right?

But the Endpoint probably still *can* be a PTM Requester?

Quoted 8 lines
drivers/pci/controller/dwc/pcie-designware-ep.c +2 -0
+	}
+
 	dw_pcie_setup(pci);
 	dw_pcie_dbi_ro_wr_dis(pci);
 
Signature · 1 line
2.17.1
maintainer Applied
#8 lore raw
In reply to Vidya Sagar
Quoted 9 lines · Vidya Sagar

This patch series contains patches to disable PTM for endpoint mode as the PCIe compliance tool requires the PTM be disabled for the endpoint mode.

Vidya Sagar (2):
PCI: Add PCI_PTM_CAP_RES macro
PCI: designware-ep: Disable PTM capabilities for EP mode

[...]

Applied to pci/dwc, thanks!

[1/2] PCI: Add PCI_PTM_CAP_RES macro

      https://git.kernel.org/lpieralisi/pci/c/e32e1e26c409
[2/2] PCI: designware-ep: Disable PTM capabilities for EP mode
      https://git.kernel.org/lpieralisi/pci/c/442ae919e6ca

Thanks,
Lorenzo