From: <smadhavan@nvidia.com>
To: <bhelgaas@google.com>, <dan.j.williams@intel.com>,
<dave.jiang@intel.com>, <jonathan.cameron@huawei.com>,
<ira.weiny@intel.com>, <vishal.l.verma@intel.com>,
<alison.schofield@intel.com>, <dave@stgolabs.net>
Cc: <alwilliamson@nvidia.com>, <jeshuas@nvidia.com>,
<vsethi@nvidia.com>, <skancherla@nvidia.com>, <vaslot@nvidia.com>,
<sdonthineni@nvidia.com>, <mhonap@nvidia.com>,
<vidyas@nvidia.com>, <jan@nvidia.com>, <mochs@nvidia.com>,
<dschumacher@nvidia.com>, <linux-cxl@vger.kernel.org>,
<linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
"Srirangan Madhavan" <smadhavan@nvidia.com>
Subject: [PATCH v5 4/7] cxl: Add multi-function sibling coordination for CXL reset
Date: Fri, 6 Mar 2026 09:23:19 +0000 [thread overview]
Message-ID: <20260306092322.148765-5-smadhavan@nvidia.com> (raw)
In-Reply-To: <20260306092322.148765-1-smadhavan@nvidia.com>
From: Srirangan Madhavan <smadhavan@nvidia.com>
Add sibling PCI function save/disable/restore coordination for CXL
reset. Before reset, all CXL.cachemem sibling functions are locked,
saved, and disabled; after reset they are restored. The Non-CXL Function
Map DVSEC and per-function DVSEC capability register are consulted to
skip non-CXL and CXL.io-only functions. A global mutex serializes
concurrent resets to prevent deadlocks between sibling functions.
Signed-off-by: Srirangan Madhavan <smadhavan@nvidia.com>
---
drivers/cxl/core/pci.c | 137 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 137 insertions(+)
diff --git a/drivers/cxl/core/pci.c b/drivers/cxl/core/pci.c
index 9e6f0c4b3cb6..b6f10a2cb404 100644
--- a/drivers/cxl/core/pci.c
+++ b/drivers/cxl/core/pci.c
@@ -15,6 +15,9 @@
#include "core.h"
#include "trace.h"
+/* Initial sibling array capacity: covers max non-ARI functions per slot */
+#define CXL_RESET_SIBLINGS_INIT 8
+
/**
* DOC: cxl core pci
*
@@ -979,3 +982,137 @@ static int __maybe_unused cxl_reset_flush_cpu_caches(struct cxl_memdev *cxlmd)
device_for_each_child(&endpoint->dev, NULL, cxl_decoder_flush_cache);
return 0;
}
+
+/*
+ * Serialize all CXL reset operations globally.
+ */
+static DEFINE_MUTEX(cxl_reset_mutex);
+
+struct cxl_reset_context {
+ struct pci_dev *target;
+ struct pci_dev **pci_functions;
+ int pci_func_count;
+ int pci_func_cap;
+};
+
+/*
+ * Check if a sibling function is non-CXL using the Non-CXL Function Map
+ * DVSEC. Returns true if fn is listed as non-CXL, false otherwise (including
+ * on any read failure).
+ */
+static bool cxl_is_non_cxl_function(struct pci_dev *pdev,
+ u16 func_map_dvsec, int fn)
+{
+ int reg, bit;
+ u32 map;
+
+ if (pci_ari_enabled(pdev->bus)) {
+ reg = fn / 32;
+ bit = fn % 32;
+ } else {
+ reg = fn;
+ bit = PCI_SLOT(pdev->devfn);
+ }
+
+ if (pci_read_config_dword(pdev,
+ func_map_dvsec + PCI_DVSEC_CXL_FUNCTION_MAP_REG + (reg * 4),
+ &map))
+ return false;
+
+ return map & BIT(bit);
+}
+
+struct cxl_reset_walk_ctx {
+ struct cxl_reset_context *ctx;
+ u16 func_map_dvsec;
+ bool ari;
+};
+
+static int cxl_reset_collect_sibling(struct pci_dev *func, void *data)
+{
+ struct cxl_reset_walk_ctx *wctx = data;
+ struct cxl_reset_context *ctx = wctx->ctx;
+ struct pci_dev *pdev = ctx->target;
+ u16 dvsec, cap;
+ int fn;
+
+ if (func == pdev)
+ return 0;
+
+ if (!wctx->ari &&
+ PCI_SLOT(func->devfn) != PCI_SLOT(pdev->devfn))
+ return 0;
+
+ fn = wctx->ari ? func->devfn : PCI_FUNC(func->devfn);
+ if (wctx->func_map_dvsec &&
+ cxl_is_non_cxl_function(pdev, wctx->func_map_dvsec, fn))
+ return 0;
+
+ /* Only coordinate with siblings that have CXL.cachemem */
+ dvsec = pci_find_dvsec_capability(func, PCI_VENDOR_ID_CXL,
+ PCI_DVSEC_CXL_DEVICE);
+ if (!dvsec)
+ return 0;
+ if (pci_read_config_word(func, dvsec + PCI_DVSEC_CXL_CAP, &cap))
+ return 0;
+ if (!(cap & (PCI_DVSEC_CXL_CACHE_CAPABLE |
+ PCI_DVSEC_CXL_MEM_CAPABLE)))
+ return 0;
+
+ /* Grow sibling array; double capacity for ARI devices when running out of space */
+ if (ctx->pci_func_count >= ctx->pci_func_cap) {
+ struct pci_dev **new;
+ int new_cap = ctx->pci_func_cap ? ctx->pci_func_cap * 2
+ : CXL_RESET_SIBLINGS_INIT;
+
+ new = krealloc(ctx->pci_functions,
+ new_cap * sizeof(*new), GFP_KERNEL);
+ if (!new)
+ return 1;
+ ctx->pci_functions = new;
+ ctx->pci_func_cap = new_cap;
+ }
+
+ pci_dev_get(func);
+ ctx->pci_functions[ctx->pci_func_count++] = func;
+ return 0;
+}
+
+static void __maybe_unused cxl_pci_functions_reset_prepare(struct cxl_reset_context *ctx)
+{
+ struct pci_dev *pdev = ctx->target;
+ struct cxl_reset_walk_ctx wctx;
+ int i;
+
+ ctx->pci_func_count = 0;
+ ctx->pci_functions = NULL;
+ ctx->pci_func_cap = 0;
+
+ wctx.ctx = ctx;
+ wctx.ari = pci_ari_enabled(pdev->bus);
+ wctx.func_map_dvsec = pci_find_dvsec_capability(pdev,
+ PCI_VENDOR_ID_CXL, PCI_DVSEC_CXL_FUNCTION_MAP);
+
+ /* Collect CXL.cachemem siblings under pci_bus_sem */
+ pci_walk_bus(pdev->bus, cxl_reset_collect_sibling, &wctx);
+
+ /* Lock and save/disable siblings outside pci_bus_sem */
+ for (i = 0; i < ctx->pci_func_count; i++) {
+ pci_dev_lock(ctx->pci_functions[i]);
+ pci_dev_save_and_disable(ctx->pci_functions[i]);
+ }
+}
+
+static void __maybe_unused cxl_pci_functions_reset_done(struct cxl_reset_context *ctx)
+{
+ int i;
+
+ for (i = 0; i < ctx->pci_func_count; i++) {
+ pci_dev_restore(ctx->pci_functions[i]);
+ pci_dev_unlock(ctx->pci_functions[i]);
+ pci_dev_put(ctx->pci_functions[i]);
+ }
+ kfree(ctx->pci_functions);
+ ctx->pci_functions = NULL;
+ ctx->pci_func_count = 0;
+}
--
2.43.0
next prev parent reply other threads:[~2026-03-06 9:24 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-06 9:23 [PATCH v5 0/7] CXL: Add cxl_reset sysfs attribute for PCI devices smadhavan
2026-03-06 9:23 ` [PATCH v5 1/7] PCI: Add CXL DVSEC reset and capability register definitions smadhavan
2026-03-06 9:23 ` [PATCH v5 2/7] PCI: Export pci_dev_save_and_disable() and pci_dev_restore() smadhavan
2026-03-06 9:23 ` [PATCH v5 3/7] cxl: Add memory offlining and cache flush helpers smadhavan
2026-03-06 23:34 ` Alex Williamson
2026-03-09 23:01 ` Dave Jiang
2026-03-06 9:23 ` smadhavan [this message]
2026-03-06 23:34 ` [PATCH v5 4/7] cxl: Add multi-function sibling coordination for CXL reset Alex Williamson
2026-03-06 9:23 ` [PATCH v5 5/7] cxl: Add CXL DVSEC reset sequence and flow orchestration smadhavan
2026-03-06 23:33 ` Alex Williamson
2026-03-10 0:26 ` Dave Jiang
2026-03-06 9:23 ` [PATCH v5 6/7] cxl: Add cxl_reset sysfs interface for PCI devices smadhavan
2026-03-06 23:32 ` Alex Williamson
2026-03-12 13:01 ` Jonathan Cameron
2026-03-14 20:39 ` Krzysztof Wilczyński
2026-03-06 9:23 ` [PATCH v5 7/7] Documentation: ABI: Add CXL PCI cxl_reset sysfs attribute smadhavan
2026-03-06 23:32 ` Alex Williamson
2026-03-09 22:37 ` [PATCH v5 0/7] CXL: Add cxl_reset sysfs attribute for PCI devices Dave Jiang
2026-03-09 22:40 ` Dave Jiang
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260306092322.148765-5-smadhavan@nvidia.com \
--to=smadhavan@nvidia.com \
--cc=alison.schofield@intel.com \
--cc=alwilliamson@nvidia.com \
--cc=bhelgaas@google.com \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=dave@stgolabs.net \
--cc=dschumacher@nvidia.com \
--cc=ira.weiny@intel.com \
--cc=jan@nvidia.com \
--cc=jeshuas@nvidia.com \
--cc=jonathan.cameron@huawei.com \
--cc=linux-cxl@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mhonap@nvidia.com \
--cc=mochs@nvidia.com \
--cc=sdonthineni@nvidia.com \
--cc=skancherla@nvidia.com \
--cc=vaslot@nvidia.com \
--cc=vidyas@nvidia.com \
--cc=vishal.l.verma@intel.com \
--cc=vsethi@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox