[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20241202171222.62595-8-alejandro.lucero-palau@amd.com>
Date: Mon, 2 Dec 2024 17:12:01 +0000
From: <alejandro.lucero-palau@....com>
To: <linux-cxl@...r.kernel.org>, <netdev@...r.kernel.org>,
<dan.j.williams@...el.com>, <martin.habets@...inx.com>,
<edward.cree@....com>, <davem@...emloft.net>, <kuba@...nel.org>,
<pabeni@...hat.com>, <edumazet@...gle.com>, <dave.jiang@...el.com>
CC: Alejandro Lucero <alucerop@....com>
Subject: [PATCH v6 07/28] sfc: use cxl api for regs setup and checking
From: Alejandro Lucero <alucerop@....com>
Use cxl code for registers discovery and mapping.
Validate capabilities found based on those registers against expected
capabilities.
Signed-off-by: Alejandro Lucero <alucerop@....com>
---
drivers/net/ethernet/sfc/efx_cxl.c | 19 +++++++++++++++++++
include/cxl/cxl.h | 2 ++
2 files changed, 21 insertions(+)
diff --git a/drivers/net/ethernet/sfc/efx_cxl.c b/drivers/net/ethernet/sfc/efx_cxl.c
index 9cfb519e569f..44e1061feba1 100644
--- a/drivers/net/ethernet/sfc/efx_cxl.c
+++ b/drivers/net/ethernet/sfc/efx_cxl.c
@@ -21,6 +21,8 @@
int efx_cxl_init(struct efx_probe_data *probe_data)
{
struct efx_nic *efx = &probe_data->efx;
+ DECLARE_BITMAP(expected, CXL_MAX_CAPS);
+ DECLARE_BITMAP(found, CXL_MAX_CAPS);
struct pci_dev *pci_dev;
struct efx_cxl *cxl;
struct resource res;
@@ -65,6 +67,23 @@ int efx_cxl_init(struct efx_probe_data *probe_data)
goto err2;
}
+ rc = cxl_pci_accel_setup_regs(pci_dev, cxl->cxlds);
+ if (rc) {
+ pci_err(pci_dev, "CXL accel setup regs failed");
+ goto err2;
+ }
+
+ bitmap_clear(expected, 0, CXL_MAX_CAPS);
+ bitmap_set(expected, CXL_DEV_CAP_HDM, 1);
+ bitmap_set(expected, CXL_DEV_CAP_RAS, 1);
+
+ if (!cxl_pci_check_caps(cxl->cxlds, expected, found)) {
+ pci_err(pci_dev,
+ "CXL device capabilities found(%08lx) not as expected(%08lx)",
+ *found, *expected);
+ goto err2;
+ }
+
probe_data->cxl = cxl;
return 0;
diff --git a/include/cxl/cxl.h b/include/cxl/cxl.h
index 05f06bfd2c29..18fb01adcf19 100644
--- a/include/cxl/cxl.h
+++ b/include/cxl/cxl.h
@@ -5,6 +5,7 @@
#define __CXL_H
#include <linux/ioport.h>
+#include <linux/pci.h>
enum cxl_resource {
CXL_RES_DPA,
@@ -40,4 +41,5 @@ int cxl_set_resource(struct cxl_dev_state *cxlds, struct resource res,
bool cxl_pci_check_caps(struct cxl_dev_state *cxlds,
unsigned long *expected_caps,
unsigned long *current_caps);
+int cxl_pci_accel_setup_regs(struct pci_dev *pdev, struct cxl_dev_state *cxlds);
#endif
--
2.17.1
Powered by blists - more mailing lists