From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) (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 AA1633B14DE for ; Tue, 21 Jul 2026 05:45:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.181 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784612748; cv=none; b=Z4l5SsWc3gofSUQufXow69pC5N1SI/4/6yWFH8tzvmoCBL+qPysZjRD1tST1Cv0IcKar5qfW7NCnTACWarfzEQUyj7ZAeejfxeIlqpUAIVWRxXyqLpLHt7O7ty/9OTnq/QLDnC/pja9PzFhcyZGbyIEaANxz1Lk52bpOTUMXGxw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784612748; c=relaxed/simple; bh=DNpHQBMjU1wP0f8jQ4t452JbWb0XX8oIoHdLdwtqCfM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JnQp3MPsKN+91WgQ1UxEkJovFnPhHVNd5F2mIPNJk8aSGdaFnyC2YGEYsnrh5EUtF9i8UBscQ+NISkLrExNY+qjMIH9LCZkF0NrIhUJbidM8GYEsTmsc9FsvmHGgmQ+QBieBnu21DTAAZ1y/w28rFvor4n7jidJS8s/k/kRxRZs= 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=pzcULYBV; arc=none smtp.client-ip=209.85.215.181 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="pzcULYBV" Received: by mail-pg1-f181.google.com with SMTP id 41be03b00d2f7-c9e607d81fcso4640812a12.2 for ; Mon, 20 Jul 2026 22:45:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784612746; x=1785217546; 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=UgojYRWP1WvUNsyVTZf0JAe0a0XGAFDjQiUak8O6rqY=; b=pzcULYBVnMcH42hzqIwsULuQFNtipObN+NiIpKsIBH47VbCr+NjIbq1VyfD3kgfITX 9iZ+vh2egG2QQqzTX4YetuldKVvXBrwrHq7f4pq/61AFFQl32a79Q8T6Z+GgGxN8wjn2 sbxzSNeGJ+5CIQcQsa2hpxEQh/d/g7Ffnf4FxIdqlPQ9fWAio6izmjG0UuW0EtFf00tt 8mYD/9k81Y4hP/adpqahHlMp7QnBd0/tNL+EpdzqKHUian1XgxcMEIfT24bIq3kw8Ame opVCC38Meewn8qrYWIBNcEjIt7+tjvYOo/TDgF9le0C+ZwWSMrLyJ+lCY7u+HDY258Wa tPLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784612746; x=1785217546; 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=UgojYRWP1WvUNsyVTZf0JAe0a0XGAFDjQiUak8O6rqY=; b=KMDXaudPOFTOMpGeFv46Rg70s7WJYIajMjaLMDiEr+GSIsI23YwCo45Gs9jKEcefDD JXKSjW4wlWbB2yYo9fWNGwz6/s67ukWDtPPuS0xNKIUG0p5qyLx/oW/GcutkUD17OAgY sEnMLRSAwmwCXYcFvS8Zc6NUZwV/6u+I/EFGFoWf1HIgH2RX+cuwzIez4BN/kNFz9yOY kgiT1pqCF5SL/Ht0uY120EkEanXkVFIRVgOM/dT/3q7Uol5jgxP+6ee0LZzofuCaxYRp pP+njaG2887WldOdI2X5BsCt1k6tuAD1WvTCCO6TQHVd9dibyDSPmDWvrv+jkPCohxo2 to1g== X-Forwarded-Encrypted: i=1; AHgh+Rq7Xt5ZYqBzdC9K7du4e2HeDNKenT9QtLYmM7BWqyulKwo9+UPJ57sFNms1siLpPBJ+frsS/XfQEPY=@vger.kernel.org X-Gm-Message-State: AOJu0YwrAOJ4cw4NprfZkv5jSk6MDr9Ivc9oNsOAtARn/Yt4xyQkpgOq 9rAJBo3ODBVdV9GO0qSqotjyyAAwGnaqlrI34qbnJU+Rv/oqRZQ8wns= X-Gm-Gg: AfdE7cl0otNrxHfvCU5wVvHFIXgdOZMt72J/lBeNsBs+bWEqVvTBbv/4DKfW3yQhNT0 g9LzJCYHZdKr1/Gn/bIzcHpo+InUlcA4RMMuurdVXzZxcq4nXb1Ajksd7ZgKlfAnvATZpNVJzVu TjkBLYT2oOFTIroZ19qyUioCYkbGL6z4V8ZlcvQJR3vq8LxGjoldoZg4cp9h0Yv9ZEJIrpPjopg sN8Qfgz2Wtf1QxiNrkKfn5atY39kls4B4mmaaPyqDcOkp3jJzVu3VODr/BPAL6i+bwKnlsYBqnl yhqgsiTmGXdy/4HkXBqEtGppkPxhSkSgl/X4iAvVD+cZtP1pOmr7EL+wT2bKRqJCyDYq9ksv1BT vaaIJt1+tzxDYCZNZms0h6AyAmMvx3EQ34qgzT0djTfx9hz6AHFr4T+ZYUjT0KH9MbfPqjjjAzp cBWM9i93t6YqLoH/DkBh5IAi1iIK4XIuL97U/WqQ== X-Received: by 2002:a05:6a21:7111:b0:3c3:a41f:ce83 with SMTP id adf61e73a8af0-3c3ada9e0bbmr18607951637.61.1784612745975; Mon, 20 Jul 2026 22:45:45 -0700 (PDT) Received: from at-Standard-PC-Q35-ICH9-2009.. ([27.60.20.188]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3142a1bb770sm46620876eec.16.2026.07.20.22.45.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Jul 2026 22:45:44 -0700 (PDT) From: Atharva Tiwari To: Cc: Atharva Tiwari , Andre Eikmeyer , Bjorn Helgaas , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Andreas Noever , Mika Westerberg , Yehezkel Bernat , Hans de Goede , =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= , Jarkko Sakkinen , Mimi Zohar , Roberto Sassu , Dmitry Kasatkin , Eric Snowberg , Paul Moore , James Morris , "Serge E. Hallyn" , linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, platform-driver-x86@vger.kernel.org, linux-integrity@vger.kernel.org, keyrings@vger.kernel.org, linux-security-module@vger.kernel.org Subject: [PATCH v2 2/2] thunderbolt: Add device links for Apple T2 NHI Date: Tue, 21 Jul 2026 01:45:02 -0400 Message-ID: <20260721054506.11871-3-atharvatiwarilinuxdev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260721054506.11871-1-atharvatiwarilinuxdev@gmail.com> References: <20260721054506.11871-1-atharvatiwarilinuxdev@gmail.com> Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Andre Eikmeyer Thunderbolt NHI on T2 Macs (2018-2020). The NHI and its associated PCIe root ports all sit directly on the root complex with no upstream port. Apple's ACPI tables name Thunderbolt root ports as TRP0, TRP1, etc. Find them and create device links back to the NHI so that PCIe tunnels can be re-established after sleep. Co-developed-by: Atharva Tiwari Signed-off-by: Atharva Tiwari Signed-off-by: Andre Eikmeyer --- drivers/thunderbolt/tb.c | 51 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c index c69c323e6952..ca47bfbcefdf 100644 --- a/drivers/thunderbolt/tb.c +++ b/drivers/thunderbolt/tb.c @@ -6,6 +6,7 @@ * Copyright (C) 2019, Intel Corporation */ +#include #include #include #include @@ -3305,11 +3306,59 @@ static const struct tb_cm_ops tb_cm_ops = { static bool tb_apple_add_links(struct tb_nhi *nhi) { struct pci_dev *upstream, *pdev; - bool ret; + bool ret = false; if (!x86_apple_machine) return false; + /* On T2 Macs. the root ports are stored in ACPI as TRP0, + * TRP1, etc. Find them and create device links + * so that PCIe tunnels can be re-established after + * sleep. + */ + if (has_apple_t2_chip) { + struct acpi_device *adev; + unsigned int slot, func; + const struct device_link *link; + const char *bid; + + for (slot = 0; slot < 32; slot++) { + for (func = 0; func < 8; func++) { + pdev = pci_get_slot(nhi->pdev->bus, PCI_DEVFN(slot, func)); + if (!pdev) + continue; + + if (!pci_is_pcie(pdev) || pci_pcie_type(pdev) != + PCI_EXP_TYPE_ROOT_PORT) + goto put_pdev; + + adev = ACPI_COMPANION(&pdev->dev); + if (!adev) + goto put_pdev; + + bid = acpi_device_bid(adev); + if (!bid || strncmp(bid, "TRP", 3) != 0) + goto put_pdev; + + link = 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 = true; + } else + dev_warn(&nhi->pdev->dev, + "device link creation from %s failed\n", + dev_name(&pdev->dev)); + +put_pdev: + pci_dev_put(pdev); + } + } + return ret; + } + switch (nhi->pdev->device) { case PCI_DEVICE_ID_INTEL_LIGHT_RIDGE: case PCI_DEVICE_ID_INTEL_CACTUS_RIDGE_4C: -- 2.43.0