Add support of cxl lsa 2.1 using NDD_CXL_LABEL flag. It also creates cxl region based on region information parsed from LSA.
Signed-off-by: Neeraj Kumar <s.nee...@samsung.com> --- drivers/cxl/core/region.c | 58 +++++++++++++++++++++++++++++++++++++++ drivers/cxl/cxl.h | 4 +++ drivers/cxl/pmem.c | 2 ++ 3 files changed, 64 insertions(+) diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index 8578e046aa78..19ccdd136da0 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -2665,6 +2665,64 @@ static ssize_t create_ram_region_show(struct device *dev, return __create_region_show(to_cxl_root_decoder(dev), buf); } +static int match_free_ep_decoder(struct device *dev, const void *data) +{ + struct cxl_decoder *cxld = to_cxl_decoder(dev); + + return !cxld->region; +} + +static struct cxl_decoder *cxl_find_free_ep_decoder(struct cxl_port *port) +{ + struct device *dev; + + dev = device_find_child(&port->dev, NULL, match_free_ep_decoder); + if (!dev) + return NULL; + + /* Release device ref taken via device_find_child() */ + put_device(dev); + return to_cxl_decoder(dev); +} + +void create_pmem_region(struct nvdimm *nvdimm) +{ + struct cxl_nvdimm *cxl_nvd; + struct cxl_memdev *cxlmd; + struct cxl_nvdimm_bridge *cxl_nvb; + struct cxl_pmem_region_params *params; + struct cxl_root_decoder *cxlrd; + struct cxl_decoder *cxld; + struct cxl_region *cxlr; + + if (!nvdimm_has_cxl_region(nvdimm)) + return; + + lockdep_assert_held(&cxl_rwsem.region); + cxl_nvd = nvdimm_provider_data(nvdimm); + params = nvdimm_get_cxl_region_param(nvdimm); + cxlmd = cxl_nvd->cxlmd; + cxl_nvb = cxlmd->cxl_nvb; + cxlrd = cxlmd->cxlrd; + + /* + * FIXME: Limitation: Region creation support only for + * interleave way == 1 + */ + if (!(params->nlabel == 1)) + dev_info(&cxlmd->dev, + "Region Creation is not supported with iw > 1\n"); + else { + cxld = cxl_find_free_ep_decoder(cxlmd->endpoint); + cxlr = cxl_create_region(cxlrd, CXL_PARTMODE_PMEM, + atomic_read(&cxlrd->region_id), + params, cxld); + if (IS_ERR(cxlr)) + dev_info(&cxlmd->dev, "Region Creation failed\n"); + } +} +EXPORT_SYMBOL_NS_GPL(create_pmem_region, "CXL"); + struct cxl_region *cxl_create_region(struct cxl_root_decoder *cxlrd, enum cxl_partition_mode mode, int id, struct cxl_pmem_region_params *params, diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h index e249372b642d..51c56069f451 100644 --- a/drivers/cxl/cxl.h +++ b/drivers/cxl/cxl.h @@ -870,6 +870,7 @@ struct cxl_region *cxl_create_region(struct cxl_root_decoder *cxlrd, enum cxl_partition_mode mode, int id, struct cxl_pmem_region_params *params, struct cxl_decoder *cxld); +void create_pmem_region(struct nvdimm *nvdimm); #else static inline bool is_cxl_pmem_region(struct device *dev) { @@ -903,6 +904,9 @@ cxl_create_region(struct cxl_root_decoder *cxlrd, { return NULL; } +static inline void create_pmem_region(struct nvdimm *nvdimm) +{ +} #endif void cxl_endpoint_parse_cdat(struct cxl_port *port); diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c index 38a5bcdc68ce..4a7428a5a82c 100644 --- a/drivers/cxl/pmem.c +++ b/drivers/cxl/pmem.c @@ -135,6 +135,7 @@ static int cxl_nvdimm_probe(struct device *dev) return rc; set_bit(NDD_LABELING, &flags); + set_bit(NDD_CXL_LABEL, &flags); set_bit(NDD_REGISTER_SYNC, &flags); set_bit(ND_CMD_GET_CONFIG_SIZE, &cmd_mask); set_bit(ND_CMD_GET_CONFIG_DATA, &cmd_mask); @@ -155,6 +156,7 @@ static int cxl_nvdimm_probe(struct device *dev) return -ENOMEM; dev_set_drvdata(dev, nvdimm); + create_pmem_region(nvdimm); return devm_add_action_or_reset(dev, unregister_nvdimm, nvdimm); } -- 2.34.1