From nobody Tue Oct 7 08:53:17 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 73980198E8C; Fri, 11 Jul 2025 03:11:49 +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=1752203511; cv=pass; b=en+DIMWPucdgPdouUIQmvjL6gpA7nFC75c+9T0+YnR//Yilkk4UKwHvXzXWG3h7BehZW9e0a8QUs0gnZWvxceYQsD29lHL7fUUjWEPTp1L0xJHKBkXtUebRSdQ2W/G2dInFaTsj282gVFAfN1uZ4yzzCI73r+aEKKXTO+Fz8C30= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752203511; c=relaxed/simple; bh=yawaFjSxeq/fKlAhYVB8ann21U7uhl6dgm04Gq0j7TE=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=tpjFdr3qf3+WOZdpi41pSg10CXXaLdS3FdPVgWii23Hu+GyA3eG7YZycrxkWe3Qq4HjNLvczi+PxvGAMSfAzLYdYr0aSM+ZNRsCf3oAjol4QPE+1Vj2tDjizHQxvPfwdHJmQCRtc1qozE+EhW1zMFypuH29NWURqw+BXgHt9UTw= 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=V/GENIji; 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="V/GENIji" ARC-Seal: i=1; a=rsa-sha256; t=1752203493; cv=none; d=zohomail.com; s=zohoarc; b=L+iVKcOU+Rlv4+NtC1Ib6PUaPcYtelMmYga/YomgQDi+YIijXRH0Lg7XzawIG/weSDNps1eDSfHpLmMyOFwCPxYMgpDJ0HW5FtAn2UG3UhJIEzWrRW3Qaua8ny8+Udzh5P/d7w2ujU8nmcXLvRrPoC4P/ggYhuE+3PZGxZEuIlQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752203493; 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=b4u6LBdW93zKsk7vPHfRkDgEBvWxtyoEagsxCg2+pVg=; b=Lyg1F7PH1YiYhDI1vTG7quKCS/OgQk0A7W49EX8S1k0vfI3XDn4CffGrH7ch87CgJQsTJArvS6JdHoNQSfvCWO8s4MYJwZ6Eik8+xAJe7EpGwagstDZJwaruVT+nColXLhz09wUDVBjgUAX7TS6H5vi7JUTR67Hhcuj+J0/aTxU= 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=1752203493; 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=b4u6LBdW93zKsk7vPHfRkDgEBvWxtyoEagsxCg2+pVg=; b=V/GENIji9Cj6uj6WjmA8W9XvlLp4Pv0T5q55HXXtgwg0OgaEVUXJ1HTNNeOkFwOp EB3QzXBl3RGw0TF5uW/WqlCIm+yM5LXiuVQgn9aqOFtnGo7Jkb8rAcT7rvzbvrKBTpb 4luEPh+YLFgZB5TbS/Tkw3ulaN1yXt46jFzDvcxY= Received: by mx.zohomail.com with SMTPS id 175220349095176.4970901840478; Thu, 10 Jul 2025 20:11:30 -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 v5 1/3] cxl/core: Introduce a new helper cxl_resource_contains_addr() Date: Fri, 11 Jul 2025 11:10:59 +0800 Message-Id: <20250711031101.126990-2-ming.li@zohomail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250711031101.126990-1-ming.li@zohomail.com> References: <20250711031101.126990-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: rr080112278d61b1fa7fc914d13a8312560000b4c3fd5d465b4ba400c8a6558a3355267c903361c5f7235c6b:zu0801122776c2ec558fd8dbba7a5d39cb0000a72f7beb42218d977f9ffd5429520b96ce45d45c09f7a6fa0e:rf0801122d7a89d3d5e0f405b265fbbda500006dbb130add86bdb3c7c0505e257f975bc1bd07ed9e4a98810b447517ab65d6: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: 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 08:53:17 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 AF477155393; Fri, 11 Jul 2025 03:11:59 +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=1752203521; cv=pass; b=oNmP0PlJcq2hqIWynxiTHc5yA9qHRTXfKQnqErCQnXp76YQ9SoPcNxqlwz0Ch+7Wh6f/uk3wLQIF9nXbqNe5cnVQPvVsQbjUBaxMG2mm7Xl+/9thweEMDl0CM599gZ0lgEB9oYMWfOaBbAYEpUznRZK0KajCVRxVDLHMnjl7fQ4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752203521; c=relaxed/simple; bh=hPdyobvwyLBaF4atMNDrLur5eZqNFFdnHhYwYAdlyFA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=g33a0zz0Qbn5Od21ezDhaKr82ysMYHKuv7jmtUdyWLUTsSzc92cQwjPMCdHDZCa9TYQekLPdtxyK5Bh7UJabAYP4JOqRHnHm9PQOJhurUnqRfcrT3IZtb/uej/ic2Speue3wbFGJXxsO0i8y+IzvVoQnjOAsuWD0tm3oMpvtMos= 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=M6Syettg; 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="M6Syettg" ARC-Seal: i=1; a=rsa-sha256; t=1752203503; cv=none; d=zohomail.com; s=zohoarc; b=NV0Am9sb+Z3c9R3b7wAyjP7kVD9CIDrs5EzWAkSLgj/eHzq/Ztk6jWnC5UCnfwH0TOehwmdTvaRMG4YBjjILNDUpeQcQ9xa80ipjWCHcjP2kpHbp62HIl328TQ50bWY3f6JfWwa8p72OrGUVQj893I4+sJ4WYhI/W1GBJcqtimY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752203503; 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=Gi3LYrc1vcSogdA2lbiuXDmZmZes03z4ws13HmDuuEg=; b=QWHJMXbFKZQQ7UFzOFS7pIDf8DzN1VAT0jN7Tv+m3dVkB8fGDWkjHuneEsXaSOFIfRA3RJBVT2RusesksmA8CzQUcM6Cys5IwRiiS/9bovS0874FEROj924LaAN2qOYQO53BeIgO09DQyW6eJgdmvXgZCsnx56HEsrjMYKYmdqQ= 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=1752203503; 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=Gi3LYrc1vcSogdA2lbiuXDmZmZes03z4ws13HmDuuEg=; b=M6SyettgAJ6p5PqQL6OC3qNcbrB2UHZl8a+TL2t0A0b8O49M9YXNT/BbGTnTIVAt gbmbFVaqnl4M9AsFrKHJF/RIwvc1EkMVtWUAfsB3Cumaa63PSAX4A1IH5sNt6ugLwav fHvP26zlVMx/aQqMri//OHSD7p3ojmDsY3F9ph4Y= Received: by mx.zohomail.com with SMTPS id 1752203501942287.89873825472705; Thu, 10 Jul 2025 20:11:41 -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 v5 2/3] cxl/edac: Fix wrong dpa checking for PPR operation Date: Fri, 11 Jul 2025 11:11:00 +0800 Message-Id: <20250711031101.126990-3-ming.li@zohomail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250711031101.126990-1-ming.li@zohomail.com> References: <20250711031101.126990-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: rr080112273de6a288ce429918b69dc73a0000760a69ef95c09ed4b548cedad459d9915361338b31fcf1e7b1:zu08011227f8203482e8bb4f855bafc7e900002435d1e897763e0846429cb9eb5c8fdcee19dcf4d3100c8556:rf0801122d0a0869ee84cca01e316964fb00004fb8bba42228e33e6df6805a29cfad23cfa1bf58c4d5662962825d453d45ac: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..991fa3e70522 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 (val !=3D EDAC_DO_MEM_REPAIR || + !cxl_resource_contains_addr(&cxlds->dpa_res, cxl_ppr_ctx->dpa)) return -EINVAL; =20 return cxl_mem_perform_ppr(cxl_ppr_ctx); --=20 2.34.1 From nobody Tue Oct 7 08:53:17 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 76C6738FA6; Fri, 11 Jul 2025 03:12:16 +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=1752203537; cv=pass; b=gHSfiYRxdVxJiK3Fufb6NVwcRZQnRVhiyuOuELjIAj11MNaMGkNeWk9JHWBhKBKBsWPuVNaBsqciOMBYn1l7VR+4mxAmzmQj27rXKGa2ZiDJ4EfvPxu79BogM0zAzaVKosMOHtjHt6ZPsEuPdYCbsatKbx32bFM8BzBV3/VEkFU= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1752203537; c=relaxed/simple; bh=31pTOJLQLLOmM0kNLmYxRxIziNDgSTDkkEGFdzrDSqs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uxWtNvVLy/cgMHsg3Lh9e/Zu9MZa2nuHwBcvmIKCvUpZJ40MIS8/G2snV4gd5zlNYgepUsnFxILWMNfrU9BgKq1Rsq8xUXzoMiV12Ei0BAF56HHroWCLA6QhJIlwd8M9+p/l3KKxhaRrANG1JQXAf9S6Nf1DOfGYV0HS3i5k/po= 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=ZGQ6EF4i; 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="ZGQ6EF4i" ARC-Seal: i=1; a=rsa-sha256; t=1752203513; cv=none; d=zohomail.com; s=zohoarc; b=kOuRbbJc1JKw+zK/736XO7Y4Vj/MUOyF1ZtjU2XluRCidWfiKVLNrbLldBldhzkJdYa9LlAAX9LZFeMo/ZfeA65YjiCdpB5fVovx5HEa2JTByB6q/GghGvGLFerI0UCL+bJ86y8kojveL0BkjvW1T/x4ycROpD3rhxTSnmHE+k0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752203513; 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=p9Wu2W086XENViu8Ob6/rPvkHD6HmlkgETjz3STunhU=; b=OgMunKFw2ZUtO59lKL6GdXrsbT1I/hDf+9hSH9LdGvKmHoN2glZiUcft7LKZIL6jmvyZIGgE8wdHcdVrqxOSbBvwjY4sRE39aZr4x6Yui5zeQi2wwqq0+xHb7edraM4PIT95w/WiJawyTMnCYmVWYTN5fXNc+nyU7O0ep/OifLk= 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=1752203513; 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=p9Wu2W086XENViu8Ob6/rPvkHD6HmlkgETjz3STunhU=; b=ZGQ6EF4ieSBrfPzK6ZZUKtEcrWg9vdp+neSeuNJHYtffW1Y948XhB3ZpofT/9ONZ dWtphT+dDr15NOs5FlLbQmrtZyjSWC8f5pqT09f9ovXinCSY2z53WvPwcd0iehJsARh LjXSTr/IJeUoDLthAOGmDkdWjlzKoQD120eKeLIc= Received: by mx.zohomail.com with SMTPS id 1752203510956229.7171969824907; Thu, 10 Jul 2025 20:11:50 -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 v5 3/3] cxl/core: Using cxl_resource_contains_addr() to check address availability Date: Fri, 11 Jul 2025 11:11:01 +0800 Message-Id: <20250711031101.126990-4-ming.li@zohomail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250711031101.126990-1-ming.li@zohomail.com> References: <20250711031101.126990-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: rr08011227a62d66d49f70cb93d1af8a770000baa0171fa723d30ad33cb8837b7498919583bd23cb2a62c950:zu08011227123ac02a2325b284fa94e297000077a815c7d6f6c18edb2c9b68026a0f5340c9bdadf63c40fccf:rf0801122d5f0935d0f2e5ffdd8ab5a62b0000a4ab05fbe538aed8f1dc9425be0c7f6e23a1806183add57c9d5f4e9bf6c473: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 991fa3e70522..714d79fb8fa0 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