From: Sasha Levin <sashal@kernel.org>
To: patches@lists.linux.dev, stable@vger.kernel.org
Cc: Timothy Pearson <tpearson@raptorengineering.com>,
Shawn Anastasio <sanastasio@raptorengineering.com>,
Bjorn Helgaas <bhelgaas@google.com>,
Madhavan Srinivasan <maddy@linux.ibm.com>,
Sasha Levin <sashal@kernel.org>,
mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org
Subject: [PATCH AUTOSEL 6.16-5.4] PCI: pnv_php: Work around switches with broken presence detection
Date: Fri, 8 Aug 2025 11:30:48 -0400 [thread overview]
Message-ID: <20250808153054.1250675-8-sashal@kernel.org> (raw)
In-Reply-To: <20250808153054.1250675-1-sashal@kernel.org>
From: Timothy Pearson <tpearson@raptorengineering.com>
[ Upstream commit 80f9fc2362797538ebd4fd70a1dfa838cc2c2cdb ]
The Microsemi Switchtec PM8533 PFX 48xG3 [11f8:8533] PCIe switch system
was observed to incorrectly assert the Presence Detect Set bit in its
capabilities when tested on a Raptor Computing Systems Blackbird system,
resulting in the hot insert path never attempting a rescan of the bus
and any downstream devices not being re-detected.
Work around this by additionally checking whether the PCIe data link is
active or not when performing presence detection on downstream switches'
ports, similar to the pciehp_hpc.c driver.
Signed-off-by: Shawn Anastasio <sanastasio@raptorengineering.com>
Signed-off-by: Timothy Pearson <tpearson@raptorengineering.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Madhavan Srinivasan <maddy@linux.ibm.com>
Link: https://patch.msgid.link/505981576.1359853.1752615415117.JavaMail.zimbra@raptorengineeringinc.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
LLM Generated explanations, may be completely bogus:
**Backport Status: YES**
This commit is suitable for backporting to stable kernel trees based on
the following analysis:
## Commit Analysis
### 1. Bug Fix Nature
The commit fixes a real hardware bug where the Microsemi Switchtec
PM8533 PFX 48xG3 PCIe switch incorrectly reports presence detection.
This causes downstream devices to not be re-detected after hot
insertion, which is a significant functional issue affecting users.
### 2. Small and Contained Fix
The patch adds only 33 lines of code:
- Adds a new helper function `pcie_check_link_active()` (11 lines)
- Modifies `pnv_php_get_adapter_state()` with a targeted workaround (13
lines)
- The changes are confined to a single file:
`drivers/pci/hotplug/pnv_php.c`
### 3. Clear and Minimal Side Effects
The workaround is:
- Only activated for specific hardware (downstream PCIe ports)
- Only when presence detection returns EMPTY
- Uses an additional check (link active status) as a fallback
- Similar approach already proven in pciehp_hpc.c driver
### 4. Hardware Quirk Fix
This is explicitly a hardware quirk workaround for broken hardware
(Microsemi Switchtec PM8533), which is one of the accepted categories
for stable backports according to stable kernel rules.
### 5. No Architectural Changes
The commit:
- Does not introduce new features
- Does not change any APIs or interfaces
- Does not modify core kernel infrastructure
- Simply adds a fallback detection mechanism
### 6. Tested Solution
The commit message indicates this was "observed" and tested on a Raptor
Computing Systems Blackbird system, suggesting real-world validation.
## Stable Tree Compliance
According to Documentation/process/stable-kernel-rules.rst, this patch
meets the criteria:
- Fixes a real bug that bothers people (hotplug detection failure)
- Is a hardware quirk fix (explicitly allowed)
- Is under 100 lines with context
- Is obviously correct (uses established pattern from pciehp_hpc.c)
- Has clear user impact (devices not being detected after hot insertion)
The workaround pattern of checking link active status when presence
detection fails is a well-established approach in PCIe hotplug drivers,
making this a low-risk backport candidate.
drivers/pci/hotplug/pnv_php.c | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/drivers/pci/hotplug/pnv_php.c b/drivers/pci/hotplug/pnv_php.c
index 573a41869c15..aaa8e0a2a893 100644
--- a/drivers/pci/hotplug/pnv_php.c
+++ b/drivers/pci/hotplug/pnv_php.c
@@ -391,6 +391,20 @@ static int pnv_php_get_power_state(struct hotplug_slot *slot, u8 *state)
return 0;
}
+static int pcie_check_link_active(struct pci_dev *pdev)
+{
+ u16 lnk_status;
+ int ret;
+
+ ret = pcie_capability_read_word(pdev, PCI_EXP_LNKSTA, &lnk_status);
+ if (ret == PCIBIOS_DEVICE_NOT_FOUND || PCI_POSSIBLE_ERROR(lnk_status))
+ return -ENODEV;
+
+ ret = !!(lnk_status & PCI_EXP_LNKSTA_DLLLA);
+
+ return ret;
+}
+
static int pnv_php_get_adapter_state(struct hotplug_slot *slot, u8 *state)
{
struct pnv_php_slot *php_slot = to_pnv_php_slot(slot);
@@ -403,6 +417,19 @@ static int pnv_php_get_adapter_state(struct hotplug_slot *slot, u8 *state)
*/
ret = pnv_pci_get_presence_state(php_slot->id, &presence);
if (ret >= 0) {
+ if (pci_pcie_type(php_slot->pdev) == PCI_EXP_TYPE_DOWNSTREAM &&
+ presence == OPAL_PCI_SLOT_EMPTY) {
+ /*
+ * Similar to pciehp_hpc, check whether the Link Active
+ * bit is set to account for broken downstream bridges
+ * that don't properly assert Presence Detect State, as
+ * was observed on the Microsemi Switchtec PM8533 PFX
+ * [11f8:8533].
+ */
+ if (pcie_check_link_active(php_slot->pdev) > 0)
+ presence = OPAL_PCI_SLOT_PRESENT;
+ }
+
*state = presence;
ret = 0;
} else {
--
2.39.5
next parent reply other threads:[~2025-08-08 15:31 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20250808153054.1250675-1-sashal@kernel.org>
2025-08-08 15:30 ` Sasha Levin [this message]
2025-08-08 15:30 ` [PATCH AUTOSEL 6.16-6.6] powerpc/eeh: Make EEH driver device hotplug safe Sasha Levin
2025-08-08 15:30 ` [PATCH AUTOSEL 6.16-5.10] PCI: pnv_php: Clean up allocated IRQs on unplug Sasha Levin
2025-08-08 15:59 ` Timothy Pearson
2025-08-08 17:04 ` Sasha Levin
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=20250808153054.1250675-8-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=bhelgaas@google.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=maddy@linux.ibm.com \
--cc=mpe@ellerman.id.au \
--cc=patches@lists.linux.dev \
--cc=sanastasio@raptorengineering.com \
--cc=stable@vger.kernel.org \
--cc=tpearson@raptorengineering.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;
as well as URLs for NNTP newsgroup(s).