mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Nikola Prica <nikprica@amd.com>
To: <bhelgaas@google.com>
Cc: <linux-pci@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
	<stable@vger.kernel.org>, <jerry.jiang@amd.com>,
	<haijun.chang@amd.com>, <andy.zhang@amd.com>,
	<christian.koenig@amd.com>, <jim.chow@broadcom.com>,
	<matthew.mcclure@broadcom.com>, <gbayer@linux.ibm.com>,
	<regressions@lists.linux.dev>,
	Nikola Prica <nikola.prica@amd.com>
Subject: [PATCH v4] PCI: Accept AtomicOps already enabled by the hypervisor
Date: Mon, 21 Sep 2026 13:19:03 +0200	[thread overview]
Message-ID: <20260921111903.978687-1-nikprica@amd.com> (raw)
In-Reply-To: <3f5fb659-c7a8-41cd-91dd-565cb46c0165@amd.com>

From: Nikola Prica <nikola.prica@amd.com>

pci_enable_atomic_ops_to_root() currently fails when no Root Port is
visible. That is common in passthrough guests (ESXi, Hyper-V): the
endpoint is assigned to the VM, but the guest topology has no Root
Port above it.

In those setups the hypervisor may already have enabled AtomicOp
Requester Enable on the device. If PCI_EXP_DEVCTL2_ATOMIC_REQ is set,
treat AtomicOps as already enabled and return success instead of
failing the Root Port walk.

After 1ae8c4ce1570 ("PCI: Enable AtomicOps only if Root Port
supports them"), pci_enable_atomic_ops_to_root() always fails if the
Root Port is not visible.  On systems where the Root Port is not
visible but *does* support AtomicOps, this is a regression: prior to
1ae8c4ce1570, it enabled AtomicOps in the endpoint and returned
success.

Fixes: 1ae8c4ce1570 ("PCI: Enable AtomicOps only if Root Port supports them")
Reviewed-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Gerd Bayer <gbayer@linux.ibm.com>
Tested-by: Gerd Bayer <gbayer@linux.ibm.com>
Signed-off-by: Nikola Prica <nikola.prica@amd.com>

---
v4: Updates commit log to make regression point clear
v3: Add Fixes tag
v2: Be more strict and only apply logic in headless device case.
---
 drivers/pci/pci.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index b2879a6be5f8..62729ade496f 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -3769,8 +3769,18 @@ int pci_enable_atomic_ops_to_root(struct pci_dev *dev, u32 cap_mask)
 	}
 
 	root = pcie_find_root_port(dev);
-	if (!root)
+	if (!root) {
+		/*
+		 * A hypervisor may expose a headless topology with no
+		 * visible root port.  If it has already set AtomicOp
+		 * Requester Enable, there is nothing more to do.
+		 */
+		pcie_capability_read_dword(dev, PCI_EXP_DEVCTL2, &ctl2);
+		if (ctl2 & PCI_EXP_DEVCTL2_ATOMIC_REQ)
+			return 0;
+
 		return -EINVAL;
+	}
 
 	pcie_capability_read_dword(root, PCI_EXP_DEVCAP2, &cap);
 	if ((cap & cap_mask) != cap_mask)
-- 
2.34.1


  reply	other threads:[~2026-09-21 11:08 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20260903121217.23F751F000E9@smtp.kernel.org>
2026-09-07 16:17 ` [PATCH v2] " Nikola Prica
2026-09-08  8:47   ` Christian König
2026-09-11 14:09     ` Prica, Nikola
2026-09-14 13:41   ` Gerd Bayer
2026-09-14 13:54     ` Christian König
2026-09-18  9:07       ` Prica, Nikola
2026-09-18  9:28         ` [PATCH v3] " Nikola Prica
2026-09-18 12:07           ` Christian König
2026-09-18 17:07             ` Bjorn Helgaas
2026-09-21 11:04               ` Prica, Nikola
2026-09-21 11:05                 ` Prica, Nikola
2026-09-21 11:19                   ` Nikola Prica [this message]
2026-09-21 11:58                 ` Christian König
2026-09-21 12:12                 ` Thorsten Leemhuis

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=20260921111903.978687-1-nikprica@amd.com \
    --to=nikprica@amd.com \
    --cc=andy.zhang@amd.com \
    --cc=bhelgaas@google.com \
    --cc=christian.koenig@amd.com \
    --cc=gbayer@linux.ibm.com \
    --cc=haijun.chang@amd.com \
    --cc=jerry.jiang@amd.com \
    --cc=jim.chow@broadcom.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=matthew.mcclure@broadcom.com \
    --cc=nikola.prica@amd.com \
    --cc=regressions@lists.linux.dev \
    --cc=stable@vger.kernel.org \
    /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

all inboxes | Powered by JetHome®