From nobody Mon Sep 28 21:07:48 2026 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C115F3F65FC for ; Mon, 17 Aug 2026 10:13:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786961635; cv=none; b=B8Mme39f6Q6TFmMZkMBfVg3acVdekGXWCgSTxuSXLnB4coxM7BvMH+zBqKipSnvLj/UFMvV7vqL+WroFfndTkw9R9PFAUcJ56ogCr3mGVWNYXInG6J+5G17N+nXVsQEXo0Q0iLidvYqD6ohIQDiSlpeNTmLlodrCIcYHq5Wcg9I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786961635; c=relaxed/simple; bh=CizFxtplh31MaoRyDhQUklAVO5brshVhPT06PE0+8xg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TueGz9EFTFYHarBMjvW1HJ9ZSRfkiuWuB6U4kpT6HDwaxlCxpwskc/NWBm1DY/GYNr2+HcGUP/1cRNYQemhKZHgvnOcl8NlI0YLsn+NqAHer8eIRZxqWQhrz+KvuZ+45w17a/UNwZdOJ7U1rtKIAeerMSAoYMPgqiLUnxT+eyc0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=OI7IT0r1; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OI7IT0r1" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-3811f512167so4523092a91.3 for ; Mon, 17 Aug 2026 03:13:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786961632; x=1787566432; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=CeECLjqLcEJPD/Rw00vUe8sjoJNKjBRQIoIZeyp3OHU=; b=OI7IT0r1Bolw6qa/o0tSxBizGX35sJpLMwghqvi6DLyNVOfhfQLj8+x8wnEUWfVYIR +OFvr9KEaSrJcmsW+rNzPyflqsCoh+HxWSbY7kslKeroVLzxDmAlKtcxJaFQ/rUoJKj7 clJUPQq9Qhz9C1Fb9fHsxTNNqrxKbf9hwFqceSFbHZBP9kXh+oHhDGzisf4qLcUZ4+lq v3VYD/BAMk/GplaXojSigbY0vlWdw6yOwoI9nMxCUeuhJduhMGCml2HT4KK2ePvfWMQh zxwLdVAe5TmzLzI7DPuEpXuGyNU88WlMl75gP5GMKo+LGcQZ8RznRqTy725Dtk/6TMow Eenw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786961632; x=1787566432; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=CeECLjqLcEJPD/Rw00vUe8sjoJNKjBRQIoIZeyp3OHU=; b=YAQgeQ8lrievFSsGvQ89pHq2Mm2vebDtcvawGGaFCzkCjNoXZ6CmcotWjCX9jXKxW/ SGbk+eKo+KjbWtzC9iI3H1bUr5ptiTi0jmsbOwFqTBBQOzTp+/YRCnbQBMDNX39Up/+3 uPp3NX7/wctY/+g1wSgfuBIyWM2v+ysmJH97l27EES4G7ZuIc8mvwKCb8hbxwKnTBMLw TCv/mDfevNIG+J0mgVYSVdA6IOvQU9ouysCHfTiPe5EOQwVBhQhZuFpmWMmWw8PjztML VhvcpoKbEqCpcPA8Af67QvQx1E+M+vtdFbx3kTxtXBBLcv8RD7aDpCJhsqCKRXCMuq4y 2VKQ== X-Forwarded-Encrypted: i=1; AHgh+Roflo0OGFQuz3zh/8zPIB0R5SuZl3ug0piKFdF/b4xU0k9RKjHuEU3sAEJGnKWagiNq2Sj1pDmiBWgUqkY=@vger.kernel.org X-Gm-Message-State: AOJu0Ywpq2gWh2qedJlqN3LOc0J8QKU63WugdVMxq1lQAd3qKCCYUSRP o8XDAFDnPRO4p1zwvaCVf8oQzYYjeZfMccI7+eyESdVO8F31aIqmpgo= X-Gm-Gg: AR+sD13Px/vF6bpNxNdbH576LfzUArJtUkP8dRZFEpSvD9+EPvYJb8DJ4rG2GspW+HG R7Gf8tUVKf+j1O8xPjcGrHfAd1RKIIFwEbi1zAbaxyEpXSCZ6wbYkh8CGnXXZA68N4aWgudV8DL du1NxwoX32mvhWRftclSMR76pTw8s9H4Gr+dQ9etQ3T4NOJ1x/PiDKeu5qxX4miIVi299+TFULa Qf8sxRMYBzeSbFm4n9N3HxWBvwymfGVqXIkCoNezkEn2MFgkoTTHdIUNicbsBytjxORJ1o4f1rx u9ZgE95aXxb6gl7aBeSo+/gtscw6IhubT7FuPq9vv/T0FtvJLKmhMA0UumI/GDygFrjHcOp/v2S 0pT9B9BIbAH20+U3IgfXNGpclhHU3daFqs4hCP2rvVv8VFYy22kBLnlIuesK2FKgXsVffzK0n78 F1IbWOEayNx0TTsmub1rSsJeHJ/EdPuvAq81YQpxGpaOaXPuWAQpLIfvk4nLkI7ucZk8RGUMwMQ tRj5RU+Ppo9fVQabxpI3A== X-Received: by 2002:a17:90b:3c0e:b0:393:1d92:db5 with SMTP id 98e67ed59e1d1-3933b8f1451mr25461296a91.10.1786961631875; Mon, 17 Aug 2026 03:13:51 -0700 (PDT) Received: from at-Standard-PC-Q35-ICH9-2009.. ([27.59.94.1]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-326761d3539sm4864117eec.0.2026.08.17.03.13.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2026 03:13:51 -0700 (PDT) From: Atharva Tiwari To: Cc: Atharva Tiwari , Mika Westerberg , Andreas Noever , Mika Westerberg , Yehezkel Bernat , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 1/3] thunderbolt: Shift tb_apple_add_links to pci.c Date: Mon, 17 Aug 2026 06:13:22 -0400 Message-ID: <20260817101329.1517-2-atharvatiwarilinuxdev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260817101329.1517-1-atharvatiwarilinuxdev@gmail.com> References: <20260817101329.1517-1-atharvatiwarilinuxdev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Shift tb_apple_add_links to pci.c as tb_apple_add_links calls pci functions. Suggested-by: Mika Westerberg Signed-off-by: Atharva Tiwari --- drivers/thunderbolt/pci.c | 73 +++++++++++++++++++++++++++++++++++++++ drivers/thunderbolt/tb.c | 72 +------------------------------------- drivers/thunderbolt/tb.h | 1 + 3 files changed, 75 insertions(+), 71 deletions(-) diff --git a/drivers/thunderbolt/pci.c b/drivers/thunderbolt/pci.c index bbd186c29..c3d5a36ab 100644 --- a/drivers/thunderbolt/pci.c +++ b/drivers/thunderbolt/pci.c @@ -18,6 +18,7 @@ #include #include #include +#include =20 #include "nhi.h" #include "nhi_regs.h" @@ -261,6 +262,53 @@ static const struct tb_nhi_ops pci_nhi_default_ops =3D= { .init_interrupts =3D nhi_pci_init_msi, }; =20 +static bool tb_pci_add_links_discrete(struct pci_dev *nhi_pdev) +{ + struct pci_dev *pdev, *upstream =3D pci_upstream_bridge(nhi_pdev); + bool ret =3D false; + + while (upstream) { + if (!pci_is_pcie(upstream)) + return false; + if (pci_pcie_type(upstream) =3D=3D PCI_EXP_TYPE_UPSTREAM) + break; + upstream =3D pci_upstream_bridge(upstream); + } + + if (!upstream) + return false; + + /* + * For each hotplug downstream port, create add device link + * back to NHI so that PCIe tunnels can be re-established after + * sleep. + */ + pci_lock_rescan_remove(); + for_each_pci_bridge(pdev, upstream->subordinate) { + const struct device_link *link; + + if (!pci_is_pcie(pdev)) + continue; + if (pci_pcie_type(pdev) !=3D PCI_EXP_TYPE_DOWNSTREAM || + !pdev->is_pciehp) + continue; + + link =3D device_link_add(&pdev->dev, &nhi_pdev->dev, + DL_FLAG_AUTOREMOVE_SUPPLIER | + DL_FLAG_PM_RUNTIME); + if (link) { + dev_dbg(&nhi_pdev->dev, "created link from %s\n", + dev_name(&pdev->dev)); + ret =3D true; + } else { + dev_warn(&nhi_pdev->dev, "device link creation from %s failed\n", + dev_name(&pdev->dev)); + } + } + pci_unlock_rescan_remove(); + + return ret; +} /* Ice Lake specific NHI operations */ =20 #define ICL_LC_MAILBOX_TIMEOUT 500 /* ms */ @@ -444,6 +492,31 @@ static const struct tb_nhi_ops icl_nhi_ops =3D { .init_interrupts =3D nhi_pci_init_msi, }; =20 +/* + * During suspend the Thunderbolt controller is reset and all PCIe + * tunnels are lost. The NHI driver will try to reestablish all tunnels + * during resume. This adds device links between the tunneled PCIe + * downstream ports and the NHI so that the device core will make sure + * NHI is resumed first before the rest. + */ +bool tb_pci_add_links(struct tb_nhi *nhi) +{ + struct pci_dev *nhi_pdev =3D to_pci_dev(nhi->dev); + + if (!x86_apple_machine) + return false; + + switch (nhi_pdev->device) { + case PCI_DEVICE_ID_INTEL_LIGHT_RIDGE: + case PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C: + case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_NHI: + case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_NHI: + return tb_pci_add_links_discrete(nhi_pdev); + default: + return false; + } +} + static int nhi_pci_probe(struct pci_dev *pdev, const struct pci_device_id = *id) { struct device *dev =3D &pdev->dev; diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c index f43f2d952..9c2fc7ff1 100644 --- a/drivers/thunderbolt/tb.c +++ b/drivers/thunderbolt/tb.c @@ -10,7 +10,6 @@ #include #include #include -#include =20 #include "tb.h" #include "tb_regs.h" @@ -3302,75 +3301,6 @@ static const struct tb_cm_ops tb_cm_ops =3D { .disconnect_xdomain_paths =3D tb_disconnect_xdomain_paths, }; =20 -/* - * During suspend the Thunderbolt controller is reset and all PCIe - * tunnels are lost. The NHI driver will try to reestablish all tunnels - * during resume. This adds device links between the tunneled PCIe - * downstream ports and the NHI so that the device core will make sure - * NHI is resumed first before the rest. - */ -static bool tb_apple_add_links(struct tb_nhi *nhi) -{ - struct pci_dev *nhi_pdev =3D to_pci_dev(nhi->dev); - struct pci_dev *upstream, *pdev; - bool ret; - - if (!x86_apple_machine) - return false; - - switch (nhi_pdev->device) { - case PCI_DEVICE_ID_INTEL_LIGHT_RIDGE: - case PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C: - case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_NHI: - case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_NHI: - break; - default: - return false; - } - - upstream =3D pci_upstream_bridge(nhi_pdev); - while (upstream) { - if (!pci_is_pcie(upstream)) - return false; - if (pci_pcie_type(upstream) =3D=3D PCI_EXP_TYPE_UPSTREAM) - break; - upstream =3D pci_upstream_bridge(upstream); - } - - if (!upstream) - return false; - - /* - * For each hotplug downstream port, create add device link - * back to NHI so that PCIe tunnels can be re-established after - * sleep. - */ - ret =3D false; - for_each_pci_bridge(pdev, upstream->subordinate) { - const struct device_link *link; - - if (!pci_is_pcie(pdev)) - continue; - if (pci_pcie_type(pdev) !=3D PCI_EXP_TYPE_DOWNSTREAM || - !pdev->is_pciehp) - continue; - - link =3D device_link_add(&pdev->dev, nhi->dev, - DL_FLAG_AUTOREMOVE_SUPPLIER | - DL_FLAG_PM_RUNTIME); - if (link) { - dev_dbg(nhi->dev, "created link from %s\n", - dev_name(&pdev->dev)); - ret =3D true; - } else { - dev_warn(nhi->dev, "device link creation from %s failed\n", - dev_name(&pdev->dev)); - } - } - - return ret; -} - struct tb *tb_probe(struct tb_nhi *nhi) { struct tb_cm *tcm; @@ -3400,7 +3330,7 @@ struct tb *tb_probe(struct tb_nhi *nhi) * before the PCIe/USB stack is resumed so complain here if we * found them missing. */ - if (!tb_apple_add_links(nhi) && !tb_acpi_add_links(nhi)) + if (!tb_pci_add_links(nhi) && !tb_acpi_add_links(nhi)) tb_warn(tb, "device links to tunneled native ports are missing!\n"); =20 return tb; diff --git a/drivers/thunderbolt/tb.h b/drivers/thunderbolt/tb.h index ec9192b61..6a285fe7f 100644 --- a/drivers/thunderbolt/tb.h +++ b/drivers/thunderbolt/tb.h @@ -1506,6 +1506,7 @@ static inline bool usb4_port_device_is_offline(const = struct usb4_port *usb4) } =20 void tb_check_quirks(struct tb_switch *sw); +bool tb_pci_add_links(struct tb_nhi *nhi); =20 #ifdef CONFIG_ACPI bool tb_acpi_add_links(struct tb_nhi *nhi); --=20 2.43.0 From nobody Mon Sep 28 21:07:48 2026 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A97D33F5BFA for ; Mon, 17 Aug 2026 10:13:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786961637; cv=none; b=JjxD+SEFwtaOiCY/4NRvZqLH48ttbKtkPGjMTFaI5yPERCuIeGdhedCOEDvZjUrbt3MlZHMR/VR+QhDRiWyx0Z50BuNjJ97AeRCB2/snsEkPEV6WqeE1cp8BXcHSU/yLPuXJ/DqLtmp6gtzFExX0ngfBdv5Z6IK3FDJiK05bk4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786961637; c=relaxed/simple; bh=Oef+XjVHvVzkVc9uWEzYYiNH9Z5rup6G0lv7jvqHv/0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ljMGp5OixkRQvZmGtzgpAjl/+AAFM2/FUr8KIhvx7ocaaJZJo62ypY0ja7Bej/uCjQNbzShwFHnHLhyZWY8AISJ6Vq5E7eKc7ZcxOt9+yk1iGH9o3QhisZBGF73aD7xCDEgT0hAr7GTr5ZsVMOouCM27BnG43sJxntt+PeBfyYo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=SLYutAtH; arc=none smtp.client-ip=209.85.215.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SLYutAtH" Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-cbed97fa26fso1965531a12.0 for ; Mon, 17 Aug 2026 03:13:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786961636; x=1787566436; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=4G2eR48d0fvH9jQm2XGVMJmsLdvNh6shGaTXK3zI+0k=; b=SLYutAtHn/xLjaoNXdGFOi6JqYtfU43n0SNikyGTyN9jdyWvKC07CJcF88axggB9DE d0EjwOdhFMc1A4nFnN9t/IdkkvEIeFxitqtpGsJVVwYZAHTre+mAdszfqFhPSNUSDhRH I2MFO4RYX9pIYMxU8acFvyEnuEUSHcoGo7C9yFHTV4eMT7Ml2+cHRHdy0NAUbrhpQRbu o044NisUWreF0bq7AH4PMgArwtgGJDQpqtkJRiwytvfBgRXtmKbXaU8hvfgDONTN/QQ2 m0cXBvXvopOjbbfB/Wd2RnEozMw0/4oNKxaXj755eYM8sFp+Djzcckbith+LGrjVDfGG I0Cw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786961636; x=1787566436; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=4G2eR48d0fvH9jQm2XGVMJmsLdvNh6shGaTXK3zI+0k=; b=TewOMVNA+HWqHdvN0rQCwzY9Zv7X7dYHS9fKaa8xrXxdpYWVjrQV6nvyMP55PI6pSS 8EtXa7sR+tSi8WXsCrCZ5WhIwwPTksXkThMU6CZvEqdSyFQU06/xgNLtXMAWQ08e6sIC shwmsmQL3StlcZ1dMgl8XMzNoUN5/xTPzH9P8WdzMO45dGwkVytW1Y0bObQBEXhB4nyd J7XOYVNVvQ/M/gcxt02dfAIFYUS21OnWlbF+bF+jGBFF923zwv/lYnVbdVkeF/a93PR/ +CrUG15wxX+b1p3tAYaLoylcdk4XYBHohV4sohSvaFqIfL49INp6AbQ5lvdVmkfycxO3 8Hcg== X-Forwarded-Encrypted: i=1; AHgh+RoqkJLcLOkuRjqLAYXrrihDjU9U8Fs3lxbW0xVdtdK1Q7u6PA12m1kMt6w5RvSYotseR4N/3pr6GCv4oU8=@vger.kernel.org X-Gm-Message-State: AOJu0YxNWkFX66/ZjgxduxYSxPenPtB+gVd/lFfuBdxrx66joF179z11 Jzode+VgcuAtyE/1L0XhyCiDnc8nMEKQ1wDXEivtrtMmZmBCn16eZO4= X-Gm-Gg: AR+sD11+4LMaUE2WCvycGFcQxLo/wyk9S0baEPlTqWc0FKkpqEcdxc6DpeZO8uhK942 2iDs4GLrcBwE4ouJnASAbH+fPMIjP5WcJkeL1ID+TL6Ot7qYZsUeqP6D0i0UKxnIMTNSlkMlhWt bysHGm5EvzfUjSo5OqCeZFncxpMo8YOr2VEceeE2cIl30cpS62f0lcibY1V9k5bM3OjRGepdnGn XuYYlZlAJafhUV3K4KnkgwzuDTCxWkqMP0u+nj2NZraEIccC8ifccbd+OPyZSMae2N7ND/eb7Hp VBqg31U/RujXFLfMVcUiFLmDg9twiooo5Bd5V1MH4Xqj0Wprro+pnJb9sBHSFoVrqs4BcdbAr+j lQNQbHwkQmrBxitF4RM09vnBihg4GD0rZWISLcpoaTEyRNtwGEQVTGlW+a17nYFco+JOY/GJbrE 8MzI986gcDZYteXgoUBagw8x4sbMTq2aNb4/lX/xPaEoRomqCQGzc/HX/+heGVrhxjDFoY8aKTt 348DazCUeQx3pP8xxx8ww== X-Received: by 2002:a17:90b:1b43:b0:38e:9ca8:e99 with SMTP id 98e67ed59e1d1-3933af8b5d7mr16818604a91.5.1786961635998; Mon, 17 Aug 2026 03:13:55 -0700 (PDT) Received: from at-Standard-PC-Q35-ICH9-2009.. ([27.59.94.1]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-326761d3539sm4864117eec.0.2026.08.17.03.13.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2026 03:13:55 -0700 (PDT) From: Atharva Tiwari To: Cc: Atharva Tiwari , Andreas Noever , Mika Westerberg , Yehezkel Bernat , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 2/3] thunderbolt: Add device links for Apple machines with Titan Ridge Date: Mon, 17 Aug 2026 06:13:23 -0400 Message-ID: <20260817101329.1517-3-atharvatiwarilinuxdev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260817101329.1517-1-atharvatiwarilinuxdev@gmail.com> References: <20260817101329.1517-1-atharvatiwarilinuxdev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Add device links for Apple machines with the Titan Ridge thunderbolt controller. To add device links on Titan ridge, the discrete method is used. Signed-off-by: Atharva Tiwari --- drivers/thunderbolt/pci.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/thunderbolt/pci.c b/drivers/thunderbolt/pci.c index c3d5a36ab..af3a7a9ba 100644 --- a/drivers/thunderbolt/pci.c +++ b/drivers/thunderbolt/pci.c @@ -511,6 +511,8 @@ bool tb_pci_add_links(struct tb_nhi *nhi) case PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C: case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_2C_NHI: case PCI_DEVICE_ID_INTEL_FALCON_RIDGE_4C_NHI: + case PCI_DEVICE_ID_INTEL_TITAN_RIDGE_2C_NHI: + case PCI_DEVICE_ID_INTEL_TITAN_RIDGE_4C_NHI: return tb_pci_add_links_discrete(nhi_pdev); default: return false; --=20 2.43.0 From nobody Mon Sep 28 21:07:48 2026 Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6A49C2931D5 for ; Mon, 17 Aug 2026 10:14:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.174 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786961642; cv=none; b=SUUUuDEnKQ0xXaJqEFlq2kf3uKz+pQBbYh7w0N7ULo3/R3CD68dM0QTbKBXqVBcJK+mkEt8KD9Xac+Ivt9DxYOXAwYi3GeWprRAtPLJ8IOkKUMGe0dwk1MtE8IZxmk3Vtj2lgHDut49xQTz0vbI3XLDupL9yKovIdfnHeHzB1ks= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786961642; c=relaxed/simple; bh=BQeOtHX8JKFhSCx/4yjh48tm8Y/d7nJcm2eNGyOeD98=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=J021McXFi8bohpnBYQhhqH4tBKqD65mIAQglT+3Him3npJ7WS7QdMW+GkVurFL0Dpav4noW0zJ0t291BefDgrMKjNwJXIFWZ1w7WUQ7+lVjQHuOF1wOXafrKllBwaPNQQTaaz1nydHnK1LnmOkdg68VK+lnvEa5kjjGiqNLtBpQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=ceL0gmY9; arc=none smtp.client-ip=209.85.214.174 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ceL0gmY9" Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-2ce98cb8165so28870595ad.1 for ; Mon, 17 Aug 2026 03:14:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786961641; x=1787566441; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=OO8kLLqET3++net7VSnmwLLKqFHxZc7VFGA6foQQzvg=; b=ceL0gmY9eXYPA5s2DJYGVkhLOkYCpXBjWVv2Gyagnx3oYtQT02ZNnrdKGhLQAdblOS 3YYL/FsemzkKqTRED/45+QqZOPDhPhxlJme2K94qBjbKRmpt1gdD2eue5U4IDcQk4h4C Te5s6nIIOAx2SBpLM0DqsaYwqq2p4vwqgUnD+uLbKMbyieoDw7cP+fX34jUAhV+2GquF S5CqE8hQaPhIhR38I+4bAUf0W6saRla5b64DueS9JYhbxY2Jxp/Y6NU6JvFC3NLBTcyH 4ggH0AL8kwyOmlUSvYtdcpLhmHz9Dd8S3OCtrYEvZn8XTHWcq11fnc3ULq9BhrG86xj8 frAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786961641; x=1787566441; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=OO8kLLqET3++net7VSnmwLLKqFHxZc7VFGA6foQQzvg=; b=sYWgoQ2d3dNckKe2GZKANPFESlnXXCkxG7wiCHCB7vo9567fSAb8a2VFpnyaWc5RWJ b1UTnHwOglhiHVX/Ce+LY21pze3h+0OQ7Kf3/CZVIvjvRaLGRcyG8W/skbchyJpjrBN1 tYfI/1bE1kSNqwKvP10Dd1fsvsBAZObMmhj2aWawleeeMbMswwOGdyC39WXJHLFCZI2f jrwWhj1qcGHMM1nPlyGvvQDqBTismqgRo619r89Z/AR5V/IbgoCoNguqAjj3j6vrYK8L 1G5ER50rTuCWw03oi+cMPJvGAhtVUHjCX12i5sVFnCjyrj78dcNHN9wRgdf2BUCwqxhm i2GQ== X-Forwarded-Encrypted: i=1; AHgh+RrN3xMwByUJyhJHLI1cteA1hT5LGSw4I/aixsLISJ7UmxD8nK76OcO7gnspF3iAHxzjEgN4iXIE1E/38Fk=@vger.kernel.org X-Gm-Message-State: AOJu0YzX+E26zYcwcWCTZXPh1w3zF1SJRFwR4lk6xOGYhBhcjrgFSTUZ R5135KCGZbgve13MEoRBaKYQKYP0qvS98mkGTq3A2TutBBhlnM4CU10= X-Gm-Gg: AR+sD12CXU0QXTZcRJaw4ceTcRvgbAxoGGVma3+w08bnxS/vLbIjxG5ovSHobSBfq0a oM2wQbYx02KBiVxvbswPHxa2ar3EPcjmnByeGKsx2mJS9GobStUlXI7MAkjzsoHvGAW6/mI9UfE 9G35NJRlORYomVJ36AwBMUeSVxR0oIKTfk9fpMDhMRuHl0ZPs8xxY/4mg1W0igT8v6GivWa+27a nbKtxezczYk6OVbC+LEzYu/Wjrj8q9HK1Nm/U+nzUdXLZ+ZY1B1IKxZOcpS96eGqogPQc0McWvV 4AyC4ecweEo3GLjpvSEml1YXEokV71j1jtn0uxY2blBa+N3UpIMLKU/4PL5pEEYoKBHD2sKHztl xIs2NTQsK2ikrffDbSewL5B40uh85BvUlDmicyjI8RuzX1u11K1TYYbqOoVaE3/rTqEbVGPBRyo REC0wscBtw3hWWcoYqBPJjtjnVj0LJq5ASms/0TMCUp4DynbiplE37Zt3k2Iu9a1ct0BMhvO6uz V3upwmn1jAmgmuVHBeStsLR4N/f4T6ErA== X-Received: by 2002:a17:902:f64e:b0:2cf:70d2:da7c with SMTP id d9443c01a7336-2d37f77fdfemr329758215ad.12.1786961640676; Mon, 17 Aug 2026 03:14:00 -0700 (PDT) Received: from at-Standard-PC-Q35-ICH9-2009.. ([27.59.94.1]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-326761d3539sm4864117eec.0.2026.08.17.03.13.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Aug 2026 03:14:00 -0700 (PDT) From: Atharva Tiwari To: Cc: Atharva Tiwari , Alexander Fischer , Andre Eikmeyer , Andreas Noever , Mika Westerberg , Yehezkel Bernat , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v8 3/3] thunderbolt: Add device links for Apple systems with Icelake thunderbolt Date: Mon, 17 Aug 2026 06:13:24 -0400 Message-ID: <20260817101329.1517-4-atharvatiwarilinuxdev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260817101329.1517-1-atharvatiwarilinuxdev@gmail.com> References: <20260817101329.1517-1-atharvatiwarilinuxdev@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Ice Lake Thunderbolt NHI That are on some Macs. The NHI and its associated PCIe Root Ports all sit directly on the Root Complex with no upstream port. Identify the tunneled PCIe Root Ports by their PCI IDs and create device links back to the NHI so that PCIe tunnels can be re-established after sleep. Tested-by: Alexander Fischer Co-developed-by: Andre Eikmeyer Signed-off-by: Andre Eikmeyer Signed-off-by: Atharva Tiwari --- drivers/thunderbolt/pci.c | 44 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/drivers/thunderbolt/pci.c b/drivers/thunderbolt/pci.c index af3a7a9ba..8c0e40fb9 100644 --- a/drivers/thunderbolt/pci.c +++ b/drivers/thunderbolt/pci.c @@ -492,6 +492,47 @@ static const struct tb_nhi_ops icl_nhi_ops =3D { .init_interrupts =3D nhi_pci_init_msi, }; =20 +static bool tb_pci_add_links_icl(struct pci_dev *nhi_pdev) +{ + struct pci_dev *pdev; + const struct device_link *link; + bool ret =3D false; + + pci_lock_rescan_remove(); + for_each_pci_bridge(pdev, nhi_pdev->bus) { + if (!pci_is_pcie(pdev) || + pci_pcie_type(pdev) !=3D PCI_EXP_TYPE_ROOT_PORT) + continue; + + switch (pdev->device) { + /* Ice Lake Thunderbolt 3 PCIe Root Ports */ + case 0x8a1d: + case 0x8a1f: + case 0x8a21: + case 0x8a23: + break; + default: + continue; + } + + link =3D device_link_add(&pdev->dev, &nhi_pdev->dev, + DL_FLAG_AUTOREMOVE_SUPPLIER | + DL_FLAG_PM_RUNTIME); + if (link) { + dev_dbg(&nhi_pdev->dev, "created link from %s\n", + dev_name(&pdev->dev)); + ret =3D true; + } else { + dev_warn(&nhi_pdev->dev, + "device link creation from %s failed\n", + dev_name(&pdev->dev)); + } + } + pci_unlock_rescan_remove(); + + return ret; +} + /* * During suspend the Thunderbolt controller is reset and all PCIe * tunnels are lost. The NHI driver will try to reestablish all tunnels @@ -514,6 +555,9 @@ bool tb_pci_add_links(struct tb_nhi *nhi) case PCI_DEVICE_ID_INTEL_TITAN_RIDGE_2C_NHI: case PCI_DEVICE_ID_INTEL_TITAN_RIDGE_4C_NHI: return tb_pci_add_links_discrete(nhi_pdev); + case PCI_DEVICE_ID_INTEL_ICL_NHI0: + case PCI_DEVICE_ID_INTEL_ICL_NHI1: + return tb_pci_add_links_icl(nhi_pdev); default: return false; } --=20 2.43.0