From: Sean V Kelley <sean.v.kelley@linux.intel.com>
To: mj@ucw.cz, bhelgaas@google.com
Cc: linux-pci@vger.kernel.org, Sean V Kelley <sean.v.kelley@linux.intel.com>
Subject: [RFC Patch 1/1] lspci: Add basic decode support for Compute eXpress Link
Date: Tue, 7 Apr 2020 17:09:59 -0700 [thread overview]
Message-ID: <20200408000959.230780-2-sean.v.kelley@linux.intel.com> (raw)
In-Reply-To: <20200408000959.230780-1-sean.v.kelley@linux.intel.com>
Compute eXpress Link[1] is a new CPU interconnected created with
workload accelerators in mind. The interconnect relies on PCIe Electrial
and Physical interconnect for communication.
Moreover, CXL bus hierarchy appear, to the OS, as an ACPI-described PCIe
Root Bridge with Integrated Endpoint.
This patch introduces basic support for lspci decode for DVSEC CXL
extended capability.
[1] https://www.computeexpresslink.org/
Signed-off-by: Sean V Kelley <sean.v.kelley@linux.intel.com>
---
| 25 +++++++++++++++++++++++++
ls-ecaps.c | 29 ++++++++++++++++++++++++++++-
tests/cap-cxl-dvsec | 8 ++++++++
3 files changed, 61 insertions(+), 1 deletion(-)
create mode 100644 tests/cap-cxl-dvsec
--git a/lib/header.h b/lib/header.h
index bfdcc80..421612d 100644
--- a/lib/header.h
+++ b/lib/header.h
@@ -1042,6 +1042,27 @@
#define PCI_EVNDR_HEADER 4 /* Vendor-Specific Header */
#define PCI_EVNDR_REGISTERS 8 /* Vendor-Specific Registers */
+/* PCIe CXL Vendor-Specific Capabilities, Control, Status */
+#define PCI_EVNDR_CXL_ID 0
+
+#define PCI_CXL_CAP 0x0a
+#define PCI_CXL_CAP_CACHE 0x0001
+#define PCI_CXL_CAP_IO 0x0002
+#define PCI_CXL_CAP_MEM 0x0004
+#define PCI_CXL_CAP_MEM_HWINIT 0x0008
+#define PCI_CXL_CAP_HDM_CNT(x) (((x) & (3 << 4)) >> 4)
+#define PCI_CXL_CAP_VIRAL 0x4000
+#define PCI_CXL_CTRL 0x0c
+#define PCI_CXL_CTRL_CACHE 0x0001
+#define PCI_CXL_CTRL_IO 0x0002
+#define PCI_CXL_CTRL_MEM 0x0004
+#define PCI_CXL_CTRL_CACHE_SF_COV(x) (((x) & (0x1f << 3)) >> 3)
+#define PCI_CXL_CTRL_CACHE_SF_GRAN(x) (((x) & (0x7 << 8)) >> 8)
+#define PCI_CXL_CTRL_CACHE_CLN 0x0800
+#define PCI_CXL_CTRL_VIRAL 0x4000
+#define PCI_CXL_STATUS 0x0e
+#define PCI_CXL_STATUS_VIRAL 0x4000
+
/* Access Control Services */
#define PCI_ACS_CAP 0x04 /* ACS Capability Register */
#define PCI_ACS_CAP_VALID 0x0001 /* ACS Source Validation */
@@ -1348,6 +1369,10 @@
#define PCI_CLASS_SIGNAL_SYNCHRONIZER 0x1110
#define PCI_CLASS_SIGNAL_OTHER 0x1180
+#define PCI_CLASS_CXL 0x14
+#define PCI_CLASS_CXL_RCIEP 0x1400
+#define PCI_CLASS_CXL_OTHER 0x1480
+
#define PCI_CLASS_OTHERS 0xff
/* Several ID's we need in the library */
diff --git a/ls-ecaps.c b/ls-ecaps.c
index 0021734..8c09517 100644
--- a/ls-ecaps.c
+++ b/ls-ecaps.c
@@ -207,6 +207,33 @@ cap_aer(struct device *d, int where, int type)
}
}
+static void
+cap_cxl(struct device *d, int where)
+{
+ u16 l;
+
+ printf("PCIe DVSEC for CXL Device\n");
+ if (verbose < 2)
+ return;
+
+ if (!config_fetch(d, where + PCI_CXL_CAP, 12))
+ return;
+
+ l = get_conf_word(d, where + PCI_CXL_CAP);
+ printf("\t\tCXLCap:\tCache%c IO%c Mem%c Mem HW Init%c HDMCount %d Viral%c\n",
+ FLAG(l, PCI_CXL_CAP_CACHE), FLAG(l, PCI_CXL_CAP_IO), FLAG(l, PCI_CXL_CAP_MEM),
+ FLAG(l, PCI_CXL_CAP_MEM_HWINIT), PCI_CXL_CAP_HDM_CNT(l), FLAG(l, PCI_CXL_CAP_VIRAL));
+
+ l = get_conf_word(d, where + PCI_CXL_CTRL);
+ printf("\t\tCXLCtl:\tCache%c IO%c Mem%c Cache SF Cov %d Cache SF Gran %d Cache Clean%c Viral%c\n",
+ FLAG(l, PCI_CXL_CTRL_CACHE), FLAG(l, PCI_CXL_CTRL_IO), FLAG(l, PCI_CXL_CTRL_MEM),
+ PCI_CXL_CTRL_CACHE_SF_COV(l), PCI_CXL_CTRL_CACHE_SF_GRAN(l), FLAG(l, PCI_CXL_CTRL_CACHE_CLN),
+ FLAG(l, PCI_CXL_CTRL_VIRAL));
+
+ l = get_conf_word(d, where + PCI_CXL_STATUS);
+ printf("\t\tCXLSta:\tViral%c\n", FLAG(l, PCI_CXL_STATUS_VIRAL));
+}
+
static void cap_dpc(struct device *d, int where)
{
u16 l;
@@ -924,7 +951,7 @@ show_ext_caps(struct device *d, int type)
printf("Readiness Time Reporting <?>\n");
break;
case PCI_EXT_CAP_ID_DVSEC:
- printf("Designated Vendor-Specific <?>\n");
+ cap_cxl(d, where);
break;
case PCI_EXT_CAP_ID_VF_REBAR:
printf("VF Resizable BAR <?>\n");
diff --git a/tests/cap-cxl-dvsec b/tests/cap-cxl-dvsec
new file mode 100644
index 0000000..14e1022
--- /dev/null
+++ b/tests/cap-cxl-dvsec
@@ -0,0 +1,8 @@
+Simple diff of lspci -vvxxxx
+
+< Capabilities: [e00 v1] Designated Vendor-Specific <?>
+---
+> Capabilities: [e00 v1] PCIe DVSEC for CXL Device
+> CXLCap: Cache+ IO+ Mem+ Mem HW Init+ HDMCount 1 Viral-
+> CXLCtl: Cache- IO+ Mem- Cache SF Cov 0 Cache SF Gran 0 Cache Clean- Viral-
+> CXLSta: Viral-
--
2.26.0
next prev parent reply other threads:[~2020-04-08 0:10 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-08 0:09 [RFC Patch 0/1] pciutils: Add basic decode support for CXL Sean V Kelley
2020-04-08 0:09 ` Sean V Kelley [this message]
2020-04-08 16:56 ` [RFC Patch 1/1] lspci: Add basic decode support for Compute eXpress Link Bjorn Helgaas
2020-04-08 21:12 ` Sean V Kelley
2020-04-08 21:47 ` Bjorn Helgaas
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=20200408000959.230780-2-sean.v.kelley@linux.intel.com \
--to=sean.v.kelley@linux.intel.com \
--cc=bhelgaas@google.com \
--cc=linux-pci@vger.kernel.org \
--cc=mj@ucw.cz \
/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).