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 5AAC131E106; Sun, 30 Aug 2026 20:19:44 +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=1788121184; cv=none; b=D1oJsk8+t5Y+kbkc2YasMnqBZHxugCsee10uqJ3PpkuyR0Xa3df1emot+Xs3LZuI7qHsfjCLgV7mr+HxnwS1lV5g9P+wlDhlSshpIIqnIoT2ZZu2REMszEeYSCv2rqx7302cVfY+oqfmLoM1sjz+oWe9tVdBQFVBFpCUQAsW5Bk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788121184; c=relaxed/simple; bh=qXUPQQ+/YlgdXuqv7U2bExUuKkk0IWuRWSMGsGl9d24=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=JPbBVUvy26poFDyw8LyFPkdpHSX0Sgyf7XXpTZwf7HzbaN61t1VBLkTTi//RkURbilGjImDvqR/PFarNMG1fN/OH0X/AjZ57xmigUt93hWe2XZiKFMRr9BpPDk9X7L8pi2XQU3TGXwLwlQpOvt8otkAK6TVqPMYVJxS603ZFkMo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=GJ0jFGFt; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="GJ0jFGFt" Received: by smtp.kernel.org (Postfix) with ESMTPS id 1CA4FC4AF18; Sun, 30 Aug 2026 20:19:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1788121184; bh=qXUPQQ+/YlgdXuqv7U2bExUuKkk0IWuRWSMGsGl9d24=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=GJ0jFGFt/PDWF0Vso1akAhRp5S0U3a/6YdJBpeuK9uOHHRsQF6Pw3wbmRPznEORtI 7iRs/vL6bqNf46PdArQ7S2dc3kJDcAss63lKbX5OjbH2xZ66k8sxeBgrX0XTpoY1sv XCvQJDPNmD7Sf8AIeivcxcZG/DuAGSAp4p+Wp0LmAvuNrPvB6n2+5o04dtaDNGwmcg tu/Q//YPMOO3bxnA4MhTF3b/cJGBAEE+ReyTAbGWjHUQVtMmvF+Ror0+IcNqJyQCGX D4zi4kYD+HptSB/5IVActGtN835TVp1Ilsd4I/E4zjijnug55SZTi9Cwm+K+8aO3za H4ic72sWbPUVw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 04B11C61DD9; Sun, 30 Aug 2026 20:19:44 +0000 (UTC) From: Sven Peter Date: Sun, 30 Aug 2026 22:19:24 +0200 Subject: [PATCH 06/19] thunderbolt: Try reading host DROM from device tree first Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260830-b4-apple-soc-tbt-v1-6-44bc9348683c@kernel.org> References: <20260830-b4-apple-soc-tbt-v1-0-44bc9348683c@kernel.org> In-Reply-To: <20260830-b4-apple-soc-tbt-v1-0-44bc9348683c@kernel.org> To: Greg Kroah-Hartman , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Heikki Krogerus , Janne Grunau , Neal Gompa , Andreas Noever , Mika Westerberg , Yehezkel Bernat , Philipp Zabel Cc: Konrad Dybcio , linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, Sven Peter X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2537; i=sven@kernel.org; h=from:subject:message-id; bh=qXUPQQ+/YlgdXuqv7U2bExUuKkk0IWuRWSMGsGl9d24=; b=owGbwMvMwCXmIlirolUq95LxtFoSQ9aUCaGOM/MNwkOWxbjxvMyYGvCJ007Rps1QtLpU8XVbr +iKws8dpSwMYlwMsmKKLNv325s+efhGcOmmS+9h5rAygQxh4OIUgIlcWs/I0O0jy9rxdsmdfYG+ P+wuW8XIsHxscl7sKPuz7nfr3NWdMxn+V4sKilw9qjK/6NWzyc6fn67OeVP/MrHp742Ii4ku5RV pzAA= X-Developer-Key: i=sven@kernel.org; a=openpgp; fpr=A1E3E34A2B3C820DBC4955E5993B08092F131F93 X-Endpoint-Received: by B4 Relay for sven@kernel.org/default with auth_id=407 On Apple Silicon SoCs the DROM is provided by a device tree property. Try reading from that property first. Signed-off-by: Sven Peter --- drivers/thunderbolt/eeprom.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/drivers/thunderbolt/eeprom.c b/drivers/thunderbolt/eeprom.c index 2a13fa6888ba..389de7df84f6 100644 --- a/drivers/thunderbolt/eeprom.c +++ b/drivers/thunderbolt/eeprom.c @@ -468,14 +468,14 @@ static void tb_switch_drom_free(struct tb_switch *sw) } /* - * tb_drom_copy_efi - copy drom supplied by EFI to sw->drom if present + * tb_drom_copy_property - copy drom from a device property if present */ -static int tb_drom_copy_efi(struct tb_switch *sw, u16 *size) +static int tb_drom_copy_property(struct tb_switch *sw, const char *name, u16 *size) { struct device *dev = sw->tb->nhi->dev; int len, res; - len = device_property_count_u8(dev, "ThunderboltDROM"); + len = device_property_count_u8(dev, name); if (len < 0 || len < sizeof(struct tb_drom_header)) return -EINVAL; @@ -483,8 +483,7 @@ static int tb_drom_copy_efi(struct tb_switch *sw, u16 *size) if (res) return res; - res = device_property_read_u8_array(dev, "ThunderboltDROM", sw->drom, - len); + res = device_property_read_u8_array(dev, name, sw->drom, len); if (res) goto err; @@ -500,6 +499,22 @@ static int tb_drom_copy_efi(struct tb_switch *sw, u16 *size) return -EINVAL; } +/* + * tb_drom_copy_of_apple - copy drom supplied by the device tree for Apple Silicon to sw->drom. + */ +static int tb_drom_copy_of_apple(struct tb_switch *sw, u16 *size) +{ + return tb_drom_copy_property(sw, "apple,thunderbolt-drom", size); +} + +/* + * tb_drom_copy_efi - copy drom supplied by EFI to sw->drom if present + */ +static int tb_drom_copy_efi(struct tb_switch *sw, u16 *size) +{ + return tb_drom_copy_property(sw, "ThunderboltDROM", size); +} + static int tb_drom_copy_nvm(struct tb_switch *sw, u16 *size) { u16 drom_offset; @@ -675,6 +690,13 @@ static int tb_drom_host_read(struct tb_switch *sw) { u16 size; + /* + * Apple Silicon machines always get their host DROM from the Device Tree, + * so make sure to try reading it first before any other method. + */ + if (!tb_drom_copy_of_apple(sw, &size)) + return tb_drom_parse(sw, size); + if (tb_switch_is_usb4(sw)) { usb4_switch_read_uid(sw, &sw->uid); if (!usb4_copy_drom(sw, &size)) -- 2.55.0