Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
 216.228.117.161 as permitted sender) receiver=protection.outlook.com;
 client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C
From: Timur Tabi <ttabi@nvidia.com>
To: Lyude Paul <lyude@redhat.com>, Dave Airlie <airlied@redhat.com>,
	<nouveau@lists.freedesktop.org>
Subject: [PATCH 6/6] drm/nouveau/gsp: enable FWSEC-SB on GA100
Date: Tue, 7 Apr 2026 14:21:22 -0500
Message-ID: <20260407192122.3055293-7-ttabi@nvidia.com>
In-Reply-To: <20260407192122.3055293-1-ttabi@nvidia.com>
References: <20260407192122.3055293-1-ttabi@nvidia.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	gH+h+QLg51/kyrYZGvorZh6FOZQfx8rGBiXXrl8SLcd1dIVpZMwhGnhrz0xWWUbsH9/rQ39dm57achV8BLwapepl3iHWmt/XpSCCK/y8xHlE/Hyc/wGYSrm4nIX+zH5TK22QD9QSL4IQa+GMeBBckuPwTS5GiKSkVOUJlCSAmcIiYkheZsG66einIRJXtiFUFAibiEj50uIn53iYx+NSh8ZUFsqPCUjysPS0RSuVAt1lr09AOojztlRN0z2skbNlC6n3+Cnb8IHaUDhg+myiwm4w060MaT3oSckyomjpKTO4uHCRzfh1Sa2KPfOvdS8na3Da0Xqx+FkJWB3SffMxuI5HEYOd0f4Oo6dZ99Yf28Tk1WsKWH1EBIuhYRdDvzw56bMFJK0U5r4w1qmkcDlFJAw4AXDHaHEdhDsLb/mPJaocthx9IFK3JTtpSxls69nb
X-OriginatorOrg: Nvidia.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Apr 2026 19:21:51.4672
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 
 0d7dd87d-aa7d-4a73-9263-08de94daebfd
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: 
 TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.161];Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: 
	DS2PEPF00003447.namprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6124
Message-ID-Hash: NHKQPWNHQRSPKO3I7OLPSGB7N2YHMCC4
X-Message-ID-Hash: NHKQPWNHQRSPKO3I7OLPSGB7N2YHMCC4
X-MailFrom: ttabi@nvidia.com
X-Mailman-Rule-Hits: member-moderation
X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency;
 loop; banned-address
X-Mailman-Version: 3.3.8
Precedence: list
List-Id: Nouveau development list <nouveau.lists.freedesktop.org>
Archived-At: 
 <https://lists.freedesktop.org/hyperkitty/list/nouveau@lists.freedesktop.org/message/NHKQPWNHQRSPKO3I7OLPSGB7N2YHMCC4/>
Archived-At: 
 <https://lore.freedesktop.org/20260407192122.3055293-7-ttabi@nvidia.com/>
List-Archive: 
 <https://lists.freedesktop.org/hyperkitty/list/nouveau@lists.freedesktop.org/>
List-Archive: <https://lore.freedesktop.org/nouveau>
List-Help: <mailto:nouveau-request@lists.freedesktop.org?subject=help>
List-Owner: <mailto:nouveau-owner@lists.freedesktop.org>
List-Post: <mailto:nouveau@lists.freedesktop.org>
List-Subscribe: <mailto:nouveau-join@lists.freedesktop.org>
List-Unsubscribe: <mailto:nouveau-leave@lists.freedesktop.org>

Now that the VBIOS is correctly parsed on GA100 (via IFR header
support in the PROM shadow method), re-enable the FWSEC function
pointers that were removed in commit 20e0c197802c ("drm/nouveau/gsp:
add support for GA100").

FWSEC-SB is constructed during GSP-RM boot by parsing the FWSEC ucode
from the VBIOS, and is executed during teardown to restore PreOsApps.
Without these pointers, driver unload or suspend triggers a NULL
pointer dereference when tu102_gsp_fini() attempts to run FWSEC-SB
with an uninitialized firmware struct.

This requires the acr/bl.bin firmware (the generic falcon bootloader)
to be available for GA100, which is the same binary used by Turing.
A symlink for this file was recently added to the linux-firmware
repository, so an updated linux-firmware package is required.

Signed-off-by: Timur Tabi <ttabi@nvidia.com>
---
 drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c
index cc57de99e59e..d953f913f949 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/gsp/ga100.c
@@ -41,10 +41,13 @@ ga100_gsp_flcn = {
 static const struct nvkm_gsp_func
 ga100_gsp = {
 	.flcn = &ga100_gsp_flcn,
+	.fwsec = &tu102_gsp_fwsec,
 
 	.sig_section = ".fwsignature_ga100",
 
 	.booter.ctor = tu102_gsp_booter_ctor,
+	.fwsec_sb.ctor = tu102_gsp_fwsec_sb_ctor,
+	.fwsec_sb.dtor = tu102_gsp_fwsec_sb_dtor,
 
 	.dtor = r535_gsp_dtor,
 	.oneinit = tu102_gsp_oneinit,
-- 
2.53.0