From: Junfeng Guo <junfeng.guo@intel.com>
To: jingjing.wu@intel.com
Cc: dev@dpdk.org, junfeng.guo@intel.com
Subject: [PATCH v2] raw/ntb: add PPD status check for SPR
Date: Thu, 30 Jun 2022 08:56:16 +0000 [thread overview]
Message-ID: <20220630085616.183562-1-junfeng.guo@intel.com> (raw)
In-Reply-To: <20220630083924.175373-1-junfeng.guo@intel.com>
Add PPD (PCIe Port Definition) status check for SPR (Sapphire Rapids).
Note that NTB on SPR has the same device id with that on ICX, while
the field offsets of PPD Control Register are different. Here, we use
the PCI device revision id to distinguish the HW platform (ICX/SPR)
and check the Port Config Status and Port Definition accordingly.
+---------------------------+--------------------+--------------------+
| Fields | Bit Range (on ICX) | Bit Range (on SPR) |
+---------------------------+--------------------+--------------------+
| Port Configuration Status | 12 | 14 |
| Port Definition | 9:8 | 10:8 |
+---------------------------+--------------------+--------------------+
v2:
fix revision id value check logic.
Signed-off-by: Junfeng Guo <junfeng.guo@intel.com>
---
drivers/raw/ntb/ntb.h | 1 +
drivers/raw/ntb/ntb_hw_intel.c | 64 ++++++++++++++++++++++++++++++----
drivers/raw/ntb/ntb_hw_intel.h | 13 +++++++
3 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/drivers/raw/ntb/ntb.h b/drivers/raw/ntb/ntb.h
index c9ff33aa59..a30a6b60c9 100644
--- a/drivers/raw/ntb/ntb.h
+++ b/drivers/raw/ntb/ntb.h
@@ -19,6 +19,7 @@ extern int ntb_logtype;
/* Device IDs */
#define NTB_INTEL_DEV_ID_B2B_SKX 0x201C
#define NTB_INTEL_DEV_ID_B2B_ICX 0x347E
+#define NTB_INTEL_DEV_ID_B2B_SPR 0x347E
/* Reserved to app to use. */
#define NTB_SPAD_USER "spad_user_"
diff --git a/drivers/raw/ntb/ntb_hw_intel.c b/drivers/raw/ntb/ntb_hw_intel.c
index a742e8fbb9..20cdb761a3 100644
--- a/drivers/raw/ntb/ntb_hw_intel.c
+++ b/drivers/raw/ntb/ntb_hw_intel.c
@@ -37,7 +37,8 @@ is_gen3_ntb(const struct ntb_hw *hw)
static inline int
is_gen4_ntb(const struct ntb_hw *hw)
{
- if (hw->pci_dev->id.device_id == NTB_INTEL_DEV_ID_B2B_ICX)
+ if (hw->pci_dev->id.device_id == NTB_INTEL_DEV_ID_B2B_ICX ||
+ hw->pci_dev->id.device_id == NTB_INTEL_DEV_ID_B2B_SPR)
return 1;
return 0;
@@ -87,12 +88,8 @@ intel_ntb3_check_ppd(struct ntb_hw *hw)
}
static int
-intel_ntb4_check_ppd(struct ntb_hw *hw)
+intel_ntb4_check_ppd_for_ICX(struct ntb_hw *hw, uint32_t reg_val)
{
- uint32_t reg_val;
-
- reg_val = rte_read32(hw->hw_addr + XEON_GEN4_PPD1_OFFSET);
-
/* Check connection topo type. Only support B2B. */
switch (reg_val & XEON_GEN4_PPD_CONN_MASK) {
case XEON_GEN4_PPD_CONN_B2B:
@@ -115,6 +112,61 @@ intel_ntb4_check_ppd(struct ntb_hw *hw)
return 0;
}
+static int
+intel_ntb4_check_ppd_for_SPR(struct ntb_hw *hw, uint32_t reg_val)
+{
+ /* Check connection topo type. Only support B2B. */
+ switch (reg_val & XEON_SPR_PPD_CONN_MASK) {
+ case XEON_SPR_PPD_CONN_B2B:
+ NTB_LOG(INFO, "Topo B2B (back to back) is using.");
+ break;
+ default:
+ NTB_LOG(ERR, "Not supported conn topo. Please use B2B.");
+ return -EINVAL;
+ }
+
+ /* Check device type. */
+ if (reg_val & XEON_SPR_PPD_DEV_DSD) {
+ NTB_LOG(INFO, "DSD, Downstream Device.");
+ hw->topo = NTB_TOPO_B2B_DSD;
+ } else {
+ NTB_LOG(INFO, "USD, Upstream device.");
+ hw->topo = NTB_TOPO_B2B_USD;
+ }
+
+ return 0;
+}
+
+static int
+intel_ntb4_check_ppd(struct ntb_hw *hw)
+{
+ uint8_t revision_id;
+ uint32_t reg_val;
+ int ret;
+
+ ret = rte_pci_read_config(hw->pci_dev, &revision_id,
+ NTB_PCI_DEV_REVISION_ID_LEN,
+ NTB_PCI_DEV_REVISION_ID_REG);
+ if (ret != NTB_PCI_DEV_REVISION_ID_LEN) {
+ NTB_LOG(ERR, "Cannot get NTB PCI Device Revision ID.");
+ return -EIO;
+ }
+
+ reg_val = rte_read32(hw->hw_addr + XEON_GEN4_PPD1_OFFSET);
+
+ /* Distinguish HW platform (ICX/SPR) via PCI Revision ID */
+ if (revision_id > NTB_PCI_DEV_REVISION_ICX_MAX)
+ ret = intel_ntb4_check_ppd_for_SPR(hw, reg_val);
+ else if (revision_id >= NTB_PCI_DEV_REVISION_ICX_MIN)
+ ret = intel_ntb4_check_ppd_for_ICX(hw, reg_val);
+ else {
+ NTB_LOG(ERR, "Invalid NTB PCI Device Revision ID.");
+ return -EIO;
+ }
+
+ return ret;
+}
+
static int
intel_ntb_dev_init(const struct rte_rawdev *dev)
{
diff --git a/drivers/raw/ntb/ntb_hw_intel.h b/drivers/raw/ntb/ntb_hw_intel.h
index c61a2a8a62..9587104f80 100644
--- a/drivers/raw/ntb/ntb_hw_intel.h
+++ b/drivers/raw/ntb/ntb_hw_intel.h
@@ -5,6 +5,13 @@
#ifndef _NTB_HW_INTEL_H_
#define _NTB_HW_INTEL_H_
+/* Supported PCI device revision ID range for ICX */
+#define NTB_PCI_DEV_REVISION_ICX_MIN 0x02
+#define NTB_PCI_DEV_REVISION_ICX_MAX 0x0F
+
+#define NTB_PCI_DEV_REVISION_ID_REG 0x08
+#define NTB_PCI_DEV_REVISION_ID_LEN 1
+
/* Ntb control and link status */
#define NTB_CTL_CFG_LOCK 1
#define NTB_CTL_DISABLE 2
@@ -90,6 +97,12 @@
#define XEON_GEN4_SLOTSTS 0xb05a
#define XEON_GEN4_SLOTSTS_DLLSCS 0x100
+#define XEON_SPR_PPD_CONN_MASK 0x0700
+#define XEON_SPR_PPD_CONN_B2B 0x0200
+#define XEON_SPR_PPD_DEV_MASK 0x4000
+#define XEON_SPR_PPD_DEV_DSD 0x4000
+#define XEON_SPR_PPD_DEV_USD 0x0000
+
#define XEON_MW_COUNT 2
#define XEON_DB_COUNT 32
--
2.34.1
next prev parent reply other threads:[~2022-06-30 8:56 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-30 8:39 [PATCH] " Junfeng Guo
2022-06-30 8:56 ` Junfeng Guo [this message]
2022-07-01 9:38 ` [PATCH v2] " Wu, Jingjing
2022-07-05 19:56 ` Thomas Monjalon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220630085616.183562-1-junfeng.guo@intel.com \
--to=junfeng.guo@intel.com \
--cc=dev@dpdk.org \
--cc=jingjing.wu@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).