public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH pve-kernel] fix #8153: revert CXL patch breaking NVIDIA driver
Date: Thu, 22 Oct 2026 14:37:56 +0200	[thread overview]
Message-ID: <20261022123800.2333393-1-f.gruenbichler@proxmox.com> (raw)

the patch was picked as a pre-requisite, but nothing uses the new helper..

upstream later moved the helper to a private/internal header in

b6a61d5baf99 (2026-04-01; "cxl/region: Limit visibility of cxl_region_contains_resource()")

as part of 7.1, but picking that would require picking more related refactors
which are not part of stable kernels..

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 ...n-Add-helper-to-check-Soft-Reserved-.patch | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 patches/kernel/0068-Revert-cxl-region-Add-helper-to-check-Soft-Reserved-.patch

diff --git a/patches/kernel/0068-Revert-cxl-region-Add-helper-to-check-Soft-Reserved-.patch b/patches/kernel/0068-Revert-cxl-region-Add-helper-to-check-Soft-Reserved-.patch
new file mode 100644
index 0000000..999ff1c
--- /dev/null
+++ b/patches/kernel/0068-Revert-cxl-region-Add-helper-to-check-Soft-Reserved-.patch
@@ -0,0 +1,82 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= <f.gruenbichler@proxmox.com>
+Date: Thu, 22 Oct 2026 13:59:29 +0200
+Subject: [PATCH] Revert "cxl/region: Add helper to check Soft Reserved
+ containment by CXL regions"
+
+This reverts commit 86e96316b55f726c46dac841ea17ddfd36563df4.
+---
+ drivers/cxl/core/region.c | 30 ------------------------------
+ include/cxl/cxl.h         | 15 ---------------
+ 2 files changed, 45 deletions(-)
+ delete mode 100644 include/cxl/cxl.h
+
+diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c
+index b568e9cd3d57c58fed26e4a7dcee867d4e972fd7..a664f3b6cdec4778b02397e450b1b5ef83297288 100644
+--- a/drivers/cxl/core/region.c
++++ b/drivers/cxl/core/region.c
+@@ -12,7 +12,6 @@
+ #include <linux/idr.h>
+ #include <linux/memory-tiers.h>
+ #include <linux/string_choices.h>
+-#include <cxl/cxl.h>
+ #include <cxlmem.h>
+ #include <cxl.h>
+ #include "core.h"
+@@ -4178,35 +4177,6 @@ static int cxl_region_setup_poison(struct cxl_region *cxlr)
+ 	return devm_add_action_or_reset(dev, remove_debugfs, dentry);
+ }
+ 
+-static int region_contains_resource(struct device *dev, void *data)
+-{
+-	struct resource *res = data;
+-	struct cxl_region *cxlr;
+-	struct cxl_region_params *p;
+-
+-	if (!is_cxl_region(dev))
+-		return 0;
+-
+-	cxlr = to_cxl_region(dev);
+-	p = &cxlr->params;
+-
+-	if (p->state != CXL_CONFIG_COMMIT)
+-		return 0;
+-
+-	if (!p->res)
+-		return 0;
+-
+-	return resource_contains(p->res, res) ? 1 : 0;
+-}
+-
+-bool cxl_region_contains_resource(struct resource *res)
+-{
+-	guard(rwsem_read)(&cxl_rwsem.region);
+-	return bus_for_each_dev(&cxl_bus_type, NULL, res,
+-				region_contains_resource) != 0;
+-}
+-EXPORT_SYMBOL_GPL(cxl_region_contains_resource);
+-
+ static int cxl_region_can_probe(struct cxl_region *cxlr)
+ {
+ 	struct cxl_region_params *p = &cxlr->params;
+diff --git a/include/cxl/cxl.h b/include/cxl/cxl.h
+deleted file mode 100644
+index b12d3d0f665884bbd39ef6fea4f969a417fdfd95..0000000000000000000000000000000000000000
+--- a/include/cxl/cxl.h
++++ /dev/null
+@@ -1,15 +0,0 @@
+-/* SPDX-License-Identifier: GPL-2.0-only */
+-/* Copyright (c) 2026 Advanced Micro Devices, Inc. */
+-#ifndef _CXL_H_
+-#define _CXL_H_
+-
+-#ifdef CONFIG_CXL_REGION
+-bool cxl_region_contains_resource(struct resource *res);
+-#else
+-static inline bool cxl_region_contains_resource(struct resource *res)
+-{
+-	return false;
+-}
+-#endif
+-
+-#endif /* _CXL_H_ */
-- 
2.47.3





                 reply	other threads:[~2026-10-22 12:38 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20261022123800.2333393-1-f.gruenbichler@proxmox.com \
    --to=f.gruenbichler@proxmox.com \
    --cc=pve-devel@lists.proxmox.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
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal