From nobody Tue Oct 7 11:57:55 2025 Received: from sender4-pp-o94.zoho.com (sender4-pp-o94.zoho.com [136.143.188.94]) (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 AF6A1280328; Thu, 10 Jul 2025 06:58:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.94 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752130720; cv=pass; b=nJ40jbP39bqry4QuyLMJMMAi2lox5s/Fb0xHreIRoUJS/dQzuTzM+cD8pzNyOriNaLcCmspuYZwpne+1LdW/1ql6K65vd7xsp59g8VpOm3l1yRJZfb+DXnj6x2zPlXNYEIPP5B46ihjIss/J/OyIpXhKBVx+3DpSA9DjHai+XEQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752130720; c=relaxed/simple; bh=kleyIYQDLQE4ccm5Yvd3nhk/56WiSGSXMisKX415Ubc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NAocZRZUB/wRgBaHmKVrmAWazLOFJQNUw3qPLNwjNKIySjJ4i9Ybzcx9xlrrg7UEhLCQRnf2ZlqaOK7wiSaOhHHApAicrlfgYmIHyhrA8CNAzPl7EQFqTCNLX+AuSoT8RiS+5OaWcRes6oyKXV6k7myxM6DTFpJ2AseQU4Q7oL0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=zohomail.com; spf=pass smtp.mailfrom=zohomail.com; dkim=pass (1024-bit key) header.d=zohomail.com header.i=ming.li@zohomail.com header.b=Na6YwQg3; arc=pass smtp.client-ip=136.143.188.94 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=zohomail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zohomail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=zohomail.com header.i=ming.li@zohomail.com header.b="Na6YwQg3" ARC-Seal: i=1; a=rsa-sha256; t=1752130694; cv=none; d=zohomail.com; s=zohoarc; b=P6wSRT3em5KjQ07ly+mTQNtCW8Vn1USg0FozTR7d3atm9QVIq7wS1rJQGn5zk7bpWlRa5/IpFenr6gGsfe+afCGSyFHwG1zMkNxINgtWZXS31y1WL21MKaxigFLRQ3o4eZcm9Y9IOS3QGPMGU/kpZLreRe5/ReJ8abJrjd/+Phg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752130694; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=R4yqQEncWjn6CZ3DlAAJiCNhjqHF1n7HHSTt3k5XNew=; b=kOm4f6wK88R1FcBKllo6C7HQCFnIxnlTScWRoDkIyD2K8PhPujwZ8QgQgcJYryPAkJgwedP371NjvBlomihAoTX/8ICZCKoTBjj51Zec/EK3b0XGd0/K+9DEFr+td3R/lXJnm9Bf8Y26ko2mh2njZNjCEYQTjNdmUjfgchuMZlI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=zohomail.com; spf=pass smtp.mailfrom=ming.li@zohomail.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1752130694; s=zm2022; d=zohomail.com; i=ming.li@zohomail.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Feedback-ID:Reply-To; bh=R4yqQEncWjn6CZ3DlAAJiCNhjqHF1n7HHSTt3k5XNew=; b=Na6YwQg31gRsYyT0wxoIf/fvPM1gA7vS+xetd98J4gWQKmY+tRVfkpycDdcMsF3U rtxNwPknQjyzZYb1Y49bmt8rQbsKdfby8KY+s26qFmKjzXNa7cfXoW3tz0FS+tmN+9b XGwIvBiShbCtCGZ1fPMBPyjwG/1/0jnFW5RA5KcI= Received: by mx.zohomail.com with SMTPS id 1752130692353436.68439357214424; Wed, 9 Jul 2025 23:58:12 -0700 (PDT) From: Li Ming To: dave@stgolabs.net, jonathan.cameron@huawei.com, dave.jiang@intel.com, alison.schofield@intel.com, vishal.l.verma@intel.com, ira.weiny@intel.com, dan.j.williams@intel.com, shiju.jose@huawei.com Cc: andriy.shevchenko@linux.intel.com, linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org, Li Ming Subject: [PATCH v4 1/3] cxl/core: Introduce a new helper cxl_resource_contains_addr() Date: Thu, 10 Jul 2025 14:56:45 +0800 Message-Id: <20250710065647.98094-2-ming.li@zohomail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250710065647.98094-1-ming.li@zohomail.com> References: <20250710065647.98094-1-ming.li@zohomail.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 Feedback-ID: rr080112271991723bf026685fddf203f30000c57052456450f141825631ee15b111c25e7e3f2241ab33bec0:zu08011227c60f1b15adedfb5cffb21b570000d383b1b5e793e578dc735fb34eabee5e31eb69139438b150b9:rf0801122df7b51dd5a3f6c135b0ba1dd100002debb34a3df224007f35e73aa53d69ba4918a665e757618bca77c72ebd533f:ZohoMail X-ZohoMailClient: External Content-Type: text/plain; charset="utf-8" In CXL subsystem, many functions need to check an address availability by checking if the resource range contains the address. Providing a new helper function cxl_resource_contains_addr() to check if the resource range contains the input address. Suggested-by: Alison Schofield Signed-off-by: Li Ming Tested-by: Shiju Jose Reviewed-by: Alison Schofield Reviewed-by: Andy Shevchenko Reviewed-by: Dave Jiang --- drivers/cxl/core/core.h | 1 + drivers/cxl/core/hdm.c | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/drivers/cxl/core/core.h b/drivers/cxl/core/core.h index 29b61828a847..6b78b10da3e1 100644 --- a/drivers/cxl/core/core.h +++ b/drivers/cxl/core/core.h @@ -80,6 +80,7 @@ int cxl_dpa_alloc(struct cxl_endpoint_decoder *cxled, u64= size); int cxl_dpa_free(struct cxl_endpoint_decoder *cxled); resource_size_t cxl_dpa_size(struct cxl_endpoint_decoder *cxled); resource_size_t cxl_dpa_resource_start(struct cxl_endpoint_decoder *cxled); +bool cxl_resource_contains_addr(const struct resource *res, const resource= _size_t addr); =20 enum cxl_rcrb { CXL_RCRB_DOWNSTREAM, diff --git a/drivers/cxl/core/hdm.c b/drivers/cxl/core/hdm.c index ab1007495f6b..088caa6b6f74 100644 --- a/drivers/cxl/core/hdm.c +++ b/drivers/cxl/core/hdm.c @@ -547,6 +547,13 @@ resource_size_t cxl_dpa_resource_start(struct cxl_endp= oint_decoder *cxled) return base; } =20 +bool cxl_resource_contains_addr(const struct resource *res, const resource= _size_t addr) +{ + struct resource _addr =3D DEFINE_RES_MEM(addr, 1); + + return resource_contains(res, &_addr); +} + int cxl_dpa_free(struct cxl_endpoint_decoder *cxled) { struct cxl_port *port =3D cxled_to_port(cxled); --=20 2.34.1 From nobody Tue Oct 7 11:57:55 2025 Received: from sender4-pp-o94.zoho.com (sender4-pp-o94.zoho.com [136.143.188.94]) (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 596A6230BE1; Thu, 10 Jul 2025 06:58:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.94 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752130733; cv=pass; b=fDKWxnVxrf3WIVWfN7DAslO9KZlltaLy/AKCVpvZUIBa9Y6gVNvCms0g24sR1gh91+5c5+SoO+6ZkEqU/T/HS9k2h1+TBByq3/JKB87hwYrWkILoD/tsDYpjxxEwTFiJu0FGfpPwR5OumUmZ4rej0b0IOzV61sjgNa8E5De2Zko= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752130733; c=relaxed/simple; bh=4XMXysEmEuVGM+mUyPzHOOIoo/2Q3NS+t8WdzC/Fj0o=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=KF4ClLr9aFXS6p38jbu/csXAOik61/sMowfyRowzhprH1G4tYXDvdNJRmNQ16L8QDEMJrd+f0cGLC8x07OGt1LLT6UT/vHRcitLLpepFkjGAqfzrc6Aga3cttL3W1qGUnMWwPyWv3OpPVCHwwveBMgTMczrL7uK+jG27x9J2Yq0= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=zohomail.com; spf=pass smtp.mailfrom=zohomail.com; dkim=pass (1024-bit key) header.d=zohomail.com header.i=ming.li@zohomail.com header.b=ZYQIpjlB; arc=pass smtp.client-ip=136.143.188.94 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=zohomail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zohomail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=zohomail.com header.i=ming.li@zohomail.com header.b="ZYQIpjlB" ARC-Seal: i=1; a=rsa-sha256; t=1752130706; cv=none; d=zohomail.com; s=zohoarc; b=FTHSwF+VcSpyUFw4j9CONtIG0JbTpFWYg9jVoGyM1yqx1cvF6Di9sdhxYcRomg6g/fuyJndJnzQ+6y0XTYK5kD/wjf4hihEDrPtqh1VTD5xOjLGQGxA8vNLiMfzZbwg59ylRm8GZDwA7LCnUrE7TMadBndd/BVk+udcULd6cQoA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752130706; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=KPlyZ/Hsh71e/mLVELA5lQX3qhvKokj1xWNXCL/wX1Y=; b=FyHed2QKIz4L3mw6QZjUHCgYDqqOtgafVE01gL0Vd5i8vAaaQzyBPqpiGlPoeKFWYV1FpVLztxGO68dPv7nyVHODzHR13Et5McU82d21AaeDbZAl8Td9ThvSkq2sBFH0de83r7F+POgD7uBVo8VgKvQ0B5CBn3xj6I2adWDkgw4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=zohomail.com; spf=pass smtp.mailfrom=ming.li@zohomail.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1752130706; s=zm2022; d=zohomail.com; i=ming.li@zohomail.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Feedback-ID:Reply-To; bh=KPlyZ/Hsh71e/mLVELA5lQX3qhvKokj1xWNXCL/wX1Y=; b=ZYQIpjlBVlRhveAgqoGArzID/TNzGD+Y5mIfBlM056rkZH7s7DK8UpO2J5qe1Mb5 He24VGPYEHzxLZBEA5OvMrNKrnn72Wykbx6/eTCip0hWyD5mCM8/IpfLx8wY3P0zkpV 71YGkQrof169lAkQafeZ6glQRhJgUp8DDpUJm/Ss= Received: by mx.zohomail.com with SMTPS id 1752130704133315.203139531022; Wed, 9 Jul 2025 23:58:24 -0700 (PDT) From: Li Ming To: dave@stgolabs.net, jonathan.cameron@huawei.com, dave.jiang@intel.com, alison.schofield@intel.com, vishal.l.verma@intel.com, ira.weiny@intel.com, dan.j.williams@intel.com, shiju.jose@huawei.com Cc: andriy.shevchenko@linux.intel.com, linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org, Li Ming Subject: [PATCH v4 2/3] cxl/edac: Fix wrong dpa checking for PPR operation Date: Thu, 10 Jul 2025 14:56:46 +0800 Message-Id: <20250710065647.98094-3-ming.li@zohomail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250710065647.98094-1-ming.li@zohomail.com> References: <20250710065647.98094-1-ming.li@zohomail.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 Feedback-ID: rr08011227c03f971dc3abfab7622a121d00009cc378dcd480c5d0418a5c82d9b38f77e20dfe96cbfc733c2b:zu08011227281d5e23887b44d5b80b695500001dfabd5b4d553b1fae532af0e589ed48a811236b8cf46198a8:rf0801122d27ad8ba4f213ba85727ed733000001f738e71875145b2d91f04ae7f88bd881a517f336ac546ae9655170e4ae25:ZohoMail X-ZohoMailClient: External Content-Type: text/plain; charset="utf-8" Per Table 8-143. "Get Partition Info Output Payload" in CXL r3.2 section 8.2.10.9.2.1 "Get Partition Info(Opcode 4100h)", DPA 0 is a valid address of a CXL device. However, cxl_do_ppr() considers it as an invalid address, so that user will get an -EINVAL when user calls the sysfs interface of the edac driver to trigger a Post Package Repair(PPR) operation for DPA 0 on a CXL device. The correct implementation should be checking if the input DPA is in the DPA range of the CXL device. Fixes: be9b359e056a ("cxl/edac: Add CXL memory device soft PPR control feat= ure") Signed-off-by: Li Ming Tested-by: Shiju Jose Reviewed-by: Shiju Jose Reviewed-by: Dave Jiang Reviewed-by: Alison Schofield --- drivers/cxl/core/edac.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/cxl/core/edac.c b/drivers/cxl/core/edac.c index 623aaa4439c4..90151cc7fe52 100644 --- a/drivers/cxl/core/edac.c +++ b/drivers/cxl/core/edac.c @@ -1923,8 +1923,11 @@ static int cxl_ppr_set_nibble_mask(struct device *de= v, void *drv_data, static int cxl_do_ppr(struct device *dev, void *drv_data, u32 val) { struct cxl_ppr_context *cxl_ppr_ctx =3D drv_data; + struct cxl_memdev *cxlmd =3D cxl_ppr_ctx->cxlmd; + struct cxl_dev_state *cxlds =3D cxlmd->cxlds; =20 - if (!cxl_ppr_ctx->dpa || val !=3D EDAC_DO_MEM_REPAIR) + if (!cxl_resource_contains_addr(&cxlds->dpa_res, cxl_ppr_ctx->dpa) || + val !=3D EDAC_DO_MEM_REPAIR) return -EINVAL; =20 return cxl_mem_perform_ppr(cxl_ppr_ctx); --=20 2.34.1 From nobody Tue Oct 7 11:57:55 2025 Received: from sender4-pp-o94.zoho.com (sender4-pp-o94.zoho.com [136.143.188.94]) (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 9259628726A; Thu, 10 Jul 2025 06:59:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.94 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752130743; cv=pass; b=f5aEULc15QxS4XIbJSl5XYcb2j2PeLPgp/jdc392y6N2PVTvXaDRayBQElcoqV0naKI9ZSrZaKmJT1475RCHj7Wx4XPjOADXJt9liOkxZeEkG7hwhhMFV3ZOzDLGBE78oJ4ES+dTd9Ms+FwBaIAji6m3sIe7gyL1K9PaXlyI6HA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752130743; c=relaxed/simple; bh=BcwNWiG4TCpjQxFwIpv8ZvHCLdqAphP7U23UHuJs3t4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=Zjd7VVAJU/hTZG+wXLUV0o6p+VdAzbMsipsW5OWDLLYRG+yxHkGP9EiG/1TE7JHJbhJCRuULIuKn2BAGeVaNfaq/uAdQoIZEs6fg0IEJ4dJNYOp+pHQYsTCQF51x5yMn3cicx+0EqLqEjUA8/8BMO0C8qg5rkp7PxZwXFlOuspE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=zohomail.com; spf=pass smtp.mailfrom=zohomail.com; dkim=pass (1024-bit key) header.d=zohomail.com header.i=ming.li@zohomail.com header.b=eVju5WpD; arc=pass smtp.client-ip=136.143.188.94 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=zohomail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=zohomail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=zohomail.com header.i=ming.li@zohomail.com header.b="eVju5WpD" ARC-Seal: i=1; a=rsa-sha256; t=1752130716; cv=none; d=zohomail.com; s=zohoarc; b=TTTJx7eYmpM9ZEO2hcVyj+tAW6kerk94JDGdWE+vjGCSNslq3AZJli82MUcuoJ0Ft2fJeY0h7+hWPY0lSuEbHDY47fgJQSNmdSpyO6Oo5aSiMMV9IQbeWZE9L3lZ4Pqu/C/ffmAr17kLZMwaED9lldYwJSoXw+B9IsDX5tJ54jQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752130716; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=ckOVWQDcbW0/bI6DKdV/avMRcGSwau58/dhBJujU/Hk=; b=VzWrUEShrPxqsv87Pj3kjZzY5HVwn/TL1eFM+7PgVmyyQEUelZpPQ+9D9dP5X0L06XIBj6TuTsCsPaODJLjbrcJ+qUvEOl64ba1Us9rylG7M1h1U0sChVF5teRTseEvwKpsSrssPyGmlRA965uV0O69kEAhwqdaaWH0dGikZkgE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=zohomail.com; spf=pass smtp.mailfrom=ming.li@zohomail.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1752130716; s=zm2022; d=zohomail.com; i=ming.li@zohomail.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Feedback-ID:Reply-To; bh=ckOVWQDcbW0/bI6DKdV/avMRcGSwau58/dhBJujU/Hk=; b=eVju5WpDqzyT4Eef4S0fZbIyVyV9oytdCixd8gZwcUtQ1P7Pz/EsJkaCEURW2ucj +lVKGpCcbSQ7BUFbyZMjFcKav7twjrGjjHtOb3zjtRseWgT28kjkgQTEH7E2G76wXWD af2Q/nY2hbzZ6/8LCuJC5VvSN326VreQS9wqaZ+U= Received: by mx.zohomail.com with SMTPS id 1752130714051765.1783342572533; Wed, 9 Jul 2025 23:58:34 -0700 (PDT) From: Li Ming To: dave@stgolabs.net, jonathan.cameron@huawei.com, dave.jiang@intel.com, alison.schofield@intel.com, vishal.l.verma@intel.com, ira.weiny@intel.com, dan.j.williams@intel.com, shiju.jose@huawei.com Cc: andriy.shevchenko@linux.intel.com, linux-cxl@vger.kernel.org, linux-kernel@vger.kernel.org, Li Ming Subject: [PATCH v4 3/3] cxl/core: Using cxl_resource_contains_addr() to check address availability Date: Thu, 10 Jul 2025 14:56:47 +0800 Message-Id: <20250710065647.98094-4-ming.li@zohomail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250710065647.98094-1-ming.li@zohomail.com> References: <20250710065647.98094-1-ming.li@zohomail.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 Feedback-ID: rr08011227b3eab6ab5fa6ee21dd2c3b8a0000777e95a87c650e9b747ba21e8b4257b093e23f7355e4fe5a32:zu080112274aa08f16a5989c1a38677978000039817680e332ffd6a977c0bf84d28cdf75295b4ed397934d1f:rf0801122d24eeb8b291a42bfa440b2a820000a88c504b100d025fa74644a4acfcfc7cd8cd04f1efc185b277949a16b81ec5:ZohoMail X-ZohoMailClient: External Content-Type: text/plain; charset="utf-8" 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: Li Ming Reviewed-by: Dave Jiang Reviewed-by: Alison Schofield --- drivers/cxl/core/edac.c | 4 ++-- drivers/cxl/core/memdev.c | 2 +- drivers/cxl/core/region.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/cxl/core/edac.c b/drivers/cxl/core/edac.c index 90151cc7fe52..d0d552e57a4d 100644 --- a/drivers/cxl/core/edac.c +++ b/drivers/cxl/core/edac.c @@ -1523,7 +1523,7 @@ static int cxl_mem_sparing_set_dpa(struct device *dev= , void *drv_data, u64 dpa) struct cxl_memdev *cxlmd =3D ctx->cxlmd; struct cxl_dev_state *cxlds =3D cxlmd->cxlds; =20 - if (dpa < cxlds->dpa_res.start || dpa > cxlds->dpa_res.end) + if (!cxl_resource_contains_addr(&cxlds->dpa_res, dpa)) return -EINVAL; =20 ctx->dpa =3D dpa; @@ -1892,7 +1892,7 @@ static int cxl_ppr_set_dpa(struct device *dev, void *= drv_data, u64 dpa) struct cxl_memdev *cxlmd =3D cxl_ppr_ctx->cxlmd; struct cxl_dev_state *cxlds =3D cxlmd->cxlds; =20 - if (dpa < cxlds->dpa_res.start || dpa > cxlds->dpa_res.end) + if (!cxl_resource_contains_addr(&cxlds->dpa_res, dpa)) return -EINVAL; =20 cxl_ppr_ctx->dpa =3D dpa; diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c index f88a13adf7fa..769bd9be8b94 100644 --- a/drivers/cxl/core/memdev.c +++ b/drivers/cxl/core/memdev.c @@ -267,7 +267,7 @@ static int cxl_validate_poison_dpa(struct cxl_memdev *c= xlmd, 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; diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index 6e5e1460068d..91ff3a495fbd 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -2847,7 +2847,7 @@ static int __cxl_dpa_to_region(struct device *dev, vo= id *arg) if (!cxled || !cxled->dpa_res || !resource_size(cxled->dpa_res)) return 0; =20 - if (dpa > cxled->dpa_res->end || dpa < cxled->dpa_res->start) + if (!cxl_resource_contains_addr(cxled->dpa_res, dpa)) return 0; =20 /* @@ -2959,7 +2959,7 @@ u64 cxl_dpa_to_hpa(struct cxl_region *cxlr, const str= uct cxl_memdev *cxlmd, if (cxlrd->hpa_to_spa) hpa =3D cxlrd->hpa_to_spa(cxlrd, hpa); =20 - 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 *end= point, u64 spa) xa_for_each(&endpoint->regions, index, iter) { struct cxl_region_params *p =3D &iter->region->params; =20 - if (p->res->start <=3D spa && spa <=3D p->res->end) { + if (cxl_resource_contains_addr(p->res, spa)) { if (!p->cache_size) return ~0ULL; =20 --=20 2.34.1