From: Alison Schofield Date: Thu, 6 Mar 2025 21:36:51 +0000 (-0800) Subject: cxl/region: Quiet some dev_warn()s in extended linear cache setup X-Git-Tag: v6.15-rc1~45^2~2 X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=74d9c59658e4d3b06f163da0c5ed7647656705c1;p=linux%2F.git cxl/region: Quiet some dev_warn()s in extended linear cache setup Extended Linear Cache (ELC) setup code emits a dev_warn(), "Extended linear cache calculation failed." for issues found while setting up the ELC. For platforms without CONFIG_ACPI_HMAT, every auto region setup will emit the warning because the default !ACPI_HMAT return value is EOPNOTSUPP. Suppress it by skipping the warn for EOPNOTSUPP. Change the EOPNOTSUPP in the actual ELC failure path to ENXIO. Remove the check and enusing dev_warn() when region resource size is NULL. The endpoint decoders hpa_range used to create the resource is checked in init_hdm_decoder(), so it cannot be NULL here. For good measure, add the rc value to the dev_warn(). It will either be the -ENOENT returned by HMAT if the mem target is not found, or the -ENXIO from the region driver calculation. Reviewed-by: Li Ming Signed-off-by: Alison Schofield Link: https://patch.msgid.link/20250306213700.2606304-1-alison.schofield@intel.com Signed-off-by: Dave Jiang --- diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index a09ae21a26c6..6d8bdb53f258 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -3235,13 +3235,10 @@ static int cxl_extended_linear_cache_resize(struct cxl_region *cxlr, struct cxl_root_decoder *cxlrd = to_cxl_root_decoder(cxlr->dev.parent); struct cxl_region_params *p = &cxlr->params; int nid = phys_to_target_node(res->start); - resource_size_t size, cache_size, start; + resource_size_t size = resource_size(res); + resource_size_t cache_size, start; int rc; - size = resource_size(res); - if (!size) - return -EINVAL; - rc = cxl_acpi_get_extended_linear_cache_size(res, nid, &cache_size); if (rc) return rc; @@ -3253,7 +3250,7 @@ static int cxl_extended_linear_cache_resize(struct cxl_region *cxlr, dev_warn(&cxlr->dev, "Extended Linear Cache size %pa != CXL size %pa. No Support!", &cache_size, &size); - return -EOPNOTSUPP; + return -ENXIO; } /* @@ -3305,14 +3302,14 @@ static int __construct_region(struct cxl_region *cxlr, dev_name(&cxlr->dev)); rc = cxl_extended_linear_cache_resize(cxlr, res); - if (rc) { + if (rc && rc != -EOPNOTSUPP) { /* * Failing to support extended linear cache region resize does not * prevent the region from functioning. Only causes cxl list showing * incorrect region size. */ dev_warn(cxlmd->dev.parent, - "Extended linear cache calculation failed.\n"); + "Extended linear cache calculation failed rc:%d\n", rc); } rc = insert_resource(cxlrd->res, res);