From nobody Thu Apr 2 19:13:53 2026 Received: from mail-qt1-f169.google.com (mail-qt1-f169.google.com [209.85.160.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9A9F634F487 for ; Wed, 11 Feb 2026 20:42:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770842538; cv=none; b=u8qnE9qX5yRMqp2xbhpF0pvmWtBx2rMwGEO9lbvbS81G3bFoONplU+CB6NpI90K/DkCq0/deZ69RKQ9x//gV4upq3CrYQ2OSbB2zcfYf++Q9aAdV7rKQBEuLILK4GGubhU8UQh8MXJQPHqDOwOiwKk2YkAMWNLYBPgFb/z7k73I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770842538; c=relaxed/simple; bh=dc0/f+72fO066qR70nZo/P4imNLuNHmky2aGyXv5bYg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QE8qqeISQfkD6Qm10qkcvKUUZ4MAFQm8ew3tU2GY0enBWjwXRrbiQ8FbWDz247owZQhN5x/1LEg2dggOCYOI63FNgmjCQDyNY5NWDor8JN8rrz+JWD7V08lDccRgxBKhsprhJy3KLMjFSiJGCqxDGZI0T6lux5bxd10ZwXZH2aY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net; spf=pass smtp.mailfrom=gourry.net; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b=k7frlLQx; arc=none smtp.client-ip=209.85.160.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=gourry.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gourry.net Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gourry.net header.i=@gourry.net header.b="k7frlLQx" Received: by mail-qt1-f169.google.com with SMTP id d75a77b69052e-5032e15525aso68405621cf.3 for ; Wed, 11 Feb 2026 12:42:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gourry.net; s=google; t=1770842535; x=1771447335; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hPnkt2HqQSF9t7HcwfsUe1t/3CrGC8q8jLWUL6hw2HQ=; b=k7frlLQxTORDD9+3nRBpf9XuS8Q5kSBu2nJwh4dH4zB2xbP9/8uh+phLuvbr9MtCJ4 mTvpqW4FJaq1JyIKWUrhuqv/mirOSvYGUesV0jcFElJHOjtphHxcEbXid11qLi4j5/Qq DBl27y7j/uLFxsezcXojVScwEwemXrzzUuSaNGeMqSk1uk5aq2mrbI3dBEEeSXV8B6iZ ud3IinDhBw9PjyjObtOr9WHdkgxm8vNlvZq5JP3qbjCCfHT5uP0dD9aJL6mHp0FRFEck 67p0aRzyHGgPVgf/qQrSoM0sNdxi2LGaysVQvOnwA5jczQCRvK1N7nCsT3Gpfbtp9YZn /TOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770842535; x=1771447335; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=hPnkt2HqQSF9t7HcwfsUe1t/3CrGC8q8jLWUL6hw2HQ=; b=G1roBEQ3rTGQ1s9KD8bSb6/0DzLfsbf792uYXReuLd0w8PAzSLCWtAnwx+qUIJEZcw BTp4Q5aqzgLuWZysuBKuHK/J3FTyL9HCc0GOivBYKC5gZtf58EqUj9NigbrXoeXKOh1z /GaFBvEc/vpway4URmOcZC2JoHGY+VC+GwqSL79aqD/JzD2GmpSBgkyaqLeH+EEW9V3i tcyn8+NdYxeIL6uGuL9zNPPpgd3Xjj12hJ0zViwDIbs9JxxbbnYwBghpWg+DpyxvFby7 6YjcdXB+SMvA6/stWqWBxvX1iMwbtP63z0Q9nRX/kUPvDKxzzQpmv1q7udzVWgmacuR9 AyEQ== X-Gm-Message-State: AOJu0YyhmXmR87YwGaUbNP5taqUUjRuFg0gQzUYzrgyTIGZHoNDEkomc AObBtU6cYxYhTazdDynLxhB7F26ap8qvKfONPdmKqLrMwJCq0nBQmzY1OiYq54in/xQ= X-Gm-Gg: AZuq6aLdqyvsplcgyBHfywglnroR8T1alkFy39i+XYwiF06RD+3qMaDZFagLbx2DEa7 85tO0wsf+f6d/s6o/MqMwSBwpodvOv0YlxEvW5cgC6N4tgMS0rFeRJg5JOZeabFR+RLPeOgCNc1 LQ7JqMssdzQsa9TvnOPxOQEDJ9lkkejm7pTzneeqIJmUIcVX60Bebrrnr3BIZ0Q85CRbPJgzJkh jU+9EcoeEwN3QR9U5J2cJhDLi8lFYofopFLRNfAX3JiMz/b69ZHvjZrTZJKvXTKbraLPdev0d6C YdgAzXcFFQsua863hqDusiqkVIpOrkvff6TqaWCfk+WlTHMTegVD/JhjKIyK+9dkhUXbynY8hLJ mbRai16f0OBs/rBOO7MVcfYsoaQ9O35jKAiCcr1Kb7PgEQaqEZpp16nhnkHg2B5fwxWoSU32+j4 GRny2EUw7i/E5DEshxW6cSIoFhS9/twCq5sCsQtggmWEXMRoe+N5HYldMKFHI+i39BgpXyctY7i PNad0mrIfspEXI= X-Received: by 2002:a05:622a:1a89:b0:501:3c88:131 with SMTP id d75a77b69052e-50691a3643fmr11189491cf.22.1770842535613; Wed, 11 Feb 2026 12:42:15 -0800 (PST) Received: from gourry-fedora-PF4VCD3F.lan (pool-96-255-20-138.washdc.ftas.verizon.net. [96.255.20.138]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-506847d77cesm20173591cf.3.2026.02.11.12.42.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Feb 2026 12:42:15 -0800 (PST) From: Gregory Price To: linux-cxl@vger.kernel.org Cc: linux-kernel@vger.kernel.org, kernel-team@meta.com, 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, "Fabio M. De Francesco" Subject: [PATCH v3 2/3] cxl/core/region: move dax region device logic into region_dax.c Date: Wed, 11 Feb 2026 15:42:05 -0500 Message-ID: <20260211204206.2171525-3-gourry@gourry.net> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260211204206.2171525-1-gourry@gourry.net> References: <20260211204206.2171525-1-gourry@gourry.net> 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" core/region.c is overloaded with per-region control logic (pmem, dax). Move CXL DAX region device logic from region.c into region_dax.c. No functional changes. Reviewed-by: Dave Jiang Reviewed-by: Fabio M. De Francesco Acked-by: Davidlohr Bueso Signed-off-by: Gregory Price --- drivers/cxl/core/Makefile | 1 + drivers/cxl/core/core.h | 1 + drivers/cxl/core/region.c | 99 ------------------------------ drivers/cxl/core/region_dax.c | 109 ++++++++++++++++++++++++++++++++++ 4 files changed, 111 insertions(+), 99 deletions(-) create mode 100644 drivers/cxl/core/region_dax.c diff --git a/drivers/cxl/core/Makefile b/drivers/cxl/core/Makefile index d1484a0e5eb4..d3ec8aea64c5 100644 --- a/drivers/cxl/core/Makefile +++ b/drivers/cxl/core/Makefile @@ -16,6 +16,7 @@ cxl_core-y +=3D pmu.o cxl_core-y +=3D cdat.o cxl_core-$(CONFIG_TRACING) +=3D trace.o cxl_core-$(CONFIG_CXL_REGION) +=3D region.o +cxl_core-$(CONFIG_CXL_REGION) +=3D region_dax.o cxl_core-$(CONFIG_CXL_REGION) +=3D region_pmem.o cxl_core-$(CONFIG_CXL_MCE) +=3D mce.o cxl_core-$(CONFIG_CXL_FEATURES) +=3D features.o diff --git a/drivers/cxl/core/core.h b/drivers/cxl/core/core.h index ced65a779a09..a89e0d6d9e7b 100644 --- a/drivers/cxl/core/core.h +++ b/drivers/cxl/core/core.h @@ -50,6 +50,7 @@ int cxl_get_poison_by_endpoint(struct cxl_port *port); struct cxl_region *cxl_dpa_to_region(const struct cxl_memdev *cxlmd, u64 d= pa); u64 cxl_dpa_to_hpa(struct cxl_region *cxlr, const struct cxl_memdev *cxlmd, u64 dpa); +int devm_cxl_add_dax_region(struct cxl_region *cxlr); int devm_cxl_add_pmem_region(struct cxl_region *cxlr); =20 #else diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c index 1c322318d70e..0c37caa60f2a 100644 --- a/drivers/cxl/core/region.c +++ b/drivers/cxl/core/region.c @@ -3392,105 +3392,6 @@ static int region_offset_to_dpa_result(struct cxl_r= egion *cxlr, u64 offset, return -ENXIO; } =20 -static void cxl_dax_region_release(struct device *dev) -{ - struct cxl_dax_region *cxlr_dax =3D to_cxl_dax_region(dev); - - kfree(cxlr_dax); -} - -static const struct attribute_group *cxl_dax_region_attribute_groups[] =3D= { - &cxl_base_attribute_group, - NULL, -}; - -const struct device_type cxl_dax_region_type =3D { - .name =3D "cxl_dax_region", - .release =3D cxl_dax_region_release, - .groups =3D cxl_dax_region_attribute_groups, -}; - -static bool is_cxl_dax_region(struct device *dev) -{ - return dev->type =3D=3D &cxl_dax_region_type; -} - -struct cxl_dax_region *to_cxl_dax_region(struct device *dev) -{ - if (dev_WARN_ONCE(dev, !is_cxl_dax_region(dev), - "not a cxl_dax_region device\n")) - return NULL; - return container_of(dev, struct cxl_dax_region, dev); -} -EXPORT_SYMBOL_NS_GPL(to_cxl_dax_region, "CXL"); - -static struct lock_class_key cxl_dax_region_key; - -static struct cxl_dax_region *cxl_dax_region_alloc(struct cxl_region *cxlr) -{ - struct cxl_region_params *p =3D &cxlr->params; - struct cxl_dax_region *cxlr_dax; - struct device *dev; - - guard(rwsem_read)(&cxl_rwsem.region); - if (p->state !=3D CXL_CONFIG_COMMIT) - return ERR_PTR(-ENXIO); - - cxlr_dax =3D kzalloc(sizeof(*cxlr_dax), GFP_KERNEL); - if (!cxlr_dax) - return ERR_PTR(-ENOMEM); - - cxlr_dax->hpa_range.start =3D p->res->start; - cxlr_dax->hpa_range.end =3D p->res->end; - - dev =3D &cxlr_dax->dev; - cxlr_dax->cxlr =3D cxlr; - device_initialize(dev); - lockdep_set_class(&dev->mutex, &cxl_dax_region_key); - device_set_pm_not_required(dev); - dev->parent =3D &cxlr->dev; - dev->bus =3D &cxl_bus_type; - dev->type =3D &cxl_dax_region_type; - - return cxlr_dax; -} - -static void cxlr_dax_unregister(void *_cxlr_dax) -{ - struct cxl_dax_region *cxlr_dax =3D _cxlr_dax; - - device_unregister(&cxlr_dax->dev); -} - -static int devm_cxl_add_dax_region(struct cxl_region *cxlr) -{ - struct cxl_dax_region *cxlr_dax; - struct device *dev; - int rc; - - cxlr_dax =3D cxl_dax_region_alloc(cxlr); - if (IS_ERR(cxlr_dax)) - return PTR_ERR(cxlr_dax); - - dev =3D &cxlr_dax->dev; - rc =3D dev_set_name(dev, "dax_region%d", cxlr->id); - if (rc) - goto err; - - rc =3D device_add(dev); - if (rc) - goto err; - - dev_dbg(&cxlr->dev, "%s: register %s\n", dev_name(dev->parent), - dev_name(dev)); - - return devm_add_action_or_reset(&cxlr->dev, cxlr_dax_unregister, - cxlr_dax); -err: - put_device(dev); - return rc; -} - static int match_root_decoder(struct device *dev, const void *data) { const struct range *r1, *r2 =3D data; diff --git a/drivers/cxl/core/region_dax.c b/drivers/cxl/core/region_dax.c new file mode 100644 index 000000000000..c8dd2bd1d9b9 --- /dev/null +++ b/drivers/cxl/core/region_dax.c @@ -0,0 +1,109 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright(c) 2022 Intel Corporation. All rights reserved. + * Copyright(c) 2026 Meta Technologies Inc. All rights reserved. + */ +#include +#include +#include +#include +#include "core.h" + +static void cxl_dax_region_release(struct device *dev) +{ + struct cxl_dax_region *cxlr_dax =3D to_cxl_dax_region(dev); + + kfree(cxlr_dax); +} + +static const struct attribute_group *cxl_dax_region_attribute_groups[] =3D= { + &cxl_base_attribute_group, + NULL +}; + +const struct device_type cxl_dax_region_type =3D { + .name =3D "cxl_dax_region", + .release =3D cxl_dax_region_release, + .groups =3D cxl_dax_region_attribute_groups, +}; + +static bool is_cxl_dax_region(struct device *dev) +{ + return dev->type =3D=3D &cxl_dax_region_type; +} + +struct cxl_dax_region *to_cxl_dax_region(struct device *dev) +{ + if (dev_WARN_ONCE(dev, !is_cxl_dax_region(dev), + "not a cxl_dax_region device\n")) + return NULL; + return container_of(dev, struct cxl_dax_region, dev); +} +EXPORT_SYMBOL_NS_GPL(to_cxl_dax_region, "CXL"); + +static struct lock_class_key cxl_dax_region_key; + +static struct cxl_dax_region *cxl_dax_region_alloc(struct cxl_region *cxlr) +{ + struct cxl_region_params *p =3D &cxlr->params; + struct cxl_dax_region *cxlr_dax; + struct device *dev; + + guard(rwsem_read)(&cxl_rwsem.region); + if (p->state !=3D CXL_CONFIG_COMMIT) + return ERR_PTR(-ENXIO); + + cxlr_dax =3D kzalloc(sizeof(*cxlr_dax), GFP_KERNEL); + if (!cxlr_dax) + return ERR_PTR(-ENOMEM); + + cxlr_dax->hpa_range.start =3D p->res->start; + cxlr_dax->hpa_range.end =3D p->res->end; + + dev =3D &cxlr_dax->dev; + cxlr_dax->cxlr =3D cxlr; + device_initialize(dev); + lockdep_set_class(&dev->mutex, &cxl_dax_region_key); + device_set_pm_not_required(dev); + dev->parent =3D &cxlr->dev; + dev->bus =3D &cxl_bus_type; + dev->type =3D &cxl_dax_region_type; + + return cxlr_dax; +} + +static void cxlr_dax_unregister(void *_cxlr_dax) +{ + struct cxl_dax_region *cxlr_dax =3D _cxlr_dax; + + device_unregister(&cxlr_dax->dev); +} + +int devm_cxl_add_dax_region(struct cxl_region *cxlr) +{ + struct cxl_dax_region *cxlr_dax; + struct device *dev; + int rc; + + cxlr_dax =3D cxl_dax_region_alloc(cxlr); + if (IS_ERR(cxlr_dax)) + return PTR_ERR(cxlr_dax); + + dev =3D &cxlr_dax->dev; + rc =3D dev_set_name(dev, "dax_region%d", cxlr->id); + if (rc) + goto err; + + rc =3D device_add(dev); + if (rc) + goto err; + + dev_dbg(&cxlr->dev, "%s: register %s\n", dev_name(dev->parent), + dev_name(dev)); + + return devm_add_action_or_reset(&cxlr->dev, cxlr_dax_unregister, + cxlr_dax); +err: + put_device(dev); + return rc; +} --=20 2.47.3