From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id ABEAD2FB97A; Wed, 3 Dec 2025 16:24:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764779082; cv=none; b=VCVPWZz0ac9UtQSl41IUuL/uQSvgYvhwoGy5RrzLtdlCezHc7e/4Vx7Hq9DrFGzRNoahQUnbQiA5ASMlXY9BKKuUGwzUrZB+Yph23tP5jlQJa2Yq06FjrNk7fM8FvBqMcRpkNR+aavokM3HVjIZYZtvWk3V6jTMyZlCUNPHmxZo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764779082; c=relaxed/simple; bh=YS4/FkIvjMUY3UZ/xjy5Xy/Gad+3oTAKkLyblw2w9Jg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ix29t7lJ0/r73shMFFDZddxsNhlqyodOXlAaOhXWZCWKGCXXBJWvo7DtuMpKdL57s6mE7YStKDaokHyHbYiHF+ZpgriqC7/Xu5sYMGts5erBrNKhiz7wZagNEJ1qsS0CZ14SCkcW7E03DrH2hAc1YD0/TqqH0qBKB5yKgGwGNwU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=p/0yfU+v; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="p/0yfU+v" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AF16BC116B1; Wed, 3 Dec 2025 16:24:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764779082; bh=YS4/FkIvjMUY3UZ/xjy5Xy/Gad+3oTAKkLyblw2w9Jg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p/0yfU+vKWSrtL5m2gu/y37pTIWRkOWKyGuWHlgOVraQih/qrWxSoUbrB1RW+cpp3 UxFEFMFkq7hoSDptUOe6j8S1w9M9uzV6hLbF7jNntAgxmbevXWayw6vl2zfJsJrotI xoRwT4bSNwxYUxUk1Mz3Y2gKnHdLs1eVlzJzyiFk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Lukas Wunner , Bjorn Helgaas , Mika Westerberg , Sasha Levin Subject: [PATCH 6.1 150/568] thunderbolt: Use is_pciehp instead of is_hotplug_bridge Date: Wed, 3 Dec 2025 16:22:32 +0100 Message-ID: <20251203152446.221879163@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152440.645416925@linuxfoundation.org> References: <20251203152440.645416925@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Lukas Wunner [ Upstream commit 5d03847175e81e86d4865456c15638faaf7c0634 ] The thunderbolt driver sets up device link dependencies from hotplug ports to the Host Router (aka Native Host Interface, NHI). When resuming from system sleep, this allows the Host Router to re-establish tunnels to attached Thunderbolt devices before the hotplug ports resume. To identify the hotplug ports, the driver utilizes the is_hotplug_bridge flag which also encompasses ACPI slots handled by the ACPI hotplug driver. Thunderbolt hotplug ports are always Hot-Plug Capable PCIe ports, so it is more apt to identify them with the is_pciehp flag. Similarly, hotplug ports on older Thunderbolt controllers have broken MSI support and are quirked to use legacy INTx interrupts instead. The quirk identifies them with is_hotplug_bridge, even though all affected ports are also matched by is_pciehp. So use is_pciehp here as well. Signed-off-by: Lukas Wunner Acked-by: Bjorn Helgaas Signed-off-by: Mika Westerberg Signed-off-by: Sasha Levin --- drivers/pci/quirks.c | 2 +- drivers/thunderbolt/tb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 0772ce28cba41..e8cfae79a47a9 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -3717,7 +3717,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_MELLANOX, 0xcf80, quirk_no_pm_reset); */ static void quirk_thunderbolt_hotplug_msi(struct pci_dev *pdev) { - if (pdev->is_hotplug_bridge && + if (pdev->is_pciehp && (pdev->device != PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C || pdev->revision <= 1)) pdev->no_msi = 1; diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c index 0668e1645bc50..f417ce477d4a0 100644 --- a/drivers/thunderbolt/tb.c +++ b/drivers/thunderbolt/tb.c @@ -1888,7 +1888,7 @@ static void tb_apple_add_links(struct tb_nhi *nhi) if (!pci_is_pcie(pdev)) continue; if (pci_pcie_type(pdev) != PCI_EXP_TYPE_DOWNSTREAM || - !pdev->is_hotplug_bridge) + !pdev->is_pciehp) continue; link = device_link_add(&pdev->dev, &nhi->pdev->dev, -- 2.51.0