Commit bdf2d9fd authored by Li Ming's avatar Li Ming Committed by Dave Jiang
Browse files

cxl/core: Using cxl_resource_contains_addr() to check address availability 



Helper function cxl_resource_contains_addr() can be used to check if a
resource range contains an input address. Use it to replace all code
that checks whether a resource range contains a DPA/HPA/SPA.

Signed-off-by: default avatarLi Ming <ming.li@zohomail.com>
Reviewed-by: default avatarDave Jiang <dave.jiang@intel.com>
Reviewed-by: default avatarAlison Schofield <alison.schofield@intel.com>
Reviewed-by: default avatarJonathan Cameron <jonathan.cameron@huawei.com>
Link: https://patch.msgid.link/20250711032357.127355-4-ming.li@zohomail.com


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

drivers/cxl/core/edac.c

+2 −2
Original line number Diff line number Diff line
@@ -1523,7 +1523,7 @@ static int cxl_mem_sparing_set_dpa(struct device *dev, void *drv_data, u64 dpa) 
	struct cxl_memdev *cxlmd = ctx->cxlmd;

	struct cxl_dev_state *cxlds = cxlmd->cxlds;



	if (dpa < cxlds->dpa_res.start || dpa > cxlds->dpa_res.end)

	if (!cxl_resource_contains_addr(&cxlds->dpa_res, dpa))

		return -EINVAL;



	ctx->dpa = dpa;
@@ -1892,7 +1892,7 @@ static int cxl_ppr_set_dpa(struct device *dev, void *drv_data, u64 dpa) 
	struct cxl_memdev *cxlmd = cxl_ppr_ctx->cxlmd;

	struct cxl_dev_state *cxlds = cxlmd->cxlds;



	if (dpa < cxlds->dpa_res.start || dpa > cxlds->dpa_res.end)

	if (!cxl_resource_contains_addr(&cxlds->dpa_res, dpa))

		return -EINVAL;



	cxl_ppr_ctx->dpa = dpa;

drivers/cxl/core/memdev.c

+1 −1
Original line number Diff line number Diff line
@@ -267,7 +267,7 @@ static int cxl_validate_poison_dpa(struct cxl_memdev *cxlmd, u64 dpa) 
		dev_dbg(cxlds->dev, "device has no dpa resource\n");

		return -EINVAL;

	}

	if (dpa < cxlds->dpa_res.start || dpa > cxlds->dpa_res.end) {

	if (!cxl_resource_contains_addr(&cxlds->dpa_res, dpa)) {

		dev_dbg(cxlds->dev, "dpa:0x%llx not in resource:%pR\n",

			dpa, &cxlds->dpa_res);

		return -EINVAL;

drivers/cxl/core/region.c

+3 −3
Original line number Diff line number Diff line
@@ -2847,7 +2847,7 @@ static int __cxl_dpa_to_region(struct device *dev, void *arg) 
	if (!cxled || !cxled->dpa_res || !resource_size(cxled->dpa_res))

		return 0;



	if (dpa > cxled->dpa_res->end || dpa < cxled->dpa_res->start)

	if (!cxl_resource_contains_addr(cxled->dpa_res, dpa))

		return 0;



	/*
@@ -2959,7 +2959,7 @@ u64 cxl_dpa_to_hpa(struct cxl_region *cxlr, const struct cxl_memdev *cxlmd, 
	if (cxlrd->hpa_to_spa)

		hpa = cxlrd->hpa_to_spa(cxlrd, hpa);



	if (hpa < p->res->start || hpa > p->res->end) {

	if (!cxl_resource_contains_addr(p->res, hpa)) {

		dev_dbg(&cxlr->dev,

			"Addr trans fail: hpa 0x%llx not in region\n", hpa);

		return ULLONG_MAX;
@@ -3499,7 +3499,7 @@ u64 cxl_port_get_spa_cache_alias(struct cxl_port *endpoint, u64 spa) 
	xa_for_each(&endpoint->regions, index, iter) {

		struct cxl_region_params *p = &iter->region->params;



		if (p->res->start <= spa && spa <= p->res->end) {

		if (cxl_resource_contains_addr(p->res, spa)) {

			if (!p->cache_size)

				return ~0ULL;