[PATCH v2 05/15] cxl: fix use of resource_contains

alejandro.lucero-palau
2024-07-15T17:28:56Z

From: Alejandro Lucero <alucerop@amd.com>

For a resource defined with size zero, resource contains will also
return true.

Add resource size check before using it.

Signed-off-by: Alejandro Lucero <alucerop@amd.com>
---
drivers/cxl/core/hdm.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c
index 3df10517a327..4af9225d4b59 100644
--- a/drivers/cxl/core/hdm.c
+++ b/drivers/cxl/core/hdm.c
@@ -327,10 +327,13 @@ static int __cxl_dpa_reserve(struct cxl_endpoint_decoder *cxled,
cxled->dpa_res = res;
cxled->skip = skipped;

- if (resource_contains(&cxlds->pmem_res, res))
+ if ((resource_size(&cxlds->pmem_res)) && (resource_contains(&cxlds->pmem_res, res))) {
+ printk("%s: resource_contains CXL_DECODER_PMEM\n", __func__);
cxled->mode = CXL_DECODER_PMEM;
- else if (resource_contains(&cxlds->ram_res, res))
+ } else if ((resource_size(&cxlds->ram_res)) && (resource_contains(&cxlds->ram_res, res))) {
+ printk("%s: resource_contains CXL_DECODER_RAM\n", __func__);
cxled->mode = CXL_DECODER_RAM;
+ }
else {
dev_warn(dev, "decoder%d.%d: %pr mixed mode not supported\n",
port->id, cxled->cxld.id, cxled->dpa_res);
--
2.17.1