Commit 644685ab authored by Dave Jiang's avatar Dave Jiang
Browse files

cxl/test: Adjust the mock version of devm_cxl_switch_port_decoders_setup() 



With devm_cxl_switch_port_decoders_setup() being called within cxl_core
instead of by the port driver probe, adjustments are needed to deal with
circular symbol dependency when this function is being mock'd. Add the
appropriate changes to get around the circular dependency.

Reviewed-by: default avatarAlison Schofield <alison.schofield@intel.com>
Reviewed-by: default avatarJonathan Cameron <jonathan.cameron@huawei.com>
Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
parent d96eb90d

drivers/cxl/core/hdm.c

+3 −3
Original line number Diff line number Diff line
@@ -1216,12 +1216,12 @@ static int devm_cxl_enumerate_decoders(struct cxl_hdm *cxlhdm, 
}



/**

 * devm_cxl_switch_port_decoders_setup - allocate and setup switch decoders

 * __devm_cxl_switch_port_decoders_setup - allocate and setup switch decoders

 * @port: CXL port context

 *

 * Return 0 or -errno on error

 */

int devm_cxl_switch_port_decoders_setup(struct cxl_port *port)

int __devm_cxl_switch_port_decoders_setup(struct cxl_port *port)

{

	struct cxl_hdm *cxlhdm;
@@ -1245,7 +1245,7 @@ int devm_cxl_switch_port_decoders_setup(struct cxl_port *port) 
	dev_err(&port->dev, "HDM decoder capability not found\n");

	return -ENXIO;

}

EXPORT_SYMBOL_NS_GPL(devm_cxl_switch_port_decoders_setup, "CXL");

EXPORT_SYMBOL_NS_GPL(__devm_cxl_switch_port_decoders_setup, "CXL");



/**

 * devm_cxl_endpoint_decoders_setup - allocate and setup endpoint decoders

drivers/cxl/cxl.h

+2 −0
Original line number Diff line number Diff line
@@ -811,6 +811,7 @@ struct cxl_endpoint_dvsec_info { 
};



int devm_cxl_switch_port_decoders_setup(struct cxl_port *port);

int __devm_cxl_switch_port_decoders_setup(struct cxl_port *port);

int devm_cxl_endpoint_decoders_setup(struct cxl_port *port);



struct cxl_dev_state;
@@ -934,6 +935,7 @@ u16 cxl_gpf_get_dvsec(struct device *dev); 
#ifndef CXL_TEST_ENABLE

#define DECLARE_TESTABLE(x) __##x

#define devm_cxl_add_dport_by_dev DECLARE_TESTABLE(devm_cxl_add_dport_by_dev)

#define devm_cxl_switch_port_decoders_setup DECLARE_TESTABLE(devm_cxl_switch_port_decoders_setup)

#endif



#endif /* __CXL_H__ */

tools/testing/cxl/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ ldflags-y += --wrap=devm_cxl_add_rch_dport 
ldflags-y += --wrap=cxl_rcd_component_reg_phys

ldflags-y += --wrap=cxl_endpoint_parse_cdat

ldflags-y += --wrap=cxl_dport_init_ras_reporting

ldflags-y += --wrap=devm_cxl_switch_port_decoders_setup

ldflags-y += --wrap=devm_cxl_endpoint_decoders_setup



DRIVERS := ../../../drivers

tools/testing/cxl/cxl_core_exports.c

+10 −0
Original line number Diff line number Diff line
@@ -17,3 +17,13 @@ struct cxl_dport *devm_cxl_add_dport_by_dev(struct cxl_port *port, 
	return _devm_cxl_add_dport_by_dev(port, dport_dev);

}

EXPORT_SYMBOL_NS_GPL(devm_cxl_add_dport_by_dev, "CXL");



cxl_switch_decoders_setup_fn _devm_cxl_switch_port_decoders_setup =

	__devm_cxl_switch_port_decoders_setup;

EXPORT_SYMBOL_NS_GPL(_devm_cxl_switch_port_decoders_setup, "CXL");



int devm_cxl_switch_port_decoders_setup(struct cxl_port *port)

{

	return _devm_cxl_switch_port_decoders_setup(port);

}

EXPORT_SYMBOL_NS_GPL(devm_cxl_switch_port_decoders_setup, "CXL");

tools/testing/cxl/exports.h

+3 −0
Original line number Diff line number Diff line
@@ -7,4 +7,7 @@ typedef struct cxl_dport *(*cxl_add_dport_by_dev_fn)(struct cxl_port *port, 
							  struct device *dport_dev);

extern cxl_add_dport_by_dev_fn _devm_cxl_add_dport_by_dev;



typedef int(*cxl_switch_decoders_setup_fn)(struct cxl_port *port);

extern cxl_switch_decoders_setup_fn _devm_cxl_switch_port_decoders_setup;



#endif