From nobody Fri Jul 24 21:53:03 2026 Received: from BYAPR05CU005.outbound.protection.outlook.com (mail-westusazon11010036.outbound.protection.outlook.com [52.101.85.36]) (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 F37DC399348; Fri, 24 Jul 2026 06:56:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.85.36 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784876204; cv=fail; b=sgnVejNWgMdNASpaSrWgx3frHmf2Tpp4F4KOBCymQ9aiBmS5KVg3nRDyebyg/abdc6LTIvjpZis54IWtEElF/THfoLh57onpkL1EZZltl5N7xGJEknfdRNC+i1VeYP4Hq7DFbPfdh1JbrjBb/S6tLhpzDlIaz5sZWNHNppXibAw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784876204; c=relaxed/simple; bh=RwKnjJS80mabb6F5WAPlFn+5SIbzx/SgCnl1vF9im4s=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=kpcMvy/ndFmLu3Q9lAOrKa8RdFWu/tXfjjOzCnlaK7jQnoyIbt8NU1THGC0F8hw2HjG05kkZYfgFX3Db1gHSyQlXv1A29FxnOFpnv0B0Xu9VZx3H7pxju8z+R/hKKoFk5ovc5Nlr3Hr1uDPsQ1oI+dgMQMwSHf2HrhVlrstsRBE= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=hQlXCYsN; arc=fail smtp.client-ip=52.101.85.36 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="hQlXCYsN" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=x7J75Cb8Hvh8dTsp3TnDCSG0JIY8Le2MszQteoRJ0w7IoeoxYElXWUANJV5DkW5YlqgRP6sozkhOzdGflSDHjH/IfhdYeFn8SZT9Tw6yttF15u+mknnPOw3jivGnjfxp20l6ZBVlLg1ohEDFyNoLuEI9DL0+pqcxZ3VLJJfpzg/wctUFgW2ecLCfNEnUMLMgfJmpm3qv++aUzi3+/7hWgqZWXo7Ml6W6UyFVjYdFgYdAcoBbiPVed2UDzDl6Ry3g3Ek+KVgjgYrFn4Sg/N5DLSATkr+05kL8Rvzdwqos+d1EOMleD26iL4VJlLWhzPsB82h03xOMpFLTgrhrozIvrQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=iGg2T1AA4Q8HK/vz8DrlfR8UdY0xNSyvnFAHwnmS9gI=; b=GkKanUPfrLE9TqGv4i3AQNfdYoEXQssDaaZc0MtQ6Z7orBV3mE3OebfJ/r+G87WUSR5iLn127QWub29Oj1g9DI60TwFZ1WoVCRuhJK/k217vCZmu3dSw4nqVBThkMkyb4oM1XdPjq/fdZbFrn7KT8fxEgc3QvTMngV2YNkWcG9FgN2rQ2UQO9a7ZxV/t1ljDdbWr5rHZ8zyi0Imf74LDmrwqxc/klh7QpU+MynJzUV7fwKbZOpI1/4gweo8F1ZT09CMbDMAje1THx2VF9XyfahV5grF7YElMJtRvn8DSLIUjeobUj+AtH9FiEnKNRocHHRYIprqHMwD92Ua9bNpFsA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=iGg2T1AA4Q8HK/vz8DrlfR8UdY0xNSyvnFAHwnmS9gI=; b=hQlXCYsNoz750ovHVEBduehhke1pVm/8R2SzE+hlt3P9/Lg0lnvhL3s10M0V887/FXip4OnZ0b5eSVjJDDYrluUAIOH0A+a8dPXlwwLbdxOKMa5+uM4TYh/snOgFZZX0A4knuay44d7ylczmMk6q625j7OBYA3h7FRnHYNo3o0VwEK3SCfcfZgakISa+e+taiCOY3JqRNATzTZR2OTunyuCzmjOcqgcbN+7i65/Cz1p1GL9Oqd4nq/5eSKK9Bw3l7GqopuGddNAiz8yzefe7yZmQaQQ6kqjKSizZVafMy2SxW+5CwwQb1riWdTbufY8Dd4x3ndv2ypNX41h8mt7nxg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) by CH3PR12MB8851.namprd12.prod.outlook.com (2603:10b6:610:180::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.10; Fri, 24 Jul 2026 06:56:35 +0000 Received: from BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0]) by BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0%4]) with mapi id 15.21.0245.010; Fri, 24 Jul 2026 06:56:35 +0000 From: Eliot Courtney Date: Fri, 24 Jul 2026 15:56:23 +0900 Subject: [PATCH v3 1/5] gpu: nova-core: correct FRTS vidmem offset calculation Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260724-blackwell-fixes-v3-1-01aa6a54e3fd@nvidia.com> References: <20260724-blackwell-fixes-v3-0-01aa6a54e3fd@nvidia.com> In-Reply-To: <20260724-blackwell-fixes-v3-0-01aa6a54e3fd@nvidia.com> To: Danilo Krummrich , Alexandre Courbot , Alice Ryhl , David Airlie , Simona Vetter , Benno Lossin , Gary Guo Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TY4PR01CA0042.jpnprd01.prod.outlook.com (2603:1096:405:2bd::7) To BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL0PR12MB2353:EE_|CH3PR12MB8851:EE_ X-MS-Office365-Filtering-Correlation-Id: f998ba13-7653-4b6c-df0e-08dee950b3bc X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|376014|7416014|1800799024|23010399003|366016|11063799006|10067099003|56012099006|3023799007|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: ap/ZGlc5FMiF1GP+OuCeT6zbOWY+E7BM/2150+euSfnW+L8ttZuIe4ixKvSsX65+dDQ7aQxaz8nEyzY9AxeQkBE7x0K5bHyj61XnXBc1REA8Q50QoSYf81TeZE0mpZH3rjnxGdBUkmnGjQaWEsjlCwxnWid6N75+fV2TTcdanPenIEZ0ZaYpcHBnop8CSvr4Wb4SAIseBr16rXXipmXqMgwuaOFQKDE/6bmGhgLLatMebWCP2XG4yL9Uv/HMNQoq6xQ/qrUdrn2oCpBTt7IEC3v2D0Vp/mFLRDI4UTPJCaFY9qSAChDwfDLSqqVKBafmDo4Q/jKTplEDrClme0Tyrjc/otBqp0JpP6ZGHoYYFWO7StZVpld94vzfS6doDF7daFRO8EwLZZYKJt7Bu4eO3ri3FQ5dpNt/bE/Ec/8ZYqth88XP5HaoM1uq6HSD4Tpz253JJ6hDvbvT/vcqmaSCWSrCiNV7mSzeXIo4JR5ZdD/b90Go9yfxIfVpkYqmwh/YNM1Jtnncy5zwchbyYIuZIagzLYdF7mo0xKE/z7DYNCqAo6puc80hdEU4BF5WH1WrjvOZn3HuBV9qw+5m38PvYgADSv3KqpfZEPRrWrqCKjbxTQkY270nq35P6meWVnrudDdCTsPuIl5bZNcHTyyn2u+ColxQD2tapfcRUuM83bQ= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR12MB2353.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(376014)(7416014)(1800799024)(23010399003)(366016)(11063799006)(10067099003)(56012099006)(3023799007)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bVRyRUtmY3pZdDFjNHR2bEk1aTV0aXB6Uk9wN0JXY3JLaG1mTDNwZ2pXc00v?= =?utf-8?B?SlEyL1g1cG9FK3NKK3ozY2dwOWxEWnRhNXNDOUg1UkFvUGRKZkcvZmwzSGZy?= =?utf-8?B?WDEvOGQvS29NQ01KU3BKQlAwWldtbWZmWE83TEh6MTN4bU8rZWNuOCtzbEts?= =?utf-8?B?eUJaM0JIVkE2RE50cTN2cEJVVUpGWk90Y3dtNkg0OEhNR1l4NUt5NGgzWVBF?= =?utf-8?B?TDJsOEdkTENhR3YyQkdVQUZqTjR6Nk9mUDR6TjR2RExCdGYwYzJYTkdHd1l0?= =?utf-8?B?RUQzTEUrRHBudDVoZHdtR29YZ1V4aXRsbkdsQ1hyZldRdHF2WmtLWHZVK2RP?= =?utf-8?B?MWQwSG1UWHgyQXpYeGNIeG1JajBpV0lUdWtuZUJPd3FrdmRWUW56SS93ZU01?= =?utf-8?B?VzBuZ0ZSZjdzMjBaaGt4NlVyODZqODVOM2U4UkNQYVljanh2TTYxaTF4SHh3?= =?utf-8?B?dHYzYlZKelYyTjVTd2FoZVVySkdBQ0NkRmRWV1dla01MTGhOVlo0Y1JITzlU?= =?utf-8?B?LzVhNVFDSlNVeXVrVGk1TzI4a0M0NSt0VzNjMUhOVm8zT0FEeGF1Mm44dUgy?= =?utf-8?B?NEFmTnFVZFlJM1grSkRFNDJkU0kwSWpUT3JWNktjaWZZODQySWZEaFQrZGgz?= =?utf-8?B?cFJBUEF3cW1mcHV4QlBrcVA4ZzBEbVptYU1SU00yZXdpbEwzTS9Tdk4ySmZZ?= =?utf-8?B?N0Nzc2pNYURHeGpjVU9LeDgrRE5CMnBCNEtyR3Z4eWFDVjJQaFhQM293N1N5?= =?utf-8?B?YU5QS3V1VmVDT29GckpsUElLaEtsV0EzOE1MM0dtWFhjcXlIOUV3bDJ0Tlgx?= =?utf-8?B?ek0ydGZ1NXlmemVFSkEyVC9jSW4xWjNYc0Y2SEhDaUdsSXhyY1BHYk05bnYr?= =?utf-8?B?STI3R1JRNTVic2tsWSsxU0FIejhvbzVzdGRvS3BWYUxtTXFjNjRseitibGRN?= =?utf-8?B?dWROS0xCZDVnditXR2ZZNnQ1SlREdS9aU3dGU2E3UVNNdm95djI2Q2ZLd0tl?= =?utf-8?B?R0FENkpaTlB5d1B6ZGVrOVdFaXJxQUZndFNodmZUUjA1RmVJNmpXaUpEZGYx?= =?utf-8?B?UGxwUkU0b0Z4MFlUeFczVWdkejhPRTlVK292QXlVdlJQVXBPVkJCbTkrUVZy?= =?utf-8?B?QW94d1ZXcDRVb3hzMzMxQ2owbGhDVHBOOTdGZGRaK0poT3M0bUNIYmxiRVo3?= =?utf-8?B?dnhXMGZDU090Rk9vcnlBOFg3MStPeTNaK0pJdEpLTHBKSHJRWHN1b1RrR2oy?= =?utf-8?B?bDlJeWdhZFVrbjRIWDk2S285TlZiL1F5Qk1qUXVacHRCV1dpb1Jnb0FOT2li?= =?utf-8?B?alhUaExwU1Y2SDB1cUF2SWhvUDg5WFdYczludEFra3JkODRTUUYyQjJaemND?= =?utf-8?B?U2RnU1NueHF5dFpqcmhtaTYydUkrTlpQcUpDQmlQTm90U1IzTEozWjEvS3F2?= =?utf-8?B?bmQ5K0YrL3k4ME1wVTNRQzF1ZG9DMGtEKytpYmd3bTgwTnY0TkZiTmFvVUR2?= =?utf-8?B?TnhxMDlLZEZCamJqRlZDMGd0WTE0VmwvYUl3TEFKeUFhRFVrcW1xZ2lDMVJv?= =?utf-8?B?RVJod3lSc1I0SEE5cVdrUlVaRkpyODVjVG9UeUNseEs3ZTNBZFgxTDlSOVRk?= =?utf-8?B?YW5TTHFqSHA4bkh5UzRBeEkydVFZcGtrKytwMFpFZkVmSVBObHVuYTNzZjB2?= =?utf-8?B?V1dERmpPMzVJSGpVZXQraUYzbjdBQTNqMmY0K2VPa2VSbmZNVXZkYk9aSlVp?= =?utf-8?B?Vkc4anEzcm02cGM4VlVQU2VObHlJQzRnUHpyc3BGR3czQk5TOVFQNGJNdDlZ?= =?utf-8?B?YUQ2TWFZK29mczdSUDJlbDRKb2RMbkFXR24wQTFuNzF0ZGFFa0RlV2xLbHAz?= =?utf-8?B?cDBiYnRCVC9CSDFLZDdQaWxsUy9qeXBRSm5mWUlORlgxUDZXNE1xcWUzMGNG?= =?utf-8?B?eldLeGRkMXIvREhpZ3IvVkVsdlJUcE1RN1BLZExjejBYUUxsS0dnRHJ4TDZn?= =?utf-8?B?bTM4TzJycllnZm5CVFZ1RUQ2cm5UMVVMWUFNbVZmelhmZHJtWGRGQVVleWZC?= =?utf-8?B?RUp5VjBNdVluR2wwZGxRVlY1QW5ZWkJBR3VJZWk5bmMxc1g4TjNidFVrbGc2?= =?utf-8?B?c21GNkNlMFJLaWMrMkcxalpvNmg0dkp0YVpyYTF6OXFmZHVjQm5WYW9qTmRF?= =?utf-8?B?aFEwdm42YjNGalhwZ21iRTB5Y3djMFF6amdJRVBYdDFIRHdpY2xKTHpoRnZV?= =?utf-8?B?YWdUbkdoTzMwblNLVXNZcTJDVHNNU1lYU1pPUXNtODlydE1wQWpXYnVLRDdM?= =?utf-8?B?L0FNdVBQaHp4bU5vYmY2cEY5MDY0Uk51WWJLZFVxbEVKS0tsb1E2UGxYNnVm?= =?utf-8?Q?ghmbF5MnhwqBvPCH4AZZ9uX/lF3RKhrqscrqf6q+6HdVR?= X-MS-Exchange-AntiSpam-MessageData-1: K0abTUxcdDI+7g== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: f998ba13-7653-4b6c-df0e-08dee950b3bc X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2026 06:56:35.6489 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: F9PBDAZcqLwNeyyCkinnUrI+lx9A4FedtPWggVD8oWir+c0e9iHFsHe7oDNaMn51p6VD0zPWWqua8tiypScloQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8851 Currently, the frts vidmem offset is calculated based on the non-wpr heap size and pmu reservation size, but this is not right. The layout actually looks like this: | non-wpr heap | WPR2 .. FRTS | PMU reserved | ... | VGA workspace | It's just by coincidence + generous alignment that the values happened to match. Instead, define a per-architecture reserved size at the end of the framebuffer and use this plus the PMU reserved size to calculate the frts vidmem offset. Fixes: d317e4585fa3 ("gpu: nova-core: Hopper/Blackwell: add FSP Chain of Tr= ust boot") Signed-off-by: Eliot Courtney --- drivers/gpu/nova-core/fb/hal/gb100.rs | 1 + drivers/gpu/nova-core/fb/hal/gb202.rs | 1 + drivers/gpu/nova-core/fsp.rs | 27 +++++++++++++++++++-------- drivers/gpu/nova-core/fsp/hal.rs | 4 ++++ drivers/gpu/nova-core/fsp/hal/gb100.rs | 6 ++++++ drivers/gpu/nova-core/fsp/hal/gb202.rs | 9 ++++++++- drivers/gpu/nova-core/fsp/hal/gh100.rs | 9 ++++++++- 7 files changed, 47 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/nova-core/fb/hal/gb100.rs b/drivers/gpu/nova-core/= fb/hal/gb100.rs index 6e0eba101ca1..51bd0c0bede6 100644 --- a/drivers/gpu/nova-core/fb/hal/gb100.rs +++ b/drivers/gpu/nova-core/fb/hal/gb100.rs @@ -78,6 +78,7 @@ fn write_sysmem_flush_page_gb100(bar: Bar0<'_>, addr: Bou= nded) { ); } =20 +// This PMU reservation size is r570-specific. pub(super) const fn pmu_reserved_size_gb100() -> u32 { usize_into_u32::<{ const_align_up(SZ_8M + SZ_16M + SZ_4K, Alignment::n= ew::()).unwrap() }>( ) diff --git a/drivers/gpu/nova-core/fb/hal/gb202.rs b/drivers/gpu/nova-core/= fb/hal/gb202.rs index b78e0970f66d..8ec30afcf701 100644 --- a/drivers/gpu/nova-core/fb/hal/gb202.rs +++ b/drivers/gpu/nova-core/fb/hal/gb202.rs @@ -71,6 +71,7 @@ fn pmu_reserved_size(&self) -> u32 { =20 fn non_wpr_heap_size(&self) -> u32 { // Non-WPR heap for GB20x (see Open RM: kgspGetNonWprHeapSize, GB2= 02+). + // This size is r570-specific. u32::SZ_2M + u32::SZ_128K } =20 diff --git a/drivers/gpu/nova-core/fsp.rs b/drivers/gpu/nova-core/fsp.rs index 1475485bded3..30e53df81aa2 100644 --- a/drivers/gpu/nova-core/fsp.rs +++ b/drivers/gpu/nova-core/fsp.rs @@ -134,20 +134,31 @@ struct FspCotMessage { } =20 impl FspCotMessage { + /// Computes the FRTS vidmem offset for the Chain-of-Trust message. It= is measured from the end + /// of the framebuffer. + fn frts_vidmem_offset(hal: &dyn hal::FspHal, fb_layout: &FbLayout) -> = Result { + let mut offset =3D u64::from(hal.fb_end_reserved_size()); + + if fb_layout.pmu_reserved_size !=3D 0 { + offset =3D (offset + u64::from(fb_layout.pmu_reserved_size)) + // The 2 MiB alignment is r570-specific. + .align_up(Alignment::new::()) + .ok_or(EINVAL)?; + } + + Ok(offset) + } + /// Returns an in-place initializer for [`FspCotMessage`]. fn new<'a>( fb_layout: &FbLayout, fsp_fw: &'a FspFirmware, args: &'a FmcBootArgs<'_>, ) -> Result + 'a> { - // frts_vidmem_offset is measured from the end of FB, so FRTS sits= at - // (end of FB) - frts_vidmem_offset. - let frts_vidmem_offset =3D if !args.resume { - let frts_reserved_size =3D fb_layout.heap.len() + u64::from(fb= _layout.pmu_reserved_size); + let hal =3D hal::fsp_hal(args.chipset).ok_or(ENOTSUPP)?; =20 - frts_reserved_size - .align_up(Alignment::new::()) - .ok_or(EINVAL)? + let frts_vidmem_offset =3D if !args.resume { + Self::frts_vidmem_offset(hal, fb_layout)? } else { 0 }; @@ -158,7 +169,7 @@ fn new<'a>( 0 }; =20 - let version =3D hal::fsp_hal(args.chipset).ok_or(ENOTSUPP)?.cot_ve= rsion(); + let version =3D hal.cot_version(); let size =3D num::usize_into_u16::<{ core::mem::size_of::() }>(); =20 Ok(init!(Self { diff --git a/drivers/gpu/nova-core/fsp/hal.rs b/drivers/gpu/nova-core/fsp/h= al.rs index b6f2624bb13d..aa2f8bda59d2 100644 --- a/drivers/gpu/nova-core/fsp/hal.rs +++ b/drivers/gpu/nova-core/fsp/hal.rs @@ -19,6 +19,10 @@ pub(super) trait FspHal { =20 /// Returns the FSP Chain of Trust protocol version this chipset adver= tises. fn cot_version(&self) -> u16; + + // TODO: consider moving this into the TLV firmware metadata when ready + /// Returns the size reserved at the end of the framebuffer, in bytes. + fn fb_end_reserved_size(&self) -> u32; } =20 /// Returns the FSP HAL, or `None` if the architecture doesn't support FSP. diff --git a/drivers/gpu/nova-core/fsp/hal/gb100.rs b/drivers/gpu/nova-core= /fsp/hal/gb100.rs index 42f5ecfc6400..f601b5d7bf61 100644 --- a/drivers/gpu/nova-core/fsp/hal/gb100.rs +++ b/drivers/gpu/nova-core/fsp/hal/gb100.rs @@ -1,6 +1,8 @@ // SPDX-License-Identifier: GPL-2.0 // SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIA= TES. All rights reserved. =20 +use kernel::sizes::SizeConstants; + use crate::{ driver::Bar0, fsp::hal::FspHal, // @@ -17,6 +19,10 @@ fn fsp_boot_status(&self, bar: Bar0<'_>) -> u32 { fn cot_version(&self) -> u16 { 2 } + + fn fb_end_reserved_size(&self) -> u32 { + u32::SZ_2M + u32::SZ_128K + } } =20 const GB100: Gb100 =3D Gb100; diff --git a/drivers/gpu/nova-core/fsp/hal/gb202.rs b/drivers/gpu/nova-core= /fsp/hal/gb202.rs index 1091b169a645..b022d298195a 100644 --- a/drivers/gpu/nova-core/fsp/hal/gb202.rs +++ b/drivers/gpu/nova-core/fsp/hal/gb202.rs @@ -1,7 +1,10 @@ // SPDX-License-Identifier: GPL-2.0 // SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIA= TES. All rights reserved. =20 -use kernel::io::Io; +use kernel::{ + io::Io, + sizes::SizeConstants, // +}; =20 use crate::{ driver::Bar0, @@ -21,6 +24,10 @@ fn fsp_boot_status(&self, bar: Bar0<'_>) -> u32 { fn cot_version(&self) -> u16 { 2 } + + fn fb_end_reserved_size(&self) -> u32 { + u32::SZ_2M + u32::SZ_128K + } } =20 const GB202: Gb202 =3D Gb202; diff --git a/drivers/gpu/nova-core/fsp/hal/gh100.rs b/drivers/gpu/nova-core= /fsp/hal/gh100.rs index 291acaf2845a..002f7ccdca3e 100644 --- a/drivers/gpu/nova-core/fsp/hal/gh100.rs +++ b/drivers/gpu/nova-core/fsp/hal/gh100.rs @@ -1,7 +1,10 @@ // SPDX-License-Identifier: GPL-2.0 // SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIA= TES. All rights reserved. =20 -use kernel::io::Io; +use kernel::{ + io::Io, + sizes::SizeConstants, // +}; =20 use crate::{ driver::Bar0, @@ -26,6 +29,10 @@ fn fsp_boot_status(&self, bar: Bar0<'_>) -> u32 { fn cot_version(&self) -> u16 { 1 } + + fn fb_end_reserved_size(&self) -> u32 { + u32::SZ_2M + } } =20 const GH100: Gh100 =3D Gh100; --=20 2.55.0 From nobody Fri Jul 24 21:53:03 2026 Received: from PH7PR06CU001.outbound.protection.outlook.com (mail-westus3azon11010014.outbound.protection.outlook.com [52.101.201.14]) (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 32BCE39EF25; Fri, 24 Jul 2026 06:57:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.201.14 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784876223; cv=fail; b=AfeQ1S6LlfUTqMPSQJjWWAchlMAq98ORevR9DoXqBAaxAr1Y5txR0MqvwqwUxK524vwa5eLiRVjTKu/sbdl2ITz1lPIOtgT2FvDJkBN8Fstd5bCURroXi3bcbIgnpGWwdCEeW70GIf7eqKZbhRaSfkcUCkTNG3Lyu+XE1IMb39I= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784876223; c=relaxed/simple; bh=ELbq/BdSkRI8j70rVC5gb0VXvQz+dDTUBInB5NOkZrQ=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=uGRLzo83E1JU/Th+ZJomv5eyxIG0DdqdDJtVx6UFXbGgBFZAwyeix1QHZO+J8k+9gBbmnw+WyuYENP+nj2j9OELyW4aPs367B7z/fczt8Qyx2NUVBncwZkt5bh7PtIknWIXHZWQoIcY0daZP2qTFopXC+G3YNn0YoUpPo3ATHjc= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=CaB8mmnw; arc=fail smtp.client-ip=52.101.201.14 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="CaB8mmnw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=DIJdo0NNwglM8c86ilwbxHMLi8PtH+1QjuK9MK1cMIsrOdsyUN7TTCVhmsSFRXzW29EH8ITK6zZsQLN9EsJS7ClTdaTGoDmN882OZ8I++MW/b4Zo7waH3LGJXn1npMPy5e58jl0MjP6sjnXit5axenJWUe6V0WUfkHidEZj6mNNGsVktwdZFMwAClYd7Ym2cGoLjpheCdgwQT6e49uvzJlVezVolLRgOH1bVoF23Qou3r9ittoPqHSH3B+qI4aJ4XZ5zJICyb0Mpyij1lP5lnowbnBn4jSQ9x/RhV76kWwDyS2d/t42z4jZ4qJPq0o2ZBWXNgOEWtNA+ruIhPxCi/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TAfBRe3lBlOcnFEhgO8l1qWKuuE0GbaaKOj4DSsHjDs=; b=KprLAm7SHswXlu32tC3hQwu7Urct6moQiH4zzq3JN3mDJugpVu9qgDY5Ka4uNDaPlzRI8qXmvCpmHJGOs9k0EpKru51cd+d30u0kjEEcHvQAUHGw6FhqglOkXyv2t/EraRu3im3uk6UAktdirA/8hyDvGTUeDDjtkCyMtoY4otfcyyd45kUXoMvMr9KYWG2oF7jRifxgwGS+COyIcVjzEV/35vBXqhMrVgUkDqivIAFB7UagTzUA4MxbWfxrjzY4ZAnGybN2ui6Ykgc4/ZRsUnZ4ah91CCFQ4ehGR7DSBPIQg6wqif4fa7Xbenyp/K3n8nFphSu/pEsH3WSLu+5esw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TAfBRe3lBlOcnFEhgO8l1qWKuuE0GbaaKOj4DSsHjDs=; b=CaB8mmnwe6pltsxidA9k0sDfqyr8DfZB42hbD7oXM+HoBhBTSpHaj3O9XCOghXrqE6xps19ob+iixu+iQpGdiy12oSGLXM+RSmJOROOpFNUy9tktai6TjF9ciKrdmefHbYHlhRRQB3W2ys3vbU4ihHJ0vlhhdO5CS5Pd01IWMOPyL4pWfEsKyFqZVvXyyKOXmqWU3cbKtiiaM8tAy8mMabXmvyGoNz5y8WMAmS25JxjxDrzA1kqBdOyUpNmBBAht/koV1RwzLlORa4VMn8k42rW3QYlV7BR+4V6tL8v7g2mSydfz5JddFQPiTOzQvowykodCgSAvbpK+rrwzmlqi9A== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) by CH3PR12MB8851.namprd12.prod.outlook.com (2603:10b6:610:180::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.10; Fri, 24 Jul 2026 06:56:39 +0000 Received: from BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0]) by BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0%4]) with mapi id 15.21.0245.010; Fri, 24 Jul 2026 06:56:39 +0000 From: Eliot Courtney Date: Fri, 24 Jul 2026 15:56:24 +0900 Subject: [PATCH v3 2/5] gpu: nova-core: rename heap size field Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260724-blackwell-fixes-v3-2-01aa6a54e3fd@nvidia.com> References: <20260724-blackwell-fixes-v3-0-01aa6a54e3fd@nvidia.com> In-Reply-To: <20260724-blackwell-fixes-v3-0-01aa6a54e3fd@nvidia.com> To: Danilo Krummrich , Alexandre Courbot , Alice Ryhl , David Airlie , Simona Vetter , Benno Lossin , Gary Guo Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TY4PR01CA0037.jpnprd01.prod.outlook.com (2603:1096:405:2bd::10) To BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL0PR12MB2353:EE_|CH3PR12MB8851:EE_ X-MS-Office365-Filtering-Correlation-Id: 02e79d94-863a-4093-f93e-08dee950b5c7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|376014|7416014|1800799024|23010399003|366016|11063799006|10067099003|56012099006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: yzNXXvcFvxcYolbgRXK3UZHZUN3bERPv7XkMcIEykKfsAkVpBEPVLpjMTR7YgFIU47Iob1Wu8a0wuCxlr+dwiVVlIoSI4BBUh2+/aY0L/ED86edVUT5IbcYbK1DcY+VZ1CUdE8Z+QGnrNZOp33jI2NVEcv+uPAWPjdRmqplPe6hKogY5egAA6KDP6DqldZo1gVyaKnnpHElhT8xRlvkLcG4See6N2o/WDnxw+K7pv/PHtkINMAysoN9nxFkNSTE3mQJruehzIDTRk+9ozXQRUtd/Is12R8tBwU3lrtQbLyJV01iOKWN0IYWTBJP6KM6mXX2J1SZM+q/1qz37q7eTjT+ffAhQW6QCH17BJipPnptydSJ8Iom27o2yKkmUVlvP1O/S1BS3vg5PzvzV16uFQURpZ8C2Aj5iwvIS4wVhS2GnNj5zGfFYpAoR/O5aiHZfSqR0MJw3kwVbnH2JaROawqxWlwy2wK1bEOZvICM/AlRV5u99cbpc8CrdS9ruEB8jQOkyaum1EfU7+wK/dWiC/kpdN/mhaw03G7GWorGj1qhfeExwWhRIi2opWeP0lWCkuNWC1hGhp7i/x2KE+NX4dV/9KcUcH75D2I3Qf9eEzAguTlgYWwlltTKrQC8yYUuVfYtCHLOjLlQWh1nh2YD7AH/gA+K8lxHz7siHSA7dDGk= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR12MB2353.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(376014)(7416014)(1800799024)(23010399003)(366016)(11063799006)(10067099003)(56012099006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eXJXb2RNM3FRUXBSL3N6NHlLS3JWUGpXOUtOQzFGd0tLMDZKU0xwUUZHZXZL?= =?utf-8?B?ZXovWWVmWDQ5SEVZdFJxckV1d2VzdE1aRlF1QmFhenhtR1EyWm9aVTRtU1Iy?= =?utf-8?B?djRtZ3NXN09GWHhaWGNhaWNQWUNGcytRdys1dFBrb3p3RjhNbzVkN2paTjZp?= =?utf-8?B?M1dnS0tMYmpRN3U1VUwzTHZQcEFVdEJyQ0FNemtFRmh2S1F0cmNpUjFEV2Er?= =?utf-8?B?aUw5S0pQa3Evd282OTNNcjJOYkI4eEhoV0NEQWxoNlNLNWNOS2poSWFObStt?= =?utf-8?B?YU4zdWIrcXFUTG1WMnhoOTNoUzBDRzJ4Yk4zZ3dzRlVtS3JQM3Z2cVdQNXBZ?= =?utf-8?B?b2RTQXZQZDlMZ2MwRWlKMmpUMHpYUE9VZWxYOEVXQTZsbTVwODM2ajkrRERG?= =?utf-8?B?WExMRm43K05BNDdlUkxxYklIVTFXTzRJWkIzeUQ0SUtqR1hZYnBZQkJOdWpp?= =?utf-8?B?bjFrbmZVK096Q05NOCs3L0JkMVFDYVRCc1FHUE9UUzBocGJpRjR2N2tUYVFU?= =?utf-8?B?TElXWEQzN0h3NVErSEgxWXJSU1ZKd2dNMVBnakgrSGJvRDZEcmFibzZIUDlH?= =?utf-8?B?eklzWGJnbGwxVi96a3A4VWxYRXZWNnh4VWRjS1hrdVhYNkVaOUtmakJSM0x0?= =?utf-8?B?Wk1saHYxWUhvN2E5em5jUS8veDVuTzVBZ3ZROHFmS09aMXVnZmM5QVczVUVJ?= =?utf-8?B?YWMvYnRSUWtSbThMVllydFdZOFBBaUs1MWc1aGxkMXhzVnJiVjNkWkJndWhi?= =?utf-8?B?RUxPVW8xREdiL0d0WENuZDdoL3NKYmtkdlFnbDIwOHQyRmsyYWdLaFRXcnc0?= =?utf-8?B?YkZTdEVWN2YwRUNUK0RSbnBpVHdUYzkxdWpkMmVwZFJiOVdZQWx6OXRDU1Y5?= =?utf-8?B?Z1lLb3M2NjNmOWxMa1pQUysxNlN1emt2ZnlreE1La3RTSnIzTFhqVUcwcFBk?= =?utf-8?B?U3lSejNFNGJvVS9RT1pUWVYvNGM2WVBqSU42QmtramlvejVCdlRGemxYTDgx?= =?utf-8?B?QkFOSWNKMTRpdktYMUNoM0hPL0FxbTU1MzViSUpBYjNSU2x2TEQrbW5Od1BQ?= =?utf-8?B?eVAveWppZnhSMFNyR0tqa3oxQlhwc0Fwakxib3pMMmkrQ1lwQVlDLzExK1B2?= =?utf-8?B?TjZDdWxWdnRsZ0t6RVRsbW5PM0lUN3IwY1F3aTh4dEE5VFg4T1V2SUZWV2RX?= =?utf-8?B?M3VBNXBZL3N2RUtzS3lvVi9sYnhGbzY0SDJ0U056TUYrWFZzUnJ6T1ByL2w5?= =?utf-8?B?Myt0dmNSaVFCUDdpQ2dieStZYWlCMXlUMU1OQU44OUJLZTRyRXpEVFJkaVB3?= =?utf-8?B?V3BGeGhMdTBvVTU2M0FDWER1cGdPWVc5MDJpdURPS2RMazd0T1ZqcmdzcU16?= =?utf-8?B?cWNsSk5BTzZmU0hTOElhQURYaXFtTzNRZXJNZ0xaS0YzeU16YTBodUN4YXlp?= =?utf-8?B?VkxLZm93eEZtWWNMYXM2SmlMY3JuSkc4dzQzQmVLUy83WVROUXpJOVVlcFVR?= =?utf-8?B?QmoxSGdINkg0VWxRazVSdVI1RFdIazlmNUFyRDl1Si9mMkEwSmYyTzhkbXVs?= =?utf-8?B?aWd3aUJhNktHMmtwbHA2aE4xREIyU2VkZ0szQklURTVDTmFqRTFmS0V5RmxV?= =?utf-8?B?MXhPelNMd3RQRWd0TEJtSjRmOFFFSDdCc0J3dW42WHdZNEJjODVyV2dtR090?= =?utf-8?B?WHQyL1h5TDF4RmlGMjVLLzR5SzdSc3BBM3pBanQ4UjJXWktFMFRFRmdzWlRu?= =?utf-8?B?dU5jM1Z6U2JIZ2lIQXZNZ0xpZnpyT0FvZmVDVVA4VG91aUFFWnU3VmR3NVNk?= =?utf-8?B?eWJkVE56VEhNZWlUZlZVcmhGa2lNOTVtUXpzSTJLWWZITWtEa2VoelpzalNS?= =?utf-8?B?UHM4czFsNHQ2SGlQZURqSi9kY3VqUVNtUW4zOVkrRlIrdVBsVmJCWXpsQVhw?= =?utf-8?B?RDVHcmwzNUtwYnR1S0ZzRlVXUUVpYStPaUxYRGNzbXBCMnRBeTJFWjZpdGtP?= =?utf-8?B?MmRoMDdpdWxRb2FTd3NoMVNjYWpXTDdybVF2SFdCSUdNZXRIY25iUGpSVnZJ?= =?utf-8?B?UnVKZ3ZxSDdFZlJBK043UlRhbzF4M1VNVFZaaXNubDdKMWpTRDJkQVEwU3Nh?= =?utf-8?B?VmVpVjlQNFljOGdmdXJIWVNaVnB3czNrZnRnRzMyaWhtb1cra1FZYS8wRzRL?= =?utf-8?B?RWZYUUZCb1NRaHJGTE9GRkNSZTNmTnRMQXJmSCtET1lPRVNKcnZPN3gyOE9v?= =?utf-8?B?Tm9DOE8wekU2bFVFb3UyTW1zNVVnUFZDSU9EV0ZwL1dSb3R4MTV0Rm11cHpq?= =?utf-8?B?OHNjVTg0bWQvVkxSSnlFY2k2VVh5T24zM2ZWcDduS3dlKzZRRXhXclFCai9t?= =?utf-8?Q?xGXuwcx6Ojc4OBMnlwizoLRJ8RFFlC1LFunfh1gAZfgdf?= X-MS-Exchange-AntiSpam-MessageData-1: 0JtWXT/Vroc7VA== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 02e79d94-863a-4093-f93e-08dee950b5c7 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2026 06:56:39.0504 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: T5MCybHIkHGECs1eKpGRUVAnsuL7NyMaG7ztTZKUzVzZFL7MukH7sLb8ef/BPuruTSPpREW9FRYzKI9RCumr0Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8851 This field is called non_wpr_heap_size everywhere else. Unify the name to make it more obvious which heap it is. Signed-off-by: Eliot Courtney --- drivers/gpu/nova-core/fb.rs | 10 +++++----- drivers/gpu/nova-core/gsp/fw.rs | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/nova-core/fb.rs b/drivers/gpu/nova-core/fb.rs index 273cff752fae..1f7b6a69e4db 100644 --- a/drivers/gpu/nova-core/fb.rs +++ b/drivers/gpu/nova-core/fb.rs @@ -163,7 +163,7 @@ pub(crate) struct FbLayout { pub(crate) wpr2_heap: FbRange, /// WPR2 region range, starting with an instance of `GspFwWprMeta`. pub(crate) wpr2: FbRange, - pub(crate) heap: FbRange, + pub(crate) non_wpr_heap: FbRange, pub(crate) vf_partition_count: u8, /// PMU reserved memory size, in bytes. pub(crate) pmu_reserved_size: u32, @@ -251,9 +251,9 @@ pub(crate) fn new(chipset: Chipset, bar: Bar0<'_>, gsp_= fw: &GspFirmware) -> Resu FbRange(wpr2_addr..frts.end) }; =20 - let heap =3D { - let heap_size =3D u64::from(hal.non_wpr_heap_size()); - FbRange(wpr2.start - heap_size..wpr2.start) + let non_wpr_heap =3D { + let non_wpr_heap_size =3D u64::from(hal.non_wpr_heap_size()); + FbRange(wpr2.start - non_wpr_heap_size..wpr2.start) }; =20 Ok(Self { @@ -264,7 +264,7 @@ pub(crate) fn new(chipset: Chipset, bar: Bar0<'_>, gsp_= fw: &GspFirmware) -> Resu elf, wpr2_heap, wpr2, - heap, + non_wpr_heap, vf_partition_count: 0, pmu_reserved_size: hal.pmu_reserved_size(), }) diff --git a/drivers/gpu/nova-core/gsp/fw.rs b/drivers/gpu/nova-core/gsp/fw= .rs index 166b0c69edb7..93f2125dbbfb 100644 --- a/drivers/gpu/nova-core/gsp/fw.rs +++ b/drivers/gpu/nova-core/gsp/fw.rs @@ -191,9 +191,9 @@ pub(crate) fn new<'a>( sizeOfSignature: u64::from_safe_cast(gsp_firmware.sign= atures.size()), }, }, - gspFwRsvdStart: fb_layout.heap.start, - nonWprHeapOffset: fb_layout.heap.start, - nonWprHeapSize: fb_layout.heap.end - fb_layout.heap.start, + gspFwRsvdStart: fb_layout.non_wpr_heap.start, + nonWprHeapOffset: fb_layout.non_wpr_heap.start, + nonWprHeapSize: fb_layout.non_wpr_heap.end - fb_layout.non_wpr= _heap.start, gspFwWprStart: fb_layout.wpr2.start, gspFwHeapOffset: fb_layout.wpr2_heap.start, gspFwHeapSize: fb_layout.wpr2_heap.end - fb_layout.wpr2_heap.s= tart, --=20 2.55.0 From nobody Fri Jul 24 21:53:03 2026 Received: from CH5PR02CU005.outbound.protection.outlook.com (mail-northcentralusazon11012067.outbound.protection.outlook.com [40.107.200.67]) (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 B036F39934C; Fri, 24 Jul 2026 06:56:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.200.67 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784876211; cv=fail; b=MKFvbGS6N2y7rUVeKvgoVYuBBCcS1uCUadb4NQoDhg7T+4x/WjjKeTqT43dZVZUIpRZBr8bxc5QXRZX23qB7JzOrKyldrClkB3vedYaKVeOy0CMWQXEVUcI/6fFkgoZMGY36kUV6Jb4Qm2q6kOog4h/50z94HRh6ip/Q7ncaoRw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784876211; c=relaxed/simple; bh=t9RWAhe1+sR5tztOOHyViywTM/q6jaCrRZ6EMFfzlRg=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=nbkJXKH3DlUEwois237vz0r+SMZnpVZ0a+mVNMe7reJ0OtFSwNxJP3DEKI6EhvSMqJ9La+e0woyJy0uiSbPm1H3ZfQv5QPtdDy/yWALal71TZFltuz7pIuDrtj3+jgkkq+ljY395ZH7EPxc0aw3gkNKb7cl/3r7YG27RvAvDuAU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=uhqBT98K; arc=fail smtp.client-ip=40.107.200.67 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="uhqBT98K" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xSMtEwXNYsBqQKRBxizzPWWv5PWxPmS8lWqowIOC8LrV4zL/RStqpQtebU0S8aiXu7f3WIjdSA/ZSafA0ROO4enVtXOw/g7qrh9HB+RdPBwG0P3z8Dt4jDZ7TFEH1V7J4y4+dRgcyCeesx3V/i4bsv6p+7Bin3FynuYU8I0EwESh61F/xF29ls37R1eARHkoZyIKp7eIeo9Q+Ktnc9RAMrtpMUNqTJwd/Yg3RY3dY1atIa/teg8sp8Uhey0/TNhhQELymvABf0/x04sWyrxvfNjAnUewYhdCG37JU68SyIWWcI9kJTW62fkEfU49KPq7cAfUB5+l2YwNLawQYZDB9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=vPXIVr5ob5FYSE1wUVrhwgMHdLRTcOpW+p/z31/oeQw=; b=yBFiShOna3RLgeMzFmqUAKpsVzi8w4nKlQBquhe86wNzZoYtR1MeA6feeh56NfQMuASuxSmWWXK8e0x+i4azPlMrLs2VHzfXZv1JF9K9AtCvbQMXImMB4neAVaq0n7vS0EKS8nnBT1UL1DfcBaVZkZsTNKI6CDLR+lKSx/yiTMkdnovn7wYGSjd+Cp6yeXLkmMgYNauxJsQeRtWREfBntySXOX6lQQQncbIKEcnH+uBQdOBXeIiwlQob1PzjRBpzfoAW9cmGXbEbY7w/TGvnEuHax0siMXPCPZyjORcQedHCHV1bNxohIDVBcjUxmTzxY56RY8wSYCwIXaYnF7ouTQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=vPXIVr5ob5FYSE1wUVrhwgMHdLRTcOpW+p/z31/oeQw=; b=uhqBT98K+aByJWj/Wc9QoJi/+ZwoFm590j0phR6I00JPL/qbwfg3RffOnWyI8fWMRJ8cMpaDh/FqAPXhuy8o1PKlTFJY7kOzwjEc+vWAVpLROa3tt68nvXjnjTfjl+cdO1uxk3hwoJj2d2gTD3Sq6JvwG6vlou7MJlDIF+9zYCfPbLNDblyvtmevsMVwrTadId1lWIeRnv0J3Jz5ZghuVvDvmChAqpizkVbjSgrXvnM0FNbJCq7qSYuxBcRdRduJGpwtBSYfA3674e5si73sU1ezuPMnk2LjDqVINcD8NskQnnBx48NInhFvwVx8UeNcbJ/rTSSkN8rtApnXGYHQ2g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) by CH3PR12MB8851.namprd12.prod.outlook.com (2603:10b6:610:180::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.10; Fri, 24 Jul 2026 06:56:45 +0000 Received: from BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0]) by BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0%4]) with mapi id 15.21.0245.010; Fri, 24 Jul 2026 06:56:45 +0000 From: Eliot Courtney Date: Fri, 24 Jul 2026 15:56:25 +0900 Subject: [PATCH v3 3/5] gpu: nova-core: return non-WPR heap size as u64 from HALs Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260724-blackwell-fixes-v3-3-01aa6a54e3fd@nvidia.com> References: <20260724-blackwell-fixes-v3-0-01aa6a54e3fd@nvidia.com> In-Reply-To: <20260724-blackwell-fixes-v3-0-01aa6a54e3fd@nvidia.com> To: Danilo Krummrich , Alexandre Courbot , Alice Ryhl , David Airlie , Simona Vetter , Benno Lossin , Gary Guo Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: DU7PR01CA0043.eurprd01.prod.exchangelabs.com (2603:10a6:10:50e::21) To BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL0PR12MB2353:EE_|CH3PR12MB8851:EE_ X-MS-Office365-Filtering-Correlation-Id: 8aeaff6a-3207-4ea5-6e40-08dee950b94c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|376014|7416014|1800799024|23010399003|366016|11063799006|10067099003|56012099006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: g41MKvGu8Ps63Attn6bzXklPfHXAHfNkM7na3YJR3WI5V3h7COFRrHWvR3OU7H+P1J1aubGF+/L4XJPBYzzGZ5Xz1LRF3Y6JXr0UXo67NGn2t4LFbqQcQfp/wuAOmZfL5bqOkvb2rP778XyaHOtRwIJarGWO0L896g8TXK5sNzLu+7g4ifr+FZOEsdefivUAPyk9MFCkKwe7ea6aKcSHP0pTy6a0vyAlhuRfUGm4l+tF35O8JdwMMDlUpbEYsLQRyOSyYlxRrPuLqyk/kZj9jLaEz4PwqGqkdinQo7YnlaPE8mhXVHG9y5W+x8lxK/N7HfcoiVVgRr/uz8pO6QgImEH7OzLG8ZFI1/kt0hTM0roCo2PFIUGq1GxsW528ThbvQX2ociy0Fc22JRWnmHYCrbfZ0hO74RI3SyncTKEgHFzcwG4uspq7Bkz06DDEv0yfkzgFkzAYu1Ux92IvUgvsme8hBuSjsZq6sD8HFP2XBBf/n3O0/sHFE2/z/4YMBmUSb3HIChwn8yp3bVw20pe5h+Qmec1tF1O8FFRRkih3UKGslWBE97+fb+iRj3Y2JvjlYacmMdZMWSWp086SWkpEPWdF5rCZE45y+4Dms48pryKnFYiEL2vwcFalu7MBON4YKAaFJvh2Es5GfqDOtgZeGRHSRILj2of4fXt74IxhAH8= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR12MB2353.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(376014)(7416014)(1800799024)(23010399003)(366016)(11063799006)(10067099003)(56012099006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MUp0czBPbzBwR2JyS0VCRlJ1U1o3dWdqU29tVG9BVHRzYWZHYjM2dStCWk1G?= =?utf-8?B?MmtzemYxb2dSRWkzdndzZEluNXVWQ3kyMTNtT0k5eUUxdTBENUlFenFGdXNt?= =?utf-8?B?Rk5UV0hyR1JOaloxUWEyU21wejdsK0RZN3c5QXQ1WWEvVG1aS3R0NW1ncEJ2?= =?utf-8?B?ZDBNZS84WElLaExpbm1keThUMFdGQmdqOXEwRHZEMTVTMUZpTXJDMnlBL0l5?= =?utf-8?B?MVJSRzhLak44RUlFdEYzVmpYVmpKb3h5c25FVzRHOTVGQ0JqZGFSdFNJay9C?= =?utf-8?B?NHNpMXpLWkJVemtzejNCeGV0SE9iZnZVZk9wVmkwem5SYmZ0bXZEcitVaE41?= =?utf-8?B?cGNrbXBqbGt0ckxsS1p2cXFWRjdEMTU1Q2RmYy9IYVpIbWUrQmttcDZPcU1X?= =?utf-8?B?OWdGd0pTanpuMWJRR3lHWWNkRkNnTTB1Z2hBTG1NVyt2c3lWcTErTC9LM0VO?= =?utf-8?B?SVVyTEJDRG9GeXFRdjhyaWtsYWExdkk0Ym9nQjhQZDQvY1gvYlNCc2NzWlcy?= =?utf-8?B?cndrWkZTSDZ2Zm42RjlaU0R4MmQ1SmVmL3NpRVZoUkRmN1FnRy9tankzbEov?= =?utf-8?B?TUJNWUtENW1LL0RSOFcxRXBoa0d1azZ0WmxadzhLUDZOM1k4R3JjWU9GTWQ1?= =?utf-8?B?blJBQi9hSEtuZ2s2UzRYcGFLdmNuVVN6bjNNZzg4YnR3QjFQTmZFSkhSNGli?= =?utf-8?B?VEVPVklvRnBZbEh5b3VWWkFTZ1hIQmJLYzk3RllaYXN4bHI5cCtSSEI3d1Iz?= =?utf-8?B?b0M5cmRGREt4Qkd5RnMyakxYQ0VpVlA5Y09sS0hMT3d4QmFLSG05ODN3YXdV?= =?utf-8?B?Sk0vZVZUZGlFeEx6MnhZTG50V0V6SFpMbzlDY1dEeHpySzVMeWI0dm0xS216?= =?utf-8?B?cm4wRS9kZXoyR0l5V1U1djFVM3B1UXd6TEpzTjkzZzJWdlRid2gwK2tldm9H?= =?utf-8?B?ZHRuSjNlOEhHMDRtRVdOY0FtZmtKbVRUbXp5aS92Y1U0anZCczhNNERlMlpH?= =?utf-8?B?UTkvVU9XblNyNEJaVG9SV3dHSmNwaU9XRzhVeHpDODV5Y1JPQ2NGeEhlVXhz?= =?utf-8?B?VitKQWNiUEF0azNFVDRSWGNpYllXUWFCWW9BZ01JeG1Qa3JlaE9qSEVVWEl0?= =?utf-8?B?Qk51YUYzOWRUbE1nSVl3Y0tDbHFZZjg0dHVLYUZMeVVmSnFvaGl2dnZXeEEw?= =?utf-8?B?eUNyc1JqRDBKVG50cmdUSisvcUlROERlN09Wcy9iOGJCQ3BNbzZVK2YvdjBQ?= =?utf-8?B?NmMxSldDK3oyYTUwL2pCcUdocGFBcDF1dTU5TzNWek9sNGVtRjdWZS9ldVNZ?= =?utf-8?B?UkZBejJDbVlGd21ZRWxJMEpYaTVvaG1jQWtHSGw5Wm9wYlRDYW1OOVFsaFdi?= =?utf-8?B?Q0liM2JIU0dzWTBnM0hWS0grY0ZwdTR6STBoMmFjY2pPaUZ3b3hEWS9HZzJt?= =?utf-8?B?OXB3YzBQaUlPanVXWkNtNll6V0p6VXE3TUx6V3lDdGczbUlTUVFMMUZubzl5?= =?utf-8?B?dlNCckRIR2REU3JPM0dnOHJ0bnhpNHdLMEhCMm9QYTNKdmNzanlSZW9BWFky?= =?utf-8?B?TXlOMGRtVzlLejJZVUhQdnVWZkZTVklFaGNQV1gyVWxBRVlERlF5Ly95UFVz?= =?utf-8?B?TERHSml4ZXJvVmpnZURUWENyOUdKR29nNmQ3Z0h4S1FkTGpKOHVPN0NWN1F5?= =?utf-8?B?MnBmN3c2cmhEZkJZc1BNdEFKQzYwR3p3R1hJRzQvN1AyNnlYeGNwSkdrcWp5?= =?utf-8?B?dFJwWTVMeUV0KzBoakNMSlFRNGtCZjR6aGxVTjE0VFh5VzNlVVJqL0hJai9z?= =?utf-8?B?c1JTL2N0Z21KRHg4VVNrQlQ5TTdXYTRvSEVKbkU5aERmQmd0MXQ4dFZYd1N5?= =?utf-8?B?ZzFVQ1ZYZHBGNnpnN09UVTRMUm1FZlFsY1llMVlxamQveGMwa0FGdWF4ZG1k?= =?utf-8?B?YzgreTcrT3NxVkdjbkZNV0R3MzJneHdvR2FQZkZQdDdSbDBIRWdTQkNGeHJX?= =?utf-8?B?RmlTaXpqWTF0RGJmZXRQNnVVZHltTDc0Q3FhMzFlcnl6cnI5TUk0dVdTYU83?= =?utf-8?B?VVlpb2xUSmpDb01WdmZ6NlhWQ281L0ZtUGt3L0NjbkVGbnNCQmhUaTd4U0hR?= =?utf-8?B?WUU3bWZLSHBxNHpwVnd3ZER6WGsxblpJYkkreVhNZHM0OGhXbmFPdUVYb0p3?= =?utf-8?B?RHExT3pMSjhqcHNRcDl2SHB4SzVNVVpoV0I1N3YydHl6NWpKbWV1aUtKaEcr?= =?utf-8?B?Z2JpWEtUUFpTcTJOWDhrbmM5RzZzSWZ6d1E4RVZEdE55c1Z5THI4blpwcXRi?= =?utf-8?B?ZHU1RzZKRnhjWWZPLzJoSVhGdk82Q2ZybDA0YldRK044T1JEVzJwM09rMTJ0?= =?utf-8?Q?ZetaVulXav4iCTF8wvexi3YLJeJ1c9Z4CqIeUeeLXyeuO?= X-MS-Exchange-AntiSpam-MessageData-1: YS0J7g4VVDrulw== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8aeaff6a-3207-4ea5-6e40-08dee950b94c X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2026 06:56:44.9555 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: V/vuuGBpvqGYB75eYmZuyCeCaWLkWGIKhagreLJ4+eJKHky3gD8GttznPULnA+EmQR7/uVLbmwAslWCVU9lyJA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8851 This is always immediately widened to u64, so just return it as a u64 from the beginning. Signed-off-by: Eliot Courtney --- drivers/gpu/nova-core/fb.rs | 2 +- drivers/gpu/nova-core/fb/hal.rs | 2 +- drivers/gpu/nova-core/fb/hal/ga100.rs | 2 +- drivers/gpu/nova-core/fb/hal/ga102.rs | 2 +- drivers/gpu/nova-core/fb/hal/gb100.rs | 4 ++-- drivers/gpu/nova-core/fb/hal/gb202.rs | 4 ++-- drivers/gpu/nova-core/fb/hal/gh100.rs | 4 ++-- drivers/gpu/nova-core/fb/hal/tu102.rs | 6 +++--- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/nova-core/fb.rs b/drivers/gpu/nova-core/fb.rs index 1f7b6a69e4db..f5832e59de59 100644 --- a/drivers/gpu/nova-core/fb.rs +++ b/drivers/gpu/nova-core/fb.rs @@ -252,7 +252,7 @@ pub(crate) fn new(chipset: Chipset, bar: Bar0<'_>, gsp_= fw: &GspFirmware) -> Resu }; =20 let non_wpr_heap =3D { - let non_wpr_heap_size =3D u64::from(hal.non_wpr_heap_size()); + let non_wpr_heap_size =3D hal.non_wpr_heap_size(); FbRange(wpr2.start - non_wpr_heap_size..wpr2.start) }; =20 diff --git a/drivers/gpu/nova-core/fb/hal.rs b/drivers/gpu/nova-core/fb/hal= .rs index 714f0b51cd8f..99363cfb116b 100644 --- a/drivers/gpu/nova-core/fb/hal.rs +++ b/drivers/gpu/nova-core/fb/hal.rs @@ -37,7 +37,7 @@ pub(crate) trait FbHal { fn pmu_reserved_size(&self) -> u32; =20 /// Returns the non-WPR heap size for this chipset, in bytes. - fn non_wpr_heap_size(&self) -> u32; + fn non_wpr_heap_size(&self) -> u64; =20 /// Returns the FRTS size, in bytes. fn frts_size(&self) -> u64; diff --git a/drivers/gpu/nova-core/fb/hal/ga100.rs b/drivers/gpu/nova-core/= fb/hal/ga100.rs index 3cc1caf361c7..3b99028f3828 100644 --- a/drivers/gpu/nova-core/fb/hal/ga100.rs +++ b/drivers/gpu/nova-core/fb/hal/ga100.rs @@ -72,7 +72,7 @@ fn pmu_reserved_size(&self) -> u32 { super::tu102::pmu_reserved_size_tu102() } =20 - fn non_wpr_heap_size(&self) -> u32 { + fn non_wpr_heap_size(&self) -> u64 { super::tu102::non_wpr_heap_size_tu102() } =20 diff --git a/drivers/gpu/nova-core/fb/hal/ga102.rs b/drivers/gpu/nova-core/= fb/hal/ga102.rs index 44a2cf8a00f1..a5eeddb8a1ae 100644 --- a/drivers/gpu/nova-core/fb/hal/ga102.rs +++ b/drivers/gpu/nova-core/fb/hal/ga102.rs @@ -41,7 +41,7 @@ fn pmu_reserved_size(&self) -> u32 { super::tu102::pmu_reserved_size_tu102() } =20 - fn non_wpr_heap_size(&self) -> u32 { + fn non_wpr_heap_size(&self) -> u64 { super::tu102::non_wpr_heap_size_tu102() } =20 diff --git a/drivers/gpu/nova-core/fb/hal/gb100.rs b/drivers/gpu/nova-core/= fb/hal/gb100.rs index 51bd0c0bede6..9a1fd76c179e 100644 --- a/drivers/gpu/nova-core/fb/hal/gb100.rs +++ b/drivers/gpu/nova-core/fb/hal/gb100.rs @@ -109,9 +109,9 @@ fn pmu_reserved_size(&self) -> u32 { pmu_reserved_size_gb100() } =20 - fn non_wpr_heap_size(&self) -> u32 { + fn non_wpr_heap_size(&self) -> u64 { // Non-WPR heap for GB10x (see Open RM: kgspGetNonWprHeapSize, GB1= 00/GB102). - u32::SZ_2M + u64::SZ_2M } =20 fn frts_size(&self) -> u64 { diff --git a/drivers/gpu/nova-core/fb/hal/gb202.rs b/drivers/gpu/nova-core/= fb/hal/gb202.rs index 8ec30afcf701..86b5b5613169 100644 --- a/drivers/gpu/nova-core/fb/hal/gb202.rs +++ b/drivers/gpu/nova-core/fb/hal/gb202.rs @@ -69,10 +69,10 @@ fn pmu_reserved_size(&self) -> u32 { super::gb100::pmu_reserved_size_gb100() } =20 - fn non_wpr_heap_size(&self) -> u32 { + fn non_wpr_heap_size(&self) -> u64 { // Non-WPR heap for GB20x (see Open RM: kgspGetNonWprHeapSize, GB2= 02+). // This size is r570-specific. - u32::SZ_2M + u32::SZ_128K + u64::SZ_2M + u64::SZ_128K } =20 fn frts_size(&self) -> u64 { diff --git a/drivers/gpu/nova-core/fb/hal/gh100.rs b/drivers/gpu/nova-core/= fb/hal/gh100.rs index d39fe99537ed..3cffc6ef6769 100644 --- a/drivers/gpu/nova-core/fb/hal/gh100.rs +++ b/drivers/gpu/nova-core/fb/hal/gh100.rs @@ -61,9 +61,9 @@ fn pmu_reserved_size(&self) -> u32 { super::tu102::pmu_reserved_size_tu102() } =20 - fn non_wpr_heap_size(&self) -> u32 { + fn non_wpr_heap_size(&self) -> u64 { // Non-WPR heap for Hopper (see Open RM: kgspCalculateFbLayout_GH1= 00). - u32::SZ_2M + u64::SZ_2M } =20 fn frts_size(&self) -> u64 { diff --git a/drivers/gpu/nova-core/fb/hal/tu102.rs b/drivers/gpu/nova-core/= fb/hal/tu102.rs index f629e8e9d5d5..4d30c005cfb4 100644 --- a/drivers/gpu/nova-core/fb/hal/tu102.rs +++ b/drivers/gpu/nova-core/fb/hal/tu102.rs @@ -44,8 +44,8 @@ pub(super) const fn pmu_reserved_size_tu102() -> u32 { 0 } =20 -pub(super) const fn non_wpr_heap_size_tu102() -> u32 { - u32::SZ_1M +pub(super) const fn non_wpr_heap_size_tu102() -> u64 { + u64::SZ_1M } =20 pub(super) const fn frts_size_tu102() -> u64 { @@ -75,7 +75,7 @@ fn pmu_reserved_size(&self) -> u32 { pmu_reserved_size_tu102() } =20 - fn non_wpr_heap_size(&self) -> u32 { + fn non_wpr_heap_size(&self) -> u64 { non_wpr_heap_size_tu102() } =20 --=20 2.55.0 From nobody Fri Jul 24 21:53:03 2026 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012045.outbound.protection.outlook.com [52.101.53.45]) (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 31D18399357; Fri, 24 Jul 2026 06:56:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784876219; cv=fail; b=XYLwT/gVsy3LbsTlX2e64gQHaZYkqv3NRtjRk3OratbLQBjETmHi1ta38ULwbbDJdGNxbJ32kaftDkZd+cJ2Uei6Oe+6UX++lRZJAyJQNuZy/rAPAaTkZ5RYLPfJcc6Ph4HG5VblkiX8edKv6HXoREzz4Yf7UUFwItuX4JohziY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784876219; c=relaxed/simple; bh=3zSkkxLPmTc54JSEzCuvlFPBLIFIggIAIhHlsRe1yRQ=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=mLBuEeqnS0pIt7jz3EesPKob8VgcctO3G5El8gwSop8RTs+rVqYeUCWE0MKjMIHWlJUtPq19+Mqkm8pypLZ8LoVlL/jQj59C8t+CQKpodu0MECoZjfzI2Q1vFuw5pOPW1tN1BoKDG2uxnw40DGRgWfuxKhC8Pv69PfJKfAHNgnk= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=cAv1hH49; arc=fail smtp.client-ip=52.101.53.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="cAv1hH49" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=E8dgdwoIcbh06tuWiF7uONGpe/3eSCopuPA1d4OC8kRZXX0E5A5IgK2c/E4msVOOTt6S4oWzbDJeKAM6F+G4JAD6gqwY6ttvokcVIiigjlk1UkITJbGtrYDziIGcoapK97oA3NpGZIcwTtWa2dafc4mGk65SE73oZdpHNycePMz8wsFKqS5eNvC2Siw+yyT8PogEMuZa3v+trNdtTKHnZSJhz1gV6qoInp/ovXDYDBGWTzxeUG//aPhSD4C0L58IMnhlAhZ8tcm6aEPyfyv+FiB3i+b1Uo5VaDNHNzzpkSBVw1FrFXLfPwGaN5UX87sJHgmqA69WWbQxLSYceNBQ7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=tA1JXFeYOEaKMKiad+b+6cYoB8oj8FVYiwPptwAgzjU=; b=FPVP8+XYDuvMgC/ylKFM0Uf6qJ3r5jHW2bjLAb61/r4maqXX4ft0C9QcuZvcwWh41qL8ivEbRUucKyDn7hmUnCNT3tZIeMUz2rs+wOu8gzNpIFMhCIDc8mxzCIM2c/UYZ0B43D5zlS2hP6hOyI56hgYLDpbgo63dHtp5xFS5vx8MRE+XJRcnoaJeTz7qSnVm7by2v6AtnmOGjkC9xFvzdEuziECDDtiNGFrEY0IV5rS22ESBYKMe2exQbaG1Z7IgyOvz+K3GoyPBi4Bz1IE1QRM03L9gQfGjxwewjGlP6uFWj/m5PC3Ln7C8Amh+M+d3L4bi8OXf5ZiGuMYJmO6n8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tA1JXFeYOEaKMKiad+b+6cYoB8oj8FVYiwPptwAgzjU=; b=cAv1hH49w2cAXIlQpnjqOWp8TK8NKGM0shzJu42tTpnflGpEKvsqRSUKgm42qxfGoWjQk7OB8ZNtOcq6F4JjutJGA3UnjrTQq+Xu6m5EG9O4+xi0dCWVsd+Cr48ACQAPYWaQimwrj47TqzbcaNgmvTH744X8peg+W3Tb1K3H+/KWz5aVIqrJOxZJdxCbrAe3z9dlNrOUg3Fuu3adHJp259/P0ZlBU6l9aODsm1W98Zoqq8JDafb/9FAdOmGjJywgQtx4bBth49LNW82Eg7OaFLEA2YHamEQvHWBdUDFBt/Jy2WeNQaz89xMjIx6oMn4dgE5uI7Zd6Zk2sNiPscBqHA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) by CH3PR12MB8851.namprd12.prod.outlook.com (2603:10b6:610:180::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.10; Fri, 24 Jul 2026 06:56:51 +0000 Received: from BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0]) by BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0%4]) with mapi id 15.21.0245.010; Fri, 24 Jul 2026 06:56:51 +0000 From: Eliot Courtney Date: Fri, 24 Jul 2026 15:56:26 +0900 Subject: [PATCH v3 4/5] gpu: nova-core: split FbLayout into FSP and non-FSP versions Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260724-blackwell-fixes-v3-4-01aa6a54e3fd@nvidia.com> References: <20260724-blackwell-fixes-v3-0-01aa6a54e3fd@nvidia.com> In-Reply-To: <20260724-blackwell-fixes-v3-0-01aa6a54e3fd@nvidia.com> To: Danilo Krummrich , Alexandre Courbot , Alice Ryhl , David Airlie , Simona Vetter , Benno Lossin , Gary Guo Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: DUZPR01CA0353.eurprd01.prod.exchangelabs.com (2603:10a6:10:4b8::16) To BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL0PR12MB2353:EE_|CH3PR12MB8851:EE_ X-MS-Office365-Filtering-Correlation-Id: 3a587392-2d96-489f-9498-08dee950bcf0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|376014|7416014|1800799024|23010399003|366016|11063799006|10067099003|6133799003|56012099006|3023799007|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: 8+3JnTu2BnRxtKx0IvYCKl/X3bOXmyj2aVvUdaTNFYf4TNmGgC1HlavRqDRUluOh0hhc+42t6FO5DTMnnnNfHJp+Z7jKtJsZcGw276k2ND4O6jtrS66nM5atSjYU86DprJG9eZMatZLWDyXnc4PoW7XGfNWDOayhkQtONWRf6cmhyUvlzMsHHPlA251Brmr63LzOmpzdvWCJRqGAEQ3zj8dRk0DSoDEVvr97UDm2kJAGbahIKyxgxEkO1BeLxycJRUOsghY97Zj9ug5FWq/POdzcfsY2DVOPOxqEE/BHEdc32WaKdkwZlWJuoesa+c4KpK69UW1iYCwhEhf8fg5Dtbw8UkPhH3PRMb8t7spNF+7NcLoWS0HF0yPSeSJUV+3GTdv90rV3vAsB/jqQgo8AJo+1yBbbpiNzUvnrPKqYF/aM4hCykftfqhlLspUAcv3ZGkMCMpFF1RMcUiUfAEPlGoxaVr+pnqcOSh1Lt1l6lTFd1tTMc66EJpBxxjo0Eh3AbqsrKZlfsjglUuok5sTXhoigltPxKjBAzXT6jVrPFqC8QDeZ+zeBgiEZxM7IeAcNL8HwVOpuw1kfJJTnoNe8M+y7ljkSG4+PFfmhK/d2Jt4CtfIp57AqJmy5MpA091Jqa8m6TWedi4cgBQ490Fa2gLDW0bsJ6t4MxYm+WIJ211U= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR12MB2353.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(376014)(7416014)(1800799024)(23010399003)(366016)(11063799006)(10067099003)(6133799003)(56012099006)(3023799007)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MEUwTGcweUhsWFYrKzh2V2tSTnhlcTNnZWk3VmZsT3A1QXkyb1g0TU5mQlJr?= =?utf-8?B?bjZzU0g0OUFUaE1abGEzN1J6c0Nnc2FtenZkNGViWVlEOUZxRUxhOXI5K0lL?= =?utf-8?B?VW1YbFpHUGFndSs3NWNEVjZBZzhrZjB5R0xCK0luRXJsOWRmVExIZXpLb1ZQ?= =?utf-8?B?Mi9TNDd4cmFUanpsVzlNSVkzUDV2dFhaaDRmV2RzNzNVczB2YmdhbkorQ3E5?= =?utf-8?B?NFNGcUlISERyNWxOSUtpRTVNajNmanl1S1dFb2xFcmkwbFRzSTVQQ0xpK200?= =?utf-8?B?REVnMWU0RnFscGM5dFdnalRKNFl6TnBGSnhBNnRSTHo2Vkk5R0xyQXNyN0xI?= =?utf-8?B?WWdpZ3ZmUUQxMmZIQjI5aHBpKzliYnJVSFpQMTFYQUpVY05yanBUOUVBVnZi?= =?utf-8?B?MnRKSWx2Nlg5ckRRUFJuOGtwaFhZSnVRMUIrSXJQVWJpbXBqZTFFNGNESU5h?= =?utf-8?B?d2hZbDZab2IyYW5MZkY5MjZ5VkYrS0kwZkpoNVFuM3dCTkZnclZib2E3TGt1?= =?utf-8?B?QU1ZTnNiMUZoZGU0alVSMTRhUmRTYmZQUzMrNFhIWEpLaWF4bXg3c1BwTytM?= =?utf-8?B?NXpTd1YydkVPM1JDcEVkR1Y2aTlmUGlRd3J0dmViUEJYZzhPY3U4L3F0MEto?= =?utf-8?B?ODA4dFIvVFU5ZGRaRjZmY29iSUpRaUVJQ1FsT2lRem5udUF2UjRLbHdjb28z?= =?utf-8?B?Q0ZWdDFMY0JFdSszb2J5VXlXNzVSU3NCVjZlcGV4WnE4L0V4ZmZ0TDFmM1Vz?= =?utf-8?B?UHQ0MmFYa3p1cmJ6eUJvbWp5R29CREFvaERoWWVJUFFzVEFrUmFSNUFzUThT?= =?utf-8?B?Qzl5Y2JiQy82ZU02dVVpODdUM20ra1JaNythOU1OdjlZZFV2QmFnb3FDdFQv?= =?utf-8?B?ZW5UNzFyM2k2MFBvVlBCWEU0bGpNV21JRTFJWmlBb1ZMTzhjaXRuK1p1aGhr?= =?utf-8?B?ZHc5cWtEVmxiUDVBMDRpK05KajRReEhESGZleHRCbk5EM1hBaWd2U3lsUzdn?= =?utf-8?B?N3l2Vmx6WHdBWm1PbTVKSVpSaXc0S1p0Ky9obC9odyt4MHdpZVFFRmdlWS9I?= =?utf-8?B?Q3RTc1JtaUd3aXU3aHVaY3hZQ1JKUnJNbURsaElEb1gzYnhuclhKWGNFekFR?= =?utf-8?B?eWxWR092bVdkVDNiY2d3bTBLT2dsTGNNaG1YNkJRSDJrUGYxcXI2b2FxNi9j?= =?utf-8?B?YnJ0MzFlLzVkekh3MjFzU3RWV1R6anh5czZ4WDU0dEhPVmF3WWk5ZlplTWc1?= =?utf-8?B?RnBjVnk2c0kzN2h5d0xocUg5UllIRXZuM1cxT0RmTzdaM3lBRlNPNnc4Y2xs?= =?utf-8?B?STlVeEd0TE12ZVZXM3pQKzlTakhWRlVUWStVTzZYNzQrYnlDcGlJTXFHYmJW?= =?utf-8?B?azBXa25mMUpMcURoKzhjR29reTIrR0U5TlArd3hDRFhMSHZvZHV3MmlBNVc5?= =?utf-8?B?WEQ2b0cwaHFIWGdzNUZjdm9oT0lmMjhMUFNnNmZ6MEcxR1FvQ0ZWek9SQzFR?= =?utf-8?B?WktVMWt3VC94SlB6S2FucUR3RFpqQ2ZtS2x5N1RnOVFVWU9aTzJjVHkxN0pG?= =?utf-8?B?MTVXbWZueWp6SmQ5eXlaTUUxazk4RG5MbERuUTQ5SkxIZ2FRNEVBZVFjYmtL?= =?utf-8?B?aTNMRHZyRlBCaXQvV0hneVFTZXQ3aHFLcUlsM1B3TjdpRGUwbEdlbXNUMnZM?= =?utf-8?B?d1N4OXRyV0JBZ1Zod0kvK2E3Qm1UbVpLUHhNeFkxUHJrZmlScGxtOXk1SUNz?= =?utf-8?B?c1JiNG5vNWpUYzMzZlRKN01tUDJEYTJDVXo2UjdCa2lOWlNxMCt5ZFMxcURr?= =?utf-8?B?MzhLamJTazYrVmFFMDNUdHlqTXU5NjAyQU9nZjNoaS9GbXFLS1JYemVsNnRG?= =?utf-8?B?SEpJcThGVEpkQWRMT1l1VHlTQTRoSml2WFpEdUQzN2xOUFgzR1BoTit0Umx0?= =?utf-8?B?S3kvb0tkNm9GVWkrbE9tWWJXZVF3T0UyVUdjZi9rRXJLUlcwZUVSZTFqdkxp?= =?utf-8?B?ZE1VZTJLTlMweDdIZDJ1L0lxTzRaazBtYmw5RDFWQTJjTWZBclRMSXRuaVRj?= =?utf-8?B?U3lTY1IrTy9GNU1uL0lQeUpHbWE1UDU0TG9BUnlnOHJudHZ1VisveUg4OVo0?= =?utf-8?B?S2o1VWlRakpYUWFPRVJ5b2dKdnhPbWR3N1RRUzRNT2ZDc3Rjb01tUHRLUVox?= =?utf-8?B?VVlXUU84ODhQaG5Vck83Z0hkV1YxWXRNZ0pZN2dtT2pIYkdVVGp4RWhXZ2dp?= =?utf-8?B?UUc0K2I0UEk1cEN3ZG8zc1VVbWc2WGx1anIvdlJyVmU2UGQ4M3Fwc1VMN0Zr?= =?utf-8?B?djErTE5KR3FzWEJUNmNtMkVkQmFvWFJyMjIwOFpTYU53d0FoaTNXN09yQkJ3?= =?utf-8?Q?XBO+T3ki+jDyRon6b1AdyyIIRD9INT8yxCp41s2jUfAzq?= X-MS-Exchange-AntiSpam-MessageData-1: GI+jIALo7B98hA== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3a587392-2d96-489f-9498-08dee950bcf0 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2026 06:56:51.1863 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 8nbg/TVN60IBenflSYpr+ENoDA9/l1j4Q3gNtiyf+kXBVpxQZRWn2ZeMuFrIKt8eWlrpA+lf2ARNOXd7MaHSXQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8851 `FbLayout` is currently used for both pre and post FSP architectures. It contains ranges for each region of framebuffer, but on post FSP architectures, only the size is actually used by GSP. The offsets are not decided by the driver. So, for post FSP architectures `FbLayout` contains essentially guesses for the offsets. Instead, make separate types so that we only store the information that's actually needed, rather than keeping around offsets that may not be correct. Signed-off-by: Eliot Courtney --- drivers/gpu/nova-core/fb.rs | 40 ++++++++++++++-- drivers/gpu/nova-core/fsp.rs | 21 ++++----- drivers/gpu/nova-core/gsp/boot.rs | 28 ++++------- drivers/gpu/nova-core/gsp/fw.rs | 85 ++++++++++++++++++++++++++----= ---- drivers/gpu/nova-core/gsp/hal.rs | 12 ++--- drivers/gpu/nova-core/gsp/hal/gh100.rs | 17 ++++--- drivers/gpu/nova-core/gsp/hal/tu102.rs | 32 ++++++++----- 7 files changed, 155 insertions(+), 80 deletions(-) diff --git a/drivers/gpu/nova-core/fb.rs b/drivers/gpu/nova-core/fb.rs index f5832e59de59..2336e97f7748 100644 --- a/drivers/gpu/nova-core/fb.rs +++ b/drivers/gpu/nova-core/fb.rs @@ -148,7 +148,7 @@ fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Resul= t { /// /// Contains ranges of GPU memory reserved for a given purpose during the = GSP boot process. #[derive(Debug)] -pub(crate) struct FbLayout { +pub(crate) struct FbRanges { /// Range of the framebuffer. Starts at `0`. pub(crate) fb: FbRange, /// VGA workspace, small area of reserved memory at the end of the fra= mebuffer. @@ -163,14 +163,16 @@ pub(crate) struct FbLayout { pub(crate) wpr2_heap: FbRange, /// WPR2 region range, starting with an instance of `GspFwWprMeta`. pub(crate) wpr2: FbRange, + /// Non-WPR heap, located just below WPR2. pub(crate) non_wpr_heap: FbRange, + /// Number of VF partitions. pub(crate) vf_partition_count: u8, /// PMU reserved memory size, in bytes. pub(crate) pmu_reserved_size: u32, } =20 -impl FbLayout { - /// Computes the FB layout for `chipset` required to run the `gsp_fw` = GSP firmware. +impl FbRanges { + /// Computes concrete framebuffer ranges required on non-FSP booting a= rchitectures. pub(crate) fn new(chipset: Chipset, bar: Bar0<'_>, gsp_fw: &GspFirmwar= e) -> Result { let hal =3D hal::fb_hal(chipset); =20 @@ -270,3 +272,35 @@ pub(crate) fn new(chipset: Chipset, bar: Bar0<'_>, gsp= _fw: &GspFirmware) -> Resu }) } } + +/// Framebuffer region sizes needed for GSP-FMC boot. +#[derive(Debug)] +pub(crate) struct FbSizes { + /// FRTS size, in bytes. + pub(crate) frts_size: u64, + /// WPR2 heap size, in bytes. + pub(crate) wpr2_heap_size: u64, + /// Non-WPR heap size, in bytes. + pub(crate) non_wpr_heap_size: u64, + /// PMU reserved memory size, in bytes. + pub(crate) pmu_reserved_size: u32, + /// Number of VF partitions. + pub(crate) vf_partition_count: u8, +} + +impl FbSizes { + /// Computes the framebuffer region sizes for GSP-FMC boot. + pub(crate) fn new(chipset: Chipset, bar: Bar0<'_>) -> Result { + let hal =3D hal::fb_hal(chipset); + let fb_size =3D hal.vidmem_size(bar); + + Ok(Self { + frts_size: hal.frts_size(), + wpr2_heap_size: gsp::LibosParams::from_chipset(chipset) + .wpr_heap_size(chipset, fb_size)?, + non_wpr_heap_size: hal.non_wpr_heap_size(), + pmu_reserved_size: hal.pmu_reserved_size(), + vf_partition_count: 0, + }) + } +} diff --git a/drivers/gpu/nova-core/fsp.rs b/drivers/gpu/nova-core/fsp.rs index 30e53df81aa2..48438ba21b91 100644 --- a/drivers/gpu/nova-core/fsp.rs +++ b/drivers/gpu/nova-core/fsp.rs @@ -31,7 +31,7 @@ fsp::Fsp as FspEngine, Falcon, // }, - fb::FbLayout, + fb::FbSizes, firmware::{ fsp::{ FmcSignatures, @@ -136,11 +136,11 @@ struct FspCotMessage { impl FspCotMessage { /// Computes the FRTS vidmem offset for the Chain-of-Trust message. It= is measured from the end /// of the framebuffer. - fn frts_vidmem_offset(hal: &dyn hal::FspHal, fb_layout: &FbLayout) -> = Result { + fn frts_vidmem_offset(hal: &dyn hal::FspHal, fb_info: &FbSizes) -> Res= ult { let mut offset =3D u64::from(hal.fb_end_reserved_size()); =20 - if fb_layout.pmu_reserved_size !=3D 0 { - offset =3D (offset + u64::from(fb_layout.pmu_reserved_size)) + if fb_info.pmu_reserved_size !=3D 0 { + offset =3D (offset + u64::from(fb_info.pmu_reserved_size)) // The 2 MiB alignment is r570-specific. .align_up(Alignment::new::()) .ok_or(EINVAL)?; @@ -151,20 +151,20 @@ fn frts_vidmem_offset(hal: &dyn hal::FspHal, fb_layou= t: &FbLayout) -> Result( - fb_layout: &FbLayout, + fb_info: &FbSizes, fsp_fw: &'a FspFirmware, args: &'a FmcBootArgs<'_>, ) -> Result + 'a> { let hal =3D hal::fsp_hal(args.chipset).ok_or(ENOTSUPP)?; =20 let frts_vidmem_offset =3D if !args.resume { - Self::frts_vidmem_offset(hal, fb_layout)? + Self::frts_vidmem_offset(hal, fb_info)? } else { 0 }; =20 let frts_size: u32 =3D if !args.resume { - fb_layout.frts.len().try_into()? + fb_info.frts_size.try_into()? } else { 0 }; @@ -368,15 +368,12 @@ fn send_sync_fsp(&mut self, dev: &device::Device, = msg: &M) -> Result pub(crate) fn boot_fmc( &mut self, dev: &device::Device, - fb_layout: &FbLayout, + fb_info: &FbSizes, args: &FmcBootArgs<'_>, ) -> Result { dev_dbg!(dev, "Starting FSP boot sequence for {}\n", args.chipset); =20 - let msg =3D KBox::init( - FspCotMessage::new(fb_layout, &self.fsp_fw, args)?, - GFP_KERNEL, - )?; + let msg =3D KBox::init(FspCotMessage::new(fb_info, &self.fsp_fw, a= rgs)?, GFP_KERNEL)?; =20 let _response_buf =3D self.send_sync_fsp(dev, &*msg)?; =20 diff --git a/drivers/gpu/nova-core/gsp/boot.rs b/drivers/gpu/nova-core/gsp/= boot.rs index 6b7d00205000..028a58f2bd40 100644 --- a/drivers/gpu/nova-core/gsp/boot.rs +++ b/drivers/gpu/nova-core/gsp/boot.rs @@ -3,7 +3,6 @@ =20 use kernel::{ bits, - dma::Coherent, io::poll::read_poll_timeout, prelude::*, time::Delta, @@ -16,15 +15,13 @@ gsp::Gsp, Falcon, // }, - fb::FbLayout, firmware::{ gsp::GspFirmware, FIRMWARE_VERSION, // }, gsp::{ cmdq::Cmdq, - commands, - GspFwWprMeta, // + commands, // }, }; =20 @@ -50,23 +47,16 @@ pub(crate) fn boot( =20 let gsp_fw =3D KBox::pin_init(GspFirmware::new(dev, chipset, FIRMW= ARE_VERSION), GFP_KERNEL)?; =20 - let fb_layout =3D FbLayout::new(chipset, bar, &gsp_fw)?; - dev_dbg!(dev, "{:#x?}\n", fb_layout); - - let wpr_meta =3D Coherent::init(dev, GFP_KERNEL, GspFwWprMeta::new= (&gsp_fw, &fb_layout))?; - // Perform the chipset-specific boot sequence, and retrieve the un= load bundle. - let unload_bundle =3D hal - .boot(&self, &mut ctx, &fb_layout, &wpr_meta)? - .or_else(|| { - dev_warn!(dev, "The GSP won't be able to unload properly o= n unbind.\n"); - dev_warn!( - dev, - "The GPU will need to be reset before the driver can b= ind again.\n" - ); + let unload_bundle =3D hal.boot(&self, &mut ctx, &gsp_fw)?.or_else(= || { + dev_warn!(dev, "The GSP won't be able to unload properly on un= bind.\n"); + dev_warn!( + dev, + "The GPU will need to be reset before the driver can bind = again.\n" + ); =20 - None - }); + None + }); =20 let mut unload_guard =3D ScopeGuard::new_with_data((ctx, unload_bundle), |(ctx, unload_= bundle)| { diff --git a/drivers/gpu/nova-core/gsp/fw.rs b/drivers/gpu/nova-core/gsp/fw= .rs index 93f2125dbbfb..d8f88f1665e9 100644 --- a/drivers/gpu/nova-core/gsp/fw.rs +++ b/drivers/gpu/nova-core/gsp/fw.rs @@ -36,7 +36,10 @@ }; =20 use crate::{ - fb::FbLayout, + fb::{ + FbRanges, + FbSizes, // + }, firmware::gsp::GspFirmware, gpu::{ Architecture, @@ -169,10 +172,10 @@ unsafe impl FromBytes for GspFwWprMeta {} =20 impl GspFwWprMeta { /// Returns an initializer for a `GspFwWprMeta` suitable for booting `= gsp_firmware` using the - /// `fb_layout` layout. - pub(crate) fn new<'a>( + /// framebuffer ranges `ranges`. + pub(crate) fn from_ranges<'a>( gsp_firmware: &'a GspFirmware, - fb_layout: &'a FbLayout, + ranges: &'a FbRanges, ) -> impl Init + 'a { let init_inner =3D init!(bindings::GspFwWprMeta { // CAST: we want to store the bits of `GSP_FW_WPR_META_MAGIC` = unmodified. @@ -191,25 +194,67 @@ pub(crate) fn new<'a>( sizeOfSignature: u64::from_safe_cast(gsp_firmware.sign= atures.size()), }, }, - gspFwRsvdStart: fb_layout.non_wpr_heap.start, - nonWprHeapOffset: fb_layout.non_wpr_heap.start, - nonWprHeapSize: fb_layout.non_wpr_heap.end - fb_layout.non_wpr= _heap.start, - gspFwWprStart: fb_layout.wpr2.start, - gspFwHeapOffset: fb_layout.wpr2_heap.start, - gspFwHeapSize: fb_layout.wpr2_heap.end - fb_layout.wpr2_heap.s= tart, - gspFwOffset: fb_layout.elf.start, - bootBinOffset: fb_layout.boot.start, - frtsOffset: fb_layout.frts.start, - frtsSize: fb_layout.frts.end - fb_layout.frts.start, - gspFwWprEnd: fb_layout + gspFwRsvdStart: ranges.non_wpr_heap.start, + nonWprHeapOffset: ranges.non_wpr_heap.start, + nonWprHeapSize: ranges.non_wpr_heap.len(), + gspFwWprStart: ranges.wpr2.start, + gspFwHeapOffset: ranges.wpr2_heap.start, + gspFwHeapSize: ranges.wpr2_heap.len(), + gspFwOffset: ranges.elf.start, + bootBinOffset: ranges.boot.start, + frtsOffset: ranges.frts.start, + frtsSize: ranges.frts.len(), + gspFwWprEnd: ranges .vga_workspace .start .align_down(Alignment::new::()), - gspFwHeapVfPartitionCount: fb_layout.vf_partition_count, - fbSize: fb_layout.fb.end - fb_layout.fb.start, - vgaWorkspaceOffset: fb_layout.vga_workspace.start, - vgaWorkspaceSize: fb_layout.vga_workspace.end - fb_layout.vga_= workspace.start, - pmuReservedSize: fb_layout.pmu_reserved_size, + gspFwHeapVfPartitionCount: ranges.vf_partition_count, + fbSize: ranges.fb.len(), + vgaWorkspaceOffset: ranges.vga_workspace.start, + vgaWorkspaceSize: ranges.vga_workspace.len(), + pmuReservedSize: ranges.pmu_reserved_size, + ..Zeroable::init_zeroed() + }); + + init!(GspFwWprMeta { + inner <- init_inner, + }) + } + + /// Returns an initializer for a `GspFwWprMeta` suitable for booting `= gsp_firmware` using the + /// framebuffer region sizes `sizes`. + /// + /// The region offsets are left at zero: the ACR ucode computes them w= hen it sets up WPR2. + pub(crate) fn from_sizes<'a>( + gsp_firmware: &'a GspFirmware, + sizes: &'a FbSizes, + ) -> impl Init + 'a { + /// VGA workspace size to reserve at the end of the framebuffer, i= n bytes. + const VGA_WORKSPACE_SIZE: u64 =3D u64::SZ_128K; + + let init_inner =3D init!(bindings::GspFwWprMeta { + // CAST: we want to store the bits of `GSP_FW_WPR_META_MAGIC` = unmodified. + magic: bindings::GSP_FW_WPR_META_MAGIC as u64, + revision: u64::from(bindings::GSP_FW_WPR_META_REVISION), + sysmemAddrOfRadix3Elf: gsp_firmware.radix3_dma_handle(), + sizeOfRadix3Elf: u64::from_safe_cast(gsp_firmware.size), + sysmemAddrOfBootloader: gsp_firmware.bootloader.ucode.dma_hand= le(), + sizeOfBootloader: u64::from_safe_cast(gsp_firmware.bootloader.= ucode.size()), + bootloaderCodeOffset: u64::from(gsp_firmware.bootloader.code_o= ffset), + bootloaderDataOffset: u64::from(gsp_firmware.bootloader.data_o= ffset), + bootloaderManifestOffset: u64::from(gsp_firmware.bootloader.ma= nifest_offset), + __bindgen_anon_1: GspFwWprMetaBootResumeInfo { + __bindgen_anon_1: GspFwWprMetaBootInfo { + sysmemAddrOfSignature: gsp_firmware.signatures.dma_han= dle(), + sizeOfSignature: u64::from_safe_cast(gsp_firmware.sign= atures.size()), + }, + }, + nonWprHeapSize: sizes.non_wpr_heap_size, + gspFwHeapSize: sizes.wpr2_heap_size, + frtsSize: sizes.frts_size, + gspFwHeapVfPartitionCount: sizes.vf_partition_count, + vgaWorkspaceSize: VGA_WORKSPACE_SIZE, + pmuReservedSize: sizes.pmu_reserved_size, ..Zeroable::init_zeroed() }); =20 diff --git a/drivers/gpu/nova-core/gsp/hal.rs b/drivers/gpu/nova-core/gsp/h= al.rs index 34b4bb82a999..11e436651a69 100644 --- a/drivers/gpu/nova-core/gsp/hal.rs +++ b/drivers/gpu/nova-core/gsp/hal.rs @@ -5,13 +5,9 @@ mod gh100; mod tu102; =20 -use kernel::{ - dma::Coherent, - prelude::*, // -}; +use kernel::prelude::*; =20 use crate::{ - fb::FbLayout, firmware::gsp::GspFirmware, gpu::{ Architecture, @@ -19,8 +15,7 @@ }, gsp::{ Gsp, - GspBootContext, - GspFwWprMeta, // + GspBootContext, // }, }; =20 @@ -44,8 +39,7 @@ fn boot( &self, gsp: &Gsp, ctx: &mut GspBootContext<'_, '_>, - fb_layout: &FbLayout, - wpr_meta: &Coherent, + gsp_fw: &GspFirmware, ) -> Result>; =20 /// Performs HAL-specific post-GSP boot tasks. diff --git a/drivers/gpu/nova-core/gsp/hal/gh100.rs b/drivers/gpu/nova-core= /gsp/hal/gh100.rs index 22b60f9233de..358dc2f25e26 100644 --- a/drivers/gpu/nova-core/gsp/hal/gh100.rs +++ b/drivers/gpu/nova-core/gsp/hal/gh100.rs @@ -16,7 +16,8 @@ gsp::Gsp as GspEngine, Falcon, // }, - fb::FbLayout, + fb::FbSizes, + firmware::gsp::GspFirmware, fsp::FmcBootArgs, gsp::{ hal::{ @@ -144,19 +145,23 @@ fn boot( &self, gsp: &Gsp, ctx: &mut GspBootContext<'_, '_>, - fb_layout: &FbLayout, - wpr_meta: &Coherent, + gsp_fw: &GspFirmware, ) -> Result> { let dev =3D ctx.dev(); let chipset =3D ctx.chipset; let gsp_falcon =3D ctx.gsp_falcon; =20 + let fb_sizes =3D FbSizes::new(chipset, ctx.bar)?; + dev_dbg!(dev, "{:#x?}\n", fb_sizes); + + let wpr_meta =3D + Coherent::init(dev, GFP_KERNEL, GspFwWprMeta::from_sizes(gsp_f= w, &fb_sizes))?; + let args =3D FmcBootArgs::new(dev, chipset, &wpr_meta, &gsp.libos,= false)?; + let unload_bundle =3D crate::gsp::UnloadBundle( KBox::new(FspUnloadBundle, GFP_KERNEL)? as KBox ); =20 - let args =3D FmcBootArgs::new(dev, chipset, wpr_meta, &gsp.libos, = false)?; - // Wait for the GSP RISC-V core to halt in case of error. We creat= e this guard after `args` // to make sure that boot args are kept alive until halt, in case = they are still being // accessed. @@ -167,7 +172,7 @@ fn boot( =20 let fsp =3D unload_guard.1.fsp.as_mut().ok_or(ENODEV)?; =20 - fsp.boot_fmc(dev, fb_layout, &args)?; + fsp.boot_fmc(dev, &fb_sizes, &args)?; =20 // Wait for GSP-FMC to release the GSP lockdown, indicating that `= args` is not accessed // anymore. diff --git a/drivers/gpu/nova-core/gsp/hal/tu102.rs b/drivers/gpu/nova-core= /gsp/hal/tu102.rs index 648657e248da..7a7c7c58aadb 100644 --- a/drivers/gpu/nova-core/gsp/hal/tu102.rs +++ b/drivers/gpu/nova-core/gsp/hal/tu102.rs @@ -17,7 +17,7 @@ sec2::Sec2, Falcon, // }, - fb::FbLayout, + fb::FbRanges, firmware::{ booter::{ BooterFirmware, @@ -142,7 +142,7 @@ fn run_fwsec_frts( falcon: &Falcon<'_, GspEngine>, bar: Bar0<'_>, bios: &Vbios, - fb_layout: &FbLayout, + fb_ranges: &FbRanges, ) -> Result { // Check that the WPR2 region does not already exist - if it does,= we cannot run // FWSEC-FRTS until the GPU is reset. @@ -160,8 +160,8 @@ fn run_fwsec_frts( falcon, bios, FwsecCommand::Frts { - frts_addr: fb_layout.frts.start, - frts_size: fb_layout.frts.len(), + frts_addr: fb_ranges.frts.start, + frts_size: fb_ranges.frts.len(), }, )?; =20 @@ -200,12 +200,12 @@ fn run_fwsec_frts( =20 Err(EIO) } - (wpr2_lo, _) if wpr2_lo !=3D fb_layout.frts.start =3D> { + (wpr2_lo, _) if wpr2_lo !=3D fb_ranges.frts.start =3D> { dev_err!( dev, "WPR2 region created at unexpected address {:#x}; expe= cted {:#x}\n", wpr2_lo, - fb_layout.frts.start, + fb_ranges.frts.start, ); =20 Err(EIO) @@ -259,8 +259,7 @@ fn boot( &self, gsp: &Gsp, ctx: &mut GspBootContext<'_, '_>, - fb_layout: &FbLayout, - wpr_meta: &Coherent, + gsp_fw: &GspFirmware, ) -> Result> { let dev =3D ctx.dev(); let bar =3D ctx.bar; @@ -268,6 +267,17 @@ fn boot( let gsp_falcon =3D ctx.gsp_falcon; let sec2_falcon =3D ctx.sec2_falcon; =20 + let fb_ranges =3D FbRanges::new(chipset, bar, gsp_fw)?; + dev_dbg!(dev, "{:#x?}\n", fb_ranges); + + // Declared before the unload guard so that if Booter fails while = running, SEC2 is reset + // by the guard before this allocation is freed. + let wpr_meta =3D Coherent::init( + dev, + GFP_KERNEL, + GspFwWprMeta::from_ranges(gsp_fw, &fb_ranges), + )?; + let bios =3D Vbios::new(dev, bar)?; =20 // Try and prepare the unload bundle. @@ -287,8 +297,8 @@ fn boot( }); =20 // FWSEC-FRTS is not executed on chips where the FRTS region size = is 0 (e.g. GA100). - if !fb_layout.frts.is_empty() { - self.run_fwsec_frts(dev, chipset, gsp_falcon, bar, &bios, fb_l= ayout)?; + if !fb_ranges.frts.is_empty() { + self.run_fwsec_frts(dev, chipset, gsp_falcon, bar, &bios, &fb_= ranges)?; } =20 gsp_falcon.reset()?; @@ -309,7 +319,7 @@ fn boot( FIRMWARE_VERSION, sec2_falcon, )? - .run(dev, sec2_falcon, wpr_meta)?; + .run(dev, sec2_falcon, &wpr_meta)?; =20 Ok(unload_guard.dismiss()) } --=20 2.55.0 From nobody Fri Jul 24 21:53:03 2026 Received: from BL0PR03CU003.outbound.protection.outlook.com (mail-eastusazon11012045.outbound.protection.outlook.com [52.101.53.45]) (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 5E66F39A802; Fri, 24 Jul 2026 06:56:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.53.45 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784876220; cv=fail; b=guFqUMoM8L0rV2IsF/+zQjhEy3GIda1KyqlMybvqO2crjZy0xyvqp1rPlihbYvWNHmd8JkEQOhOc2yj1LEEzOvHDlOddLSklP5f/9Lf/tsEWynszlv1TMjKQ9jV9/rMtH5iQUtRTAERihrvGfDFVY2D1kh5LsLVpMWLLvMBXRGE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784876220; c=relaxed/simple; bh=Ioo81sZrqm67CaLXmtOmC/VHhyr1vRa9BOHJrEBRTmA=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=cLDU1mevSLkm58R4nej69rzvMWuAG6qASm6Zw28Z+Jj+dTKfFl7qL9VJjViIvuTMhmvZPtqkpVnMeM12HZ0cvcTPwPxEDUmbKe+irHj64xzFuB/dwSDvyAyZ58tkHpzJKvyqzrYKwP/SJ41QlYTk4P2TVjYqLsYnTa+YOoTMB4k= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com; spf=fail smtp.mailfrom=nvidia.com; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b=uGiAD7rD; arc=fail smtp.client-ip=52.101.53.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="uGiAD7rD" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=yPsdUTQl6TQS3R88wBlsAg5o4XIh1krTkW+hmONN/ZD1Ug0gw9N4J3tJG1QH9l0/qC++N+Fp/W6dSd6fUKW8vu3MDUDW1oRawevAwYEEfeK7JZZdqzahf1awrFvilTdNCaox/+qlt6acXFp1DYobtP7BRIK37eV22UapMryFtRJf5hXywz8NTA+zI4bDFtLPHtrq/KblmVaxM0V3VJ9+hixNGySuN7XZ+zRIMw8cb5eJcEytPtXO1JXLOy5LPTld4609V5iS4LBo3go1uuXEEZ4tYkfPaZ+BkPFMsdNhdYqB1I6M6j8WMkYjMKh/pHspt/HEwmQR79/k7L3jF+MfWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=VC3DkmnfTPd83IgAYUAaW8UU7lVVABr2uYfbEPghTPs=; b=dnKjgChW3eQzmrgmlaoFBeSWhea9ejmSbkAqgeqtmzYN0GXXXkgBtTfOmOw5szSDWwxOPQfNb/aTp2KW1eyeSbId9aucIvrUVduZxoZryF1DprBjiuCRaEI0ZLopsqLEkY40qjWcetl9Oq0Y7K9nLlaiF/DDvqYTrbtp+Dtl/oGh5h2rz9pyD/HMuCs04L6w+LMW7oak5cFV+SdgWK2WFKX5/8TdZeU1X67HlUul1RjXK0l7BiboRJKwhQ0B3Bp9PeTA4N4+hmnEroMCyV12FnoX5Zhx1CaBJRcbzxOB42lVeegGKywyNuZYv8xlKArkP5/+MFIxwku1OVGl6gYeig== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nvidia.com; dmarc=pass action=none header.from=nvidia.com; dkim=pass header.d=nvidia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VC3DkmnfTPd83IgAYUAaW8UU7lVVABr2uYfbEPghTPs=; b=uGiAD7rD8hUgsav1xuc2GE1asQYqmqnMkseU4DTtjf2JdSw4b7/Zx/cLtM/R35XuMcF45QKW/T4zC0sDE1CuoGJtItVQNwfYVKhxGlYA61mAh1Zbp0bdQOy+JSOZPvTEtdzxDtXdmz32hsCm3BPwib6CA2TXqLlIrTjokpVukvz2qfhLD2KwW2h+Ei+CAhFeCLgqswfk4T/gGf84u9enlsTOaJjlnF+2UAXRykZmhcrg8DMH09U2kcIzQ08M62GbXJnXwB3f4Hzj/ufAhmkRAc09BSgj8abBmiJTJRlUgrzsSFFqaglzGbsO28LCenxQECQ7/yqA86NQsav0EdoCMw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) by CH3PR12MB8851.namprd12.prod.outlook.com (2603:10b6:610:180::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.245.10; Fri, 24 Jul 2026 06:56:54 +0000 Received: from BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0]) by BL0PR12MB2353.namprd12.prod.outlook.com ([fe80::99b:dcff:8d6d:78e0%4]) with mapi id 15.21.0245.010; Fri, 24 Jul 2026 06:56:54 +0000 From: Eliot Courtney Date: Fri, 24 Jul 2026 15:56:27 +0900 Subject: [PATCH v3 5/5] gpu: nova-core: pass WPR metadata ownership to FmcBootArgs Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260724-blackwell-fixes-v3-5-01aa6a54e3fd@nvidia.com> References: <20260724-blackwell-fixes-v3-0-01aa6a54e3fd@nvidia.com> In-Reply-To: <20260724-blackwell-fixes-v3-0-01aa6a54e3fd@nvidia.com> To: Danilo Krummrich , Alexandre Courbot , Alice Ryhl , David Airlie , Simona Vetter , Benno Lossin , Gary Guo Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TY4PR01CA0041.jpnprd01.prod.outlook.com (2603:1096:405:2bd::8) To BL0PR12MB2353.namprd12.prod.outlook.com (2603:10b6:207:4c::31) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL0PR12MB2353:EE_|CH3PR12MB8851:EE_ X-MS-Office365-Filtering-Correlation-Id: dcf49efc-204f-4bbc-8250-08dee950bf1e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|10070799003|376014|7416014|1800799024|23010399003|366016|11063799006|10067099003|56012099006|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: Xm0AfNQ8FT6Q61U2Q4sFgQEARV4qCetd8G0HYMWEL8xqmBXCJI+trZgat7SI/NtceDjS8GKFMfKFGGVhU/Tt6WcelgObyM/rF9+kxlDQiWB1ykp+0/K117aYwXFCwToC9Hm4aFmlliLjBhGdbaZlsY3NOfMd8/UL8+6pQeNpZ9dgS5Ml6TXAIAi/11Oa2n/W+8UqIGKoHF/gE7Y5QihHyXbDljQfx3cVHkN0vTIcgSN1G8ZGoklic7+xK5GGi9pHyblKha2zGVDW3B12mNSx2VzG31IvBDOGMQ9YFeubBDRgOmDZ54eYm2pYfQ8b8jqcd/kxJCNpOtP+vZ11bW2Rr1SDidIbqBXcfKo5sObzqJ3cc3kJphZUIg65R/9Oih/OwYq9L41NNvTQzO20rS9ovZIylqx037Nm76nNks1b7+qYRuUVgi6aOKaGwrPCWgjrydxEupswDA2SOa4gjpp6XYPNewI5cLtPMAP11hwnO7NAwVEOA/LcMk/uiXkA02lRZnufLSuCZ4uF+S8xsDvghe1jlB4C1sEtwe6OkAmIhmJp5DP3A5j70XznUiIDm1xD+6lY932FoPN+QS/4yGFrAMQjAbQuE3DP8w+tUP3r3t6Gq8w2JIvwEcH4Ka15bO2nb4JxvpEJkeum2DbMD9+kLeARwcWGwYWMjExAuNKQ2k0= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL0PR12MB2353.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(10070799003)(376014)(7416014)(1800799024)(23010399003)(366016)(11063799006)(10067099003)(56012099006)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cXlOWDY3VkNSU1NXcTZ5TzdjWDY4MUhJMWo2L213ZVdBdFk3QlhYYkJCODFQ?= =?utf-8?B?QVZ4dGpBVStHVkNFNUVaT1BSMEt3bkZ3MTNEbHRaS1lmRG1FMlI3dmpjSVBq?= =?utf-8?B?eHNkVmJSa1EzSHBXUVE4YzMyeldYa0dROE9oaVFnZzNUeU1CWTNMVkozZ1py?= =?utf-8?B?UkQ2RzZjQmtlWXJTWDVvVFpCTTJ6cTVFOFpCNmJhRnhPRmZBV1ROeERod1du?= =?utf-8?B?djdBSE1sNWdxVnNZVXA0aWlEQUlNRVhPR2ZIWTZudm1vWW1Jck80UHAzZkJX?= =?utf-8?B?d1NvK25SVWRXdGJQcWZGd01SU2U2OCs3QVFEVGU4QXVpNVpXVTA2QnpqSHcw?= =?utf-8?B?T1hCaitNYXU2T2ZuUmFLMlRDN2JhQnBPYlJVdnhTSmRVTmZNbmlDVzBwbzBH?= =?utf-8?B?VGowT1VDUkRXZDFDejNLS3NyWTE2S2ZmakxOcisxMWZSdVpkRUR2WVgrVHZn?= =?utf-8?B?MnBJMUoyZWoyWGFER3lzWXBKN0hpN0FBT3pIVFpIZGNzS1NXZ2lORXZJZUFC?= =?utf-8?B?RWs1QWdmUjZpN05FNVprSUJlZmE4Vm9SWE03MzRiVlZQdk42aWpUUk0rQ0Vr?= =?utf-8?B?U3A1WStJWkNPSFYya1B2SkpLcXBJNUk1cGhDaGRLSnpmWXpqdEtyRHo2ZjZv?= =?utf-8?B?S1N0MEVLZkJLa3UvOTdaMUIwVFVOd3BITmRXRnFpQTBkLy9UbmhmS05EOVVp?= =?utf-8?B?N0NzeURlanhWMTBFa1pteThOb1ErbXFjd3Q1SWF6eisvcStEV1JpbTFrYTh0?= =?utf-8?B?THcySGpaekpDRXg0OVp3SUdrZWJWbDJuT2xWSEhWZ3R6RDFiTks5VkRqVkJX?= =?utf-8?B?SWRuWG1taUp3WE1YUlovbFp6djRxUTZSTkY3V0ZFZk5ET20vZWkxNElWZ25i?= =?utf-8?B?Mnd1RjcwT2RQNmVCQ2hGclI1ZGZaSGl3eHgzRFJRS001UlpSUVhvVXRVVFZk?= =?utf-8?B?MjJzOWM2WHcxeHdCcHBmdURzT3ZhUE5qWjhtN090QTZCb0IxNGl6VmN4bkJo?= =?utf-8?B?dnMyTW1CWmVSYUM1QzlxZWNyUFRPN0tqM2tLRzdsTXR1elBwK3JDRzhWUWhH?= =?utf-8?B?Uk1DbW9Da3VaNGtKZHhKSC9iTTdYUXRHeEFreUxZL2s1UE1OVGJIaTRqblpB?= =?utf-8?B?WGdBQ3pSNERtUm1OcDVtMGI4YkVCUWptY0t1SEI1U3NUL1NHQVkwR0pMeEpt?= =?utf-8?B?TTZGQW51SXViT201QVhTRE5aeHZmdUdFaWdodWNxMHBiRnVubWp3eGlWWXlY?= =?utf-8?B?a2FXaUV1cmsrS3Ayd3FrdnRVODMwSGpsbExJeG9GSmJuNnlKeWZEdk1SYXJ4?= =?utf-8?B?NWx0NjI4VFl5eWRqQ2hjemVtZGJuanB5TlBDSE1CbU9kSGwzVVNoem5sekpH?= =?utf-8?B?M3FFK0tOTlFkUklxdkxwZTZSOXFrYU9tOHNmMHk0R1lVZWI5RFhjSkprbFg3?= =?utf-8?B?azNKN25qbTh2QWZWMHVxK09NaTAvQlEvK1JwSjQxSThKTTY1bXdLcHkxS0xU?= =?utf-8?B?eitvTGI0ZXRaQ05tV2xjaDEzTmhwaTdUeHJubnJTR1Y0Zlp3dk9aSVUzVGFa?= =?utf-8?B?TXhySW5CdzRrVDlPYzVRVjY2N0JSanU3M3ZSd0VYRC93ZXJoNmxKQlpybG9E?= =?utf-8?B?eHhEUFhRcjJLKzVsOEIwdjdmWXE2NmtlSVpzeWVuTE81dXBKRlZjc2JWZHVj?= =?utf-8?B?d3RUOHBudUlSNDk0aVpXYUNvTUNhUVU5Rm1zallpQ0dPYXQzaEt6b1l5SnNN?= =?utf-8?B?b1pCRG85cG0xclJtQ045eWdQVFY1QmhFamcvTEhnQVVuOSsrL1gybWtjRm9X?= =?utf-8?B?Z0N0K2dkTnhZWWk3TThYeURmRFJJWmJrd0grS2dzMHM2cSt6TWRzbXViRXFy?= =?utf-8?B?bGFtV3h3MkpNSlBONlBGWEZ2Y1VyaUdTVlIrWFhlNVNJSnptTWIvSnJiMjgr?= =?utf-8?B?MHpITHBScUZ2QmhoUEo5ZzFIWGIzeU81U3NsTmt5aVZoTm9yZjdyVjBiTzJr?= =?utf-8?B?bTRJK3ZSeEp2bTd2a0hYSmhaakQzT1BWSk9JSGVUNzZqQ1psNHJWNWJtOXNM?= =?utf-8?B?SWcxdHBCeklCZmQ2RzlQT00rZC9oMTRuQXZ5OXBTTC9qK0hONGd4RzVTUUFN?= =?utf-8?B?ZHlDMEVFaG9BWDNjbVBwQVdVTHVVQURYbHUybnV0Uk9oM1NicENEMzdBOFE3?= =?utf-8?B?MU11ZGtpbTJ5Z1JXU1h6T015aG5RU29QRVJPRlRDSm80ZDFkc2lvOFRKVldJ?= =?utf-8?B?UTNGa1hpdkdTNTR3c0RQSTVETHpRQ2ptSzNwNElDbkkvQWpCcDRIUXhuUnFs?= =?utf-8?B?THFMYURZcUo2NkJQNzNsakJHc0lKK0NnREhnYkZHbFViSHhMSzlBQ3ZzemRm?= =?utf-8?Q?YgdZz67349zAwFhLh9GBYHLbHX8roS34KO9V7Uqf+9r8g?= X-MS-Exchange-AntiSpam-MessageData-1: I8Ol/CapI2sDBw== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: dcf49efc-204f-4bbc-8250-08dee950bf1e X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Jul 2026 06:56:54.7158 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PcPy2oiHzHbk5Ojqe3VV1Pj0W7n0d5cgVk1/KexAxS6h0wyyytmVV6tseWsdVvIX05xzmaESj4A9wfAWcCUowQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR12MB8851 `FmcBootArgs` logically owns this, so pass ownership to it instead of storing a reference. Signed-off-by: Eliot Courtney --- drivers/gpu/nova-core/fsp.rs | 4 ++-- drivers/gpu/nova-core/gsp/hal/gh100.rs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/nova-core/fsp.rs b/drivers/gpu/nova-core/fsp.rs index 48438ba21b91..67de54fbd008 100644 --- a/drivers/gpu/nova-core/fsp.rs +++ b/drivers/gpu/nova-core/fsp.rs @@ -208,7 +208,7 @@ pub(crate) struct FmcBootArgs<'a> { fmc_boot_params: Coherent, resume: bool, // Additional dependencies required to be kept alive for FMC boot. - _wpr_meta: &'a Coherent, + _wpr_meta: Coherent, _libos: &'a Coherent<[LibosMemoryRegionInitArgument]>, } =20 @@ -218,7 +218,7 @@ impl<'a> FmcBootArgs<'a> { pub(crate) fn new( dev: &device::Device, chipset: Chipset, - wpr_meta: &'a Coherent, + wpr_meta: Coherent, libos: &'a Coherent<[LibosMemoryRegionInitArgument]>, resume: bool, ) -> Result { diff --git a/drivers/gpu/nova-core/gsp/hal/gh100.rs b/drivers/gpu/nova-core= /gsp/hal/gh100.rs index 358dc2f25e26..f7e7da62ad9c 100644 --- a/drivers/gpu/nova-core/gsp/hal/gh100.rs +++ b/drivers/gpu/nova-core/gsp/hal/gh100.rs @@ -156,15 +156,15 @@ fn boot( =20 let wpr_meta =3D Coherent::init(dev, GFP_KERNEL, GspFwWprMeta::from_sizes(gsp_f= w, &fb_sizes))?; - let args =3D FmcBootArgs::new(dev, chipset, &wpr_meta, &gsp.libos,= false)?; + let args =3D FmcBootArgs::new(dev, chipset, wpr_meta, &gsp.libos, = false)?; =20 let unload_bundle =3D crate::gsp::UnloadBundle( KBox::new(FspUnloadBundle, GFP_KERNEL)? as KBox ); =20 // Wait for the GSP RISC-V core to halt in case of error. We creat= e this guard after `args` - // to make sure that boot args are kept alive until halt, in case = they are still being - // accessed. + // to make sure that the boot args and the WPR metadata they own a= re kept alive until halt, + // in case they are still being accessed. let mut unload_guard =3D ScopeGuard::new_with_data((unload_bundle, ctx), |(unload_bundl= e, ctx)| { let _ =3D unload_bundle.0.run(ctx); --=20 2.55.0