cxl: Remove core/acpi.c and cxl core dependency on ACPI
Dave Jiang
maintainerPATCH 1/1 cxl: Remove core/acpi.c and cxl core dependency on ACPI
It was a mistake to introduce core/acpi.c and putting ACPI dependency on cxl_core when adding the extended linear cache support. Add a callback in the cxl_root_decoder to retrieve the extended linear cache size from ACPI via the cxl_acpi driver.
In order to deal with cxl_test, a device parameter had to be introduced to the hmat_get_extended_linear_cache_size() call in order to help with the mock wrapped function from ACPI. Even though the 'struct device' is not used by the actual hmat_get_extended_linear_cache_size() function.
--- drivers/acpi/numa/hmat.c | 4 +++- drivers/cxl/acpi.c | 15 ++++++++++++++- drivers/cxl/core/Makefile | 1 - drivers/cxl/core/acpi.c | 11 ----------- drivers/cxl/core/core.h | 2 -- drivers/cxl/core/port.c | 5 ++++- drivers/cxl/core/region.c | 6 +++++- drivers/cxl/cxl.h | 12 +++++++++++- include/linux/acpi.h | 6 ++++-- tools/testing/cxl/Kbuild | 2 +- tools/testing/cxl/test/cxl.c | 20 ++++++++++++++++++++ tools/testing/cxl/test/mock.c | 23 +++++++++++++++++++++++ tools/testing/cxl/test/mock.h | 4 ++++ 13 files changed, 89 insertions(+), 22 deletions(-) delete mode 100644 drivers/cxl/core/acpi.c
drivers/acpi/numa/hmat.c +3 -1
@@ -110,6 +110,7 @@ static struct memory_target *find_mem_target(unsigned int mem_pxm)/** * hmat_get_extended_linear_cache_size - Retrieve the extended linear cache size +* @dev: device for debug output * @backing_res: resource from the backing media * @nid: node id for the memory region * @cache_size: (Output) size of extended linear cache.
@@ -117,7 +118,8 @@ static struct memory_target *find_mem_target(unsigned int mem_pxm)* Return: 0 on success. Errno on failure. * */ -int hmat_get_extended_linear_cache_size (struct resource *backing_res,int nid, +int hmat_get_extended_linear_cache_size (struct device *dev, +struct resource *backing_res,int nid,resource_size_t *cache_size) {unsigned int pxm =node_to_pxm (nid);
drivers/cxl/acpi.c +14 -1
@@ -337,6 +337,19 @@ static int add_or_reset_cxl_resource(struct resource *parent, struct resource *rreturn rc; } +static int cxl_acpi_get_extended_linear_cache_size (struct cxl_root_decoder *cxlrd, +struct resource *backing_res, +int nid, +resource_size_t *size) +{ +return hmat_get_extended_linear_cache_size (&cxlrd->cxlsd.cxld.dev, + backing_res, nid, size); +} + +static const struct cxl_rcd_ops acpi_rcd_ops = { + .get_extended_linear_cache_size = cxl_acpi_get_extended_linear_cache_size, +}; + DEFINE_FREE(put_cxlrd, struct cxl_root_decoder *, if (!IS_ERR_OR_NULL(_T)) put_device(&_T->cxlsd.cxld.dev)) DEFINE_FREE(del_cxl_resource, struct resource *, if (_T) del_cxl_resource(_T))
@@ -375,7 +388,7 @@ static int __cxl_parse_cfmws(struct acpi_cedt_cfmws *cfmws,return rc; struct cxl_root_decoder *cxlrd __free(put_cxlrd) = -cxl_root_decoder_alloc (root_port, ways); +cxl_root_decoder_alloc (root_port, ways, &acpi_rcd_ops);if (IS_ERR (cxlrd))return PTR_ERR (cxlrd);
drivers/cxl/core/Makefile +0 -1
@@ -15,7 +15,6 @@ cxl_core-y += hdm.o cxl_core-y += pmu.o cxl_core-y += cdat.o cxl_core-y += ras.o -cxl_core-y += acpi.o cxl_core-$(CONFIG_TRACING) += trace.o cxl_core-$(CONFIG_CXL_REGION) += region.o cxl_core-$(CONFIG_CXL_MCE) += mce.o
drivers/cxl/core/acpi.c deleted +0 -11
@@ -1,11 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* Copyright(c) 2024 Intel Corporation. All rights reserved. */ -#include <linux/acpi.h> -#include "cxl.h" -#include "core.h" - -int cxl_acpi_get_extended_linear_cache_size (struct resource *backing_res, -int nid,resource_size_t *size) -{ -return hmat_get_extended_linear_cache_size (backing_res, nid, size); -}
drivers/cxl/core/core.h +0 -2
@@ -120,8 +120,6 @@ int cxl_port_get_switch_dport_bandwidth(struct cxl_port *port,int cxl_ras_init (void );void cxl_ras_exit (void );int cxl_gpf_port_setup (struct cxl_dport *dport); -int cxl_acpi_get_extended_linear_cache_size (struct resource *backing_res, -int nid,resource_size_t *size);#ifdef CONFIG_CXL_FEATURES size_t cxl_get_feature(struct cxl_mailbox *cxl_mbox, const uuid_t *feat_uuid,
drivers/cxl/core/port.c +4 -1
@@ -1800,6 +1800,7 @@ static int cxl_switch_decoder_init(struct cxl_port *port,* cxl_root_decoder_alloc - Allocate a root level decoder * @port: owning CXL root of this decoder * @nr_targets: static number of downstream targets +* @ops: root decoder callback operations * * Return: A new cxl decoder to be registered by cxl_decoder_add(). A * 'CXL root' decoder is one that decodes from a top-level / static platform
@@ -1807,7 +1808,8 @@ static int cxl_switch_decoder_init(struct cxl_port *port,* topology. */ struct cxl_root_decoder *cxl_root_decoder_alloc (struct cxl_port *port, -unsigned int nr_targets) +unsigned int nr_targets, +const struct cxl_rcd_ops *ops) {struct cxl_root_decoder *cxlrd;struct cxl_switch_decoder *cxlsd;
@@ -1846,6 +1848,7 @@ struct cxl_root_decoder *cxl_root_decoder_alloc(struct cxl_port *port,atomic_set (&cxlrd->region_id, rc); cxlrd->qos_class =CXL_QOS_CLASS_INVALID ; + cxlrd->ops = ops;return cxlrd; }EXPORT_SYMBOL_NS_GPL (cxl_root_decoder_alloc,"CXL" );
drivers/cxl/core/region.c +5 -1
@@ -3239,7 +3239,11 @@ static int cxl_extended_linear_cache_resize(struct cxl_region *cxlr,resource_size_t cache_size, start;int rc; - rc =cxl_acpi_get_extended_linear_cache_size (res, nid, &cache_size); +if (!cxlrd->ops || !cxlrd->ops->get_extended_linear_cache_size) +return -EOPNOTSUPP ; + + rc = cxlrd->ops->get_extended_linear_cache_size (cxlrd, res, nid, + &cache_size);if (rc)return rc;
drivers/cxl/cxl.h +11 -1
@@ -420,6 +420,12 @@ struct cxl_switch_decoder {struct cxl_root_decoder ;typedef u64 (*cxl_hpa_to_spa_fn )(struct cxl_root_decoder *cxlrd,u64 hpa); +struct cxl_rcd_ops { +int (*get_extended_linear_cache_size)(struct cxl_root_decoder *cxlrd, +struct resource *backing_res, +int nid,resource_size_t *size); +}; +/** * struct cxl_root_decoder - Static platform CXL address decoder * @res: host / parent resource for region allocations
@@ -428,6 +434,7 @@ typedef u64 (*cxl_hpa_to_spa_fn)(struct cxl_root_decoder *cxlrd, u64 hpa);* @platform_data: platform specific configuration data * @range_lock: sync region autodiscovery by address range * @qos_class: QoS performance class cookie +* @ops: root decoder specific operations * @cxlsd: base cxl switch decoder */ struct cxl_root_decoder {
@@ -437,7 +444,9 @@ struct cxl_root_decoder {void *platform_data;struct mutex range_lock;int qos_class; +const struct cxl_rcd_ops *ops;struct cxl_switch_decoder cxlsd; +/* DO NOT ADD ANYTHING AFTER THIS LINE. cxlsd trails with a flex array */ };/*
@@ -772,7 +781,8 @@ bool is_root_decoder(struct device *dev);bool is_switch_decoder (struct device *dev);bool is_endpoint_decoder (struct device *dev);struct cxl_root_decoder *cxl_root_decoder_alloc (struct cxl_port *port, -unsigned int nr_targets); +unsigned int nr_targets, +const struct cxl_rcd_ops *ops);struct cxl_switch_decoder *cxl_switch_decoder_alloc (struct cxl_port *port,unsigned int nr_targets);int cxl_decoder_add (struct cxl_decoder *cxld,int *target_map);
include/linux/acpi.h +4 -2
@@ -1095,10 +1095,12 @@ static inline acpi_handle acpi_get_processor_handle(int cpu)#endif /* !CONFIG_ACPI */ #ifdef CONFIG_ACPI_HMAT -int hmat_get_extended_linear_cache_size (struct resource *backing_res,int nid, +int hmat_get_extended_linear_cache_size (struct device *dev, +struct resource *backing_res,int nid,resource_size_t *size);#else -static inline int hmat_get_extended_linear_cache_size (struct resource *backing_res, +static inline int hmat_get_extended_linear_cache_size (struct device *dev, +struct resource *backing_res,int nid,resource_size_t *size) {return -EOPNOTSUPP ;
tools/testing/cxl/Kbuild +1 -1
@@ -15,6 +15,7 @@ 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=hmat_get_extended_linear_cache_size DRIVERS := ../../../drivers CXL_SRC := $(DRIVERS)/cxl
@@ -62,7 +63,6 @@ cxl_core-y += $(CXL_CORE_SRC)/hdm.o cxl_core-y += $(CXL_CORE_SRC)/pmu.o cxl_core-y += $(CXL_CORE_SRC)/cdat.o cxl_core-y += $(CXL_CORE_SRC)/ras.o -cxl_core-y += $(CXL_CORE_SRC)/acpi.o cxl_core-$(CONFIG_TRACING) += $(CXL_CORE_SRC)/trace.o cxl_core-$(CONFIG_CXL_REGION) += $(CXL_CORE_SRC)/region.o cxl_core-$(CONFIG_CXL_MCE) += $(CXL_CORE_SRC)/mce.o
tools/testing/cxl/test/cxl.c +20 -0
@@ -470,6 +470,24 @@ struct cxl_cedt_context {struct device *dev; }; +static int mock_hmat_get_extended_linear_cache_size (struct device *dev, +struct resource *backing_res, +int nid,resource_size_t *size) +{ +struct cxl_decoder *cxld; +struct cxl_port *port; + +if (!is_root_decoder (dev)) +return -EINVAL ; + + cxld =to_cxl_decoder (dev); + port =to_cxl_port (cxld->dev.parent); +if (is_mock_port (&port->dev)) +return -EOPNOTSUPP ; + +return hmat_get_extended_linear_cache_size (dev, backing_res, nid, size); +} +static int mock_acpi_table_parse_cedt (enum acpi_cedt_type id,acpi_tbl_entry_handler_arg handler_arg,void *arg)
@@ -1040,6 +1058,8 @@ static struct cxl_mock_ops cxl_mock_ops = { .devm_cxl_enumerate_decoders = mock_cxl_enumerate_decoders, .cxl_endpoint_parse_cdat = mock_cxl_endpoint_parse_cdat, .list = LIST_HEAD_INIT(cxl_mock_ops.list), + .hmat_get_extended_linear_cache_size = + mock_hmat_get_extended_linear_cache_size, };static void mock_companion (struct acpi_device *adev,struct device *dev)
tools/testing/cxl/test/mock.c +23 -0
@@ -78,6 +78,29 @@ int __wrap_acpi_table_parse_cedt(enum acpi_cedt_type id, }EXPORT_SYMBOL_NS_GPL (__wrap_acpi_table_parse_cedt,"ACPI" ); +int __wrap_hmat_get_extended_linear_cache_size (struct device *dev, +struct resource *backing_res, +int nid, +resource_size_t *size) +{ +int index; +struct cxl_mock_ops *ops =get_cxl_mock_ops (&index); +int rc; + +if (ops) + rc = ops->hmat_get_extended_linear_cache_size (dev, + backing_res, nid, + size); +else + rc =hmat_get_extended_linear_cache_size (dev, backing_res, + nid, size); + +put_cxl_mock_ops (index); + +return rc; +} +EXPORT_SYMBOL_NS_GPL (__wrap_hmat_get_extended_linear_cache_size,"CXL" ); + acpi_status __wrap_acpi_evaluate_integer(acpi_handle handle, acpi_string pathname, struct acpi_object_list *arguments,
tools/testing/cxl/test/mock.h +4 -0
@@ -26,6 +26,10 @@ struct cxl_mock_ops {int (*devm_cxl_enumerate_decoders)(struct cxl_hdm *hdm,struct cxl_endpoint_dvsec_info *info);void (*cxl_endpoint_parse_cdat)(struct cxl_port *port); +int (*hmat_get_extended_linear_cache_size)(struct device *dev, +struct resource *backing_res, +int nid, +resource_size_t *size); };void register_cxl_mock_ops (struct cxl_mock_ops *ops);
base-commit: 0ff41df1cb268fc69e703a08a57ee14ae967d0ca
Signature · 1 line
2.49.0
Dave Jiang
maintainerPATCH v2 1/1 cxl: Remove core/acpi.c and cxl core dependency on ACPI
It was a mistake to introduce core/acpi.c and putting ACPI dependency on cxl_core when adding the extended linear cache support. Add a callback in the cxl_root_decoder to retrieve the extended linear cache size from ACPI via the cxl_acpi driver.
In order to deal with cxl_test, a device parameter had to be introduced to the hmat_get_extended_linear_cache_size() call in order to help with the mock wrapped function from ACPI. Even though the 'struct device' is not used by the actual hmat_get_extended_linear_cache_size() function.
---
v2:
- Remove introduction of 'struct device' parameter to hmat_get_extended_linear_cache_size().
- Drop comment on flex array (Jonathan)
- Rename cxl_rcd_ops to cxl_rd_ops for 'root decoder ops' (Fabio)
--- drivers/cxl/acpi.c | 13 +++++++++++- drivers/cxl/core/Makefile | 1 - drivers/cxl/core/acpi.c | 11 ---------- drivers/cxl/core/core.h | 2 -- drivers/cxl/core/port.c | 5 ++++- drivers/cxl/core/region.c | 5 ++++- drivers/cxl/cxl.h | 10 ++++++++- tools/testing/cxl/Kbuild | 2 +- tools/testing/cxl/test/cxl.c | 39 +++++++++++++++++++++++++++++++++++ tools/testing/cxl/test/mock.c | 19 +++++++++++++++++ tools/testing/cxl/test/mock.h | 3 +++ 11 files changed, 91 insertions(+), 19 deletions(-) delete mode 100644 drivers/cxl/core/acpi.c
drivers/cxl/acpi.c +12 -1
@@ -335,6 +335,17 @@ static int add_or_reset_cxl_resource(struct resource *parent, struct resource *rreturn rc; } +static int cxl_acpi_get_extended_linear_cache_size (struct resource *backing_res, +int nid, +resource_size_t *size) +{ +return hmat_get_extended_linear_cache_size (backing_res, nid, size); +} + +static const struct cxl_rd_ops acpi_rd_ops = { + .get_extended_linear_cache_size = cxl_acpi_get_extended_linear_cache_size, +}; + DEFINE_FREE(put_cxlrd, struct cxl_root_decoder *, if (!IS_ERR_OR_NULL(_T)) put_device(&_T->cxlsd.cxld.dev)) DEFINE_FREE(del_cxl_resource, struct resource *, if (_T) del_cxl_resource(_T))
@@ -373,7 +384,7 @@ static int __cxl_parse_cfmws(struct acpi_cedt_cfmws *cfmws,return rc; struct cxl_root_decoder *cxlrd __free(put_cxlrd) = -cxl_root_decoder_alloc (root_port, ways); +cxl_root_decoder_alloc (root_port, ways, &acpi_rd_ops);if (IS_ERR (cxlrd))return PTR_ERR (cxlrd);
drivers/cxl/core/Makefile +0 -1
@@ -15,7 +15,6 @@ cxl_core-y += hdm.o cxl_core-y += pmu.o cxl_core-y += cdat.o cxl_core-y += ras.o -cxl_core-y += acpi.o cxl_core-$(CONFIG_TRACING) += trace.o cxl_core-$(CONFIG_CXL_REGION) += region.o cxl_core-$(CONFIG_CXL_MCE) += mce.o
drivers/cxl/core/acpi.c deleted +0 -11
@@ -1,11 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* Copyright(c) 2024 Intel Corporation. All rights reserved. */ -#include <linux/acpi.h> -#include "cxl.h" -#include "core.h" - -int cxl_acpi_get_extended_linear_cache_size (struct resource *backing_res, -int nid,resource_size_t *size) -{ -return hmat_get_extended_linear_cache_size (backing_res, nid, size); -}
drivers/cxl/core/core.h +0 -2
@@ -120,8 +120,6 @@ int cxl_port_get_switch_dport_bandwidth(struct cxl_port *port,int cxl_ras_init (void );void cxl_ras_exit (void );int cxl_gpf_port_setup (struct cxl_dport *dport); -int cxl_acpi_get_extended_linear_cache_size (struct resource *backing_res, -int nid,resource_size_t *size);#ifdef CONFIG_CXL_FEATURES struct cxl_feat_entry *
drivers/cxl/core/port.c +4 -1
@@ -1793,6 +1793,7 @@ static int cxl_switch_decoder_init(struct cxl_port *port,* cxl_root_decoder_alloc - Allocate a root level decoder * @port: owning CXL root of this decoder * @nr_targets: static number of downstream targets +* @ops: root decoder callback operations * * Return: A new cxl decoder to be registered by cxl_decoder_add(). A * 'CXL root' decoder is one that decodes from a top-level / static platform
@@ -1800,7 +1801,8 @@ static int cxl_switch_decoder_init(struct cxl_port *port,* topology. */ struct cxl_root_decoder *cxl_root_decoder_alloc (struct cxl_port *port, -unsigned int nr_targets) +unsigned int nr_targets, +const struct cxl_rd_ops *ops) {struct cxl_root_decoder *cxlrd;struct cxl_switch_decoder *cxlsd;
@@ -1839,6 +1841,7 @@ struct cxl_root_decoder *cxl_root_decoder_alloc(struct cxl_port *port,atomic_set (&cxlrd->region_id, rc); cxlrd->qos_class =CXL_QOS_CLASS_INVALID ; + cxlrd->ops = ops;return cxlrd; }EXPORT_SYMBOL_NS_GPL (cxl_root_decoder_alloc,"CXL" );
drivers/cxl/core/region.c +4 -1
@@ -3287,7 +3287,10 @@ static int cxl_extended_linear_cache_resize(struct cxl_region *cxlr,resource_size_t cache_size, start;int rc; - rc =cxl_acpi_get_extended_linear_cache_size (res, nid, &cache_size); +if (!cxlrd->ops || !cxlrd->ops->get_extended_linear_cache_size) +return -EOPNOTSUPP ; + + rc = cxlrd->ops->get_extended_linear_cache_size (res, nid, &cache_size);if (rc)return rc;
drivers/cxl/cxl.h +9 -1
@@ -420,6 +420,11 @@ struct cxl_switch_decoder {struct cxl_root_decoder ;typedef u64 (*cxl_hpa_to_spa_fn )(struct cxl_root_decoder *cxlrd,u64 hpa); +struct cxl_rd_ops { +int (*get_extended_linear_cache_size)(struct resource *backing_res, +int nid,resource_size_t *size); +}; +/** * struct cxl_root_decoder - Static platform CXL address decoder * @res: host / parent resource for region allocations
@@ -428,6 +433,7 @@ typedef u64 (*cxl_hpa_to_spa_fn)(struct cxl_root_decoder *cxlrd, u64 hpa);* @platform_data: platform specific configuration data * @range_lock: sync region autodiscovery by address range * @qos_class: QoS performance class cookie +* @ops: root decoder specific operations * @cxlsd: base cxl switch decoder */ struct cxl_root_decoder {
@@ -437,6 +443,7 @@ struct cxl_root_decoder {void *platform_data;struct mutex range_lock;int qos_class; +const struct cxl_rd_ops *ops;struct cxl_switch_decoder cxlsd; };
@@ -775,7 +782,8 @@ bool is_root_decoder(struct device *dev);bool is_switch_decoder (struct device *dev);bool is_endpoint_decoder (struct device *dev);struct cxl_root_decoder *cxl_root_decoder_alloc (struct cxl_port *port, -unsigned int nr_targets); +unsigned int nr_targets, +const struct cxl_rd_ops *ops);struct cxl_switch_decoder *cxl_switch_decoder_alloc (struct cxl_port *port,unsigned int nr_targets);int cxl_decoder_add (struct cxl_decoder *cxld,int *target_map);
tools/testing/cxl/Kbuild +1 -1
@@ -15,6 +15,7 @@ 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=hmat_get_extended_linear_cache_size DRIVERS := ../../../drivers CXL_SRC := $(DRIVERS)/cxl
@@ -62,7 +63,6 @@ cxl_core-y += $(CXL_CORE_SRC)/hdm.o cxl_core-y += $(CXL_CORE_SRC)/pmu.o cxl_core-y += $(CXL_CORE_SRC)/cdat.o cxl_core-y += $(CXL_CORE_SRC)/ras.o -cxl_core-y += $(CXL_CORE_SRC)/acpi.o cxl_core-$(CONFIG_TRACING) += $(CXL_CORE_SRC)/trace.o cxl_core-$(CONFIG_CXL_REGION) += $(CXL_CORE_SRC)/region.o cxl_core-$(CONFIG_CXL_MCE) += $(CXL_CORE_SRC)/mce.o
tools/testing/cxl/test/cxl.c +39 -0
@@ -470,6 +470,43 @@ struct cxl_cedt_context {struct device *dev; }; +static int match_root_decoder_by_range (struct device *dev,const void *data) +{ +const struct range *r1, *r2 = data; +struct cxl_root_decoder *cxlrd; + +if (!is_root_decoder (dev)) +return 0 ; + + cxlrd =to_cxl_root_decoder (dev); + r1 = &cxlrd->cxlsd.cxld.hpa_range; +return range_contains (r1, r2); +} + +static int mock_hmat_get_extended_linear_cache_size (struct resource *backing_res, +int nid,resource_size_t *size) +{ +struct range backing_range = { + .start = backing_res->start, + .end = backing_res->end, + }; +struct cxl_decoder *cxld; +struct cxl_port *port; +struct device *dev; + + dev =bus_find_device (&cxl_bus_type,NULL , &backing_range, + match_root_decoder_by_range); +if (!dev) +return -ENODEV ; + + cxld =to_cxl_decoder (dev); + port =to_cxl_port (cxld->dev.parent); +if (is_mock_dev (port->uport_dev)) +return -EOPNOTSUPP ; + +return hmat_get_extended_linear_cache_size (backing_res, nid, size); +} +static int mock_acpi_table_parse_cedt (enum acpi_cedt_type id,acpi_tbl_entry_handler_arg handler_arg,void *arg)
@@ -1040,6 +1077,8 @@ static struct cxl_mock_ops cxl_mock_ops = { .devm_cxl_enumerate_decoders = mock_cxl_enumerate_decoders, .cxl_endpoint_parse_cdat = mock_cxl_endpoint_parse_cdat, .list = LIST_HEAD_INIT(cxl_mock_ops.list), + .hmat_get_extended_linear_cache_size = + mock_hmat_get_extended_linear_cache_size, };static void mock_companion (struct acpi_device *adev,struct device *dev)
tools/testing/cxl/test/mock.c +19 -0
@@ -78,6 +78,25 @@ int __wrap_acpi_table_parse_cedt(enum acpi_cedt_type id, }EXPORT_SYMBOL_NS_GPL (__wrap_acpi_table_parse_cedt,"ACPI" ); +int __wrap_hmat_get_extended_linear_cache_size (struct resource *res, +int nid, +resource_size_t *size) +{ +int index; +struct cxl_mock_ops *ops =get_cxl_mock_ops (&index); +int rc; + +if (ops) + rc = ops->hmat_get_extended_linear_cache_size (res, nid, size); +else + rc =hmat_get_extended_linear_cache_size (res, nid, size); + +put_cxl_mock_ops (index); + +return rc; +} +EXPORT_SYMBOL_NS_GPL (__wrap_hmat_get_extended_linear_cache_size,"CXL" ); + acpi_status __wrap_acpi_evaluate_integer(acpi_handle handle, acpi_string pathname, struct acpi_object_list *arguments,
tools/testing/cxl/test/mock.h +3 -0
@@ -26,6 +26,9 @@ struct cxl_mock_ops {int (*devm_cxl_enumerate_decoders)(struct cxl_hdm *hdm,struct cxl_endpoint_dvsec_info *info);void (*cxl_endpoint_parse_cdat)(struct cxl_port *port); +int (*hmat_get_extended_linear_cache_size)(struct resource *backing_res, +int nid, +resource_size_t *size); };void register_cxl_mock_ops (struct cxl_mock_ops *ops);
base-commit: 19272b37aa4f83ca52bdf9c16d5d81bdd1354494
Signature · 1 line
2.49.0
Quoted 10 lines · On Mon, 9 Jun 2025 17:02:37 -0700 Dave Jiang <[email protected]> wrote:
It was a mistake to introduce
core/acpi.cand putting ACPI dependency oncxl_corewhen adding the extended linear cache support. Add a callback in thecxl_root_decoderto retrieve the extended linear cache size from ACPI via thecxl_acpidriver.In order to deal with
cxl_test, a device parameter had to be introduced to thehmat_get_extended_linear_cache_size()call in order to help with the mock wrapped function from ACPI. Even though the 'struct device' is not used by the actualhmat_get_extended_linear_cache_size()function.
Quoted 7 lines
Signed-off-by Dave Jiang <[email protected]>---
v2:
- Remove introduction of 'struct device' parameter tohmat_get_extended_linear_cache_size().
- Drop comment on flex array (Jonathan)
- Renamecxl_rcd_opstocxl_rd_opsfor 'root decoder ops' (Fabio)
There is a lot of indirection going on in here, but I think I understand why it is all there. A few comments inline. The device reference one just passes what I'm comfortable assuming you will just fix it up though so I'll wait for v3 for tags.
J
tools/testing/cxl/test/cxl.c struct cxl_cedt_context { · line 475
Quoted 11 lines
tools/testing/cxl/test/cxl.c +3
-0@@ -470,6 +470,43 @@ struct cxl_cedt_context {struct device *dev; }; +static int match_root_decoder_by_range (struct device *dev,const void *data) +{ +const struct range *r1, *r2 = data;
I'm fussy about this, but I'd not mix a non assigned and assigned declaration in one line. (Trivial comment though so ignore if you like)
Quoted 13 lines
tools/testing/cxl/test/cxl.c +13
-0+struct cxl_root_decoder *cxlrd; + +if (!is_root_decoder (dev)) +return 0 ; + + cxlrd =to_cxl_root_decoder (dev); + r1 = &cxlrd->cxlsd.cxld.hpa_range; +return range_contains (r1, r2); +} + +static int mock_hmat_get_extended_linear_cache_size (struct resource *backing_res, +int nid,resource_size_t *size) +{
tools/testing/cxl/test/cxl.c struct cxl_cedt_context { · line 498
Quoted 10 lines
tools/testing/cxl/test/cxl.c +10
-0+struct range backing_range = { + .start = backing_res->start, + .end = backing_res->end, + }; +struct cxl_decoder *cxld; +struct cxl_port *port; +struct device *dev; + + dev =bus_find_device (&cxl_bus_type,NULL , &backing_range, + match_root_decoder_by_range);
This grabs a reference to the device. Do we need a put_device() somewhere?
Quoted 15 lines
tools/testing/cxl/test/cxl.c +11
-0+if (!dev) +return -ENODEV ; + + cxld =to_cxl_decoder (dev); + port =to_cxl_port (cxld->dev.parent); +if (is_mock_dev (port->uport_dev)) +return -EOPNOTSUPP ; + +return hmat_get_extended_linear_cache_size (backing_res, nid, size); +} +static int mock_acpi_table_parse_cedt (enum acpi_cedt_type id,acpi_tbl_entry_handler_arg handler_arg,void *arg)
tools/testing/cxl/test/cxl.c static struct cxl_mock_ops cxl_mock_ops = { · line 1082
Quoted 6 lines
tools/testing/cxl/test/cxl.c +2
-0@@ -1040,6 +1077,8 @@ static struct cxl_mock_ops cxl_mock_ops = { .devm_cxl_enumerate_decoders = mock_cxl_enumerate_decoders, .cxl_endpoint_parse_cdat = mock_cxl_endpoint_parse_cdat, .list = LIST_HEAD_INIT(cxl_mock_ops.list), + .hmat_get_extended_linear_cache_size = + mock_hmat_get_extended_linear_cache_size, };
Why is list set last in here? It's first in the structure and we now end up with the callbacks not next to each other which looks weird. Maybe move the LIST_HEAD_INIT() up, or if not move the new callback setting up one line to next to parse_cdat.
Dave Jiang
maintainerQuoted 20 lines · Jonathan Cameron
Quoted 10 lines · On Mon, 9 Jun 2025 17:02:37 -0700 Dave Jiang <[email protected]> wrote:
It was a mistake to introduce
core/acpi.cand putting ACPI dependency oncxl_corewhen adding the extended linear cache support. Add a callback in thecxl_root_decoderto retrieve the extended linear cache size from ACPI via thecxl_acpidriver.In order to deal with
cxl_test, a device parameter had to be introduced to thehmat_get_extended_linear_cache_size()call in order to help with the mock wrapped function from ACPI. Even though the 'struct device' is not used by the actualhmat_get_extended_linear_cache_size()function.Quoted 7 lines
Signed-off-by Dave Jiang <[email protected]>---
v2:
- Remove introduction of 'struct device' parameter tohmat_get_extended_linear_cache_size().
- Drop comment on flex array (Jonathan)
- Renamecxl_rcd_opstocxl_rd_opsfor 'root decoder ops' (Fabio)
Quoted 4 lines
There is a lot of indirection going on in here, but I think I understand why it is all there. A few comments inline. The device reference one just passes what I'm comfortable assuming you will just fix it up though so I'll wait for v3 for tags.
Yeah I figured it's better off to push all the complexity to cxl_test.
Quoted 11 lines
J
Quoted 8 lines
tools/testing/cxl/test/cxl.c +0
-0@@ -470,6 +470,43 @@ struct cxl_cedt_context {struct device *dev; };
Quoted 7 lines
tools/testing/cxl/test/cxl.c struct cxl_cedt_context { · line 475
Quoted 3 lines
tools/testing/cxl/test/cxl.c +3
-0+static int match_root_decoder_by_range (struct device *dev,const void *data) +{ +const struct range *r1, *r2 = data;I'm fussy about this, but I'd not mix a non assigned and assigned declaration in one line. (Trivial comment though so ignore if you like)
I can change it. Original code was just copied directly from core/region.c.
Quoted 18 lines
Quoted 18 lines
tools/testing/cxl/test/cxl.c +18
-0+struct cxl_root_decoder *cxlrd; + +if (!is_root_decoder (dev)) +return 0 ; + + cxlrd =to_cxl_root_decoder (dev); + r1 = &cxlrd->cxlsd.cxld.hpa_range; +return range_contains (r1, r2); +} + +static int mock_hmat_get_extended_linear_cache_size (struct resource *backing_res, +int nid,resource_size_t *size) +{ +struct range backing_range = { + .start = backing_res->start, + .end = backing_res->end, + }; +struct cxl_decoder *cxld;
Quoted 8 lines
tools/testing/cxl/test/cxl.c struct cxl_cedt_context { · line 498
Quoted 5 lines
tools/testing/cxl/test/cxl.c +5
-0+struct cxl_port *port; +struct device *dev; + + dev =bus_find_device (&cxl_bus_type,NULL , &backing_range, + match_root_decoder_by_range);This grabs a reference to the device. Do we need a
put_device()somewhere?
Yes. Forgot to add the __free(put_device).
Quoted 19 lines
Quoted 19 lines
tools/testing/cxl/test/cxl.c +11
-0+if (!dev) +return -ENODEV ; + + cxld =to_cxl_decoder (dev); + port =to_cxl_port (cxld->dev.parent); +if (is_mock_dev (port->uport_dev)) +return -EOPNOTSUPP ; + +return hmat_get_extended_linear_cache_size (backing_res, nid, size); +} +static int mock_acpi_table_parse_cedt (enum acpi_cedt_type id,acpi_tbl_entry_handler_arg handler_arg,void *arg)@@ -1040,6 +1077,8 @@ static struct cxl_mock_ops cxl_mock_ops = { .devm_cxl_enumerate_decoders = mock_cxl_enumerate_decoders, .cxl_endpoint_parse_cdat = mock_cxl_endpoint_parse_cdat, .list = LIST_HEAD_INIT(cxl_mock_ops.list),
Quoted 8 lines
tools/testing/cxl/test/cxl.c static struct cxl_mock_ops cxl_mock_ops = { · line 1082
Quoted 3 lines
tools/testing/cxl/test/cxl.c +2
-0+ .hmat_get_extended_linear_cache_size = + mock_hmat_get_extended_linear_cache_size, };Why is list set last in here? It's first in the structure and we now end up with the callbacks not next to each other which looks weird. Maybe move the
LIST_HEAD_INIT()up, or if not move the new callback setting up one line to next toparse_cdat.
I'll move it a line up.
Quoted 3 lines
Dave Jiang
maintainerQuoted 11 lines · Dave Jiang
It was a mistake to introduce
core/acpi.cand putting ACPI dependency oncxl_corewhen adding the extended linear cache support. Add a callback in thecxl_root_decoderto retrieve the extended linear cache size from ACPI via thecxl_acpidriver.In order to deal with
cxl_test, a device parameter had to be introduced to thehmat_get_extended_linear_cache_size()call in order to help with the mock wrapped function from ACPI. Even though the 'struct device' is not used by the actualhmat_get_extended_linear_cache_size()function.Signed-off-by Dave Jiang <[email protected]>
Please ignore this patch. Scripting mistake. See v2.
Quoted 334 lines
--- drivers/acpi/numa/hmat.c | 4 +++- drivers/cxl/acpi.c | 15 ++++++++++++++- drivers/cxl/core/Makefile | 1 - drivers/cxl/core/acpi.c | 11 ----------- drivers/cxl/core/core.h | 2 -- drivers/cxl/core/port.c | 5 ++++- drivers/cxl/core/region.c | 6 +++++- drivers/cxl/cxl.h | 12 +++++++++++- include/linux/acpi.h | 6 ++++-- tools/testing/cxl/Kbuild | 2 +- tools/testing/cxl/test/cxl.c | 20 ++++++++++++++++++++ tools/testing/cxl/test/mock.c | 23 +++++++++++++++++++++++ tools/testing/cxl/test/mock.h | 4 ++++ 13 files changed, 89 insertions(+), 22 deletions(-) delete mode 100644 drivers/cxl/core/acpi.cdrivers/acpi/numa/hmat.c +3
-1@@ -110,6 +110,7 @@ static struct memory_target *find_mem_target(unsigned int mem_pxm)/** * hmat_get_extended_linear_cache_size - Retrieve the extended linear cache size +* @dev: device for debug output * @backing_res: resource from the backing media * @nid: node id for the memory region * @cache_size: (Output) size of extended linear cache. @@ -117,7 +118,8 @@ static struct memory_target *find_mem_target(unsigned int mem_pxm)* Return: 0 on success. Errno on failure. * */ -int hmat_get_extended_linear_cache_size (struct resource *backing_res,int nid, +int hmat_get_extended_linear_cache_size (struct device *dev, +struct resource *backing_res,int nid,resource_size_t *cache_size) {unsigned int pxm =node_to_pxm (nid);drivers/cxl/acpi.c +14
-1@@ -337,6 +337,19 @@ static int add_or_reset_cxl_resource(struct resource *parent, struct resource *rreturn rc; } +static int cxl_acpi_get_extended_linear_cache_size (struct cxl_root_decoder *cxlrd, +struct resource *backing_res, +int nid, +resource_size_t *size) +{ +return hmat_get_extended_linear_cache_size (&cxlrd->cxlsd.cxld.dev, + backing_res, nid, size); +} + +static const struct cxl_rcd_ops acpi_rcd_ops = { + .get_extended_linear_cache_size = cxl_acpi_get_extended_linear_cache_size, +}; + DEFINE_FREE(put_cxlrd, struct cxl_root_decoder *, if (!IS_ERR_OR_NULL(_T)) put_device(&_T->cxlsd.cxld.dev)) DEFINE_FREE(del_cxl_resource, struct resource *, if (_T) del_cxl_resource(_T))@@ -375,7 +388,7 @@ static int __cxl_parse_cfmws(struct acpi_cedt_cfmws *cfmws,return rc; struct cxl_root_decoder *cxlrd __free(put_cxlrd) = -cxl_root_decoder_alloc (root_port, ways); +cxl_root_decoder_alloc (root_port, ways, &acpi_rcd_ops);if (IS_ERR (cxlrd))return PTR_ERR (cxlrd);drivers/cxl/core/Makefile +0
-1@@ -15,7 +15,6 @@ cxl_core-y += hdm.o cxl_core-y += pmu.o cxl_core-y += cdat.o cxl_core-y += ras.o -cxl_core-y += acpi.o cxl_core-$(CONFIG_TRACING) += trace.o cxl_core-$(CONFIG_CXL_REGION) += region.o cxl_core-$(CONFIG_CXL_MCE) += mce.odrivers/cxl/core/acpi.c deleted +0
-11@@ -1,11 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* Copyright(c) 2024 Intel Corporation. All rights reserved. */ -#include <linux/acpi.h> -#include "cxl.h" -#include "core.h" - -int cxl_acpi_get_extended_linear_cache_size (struct resource *backing_res, -int nid,resource_size_t *size) -{ -return hmat_get_extended_linear_cache_size (backing_res, nid, size); -}drivers/cxl/core/core.h +0
-2@@ -120,8 +120,6 @@ int cxl_port_get_switch_dport_bandwidth(struct cxl_port *port,int cxl_ras_init (void );void cxl_ras_exit (void );int cxl_gpf_port_setup (struct cxl_dport *dport); -int cxl_acpi_get_extended_linear_cache_size (struct resource *backing_res, -int nid,resource_size_t *size);#ifdef CONFIG_CXL_FEATURES size_t cxl_get_feature(struct cxl_mailbox *cxl_mbox, const uuid_t *feat_uuid,drivers/cxl/core/port.c +4
-1@@ -1800,6 +1800,7 @@ static int cxl_switch_decoder_init(struct cxl_port *port,* cxl_root_decoder_alloc - Allocate a root level decoder * @port: owning CXL root of this decoder * @nr_targets: static number of downstream targets +* @ops: root decoder callback operations * * Return: A new cxl decoder to be registered by cxl_decoder_add(). A * 'CXL root' decoder is one that decodes from a top-level / static platform @@ -1807,7 +1808,8 @@ static int cxl_switch_decoder_init(struct cxl_port *port,* topology. */ struct cxl_root_decoder *cxl_root_decoder_alloc (struct cxl_port *port, -unsigned int nr_targets) +unsigned int nr_targets, +const struct cxl_rcd_ops *ops) {struct cxl_root_decoder *cxlrd;struct cxl_switch_decoder *cxlsd;@@ -1846,6 +1848,7 @@ struct cxl_root_decoder *cxl_root_decoder_alloc(struct cxl_port *port,atomic_set (&cxlrd->region_id, rc); cxlrd->qos_class =CXL_QOS_CLASS_INVALID ; + cxlrd->ops = ops;return cxlrd; }EXPORT_SYMBOL_NS_GPL (cxl_root_decoder_alloc,"CXL" );drivers/cxl/core/region.c +5
-1@@ -3239,7 +3239,11 @@ static int cxl_extended_linear_cache_resize(struct cxl_region *cxlr,resource_size_t cache_size, start;int rc; - rc =cxl_acpi_get_extended_linear_cache_size (res, nid, &cache_size); +if (!cxlrd->ops || !cxlrd->ops->get_extended_linear_cache_size) +return -EOPNOTSUPP ; + + rc = cxlrd->ops->get_extended_linear_cache_size (cxlrd, res, nid, + &cache_size);if (rc)return rc;drivers/cxl/cxl.h +11
-1@@ -420,6 +420,12 @@ struct cxl_switch_decoder {struct cxl_root_decoder ;typedef u64 (*cxl_hpa_to_spa_fn )(struct cxl_root_decoder *cxlrd,u64 hpa); +struct cxl_rcd_ops { +int (*get_extended_linear_cache_size)(struct cxl_root_decoder *cxlrd, +struct resource *backing_res, +int nid,resource_size_t *size); +}; +/** * struct cxl_root_decoder - Static platform CXL address decoder * @res: host / parent resource for region allocations @@ -428,6 +434,7 @@ typedef u64 (*cxl_hpa_to_spa_fn)(struct cxl_root_decoder *cxlrd, u64 hpa);* @platform_data: platform specific configuration data * @range_lock: sync region autodiscovery by address range * @qos_class: QoS performance class cookie +* @ops: root decoder specific operations * @cxlsd: base cxl switch decoder */ struct cxl_root_decoder {@@ -437,7 +444,9 @@ struct cxl_root_decoder {void *platform_data;struct mutex range_lock;int qos_class; +const struct cxl_rcd_ops *ops;struct cxl_switch_decoder cxlsd; +/* DO NOT ADD ANYTHING AFTER THIS LINE. cxlsd trails with a flex array */ };/* @@ -772,7 +781,8 @@ bool is_root_decoder(struct device *dev);bool is_switch_decoder (struct device *dev);bool is_endpoint_decoder (struct device *dev);struct cxl_root_decoder *cxl_root_decoder_alloc (struct cxl_port *port, -unsigned int nr_targets); +unsigned int nr_targets, +const struct cxl_rcd_ops *ops);struct cxl_switch_decoder *cxl_switch_decoder_alloc (struct cxl_port *port,unsigned int nr_targets);int cxl_decoder_add (struct cxl_decoder *cxld,int *target_map);include/linux/acpi.h +4
-2@@ -1095,10 +1095,12 @@ static inline acpi_handle acpi_get_processor_handle(int cpu)#endif /* !CONFIG_ACPI */ #ifdef CONFIG_ACPI_HMAT -int hmat_get_extended_linear_cache_size (struct resource *backing_res,int nid, +int hmat_get_extended_linear_cache_size (struct device *dev, +struct resource *backing_res,int nid,resource_size_t *size);#else -static inline int hmat_get_extended_linear_cache_size (struct resource *backing_res, +static inline int hmat_get_extended_linear_cache_size (struct device *dev, +struct resource *backing_res,int nid,resource_size_t *size) {return -EOPNOTSUPP ;tools/testing/cxl/Kbuild +1
-1@@ -15,6 +15,7 @@ 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=hmat_get_extended_linear_cache_size DRIVERS := ../../../drivers CXL_SRC := $(DRIVERS)/cxl@@ -62,7 +63,6 @@ cxl_core-y += $(CXL_CORE_SRC)/hdm.o cxl_core-y += $(CXL_CORE_SRC)/pmu.o cxl_core-y += $(CXL_CORE_SRC)/cdat.o cxl_core-y += $(CXL_CORE_SRC)/ras.o -cxl_core-y += $(CXL_CORE_SRC)/acpi.o cxl_core-$(CONFIG_TRACING) += $(CXL_CORE_SRC)/trace.o cxl_core-$(CONFIG_CXL_REGION) += $(CXL_CORE_SRC)/region.o cxl_core-$(CONFIG_CXL_MCE) += $(CXL_CORE_SRC)/mce.otools/testing/cxl/test/cxl.c +20
-0@@ -470,6 +470,24 @@ struct cxl_cedt_context {struct device *dev; }; +static int mock_hmat_get_extended_linear_cache_size (struct device *dev, +struct resource *backing_res, +int nid,resource_size_t *size) +{ +struct cxl_decoder *cxld; +struct cxl_port *port; + +if (!is_root_decoder (dev)) +return -EINVAL ; + + cxld =to_cxl_decoder (dev); + port =to_cxl_port (cxld->dev.parent); +if (is_mock_port (&port->dev)) +return -EOPNOTSUPP ; + +return hmat_get_extended_linear_cache_size (dev, backing_res, nid, size); +} +static int mock_acpi_table_parse_cedt (enum acpi_cedt_type id,acpi_tbl_entry_handler_arg handler_arg,void *arg)@@ -1040,6 +1058,8 @@ static struct cxl_mock_ops cxl_mock_ops = { .devm_cxl_enumerate_decoders = mock_cxl_enumerate_decoders, .cxl_endpoint_parse_cdat = mock_cxl_endpoint_parse_cdat, .list = LIST_HEAD_INIT(cxl_mock_ops.list), + .hmat_get_extended_linear_cache_size = + mock_hmat_get_extended_linear_cache_size, };static void mock_companion (struct acpi_device *adev,struct device *dev)tools/testing/cxl/test/mock.c +23
-0@@ -78,6 +78,29 @@ int __wrap_acpi_table_parse_cedt(enum acpi_cedt_type id, }EXPORT_SYMBOL_NS_GPL (__wrap_acpi_table_parse_cedt,"ACPI" ); +int __wrap_hmat_get_extended_linear_cache_size (struct device *dev, +struct resource *backing_res, +int nid, +resource_size_t *size) +{ +int index; +struct cxl_mock_ops *ops =get_cxl_mock_ops (&index); +int rc; + +if (ops) + rc = ops->hmat_get_extended_linear_cache_size (dev, + backing_res, nid, + size); +else + rc =hmat_get_extended_linear_cache_size (dev, backing_res, + nid, size); + +put_cxl_mock_ops (index); + +return rc; +} +EXPORT_SYMBOL_NS_GPL (__wrap_hmat_get_extended_linear_cache_size,"CXL" ); + acpi_status __wrap_acpi_evaluate_integer(acpi_handle handle, acpi_string pathname, struct acpi_object_list *arguments,tools/testing/cxl/test/mock.h +4
-0@@ -26,6 +26,10 @@ struct cxl_mock_ops {int (*devm_cxl_enumerate_decoders)(struct cxl_hdm *hdm,struct cxl_endpoint_dvsec_info *info);void (*cxl_endpoint_parse_cdat)(struct cxl_port *port); +int (*hmat_get_extended_linear_cache_size)(struct device *dev, +struct resource *backing_res, +int nid, +resource_size_t *size); };void register_cxl_mock_ops (struct cxl_mock_ops *ops);base-commit:
0ff41df1cb268fc69e703a08a57ee14ae967d0ca