From nobody Tue Dec 2 02:43:36 2025 Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9CCC12F0C6D; Tue, 18 Nov 2025 19:43:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.11 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763495029; cv=none; b=as1Bfa1IQY8KsrXQ6Ztz9u3Tij6sFGhEAbu5h0FgdzndYwDggD2Yz+jjGQ2pALvciLfMc6R7gfLOgd3pjgPNEKKu8bylYTFV4i9S+46Ag2hlOcGcxgHRyvR49L0Hh91J+4z76fYuWhVQgbiUDTd/kh+27mRbv+iKCTLnNRrO0m0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1763495029; c=relaxed/simple; bh=m8DjxY+rTRHrz40cfPpRJwVaJCn3qnjQjSy7dIUe7og=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ixvu6xK4aoKNqkfVjrLjnGfYjgsesRtxyMc4P6132oM+UOvB1dEV8KlxmBM9gIPxEC7W4ooM8GzVrMqfoVA2S81pAVzpH1h0bzIh4n494T7J9P9TynPAgV87uXGNeEuSoTCVaDwQ2FKBUfnkL+IrG7zTHeNEYBd48QBeVqWdAb8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=pass smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=VcLYIWV6; arc=none smtp.client-ip=192.198.163.11 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="VcLYIWV6" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1763495026; x=1795031026; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=m8DjxY+rTRHrz40cfPpRJwVaJCn3qnjQjSy7dIUe7og=; b=VcLYIWV6zVPx2gZ0cslbAFMSW9b9F/mvtaYS2q8zc56iFPXEVmfWdFcQ rmv3sGU0Uwgj6YObS438SSxGILqJcxlZFxozAmYGvnTfIML8XYarPNvjD TZLgcBuQkDTq6AfQAFrTbtl6bnbK+EqTHb0BkZZoIJYcjCkgSORxAkoJA KlpGldtk4+IxwFR+AM74yY8/bSkQkz49O9CnYOEZzMJlKA1FD30HfqNoJ 4sj6PiGWlKlvciCZavrl6FGqwyrcbmbT0bl+yHNPLYtN/Jv+TXqOnh39Y ZPJO8HFejzoDgrpfbFyt2gJjK9yk7GN89PH7B+Fh+WSc9Z9/B8w4VHPkY g==; X-CSE-ConnectionGUID: oP9pWCziQ9+vz9xOVovF0g== X-CSE-MsgGUID: HLmzqjlXT8+GTKnLaEk7Hw== X-IronPort-AV: E=McAfee;i="6800,10657,11617"; a="76138715" X-IronPort-AV: E=Sophos;i="6.19,314,1754982000"; d="scan'208";a="76138715" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2025 11:43:46 -0800 X-CSE-ConnectionGUID: P04xAaMKSTuzRLFd2Vqt3Q== X-CSE-MsgGUID: fwhgMEtGTqSkCH0c0j6VBQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.19,314,1754982000"; d="scan'208";a="228188911" Received: from fdefranc-mobl3.ger.corp.intel.com (HELO fdefranc-mobl3.intel.com) ([10.245.246.148]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2025 11:43:41 -0800 From: "Fabio M. De Francesco" To: linux-cxl@vger.kernel.org Cc: Davidlohr Bueso , Jonathan Cameron , Dave Jiang , Alison Schofield , Vishal Verma , Ira Weiny , Dan Williams , linux-kernel@vger.kernel.org, Gregory Price , Robert Richter , Cheatham Benjamin , "Fabio M . De Francesco" Subject: [PATCH 3/4 v6] cxl/core: Enable Region creation on x86 with LMH Date: Tue, 18 Nov 2025 20:43:05 +0100 Message-ID: <20251118194321.1773484-4-fabio.m.de.francesco@linux.intel.com> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251118194321.1773484-1-fabio.m.de.francesco@linux.intel.com> References: <20251118194321.1773484-1-fabio.m.de.francesco@linux.intel.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The CXL Fixed Memory Window Structure (CFMWS) describes zero or more Host Physical Address (HPA) windows that are associated with each CXL Host Bridge. Each window represents a contiguous HPA that may be interleaved with one or more targets (CXL v3.2 - 9.18.1.3). The Low Memory Hole (LMH) of x86 is a range of addresses of physical low memory to which systems cannot send transactions. In some case the size of that hole is not compatible with the constraint that the CFMWS size shall be multiple of Interleave Ways * 256 MB. (CXL v3.2 - Table 9-22). On those systems, the BIOS publishes CFMWS which communicate the active System Physical Address (SPA) ranges that map to a subset of the Host Physical Address (HPA) ranges. The SPA range trims out the hole, and the capacity in the endpoint is lost with no SPA to map to CXL HPA in that hole. In the early stages of CXL regions construction and attach on platforms that have Low Memory Holes, cxl_add_to_region() fails and returns an error for it can't find any CFMWS range that matches a given endpoint decoder. Detect an LMH by comparing root decoder and endpoint decoder range. Match root decoders HPA range and constructed region with the corresponding endpoint decoders. Construct CXL region with the end of its HPA ranges end adjusted to the matching SPA and adjust the DPA resource end of the hardware decoders to fit the region. Allow the attach target process to complete by allowing regions and decoders to bypass the constraints that don't hold when an LMH is present.[1] [1] commit c5dca38633da ("cxl: Documentation/driver-api/cxl: Describe the x= 86 Low Memory Hole solution") Cc: Alison Schofield Cc: Dan Williams Cc: Dave Jiang Cc: Ira Weiny Reviewed-by: Gregory Price Signed-off-by: Fabio M. De Francesco --- drivers/cxl/core/region.c | 43 ++++++++++++++++++++++++++++++++------- tools/testing/cxl/Kbuild | 1 + 2 files changed, 37 insertions(+), 7 deletions(-) diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index 315481444eb0..173a4b2d4baa 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -14,6 +14,7 @@ #include #include #include +#include "platform_quirks.h" #include "core.h" =20 /** @@ -872,6 +873,8 @@ static int match_free_decoder(struct device *dev, const= void *data) static bool spa_maps_hpa(const struct cxl_region_params *p, const struct range *range) { + struct cxl_decoder *cxld; + if (!p->res) return false; =20 @@ -880,8 +883,13 @@ static bool spa_maps_hpa(const struct cxl_region_param= s *p, * where the SPA maps equal amounts of DRAM and CXL HPA capacity with * CXL decoders at the high end of the SPA range. */ - return p->res->start + p->cache_size =3D=3D range->start && - p->res->end =3D=3D range->end; + if (p->res->start + p->cache_size =3D=3D range->start && + p->res->end =3D=3D range->end) + return true; + + cxld =3D container_of(range, struct cxl_decoder, hpa_range); + + return platform_region_matches_cxld(p, cxld); } =20 static int match_auto_decoder(struct device *dev, const void *data) @@ -1812,6 +1820,7 @@ static int match_cxlsd_to_cxled_by_range(struct devic= e *dev, const void *data) { const struct cxl_endpoint_decoder *cxled =3D data; struct cxl_switch_decoder *cxlsd; + struct cxl_root_decoder *cxlrd; const struct range *r1, *r2; =20 if (!is_switch_decoder(dev)) @@ -1821,8 +1830,13 @@ static int match_cxlsd_to_cxled_by_range(struct devi= ce *dev, const void *data) r1 =3D &cxlsd->cxld.hpa_range; r2 =3D &cxled->cxld.hpa_range; =20 - if (is_root_decoder(dev)) - return range_contains(r1, r2); + if (is_root_decoder(dev)) { + if (range_contains(r1, r2)) + return 1; + cxlrd =3D to_cxl_root_decoder(dev); + if (platform_cxlrd_matches_cxled(cxlrd, cxled)) + return 1; + } return (r1->start =3D=3D r2->start && r1->end =3D=3D r2->end); } =20 @@ -2039,7 +2053,7 @@ static int cxl_region_attach(struct cxl_region *cxlr, } =20 if (resource_size(cxled->dpa_res) * p->interleave_ways + p->cache_size != =3D - resource_size(p->res)) { + resource_size(p->res) && !platform_cxlrd_matches_cxled(cxlrd, cxled))= { dev_dbg(&cxlr->dev, "%s:%s-size-%#llx * ways-%d + cache-%#llx !=3D region-size-%#llx\n", dev_name(&cxlmd->dev), dev_name(&cxled->cxld.dev), @@ -3472,7 +3486,8 @@ static int match_cxlrd_to_cxled_by_range(struct devic= e *dev, const void *data) r1 =3D &cxlrd->cxlsd.cxld.hpa_range; r2 =3D &cxled->cxld.hpa_range; =20 - return range_contains(r1, r2); + return (range_contains(r1, r2)) || + (platform_cxlrd_matches_cxled(cxlrd, cxled)); } =20 static struct cxl_decoder * @@ -3591,6 +3606,12 @@ static int __construct_region(struct cxl_region *cxl= r, *res =3D DEFINE_RES_MEM_NAMED(hpa->start, range_len(hpa), dev_name(&cxlr->dev)); =20 + /* + * Trim the HPA retrieved from hardware to fit the SPA mapped by the + * platform + */ + platform_adjust_resources(res, cxled, cxlrd, &cxlr->dev); + rc =3D cxl_extended_linear_cache_resize(cxlr, res); if (rc && rc !=3D -EOPNOTSUPP) { /* @@ -3702,8 +3723,16 @@ int cxl_add_to_region(struct cxl_endpoint_decoder *c= xled) mutex_lock(&cxlrd->range_lock); struct cxl_region *cxlr __free(put_cxl_region) =3D cxl_find_region_by_range(cxlrd, cxled); - if (!cxlr) + if (!cxlr) { cxlr =3D construct_region(cxlrd, cxled); + } else { + /* + * Platform adjustments are done in construct_region() + * for first target, and here for additional targets. + */ + p =3D &cxlr->params; + platform_adjust_resources(p->res, cxled, cxlrd, &cxlr->dev); + } mutex_unlock(&cxlrd->range_lock); =20 rc =3D PTR_ERR_OR_ZERO(cxlr); diff --git a/tools/testing/cxl/Kbuild b/tools/testing/cxl/Kbuild index 68b38863605b..2241abbac91f 100644 --- a/tools/testing/cxl/Kbuild +++ b/tools/testing/cxl/Kbuild @@ -61,6 +61,7 @@ cxl_core-y +=3D $(CXL_CORE_SRC)/cdat.o cxl_core-y +=3D $(CXL_CORE_SRC)/ras.o cxl_core-$(CONFIG_TRACING) +=3D $(CXL_CORE_SRC)/trace.o cxl_core-$(CONFIG_CXL_REGION) +=3D $(CXL_CORE_SRC)/region.o +cxl_core-$(CONFIG_CXL_PLATFORM_QUIRKS) +=3D $(CXL_CORE_SRC)/platform_quirk= s.o cxl_core-$(CONFIG_CXL_MCE) +=3D $(CXL_CORE_SRC)/mce.o cxl_core-$(CONFIG_CXL_FEATURES) +=3D $(CXL_CORE_SRC)/features.o cxl_core-$(CONFIG_CXL_EDAC_MEM_FEATURES) +=3D $(CXL_CORE_SRC)/edac.o --=20 2.51.1