Re: [PATCH v10 00/26] cxl: add type2 device basic support

[Alison Schofield <alison.schofield@intel.com>]

On Wed, Feb 05, 2025 at 03:19:24PM +0000, alucerop@amd.com wrote:
> From: Alejandro Lucero <alucerop@amd.com>
> 
Hi Alejandro,

Appending a patch with the cxl-test changes needed to compile
this set. Those changes can be applied in pieces to the relevant
patches. 

Once compiled, the cxl-test module builds and cxl unit tests pass :)

Snipping your cover letter and appending the cxl-test patch.

Subject: [PATCH] type-2 v10 review - make cxl-test compile

These need to be folded into the drivers/cxl/ patches that caused
the param changes.

---
 tools/testing/cxl/test/mem.c  | 6 +++---
 tools/testing/cxl/test/mock.c | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/tools/testing/cxl/test/mem.c b/tools/testing/cxl/test/mem.c
index 495199238335..a37f144a6f38 100644
--- a/tools/testing/cxl/test/mem.c
+++ b/tools/testing/cxl/test/mem.c
@@ -1518,7 +1518,7 @@ static int cxl_mock_mem_probe(struct platform_device *pdev)
 	if (rc)
 		return rc;
 
-	mds = cxl_memdev_state_create(dev);
+	mds = cxl_memdev_state_create(dev, 0, 0, CXL_DEVTYPE_CLASSMEM);
 	if (IS_ERR(mds))
 		return PTR_ERR(mds);
 
@@ -1559,13 +1559,13 @@ static int cxl_mock_mem_probe(struct platform_device *pdev)
 	if (rc)
 		return rc;
 
-	rc = cxl_dpa_setup(cxlds, &range_info);
+	rc = cxl_dpa_setup(mds, &range_info);
 	if (rc)
 		return rc;
 
 	cxl_mock_add_event_logs(&mdata->mes);
 
-	cxlmd = devm_cxl_add_memdev(&pdev->dev, cxlds);
+	cxlmd = devm_cxl_add_memdev(&pdev->dev, mds);
 	if (IS_ERR(cxlmd))
 		return PTR_ERR(cxlmd);
 
diff --git a/tools/testing/cxl/test/mock.c b/tools/testing/cxl/test/mock.c
index 3c6a071fbbe3..3f7e8db579ac 100644
--- a/tools/testing/cxl/test/mock.c
+++ b/tools/testing/cxl/test/mock.c
@@ -196,15 +196,16 @@ int __wrap_devm_cxl_port_enumerate_dports(struct cxl_port *port)
 }
 EXPORT_SYMBOL_NS_GPL(__wrap_devm_cxl_port_enumerate_dports, "CXL");
 
-int __wrap_cxl_await_media_ready(struct cxl_dev_state *cxlds)
+int __wrap_cxl_await_media_ready(struct cxl_memdev_state *cxlmds)
 {
 	int rc, index;
 	struct cxl_mock_ops *ops = get_cxl_mock_ops(&index);
+	struct cxl_dev_state *cxlds = &cxlmds->cxlds;
 
 	if (ops && ops->is_mock_dev(cxlds->dev))
 		rc = 0;
 	else
-		rc = cxl_await_media_ready(cxlds);
+		rc = cxl_await_media_ready(cxlmds);
 	put_cxl_mock_ops(index);
 
 	return rc;
-- 
2.37.3