Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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: Dan Williams <dan.j.williams@intel.com>
Acked-by: Ira Weiny <ira.weiny@intel.com>
Tested-by: Alison Schofield <alison.schofield@intel.com>
Reviewed-by: Alison Schofield <alison.schofield@intel.com?>
Link: https://patch.msgid.link/20260205001633.1813643-2-dave.jiang@intel.com
Signed-off-by: Dave Jiang <dave.jiang@intel.com>
+19
-10
+3
-10
drivers/cxl/core/pmem.c
+3
-10
drivers/cxl/core/pmem.c
···
115
115
device_unregister(&cxl_nvb->dev);
116
116
}
117
117
118
-
/**
119
-
* devm_cxl_add_nvdimm_bridge() - add the root of a LIBNVDIMM topology
120
-
* @host: platform firmware root device
121
-
* @port: CXL port at the root of a CXL topology
122
-
*
123
-
* Return: bridge device that can host cxl_nvdimm objects
124
-
*/
125
-
struct cxl_nvdimm_bridge *devm_cxl_add_nvdimm_bridge(struct device *host,
126
-
struct cxl_port *port)
118
+
struct cxl_nvdimm_bridge *__devm_cxl_add_nvdimm_bridge(struct device *host,
119
+
struct cxl_port *port)
127
120
{
128
121
struct cxl_nvdimm_bridge *cxl_nvb;
129
122
struct device *dev;
···
148
155
put_device(dev);
149
156
return ERR_PTR(rc);
150
157
}
151
-
EXPORT_SYMBOL_NS_GPL(devm_cxl_add_nvdimm_bridge, "CXL");
158
+
EXPORT_SYMBOL_FOR_MODULES(__devm_cxl_add_nvdimm_bridge, "cxl_pmem");
152
159
153
160
static void cxl_nvdimm_release(struct device *dev)
154
161
{
+2
drivers/cxl/cxl.h
+2
drivers/cxl/cxl.h
···
920
920
struct cxl_nvdimm_bridge *to_cxl_nvdimm_bridge(struct device *dev);
921
921
struct cxl_nvdimm_bridge *devm_cxl_add_nvdimm_bridge(struct device *host,
922
922
struct cxl_port *port);
923
+
struct cxl_nvdimm_bridge *__devm_cxl_add_nvdimm_bridge(struct device *host,
924
+
struct cxl_port *port);
923
925
struct cxl_nvdimm *to_cxl_nvdimm(struct device *dev);
924
926
bool is_cxl_nvdimm(struct device *dev);
925
927
int devm_cxl_add_nvdimm(struct device *host, struct cxl_port *port,
+14
drivers/cxl/pmem.c
+14
drivers/cxl/pmem.c
···
13
13
14
14
static __read_mostly DECLARE_BITMAP(exclusive_cmds, CXL_MEM_COMMAND_ID_MAX);
15
15
16
+
/**
17
+
* __devm_cxl_add_nvdimm_bridge() - add the root of a LIBNVDIMM topology
18
+
* @host: platform firmware root device
19
+
* @port: CXL port at the root of a CXL topology
20
+
*
21
+
* Return: bridge device that can host cxl_nvdimm objects
22
+
*/
23
+
struct cxl_nvdimm_bridge *devm_cxl_add_nvdimm_bridge(struct device *host,
24
+
struct cxl_port *port)
25
+
{
26
+
return __devm_cxl_add_nvdimm_bridge(host, port);
27
+
}
28
+
EXPORT_SYMBOL_NS_GPL(devm_cxl_add_nvdimm_bridge, "CXL");
29
+
16
30
static void clear_exclusive(void *mds)
17
31
{
18
32
clear_exclusive_cxl_commands(mds, exclusive_cmds);