From nobody Mon Jun 8 23:56:06 2026 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11013051.outbound.protection.outlook.com [40.107.201.51]) (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 F2432387347; Mon, 25 May 2026 13:57:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717470; cv=fail; b=N7CTBUFCHQPoIPfda8MUGpRjlps3Zye64/9cFf7zptLZeVb1uiioy24rsDSLMW3xPuGJaNvKeX8/NBVQpNhcp7nm1Pjk1qV61xw/yV7VJVtITo2THiKUfqydyVzrDjKD/L2le4Q1f2cvEBiuWh0BxQnPncIldslAdaFEenSpBmA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717470; c=relaxed/simple; bh=OojlLu6Ih4xp5kEc7Czi/22RKvGDwnJ/YsZPiuMnpps=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=aKI33QfETRDYb4vYH0yvtAQdM8uX66vxIJhyhWNMK5d5NtuWljfF8t4pk//DB8PKAhBusrpytGXJJTVymTaTYhmpXzheK0SzkgNJtaLxFu4BZ4C/qkuqZfFgC2fjaV5OW/8/fnVhZEFZDYvOTfFXJ7FY4YYRjRiKfsSinvZo9uI= 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=lMr7sDSX; arc=fail smtp.client-ip=40.107.201.51 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="lMr7sDSX" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=m78JVcms7t/XuY+xygOnGQFTQnEUFFTyXhJwUAtSpQq1nnWjsfXOItnClPzo70SduCut1fJdZBjLXGz2KA6u+ymmIa1e0sCo8zepOK7HPmsGbNoaq3YpJsMy3vMVyr1bNePfxtkLE1PWtMKypZqqLN76jYc122ap4QyeLYJJvge7Z6hHG9P5ymtOu7pnKx+uUF3aJwlj/JlFWte9kg/PdfHV+YD4kEU7miSXgweRVVWmVel8ouXgnzb77Tk/yHctfBOBUGBfkpUwm+bc0fAhvs56/gAeCRocbYEInkXKh1+a1yvem/WxEK+lFI2jCYAWlT9uZPQxCzWFmS8muqdnyA== 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=Lz2frmdQCV8KbxwY2sX54Zp2paWfnuU46V5smLr4E0g=; b=IyavOQkmJ+I/AOTjpQePsUkINDQnxNt3pR4wTGpUUaxxk7moo7EpypXuyjI1+6JjQlhPGhxexBm5WsT/mRoeK78OP95GBTBpuMRmFD9963jhxeWMLRDTphO8lmKSV8sdiCFPTATSEJgc/9i2COlLZM20nTj/YjFWsXP8iYC4ncvzMEkcpPbDvzOBEgaFKCTa7BnSydXNJdvnRmMv7pCfx4lctCO4DRIvZBKEBcD74p0BSp29A2JOAWFbwV8h2M2+Obt1OuL0SQKwxZcBwlxhttdmPlaLOTQO22TdGSJNKpp4Xsy8ivMgGe1UE5nppu2UhiOWu8Xg5gndy0TwqWnwfw== 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=Lz2frmdQCV8KbxwY2sX54Zp2paWfnuU46V5smLr4E0g=; b=lMr7sDSXo/nJcp1gwcYM5vZQyKHmVwZTtwdLaTyko+5H0pnnJmCIwXRSv5kEcDCSiE/Z2Mhh1hZ0B2PlTl+I4ZY0Wyw/56tL8Gz1pMj2ACpzvvdvsy5uP/jJd0XXxh3UiPSsKqE+fIj3DOaUe5eA5+vCzgcQv0YStsZWn+F+w+0oLBr1hPH5GZ3VSIinXSXV/3idTpBTTBGGdfjxwK3nhQP5yimXrQHjXozeaD58XrlIf/DORdKQz716XpS80zUOPyFRautBmCPuW+gUk9mcKi3I+Qv4npRMSpR9ZSW3bzlnBOgGIld9AqGfPJNR98V/CNSNO/vFhL010P0slg8cMA== 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 IA1PR12MB9500.namprd12.prod.outlook.com (2603:10b6:208:596::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.19; Mon, 25 May 2026 13:57:46 +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.0048.019; Mon, 25 May 2026 13:57:46 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:19 +0900 Subject: [PATCH v5 01/22] gpu: nova-core: vbios: stop scanning at BIOS_MAX_SCAN_LEN Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-1-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney , Joel Fernandes X-Mailer: b4 0.15.2 X-ClientProxiedBy: TY4P286CA0126.JPNP286.PROD.OUTLOOK.COM (2603:1096:405:37c::19) 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_|IA1PR12MB9500:EE_ X-MS-Office365-Filtering-Correlation-Id: da137d70-8589-491f-b535-08deba659961 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|10070799003|366016|1800799024|11063799006|56012099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: e575AZI6+ktEM8PcaJ66G44WFWquM+hfzi8HO9p2Y2LCMe+huI5EJaSUl3lLfqrl2mrZq06eZSmdNOVseOv+QeiJruhYpCs4bxp7Ft4kCMQeergMnOwXNXWcd3fMhmhVMCgx5AXZJTHpycczmlKysjfMnepgvLhjPbi7vnG8F6naTUQpdxJ6UeeG1IzoqYYzd3VHCuAjm7OyICe1O5s+qKEiruFEbg85nYwJdqpgChD+MEJt4HYXTGHKP+Z0jGVpBPNanpRGVI9X//tUrpC87HOoT1AokY6cV1uFEymAap2a+iIpgwICDhGMbkoW7SJedg/kcVWOklJubdRj37UnqwSenXmjDJLI6n6+DSzROodTC4rStuB0lXGQjwGdIzdra5pxbyJEdFdtgYM2R+lbAI2cLpGeWwKsIyZFL6cnXh+5Pl4fwwS612ZZtzZT+HMKFP9eNVVRdX41zfTOP+QWyuSDrD6kk3qkoqtpgLr9PgvfKy+qmu3DKbosTiHK2Y26ujWSp/3HJHy5nfE9WyOZbVTNwy4fG19YkUph6TYT7yIT1Cjrnbd0i9OXMw63pdoD58C55KjsCv2FzLTjQLQusFuvGN7lv9KSFvbVFScqOnrZRdm8YCI9FVVN6ANiPsV5UZG6psAFtcAiacCoq1rOrrkvYSymqyFDXmiS5faZeFfB5hj4slue8gUcKdFTnjZ8 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)(376014)(10070799003)(366016)(1800799024)(11063799006)(56012099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VVprcGJLbmxyUnd6Z0RNQnBydEs3YjQyVzV1VnVKcnhscithVDhTaWFvV2tu?= =?utf-8?B?MkhTZENITWdITmd6amsrdmQ1UWl6MzZSMVZvVVp2UXQ5VjlyUjFTcE4yL295?= =?utf-8?B?NnVUS3pPNWxoSVFuRlNsQ0w4Qkx2TW9TNlh6WlRrR0pHVzY0SjNRWXo3bE4r?= =?utf-8?B?UVF2RytGZ0JCY1hWeFpYSkNCdmhIUUJHbURReWpLVW1LVTR3Y0xYRTRDc0dH?= =?utf-8?B?Rm85ODM2UjF3eU9Oc0R4YktoM3RwYmoyc1dzcnV1Ti94SVBUUVlTaStFN1l3?= =?utf-8?B?ckY4R1BLdUpHN1FEeFVEdnFOUGUzVVl6OGZGK0V0Z2s5dmhBUGVnUlEvdHhq?= =?utf-8?B?ZENzbzhHVGwvSVlEWHAySjhxekRVRWd4blJHbysva2RvRDhLWkY1SnczRTV3?= =?utf-8?B?NitrWEJtRzYwQTl5YXNLS1pLeWJKUi83cTBHYy9IaEd2TXVRYmYyTmlCdjl6?= =?utf-8?B?UkNjNExXV2UyRytpUnp6djZUZzFOcTM0SDhybmlMVmVoSEYyTDcyRFcvVkZ3?= =?utf-8?B?TmRmQWh2Q256L1I1UXhmRGMwWUxvNFRGckFkUktGUFdUOHRNeHI5VHVXVVdF?= =?utf-8?B?SFlqY1JtN2J0S2s2TVNLcklvNWN2Y2c1NEd6OGNPdmxkb2lUaE5Vc0F1NW9v?= =?utf-8?B?akNMZWptUnNzYnNqWHF1bTE3RWhCZGg5UXA1ckxieTU3Q2ZLVmkwUmtGbXhQ?= =?utf-8?B?NWRwSzVscjd2Q3puU2xpdkMxQ2tMT2xZdUZXcjFTeWNDblJrbVRwYVRjdUpD?= =?utf-8?B?WUlzV3FaTTZnelRGbXhjb0xnK2xkVjRHYUovc0pUMHp3azhGOE95VWtYOHJi?= =?utf-8?B?dVppbVJBOXg5c0tiUTg5RG9aVzdFRi93ZDZWZW9rdFlTczZKd2pRZXZBYXk0?= =?utf-8?B?dlhOcUNCNlRoTGhKQlNYWDlsSXh2VW5jaHZzZEovYjR4RnltTjNhcmZaTFlz?= =?utf-8?B?L3l1RHpGbWZXT1R1a2hvU3VCMEJyU3Q1b3VkZVBGNXBkRjhkVnhHQkxOdmVm?= =?utf-8?B?M29ZLzM0eUJtaitqaDIvZTY5YnNDM0ZWN0YxRjZyNkR5SXlOSkozRSt6Ukx4?= =?utf-8?B?WlVoYWVLVXZpNGM0bG1rUm95UUdqTnpWcnlNSXExcmMvQ0ZiKzRUVjhQRDlU?= =?utf-8?B?SGRaUTR0U0lWTm15Y2U1aFpNaVFZbTVVWlQzUkt1N2VsNEl2WVdjUm1JVWhG?= =?utf-8?B?MExYWWxjYlNXT1BRSURDNkExQ3B5OTRCWnBhekNjcEVaU25iSDQ5R2lobVFM?= =?utf-8?B?M3BRQjNPMGV0UDlxRENZZkFnbmVZV3hsS1JraE44TUFjcFEyL3JCVEhxdzJP?= =?utf-8?B?QUx4eHhXSXljZFhSTUpPendFTHo4WDdMS1ZZbnlFcDVQWDhTMFdsN05qcjBw?= =?utf-8?B?NTBGVWhNYWFIL2ZpcGtsbElVYTdpR3RoWDBiVDJZMi9lUmNid2VwNEpGWmhU?= =?utf-8?B?ZHJqNE9wSzdBRDJVQ0p3cmdSb2NVYTJBR0RKcUhXbWZJUmI4SS9TdTJIUnRU?= =?utf-8?B?TUNQSkxqQTNqQjJrQmlqZTJBTzAxc09yN0dpb0xiOEMxYWhUeGxBdUhoUzFP?= =?utf-8?B?SWxFVnZpUUlDNWp3bzhBV1Z5RTh0UTZzSnVZSWdKYjVCSGVBeFZFc2hnajQy?= =?utf-8?B?N2NSNmIzb2NDWmxJMWx4bFJHL1pqQ01nZ1Uycm01dmN0cGFmbWNhd0FHZ0dj?= =?utf-8?B?MzFjQWhBM2V4b3JGZExLS1E3V1lYZG5SRjlaOHZJbVgyL2Njc2I2TlFGUFZx?= =?utf-8?B?dUdpaFBaa25haHN0RzRNOTZiLzV3eGs1aEhLTGtlVmp2OW5QT0ZUdUtmcGxa?= =?utf-8?B?VG9JeTlKNk1MbVFwMU95NkhIQk1wdWtiMHQvU2Q5U1hNQVNXL0U0bnJ3ekVu?= =?utf-8?B?RUl4cTBscHdkeU9HUHJkRW1NWTh3TFZjbUxqTEIyMVREZ3ZjakJ0bGloY1Jj?= =?utf-8?B?YUVrUVRNU0FsQnVaUWRITjdEVEtzT2JXNk5ENUluZ2dOeFltU0xEOVVHYnhB?= =?utf-8?B?VDJ2ejJ2MkovUUw5ZEo1emU1bUFCQ0liVFdxYlI0eHJ4bmxVQkh1UEVXSmdK?= =?utf-8?B?aHdvb0plc3BYWTFnWGVITWdGN2xzbHpuTGpabnorQ2pzVXliQ2hjaW5DNTg0?= =?utf-8?B?OVdtYnUxRXBPQUFsNFJUdU1DVS9FZkVqTURwcVg5RS9lRE5iZVRiaWlkVG9x?= =?utf-8?B?aVNQUEFMVzh0dXFnM1pBOUZTT0ptelk3QWM2dmxrRmJqdkpoMytYeG5GQVh0?= =?utf-8?B?aUkrMmhXUTFFOXZ6dzhZaU5Eb1FIczlmWmhLNjhWdkh4YnBnN3Y5cEM3YktV?= =?utf-8?B?c0xYZk11ZEJVNE9udmpCTDhRazZVT1d6Sm9pVDZoU29udk5MN1FsdnRzdmRO?= =?utf-8?Q?cq0Mp0ZBYSesbmIGbYJ2sH4he+AKeMkF8bHiIyJ/WGgnC?= X-MS-Exchange-AntiSpam-MessageData-1: BnZ8w4oIZBB01w== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: da137d70-8589-491f-b535-08deba659961 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:57:46.2445 (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: /yDZzG3XqEharYkK2g1+OTtupX4ZtiiKVzRKb96MnBDOp9xelUjBzWXvheIi56QaWeuyCdt2GrSM9r1yCQq/cw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB9500 Current code lets `current_offset` go to `BIOS_MAX_SCAN_LEN` which is one byte too far. Fixes: 6fda04e7f0cd ("gpu: nova-core: vbios: Add base support for VBIOS con= struction and iteration") Reviewed-by: Joel Fernandes Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 6bcfb6c5cf44..7bec81a37340 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -272,7 +272,7 @@ fn next(&mut self) -> Option { return None; } =20 - if self.current_offset > BIOS_MAX_SCAN_LEN { + if self.current_offset >=3D BIOS_MAX_SCAN_LEN { dev_err!(self.dev, "Error: exceeded BIOS scan limit, stopping = scan\n"); return None; } --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from CH4PR04CU002.outbound.protection.outlook.com (mail-northcentralusazon11013063.outbound.protection.outlook.com [40.107.201.63]) (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 88D7C30C17D; Mon, 25 May 2026 13:57:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.201.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717474; cv=fail; b=pvaXu44EYEiXRG/MeIXrV4cc89m8faFX17N16OJS5YVppdvauUZ8vmj6TyuHrJcRGqAsWgwM4IBP7DoxcvhBNHBZP4B+ZFDDMZ7Onn4Ioox+yTMgSa20tQC04bS/mCAxbMGMp8iXYpL5jqB2/BAyIf3z/P+X0U8Aj0XMlp1lTVQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717474; c=relaxed/simple; bh=wlHLBYNSyiAvFwNZH0m6n8tzikHzM0UAI/OmkmzOOSQ=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=Y0DFnaJWkTOEo+mS1Z0zdmhjhtKsefwETXvwwODw3E64iobZU3l+HNTk3VULyQ8SoIhvaw2KlKuunvCQtquNwWHlrf1pFIAwNG11wFWt7GJyHb3iaik9yay96G1YSjVR9yj/sUPkU5O/bQn6OVUNjO7Du/mu41Hovj1EUoe9O2Y= 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=cx6K6YPs; arc=fail smtp.client-ip=40.107.201.63 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="cx6K6YPs" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QSTifN7QBo6d4IiXDFNRtrc7RquAPqPqwGfDf3IjRm5qc+BLs9Tdu9UyTou1421ufyEqlQ6MiwmhNhmn5gtLkodUkiSFs4xQ3UM11EWM+6M+6NLC6JV3Z9fO6oa+w6U72G3/WRfWc/t3dGbz3jpY6cZ0kRPwLyAZr8nd4adilnKgN6RxeKy7idHqe3z2XoRcYe8cQg4+7Bec418gzcduS1bDHMBg384o5sHhVOIyb+tcr0rDQIypCm8jmOug9zIlBwweW+UguVJm2qZbWt2NUr1fTv5egI+oBWZwYA2FqLABDyj+6eht0KrnRbumu9shkfKBVopAy+8gcWo4PQ5HYQ== 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=6Q1sfgtdUMPFVMl/iuiRv5Jebs4g10qheWGIkAjARB8=; b=MlFhCUMT+Xst6ZDlhCoCkQvBYHovz927BvFah/OfMxv999TfDJ5KF4cHq4+hG9ucmMASX/yXpkid1jqWLySCZxEKv0VILa6NwJAiunWHoAZNA0qecWcU+8VYUuhroLDcz2VKgoH1v4JK8NsbwWjJtpozsB2aIc0fb+wIdKLLbEUZfpFkroOi73qt7KwE9FvqttnwnO6FBQ6hQDnqipfuV1Do3aI/ImVJtUiMLwidF6Nfc3lKo/zCUn5goxEeTV5tXvlcdxbBZJMzhvPFnvESTwOiQP5xV4TNeDFKaevx9pIbGWUyCex6NX3JJXDlpW2im9B538QlmQSPgTo5T/BSpw== 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=6Q1sfgtdUMPFVMl/iuiRv5Jebs4g10qheWGIkAjARB8=; b=cx6K6YPsb6a8OFfOqd/9xdFeN6UyvMVwvKID0/gN1jE/8T2ZAMmJwl4H006JPCIA9RxRIYmnDP9sR51ubMxtUJI7H4DdhVrSnAjc25TaA4YavfoCJHASrKied99Z8xYPRSsNRMz2Q7jFfOmE+kitTL8RNg6yFUnxYrGPSuwHqz6BnDd+X9QyMs+/zs8J15BRiHk9da9EBT7/6lxdJIIPZBRZiW9AutH0NljE8fHwTVB2gjwMAeQnZkN5CX72Vzh5hQjIhVNeT/ldusCvae4BQw55l/3ZT7NgGBdoAhaL90kMH+XmmBJcAD8R2CSItu8ZMPBziXuyFQLrZcXN+rX4Kg== 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 IA1PR12MB9500.namprd12.prod.outlook.com (2603:10b6:208:596::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.19; Mon, 25 May 2026 13:57:50 +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.0048.019; Mon, 25 May 2026 13:57:50 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:20 +0900 Subject: [PATCH v5 02/22] gpu: nova-core: vbios: use checked arithmetic for bios image range end Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-2-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney , Joel Fernandes X-Mailer: b4 0.15.2 X-ClientProxiedBy: TY4P286CA0121.JPNP286.PROD.OUTLOOK.COM (2603:1096:405:37c::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_|IA1PR12MB9500:EE_ X-MS-Office365-Filtering-Correlation-Id: 9997154a-467c-4183-e428-08deba659bee X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|10070799003|366016|1800799024|11063799006|56012099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: qnIvDlVjdU/G2KK8MC9JrkjkQKANzN6iPuLHzCybsnFs6HWXSxUJSa579jydnqMkKETba74ZZ4gTgsjCwibCzuFLwAVRB7c1wqrO78XPjghwFanZKn6EuX7EFUQYx214BPA6ORH+1luscPSGtEQ66AWkXlWGsioSSg1Wgh/85JgovP1gY12nrM6DXrcAGOuKNnTCFLae+CNxHlF4itdW22DwVoXJnUGMWzrJGXZhQIu3Krf+m/HuWVW8Ej2C9qaN7tnGT4oY7AL9yHIBVzvaXLpUHrzLsmwY42B5VtqubfAKHBar53/3uVTKGu+c96ntbHYIydiKRdY6i+1yDCqA/LHSlf3UroJSUS41Pg1GN6EtRU1PCDd/ynxsL2XZW13nrXzb8MmmPgIuh++a4zI40SfsJRVBZC/s7WD7/iMjjF1xwVHVPUnF+/04kGRmZOc/hwaDsxXP0wGuIXewgJ7EDeO2D3RllRCuDRdYwCEMiwZw5O14UCaUx5sZ5aPqD018bRCXPQLF/EYe0TQDb99+Fv9qOpvATfkVAHDRG4qO3YOJGtlazGlPyFiTMKMLHQvJ4gSQHRWew3MAMb05gEgedjToagYDpKrvC+bbLWNxz8LfLOSIugk5INzN12p+EUO/1rFJPLg0MjT5p16D0iac7nGvpN+KPNAcEsS2nG7aURYkHY93MWHbi7p8DAcEU4bz 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)(376014)(10070799003)(366016)(1800799024)(11063799006)(56012099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bFRua3RBQ25HamJrQzUxWmxHZGx0SU9BdWYyRW5rNlZLcXdsK1g4RGtCTXZ2?= =?utf-8?B?dE5vYkxDdXBvZ3lnUnhSTlhVTy8vTklOMkZrcjR1dFo0amxkUmNqaUptaERW?= =?utf-8?B?anYxUU5sOVNDTzJHYmRnMUFWL05ySzJMNmFaY0FIaGtLT1hTQUJwWG1PdGtO?= =?utf-8?B?QVd5U05GZGFqaXJ3d1JkNDExZXFEOGJPdVFmdjN3YlRUOHk2QlFIQmJvM2d2?= =?utf-8?B?MEo0RHJySGlKUXVCQzA2aEovcy84MGZOWm5SeTEwSStma29lOGNvYjY2eGJJ?= =?utf-8?B?Uk9rWjB0NFRXbFJ2aHJES3hhWElhTi9ONjdWYzRXYUJZMUVtRERDLzU0NlJU?= =?utf-8?B?dUdVbkhaNzZtajV2ZEl2RzRubm5BM0wxUkxCR0g4Z2dpNkV0N09vUUwwVVp3?= =?utf-8?B?cHhIb1ZYQUN1N2NOek1jODMyd21neFlmZzB1UVZjSnAxQi9ld1Ftcko4REpL?= =?utf-8?B?Wi84aERjOVlId0dKMTBySzVEeHFhVnFVZ21QTGVVbGFzNEFtZVQ5VkpDbncr?= =?utf-8?B?NU1xcldINlp0ZkROU0NEdDZ6VFJCSTBLdUc4SS9Rc2Z2NXZqR0pBTWNuU0Vx?= =?utf-8?B?NlFSZGxjVmcrZ1lnbWJzTWhiRlZJMUVqeDduZ0c5aWllS3A3RWw5ZU5GUXNM?= =?utf-8?B?di9aZG1TM1dSUGhESTZpMjIzSFRGcDNHWTZ5R0Z5aEJ0TURBdGxXRUZ6WTZl?= =?utf-8?B?d3hJLzlvVFE3aVlKV3p4OHdWNjN5a0ZmQUNCVVdmYWE2TnJxSGovK1BaU2RR?= =?utf-8?B?VzZCcEJzSXBXQWRRanpiZmNiOHhWV09JUkMydVM5V0p1TE9kYndFWHA4VnVi?= =?utf-8?B?aElCRVIwSkp4YzhHUERRbkdiMzIreklOK2pVTUR2TUpYYVJVeUpEQWgyOU00?= =?utf-8?B?b2grSUpzdFJkQ1lWUUJuclJycUlWVGNEVHpZOVVUTDU2bUxlK05qUjFmNDJt?= =?utf-8?B?Q0FCSFQ5NWMyekoxcEthNTJaUmd2RGZKZzRyL0NnYkZzVkIzOEpKOHZSd0ZV?= =?utf-8?B?dlQ2aFJyK1crRjJwMVhnSDRkUnYzN29IRjZBSnlYN3ZydDd6TnNYUjdTeG5v?= =?utf-8?B?WXNSSmFERDYxSk0vQzRwMU8rdGZ5QjZIQUk5NmJNVGxZN3hNYVZnTVU0bEMy?= =?utf-8?B?SkJHVlp3RlZYNDJLREFnTm1hM21tSENhd1JrRjBCWVB1MWpXcFNkUWRpSnBY?= =?utf-8?B?YTJiVnZaOWNHcjNvQUEwNUhnSW9PdHc2a3lhRkkrVVBaWjducUFuZjJWbVdJ?= =?utf-8?B?Tkh2dk9oUE9PMFhvZHlhUk5waWNtemhOT05nMjRNZnBqcjMrQ2xKTk9Fc2Fk?= =?utf-8?B?OHBKWFVrSEJjMVVINU9YMVYwOXp4TmVUMnRoQU5ONE0zMFFZOVJ6aUtDQzh2?= =?utf-8?B?d1JXazZGZUs2enBZVWJwV0RIcE96NGFQTXJkb0cxNVR6TGtYc0N0WFp6WWpG?= =?utf-8?B?ZU9ZVHlBTzU5ekxEbGg2aGJPejVobEpZVktVbWcrcmdIMS8ya2tocGplR01O?= =?utf-8?B?elkyU1hzWDUzYU1JOVBhakhHVm5LVGNZR2tkbGdlRmEva0FXdUZIOFBtaUJh?= =?utf-8?B?OFRKUWJyQU5WU3RkSVNqUUg1aSsrODlSUlY0d1FvbVhSMDR3UUtFbTZWeTJQ?= =?utf-8?B?TDYwUkl1Unl1NlphdXNrVlI4RStWWTdFSXJGOVVsK2hOUjMzS0luaElSczVN?= =?utf-8?B?YktCcDBpcWdQWUZHSlk4TllIVXR6V2sxbVIrSEYvN1hKaHZ0cXB3S201Z1JF?= =?utf-8?B?QkVOcnBqbnU3ZUZPQTFGVnJvSzl1RXlaa1lqanBDV2R3c3UrYUNETTlBbXBH?= =?utf-8?B?Y1NuTGlvNVhCWjQ1MEhnV2RuLzU2ZUVSQ3FVTzVNTXRmdGtFbFpURldVLzA1?= =?utf-8?B?dW1YcDFXemVocWJOVDlpSjByRXJOdXlLUDNrZjhiY0J3RzF1WUZrdFhNR2ZQ?= =?utf-8?B?V3lJQU1kL3R3cVZvQTJ0N0IrV1JUbEZ5dlFTNkJLSVhlZkMyKytrQ1pKVVM1?= =?utf-8?B?b0ROZkFGQWpyYjR0SG0yY0V4R09ZeE9vUHEwcG1UdDZkazV3MTY3alZIbG5v?= =?utf-8?B?VEFoVTZwL3F5TmNySmQrWVZxeHJWelhtMkVaRk96aHNFZXNoaFhVK0NpbXZm?= =?utf-8?B?N0h1NmsxVXJyMWtPY1dOTVJLblgxYmwrSGZMSWszTGVEUlExTzU4UFBDdjlF?= =?utf-8?B?QmMrZVFxeUxmZ1QvUDlzckNtZ3p4NW10dVNNTVArVWY4UGJmaytuVmZWelYy?= =?utf-8?B?TWo1YVNiUEZCckprdHdsbWVscHVCRFd1VTNBVklBSElid0VhWVUxM1RqSzRv?= =?utf-8?B?Rzd3ZW00eVVjcnBCQm5oRU9WK2RGenpnMHd5OVZya0Q1Y0R2S2RYTklWd3ZN?= =?utf-8?Q?5PSlz8EjolLWyp5U8wHksseYklyt7yuOyjC/JKmHtDAkm?= X-MS-Exchange-AntiSpam-MessageData-1: eWXmNVh7lJc9mw== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9997154a-467c-4183-e428-08deba659bee X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:57:50.5263 (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: wao2TtaciytKaGIK+q/5e+K9/tpaA0HBVYydb9WPglmR8CwmyZpOcu4T8Gi+hWPU48l5N5ewe0EPsWWU3MKruQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB9500 `read_bios_image_at_offset` is called with a length from the VBIOS header, so we should be more defensive here and use checked arithmetic. Fixes: 6fda04e7f0cd ("gpu: nova-core: vbios: Add base support for VBIOS con= struction and iteration") Reviewed-by: Joel Fernandes Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 7bec81a37340..180928433766 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -238,8 +238,8 @@ fn read_bios_image_at_offset( len: usize, context: &str, ) -> Result { - let data_len =3D self.data.len(); - if offset + len > data_len { + let end =3D offset.checked_add(len).ok_or(EINVAL)?; + if end > self.data.len() { self.read_more_at_offset(offset, len).inspect_err(|e| { dev_err!( self.dev, @@ -250,7 +250,7 @@ fn read_bios_image_at_offset( })?; } =20 - BiosImage::new(self.dev, &self.data[offset..offset + len]).inspect= _err(|err| { + BiosImage::new(self.dev, &self.data[offset..end]).inspect_err(|err= | { dev_err!( self.dev, "Failed to {} at offset {:#x}: {:?}\n", --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010053.outbound.protection.outlook.com [52.101.61.53]) (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 7882B386C10; Mon, 25 May 2026 13:57:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.53 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717478; cv=fail; b=KOtO3XOhGc1V20HlRuoz1Cfa6j7PUqUUZA8JlI3sOavWfxFoR67OrYGqKu5GyBHY11Ox4Z4MlH7kewrurE616lpgQLfSofFV7SrruYR8q6mPfZgY3xCXLCbEgdy/f/INxXr0BxUkXeAO3Sx8X6hY9Z6Ixd8cpkcAqn1VIihyj9w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717478; c=relaxed/simple; bh=xFDHUDZhb+nGNYS2d3swB+GjZ8KYB+EIkjVx5u9S4Vw=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=a2ckIKvo/Ply4po/uPF86Bc/KTqo1OkMvE1kHxiI72VZGglaZjpqqEvLbfpuy0csMuiWQ3NZBIrGyz5bYazJ/o3oRtryeg9HD33ToXL5+d+iyoKq2dsKAJqfdOpeSnZ4ICc4BYe45PAsydxc8wFBj/BRthNoaC+dKzy6mo8zTBM= 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=spIP3Zw5; arc=fail smtp.client-ip=52.101.61.53 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="spIP3Zw5" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=c1KmE3/G5Cn49SEG83x03NePG/iBbs0Sf2BQ+ZpZymmyVVftqaOjU9SLNgzDacC85rmHKnLspO6n0qLZsl3E8XyDYeLu06Q5W6rly8O1cAXxVupn9QEmUlnxwCaYzVASCujE3mxcOKZ+7LPbXGOPdSH2IO7Ga2pg1Wy+AqtwkQEwKoSNT8ciu4IigOWhgwoVCZ6/tnfOM2K1p6uAshxIgMLtmw91kGp9bAqfLEbSLJPGgGIo8yWwpUsqHbXnoSgQ1k1f2VrfajZGpPBSzgS6+wWVtoEaBSgvtfeMHg6JuI/O0UO2I+MKHgFYG5T6scDedzv6KLTPUj9icYm6w6ziRQ== 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=8ea7eWB7X6/oc2QMhS3OfgJSffzEUy83po5ak8yzb88=; b=PDhIW/5CAU5n2AkYzXu50vF6W2kMn+a7piPsQxXSX3XMuKPqRbCJJJMu6esDf7n3jkxaafw3xYuK09RGGhsfDf+QfmA17PXAcvwQVfBZ6L1DpLMlN6si3S+F73Z2YnDiLLRw3QcRCRT0UF2XSyyp6JRnkftK7SvhhX4tLxUPK+Oip3UEZnYViZzQiAUifNlRf+fj1OUxEis1uHjLuqneUW4uFyRdvZo8ZmkWAoN5Jj0OBdsiLe2FNfW5n8BXfemIRvtLVsojG+m2Bexwy/trPU+LBgqMCfs1PDIfrWf36chKp/kSGvYZtu1pifma0fad6DmVSd67B1ooZ+tD0xT1ZQ== 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=8ea7eWB7X6/oc2QMhS3OfgJSffzEUy83po5ak8yzb88=; b=spIP3Zw52ddPPs9MnmtbwoGifVjapnJPMdBJfHaunR5d0wB2i/fqZG7Bzxi/wRjpIl0waVoZ/X1ZZDlLrqtOpDN4I5VaBF6H+ab7mI82oVG2MkXUwkkC6dXlk/KyGBQ6Kv13lblBTIiuaBmxnm6FhRC6G+v4BnuhcOlBmTsWEGJGyXNPKTPAs0HcWMGZsO8UhBUZVjiaMxQuPaQDQEt+Vvk+GaSVcdq71CG1pY8+cVteVgToa9/wW7+c+VFPf3aQXWM8+Bpce97Uk075ZjN7+n1y0p5DtJBZZKjtFxiNqZpKLeeLaAnu8sP8RwKty6NAeKj5pIZ9CMD54pwgtkU9kw== 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 IA1PR12MB9500.namprd12.prod.outlook.com (2603:10b6:208:596::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.19; Mon, 25 May 2026 13:57: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.0048.019; Mon, 25 May 2026 13:57:54 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:21 +0900 Subject: [PATCH v5 03/22] gpu: nova-core: vbios: avoid reading too far in read_more_at_offset Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-3-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYCP286CA0233.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c7::19) 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_|IA1PR12MB9500:EE_ X-MS-Office365-Filtering-Correlation-Id: eae40d7b-eacf-4f8d-dc0d-08deba659e62 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|10070799003|366016|1800799024|11063799006|56012099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: nNgb2ZzeY3a3Q1I9dP3mCyPKx/PhST8vRWk7KN+dVb4MinaMvsLGsGaB8b87vrw/jps0Vd5JsHrh7qliBoxTvqKmJBjgrYskLwiHYPilAsRUJ9qw+fDvwN7lmhWS9CBPgizDfcbJ/Ccos1XhJ/5/9OSh5EVsy+yBk0h6q7XjviNu2pjnPc2q6FAf28q5vsnfQgjQ938Qmmm9DQhrEgzl4wTZf+bL9iqctCCEi/D1Kd6W6HjsBoyfaAU0rUBk1u4tFDB6mXUmMImjUYFnzfaDRF8QvoZIFUpdeskUTybDYWv3dwrngzoc3Qichrh6WHZdR5FvPXGpNB7wC4v5CtbAD+ejzwFe7wJ1fCzR2OOEnDz9ctyiNL9D7ubtFLipVDbJ9dtuS56RUjJQXC19nntaGVIapIDuwJJKyMZNJRm8cDwGZlX7XfDhF1yxaihe8B4bro15kOZb5Hd/X9IqL4AO5NPe2762jgFTdamTDN1zf3/6Wet0X/yyuLJ6sdmNWivlYAyEAQlpm4o6hk9vHhstjfjtr3P4XnEZSJtZIBbff85Mmd56GpM8YOeJ/YvNqwSP8jeGOhYKxMi1/2jB5T6v2Bm6lhhCWqkI1n9oPWkdTmRoYmPR9EOPP9ItHCQywC96Uvf9F89p2K+JPdsZDY4kE0RB+FeZn3G+OKEdcLUgKqudiy0ymOPrcJmk4tTUmD3B 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)(376014)(10070799003)(366016)(1800799024)(11063799006)(56012099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UDFlTi8vWEpzN3pralY0bzZDR0FDZkE5Z1FHS0VPcXFkZXgzazIwV2xPdXpj?= =?utf-8?B?Q2ZtU2ZoQnVOTW1sbFJ3ZzRyWVE1bUk2Y1BTZ1lscysyYUk4YnBTRUt4WTFZ?= =?utf-8?B?Um5FZ1dwYm9rSzBuRU9LRFZJVkExYzhDRXVodi9Fbnl3QWhkTVkrU0p2VWNP?= =?utf-8?B?bjJKVjB3RnFabjVBRFliR3FSTU9vcE9QQ01LVGI0V1dEMmdWcElxczJnNGxw?= =?utf-8?B?bklMeDVVMUVLRFk2ZkRDZ05tTFVoOFBvd2Fsc1Jkc1FZd3NjYUJhVVBGRXNz?= =?utf-8?B?WVJjbWFIQWlCZU1YVjFyZFh1OUN4aytYU1Q2Vk45YllLVGxvYVpMendHSTdp?= =?utf-8?B?M2NPZ0g2UkI3cGdjZlVMUE9KYmVldWo4RkR1eDRWQVdkRkg0Tk1tU0NvKzEx?= =?utf-8?B?a01RS0RvdHkzZ3FPOVBqNzhWU3lSbmRQOVdXRXpMa0hRc2ZGU2VpcXE3VTdj?= =?utf-8?B?NTlUZVQ1STZXcUdVWG8rcTJYdG9qb3J6eE9rRjJ2ZGVWRzlFZ3REaFZrN20v?= =?utf-8?B?QldHSjFvbVpxSExyQXhiTGVMc1NUbEQxNWYyeTA3b09CMXNLK0FYZ1FHdEVL?= =?utf-8?B?VWlQL3p4SDJqaGVCQVRJN3JjZmZYbkhXZ3QxZlpCV2U1VVBiK09UMExrVDUz?= =?utf-8?B?dC93T2ZkMElHaDJjZW96TnBBdGZmbUVVa0V1RWlMajhKN3Z3S2l6T2tCbjFM?= =?utf-8?B?aHhyd1RoVXZzZGt2dGtxaW9Ha1FlMzRERnZ0NXVBUk50T2lHUUFFQTJFRnZs?= =?utf-8?B?Umw1T3JTYVhQQkpDRFlTcmlVSTRxQlEvWU5jbTVoMFkzb3Ftc3V1Ny9jdmdo?= =?utf-8?B?cmpvN1JKZ0w3cVRmalVRWFJLTHg3dGhJQ00vRk9FL1ptTng0dGl4M3R1T3ly?= =?utf-8?B?c2dXNUZ1RS9veVlMMHlLWnVFS1J4MCs0cXE3VVUwcmFSejR0OXdWNEp2ckY1?= =?utf-8?B?OGN1Y0k5MVozWHZucmlHaE1hRGZnWlJ6UEdaSGpNam9YOVk2a0tXVENPei9q?= =?utf-8?B?TDIrV2thY2tsV1VobW9ORjluNVR1bm9yOWJJYUhxa1psMWhZUmlqZEYrV0R4?= =?utf-8?B?UFkyUzZJTmZPSkNDRzlCYytVUXROSG9SWVgrT2FEQ01BRWYySUdwd0JLTUtX?= =?utf-8?B?bi9VS2NvMkFuMmV2S3JoWm45Sno3Y2Nkc2ZiTjB1ZlJxNHZmK0NqOFN1L2ly?= =?utf-8?B?bmppWmhUSkpMSTQzTE1QVCs4N2NIWVl2cHVKa1ZtYnJLZGE5aVpMd0dvMDNm?= =?utf-8?B?V09XQW1mUVNGaWlSMTg5UU1wd1VUeVZwWFkrYjQwR21EWXNUaUNCS003Z2h3?= =?utf-8?B?dVZtSldRVEIwejdyT2d2V3NOQkVsa1RZZk13ZjdGS2g2QlJvN3hBK1VuL0h1?= =?utf-8?B?Wi8vcUgvYVRxNXk4ZkkzQ3FaZDBKOGkrZUF1dGhTRlNDL2RhdFhmTE5GMTRh?= =?utf-8?B?Y2w4RkV6S3M1cTBBbnkxOUtQVGR6cFZ2YjhoUy85R3lGUlRhQ0ZWZ2JHYUZr?= =?utf-8?B?Wm9VRlZOa29GMzVYb0MvUkwxanlqT2FkVlpGdGx1Y3VtYkRET2I3ZElUTEE5?= =?utf-8?B?RHIydU9KYU42RjJzbURBMjQ4MW5YRTAvWHAzYkVMa0R0MTlMZTFHWUtMallE?= =?utf-8?B?QXlRQ25EWE5CWk94SFoySFJoSXFwWUN6ajhvbUszUS9keHJSTUU1bFJtWFlQ?= =?utf-8?B?YWpGT3piYzJjSWNTQW5RSWhlUVR3NW5HcEhkaEpDUjRJWHBaZmcyY3dCRU1a?= =?utf-8?B?b0M0TFdMOVRNbGlCQTdBMUZvdWk0SFZOdU1ZaUNTQ1lPZ1FWQzJPbmJsRjk5?= =?utf-8?B?TnFtb1loRi9XMC9zS0xJSUMrNWZqU0VkcldvK3ZHODkzR0FsMmZRMlVPeVpB?= =?utf-8?B?Z2gvQlFLQzhlSDl4Mm8rTGtJTXRNd0NLSTRIM0llNmFkUHZIODFpTzhKZmxt?= =?utf-8?B?RFFsUEVaR3I1bmhZTXIwRUV5TVZuRUQzRUtpSExydFFnV29vWFdaZ2Z5SVVw?= =?utf-8?B?VENHQ2pURS9ST1FucDRYK2pFeHlGSTRGMHNFMXRXOWpWdnhIdHRrN1JSa0h1?= =?utf-8?B?elFTVjgra2xtVzEzc2Y5a2VnWFZnd1g0NGd2ZXVKL1ltaVA1eGc0MkF3MWNH?= =?utf-8?B?LzFSbkVJQm5Vdm14b3BKZ1VNaWl3bnJjSXBpK3NiaGswSjdsOXBjT2dLTDZO?= =?utf-8?B?elQ4dkx4SFRVMm9paWZHMWFVU3ZJeUQ1V3MxVXllQndsQ0ZxWDEvQkJ4bHRn?= =?utf-8?B?VkV4dHBkdEJWcnM4YjRVb0hMeStOd1ZaS2ZlSFc0SlQzSkNWOXE2cTdRM3c2?= =?utf-8?B?dXVqdmZuWTVKVDVXR3lIb2pPSDJEQmVxaFBGV0tJaERmVTNKZnN1TmpQZi9O?= =?utf-8?Q?h82dHBa9FmxspcND2KQTE7HhKEp9NewU9BwD/wchGNGri?= X-MS-Exchange-AntiSpam-MessageData-1: FNvEyCpxsikn5Q== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: eae40d7b-eacf-4f8d-dc0d-08deba659e62 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:57:54.5808 (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: w8E2ap5oFaaL7xiyMrcSHpvD0voppFFomPINmT2+vnH/7NmZ+DHRYjNXUHygCTP248K04E9Sn3DfNUPRy+PiSQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB9500 Fix bug where `read_more_at_offset` would unnecessarily read more data. This happens when the window to read has some part cached and some part not. It would read `len` bytes instead of just the uncached portion, which could read past `BIOS_MAX_SCAN_LEN`. Fixes: 6fda04e7f0cd ("gpu: nova-core: vbios: Add base support for VBIOS con= struction and iteration") Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 180928433766..79eb01dabc6f 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -185,8 +185,13 @@ fn new(dev: &'a device::Device, bar0: &'a Bar0) -> Res= ult { =20 /// Read bytes from the ROM at the current end of the data vector. fn read_more(&mut self, len: usize) -> Result { - let current_len =3D self.data.len(); - let start =3D ROM_OFFSET + current_len; + let start =3D self.data.len(); + let end =3D start + len; + + if end > BIOS_MAX_SCAN_LEN { + dev_err!(self.dev, "Error: exceeded BIOS scan limit.\n"); + return Err(EINVAL); + } =20 // Ensure length is a multiple of 4 for 32-bit reads if len % core::mem::size_of::() !=3D 0 { @@ -200,9 +205,9 @@ fn read_more(&mut self, len: usize) -> Result { =20 self.data.reserve(len, GFP_KERNEL)?; // Read ROM data bytes and push directly to `data`. - for addr in (start..start + len).step_by(core::mem::size_of::= ()) { + for addr in (start..end).step_by(core::mem::size_of::()) { // Read 32-bit word from the VBIOS ROM - let word =3D self.bar0.try_read32(addr)?; + let word =3D self.bar0.try_read32(ROM_OFFSET + addr)?; =20 // Convert the `u32` to a 4 byte array and push each byte. word.to_ne_bytes() @@ -215,17 +220,9 @@ fn read_more(&mut self, len: usize) -> Result { =20 /// Read bytes at a specific offset, filling any gap. fn read_more_at_offset(&mut self, offset: usize, len: usize) -> Result= { - if offset > BIOS_MAX_SCAN_LEN { - dev_err!(self.dev, "Error: exceeded BIOS scan limit.\n"); - return Err(EINVAL); - } + let end =3D offset.checked_add(len).ok_or(EINVAL)?; =20 - // If `offset` is beyond current data size, fill the gap first. - let current_len =3D self.data.len(); - let gap_bytes =3D offset.saturating_sub(current_len); - - // Now read the requested bytes at the offset. - self.read_more(gap_bytes + len) + self.read_more(end.saturating_sub(self.data.len())) } =20 /// Read a BIOS image at a specific offset and create a [`BiosImage`] = from it. --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azon11012018.outbound.protection.outlook.com [40.107.209.18]) (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 0354C386C20; Mon, 25 May 2026 13:58:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.209.18 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717484; cv=fail; b=qiavY59Abt1whjNwCJuUx8MYtTRcjZaeRsRpWsuv+5u6aVnM4m21pRRVxb8U1wE1+fBo0kb5rK5rFDY7nHoVtzdevNHuhAMOUNYuR93COtDX82k9HJdouFaz/AVn0uI5+7N9dHKsgcYUuX0CcJfZS0G9arqBg/9MJebatU4s9OY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717484; c=relaxed/simple; bh=1eD11ubbjjilSKKGsH+PkgkJJpt89PesNFTstj0Q9vg=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=l6BrAncwPH3KAjl8F+plHMNUJbfEUY15EJAu2e3SaYhqSQLEzvGTmo8nFmFwbS1B2goN04mjhnYm3DbL0EhvcGze9DV2KePgC02hDzINujbIyB7FTVFonveuuTi8Fl9/W1qX4/xJgl7fEVS3zir5tzQKVW7Y1MWRkUzMd6xvnAc= 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=TofsEeUk; arc=fail smtp.client-ip=40.107.209.18 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="TofsEeUk" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Cly/SWgqQYc04ySnmzAbl5+BueFlskauQlwc/UM3mWZosIN05Z2jzGP1bGDEf/UlMpjUGIUQzRWDHh+bqVi2hxMBlWHsv7NSQ3cRbbr9B0yCaP4XP0QMajjcUindL940L89I33NWxbuqTN65DXCjVBAAYxCM+RkL5XFse7p5HfSIOIGWX8HfgEcTmv9L6hGUL37dTqXICfOJELWs2pCQP1fqGJsminl5kMaTyBLvyrGGPzV41lTj6LVv28Ib2IkoSClzATOfHvDUAk1jAyMACGA1IRWBlx2KPCke1ey+QPSQl6uDloziym3cruSEHkY+8D2BJ2YqOmNPAZMC36R5Jw== 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=YzYn3fiVkOtWM7EJXAOb0HBVUrEKfyyMkfKpsmqs1Rc=; b=Mdef75BKngpw+L9bSCUV5JbUAmkt2QDO23vbTH4MQahA4xeNhrea4n8aBErtho1I4zKxTRHE4htydBDAlgC9Jc3thfSBajMuH9rx7hUgpYR9AMTOHdW3VN/kqTL4Re6a4GO0eXETXRGlGyyo6/OkCkOr0riAerEXjRaXYPt7norNoR6x0UMDfEYSiZjVHOaAq6Gr1Gxy5p/TkLbFxXJ2rU9oWFys0SPRD/IDXiraZ2Ey8ka01C093ScmZP6q1fhXkB6EyvGcuah0uCXw6Z8KoeMDOHmXRxj1JK+o4B5TvoUdKdOm8SayGyiZ8v7tNE2Xd54lsKFC7bOY7G6SC3VscA== 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=YzYn3fiVkOtWM7EJXAOb0HBVUrEKfyyMkfKpsmqs1Rc=; b=TofsEeUkpHYg5fSQZlYnWOniiKaJTsn5mdxIZnEjE9IHabvRUrouMhB1w3RcVtCuwmjoN4dIBhr1AraxMfHgiJoex+sqQJR8WsVZRipi3xwOAgaE0okjBApkgJeTrwRjj6tZOoz77QKs4AVwirUTOIZ4sHgfh2awNQB4A0hNpmwYp4f02VSxDnIJ29BBvMacrDR2s9y2U6Cn0wqlXVs2gpSUMASdCpw347PHIsU4hngJFvSuy6DuK5rgRUlwQpmMVUB0A4xiSyZCJeejMrrzogobACYPBh4+3t5XRFJlu5llApNy/u7r5GIgsg8q8DvHTdHmExIqOpsBirM7hgSkmA== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:57:58 +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.0048.019; Mon, 25 May 2026 13:57:58 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:22 +0900 Subject: [PATCH v5 04/22] gpu: nova-core: vbios: read BitToken using FromBytes Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-4-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYXPR01CA0051.jpnprd01.prod.outlook.com (2603:1096:403:a::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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: f059ace5-404c-49cf-f20b-08deba65a0ea X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|6133799003|11063799006; X-Microsoft-Antispam-Message-Info: dgm0hYdbF1KwOiiUTZYZkY3i6SwDSYRB1qaJZLTkbbJLwDXScbhVgOpLbFSEv//2VtWJmml5qPWrm7tvhD+coL49uL+tliN0UB4BshDHENg5uC4uiOt3t3H2b23LzwHv7KqrW+OKvqG2VgXjU17vjLwuOwEoJbcZa8FvIXOKYO0SNawYR8PczAEXeJnMNvR4dMgX+HfcByDlABC3imjLiBLApq+CrONpgde0oOQ9EbKK6WBdHn6Hbiip9lXQOwBHNi8HEt8HR28+vs1X+Iy+h6YoVZwskK8GmSBs3LB50qJ6NIV9+Q5sYaZeqRVwnzMyxg/CT6MD64dkN0DO0HV1ePZQuKOeTU6cmJ6kwvgjd9BmCqjcusfXyKRYJIAnVF0ei9RjtR7YtMxXGb4vKUHPsf117qMQur0Ipgco0ghRgSocM4tab0mnH/B2C1Y+rRcDAGGCYT/M90DOtj/1UTLg3OiQmFJL7nDl9DK1U+BoASURl6ti+yCgdjC4/Sttz7gNhIBA4AQKeD+Ugpy4LXOgdSHVYMlOVYeD2phXlUowJ8DwL6EuB/xjitFQWepbZvcgald7k+KjWxQy6WLCPFO8wpasSkFPZtXrgmBYYsQygWIUTgqZ65fGYiGicpE8YdKcb5J2q47K+M/+r5VhZetG4HIIvrxYbHg782T3r9tEl5EpYHvsVjB9bUtixmpj8wBL 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(6133799003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dXE2UEg1NFU4Z3I3SU95UTd2SlFiL2dJV0VhTDRaK1FOQ25GWlBNQnk1cStM?= =?utf-8?B?dFp6bGUxSVlFeitiOUlYMDEvbmI5RjYzMDFPQ0hLNVlYN2tPVi9rWjdrdmpX?= =?utf-8?B?SUtDSVY0M0JCTU02KzdSNWZjRVdlOUhLYmpGdXIzclZSUjIzSDFsTEpQN2E4?= =?utf-8?B?Zm54WEg0bmN3STFrUXgyZUp4ZmZodDlPN3BwQmdPVkk0dkxxY2RDbGNzSXU3?= =?utf-8?B?aytMN0x4dHdhUWUzODU3SjlzWnlHS1VWZTNmN0FUdTROanVOYjBJOHRyaU4z?= =?utf-8?B?V2hsdFlxN1dDc2diakExUVhjRHpXN2k0RFZKcUJWVXIyRVJ1Z1BDcHR1SHpr?= =?utf-8?B?L01GVjI3MnpXdW9SRitKcDJQaGlma3lqNFpvRGhWMGRNTy9tNmwwMEhQSktz?= =?utf-8?B?K1o1L0Y3VzVRWEo0MHlKMjQwQTA1ZUhDWksyVHExTUhXT2s2ekI1c0p5YUhN?= =?utf-8?B?QVA5MGJQa2d6djRZVG5tQWZHQmR6anh1K1hldmlHQlZ6VDY0dHYwMXY5ckNU?= =?utf-8?B?TWJscWZKRm1mVWFQTHF5N1hvTGdDM24vM3Azcm1wdUtsMXdVbEc0TUVDK2dD?= =?utf-8?B?dHk4WU5zUlZJTVN6NjhTaGpXVDE5T3ExY1hTTW5ldnNTVFdzRDRMZzNmRXFM?= =?utf-8?B?ekZWSW1QS0lHOHY0TUxIbkNCS0tDL3V1TGx0d1hhRkRESGhoQmtJVHl4cHBn?= =?utf-8?B?MVdYOGRCMWhaMzZDUFVEMElwM0hhQ0t5MG8xN1U0Q2lLWGxBTjdwYTVvVnN1?= =?utf-8?B?bC92REFTTmZXanArU21xMGVOVlRMQ0liU1BseStuRDVyeVRITnRBVzNPS1kz?= =?utf-8?B?UGU4MlMvam52WGdyc3gwODBuZXBLNW96bnZuUUkxTm54TlNHQlFwZC9pY0FM?= =?utf-8?B?K3NXNDg2WUsxalcyaXJBWU1oNTIyMXZnNDBmZkQ4QjlSL0tqaE55ZDdsbXBC?= =?utf-8?B?VXhnVW9EcUgyOWNFNWVVUzdJY3UxSVU4bVRBSTNrWXlmUFNvVTJNNiswdFV1?= =?utf-8?B?Z0Q1d0JRNXptMEVKa2E5TGlEbGRhSVE4emNnWVo4ejd4Q2pPaFJrQjM0cVJs?= =?utf-8?B?MjJ0WjlwNTdDS1lJOTcxNitVTzdKRkZyRnNvUWp0VHNKQ3VWSG5hMTI0QlJi?= =?utf-8?B?Tm40b0NHdmNIaWRhV1RRZTZQd3RGdjA3Ykp1L0ZONzB2UmtqajFpc0dzUnov?= =?utf-8?B?QzZzZCtPV0Vlck9CWDU3MFJBNjIxVVE3cHJoeVVCSXlGYjhDVHlWeHFpd2Ex?= =?utf-8?B?RTlCREdQUnQrMjVISEhUMXIyZzJMSkQrR2ZIejhyNldnbXJsZzE0MkdqTWxW?= =?utf-8?B?bmlYMjdtcWQ1RGZYTUc0MEM4TitUelB1c255TXpPRWo5KzNsL0ZZN1RrVDhl?= =?utf-8?B?L085YVBjUlRhUHJWVXl6OFFvZG9zczJGNkdrYTIxUE5XQTNRK0NLV1d6ZzJh?= =?utf-8?B?MXZWU3loR1cwb0lseEVYOTZTU2cySDhac21BZk85NDNSQkJuL3AxekhVTU9t?= =?utf-8?B?VFJDRFp1TlM1OUZ3eUJEK1FPSk9ad0pHbVF0dG94VFcyc1NoZkhydzJ0VG1L?= =?utf-8?B?a0ttbmtWRmx5ZVF4Q3JmREJNeVBITytXYTBWT0wrV1VZUVRJa1piYVYvajhZ?= =?utf-8?B?MTFMZWdUcXF0L3hzaytEd3pxN0twMjRhdTd0UUdPQ2VFUktMSytBYnZSSjFy?= =?utf-8?B?Qjc3Tjg3L3NyYkdhcWd5TEN6d3lzMHF5SFBEVkdjdjJJWnh4QmdRZlprV2Rq?= =?utf-8?B?SnkreDJyNUY1djJBNXZMZTBZQWsvY1hwaTNTdUJZYnZJL0YyT0JZcnRpSDhu?= =?utf-8?B?YnkyM3cvb0I0M3VsV1FTTXdOd0w3VkZjbFRjbm0vbzhYRTBORzdrblBid0hL?= =?utf-8?B?Yjl5UVlTWGl4bHhjdmEvTytVMHFwU1BySmtydXdmM3Nqam5LSU5KRlE0QW9H?= =?utf-8?B?bm5Sby9lRFpsbTdyVE9Hd0F3cHFSdTRMVWJEWGxFbVMyeTNLc29MNXFsR0lL?= =?utf-8?B?OTI4SkRlMzFkTDliWTk5WHVyWnljUitCQnJjQ0RYTjdxQkxFQlprM0hXQXMz?= =?utf-8?B?WCt0NVpJTlBXa3BTMUlMdllmMGdVa1JIV1BkVFdNUmxyWGRaNEFWQWlyS3Nv?= =?utf-8?B?Q1JYTTRtNmRsV3pLa3AybFE1N0xLQ3Nidit0Q0xhSVUwbVZEVDRtRC9PMmc0?= =?utf-8?B?ZlBTQlRRUGJOL29KQXV2cHRxZkJvOWlCUTRmQ1FlcUNpaGRrT0ZrY0FvM0w5?= =?utf-8?B?aHNnLzlVZndiN0lxWHNxUkszdlZJR2x5eURScWZhTkhCWWZMSnhnUkhTek9W?= =?utf-8?B?bUpML1pDRGo0Y0RCbnVDWEM1ZEtOOEFkb3RYZWVsMWVmN1NpZmxNalZHZVZ6?= =?utf-8?Q?i/YFfRjVuzvljM8oOv8JEtP+ITi0xoUGLDm8R0oEl0ryl?= X-MS-Exchange-AntiSpam-MessageData-1: 3AwCRwuGDH+6yQ== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: f059ace5-404c-49cf-f20b-08deba65a0ea X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:57:58.8607 (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: MfHHgcjz5OqcJxbIWWKo3ZVYl7xd6mUB3rzo/RikKv6uDgiIqyyp4fuAk9HuQEVqkK5ByJCLkEhNI5CUg6vY0w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 If `header.token_size` is smaller than `BitToken`, then we currently can read past the end of `image.base.data`. Use checked arithmetic for computing offsets and simplify reading it in using `FromBytes`. Fixes: dc70c6ae2441 ("gpu: nova-core: vbios: Add support to look up PMU tab= le in FWSEC") Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 79eb01dabc6f..2ff67273fdff 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -486,7 +486,7 @@ fn new(data: &[u8]) -> Result { =20 /// BIT Token Entry: Records in the BIT table followed by the BIT header. #[derive(Debug, Clone, Copy)] -#[expect(dead_code)] +#[repr(C)] struct BitToken { /// 00h: Token identifier id: u8, @@ -498,6 +498,9 @@ struct BitToken { data_offset: u16, } =20 +// SAFETY: all bit patterns are valid for `BitToken`. +unsafe impl FromBytes for BitToken {} + // Define the token ID for the Falcon data const BIT_TOKEN_ID_FALCON_DATA: u8 =3D 0x70; =20 @@ -505,32 +508,28 @@ impl BitToken { /// Find a BIT token entry by BIT ID in a PciAtBiosImage fn from_id(image: &PciAtBiosImage, token_id: u8) -> Result { let header =3D &image.bit_header; + let entry_size =3D usize::from(header.token_size); =20 // Offset to the first token entry let tokens_start =3D image.bit_offset + usize::from(header.header_= size); =20 for i in 0..usize::from(header.token_entries) { - let entry_offset =3D tokens_start + (i * usize::from(header.to= ken_size)); + let entry_offset =3D i + .checked_mul(entry_size) + .and_then(|offset| tokens_start.checked_add(offset)) + .ok_or(EINVAL)?; + let entry =3D image + .base + .data + .get(entry_offset..) + .and_then(|data| data.get(..entry_size)) + .ok_or(EINVAL)?; =20 - // Make sure we don't go out of bounds - if entry_offset + usize::from(header.token_size) > image.base.= data.len() { - return Err(EINVAL); - } + let (token, _) =3D BitToken::from_bytes_copy_prefix(entry).ok_= or(EINVAL)?; =20 // Check if this token has the requested ID - if image.base.data[entry_offset] =3D=3D token_id { - return Ok(BitToken { - id: image.base.data[entry_offset], - data_version: image.base.data[entry_offset + 1], - data_size: u16::from_le_bytes([ - image.base.data[entry_offset + 2], - image.base.data[entry_offset + 3], - ]), - data_offset: u16::from_le_bytes([ - image.base.data[entry_offset + 4], - image.base.data[entry_offset + 5], - ]), - }); + if token.id =3D=3D token_id { + return Ok(token); } } =20 --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from CY3PR05CU001.outbound.protection.outlook.com (mail-westcentralusazon11013020.outbound.protection.outlook.com [40.93.201.20]) (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 AFB07386578; Mon, 25 May 2026 13:58:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.201.20 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717488; cv=fail; b=tJdQiN+wPIalQv4ifF6Wld0w/WqIHjMRYStFR4v42n9Y9BPb+OGai42prMzILB5VkrUHwyJj/+0k90HlP/ENOb4JvmLzJx1QWqALGj3uBHrdgU+LX4ldATqMnb+Y09NmdweJioKCQxrJqEjLI4RwNs5et2bpggPEsaiCf1/hCU8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717488; c=relaxed/simple; bh=ZDGq726aGkjD3hsn70WIgZh2caQR+19OJOO6oqxUwDI=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=VAAjWhEtmKZhfDXUNMt1M4puxsxCRgW7vXxLse07BcuMj1vo3s3Lz4o56mnagYpZaiP05inRlksmE6JVf29WmilBcZKpyErPPqorH0aKoxQDVLgFWGauQallhXoSG6LwdKY5xPxwyAjmlwbpEXJs/F/pICveO1aVp6Vd9MzS3t0= 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=IQYPjFHq; arc=fail smtp.client-ip=40.93.201.20 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="IQYPjFHq" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=LDK5B5/vgZ0X3nS01g5PCzi7FmmmRR+fa5TlnNq9fH5sy9Tc2jvPD6fkQ7H4eormwxPpxF7PFwkuZ16nZ9p7ZLOqGwk5zD4ZJ3bk1jvHAE3fgCDw3QQ+tcW89MJGGxxuxLNwm/T0E0Q278nIsuYAnlhQGAlNiv4unpXpi2tzqJ1SMOZ/1NxAL0lO4xpTjfYfrSggyRnCLYeCk3GKwXPoa+5cbWoJxjt44KWK3jZfc5EDDlF/lfIT31mgafMEBJBQncp5pERnRh+a0JAJH6cOAOlYpNpl13J73zlLTjSjHsCM2/ewuCeroEDQMeopqe/5fFHaA/s8Cu92LNKQcVxyJQ== 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=Aya5SSUspW33cSt/mUi+BYmEFlX1Nx5xPW/ipmlmzAo=; b=VviTUS36eZ/w97uZglJwUBglpshNCh+Lta5nON+c5g5XE4JAf0PNLz9rbJllb5KZUArprLlr1QNGxomOgEDl4+LiRKY+Nc7THNowa0j+yXJep8dtbmj/UD1f0n8bRdK+5R//nSSSTLku+u/GPyzJR2BIvc7mniTs/fIk7IrMZShN1IapvxKP20wuXoVYtwxyLz8YFa59MGPXwWoVF1InWUY3SZzgQHOWxB832d0DTD0cdQ9wnzrDkhNbfLrnF9z+57fkeg+miC7q9geDVFOWfdHDiwZSVTeHtOHN9QhrRFec+8+I76uf03m+OnJIl5O0fWsx9F0R4XB3Lxg5zwQj2g== 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=Aya5SSUspW33cSt/mUi+BYmEFlX1Nx5xPW/ipmlmzAo=; b=IQYPjFHqlWSVk2UG1KSGoY6lj0ZwlWyZu9A2k1LenvZJJ6JNY79zmIWx2Kg35JGPDla4KSMttHB/GBWmbayDGkcGBSjav9RQr9stKv1YzDbpFlyhvDNOGcrSy7pPte/y50W4D/6E5Dab3RG+VyaUMgt/H4sMc7CNE0fCXZSHotycvx17s252FwIEJa+O0PiOfYU9H6UjreVj+dKyQ5YX/6TY58Q0pbpLEqQm/jUUrqFD3A4ac9NH7FZeuAm1Hjmouhp1lOUiRmSaFJ3zXnGCn6XrMKxyUDwOGGlEeclCR/ZxfAuBP2/9DWnKtgXmGgo5cP1Ld6AVtd/FydgGzukjDQ== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:58:03 +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.0048.019; Mon, 25 May 2026 13:58:03 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:23 +0900 Subject: [PATCH v5 05/22] gpu: nova-core: vbios: use checked ops and accesses in `FwSecBiosImage::ucode` Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-5-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney , Joel Fernandes X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYCP286CA0226.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:3c7::20) 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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: 2451d579-cf51-40fe-c014-08deba65a399 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|11063799006; X-Microsoft-Antispam-Message-Info: kncDmUjACT5ZM7FdOO9fj2qFhUOfKDxy/0D0I2nfIx9VKPyDvUADKN5XJqCnjUrTa8/QxR4YAZP34NPNm7dbNYyXoRW15VClmrWcCA/IZLmy22iMBJ4TobIRIvqUs/L9Q/V0kIU1/wsMIIX7Kb+Vw93NuvteKfmdLqlcUFU6skiRL7aqYVd45y3+x3W29eq+SzNTbzYpP3tEl7VLg1ZvGrk4NlK0xfRIvursPLlQa6Mn0u0k7+U1Q3mkgIBQPrbkvvQE+wAkthwRxDYbd1hlInT+kNlUg6LXEHvon+I5zBHQ08YWtv+HlRW2HFaVjYhYUaIy0Xfa8UvnH3zw50ktMGJ0Qb2qeDBQNcRO8sT7UEU8e8kqlR3yAfBOU45f/myOC7CMYGhzIcCb7oPmvsCewhNoXHcnF6k5rLeEvUarZsN1Io/KAUCVpBAL9DGf1i9NPbR4qHzmeVVHT//oidgBJDhjlYHmCTQPUxrw0h389fim2rQqNcD5WiQHPLtJ/3zQ+2hCay7ThBkAvZef0PVp4RbwGmlgs4BExPC5XqdGYLVRvj9PpbTXXo57E6pdQU5pXxaE1Tx0VsQTt93g8B7efP7tL5/DO0vbUUT5FU8MsLRWYVf5tlHp62SIsQFY5hZASPgQwHgTmuLObGvBCib4O15UnYO2O4zhgPmLRWHT/S7DY70izz7AzAdn8qJabS9a 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?M3JjeWRXYkdTejBLU3U2STZCaThUdm9haFJmVSs0andlYldTTTZzaGI5VG9n?= =?utf-8?B?YXgrTkU1YzJqU052OXlrNXFTWXRDdDFHRjVuM0h0bTBkWElqRk1oQkZRYVV3?= =?utf-8?B?M2FUVzRtV1ZwWVpHMUxobVpJeGQzM0xSZkFMWGtWcnloZ24zajRUMExyaUUr?= =?utf-8?B?ejlpK1paTDlJL1RqamJoTHdCeTVmbUhBaWV6bDdPT3VJajlrQmFNdnpSeWFv?= =?utf-8?B?R3VBN3hVZXl2aGhyMXB4TjRCMThDUjd4RVJmTm8vMm1CQ0c5UlBYaXV4MTht?= =?utf-8?B?bmFrTjhTclRRNFR4TGd3U1ZlelZTdlkvN2o1NGkvSkxpTE52OUl0dWNRYURi?= =?utf-8?B?UlJDanZiNnByTzBGUW90UFNKblRkWnhZdmE3NjFPTEk1UFE5OG5nZzhlOXo0?= =?utf-8?B?dnBmMWxCYk1mcXVxdkczWFNVL0c3eDhrZGxuZTJvQk1UdmNoaVArM1g2Wmhv?= =?utf-8?B?aGVpY0tyWWE0SlFuc3lYUklncnlDSWFVNFFqTWNrdVcwRTgwcUdWS3o3WUF2?= =?utf-8?B?aHdZM2I3YWZBaWhtNHlJUVdsclQxL0Q4M2tBR1VjeTBhMzd1MTdTQVJVa0pN?= =?utf-8?B?Q1ZWbHB3WDlQS1NRejVUblRUS1ByRmhmdVFXSnMyeUZ3UHBBd0toN0xMVEZH?= =?utf-8?B?RmluT1JnN0VXd29EanZacm1PMkJWZWhDQ0pKOHd0VGZpK3VaMEhMdkM0azFy?= =?utf-8?B?VVFkaExGS1ZUaTB1UGxMM3g4WWtzY3VZWnl5VTBtcTJOS3NtSUZKSGRWbGlr?= =?utf-8?B?SlE2THlhMFJIa1hrL3JuQTNvM25FNFhLV1FrU2g4Yk1UYUVsOVpWUTdrejNC?= =?utf-8?B?QzFhcUpOOHJTTG5PaEQxcTc4Y1BXdTJlTDBXY3F2aExhY2NXc0g5MmsxR00z?= =?utf-8?B?WGNQZmp5N3ZoSTNiUWdiQTdhRlVNaHVjMjZTWmdIOC82OC9CSnBmdCtkWnJ0?= =?utf-8?B?VkRnYzhueTE1dTJMSjF1YWlSbDl0b0Q0VnJsMUNDekNFbXFBTEZ3VXh2VWpV?= =?utf-8?B?NDJpUEM2VU4xa1dwNmd3dGNQSjdldFpQSkJxNVU3Vks3RndMdlVDUFJrUDVP?= =?utf-8?B?Sk8wdnVHalp4bmtNVEdlODBtdkJRM3ZUQTFjeXpzbkdHWGUwNmUvQVZJaW14?= =?utf-8?B?d1FnaFErZFo1YkRURmdaTlVXNmw3YmJEL01tRWRDV0VUdzJpbEx2Vm9UZ2tw?= =?utf-8?B?c0xkbGs5ZWxDdjluOEVBNG1IUzRMNEpPWXdlNHdCTnMxVlNGMm9FTDNXSHJ1?= =?utf-8?B?aFR4SXlKTzdpV25zdWhoNVBSUk9QaWE3QmFJYWd0RjZaVTNza1l1UUJRQjkz?= =?utf-8?B?Z0NVZTNIU3lDTkxPakpmd1c0dkREMzJPU2JHVkVKWG44SEFoODQvRENScjBr?= =?utf-8?B?Ymg4cWxodWQzMFhNblUzNExzM3pqdnNqUFdCRTVhc2hhVlVEUkh1VFBMU0hQ?= =?utf-8?B?aU1LdkpWUUk2OGhxMC9IVWQyajZFNXdyOGZHZFpMRGk0eFlBTjJZUlkzMXJk?= =?utf-8?B?Y1l0UUZ5WUl1K2NobjZNNnZ2bWpYZGxNL1BPWHRadU5UUXQxM0JWLytLM3FK?= =?utf-8?B?K1ZYNUNpMDZIVk0wVUV1VnlKdU1wZVAwNDc1ZWNSM0o1REs3clhCZWxYbWhZ?= =?utf-8?B?Q29WeE1GRnNEb2pZSkQ4d3pIU2FpRGVXMWw4MlMydE1wWUpIOGg0d2lGR0x2?= =?utf-8?B?aDd6aStvSU92b29jQ0lodi9nUjV3NVQ3ckxuM0FXT3RDYW9RVWRoQTVwNkov?= =?utf-8?B?Y1J6UnMwcDV6Rnl5elVLUUhNWkdlOVNaVFhLT2lDRFczZ0kxUGY5US9rSmFO?= =?utf-8?B?N2dTV2t0WU1jWVJtMXBNU2RxNWs4R2lZMG9HQTZ5UlVvQWlPUHdNZExaVjBw?= =?utf-8?B?bisvWkRwemJWT3VGaDIrb0szTkU0QXdZYXo0MVNZK0xOczBibUJ4RVhmakto?= =?utf-8?B?enMwVzBqdG5qcWhna0pGZTdVTGNIakVsY01PRENmYXltTDR5NnZrcFRJLzZ3?= =?utf-8?B?T0Z4MUlEODdpVjR0dHA3OXNoaldoc2FjbE1xQnlUN21mazRCVEJ3c1V6SFM3?= =?utf-8?B?OHJuTG92T3VFT0IveVJGNVFjZmxHakxHQTQ5MUpoUXNDSFc5M1UrKytSTjM3?= =?utf-8?B?NlZhZndyKzc5RHZtQ3ZHK3IyYWgzVStBaGVoNTg3Z3c3a3RsbVQ0bzJQVVRP?= =?utf-8?B?d3kzUDVVVnhMVEpic0FhY1kwL3liVjNIZjB4bWUvZHBsSU51U3ZEWXdrNmx3?= =?utf-8?B?N2tua2NkUFAxV2k0bExmRHg4SmN6bzBMUm53c0QzYjVWRU5iR0pObVdQRlpO?= =?utf-8?B?U0FMZmg3emc3cm1Sb2pBYUo3MXA3VXR3a3FrcUlHMlBpd3FsZ2txV3NFWXRs?= =?utf-8?Q?dk7dgxZ42E8ECOgCLFu6X/udfGmprHqxtu5aJPFKpw3p3?= X-MS-Exchange-AntiSpam-MessageData-1: Gek0O6tEpSolHg== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2451d579-cf51-40fe-c014-08deba65a399 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:58:03.3559 (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: vhEQCUL1IZvIAreJNWawfslfEHlH/aA9t2vIemlkY/eXnc8WBVVpTfT3R14a2Cv9qPKk532iN/CcSgxWUYp0Kg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 Use checked arithmetic and access for extracting the microcode since the offsets are firmware derived. Fixes: 47c4846e4319 ("gpu: nova-core: vbios: Add support for FWSEC ucode ex= traction") Reviewed-by: Joel Fernandes Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 2ff67273fdff..c62d918a3041 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -1110,16 +1110,18 @@ pub(crate) fn header(&self) -> Result { =20 /// Get the ucode data as a byte slice pub(crate) fn ucode(&self, desc: &FalconUCodeDesc) -> Result<&[u8]> { - let falcon_ucode_offset =3D self.falcon_ucode_offset; + let size =3D usize::from_safe_cast( + desc.imem_load_size() + .checked_add(desc.dmem_load_size()) + .ok_or(ERANGE)?, + ); =20 // The ucode data follows the descriptor. - let ucode_data_offset =3D falcon_ucode_offset + desc.size(); - let size =3D usize::from_safe_cast(desc.imem_load_size() + desc.dm= em_load_size()); - - // Get the data slice, checking bounds in a single operation. self.base .data - .get(ucode_data_offset..ucode_data_offset + size) + .get(self.falcon_ucode_offset..) + .and_then(|data| data.get(desc.size()..)) + .and_then(|data| data.get(..size)) .ok_or(ERANGE) .inspect_err(|_| { dev_err!( --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010051.outbound.protection.outlook.com [52.101.61.51]) (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 ABFFC386C2C; Mon, 25 May 2026 13:58:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.51 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717492; cv=fail; b=WTS22hriPR2oomnCbE6ouWPu6rSnmiP/XhP8E9JFGOwrqI6JHq+kNDa1abJzIUM/lI6eYv5jHJiaO9HP4XsKiH7954sfmnYK5eT1azJ3mjhz4WdC3XAwOW6Fh7LjALP7iV0zrZqcL4jRWnsTIBvc4opCjR1LQst5VJ6EpJBEYag= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717492; c=relaxed/simple; bh=qk7TNCI6kpYppjWMlYLgX2c79MQ712+8ztH5KhRMjWQ=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=VexpFtP/5DYB05Ex6L8OQ2KytR3YIi/HjVktah9NtDStkVOan4oDhDBPynDwDQnlP0ZxZ96m2mkxc8s1nBXhK5/8CX36S7F2JVwF3NNAApYebajGcMIAQPuQCYiNxKBo86qYeI5wDR5G9/omY2CpJ9RdolhTIwiDCn0pnz3AqtY= 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=M89I04v+; arc=fail smtp.client-ip=52.101.61.51 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="M89I04v+" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TRhDwQJM2TeOlfSElc2T8XZKswwZ3Z7iCnizcX7wUrhcBo0GpgGA2luP1fGdiKYPr4bdfJDQbvODj9KuIYSDKL7p55QW3IpieSdQXemeP0lWJT247TyW5PtYSFN2xGrNkRQVwN/+cwWotX8Cp5yDNjUnsxsP6oeJDht59nzQtRm5QATneeeBC/5ZGBKx+XASicpcGSUBPaGH9BM+B8Bht4b2gAitOyE8su1EH7wJZM3yME59NQrNJwGIMAsyqfLcaBiZQqu/SD/VDMqGs2OzNT1BBcy0vvMLTWJIut3c84XiEbqc2DLHRffVAD42t2PMfQlZ04p9GALjWM4tnCXWLg== 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=myl/x9fzSJBQ0R2mDzg2R2G0SeM7YEBoke3eDTQJhNg=; b=PsFa02VHVnY+E0C2cMw5yPsW6TozwAWVHhA8xkQH+GdFCbJuNXWJ8gTqLUJApj/vmhFdP6zrnQkKWilzdU58rnn+B+jd4ayKLNmSr25KnKFZNaa9Q7Bcc2lMttOXlTQzmJxtR9Vfv/JvzJ0NN6BRsRMwxlZ+l3WDn+/3s6JzOFxHuFx9TQzihU06e27NH08mJ4hZwjHcEzDJRnb58Hn76ef3FroImhtbhd/IWfcL+zX6o8NMnn4I/RG8fMkG+g/o0Px2IRD1njdwj1QvV4uBS6qdZeBciza049Q+WmwFUJrnLVSV/oMc4WuW+EcXc0BTQfrxzdcLywomM1R7B3u05A== 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=myl/x9fzSJBQ0R2mDzg2R2G0SeM7YEBoke3eDTQJhNg=; b=M89I04v+/3T9RFYVQLbvhuMsmoUK7uXxC9iJS5hIYXWUeUs5J1EsENufjm8TZDVqSm+xH23iGOC9TVxoV4UFsa0d7lf9WGKR+BapSU6TqxdPGSA6OB4uf5sR1mgUqe+oc+zOKHXXkt0TA5TRbY/976Cf7n6Ne3i8FUJMDk7YYLLsapqRbpO6vccYRcs6rFhoavkQ99vp1SwjpxfjpHaI6DLBrP80QaKD5wym2ZCk6yIOmmjeALS0zrTNs4rqBvtE+jBkKWL/vIwC4t06regCgQ0FAt1/y/kj0grxT8otR544aE4Hv6eEh/1A18YyWMyIcDePhhaN5RgqyPAhUvh8OA== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:58:07 +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.0048.019; Mon, 25 May 2026 13:58:07 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:24 +0900 Subject: [PATCH v5 06/22] gpu: nova-core: vbios: use checked access in `FwSecBiosImage::header` Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-6-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney , Joel Fernandes X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYCP286CA0079.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b3::17) 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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: 30f930e5-e648-452b-e2f1-08deba65a607 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|11063799006; X-Microsoft-Antispam-Message-Info: Ri9gtJMHcZP58EbfcFcQdJEwZZ/mXPDVF5xL0mYbacSou0+d1mUWqiK4ZYLD8eqnhjGJiKm4ql6BsltEffTPeA5xucApEbQXRqo5wf2zbVF58U8qQ8iNfOYVAH26ACx5Iq2x4Wu56qFVldNgsY3kdCK7aoyGUwM6kNble2NyPNahUcieIKiEZNT7fiuj8zGA5p584PNCmNfWgkRue166hwS8XvWt5H58h7Rx+W0NV9KvDR0/HvfDNkdGcHllPl6licIXHdnvSP7PsqF0FvBfJBWZBxYS9bIQoNjlmP99ZP0OxdB6JhJybOLY6bKwmvcE/JuQowdddtHs/cPHddrvltb0yUolxY/aT1QNoi+SAQ3A7zKOiL/S7DDDjKuFvU6JSmksfYThuU6Zl5DEnshB+wI70wA3uZcGmhgDyKu/W36WbJ4vdGbcbh4varbjQ2K9zH2pVCedUfXbHdXpZPkPI/MtQHFzdJ2aVRLENePuy8RD6eg59554QVBN0odeBl+HUCGGeNHPL5ddqcnlPVtGtA+hWkymBEFTJOgFUockKLwbIHphb12DT7R3E2giOXTvJfSLWQ/boHfhXBDyEmXTfsPsIjVdFnCLABwXhovB9zkyRJLwOghXCAh5Wq+exVJFNyFyYUc3GfzUXPj8ELtS4YrH9IjyhN7zzA2sM3utKHxIY8q38NqLy7gvt2uHw4GQ 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TEppMnhLL05EeWlXTWNmYlVHQ3ZKVWlScWYrQ1oydElEa25ydXhZeUxtcW1z?= =?utf-8?B?amJaVDk0T3pSUVpicTNqc1M2RTZEOXNXTS9lZzFwcFVOMVNqY1c2S1lTemN6?= =?utf-8?B?K1JLZWxoUTl0TDdTSnZWSDhEWm83OXVJSVIvWG1wUnNtSURVdkhTWDRLbVpq?= =?utf-8?B?ODhKZHd6UzZrK3Y2NzFtOG9YMkM1MmRCRUVMV2xFZTF1amFvRDNhZldldUh4?= =?utf-8?B?MzRnTXVSaUpkdDhWVWp1SVIvUEFTbFRJMitidEw3cVd6K3Y2ZDdvTlh3OEg1?= =?utf-8?B?bW81aE42R2x0YU5EV0pvd2lTaWhvUEV1TEFxNHY0eXVTeHZ4eVZaeHhGbUta?= =?utf-8?B?bWtNQWFQY0xFZyt4aC9yY1h2eFdXdE5mb21uTHdmbnpvM1M4ZUdaclNjWW0r?= =?utf-8?B?U1RwQlZnMDc0ZDNJTU5nNHJxL01BL1dIdVl0d2E2TmxvZkllWXh3RlhMWklw?= =?utf-8?B?MHdIclJWb0o2UlFPamFaMXZQS0JFZlM3MEFBT0YyKzRZYktIeUo4MG5hT09V?= =?utf-8?B?a01CcTM5cjB1L0E2NSt0WXhhUUJZVmg0Z0daQXNnRi9iRldjUElCTUlaeHVt?= =?utf-8?B?WlE3QjFpb201K01zS0dpbDNObUVFYXEzRzM4RThSL1BNZXBKaWlPdllJTmpX?= =?utf-8?B?azBiUDdOMUNaN0tSQVlTelNQKzZsbHRPeVZsc1dkWDBFVDVaY0I4UTh1T0xo?= =?utf-8?B?dUcxRXBZeWZDWnU5M3AyNDZwM2ZrRzZ0anZSWnptUGhNdXF3ZGNYRnNDdTlW?= =?utf-8?B?TDIwUDVMV2dDTXVnNkE2KzZXR1pJcms3dzN2WjVqRGxnWWZwWXM3SVowczRR?= =?utf-8?B?cG5lY2JqanVFOTMzL2s1V2tkU3RlUHVFNVAzd0l1RWdHampFS1o2dXcvbGJn?= =?utf-8?B?bThJRStpR3pNNVNJcVV2d0k1a1BQVC85a0cxR0xlcGlvOU5KVzZ2ZUVrdFRh?= =?utf-8?B?TzliTVlpelptNFZUUTlUQmpGbmRGd0RiWVQ5S2NZQ29jZFBIWDF5RGgzck4w?= =?utf-8?B?V2pvMlgyeXEvM1k0aGNkaWxwVVhQUXBsVkc0RUJTaDVsNDFlVjVrMzFVT3Jh?= =?utf-8?B?M0ZIdW5IVUYrT2tTVWFESmlpZ2ovZm4ydHAwQlc3TlJUamRicUJSNldXdkls?= =?utf-8?B?NnNmcjVsTEp1SmdaVldaRVhDKzcwT0FWdlBmYmVpS2gwdDFaeFJ0d1AzaWpo?= =?utf-8?B?aUR1ZGkreUhZRmJmblRqbjJycUVWWENHUkRwSEJRNTJSYXJQY2ROVndzS3lP?= =?utf-8?B?dmJyc00rMXBKelFTWjQ1RkswSEdkdE9NWHRYTVNRMU1iV25kTkRodVZOVE4w?= =?utf-8?B?SW1xNmIzWEl2SHlJcVNmZm5Hc1Q1YVdhUjdaMVZMMGRJTTc4MjdGVEEzbjlU?= =?utf-8?B?VW1sbmFQTVpEb0RkQ0lxT0FqRjRkWVptMFV2cThqT1VWYnk3b093NWVtc25m?= =?utf-8?B?RktBWWtTUklPZy9nWFZ4ZHJNRU5Ua1U0Wjh0d3hmVlpmWDVPdy9XbVdzOHFD?= =?utf-8?B?cDNwSGhlSi9Qdks3UTVLRkkvMmR6bzdrdVJJb1NkQVRtMzF5ZXFOR1ZZWE50?= =?utf-8?B?OWduMUhGSDdLVGY4WEJMb3l1OUNuVXdUekdscXRWSlh2V0ppTXhQWWZaWlpT?= =?utf-8?B?NC9SR0NFZHc4TnZ6QUZheWFsS0RqMStnck5GV21kWHRrVDI0MEpZcXZXd01J?= =?utf-8?B?ZSt2VlFndDh0NzFlNUlCd2RJSTN6b0I0aWRBeUhXU1JCczh1M0paYk5ORDFM?= =?utf-8?B?czRzOU5yaWIvL2ovYnpXdWY5MGJxYWlESzlmdDk2amFGUDBpZzg0eFp3M0U2?= =?utf-8?B?NkhqKzN1QUZidTBCc2I2MllyU2JBUmpwOTRjK01OUkRML0hvWDFSc1cyK3Nn?= =?utf-8?B?bzIwTld5SlNMeGZvdWZDdXlNMUVUSlRYMmNOZThwWHVJR0RDK1lGVDBKdi93?= =?utf-8?B?OG1XRDU2M2JxbzJBVHhzcG45UzlJMnFsMDZYUjRoYzhWejc5OWdwSzdEM08r?= =?utf-8?B?K1lRWEhUc3Q5OERrYjhKRklpUDJKSGVrWUtnaVBjSmhPSlJFNEQ5eFNiV2w2?= =?utf-8?B?WDZvbm4rb2QxTDZyQXp6VVB6RE1ZeFhvODlTbi9jUktaS3pBSTJWOVJPRnlD?= =?utf-8?B?Q0QyUXNWeGx0Z3JyN2J0K3V6TXBZVW5jcnFhRnBvSXZoSnBnd2RTM1pxaG1n?= =?utf-8?B?K2JnSXBXRVVOMDBvVDhNMXdtNHhDbFlTVHg5cVNTaHIyZDV2aDZqeDdxb0I4?= =?utf-8?B?WGsrUWdqSTBkQVZOV1ZjYzgyQ3JZWjArVXZLeGJrbnRaTTNjQkoyZE8xVHNk?= =?utf-8?B?Qk5heHZNcXA2a2lWSmViUitVQ085VHdJUFRJbk5PZXhEbkIwRHdKcGl0ZEQv?= =?utf-8?Q?k5bEAUy3wEWxmQz3DJPpSP7lI2a+77cPez/fAgBAqGLkA?= X-MS-Exchange-AntiSpam-MessageData-1: eP5PJhKIMHSdqA== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 30f930e5-e648-452b-e2f1-08deba65a607 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:58:07.5957 (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: e81zTy1/vGGHAbdx3mbOr0dFiOEIJW2EmTMeXG5hO4pjXzib1Ei3G36/L7w+OEkl5kPQC3IGFqgqb8suelVGxg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 Use checked access in `FwSecBiosImage::header` for getting the header version since the value is firmware derived. Fixes: 47c4846e4319 ("gpu: nova-core: vbios: Add support for FWSEC ucode ex= traction") Reviewed-by: Joel Fernandes Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index c62d918a3041..48a46684e279 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -1077,17 +1077,14 @@ fn build(self) -> Result { impl FwSecBiosImage { /// Get the FwSec header ([`FalconUCodeDesc`]). pub(crate) fn header(&self) -> Result { - // Get the falcon ucode offset that was found in setup_falcon_data. - let falcon_ucode_offset =3D self.falcon_ucode_offset; + let data =3D self + .base + .data + .get(self.falcon_ucode_offset..) + .ok_or(EINVAL)?; =20 - // Read the first 4 bytes to get the version. - let hdr_bytes: [u8; 4] =3D self.base.data[falcon_ucode_offset..fal= con_ucode_offset + 4] - .try_into() - .map_err(|_| EINVAL)?; - let hdr =3D u32::from_le_bytes(hdr_bytes); - let ver =3D (hdr & 0xff00) >> 8; - - let data =3D self.base.data.get(falcon_ucode_offset..).ok_or(EINVA= L)?; + // Read the version byte from the header. + let ver =3D data.get(1).copied().ok_or(EINVAL)?; match ver { 2 =3D> { let v2 =3D FalconUCodeDescV2::from_bytes_copy_prefix(data) --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azon11012000.outbound.protection.outlook.com [40.107.209.0]) (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 CA657386578; Mon, 25 May 2026 13:58:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.209.0 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717496; cv=fail; b=VGvecmfkUoz5LQxy4LL2Toe2XsD92Lcr5uUPQMYwQlr2OEUuTSUTczVKGk8AmfK2HHcGUeWPucwEYXc8kxAhFA0c20xgAK0l+BPFgJM/PtR6VHLraYUraEn0mHa3ATTuHxxGrFqmXwAlPF3n852TZqAThSaisrgGiomFz96DSDY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717496; c=relaxed/simple; bh=eusDGZNoX63KwlghMtjuX/sYegM8AWkfBytASHAhQWc=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=ScUkd1GqhlZbM0nXl45vUlTk35lsoZZNKQawvtsGRZtRS0MOAUhqKLkjTeVKSb8uVU5YLUhF96Zgz43Ovdb+lIN7HFLHfRFGh/RaBaT196e1HvThKr1nbnEgS+9//ndswnDDl8eJNkZpRiswXpf3Fj+ky1onk7UqmmcE8srjWsw= 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=V+rduHfD; arc=fail smtp.client-ip=40.107.209.0 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="V+rduHfD" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IkcKS/rYEqj0A/4xQHHvC9dufc17BhRsWBaEHki53OhUwK1iuWWIV3JyKVk06I9C0pvMvAgPnzOsVzQILkoyZXWAV1I2iOKSfYYWTyqQhegudcwNv8UlsfS5LFyJzw+Rnka0lbIA4//A71JFoJCCZ9ba++6xlhlGUws6aoAwDlApO7Dhp0GDt9RKoAy2vZ9WBBRDHPsL8Pirvtk2tfuUt2lIF4j3yEcw5gR9PS26I5+AFGFVC4R/yhDGQ97O4mIpLnpOo6WN7pgchV6y8kdIvZ+5UZkm4KvyRCknQFfJMHsfjYlXE5o22GJIq34jsTKsbW+qY7/a/40Sg+XNaUCKOw== 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=vzQ0BY25+SCsq/oD93ojUjpEBLODGWtIgKN6A/oWX0k=; b=LUSFBdWQVJj52496+pZ4J5tN6Yy3O+vgUrrxqhYnvfTStrlH5N4RFCm0F4DH+U+omXc28wFvwQYwqJPnzC+x7K3R2DSIFTwJA6xD9k1NCgoxBZqRRU6iRjHOB9UnyREtWRsZ+590K3bHTSjmv4hXysJEo8Qq3bBb1x6X+aR2XfYRkQxX8+cRGg7cWtEVHoLV6QGEiMHDwlvW7VM7E08xCqIN7dYwoWnifvYbpCFRJjrKPyLkp5y/42NeLRJDATHmNVjeMtUZayMZt3EOVFQx1ezUapIJXc/taNcv7D7asi/PfztcFT+9RrpcNdRQOlJsDLF784CGY6LZlaFQqvxVKg== 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=vzQ0BY25+SCsq/oD93ojUjpEBLODGWtIgKN6A/oWX0k=; b=V+rduHfDf7GGMMnsqni9O3Ly3i7Ipd6VabnadKqCPWpVmXxMnfZyuhU5QS+k4d30SDPwkjb2WutbDV5uWjUhcs8nktg634lJNCYU4fkWxbY3ZjRLIETcq/4IL+Z/Hlz+PPtFcszO67MuS+JHrh+VLG9bsAcq17Vs0RjGab1E4aKs9wo3D+xedeSrInHSJqq5hGXrb23Lhg83GRR8HQaUdOKKGaDTLRNQ8ORrQza2YATsgn6qOHYiPHq2uYh7dcrv4Vyz7pTanQ4Rxu54fDO4ZRT+fylT99cenk3c0C0WZSAITmA8KUCcLciNI4Yw505vJMAGyQEQznV1capxJoXW0A== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:58:11 +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.0048.019; Mon, 25 May 2026 13:58:11 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:25 +0900 Subject: [PATCH v5 07/22] gpu: nova-core: vbios: use checked accesses in `setup_falcon_data` Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-7-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney , Joel Fernandes X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYCP286CA0080.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b3::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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: eee82371-7723-46d4-45e5-08deba65a895 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|11063799006; X-Microsoft-Antispam-Message-Info: CCkvNE1esMI2rJDLPAKqucYhTZe+cmo40Uvkoe9MUPzs8G5RNIiGhYmlE7qKKQQRsXJLhQQTN53jF0g0VP2COlcizAAHSxJX2m6sJmFtIIP22bRKhcKdJJsLgUBLjc1BfeszVseQVi9fA14zcYBoBidsKR4CtdWDMsppB0RLW8EDfDdu+0mi2AgUCHn9eNOUQWWtJ/QbZdmiLZyqZy/WZEY7YFYrc7pdpK5K7lDVMO7IKAta+DQBD/xGnS8n9X38JIxWFTa4EpbwvEdEngiQxtGFcf94owvbfCBaBsdoI3a2Hl7GYavxw5kA2F7ZN+WR3peg8sH8Z+i2cLIDD5xXEw/408KGaLNCEKbAPWr6BD+td0SIQ+2NccjKPvc6dm/WAIjmtkWG78opKeH9D7FyTxTUNezbtjUvupDZ3Slbf7j1gDSuj1UGmZVTXCT7iZ8bzd3EGLq1qzGsU69RYsAG/nKbL9iyCh2HXtvcx+gLfWlggvvTzQ3ip3tvcPyBjU7mBmShmDu5n45ugz2aJzlZv5xEOSHNhF92NPVE755LKKI12dvwhReQsHtgKdzHF4CO+UFzrGcOQqeWd7lZ2RPkUesnJ2lbpQ98KcjXgBDknqTCPETx0x2QPWNJlf40sr3mS4TG/K3VQ5jlHSAIrDq/BCKuL39xBihcuKj/Ysaif9Az5hyKDE41EEGXmUaU4Bpp 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YXhEUUdJRmVwaE55b0hjMkEyK3YveTk2UmdlK25JRUphdCtJR1BMekFlb21Z?= =?utf-8?B?TTcydXZuV3pqMjNrZ05WaVlDSDdMa3BKZjBiTDVVdG5sT2w2U1V2L2oyQ29k?= =?utf-8?B?RU9lTDY5S3JSRVRXcW8xRzRKYmlxaHpiMmlOS2ZMV1lGalVCUlBjRk9VK2x6?= =?utf-8?B?L1JlZ1A5bWJHNnU2ZFUvQnluQnZ3ZGhvU2x2V0Q3bzJxWG5kYnR4eUNHRmMx?= =?utf-8?B?OVV3TzVVTjVFYVVRYmhTbnZyaEh1VDJWRHUzVDlubmZmT202WmtKS2UvZk5j?= =?utf-8?B?RXc5LzlxcHh5SVpvRW9DTjJGdDVJbWRvRmhFSHlYdDlEbGdmbUtubWFGR2Nh?= =?utf-8?B?M1R1UGF4cEpuSzFzYmhJMDRQcS80Z3MrOUw4Y1Ntbmh0dExWUk5VWWFKY3FO?= =?utf-8?B?TjI4YkRrK2R6d0R1SVBOZnpWalUrbnRuVWtTTVpIdllheHR2amhRcGhwdXFY?= =?utf-8?B?MTlFa0o3N0dNbzBaN2tpU1FHamx1RTBGdllBcTY0QW94ajJqUzFKcXhXajkx?= =?utf-8?B?ZHFKMWhpWHg3S001RG1ORFd1UEFiWERyZGtjRDd2b3kzTmcyelVNMTd1NzN0?= =?utf-8?B?VTFYSHgrSUY1c2FUK0N6eDBNTXliSXB1QUxxVTJXczFPcWxmeWx3NU56SDY5?= =?utf-8?B?U1lMY1dacVBGTEJGRFZqWnJ6dU92MGRUeTRIUktNcG01ZGdZL3VpM1NBb3Bo?= =?utf-8?B?R2Vybm9Qdkdsalk5R0lEQUoraFArZjJEamN4NnNPemM4Z1IzUlZEQ1haNnhh?= =?utf-8?B?Q2NxSjQycTlrQzB6OS9PcTN4bFhUTUt5UDc3aTlpd3ZsQkpMVXEwYXpjYmNN?= =?utf-8?B?OEJRdXdtUWhCSlZaRnVnM2lUbGhYK3Zlb29IUUpCSjhsSkxIeDJoMGF2UDNK?= =?utf-8?B?dENQZGFqK2dpSGo0RGVjRzhSbzQ1d2dtMVhIcXdUVDBoeGg2M21GakhHSU9y?= =?utf-8?B?YTY2RXhDTXRReDU5cjY4Nzdia3krekhQUVpQV3BzcVJrVTVIbU5aUHdKa1Vz?= =?utf-8?B?VWJyMzA4RXhCbklUV08xa0VWa3VvZ3gyZUh4akxSOU5oR2tEZFZHenhmaGFv?= =?utf-8?B?eUExcGEwQ083SnlXdzBNdjJua1V0ZFhxcnJWTGR6YVUvWVRXeGg0U1FPTlIy?= =?utf-8?B?NWwwYUJSL2NsZ2VjZDl5Mk5vR1ZxNzgyS1dTT1NvMUt5TVFjZ01GaTZ0VnB4?= =?utf-8?B?UFJDaDJvNE16eHlwczNYUWRmZHpyaHdaODk2UTJCcnpWU3BZYU5CNiswUXM4?= =?utf-8?B?aFpvNTJLbXdsTG5sRUdLMmNmRDczNjNLYzhFMXZyTU5tV2F1ZXRZbUtyanE0?= =?utf-8?B?YWhPcTRURlp3TFBuMjhOT2RDUTJQYUpEZlJWdG9vNU5EMjZYQVF2RDUzVWNC?= =?utf-8?B?WHBoc2x4ZW9qejByaVlEcHFiTGF0NWtiY043cGFLdndxQ2NSNytLTUUvS0Zw?= =?utf-8?B?Q1NxcloxbkhIbnNMd3d5eVI3UnNpTlRaaVFRMU42Wmp1L1ZhM2JsUDl5cDhT?= =?utf-8?B?NWhxYXRZOTIwQU9xRDdGOFpYMzF1STR2L2xEejRXbDdFVGNHR2RreVNEd1hH?= =?utf-8?B?Zk84Njc2RitaemVTTlBRVG9LUHRBVHBLTGdzU01GZE1JblBrNDVPU3NxY0N3?= =?utf-8?B?c0tMOUZTaDJ3RjRhQkdNNUwweU1wdkZYTnNWcWsrb0FMZ1JxdnkyUzVOenhl?= =?utf-8?B?RmdialZiZG9GUDFNN1Y0SHVxak1OZkNGdDN1eHpJSk1DTVhINnA3TkJza0pX?= =?utf-8?B?TG96TVhVa3o1c2RkVlVlK1gyM0h4dTJ0dis4SW5WYWdnNElnMVJuemcwUzhk?= =?utf-8?B?cmUzTzRvMlMybGkzUmJNVTQ3dTRsMmJqbGR0N2JtMDhNWTJ3UXBoUUZwQ2Fv?= =?utf-8?B?Mmw0RXR5RHUzd1BUenhEUWNBZDkvQWxGTWFkby96SUVEOUhvSFk2dTZGNDF4?= =?utf-8?B?OXB2UVgrOFF4aEtOSmVKeFpOQkRTWUtqZDFFaGNSY09DOFhYRDdreFhDZkFs?= =?utf-8?B?ZEFWL2x2U2pjT2QxWTFLTWJXTzM3MWM4Y1Q4cU1QNWVxQi9QaVFoS05VOGVv?= =?utf-8?B?eDdITU45QmRMaU81VlpmWk8zc1llVHNMVHdMK2g3V2p1V0x1ZTRtTnFTSU9K?= =?utf-8?B?UjBVbytjVHQ3VVJqMXdSUllqNTJzMVlkMFNubDNUc1JFYnQ2UFZUWTZkUTFD?= =?utf-8?B?MDY1dStJTTkyVG42ZkxCeEJ0TmlxU0RwVFNRVGt2NXU1VEMyVVd6K1FYTDJK?= =?utf-8?B?aGlXU3ZucDJMZFYrZ0c1M0t6cE1FMnVXWmtsYWlsc09XQTJMam1qWm5Rdmw3?= =?utf-8?B?WmlBbmN2N2U3Ry91RmZxNlBUY2d2WndPS3ZqUEszNEQrZG56d01pRE1jM3V6?= =?utf-8?Q?4UTvxN/41npd526Gvh5FKP1YU3oM52Ym/3eCjW265uxNm?= X-MS-Exchange-AntiSpam-MessageData-1: QEMavzs7XROqUQ== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: eee82371-7723-46d4-45e5-08deba65a895 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:58:11.7526 (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: r2KwDp0ehmDq5ox4tm8iJkronzTtieELwBPZYOH9fc1d2r2g0fSXQ3SaMWx4R9bvyzA1Es6E3YUrFFK4rVZuGA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 Use checked arithmetic for `ucode_offset` in `setup_falcon_data`. This prevents a malformed firmware from causing a panic. Fixes: dc70c6ae2441 ("gpu: nova-core: vbios: Add support to look up PMU tab= le in FWSEC") Reviewed-by: Joel Fernandes Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 48a46684e279..871f455bb720 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -1036,14 +1036,15 @@ fn setup_falcon_data( .find_entry_by_type(FALCON_UCODE_ENTRY_APPID_FWSEC_PROD) { Ok(entry) =3D> { - let mut ucode_offset =3D usize::from_safe_cast(entry.data); - ucode_offset -=3D pci_at_image.base.data.len(); - if ucode_offset < first_fwsec.base.data.len() { - dev_err!(self.base.dev, "Falcon Ucode offset not in se= cond Fwsec.\n"); - return Err(EINVAL); - } - ucode_offset -=3D first_fwsec.base.data.len(); - self.falcon_ucode_offset =3D Some(ucode_offset); + self.falcon_ucode_offset =3D Some( + usize::from_safe_cast(entry.data) + .checked_sub(pci_at_image.base.data.len()) + .and_then(|o| o.checked_sub(first_fwsec.base.data.= len())) + .ok_or(EINVAL) + .inspect_err(|_| { + dev_err!(self.base.dev, "Falcon Ucode offset n= ot in second Fwsec.\n"); + })?, + ); } Err(e) =3D> { dev_err!( --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from CY3PR05CU001.outbound.protection.outlook.com (mail-westcentralusazon11013056.outbound.protection.outlook.com [40.93.201.56]) (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 BF7DD386C20; Mon, 25 May 2026 13:58:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.201.56 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717500; cv=fail; b=dt+2U1JZ2rpbPM91WaY/1LuEdsDUY0DZW6KYCariV51N4cij2F8Asmc+I53WfzNrRespAVsSEwN5Fx71Z3Z4vv1nx6cLWGVWSP3QdBxLIpUoblk4jzIBYvXrRbT7VUHiksYYnzlCSIcsTLiVSLBveOthFB59olmDL29aaNEedfc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717500; c=relaxed/simple; bh=k8GRcJADHCxNSNQjtJt2YUK//QLkzN6tWJc2lYuOyoc=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=DNcfb3Nmx1sq9dInv9XE/fK7vehdTzrbjI12mmhUczwQJD3uTpHi0XYHNHohqDqpoVE/IN3YJ6DfJVZp/gKawmzvrIcxKtrhPodw11bnvKFlAkpZ40JYh4ST9DdKAfx9VGsCTiYT24nPEjOiV39KFo3tjg8lAChf9/11jh+G8pI= 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=Oa1YLF8S; arc=fail smtp.client-ip=40.93.201.56 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="Oa1YLF8S" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=G46h25Pkd2m5bVe8KOA3MObIVNLDkhQHN83IW3mYESXMnLZWPKjWDel0Ydu3/L6IEXopkZVQogdJPKMjmQZOgQvhGlU/czJwuYO6RZRKQvC2AbEYFJAu8fM8CLDZSlnrAfZ0docqoVjVCg2rc1oFhj5C8DIrMBUJffUdynBwh/UYdExXw2wxVEJR0IfzhnC2dF+XijmjnXVKIbOarFrRasvAh2Q0U0dlwhv9GPb8I2ScOUASS8VRhXtdctCaCjkOauE9T5fOC/KPYYlaaSsd0+9skVjmUEdzzPKUovJ4wqDxH27wNGw+75as2vTbd3AcnWz+I0m6akmnJ7tmTK61ug== 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=Cmo2IlJBcwtJXMwfctTubQN5NWXZg4+Znv4fSifq6vc=; b=ABVNDx/mqnVFw5M8je7W79cMlUy2c72SqLBhBIkXvFO0v1Zwii37XUAvrFAk6MV4SDV/OoRXwHjn46BonbZ49BxXcNQPgaiTLfLVT1gPAISU2Il6kC7H5tLUtSLu/wCkFcum0dUZxQEETLhasjN7sWld6h/3BPK6P1e/o+Jyxsulb8wplZOfTyX7UyfjmDyOXcxiK0mywI5XQzJaZoB7Ak0N1soaFG5Nf+iVwyrNBVr8zcw3y8zAoWg/YQ+N5iGNxLqL2VpZdFaiZgjfDcS8NKwImI/R/qhF8xcnkN8Eaop8oT8zs/RVZu6oKTI0dQdXJZgIJPwa75ML9N3OpGGBpQ== 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=Cmo2IlJBcwtJXMwfctTubQN5NWXZg4+Znv4fSifq6vc=; b=Oa1YLF8SZBq3eO4iidVdztGPuMsaDaQreXY8Ge1DNaTiPEGklpIFi8EWmpemXmhjb7FJ83/331RJz2bTH2DW+4D4S5YuP81Z/p2dAaF9JrAuRgPbhEqZwgaH/KWT8GEPGrefCvIvRS3++2KoBxazMw3TzJTCR6HxpZbt/bDHOVTpkmGcDhUE+q+Jo1qPwQcwnD95Wc1SRm/z+vEt/RambLP+EX4w+hdPwy2mOG6KmTQGyecUvbnCNLY+fle9PqlMlTI7ls5+8UgEYdu/83xwqPhQDwUXP6ubGfzqZuqRZ2uWLfU5zYTcjJ+/xIADz07vUqpI/8yjhJJMafqTpnWWFQ== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:58:15 +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.0048.019; Mon, 25 May 2026 13:58:15 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:26 +0900 Subject: [PATCH v5 08/22] gpu: nova-core: vbios: drop unused falcon_data_offset from FwSecBiosBuilder Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-8-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney , Joel Fernandes X-Mailer: b4 0.15.2 X-ClientProxiedBy: TY4P301CA0051.JPNP301.PROD.OUTLOOK.COM (2603:1096:405:36b::12) 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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: 23238181-1a75-4319-b0ec-08deba65aafa X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|11063799006; X-Microsoft-Antispam-Message-Info: k0yDlGk1AOW5tMOrbUj5XZIb7kuoC9QU85wnv1K0scVN3d7U4kw1TCnY37Ht8x1fImaYYevcq4qU3RW+d/m2dW3PAuAskr/HSpGMtKUsXXIuYrMpxzFqy7DkW846yp39InZlsyBquYFNZM8IQUoO3r8yzYSmlGNLuzm8riPCSVxE7OgJ9PLJeNKIjeHRu67R5tSSSh64ssNDDwqyaW1YU6sjPwqlgBM2rYZOGhLy00zyoi0yjqy6gJIBa+M8KEqghj15avg60M1yvvemNoHLMXt8mZWuNcU1BVc5oP2qRgfmqoqplgHIKt7cyPfQT3cJ/bjvbHmXCyp+HNgN9KG0soIpiS81M7LSVcVCrJVDNQ7tjRz3UAyXiuqN+fO10GncHXnWjzUtOak2nOnFP+GKB/1s9mBHxCykv2DwN5ZxII3v3eaWCLUZyGUZ+/cAvd8Zh7EFlaiwopK+ENnLNYpYYSYkF6l+FH3/mrl6GsZy3QSHDP4cryUvmKTppnpvAKTpSQr68oUIpyI33p2Ls2+07PQAuGWuC1P4hi5uWXrionwoT1Ivuoel9Gb7Nn9mxN6m3ecIdqnHenN3SK1t9YVs3LB/ZUhwl3+ZnkLKQ0qACKT26izFMIomLufr0Nof3h/Ckqgyp5BCR0tEUCeFrDdSHtq5H4tGhCMt1TEMdwCK21+T2RF5YESyBkBGGwdpnZkH 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ZURaM2o2eVBUVHBRMTdzeFFhMlRQaHR4dCtBdG9mOTlUbzczMitsSWxpWDMx?= =?utf-8?B?alVscTBHVU5ndHROeWxKb3hpQklrWXZMQnNaamZOdnlWZjNLQVF1b0c1aE1G?= =?utf-8?B?Si9RTTJkTGI1WHFvMXNUc3NVU2VzUVBISEEzSVJ2OUVmNGJQTW83a05ORzY0?= =?utf-8?B?MldQdWFJYS9CWk9xeGNUazBEdEoyRjNoUTYrMmU5d0c3UnpBSEZsc1ZVejBy?= =?utf-8?B?RVhSaWFZNWo4eFduRWVEbk9pTW5mengzbEVUOXlWWmFMbnJrUVh3dXZHV3BR?= =?utf-8?B?L1pUeU5ZUWtIa2dESmxORXBPZ2VPemRONXQveXNWSWxlMjlQTkdOMExuNlND?= =?utf-8?B?cHNSQVZCRDkxTG1iZnpWajVNYnpybWhTWHZjZ1lMVW0zNnB5MXdMNnNVTDIr?= =?utf-8?B?d0ZVdFBhRnFpdzJuaUhNaU5zMHRqL0NPeE1CbDNTY21IS2htZTY3V05qTmNP?= =?utf-8?B?RWVJYnJrbmc2cXViYVdYU1dCQTVJczJnWDBDcVkzVlRGZzg4aG5BNm1DenZp?= =?utf-8?B?aGRxVVZDWmNRbU1SSVRGZEpib0QrK01CWlZyN1ZaMmhMMDBsakY2MHdIaTAz?= =?utf-8?B?OUt3bVh4Umo2NmRFVlVZenBGcnFRR1BFOGVNaEtKMUN6ZnNKVVdQYzZISnoy?= =?utf-8?B?Q3pmMEcxNnR6NldGclgzNFZRWDk2aW1QRkd6ZWl5ckViZlpGMXgvaU5xNWdl?= =?utf-8?B?bVdpQnZUYXk0YzVmSGFLenZyRDREUzZ3bDNBeTQ5TFJTRVFoeUxRMUxEcDFK?= =?utf-8?B?dVRrdUV1WTJwcVBKVXYrZUdCWTBUdDRrTmdJNDVsS0k5NzJ1eFhnQlZMK3pY?= =?utf-8?B?UGNHTjlmZ3U0RXlObDYwdGZ3dkM1ODZvdUVMZEJyRGcwYy83a1ErU0Rna0VM?= =?utf-8?B?ampObDFIbmk4TTdlSk5lbmx5VGdiam1JQjV6U1p2ZThCOEEyNnlFZW92YkV1?= =?utf-8?B?Ymt3M3ZmRUFFM0lUZEJzeDFVcERVT1R4Mm1IRkZvUzBRekc3cGFZYkw0S1du?= =?utf-8?B?MWtPZWlEVjVHVFgvZmpMd2RSdlc3SHR3bGlGeHhET21HblhGZXB2SjU1Q1lz?= =?utf-8?B?NXRud24wNDNBaXNISXJDTDFKb1RYTTdjT1BCNldSUlE3K0kxbFBIeFk2RzVs?= =?utf-8?B?cmxoaWFNUEJMNE54UmtpN01uN0hlakpYL2RxWnhjVDFOajdwTDNNbHR5WnBU?= =?utf-8?B?VHV6VFVCZUJEa1lobGZwRlkxWDB0VVNuVklaS2tvZFE1Qko1T25jU2lDRUFF?= =?utf-8?B?M0V5Q3RmR3lyNkNFanNCQ2ppbWQ4N0hWbnVTcmZkZVNxV0F4Y2JKSkpHV0RK?= =?utf-8?B?ZmMwSy9VWS9RaG9hMGE1eXdydTVnd2tpVTlWQ3gxNmxiYXBnSVRXaFhjcW1a?= =?utf-8?B?MzBWdHNXaGVDQktNTWZGZk50U2Z1WnJWczlkYU45enQ4R3dxcmUzN2c2b2o2?= =?utf-8?B?TVVQVHBGY0VqY1dKNTVUWnNFR3lMcGVxYlRXd3RteHo2MEZjd0I1NzJOWGk0?= =?utf-8?B?QjZYN3V4UUtSd3RaSWlxeG0wRGZOaG9tdkEwcjgwL3hyWDRDSHBwMjRmWGN3?= =?utf-8?B?T3JaV1psNTNaM0wzakg5b3BBR1V4V0xLeWdvcUlUdXM4ZFlXNWU4S3ZLSVox?= =?utf-8?B?cmpOVXk1VzY3NXlaWTBHaDJYcXIxV1BESTJmcjhKK0ZZRDdNNFR3Qk1aQkNB?= =?utf-8?B?ZkxQZWJZOXhlYmlSY3ZQZUhVL2lZVEJJNmVlZlhHNnAxMWJFbjQzQkZ1RFlI?= =?utf-8?B?Nkk5dnR2OERrellDYmFRZ2xzZGdtd29iQVFkTEg4cG5KWnZpWHM1ZW9rSk85?= =?utf-8?B?SXZmM1BHdUJnUXdCRjFTNWdsMFZqem5oYStHWFNueWlVQ2JuQW9Wd2VCUTNX?= =?utf-8?B?RkgwME0wUzNmREJranBzSHJuazdGNHdQa2VFYjJNNkxjK3A5eE41Q2w0VEFK?= =?utf-8?B?K0d4OXFETWZtMFJEbVdkSCtNM3RaUlpKc0JwU0t1SHIweFd4UUlqRXJhZnZT?= =?utf-8?B?dDZMbmtvRXdKSVRQYzZrSXNONWx1Zy9LLzdPNG8rVnA5Zjk2V2NMZjJsMjFU?= =?utf-8?B?cVRnc3k1SFlHMTJ1amdLNzhESDc0Z3BDSkhvai8zUitEOVZhbTRnTUpIZnNQ?= =?utf-8?B?ZzdZTERqcTl5QmNpVlcwQUp6Zis5Mi82dkRSSmRYTm0zMVlYdzBjVVJZV3FD?= =?utf-8?B?VVl6NEJRaHIzMDBzZ29IaTdteFZwekRBSG92djJZSmFlK1NXQlRDeFFKSXJH?= =?utf-8?B?aGxWYXBmSk14dU90N21Iekp1K3VJemFDK2c4SWcwZEVmNTEyajVUUkV2dkJJ?= =?utf-8?B?R3VzMjFSamxvS1VTc05haG1xN1NoeDhIeWE1WDJkZ29CY2JhRkcrZldBSDVV?= =?utf-8?Q?qJnqIRl6kDXpAY8VBMqLTNrdSM3wrxwEmpNeUZQ56BeTp?= X-MS-Exchange-AntiSpam-MessageData-1: 22WsjT5iJjdxvQ== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 23238181-1a75-4319-b0ec-08deba65aafa X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:58:15.7383 (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: e4VkN/ZOpZSVAqNoOdXNpSGt/5/z+9kMl1TOMbb4tbRR7UMtRwZKA0PZrJG0ETHXHwPzWpcXCSFvfugYl7ZqCw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 This is unused, so we can remove it. Reviewed-by: Joel Fernandes Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 871f455bb720..8a0e16e6c9e8 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -338,7 +338,6 @@ pub(crate) fn new(dev: &device::Device, bar0: &Bar0) ->= Result { Ok(BiosImageType::FwSec) =3D> { let fwsec =3D FwSecBiosBuilder { base: image, - falcon_data_offset: None, pmu_lookup_table: None, falcon_ucode_offset: None, }; @@ -712,8 +711,6 @@ struct FwSecBiosBuilder { /// Once FwSecBiosBuilder is constructed, the `falcon_ucode_offset` wi= ll be copied into a new /// [`FwSecBiosImage`]. /// - /// The offset of the Falcon data from the start of Fwsec image. - falcon_data_offset: Option, /// The [`PmuLookupTable`] starts at the offset of the falcon data poi= nter. pmu_lookup_table: Option, /// The offset of the Falcon ucode. @@ -1015,8 +1012,6 @@ fn setup_falcon_data( offset -=3D first_fwsec.base.data.len(); } =20 - self.falcon_data_offset =3D Some(offset); - if pmu_in_first_fwsec { self.pmu_lookup_table =3D Some(PmuLookupTable::new( &self.base.dev, --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010048.outbound.protection.outlook.com [52.101.61.48]) (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 2CEAF38836D; Mon, 25 May 2026 13:58:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.48 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717506; cv=fail; b=JOQfpaD38uYz4vYGkpxfd+StG+gC8hJ/dvyT3HDIcBaC26xyZj52NlscOmcVENufBx93eEWWE+IJv+7TlDlhIxjCK5jXLzbZSc6ZMXkDf6d+jvRmbCQPhTReIu0I4qQyfyfCfLW9Bm8FXAUVh9f8w1k1qqx9b9NHIoO1SDU03uo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717506; c=relaxed/simple; bh=PS3BTYa7DGId8XD0ZxjPrZZev0SqI8nk0YXr6X3cGek=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=QqylIpEucLdnyKz9mY7dhfHmkjSj3BHKGH7RTufEv5Lq5OmtkhkQWsOJbcy42ii+ljCcJEpghLgQOteinlDOvI1mOUknVoGsCnQZuAbygCPEOHIB6t8NLEvddDljvnazyNE8c1pLjWVHOPvElLGLZA43Vwi5hJ1tTein0VXZme0= 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=Gj0MOX/4; arc=fail smtp.client-ip=52.101.61.48 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="Gj0MOX/4" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=GNSwEO0mNoiA4LDC0hsa/ZUXIFCRFlLeiYEZ36KRcBx/SglA+qzuDBcvGiE/DgjXWpRLRzoLm6UY8i8andxpNbgh0RtJETYdHAQ9oqHgvJVwVTeNKJLW72Bno51TbYpLzZEzQIktRFxl1FzJ92dejXYivZbLPj/HMq7sB7OMgyyp/WqV4J4H9WQ7Xn49XLG6h3gtib3ai1M+qnFj78Dkk6RGK0HPXQjHGaLfGSpRg+GFG7tMh00VbCPTuENABuSSz9Kjq+B5wQqT1A6+IsNd7V0F7O5h5tS2dgVKP096L0DwxCu5yuTJBmh+GndvMNtf6+gCkNF9GKm5i/VJJE67UQ== 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=uk9pFeENMzk1vGw5V2IC+se+8Qb55gcxR7EZeG33eac=; b=F/a5Zgz2yNXovZqwWjxs8iSUjZCPqBLtlc9yo6BVj6jakh7dPljl9fL8nq9yMmmFD3f/pufFOoG/p7mTYGDzapIA88m2ctHGCDd8gvmkeIlDawJ3dMdqWZbeUD3+u+IHg8lAoz6EbyQYD5+GRsWfPO+QhwxL1Cxehf+1P3AnO728l0WYKvU71mUCXXnQUjtp8QhuMr/5Nk/wgbRNBwBJb7XsBsvr3rvYmL/cvLpH/S1OcUPP+Iz8rXooyiGKGV72ZuAKgX+vS/T+DmQ1q7a3mCVxr26v60QTnrK84OkNsujzCavLp6Ns+kZFr2O4OoQGnWe+ql5WcWLLRz0E62EDcA== 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=uk9pFeENMzk1vGw5V2IC+se+8Qb55gcxR7EZeG33eac=; b=Gj0MOX/4Raa+TcPB/uXdpiHuhtEXaufGhzgD7Pw2NE80dTF9gjK8jgCb610EV40WSeuCB7EkWCUq/2T+lcOJ0Fpftz/oDmuQP0u4H4hwacc6G2Zt0Kuk+cAiPY5VGb7d0aJ+SRu0MhriHr7mdoo+pK6SXAnqYsp8Bpqm/lqr6MDsCMcQK8jAn2lyDExezMftlcop3yFKsPeeMhwFbrfX6kkdZUyJyslRbE7g96BPB732wWHPfAmFEIg9fal8/rAHiJyjX7dcLQK6P9HxBolxm1xJVRWUmsq6FwY8GkcTnDxbsldfb70I11iVOk8XBRTC7LBj2Y+6QFvSZNgK9Z3GEQ== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:58:20 +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.0048.019; Mon, 25 May 2026 13:58:20 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:27 +0900 Subject: [PATCH v5 09/22] gpu: nova-core: vbios: keep PmuLookupTable local in setup_falcon_data Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-9-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney , Joel Fernandes X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYWPR01CA0049.jpnprd01.prod.outlook.com (2603:1096:400:17f::20) 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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: ce8aacb0-9066-435e-7a13-08deba65ad94 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|11063799006; X-Microsoft-Antispam-Message-Info: Mj3UaKSygIS6d8RVnVc7VLD31XnABMQdn/+Arfgr+jnWvrRv8X+GILcW7I4fzSOc8Q36/MvNfEMnIlt4AOa2+Laul2XFw0WjOlCz8WVFvcdjNAnsAS89VgYve4LDPdhNvv8MHWtH5bmjqwhc3/cqTERk61MCmCBz8r+O6j71IiMM6af8LzCljXA9oeGJeMsS4fue71ViLZCm/ZEt2uAb7uw8YovDJgLiwmnO4NcJPUWXW5oDs9u7+WD8Q3Hb6WVHJfiggDB/4Kt6sHlWLqXeMgjlqEYgE+ub4A6mCOTprkRWbKRdVff7bfVVmLdcLASjrD7q7oP7fsQuDO7Dntl3KnHKavr82uw3FEpzuCWawXWu00YAxdMJWVTqdCQEJKd847yD2rbFi1su0BznEKPVHRjexCfk0RBJ59+6vflYd1RJfy+1/2pmSzU8q+jbAZLb7gXt6bV8x2OwlVvYi0ctUdefsFtB5exTQDh5yWSzYy6OqcbxH4TbP/rfk6FehAF49uNfk/QHOr1HaO/v3Pnr4PSv2rbH0neqJMlVnLaYkRlwJT0xdKenNN1MOegOyhYRIn/QdMuFZboxTgmkbu3AuqMH/ZV4uzISliL3zxPL4+Mt5Xrps3Yg2vqruWayn8Dc1MkE95k2G4wrIpaePKBG3r/eMD6X6RX+EtvKwagUedwZu5ac96h23XzlbXw0b7Ap 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QkwvQkltdmhoSnhmYXhKMTE0M2dncWgyelViMlJZMXc4MEhONkJLdXdDNjFR?= =?utf-8?B?T1ErekRJdUxxWklDSFhkVnh0WHkvMUdZamdobmFXTGtNZG10Y0w1VFpjZk5G?= =?utf-8?B?ZmQwMUZaNmtGdHNCRXpwLytRWk1MK2o3SkV2VCtNSkxOQU5DVi8wZlhoK041?= =?utf-8?B?eDI0VGczY0ZPZ1RmWm91aG5EQkljNzZLUzZvU3ZzSEZMTUhManJoOFhNTWJ3?= =?utf-8?B?dDJMNC9QdjBESXJiZnFBa1hIRHhNT1pVZXlkanlTUVhVS09GbnNxL1RTMk4v?= =?utf-8?B?eFdXL0I5VG5lWC85d2VUdGhrL2psM25lMmNTcHFmMVZwQW9FVUsyNHI1K0dZ?= =?utf-8?B?Wm5HZm1XOFZaZlpWcjdNaTh0Z0JydGcvRzYyOFZvUklzdTdWNjJ1RWJ5SlZl?= =?utf-8?B?ajM4Z1c2Yy9vZGhHLzQ4bjBWSTYxVmdTL280cUFNZGZrMUpUSjNWVHBsREZY?= =?utf-8?B?bG1keEdCWGRHZUFxN0ZWK3gvSHA5RDVoUEJKeE0yNmtxUWpqMWhNZkgxR0ha?= =?utf-8?B?cC9iUFRRWGpDcUp0V0UxVDdhNWR6SllpbEllbDRkWDR3YmdPZWJiRnl5dFJV?= =?utf-8?B?MjVlaHFyeWxHMnZOOFdhLzFZd2VQMHFFOGpuRUVjS3BxUWFkSFg1MlZzbllQ?= =?utf-8?B?UUc3alNyc1FvUU5sMWhnMFVYS1IrQjJobXYrcms1ZFlsSE9pNGRveE5iTWtJ?= =?utf-8?B?UzQwamp4d2ZsVldEcy9wUkNBZm9JeXJyM1l0MkQ1MDE0QTZPYVlkMjFvbE91?= =?utf-8?B?M0lqRVUxT0pyTE9KUkhJWm54VlErVVF4Y3VHMy90QmFCdjR6eU1WeDBtWVht?= =?utf-8?B?aFlJR1NjMjV0L1pNWGx5bTNqaUc3UkZObXZ5aWE4TW1rSnRWZm9NRVpIT2ZQ?= =?utf-8?B?NXpnK2FzdVhwT1JJZi94T3pWTUtFSnNLdjk3dmE0Uzh1Rk5sSnp2a2pXcll2?= =?utf-8?B?S0gzcE1TVlBhVm04WkJYRHVVS09mbk53UjArWDA2ZzlVazdlKzZoK3VMOVpO?= =?utf-8?B?R0trWmxybW93VjNFN1U3TURmZUZCSnpnWjlZRlR4RHNFRnAxZTNsRjRRVUJo?= =?utf-8?B?cGhHMjRLaFAyRzhqRFV2ZEtpMkkrQ0dQQ3I1bnJTYlhQRC82RDdxQTkxOC94?= =?utf-8?B?c1FrMzhsMXY1SU9DeFRlMUVwQzdLZjQ3T0dSK1d1WkNNd2JVTUxSbU9yRXFk?= =?utf-8?B?akwyTEhKbStYTnQ3T1RoQlR6UTA1RzZXU2I4WEovQW51dzZsdWk4OS9VYThU?= =?utf-8?B?TlhUakEvSWFJbEsvNFZzT3M0Mk5MRXFHOHQ5eHRUYkV3U1pCYm0vL0FOdmNH?= =?utf-8?B?OGFBbUlYcWJmL2lmRitOek9PUXl1dkhFKzhRZURNaGk0cVE0emZxYU5tRTdN?= =?utf-8?B?OVdzckM5cGYyWFVqajY2UjJHSHZXeWR2bFBLd0lPVjMrNm1zOVF1eU56VGZr?= =?utf-8?B?eXNvRnlNenhQYXNoYjNmcjJJN1MrR2NmZ0NYYmtOMVVUOFFpMk83L0tKWi9q?= =?utf-8?B?c1NXQ0hnOXlEeFNEbDNiNGFJN2FLUVI4S21YS3Z6M1IwR2pCS2xEcFVia0hH?= =?utf-8?B?Wk8rTzh2TFdaRGxmdnh6NTRORk0zRmRQb1FBSmZBcXNkQ1cxUDQ4a2tjZ3JD?= =?utf-8?B?a2JTTEx2RXFMeTJ3RGxzR0ZjTjJ3bDJWZmY2dU43YVJNaXgrNS9oTGhUZmRZ?= =?utf-8?B?cWJrZm5QYmxUbUZNOTFiYnJqcytRZmRONldRQzdpMDh3L2JpUnJ6TWZjcFZI?= =?utf-8?B?YmQvVU1Lb0hsR3FBTE1mQ0I3SHQxTk5HdnVWcGlZZVpaNjhJTFZZWnBGTGV4?= =?utf-8?B?T1grdWRoS1VoYTBTV2RnQzkrdHF6MVN5SWE4dEtnbjZtOExVV1k1WEs3dlY1?= =?utf-8?B?MUNTL1ltdXJod0FCM0hTWUJLWlNGTUtadTZCcllJMWRNUWpwYUl1Q0QwVkpE?= =?utf-8?B?K055QUZlQlYraWk3c0FycVZtcUpGYlNkM0FvNjJVWnhtUFFsUU5SZFM4dHdm?= =?utf-8?B?RkJUT2JRTTZKVEVWcVV0eTJ2QlJCcWpGTWoyOXRXdXF1NFRabmtiTEphcUg4?= =?utf-8?B?Y0xYVlJKWFhPSG1qK3BiZDJzRlVRMmVtcDJpcnM1ZzdDdDFZWXE0bDQzdlRM?= =?utf-8?B?TDF1UmxPS01zRHMxUFdRUGk2UmpSeXR0b1gyWk1TV1p2ckhTbGlhYkFseDMz?= =?utf-8?B?OURaMjM1VWZnWVlqc08wVEU2Q01yNW1wZkVrS2haSG44V1drSkRjSEFOY3py?= =?utf-8?B?VERMZWw0NlR6eFZOK05GZituNDB1T1lBb1NvSWRLTERlY2k4dE5zclFyZWpr?= =?utf-8?B?YkdLZzAySUcxalg3cm5vOTJyTHZMdWM1WlptekJHMWhBOUJoWEQ4UXBYcTVh?= =?utf-8?Q?0axHMQD4byXJo3qfAejWW+6H7hjqxHdfEZDyA/It+IGIy?= X-MS-Exchange-AntiSpam-MessageData-1: qoEqU6GxoQROmA== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: ce8aacb0-9066-435e-7a13-08deba65ad94 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:58:20.1317 (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: QZ+6Z7ODybxD6Euq8pBtYdxKTUzWeCRxWgIc7lnxjNI52Xna5rrHA5Y62LewQxyDzzNNQHGoZ2RsVi5PRn07Cg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 This does not need to be stored in `FwSecBiosBuilder` so we can remove it from there, and just create and use it locally in `setup_falcon_data`. Reviewed-by: Joel Fernandes Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 8a0e16e6c9e8..cadc6dcffefb 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -338,7 +338,6 @@ pub(crate) fn new(dev: &device::Device, bar0: &Bar0) ->= Result { Ok(BiosImageType::FwSec) =3D> { let fwsec =3D FwSecBiosBuilder { base: image, - pmu_lookup_table: None, falcon_ucode_offset: None, }; if first_fwsec_image.is_none() { @@ -711,8 +710,6 @@ struct FwSecBiosBuilder { /// Once FwSecBiosBuilder is constructed, the `falcon_ucode_offset` wi= ll be copied into a new /// [`FwSecBiosImage`]. /// - /// The [`PmuLookupTable`] starts at the offset of the falcon data poi= nter. - pmu_lookup_table: Option, /// The offset of the Falcon ucode. falcon_ucode_offset: Option, } @@ -1012,24 +1009,14 @@ fn setup_falcon_data( offset -=3D first_fwsec.base.data.len(); } =20 - if pmu_in_first_fwsec { - self.pmu_lookup_table =3D Some(PmuLookupTable::new( - &self.base.dev, - &first_fwsec.base.data[offset..], - )?); + let pmu_lookup_data =3D if pmu_in_first_fwsec { + &first_fwsec.base.data[offset..] } else { - self.pmu_lookup_table =3D Some(PmuLookupTable::new( - &self.base.dev, - &self.base.data[offset..], - )?); - } + self.base.data.get(offset..).ok_or(EINVAL)? + }; + let pmu_lookup_table =3D PmuLookupTable::new(&self.base.dev, pmu_l= ookup_data)?; =20 - match self - .pmu_lookup_table - .as_ref() - .ok_or(EINVAL)? - .find_entry_by_type(FALCON_UCODE_ENTRY_APPID_FWSEC_PROD) - { + match pmu_lookup_table.find_entry_by_type(FALCON_UCODE_ENTRY_APPID= _FWSEC_PROD) { Ok(entry) =3D> { self.falcon_ucode_offset =3D Some( usize::from_safe_cast(entry.data) --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010055.outbound.protection.outlook.com [52.101.61.55]) (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 F2EF6388378; Mon, 25 May 2026 13:58:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.55 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717511; cv=fail; b=VxBbdYgPpkDG6SsQz2yup3s7R6ckbovzvzwHQLZv4ysPYXs7l6sZDk/TBfYrDgqf3jyXy3RuPl4nkwQJ3CvbJLNAeGIKAXaaZARtsK7UNLDAYad4IM951OpeKcNAkQcoY+qw2S4HabcSJCMCVGfhOOpBno9uttmDmApF/eQbv9s= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717511; c=relaxed/simple; bh=jkfbb26Stshuciiree40HqDLUeM6h41Dy+OJKKEgOy8=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=Tnv9IfVW/PqxJdaLnCQi/0SQaYY0pMSRsTPUyBuNkZXPuZI4FQfEH8OzlHHYTIGxOm2fbdpG7bpGXeEhf/b19L8Jtt8OrxoqHdP4SztWbCR85QTXdHug96KTuXoRoqvTD7homwBlbAlZioFXeT9fsgkq3B4XMEI0eBW9jq0WGco= 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=SKjJrcOP; arc=fail smtp.client-ip=52.101.61.55 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="SKjJrcOP" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=nh8OuT1Ym86x+DfrLmR+dD9qndO35iWabPBovpwDiT9MFavOyaMQgFX5CnIFBS6HQQuuhB/oInxO8ttQrXavX1gtpwq9WB9bkvpaVoVgc3yf1KvhKH4tkuheaLg2DZF4M+aEdSrwsQBY/F5XjIjLma8lSN8o/e4Yzb/lhzsovWoH4fb9Vcco3tUjk+it9WZxn1F7h0cyDRYbS3WMXtxHqoPo93L159SbzaU/qUx+lzkQKHVMFqvWTmYxkil6j9gwepr5ZeMxJdupM94ySQS9poA5WWNPVsC+X3iuCblYTnJO/bALe3g7EbnCfbdfxjPxSQmM00GLdyMWC0sz9yrr+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=ByLo1hFhkWWfpp/bwPB37BD8Sv30qx0D0V6cy6zHe8c=; b=GiVNHNbT1Dt1SVskYsphWpyTvQgFoDu2uZ2rDeSg3FIxuWfi8drqK6raKw6hVNRdJsOkF51UET78VYArgQ1WH05DVll6YcsZBBbQDuwUDX/LQ+ovPoFhUvYUO+w1dcLozsMoiZdaNbPet7fRpl94moSdXU5X4enaW+htEHnhETdK2zmUCmTb+brefBVKt+kJgGChp2uvzuCaZv+WlQkidL/jmLU9gGapA5XZmlcedbWU7nQpSppUEZ7aCa6VTDIo/KSpS/T+hTc49qHg3vHbKEkXcdiQEW6DTODzAKXhjvr1P6IOeXuqXNuoU3vTHfVu8wUcKBBz/O6uK87N2eSk+Q== 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=ByLo1hFhkWWfpp/bwPB37BD8Sv30qx0D0V6cy6zHe8c=; b=SKjJrcOPt/nR7xzwMwBVxWM/tH7eorPkRJixcqNHHzLzmRMCTzVtcQAQERYhrvnwWmB6UfH/zWe7Z3DKqW8NxV62oZO7LlIE6Fw4LbrRXg3rvtwwbuk7IrnkxH+4Jh4JPFLkRITHEqnHLF974cbY1l/5pJzmD3OnswI+stfryX1sJcXpIpBzulkkE/Eb9gvb+fqqCgchoOsfL+jiYR/EwG2x1iur4msXjB0nMso8o3KNx0d0MCAtTWLyIhVYzbpCOCZmS2xJnpPSFr7reaQlC0QSDD4mscDp1ysNS+PP1cAgyVy8PrwCUxOn6I6eXMexsbx4U6j7lPOqgiaRDZnuUw== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:58:27 +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.0048.019; Mon, 25 May 2026 13:58:26 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:28 +0900 Subject: [PATCH v5 10/22] gpu: nova-core: vbios: compute FWSEC-relative Falcon data offset Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-10-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TY4P286CA0072.JPNP286.PROD.OUTLOOK.COM (2603:1096:405:36d::11) 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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: e12e315c-8704-4d38-ffdf-08deba65b1a9 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|11063799006; X-Microsoft-Antispam-Message-Info: AzRnDdYXVS3l6SZiUkAsf7kEd6HZLPQMaG5lsdxeE+EJxpjk/5+JJ1HYRN/pWEONBIJvccdv8ilbdbyaNAAyZkiIMNrZoJJELVIUK0NcJroI8fzmYPA1D/5w/qkvRS4aUrMpBqgMcPSICvmzLl9OAR3L5JTMF6UJGvqmogbB7oO6dXgPKT6sHgynewCYWYLFwo2d+AnjOjH2y3IWjXJpz3Oi3K4Hm6sJZe6pnqXX7mdhss95mTjou1sdZ2Q5xmq70GJzl0HlSy/j9C1vtNMeIiZxM4eT62Ma2KTrGfU2+EQHaH90fVnTBavwT0n+sRVkjn2iQBO8WO6M/2VD3cg3xD7yucDiFQP5OMGHSqlx6S9WAty6FPJJlHaixmKjtiRPjYtmheCctmdxfGVe3xmd3m9LyCLIR6VgJmnidh6mZiqTYWMg5VYgxNEtKoVP6hwecnt2xZtIjfEo1TF/b4VDHaJB/Co830g06G3HviNCk+u8jBqTv/kAqx5hgUcUlZYODkVX7u81rpy8fPKM10vivExQky9vTWvud1pogttWyGz5lF5cltaL0lMXEOHHkm/hjJuFyAPGcqnmDMWU8w5uSDim1uX8aN4XTWHJ0UlCUrqdas5fxy2aUgNsMiWAWwO3oJzS+AKHJ7AvwuN7i8F6DacsBM/zl9IhSD6bq5kVGQkGBdNGQpv3dcD1R9bxn5MQ 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?UUtqSXUvRWswZWhCYVlXS1hoanBEVXVTL2hDUm00KzFueEw4Ti9Ua3FqcGRE?= =?utf-8?B?RWZlMFEvL3FMRm41MllqeWl4Rk81L0FlYzk0M2lSY05oWnhEZkVFQlRhd004?= =?utf-8?B?YXkxRXlVMUtlRUlBQjIyMG8zUDZoVmFGMkpNZTZpeXQxbnp0MU1oNGtCbG9O?= =?utf-8?B?aFZuNmJmNG13OUxLYVFaVWord3ZQZG9iUUw4VHNjSDJjRUhuWWt1ZVladC9r?= =?utf-8?B?L3JHRXhjUnlhcTF3ZHFuZHlWYStBV1hYdFdXK2NYN3UwWmNJdnk4TmUza1ZW?= =?utf-8?B?b3pFZVJiWTdvWVd0UTgwM2RpSk5tNHFROTErdVk3UjV3ZVVrVUVqVTBYTVNm?= =?utf-8?B?NDFsK1U5Y2NTTExqQStiVzNsZy9Dd0o1eFlESGFOVTZHV0xMNDd1bXBqNXlO?= =?utf-8?B?VUd6YzI4MmFaRGROYy9nYmIwdEcraTVLRXhVOHEwZ1J5MmRKTWRPYmRvWEpW?= =?utf-8?B?SytzRzNSMGx6RTBmd0ovOU1lY0VDeFlrSm12MzBXMjJCREVqRmR0UVpNZjNC?= =?utf-8?B?MExjaG1QNCtSWWQ4eERwZlBCMlJDUzMzb0EreGxKVFMxOU5KVE9tUjgyRjd6?= =?utf-8?B?NFluOTk0Tk1ORnAxNmprNjR5VHo5bXR0azRZbE5CdU9IUVAyaEZhbys2ME9y?= =?utf-8?B?R3l0ZDEyei96bEMxSVVYRk4rVXRmT1AxRkJ4R0VVK0ZjaWUxYmdFREVURXZn?= =?utf-8?B?aDQyQ25xbGg1ZmNTQ0VvNklVM01Vak8zNlNDSllzazIxa2RhVDZxUXdPSXJ6?= =?utf-8?B?SnBRbU9ZSEhWak1LYUk3L2JXQUNBTld1d1AyZDdHejh0UnNCc3VLNCtJeUdF?= =?utf-8?B?M0VxVWduOVdvQlhrakNLMUJxVXhVeElWc1JiMFQrOTZjdUhHQkZYQ1B2Q0xn?= =?utf-8?B?ME1pQ3Q5OVJHcWlMcFIrNDdwaStMblZMY1RNdWFTaEJaVnpuSDdVN3R5ZGFI?= =?utf-8?B?WVFCWTgwNnlLQm5xMUhDYkM0WjdNajQ3V2I2WGw1YzFZaWJ6K0ZoK1dJTUV3?= =?utf-8?B?WU13SktFd2E1QThQMjhxcFdIUW1kd0F1UVZ5TTl5eCtkcFluVGs1Wjl1Y3JE?= =?utf-8?B?VlB5NU05a0E2NENremYxeC8yMkFObHhtTncxcmJuMW15alRiclRHWGVhZ2Fi?= =?utf-8?B?MWJCQkFRTjgvUGFaN1VXcWNVOExwZDR4Ukl1T3luRkZlM1h1MmtlMThBL3NV?= =?utf-8?B?Ny9iM1VxWGhOblNNRm1SQitaWWdYS0QxZ1UwQm1qSVVGYWhFaGoxcDdsa0lu?= =?utf-8?B?QW1RVjJRanlIczg0TCsxS1hXTXFlNS9WZW0vVFMyVkYxSGZVd09iTnpERGJv?= =?utf-8?B?MHF2R2dOS3lwYzBKOFJnbUJ4ajlUZXkzSTdGTTdYRUZkTVIycHRBdkd2U0Fa?= =?utf-8?B?MTRKMEtWR3dZSlFZL0RiUEIzS216eUJWMjZOZEhPOE1BZmJNb3JsYjZzd3Nr?= =?utf-8?B?bzd0OG9JZWNaWEcwL2xnb3J6RXNVWlZzNFVFMktpdkdERUhSLzRnN2JVQ0FI?= =?utf-8?B?ZldhMGRqN0c0RVRENmpsYnhQK1BaVjc0OXlhZTdBTFpRUlhZb2pXM3F0Yjd4?= =?utf-8?B?dis0Wmd5b3Nob2gxWGk0cUdhNmRpVDZ5bzAxY21pdzdabmltR2RON3BJRlFh?= =?utf-8?B?THY2L1NNMWxYQzE1Zm84Z0Z3NWVPbXBsN0VqUkM4T2hTRlJIbUpKOVI2T1Iv?= =?utf-8?B?SXFDWldDNHVWdnczdVJMdnUzUFJhUGhOcWp6am5kOGxIbHo3blUxN1hmNTV2?= =?utf-8?B?NGZXVVVYTjllemlCZVN6N0oyaDliekVDaHBLbWtHK0ZIaXBMVEtZSDlLaTQv?= =?utf-8?B?U0RnUmVocC9CYUFTc3AyUnl5dzFBbndiNnZWVFNvdEYrckJqeXhEdlBYQUJo?= =?utf-8?B?WWE0NDJCaXlibzROTHVlb2ZLc0JDeTl4Ym1PNVRBTjZhTjF1RkkycjZhMGRw?= =?utf-8?B?TXhsa0ZEYm9TaUNGYXRxa1cvQy90MUN2RGhnVy8yYlBIUlpoOVdkUVVraEF6?= =?utf-8?B?WEdhRjZZVGtWQ2tEbTdMQnFUWW90MERkTllJZExPZEZUd1hmRnRHYU9rMXZs?= =?utf-8?B?MlpUeGo2OHcvZldTWFFtMGoyRlptbTJmTkRwaTBQZ050MEJ5Y3FqdVplM3VW?= =?utf-8?B?VnVrSHBkeWN3MkgwOWdBd2kyeGYvRG00c0VoQ2d0WjRwaytSRGRGd1lJbXpD?= =?utf-8?B?eVNmUVk0MU5jTUw5cjlsL2srM2xKOXBSVnFzT1czN05mM3dKQ0g2c0ZRYVNm?= =?utf-8?B?V0FTejc3NHNIci9VNFc4RVpqS2ZBenNDa2Nnb0JjakVwa3JRVUZQVkYwQ01P?= =?utf-8?B?U2pNT29nUlVuOS9OMGNMc0JWb2l4VXdoSHVXRWVoNUI3SWhxKy9sVDcrcmVk?= =?utf-8?Q?GPykMl5KC57J0nrCQ94g7CWNfJKDBjcX8/Hb7YKgLx+72?= X-MS-Exchange-AntiSpam-MessageData-1: IAIRmhUeI5Ly0A== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: e12e315c-8704-4d38-ffdf-08deba65b1a9 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:58:26.9331 (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: UuTrOIQElCAw/5KeaYuBHNMrkz9lcWDDDQv9tQgXEK28ypz+WJZOKE4WqYPlRQR28yTnkTqFslBuuUNBdw6xAw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 Push the computation of the falcon data offset into a helper function. The subtraction to create the offset should be checked, and by doing this the check can be folded into the existing check in `falcon_data_ptr`. Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 48 +++++++++++++++++---------------------= ---- 1 file changed, 19 insertions(+), 29 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index cadc6dcffefb..ca101b2b6095 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -846,33 +846,29 @@ fn get_bit_token(&self, token_id: u8) -> Result { BitToken::from_id(self, token_id) } =20 - /// Find the Falcon data pointer structure in the [`PciAtBiosImage`]. + /// Find the Falcon data offset from the start of the FWSEC region. /// - /// This is just a 4 byte structure that contains a pointer to the Fal= con data in the FWSEC - /// image. - fn falcon_data_ptr(&self) -> Result { + /// The BIT table contains a 4-byte pointer to the Falcon data. Testin= g shows this pointer + /// treats the PCI-AT and FWSEC images as logically contiguous even wh= en an EFI image sits in + /// between them, so subtract the PCI-AT image size here to convert it= to a FWSEC-relative + /// offset. + fn falcon_data_offset(&self) -> Result { let token =3D self.get_bit_token(BIT_TOKEN_ID_FALCON_DATA)?; - - // Make sure we don't go out of bounds - if usize::from(token.data_offset) + 4 > self.base.data.len() { - return Err(EINVAL); - } - - // read the 4 bytes at the offset specified in the token let offset =3D usize::from(token.data_offset); - let bytes: [u8; 4] =3D self.base.data[offset..offset + 4].try_into= ().map_err(|_| { - dev_err!(self.base.dev, "Failed to convert data slice to array= \n"); - EINVAL - })?; =20 - let data_ptr =3D u32::from_le_bytes(bytes); + // Read the 4-byte falcon data pointer at the offset specified in = the token. + let data =3D &self.base.data; + let (ptr, _) =3D data + .get(offset..) + .and_then(u32::from_bytes_copy_prefix) + .ok_or(EINVAL)?; =20 - if (usize::from_safe_cast(data_ptr)) < self.base.data.len() { - dev_err!(self.base.dev, "Falcon data pointer out of bounds\n"); - return Err(EINVAL); - } - - Ok(data_ptr) + usize::from_safe_cast(ptr) + .checked_sub(data.len()) + .ok_or(EINVAL) + .inspect_err(|_| { + dev_err!(self.base.dev, "Falcon data pointer out of bounds= \n"); + }) } } =20 @@ -989,15 +985,9 @@ fn setup_falcon_data( pci_at_image: &PciAtBiosImage, first_fwsec: &FwSecBiosBuilder, ) -> Result { - let mut offset =3D usize::from_safe_cast(pci_at_image.falcon_data_= ptr()?); + let mut offset =3D pci_at_image.falcon_data_offset()?; let mut pmu_in_first_fwsec =3D false; =20 - // The falcon data pointer assumes that the PciAt and FWSEC images - // are contiguous in memory. However, testing shows the EFI image = sits in - // between them. So calculate the offset from the end of the PciAt= image - // rather than the start of it. Compensate. - offset -=3D pci_at_image.base.data.len(); - // The offset is now from the start of the first Fwsec image, howe= ver // the offset points to a location in the second Fwsec image. Since // the fwsec images are contiguous, subtract the length of the fir= st Fwsec --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010041.outbound.protection.outlook.com [52.101.61.41]) (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 1F617388868; Mon, 25 May 2026 13:58:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.41 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717515; cv=fail; b=BSchoJbttucRugVwWCLCn1756yuoxpVD/Hyr3P+FHpbzDBQxbxYp1CE1fbyedzeDtvrRLKXZ1bvYeR7vVP4j9IUZt0ktyWI7NXfCL0t5EPG2TV+NwGU77+y0CXRIICMYvW+IZT12eVFHzakSTD3RUL9+OEVZI5HSo4W5Juii/h8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717515; c=relaxed/simple; bh=AVgA2zguCzexFTl+q+63yhjIzyrSzeiv8sW6IVmo6+4=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=fUWVJCYI/8iYabqSYSh+Uimflq57/SqdCyRfDwBjsazxCjbikYKSagCZKZNcbJ+p9E0ZD52XTCZ0z0AdnquQVpxz4T5tY4PO5E/kPIfeciGBZSJ0xl+lBOE6w053+/fwfVCX3EPD2iYdoTN8joyC0yGhdCwlWDtQUm3Pft7PkKI= 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=lSJkxI0n; arc=fail smtp.client-ip=52.101.61.41 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="lSJkxI0n" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QGjh9nLuMhL+mBEPuUxta04pX+8Zw6wPd/5pioECdGtuhCSfbaPWFgQ0Q4tJzJdTecj2J40kKB1swssqs58w6i0dY0kD6Dw/0id8NDR/gL0hReqGv3ZrzVLysI3jrRulAldtSJDCnYjaCIw4V1Vej7J6SHtXa9Dt2CmldsOQkRZcYEJJihDXELqInfHaWylKfDMsiplLI8c7HD0PSkF6UjOptHf5miv/oJUxHeT63J3YBegnn4PEr1X4ikrqc67F1kIcn0U7NBP5U7fCX95/nPOt6tK+AdA/pSx4GtqeYQNsHS4mbPYYi5mpIIIq44NxbihGy5BQ8H5vmIq8Tju3HQ== 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=5k8iWz54qyTt5iLRlq8TfyVwsd2AeNe7OZbLfutC1pI=; b=CNJs3w5BybokC+/OLZjvwnS7WDbyeXovcBLAsEnEFe9tuahHUojNEtPSuJ8y59ePGCbzxcnROHLZbliBlUsKJjg3uzr2NzF6mhksafczJ9jluAhIgtNUQET5Cz+Gw/m5PdIwr1iYbSo5JFnqWKLB2WSokjY4qXZz0lS/DTptA+q1rHKcPOz7TUdgrlGVHaxZCckW/QhqhBhlDraq6RTeh28QXkOWMv+C2cek5J7PR6V6O5IvMPdeLiuCO0jngzOlm7NFn/2r0nADPXlKI6z/pzJt/1nbin+bMOjSL5MH8lzEuL9ENP9ho6iqobfJtishtb7/XQfsJLm3yXwHUNy8NQ== 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=5k8iWz54qyTt5iLRlq8TfyVwsd2AeNe7OZbLfutC1pI=; b=lSJkxI0nHnsB8dTSzH8CQeyQnUxvIRoO73eL1zavzmrZFT0KFS4w6rJo1YK4lrlz3jtlEkPYkysoHRpl/lTtwmrXe7+rL+0D8N96ievJGV2sXVdIGePRkUCkBXvEuZ8qLmLRRe1xlehVMsb3SY+4Gb57uD4M1EELQF663OBiosU4LlWBvIZVHZhTCZJEOx+sCHgUpY3PTDuBBCmAAzs+3SPX9tJxxAxOGsWXLTXResob0QrW02Z1ZBCGK3D2t9xRVyoRyZpf1K2X/UwcuN6P1a00glqL/tZrz4ZmEIHnRFkwMTH8aj+zW0GVvJJgQMq2eThUEZ3wjknAZDEniVKZ0g== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:58:31 +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.0048.019; Mon, 25 May 2026 13:58:31 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:29 +0900 Subject: [PATCH v5 11/22] gpu: nova-core: vbios: simplify setup_falcon_data Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-11-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney , Joel Fernandes X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYCP301CA0021.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:381::18) 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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: 6b10da77-b9ba-4cb9-fdfb-08deba65b408 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|11063799006; X-Microsoft-Antispam-Message-Info: 99kCBMmpd1an8hC8ntKET1Um/r5G/CxJGSpztr0iI3W64V8g3QoHzOh11FCf/MUrx7BebQveIROHiCCXrH3/sVqdXDDETMINySCF6nMb8OX739EVol6lpGwvEHB9nCnTUb2IlEguEFVE8335PKGVRheSr+2SzMvailbA5rzuQ08SwYzjIniOqsA5RgQ8XcJA8tniCiWspCV9F9rFzggfE3ktFQPwVbzLhpH1OlurmApcB4lLVzQWU59532HnxhIGP65NEJybZ8BztyUqurvxvuJ9lQsYQh41kC2VRb2vGNY21BuRABBoFSMmqcbdrSiEp7HamRZDRiojW/g7sO3WoEdT0kIS3dAFHaS+i+SXe5zkRDAfOkH7uA5lDonA9wGHX/ygWbpHpISfTBCw2HFCz/U0ma4pnUNxZtP87+XDOxC0a/ejZIAZkJmHLqIjmzEGe4luKOcMNVdXpwO6X5enxuArJ8q7f213MHVDcWJch6gdR1JKL+EnRdyDu/l92GheiBvnX5VUR8XUcn+1KJfhJj179WuYQXS3+wE5jvdq9U2QLpmSnkU6s7lXBZ6OpNyLSXd1im96bKCRTymQOHcM2yRTWfRbs6nWfwY2KOuXwbRhi7yzgI6sLwnT9QFat6OQCIyHiuKCgRJ8WF1N74y9p9ghhc17NSKnbpUm3qvJCSmbgB65wZtivslsSuwNFUWR 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NWNJVUVmN2k0dFMxZFVMWmtrbFg2TnFYclhiMlE2Ukw4Q0VsU0NCWkJjaHli?= =?utf-8?B?MUtFWklFSHpYWXAyRVBub0d4OE9JTnIxVVJIYUhyQTExM0N3bHFyZFVTZGFU?= =?utf-8?B?MFNRMHlqL1JYcFZxU0lHSHlIalNzcVR2ZFN1b1lIeWlRcmdJTVMzdGpudUZD?= =?utf-8?B?dGlRK1JsS0k3UXFPNTJZbjlKNXJyVEozYVE2RTZybmJ4d216eUJXVHFSNFRy?= =?utf-8?B?ZVUxb0hxc3RpWC9ZZnhOVDh4MnJMY2Z0dElsNDUzbG1BQ3pwaTQwUXVMM2R0?= =?utf-8?B?bS9NUmxVV0V5MWNkUktuWDJHTklSTFlpM2VieGpGN1pHaElxKzBYL3dmSUI3?= =?utf-8?B?eGZPekpZNDRkSEdweTZ0TlIyQm5FQVJNYWowaTlDc0RQUXhYRXhrMzliWlVU?= =?utf-8?B?UDR5a0xxTm1zbG43aVd2cUlyNmtvckhjUDlReXFKSGhYZHVjbDFZaWhhcEVZ?= =?utf-8?B?SFllaURWVi9ZZHdQYndaMEU5QzdLbTZnOWMyQVRuUm5ES3hObndnUGN2U3cw?= =?utf-8?B?NENsZ1pVUC8xTHBCZFg1bUwwWG9tWXF2NXRSV1NZYnNDWEZpb29LVlU3bjVV?= =?utf-8?B?Mnp4U2tRWXlhZCtzMEN0M2NReitpenovZmFkYW03WGs0WGRwVjQzSTg1T05T?= =?utf-8?B?VTBhL1BLYndBdGY0SzBna3lNdnIyaXA3aHROVEJSaVpZbjBPTHIxeUpDTG1Q?= =?utf-8?B?d1NmZy82VmVEbTM1bkZEMlBTNHZ3YndKY1Z5SjUvT3hZeEFheGJpQnM1WCtU?= =?utf-8?B?bExzbUJTVHRoWU9OUCtkL1dpV2V6RlpmQkdZL3hXV0twc3FSMWJxc1NUMGtC?= =?utf-8?B?emZ1YjRsY0xGY0xtQmttV0FTWTNqNGRNWkI1OC8wKzVJV3h6WFBrVWtzcCtj?= =?utf-8?B?WFhndzQreFM5YitReGpXTkpHWUhaZ2ppTkUyeU9uVTVacTBKRHM5blFlR2cz?= =?utf-8?B?RWdldUNvVWxPdzAyQ1pJQkJSbFoxQnRpUWNibTAva0tGclU2aFFidG5XRjVU?= =?utf-8?B?dkZvd3U3bTVBMS8xREs0T3FqUHNoRWs3ZURzeVpLcWptNzhiamlGNFdOQ2Ey?= =?utf-8?B?cGthb0Z4cDhwRUZ1VHpSRGxhTnd0VjhoV3dzYURzR255YWtuTjArWkJJeWRM?= =?utf-8?B?UjVNUlZmb2Jqa2xaQVNTQVdHSVVmNG9nK0pCUnJ2ZHIxOXdrMHRxUnpzZnBZ?= =?utf-8?B?ZlZNbXBtK2J2bnZaZWNvY1h4YjFJVmQzbWIyNktiWGxDbEl6Skx4YkxaUW5a?= =?utf-8?B?eTJmOEFWNDZuYWNEeXBtemdFdlZ2S25vcjErTnd5blpWbDZ2MG15dlNYN0M5?= =?utf-8?B?QjA4Sm01RzZ6OE55Nnh4cHl0bVNPQmtSTEFXbXR0K2tiL0dta1gzK3FVb29S?= =?utf-8?B?RnFPbERuQkM2OWVJV25RY0Vra1J3UTFpdFJLVW5vVk1qWC9KYWVWVDUweWgx?= =?utf-8?B?UHJoaU5KQ2VyeWt5UzI1OHNvOEk0cTFyellyM1p4NGRzMzhCc2t5VmtiWDJJ?= =?utf-8?B?MnY1dUFXekduQ01IR1dNc2I1TmtVak0zSFB0REdMUXRoc05QWXZPTG54ck8v?= =?utf-8?B?R2NuYWdrcS9ES2tyb3MzRG5EYURpZE5yMllvenJxMUNtTENITkNwNDIzcEtH?= =?utf-8?B?MHFFVnRGTks4S2hmVHlQV3hQLzg4SmRuQi9XOVBJOG42QWc1cjFtM3Y1SXNu?= =?utf-8?B?SEs3Zk04YVc2Q3NPSE5ib1phT2MrRlpHb0pQU1JNYnQ4dW9tVnZDQkwzRDNz?= =?utf-8?B?RnJKcHl4YlgrUG9VNVh3R29ZN3hyL2dkZTV2c095MUVENVpaWFBDR2c4c09o?= =?utf-8?B?alFuRkJjR3FxM0FzSmVmaXExam41VlQycy9iTHd6d3dDaGFqWmdCZXdjN2Zp?= =?utf-8?B?YWtObzMzZkJQcjVvcFhSZXFtdm11OWZ6SHN2Z2RBSkhBeVpkSnpsWjdnOWkv?= =?utf-8?B?SCtaRlowL1lGbHJ6d0Z6bElDMG04UklLVXpHTDIxcGh6aHZuNVg1ZmRLWVJF?= =?utf-8?B?bE1QUlliRGdyYk1pSm1ITnV4aEtETUljOTJ3d2dlck9hRjV3WnVuSmJRcml0?= =?utf-8?B?Z0ZlQkR2aEkxUzFVV3FLdzcwQXFVdTF3M3YxSFg5N2U0VElKWlZQbENOL0pi?= =?utf-8?B?azBZVExkZ3Q5R3B2V1ZPem1uUCtvbXdYS0d5ejMrRDdvM2ZEVlZ0ZXZPM1Mx?= =?utf-8?B?THFjbnVRa2NLSHg4cFBEQU0xTzhvbzMydG1FdC95bTZtc1UxVVQ1QzFvQ0o0?= =?utf-8?B?MDJLS2hpVFFxM1BnVXFQMVl3Sm9RbngzcmxkTDFXdWFyTkFTbFdiNTdSeFM1?= =?utf-8?B?TmEzNENvN1RYNzE3WGtMckpPdWYxd09jbFdjbmFzbzBlZVptcENOejZnbWZU?= =?utf-8?Q?Y1QV5BHmyybSclBHiPbr34iiCEaUn/0Q+CRfYZ079s9a4?= X-MS-Exchange-AntiSpam-MessageData-1: jTct9bznBglccA== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6b10da77-b9ba-4cb9-fdfb-08deba65b408 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:58:30.9220 (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: D4FkLC19eHNbPVsk7AZ4KZpNLJ1H2EjrRJmEc57l38hW0acwjTgiA++O1FcKVHhpFG/5vIBua4hGgnhSlBTBFA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 The code first computes `pmu_in_first_fwsec` or adjusts the offset and then uses it in a branch just once to get the correct source for the PMU table. This can be simplified to a single branch while also avoiding the mutation of `offset`. Also, adjust the code after this to keep the success case non-nested. Reviewed-by: Joel Fernandes Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 54 ++++++++++++++++++--------------------= ---- 1 file changed, 23 insertions(+), 31 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index ca101b2b6095..470e0e2a81ab 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -985,48 +985,40 @@ fn setup_falcon_data( pci_at_image: &PciAtBiosImage, first_fwsec: &FwSecBiosBuilder, ) -> Result { - let mut offset =3D pci_at_image.falcon_data_offset()?; - let mut pmu_in_first_fwsec =3D false; + let offset =3D pci_at_image.falcon_data_offset()?; =20 - // The offset is now from the start of the first Fwsec image, howe= ver - // the offset points to a location in the second Fwsec image. Since - // the fwsec images are contiguous, subtract the length of the fir= st Fwsec - // image from the offset to get the offset to the start of the sec= ond - // Fwsec image. - if offset < first_fwsec.base.data.len() { - pmu_in_first_fwsec =3D true; + // The offset is from the start of the first FwSec image, but it + // may point into the second FwSec image. Treat the two FwSec imag= es + // as contiguous here and subtract the first image length when the + // target lies in the second one. + let pmu_lookup_data =3D if offset < first_fwsec.base.data.len() { + first_fwsec.base.data.get(offset..) } else { - offset -=3D first_fwsec.base.data.len(); + self.base.data.get(offset - first_fwsec.base.data.len()..) } + .ok_or(EINVAL)?; =20 - let pmu_lookup_data =3D if pmu_in_first_fwsec { - &first_fwsec.base.data[offset..] - } else { - self.base.data.get(offset..).ok_or(EINVAL)? - }; let pmu_lookup_table =3D PmuLookupTable::new(&self.base.dev, pmu_l= ookup_data)?; =20 - match pmu_lookup_table.find_entry_by_type(FALCON_UCODE_ENTRY_APPID= _FWSEC_PROD) { - Ok(entry) =3D> { - self.falcon_ucode_offset =3D Some( - usize::from_safe_cast(entry.data) - .checked_sub(pci_at_image.base.data.len()) - .and_then(|o| o.checked_sub(first_fwsec.base.data.= len())) - .ok_or(EINVAL) - .inspect_err(|_| { - dev_err!(self.base.dev, "Falcon Ucode offset n= ot in second Fwsec.\n"); - })?, - ); - } - Err(e) =3D> { + let entry =3D pmu_lookup_table + .find_entry_by_type(FALCON_UCODE_ENTRY_APPID_FWSEC_PROD) + .inspect_err(|e| { dev_err!( self.base.dev, "PmuLookupTableEntry not found, error: {:?}\n", e ); - return Err(EINVAL); - } - } + })?; + + let falcon_ucode_offset =3D usize::from_safe_cast(entry.data) + .checked_sub(pci_at_image.base.data.len()) + .and_then(|o| o.checked_sub(first_fwsec.base.data.len())) + .ok_or(EINVAL) + .inspect_err(|_| { + dev_err!(self.base.dev, "Falcon Ucode offset not in second= Fwsec.\n"); + })?; + + self.falcon_ucode_offset =3D Some(falcon_ucode_offset); Ok(()) } =20 --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azon11012043.outbound.protection.outlook.com [40.107.209.43]) (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 BFE54388371; Mon, 25 May 2026 13:58:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.209.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717520; cv=fail; b=IDJxnXG4VYc/9AskNDRGRlSKeouOHy4bHXIiDzZmvmubNRehWv666BFAK6wjF7Z5CX8XYw3WzjV+pSTZNrNC1BTNlEc3CWZI2DiCksRRvZU0+8Rypp1LFeUiMrmiWmNnJ7Kgvgq7bylt6ZketVL11fiTIwz4nU+VjVo+kQKju44= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717520; c=relaxed/simple; bh=46SwNr49X5pHf21pyD7Jd9n4kO7bjEeQYnLcHtwpbBI=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=WzZgBl5H3WOGrNde8klLUhUkHvZ+/kpbE3ClRwgfF7TpqfP+C22Zp5IWQYMb44HBiYeKTN6bnqdJnDjRXbryXEVn7Ilc0BDQJQydeJouojUVvfUBJH88BiG4bxQhT7AdhHU/+N5ZYMhMK3I1yJx2QbT4s5xKUBWf4tk/iaWlOYE= 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=FTYztMXg; arc=fail smtp.client-ip=40.107.209.43 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="FTYztMXg" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=gFhxBMqvY2XpK0oV9wZMOchihddfEUJv8sR5W+jhWXXUJGivcqmr7IUhAd81CcSZ0nh3nFdzSTpbg35EsLdczJ/P7nJOcitM8S+6+L/bYqHtFO3H0og5hu/AoLf0NYmZW/qk3ZQJWOSXWMShjWh7EMt71rYL61ftgc46Qw3H5WuUw6vAN6+7RVQ8YhP/h2aGYzyiC21z8Ybj1I9ku1NUqM6vptIphbm1HEB3leyh6G6VFYy1KuhoyBKFyrrmNxfgQ9CJKWD4Ymfgdh+eMZswJj+wyp4AWsK9pK7UjhASL51xscjaUs6FheH4sWOPOXOc5Sd7Cv3WuQbiaXza3+5wbg== 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=37oHg1BZVRUA/LLf735omqQfHVHTDQXjfXeq/Dk2G4o=; b=RDL6ATlVn3bLWT6Sa0qR0IiEDtM59J5lvl5UESaCSZ6c799mKynNJlkglhhgAnMEym84WMlD8JZ9SdvShjTTNWRPiAVUaM4A1ccOVkGxGmrHpxW1ptnK3PQtg8CCIGzASN2K3BDB0hJ8z1sMzkLugR+aQ7Kfi9XokRt1SvDWCQ4kfQn+fFFBO9awJSoQQcxc2CqioIz6x9A4oGpWQCgBcTO2hwSEsR8Lq2acokd7x17RGi5sCzFiAl9Bq1w0N59OXqO5UYEMUXUiWf6DTGV1My+Sp4PjDtaIsNVVk8NoH4zAgArwzY9ndfuq4s5Jt+jR99wDJF5qn9jpw3q+ap07aQ== 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=37oHg1BZVRUA/LLf735omqQfHVHTDQXjfXeq/Dk2G4o=; b=FTYztMXgsUQWPfDe3ofOJgJy4HLoRQlKjbd2S+kyk1G+lr4Q8A36FH7qaC6lrhYWCeBveofZ4lGeZ4AXhip3p6LqYoTkol8oai9q5S8oot7bi8oFjDJGrt+N5mAR8tYENXaCnHQRIRXF5PJN9bANQpRHXdI7QpHnO7NNsM25IFPTPzUCdO1Apwm+g4UCWfX7PrE6LYthLrtW/BxlVZm3X30XOjK5h0LUG0QO0exHkVhUvQY+KKXPsPLUKt6yFN8dG8PWlJwCoexkCc8ZcNHRagsdponX10uNXzz+O+UQ4ATo9EUhuGxtEZQZysokAiWEgu7TsHBBd/XoLo83pmcZ4w== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:58: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.0048.019; Mon, 25 May 2026 13:58:35 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:30 +0900 Subject: [PATCH v5 12/22] gpu: nova-core: vbios: read PMU lookup entries using FromBytes Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-12-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYCPR01CA0120.jpnprd01.prod.outlook.com (2603:1096:405:4::36) 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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: 2b6a034b-ac32-4769-6269-08deba65b699 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|6133799003|11063799006; X-Microsoft-Antispam-Message-Info: IE9dY7SkqBRiYfwgpkY0vTFgw8L3eBoHo9BVyqgcmko3AzPLEeENHMTGKg5txRhnhh7wem0aGYnV2WZq6Mextn5di9arTFwH97HMgqYb/1A/Clal1H2g6NYA/qMn1ck096RKqDX3g8HhuPdztDigEn2SqHLt2HPJy7OwstFHmiu3rQ6kDSOTWfydI2QAvtQ0JblQNYZToK95S0muNvY4YmA9D0nKAKt5Vgpe7rh3sMEMATPJz8kPcuuMyLqBxo7ifl/oXuC2BH+LG/Nf/fytr3QaFamYWBm5PDdUY3UCAv7vg9UOkV+RF6qzYsxoAtzxG7csBgovHpZuZJ8+BYsKk772LQHPMNtKDJGsUcEwFQyFCHcRPoKQTjujJbAABXnsFoGHeccdcekhjRBRAORig8T64DeeAztoEo4pw8qtF6B73seq4BDGinSLy2GLBdu2Fb9DcNPXMq8aucWw0TwVnsR9uYAe9+h4GQDtVjqZ/iBPQMvkbo5IDUe8XUzx6Lt57r+et9dfFQz7KAl4QmmSkbqiyyRfquAFFiXsWR8A0Bw5JkMKudXsDwwhFQGFH0NbCZ1bHpvqaVQwOg2apkBQhGGT2R/M463dbnmLjAobjfToe+4OeUsaVBjEoT6DlJ6ibCq8DW+pixNu+FOKrOh+vw8SAL06wzt0a71Tdud3ThE9EimLNDNk30xtA/8Ta1HL 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(6133799003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?amVNUkxoeDVBMEplOHJuUmdoelpHdlRNNVUzZWovcHIvNkJZY1BXc1QwSzZD?= =?utf-8?B?d2krVktKZEYzNjNMSDNNckRFS1g3dGdVWU02dUZEZGM3R1QzdFdWVzRGSE1t?= =?utf-8?B?V2lqU0RxVEJUczB0MUFkenh4WFpuenM0cFBUam1YOUMrNXdzelBFRSt0LzRp?= =?utf-8?B?K1l4ZWUwT2EzTEZHV1FEalBSZ0YrazU2UXcweGcyVTd2c1htQTFEaHJkWTU3?= =?utf-8?B?Z0plbmRoNS9NMThBVGVnTG1UWUlrS3g3cjZMbTZtMFdKVXYzVkE4UXYwRUpq?= =?utf-8?B?KytYYW9Bd3dmaWF2TDFJUjFKYmd3ZGZnWHFGUlNjNHJMdHBqbGpVd1F6SzQ2?= =?utf-8?B?YU9iZXB0N2pZeEZkN1BFcVRSQW1ha1ZNeHgwSEZuNGZVSFUwQVZVakJvRitM?= =?utf-8?B?ZTUyQ0tBRUZIR21zV01LVjV6TURHSHRCZDRWRnJXTDlWQjVzcnZlL2FRNW5B?= =?utf-8?B?U1VUSjJsMFJYS0tYQW9FQU1JenpFY05vK2lYQmcxMEpxTXkvcERTMDBpZThn?= =?utf-8?B?T1dsY1E5UVVSTUhZeGZjZ1M2UFZDaDI1b2gxUFRyT1FUY2ZQWVdqbWlyUGxu?= =?utf-8?B?THRLbUpFQzlKSTdPdmVKa2krVFNTelFxT2pKQUhLamZrZmtEYjJadlh6Y0x2?= =?utf-8?B?ZFR2L1kzZFlXTWgyYzVpRVV2Sm9BWHp1ZVluVjEzcU00OWNlRm5CYjBEMi91?= =?utf-8?B?Qm8yMWR2MktHOVNYcFB0VUI0QWtQMFQwT2o2UzJBZFhiS3ExRi9DNUd5U1Jy?= =?utf-8?B?VEdTZ0RKbExzcnlkVkZQc1cyQ2g5TU1LNjk5QWxoeWtJcG5LQjZuOHRBVHY3?= =?utf-8?B?clZucXBNZGFvMzZLYnQwSWxFWDM1MklXVG90RkVsV0tjZ0xZeTJaMXBJZkhj?= =?utf-8?B?MW1aSG9KcWd2YTRxMmlJQmJaeHZDL1ArTXJkcTh2SCtUbU52Njc3RmlZcXBS?= =?utf-8?B?QTRoS3FUS2dQOU9TNW10aHNSeVpuQmxlUjhPdXAwNlBNT0lFR205WnpnYTFk?= =?utf-8?B?YUNOUVE1Qm55MjE4R00xSHpSa2dCanBsT2ZxMlN4eUM1RjhBM096M2VsekEw?= =?utf-8?B?ZTEvY1AxZG5kc1VXblJHTmhNSkdPWUVHSEk1QkVBSnMxSTludnpQZE1BbFRH?= =?utf-8?B?SC82YkU0WW13VW5kK0Q0dzViUytVUlB6NWlwNm5uQkNiRUdDbThIcVVZR2Vu?= =?utf-8?B?MDR0RW96b09JM3puMWF1Sjd4U2YyQm9RVHNkMzFrU09NT2xwT1VkWjNKNFdU?= =?utf-8?B?UW0wenUzM0EwUEd3TTlBbHpLcGRTaHlVMU9DMzQrT2o2aFpiY3V4RXZ6ekpw?= =?utf-8?B?MVB2enZOZnM5LzkvYUpLY1BrSm9SckZpNmlMajdFUTg5ZWhKQUIwWGo2dnli?= =?utf-8?B?ZlUzdnhGVnYwQzJmYVJ6OVNJNSs4dmx0N2ZSVkRlOG43UkN3Rm51MFE3VGk3?= =?utf-8?B?SWtRbGoxaWNsTmZXME5xcmNZc3VWNzRPQlJQckl5ZjJ0ZW5FczM4RXFEQlJ3?= =?utf-8?B?ZU52NnBtU1ZhVmRvSXlYaDg5R3p3RmVvVC9uQ0VmUVhKWGtZelVCT2hveHlY?= =?utf-8?B?a0o1YTUvWVZlaTcwcjM2YXdUWGZqT29MSWlUdnBYMGV3bE42R014UGt0Z09T?= =?utf-8?B?Q1NqK0wxcnIrc01Ra3hwSHBhLzJ0UkxQcG5SR1cvYlN5TTVQMDF1MVBneUhI?= =?utf-8?B?bmMvdnVpV0x0WktjNVZnSGgwelNwME45bytUSW9EQWsvcHAycmF2ZS9BVEpO?= =?utf-8?B?K0FVNVhsclRPa1k0ejVzczQ2OUFRb280MlU3NUl0NW9VazRHcHRra1g0TnAv?= =?utf-8?B?M2crLytwNnN6dWY2R0JJOXlROS9KeUtWT3h5V0dxZ0FOcENVMzErUzVIZkpP?= =?utf-8?B?MlEwMlhFaWszcDM1TEcxTU9obkZUVlJpT3VSeEF1WXFqdVdjQzR0U0lHc3FZ?= =?utf-8?B?NXk1SFI1eVYvWFcwaXN5Nmg0UHkrbFNWMFprZlQyS1RPd3FOUlJQeFZjZzVW?= =?utf-8?B?eTFva1lGbE5jZFhEZHB0UXFHaGlYeVNESEZNbWNsYlhWT1ZZL0RabzhNUjFK?= =?utf-8?B?RHV1Ym5yUERJNmJjUmJVbWtPZ3JEaGI0dkN5ay83RzVUaXcwb2hnRnZ0MlNZ?= =?utf-8?B?alZMd1EwYmpXbUVwWFdEZUdQQm5CQmtuY0R1WlJ5TktQcUVpSUc1ZXc1OFdn?= =?utf-8?B?am41dEwwYkNNd0g3N09kK1RVOXRXMFFwSEorWS9vVnU4ZGd1Z2s1MlNkNDg5?= =?utf-8?B?R1JDSGNHa0cybzZOQ1JkUWMvWUlIay90cWQ4QldNOW0wTFBzYjB5L0YrcStX?= =?utf-8?B?UEdhQjdWQ0dINXdEb3ZpU1prbHAvZDVYaGc3emxKUE4zWUQyZld2NEF4NHNx?= =?utf-8?Q?DiNKzh4Ijcy/aufiniHNs8HgP6RKWc97/yKBDTsWshNEF?= X-MS-Exchange-AntiSpam-MessageData-1: iPcWwuCxSA2RDw== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2b6a034b-ac32-4769-6269-08deba65b699 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:58:35.1989 (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: RGhtvODBSuSj3WOboRAHDnGjq5GGV+1gHIiBjMww6uMp9/97+vrN2yGQFSRhXQ9jEouKdzal21hsq6xhcTyOwg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 This simplifies the construction of `PmuLookupTableEntry` and is allowed now that the driver can assume it is little endian. Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 470e0e2a81ab..987eb1948314 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -897,19 +897,8 @@ struct PmuLookupTableEntry { data: u32, } =20 -impl PmuLookupTableEntry { - fn new(data: &[u8]) -> Result { - if data.len() < core::mem::size_of::() { - return Err(EINVAL); - } - - Ok(PmuLookupTableEntry { - application_id: data[0], - target_id: data[1], - data: u32::from_le_bytes(data[2..6].try_into().map_err(|_| EIN= VAL)?), - }) - } -} +// SAFETY: all bit patterns are valid for `PmuLookupTableEntry`. +unsafe impl FromBytes for PmuLookupTableEntry {} =20 #[repr(C)] struct PmuLookupTableHeader { @@ -963,7 +952,13 @@ fn lookup_index(&self, idx: u8) -> Result { } =20 let index =3D (usize::from(idx)) * usize::from(self.header.entry_l= en); - PmuLookupTableEntry::new(&self.table_data[index..]) + let (entry, _) =3D self + .table_data + .get(index..) + .and_then(PmuLookupTableEntry::from_bytes_copy_prefix) + .ok_or(EINVAL)?; + + Ok(entry) } =20 // find entry by type value --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azon11012069.outbound.protection.outlook.com [40.107.209.69]) (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 A292438838C; Mon, 25 May 2026 13:58:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.209.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717524; cv=fail; b=PxzF6tbCBkGw/FF1PMU5mLFb7AE7kiBWtvlh+YltnaJS9qayAPqWRDu6qyDFEqSGq6sMjctJfhT9b6nabPxLVZ8ivwp9j0R/Z2bc4GuDFDkTixf/Jq/WUwGl4Mu8hMMyaBBBggtAs0vqk0wdTs2KqVQLsPB2eZNOSnaUqnyYVLo= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717524; c=relaxed/simple; bh=l9wxR6PpfYoePjJiaKVAja0LJEnUqUYK0Z80XiANSSI=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=C+GXSqNCGo0TrIAK6HAptKsCaZNU7LxPFIsVs8ms9XWw0tZ4YFw/xKQimTh7U/k/gbrDRUzpJD+dzHK+P0oFhT/HYobV2ceZD5VApBTlEIyjAfmyr01+wS/U7LTS4JQrmmjN3hmjz6DpPlWbm8Jc6iRfLh7qPnorVrh34NM641s= 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=DQNsNuzb; arc=fail smtp.client-ip=40.107.209.69 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="DQNsNuzb" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=CZGl5q2jLKMbzWq++UyYMRcTP+i3JpnnVgGb8F9B57gmEH+IxnpOnLVV7FBicFY9DmtkqImOOdo1CbomJHywWPa8Q1FIYUoofy6HkS6X5BdqH1ogUf466Dix4xqg2qWXK8++Jkapv1UsNIz334Rc0STIc1EWAgAnaUhQZ7HXD0yCnnde30M1gXM7DA7KodHvKXyFfdCl7s6qYFRfdY9N/3/pQUJ/k9oO2jL5xoQbu+r4uGP3Zj1Kq1H6GuoJkBu8tCN2fqU/fdqURU4sHL3ky0DxEdIVMxUetFksio8lUCMi/EShO0g2nX+poD6bP7dRrHJ2eXM0dYtfmuM5E8aiUg== 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=n5Dw4H1jc7BfXPVxDG2BXsI9VqdihIuBtz3y9bBPnlQ=; b=k5LE1bU4FlGRahEWK1yaZ7cKsLYSLAbCqezj9o4uF/qy/eWxvnSPCasrXtnx/UM1VPFhpe+HhsdqLRMuPlzTkI/8mRua/bmvd5gVIxUQZk8LmaX8qwISx8l0bQUoCXLXCDwZQjRSHp+enERSNswGvbU+6bLDGSrGsLZNvfBNAqnNjYb/e2jMYkkFzsDXvomycxM8IErWWJqn1gVhsKp5aV+xyGmx3CmqjgHjvGtxa+Bs/1Wt54xxGqTMTyCuIkUQHJ4Gkc6g2/P/fESRlgg6Fzy4J4mJnLhhx39aOgiuiZISBxYAoKxMY5K+xBHJbmaejyk2lp1T1IJsLZAGzWfarw== 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=n5Dw4H1jc7BfXPVxDG2BXsI9VqdihIuBtz3y9bBPnlQ=; b=DQNsNuzbMp+2iZflzG1UH1DcBTYmGeZLJMFxDw84lbSgsHh+1DDb7Zy0wpoArz5n02NUsnTdH7HG/TSQG2cD0VfHeP9iiQA3cmzaoBCG/l9fSbMYl0yClLlxvHfhfY/U+QyzOWRJN1j2EZp3hNF3g37DySU+VaT64+12kRlboB1LGhMx+9KhFP0lnqOztjafpGgXLS5t1xA5gfcv3veplsnMveMpB/xF0mJx/bWfFjAIyhcTMCQ08oPW9vFnxUu4RHpx37rLLpKYbBWY7ZKh/gukL9pD6OAGW5sn0KnbY+O82gEdKZC/5PfCjIHw35hq/Qe+3ofYFdFbnUJaaz63Fw== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:58: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.0048.019; Mon, 25 May 2026 13:58:39 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:31 +0900 Subject: [PATCH v5 13/22] gpu: nova-core: vbios: store PMU lookup entries in a KVVec Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-13-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYCP286CA0115.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::19) 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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: 3904c5c3-1a88-41be-fe62-08deba65b90c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|11063799006; X-Microsoft-Antispam-Message-Info: HCYmXInW44n4MKBQbq125nvQBS5zBtDLd06sLplolQh8pQjaLSXSUXRb+eMGn4nIn6qfoUV4G9T9aQk2a0+gYcftp9Zh9lTUJM60zqQ1B6jIGH3y1UBo/wn9k0Lj0d92GIbfTu0ZHgWsj7348fcUoyegDZKmdj4qJkSpSY+tC4M+tZn4sHQCd2HxKJ7oiRQEI4/hS0qz77Qlqr7hJMFxaiUgEtqNtXpi+Xgz/ozWt4c57J7IECUP2PbOCnuazDMNzfIeM6TDtD5KZQBouqVCkjo71ipF7v/6qIeN7A2U3LN//EnwvCuvRjcdDbhbfhycVntaTAcb/0F5sGM9NgsP2ZSUNb+D6uOhcfr7h6CygYg8UToN9CYU5GPfp7B2hYR4ffsKq8+2xly1L3pBHKP0LIu777BeumaJHPkUlwUA/e4I39UAbNNtWzrkrnnFT1jGcY+j1Xt1CL447oVA9xqSflDSbmn7UOnUYHP9R4lEv/3hzYA1RPYFVFTfX/B5RgoS7SFMI+boN0e8hxQrD68VobKIIK7LpzO+xQVu2JzP6VnEfX3o3BatvCJL8R7D23RHAwV+qWCP5pb+o0TNkPjMbqxEpD7/XGJ9e2Zh21YvqJ7Sjr0XQjZEYzt1A+suYrFxmR6s3yuL3yZShQwO51jsIku/6YShLXl8Uz4SZr1atdZF/xgaXkv8Ig5cNLPtQ0Wt 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SlFZQnQ4UmhGR3M0ZW4wSnR6RDdIc0srZ3R1alRCbmN2empHT3BaNW54VGZo?= =?utf-8?B?OWlzNWNFcFg4YjVYRDNwNGZrMW93Q01sVlhHc1ZKdVZScHJXRzhyaVpYbnI3?= =?utf-8?B?dXFjUU16V2JMOStnM1o0MCszL2o5VFdMWjVjMXVZRmViMlpvaGNHQkYwQ3By?= =?utf-8?B?Wml1eXlmN1RvdUFrL3VDdi94ZE93Yno0NkRiQi8wNThCemp0cDhYeW8rRVpF?= =?utf-8?B?Y1QxUi9PWE83M0kvUUE0OEdpNlFwZlhTZm9NVWdKVDE2ck5kb3hLQ3JvdG9U?= =?utf-8?B?L1dWREFlSkJMNjEwRFJKTTExVjBkYzJGV1djYzF5TnBvbk9wdDRtKzZlc0R5?= =?utf-8?B?UkJPdHU5R2NtUlZuUEw0cm1HRWdnTy94OTVPbUp2Z3JUZGxaODl0VkMrUFor?= =?utf-8?B?cWI5V3BiMU9XWGUzRFRKRTRONE9nWkdQcEtvVEl3bTFZNVpnTVZoRDdMSzBl?= =?utf-8?B?NzBhSi9tQzFsQzk3eEoySkZzc3pSMEFuMDdVeDBLeEY5SUE1OGhTRmwwZjJr?= =?utf-8?B?SXQ5ZFRDNE1jektrNUxsUXZtTnMyaENXVk5LSVVzVDRVeHhDeWNicy84ajJt?= =?utf-8?B?dFVQK3FVa2tNbXFaZXBHUG5MQlJRSnpOTFkvQ3NHb2h1SEdhRnlsVU5rOTFP?= =?utf-8?B?UnhHSU9VYWFEVG1FSVdSaTBPQW9UUjdNVVFXbHU3SlFYZGpCWDNkVXMrSXJ1?= =?utf-8?B?YW5uMG5rdFF3Qm14cVZ2V2JYTk5XVzJjTFpFaWtYRXVOMTd4ZGRSQVh5bmRK?= =?utf-8?B?aFdDNFdReDkyQ0VSQnV3NXVpZjJwVjRiRWNhZ3ZhVndYRjlJVnNhTDZSSU5H?= =?utf-8?B?ZzVsTWNqNkJ0K0VDM3BKcjYxMGxJSStqcEN6OG9ZMzhIbGk3ek16bjhoT3M4?= =?utf-8?B?TUIzU1FsZjBVVXZiSENEeFR5L2ZSRXlzR29hdzhYWjcrU3RDWDZFMjEvT1dy?= =?utf-8?B?TWptWFh1bkEwL0hWVHlsN2h1KzA0ODRFUUZ2RjlONC9VcTBoRThqRVdUTVhF?= =?utf-8?B?ME9hNmlGa0ZCdktreUNsTFJtV2c1QWVWR0xWTzhQZHFGZU9zY1g2eTZPMzB0?= =?utf-8?B?aDJ1MEtIVEEveW5hY3d0ZzlXL0hVb090RUxIckJYcUJhMlFaM2kvd3V6SnFX?= =?utf-8?B?MFBwb3oyMjFGb3B5WHlMMDRNWGFjUStXN2R0WTErZ2ZDU0ZubWo3TTJ0SVFk?= =?utf-8?B?Tk5aQnBVbmlPMGRtNFlVRmFEL29EYWxrZW1RUVFhRHI2d3VFS2RDbHlma0F5?= =?utf-8?B?dmk5ck01Mm1WRUZOMmtxTGlMV0ozeklYMlpNOTBXalR6UklyYWJHMTdsc2NN?= =?utf-8?B?Wnp3amVVUG5FT1d5NjdkQlhWMVhoTWowdXdNdjVXQUZKUE04Y29QY0hPSWMr?= =?utf-8?B?TTN1amlPWVJOc1crNXh5YWtHYUhuaGxRMGJwUnpXc3o4NWVpL0dhd2F5TXIw?= =?utf-8?B?NnFqeEVFMnY2VzgvSzFQY00rckU1bUhFbGtXaENQL0lHQ0hTc2lYUDZ6alhN?= =?utf-8?B?UDZyUFFZWVVIZnZRQk1Md0I4RXZRNFRPYU5mRGp2NlRqazh2OHZnUWVyajg4?= =?utf-8?B?aWRrbGlkSGZTUHUveFdpSDNwZ2pZLy9XMytHbUtSYlMzd0xlWU1mQTNMQjFC?= =?utf-8?B?RlZHNml3SDNzN2FCcjNYd3QraUx6cmtYeFJZcEM5WGwwSkg1ZWVGODQ2RFVX?= =?utf-8?B?MGJtbWVockVmZm1VVjVWR3RBaitzUFdNbnRJSHAzNWcvbVZveFZ2OUJQS0ZJ?= =?utf-8?B?QTliMHJVMGlQRldzYVMwdkpjOC9HUG1sTHFFQUplOEpIVXFmV2RXQUJIT2JO?= =?utf-8?B?ckNPUk9SaG05WGlXZjl0SEljZTBGSGtMUHZBc3JXbnVoWDN6WFZIVldDS1dI?= =?utf-8?B?RFhFNFV6YmhKUmN3RExybldpa2wzcG9WQW1hV2FTc09SZnFBbGxmVVVoUEdF?= =?utf-8?B?TEd4czZiWER4ZWJzZWVGRllCRnNGaFlVU29McmlpTnkwUHlBRWdJS2ZLYUZL?= =?utf-8?B?VHZ0ZlM2eHBkV245aVYxYnlIckFqQmNJdTRQWEhXdm1JYUJwN2JXN202U2hQ?= =?utf-8?B?TWMrTHRla0ZWL253M295ZG1Va2pGVkV0SThSWFZsL2d1R3lVdEM4R08zRE54?= =?utf-8?B?ZGRQYXVMdTNjVXFGTUp1bEpSRmV0S0YzSVA4SVdtSWNCL2FzL2poQ1hNdTB6?= =?utf-8?B?ZW1xWGs2ZGsrQWFySTAvZ1dRaU9IY1Z6RGY2U1ZDL1NNMUxTTGl2Uk13NTJH?= =?utf-8?B?bHRjRk9LeEtvNGVpQitGbitONGhLa3VNYWpNay8vK05NZXE0U0Y2V1FQQmdP?= =?utf-8?B?SHhaR2Z4V2RmUGVSSTlEaE9PZlpoU0VlSHNKSEtDMDRKK0wzVExYZjh6Q2pa?= =?utf-8?Q?IIl+w+Axfbijez/1iZr4PoPgm4OEWSshVn8C+mnfeA692?= X-MS-Exchange-AntiSpam-MessageData-1: 4qIdvY8sR6S+Cw== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 3904c5c3-1a88-41be-fe62-08deba65b90c X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:58:39.3281 (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: s4MYJfQkVMczR/bNMAQCdPNyI2otEVlxrmn1tYdmfEAkja/0XMJbjS5s/UEM0iKwbVGVEtJ9rwJTdYzWsRQe7g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 The current code copies the data into a KVec and parses it on demand. We can simplify the code by storing the parsed entries. Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 56 ++++++++++++++------------------------= ---- 1 file changed, 18 insertions(+), 38 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 987eb1948314..1ffaf0ef56a7 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -917,8 +917,7 @@ unsafe impl FromBytes for PmuLookupTableHeader {} /// The table of entries is pointed to by the falcon data pointer in the B= IT table, and is used to /// locate the Falcon Ucode. struct PmuLookupTable { - header: PmuLookupTableHeader, - table_data: KVec, + entries: KVVec, } =20 impl PmuLookupTable { @@ -929,48 +928,29 @@ fn new(dev: &device::Device, data: &[u8]) -> Result { let entry_len =3D usize::from(header.entry_len); let entry_count =3D usize::from(header.entry_count); =20 - let required_bytes =3D header_len + (entry_count * entry_len); + let data =3D data + .get(header_len..header_len + entry_count * entry_len) + .ok_or(EINVAL) + .inspect_err(|_| { + dev_err!(dev, "PmuLookupTable data length less than requir= ed\n"); + })?; =20 - if data.len() < required_bytes { - dev_err!(dev, "PmuLookupTable data length less than required\n= "); - return Err(EINVAL); + let mut entries =3D KVVec::with_capacity(entry_count, GFP_KERNEL)?; + for i in 0..entry_count { + let (entry, _) =3D PmuLookupTableEntry::from_bytes_copy_prefix= (&data[i * entry_len..]) + .ok_or(EINVAL)?; + entries.push(entry, GFP_KERNEL)?; } =20 - // Create a copy of only the table data - let table_data =3D { - let mut ret =3D KVec::new(); - ret.extend_from_slice(&data[header_len..required_bytes], GFP_K= ERNEL)?; - ret - }; - - Ok(PmuLookupTable { header, table_data }) - } - - fn lookup_index(&self, idx: u8) -> Result { - if idx >=3D self.header.entry_count { - return Err(EINVAL); - } - - let index =3D (usize::from(idx)) * usize::from(self.header.entry_l= en); - let (entry, _) =3D self - .table_data - .get(index..) - .and_then(PmuLookupTableEntry::from_bytes_copy_prefix) - .ok_or(EINVAL)?; - - Ok(entry) + Ok(PmuLookupTable { entries }) } =20 // find entry by type value - fn find_entry_by_type(&self, entry_type: u8) -> Result { - for i in 0..self.header.entry_count { - let entry =3D self.lookup_index(i)?; - if entry.application_id =3D=3D entry_type { - return Ok(entry); - } - } - - Err(EINVAL) + fn find_entry_by_type(&self, entry_type: u8) -> Result<&PmuLookupTable= Entry> { + self.entries + .iter() + .find(|entry| entry.application_id =3D=3D entry_type) + .ok_or(EINVAL) } } =20 --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from CY3PR05CU001.outbound.protection.outlook.com (mail-westcentralusazon11013028.outbound.protection.outlook.com [40.93.201.28]) (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 8EE1C2BEFFE; Mon, 25 May 2026 13:58:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.201.28 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717530; cv=fail; b=fPDhZVoHs/1nEc/9EcAQC4rWal4hLUwSyfSKhsVZGslgrwh3dGSJtgtVP9NLr3T+sDAQdRhY4SrSbxPZG3Dvp9ZLxiwDLcFbLZ2PquX0IspziECqUxBRL6Ul9yxZEg2/4fIiY9p9+BHESBYNHyYWLs9x/0vheY0MGZbQ/mw60Qk= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717530; c=relaxed/simple; bh=3M7qk7+2jyNCxicUM57Hss4u2D4aLt818BrzMzzyl0E=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=YQziUb0SfVIxuQykVBt99pPf1dhykXUv7bRfUgMzSPHSOiABc4mZox8xZFp2yVmVHk/LKtGw2/Bpx5nUuavMTV3qenR/hzntAcIkLWwLEhmKeIPApxynHLYtvziZfhAqQhxK3USOgu4n7YufYU+2BRgOHk043U3sqQS+J6/6O60= 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=IHmQQgpe; arc=fail smtp.client-ip=40.93.201.28 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="IHmQQgpe" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AsYpBVr9cXMxTAKP4p9B5LXJ0BYZRidYQbVI7XfwZFXEfnlU7DGhVelyChKl7o0SCh+jXOigVUY7VwfE8yb7r14NqtZDXYReWgM/cLXircnWbfxeZYiivjgLyxk8YRrPqxjzugRrnHNc8WH7ipYZuX4B1qKYd8E6my133wH9qN8p5he6lFF3DOwJ9GrmRRqTDbc7OUYAD+yzSxN+GB6+BqSHPUonDmsKTCg9nbOdYyIGjikfKyd7kPAaIImAl9m40ydzx4v8nfJEA9pxACLo3cXdL26TAiwU1X0BAimxz4sQT5WEQIHIgublZ0wBGbUo/9BDnguCSmvmA5Zixmz4Dg== 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=3LUMrVT3mmx8YalNsoeGbN0Hu7ceb3QaGI+JRWxbxGA=; b=Vn9QFZYK2WUTvil8p+OJndLz7WU5IgLeqia7WxffUZ+zuZ7hSnT19NVCH3hDPOhIDlTraDl5xgDsc3X2+Z4F+9iQkdHjlICJ+9lUAR0G14tTKRoQsm09IFRecjBbqIrBT9FAViJTpN2M3ypd6UcD+Moc75UGx8REpqRvcFeD5UNbIDSzV9hlfXmF02zKmnnsXhpxCLXBfSW1m4dHR0sptBt59N8nPE7gj/k5ChZhUyN5zHkQoUW11DjumLxghrjh7Qliuv5ZpUzldGHOcH3tLpiluez2cyq89uXR8oL36wFsGR2EyEUcc/64f7+nhO3do4VRCZVIBfWahgudyJmojA== 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=3LUMrVT3mmx8YalNsoeGbN0Hu7ceb3QaGI+JRWxbxGA=; b=IHmQQgpehcIiL+3JTrHSa9swWhX2Yy65Yg3YnWiNwDWHGSd3UOgQQJgzn1Hbm1N7bCfX17EtFoT/Ii0B/nm2gD00zWsyPC5a1S0igxXPCyGO1SWoQpzyRzSwHueDQFFmM2lYdOUMu8GkPOpiLKRh/TywuBAul/zemuPNuO1dMdh3QUBDeDW2xucHW+V8vuKzw4tNLRlpGaVwak/2Oya2yaFPDDbSaXRRuSQvoWoNNKGFFdvYJgC12v8bnwFfToMAZUd0EINndZcMOAjO59r9WKSIIwkV1F4y3+3VTD535U9ak01sCgcp+BEZ3XPVjJCEJqRbbswyOHvuz+J3aqaRsA== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:58:43 +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.0048.019; Mon, 25 May 2026 13:58:43 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:32 +0900 Subject: [PATCH v5 14/22] gpu: nova-core: vbios: construct `FwSecBiosImage` directly from BIOS images Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-14-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney , Joel Fernandes X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYCP301CA0010.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:386::13) 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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: ab552876-b4fe-470f-c989-08deba65bb80 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|11063799006; X-Microsoft-Antispam-Message-Info: whXZHJ+DxNylHtfxtkElgtqPKkR9W6lc0EoyJLTIxXs4JMwMpucRfG+Vf0uDlwHspNGfu+XdKM9gsxs4ageIl+DWVCdmuOH0YjWCqkRhbPh+bMjERZpVqiuGHo0OZymYO5331rVaKb76sDfoBiE3G20VNj4pZEqIIuPOAtvdFJb2Bh5g9usGtNpB5DwU61w5vJVcqAKW9/1lvWCQ5ue2N2EawRvrIwzSgiKCjfRNp13nv7qI/AfB8grLyDF9rE3Z6VcdSObFZwvGP+Llhzyg/EB81ZrrhBqb3xwrUGq+aZAcYq1aJHXZUz0zQjjHASoP4Z2Qx0hI2CxDiPTC0tYmgYXQVN/6HqL/R/TcER7ywl6V0jPcCrk6UJG86NiavDdx9ZT4qQZrI4tY9D/i4BGbJz13zqdXIwQwSKyJwknT052BULVMOfImFGsrPmvYYjreSse16lQi9wQEZ/9217cUNOxeqtCGJupUKdDRhZ47HIvrAXpWullFy1XQUibeHnLX/y6cQubRcJ9Eh4qurRqSbX2yLyutr0TR/ZZKzUE/7iXFK96GQnAEMErNvcR3EQvEcJGO4AT9AtIDV/OJll3pHKox0R3qvTwHBJOq8FnuHwDEiIuarziMwxvp/Q5TgOHQA+DCVJ7kacNboEw4U5sFq3atEn/F8/t3lcl/5/uynVqNsKQVY+Qsfh85rniu2D3I 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?K1dEaWltQzNwVGxEcWptTUs4TmxxaWU0c1JobnZCRUJacXdRYncrU3BXbXA1?= =?utf-8?B?T1V5ak9JV3N3VXhtcmdJTGQ0ZDBXc293U2pNcWwzdXhnT2Z5dDlwS2xWZXBy?= =?utf-8?B?dE5KcStGSHJkTVBXZDR2a1liQ0RHRW1DWXNKR2pxTzg4TzBJQUZzK2Z6SUhN?= =?utf-8?B?TG5CMys0VGk3TFdLRFdVRjU2MXBwSHFNTXJja0ZJdTRrUGl4Q0JFTzZvMVNm?= =?utf-8?B?dUl2YnN1dUhtL3NUMGt4NVlMM0hBdGFQQ3o2QndaK1Yvc01jT0p6VzRrTlhI?= =?utf-8?B?eUJ5T1dHRm93c0FNamhPWjRVbHpXMGVsTVhML2szQ0RMZm1lVnpBM0hFZllw?= =?utf-8?B?TGFzcXJLeEhrT1pPNm12ZThQTFErS21veHNyaEZNaHFLenFJRmNXTHVCOEF3?= =?utf-8?B?ZG9oNGlLYWVVU0JxbmNMSWVZclBOMGpraTRaSWVNQkR2UGRGSkVMWWhKYjMx?= =?utf-8?B?TnVFcWU1cHJvT0NsYys3NFdHYU5HbjlkTUNVMUdYeFpNU053dWpxaWk2TU1V?= =?utf-8?B?NE1SdDBQTUw1VE1oZFFIZGFZcGhhQUJLcUtQWDJOand3K0pzY3UyU3I1RG1w?= =?utf-8?B?YVJSaEVhUU9UckV5UWVOYTNrZFRrdFJxemtwQjlpUkhIZzVYajR2V29Vcktw?= =?utf-8?B?OGw2WVkyWFgvblY1NFVHU1dNWExtejhZOVUyNC9RTWpVQWJtM0trUWpEMmdl?= =?utf-8?B?SDlrVHlESU9pYmdxSXZtZ25MeUtKMWdWVTl5Mk5DeHdXdWRud0xWWVVIY2Fi?= =?utf-8?B?YS93VHkzaGlyL0xIbEtWWlhza1JHb3RuMHM3RWhVS2dsVHFhUEVXY1dtM3Zk?= =?utf-8?B?Y3BoUXNIRnJzYytGbm5pN0x5N2FIbTVwM1d1UlRMdXJSWlRVQlFUWlhaL0Rt?= =?utf-8?B?ZzRHZTI0VDc3YWFGa3ZvUk84ZWtneWpSZEQzTkVqMVZzTklqZjZrdHg4QlpO?= =?utf-8?B?UHFLdXBudThyK0lHUDV4S1VpRDJtT0NiZHRwUkpENUg3eXFpcHNHVVlCRDRC?= =?utf-8?B?a3UrQUhKbDRZR2g1OUZLcWxzaURWR0c5SzA0L3FEa2o5RWNxb3V1bVFGWE5o?= =?utf-8?B?M0dGdkdXOFRxLzA0V1pRZ1FDR1ZoZWhISnJuS3BWV3Y1c0hWTmdQZkNjVnd4?= =?utf-8?B?aFVjVGpuUU9kekpGQlRZclFOQWlWNDh1NEZiQVhSSHJFWUljekpBdFpmUVN6?= =?utf-8?B?STdZR21Da2xpazdMS0o2andidWhnKzF4SWpCbkpzWjlYcUdKeFEvY0VzTlN6?= =?utf-8?B?cVV3QVMxeVZSVHE5aTFlbldYUHYvckNZSkgrOW9tVFh5U00xUVJYTWU5NlBr?= =?utf-8?B?amZ0R01qTDRvVk9FRFFHaFdqRUVXcm04VzFQdkxVSkJLUG5WWWNwMWVkM0Jv?= =?utf-8?B?aC80SEZ5bC9uQU9WTG9tOUkwZzFlaDNXcGRKbmo3bEhscUYzcUIrTXB2bG9p?= =?utf-8?B?VW45TjRBQVoveGdDVmFvU2VBb2FRbVB1VnkyVzR4cVJJUzE2QTVINmF3cEEv?= =?utf-8?B?eEpmcHplb0FnOUIwNjd5VDhTZTlLMVJwUEJ4SWYrWDduNTBHZWkwSnV5QkY2?= =?utf-8?B?MHVlcUpCK0Q4bWM3djVjZmY3R1RNNFdTSlFwUGd4ZExDZEdoQzhlc3ExNmc1?= =?utf-8?B?UTI4alQyVXRoVVoydWlPZzNCeGFzd1FVUmRKZmxOQmlWSmhDdmRaMmdKWDVK?= =?utf-8?B?NzhiY1F1RGtHZUhWKzQxMGM4Q1RscllxUitRWjMwQ2ZjZDR3Qk9Ib2MxZ0w1?= =?utf-8?B?WDkzNE1jUk9nd2dpSjY4QTJKdlY0R0pXTmRFZ3VMWnhwZlJqU2xRdzhsRnBw?= =?utf-8?B?L0JVc2dSNVc2UEVlb25oWXpsWjBYU2FRWmZQTXA5anlHOE9GR0VJTjErN0ls?= =?utf-8?B?RUFzL1hTWHBhb04ySFNOOTRHNEtRbVVrUzJEWVZOTndWSjFPd0tGbGFGbjVk?= =?utf-8?B?Wkp5dTNpSmtXMHZzSUJ6K0kzN0dPTkdpTkVDUzFuTGlUT1RZSVVpaHBTclB3?= =?utf-8?B?K0RoZnlTdTMwdlA1UzFFaDRkQnZwU2ZoMHJnT2FjdEtsbnY3N2RZRDJKbjNR?= =?utf-8?B?MmZOZDVUWGUxR0Z3T050VUlaQUpOQnUzSW92SWRqZFM4cE9zdmZGQmtZYnl3?= =?utf-8?B?Yk9LSHlKZFdEMEpMOHNPMVJYTGN2S0NDVkZlZndRTXBXaGNZNzFGaVYwOFlY?= =?utf-8?B?T0xMWUF2d0lqYUhIT0R2b2ZFMzFWc09LbXRHVjE2N2duNkRxbk1qMFdkZGNt?= =?utf-8?B?NDdERlUrT244ZWQxdkhqRUp1djZtUVNvc2kyVUVZRVArd3lYb0VRRUFPQUUr?= =?utf-8?B?c24xM0dFWG92S2pjMmRWZ0w5SUJjNm1vZzNFRWV5ZGRCZDFpbnVaSzc1MExD?= =?utf-8?Q?g/83QH4pgUlt0LOjfmRJK9DNGXPWpKEVKHclOXHMtTnQz?= X-MS-Exchange-AntiSpam-MessageData-1: FxhLE0Ram82dew== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: ab552876-b4fe-470f-c989-08deba65bb80 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:58:43.4758 (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: wG23BmptbkRp/KBAfgSbQPrweyEoAjKKycxj78xaVwoUhch4RVmYAk+V4ubO933Ad+8hw1ywxblbtLwRJKgUxg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 `FwSecBiosBuilder` now only contains `falcon_ucode_offset` which just gets passed directly into `FwSecBiosImage`. Remove `FwSecBiosBuilder` and construct `FwSecBiosImage` directly, as a simplification. Reviewed-by: Joel Fernandes Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 88 ++++++++++++++------------------------= ---- 1 file changed, 29 insertions(+), 59 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 1ffaf0ef56a7..9c5281e7a0d3 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -315,8 +315,8 @@ impl Vbios { pub(crate) fn new(dev: &device::Device, bar0: &Bar0) -> Result { // Images to extract from iteration let mut pci_at_image: Option =3D None; - let mut first_fwsec_image: Option =3D None; - let mut second_fwsec_image: Option =3D None; + let mut first_fwsec_image: Option =3D None; + let mut second_fwsec_image: Option =3D None; =20 // Parse all VBIOS images in the ROM for image_result in VbiosIterator::new(dev, bar0)? { @@ -336,14 +336,10 @@ pub(crate) fn new(dev: &device::Device, bar0: &Bar0) = -> Result { pci_at_image =3D Some(PciAtBiosImage::try_from(image)?= ); } Ok(BiosImageType::FwSec) =3D> { - let fwsec =3D FwSecBiosBuilder { - base: image, - falcon_ucode_offset: None, - }; if first_fwsec_image.is_none() { - first_fwsec_image =3D Some(fwsec); + first_fwsec_image =3D Some(image); } else { - second_fwsec_image =3D Some(fwsec); + second_fwsec_image =3D Some(image); } } _ =3D> { @@ -353,15 +349,13 @@ pub(crate) fn new(dev: &device::Device, bar0: &Bar0) = -> Result { } =20 // Using all the images, setup the falcon data pointer in Fwsec. - if let (Some(mut second), Some(first), Some(pci_at)) =3D + if let (Some(second), Some(first), Some(pci_at)) =3D (second_fwsec_image, first_fwsec_image, pci_at_image) { - second - .setup_falcon_data(&pci_at, &first) + let fwsec_image =3D FwSecBiosImage::new(pci_at, first, second) .inspect_err(|e| dev_err!(dev, "Falcon data setup failed: = {:?}\n", e))?; - Ok(Vbios { - fwsec_image: second.build()?, - }) + + Ok(Vbios { fwsec_image }) } else { dev_err!( dev, @@ -702,18 +696,6 @@ struct NbsiBiosImage { // NBSI-specific fields can be added here in the future. } =20 -struct FwSecBiosBuilder { - base: BiosImage, - /// These are temporary fields that are used during the construction o= f the - /// [`FwSecBiosBuilder`]. - /// - /// Once FwSecBiosBuilder is constructed, the `falcon_ucode_offset` wi= ll be copied into a new - /// [`FwSecBiosImage`]. - /// - /// The offset of the Falcon ucode. - falcon_ucode_offset: Option, -} - /// The [`FwSecBiosImage`] structure contains the PMU table and the Falcon= Ucode. /// /// The PMU table contains voltage/frequency tables as well as a pointer t= o the Falcon Ucode. @@ -954,32 +936,33 @@ fn find_entry_by_type(&self, entry_type: u8) -> Resul= t<&PmuLookupTableEntry> { } } =20 -impl FwSecBiosBuilder { - fn setup_falcon_data( - &mut self, - pci_at_image: &PciAtBiosImage, - first_fwsec: &FwSecBiosBuilder, - ) -> Result { +impl FwSecBiosImage { + /// Build the final `FwSecBiosImage` from the PCI-AT and FWSEC BIOS im= ages. + fn new( + pci_at_image: PciAtBiosImage, + first_fwsec: BiosImage, + second_fwsec: BiosImage, + ) -> Result { let offset =3D pci_at_image.falcon_data_offset()?; =20 // The offset is from the start of the first FwSec image, but it // may point into the second FwSec image. Treat the two FwSec imag= es // as contiguous here and subtract the first image length when the // target lies in the second one. - let pmu_lookup_data =3D if offset < first_fwsec.base.data.len() { - first_fwsec.base.data.get(offset..) + let pmu_lookup_data =3D if offset < first_fwsec.data.len() { + first_fwsec.data.get(offset..) } else { - self.base.data.get(offset - first_fwsec.base.data.len()..) + second_fwsec.data.get(offset - first_fwsec.data.len()..) } .ok_or(EINVAL)?; =20 - let pmu_lookup_table =3D PmuLookupTable::new(&self.base.dev, pmu_l= ookup_data)?; + let pmu_lookup_table =3D PmuLookupTable::new(&second_fwsec.dev, pm= u_lookup_data)?; =20 let entry =3D pmu_lookup_table .find_entry_by_type(FALCON_UCODE_ENTRY_APPID_FWSEC_PROD) .inspect_err(|e| { dev_err!( - self.base.dev, + second_fwsec.dev, "PmuLookupTableEntry not found, error: {:?}\n", e ); @@ -987,34 +970,21 @@ fn setup_falcon_data( =20 let falcon_ucode_offset =3D usize::from_safe_cast(entry.data) .checked_sub(pci_at_image.base.data.len()) - .and_then(|o| o.checked_sub(first_fwsec.base.data.len())) + .and_then(|o| o.checked_sub(first_fwsec.data.len())) .ok_or(EINVAL) .inspect_err(|_| { - dev_err!(self.base.dev, "Falcon Ucode offset not in second= Fwsec.\n"); + dev_err!( + second_fwsec.dev, + "Falcon Ucode offset not in second Fwsec.\n" + ); })?; =20 - self.falcon_ucode_offset =3D Some(falcon_ucode_offset); - Ok(()) + Ok(FwSecBiosImage { + base: second_fwsec, + falcon_ucode_offset, + }) } =20 - /// Build the final FwSecBiosImage from this builder - fn build(self) -> Result { - let ret =3D FwSecBiosImage { - base: self.base, - falcon_ucode_offset: self.falcon_ucode_offset.ok_or(EINVAL)?, - }; - - if cfg!(debug_assertions) { - // Print the desc header for debugging - let desc =3D ret.header()?; - dev_dbg!(ret.base.dev, "PmuLookupTableEntry desc: {:#?}\n", de= sc); - } - - Ok(ret) - } -} - -impl FwSecBiosImage { /// Get the FwSec header ([`FalconUCodeDesc`]). pub(crate) fn header(&self) -> Result { let data =3D self --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from BN1PR04CU002.outbound.protection.outlook.com (mail-eastus2azon11010065.outbound.protection.outlook.com [52.101.56.65]) (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 1F4CC38AC8E; Mon, 25 May 2026 13:58:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.56.65 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717533; cv=fail; b=I2OR33S3FYOj71Qy40ZgDIKjOzhZgtykDO2Tzt8M95PbCP4yRKDXkllgnFLWEvYqP8u50Gl9B0hKTlZ2PO5OC62qkA0J9BhZknjmGiArJzYL5FlYXRE2CKSz4o4UsVdosQhRGIC0pmyC3PIUPZ1w2kl5uHLHD6H7clKtfZRm4Ak= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717533; c=relaxed/simple; bh=QUgcJZ63Cb3OhedlB0PHZDPtiCCUnpL0WhMtWm2pv+0=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=SfIbW7vQQZ0t7NLt8AnwGXxnEVkK2DmUM4WakeRCsxItH02OvwImdRw+cBhAD2NvCizqYjdxnOtaCQfldz63kOVoxQC8Dtq/B8ouzLFZBcXyJfBHq+fCTKbPH9fk1ME6EE8PtRkI5xMm7Jal00H5YvzxiE4Xm2Y6MhVK/fWiJBg= 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=DNo7Gc4r; arc=fail smtp.client-ip=52.101.56.65 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="DNo7Gc4r" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=FqRaZ+FVK5OiH+GvInFGVb+kxfsTyq5M9v3NHNTy3DYFr0+Is5Xcp91hm2J3qUDyX1bx26ErlHYy5O+yWVJU13xd4lu3VVi+owJFQG8da+RGj6CjCeQuqtFVz10aJuwDXdrz/eGlmHYszVYEySoECr10pV+IgD9TEChIrqvui9j0KTqVZ3mADR3I79m7agHQfyALnFNV0TGhFhH483wkIebgaBYQg2PdWb5aB/A/gORNd+/L1wJBCRJlfB34DxdBmaQHPgQzkPTwbWv5zmnrg1N8XRSGyUGKvX6udqOyHtZon8nT/cbAY8CF73mJ4tT9lS4cwxmwWKO+u/MJJ6BeCg== 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=a2Fu+/N6fTQw7yoERolJMEuLXln8P7QlCYPqLlCbu0k=; b=jLckGqiLsZHgNVD0xfpDgcZ/G+mPjQacgQM5ndEnuczTkao0ENCBAzknvwykyeULFO+BxgxiYw8C7X9cuzcVRs5eyqRFlpWpm9G8/iAHMrt33iKit3A+I8gp+dMgL2sqW48/FyK5eY+bO/ntQigwuF4aUuLclf9AmC3KuOJGiDBdy3jRm/x1wgd7TiguF2rhBqQtppjhn/gLkKVWF/Yra3z4/y1EVadYifWfszg8p3T6aPbK28rPcVqtCBqTGarPnOg14h2j2r76Px4tt5mK5kKLC81ebdtg/Ugs6zv/jJFMrx+GmsK9bGWTyT0L6rjHtnPd+dq101hjf8zsPe1gww== 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=a2Fu+/N6fTQw7yoERolJMEuLXln8P7QlCYPqLlCbu0k=; b=DNo7Gc4raZpNB/n/hE2vO/Sy75Cuy+U4DV7b1k/xmP/dUW80hVLXKfNFu8lRTOcjLETb9mIueKzsVc67BWSqt2+PLx3KrRj42L6hxWpVYVTfXpL+dUgzlUmgnkzahGZaDtX7TyCyGuR0VmIobEO5Xd6ncnJYjxqnMRroWcPlAfVJlAD6YqiShc82EV6viFwHenSV8tMG3TmJeErg6fkq2WJc3GyImQXrcXPzydWpqBUOt419Gno9z/try3DGXjp0aPrKdS8Dv8H1vFkNDVN75F5UOnwb6Jc5Yxq7nJytmfasb0mMCcXjppGq0uEEg08JXwM5f0VKhl5dj1wGhBGoPQ== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:58:48 +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.0048.019; Mon, 25 May 2026 13:58:48 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:33 +0900 Subject: [PATCH v5 15/22] gpu: nova-core: vbios: use the first PCI-AT image Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-15-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TY4P301CA0119.JPNP301.PROD.OUTLOOK.COM (2603:1096:405:37e::9) 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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e06095a-29c6-4877-4bfb-08deba65be3c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|11063799006; X-Microsoft-Antispam-Message-Info: 3oojMWwvbDZlXodRRdBXyb7vl1Y4Jvob8nY8RfX65wNGZf0KBh8OpmkOOj47MPPpNmDlvY/nvHf3ugUnoWGYfDb51onjRYV2BiE/ydYG0rWFthZX0HYkeh3cMXwL3Nt0B5kxDv92p8b6Mb8H3qhjHxoy5Dzg2l3bgesTvMtwCkEF9gOXJqOM07M3Y7Llr1cehcYK5VBW1SQY6e8CqsFsOkkjvn47hYxsGN5jfOtiDF35P0svG9xZNYiweBBE05znIqk29z7mGjoBm9URSKPajIvgdXACjsZxI5z2NSMSjGgG/UlOjNLqXZqV+JVW94h4Uz5qwzFZLb/5QLzh7z4q388Z9YQsLOL5glYvwmAwWKhvujI09OJjwZMvNyCDrbDkZ49Qw4T6uNENYjgoZIjBoY3fsnKdOET0i8EpKEydKOJEpGSB4DfsLHrnsNJ/ioeAQ35l0h57i+EhJjiBu2/Df7e95maVPUGC2IpFrDgHG6sSauKK+BKKiX+UTwC9bJn3QmbnrXtOLyPkfNM4L+S2zf382zWQP/5TiBtMUYm02ugYw0E6p5cZsGgAaMPkZBXXuFgYd1igm/WPm2+C1bajUS1uDbQz9J69DSvYgbgMhBlXpAz/+zmxHegSNjBvbnHHG9vpe4qdnQa9JNKA8pIBWuuW9mdh3xzhNBsp1TID2zzIpboniXz/VOG7ftv/pCOr 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ekZGRm54Z2U2SkJSNGVxcW5zRnlBVlp5em9WUDJaSTNrZ1NaYTNjbVd6WGRj?= =?utf-8?B?VXdrRVRyaWdEQjZPT0EyRmFNWHNXQ0QycW8zb0dKYnQ4RkRmN1FrWmlObGtl?= =?utf-8?B?ZUpvZ2tZT0Y5TTRTdC9sd1kxQy9PV3VCeDBPOFNEQXRSNHdPeCtSQ0kwaEMz?= =?utf-8?B?VEVjRDJVQ0NiK0ZlVHdkUThvOGNmTTBwWWNPd0dXeERESjROQWRBZEw2OEJS?= =?utf-8?B?M2lDMng2UWMxV2EwS3FNcHEvSjI3UGZKR3NmTXlnd2NMV0dpMkY0WHk1WjdB?= =?utf-8?B?YldlL2l1cDVYTWtDVmhlUysvWVVXb1EyZWZ4ZzlqenF0VmJzNFA2YVIwa3pJ?= =?utf-8?B?dXRQWG9XZkRXT2tTVTFzY2Q1b1RyUTA4c1g2MXJtUkRGOE1UWEF2a0h6TWVh?= =?utf-8?B?MnBLMkFLb3RiQVNla2kxU0lqQnhnTHVnL3FCZE5wSXBzUW9TSit6VDl1ck8z?= =?utf-8?B?WElDVHM2bGp0bGVwZVJ5b1ptbTY5ZGs4UDVpK2N2THpqelUzUnFpRHR3VlEz?= =?utf-8?B?WVR3TVNhOU1ndXpzK2pPWUF6a0VZbWNBM3pKemdUbjRFUjcrLzY4R25pbGlR?= =?utf-8?B?OXRsT0lNd2pYNUNrNWdNUVIwdWRYNmpCTEJXaW9XT3AycHlicml2b3lBUXhX?= =?utf-8?B?YVB4ZWZMeEdsTlpRMmpuQ3V6SGlPbGpYMFd6WTJKSzJGV3lNbVNWbmlwbUl4?= =?utf-8?B?VENnQmRUQ1pORmxOWlJLbExVNkRtSzJoZ2w3ckdraHFwZjRoMXplWkMwZWM5?= =?utf-8?B?Qlp3MkFDLzNrckx3NC9Wc2NDRk9Zc1habisxNms2OEUyY3JnbW1BbFM0OEcy?= =?utf-8?B?Z2NVcWwxaFZmRkpzUzBiMWVVa3hOMjhiTmRJUnlrNHJyVzBHNitRRGo2OHh1?= =?utf-8?B?b09zU0tsQXAyQzFTbDcrekRsTWZONHBzU2t4d24yVjRsV0QxL0hmQlZCV0Ja?= =?utf-8?B?NVBENGZaUUxGdU5IQ1dXZld1TEZ5ZllPcVZzZGRLVzFlQThGSlJSeWpXSUpE?= =?utf-8?B?NEJ0eW5TK1k0V2hEM05RSTRLSWdhcnVxcjJxcUEyT0dBcFgzc0VydCtBZHVk?= =?utf-8?B?SXhVU2VHNjVOdWREY1l5ci9UVUhlTGNEVUZERURycHJJUmhZcDk4YlkvSFo4?= =?utf-8?B?c1V3N1R2UGs0NHJKWlpVMVk1a0U5Uk8xSy85ZHlSSVlYQmthbDBZMDFiOUNu?= =?utf-8?B?MnBUSmF6MUE0WTJ0U0NTcGlpeGxaK3JhOTZKSmRtamYvUFlkVXlqVEpWRzVn?= =?utf-8?B?UWcvRStzQjJZZzlja05rZ1NFM21oQnIwQlgvYmJKTEV0OHF2Wkl2Q1htd0l4?= =?utf-8?B?WlhPNVMvRzFqZU1GZEtsbm1NMUhHNjVrVFNDUmdwQ0JONU92VVAxUEtZVjdl?= =?utf-8?B?MExxalNsWUxhdzh2QytlSFZKMlJLWU5qY1VvWlNJRkwreGVpMXRGMzlLajdH?= =?utf-8?B?UmNPSDdQM2dJa3N6Y2w2RHZnUVdzQkJyMEpYZ2M5djZZTjdxdHRIbm5RL1Q3?= =?utf-8?B?c3VSOFQzbGI2T3dVaVVhcDdSVlhMemhXazU4dURuUWtWR0FGOUxTck1waGlG?= =?utf-8?B?WnM0WURhQnZyYnJ0MWdIb0xHWG80UERFM1pWY3o5UDd4cmJzeGtqK0t4R1Y0?= =?utf-8?B?NGVwWVF6QW1NdUxlanUrZVBudVViMnVnVzRyUkxLbXBtWFFJNFFDUkdnSmhn?= =?utf-8?B?RStiQVFGUmNpMk54WTFIakhQTUpEa2ZRaXp1azVBTTlDUmNUWG1uNzdDamlB?= =?utf-8?B?UjhPaEthTFZONXkwc3FwWTJEYSs3TGdhNjZRV0h5VjgvZjJZQmJ2bElnTDQv?= =?utf-8?B?N3hWWUtvSDI4bGU3R2JYeklNdS8vSm1zTmlwZFltNkZKNG85Q2l1VUh5cjJa?= =?utf-8?B?dTlSWDluS3hHZURuK25lMU1TY1JUQnptSGtSY21RZ0ZyL2JKQVRuMG1JcmVu?= =?utf-8?B?VExPQnVyaERLZVZiWWdrMzVLbXZoeU1OVTFROW03STI3czlsVzA5ZENBVmpM?= =?utf-8?B?S0lrdjQxL25vRlIzeDRiSVIrRG14ZzJtY1ZJdGgrSkxSTHF1OEtPSzM3NHpK?= =?utf-8?B?VThhRzI4ZzM1ZXUvZFV4dHBsMlVVU1QxejlPelZNSVZLbzgrREhDSUliMXo2?= =?utf-8?B?clYyVXZvdm9zTnN6aUhJdjA1OXdkejRNU1pZTHg4RXBJN3RGd2pNdENjUy9L?= =?utf-8?B?VWZrRFNjaStiZ2llYWtyR3lTSkplM0hrKzlEY0JxSHduSjg1U1Z5ZzBpZjFk?= =?utf-8?B?K3RKMUVKeEdmNTlFUU02OXpkUGx6STE3amFwU3h3SEFUeTd1NURoVjkxY2hp?= =?utf-8?B?OW5vNmIrcllGQ0lhVzBNSjAvQk55L3BjRkt6TTZCS0IvMktsYVRERDR0bjFh?= =?utf-8?Q?Vjkp4mVZxc7HCswm/DLMIBxkFdtsmJGB4iQZP34BM+vNd?= X-MS-Exchange-AntiSpam-MessageData-1: sqIpjQcRROEFtw== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e06095a-29c6-4877-4bfb-08deba65be3c X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:58:48.1831 (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: C/A4vllt96tEdKG5eEYhUegbfzyKz5JHg3WcLdDqiizJMuC9EbFZQezs7jOZb7mKCJmKLSuPrf77OxZ9TogBrw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 Currently, PCI-AT takes the final image if multiple exist. Use the first one instead, to match nouveau behaviour. Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 9c5281e7a0d3..82811e42e858 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -333,7 +333,10 @@ pub(crate) fn new(dev: &device::Device, bar0: &Bar0) -= > Result { // Convert to a specific image type match BiosImageType::try_from(image.pcir.code_type) { Ok(BiosImageType::PciAt) =3D> { - pci_at_image =3D Some(PciAtBiosImage::try_from(image)?= ); + // Silently ignore any extra PCI-AT images. + if pci_at_image.is_none() { + pci_at_image =3D Some(PciAtBiosImage::try_from(ima= ge)?); + } } Ok(BiosImageType::FwSec) =3D> { if first_fwsec_image.is_none() { --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010043.outbound.protection.outlook.com [52.101.61.43]) (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 D3D6D38888B; Mon, 25 May 2026 13:58:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717537; cv=fail; b=jasTy5bDGr4HQLiVl1WHIncKWBDfYMHNzZ9J31H3Fy95T5FQl+RB+Bz5VyXUwNQ5/DW3FJwuOASSP7K5e4dk6fJpbIZD1dSBqG+uwc/Xg+4QNqS5ef317ouu3bzMN5GHlHm8pPixzZAWnLOOoW2ykh80yMSCIzWCwa19d30NSMA= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717537; c=relaxed/simple; bh=vUITHAOZtzPfJQk1lFQANfiuKlBXOZrI6VMmY91kqfg=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=K3LC7UWp/aKRP3GGO14vAYG8XoTHVx7aK0plXTOuw3C6r7wwzot+9oQieN1TYA9My1TFnumxgqimUxWVh/r4Pmf5L3IAsk7s+xlP+iX4FDiuKUT8guKB+z8JI1LJu6PW427TlPVr+rC8ZNRU9HiF+aYXrhKtsch40kCIhSgi/6c= 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=mZVWYmyT; arc=fail smtp.client-ip=52.101.61.43 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="mZVWYmyT" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=f6lg7UvLRxq0NkmpTYNIXOle5Tj7DXPbHL7juLNGpW+o21nmpU66nsjVB6E6GX55lGsrm8J51IOXNeNRzTqQoJKE4ECVNczJcKqBcsEz48vO5tkHlgmNG+8++kAd5hSEuILYHypDVRng1xVw+5biJxcysXlppmULmLGn0VJOS++Lg2y/5vdv1Qvdb6a2e0ACNR24s9Zf561fm2cF81RjxxHbuEZlU28oijiV7JkBIBFQkvhRrT6t/vTqgicFv1ckrE+75SSHY3/zOO/k8Z+TvShjwYe01kYA3PFFd8TQUPdEbsbwdQKc3z0ZiInlr9vkNZsx3qbTf0WT3FdjETnMgg== 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=LaxYNiCObU+skCYh3NazEDXcaQUUrYOkr/QyrxE+EB4=; b=XrxXJH7A34UFppkgymQcFerdBNcA3zd5UfrLFBouWt7rWLF3gtsZGT8GFTXV/1EJt6s9i/0JDXBrXysl1jphJZhkqOOMLs7QWWAoLlharoxuBW0KTg9Fy3CQappySdqM7rXVsnC9jykhTSHb1bqDeliJBZj4SXTCTAfxI0QqZ1Ugr7YVh61tpksoCucqimN8awggYT+IK3NQ6rWWnfBIBOLpOAEch25bVOz4sG3iH87kyVeHsvsUwbTM6Kyx+MfvoIEq5x9NdmOq5cKOjwPV8+XFvafJK4PFWq6o3okmw1Klkk+Vcts2inF/9/6w76XM7JI0xfUqvoroT57XOmcTHA== 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=LaxYNiCObU+skCYh3NazEDXcaQUUrYOkr/QyrxE+EB4=; b=mZVWYmyTyagBHTXEI0WLhpstfLMV9y5EoMuU8b18hwgkg3QSkvc3Ocj878UxbudapFVTBmadlRtcY/1c7j3QyGMLmdNh9MzFcttpHkxCdxNUKxHq11xatwguYKXS79mhR1sALqIgk/YdwEr1GnxMyZ5qkUs+opSsEhRBgTPqPieW/ZwvbYo9xS3Shagepmh0DvM/58Tck699seTJ/GPg+i2xZ2Tkp7idpsbjNiCWOEnqhY2Ycg8vtNIubChP6kiqNUAux3ilCe7wAxHekknFO0hrTeKufmJR2159oDM2AAIqTlQFgxjJqhQvw58Xqoq6YbAyPfGa0no7ReOc98obRg== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:58:52 +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.0048.019; Mon, 25 May 2026 13:58:52 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:34 +0900 Subject: [PATCH v5 16/22] gpu: nova-core: vbios: use single logical block for the FWSEC section Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-16-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TY4P301CA0121.JPNP301.PROD.OUTLOOK.COM (2603:1096:405:37e::17) 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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: 0890a931-e684-4392-4eb3-08deba65c0c7 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|11063799006; X-Microsoft-Antispam-Message-Info: XvL62vP8TuO7f2+723yYo67GSc/P3Z3KAji/uQFnly0H86I5jlSrjiaAmt2ELi4YW39iy8jNy6cdo/x2BxM7zK9UiuVqCnhKPrXHz/L0f8JiTj8xJb4J8AYToihUfWmJERbGe0Oo9sMo+LXKXI8uEGD3EVz4OKw8nnPQEw09aqwwIeG1GjcziOzlepZyb9fgQ3nBYKo+sfLLi8IO8Jod4fSmhwu7NPCwZIrynKGrPN2GyfPYcLFyTPlY6d5AG4jkf8/zz0MBXNF15q2VsMJcquDDAI47X2WKiIozWgmiBkHmWhUrTBgm0lKRPpJr3JhV6BCLgySgGAXuPaFG0K6TRbyLn5AsWbzKt/FGGNuxgwHtPfz2izxDkhrA+Tl4iKzUA8odHnX/3gpEyFPj2no5PKdzAuslj2N5MhUJJYl29Cy2N6vcY7YkqwROQclUCmA9xSmmxd2tHb4MhDNWR1AGXvS5n/ObcwGt4/RoAv3fvRSct/WXqQ82cWj+W48vU8h+Z1IUkRMKEGbmyBiU5a6AxRL6Q7TaVeFq4TZyCd4S+O72lhdKdIuIe9q2OoWku7A36LUIarbnn+uzeHNb3X1NJT73DX90WlA6sDvDfFCkWWq3aBVgUsEi9nVVS12MpE0TjADF6D2DZ6A1oZ+CYVi0AINd6rxnkGbro10Ip5Vqe3GFU86XNXxMI0RrMXcePLsw 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?S3BuY056cFBhaHZPUkNQRmUrbytiaW9hZ21uYnNNTjYvYmZyRXNXaTRLMGdV?= =?utf-8?B?eTdqaHdwQnFxcjBFYWhLTGRUZlBRZC9vUEthWS9pZ1U2RHFjT0Z3bzExSTZj?= =?utf-8?B?VUpFd2hMeU5BYlRYUXFMaTEyaUdGUU5mY2Q1bVU0VkJGRmxpTG93SGZPdlhj?= =?utf-8?B?dW5wRzU2Tll6Mmk2bDkwVGZCNTY4Yk9QL2hybkxjWDhMT3JIZUZUSVUvUzZD?= =?utf-8?B?Tkpqdko2dHVXaCs3SUFwbm83S2hNZjd6aFI1K1UweG1ITmplZWhCbHRJNzBR?= =?utf-8?B?ckhJcy95a3ZqdDNLeVl5dnRucXM5K3Q2U1VrdTRCQ1NrbzNsZEZWMXVwRkM1?= =?utf-8?B?ZE1JRkEwanpuYXVpTCsvM291ME54cFd2WXBFYktDM051TFhkWE5QcTZ4ZUt6?= =?utf-8?B?Ylloanc5ZjJYVml6WnpJbHF3dGJOUU1jWURIYmt6Y0QvcEt5bGQ2REJLcUtj?= =?utf-8?B?NjFVZG9iYVYwaVZidVpEdnFaSHpCaDB0c2Jna0ZzUG1RSm5nQWRkVk5LL09r?= =?utf-8?B?RDIwTXpQWTZMUWo1OEhONUFrdHVWSnQ2U3drTjlyT1poam5BUGt2UU4vL2lU?= =?utf-8?B?clEwdElEWmhMTUVuUjFWaFJTQUxYSXg3T3NISmhFQ2lrMWZTd3lUalB2VjJ5?= =?utf-8?B?aWRwUmlaNEdsSEhUV0cwdk1HckltZWsrMk5GcVFFWG1xU3JuYVhRemtQYi9s?= =?utf-8?B?cTFZRm42UVJVelp6NSt6WDc0ekRDL1V6VmxxOG40VzBKNUxDSjEwbENXQVZ1?= =?utf-8?B?OGxMaytPclZTRXhMdkZ1VEdpTEVMRVhPK3k5SnEza2tsbUU4RVZiRnhUZXg5?= =?utf-8?B?KzFVSjNLT1N1UzAzVUJpYnR0cGhsZi9uNUEyNHFGNlQrZHBBMzRqZ01CY2p4?= =?utf-8?B?NmN2dzNhSFQxODFiRWpERzZoY2l2SXprdGRzQmwySk9CQ0JaZlRTbDRudFQ2?= =?utf-8?B?eUVKVXcrQWd3NzB2REoyTVc3blp5VnlLczZ3OEFKbU56VzFEcm5ycGJBR0FR?= =?utf-8?B?ekhyUXN6b25Va3BPMC96ME51VGc4cTdrRXIrTncvemt2aFZWVzZSQVFhMGg5?= =?utf-8?B?TldUSXcrMGl6MnRRMFNxRTlUZmlyU0tYRHZ1N2dVVnZadDJzdDFkYW9SSy96?= =?utf-8?B?Tk5Obmp3VGkrd3E0Q0FhZE5rSHhZRjVEcnZiS2FNYXpyN1FiQk1hbTBta0tR?= =?utf-8?B?NC9mNkx3R2NBRk5nNkdKVFFDVGNNY0tYMHowSnRRQi94MFVSdEtnQi9zcFk0?= =?utf-8?B?M1NDL3ljSURxWVV5WHpKYWtSVDZ0eXZVbVcwSXhrVjlJQVRsNFBWcURzdnRj?= =?utf-8?B?NG5FMDFHbmxkZU4vVjNSSm0rc1dGVHhwakFkcjhlZjRYV0pNdVZKQ2F5cWNz?= =?utf-8?B?aklqb0swNm94OU5tcUJLWUovTHJQbkVWVGxjdE5kSE1hUHc3WUttWWFBZWx1?= =?utf-8?B?dytxckhjenlpa09VNUtDeDlpY216NGtrOXIzK011RU9tK0g0Y1NQZ2dBb2xI?= =?utf-8?B?eTVodUt3d2lQbUFuMjZLVEk5YUM1dWZDMWIrZk1tZVVKcU1NNGN6RnFMZUNE?= =?utf-8?B?eldmYVlCZW9BTjNUd3V2OFU2KzdEbGtWd2drRmgxaW9pQndxR1g5a3BhUFJD?= =?utf-8?B?T2RrTnhhTkxKUHN3dHZIN0xlTkxOM01mRnFPZ1llZURaOXkyYmtOcFdnM3VV?= =?utf-8?B?THpaNG5ZdGpPekx5ZE1YSmk3eEFMLzY2eTQ2UGFNQ0tRc3RidEZjYXFMbWNI?= =?utf-8?B?OG5nVkR2Q1FJRUt0S29RaEFjaE94MUZQZFU1TWQySms4azVSTmc0ait1K2F0?= =?utf-8?B?bzk5UlFXY2h0dUJEcU5waml2VHpLL25RMFd1ekpCRVZ4UEVKaDhUSHpyMzNm?= =?utf-8?B?RkRYb3VoS2tNZWlMR2xKK1JWNjN6cWJZajRycVpmZjNhc09oYTJuZDU3b2RZ?= =?utf-8?B?NE9ZZVhGOGsrNUhwdVFlSEtIZ0dSbFh3WndJbXJnWHIwcEJLT2dOMUJkVE5G?= =?utf-8?B?WUc5bzhoWWRxaFJrTzhlemQzOXVNNFIyQTF6dXZtSjl5ZWRNbkJyblJ4NXdn?= =?utf-8?B?YkE5eFZ4OStjTk9vMnQ3SFZZd08yTWZ1VGpzUE1HcmtqaVRQZEZuWndQTDBr?= =?utf-8?B?c3UwaUVDRUpsZXVPMmp1ZUpLUjZPdWdHVVk0MEM4S0J0SVJJeEQ5TUpmSU9m?= =?utf-8?B?cTUrYTBseHFLQ1hNUFBRZE9PSjMwZlc2Z1pBSzlHc0F5cGRRcm9tTWQzVkJs?= =?utf-8?B?cHhQTUlmWDFyZkJqWVlJVWJYbjZLNXdiZXdwR2VUY2lCZmgvK0xGcUMzNksx?= =?utf-8?B?Vzd2dVhrcDhDRGhUZ3N6WjVLOW9NQnVwRFF2em5nRDVDT3oyYWpzYkxBM2xu?= =?utf-8?Q?KuybkSCWdbBcjZxDcRd+xS4aZhiIVRJHwbxxrgA9PE/3s?= X-MS-Exchange-AntiSpam-MessageData-1: Tuutlv5G4qciqg== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0890a931-e684-4392-4eb3-08deba65c0c7 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:58:52.2949 (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: ONFenGJsT+sBtTs+W8EcdUu818Pd5sYt20kzf9y1R0B8zYTbuGRvZ8LcBG3uConqnrqJk8N/KrICBcLtMR+UHA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 Currently, FWSEC takes the first image and the last image. Treat the first FWSEC image and all following image data as one logical block for building the final FWSEC image. This avoids explicitly tracking two FWSEC images. Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 99 ++++++++++++++++----------------------= ---- 1 file changed, 37 insertions(+), 62 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 82811e42e858..5266e15793cf 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -84,7 +84,7 @@ struct VbiosIterator<'a> { /// progressively extends. It is used so that we do not re-read any co= ntents that are already /// read as we use the cumulative length read so far, and re-read any = gaps as we extend the /// length. - data: KVec, + data: KVVec, /// Current offset of the [`Iterator`]. current_offset: usize, /// Indicate whether the last image has been found. @@ -177,7 +177,7 @@ fn new(dev: &'a device::Device, bar0: &'a Bar0) -> Resu= lt { Ok(Self { dev, bar0, - data: KVec::new(), + data: KVVec::new(), current_offset: vbios_rom_offset(dev, bar0)?, last_found: false, }) @@ -315,8 +315,7 @@ impl Vbios { pub(crate) fn new(dev: &device::Device, bar0: &Bar0) -> Result { // Images to extract from iteration let mut pci_at_image: Option =3D None; - let mut first_fwsec_image: Option =3D None; - let mut second_fwsec_image: Option =3D None; + let mut fwsec_section: Option> =3D None; =20 // Parse all VBIOS images in the ROM for image_result in VbiosIterator::new(dev, bar0)? { @@ -330,6 +329,13 @@ pub(crate) fn new(dev: &device::Device, bar0: &Bar0) -= > Result { image.is_last() ); =20 + // Once we have found the first FWSEC image, grab all data aft= er that as the FWSEC + // section. This is indexed as one logical block to build the = final FWSEC image. + if let Some(data) =3D fwsec_section.as_mut() { + data.extend_from_slice(&image.data, GFP_KERNEL)?; + continue; + } + // Convert to a specific image type match BiosImageType::try_from(image.pcir.code_type) { Ok(BiosImageType::PciAt) =3D> { @@ -338,13 +344,7 @@ pub(crate) fn new(dev: &device::Device, bar0: &Bar0) -= > Result { pci_at_image =3D Some(PciAtBiosImage::try_from(ima= ge)?); } } - Ok(BiosImageType::FwSec) =3D> { - if first_fwsec_image.is_none() { - first_fwsec_image =3D Some(image); - } else { - second_fwsec_image =3D Some(image); - } - } + Ok(BiosImageType::FwSec) =3D> fwsec_section =3D Some(image= .data), _ =3D> { // Ignore other image types or unknown types } @@ -352,10 +352,8 @@ pub(crate) fn new(dev: &device::Device, bar0: &Bar0) -= > Result { } =20 // Using all the images, setup the falcon data pointer in Fwsec. - if let (Some(second), Some(first), Some(pci_at)) =3D - (second_fwsec_image, first_fwsec_image, pci_at_image) - { - let fwsec_image =3D FwSecBiosImage::new(pci_at, first, second) + if let (Some(pci_at), Some(fwsec_section)) =3D (pci_at_image, fwse= c_section) { + let fwsec_image =3D FwSecBiosImage::new(dev, pci_at, fwsec_sec= tion) .inspect_err(|e| dev_err!(dev, "Falcon data setup failed: = {:?}\n", e))?; =20 Ok(Vbios { fwsec_image }) @@ -703,7 +701,10 @@ struct NbsiBiosImage { /// /// The PMU table contains voltage/frequency tables as well as a pointer t= o the Falcon Ucode. pub(crate) struct FwSecBiosImage { - base: BiosImage, + /// Used for logging. + dev: ARef, + /// FWSEC data. + data: KVVec, /// The offset of the Falcon ucode. falcon_ucode_offset: usize, } @@ -713,8 +714,6 @@ pub(crate) struct FwSecBiosImage { /// A BiosImage struct is embedded into all image types and implements com= mon operations. #[expect(dead_code)] struct BiosImage { - /// Used for logging. - dev: ARef, /// PCI ROM Expansion Header rom_header: PciRomHeader, /// PCI Data Structure @@ -722,7 +721,7 @@ struct BiosImage { /// NVIDIA PCI Data Extension (optional) npde: Option, /// Image data (includes ROM header and PCIR) - data: KVec, + data: KVVec, } =20 impl BiosImage { @@ -795,11 +794,10 @@ fn new(dev: &device::Device, data: &[u8]) -> Result { let npde =3D NpdeStruct::find_in_data(dev, data, &rom_header, &pci= r); =20 // Create a copy of the data. - let mut data_copy =3D KVec::new(); + let mut data_copy =3D KVVec::new(); data_copy.extend_from_slice(data, GFP_KERNEL)?; =20 Ok(BiosImage { - dev: dev.into(), rom_header, pcir, npde, @@ -837,7 +835,7 @@ fn get_bit_token(&self, token_id: u8) -> Result { /// treats the PCI-AT and FWSEC images as logically contiguous even wh= en an EFI image sits in /// between them, so subtract the PCI-AT image size here to convert it= to a FWSEC-relative /// offset. - fn falcon_data_offset(&self) -> Result { + fn falcon_data_offset(&self, dev: &device::Device) -> Result { let token =3D self.get_bit_token(BIT_TOKEN_ID_FALCON_DATA)?; let offset =3D usize::from(token.data_offset); =20 @@ -852,7 +850,7 @@ fn falcon_data_offset(&self) -> Result { .checked_sub(data.len()) .ok_or(EINVAL) .inspect_err(|_| { - dev_err!(self.base.dev, "Falcon data pointer out of bounds= \n"); + dev_err!(dev, "Falcon data pointer out of bounds\n"); }) } } @@ -942,59 +940,38 @@ fn find_entry_by_type(&self, entry_type: u8) -> Resul= t<&PmuLookupTableEntry> { impl FwSecBiosImage { /// Build the final `FwSecBiosImage` from the PCI-AT and FWSEC BIOS im= ages. fn new( + dev: &device::Device, pci_at_image: PciAtBiosImage, - first_fwsec: BiosImage, - second_fwsec: BiosImage, + data: KVVec, ) -> Result { - let offset =3D pci_at_image.falcon_data_offset()?; + let offset =3D pci_at_image.falcon_data_offset(dev)?; =20 - // The offset is from the start of the first FwSec image, but it - // may point into the second FwSec image. Treat the two FwSec imag= es - // as contiguous here and subtract the first image length when the - // target lies in the second one. - let pmu_lookup_data =3D if offset < first_fwsec.data.len() { - first_fwsec.data.get(offset..) - } else { - second_fwsec.data.get(offset - first_fwsec.data.len()..) - } - .ok_or(EINVAL)?; - - let pmu_lookup_table =3D PmuLookupTable::new(&second_fwsec.dev, pm= u_lookup_data)?; + let pmu_lookup_data =3D data.get(offset..).ok_or(EINVAL)?; + let pmu_lookup_table =3D PmuLookupTable::new(dev, pmu_lookup_data)= ?; =20 let entry =3D pmu_lookup_table .find_entry_by_type(FALCON_UCODE_ENTRY_APPID_FWSEC_PROD) .inspect_err(|e| { - dev_err!( - second_fwsec.dev, - "PmuLookupTableEntry not found, error: {:?}\n", - e - ); + dev_err!(dev, "PmuLookupTableEntry not found, error: {:?}\= n", e); })?; =20 let falcon_ucode_offset =3D usize::from_safe_cast(entry.data) .checked_sub(pci_at_image.base.data.len()) - .and_then(|o| o.checked_sub(first_fwsec.data.len())) .ok_or(EINVAL) .inspect_err(|_| { - dev_err!( - second_fwsec.dev, - "Falcon Ucode offset not in second Fwsec.\n" - ); + dev_err!(dev, "Falcon Ucode offset not in Fwsec.\n"); })?; =20 Ok(FwSecBiosImage { - base: second_fwsec, + dev: dev.into(), + data, falcon_ucode_offset, }) } =20 /// Get the FwSec header ([`FalconUCodeDesc`]). pub(crate) fn header(&self) -> Result { - let data =3D self - .base - .data - .get(self.falcon_ucode_offset..) - .ok_or(EINVAL)?; + let data =3D self.data.get(self.falcon_ucode_offset..).ok_or(EINVA= L)?; =20 // Read the version byte from the header. let ver =3D data.get(1).copied().ok_or(EINVAL)?; @@ -1012,7 +989,7 @@ pub(crate) fn header(&self) -> Result= { Ok(FalconUCodeDesc::V3(v3)) } _ =3D> { - dev_err!(self.base.dev, "invalid fwsec firmware version: {= :?}\n", ver); + dev_err!(self.dev, "invalid fwsec firmware version: {:?}\n= ", ver); Err(EINVAL) } } @@ -1027,15 +1004,14 @@ pub(crate) fn ucode(&self, desc: &FalconUCodeDesc) = -> Result<&[u8]> { ); =20 // The ucode data follows the descriptor. - self.base - .data + self.data .get(self.falcon_ucode_offset..) .and_then(|data| data.get(desc.size()..)) .and_then(|data| data.get(..size)) .ok_or(ERANGE) .inspect_err(|_| { dev_err!( - self.base.dev, + self.dev, "fwsec ucode data not contained within BIOS bounds\n" ) }) @@ -1053,9 +1029,9 @@ pub(crate) fn sigs(&self, desc: &FalconUCodeDesc) -> = Result<&[Bcrt30Rsa3kSignatu let sigs_size =3D sigs_count * core::mem::size_of::(); =20 // Make sure the data is within bounds. - if sigs_data_offset + sigs_size > self.base.data.len() { + if sigs_data_offset + sigs_size > self.data.len() { dev_err!( - self.base.dev, + self.dev, "fwsec signatures data not contained within BIOS bounds\n" ); return Err(ERANGE); @@ -1065,8 +1041,7 @@ pub(crate) fn sigs(&self, desc: &FalconUCodeDesc) -> = Result<&[Bcrt30Rsa3kSignatu // sizeof::()` is within the bounds of `data= `. Ok(unsafe { core::slice::from_raw_parts( - self.base - .data + self.data .as_ptr() .add(sigs_data_offset) .cast::(), --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from PH7PR06CU001.outbound.protection.outlook.com (mail-westus3azon11010010.outbound.protection.outlook.com [52.101.201.10]) (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 6FF17388E51; Mon, 25 May 2026 13:58:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.201.10 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717540; cv=fail; b=E3XfafKCKGKTicnqKWa9I9+yIoaSQzql6a4P/G+DYq7kUF1kyGkicyqHsF+Co5gCAkHGwHg6fM/Rsu6pD7yIhCh8UYvwrb6eDR/dP9TnrszJuvd1I1E1uknyNcdlMyW8v5s1GL9ukkGcRYDn1XrFSjIWcCD2D9mSW6qhVScJ3Zw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717540; c=relaxed/simple; bh=5uK4ZP3uJTVuFxfWmBowXvxk4Lv5bjsL5hpXjtI+7BY=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=Kk2I4FQ+hmg2FnGzWx9sSSTeVQK3wV3dCVMaMHHcw4Pa/SqapuqUz4IcQljQ2IUq5TfVoiyzevnzU5TCJf2j8pE/5Y+oNcJNqTWqU81svjxvqXUv54s30mo4m62wcyoVM15YClM1Y6FhTWrC3L7XzV8iVuiXaJyb2UugLgHmpR0= 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=UTsO+1u7; arc=fail smtp.client-ip=52.101.201.10 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="UTsO+1u7" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=c+m4e2va5R2IUvUUSycCPebTjwAJ2hzqUg2iy2HO/fgW3tyXTYE+hS2VNlqbo9cdHwypV37s8fGIqIGga7LD1dG78d1/Orr+e/bPLGYG7soX3JXYPBgr9U0yuJA/mt5gzxBQcX5YrtsmKZY9WcPJn4f+vwFc+r1oQwGlyYqDEN9HLfU8L1RBTIwi7DxnBr7oyrgCYSj8sBSM2cJOh5RofdmTSeFltRArJTtQWCVfczImvHlkUL+9AO3njQk6xX1rK/zLHfzDWYSaeZp646D6qmwDbIuM8TWQgrMQBFQagEcBBpCRsBviB0QqHBkuUxZDbLg89piOvZBLN+FUqhAwcw== 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=XI/M1XhsK62JvPYAr6QFmk1ib9sJFHoDd1xQwj8CBMA=; b=agZ2MRJA4eaWeIMRTrL8XEP9p8Tx0KbViS2YV8w9F20wQcZqLjkgH8R1f+MeegUp+o1fQE0Z3r8nXI5kStX5XIovcpSQAkBSRj87jjudJ9wM/zqYn8hYpBMIWgPHdC8+Eop65JSGLe6AZ7HxWwgKkjH7DFoas6ByXiRERv1Mn38mzVmCBibytdKZvxVWLhmKIBTLRanBBIYEPqjiG3QzdDxw5cuRpy8oc68NYcqmHQ6F/W80hgWcKdP5pcCr0NvVnNaVMKlncwy6++ZzVE3B87bu2XXz1+c8URnt0eYDFJ2O0Fl9ZaVbd4hcDENXI8AqoZnPJyBWM9vkG0618ZGtyw== 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=XI/M1XhsK62JvPYAr6QFmk1ib9sJFHoDd1xQwj8CBMA=; b=UTsO+1u7iMV9ISJjFghjAJi3DgnoWlVbzeJxEzsIuam4lpoF4FUw0H9hv1QGHdt5iDl0EhMSlFygSLAtu+ciSZchBOp79jO6gq3xhWAamKDx3PsB2sfzSbO3bddl8bkCDSYmQKLPo79kBRPBGyUwvRJ713Qw/wYVSN11oF0ydTl4w9oN0t++sIwpbL25Qb85arxsMLTmsD67oaAD4lk2iSlHFUQprYdmqTi390035VJBCvs6HEN6Ks6eCsvVN6Xj8kLvyzAam714BeLPDbX1RY3eTI85AukV5V1GMnV5gZlKuOJrvrjlpaOk5wdJqaB1K+btPNYEjNyKxR7dq5ikAA== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:58:56 +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.0048.019; Mon, 25 May 2026 13:58:56 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:35 +0900 Subject: [PATCH v5 17/22] gpu: nova-core: vbios: use let-else in Vbios::new Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-17-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TY4PR01CA0107.jpnprd01.prod.outlook.com (2603:1096:405:378::15) 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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: ff97baec-5ac4-47eb-def7-08deba65c326 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|11063799006; X-Microsoft-Antispam-Message-Info: em6PVOm+XkGo/wMtyHbL0ZW8AmJJo0ShfEKtEFZzmVYpcnIi5cTk0ciZt6CZHdoCVvcuf2SlQKCiLTbPmRjRMevF2zTcBB3KRYXKmtK+zfiJzNjsiLW1uE0OIhBqgcKkrIaNNFIfAvVqil3awvJcq8RI3wKbzDlmmjEYGeNDpQIp612+R8zi0UuHtzOSzaEa0q8K5dn9S2P8ipVP51iDLruDDTTgn66upYiBiBh7YRX+lidcig7jvmP2gOfUvLjgRGUPQ5vwUA+TsKXPbxrVagXIErJAUmXZc73EOaBPF+NdtZKmTgve5PDat3o+GM4l9h4gSPH0E9h8TBbEo8U11FiISegvmRYZWbUMTcm4pMIot9eyHnMix9/rTk1TymBvY5SjqZ2jxB5ScLW3pJ2tY0SEPYrGnxVOZIS9ipXaPYpAqFP1j4JLWYdTUE7f4vVnbISX+WhqlBnFyO1ZbpqhBk0DceksdHwPRiltKJzsWD4B9SxuOm1z6ji+++Z1TMm+pJynICkzI6XdPtHBzxz6epABMXv7zPXgO3l1ykTRkbID8ro3MkHoaw2QCXQNTU8l5PXClOEziq5zA/UrHh5oQMoCuaP0kw0xcka415zmDYMCZe4ptA+OeFajv6aPh3BKlLDAif54XN8o9LzKQ4po9evjhBmXZhYx2mVAPq/NqAFPxBGk5SBMK/k59j3omg4R 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cFRpbGVBV1REVjNHRDVDK052bEhEQTViTVJmdGg0TmdYYUJzWEVBNkIxQi9P?= =?utf-8?B?a0hrUEZUclp4bG5LSEhINkJzNVQ5d083dWM5UU9BdFR2WW94c1VJdGJONlQ2?= =?utf-8?B?MWc3ek8ybGdTRG9qa1VPa3BQbHZCKy9PU2IrSGRzTmplcjZpUnU0MXJOZi9r?= =?utf-8?B?QVpJYWVZMHM2RU1rdWlBK0NuWnVrbmVGWHRpSmMrbDY0VFBuK1gxN0FnVGVS?= =?utf-8?B?SUQ4MFFrQm9Nb0lJaGFFMHRoQ0wzVWRWcUh3OVc4UDFmNFNRVmhGWmttT3pT?= =?utf-8?B?Um5NTGFCSVg3WXhoOVRwYWRQTEJxcmk1b3QyMVlNUWNCTlBadHVWSWVKV0Jw?= =?utf-8?B?SmMvMGl1bEFpc0l0L1FyZnhaM1RWMjF0TWVSSXU3Zlo5blRIZWVuNjZOeEJ6?= =?utf-8?B?eVpBQnhGZXJJdUVzYURYSWNVZGIyNjl6ZnZpbTBVMW8zRW9HV0owenJLY2I3?= =?utf-8?B?QW1aQnpWTE5YVURsM09KQXk0V21Xek5rcklLcllQcXBxTjdZL0lmWC9lNWVu?= =?utf-8?B?TWNoSVJ5YnFDUzhVNllqelhxd0N4bXBmS0RFb05CSXl1M0JXSWVzdjFMT0dp?= =?utf-8?B?M0EvMEc4QUdlYlV4b0tFOHh3dFRtcTUyc3JmZkRoYnA1TW1yOEpiSU91Wm9x?= =?utf-8?B?ZExGSEYyN3Q2R3RPYm82V1RmR3pGL3E3RElDdEhVUzVNVXhIMnlHYW9yNVVB?= =?utf-8?B?Smd4ZzlubkRLcGhYcHZvaWlDOHFjN0dkbEZ1YjlvZkdJZXErQUUzZ1hpSVB5?= =?utf-8?B?ZHFEVXBTUloyV0ZBS0RaaHpkV0xzNGlJdTF6dTFlRE1UdE1FbGF4QVY1QWtD?= =?utf-8?B?UXBxbWQyN3liYTVNZFhWZExSd0VFSk01Q3pLMDVQVG56cVlxZjk3dkprNmJY?= =?utf-8?B?OGpYUThHckdLblFwcjNGMGJPMHVZLytuSysraG1BbkVGb2Q0ZU5tenM4TktK?= =?utf-8?B?YmwrUXBrOUV6VE92dENoTTZsSlVLajg4MVQ1T3JUSiszc01sbHpQc3Y5OUtl?= =?utf-8?B?QTB3dzRpZjVxZWs0dUdqUCsxaE9ueTlFY3FISHdzMVYzUjJXWi9JNzRGdmhz?= =?utf-8?B?T08vOHJ2N1ZKY3JsSkZqSkgwSEdNQ3ZHYk44ZW85WTh4KzJCNmZ3d3V3M2h6?= =?utf-8?B?R3h2MWw1bG90b0R3eC9xendoWGVWbW5OeTByM0xZbjE0LzFBdDZGQnhQeThE?= =?utf-8?B?aWtQSUdPOXRGMlRFenJ6YktKZmhSRm0rM3NTT1lmMmhVVmRvaTMxdDZ3Tncv?= =?utf-8?B?cXdwU3ZFV0RDRVJMcDB2OVFHNnI3UmdQSmRZRWZFZDYrbFIvcEdhUlVZSE1u?= =?utf-8?B?bC9DZm9MK3B6QjlVMzU5T05oYWtTZHpYN245VS9qQzBsZFNvUHdQSW9hanNQ?= =?utf-8?B?Zks4M0crWjhKVjZiZktkWmlXeEVLVEpMNmdZUjdRSFRRVkJGZHpVUVpMZi9K?= =?utf-8?B?ZVU4ZlpJSjlpbzAwOTVzN21SK09qUDB0OE1IOW9VQ2NNd2U1TDRRZzBDc2d2?= =?utf-8?B?Z0NjeGduNHh6QVg1Wm03Y1dsbUlGWjJ2d2xEdTk2b1c0Q0drMWttVmhWTWVk?= =?utf-8?B?OTJqSUpuMHhvWTdtWjhJMXRPc2h6dFFYYlJyTnlqdlp3NFlrU3BNS0JPRVd5?= =?utf-8?B?N2RFUE9CMFhXT0czZVFwNDFrNHpmc21meWFadHFPU1A1NXZNQWhBM2luUEsz?= =?utf-8?B?YUd4WGRQdWNpM0tSWDNIWkJUVmpYeWx1MDRyRHRTUk9xMEtkb3lVQXgvalhS?= =?utf-8?B?NUtibExDM0pXU1FWZDlzcm9EZ2tlNWtRZjcrQXZrdWx3MWZVcVJXQVAxb0Fq?= =?utf-8?B?dVoxdGNTVGk3MldUeThFWGhhWDI3a0dWaENteU51bGRtSnhGTXliM0c2Sm9X?= =?utf-8?B?TkhwaWpnMVh1cjVGQTVlcDR6RTlqZ3VzY1VEVElKNWthcjlLNGZxWTg0djNM?= =?utf-8?B?MXBUM21hbVNmcWk1QU9GOWJlVExTMGtNQS9XZGdCYkRyMmZzMFpwbkI1OVNv?= =?utf-8?B?aklEZDMwZWx3NGpJMjhBTDRZWEdpZE1vdk1wQ2VZS3gxQ3NmQlRzd2tEWWN5?= =?utf-8?B?cVo4UVVESk9pQkdZc21CN01VVkcwVkFFOERIZFR1RWJHekNRb252VXc2K0Ex?= =?utf-8?B?eEJpUEdMbGU2cGtOS2twQW5HNE85ZngwSW5Odllub0JQRmhPQTNkanpWNWtt?= =?utf-8?B?KzJnNm1XRnZuNHpRL2RZemNkSnc4d2NvNmd6R1hkbzU4NlhLeEJwZDQ3RjVM?= =?utf-8?B?QWVWeHJ4RU9QVmJwTjB2SUUyRkozVXVkRjRrT0FJcjMweWk2dkgvdGY4eHgz?= =?utf-8?B?TnJQUlVoSy92MzRCZytnZ05WbWNqay9YU1k4S2dwMlN4c1ZsUjMzeTBBNzJV?= =?utf-8?Q?zMkf9kTLqffbZCrr16o4phDfjktPDU7GSJ5tE7IlmmHf3?= X-MS-Exchange-AntiSpam-MessageData-1: YeqFB80dBQZUxg== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: ff97baec-5ac4-47eb-def7-08deba65c326 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:58:56.4162 (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: vFXl+a58wK1pAoTfytr9TyCALgaEhl70g2HVql2WeFWZUKZpZKTKZEQD6HJ9OvK2NVFwv7qgVLg+MNEpNeSANg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 Improve readability by moving the success path outside of a nested branch. Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 5266e15793cf..52e33fdd4f5d 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -352,18 +352,18 @@ pub(crate) fn new(dev: &device::Device, bar0: &Bar0) = -> Result { } =20 // Using all the images, setup the falcon data pointer in Fwsec. - if let (Some(pci_at), Some(fwsec_section)) =3D (pci_at_image, fwse= c_section) { - let fwsec_image =3D FwSecBiosImage::new(dev, pci_at, fwsec_sec= tion) - .inspect_err(|e| dev_err!(dev, "Falcon data setup failed: = {:?}\n", e))?; - - Ok(Vbios { fwsec_image }) - } else { + let (Some(pci_at), Some(fwsec_section)) =3D (pci_at_image, fwsec_s= ection) else { dev_err!( dev, "Missing required images for falcon data setup, skipping\n" ); - Err(EINVAL) - } + return Err(EINVAL); + }; + + let fwsec_image =3D FwSecBiosImage::new(dev, pci_at, fwsec_section) + .inspect_err(|e| dev_err!(dev, "Falcon data setup failed: {:?}= \n", e))?; + + Ok(Vbios { fwsec_image }) } =20 pub(crate) fn fwsec_image(&self) -> &FwSecBiosImage { --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azon11012052.outbound.protection.outlook.com [40.107.209.52]) (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 0551E388E51; Mon, 25 May 2026 13:59:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.209.52 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717546; cv=fail; b=VeUY+m2mBwW5A6tUSTC9rXPnpndp6LC6qeuElS/FRdJLZTrd8ka9n0P9EwRTiGVa1vXVgK7Y5FDXb9TJLB6t4Qkd6JVxuue3wxP4XJ/XbYNJb8po8ZYb6vL5jHs7UAkvCCCNHlFcC+ZUDwDqij7sxaa4kcpOWri7SKIIv35Gyws= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717546; c=relaxed/simple; bh=x5SX1/eBFACJqbE/cacFjmIdQFlJzvBzsX5HdHfmkKg=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=pLa9/xOd59st17MW/xoy2B6Nghx3hTIoP9CVqYrmN8IfG71Rx+ZmA1AsLJjh1t6jzztV4v66XGigzeMM4d0gNt2akrFE+3AzE0WfTKbQEVWQTAhwBUnwgxmv0v7yhJ+KZrRmJbiHe/lyqcXlOZVn2eC6D1JJ2RK0/G9RXsi+KAs= 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=VetinHlQ; arc=fail smtp.client-ip=40.107.209.52 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="VetinHlQ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=M3BOlfBLUPk6xSPmivN3SlaMKGcZ9Lji6KEloHREI4QC6tbjgHFJ/hCI+AbBu8AgqNl06+Pc6DkHcNxq1Q4NWQNZrgZ9vWqArezxCWVZgYTQf5MBS5DtogS6co4TABTYcnyz1hVsIjQ3BoeIdOLOsxj+b6gNfkz3/v90uNr8tVibMUhBEmiCcy7Pll+UI6CCLZrXXVSYFNxM/O+IBGyZLJRucz6mbPe/dSZGEQHGxbWyiyoVyGI39Jp6CZiWkFfTDyEdSEv0o05PncDIpHRxNQUG8fRxAFqNS6dLBrMbEwgvJ73bsBQCJlS28E5Ns0pLpLYzmzIY3a454OtTDMe6gA== 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=phryEJSMrpag6W1sICkYBfVPmwIqFPylhh1v8/Xcn3Q=; b=m60DO2qeh+4qv/866WxUQfvYdSMfb4gcAZnnL9pY2esvbx6l5O34aEhFHnOkGPDQZxk0xQm2VCQYApb6K1elNxtZX0AO8Yigov7sTxvvrTBOEtfspeVgNwPIAbip1zg59AST6CdJxa26VFy1Fi7kN/Z9hPFU/93m1l8m47/vKNiD4xEjoGrMZSdq7jvcHVDSDZvpwavdZWXCRyVDijbqO9voVTBNTzhk8VnNShhuDJXTYszdxoYmrTHUObh10dhjRWTa5jaaEjxcDJTrBULtZ34M2FuIj9byfbNZl6VL9fQlS3r4xkd6N0buC3pIDkzfJ0xpAj8o563cHAHmU2D5gg== 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=phryEJSMrpag6W1sICkYBfVPmwIqFPylhh1v8/Xcn3Q=; b=VetinHlQ+QXHHJtG4gmJ24Aupj1JWrA0cj+dTsQPBHH6isTFzV9Gzc64YClrQL3ldb5CtLL1ea6Q75og8u7Hnf9XzCMgWhLxmi+3qrG8CvTHgENUustKq+x5pjd0PJqKDL0S1pGe77vC8AyfoVF81RsGvDBj1WIGZY8mVDuVjT2aIiltaLxMmvcrVVHdLBQDw8FxzVswq/LnLd83rEjl+fl7Ge/r7BxQZLvljlcqscqQBOe+edU0DL8qh0WG3M/+j8EOtydIVUajJpAbKDu0u0iSPe0otGc8TufYSOm6xh2zwDv1652+mm/XZTvQoGSfYYJ6pBlT9kKGRh4zwnSuFA== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:59:01 +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.0048.019; Mon, 25 May 2026 13:59:01 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:36 +0900 Subject: [PATCH v5 18/22] gpu: nova-core: vbios: remove unnecessary fields in PciRomHeader Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-18-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYXPR01CA0044.jpnprd01.prod.outlook.com (2603:1096:403:a::14) 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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: 8c6b6e18-88da-4591-5090-08deba65c5f6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|6133799003|11063799006; X-Microsoft-Antispam-Message-Info: nPz84Mk9ObOVqMz7cfYec9jx98vouBrUt1mlGCtOK5F9tfQCgA+Fy69QEc7zW72XzPGaudPaoOw9I4c2Ax9ltIKGS4cOpjtnx5+9//ij7+hW1nasVbieAbRyRyKeOrXB7jdPrAW4cGF+/VySqcT1RqixIXRJxlIU/3IOOxYNe8cFrfKANSArxZEutzxnQrL4HUnz4EPN9jAULeLImpbb/g7GcGljMZjXRsIPREk0Dadz5gZ0IB0bxk+rI7vpFScVoSZ7pCLxTaaQiTMIU5SLagvxEXhx/XAga/thORUXQWRrRAu6jPfwh5ywJfVjmJfFpirgl5ZWNnVr/fXEZojisWu5VmbT2UXs0o/ucFQHV9jnWskzeUSTzPsxhYX6HVf2ZPBv4g3Pa4O6gikQ68TebOyDUFqfQKKYY+iFbaJXFHxDEmKYVLQ7NSd0yBM8SKK/4A3jaIRjdsf7zhSmjvCC7WpfWMHvDRIFjwkB06R67XA+43cBkTvyW/FqFB6SjbSz1SdAipw2JRBdiaDw5ctRnMR83n/qB+7f1LFBXfPc6WUcvjYIRBiVPU6+l8ZV2aEB1sWIlRv4odp1zwHqY16Z8sqDpLyPJjbCUOqurWq9BpvNK8Do82SEq7Dyx8fwHqfiGq8OHSV5NsIYXHUPOof4qHFNXX0BtfM08CxvaRjKGyiR2QPbOwmgSLODW9hkszrM 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(6133799003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?NlFaMnRzdEpqTmpWeVFCN1hxQXYxSHIvU3JBUExlMkthb2xDYnIvcVR1TVlX?= =?utf-8?B?ditWdWIwUkFlOCttN2VTaXgvK1VoTXMwRjZ3WEgwaGdJU3VkajN0ZkJCcHVJ?= =?utf-8?B?b3FqbW9Qc0tVRnZhd0lPM0VkekNlVkZrRzlEVkdINkhieEJIU0dSa2hJTmwv?= =?utf-8?B?Y0loSkFoUnNvVW9DdVRhMmRPUHJKaXlpb1B2UGI5Q1MwcEVqdjlVVXNnQTZu?= =?utf-8?B?ZEo5LzBGcElHb0VnL090MGVoQWdsTGsxdjA0NEg3blBheCtSMjJMcjZZOGNv?= =?utf-8?B?cnJpZmdMQWVORWFwVzdjclV4VHUwTFVjbGhScmtYbTQrUUhqNDladzlya2N2?= =?utf-8?B?RWJSK0lMSmp6TU5WekgxbVpqc2xNQUNCQlhLUWRUaHdCc21LVXdnUThURFVD?= =?utf-8?B?NVJvNzhxZmZBOUVpYTZKQkJMYjVpRnZSUEJNWGo2YlY0RnpZTDMwWVVndCtN?= =?utf-8?B?R3dlUjhFMUs1b3FpaURKdE83eGRYSGg4WmFFQkVSbERxOEpTcEZBNTR5V0Zw?= =?utf-8?B?SUhhM1B2dkhDWk53NURyeklaNm1IendFeTFjMDJIYUZrVkhsU3Z0M21ONHh3?= =?utf-8?B?RElKTTFvYW5oZlVlNDFkc09MK3RZRGw4c2dJSTdGVGU2WDJrUE9HU3pqNVIv?= =?utf-8?B?NEhTRGhFSWh6OXV3blNNOFFzVU53N0VZNTZuZENCTmlaSldVODhtdW9NNlNp?= =?utf-8?B?YVljamtMakZiU2p2WitEaWRvODVESUVacWFydS9pV0JHMWlSc3cza3BxRkYy?= =?utf-8?B?b2xzUVUzNHB6NjNFaEhvazRHaDZwQnNjYzNKNHNHTHBvUjAwN2lkVC9paHZP?= =?utf-8?B?WGJTbC9kcklZWTc4WDdCM1lqOVdCY0lkWGR5V3NJcjZ1VWk3TE1PSUdHVTFq?= =?utf-8?B?V2JGai83K2ovemdmdXAzLzZQTlk5bWJ5eTRldTRMNE9XaFAzTDRqQm1Wcngw?= =?utf-8?B?TFordkYrNVdVUVFxcllQLzUrcUZqSmVwRXQ4d3RtTmllWjlxUTBzd0d2V1lH?= =?utf-8?B?dW4xTEhkdUZxMjlncVhXNnhHYzBSdjBaUnNETk5kZ01OUSsycmRPZDVlSGFQ?= =?utf-8?B?QTErcnA1K095OE1KalJhbVk1TTBSZ3l4dHluV0JEdVNjUS9tM2tVOEt4d2Nk?= =?utf-8?B?L2JXOGl0bENLVlNOQVVwVE4wVkc3ZldoSDRLYjNvZzNsUHUybzBTTUtHak4w?= =?utf-8?B?a1FXYjFneGRnTkgwenRBOHRJQ21semlZQkdjMHVzTXdpUzdwWEFVT2tKOWQr?= =?utf-8?B?OFpCWm5Ybk5KZUc1aEZzUW0vSGd3RW9PZHVrY3RLTHZWTXZ0eHpsTW9hZjJr?= =?utf-8?B?VDZrMUJIc3lBOUVpZXRjc3B6VE5aTHJNMS9iMGNPbUV3UnJ3TFhkWXpzalpN?= =?utf-8?B?cWhsV2Q5WWNVWmFYaWZxZ3hiSkxYWERkSkVFNHVZbktya3JxSktiOUk3N0RV?= =?utf-8?B?cWJVNDZFQlRqVG0yTytJSXozdW50OTRwN3I0ajEvanhJRkI1SVNjb2xjQ216?= =?utf-8?B?TFp5czVENGkxV1lQS3MvMEpUVDQrdHJuaE1QdHJxK3FleDBHaTYwK3I1UDFq?= =?utf-8?B?TUk3M29USXc1UVpyYU5STzZKT1pzYkY4cG5hc1VORGVaNmdMNU15RjBQamE5?= =?utf-8?B?T3hMcEo5NHlLRElFUFE0VXpFWUVIMTA3eEwyREdDL2RsWXVGTmFHMGhrQnhm?= =?utf-8?B?a20wM2ErczQrZE5sWG9NZHdtcmZMbXV0Z0hQb3Y0aDlYUjNBc1c2cjcxYm9z?= =?utf-8?B?MDBDaWt5K043dnZuOW9tcElxKzRmWHMvdjRORnlKcWM3M1dJYXpXUS8rWVRQ?= =?utf-8?B?RTZSQXZWWnVjYzN6bng1dWFpODZ5QkZ1UG5BeDdqREtFdjdHSDNCRE83RWxM?= =?utf-8?B?cnlDYW5YU1R5cE0xYk9yRzRHd3BBOUpKTkRuRStnWUFraVhwUFg2amE3bHZo?= =?utf-8?B?L0Zoa3BTQWw5ZUtWR0tJTEtxT3ZET1FSKzlDdGdhVjloc3dkRU56Ui9IWk5L?= =?utf-8?B?MGJ6WU9CM1Vvb0lENS9nbkkrL1ZVR2Ryd2s5cTltR25mbnBTUmNRNE1UUjh2?= =?utf-8?B?SkQyUkpDWUErUXVLK1BkVGZVUlUxS1cvNW1lWUJzNG5pUVFuenB4SjZjWC9h?= =?utf-8?B?bmwyOEV4K1dTMnlCaXlraitVYWl4bHQybDFqRzlpZzJ2RVl5aUg4WWJ1aDBi?= =?utf-8?B?WCtUVU9Ldjh5VEM0ajA3QUtoRktrRTd1TzJnT3phYldHMlYzRUJZOGlFQzRT?= =?utf-8?B?ZlZ0cjg4Zk5UL2xtdEExZ2hsRjMwcVdNbk00WXlXa0p2TWk2akU5MnZLRzJD?= =?utf-8?B?K0tveHBIOHlwazlEendPc05qbm92Tm1SRVNHSXFDMm5zTkRueG9uTFczdElH?= =?utf-8?Q?9DGqNX3pNB1JF2Q15k/habaOdmqCVz1WzLxN486sO8Eam?= X-MS-Exchange-AntiSpam-MessageData-1: KgHa9sBs1NraHg== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8c6b6e18-88da-4591-5090-08deba65c5f6 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:59:00.9871 (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: D+IiUspVJBlmZrn46+SBNYSy5XMm1ejoIlGUn7HfDZ8qYG3pFivTEhgPlGqFTNIHlH1F+rNEwAu9wK8kylV3MA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 Remove unnecessary fields in PciRomHeader. This allows a simplification to use `FromBytes` instead of reading fields piecemeal. A lot of these checks were redundant as well since it checks the size of the `data` first in `BiosImage`. Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 68 ++++++++++----------------------------= ---- 1 file changed, 16 insertions(+), 52 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 52e33fdd4f5d..7399f2d087a9 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -533,67 +533,38 @@ fn from_id(image: &PciAtBiosImage, token_id: u8) -> R= esult { =20 /// PCI ROM Expansion Header as defined in PCI Firmware Specification. /// -/// This is header is at the beginning of every image in the set of images= in the ROM. It contains -/// a pointer to the PCI Data Structure which describes the image. For "NB= SI" images (NoteBook -/// System Information), the ROM header deviates from the standard and con= tains an offset to the -/// NBSI image however we do not yet parse that in this module and keep it= for future reference. +/// This header is at the beginning of every image in the set of images in= the ROM. It contains a +/// pointer to the PCI Data Structure which describes the image. #[derive(Debug, Clone, Copy)] -#[expect(dead_code)] +#[repr(C)] struct PciRomHeader { /// 00h: Signature (0xAA55) signature: u16, - /// 02h: Reserved bytes for processor architecture unique data (20 byt= es) - reserved: [u8; 20], - /// 16h: NBSI Data Offset (NBSI-specific, offset from header to NBSI i= mage) - nbsi_data_offset: Option, + /// 02h: Reserved bytes for processor architecture unique data (22 byt= es) + reserved: [u8; 22], /// 18h: Pointer to PCI Data Structure (offset from start of ROM image) pci_data_struct_offset: u16, - /// 1Ah: Size of block (this is NBSI-specific) - size_of_block: Option, } =20 +// SAFETY: all bit patterns are valid for `PciRomHeader`. +unsafe impl FromBytes for PciRomHeader {} + impl PciRomHeader { fn new(dev: &device::Device, data: &[u8]) -> Result { - if data.len() < 26 { - // Need at least 26 bytes to read pciDataStrucPtr and sizeOfBl= ock. - return Err(EINVAL); - } - - let signature =3D u16::from_le_bytes([data[0], data[1]]); + let (rom_header, _) =3D PciRomHeader::from_bytes_copy_prefix(data) + .ok_or(EINVAL) + .inspect_err(|_| dev_err!(dev, "Not enough data for ROM header= \n"))?; =20 // Check for valid ROM signatures. - match signature { + match rom_header.signature { 0xAA55 | 0x4E56 =3D> {} _ =3D> { - dev_err!(dev, "ROM signature unknown {:#x}\n", signature); + dev_err!(dev, "ROM signature unknown {:#x}\n", rom_header.= signature); return Err(EINVAL); } } =20 - // Read the pointer to the PCI Data Structure at offset 0x18. - let pci_data_struct_ptr =3D u16::from_le_bytes([data[24], data[25]= ]); - - // Try to read optional fields if enough data. - let mut size_of_block =3D None; - let mut nbsi_data_offset =3D None; - - if data.len() >=3D 30 { - // Read size_of_block at offset 0x1A. - size_of_block =3D Some(u32::from_le_bytes([data[26], data[27],= data[28], data[29]])); - } - - // For NBSI images, try to read the nbsiDataOffset at offset 0x16. - if data.len() >=3D 24 { - nbsi_data_offset =3D Some(u16::from_le_bytes([data[22], data[2= 3]])); - } - - Ok(PciRomHeader { - signature, - reserved: [0u8; 20], - pci_data_struct_offset: pci_data_struct_ptr, - size_of_block, - nbsi_data_offset, - }) + Ok(rom_header) } } =20 @@ -712,9 +683,9 @@ pub(crate) struct FwSecBiosImage { /// BIOS Image structure containing various headers and reference fields t= o all BIOS images. /// /// A BiosImage struct is embedded into all image types and implements com= mon operations. -#[expect(dead_code)] struct BiosImage { /// PCI ROM Expansion Header + #[expect(dead_code)] rom_header: PciRomHeader, /// PCI Data Structure pcir: PcirStruct, @@ -759,15 +730,8 @@ fn is_last(&self) -> bool { =20 /// Creates a new BiosImage from raw byte data. fn new(dev: &device::Device, data: &[u8]) -> Result { - // Ensure we have enough data for the ROM header. - if data.len() < 26 { - dev_err!(dev, "Not enough data for ROM header\n"); - return Err(EINVAL); - } - // Parse the ROM header. - let rom_header =3D PciRomHeader::new(dev, &data[0..26]) - .inspect_err(|e| dev_err!(dev, "Failed to create PciRomHeader:= {:?}\n", e))?; + let rom_header =3D PciRomHeader::new(dev, data)?; =20 // Get the PCI Data Structure using the pointer from the ROM heade= r. let pcir_offset =3D usize::from(rom_header.pci_data_struct_offset); --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from PH7PR06CU001.outbound.protection.outlook.com (mail-westus3azon11010037.outbound.protection.outlook.com [52.101.201.37]) (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 0BDC3389107; Mon, 25 May 2026 13:59:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.201.37 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717549; cv=fail; b=bkYg4T/EvZswh9Ky+KGYWREu+MG30km63BfkD6Am8LBXOPXxxqtzlJq9OPTseOlqFR6WaQ5ouK9trdaojwmOWk43eeg6oKub5HYlBz9zHlbtWdC4YH3TGkJS1wWz4tbzNNi31Xy6tcsPvkwgaYp0vUcmBQjyJC+MSsRUOfGmL/w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717549; c=relaxed/simple; bh=nD+kPCCE0QeCqLYdVyjxQQsME7PyNHxjMcKS9xh4Jvo=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=Hp44z/h8QdMKADvssdoAeOapE9bWJZyfE+ra+ymt+9LVitlWN5rFdNQDo1OH1YuNKpnhDm29MAnKybidGoqsCznsoN4Ffa1uiX2TQNu9ZfQ4y0+IeV7nlHKSZYvjUUYXQO9CJqpq80HrkWEP5Uie1Srp54cD1rA/H4JKatUOCfg= 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=mphsvI7g; arc=fail smtp.client-ip=52.101.201.37 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="mphsvI7g" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=en9L3yyv29CySjvsr9ko0h1Npbugys+2Zf1zDcMHlwvrmZ9MwW18NZq3BR+lrVyq/jS3AqaHg64RUoOPmdKvV+gZe0kK9KGs99+iS59EUgoxVx/Tlonj0BUPgCLm8R/Tu8M+s88j3hP6Q6g9vU9+3uJfCXIqJ6XDQyeWfVIBTYTrRORKPThZZPqjEltmYQx/6au27aLGisVBBsMTvEvE4a6FMQxRWEbO72NByinGN0pdKc+dSQ7FrRqmX0Q6qosxtPfipQKtzB3/LdYnbP5m0JXMfjXvlpUnc+qzhCeOh5tO3h2emERpQ7UoSQsoDodMCZnNT91tbGrJ2wozsag72g== 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=I9WRoAbgZn4F+IjLqaVeEyfdrBQA5KppAxREOnlnc7U=; b=J1HZlS+XmPD2Xm8PHh5ioq7QLgRT0DlVNSB/9IBAzdq8LUSdA/NQAvJJGX/lf83I32YyXOF3MmTj8J7dqkbtKkIZfbGOMmcnWsRuiVIbIW2l+naRjDG0qEnGolXMvfJWxmNyx6T+tucLkqw//esiSFWcJKyuYkrGKPaFxAZyb6gpzRIsMb2n6r165SY8ez9slRnk21QvRd+6tj3mdxEHiJGv3SI8bjt0Ov7Ktr8JjWUTCb8SQg+HZfs6mRPizrWetj6joeU9pG9Q57w75XI3+OM5J5VOwPPY629OpJPBIR6EhyxeLyyQoxJ0nXai5Er7PK3pvQ19fWUZAl8opmNBMQ== 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=I9WRoAbgZn4F+IjLqaVeEyfdrBQA5KppAxREOnlnc7U=; b=mphsvI7gqfTdqfaF5NeUAGD9ayq4A4mhSb+2aVwrKBcgSg3SYB2eeltOcGLcMyDyxw5d8COeezpYhwwk/HGwMGbTl9JN0nHMRtIMvP0dI3X+B5Tc6nOhzr5EC0Gz8zBWEL76ykJml6VvdM0Ym1eifBAmlA8cZ5kmVwmgLBNdZ9nCD4DgDcFtqpnc4JyNmeV5HnXxd40qiov5iS6W80c68znrZkmwL8WVoRJZu8wrGivoGokh6DApniU55qQZ1Bu2l492KL/C8+S5/z7xXOmGiyOP9i/cXAj5eN402I+oYb7DCf9rUyjMAA0rz2oCPI+cZ5NBIN10Kv+4l2McnrW4/w== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:59:05 +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.0048.019; Mon, 25 May 2026 13:59:05 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:37 +0900 Subject: [PATCH v5 19/22] gpu: nova-core: vbios: drop unused image wrappers Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-19-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYCPR01CA0156.jpnprd01.prod.outlook.com (2603:1096:400:2b1::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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: 118652ec-a297-415a-9189-08deba65c85d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|11063799006; X-Microsoft-Antispam-Message-Info: XXdWSOhj0gwuhEXbecncmCfM30YiAUpNYxom/+2Iv0zHxKNyEWIu0OW2IKwYDOGIzBf4/Dg+2Jkn3jBhYB4TasZ4+ws/IV7gnUVxPYFPEXv4BwWlPnf/hDNJSnd6qwPi6DIviEH96EvqhSzNaVB3olqbh28eY/E6IfxApa+J+GX9/gjFVnl/eo60ucqHf+0PcMh+1j/fyPd79UJizmPtwW+boRJrmB9cWmT8vSnWPlurPSUnGdZ2/HChlrjcZ8D9euust7mXeBhizAfOUWfKfBGzDETaOHm0s9zsdbRu+xoIw/+nFvo9tIl7ra06EL9ofQVAQvJT0hrKKHhjFI+2e9iOeMJ1cfXUjFwSldBhWbpNmjQt5+TpaNOauTHtfs8ekIyl6iaNn4EGjI5byE2WJjptArZriJzzAJW7hHzb8x/oQSBDDFcq0fjLe6XFlHQ7p2YEUqXhAPvQtF+Nk1CzS8uHV2/C8VI1SAF7EHYoQ7RlK7bER5SK0RTb1t0BxWOokGnsGm2zt282evIr8L37fO0YgzraxUysAVoOl198cNxYI1P/mlPc/Bk2Sbf/s5R+Ez6Nrcmvt9qPzXFx+3ysdMh4rdUalqY3J2yxgOWloQBN2nH11eEad1eDl86MlYptPwbqZ5c6YQAn62e98H6zfifArzogg/+JAZyffqjrZWwp2DTC4pVSocjwu9SxBEl+ 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TEJIYW9NemJRMzFyTDQwYjgrcVREZDg0RUFxODAzYW56ejF3VUIveE5nUTU0?= =?utf-8?B?SVlZMStEd2JCcTBkWGtQRUZ4dEVpbXJQazA1b0I1bnNyMTVuWkJVajhDM0NX?= =?utf-8?B?ZjdjdFdockc5RzEvNEVPcnRWOCtScmJBTy9sUkVheFVJRElpUHhtQm1IT0hO?= =?utf-8?B?WktBaEE0VnhjVDM4dzB3aVMySzZKa2xQQjJFYmExU0oySmk0UnNaVVd5Wkda?= =?utf-8?B?OVZIZGkvc3dCZnFZQ2Yrc09lZjQyWlQ3cGQ1YUswdXVzajY1UkY3bi9MWnJv?= =?utf-8?B?SFBQOW1mOFpYVzNwdllWVWg1TDIwNDlEUS9aNTVrWXVpZE1ya1BuRmU5ZkQ3?= =?utf-8?B?R0lqUndyeW1BWURPQ0xsUThKU2pQSGcyWjJMMjZTK3d5V2xraEJIZXp4dnk1?= =?utf-8?B?WW5HRkxMNUJCMG9LM1NXZ2xxbGlHNmdocFlzRERicTA0ZWUxdElMdXBodDJv?= =?utf-8?B?eVNlb0MzY01FR2lGblI3Vk5ZK2QxT09NdTFXdGQ5N2VFUUhiRmE1ekpabXBF?= =?utf-8?B?UnMyMnh0TkhvNnZic0QwZE43RGFMcHgwN1BKT3Q3M1doNmZxN3ViUFVHckNp?= =?utf-8?B?UThmYUdEVENDZWswejl2Y1hDYWpsTXRsOUc4MGFDVjAraVRhY2pvRGR3S00w?= =?utf-8?B?ZzhpbXpuSTFsTzA4cXQydkJmZlBjUG90M2Jha2k4dUU5dzNhTDg5RGV1Tkls?= =?utf-8?B?VVEySk96cDVFbUtMS1puZTQrYXQxQXI1Z2ZERTNLZ2tXUXcxTVBxeTlLeklx?= =?utf-8?B?YnlRRVJkTzlZamhXYW4vZWdGazVHajdWc3VoU3FJRXBHcE1sV0x2SUZQMmto?= =?utf-8?B?VWNSTTBFOWFBRnpzWWJmUzdhN0N1OThwT3VTcTM4NWtBN2xUTUwrRkwrRGpv?= =?utf-8?B?OStseWRBS0czLzZYNmNpb20yQm9qSTN2eWI3dEtxbU42azExd0FkY1EzcmJk?= =?utf-8?B?ZUVqTFhnVGRaMVBDMTMvZytjKysydGpiaG10bUFxRXF0RGs4YW9PejNBWkFH?= =?utf-8?B?Nzk2MGxEODZTZWpHVWUwMDg1aHp1WDR5MXg2MXkwcE9LdUpYYkphUHA4MG5X?= =?utf-8?B?SUZ2aUxZeFVMQ1NHZC94dUFTcWhLeWI3bDdGRS83NHBsK204TnFkRy8zOEFT?= =?utf-8?B?Yjl6QjVPRWEzYkcrMzIwTFloaThMU3I3d3VJRWRRd25JUk55dmNDRkQwbDFs?= =?utf-8?B?aTVnVktSN0w3dU9yenVNUW9YUmtMQUpXVnBtdWdQNk94VFpKV2pmNUV4SkFr?= =?utf-8?B?ZnR6VkFmZjRnY3BQMmlRVVNQMFBmdnhKK2F4ZzFTc1g2ZE8zYzRWUHVWQitZ?= =?utf-8?B?amZtWVpGZ0lvcVJidXBDcGNqc2hlKzRMdzMrRVFmWDA2eGhzVmYyaXVwbG9p?= =?utf-8?B?ZDd3QkpZamg0ZTlOYU8rRk5jT09pSnEwcG1nT0YvV0N2TWFJNDZDSnYwdldv?= =?utf-8?B?eVlhWEJDQW96Q05lSnIyNzFIaXBXT2RUUzBvSlhkOGgwVlMxMmJXbkRIZDVo?= =?utf-8?B?TFdpejVqa2svZFhwUnZPdEhRbThNYy8rVlBlZnBuTnNMUmVCUXlXcXJTM1pP?= =?utf-8?B?NWdaRks0S3RuNmdtbVY5cFYxaXBINnBvVU1iWXBML1AyQmhmR1hqNmVYVXB2?= =?utf-8?B?ZDlWdUpNS1ZsYlhNVzRJNCtia3lDUWJIQUxDbzBTOFFLa2JFVGhId0ZQUGFu?= =?utf-8?B?Vm56c2ZoS0hRMDJuR1pXY2NER01FejJXaDRFSXZ0N2wySUM1bmFxd3gvWVhy?= =?utf-8?B?WDIwVDczQ01qVjFUa3RKREdRVU82U0FMRlJSaDBnVXpSMFd4a2FteUZmQkNY?= =?utf-8?B?c2d2amUwdGtLUHREM1dmT09JT2RONElFQ0Z0VEdhRmRJd3dYa2Z6YnE4ZVVt?= =?utf-8?B?TnRBTkdranZzQ1VpMXpSakU0YkQ5SnlaaDZzWnZ5NFFnUDd4SFpUam1qcDc0?= =?utf-8?B?amRPSFVRaHZvN0wxeTZrc2UrbzFwNFZQaUF4Smlib0c1MFplZ2tDYSthdTFa?= =?utf-8?B?d0phTk1kTTNVUFNpamYyTVVNQlAwQ1J4Ykh5NUdzclUxWnR0dXZqZnFmWkxO?= =?utf-8?B?b3lCNUNSRUd0bnN3dzJOcEp0YjlBTHJFdFdRakd6dEdsV0xUTS9Wc0VuRzVN?= =?utf-8?B?VFgydFg1ckE5WjRYeUp4ak42bVhRTnRHWGJtakdvTEFKaEdjVk1yTW43VU5o?= =?utf-8?B?WDJoazR0NER4cSt2SUxSTUhPUFg0TStFUmRwbkpJWGpMR2I5YllVU01pelhx?= =?utf-8?B?SGs5M1BkVkV3ejdJczNvMWhnZVY2eWQvYnQveXQ1VGYxVTlRdXV3aERQY053?= =?utf-8?B?eGx1dW84NEF1Ni9UQ1o4ZXdnY0RYUnBVV21WQ1ZzMTlSN2ZrVkhoUjVCNjZs?= =?utf-8?Q?Dp08l2TR5URhUtPP/ipNMjl0RRkpwADAPrePC68LfOkBg?= X-MS-Exchange-AntiSpam-MessageData-1: yFBiCNlAHkvPEw== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 118652ec-a297-415a-9189-08deba65c85d X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:59:05.0460 (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: bfvBgfTSiFzFYu9Mz7uZk0avmdRFBvd+G3h75a3hPvsujQa+Jgtpsv76X3h/6f35+k6d0dCwcx5R5HGoPlHe/g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 These are unused currently, and it is probably sufficient to just check the type of BIOS image in the future. Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 7399f2d087a9..5401702acee4 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -656,18 +656,6 @@ struct PciAtBiosImage { bit_offset: usize, } =20 -#[expect(dead_code)] -struct EfiBiosImage { - base: BiosImage, - // EFI-specific fields can be added here in the future. -} - -#[expect(dead_code)] -struct NbsiBiosImage { - base: BiosImage, - // NBSI-specific fields can be added here in the future. -} - /// The [`FwSecBiosImage`] structure contains the PMU table and the Falcon= Ucode. /// /// The PMU table contains voltage/frequency tables as well as a pointer t= o the Falcon Ucode. --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from PH8PR06CU001.outbound.protection.outlook.com (mail-westus3azon11012034.outbound.protection.outlook.com [40.107.209.34]) (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 E3813389DE3; Mon, 25 May 2026 13:59:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.209.34 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717553; cv=fail; b=leVIwAHQVNIJ5WvHWsEYZLHDBU1qMR7GSrK1W/9n2bUGqGvUw8x7tZm+Img3JyLwiuCXMH43dX1YZXbbaSXgW6W1BkgHhrcLOtTL/sRxCinmM62Sx1AHrzeF7YoDn9Vq34NBKuENxz8mtQwuZO/LnkjGJrmpXrQnr1lmmEUHEN8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717553; c=relaxed/simple; bh=JRf0HtvPfmp4Xy7UFnZQ7VoU29q1xIezQM+OVp5h9Yg=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=HraWGtog+2dkNjGfn7qGBbui9B/6C2gR/DgQbcpbuzY3UYI0s5ETLzY4lJ2/Un6nvL4AmASCP+1I8Ha7fij6mfl6roDBVEt2iSkdQUWZTHre4iXppYGEYAYMVQcwopmY+90Bu0R1oa58N1yTWwDsWI9yJFmx+TnAHKd0J23JJGQ= 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=XELgjNoJ; arc=fail smtp.client-ip=40.107.209.34 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="XELgjNoJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=IUiHu1OJ3ndR0NE0MCjD9QrWThH+Is7r9qsJ2evwnTZFjd0j1Q99ZUxbl68faW8RkgUI4Rm9m3o62L0I4bBfzPeYLK6ibhaU3f9s7iEfz+ULUzYQ0EgGMRI/jO/f1t/iWLPI6rhjY6PxuvZgErnPdclTGl9cTEDjQhN867FEA57uDnYWkff8WL/LWpeLOIphnPN9Dr6wiSoNgiG4hW4xYYyx//OebaMe2+3qC2dyr4UBMIuU3oIOLmLHzrMRlKd3PT06Bi5H7jx5MFnOfh2w1C8b4GzTw5OGyJXoSPQh2oZeZ5C/Pdwu2Vk7VJuCta/I0rfcMBBIyHGpO0UPWVQU7Q== 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=vUrkY/63W0QI8we9xlT2wHDsylVH+l+tgYLHEMTPQL8=; b=cEL0vzWJ6sVD4HoY5Kv1gx/5+5cyA7ZC51n3iDBsBOW5a02T1KYSWqQ+VAbYho6AcYb6W1QjMS8GQrkZoBqN5qts57p7T6KzJM8KQXSC+4aFWIB3lQkPeL47UG4vJGDO9sP936SJRNg/+gzqgt7zLRTudZdqfvCuv/nSAILiCybly+u2hsQ5dcsK61+ae80N0gUhe5BGEZr0P3qK/AULGVQMTDm1U573lF98qk+CJLNaBUzOMCu0bwVPzFDtA9LTF8ISatgAdc1v4OL2b2ukQpug+s0Nwv5X6+sfZG/B6ubldlIoLE45ZQTLEroQPS1MsakNbYLb1walo3A8dW2U+A== 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=vUrkY/63W0QI8we9xlT2wHDsylVH+l+tgYLHEMTPQL8=; b=XELgjNoJlbziXtvk/VSb4yvQnHO4JCiCnGJY7q3MR+uB+nmF548shIMdid7ISJFr86Vxc/oO6uebjbXLT/L0PZD1vXaqnlA3kuzGcFILzfZULC51hvEu3srofVo91zuJlwIKT999jDe4Hzuin1At4Rm62aXJ4+QJLkd31ZdVwoyI1SM8jVRUjTOqCt6QizI6jaaDlKLSVjYMODY70GtX8ioIFpsK/oSG5OY/9OqmJgU9eWM1rairdkVxRm+hHrNGb+jn2icJQucmwKoNNMhDQDBkD0tlFwUkkVpcsKoLrXAafvmCPjmoox32alT9Qq0syvZSo1kTf0Wc0k+5xnzTRw== 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 IA1PR12MB6628.namprd12.prod.outlook.com (2603:10b6:208:3a0::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.20; Mon, 25 May 2026 13:59:09 +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.0048.019; Mon, 25 May 2026 13:59:09 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:38 +0900 Subject: [PATCH v5 20/22] gpu: nova-core: vbios: drop redundant TryFrom import Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-20-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TY4PR01CA0125.jpnprd01.prod.outlook.com (2603:1096:405:379::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_|IA1PR12MB6628:EE_ X-MS-Office365-Filtering-Correlation-Id: d9900b65-a3fe-4c56-ed29-08deba65cac1 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|1800799024|366016|376014|10070799003|18002099003|56012099003|22082099003|11063799006; X-Microsoft-Antispam-Message-Info: 7pAmBpPfBFTh/oAwPpooq8Fm5F+Cfap3tn9gjLop6wJaZljmKNHl95v4EdNSUSFnx12zoU4igeKfxkpxheLV8IHPBSQ/LzAcOP5HZOL7RWb+XzIx71aOtx4nseh+43JQMqOJ3IuZMT0a+vqd+rcGVctXopbjEYz/joTAB9B5W2peDvO1YExZWsTyrFxH+pC6UghMdA10ReCAaSvndKaOgNYZtm/mhMMoH9vKTM/EKKJBXTLukczAnOvjEBpUQK6ABaV14CZUndSxsqMNX0zEZGyL+5e1XFICKA4wv6TBW1X6drjS0+9o09EFGHZtTUG3VA6s8qEvFdRCEZjoMMuCSp5sM2mIXnil+p/P/Br4rkUi0qKiDp6dLuIFEwzI1qsnrjNiBsbjRJcjlYRs5XLqCpv9qiCSRwieLa7VYruF6I7vaYrjfzBW7vjHm1F17U6qFkA6IutXTZ0pImpyr3pQLvYXwsUlVFLojzEkC2WaqmlvxSG65D73xUiy7jnNN68FG3WUX3L6LjPxyK92sOakg8x+788vzDMcrP+xBHyn2V3QXxKe+RfIvT2VAN042KhmVyrgBqpyoaeFyUvwJF7VhXnsyJ27TkE+O5YD4sbZtRwpnXcrTk37DNJLvsiraOl50ezl3dnCjQB6hOsE1hxTJslPAibjfg3EhoHANDznnBvLIZp4P49IrjJGxaD1yf1r 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)(1800799024)(366016)(376014)(10070799003)(18002099003)(56012099003)(22082099003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?MU1oVG1RNUJqcnJRbmc0V0NKNVM3M0xpdDIrdVZGTFdZQldKMVNFVElWOERQ?= =?utf-8?B?SFBVS29KWUtuK1VMWXU1Tlo4QURUMm9OOTl2aFp1QmF1ZDJ6elFJbEtYakNm?= =?utf-8?B?dTVyWGJRdUdTcFdNNGFLcHFuREN5NS9ld3YrRUw2N2dYaFRCT1VNSXJEWEtJ?= =?utf-8?B?RDJtcXN6dDdyWE5aNFZDTzVGRVI3bzc4MU5XcUFVMkhOSDNMZ2tsdE5aSmNt?= =?utf-8?B?WGZyQkR1dENHSzVTeWVxWEVXeS9KdVcwYnhuMXJhWHBxUmhMUWl0b29kTThK?= =?utf-8?B?dzhlREdWTnJTT21PQWRvWk5nNlc5bHJzenl4cnJCQXJmYkpWT2lJcnh0SFZi?= =?utf-8?B?TDZ3TEpnRjk2dkQyKzFnd0hPTy83V0k2S1IrL01EMFZDbzFPWGhOMUhuNm80?= =?utf-8?B?c3dsUHduclZONmhOVVpJcEdGNjVpMmsyNjIxYTA0UXJ2bU1NR1VZNWNOaXFO?= =?utf-8?B?L2hQM2ljRTF5aStKT1QzZXJIRURlcjl2UW9rSi95K1VZQUVxL0ZNQnVlaWdm?= =?utf-8?B?b0tPZnBpNTd0dVhDOHNDdlc0MTU1K1g3bWpJT1hjdUlxNXA4Q2xBREhuaWRm?= =?utf-8?B?ZTNZT1Q2RWYxc3gvSzY5WTYwcEdOMXFXeWZhMThUQ0N6aHpuMUhoeXhmLzZJ?= =?utf-8?B?cXhkWGtDTTNuZU1oY2lFclEyeGRxaGpncG02c1JBMTZVNGZrYy9OZjNwZW95?= =?utf-8?B?S1dHMU1SemJGaW9GNkRReUhkZG91dVVPMDBQUGRmYTlOT09HSnh0SWZNcXRT?= =?utf-8?B?ZE5kNnFOQ1l4ZzMrUDBJLzBNc29jaGZ1QUlvTndlNEUxL0hVSVVOSHNaZk4w?= =?utf-8?B?OEZ4Z2xoRVJScXNKV2RBYjlRS2IxMEJzN2ZNVXVmMGphM1FxdDhQaTVlMzg2?= =?utf-8?B?dVJCUFFHUENRUzNwcjNET1NUek9BRmdaalByd1Bxem5sTHF2NlczQldvOVBV?= =?utf-8?B?USsyRU5xbjNPeTVLZzFJMXpRRDRlVXRNejZaY0htRGVmOVN5aE4wZ3NCOU90?= =?utf-8?B?d2MxWTRhenN1eWRPN3hkK0REeVUxZmp6VDI2d29kZUFRMkxDTE5ZKysvcUUv?= =?utf-8?B?NCtvYm9uSTFENlZ5YUl5SU02VnlsYzFmUWcyUElXM2liSyttZWZuL1hTTlNh?= =?utf-8?B?WXV5SW9peXBIZFhtc2lCNE5PRmU0aTd2NjFKdGJKMVIySnlCOG0ycFFhRkc0?= =?utf-8?B?UmFHZDNBL1MvZlAvKzIrTm50cEdrYU1ZMndTWE5FT29QR0hkSUF6Uk9Ga3N2?= =?utf-8?B?OFZuZ2pIK1U2MWlHdnVVeTFmSFgycDZ1MnUrb2lmOHA5R2M3L3c5dDVlMnlQ?= =?utf-8?B?U0syRDlTV0szTEU5c1FJMnUwdEw0NTdsT3ZDc1lBbUJiUFdRNUlDNk94U2h0?= =?utf-8?B?NXR1TXk4Y1VPL3p1QWxaQVZQNlE4L2h3Q0JPdVlpTXFUdk40b1crYWVPbllz?= =?utf-8?B?bmc4YkpRSVZ4dDRJSmtsaVYrUjBheGsvMkZSRnU3WGh5TStaOHIxcFgyNXpK?= =?utf-8?B?UXlQaTZZL25yb3YvUmY3bmhjTHROTFRleEJjNTBGQitkSUg3eEN2YzloTGRW?= =?utf-8?B?dnZEVjd1T1RWMDVFVVNJMnNVQTRBa0k2TStrU3FjQmRmYzQza0YwS01qY3lF?= =?utf-8?B?N1hPd2RzZ3I3SjdCRVFtb3lmb0Vtb1NaWEF6TFYwZGxFblQ0emFBYkRWMjRQ?= =?utf-8?B?aSt5UTlzQnROVTV5Z1h3Y2ppdGJuNnFnVEhOckVNR1FlOU9LQk9UdDZ0QkhV?= =?utf-8?B?YnJNaWNRZGNmWUlBYitENTl5L05Ha0wydjdxdHR2WU5BazlibU5FVm84eGkr?= =?utf-8?B?VXdnb1ZpVE1QRDdOWHo2am5GZ00yM3BGZjlFVW5DeWN5dUdTWU5tUkJ2UEpv?= =?utf-8?B?ajBnd1B3TkJCRTRkdXV1M25WRXJCOElSanJTUE5UWnlnczczUlFENnJoWXhC?= =?utf-8?B?cDBnUVFzeEh2bUZuamxvRVl6ZURzMW5qVkI4OUx6RmJreGw2dWRia3lXMUZP?= =?utf-8?B?dEEyVGJjbExMMll2Z0s0eDYyR05MZWhzYTdFVmdtWTFkcWlPN0N0K0tmNWhS?= =?utf-8?B?WnZGMGdwYUNLem1LMmtBam9yeFBLTUtwYlNCY0YxVUZ2VVg5alhaWWJSbjFQ?= =?utf-8?B?UGNBTld5R0x3UkU2K2M0ZVM0SG12THI4L0lDMmNFSkFYYlhJOGdSY1NOR1la?= =?utf-8?B?eDJPVmxlaE9BYk41VFp4blA0MDkyaDltdUw5S3pvT21LdllsMDl2QkFzUk01?= =?utf-8?B?ZFFqdzk5VkRQNVJ3VkJWZHowMFljMTBzcThDZGp2Tm9MRFBPWkJiU3R4a1ho?= =?utf-8?B?a0dOSkpSa214RkNmcGlSMUorOThYK3VoK0dxKzVyeU1rSHVyeTd6VE0rd0Fv?= =?utf-8?Q?c/B9JiJW7tcjgpvZ6VLesLanjdXcM1cRKWgd1yA5QHjHi?= X-MS-Exchange-AntiSpam-MessageData-1: JbFb1KafXBeTRw== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9900b65-a3fe-4c56-ed29-08deba65cac1 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:59:09.0498 (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: tZ6wtXNLXPCLYRL0c5EHYpkQy7dFwlwMjy6pKJXuDavPCVLJ2JFAxAN4ItFUw+yPKXpljFUjVrJJBCdMER6+Cg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB6628 This is unused. Reviewed-by: John Hubbard Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 5401702acee4..6492f158d11e 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -2,8 +2,6 @@ =20 //! VBIOS extraction and parsing. =20 -use core::convert::TryFrom; - use kernel::{ device, io::Io, --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from SN4PR0501CU005.outbound.protection.outlook.com (mail-southcentralusazon11011065.outbound.protection.outlook.com [40.93.194.65]) (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 01138388391; Mon, 25 May 2026 13:59:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.194.65 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717561; cv=fail; b=aGDFOxqxvuspztOmaAL7vOIdBvnB4obCMJuU4DK0Snhvk41c5lroncUnjSDZwGD4SLiACvLPv1n54pH/Ii7xgLwlpbRfV0QFH16wEKOUA+22Kq1dFyqSYObF5dqkwIDyQJKEkhoiAjzgzxBmY2eLyJOarXOs6362MPpz7Vrwlew= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717561; c=relaxed/simple; bh=lm1zYLJzsYFtV6v0lw7EslyNBt5rW74N77VeomvyV6s=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=Qg4CE7PYgQdFBE40jBsO8FE5QgWapHCf+NyuVHu2CA/QsnCokxw+/C1k2L4jgyZyZcFHrRk3sbv+8hXhbd+fPrkH0UcCdAuqro9g//DJZgLJxeZrvSIZslMjFcZGgl/9x2vi7Mu9O6+s70XEURdCjBU6NzVq5K47G43Mtj7i+SU= 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=jZxMj7d6; arc=fail smtp.client-ip=40.93.194.65 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="jZxMj7d6" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Lce+ZNGXNxCxphFRTaPPnVmIw9COABwyzHSaGCra5Gxu0ZGd9Wu1VihdSrAom3KwkS5wmA2RxmUaxkjMl3qNuJ6xv3qceHZmU1vXmnf1zznKPAjBh7cZ/1m/7pGdT91nLN2HF4xWxyqv/tcg3aJ6GemLHBdcwhu7QRoTn/YZHKlDQFNFQT/oNhMTtLu+324GJ9G/BayzC/X7+H/9zfIuqNz5JQ38lP/UUwhEDpexh6WJF+e0vkzHT1HrUVQenyedYuysvs8LBEIKYarJ9y7jFxJvaXoAC/Zn3WAvRFvWLbgZbG+orFo2RG5JM7BLDpi8vtpp8uE9X+yN618lIYsDtg== 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=w1VTe80hMYMTVM3LcTcIbnGGIJ+ZCwaDxQb6OzDURdc=; b=mIDOBKvJk/siVCXBD2KrIS/r9u6RmevCpWFodmXx54/xtHvgmbZ5uvit2tlNGTO91a1Aob8uDGH0pSUfkr3YbnDGdydEHisWfNetpTcv54XY3XR+Dj5s2iARPmX5ya7QrT0NplbzbgZCS97k4aCeb3LkuBVfVuyQiPJ2QGz/dqk9hnKaaRhAoPb2w2tAwF7hpzsUG7h8qQGykn+2UA7zBTJ1zoMU9UI9mQ+QouNwq7eHNeUxo/zXzgd/mRU9Twv+AyGDg7vPvVdh7g0dDZLaNXgJZ1EKnmBlnb8GXOnwXrsWkbv+77M2MXSH+VVf3uYRbYWTwITjp6hyfXGIE3JICw== 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=w1VTe80hMYMTVM3LcTcIbnGGIJ+ZCwaDxQb6OzDURdc=; b=jZxMj7d6D5l0WLgvbB85bZDJrFJPOhMku3gswitFw5ZGbWURJ9pSM8pSv+W00XvcYcZg/Yakmg0hpQQOSKdnggaCFOAqR7fzvXTr2hYfzOUq1KZAUBMNi2hgXHPKbDg3Gw3Ft2WW7dB1/Jt2harExXcm8UKRmqrWCjI407iIz7x/ioz2fNDUBf/LSXyxDoWLGy2fhs5z/QXCK9PJE/4A4gzfDBxdQumpMrzxoC9sxLAwAvPT5eUuQCqgoEDqnwDw0iixC1UuVagS7axyDBRbCReJdojr+eR6zcrd8Rih6NQS7+I5DJrO5uKroUcE8NvjSyGS6xYVuRtVP5OthF0HEQ== 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 MW5PR12MB5681.namprd12.prod.outlook.com (2603:10b6:303:19e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.18; Mon, 25 May 2026 13:59:15 +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.0048.019; Mon, 25 May 2026 13:59:14 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:39 +0900 Subject: [PATCH v5 21/22] gpu: nova-core: vbios: move constants and functions to be associated Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-21-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYCP286CA0042.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29d::18) 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_|MW5PR12MB5681:EE_ X-MS-Office365-Filtering-Correlation-Id: 1944c386-fc9b-48b8-172e-08deba65cde4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|10070799003|376014|56012099003|22082099003|18002099003|11063799006|6133799003; X-Microsoft-Antispam-Message-Info: u3J4CL+B5s5Uc+WUwcrer5kq5nuJM9TXvMsKB9VCVAD3i35UVjATl6VpD++06WEEnmYTzvIEWWr9EK0p/IeSPV3eSIukZ3BRHuJsLLCG43WRZuCGZ3oeh0ZwDgXkZNcOJJ//ekLz2Tps/NnSRZ9tx8kq2mJ45HM4nfF8Fs5Tu1XYpMRlgL/MwucmHf8v0FpwFvYlKaXDqRrmK2fE3S5DeE5PM+vmsEMp+ndcN8XykN/5hq3WGRAOvx+y18dnAuJa/T5AViIZpZZY3B0mMJh58nL69Qby5dGqh+nII0UOSXFj6RArZjHn23Im3ysKg3HzVU4oH7jX8VUtbHqL4ggRlSIy/p8hnbt7nTk0IWL5SX6kj5rRi2Mv5RkkaKeJsYFUucdcA0aqfZtEUgw0uPhocwm+SOvgrMkiimSPVUiiKm4NlbFXghbITS42I/uh9sUJ3lkOcD4aZClveX1npUYKVyKlZoF5aXYsrwjs5hFQ4Y8JWi69Uim7Ze7/niJkKUKamQ5s863w4Zme+a6CWnc5ajIzWQcT34XuSFPThdYwqkS0zM1iaQPXH//oaZARYrPuaXBSyXFOVTnADixfVZrS77C6GeupzxjQLDqznUR6JYG6L6vPAebmvs0hdljT553uELQF/CvW9UD0YzxGV+VQEDJhTmu7XVHD1JElZqjx9JZui2nDxIC9ZtjI5zhaW8lE 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)(366016)(1800799024)(10070799003)(376014)(56012099003)(22082099003)(18002099003)(11063799006)(6133799003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eStsdHBKVEFHVlZlR0hNVnJvbFZKZzJybmxtRGpGUmxBR2pXUDlTdkNJRUdm?= =?utf-8?B?ZFZ1M2RUOWZpODNRZkMrRkxFTkxtbWhwTWZoRFFMczBTWnhRMGI3TXMxNUFp?= =?utf-8?B?MmNFci9hU2ZZWFA5MW40N2luYUpzdFVHWUM4VXFmbm1DQU9IamZHOGs3SkRo?= =?utf-8?B?TjBZMXBGeFRWQzhxWnk5emtBZEdRTWZsQ01hNHo4MTZ4QVB4QWRza1paZUlo?= =?utf-8?B?SWMxSzRSa2djNklVRG9nYUpjb3N6eG54dUdKM0N1YUJXRzJRZGZQOHJVbXlx?= =?utf-8?B?MG9qczNoS1kvZnhVbWlpUm5aSnlPVTg2U2t3S2hkYmhwSjZEbWkyYkNIMDUv?= =?utf-8?B?djVjNTI1UGFXSVp5bmkwNit3aDhUdjNvT2lLb1owaElIREs4RDNVQVhVL3FF?= =?utf-8?B?clVUZVFGQ3paUzZKRUhDOGRpeFFORGo0NEgwajQ0L1Q5ckJnMmFmcVF2Vnov?= =?utf-8?B?WGdvQ1Y2VzVOQS9DWHhoMHpLdlhCbGtJSStQNXV1QU9iYk5RRzhpb2lJZVdD?= =?utf-8?B?VkxyM0t4RW1HM3dlaDdkMEZ2VFQ2WWppRlA2TldEc0JvZDFBNjlLVnlhVFFv?= =?utf-8?B?R0NzWHdkSnhJVER5bWlkc2pZR0tqQkJtZUZOc0xqd0dEZXFXdWdsS1dvZ0hm?= =?utf-8?B?VnlzRG0vUE5QWXhiRTBlRGo3YW9zcFpMR0xXc1ptODVpVDJ4QnpOdm9hZ0Mw?= =?utf-8?B?M0RScTMrVmhRYWkyMkEvU0EwblVOT3RkSnd3MmFWUFhSalRLdmhaaGVFZVRZ?= =?utf-8?B?Q2tGWm9FR0lzN0hxNUdiZVdHM2RrOGJpTzBWTk9MbmhvK0syb3BlTXhjQ2Nm?= =?utf-8?B?ZGtzb01PenlNL0NNSmtzMmZmcUFDd3gza25kdURaREJpbDFoVmlYT1BydUs3?= =?utf-8?B?c3F1UXJxQjYwNkdtd0JJVzh5eThHajhiYkhEMlZnWTNFTm8xN2FJUU9naytt?= =?utf-8?B?SEFPbGRXUVM5bUNVYmF3Njl4Sk9GdlhROTYzWkYzVDFSRHVDcmVmRHhTU3dh?= =?utf-8?B?QXk1akpaUFVCTWM2czUyUE9yN21nNW1lSk52dHdyKzdVUUU0Mm5XWjlLQk1P?= =?utf-8?B?dVQ1VnloZzVNRHpLYU9INnVEeW5GdHhzQldocHFXZ0NaYUxoTE5nOUl1cFh6?= =?utf-8?B?RFFXWjBhTURZOWpBOEJTeWlYT3RSczZxNFJwMTIwZTNkdFZ3ME5FSGU5Q0pC?= =?utf-8?B?eFJyTmIybkoxQlVGSWVuZlF0U1h4SGpIK2UrRnZTcVdoR2M2SVFhV1BqVks3?= =?utf-8?B?ZjlhNTVhYVhVS3FqaU9SNTdSc2VOdnRPSFVjUjU5ZGNJZ1lLTG5aSklBd3RE?= =?utf-8?B?L2ljV2dSRHR0Nk80Y0hTUzhoVGJ4Uk1HV2hidEh5cDl2a1dpdjdDVXJGbHo1?= =?utf-8?B?TUUrMEpuRXFPL1czUTJXNGpkVGpkcFYwVlRKWUxNdGg0SXk1UDJqTnQ0bDZl?= =?utf-8?B?Z08ybXBIL0FEbU5DemxuT3ZoaVowVUpnKzRkNy9ITXBhUTFreXE4VWlGbTJs?= =?utf-8?B?amtxNjRLMUdPanpETi9VVEdzUzdxQ1EwVVB4UEl3QVBQenJheUFIOTBoR080?= =?utf-8?B?cWs1UXJwYWloSWRkbmdyRVVyUm44MVNCRmlsTTlHSUNNZUpIK1lSalNkTXRy?= =?utf-8?B?aDkzYTRzU0pzaGN0QkE2QzhjbDRYWFd6bytuTEV5UVVJLzR2cVpRdkh2THND?= =?utf-8?B?M1djc0M4ZHZld0ZxOFpsUXJCQlVUbkxyMC9BNklSYmliUzhWTFRTaGRUUE5R?= =?utf-8?B?WmhHM1RSZXkzNFZZOVdDcDdsS1NYM0ZYeVdteG96NEQ5RU9oMVZSVi9KenRK?= =?utf-8?B?MDM3cnU0WVowQ00rdms3Myt5TmF3NFFUZytIVkR6YytKNUhmNFdOTmZ0ZFVh?= =?utf-8?B?TUdKMmVsL2docWlNVGVJTkZWeG9LeWxUd0lRZ1ZHRVE4ekh6cXRObTEwWWx0?= =?utf-8?B?Tk80WC8vS1EyQ3p0ZlhxcEtMYWFKc2RteXM5WGZDWW9KT0Rnbm1ianhONWdJ?= =?utf-8?B?SWlPWTh0YVFtS2UyR0RDcGxMUEJsMlFmUGJRZTJleHRlNmF2MFk3bmdiN2do?= =?utf-8?B?ZDhKTHF0ZGVoTDBnWEp5RTZMT043M1hDVVdIVTdZWGo4UlV2QXE2b3ZzaHNS?= =?utf-8?B?TDYwcDZlK2xONlhpL2xOMXp5OGFiQkFXSVhpMmJkTFdaVnlwUktWSVpaK3NL?= =?utf-8?B?RUUyajhhVnEvK1BpaFV1d2R0QWJGVE5Ndk8vYWFhVG9lMGROMlNKeDNLSjBU?= =?utf-8?B?SjFsTXk0bzA5RDlWZTloejhXOEpWdGp1TWF1aEdFWHp6aXhYVWpQcHllQVBm?= =?utf-8?B?WDBCRGRhNDBoQ2NXRGsyblc2NVFLZG9wR1FOWUxsL1hBbE5NKzdrcC9RWnpJ?= =?utf-8?Q?RQPWUcH+5vARttDZ31KTaMV1si9DD6oCjKnXEtmO7S+j0?= X-MS-Exchange-AntiSpam-MessageData-1: LMQoNkGyTm3WRA== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1944c386-fc9b-48b8-172e-08deba65cde4 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:59:14.3217 (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: GyB/Gp0U36p6h1GllVdeQVP/Fi9A/82rlCIY4tgIdQPdy++ovV8NbUhROsziTv53jk70qrpbHhQ/iGagrUi+5w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR12MB5681 Move constants and functions to be inside the impls of the types they are related to. This makes it more obvious what each type and value is for. Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- Documentation/gpu/nova/core/vbios.rst | 2 +- drivers/gpu/nova-core/vbios.rs | 220 +++++++++++++++++-------------= ---- 2 files changed, 113 insertions(+), 109 deletions(-) diff --git a/Documentation/gpu/nova/core/vbios.rst b/Documentation/gpu/nova= /core/vbios.rst index a4fe63422ede..9d3379ccfb30 100644 --- a/Documentation/gpu/nova/core/vbios.rst +++ b/Documentation/gpu/nova/core/vbios.rst @@ -232,7 +232,7 @@ Falcon data in the VBIOS which contains the PMU lookup = table. This lookup table used to find the required Falcon ucode based on an application ID. =20 The location of the PMU lookup table is found by scanning the BIT (`BIOS I= nformation Table`_) -tokens for a token with the id `BIT_TOKEN_ID_FALCON_DATA` (0x70) which ind= icates the +tokens for a token with the Falcon data token id (0x70) which indicates the offset of the same from the start of the VBIOS image. Unfortunately, the o= ffset does not account for the EFI image located between the PciAt and FwSec ima= ges. The `vbios.rs` code compensates for this with appropriate arithmetic. diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 6492f158d11e..b14f9ebdc68f 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -27,16 +27,6 @@ num::FromSafeCast, }; =20 -/// The offset of the VBIOS ROM in the BAR0 space. -const ROM_OFFSET: usize =3D 0x300000; -/// The maximum length of the VBIOS ROM to scan into. -const BIOS_MAX_SCAN_LEN: usize =3D 0x100000; -/// The size to read ahead when parsing initial BIOS image headers. -const BIOS_READ_AHEAD_SIZE: usize =3D 1024; -/// The bit in the last image indicator byte for the PCI Data Structure th= at -/// indicates the last image. Bit 0-6 are reserved, bit 7 is last image bi= t. -const LAST_IMAGE_BIT_MASK: u8 =3D 0x80; - /// BIOS Image Type from PCI Data Structure code_type field. #[derive(Debug, Clone, Copy, PartialEq, Eq)] #[repr(u8)] @@ -65,14 +55,6 @@ fn try_from(code: u8) -> Result { } } =20 -// PMU lookup table entry types. Used to locate PMU table entries -// in the Fwsec image, corresponding to falcon ucodes. -#[expect(dead_code)] -const FALCON_UCODE_ENTRY_APPID_FIRMWARE_SEC_LIC: u8 =3D 0x05; -#[expect(dead_code)] -const FALCON_UCODE_ENTRY_APPID_FWSEC_DBG: u8 =3D 0x45; -const FALCON_UCODE_ENTRY_APPID_FWSEC_PROD: u8 =3D 0x85; - /// Vbios Reader for constructing the VBIOS data. struct VbiosIterator<'a> { dev: &'a device::Device, @@ -89,94 +71,99 @@ struct VbiosIterator<'a> { last_found: bool, } =20 -// IFR Header in VBIOS. +impl<'a> VbiosIterator<'a> { + /// The offset of the VBIOS ROM in the BAR0 space. + const ROM_OFFSET: usize =3D 0x300000; + /// The maximum length of the VBIOS ROM to scan into. + const BIOS_MAX_SCAN_LEN: usize =3D 0x100000; + /// The size to read ahead when parsing initial BIOS image headers. + const BIOS_READ_AHEAD_SIZE: usize =3D 1024; =20 -register! { - pub(crate) NV_PBUS_IFR_FMT_FIXED0(u32) @ 0x300000 { - 31:0 signature; - } -} - -register! { - pub(crate) NV_PBUS_IFR_FMT_FIXED1(u32) @ 0x300004 { - 30:16 fixed_data_size; - 15:8 version =3D> u8; - } -} - -register! { - pub(crate) NV_PBUS_IFR_FMT_FIXED2(u32) @ 0x300008 { - 19:0 total_data_size; - } -} - -/// Return the byte offset where the PCI Expansion ROM images begin in the= GPU's ROM. -/// -/// The GPU's ROM may begin with an Init-from-ROM (IFR) header that preced= es -/// the PCI Expansion ROM images (VBIOS). When present, the PROM shadow -/// method must parse this header to determine the offset where the PCI ROM -/// images actually begin, and adjust all subsequent reads accordingly. -/// -/// On most GPUs this is not needed because the IFR microcode has already -/// applied the ROM offset so that PROM reads transparently skip the heade= r. -/// On GA100, for some reason, the IFR offset is not applied to PROM -/// reads. Therefore, the search for the PCI expansion must skip the IFR -/// header, if found. -fn vbios_rom_offset(dev: &device::Device, bar0: &Bar0) -> Result { - /// IFR signature. - const NV_PBUS_IFR_FMT_FIXED0_SIGNATURE_VALUE: u32 =3D u32::from_le_byt= es(*b"NVGI"); - /// ROM directory signature. - const NV_ROM_DIRECTORY_IDENTIFIER: u32 =3D u32::from_le_bytes(*b"RFRD"= ); - /// Offset of the NV_PMGR_ROM_ADDR_OFFSET register in IFR Extended sec= tion. - const IFR_SW_EXT_ROM_ADDR_OFFSET: usize =3D 4; - /// Size of Redundant Firmware Flash Status section. - const RFW_FLASH_STATUS_SIZE: usize =3D SZ_4K; - /// Offset in the ROM Directory of the PCI Option ROM offset - const PCI_OPTION_ROM_OFFSET: usize =3D 8; - - let signature =3D bar0.read(NV_PBUS_IFR_FMT_FIXED0).signature(); - - if signature =3D=3D NV_PBUS_IFR_FMT_FIXED0_SIGNATURE_VALUE { - let fixed1 =3D bar0.read(NV_PBUS_IFR_FMT_FIXED1); - - match fixed1.version() { - 1 | 2 =3D> { - let fixed_data_size =3D usize::from(fixed1.fixed_data_size= ()); - let pmgr_rom_addr_offset =3D fixed_data_size + IFR_SW_EXT_= ROM_ADDR_OFFSET; - bar0.try_read32(ROM_OFFSET + pmgr_rom_addr_offset) - .map(usize::from_safe_cast) - } - 3 =3D> { - let fixed2 =3D bar0.read(NV_PBUS_IFR_FMT_FIXED2); - let total_data_size =3D usize::from(fixed2.total_data_size= ()); - let flash_status_offset =3D - usize::from_safe_cast(bar0.try_read32(ROM_OFFSET + tot= al_data_size)?); - let dir_offset =3D flash_status_offset + RFW_FLASH_STATUS_= SIZE; - let dir_sig =3D bar0.try_read32(ROM_OFFSET + dir_offset)?; - if dir_sig !=3D NV_ROM_DIRECTORY_IDENTIFIER { - dev_err!(dev, "could not find IFR ROM directory\n"); - return Err(EINVAL); - } - bar0.try_read32(ROM_OFFSET + dir_offset + PCI_OPTION_ROM_O= FFSET) - .map(usize::from_safe_cast) - } - _ =3D> { - dev_err!(dev, "unsupported IFR header version {}\n", fixed= 1.version()); - Err(EINVAL) + /// Return the byte offset where the PCI Expansion ROM images begin in= the GPU's ROM. + /// + /// The GPU's ROM may begin with an Init-from-ROM (IFR) header that pr= ecedes the PCI Expansion + /// ROM images (VBIOS). When present, the PROM shadow method must pars= e this header to determine + /// the offset where the PCI ROM images actually begin, and adjust all= subsequent reads + /// accordingly. + /// + /// On most GPUs this is not needed because the IFR microcode has alre= ady applied the ROM offset + /// so that PROM reads transparently skip the header. On GA100, for so= me reason, the IFR offset + /// is not applied to PROM reads. Therefore, the search for the PCI ex= pansion must skip the IFR + /// header, if found. + fn rom_offset(dev: &device::Device, bar0: &Bar0) -> Result { + // IFR Header in VBIOS. + register! { + NV_PBUS_IFR_FMT_FIXED0(u32) @ 0x300000 { + 31:0 signature; } } - } else { - Ok(0) - } -} =20 -impl<'a> VbiosIterator<'a> { + register! { + NV_PBUS_IFR_FMT_FIXED1(u32) @ 0x300004 { + 30:16 fixed_data_size; + 15:8 version =3D> u8; + } + } + + register! { + NV_PBUS_IFR_FMT_FIXED2(u32) @ 0x300008 { + 19:0 total_data_size; + } + } + + /// IFR signature. + const NV_PBUS_IFR_FMT_FIXED0_SIGNATURE_VALUE: u32 =3D u32::from_le= _bytes(*b"NVGI"); + /// ROM directory signature. + const NV_ROM_DIRECTORY_IDENTIFIER: u32 =3D u32::from_le_bytes(*b"R= FRD"); + /// Offset of the NV_PMGR_ROM_ADDR_OFFSET register in IFR Extended= section. + const IFR_SW_EXT_ROM_ADDR_OFFSET: usize =3D 4; + /// Size of Redundant Firmware Flash Status section. + const RFW_FLASH_STATUS_SIZE: usize =3D SZ_4K; + /// Offset in the ROM Directory of the PCI Option ROM offset. + const PCI_OPTION_ROM_OFFSET: usize =3D 8; + + let signature =3D bar0.read(NV_PBUS_IFR_FMT_FIXED0).signature(); + + if signature =3D=3D NV_PBUS_IFR_FMT_FIXED0_SIGNATURE_VALUE { + let fixed1 =3D bar0.read(NV_PBUS_IFR_FMT_FIXED1); + + match fixed1.version() { + 1 | 2 =3D> { + let fixed_data_size =3D usize::from(fixed1.fixed_data_= size()); + let pmgr_rom_addr_offset =3D fixed_data_size + IFR_SW_= EXT_ROM_ADDR_OFFSET; + bar0.try_read32(Self::ROM_OFFSET + pmgr_rom_addr_offse= t) + .map(usize::from_safe_cast) + } + 3 =3D> { + let fixed2 =3D bar0.read(NV_PBUS_IFR_FMT_FIXED2); + let total_data_size =3D usize::from(fixed2.total_data_= size()); + let flash_status_offset =3D + usize::from_safe_cast(bar0.try_read32(Self::ROM_OF= FSET + total_data_size)?); + let dir_offset =3D flash_status_offset + RFW_FLASH_STA= TUS_SIZE; + let dir_sig =3D bar0.try_read32(Self::ROM_OFFSET + dir= _offset)?; + if dir_sig !=3D NV_ROM_DIRECTORY_IDENTIFIER { + dev_err!(dev, "could not find IFR ROM directory\n"= ); + return Err(EINVAL); + } + bar0.try_read32(Self::ROM_OFFSET + dir_offset + PCI_OP= TION_ROM_OFFSET) + .map(usize::from_safe_cast) + } + _ =3D> { + dev_err!(dev, "unsupported IFR header version {}\n", f= ixed1.version()); + Err(EINVAL) + } + } + } else { + Ok(0) + } + } + fn new(dev: &'a device::Device, bar0: &'a Bar0) -> Result { Ok(Self { dev, bar0, data: KVVec::new(), - current_offset: vbios_rom_offset(dev, bar0)?, + current_offset: Self::rom_offset(dev, bar0)?, last_found: false, }) } @@ -186,7 +173,7 @@ fn read_more(&mut self, len: usize) -> Result { let start =3D self.data.len(); let end =3D start + len; =20 - if end > BIOS_MAX_SCAN_LEN { + if end > Self::BIOS_MAX_SCAN_LEN { dev_err!(self.dev, "Error: exceeded BIOS scan limit.\n"); return Err(EINVAL); } @@ -205,7 +192,7 @@ fn read_more(&mut self, len: usize) -> Result { // Read ROM data bytes and push directly to `data`. for addr in (start..end).step_by(core::mem::size_of::()) { // Read 32-bit word from the VBIOS ROM - let word =3D self.bar0.try_read32(ROM_OFFSET + addr)?; + let word =3D self.bar0.try_read32(Self::ROM_OFFSET + addr)?; =20 // Convert the `u32` to a 4 byte array and push each byte. word.to_ne_bytes() @@ -267,7 +254,7 @@ fn next(&mut self) -> Option { return None; } =20 - if self.current_offset >=3D BIOS_MAX_SCAN_LEN { + if self.current_offset >=3D Self::BIOS_MAX_SCAN_LEN { dev_err!(self.dev, "Error: exceeded BIOS scan limit, stopping = scan\n"); return None; } @@ -275,7 +262,7 @@ fn next(&mut self) -> Option { // Parse image headers first to get image size. let image_size =3D match self.read_bios_image_at_offset( self.current_offset, - BIOS_READ_AHEAD_SIZE, + Self::BIOS_READ_AHEAD_SIZE, "parse initial BIOS image headers", ) { Ok(image) =3D> image.image_size_bytes(), @@ -403,6 +390,9 @@ struct PcirStruct { unsafe impl FromBytes for PcirStruct {} =20 impl PcirStruct { + /// The bit in `last_image` that indicates the last image. + const LAST_IMAGE_BIT_MASK: u8 =3D 0x80; + fn new(dev: &device::Device, data: &[u8]) -> Result { let (pcir, _) =3D PcirStruct::from_bytes_copy_prefix(data).ok_or(E= INVAL)?; =20 @@ -426,7 +416,7 @@ fn new(dev: &device::Device, data: &[u8]) -> Result { =20 /// Check if this is the last image in the ROM. fn is_last(&self) -> bool { - self.last_image & LAST_IMAGE_BIT_MASK !=3D 0 + self.last_image & Self::LAST_IMAGE_BIT_MASK !=3D 0 } =20 /// Calculate image size in bytes from 512-byte blocks. @@ -492,10 +482,10 @@ struct BitToken { // SAFETY: all bit patterns are valid for `BitToken`. unsafe impl FromBytes for BitToken {} =20 -// Define the token ID for the Falcon data -const BIT_TOKEN_ID_FALCON_DATA: u8 =3D 0x70; - impl BitToken { + /// BIT token ID for Falcon data. + const ID_FALCON_DATA: u8 =3D 0x70; + /// Find a BIT token entry by BIT ID in a PciAtBiosImage fn from_id(image: &PciAtBiosImage, token_id: u8) -> Result { let header =3D &image.bit_header; @@ -591,6 +581,9 @@ struct NpdeStruct { unsafe impl FromBytes for NpdeStruct {} =20 impl NpdeStruct { + /// The bit in `last_image` that indicates the last image. + const LAST_IMAGE_BIT_MASK: u8 =3D 0x80; + fn new(dev: &device::Device, data: &[u8]) -> Option { let (npde, _) =3D NpdeStruct::from_bytes_copy_prefix(data)?; =20 @@ -614,7 +607,7 @@ fn new(dev: &device::Device, data: &[u8]) -> Option { =20 /// Check if this is the last image in the ROM. fn is_last(&self) -> bool { - self.last_image & LAST_IMAGE_BIT_MASK !=3D 0 + self.last_image & Self::LAST_IMAGE_BIT_MASK !=3D 0 } =20 /// Calculate image size in bytes from 512-byte blocks. @@ -786,7 +779,7 @@ fn get_bit_token(&self, token_id: u8) -> Result { /// between them, so subtract the PCI-AT image size here to convert it= to a FWSEC-relative /// offset. fn falcon_data_offset(&self, dev: &device::Device) -> Result { - let token =3D self.get_bit_token(BIT_TOKEN_ID_FALCON_DATA)?; + let token =3D self.get_bit_token(BitToken::ID_FALCON_DATA)?; let offset =3D usize::from(token.data_offset); =20 // Read the 4-byte falcon data pointer at the offset specified in = the token. @@ -833,6 +826,17 @@ struct PmuLookupTableEntry { // SAFETY: all bit patterns are valid for `PmuLookupTableEntry`. unsafe impl FromBytes for PmuLookupTableEntry {} =20 +impl PmuLookupTableEntry { + /// PMU lookup table application ID for firmware security license ucod= e. + #[expect(dead_code)] + const APPID_FIRMWARE_SEC_LIC: u8 =3D 0x05; + /// PMU lookup table application ID for debug FWSEC ucode. + #[expect(dead_code)] + const APPID_FWSEC_DBG: u8 =3D 0x45; + /// PMU lookup table application ID for production FWSEC ucode. + const APPID_FWSEC_PROD: u8 =3D 0x85; +} + #[repr(C)] struct PmuLookupTableHeader { version: u8, @@ -900,7 +904,7 @@ fn new( let pmu_lookup_table =3D PmuLookupTable::new(dev, pmu_lookup_data)= ?; =20 let entry =3D pmu_lookup_table - .find_entry_by_type(FALCON_UCODE_ENTRY_APPID_FWSEC_PROD) + .find_entry_by_type(PmuLookupTableEntry::APPID_FWSEC_PROD) .inspect_err(|e| { dev_err!(dev, "PmuLookupTableEntry not found, error: {:?}\= n", e); })?; --=20 2.54.0 From nobody Mon Jun 8 23:56:06 2026 Received: from PH0PR06CU001.outbound.protection.outlook.com (mail-westus3azon11011024.outbound.protection.outlook.com [40.107.208.24]) (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 E0E7D389DFF; Mon, 25 May 2026 13:59:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.208.24 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717564; cv=fail; b=hxFf73HVLWcTxxRo0zLpWu5cx04ZC0aie1Zwci7nMcr/fA6xfUprcmZorwFU6lu5NFY9hHjxlPQ0XdrGjLeh9qQZ9Dv9M6m75DLgPtic3ryqnFXh6mnwQpif2ZtVCVJGApOu1ozk46DtOgDJ7LaGNW4w9/qtaCVQnunVaMNALhY= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779717564; c=relaxed/simple; bh=XFGmqUpbFT1tZw3lwCgCx28EMEGIE73A/bEo/Sl6h8M=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=MgmdqsDaS3j8z8+sOyvCC9WxKcscMnDrNjbD7YyZc9FWnYt86cgujATFyAWdmQOl07K+PhUyoykYiTZk5uuLeMc6PMNgxHr8P8gpMVnq5+HTBA5foEvhHKaM5224dXH8aD2m+FyysPxW7oEuJ/LR9cC7DNjDVHOooxCPQyG2o/E= 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=qo1IBVOf; arc=fail smtp.client-ip=40.107.208.24 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="qo1IBVOf" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=A/9Mjd9AVatZ3qlK3ZA2os0iTNrNCmBj9r4bAaTv5rhXCQgDo9zUkEFUrSq2LlhjMgp4LVnmPakCvbG24SS3TBLXV/mjsderIoSivu+xIgDwIVpzbnxcvOfYOJ1iZLIO6gYf7bIMFuOhONCQSszC5HwLJOLs82zeKXIdBFjDBnx6/m77HSuhK67615BZKqAODrdrzFXdw38CC7ps81wnudTbsiFI5M7Loz9bpi03ZWKpPgz8hfQUvSB3aQCtcd2ZpisPz5tIKRNS1VE3+IHGlxFrE951fHivId9eUVFJucs0zqjFbBRCnu8xG2/aQ1FpJNAVDNrQpKqXXe+u83O4BQ== 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=REUh+d88oDvWs0/ZeBNqMN14GinHMDvUgP57pNjzJWc=; b=R8+TP9MYIj9jsnMHidzgVcA8b8WLTmM1wUrRKwl+ZuxMiYgmf6hniMZQRSvxyN/WynY4j9KB5eh3lvsM1LFLMzrOP/OHHCXAHLs01CRKPnk47hYN76FSxMnx5w0rj4bKRVxfKQSRFRiq82CdMx7S+DkSFj0FiFU/97XJ4YL2KgTzk7n2qQe9wXGaV2gpu6xaxluvtjKQn/6x7dbWLSA6nr6zCuOMNI2JmKODZvUoS8aE2KnV10aKD6eGJ+sv3GrXAhBMxhDlNtoVRBeU0+5XtygHyk9/9I1+tt7sjDRDzTkovn1Vj6OdLMaS1K4HjlkIxRUNpAe7mSmpy0f1z+qESQ== 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=REUh+d88oDvWs0/ZeBNqMN14GinHMDvUgP57pNjzJWc=; b=qo1IBVOfsK+4vbRxfzp8+I3l1Ve9iCbt4L6eDlfTMaWZLzqSc5jvN3YGkQxPndg9mqe05p4E3bwU5Aciy1/OCCyownB5E1cLDwcWuleoWZPQD9hjmUdQMXm21wCyNBwGxWD+zd7X0PpWeteXDOcR7cRqc4rcv6Wu3ar3/UWqNX96WbdjP4v/+AOXk/xsCMW6tC6xTEy6xgf6gHASL/g5D2/FTmo8LXiTN+gX6bTSk3nn/51bGDG60rYaUDoj6sk01NusMXql/6mzBuPUJVESB4zdpEM/SVWdoQPm+u35O8E7evIWSI9hUeSVyMo/lTJ9u3Fvrz+bVUAm05KQA9F2yw== 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 MW5PR12MB5681.namprd12.prod.outlook.com (2603:10b6:303:19e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.48.18; Mon, 25 May 2026 13:59:20 +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.0048.019; Mon, 25 May 2026 13:59:20 +0000 From: Eliot Courtney Date: Mon, 25 May 2026 22:57:40 +0900 Subject: [PATCH v5 22/22] gpu: nova-core: vbios: remove unused rom_header field Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260525-fix-vbios-v5-22-e5e455251537@nvidia.com> References: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> In-Reply-To: <20260525-fix-vbios-v5-0-e5e455251537@nvidia.com> To: Danilo Krummrich , Alice Ryhl , Alexandre Courbot , David Airlie , Simona Vetter Cc: John Hubbard , Alistair Popple , Timur Tabi , nova-gpu@lists.linux.dev, rust-for-linux@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Eliot Courtney X-Mailer: b4 0.15.2 X-ClientProxiedBy: DU2P250CA0016.EURP250.PROD.OUTLOOK.COM (2603:10a6:10:231::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_|MW5PR12MB5681:EE_ X-MS-Office365-Filtering-Correlation-Id: fdb010c4-0798-44ed-5794-08deba65d149 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|366016|1800799024|10070799003|376014|56012099003|22082099003|18002099003|11063799006; X-Microsoft-Antispam-Message-Info: 10Oy9tHts4ath7a9zeYVo3KXTrAPMoszxkITnLv3R2XTYEtsF6DfDDjICpl636W+sULuE04HUCr7zNQx/J0340yTw6xPgjYvWN8VTS4HvFu9ji4Dcl14EmUohvGftwbgs5dTu/N31R1Sp6dKaHqHpkUHcd2t2UhnqSrD/EsN5Q8rDFk7vc9drAbx+lz8aGViijxl7U3lZjKxBDU35UGwzGeD5txtTlydXIe39dI67+VZIigTGaIFnCNtaMsqkg9Y2eJjlvwa34OGbVf4AT47tBxK2J9BJUtxhC522RsDaTCpaS7NjZ41YXax9P3eEG7HZHAvISe9WTuA8iBJ6vToAjXnbb00eQQDjje4lxjoj/unSED2WCZNfGNzf0Vi3pCEqo1je9ET2hZ1sX9VMsl9hdInPgWZnE/Y13Eb0kw4ESqhPCgmoNT+lIROclE7P88bQiyH1pIMUhRDqMDwnrIg0q8THkS0ABYdzaPyksn69cNWQba/ppwoH/lol3aJfuTABWDIZGWn+dZEo2HP8oSNQeZ9J7fDPl+Rrj5eSYQEUcHNU8Qa/kJJHNSBSLT1fIWdzuKNGnSLb0vYegV/kz87bng+WyWRUNRVHn85/iVVTcAwir9nUtWatqAZQWoskxKHDWw6sUMvXkIyaPJRcIwH2a59bQ0QDh+z3HT2UUkBZVZv1duA504SW6ACyB0qznzr 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)(366016)(1800799024)(10070799003)(376014)(56012099003)(22082099003)(18002099003)(11063799006);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dDV2OC9rV2VNMzJxNFArNGxnM1dRWW1VRkh1VUlsWmQ1eW5lZDNrU3lpL2Mv?= =?utf-8?B?a2RmN2lqQjF5QTg5a3cxZXhPOGd6bTk5UWNMMGFUSjBqT1JCeC8vT3pJQkhh?= =?utf-8?B?RncrQVhmWm5uY2FYNDBFcS9HRU1zOHRDcXNSU2REb0p4L1hyQmh5dmtialdP?= =?utf-8?B?aWVVUU15YWo0eE41OUJHbnNCNDFrZjMzdi9id3BlRStFRUozamZIQkhHb1Bu?= =?utf-8?B?MVhCMU5GYW1QTXdVMWs5THBCdFF3TWtncGpIN2RKeHYzUlVLT0tmbmNtMjE1?= =?utf-8?B?QkdtUDkzQTFvZkV2dTZWYWNIOEgycUFtMmN6UE1xL3FjN08wcDFRZTVMQSs1?= =?utf-8?B?cVc4OW1hUHZwWjU0aVZSOGxVMXpZZ0NwMk5Pa1B4TkUyMm5sV1RyTThlc3da?= =?utf-8?B?bnBja09IOVZNVXhHZHh3bnR1bXZ3WS9JZmxiNTA3eTdpcE9MTlhFT04zQnZL?= =?utf-8?B?bHhlenVhbm0xcW1BZG9STExsNWlBVHZxTzA4dlN0REtwa0hDV1JKZDF3enJl?= =?utf-8?B?REd2MG5WMzJSQlJ3SmJNaytxRTIxQWR4ZlRSbzVTU29uSmxyVVhKbktWbHBj?= =?utf-8?B?bTJFK0hENWZMUWJYdkE5RWhhR1hrOUVrNTBPMU1VRmlxWkZZd1hlVkJzM1Bo?= =?utf-8?B?OUZJZzNoM0d0KzVCZGtNQlpqcUdRK2xmNU1MN3RXRWVKS0gzVHJOcWd1ZWhT?= =?utf-8?B?R2NuQXp0SThJV3N3S2lOTWtUdGdBOTVaSDQ4Z2N0SGU1ZUYvM3RXVWFGdEdI?= =?utf-8?B?MWFEZXUvUHMxM0JPSUJPcW1lMUVUcmJuYnd4Y3N5ODRxU2xHU0RpMnRZeXA4?= =?utf-8?B?eG1xMXh3N04wekFCS1VYZ204cmxnSVdHNEw3WWlRdXNrY1ZaTTJGQnBFRXBW?= =?utf-8?B?OTRZZ3ozSWtXaEMwa2ExanlmNW9VbTlCZ0ZQQmNrVUpQUTRrbnBZKzNmOUMx?= =?utf-8?B?ZHh2cFN4U2p2RUdySXZVUXA1K2RIU3hidnBxanBNYlFZMytCL1hYUnJ4Lzdi?= =?utf-8?B?R1ViMHRzdzhyRlpjdkRwQ2QvOXc3Z1BiQkxLd2VjM1RTZExuZEtNVEt1Mnc2?= =?utf-8?B?M29KSUg3WXVFQXl3Y1FUVll2N21xclUrdVJaZjVlaXhOL1hPU1IyTlBjUGtS?= =?utf-8?B?Qkgra2NWcVUzUWFqRzhuSDE2VXk1Q3gxOVlvQ2NEN1E0YWo1Lzl2MitZdHZ1?= =?utf-8?B?TDh2SXBvcWNjWGdaVGRBTWtDQU9nbGVkeEVxdllGYXVFYVc1aGRtZmZsVUhE?= =?utf-8?B?QVJMbTlNVVAxT3FnUytQYkVPQWEyT3k5RUpwVE1MTEZMK09LcWFXSzVEWUh3?= =?utf-8?B?TWVLVi9KbFRlNXVNdWJPTGtKZ1YxZFZabHpHbDdXWlBGdHErWGtZckRQWWN4?= =?utf-8?B?R1BQOSs3TE1HYjBuakZVSzdrMzBwcWxWdUt5YWZ1emJsQXRaR1k4bmMralN4?= =?utf-8?B?RzVSZTZZMkZNa3BDa05qTnhIUFNRT2pnSzNnNTNCWXhJVktrYmp1K0QrR0N2?= =?utf-8?B?Y0wvS1FJc3pBck10V003cDYrc2VUZUlRQ2dpSytDcGZBV0NyaUpnczIwQXhw?= =?utf-8?B?dWZZSUNGdFNDdkp0bmNiUjE0elo3UnRiMGZ3VWNnUFFwRGhUK2lSdGJmRHZk?= =?utf-8?B?UkswVFgrYTJoL0FHRGFOK3hSWVZiY294cGYzL1dRZVJTNWowRnJmRk8rSmxU?= =?utf-8?B?a2R4Y0lVRVBRc1dPdW41R0kwbzhMRTRjS1BQR2lxc05XT2FDVVlLS1NMR3NN?= =?utf-8?B?L000NVAxWDlsYVRvc0dSSXBEWTBmMnhsZmVwb2JMRXpWajZ6bzQzS3FhZGFo?= =?utf-8?B?Z0pVRWRxZ3lsejlaYjFscEV2MEJkUjBCOWh4b3RySHVnSFo2YnFVYkhSSFp1?= =?utf-8?B?N2U5QkNnQ2xuUXFIVzVlbndMeERKM1MybHB1YnhkMHpHbXJDU0JKaFIrNm9W?= =?utf-8?B?djdERVRISkxIc1VBNjlRV3FicThmR3JOSlovWkVFOEI2eThmam9UbWxoNGlz?= =?utf-8?B?ZUdZMHYvQkdDTm10Qkcxc3QyR3F1VklRMW80d0JIcE1JaFBhS1BCWnpZM1Rx?= =?utf-8?B?RDhzWHdwa0dVN05xZXVWNmFhM0VSYVFyZGd5ZWhQclp0TFU3Vld2bFpNYTBE?= =?utf-8?B?L20wb0hRdDd4c29SZkcvVXdndW9HOVJ2RGdnM0xjRFZNdHF2YWZTYW4yUFVp?= =?utf-8?B?QVQ1aWtOM1NvQmdhdklEL2lUZXZZdWdLc3BIMjIySlpNZHJVOGRtbmpWWnJM?= =?utf-8?B?Vk1zeStCSGRtaWt0TmtyODBrczBqN0VCUGRUNkhzaWF3YzhVdVZHU1FoK2Uz?= =?utf-8?B?WDVxYU9TR2ZBYmZpMC93ZER3N2Y1bWl4U3RFNEhTWEVveHZTVWRTZVE5MkJO?= =?utf-8?Q?nuE1pMND88bQ8kk34+Gw0H32H7jhGFVrASxQzpF3g/tbR?= X-MS-Exchange-AntiSpam-MessageData-1: c9m5PRKI5Rss1w== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: fdb010c4-0798-44ed-5794-08deba65d149 X-MS-Exchange-CrossTenant-AuthSource: BL0PR12MB2353.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2026 13:59:19.9901 (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: lQ7pG5uHsCuoBKllq5kffLT7/XD6m4nn6aQl6UAiZR4MvYpj4YOSm2N5ObH3PQfA1TQxPNfsFnsmveqiJzhqXw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW5PR12MB5681 This is only used during construction, so we can remove it. Signed-off-by: Eliot Courtney Tested-by: Alexandre Courbot --- drivers/gpu/nova-core/vbios.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index b14f9ebdc68f..c0bc1008ed75 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -663,9 +663,6 @@ pub(crate) struct FwSecBiosImage { /// /// A BiosImage struct is embedded into all image types and implements com= mon operations. struct BiosImage { - /// PCI ROM Expansion Header - #[expect(dead_code)] - rom_header: PciRomHeader, /// PCI Data Structure pcir: PcirStruct, /// NVIDIA PCI Data Extension (optional) @@ -741,7 +738,6 @@ fn new(dev: &device::Device, data: &[u8]) -> Result { data_copy.extend_from_slice(data, GFP_KERNEL)?; =20 Ok(BiosImage { - rom_header, pcir, npde, data: data_copy, --=20 2.54.0