From mboxrd@z Thu Jan 1 00:00:00 1970 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 A18EE3B3C05 for ; Sun, 19 Jul 2026 18:04:08 +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=1784484255; cv=none; b=LJcgwIFl9Lm00crd8N7nDob+fc+J+cupB/Ef4eU7UW6kSCRzNstrSqBHH4AwJ2ckvL82DGfzj/bCqtn8/8OP7vbn8uhSTogcPMFynVhwtFXBcuayhylSkVhmPxSRgH+Hm3G7u8075uRBEIQ8B/kEWnna9kkpu7wMutCVWobJ+x4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784484255; c=relaxed/simple; bh=V0Tae/rKozWhabyRfdu4QuNkEaB8DkFkgOcQe8o5wq4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SNgQawmQ/JyKEJAECVfhEZW4BeCdjBCsPgLpXzMDG968xVIFkuCcTb0i9817dzaOZ2cMdaJZDfE3OA0lhX0tNigOJZdjwcVeBvfj5TOwhYquMDMW6nvzVzG050JWKP0Mhp77tw8QyFVZhhnh4kIiYe86hLNkxjd3z4vNvfGmg+g= 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=FfG43JtS; 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="FfG43JtS" Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-ca00f126b7eso6225727a12.2 for ; Sun, 19 Jul 2026 11:04:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1784484246; x=1785089046; 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=uWQkBHme3djyDjtoGqM4G+GNxyywodyr8gsYJac/hfw=; b=FfG43JtSl6k2dkdJv1ue1j48FkxIOoBrilaiKruWxYFM28947LGwWga39sjiHmMDIJ TgWB5f/dZ/YajU65sC5pzoJMBx/NjJsBsQ7QhEwLeT99YAPnm4FgfBcgXMMTwp76pBuk A19zIh+9Fxg05n1+gVcE9ygTvcwo57pK/ul5J/Ll+Xqk+bhLzG4czKkx3fTsCPH+Hbwg tLwsoFBEx6MOv4OVTM8uqVvKAjtIp0ZOuNeYLfXBwvPFGaZHCLXiHWlGObp2EmJj92gI FXUwej9BaUvPlm371En4fqgIjkZjUcnbWYof5ME9Ppkq1pSjL6G/pqWjaDKT/tTl8GVZ svgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1784484246; x=1785089046; 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=uWQkBHme3djyDjtoGqM4G+GNxyywodyr8gsYJac/hfw=; b=FfSLtgXrzrd70htExbTFVJdDv81bM/Ji3tBzBIcZioxBXe0yHE4ZNICj/LTr4Q6HkF u59+6yj9yFqiXD8DaP/I5hToVvgqhVS9LHhvdwhVZ8n5Mi59sDEjcJ++7rfYl4AGpeFv 97tjpHxJf7J/RDT0NpmmHTJ0XZ4gYPe6FXf7hTkSnFjmWwX90vk7xjtUIjfawFhFi347 NtWiZFUK57eUT0x49sCN3NkJvjdSRSXZ74EJ3eg4+9iSOrIlTpotiUd2q9AYa1u+4q7n /PZJ1XpczsPU1DnoccDVFKPAD2g+3vHEXhZ1IfTyxthwHmTNCHD5yCGu2z3YCeoOt55U PLBQ== X-Forwarded-Encrypted: i=1; AHgh+RpZvtwalC+yy5r3D0V2jt2SJ0IdGtxtDN9CTDHt1vUIKCtDuC+C/1ekNQGocl3LTx+cABqTnyg+RxUh+gp0taVt3dGyJ+o=@vger.kernel.org X-Gm-Message-State: AOJu0YxzvQBLkaRCBTgha1uEZr2RxrPkundsxv/An1v2PV3rYTWZY3sK k/0zwWEK2ZNrwDo3LAMiHXnB+/oqlvsffRYnfGhNrsODabPCajetOgk= X-Gm-Gg: AfdE7cnJdceLOS/TFVZQipUvoC7iLE7DJkrDCtQiEkr7FbjwiEn/qBtTnggqHO2QJE7 REpQHV5ZQinKGN+hDZ6bIQ1yCAUdp3cg5vu1C7uFluxfOx4S/n25eOtI1WyGZ+7jOMGGZ+S7dQM RRKpP9+Qcuhy2WKxTXaGOoJWyqeeZAJZObxlLgUtf0pXtlcQXGFhvXKJqt9gAroM6qq42G7WmfM b4G+WoR8N+eg9G7LbKcr7Mer/9jN6XbmhGec/bXugbgFC6Ng0UXBJQYqRJ+h6+J8tKwKFge3Th9 p6qWaHPDvkEKK4R2q2y/jtWTZuvNNfjwVfm1EJhDJ1AdqPuYvbQM+NXtptchthMoOug0VAvk5Kr NzKVgoTUc51LAnGtrYxlLa46SntjrcEWVskpSEYYoJFT+YhyoW7VOZYCR3AP7BFPADsDY0IP+ID cdRNT4BwVq9lnyBk1JwQeivXKbJi7pi1c+VWevGjpr X-Received: by 2002:a05:6a20:1713:b0:3c3:8651:b302 with SMTP id adf61e73a8af0-3c3ad7ac447mr8585778637.28.1784484246013; Sun, 19 Jul 2026 11:04:06 -0700 (PDT) Received: from at-Standard-PC-Q35-ICH9-2009.. ([106.194.66.250]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-3142a02b7f2sm27967645eec.13.2026.07.19.11.03.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jul 2026 11:04:05 -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 2/2] thunderbolt: Add device links for Apple T2 NHI Date: Sun, 19 Jul 2026 14:03:04 -0400 Message-ID: <20260719180308.1398-3-atharvatiwarilinuxdev@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260719180308.1398-1-atharvatiwarilinuxdev@gmail.com> References: <20260719180308.1398-1-atharvatiwarilinuxdev@gmail.com> Precedence: bulk X-Mailing-List: linux-security-module@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 | 49 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/drivers/thunderbolt/tb.c b/drivers/thunderbolt/tb.c index c69c323e6952..26529141573a 100644 --- a/drivers/thunderbolt/tb.c +++ b/drivers/thunderbolt/tb.c @@ -6,6 +6,7 @@ * Copyright (C) 2019, Intel Corporation */ +#include #include #include #include @@ -3310,6 +3311,54 @@ static bool tb_apple_add_links(struct tb_nhi *nhi) 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_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