Commit 8b3b1c0d authored by Dan Williams's avatar Dan Williams
Browse files

tools/testing/cxl: Make mock CEDT parsing more robust 



Accept any cxl_test topology device as the first argument in
cxl_chbs_context.

This is in preparation for reworking the detection of the component
registers across VH and RCH topologies. Move
mock_acpi_table_parse_cedt() beneath the definition of is_mock_port()
and use is_mock_port() instead of the explicit mock cxl_acpi device
check.

Acked-by: default avatarAlison Schofield <alison.schofield@intel.com>
Reviewed-by: default avatarRobert Richter <rrichter@amd.com>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Link: https://lore.kernel.org/r/166993043433.1882361.17651413716599606118.stgit@dwillia2-xfh.jf.intel.com


Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 4029c32f

drivers/cxl/acpi.c

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,10 @@ static int cxl_acpi_cfmws_verify(struct device *dev, 
	return 0;

}



/*

 * Note, @dev must be the first member, see 'struct cxl_chbs_context'

 * and mock_acpi_table_parse_cedt()

 */

struct cxl_cfmws_context {

	struct device *dev;

	struct cxl_port *root_port;

tools/testing/cxl/test/cxl.c

+6 −4
Original line number Diff line number Diff line
@@ -320,10 +320,12 @@ static int populate_cedt(void) 
	return 0;

}



static bool is_mock_port(struct device *dev);



/*

 * WARNING, this hack assumes the format of 'struct

 * cxl_cfmws_context' and 'struct cxl_chbs_context' share the property that

 * the first struct member is the device being probed by the cxl_acpi

 * WARNING, this hack assumes the format of 'struct cxl_cfmws_context'

 * and 'struct cxl_chbs_context' share the property that the first

 * struct member is a cxl_test device being probed by the cxl_acpi

 * driver.

 */

struct cxl_cedt_context {
@@ -340,7 +342,7 @@ static int mock_acpi_table_parse_cedt(enum acpi_cedt_type id, 
	unsigned long end;

	int i;



	if (dev != &cxl_acpi->dev)

	if (!is_mock_port(dev) && !is_mock_dev(dev))

		return acpi_table_parse_cedt(id, handler_arg, arg);



	if (id == ACPI_CEDT_TYPE_CHBS)