Commit e7e222ad authored by Dave Jiang's avatar Dave Jiang
Browse files

cxl: Move devm_cxl_add_nvdimm_bridge() to cxl_pmem.ko 



Moving the symbol devm_cxl_add_nvdimm_bridge() to
drivers/cxl/cxl_pmem.c, so that cxl_pmem can export a symbol that gives
cxl_acpi a depedency on cxl_pmem kernel module. This is a prepatory patch
to resolve the issue of a race for nvdimm_bus object that is created
during cxl_acpi_probe().

No functional changes besides moving code.

Suggested-by: default avatarDan Williams <dan.j.williams@intel.com>
Acked-by: default avatarIra Weiny <ira.weiny@intel.com>
Tested-by: default avatarAlison Schofield <alison.schofield@intel.com>
Reviewed-by: default avatarAlison Schofield <alison.schofield@intel.com?>
Link: https://patch.msgid.link/20260205001633.1813643-2-dave.jiang@intel.com


Signed-off-by: default avatarDave Jiang <dave.jiang@intel.com>
parent 0066688d

drivers/cxl/core/pmem.c

+3 −10
Original line number Diff line number Diff line
@@ -115,14 +115,7 @@ static void unregister_nvb(void *_cxl_nvb) 
	device_unregister(&cxl_nvb->dev);

}



/**

 * devm_cxl_add_nvdimm_bridge() - add the root of a LIBNVDIMM topology

 * @host: platform firmware root device

 * @port: CXL port at the root of a CXL topology

 *

 * Return: bridge device that can host cxl_nvdimm objects

 */

struct cxl_nvdimm_bridge *devm_cxl_add_nvdimm_bridge(struct device *host,

struct cxl_nvdimm_bridge *__devm_cxl_add_nvdimm_bridge(struct device *host,

						       struct cxl_port *port)

{

	struct cxl_nvdimm_bridge *cxl_nvb;
@@ -155,7 +148,7 @@ struct cxl_nvdimm_bridge *devm_cxl_add_nvdimm_bridge(struct device *host, 
	put_device(dev);

	return ERR_PTR(rc);

}

EXPORT_SYMBOL_NS_GPL(devm_cxl_add_nvdimm_bridge, "CXL");

EXPORT_SYMBOL_FOR_MODULES(__devm_cxl_add_nvdimm_bridge, "cxl_pmem");



static void cxl_nvdimm_release(struct device *dev)

{

drivers/cxl/cxl.h

+2 −0
Original line number Diff line number Diff line
@@ -920,6 +920,8 @@ void cxl_driver_unregister(struct cxl_driver *cxl_drv); 
struct cxl_nvdimm_bridge *to_cxl_nvdimm_bridge(struct device *dev);

struct cxl_nvdimm_bridge *devm_cxl_add_nvdimm_bridge(struct device *host,

						     struct cxl_port *port);

struct cxl_nvdimm_bridge *__devm_cxl_add_nvdimm_bridge(struct device *host,

						       struct cxl_port *port);

struct cxl_nvdimm *to_cxl_nvdimm(struct device *dev);

bool is_cxl_nvdimm(struct device *dev);

int devm_cxl_add_nvdimm(struct device *host, struct cxl_port *port,

drivers/cxl/pmem.c

+14 −0
Original line number Diff line number Diff line
@@ -13,6 +13,20 @@ 


static __read_mostly DECLARE_BITMAP(exclusive_cmds, CXL_MEM_COMMAND_ID_MAX);



/**

 * __devm_cxl_add_nvdimm_bridge() - add the root of a LIBNVDIMM topology

 * @host: platform firmware root device

 * @port: CXL port at the root of a CXL topology

 *

 * Return: bridge device that can host cxl_nvdimm objects

 */

struct cxl_nvdimm_bridge *devm_cxl_add_nvdimm_bridge(struct device *host,

						     struct cxl_port *port)

{

	return __devm_cxl_add_nvdimm_bridge(host, port);

}

EXPORT_SYMBOL_NS_GPL(devm_cxl_add_nvdimm_bridge, "CXL");



static void clear_exclusive(void *mds)

{

	clear_exclusive_cxl_commands(mds, exclusive_cmds);