summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2021-05-14 08:22:00 +0300
committerDan Williams <dan.j.williams@intel.com>2021-05-15 02:13:19 +0300
commit5f653f7590ab7db7379f668b2975744585206b0d (patch)
tree94a35fdd5f2d6c58594d24933b5cfa66523243d4
parent8ac75dd6ab3039ef0656d777a564ea1b65071971 (diff)
downloadlinux-5f653f7590ab7db7379f668b2975744585206b0d.tar.xz
cxl/core: Rename bus.c to core.c
In preparation for more generic shared functionality across endpoint consumers of core cxl resources, and platform-firmware producers of those resources, rename bus.c to core.c. In addition to the central rendezvous for interleave coordination, the core will also define common routines like CXL register block mapping. Acked-by: Ben Widawsky <ben.widawsky@intel.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Link: https://lore.kernel.org/r/162096972018.1865304.11079951161445408423.stgit@dwillia2-desk3.amr.corp.intel.com Signed-off-by: Dan Williams <dan.j.williams@intel.com>
-rw-r--r--Documentation/driver-api/cxl/memory-devices.rst6
-rw-r--r--drivers/cxl/Makefile4
-rw-r--r--drivers/cxl/core.c (renamed from drivers/cxl/bus.c)15
3 files changed, 13 insertions, 12 deletions
diff --git a/Documentation/driver-api/cxl/memory-devices.rst b/Documentation/driver-api/cxl/memory-devices.rst
index 1bad466f9167..71495ed77069 100644
--- a/Documentation/driver-api/cxl/memory-devices.rst
+++ b/Documentation/driver-api/cxl/memory-devices.rst
@@ -28,10 +28,10 @@ CXL Memory Device
.. kernel-doc:: drivers/cxl/mem.c
:internal:
-CXL Bus
+CXL Core
-------
-.. kernel-doc:: drivers/cxl/bus.c
- :doc: cxl bus
+.. kernel-doc:: drivers/cxl/core.c
+ :doc: cxl core
External Interfaces
===================
diff --git a/drivers/cxl/Makefile b/drivers/cxl/Makefile
index a314a1891f4d..3808e39dd31f 100644
--- a/drivers/cxl/Makefile
+++ b/drivers/cxl/Makefile
@@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_CXL_BUS) += cxl_bus.o
+obj-$(CONFIG_CXL_BUS) += cxl_core.o
obj-$(CONFIG_CXL_MEM) += cxl_mem.o
ccflags-y += -DDEFAULT_SYMBOL_NAMESPACE=CXL
-cxl_bus-y := bus.o
+cxl_core-y := core.o
cxl_mem-y := mem.o
diff --git a/drivers/cxl/bus.c b/drivers/cxl/core.c
index 58f74796d525..7f8d2034038a 100644
--- a/drivers/cxl/bus.c
+++ b/drivers/cxl/core.c
@@ -4,26 +4,27 @@
#include <linux/module.h>
/**
- * DOC: cxl bus
+ * DOC: cxl core
*
- * The CXL bus provides namespace for control devices and a rendezvous
- * point for cross-device interleave coordination.
+ * The CXL core provides a sysfs hierarchy for control devices and a rendezvous
+ * point for cross-device interleave coordination through cxl ports.
*/
+
struct bus_type cxl_bus_type = {
.name = "cxl",
};
EXPORT_SYMBOL_GPL(cxl_bus_type);
-static __init int cxl_bus_init(void)
+static __init int cxl_core_init(void)
{
return bus_register(&cxl_bus_type);
}
-static void cxl_bus_exit(void)
+static void cxl_core_exit(void)
{
bus_unregister(&cxl_bus_type);
}
-module_init(cxl_bus_init);
-module_exit(cxl_bus_exit);
+module_init(cxl_core_init);
+module_exit(cxl_core_exit);
MODULE_LICENSE("GPL v2");