From nobody Mon Feb 9 07:22:46 2026 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2065.outbound.protection.outlook.com [40.107.223.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 6D77E1E5204; Sun, 20 Apr 2025 12:20:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.65 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151602; cv=fail; b=kXseSuNj11UztCrcVQeXQY1oiROKaq2xbF/7PLCDkUac8nGRVQtAevQjc7xIkZZ+EUadQL4uQNKbNZip18ScJjrDce6rdQy4NIi8MIvQ+Ai2kyDgPdJjRctSXrCr+zB2WClKR9ciOp6D0AwZkr83ovA0UUSWdSFtoGNaV6SLH8w= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151602; c=relaxed/simple; bh=wC3khio+fKlcgea4J5nJ5cAH4awP2vTY2zEwVUKxMpE=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=tX+j+dG5ZlR6hP27ggesG/5+tpZbE5s8Enw4fICFlPHV9qGfR1N9GMnIjoXCAYlKTnCkk9t/ATlLE2AQBQtUGpw+cEIxW24Xqln7+LQ1GO7ZLUcNds0Ryx95V/aBdOkYe/AU8rQ1kTpkOaqVYr++N/qlbVOg2EkZey8TzsUUoRs= 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=DtoTKwRn; arc=fail smtp.client-ip=40.107.223.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="DtoTKwRn" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bAKX4H44pCfn1yPQG1xop2EUgw1yN63kc50qak9uK0z3jSZGenXBuPkbbfhjtTFUL2t/fob5X8LSYVLpfj7vbSvE1nd68POmBacXXUCVMWyKBaLThuTQiUNTDFMH1GHlNU6B+vLKwMjk8w1E1wtMXiRorzSLQHGTrK9A4ORWss0aamCunCqyszrnWHTk4BlaPyfYOjtKoVhf/dA4Rk8R9qT+ZFD8XnynOXj70NbY6KzdvEGs7pN7kPpMLHazP1WwPPJtV/t1+6p7YE4lLyoN1U7U2hpAw0Gu7OxzTz6DA5/KWj9iPoDEMrVNfCBn/r+vLdeVKzZv8I+HP50+PSnp+g== 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=irB1IbCqc/a3OfWnRZE8DG4+g7cDjGxVbBI+6xfczB0=; b=ioO7lS6bUWUyheWF5RsJ90wPZV/5yDV91JDvY68u0bf8PfdzGgwjvW4hi1pnKNwekRS1qfg/nYi2DpSZrFHD0Md92Jb6BdE2TeLvw/Ax9gKipRx3NsrUo/nZ/pcKCfhLsG5yNIuQgYsqLffUHvBDngqWKLI5bMnWF5ahz5Unq8L8nMWYOJT0uRxhFlGfku6zVWWaxtB+Ixk7Dq7IfBpCKz3hby6jDUptCqsCWwh5eUESeTXGCFihbC3AcpdzCq1k4yCQQAJOoUJ+vYyDwLrY1fpI92CumgZ478SapnNDC2JMZRKPtuLj2brpVAUsDknqLXWJ7j0Q6GOdiXPZNEB0OQ== 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=irB1IbCqc/a3OfWnRZE8DG4+g7cDjGxVbBI+6xfczB0=; b=DtoTKwRnvxw5wKA5IamtjaB6CuhaPxNbR595oe26pvvMMSA9cNjkI24QM76E/DJVFNl/1UT4IBzjc+UbdRs/O6ewEYHg/sdNbKkWdgpQ6zJ2wvngFTUDQ0ARTxeEaAaRtPD8S8YBuiEQbm1q4BE1EPVyfVy5tNCsWIMJDUxTc210LBulmMP6vvWTZrUCdl12E/02fYRTxC4eye7SjsOCW8/DXMYEzPuvLU8nf1prSL1pWrc50XqWPJ8H2w+CvOms026bOsrsxgeteybQA+KOhD9VGJiJQ9zMiR6rojILSQHWUc2Txby3O0a3P2TL92/iHJeIYLJW9qrAymfwWcU9xw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr 2025 12:19:54 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99%4]) with mapi id 15.20.8655.025; Sun, 20 Apr 2025 12:19:54 +0000 From: Alexandre Courbot Date: Sun, 20 Apr 2025 21:19:33 +0900 Subject: [PATCH 01/16] rust: add useful ops for u64 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-nova-frts-v1-1-ecd1cca23963@nvidia.com> References: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> In-Reply-To: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: John Hubbard , Ben Skeggs , Joel Fernandes , Timur Tabi , Alistair Popple , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alexandre Courbot , =?utf-8?q?Sergio_Gonz=C3=A1lez_Collado?= X-Mailer: b4 0.14.2 X-ClientProxiedBy: OS7PR01CA0155.jpnprd01.prod.outlook.com (2603:1096:604:24d::8) To CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) 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: CH2PR12MB3990:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: a34ebd69-17b5-4ce3-c7b8-08dd8005a853 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|10070799003|1800799024|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?ZjlZVC84QnNaS3RFMzRNenlCUnJxbzU4bDVreHBtNUNMV1Q1dWZpdzZpR201?= =?utf-8?B?d3N3cy9USzdPTG9uMEY3ZkIyemRFTklobTYrZ2dXQ2VlOGtUbGlOVTdDZVFH?= =?utf-8?B?c1FoOFdxc3J2N1NwbDBZYlpjNXltZGsxb3hjZEdjZUlzYkllaXEzZmhKcDNl?= =?utf-8?B?QUFPbGN6Snh0a1FlMytGRXp2MGp6aHk1aksyWkdubXZiVFIzem1oNFZQT0dw?= =?utf-8?B?amY4ZjNsWjlnOEdqVG1VRG5VOXB1WWRGOW9DN1RMSUY2WkZTOWkxQ25yK0sx?= =?utf-8?B?bmd3amJpSUJpa2JHOEhBQnI1RmZWQmdZSVNiM2tlN3YzOTEzakNtMS9VOW1D?= =?utf-8?B?K1pwYjhtMjFEZDFENmZYSTZlcktLREs2M1lxWExrb0U0dDVsL1dGNExWdjlH?= =?utf-8?B?T1JYM2dzNEJGUCtIL2k0V2xabWtPKzhyNUdrOEttQnFRNDRXNjBrZEpiT04z?= =?utf-8?B?aE4rNWZORFQwMGJFbnFBTFdVTUVPbmVGUzlKWitoMEYvaDFnRGFqYzEzWkM4?= =?utf-8?B?ZnF1Y1lqWGVpWUdieW53Y3F3cXpSSnVLSVJhdUNMOVRxaENCQTVUcnY2b3Rx?= =?utf-8?B?T3N0MzlGV3FPTjJCWWcrd3U0YW5IRm1vZ1ZIajFtZ2IrU1pUOC9YOEUxa01t?= =?utf-8?B?cDFoSmVqWVVNbXBPc25nV0tKS1pqR0lOTXc3RzA3aTdjZk1QbFoxeGtnT0RD?= =?utf-8?B?bW9lU1FSM2ZYWTNCV1Y4MVdTRExUSXFRdjMxRDIxa0JRdE5md0VHc1NDa0dD?= =?utf-8?B?dW9lRW1JNlpTa0IvUTY2djhQSFB6a09mQis1aXJzd1FFK1E1RnNaTXVDNmNo?= =?utf-8?B?R2NVRy96eGc3VnJ5eEZRbU5LaER5MVhDd0tUTTY4TG5qZjhaOW5GNXRvY2ZM?= =?utf-8?B?UndBeDNvQ2xPb1NYR2h2SFk1MGltWHgrN3RuM0pqdGRZK1hMNEZ0SFF4cU9n?= =?utf-8?B?eE53NXpUUlJTbGdmSW5kN01sT3Y2ZFBvUklpakF4bk5wVXlKMDNiYnRLbEdU?= =?utf-8?B?ZGlEV1g2Z0FyQUorcGM1dDJONXdVR2RUbHFsZkxxWUo5aEJGUkVHdzZVREsv?= =?utf-8?B?ZDVocExhNnVTbEsxNmkyUnpaRm1KbjZJTmtTWkJFTHdkbW1qZldpOS85T3RE?= =?utf-8?B?Z0U4eDd6Q2dTa0ZuN3RVWDg3dmVOQXB0RDQxT1lIQ2szN29rOU1PRW1Kd0d5?= =?utf-8?B?K0dEekhLalZId1NIbWx0Y1A4cWFudW82dzdtL0ViRXg1Wmtzb1hnRzIzR0Nn?= =?utf-8?B?VXhzQVlvb2ZMTFdkaWdOS2ZGanFxYTdyNDFWTmFBTHI1MUFMVkJsWE1ZY1Rm?= =?utf-8?B?aFY3MGV6SGhOOHlKTXlSeVBvcDh4N3RtbHBtYU90cE9wbHlqelNzckxPb2c2?= =?utf-8?B?QnFiNFJUVi9KKzlIQ1hlR2c2ZmMrajlJTmw1WktvVmZEM3U3d3pza0tpSDg1?= =?utf-8?B?SmNpWmV5ajAyOG8xdDRZK1dhMk5iQkRMdVJtbFA0TStUcWx2U1pqblJMY0t3?= =?utf-8?B?d0ZucXJQUmhBVGtybWFrRnM4UjBSQzcvaU5aSkVvU09PTXBKbGRLRXpjbWY1?= =?utf-8?B?NWdYMUFVZzVBRTZ4Y1FoazAxVXRmN0J1a0hOQWs5bXJFbFI4YTFWeVhWYVlU?= =?utf-8?B?MS9zVmlzMVhvNDhiZ2Zrcno2cEpuejRISXdFZkpUUXdxZWpHNjNnNEVVWnY1?= =?utf-8?B?LzQrempNYW9qY0xzYWUyWEswYkdXTHJhQVgzOU85Y2FmU2ZjSWxoTE5BaHRH?= =?utf-8?B?aWJwYVovV2NUdm1oZVc0aDdLWXd6aGprcVVwMTVDVmpSYm44NXQxZ2tuUUU0?= =?utf-8?B?RlNISWRvV0pvblV2a2NESVkycFF0WTlvYitlOC9JcWFxV1VNTUhBSEhkWjZY?= =?utf-8?B?c2poZi90Q0Y3ZTJzU1JtVWNVamRSNzZ6OGhiWnljY3VtM2tOOWhyTWFHaG9B?= =?utf-8?B?d1NBMGg4d1llWnk2V2RXNjB5QkpGMzI5UDM3K0pBRmhlNldhSjZyUlY2eHJ4?= =?utf-8?B?VTQ2dGxmb3RRPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB3990.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(10070799003)(1800799024)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dDBYelV5MVRndVYzYjNZU0hmd0dPWXBxcUhQbGpPUHlNK3FVdGF0d3UrL3BS?= =?utf-8?B?aDIzOVhxbU5iNnV4cjd5dkZOaGViaFk3VUZFeWNEc1B2VXk1aXdpNUtkK0E2?= =?utf-8?B?bVNtTlBGWUFGZ2F0aTdKV3o4cFZINE5mSnhjS2F6OGlaUHlJdXlSTnZKK0xj?= =?utf-8?B?UGRtUFNRQ01tTnBBKzJLbTdueTlBa1Nna2xNTE52VG5peDJGTmZhdEJoRFh5?= =?utf-8?B?R2lrZmF2UklSbUpKODN5c1dnM0tMRjRuWXpoQlBmNnF6ZHl0VGNPN2VhNGU0?= =?utf-8?B?YzdaZmlFOHpiMXRsK3NtN2pKZTJSdnI2Wm9USitsekZCNFExUzkxR3V1dDY0?= =?utf-8?B?bUUwem14aTgrbHNVeC9SbmZVcnBzZnBMMGNjekQvUFZzMWpsb3pVMmNCOWg2?= =?utf-8?B?OUVlalQ4SmUyS2FmWU1rTG9KczRCd3pyNVc3SklPNDN3VGZQK1ZhMExZNnpy?= =?utf-8?B?MHcxSGk0ZU9tdHowRzZuUGJ0U1NKKzlWcXdDWHJCRzFrdnA3aTBvblRjTFZN?= =?utf-8?B?cDZJT1F6N0JJWkdOL3VHN1lLQktHZDFzS1RwOVZsUlNLQWxPWnJzVUdLUGlv?= =?utf-8?B?WlJVT2lQVENJU240YTRwSUFjZmpabFRrekg4Uk1tOHRDbzlKc24zaUFocVU5?= =?utf-8?B?U1B3UlEyNkR0RmhJRHlSYnQrQkVzaTJMZHZBWUxkVlYzd1Z0dUMwcFhDclIx?= =?utf-8?B?L0Vvcmh6WVorSGJ3UUNmNFJKcjFiU014MVVsdTlDMG93THhYTDIzSkI4dm9D?= =?utf-8?B?R3U3d2xOMEFUOGFnYndEbnkvNkszTG1DamtTUm9Xc0tOZ0pZV1kxZjlaWmdM?= =?utf-8?B?ZFpHLzlBTk9TZE1kdWZhd0ZvUkRDNGFkWU9OWm1YeTJVNU5TK1IzcFVsaVY2?= =?utf-8?B?c0ZVMHFwYVlkbHBJdEIwY2R6OWI5MnF4QjZScnU2c2MxUWRZeWZYMHJIWmVE?= =?utf-8?B?dk9SRGQvQnEyclVTRFR0SXY3VnlrUzhVYzZPTmdFeGY2QW5XUzh2aG9DVnk4?= =?utf-8?B?NTZzRC9TTWo3Z2VoZ1Y5bjdDZmNGalI0QzZBZmQxTzNrVTM1U0ZKT1M5RFVt?= =?utf-8?B?QTdYNlFOQmJ2NFlnYzlKdnhibUhpeW5rMExKSWVTRDVTYnhwOTl6MUt0NjR6?= =?utf-8?B?ZzkzQ0U3eVU0SWxraitFVGNTNm0xdUdYbkFhMlNlVnlhVXlGbEM4NWZSRUJM?= =?utf-8?B?OTAxSEhiNHBPSGQ1a0FxdlBoL25nWXdMUEpLdnVEUUZvRlNJSkY2T3VxSnZP?= =?utf-8?B?ZmFzcG5WaUpxNDNqTVJGWTltM0FQZ1NsMW9jMUxLQVF3ZmpFL2JoQWprZXVJ?= =?utf-8?B?WURCL0VtMmlVdGt2SDY2QlZJSUVLaitiMEN4WmVyNjFPZkREUWx5NXl6QXRR?= =?utf-8?B?MVJ1NnAvYkw2TkNsbFNLTG0wbUIwYm5VZnRJSzdLLzJYN2txYk54YWw4NENS?= =?utf-8?B?bXRDMlNwMUhwcFF2Um96eXBJeHdFWXc0Wlc4V21ZOE9UNTlTK1FaN01MQTN2?= =?utf-8?B?QUxLZ1hsd2NiYUpYdW0zcEpKRGZKZVJIRUsxcVBINEhyU1ZVZ1ZZejhpVHlk?= =?utf-8?B?YkM5U0VURnBTUStzenB2ZWRvS2srVDRHcDhwTGdDQmVGT2lIK0FVT1padmtV?= =?utf-8?B?Lys2MDNaejJOd2pjMzIvM1FVTGFyQUxjWUppeXgrWFRwVDI1dk5BR1VZVVJh?= =?utf-8?B?bTNIZ1IwQStZeHpXcE1CR3VNMlNrMUc1M25JNmlQeEtzZzVSWEZzZEE4UjVD?= =?utf-8?B?MHNFbFdjRlk2NjJML0hVTkRYOC9tekI2Vmo5SGhkUkhzQmxQcGFhUnUza1dL?= =?utf-8?B?cE4wRHVoVWRQbjZwZi9RYmprQ2w1dU1Za1JaMTNvcXRROUVDRFpyYkFqSkVy?= =?utf-8?B?clE0V0VhMEdiVFYrN2VNVVZhSGpHeVJ5SGdaYXlaclB3UUlQR2RuZExiQW1Z?= =?utf-8?B?NnV5eUVDTWZiTHhsZVNhSnlYRHV6ZmdGb0hOdnNKSXpkdTBicGRKTE5iQmVV?= =?utf-8?B?K3lTQUMwV1dxNzl4a1VVV1lYQ3ZsejdCNkpkTkUvQldlcGJ2SEpSOVo0UkFk?= =?utf-8?B?SXBIMjhLSFZCdGhvTk96cU1ud1d5d2R1cVVuVWlLeVZwZURmY3V2azBlbldC?= =?utf-8?B?ZTQ0ZWUxR1hBaXlBTU4yaGE0RUxFMlA1V093bFMrU25XMGZVcG9tSU5Fcngx?= =?utf-8?Q?1BQv3he6g+K2QOw4Q50/gbo/WPChtMdkaKRaZ/FfHaWv?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: a34ebd69-17b5-4ce3-c7b8-08dd8005a853 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 12:19:54.4982 (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: 3zrdBTV00ifJ1NymMT3RTLB0fwJsQAsp2G8+yYSKMdv8Hw0osBxOAWVWBZlW9HZ8qIeDDwOqzEXH0HE9lCaKxw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 It is common to build a u64 from its high and low parts obtained from two 32-bit registers. Conversely, it is also common to split a u64 into two u32s to write them into registers. Add an extension trait for u64 that implement these methods in a new `num` module. It is expected that this trait will be extended with other useful operations, and similar extension traits implemented for other types. Reviewed-by: Sergio Gonz=C3=A1lez Collado Signed-off-by: Alexandre Courbot --- rust/kernel/lib.rs | 1 + rust/kernel/num.rs | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++= ++ 2 files changed, 53 insertions(+) diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs index 55a8dfeece0b27f188456a9eaebd1045c4cafbcb..e30d2c075a3607f6ea40c901b32= 81e8798e81260 100644 --- a/rust/kernel/lib.rs +++ b/rust/kernel/lib.rs @@ -65,6 +65,7 @@ pub mod miscdevice; #[cfg(CONFIG_NET)] pub mod net; +pub mod num; pub mod of; pub mod page; #[cfg(CONFIG_PCI)] diff --git a/rust/kernel/num.rs b/rust/kernel/num.rs new file mode 100644 index 0000000000000000000000000000000000000000..9b93db6528eef131fb74c1289f1= e152cc2a13168 --- /dev/null +++ b/rust/kernel/num.rs @@ -0,0 +1,52 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! Numerical and binary utilities for primitive types. + +/// Useful operations for `u64`. +pub trait U64Ext { + /// Build a `u64` by combining its `high` and `low` parts. + /// + /// ``` + /// use kernel::num::U64Ext; + /// assert_eq!(u64::from_u32s(0x01234567, 0x89abcdef), 0x01234567_89ab= cdef); + /// ``` + fn from_u32s(high: u32, low: u32) -> Self; + + /// Returns the upper 32 bits of `self`. + fn upper_32_bits(self) -> u32; + + /// Returns the lower 32 bits of `self`. + fn lower_32_bits(self) -> u32; +} + +impl U64Ext for u64 { + fn from_u32s(high: u32, low: u32) -> Self { + ((high as u64) << u32::BITS) | low as u64 + } + + fn upper_32_bits(self) -> u32 { + (self >> u32::BITS) as u32 + } + + fn lower_32_bits(self) -> u32 { + self as u32 + } +} + +/// Same as [`U64Ext::upper_32_bits`], but defined outside of the trait so= it can be used in a +/// `const` context. +pub const fn upper_32_bits(v: u64) -> u32 { + (v >> u32::BITS) as u32 +} + +/// Same as [`U64Ext::lower_32_bits`], but defined outside of the trait so= it can be used in a +/// `const` context. +pub const fn lower_32_bits(v: u64) -> u32 { + v as u32 +} + +/// Same as [`U64Ext::from_u32s`], but defined outside of the trait so it = can be used in a `const` +/// context. +pub const fn u64_from_u32s(high: u32, low: u32) -> u64 { + ((high as u64) << u32::BITS) | low as u64 +} --=20 2.49.0 From nobody Mon Feb 9 07:22:46 2026 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2065.outbound.protection.outlook.com [40.107.223.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 5A2F51E883E; Sun, 20 Apr 2025 12:20:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.65 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151603; cv=fail; b=DUeMCo08/ZFQsUpfqAht12Qj7uqgKPyKOTQeOht7f/YRWLGk63L3a2QQJ+9Ew/PZVQJJR3JAFxuo0f6O5lbBBhIXtNNjdpQGqZoMRCq9hZ527D3s/OJDngKaKjRdOsnF08E+c87xotG978u4+199kJcqrld4IP4R7VapEnu2+yg= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151603; c=relaxed/simple; bh=WO2xZodqjf+haDzrgvbgqkJy08dzcjaGkllzyeR9brw=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=IpU6CxrzkNxOFAO5HgQajWSNwLkzi+eM5JqHrpoGuMCyehHAptPzP6nNncSBTOe8Pn6Po/bQBqWFz+7dycvGkLiYBbOQatRycwnaEpcKjkJxun+8x5WdLPAPSQEahaBW4wjU4OYsxywwfacMHfkx9S0yO/CwLHQ/ZXSrI6Vg6gY= 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=efG4L1bJ; arc=fail smtp.client-ip=40.107.223.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="efG4L1bJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=QicDutrt6MZRyz5OvXjE/fJdBXfuRf0W10aBCNg1tL9Fx8va+da5bTC0qmBxHaOxkzIPJutahaJnQvlEv5UAE1Tm6n6O0VvocXmIAD6ot2jbflCDB1URpUuwXSIXEPWT9PLIHBNrcQoNO5SAufwQUI2nY7968TSM4BHYnzjsYotRTTIInzu4hhrBPuto+WN32JrECEYMkdSy8xykT5cPNY0T46y+HlaQghicRQIub+DCK6OP7Qx72IWNtkZtQte3BtVo2kUwJ5/a4U188LCNvnAO9ELJX8sRdtWJES2zEkNANo9w8Je2ULEtxi2qa+W3sY2f06ARF4ab5tQ7Bi4Emw== 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=UNdIUZOGUBA8bqX743RV4RAhbdDpl/1y5DCmOIqKFOE=; b=ZJ0V3Tey0JSP6O41Scy/qCO7zCvE5LECNmCVuDJ777ZSgPVXlQABa4aTzYpyEQc1GuIMtRQVY5etN6W1TLOVLckBM0e0DMcu6FZgjJCpDV8rfFB1LPzCIFolpJ/1tpw/ah82lS1kQA9y/29W/FhkMxeDp2+1o8CTJLi/sO5cMXbkic+mm+/b2zhlOvPZ7k13bKF9PdN+e35sWoyzsL7eW1OO9qHszPfOyz5dCw+fkKZ7ZFA8X33DzoZt4jRLI2mZXzDR1c2kTyGJkrPSqdKQm6HbZ5wWu81prfR7LKdV2YAYydTV4pc0sRgOl9/eGoMbwqZ/9itHSJ7I16VRqoa8TA== 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=UNdIUZOGUBA8bqX743RV4RAhbdDpl/1y5DCmOIqKFOE=; b=efG4L1bJGJRkuEnT/VnbcNPoyjLKr6URE8wBHu7RpA3i8dfVjTkMxcxOT7AVBZV9Owe6ZKZ/PVI+2Iw+xosdvexNh/yUThrzSz1OycD86Xift1TRRmJC61GeCNFO+0fiN6XwQLarILuDz7Cbh9GByWqZ0BlnjjSFGYqy5JrKyl4oS6wg8MdV1u9xcD90exTpOjUo9YD6y05XUYlXvSXXZ3B5VAizMuy4V+kmqDZWIYj9bulCDOxA5mNFV9IKZsGTZ4Ud2NAjlYoF+QN1DY+hHD3luk4VqxKxohGjqOCUOSei9hZX2tai1wcNFsOLNI7B1Af0AMPwIA7MUm0+tOCmIg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr 2025 12:19:58 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99%4]) with mapi id 15.20.8655.025; Sun, 20 Apr 2025 12:19:57 +0000 From: Alexandre Courbot Date: Sun, 20 Apr 2025 21:19:34 +0900 Subject: [PATCH 02/16] rust: make ETIMEDOUT error available Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-nova-frts-v1-2-ecd1cca23963@nvidia.com> References: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> In-Reply-To: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: John Hubbard , Ben Skeggs , Joel Fernandes , Timur Tabi , Alistair Popple , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alexandre Courbot X-Mailer: b4 0.14.2 X-ClientProxiedBy: TYAPR01CA0222.jpnprd01.prod.outlook.com (2603:1096:404:11e::18) To CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) 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: CH2PR12MB3990:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: 2fa2b107-2d09-4ea1-e46b-08dd8005aa36 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|10070799003|1800799024|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?LytMajFmRGxWNXJ3UG1TcWZ1OUpKUUFMQWJva2dNRUpPcU5Gdmw1L0ZZMEw2?= =?utf-8?B?amx1QUJqdXh5VzlJdytDRmhTRHVjbVpwanN5NVZhQ3MyaUtkMFlHcVpGdVNE?= =?utf-8?B?Q01VR092MEhsV0szRzc1UUVtZzFHNEhnWEQwT0hTTWk1WUE0Q3VPUlhGamJy?= =?utf-8?B?Nmx1TU1nWlV0YWRUZHlGNzNuYmhkNVFhVHQ3dVlqbnhYNGd4RHBmUGZtdTBF?= =?utf-8?B?RUlqckpwWXNnRmpNeWlDWGpBRVc3RG5wcEc5c1U3a2U4cVV6TXh2b3k4dGg1?= =?utf-8?B?VmNpb0hLUHBObytMak1UZWtMZ3VtNzlQazFKL3A1dTk1ZktMOHNDc3kwWVFV?= =?utf-8?B?Q1VsUnE3ODU5djZUcDBDN2JNSVdCYU81UjluSXhHanhDM0N4bDF5cyt1MlR6?= =?utf-8?B?cy8wY3RXcDBMdDRZN2d6eVBPL3FvM3I0czhPc3VEekV0VXd1SnVZWHZXZ1ZD?= =?utf-8?B?K2c4RHVYUVZNUGwySnBGOUIwYlAvNzEyUHZzcVJWUGJwOEhrNENMVGt5SVlS?= =?utf-8?B?V0VWM3crb1V6ZVlwZWYyaXByZ2IyZ3lrVHZxTFFVVkhnZnUrWVR5VDdqeTk1?= =?utf-8?B?Q3lQbjkwUjg1eG9CalYvVXBNMnlRdzlBK3VUUkZaVXNCSGVQMGUvSmNtNU15?= =?utf-8?B?TlZDa1NnV09mR0JOeEZBNFI5OWdjc3gxUmVmSi9KNkIrdVMxa2M4WDhoYkw4?= =?utf-8?B?RU5uWXRabGpYT0pMNnpKMVRjM3FtTVZnQzZBMjlsSmdjS0YzTDNjeExRWEhG?= =?utf-8?B?VnNFck8rV0h3Z016QjZReUNpWi9oeVRPMTlWV2tCN2tkMGV1VmZpdUZHRy8z?= =?utf-8?B?Z1hiUTF0NDhzLy96SHhzMUxrNFdXWDdQOWQzb0FqSXlreXlyaldhTUh5R0xv?= =?utf-8?B?dy9iMTYxc1dBNkdXRUlreUQvQUh6OHlqWnNBU1dWTlRqVEFCWjFveHl6VktT?= =?utf-8?B?V0NRendwZ3JnMVh6TlR2Y3l4T2RJVTRXeTAwbjJiV2pYT1pkbTkwd2k0ckpC?= =?utf-8?B?N25SOWlPbWhhTkRDWDE3TnFwbWtEYUJVQ2JNdDkwS0EvWVdEMm5KZjZ6V2FN?= =?utf-8?B?dS9TQ0R4MFQ0M1FVQzNTb3l1aW9vQ3JmMDBCR2xWQXMwTVRWdE1mRE01T0I1?= =?utf-8?B?OUZFNWZXaXlVdC9QMW1LdTZkN1BxMWM4MFk4Y0xIK2lVUERMQlN6Ri9jRkpT?= =?utf-8?B?dWJCWWxyZXRXQjRxdDVvRUppRlZPZHRjcDM2TXNCbFF6aE1aZzBtRjVKcDZv?= =?utf-8?B?eUVmQW96cWRRc3p2SkxFN2tsdW82Sm9oak9HNDgvZG84S0t1Nlo0Nkluamk5?= =?utf-8?B?TWJRcHlnMTBVZE5DMVZMME9WZUNtWVdWbTJUZFJ0am50bXBuL0RIZ1hmaEpU?= =?utf-8?B?QU5jR2ROUGY2cSt4SXV1c2tlOGpXd3ozYlJna3F5aDlacjdyQnZKRXR4OE10?= =?utf-8?B?dG5aUDFMcGhJenArSTU5WWxObUhPckdsTUhhS3U2UmNzdkRxam4zTDdiTWxT?= =?utf-8?B?OWNkRVlMVFpzcG5RSElPdVZxeWdjOUQyQitMOHkzQ0NuOXd6aHhvcnRmMU1X?= =?utf-8?B?b1M3U1lvZWtvQUZKV2duOUwxRlNIUnFIMXB0UyswRzczYloyNWlqb2x0NXBs?= =?utf-8?B?bi8vc2RRMFpXN1JKV1NoaG9MY0VUVE52YVk1dG9TZnJKTFdXYWZOUTV1YlBS?= =?utf-8?B?ejQycTNMT0hmbEdjVG5nenRNRkJTclN4QUFGREhoeG8yMnIwYytXZXJCMlE5?= =?utf-8?B?S0VFczVPRFRmWHl3TlhSU1NzOTQvQmFNMVZpN0NKaVl2NDlHYXF2QWZSOWRU?= =?utf-8?B?ZXZ1M2ZuVGFyNFJUbCtPaFJMZVMzZU9QOTluZUs0Sm43R2Rwd2RxbVl4akdL?= =?utf-8?B?YnBTcmZNb1FPQStHMlFJM3FreHJwQVhmc1FXR3lyVmNJdTRYUGxwRzBZWDha?= =?utf-8?B?Vlcxdzh5U1g1aW45WDJqc3lUQ0VwL3JMMGxjM3dqTmZVdUhNOWo3KzlBemhX?= =?utf-8?B?Mi9TT2h4UXZBPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB3990.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(10070799003)(1800799024)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TEtHMGFiTDBXOE96SkpiY0l5c3lid0l3WGw2U2svcGVseUdaV3dEcmhtY1Fn?= =?utf-8?B?STlITVAwUkQyMnV2cUtHYXBtNFViZUg1TnR1V3AxRjVsaUhQQUdyZ0p0MHk3?= =?utf-8?B?bmt1SFJ6QmZibE94OTJYSTVuaXFuM29qcjZicU9pOTR6R1BxK0xzd3dISFZw?= =?utf-8?B?aTZnbEpNNnJJd0ZDYklDKzA3dlA1Vkl2eEZiTU1vKzFRU3dGNXJaVUp4YTVX?= =?utf-8?B?NXQ2YmQ2Qk81UjVXaTJJWElRQ0NHekRRQlFWNXdoemx4WVowMGpTL2QzSnR2?= =?utf-8?B?ZUl4YkduL3FpTzl2YlIvL1pGM096dG4ySEkyVklKTy9ac2hlclVvSzlDNEJD?= =?utf-8?B?RE9FZnVQQndaWGdvRVNuZXduUHFtczVuMklwSDBsSUxmcy8wV1RLS3QyL0Yz?= =?utf-8?B?UUM3QnRERzFoR3haT2lyZElPYzd1YTBqTDFYWW44blJmNDdBWWRrWkdtZXZQ?= =?utf-8?B?U21ENlZxcHFrbHc0SDUyemdCa0dEU0trd3ErOWVqWHlzS2VTVGJMOUhlL3dK?= =?utf-8?B?czd6Ty9LR2J2WVB1OUZJOUpBSHkzR0hCSVpUREhtak55Q0xDQnhaQ0VPdTlV?= =?utf-8?B?M0ZCKzdwcHpRU3lheDQ1TTR2SThzbCtKR1RkK3dwMEZVTnRTQnJDRTAwN29R?= =?utf-8?B?RlFoc3ljWXF2aTZSQnR2STZyRmplRU8ybldaY0RqY1RQNDZ5T01xWXVjOTkv?= =?utf-8?B?OE1ncHArM0JxRUhIZlRSLy80YTFtV291OWVjZDVRMVFQT0FKZlB5SVF2NE95?= =?utf-8?B?VGxrV3VRUXlPVEtRS3NFUnpHWEFtUExhWGJtWXdqUWUwV0pha0UxQ3N5VU1i?= =?utf-8?B?R09OSi9oa0JYeHZpR3Z3RGN0ZGlabHZtblZtTmFlN2E2MzJBazhFWENzT0to?= =?utf-8?B?Sm1WRUtNeU52MkVFZnE3R2xiM3ZzK2RvdVlWeEQ0ZmRwUnlQZHpVY2NpUXZB?= =?utf-8?B?a0RGTzhrOFRib0FzSkNmU21zTlEzelQ2S0pTVHNpemdReEJxWk1HeUVtSnQ2?= =?utf-8?B?S01HVkhkS2Vyb0p0TjB1RDZMamFWdS9FQkZGYW5HNTRTV3lod3NLdzgyODhv?= =?utf-8?B?cS9VTTZNcC92TmhyczZ6OHFMNUdKdGtFSHBoVFRPUnp3UnpCME1vRDFzS3Vo?= =?utf-8?B?TjJad09LRGpCK2pFNWdWbjBYMDlNcWNiOThUV3RuelRiY1VsREdxOWhzWHUz?= =?utf-8?B?SHhxYXRmRHhCUXg3ZElQbkxKUkpGNmY2WVVsV2M0SnkrWVE4R3dPS0VkZEZ2?= =?utf-8?B?TThMVDBaQWFPSkpaZU1JTzVPQjN5TzVFbkgzVHRKclVlQ0FOaWtudUxEUndy?= =?utf-8?B?L0JnaG5VNnhnemx0MTRPaHp2OHJyRE5ETUljSXpVZ1A5MGFnN0V3M1RVejhU?= =?utf-8?B?cFpXT2hTK1lyMW84UmFITkprM0ZHbjFwUFhjZk1xY0xoZ21nRGxwM3ZDRzFl?= =?utf-8?B?dkxTVFZvclFLbUplTDA5UHhzY1NibVpPemVqZjZtNUVSUHhHeXZzNFZoanhh?= =?utf-8?B?T2x6YWFWTStwdmV4TGZXd0FnUjdQYW1ZOVNKUVBZc2RJL3psbFE1cjRnSmtV?= =?utf-8?B?WGlFK2RhQm8zSW9oVDB1aUFvNFM4QnlkbmI4c2EyRzdyNGVYYlVsSzRZcUky?= =?utf-8?B?cjJ6em5TdlkzdVh1Y0VidXZ3elpFSTNKUG90RVluTTk5L3l6K20raVp1Tm1m?= =?utf-8?B?QkQvZWRFQ1RPT3dzeUE5MU9WTHJmalo1bUpWQnNOTmhkYVRnQ2ZrQWl3SHlV?= =?utf-8?B?bGFvU1B0RDhZblozTXplR3VOVXBPTkFJT0w1OEg1K2ZGY1Z4N2J2LzVtdWhE?= =?utf-8?B?L0pLYkhidnIranBPL1o4cThVVmFHYk92OVRVK1pScmpPV2dMc0ZpeWhqa3RR?= =?utf-8?B?eG9uejZzMHcxTk9RVmg5cjBJUzRBL2FJd2crMGdPeDQ1czJhTUk2b0FwUVha?= =?utf-8?B?S3JJa3ppazFPUTVaamZDZ1dicmV3Tmc5ZFNLSmlNczNmcTdGNlVLWW9PcmN6?= =?utf-8?B?bXA1V1E2ZUpUTFpzMlpHV040MitFa2NUMjRTMysvWmFJL29YM3p2RWIwcVFs?= =?utf-8?B?RktKSkVaSzNOTk1qRUliZFdFb0lXZFlEbWs2TXFrZGhhUjBieFF0V0xqaHB0?= =?utf-8?B?aCtmNTRXR1hyU3NVMnBkZ0lDT2RjRTlWb09HRHAwNTBITDhaa3FtWW1Rdmsz?= =?utf-8?Q?gPlYiNVKfglPzf7TFKU+yXhyqedd/hVlHnfEfkTgKkjn?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2fa2b107-2d09-4ea1-e46b-08dd8005aa36 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 12:19:57.8725 (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: LIXDflkme+ANzw0fUV8KRkI3uQWjyfeMXr2OKUn4UVrEeKTkNK9L6MWxBRusU4RwPneeAdKfJVisTU4zYPxdZA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 We will use this error in the nova-core driver. Signed-off-by: Alexandre Courbot --- rust/kernel/error.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs index 3dee3139fcd4379b94748c0ba1965f4e1865b633..083c7b068cf4e185100de96e520= c54437898ee72 100644 --- a/rust/kernel/error.rs +++ b/rust/kernel/error.rs @@ -65,6 +65,7 @@ macro_rules! declare_err { declare_err!(EDOM, "Math argument out of domain of func."); declare_err!(ERANGE, "Math result not representable."); declare_err!(EOVERFLOW, "Value too large for defined data type."); + declare_err!(ETIMEDOUT, "Connection timed out."); declare_err!(ERESTARTSYS, "Restart the system call."); declare_err!(ERESTARTNOINTR, "System call was interrupted by a signal = and will be restarted."); declare_err!(ERESTARTNOHAND, "Restart if no handler."); --=20 2.49.0 From nobody Mon Feb 9 07:22:46 2026 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2065.outbound.protection.outlook.com [40.107.223.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 256131E991A; Sun, 20 Apr 2025 12:20:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.65 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151605; cv=fail; b=fEuuwrYOG+Qc9410GBKcEjFf2YpdoiG0/PGzl8ZqNJwCcBQ6jiEMifYmxNu+STDm5B+0TC1gtg6spnwc6jpAVKSioHKU+PSYS+XHDOJIIvz9gfCHYIewQhSsdvruQuVNsyPV71IQUe2G3RFznIAz7a0O4UDkGlh6UjY73s7+2vw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151605; c=relaxed/simple; bh=FNkMMSK4nk4ksPWRv0df1f0p10JKCv3J0c912JivkRk=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=OzqHqphRuOb8XvKhrB8T7SL0/+wPLRa6GUNyIIbbI+ky7uDbMDXj2z53956iV3lSt63VVDgyjREXMKoDY8b79XgK5CHhqzPaKXan7JiseoRCCgN+LfVra8Cag5ePsZTKw/rxq+zMXju7e1x83MkucW4c9mQX0qBXzgbq5H//+WQ= 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=NsZS4q+k; arc=fail smtp.client-ip=40.107.223.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="NsZS4q+k" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Q3P6shgQadg6MHaG9wBQ8TXFvFpqq/98ZIVa1W6y6KC/5I3RxChUx6sDpnYDS2bpObW9qLWswZeMsz4CmutnENNddb2F3ifEqKddZdVqBfZ6R9Ald5gp0UjK8rHNAj4R5P76YEXANXoP3yZGc4hOUpvViDvAnG7MCKT0z10dfNNHa+nWmVncXWazz6k7vU4NJB2NV4tMmt6IyzPTRpyFTsNdkYqbgRusyh38tCqTcWyudJT0Gb4ARs0FKCnCJQ74Lc8Lnn233/PTVYI0WSp3AirHSsH7KpFQNy0Gieeotx2shJreiq8LHk7h9yZzvpIUof4Jb3LjmvW4Zu5XEF/d2A== 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=IPTmwN0glf7WjhUerrKyJMaFvWRXWDbnYc+uvGNFom8=; b=EQwAAM0hMmluruulJjqeHRF6q4UbXFfRnMkttrnIlXTeZVMFRKNZMBhh4eZsOMKQutXL5zyUcywQR30Zx/b0qI22y3yqYccCFNaPZHVSxNnMpngO2ZlMQPgRMdvAl+4nOjQIi1JcsIvKYI7Vhaxus+Z1enOzJxGOsIQ3ng4ILNxY5ApY7ARBNkf2XgK4eI27soycw+XgxAprWfwZScPYztnxKcyuXdrErkbMCrh8hi6b81GW9+rW0FzZZA4zciauM0FEwapxI6hO0mnsMjDR1goeawdzUeA0h9emoEJZBh0qhk/H+3CXgG4p+c31m7/K5vwq8KOotqW7ESNdL9SyLQ== 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=IPTmwN0glf7WjhUerrKyJMaFvWRXWDbnYc+uvGNFom8=; b=NsZS4q+ki+I4uYHf6tsLAm9IxQNugy7yo4cjs1zinTQ6kNWsjXTulfXZ84dLcB+i8emcZq+XnTtVw662Pgq9DOBkslX8q5035neM24jBFQNu+4aheH31xi5YrPPWc2RRmN6kD4jKEXWlP9OcNd+zJ7eWjNI+LvLdztLPwwTrgoszy+IWBFRgQdecxXg9M+/0AgsopIrQYGBW9qCSPyV6CGeIuqnLAq7lIEz2fWE7r+8s3kfmSzLMk7xCniRzJL5ykUsrIkGx7bj5GWzqxRNTt7jkq5JShbPmM9WaB0uiH03BhPFEJmivg7xiNuQh9Vk1WAp6sqGqkC01/xzv6oB+qQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr 2025 12:20:01 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99%4]) with mapi id 15.20.8655.025; Sun, 20 Apr 2025 12:20:01 +0000 From: Alexandre Courbot Date: Sun, 20 Apr 2025 21:19:35 +0900 Subject: [PATCH 03/16] gpu: nova-core: derive useful traits for Chipset Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-nova-frts-v1-3-ecd1cca23963@nvidia.com> References: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> In-Reply-To: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: John Hubbard , Ben Skeggs , Joel Fernandes , Timur Tabi , Alistair Popple , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alexandre Courbot X-Mailer: b4 0.14.2 X-ClientProxiedBy: TYAPR01CA0196.jpnprd01.prod.outlook.com (2603:1096:404:29::16) To CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) 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: CH2PR12MB3990:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: 1f624cf4-21bd-4c19-e01a-08dd8005ac91 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|10070799003|1800799024|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?aWF2MWNJV0ZPNXBQUGd5SGN6bitqbHhvSklabmQ5aklCWWtDYlpTbW5LQTli?= =?utf-8?B?Mjg0YlFEMEVzUWJMRHMxWkNaY0h0OFVTYVhoOXNnTDN3SVlIZ09HamdGaksx?= =?utf-8?B?NGNESzBHek1qYW9Od1B4d052VEhKYTJjSTFhRmk0WkdhVXJlQUJzd1FhTFli?= =?utf-8?B?RUcvdXpQMDcyWHpWSHIwWm83Q0lXZGhURDNIR01kMWNtaHV4NUt2QUdsS1ZD?= =?utf-8?B?MXIzaERiTVk1cmFkekJjWm4wdWV3Y1Z0TEQyZU5KUkxzNXFEVU04bkN2VHBI?= =?utf-8?B?bFozTGFVUVMxdm1VdzRPNU01TWVocm1DbzA4NXdxRE4weXdESW5RaVZLYWow?= =?utf-8?B?MjNFelRNQkFmbHFLRHh5SDdNbzA5Y1QyTFpDTWgrOUp2MVk3a0ZVMnRrcGZa?= =?utf-8?B?R055MGx3RzdPT25FVlJ1bTN3bXk2TjBtQThPWWIxbjlRUW5Mdk1JRHpSNm1x?= =?utf-8?B?c1BxWXJUY3Jpa2lHTm9kR1BLb2tkeEVaQkFQOEtucTVwcUpTb0NVYTdpZzUz?= =?utf-8?B?MSt2RUtrYUtNOVoyK2xCc1hCWFg1ZXc2S1dpcGxnU05sWjhVay9YWGZ2cjJQ?= =?utf-8?B?UzdXWVY1VzRVRnA4YzY3R280OC9VSTJmdlZxYmVvMXltSmU4TUVESTNDNS8v?= =?utf-8?B?bXlyUDlzVDRmQk5RaWZrdXc2Y29xVnk3bEhROStNUzRmMnpGWEhVMURrTStv?= =?utf-8?B?cWFNdW90WFZUWGxxckczajY2Wi9UakVHUDc1emovVnIxekQ2WjZWSTVBN04r?= =?utf-8?B?VTJoMlVFQTZVcU1KaEZES1d6VjdUcm5Ra1laK002Y0l4Z0w0ZW15eTB3Q0xE?= =?utf-8?B?UENBUlFucTRQR1dhN1Bua2tsVU1aTFVVdUhUU0VpU1NMSnk5YXkrSElUV2tO?= =?utf-8?B?cVRWaWxBU1JVMUw2WGZQbDZHVmpBZHh5eTR6Q2VtcUVHZEdBU1JSOXMxOERT?= =?utf-8?B?azBkK2lTTVRzQ1BxU3JFZkRYVGhwRGRzVC9kdll1d0JSRlIzVlhPL0pGLzFm?= =?utf-8?B?bzNFbkF6SkhsSnJtdlNjRGU4dmlNZUFMRERjZ3hUbGdjM1drVkM1dnE2Yngy?= =?utf-8?B?WmdreHl4djBsVkpaMzlUbkJlNklGVE94N2NaaGhKQk9ERlJSeXBDekdpY280?= =?utf-8?B?VVhIdlZCODQ5Z0RXNUZFTmNEakNHTUNJN3M3b095d0dSWldyRWhTTXJDMmJW?= =?utf-8?B?N1dEYzdTbzhxS21iQWVHTlQ0TGdublNhOUpaYktmVmNxZTkyekVDUzhiOWFN?= =?utf-8?B?YlI4UTE5c0lPQTkxeHZDVm5LZ0RhK0lLaEVqandiSGJBc1Irbmk3c1RqNnBp?= =?utf-8?B?MGE5RldmRU1wR0hNeWNWMHUwVEZqWTBKRWZQckRwci9iWUpwaGJzdEJMem9i?= =?utf-8?B?dVZIcnZkZmV3Z3VMZUh0YkQrbXI3VmZVMHNrSmcxME8zaHBheHRYbEtnRnU3?= =?utf-8?B?YksrYnlaaWNJOVBqTkxwSGNGcnBNK3J1dG1Uc0pFWGVhdUNDTzJZd0kxdllt?= =?utf-8?B?NXhJV0pZK1JVdWlReXdrWVNmcEtjeU80SmExby91a2FQQkgrV0xvZFBaUkUz?= =?utf-8?B?K3JoUng5ZzNPU0N0c2JFYnNoV1A2Uy9ERDVnZjdCY2s5ZHpSVGc4aENGVWV4?= =?utf-8?B?N0ZMdXU5aE11T2tqT2U4eG1YeGVKV1FZdDRBMDVGUzUvc1ZsVFJDckRkQkdz?= =?utf-8?B?SEFzTVgwc2RNMVFhT2Jld0FCWkZuM3p3YUJPZ0loNUtXUmxBWGpCVUJ5eURY?= =?utf-8?B?VHdUeXZOQWd5Y3RuZnZpaXp1eDgyeVMxcU5odGRaQTlESTFhQkZoV1k3Yk1t?= =?utf-8?B?TFVORDRPUWY3V3lZYUptRGcyb1p2L3VxeVc2NU4xRkV6TENmb1BUM0l1T3BY?= =?utf-8?B?NlVIY1FYeXJNT3pQdVphU1VjdnZnK3RLZDZwcUIyZnZrK2ZycGEydTJvQzBI?= =?utf-8?B?VFNOMXNQUGZRdHhOSmNrb1VrcWNXWElUc2IzbzdXR2IwTjFHUVl4dGFUVEdk?= =?utf-8?B?SEZYcmpXOTZ3PT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB3990.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(10070799003)(1800799024)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Q2ZoNCt0ZmhoaHZGTU8yVTJSZHQ2S3hzNnpQb3dwaWIwcjAzcjdkR1NEQzdx?= =?utf-8?B?bW4wN0hkV0I4YjZvaUhNZEYxTUdrL1F2S1o5NWkvVUlyQnpVc25LVXN2OWRi?= =?utf-8?B?b2tjWmF0MTZUWnhCM0IrYkZGeXRmWkRPd1hrZ1VMK2lWTldaZ3FQTlRUY3Bx?= =?utf-8?B?Q3lBY1BoWnVhbVJMRVdjNExXRVhvTVNhOFRRenVUSTh4N0F3ZGNiRWNFNFV3?= =?utf-8?B?SDFDYk41WW85TGJCTXdUYmEwUGxEZnhmd0p5UzFpbTV4OGFZcEh0QlRzLzhs?= =?utf-8?B?Z2dBenBGcTlUL2VUSU5EVEkrQ2NzaGdCRGVsUUxNejdwTXNMVytxUzZGbU9S?= =?utf-8?B?emtLeE1zWElEWVZyaDhMTUpZRnVEQzVuRE0xc0ovcXMvYStHT1NSUUhDMC9V?= =?utf-8?B?bDEvNDlTdjJDYy9JSlBXd2pkRmJPUE9QMm9TYXdpdzlnVFZhenJyTEZDMHlI?= =?utf-8?B?bGF5RlMwekVKcnlIME9wd2lWWUdpYld6cFI5U3Z2OWUvMzUrWkZPZnc5dHFq?= =?utf-8?B?ZzVyS3B5aGlmVklFL1E3VHl1czlKVkJ4d0w2TmY0djljc05WamdYMUtxVlVH?= =?utf-8?B?Q0wycTMrQWxoVHhmMWliTlBWQ21VQzVyT0h5SXNVYXRWN2RydGFkVk1HMHp5?= =?utf-8?B?SkJVQ3RhTkNhMVBzRGRwWlRwVWNHdU12RFN2MXpFUE5pd21zNkpUTk1POEhw?= =?utf-8?B?MmZjWTAwZjhFQjNwV0FmemJ4WXNZRmxIY09LR0QxcGxmdjExMzNNRGx3ZzVx?= =?utf-8?B?cEZ6bVk3NXhrSm9CNUNlbGMyWVNYdkJvVERGcDkyWDRzOUJlaXVxMW16ekR1?= =?utf-8?B?cHBQcHB2cFU5VksvcWF2clZmb1VHU3NVR0s2TkR5N0ZMMHVzMVprUGxtSUtp?= =?utf-8?B?QlNVT3ZWdkRzWUNEZHJRNDRjenBLUFpmQlBJTG5WWkw2MmlXSWNOa2JselZU?= =?utf-8?B?VWFlMG1pVXR3T1ZBbWVNL1RxZFM4OUlmR3FkSFdFM3RmV3k5MnZReXNjaGZw?= =?utf-8?B?d1VrTGowTTVmekxTTlQ3YmRXS2tHaWJlaExlbDg5RlowblpBVStEbmpaU0o0?= =?utf-8?B?MkpIYzFWbUxZNnNHMzRpajdHRk5CR3NvTUNLbjZlQzVSRjFiV1FGM3NUaEVs?= =?utf-8?B?OXpLbkphditrMFZETjdDRXlGa2VycEpUbHhQTW5hR2YvRVR2dFBZeW92Q0My?= =?utf-8?B?T3VlcEdjVTVyZFg5WUNScStWOHpWR0pSNnd6Vi91SFpZdFY4QU05aVUrMGtL?= =?utf-8?B?blN5QWR2Y0lFaVoxblY4MUlLQ0c0SnhRdGpFU0gwNFg5RnUvQW1oZXhPMUEw?= =?utf-8?B?TEM1RTdsSElkeTgrcVFGR3kvNkVERWxIQ3pvWXJVeVNRKytXdjhwSmZnQ3VR?= =?utf-8?B?UHMxeDdjQitQREtpUDNEaVBOaFNpajFJM0R1aDJ1M0h5djNURjNGQW1tZ1pi?= =?utf-8?B?c29BcUZnUnV4T0FETjBGUW5PTHVEd1hyYkZZVmlMM2w0bHYzbDJ4amlGbllM?= =?utf-8?B?Qnh4OUdlQzZZOEZqUUY2WlI4amVRVlhRNU5kK3FTYk42Nm5sUFpTQ09vNnR1?= =?utf-8?B?bXJZSXd0TzVGSERxWm51SEsyUW1LQ0lGaS9CMUZnMk02WjRFWTVUVldSTDBh?= =?utf-8?B?TDI1b0ZYRENyWEo3M1Flb0l5cWFSWjIyeDZzSW5RSHFzZ1l3eFNiNmJZTmov?= =?utf-8?B?TEJVZ0FXUVIxNThrV2kzKzhCUk12bldGMlNNQjJVRmNQOStWVHQ3ZzB3U2p5?= =?utf-8?B?TnlDRjFvUk53dVExb0lKS0Z4UnQwWmV6OFBPeGN0eEdFeXdlaU5xM1BkNU9Z?= =?utf-8?B?VGQvdGY0bFRVemhKa2N2TjRnSVYzZ3U5VXhwWUFEVnA5cFpFQVJ5bmpFTzFp?= =?utf-8?B?anExQk1jT3pqTWk5Q1I5L2dzZEcwYTZQR1UzMk5vdzVzNFQ0MmFmWDRPanpw?= =?utf-8?B?Q0ExR1ZINk5ZNjI5UGNTSzQ0NnZ0MW5jN3NFRERJQ1FUOUpxb1Z0eUdlMksy?= =?utf-8?B?TTVHb3Z2ZG5BMjV2UXE5MnJ5QjVZU2ZScmNWdWF2RTBpaStrbHhYZU5zQ1ZG?= =?utf-8?B?ZzE1Q1ZPRXJySkRwNU5JdTVmeUgrU3FBUmN4cTZvZlRpRzU4cFBTWGpSQndl?= =?utf-8?B?U2VOZ0JCS05SV2NPTnpjdW1YZ3lpbXhrV3p0N0RBWktsQnRhWS9Ba2hRb3hC?= =?utf-8?Q?MINNFOx5ZMPv5Z2Fyvl5aXYaBRxRaOQaqFPMaVpaO5cy?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1f624cf4-21bd-4c19-e01a-08dd8005ac91 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 12:20:01.6086 (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: JPkr4BjPlE8TYrLiQ4BYfPBh6A70VcNO6t3ZnVqQgO/BUkVD1tFxJSpLVdOACV1CVUOzZSb0/JVw0LLkMVX1Lg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 We will commonly need to compare chipset versions, so derive the ordering traits to make that possible. Also derive Copy and Clone since passing Chipset by value will be more efficient than by reference. Signed-off-by: Alexandre Courbot --- drivers/gpu/nova-core/gpu.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index 17c9660da45034762edaa78e372d8821144cdeb7..4de67a2dc16302c00530026156d= 7264cbc7e5b32 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -13,7 +13,7 @@ macro_rules! define_chipset { ({ $($variant:ident =3D $value:expr),* $(,)* }) =3D> { /// Enum representation of the GPU chipset. - #[derive(fmt::Debug)] + #[derive(fmt::Debug, Copy, Clone, PartialOrd, Ord, PartialEq, Eq)] pub(crate) enum Chipset { $($variant =3D $value),*, } --=20 2.49.0 From nobody Mon Feb 9 07:22:46 2026 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2066.outbound.protection.outlook.com [40.107.220.66]) (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 5F8491EB1A6; Sun, 20 Apr 2025 12:20:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.66 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151609; cv=fail; b=OSZJ2YWTHiRw9FixGW0JlwMjpMou31qwc3oY2Ep8J93aV1f1UUP0mUmvxF1QzdZ6zM3I2g463gCpywRjZ03SRVKcNJr7DAE1xP5XUe/JeNwKUBAWG3OH5EfRq+tvnb9pHrhYMtc+fCUnlEFnwuXyWLyCWy+FxRdxgRYNhQBOjFw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151609; c=relaxed/simple; bh=JOOKUB4035Rk/1A71BQF2mrflePXO+yN5dAZE4iVrFU=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=lJ5qienO6m4JkqIkj7qoQlsNO3iS+tb0bfNJppAV00HuZueiR+I/4K+qvV2JJnG9Kf0/MJaL3yiC2TAHYV8xLjVt7QSDMk0DQTMIXIgEzM3SR98K5YUStHZLpslUMBcvkrHJV6O0mWMsXmr7eQ3beOplcC2h04UjjXaDQWO31Qs= 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=cWvJfyQd; arc=fail smtp.client-ip=40.107.220.66 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="cWvJfyQd" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=k77CfjjwPbRhTFj9juTmjZFwoio+nWvSgwMvMIjk9Rcjia9c580Y+y+goZHIfdCJviBtgmxYtN3+5WiR2LUhsJT8mgbgSg1R4JW+OeFBgoBnFEIOwKJoItTW8fJk/4ajimLkIvqvLAiGFfjBG0KGKdCX09sI6BtcELEmcVqKzZh1hP5HfydH7qKtr5k0sh2JRT0UKymWBThjDx4T3lD/sq+XCgSIguzxUUl0m6A8xwtj1QqUIVc2wXl3WIdxP8pRBDPhoKcISlCuR3GeRKh8LrtAXe+99VqgcncEkPnsKH5a1iE/Og/LFnIBVa22qHT6LfYja8lfnj9M62y03LTFlA== 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=XmWSj57R3v+UIceJhRruaNFfPcJL96GvOx+Ep5xc3PM=; b=IU4tXSa0dwGO+MbiWJDoL6HTAO5ryz2h4VTcaCzCEWobqQxSSGhtlZ4FIUBZFYFN5VnT8dLhJdq4vCxrN3pCw/OdLLwF+XQEGeAphK8Qm8b9bzRFgaXcQZ05ZDdZn8bMt0L0U3X2vvqgkhzLb2WvlYQiJbkDdr5jCpvfD5Fjhjvnd6WeFcxTSAfcgKxmeNLiNDp5eKF+81QMlVhbPehn50Sawwd4Rx+QGJFeWVRO/6SOFzW+V/nVdEVzwtO6hSOMVMLQLRO1/dY0AlL/A6kFkAaVpXoLRNIEBPSoiLSsWHEqadxEZBKBQtenoTJhYGjcPk6v2gL/rVFi9VSbcDhrwg== 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=XmWSj57R3v+UIceJhRruaNFfPcJL96GvOx+Ep5xc3PM=; b=cWvJfyQdnZw6lwSb9BB6x18tqCceIGdHrhVTPEzFWdBQMcc8y2yDimblATmMRBmv7dvhiTo0WDpERasG8bq/MiPgfxl+NHBMTptUNkaNlYEtFgzVQzp0NdqMqR9yIOE4n1RlL+lsDtvu9ugPYzWigN038In+dl8H/dM5ZLVwvVtQ39dthcfQQxvxKa2FESFsEinMrJGYcOafe7oEUaPnTzYBI8RxJoksqKeTuJ/JREfFDrOrM1Mla3vKLHMsWC+X6LrKIG9Yw2HedStYKcauAkveO6ziz1DH/kARsv8Bs29gz4RLbFQE78sLT3t6oCukZXWttUwCSZGi6Qg7KtDoTA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr 2025 12:20:05 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99%4]) with mapi id 15.20.8655.025; Sun, 20 Apr 2025 12:20:05 +0000 From: Alexandre Courbot Date: Sun, 20 Apr 2025 21:19:36 +0900 Subject: [PATCH 04/16] gpu: nova-core: add missing GA100 definition Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-nova-frts-v1-4-ecd1cca23963@nvidia.com> References: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> In-Reply-To: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: John Hubbard , Ben Skeggs , Joel Fernandes , Timur Tabi , Alistair Popple , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alexandre Courbot X-Mailer: b4 0.14.2 X-ClientProxiedBy: TYAPR01CA0234.jpnprd01.prod.outlook.com (2603:1096:404:11e::30) To CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) 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: CH2PR12MB3990:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: 1c4401e8-7033-4794-9a3f-08dd8005ae98 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|10070799003|1800799024|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?cW1mbE9LL0hYeTFTaXp4cUJ0ZFZLbTg2ZzYrRUxGeHcvaFZpdkVtRVR4c2ZU?= =?utf-8?B?SU1GQ0JheThmMW1aWmhKcS9hTVJURW9INFJtOUZrNFpGZzVjK1ZxenhmdHN3?= =?utf-8?B?bHBNai9UTGt2QUMzOXlKeGh6bzFaY2x6S3NPcGJYV1VqREJNc2ZDMUNQVXdy?= =?utf-8?B?alYrVm55VlZNVm9UaHVRWmxEVnp3bW0rcmREcVoxOGovYUdBdDBWNUVGeDRk?= =?utf-8?B?MjZMdllsNEQ4bExqeGhKekczcEFJR21QVGtEUnIwT3JrREE1alRNODVtN2Vu?= =?utf-8?B?UURNM2RXUGRZWnpuNUthL1hEWXlJTzdlQ25waHVubk9rUm9Pa0RFRkc4WVhL?= =?utf-8?B?ZXErQmlQY2kwWmJpQW8vYnJVbkdWdWdOeHg1V2ZKSGJLeUw1eHp0eVZrVnJO?= =?utf-8?B?eUZ5QklhdGtVVGcwSHcrNDJoL0x4Y2VNa2lKa082MVMrQTZGQ1hqZ21xMytz?= =?utf-8?B?Ulk4Sm9jcmxzZFZMK3U1NFJnc2hCQUswRC95MEV3MWRNSkViRnRRQW9NM3Fx?= =?utf-8?B?U3lwSWp5MExpSm4vTVlNUHd6UHVRZnpydGhGRFd3SVdpeExvYjZkd1R5Snps?= =?utf-8?B?Vko4ZlJqVmxOVlc5VnpVdDNmQVdyV2pRajlrcjM3cVZhbFo4dnAvQUtSdjIz?= =?utf-8?B?M2xMYTV0TFhFZ2FZelhZcURkN0h5ZHhLeDE5UFM4dUlyQWJ3MSs1UG1NN1Z4?= =?utf-8?B?c3hVaHFOTmlSdkNnTWVzZXRaZDU2aHB0OG80M1c0SkVwT1NFQlBLZTBBbFdv?= =?utf-8?B?USs3TXkrRFlsQmFVUVpKUHI4OXpMTDVIREhkL1pZNXdVU21JSi9ETll0TS8x?= =?utf-8?B?TTFQb1RYa3Q3Zm55QzgxSVNFdUtnN2ZydVlPaVUwY28rV0U2SFdBWmFVdnpv?= =?utf-8?B?NE5iVWNPNTlGbFI5eUl6c2k0RTRXRDVQRmFYcjc1djRsR3hSSkR6bHJIdmdH?= =?utf-8?B?bk9tOHk2eElaaUh2NWRJNlo1RENBNGk1Q0FPWEVVTXVTWXg2OGs2L2VmZWZm?= =?utf-8?B?Y3doZElzQnhhUWY1enI3L3hQdlRsRDY1ZnFiZ25yY3gzRDlvUGNpMUhjMEFO?= =?utf-8?B?Y2hKOENmME5CSlhCUi9ZVHE3dU4yVVduTUpXU3JNeGpYdG84S2ZGZFpMcmN6?= =?utf-8?B?bjhMQ3RXMWYvTE1iNExsZ1h5KzQreXp0RXJkWHgvK1doUFBSRloyR0N1cVdO?= =?utf-8?B?NUpjbkJhT3ZlcFBvajBPYkJMclYrMS9Vb0l3cjhlRXNjUXpBMXBubUp3Qkla?= =?utf-8?B?dFFjdERrbnZkVXJBdXRoZTUvYUZjdjJoRzdpdDFFYWp1cmg4cGNzbVJRT0NR?= =?utf-8?B?a043TklvMVZqdWtzWFBueGVEdmxIWk1ZVkM3QU1YWGlkMzlBckR5ODZvQ29w?= =?utf-8?B?eXJUVnVhZnUrNW01b2RhcDF0aEszVUFrUktkaHdKRUhhaE9kUFJ4MHg3WkFK?= =?utf-8?B?N244cVhvM1p4SWM2U3RUTDBOSzdJcFhHL1IxTERiSnluZXRQQW13WDcweGFz?= =?utf-8?B?TVRnL0lHRlB1R05LMnZQdStDM0FmcXJyZzRBS29zTEx2QkR4N3NGeFd3R2hx?= =?utf-8?B?VVp2SmU4bUxEcnZxZSt0ZDRoTmU1SzB6YnlCcUxUOE0zeWwxbW16clFOT0RZ?= =?utf-8?B?Z2pWUkdKL3BjOEZ4N05UOVh6MHZlY25iamtpcndVNVBaUW53WjczR3BpSnln?= =?utf-8?B?ZlRab0pHRWZsMkZxUnpiNGZ5SlV0WVVZMDlqd2h6a3VaM1lKSU1mdjlRNms5?= =?utf-8?B?M3RUN2sxNDVYeENNNHRrZ2JaODNSZjlGcSsvUlBHMUcxQjh5VkpmZktnQTcx?= =?utf-8?B?dEJVdThOeVRWaGVhTXEvdkpTUkN0WVZ1SzZQb0c3WDExVUN0L0JEdlNrYnhL?= =?utf-8?B?TGV4OG5qWmZCTmZDSjlCcHNjZHhtNjVBVHlDS0V2SUh3azRWcGh4a2l0ajhO?= =?utf-8?B?Vkdza3NSdUZGanFQenNhMnBYT0wyUGFHZloxSE1PajViUjdNQS9ZY0RRaUlI?= =?utf-8?B?MnNQd255a2hnPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB3990.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(10070799003)(1800799024)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VXJDdFNqd1VLbnlUdit0NW9BeG8xVE5iSHNKNGtETW50RmNMR3k3a3gyNmxZ?= =?utf-8?B?c2tKNi9sNmI3SE52blIvZHp5emRjbDBsTysvM1BuWGFsRE9GbXpycFAzU0VL?= =?utf-8?B?aDg4NzVhZ1JUMll3cy9Qb0IvVWt0WGlMNFRmRHBHbyt4KytyTXlCUEphMU51?= =?utf-8?B?MktDWWdBbTV6aVMwbXMzdU9mTWdYQlhtSHlOVUVJVzgvRURtMnIza2VuVENE?= =?utf-8?B?eW1rRFdZTHN3NlJrajlyaHdPcnB1ekJSUlR4UDBtR3NxZWZaRlFGN0EzZnE4?= =?utf-8?B?dkFFalVKbXdmS1ZqZUYyZ0NpNm1CV1dLSnJ6SjIrWFdEMCtTRitmeXJOTU5a?= =?utf-8?B?dmNCWTZzekIreDBNcy9jcFJnWXFDZENSQzZkSXhiU3EvZXZaTHJLODM4endY?= =?utf-8?B?cjZDWEJwSkpIREZ6N0FycnBMbEZoL3Buc2ZxcC9FTDk0N2ZzL0R3TGtLQ3ZX?= =?utf-8?B?MjRRUjVzTzhFZXV4QVhWaXA2RFYwZ0lCYzNJa2E2V1NmcldpQjVLVkczTmQ5?= =?utf-8?B?T1Z5bTRZdHcyQmlwYXJPNUFDTmE5bDFNZ1NDU29vSFFXMC9yK0FkZ0V3L3c0?= =?utf-8?B?NTQrSWVscEltdVc4WkduYlBYSEVzYTNuejZFcTlaUWpRczJlNmtjWkM1NHhp?= =?utf-8?B?YUQxUkhzNTFabDAyQmxxY1dRZy96eS9FcHBUWjNkMlVSZ0F1QVJtcURjb2Iv?= =?utf-8?B?UEpCNVpFWXl3NzZLSEIwVlJpZ2d2bzJvWTVUakpzbERzNkx5STVVMXpuSURW?= =?utf-8?B?YkQrNm51cmZDN2FzZG5wMFZhOTJPMEJENHdkZ2lmdlNBbVdHOXhYb2JNcWdl?= =?utf-8?B?blFIemVYSTUxWEloTEgzS3VDUGVXbnRQM0lMMVpRdGtBTjFGVGxrcENRYmVH?= =?utf-8?B?KytLb0lMSjIxVWd6aGc2THErT1ZYc0o3OGlybStZT1BWLy96bjhORU5IczQz?= =?utf-8?B?TWFLUStySWRqNS9FVjdZK0dBVFRmaWtZSldFRVUrOGxkU0ZCdTVMQWRRcjRL?= =?utf-8?B?a0ZFY3pTcHBGWVVnSERoNm1tVmNGZHVZamNFUVpmV1JpOERuK2V5L09sblZ5?= =?utf-8?B?RzZXOTZDV0NlOEJPaWc4UGtKK1BmQThENzMwbVhHUzVVSVhyN1BFbU1aZjVm?= =?utf-8?B?WHByRENyczVqUEZLWEN4QTFSeFV5SkpRMk5Ea2kxcHBGV3psU25wWFZjZ2s1?= =?utf-8?B?eGZHU0hTallQVC9qU3E0TFp3TWpLUW9vbk0xc1JIK0FNN1hqcHpjcUUvZXRm?= =?utf-8?B?M1dJU2dvVExkcEw0K1dWT2JjQk1QajUveUNwdllwTmdSSHB4K0daYWVmYWx5?= =?utf-8?B?VHpkeFBxY3M2b0FPdVI3c3NHN0VXSFJpcnNBTjU5WVR5K0hiY0pnbzNOK1Rv?= =?utf-8?B?dTBxVDBrT2tHY2xGNytrU2JwYTRSNXo0ZjdZYVQrbElPZjdjOVRqNVU1ckRX?= =?utf-8?B?QVdiT1RIbnRKVGd4Z01rSDJyMkpwdlQ5NW50SVY3MmdiOW16LzFDMndsQndL?= =?utf-8?B?V3QvdUVRNDhTUWp1L0ZUalBqY3VJTFZhUnNmRWt3d1NZQWE1anNWSUEwYXMz?= =?utf-8?B?NHNBTy9jck5RZTdjUWwwSE9uejlXVnpsQTlhNmMrTHdHaE40eTZKUGhrM0pp?= =?utf-8?B?UmtKWXNFejUveDNNMEVsUnhORlcxTlBNcTFvRXh6TFhDUFNpTVByK2xRM2tV?= =?utf-8?B?SGdJM09pMkRRd1I1NEFqVHRsNUN2RUszWkdZdXBDSEdJNjBsVERlaFcyRHhp?= =?utf-8?B?SktRZ0hYbHE2VGd6Z1N6S3h6MW4rSVlVQWY5bnhTNVVUajVaUGJ2MFA1aFcv?= =?utf-8?B?Ni9sZ3dJOHR3TWJTYzRZVGhsa1U2TGVBUW9QcHBKSzV1VEY5c3JxUTJFdk5i?= =?utf-8?B?WWJ6eWthYzFaSDlZUnFCTmNDNW9jY3pLLzNNQzcxZVFmaGxUVWlLRktZckU3?= =?utf-8?B?Q3NTTWowdG4yRWgzRHRSc2RETEpvT2ZFVWEwck4zZXloVHF6RHpHYUVtdnFY?= =?utf-8?B?eExPa25leStYaHlOSmh2VEVOZ2hRNW9tbWIwcURrM1FPejQyaS9LTW0wWkE5?= =?utf-8?B?eDNkODRqcldRak4xTThFeGVTaTl0VXBQU2x0UmNsdHp3WTZ5R1JjQzUzc2R1?= =?utf-8?B?c3pUT3kxTmkyM2s0a09QNUFWamNXWS9mVzZmNkVhZmszM1k2eUUxaTJuMmlP?= =?utf-8?Q?H3pZkZE8A+e12iGt3H5czFtcvaVkCV3RQ5Pfyofy7UKY?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 1c4401e8-7033-4794-9a3f-08dd8005ae98 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 12:20:05.0140 (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: Yb/vWrFK9jDdQ/v5hmhq40oQPWa79e4XsacXODRouXn1xIvxprtgn2toP1YUpLjN/JuNgsd/We9GMahbUA9gkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 linux-firmware contains a directory for GA100, and it is a defined chipset in Nouveau. Signed-off-by: Alexandre Courbot --- drivers/gpu/nova-core/gpu.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index 4de67a2dc16302c00530026156d7264cbc7e5b32..9fe6aedaa9563799c2624d461d4= e37ee9b094909 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -54,6 +54,7 @@ fn try_from(value: u32) -> Result { TU117 =3D 0x167, TU116 =3D 0x168, // Ampere + GA100 =3D 0x170, GA102 =3D 0x172, GA103 =3D 0x173, GA104 =3D 0x174, @@ -73,7 +74,7 @@ pub(crate) fn arch(&self) -> Architecture { Self::TU102 | Self::TU104 | Self::TU106 | Self::TU117 | Self::= TU116 =3D> { Architecture::Turing } - Self::GA102 | Self::GA103 | Self::GA104 | Self::GA106 | Self::= GA107 =3D> { + Self::GA100 | Self::GA102 | Self::GA103 | Self::GA104 | Self::= GA106 | Self::GA107 =3D> { Architecture::Ampere } Self::AD102 | Self::AD103 | Self::AD104 | Self::AD106 | Self::= AD107 =3D> { --=20 2.49.0 From nobody Mon Feb 9 07:22:46 2026 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2059.outbound.protection.outlook.com [40.107.220.59]) (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 CBF3F1E8347; Sun, 20 Apr 2025 12:20:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.59 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151613; cv=fail; b=M1aaqPmCNr/g0rIWRAuLWSY3V+MkL/Ok3mkYMu6iNfwUZuYx3hxsvl2dO+7ct2mXk+laqQd0NxsKSnCXhorZ4obmFzbu0ASS3hrgwl2+2z1vHdXwxb9H/bkZa4KssUUcjouQ+Te+HJP7Ns2KzZWa7sxS/z69HEC0lEbHCuRqjtM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151613; c=relaxed/simple; bh=X2LwCOni3IeGzsGV+yeglDDfF4auW2QP5siQRB+1P0c=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=M9DslfnbU8fOY7NWylV46k/auPeiXjOBS7pX1q9dUYH5X5eTcfQn51sW2EbMyJrYeGbSlpfVkjz0/QV5A1Tq8jFE36cBZE/0CvZ6aDfJxoyITBS0R3iV/1voNANsvBt0DvCNCr9ohoc0zHezf5JHGGzn6QlgUHS8n7k/hdfNMHw= 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=tTn0vVem; arc=fail smtp.client-ip=40.107.220.59 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="tTn0vVem" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EvBLou6Oh59gRdWYJkJGb4vhZybCunuDTWN6yBfE9L+lpRPRDxR2b4+VnNh5lFZvIectdH74U38WtBMwlHJyOKTSelLdBERCIvkyIeQTpxFqEtbRwdfxS0fom7oTua1o24g3Dn0SETpBmh6+8mFQkK1iJTovTCkTBRPPEcH2u02uVLN6+hme7BHSWMvnQaVgFUgLsn0RCwv2nuBHoI9vm0XcWCCgT+jJxgQkf1q5IwRWFmwqTlFh0bTEXDhO/tXba+lWe0y9MuoNmkSDy95Qr/+pX0ywId9+Cj/BU6d5Ec01CiccKh1OSCvAFhyhg+EQS3iPgaGMSh/akPsg7ZNnbQ== 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=DiZI8pM4Zu/6ZqF08uy2+0TbE30HzmhD1uWG+Lm3eBw=; b=PLH6vcHMBa7S3MRYQxSFzEFUd0Sz16R6kX1ZXTYtQmzKZ4YzV8uWc/CDl8SfBTtdD7tsFQ+yCvhinXAgSTPjaYEGE7bNWdl50vHFsoo9jzVn75dL8gxTK4YZti7ZYwgkO0XwqbP8KKeIurmOltQk0ln21Fw4OJZKaNkZ5g+qKFlWgIGfjeGodAhRDmbrn7Zc8Re3eHE2xsCSycblMaBptTRuQBophCRpHVMJdpx+mDAVufmKbWpvF2e7HtdYTiSeS88mCoX+SGlgdwOSQK37fSkhTLIKp5xVwRPqYeLKffLDi4YF6IJF7UEFwCTDa4QiR5E1D44BN57+ccwF0cu1gg== 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=DiZI8pM4Zu/6ZqF08uy2+0TbE30HzmhD1uWG+Lm3eBw=; b=tTn0vVem48okIdYJgTtN+c7/DiqUx4nPfMXirUlL31xrwI5OmA/6FAGmhvT3a5A2A5RQVCVmdGlsiL0cycqH4SvgtO8AkXIAeTfJH9Sfq6ZFvce6LMsL4kURgM4l+yQyWzONXcnUvczeGadTEl9RtuXlekJ78Ju6+pUtGmyh9mUMH4x55m4YeSl5MoW/eRTM/wdTfOQWgjsJdgcmALAjAqNzALFVTVz0nEs18RHkWm/pjD+36N20hMp+L2pGuQrND3yv5rsgAZsdHzLWoGSU7VIV1khU7WpnUHMGAyQ0NIn09LGhrAytlI9+Lefv2PKB6khXce6Ke6Y6IAHsvzqC/g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr 2025 12:20:08 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99%4]) with mapi id 15.20.8655.025; Sun, 20 Apr 2025 12:20:08 +0000 From: Alexandre Courbot Date: Sun, 20 Apr 2025 21:19:37 +0900 Subject: [PATCH 05/16] gpu: nova-core: take bound device in Gpu::new Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-nova-frts-v1-5-ecd1cca23963@nvidia.com> References: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> In-Reply-To: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: John Hubbard , Ben Skeggs , Joel Fernandes , Timur Tabi , Alistair Popple , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alexandre Courbot X-Mailer: b4 0.14.2 X-ClientProxiedBy: TYCPR01CA0084.jpnprd01.prod.outlook.com (2603:1096:405:3::24) To CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) 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: CH2PR12MB3990:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: 41089990-dfc3-4d35-02b1-08dd8005b08a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|10070799003|1800799024|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?YTZJbko0MVpzdUdYT3hlVmZ6Q2JCRHo0dWdGTmM0VVAvODBNQjBhbW4rSUl2?= =?utf-8?B?VXlDUk9keWZOUVNVazNiNlN3V1l1UUV1SkphTnJXWTNVcTE5WjZDZlVrajdv?= =?utf-8?B?cll4dDJ2US9URDE4NmdSZ0RPa2phTW5ic1MrRGloTEhRRE1VRjJ5MVc4ZFg3?= =?utf-8?B?a3FFYzlaNzB2RUFnQzY1ZXFNZE14RlBhcndZbXpsTURvVmFLZkZVbjJ4Smxn?= =?utf-8?B?NElUNGI1dlNGQXBaVTJQS2dvZE5yK1FHVlRYdUpzZVoyb1YzUnpITDNnamVu?= =?utf-8?B?VHFseTh0TTN4WElqckZEekFlUTY1MWQrMVVOb09DaHYxZm5oRU5sRjZyM1BZ?= =?utf-8?B?K2M5d2ZqU0R5RjNrRnIrajdsMU5TYUt4UVNDMWJXM0UzazR6RU1oa2l3TzM4?= =?utf-8?B?dU1iQ2tKWjJkejQwTmYyazJCV09yVFB1d1NsVmZjWnIwNTR4aVQzVys2di83?= =?utf-8?B?Y0Z1VEFQVHNpTWlBaE5BeWJ5Q084WXJ1RFBzaFcxU0RORjlxZkdZeTg3dzJx?= =?utf-8?B?MWExL29mWlNPWTByelhidWVRVmhXWnJiTGxXbU9Ca0trQ0k4N1hHTkpXZm8w?= =?utf-8?B?ek9ab3JSZ2ZYY0taTDMvNG9LcDVPUVR1VDVKMUh5MUI1b3JqWXAzbE1SM1I2?= =?utf-8?B?RFRvOVdXdUQ4MFQyM1BoME9NSFRIdlRvREZBK2p2d1cra21nYUZ3cE12REhU?= =?utf-8?B?eXVLc2dWRXp2ZTZrcWNZWHVML011L2ZhRER4UmJvcFBHd1VwMXprS2hBdEZa?= =?utf-8?B?QkxqRkpFU0gvbkpiQ1dZS2kvcXpVQzIzalFRWlRmcmZ1OW16WTN1eXdLWVgz?= =?utf-8?B?RFc4N1R0R2N2Mnl0NC9aalcyWEpCLzVYeEhkd2NNVitXb3VldWdZZFk1c3Bj?= =?utf-8?B?MXlKc2E4ckMvOUphNXRoL2llVUw0TmhwV29CVDUxaURTbTVBbi82MDh3aWpE?= =?utf-8?B?M1Vwc0ZDaU5rQzR4cnJpZXNpUHF2Z3hKNTNteEF6cnlocGFzYzA1L1RZaXhN?= =?utf-8?B?S3Nnd2dZZmZGNUdoc1YwOUdiTGFmWkxpb3ViTkUyUm1pZVVyRjJwRDJLdHJG?= =?utf-8?B?dEdwRFd0SG1wN1RJZzkxdlYvMzdmdTQrTzNrRnAwOGNKRHhSalNvWWtVT1Y5?= =?utf-8?B?TkJtaFh0Qzg1SG1Tdkdabk5kNy9jTHRJUTVNdDM1cXh3TUpoRWs5bHBhWm5B?= =?utf-8?B?MDc4eUxQZ3dkY2dnbm9YQ1Jqam9GVkllejBuQWhVNk52TmF1R3V1c285V0sy?= =?utf-8?B?K2NBWXJCSUlScWxGanI5Zm9oSkxramtmMlE5dlAwQXpOOFFxSnF5eTZGcXYy?= =?utf-8?B?MFdnUldmQ2JkMHE1ZDJDV01TWStYQjQrYTBGTkJ2OG5la3pLcHNWaEhCeUpS?= =?utf-8?B?cnpwQzkwdWxCY0x3WnluTDRGR0J1WDJDYml2c2ZLT3NQbzNtNGgxdTRXRVlQ?= =?utf-8?B?WGhxNElOYWdBZGVlYTdWblQ0dnQ4NSthR3VOanBSRHZHbXFBNXpvNUpZSnFl?= =?utf-8?B?MSt4ZzBIT0dLcS9DV2N0dWtZY3J5OTVLMGpDYjdCd05sTStKUjlzSnM1eGRn?= =?utf-8?B?cXJpdm1wZ2QydUNLdkUyS1VUNCtqeEhtZllXMzNvUXJHWmgyZXRpZTNHWUJm?= =?utf-8?B?MnRUZkRvNGFvMWZRRUZEQWZROGx3eU1UdCtaVmg0OENXYnE4TThuRWVLQngv?= =?utf-8?B?NHJzMFlWTlhsZjlQcFl0Q2tGeURJNDgvSmszdGFPNDhxcnFMVW9VQ3luK21Q?= =?utf-8?B?aXNkK0JDVVBYd21EM2lHNHJXZkR6Q3loQVRNcEVZckxkZ1NuWFVDM2RWWlI0?= =?utf-8?B?R0hEN1cwVkFwdUVCSUFETkZNT3lwcXJCZjcxdzFaek1RbXVzVjB5TVdxNVd4?= =?utf-8?B?bnRpOEozc0cwUk1ZV1A4d21ibkE2U292a1V4OWw3TURUTkNiR2RzNkx2NUZ3?= =?utf-8?B?N3B3N2ZQdjQ3U282Tm1HdTR2TTVMUDg3TEpFTEU4dW15RldZcnAwdTVJd2pI?= =?utf-8?B?VGhkUUkrZkdBPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB3990.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(10070799003)(1800799024)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?cW1aVkZUR2MwcHZ0NmQ3Z2IySW5Za0pTOVdHMHlodkk1T21GcUl1eHU0RVVU?= =?utf-8?B?WWlKdnQreTlhMTJCdnh6dGcrVHJqN0xURCtIRlJsVlU2aEZUcnBldUQ0WXN6?= =?utf-8?B?ZE05NHVFTW5LVjY3dDVabkgvRTk0U2JOaGxVQlRQL2MxYVhma3ZjUk9kRU1u?= =?utf-8?B?YWt3dXlzZW9KSXJVeU5WQzRyREFDUTlPeXg2NWJOeWdSbDkxVW9RWGI1R056?= =?utf-8?B?cUhPanVEc2JsV0MwSlY3UVZqOXVnN3A0RTVSSzhGMThkT3E2dVd2R3ZyZGY0?= =?utf-8?B?NDVSQWV1ajB5Z0pmTCtWeElzS3hIU1BLUVVIUjVoRkFkdXBLVzdHbkxJMmRC?= =?utf-8?B?RDc5M1Q4WmMzbU9GdVlTZC9yb05hZ25ZTnplUHRsSGx3Z1NEdDZxNzNJYlE3?= =?utf-8?B?OGJ4MThhSXhsYVVSQ0xINER1MStpREtXNWg4SStCY1hWSnZOakNZdzVCMHBv?= =?utf-8?B?UUZ5dkRLWDR1OVNaRVJ5SkIwNW1iQ1NYS2JCMXVLendDVmU5dFFKMlg4akhr?= =?utf-8?B?QW9iTDBpNVdURVczcWp3dHNEUkF0TDNRZzJYaVMvQkgrZm9wb1Z5SVNVTWFa?= =?utf-8?B?aFFHYmxBcTNDTUswUU5qLzNXMTc1QlhlMVc1MmswcEZvaTFOalRuT0tpRUNE?= =?utf-8?B?enJwQlFxa0QwdDIxMmFFYXF6L3h1MitQemQ3d2Q5MEx3M0JZRmZyQ2o0Y0ZD?= =?utf-8?B?VEpWOXkxQVhCWEhML3hGajdJSUx4SVQwQ2l3c2tJcnBzeWQwNWlVMk1kcW1p?= =?utf-8?B?TVd5Vjg2U0RDeVZZOTA0d3I2RzJkcDVEdzZkRUpJd0JHb3UzZ05SYXFGS056?= =?utf-8?B?UGxrUWF3S0xJMlA4NXIxZ1VCOUhZS2RGdGxkM0dFSlAwR0tDeVlHUW5ycW5r?= =?utf-8?B?VzZEOG41ZXhlYUlrU0t1d21rUEZmMFNYOVlTYW83dy9aellkeXBXcG5DUUZs?= =?utf-8?B?VFBESE4yUlE2cFdJS3dRTEJwVmpKSG5GR3FIanJlZURGTnE5Y0pzZit3dk9G?= =?utf-8?B?elJ5SmhEQkQ4WnBxZWRUKzFCN0JRbU9yVU9UcWtYQXduSDViWStwT20yblNJ?= =?utf-8?B?QjRKQnpyYm1NdUtOQzhjSmp4eFlKU1pXcW9hZTBKWDhZNzVrRlZyeDJ4ZWZJ?= =?utf-8?B?U09QdU82N0VHVmZsZG52V2JDRFE4dWhIY1hVa1BoS1VoNjFPK0FKUWNrQ3FU?= =?utf-8?B?ZVFkbFgwMmJMVm1tM05Ra1dXT2lMMWt2TlRQbGJLcFhxcGxCcXhkeGVuZUJn?= =?utf-8?B?K25xdkd2MVNKeERXZ05rV3VjdHdnVnJmelB5R1EvLzkrSUM4aFRzekJFK2Ru?= =?utf-8?B?VHZNK0hpcVNZajJsWmZGYkJYU2VIL21vVjAzSHBUdDVFV3BmYy9idFpYMC81?= =?utf-8?B?ZHhUb1FaTjVmVnFUZGlrQjBHYzFpZlBoTVhEMEtMTmpTR3FzRlQxb05vVXN6?= =?utf-8?B?T1NBNVRXWXJwSnpEWkNuMk9udmJwcUlsTDdwakE0dEdFOWxOM1NJNFJCTGx1?= =?utf-8?B?WWh0Z3QyTkthUW1LSDlMQkhJdHhmUVl1K2pYajNqVlBZSVN2NFRKZmZCcXpr?= =?utf-8?B?eUpWcld0dHBhVUdSeXpOUUcxZFNQUU5pYnVHNVJCemdKRXhSQjVRTmhKM3dk?= =?utf-8?B?eTdtbGhEYVpUcXhjdkVoMzFnTE9oN2lGU1VuUmU5YlZ0ZGQ3Vmp2ZWZPbXNj?= =?utf-8?B?cDA3OXdydVF1WWsvYW11enZiYWZyQzMxWHJRQVorYTc4RlladndLNDBuRllL?= =?utf-8?B?SXdJSGdnWjhQT2J1N0JHbUZvVW9NNnQ0cHpLR2w2ZE1qSFJyNDN5NDh6N2Rt?= =?utf-8?B?bnk0NnRQbW43K2NkNUp2UWxOTG9uY0ZkZWJvR0Fac2pQdi8yWW4zSXhEUW5Q?= =?utf-8?B?N0Y0Q0xncTdQeElxRkNydHoyWlFUWXg4L01wMkdxanFJQWFYOFFxYjQyUGZy?= =?utf-8?B?TFR1REwzWWVZdllTL1hkb0RjMk9zZFB1anZZL3RxN1BNUGE4Lzd0b3ZtVFFE?= =?utf-8?B?RTRYd2RsaHMwMVdSdjFZNVlMRkJIa0tVWEpsOHFiOGpUODFuM0tlVkdYWDRt?= =?utf-8?B?ZjBQWTRnNm14aFdkV0ZJQ25YVnA1czd2VUVRd1llRzg2UHZBYjF6Sy81R0JG?= =?utf-8?B?NnNhOEZRSml2UFltNzJsd1VyeVl2eDMxMWtjSVMwL0tCcGpCWld0aVBkejd0?= =?utf-8?Q?7n21IkO5dLAMunLOicrZ9Yf3LvT01lC1d8FZF1LFv+eS?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 41089990-dfc3-4d35-02b1-08dd8005b08a X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 12:20:08.3006 (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: DHCZVzA93YC5bad38w5hlnpIBIONlAjkmawMtEYx0awdk9U0eCPLvseUmuwCFAuYGAD0oDTINqBLtIIySph4dQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 We will need to perform things like allocating DMA memory during device creation, so make sure to take the device context that will allow us to perform these actions. Signed-off-by: Alexandre Courbot --- drivers/gpu/nova-core/gpu.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index 9fe6aedaa9563799c2624d461d4e37ee9b094909..19a17cdc204b013482c0d307c58= 38cf3044c8cc8 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -183,7 +183,10 @@ pub(crate) struct Gpu { } =20 impl Gpu { - pub(crate) fn new(pdev: &pci::Device, bar: Devres) -> Result> { + pub(crate) fn new( + pdev: &pci::Device, + bar: Devres, + ) -> Result> { let spec =3D Spec::new(&bar)?; let fw =3D Firmware::new(pdev.as_ref(), &spec, "535.113.01")?; =20 --=20 2.49.0 From nobody Mon Feb 9 07:22:46 2026 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2057.outbound.protection.outlook.com [40.107.244.57]) (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 A87A31E98E8; Sun, 20 Apr 2025 12:20:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.57 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151616; cv=fail; b=tUk5Xc2RfcYlNan5CnN+Q7CEGt86C/i88r5FiS4/ltf1E0fSzCcJDprOkSkps5FT/AzecA4qb1vstngFaHKpC8qhdmFkTRzbMab1qQhdWQiHCGnfw2rutTOc3bwkSrqLIrncFNJYrH8rEoUqlW8IiQykHVPdKROAMeSuN0p6bLw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151616; c=relaxed/simple; bh=jhNX8Hf0RAO5arE9Nn6I3dPuPjlLV0J/r6g8RZ+2pTk=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=HCCjC6QvzqBG8Kcq/PQWN6270knwJVUQgSRJTvWjSuBioi/KoRLGJu4OGkKck7Z9oPJszonD8y1FdasH/MuSR28UkA7cNRd/yNqbQ3rDJCu8LAkoD+a2vVZILX1sgeYj8epTzhyBrzzuRL/X8J9e7qVRp8L69orgmSnmA6F5cEY= 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=QYSXpR8M; arc=fail smtp.client-ip=40.107.244.57 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="QYSXpR8M" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=ybrzYRz7PoxCpX6wCKBscoCfQZBOK4uqQNpcLb9WXzLHEFxx3Vhepln/4QVC5EVTIc3cs08ZvKPbxIPnyWYtvhbPO9e6FPgoAa8Zhy4dchrc6T9SsIZGR3Cmv12S585IP/a21ST1oCK6uu2qlzf3h7J8r1raiql1ndg4TaWlklS6yTNH1+toF7iDbTS8q6CuR5vFESmrCqnQQDzqdSeLzZCVyjthHcu34RoCArmqilbkB+WROrcTTnvqJ3ys3L/QePvAeNxHFdEWya4zf/D1NTgR501BdtZ6d5NEK+uq5mukpPe+2L3N7OuM9uiSB5nEPzsRw4thfj7gwMbYymAj2g== 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=8ZfmoFrp/WsGmA+wdzIM2RG2s6FVeuYL/YMW9fghwKA=; b=mAGL+M02jzbQO3vxRG6+iAHpMts+WifsPSaIY0LVMjjhhNK9Ap2l/5z93ts33OVLOI1xL8He2LTfGwAzeTJAtaeYggCozFcbfLKOQ9iad7/dvYW9Rs8i5LZGiVjJqukX3Ivl69Ws8fB+HxMLqXfxKwJaJN7fA42jkb+8vJqdVQ6NxVyuBn0hiWcStcJbACl3AlmdoJfq7qPqb7DmJ7KK+LGfXBYlFL8uw3ynNwyRRBwgAeBK4Tao1xxPb4rBy29PgXOhwlSHuml9G4iJPWtDX3PkLWcCFLLXffw3Gl4CeK6VL7wAnVU2GvJez+gAm9GMrAkymwFQLp4rOZhyrjdycA== 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=8ZfmoFrp/WsGmA+wdzIM2RG2s6FVeuYL/YMW9fghwKA=; b=QYSXpR8M2YTAQUiADR6+i3QC+ILYcljvqqKTR6NsW30DIigaUkE9qLkQM1a3uxhCBjqm28ci/QUZ3yT0FIQ8MNdSZnLVqpY2fsBmW7shzU7wNzVoluKWNqZJFEvHWHgsbcXvwBkPEfGmcZJpUSSaG+ep+0X+TwDXP8+q4sedLNut7vfc1aaY9J6wHMpairOyrHFNeAM+/3fPRWWx6/l8LIT0ocZYY45cMDKpvlqQD/THO5wL5BaUNgTqUwvG0a9OmrA/bXhb8ZBrrGuQ/Jgpu+fbBqxLMWeYIVi/GHNIR2qDDVvh2NKfEC53nljDZc9uqkF4jQv6XlwyAnVQf9YIpg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr 2025 12:20:11 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99%4]) with mapi id 15.20.8655.025; Sun, 20 Apr 2025 12:20:11 +0000 From: Alexandre Courbot Date: Sun, 20 Apr 2025 21:19:38 +0900 Subject: [PATCH 06/16] gpu: nova-core: define registers layout using helper macro Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-nova-frts-v1-6-ecd1cca23963@nvidia.com> References: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> In-Reply-To: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: John Hubbard , Ben Skeggs , Joel Fernandes , Timur Tabi , Alistair Popple , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alexandre Courbot X-Mailer: b4 0.14.2 X-ClientProxiedBy: TYCP301CA0045.JPNP301.PROD.OUTLOOK.COM (2603:1096:400:380::18) To CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) 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: CH2PR12MB3990:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: c4d85820-0b41-47e2-86c0-08dd8005b251 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|10070799003|1800799024|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?U3dPc2dGNHA4WkNzcHdZRkhkUTZZOGltb2l3eTc5cmkvRkNrWDF2YjhLQWhR?= =?utf-8?B?RWhBV3djVmNreG1aQ2VQVmtYRFVNaHJ0bWVreEUzcktJNXg2dXFoUlhRQ2x6?= =?utf-8?B?WUc3bHRkYldjMW9PUzg1NHFPTTVSaWdzcXJ4c25uOTBlaGVCaXZhZk9ibDZo?= =?utf-8?B?dkppNjlYRmoxRTZ5OGFFUHRnak5rQVBkRG9YU1A3V0JpeTA4TVM4RlZTRnFt?= =?utf-8?B?cEpzTEhnb0xUSVhaSmdxREQ4RjVWVU0zUjhKbENRTVdtSElrVlRFZVA2STZm?= =?utf-8?B?TVRZekRnV3pSVmZyakV2MFNJVkJobmd5WUVTNDZ3RHhETFhsVHFNcnNOb2NI?= =?utf-8?B?ZjErNWJMbWdKYndhOUJWSVJJb3J5aWxKdlhiUXFIbVl2NFdHczRxTU9ObkhH?= =?utf-8?B?Z0dEbUxsTDhueERJTVRWSVlHV3dNRmt6bTZqWmpZYmQwckltYmNqRmUvSVZR?= =?utf-8?B?Y0o5ZGJvZlhRSWFZc0lkRWdZTW1ZeDZyUE5HaEE1OUQyblUrOXVCNTJDZ0xJ?= =?utf-8?B?RmZVYkk4M0tESHRjc1ZjSXp4blNjaHpQMjROU1VxMmRYLzRHZzltazRWUk1x?= =?utf-8?B?TnJUQVEyM1p4OW1rSkNzRkFmV1ltNjBxR0RkZDk0UFJpQktRUnltbUhUUE5j?= =?utf-8?B?S1VPYzh5aVllSjU3cTlKV3pvbDl3T3Z3OW9WUCtQTTR6ZE02WFhhbEdUY1l2?= =?utf-8?B?dGR0VklMejFPODZ6djlTSnpJYVdkR1JycVovYWdSNzA5OFNiYk5YbFh6WjZt?= =?utf-8?B?NzFtbDg0RW1TMmVYNW5UOUhUUjdZS2JTa01yL1JNK3JwSnZHQ1EySEhZZWY3?= =?utf-8?B?ZkZLNmxzK2Y2WlkreUhxcmJVSWU1WGxpYk1RNnUxZVVlRWFGei83R2dJTnRw?= =?utf-8?B?dHNyUi9PYTlaUFI3dHkwckVUR2JzZ29QdERBcHNQYzZxSWRCcUZCMjBXRlVu?= =?utf-8?B?UEJYR1NEdTZEdUlwbWkzV25CUFJDWExOQUtNWTJSSHF2ZXprQXo2dEdoVUpS?= =?utf-8?B?NEdqTW5BWmRreVQ4cEFOS0g2bzZaWEVHZll3eEJLZHNLVDUrRDFyekxkbWI0?= =?utf-8?B?b0R3cmQyakVQSEZJaVhjZ1lwTUpsdDlwN0hvNjl3eG9weVQrOUV2RXlHUUZ3?= =?utf-8?B?UzkraU15dFczMVhyZUlZdkZ6MnA0cmlBMGVURVU1UTBwdUJySVdJVVB0Y0ls?= =?utf-8?B?OGY1UzNvUThXVTdtdlFPMi8yNUVZVnpoQnh2d082UWtHMGJYVEl2SVVWQVlY?= =?utf-8?B?amU1TGZpZHJ6aGRKdlo3QitPNnlsb0pBZlV5VDRVaVRIR0JWMktVamFsS1Nn?= =?utf-8?B?OHE5ZVJsZDhwNEJWZE5PSzJRWlZQeE9WQ2dxSXdPekRWeTUzb0ozam0yNHAz?= =?utf-8?B?T0JMRGthZjUwQW5uaEdELzJjbWxYdnhsV2FWNlB1d2NGVXo2bDJpY1c3VUtt?= =?utf-8?B?UG1paFZkTFJ3OHlDYmRicFVMdXQrMWUvcVVuMmVreVBOZkVOQWJkRkhEUTFQ?= =?utf-8?B?N2FmM3Q2RldKT0UwSWNvOTJmdXBPYmJsWVk2WVlhRTJGem9PZ3RsczVRdEpK?= =?utf-8?B?R2l3MHJDOGFFTHFkTnZoVjZqZXJpaXV2RkRmSVZEYVloakFqb1dJS2lreldH?= =?utf-8?B?QkMyZGNOaTVmaG5zTkhoSHRhcFVLSWtWT2N4R0x2UnN4UCt4a3F4dlpKVk94?= =?utf-8?B?VHMvZ0VmYkpoUnBFS29UQWRqeTdJS2JiSWJjMGdSb1hSNDhBanFhRC9qMGVE?= =?utf-8?B?NXoxVys5L01nR0JTQ1puRzBhdCtsSzBwcjR0TXE1R04wbDlFdS9CWGhESUNw?= =?utf-8?B?aTN1c3NWQ3M4TDZSK0hXVGhXRU9mS1dyYkpvWlNIaWJnckZUMVI3a2dWQU53?= =?utf-8?B?VUpINWtsditTajV1ZzZoSTJrR1pJRjdZUjFVb1NUSDM1dWhaTHRGZ0lKenMz?= =?utf-8?B?TjUxcURDTGFUVFc0MVhBTWVJYU0rMFVOaHhaN05HZmpUVkliaWdyTFdEazN3?= =?utf-8?B?ZzlHMzNUUjBnPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB3990.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(10070799003)(1800799024)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bjVkRElGWm10T05NZ1F5R0hHeHBGZURDVXlPZFdYZ1J2cVp1MnRndHpjelN3?= =?utf-8?B?NVNmMU5rR3pyN0JiTkczWld5NHRoZWhUNk5EZDZ6SzNIVUxudnFYNEFLeVov?= =?utf-8?B?Yit1cUlveFo0SHFaUng3VXFVV29Fb2FEYnhTdTRnSklOYk5MNDZ3VC9kT29L?= =?utf-8?B?TFozaHF6cnNOZVV0ZGJzS1NWemdCbUlhclNOMG16TndCak1XSzdwTS83a0Zq?= =?utf-8?B?RDZwZEM0SFUxUmt1dzVjcVpiRnNGK2JuQVp1SENSb0psb2ZIZUM1TmsxYVZ4?= =?utf-8?B?K0E1SWJ6NXhJRXk0d2swV3pySXNhQzZYMTlhMlBrb0g3aG5jMzV2cmE3dVNx?= =?utf-8?B?ODR4UUtBK1JlcU41aXNNMk9aeEhpeERDcERMT0xpaFJNSGdIM2t6RitpWExD?= =?utf-8?B?YldHeHpQVCtOVjRPdytoQVRMVHQ3SXpNa2JOczg1blREV1dBc1I0UlhjTkVo?= =?utf-8?B?NG9DOFJnM0ZQYUx3cngrRzFxM1FDVHVHcWNncEEvajEyNWZrd1FoTmlnK29M?= =?utf-8?B?WGE2dlN6QzREM2VhMGZoMkRkZ0VVSDZHV2NBNEJwTVJoME9CUnRNL3dNakxl?= =?utf-8?B?eEpJWjNXR0NHUWgrQ3krTE1nWTZNZlZlRFYyUlcraU5UMW8wckM0enZxbFln?= =?utf-8?B?MzVOZ1A2ZU1hc3ljeTNpNS8vRmsxNXBKd1lNMnVBNjBrZzNUMWhKZHFZMUJT?= =?utf-8?B?VHV0UEx1S0hMSmRQK1g5OEllalN0cStacnlvSEVyRjl1NklYR1BSb1ZYZ2hE?= =?utf-8?B?dUdCM2hXdGJmL2hrTTEwZ1pHUFdoNUxQL0wxU3h2ejY4cHVTdlUxbEIrbnBn?= =?utf-8?B?MmtmRGUzdTFNRHlLUEREMFp6MEtHa3dzZnMyNDY1cmZrQytBWFAyMUFybkFP?= =?utf-8?B?b1VyUDl5TUUrRFZ6ZVB4KzJ4bVI5alkyandRNzZNOEFVVk5VNUUrdis1dzc5?= =?utf-8?B?SnJyL05PeFJxZ2F0TFNyWFhHTTdTU2libjN0eFlMWGlGc2xTQ25WMm45clVJ?= =?utf-8?B?MTl0WXJqSEJFUGxEVGN4L21pVElEdTVGdWlzb1FVR1ZRaFNnbC84Wk5WanFz?= =?utf-8?B?NkJyZ0NCUnlIT2oyU0JXcHVZU1VXU3FhelMvTDQ2MEkweFlaQyt5WE55Ny9J?= =?utf-8?B?M0lkbE1EVm5nS0c4TWkzZ3dybWNzdXJWV255emVNR2xnL1dBR0U5aDNmT1ZT?= =?utf-8?B?NFlwY2krajBPQXI2b2M3Nnd0OGhxZWI5WmJvbkxPR1BydU9NRnl6bW9EM2Z6?= =?utf-8?B?Ly9iTXVBUEJ2UGQrZVc3NzZ1ZWdjYkZ2UjhtYWhDRlJUUHQ0RXVTMHJBSlJk?= =?utf-8?B?OSthODZkRzd6cU1QQkF2Nng1L2ZSdzNIMSs0RTR3MVpiejhUcFlHUlVRWHJT?= =?utf-8?B?TjlDbGVyZXlxUHhwOElrS2pTc1BKR1FHVHpBMVZEU3hha0hWcTZhQThzbXZS?= =?utf-8?B?WFZITGpueWRDUDNoM1FZeWZkUTgyMUlURXcySkNnUytlT29YWnhRVksxTHJl?= =?utf-8?B?YVk2WkRPckkyWTVtMW5oNjd1c1VpQml2RUNQSTNtcUl6K2lkVy9xSWZUM0tP?= =?utf-8?B?MVpTUmdSR0kwTnRzWUdwRFpnTFRBRVcwT0J0SGlpWnN0Z0FlU043SEVWS3Nw?= =?utf-8?B?UStxbkVvYysxU1pFcVY5dUROTFNDTWpZdG5naGRMa1lSalhTQU43MEJYbC9z?= =?utf-8?B?WEplWEZNNUdPaGE5Z2hwODExaS83R2dCOFlTM2IzTDRHZVY1OVl5VEVnbXFi?= =?utf-8?B?M3plR1QwbEYxNEF2K1pCMU4wNzVSZy9RR242VzNlMElCdkRiV2VLSmhuc1NS?= =?utf-8?B?YjdjbHlScEpESC9kSEl5MWVpYjZpeUU5ZCs0bFdZUDlFLzJXVDNCL0dWMXlV?= =?utf-8?B?VlkxbVhmMjQ1ZVJGL3FDOUxrT3NKdVpUM0F2RkVseWh4bmk4eDVweG51dCtD?= =?utf-8?B?UXJxRVljaHQ5MUdoUzAxTnFUWU1nV3lvZ0FaNi9uTFFtcGxVOHU1NWNEcFow?= =?utf-8?B?eDhTNDVMeVcvYnZNeHhya3pvS3JlN0VRQklJcDkrYVI1N3NsUlJkVnBheGp3?= =?utf-8?B?ZjBsd2dseEJLTUJMRDdLSzJOTXkrL0NGU3k3eVBBU1JsOVRsU0VONDlhRHNR?= =?utf-8?B?M2l5Vk93d0EzSTVDaHBZTHlaSThNSG5ZUVBHYlY5d1QwNVFXK0xwM2FSV0do?= =?utf-8?Q?+9JJDQkBHKcgtlcZj9D9J4DitFB+5cIaoE10lySucZos?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: c4d85820-0b41-47e2-86c0-08dd8005b251 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 12:20:11.2626 (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: h6OqRSSWnOVuXFYkshFToBIxXR85ZNZ95qN/VlgjN/Tz5oBp8exOzKvqgbL0YT4heDonOdZ9t4k8g6rHrtHWhw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 Add the register!() macro, which defines a given register's layout and provide bit-field accessors with a way to convert them to a given type. This macro will allow us to make clear definitions of the registers and manipulate their fields safely. The long-term goal is to eventually move it to the kernel crate so it can be used my other drivers as well, but it was agreed to first land it into nova-core and make it mature there. To illustrate its usage, use it to define the layout for the Boot0 register and use its accessors through the use of the convenience with_bar!() macro, which uses Revocable::try_access() and converts its returned Option into the proper error as needed. Suggested-by: Danilo Krummrich Signed-off-by: Alexandre Courbot --- Documentation/gpu/nova/core/todo.rst | 6 + drivers/gpu/nova-core/gpu.rs | 5 +- drivers/gpu/nova-core/nova_core.rs | 18 +++ drivers/gpu/nova-core/regs.rs | 60 ++----- drivers/gpu/nova-core/regs/macros.rs | 297 +++++++++++++++++++++++++++++++= ++++ 5 files changed, 333 insertions(+), 53 deletions(-) diff --git a/Documentation/gpu/nova/core/todo.rst b/Documentation/gpu/nova/= core/todo.rst index 234d753d3eacc709b928b1ccbfc9750ef36ec4ed..8a459fc088121f770bfcda5dfb4= ef51c712793ce 100644 --- a/Documentation/gpu/nova/core/todo.rst +++ b/Documentation/gpu/nova/core/todo.rst @@ -102,7 +102,13 @@ Usage: let boot0 =3D Boot0::read(&bar); pr_info!("Revision: {}\n", boot0.revision()); =20 +Note: a work-in-progress implementation currently resides in +`drivers/gpu/nova-core/regs/macros.rs` and is used in nova-core. It would = be +nice to improve it (possibly using proc macros) and move it to the `kernel` +crate so it can be used by other components as well. + | Complexity: Advanced +| Contact: Alexandre Courbot =20 Delay / Sleep abstractions -------------------------- diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index 19a17cdc204b013482c0d307c5838cf3044c8cc8..891b59fe7255b3951962e308191= 45e686253706a 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -135,11 +135,10 @@ pub(crate) struct Spec { =20 impl Spec { fn new(bar: &Devres) -> Result { - let bar =3D bar.try_access().ok_or(ENXIO)?; - let boot0 =3D regs::Boot0::read(&bar); + let boot0 =3D with_bar!(bar, |b| regs::Boot0::read(b))?; =20 Ok(Self { - chipset: boot0.chipset().try_into()?, + chipset: boot0.chipset()?, revision: Revision::from_boot0(boot0), }) } diff --git a/drivers/gpu/nova-core/nova_core.rs b/drivers/gpu/nova-core/nov= a_core.rs index a91cd924054b49966937a8db6aab9cd0614f10de..0eecd612e34efc046dad852e623= 9de6ffa5fdd62 100644 --- a/drivers/gpu/nova-core/nova_core.rs +++ b/drivers/gpu/nova-core/nova_core.rs @@ -2,6 +2,24 @@ =20 //! Nova Core GPU Driver =20 +#[macro_use] +mod macros { + /// Convenience macro to run a closure while holding [`crate::driver::= Bar0`]. + /// + /// If the bar cannot be acquired, then `ENXIO` is returned. + /// + /// If a `?` is present before the `bar` argument, then the `Result` r= eturned by the closure is + /// merged into the `Result` of the macro itself to avoid having a `Re= sult>`. + macro_rules! with_bar { + ($bar:expr, $closure:expr) =3D> { + $bar.try_access_with($closure).ok_or(ENXIO) + }; + (? $bar:expr, $closure:expr) =3D> { + with_bar!($bar, $closure).and_then(|r| r) + }; + } +} + mod driver; mod firmware; mod gpu; diff --git a/drivers/gpu/nova-core/regs.rs b/drivers/gpu/nova-core/regs.rs index b1a25b86ef17a6710e6236d5e7f1f26cd4407ce3..e315a3011660df7f18c0a3e0582= b5845545b36e2 100644 --- a/drivers/gpu/nova-core/regs.rs +++ b/drivers/gpu/nova-core/regs.rs @@ -1,55 +1,15 @@ // SPDX-License-Identifier: GPL-2.0 =20 -use crate::driver::Bar0; +use core::ops::Deref; +use kernel::io::Io; =20 -// TODO -// -// Create register definitions via generic macros. See task "Generic regis= ter -// abstraction" in Documentation/gpu/nova/core/todo.rst. +#[macro_use] +mod macros; =20 -const BOOT0_OFFSET: usize =3D 0x00000000; +use crate::gpu::Chipset; =20 -// 3:0 - chipset minor revision -const BOOT0_MINOR_REV_SHIFT: u8 =3D 0; -const BOOT0_MINOR_REV_MASK: u32 =3D 0x0000000f; - -// 7:4 - chipset major revision -const BOOT0_MAJOR_REV_SHIFT: u8 =3D 4; -const BOOT0_MAJOR_REV_MASK: u32 =3D 0x000000f0; - -// 23:20 - chipset implementation Identifier (depends on architecture) -const BOOT0_IMPL_SHIFT: u8 =3D 20; -const BOOT0_IMPL_MASK: u32 =3D 0x00f00000; - -// 28:24 - chipset architecture identifier -const BOOT0_ARCH_MASK: u32 =3D 0x1f000000; - -// 28:20 - chipset identifier (virtual register field combining BOOT0_IMPL= and -// BOOT0_ARCH) -const BOOT0_CHIPSET_SHIFT: u8 =3D BOOT0_IMPL_SHIFT; -const BOOT0_CHIPSET_MASK: u32 =3D BOOT0_IMPL_MASK | BOOT0_ARCH_MASK; - -#[derive(Copy, Clone)] -pub(crate) struct Boot0(u32); - -impl Boot0 { - #[inline] - pub(crate) fn read(bar: &Bar0) -> Self { - Self(bar.read32(BOOT0_OFFSET)) - } - - #[inline] - pub(crate) fn chipset(&self) -> u32 { - (self.0 & BOOT0_CHIPSET_MASK) >> BOOT0_CHIPSET_SHIFT - } - - #[inline] - pub(crate) fn minor_rev(&self) -> u8 { - ((self.0 & BOOT0_MINOR_REV_MASK) >> BOOT0_MINOR_REV_SHIFT) as u8 - } - - #[inline] - pub(crate) fn major_rev(&self) -> u8 { - ((self.0 & BOOT0_MAJOR_REV_MASK) >> BOOT0_MAJOR_REV_SHIFT) as u8 - } -} +register!(Boot0@0x00000000, "Basic revision information about the GPU"; + 3:0 minor_rev =3D> as u8, "minor revision of the chip"; + 7:4 major_rev =3D> as u8, "major revision of the chip"; + 28:20 chipset =3D> try_into Chipset, "chipset model" +); diff --git a/drivers/gpu/nova-core/regs/macros.rs b/drivers/gpu/nova-core/r= egs/macros.rs new file mode 100644 index 0000000000000000000000000000000000000000..fa9bd6b932048113de997658b11= 2885666e694c9 --- /dev/null +++ b/drivers/gpu/nova-core/regs/macros.rs @@ -0,0 +1,297 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! Types and macros to define register layout and accessors. +//! +//! A single register typically includes several fields, which are accesse= d through a combination +//! of bit-shift and mask operations that introduce a class of potential m= istakes, notably because +//! not all possible field values are necessarily valid. +//! +//! The macros in this module allow to define, using an intruitive and rea= dable syntax, a dedicated +//! type for each register with its own field accessors that can return an= error is a field's value +//! is invalid. They also provide a builder type allowing to construct a r= egister value to be +//! written by combining valid values for its fields. + +/// Helper macro for the `register` macro. +/// +/// Defines the wrapper `$name` type, as well as its relevant implementati= ons (`Debug`, `BitOr`, +/// and conversion to regular `u32`). +macro_rules! __reg_def_common { + ($name:ident $(, $type_comment:expr)?) =3D> { + $( + #[doc=3D$type_comment] + )? + #[repr(transparent)] + #[derive(Clone, Copy, Default)] + pub(crate) struct $name(u32); + + // TODO: should we display the raw hex value, then the value of al= l its fields? + impl ::core::fmt::Debug for $name { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::= Result { + f.debug_tuple(stringify!($name)) + .field(&format_args!("0x{0:x}", &self.0)) + .finish() + } + } + + impl core::ops::BitOr for $name { + type Output =3D Self; + + fn bitor(self, rhs: Self) -> Self::Output { + Self(self.0 | rhs.0) + } + } + + impl From<$name> for u32 { + fn from(reg: $name) -> u32 { + reg.0 + } + } + }; +} + +/// Helper macro for the `register` macro. +/// +/// Defines the getter method for $field. +macro_rules! __reg_def_field_getter { + ( + $hi:tt:$lo:tt $field:ident + $(=3D> as $as_type:ty)? + $(=3D> as_bit $bit_type:ty)? + $(=3D> into $type:ty)? + $(=3D> try_into $try_type:ty)? + $(, $comment:expr)? + ) =3D> { + $( + #[doc=3Dconcat!("Returns the ", $comment)] + )? + #[inline] + pub(crate) fn $field(self) -> $( $as_type )? $( $bit_type )? $( $t= ype )? $( core::result::Result<$try_type, <$try_type as TryFrom>::Erro= r> )? { + const MASK: u32 =3D ((((1 << $hi) - 1) << 1) + 1) - ((1 << $lo= ) - 1); + const SHIFT: u32 =3D MASK.trailing_zeros(); + let field =3D (self.0 & MASK) >> SHIFT; + + $( field as $as_type )? + $( + // TODO: it would be nice to throw a compile-time error if $hi= !=3D $lo as this means we + // are considering more than one bit but returning a bool... + <$bit_type>::from(if field !=3D 0 { true } else { false }) as = $bit_type + )? + $( <$type>::from(field) )? + $( <$try_type>::try_from(field) )? + } + } +} + +/// Helper macro for the `register` macro. +/// +/// Defines all the field getter methods for `$name`. +macro_rules! __reg_def_getters { + ( + $name:ident + $(; $hi:tt:$lo:tt $field:ident + $(=3D> as $as_type:ty)? + $(=3D> as_bit $bit_type:ty)? + $(=3D> into $type:ty)? + $(=3D> try_into $try_type:ty)? + $(, $field_comment:expr)?)* $(;)? + ) =3D> { + #[allow(dead_code)] + impl $name { + $( + __reg_def_field_getter!($hi:$lo $field $(=3D> as $as_type)? $(= =3D> as_bit $bit_type)? $(=3D> into $type)? $(=3D> try_into $try_type)? $(,= $field_comment)?); + )* + } + }; +} + +/// Helper macro for the `register` macro. +/// +/// Defines the setter method for $field. +macro_rules! __reg_def_field_setter { + ( + $hi:tt:$lo:tt $field:ident + $(=3D> as $as_type:ty)? + $(=3D> as_bit $bit_type:ty)? + $(=3D> into $type:ty)? + $(=3D> try_into $try_type:ty)? + $(, $comment:expr)? + ) =3D> { + kernel::macros::paste! { + $( + #[doc=3Dconcat!("Sets the ", $comment)] + )? + #[inline] + pub(crate) fn [](mut self, value: $( $as_type)? $( $b= it_type )? $( $type )? $( $try_type)? ) -> Self { + const MASK: u32 =3D ((((1 << $hi) - 1) << 1) + 1) - ((1 << $lo= ) - 1); + const SHIFT: u32 =3D MASK.trailing_zeros(); + + let value =3D ((value as u32) << SHIFT) & MASK; + self.0 =3D (self.0 & !MASK) | value; + self + } + } + }; +} + +/// Helper macro for the `register` macro. +/// +/// Defines all the field setter methods for `$name`. +macro_rules! __reg_def_setters { + ( + $name:ident + $(; $hi:tt:$lo:tt $field:ident + $(=3D> as $as_type:ty)? + $(=3D> as_bit $bit_type:ty)? + $(=3D> into $type:ty)? + $(=3D> try_into $try_type:ty)? + $(, $field_comment:expr)?)* $(;)? + ) =3D> { + #[allow(dead_code)] + impl $name { + $( + __reg_def_field_setter!($hi:$lo $field $(=3D> as $as_type)? $(= =3D> as_bit $bit_type)? $(=3D> into $type)? $(=3D> try_into $try_type)? $(,= $field_comment)?); + )* + } + }; +} + +/// Defines a dedicated type for a register with an absolute offset, along= side with getter and +/// setter methods for its fields and methods to read and write it from an= `Io` region. +/// +/// Example: +/// +/// ```no_run +/// register!(Boot0@0x00000100, "Basic revision information about the chip= "; +/// 3:0 minor_rev =3D> as u8, "minor revision of the chip"; +/// 7:4 major_rev =3D> as u8, "major revision of the chip"; +/// 28:20 chipset =3D> try_into Chipset, "chipset model" +/// ); +/// ``` +/// +/// This defines a `Boot0` type which can be read or written from offset `= 0x100` of an `Io` region. +/// It is composed of 3 fields, for instance `minor_rev` is made of the 4 = less significant bits of +/// the register. Each field can be accessed and modified using helper met= hods: +/// +/// ```no_run +/// // Read from offset 0x100. +/// let boot0 =3D Boot0::read(&bar); +/// pr_info!("chip revision: {}.{}", boot0.major_rev(), boot0.minor_rev()); +/// +/// // `Chipset::try_from` will be called with the value of the field and = returns an error if the +/// // value is invalid. +/// let chipset =3D boot0.chipset()?; +/// +/// // Update some fields and write the value back. +/// boot0.set_major_rev(3).set_minor_rev(10).write(&bar); +/// +/// // Or just update the register value in a single step: +/// Boot0::alter(&bar, |r| r.set_major_rev(3).set_minor_rev(10)); +/// ``` +/// +/// Fields are made accessible using one of the following strategies: +/// +/// - `as ` simply casts the field value to the requested type. +/// - `as_bit ` turns the field into a boolean and calls `::fr= om()` with the obtained +/// value. To be used with single-bit fields. +/// - `into ` calls `::from()` on the value of the field. It i= s expected to handle all +/// the possible values for the bit range selected. +/// - `try_into ` calls `::try_from()` on the value of the fie= ld and returns its +/// result. +/// +/// The documentation strings are optional. If present, they will be added= to the type or the field +/// getter and setter methods they are attached to. +/// +/// Putting a `+` before the address of the register makes it relative to = a base: the `read` and +/// `write` methods take a `base` argument that is added to the specified = address before access, +/// and adds `try_read` and `try_write` methods to allow access with offse= ts unknown at +/// compile-time. +/// +macro_rules! register { + // Create a register at a fixed offset of the MMIO space. + ( + $name:ident@$offset:expr $(, $type_comment:expr)? + $(; $hi:tt:$lo:tt $field:ident + $(=3D> as $as_type:ty)? + $(=3D> as_bit $bit_type:ty)? + $(=3D> into $type:ty)? + $(=3D> try_into $try_type:ty)? + $(, $field_comment:expr)?)* $(;)? + ) =3D> { + __reg_def_common!($name); + + #[allow(dead_code)] + impl $name { + #[inline] + pub(crate) fn read>>(bar: &T) -> Self { + Self(bar.read32($offset)) + } + + #[inline] + pub(crate) fn write>>(self, bar: &T) { + bar.write32(self.0, $offset) + } + + #[inline] + pub(crate) fn alter>, F: FnOnce(Self) -> Self>(bar: &T, f: F) { + let reg =3D f(Self::read(bar)); + reg.write(bar); + } + } + + __reg_def_getters!($name; $( $hi:$lo $field $(=3D> as $as_type)? $= (=3D> as_bit $bit_type)? $(=3D> into $type)? $(=3D> try_into $try_type)? $(= , $field_comment)? );*); + + __reg_def_setters!($name; $( $hi:$lo $field $(=3D> as $as_type)? $= (=3D> as_bit $bit_type)? $(=3D> into $type)? $(=3D> try_into $try_type)? $(= , $field_comment)? );*); + }; + + // Create a register at a relative offset from a base address. + ( + $name:ident@+$offset:expr $(, $type_comment:expr)? + $(; $hi:tt:$lo:tt $field:ident + $(=3D> as $as_type:ty)? + $(=3D> as_bit $bit_type:ty)? + $(=3D> into $type:ty)? + $(=3D> try_into $try_type:ty)? + $(, $field_comment:expr)?)* $(;)? + ) =3D> { + __reg_def_common!($name); + + #[allow(dead_code)] + impl $name { + #[inline] + pub(crate) fn read>>(bar: &T, base: usize) -> Self { + Self(bar.read32(base + $offset)) + } + + #[inline] + pub(crate) fn write>>(self, bar: &T, base: usize) { + bar.write32(self.0, base + $offset) + } + + #[inline] + pub(crate) fn alter>, F: FnOnce(Self) -> Self>(bar: &T, base: usize, f: F) { + let reg =3D f(Self::read(bar, base)); + reg.write(bar, base); + } + + #[inline] + pub(crate) fn try_read>>(bar: &T, base: usize) -> ::kernel::error::Result { + bar.try_read32(base + $offset).map(Self) + } + + #[inline] + pub(crate) fn try_write>>(self, bar: &T, base: usize) -> ::kernel::error::Result<()> { + bar.try_write32(self.0, base + $offset) + } + + #[inline] + pub(crate) fn try_alter>, F: FnOnce(Self) -> Self>(bar: &T, base: usize, f: F) -> ::kernel:= :error::Result<()> { + let reg =3D f(Self::try_read(bar, base)?); + reg.try_write(bar, base) + } + } + + __reg_def_getters!($name; $( $hi:$lo $field $(=3D> as $as_type)? $= (=3D> as_bit $bit_type)? $(=3D> into $type)? $(=3D> try_into $try_type)? $(= , $field_comment)? );*); + + __reg_def_setters!($name; $( $hi:$lo $field $(=3D> as $as_type)? $= (=3D> as_bit $bit_type)? $(=3D> into $type)? $(=3D> try_into $try_type)? $(= , $field_comment)? );*); + }; +} --=20 2.49.0 From nobody Mon Feb 9 07:22:46 2026 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2057.outbound.protection.outlook.com [40.107.244.57]) (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 DF53E203717; Sun, 20 Apr 2025 12:20:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.57 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151618; cv=fail; b=tJvWHIVMUz5+WRoc2P6gg1f0DWXo+LHJyCXR7X56XA0hoW3O2DN9ieKyFYmL41MYiSQ8a5Cs68x44Z6WltFwFQfyHTkRZd9pSkPKN7z0yYS9V0+Cy2q3fMQl4tBI6TBwCJPCmdB/H03IxEn15OblAZ11zfE1LQzREbyzAfDSv3A= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151618; c=relaxed/simple; bh=LaykDE+y/W5i4K8Du4yC2ZUJwU+2TZLX4L95G6rnyrg=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=sJhSHJCs2fjStqW4VntSQrN7mA6lh6m1BggRuRJmCzyNhCaBdMKIXQwRxuGOD8MKFjTPF+Na4C0+TzoE+3c5OwoDxq87SYC0E7yHd4ZJ3MWuBNYeIqjKE0HCEjyLdhW7yY7MZvCCzUbAaiLZg0R+3H+bripYakAYBF/S4D83YO0= 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=t6FpgVjo; arc=fail smtp.client-ip=40.107.244.57 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="t6FpgVjo" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=TXhLu+jiu6ZIQZFThgxXeLeU4c4nL9O8Kev/tJ2TvaRC4v5NscqxHEXqXlFSpHkvSHEBSpmHRvsUr8Fj8xNB0tO078rh4hwkRggrcVoGj6MeimnPZvEHMfhhJyddPbjkp56rU6iQtKkGImUpZeuo/gbeyuN3vGOf7Hkfkm6CJxuQFZEqDLpM9SXjbRtDqpbuiHTVoUuYChH+PiM9VHKMLE6Yz4PHL9Hqd+/25fy9bJ+wV+PsJTkjjLYgN1/8oBKf0TNBq5EHx2kXfYrPYj89QbLBWGkxyXYkbnaJ2BxXVhg3r6sY03Ds+hcDDj7g7zSPwYcih6Bs6izf51oK5sUsUw== 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=D8AXLmAd8tujzUv0gLs6/7pbTaWcH6PJlcstTGLqhDI=; b=HdYkerB1WdtRAZDCrt5sNAHoPK/fc83gwK3NLNuO4Hw1o83VSgrRz9w5ipUnaz2SNGBDZa3b9j2b1kbLfpcybSoNixnrdBsTr6NVNbCMC9sic9Lva3UnaJPS9w6WHAKh8J6as9caRDrbuqG3zhLROhej6xaMC8OdDLAJ7tkairTJXuVAHKfrBVjM4IWt/pnyZTpHdN6oU2he/CL/FqfshgKyInPdQlOMaqiWs+e3j+MQJ3Jrh+wN5i4RDW5VsssbND6g44BWJlF82xgxsy6mG7Ys7tME9sl2F1MtcfFi0jqTLbCm8/5Qp8/fST+khJaAqKHQm4sZZkFzd322sPasng== 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=D8AXLmAd8tujzUv0gLs6/7pbTaWcH6PJlcstTGLqhDI=; b=t6FpgVjosXeQ0YfDJP7unq1WCF3uEnHiEBzn14aqKZihvLs9sfHH30mncXW7mDM9Q9awO6/MFGMmPE9bosSZZEtezlIXIpD09Uy1ry3LiVJwsNei1mXVadw5ZlPRGoGeplhqtiv7DgSHsHJFfsK39UhGcNf7StTq5OmTSJxKIv/rnDa2LoWIzO+s7Ns77nX2LiGEQ43QHHz9iyIUrif0wJGbaJYPJ2DA4+xRJUsWe8LPuZjfeVgL28daft7pYaye88cwTiabT2Z46/bSo+abNx8v3hNFHD/G8xiqcZ/4dhU/dC+jvZ1Fn3DOsb6iJIWtmk56m3AZgjg1zAphUcwVCQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr 2025 12:20:14 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99%4]) with mapi id 15.20.8655.025; Sun, 20 Apr 2025 12:20:14 +0000 From: Alexandre Courbot Date: Sun, 20 Apr 2025 21:19:39 +0900 Subject: [PATCH 07/16] gpu: nova-core: move Firmware to firmware module Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-nova-frts-v1-7-ecd1cca23963@nvidia.com> References: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> In-Reply-To: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: John Hubbard , Ben Skeggs , Joel Fernandes , Timur Tabi , Alistair Popple , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alexandre Courbot X-Mailer: b4 0.14.2 X-ClientProxiedBy: TYCP286CA0110.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:29c::17) To CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) 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: CH2PR12MB3990:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: 8f318cf7-85cc-4066-ae1c-08dd8005b44a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|10070799003|1800799024|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?bUcvT0NQVW8wa2tudGljckRWTVN5QytnSmNsVWRnRVVNTHpKS3plR3FqemFz?= =?utf-8?B?VzlGcWswZ05YOGlaZjRXT1FYZExtQ3U5WlAvRXJ6bVNoR1phYklmMG05OEQw?= =?utf-8?B?Y0NxY1ROVWd0Q01ZaTVWTDlCK08yQStWa2pvZmdPRUtacUYrZWRwUTAwcmpR?= =?utf-8?B?TllBS2ZhVVlmQWxYTHJSNURsMDczT1grdjROc0NDZk9aZmlkeWx6OE5HRjJl?= =?utf-8?B?Q0c1VkZscHhObCtxYm5keE9qbHNEN3A2M2dDTWN2a3cwZUo1NWFqRCtPeUZZ?= =?utf-8?B?d1NuR1lLV3lnOVFwbGtuUExxNXl3anZTVjEvWVhhSmpSVjVEbjN0WGlVeDJJ?= =?utf-8?B?N0d5YjgvbEdFeUxORUs2cW9ydm1Sam94bFlEcVN3b1BINTkxRm9lQkd6Y011?= =?utf-8?B?aWM3amVIa0VCR0Y5RWFUVERpVWk0bmVVcXd4MjR1angzcnpoTkRaUS9Mdm5m?= =?utf-8?B?T2t1TGdKQUtlbFhQK1lkV01ETm41NUxobjkxek5hdmtqQlo2NkhJMlZCY01W?= =?utf-8?B?MVpkMWRyYUoyeVZQN3YxcTJ0UzI0eXlKMGRoVHNuT0ZnVW95MTQ4V1ZlRGl0?= =?utf-8?B?dWg1L1dzOW5ySXBLT3h6RU9XbmtmU0QxaHJDc2V5cVpkZ0NOQUdFckZ5WGVH?= =?utf-8?B?ZkpQV0U1cEN6RWVKWXBJVlZoekVid3hlNFFxYkhjcERHUTlBWExRRnVQWW9X?= =?utf-8?B?VUdLZ1htQ1hsSWhDKzY5WkN3Z3RJQVlkT1N0ajh5RTZVUk1JZEh3dnMxM2N5?= =?utf-8?B?SndUY0RET1VOWktMNklGN1ZzZStYOVJGckVlckVQeHJjK1lpZ0NjOS91MW03?= =?utf-8?B?L2NvWlcxcFlyLzZ5eXh5OW1nMkhQYkVsQkxkTGhTOHlMbDJ4QXNKMFp2cmNG?= =?utf-8?B?VnZyQ3R6SWcydnhYNEFJWmNGOFVtTStRYm90RjVwUitaektHMzJocFlpTmNR?= =?utf-8?B?TkNBZkRYRFViNTZhb2p5cjhiQjhqVGM1SWEwY2xBZjVoUmR6ZlpnSkdueTlk?= =?utf-8?B?NmVHNlo1TmI5ak5TNUltV0gyWXBmQzNvZ016V053cmJqRWxuSlp5QnNmWHN5?= =?utf-8?B?RUFPWXpScHc1bk03cVJwSGw2SHkvbFZCaHZKTlhrVlZJNHhGSjBSelcwY0ZJ?= =?utf-8?B?VlJVVHhaV1ozbVdoaTBjRDBUcTVoeER3Y1lQcG43RU8xS1hGVGt6TlM2RVk2?= =?utf-8?B?VmJ1OWprV0V1b1ovc0lFYW9Lbmx5eWJZUTg5NTlNR0UvZGlldnNrbTBFdUNG?= =?utf-8?B?bG1pQWZ3eUQvYjFZMFRrdmdiSGFTT0s3blltQjJVM1V4U1RlbDQxaVN3ckpH?= =?utf-8?B?M0NnZ2k2SzFzS083WG5ZZHpuOUE4b0F4d1g2MnVJb3JDY1NISk5Ja2ltbHo5?= =?utf-8?B?RHpvaEJPbW1KQzRXODhNRjlQYithUExrNHhtRnV3NW01dUhGa3dzOElYbXBv?= =?utf-8?B?RzZUZlYrNjhZZ21ZTjN6cmFEajlzRG9MaGw5V3Z5NlpLMjRJNS9zMzNWY040?= =?utf-8?B?dEJDU2Zha05RdENVU2xFWTFmZmZNN0xNejdFVFFIS0FOL2NkQ2w5bWZyMGlY?= =?utf-8?B?MTRYNGhOclpHZjY1UElBY2FPWEFkLysxY2toTEpFc2JnRnEzWmpsMmNlZHY2?= =?utf-8?B?d3YvSmE0ek1DbjVYTWhkVC9aYzc4YUJpamtVOUZhOWM1U1Z5SWNJYTRIWjVy?= =?utf-8?B?UXZ6L2ZpckIrZlJueEl1Y3h0NlB5VThIOTQybEFEK2FERHo4ZHZmdG40b2M2?= =?utf-8?B?RFBTYldWN3AwaFRRWWVydzR1TG9jYUtvOUtqUVZvU2RTanZzcnVZZ0ZKdENi?= =?utf-8?B?bUt0bncwNTdjR0JjQnNNRys3RnVOSm1uUU5DNTNDbENmeHM5bDNvNnlxTHMr?= =?utf-8?B?R0JUdzZHbzNXL1l2QlF3Q3FwaVpKV3kvUmdRUEJWems1ZXYyeXN3Zm02ZFNq?= =?utf-8?B?T2lHeDJSOXIwZWF4Sis5eTljeDI3YlhrbGptZW1ibFZCMG5ONFI2NmtRRlEv?= =?utf-8?B?OW9rRUtsZ2NBPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB3990.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(10070799003)(1800799024)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Yjl0V0lVTEYyWkFZcTBPdFM4TTJSSXQxQkRVR1lZOFJ2UWZabVExNmxxVzhj?= =?utf-8?B?dUM2c1FuMnlUVWdCVlJZTVkrbEx5clU0QUhMRUZlVlREclZTa1BwbU14NXcz?= =?utf-8?B?VUY3ZGZMWXphUWVWcExmaUJyNGJQbVJJWTEvaWFrdDFLR3JLaWt1VkYzOUx5?= =?utf-8?B?cmhpUTdIWlZ6bTRyRVdVL3RtOTVta280REVaVEFHSEEvc2VENmJ1ZUJwdklU?= =?utf-8?B?a3U4WEZXeVdrdGZhS2NUbk9jaVBGL1QyanZFRU15U0RiYWRlRlRJT2RmSGFV?= =?utf-8?B?VURiQUQ4R1pqUlQ1Mk5FYmlhVTFuelIxUDMwUHE0UHM2d0NyYUErb0F6dHlz?= =?utf-8?B?S05oK1g1TldFWjlySTJ4ellQUFZzaDlkVy9wUEd1WXlzcGp4eThxWFVPWGNV?= =?utf-8?B?RkYvTUtxcGdiMnl1aHg0cjBEU0I4TGQ4NzNZTzN2SGkvKzB1ZXR3djJoYmpF?= =?utf-8?B?ejh5ZjU1Z0NPRVF2bE94MEdLbEJnWHBXSDlVWEZhZkV4SGVlS09OUzZCNUgw?= =?utf-8?B?Smp3LzFaTndMR0Fsb2tmK0dtdzRtQkdIcTdkMWhGWmdDc1NFaUF4WXBqNThj?= =?utf-8?B?WUdaMWNYTVlUdHZpdUZ2cDZuTHc5ejdDUHhFNHFlZVRDTGMycU1Ud2h0dkNw?= =?utf-8?B?Q08vSm1hQzhnZHVWK2U0TlRKQkZSSkN3OHJIN0lmWHRDN0pEWWRrUkdSbUo1?= =?utf-8?B?bnJmaW01TFV4NUNBOHlFWHRHeEw5am4yZnZCL3FCN01sL3ZHb3prM0tDL3Fq?= =?utf-8?B?Y1BYajVxWUd4NktCdUthNHN2ZHZnN0preDFkQ2hlWHFWU2JDYUIrSHhMK2h0?= =?utf-8?B?ODA1WkEzdWVyYWgzS3h5Tkw5VXdiNmhqc1E1djliNDBsUEdRWlAwUnY3UXRY?= =?utf-8?B?bExBMGhJbTBZZzNLRGl3dUQ5TFJwTXNPa29MdWJBU0NmNjFDQWdiZCtRcHBt?= =?utf-8?B?RTgzb0RkaGxPRjJsMDZCbm04bnNWVFc3dHNja2h0NUE4M3d4VU5FeHZwb0I2?= =?utf-8?B?MnJNbXpmMmJHOWJ6amV5WmNMeHhhWXFsdmVHb1JqUTdmeVN3eStSc1RLeTR6?= =?utf-8?B?TDQ1UFk4MHBHZnlHd2s2OXQxMGlIdHZJT2t3UHdSeWlxMnhkbTJ4R1VEeEpy?= =?utf-8?B?T2pKdGVyV3poaTMzdFRoN05peC9uUFdVU3ZMNTNJSVdxZDFVWkZvMjVqd21P?= =?utf-8?B?M25GZUZyWCtaOGZ4ZFQ2N1I1RU9hRWpHSHMxeCthdnpkLzI4YnB6SThxdVFV?= =?utf-8?B?ZEZCK2tBd2lpRHdEajJsYmorYlpUMjZnRE5SSUlLeURpOWJCMzMzaTRWVEti?= =?utf-8?B?ZzlLSHVwTUNIUmZtRk9xNkVab3J4eTliMEVoaTQ1aTRaSmFDK3ZXQTlHdVc2?= =?utf-8?B?S2NlRWdDcEt2RjRpQ2JrTWRJZ3U3c2I3dHdRRldLL2RHY0Uvd2JRb0gzOHZi?= =?utf-8?B?TWp4YUtoWDNnb0ZMb01ObHJLZkxObXBuM0V0VDNaeWxka1BiMmM2TStiSGhL?= =?utf-8?B?d0tnT25PMGdWVVd3V082cjlIMSs0VGlZRDZKbGZqcU54WTRLTTRwU0h1VFhZ?= =?utf-8?B?ZE5kTUpPZ1FTWUczN1poWUNOZmhKTVVZaVlvOUgvZTZEQjFlbVBTcVowRVlq?= =?utf-8?B?bmJaUWNqMjcrKzhxQlpWQnhUZFMrODI2WWZlVlN1aEw3K2xGUmZCdVA1MlhT?= =?utf-8?B?a3V1VTFaWWJkYVZ0ZGs4UVM0WDVpT3RudFA4eHFxaVFFOC91b0o5amRwb05K?= =?utf-8?B?UnpvMVlaOFpraTVSNEg5MWcrT1hsRFdkcU1TYm1mWnlua0o4OUl5aVNlUUFX?= =?utf-8?B?S05HNG1VN0V3VHBCYzIvZ3FCNjRKTmtXekFUdXdvekNNMHV0TnNZSGgrNm1N?= =?utf-8?B?VEZXTkJKNXhhcEFEODM5ZVZiOURDUEg2QkNjWkcvYXZ6c0prdUxaZldzSGpl?= =?utf-8?B?UE44aFhKRUU5aUxrT2lET01VWVEzQUNVNnJwOWJZYk8vdDZVZFVSVmJqUEdE?= =?utf-8?B?SThjTmE5S1lmV01zQVdtZTBqSHZIV2g5N1lKL0dNM0hoSmNwV0dmT1A3dHo5?= =?utf-8?B?NWI3QVBDclEwdERDak9yVjlBNzFrZU1Ca29hcEtFRm5PWEV0d3JLdkRlYkU0?= =?utf-8?B?M3dTUUo1UDZGV1MyVEhjMnRGdnhJYWdXTFpNdDN2dDZxdDExN1l5ZHA1Smpt?= =?utf-8?Q?WvmjFDBu6ajinTXTBFHCGTLVau3cQI3SIp8h11Mb4GKJ?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8f318cf7-85cc-4066-ae1c-08dd8005b44a X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 12:20:14.5737 (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: KIQkKHuZ0DKobpuLUsYaWJREJ/a+MSYQWINhnwj5we0UIJ4E/WHvXypprNGyMQZbSAxNNLxqWHs2h0wTjr7APA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 We will extend the firmware methods, so move it to its own module instead to keep gpu.rs focused. Signed-off-by: Alexandre Courbot --- drivers/gpu/nova-core/firmware.rs | 42 +++++++++++++++++++++++++++++++++++= +++- drivers/gpu/nova-core/gpu.rs | 35 +++----------------------------- 2 files changed, 44 insertions(+), 33 deletions(-) diff --git a/drivers/gpu/nova-core/firmware.rs b/drivers/gpu/nova-core/firm= ware.rs index 6e6361c59ca1ae9a52185e66e850ba1db93eb8ce..9bad7a86382af7917b3dce7bf30= 87d0002bd5971 100644 --- a/drivers/gpu/nova-core/firmware.rs +++ b/drivers/gpu/nova-core/firmware.rs @@ -1,7 +1,47 @@ // SPDX-License-Identifier: GPL-2.0 =20 -use crate::gpu; +//! Contains structures and functions dedicated to the parsing, building a= nd patching of firmwares +//! to be loaded into a given execution unit. + +use kernel::device; use kernel::firmware; +use kernel::prelude::*; +use kernel::str::CString; + +use crate::gpu; +use crate::gpu::Chipset; + +/// Structure encapsulating the firmware blobs required for the GPU to ope= rate. +#[expect(dead_code)] +pub(crate) struct Firmware { + pub booter_load: firmware::Firmware, + pub booter_unload: firmware::Firmware, + pub bootloader: firmware::Firmware, + pub gsp: firmware::Firmware, +} + +impl Firmware { + pub(crate) fn new( + dev: &device::Device, + chipset: Chipset, + ver: &str, + ) -> Result { + let mut chip_name =3D CString::try_from_fmt(fmt!("{}", chipset))?; + chip_name.make_ascii_lowercase(); + + let request =3D |name_| { + CString::try_from_fmt(fmt!("nvidia/{}/gsp/{}-{}.bin", &*chip_n= ame, name_, ver)) + .and_then(|path| firmware::Firmware::request(&path, dev)) + }; + + Ok(Firmware { + booter_load: request("booter_load")?, + booter_unload: request("booter_unload")?, + bootloader: request("bootloader")?, + gsp: request("gsp")?, + }) + } +} =20 pub(crate) struct ModInfoBuilder(firmware::ModInfoBuilder<= N>); =20 diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index 891b59fe7255b3951962e30819145e686253706a..866c5992b9eb27735975bb4948e= 522bc01fadaa2 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -1,10 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 =20 -use kernel::{ - device, devres::Devres, error::code::*, firmware, fmt, pci, prelude::*= , str::CString, -}; +use kernel::{device, devres::Devres, error::code::*, pci, prelude::*}; =20 use crate::driver::Bar0; +use crate::firmware::Firmware; use crate::regs; use crate::util; use core::fmt; @@ -144,34 +143,6 @@ fn new(bar: &Devres) -> Result { } } =20 -/// Structure encapsulating the firmware blobs required for the GPU to ope= rate. -#[expect(dead_code)] -pub(crate) struct Firmware { - booter_load: firmware::Firmware, - booter_unload: firmware::Firmware, - bootloader: firmware::Firmware, - gsp: firmware::Firmware, -} - -impl Firmware { - fn new(dev: &device::Device, spec: &Spec, ver: &str) -> Result { - let mut chip_name =3D CString::try_from_fmt(fmt!("{}", spec.chipse= t))?; - chip_name.make_ascii_lowercase(); - - let request =3D |name_| { - CString::try_from_fmt(fmt!("nvidia/{}/gsp/{}-{}.bin", &*chip_n= ame, name_, ver)) - .and_then(|path| firmware::Firmware::request(&path, dev)) - }; - - Ok(Firmware { - booter_load: request("booter_load")?, - booter_unload: request("booter_unload")?, - bootloader: request("bootloader")?, - gsp: request("gsp")?, - }) - } -} - /// Structure holding the resources required to operate the GPU. #[pin_data] pub(crate) struct Gpu { @@ -187,7 +158,7 @@ pub(crate) fn new( bar: Devres, ) -> Result> { let spec =3D Spec::new(&bar)?; - let fw =3D Firmware::new(pdev.as_ref(), &spec, "535.113.01")?; + let fw =3D Firmware::new(pdev.as_ref(), spec.chipset, "535.113.01"= )?; =20 dev_info!( pdev.as_ref(), --=20 2.49.0 From nobody Mon Feb 9 07:22:46 2026 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2086.outbound.protection.outlook.com [40.107.220.86]) (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 B97552040B3; Sun, 20 Apr 2025 12:20:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.86 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151622; cv=fail; b=F4/wR4i9Mi3emBSTnHaGpICBu8K1r+sdEBV/MtIdRq9opqUsPKvQ5oetPhOVVRlK/CCLlNNemeWqYYE1EWHBIx7IOSkqMLOgjwlPhU8bzqdkojKoFvs1wauuKkgDatsTqJkpUQ4W3mlr+EhJ1EJniy1jEr6wlYPHPD+aZLIXuDw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151622; c=relaxed/simple; bh=qlVRruBp4hxN4nZEhW3+dnFJokh3g5H2Y6oFTvvVzzE=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=HbzoMtg/J0EkCjcCej3C37/amWnIyeA6Zx1XvcmLTlSdbbGvBD6zvTM6AG8hIRtLXE9ZQ5kZObj4spbxntRMxivu8GRNEkEfxVoD8t+zN3sYphdOsBPla6/pgXVG+PSsRj6XI679ItUNP3oDfARsU/FKzm07rHwqlJtqQjNLREY= 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=nHLfh5/f; arc=fail smtp.client-ip=40.107.220.86 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="nHLfh5/f" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=UlV8XTo1zYUNdIACISHaooDdqNK+6QW4kLMAViynp86PeYZpsLIX5jEn+JqLFvGt+nwDAL8A+/zKkBGpk9v/8mRj8yLXIAUAuFWs1axp5ao5nle0jdw/OsrSFPaOiV/veYf6bnpoVw52srTtwW3kK+liSGe8pKW0k29fv6V4SwMG0JiSu1ra1WA4zNsO8CmPhw7SCdqOabp01Yq1l47WrvdY+9vtxnrU91jSDlFLx2I3LB/WJimNEcK2b/jHoBmTn/nMP0IEeiyKUZHFRTITV2uk8Pvz++n/BEGd8I8F6PiNevLsnK9rF8eXiw0/YNCF5i21OUbuwDEd5TrQ3ZujFA== 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=qovyLVakz2CRcqHQ8fcZbF18vsp+TY6C89yXoIfi5go=; b=Xj7h1GzQxe/4mmn/wtKLKk3wSUubkBlBt1BbmodRueKF0su75v4WyoUmA34CVJObfjMRTu7FpXgsd875upby65Xurpel5bcVzHwsvdyxVdEWPcgGabwzx0IbdZ/R1jiiDIrnXC2dqVk5lAfIHu5Qp9pVrMMOO8TZqbAsLEzmdA4TbCtEOTk4PtS0ENHV46QTfOwpfp39Dl9dRHGjNJUiKBjekONeuQArtfS6WtfmjRXtIK7t55cgDbnn0HMiFCRygGHabHnnMFx0/O6ZhNqk6NAU5mPJJ7qwa31Jp4pLf/IKSHpNWS8bfPzcF0xN8158sj2V0E9suBTLTq3CpBCntw== 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=qovyLVakz2CRcqHQ8fcZbF18vsp+TY6C89yXoIfi5go=; b=nHLfh5/fSgyK7HnMocu1xpzHx+Lwzh8v5lpEWt6Ex3+Zh4OUlPiGrVNe0O8tHGe8oYyvg1yaK/FIULvSU0RPk9L/FHjqI0xm+44F6HEexnETCwtPpaXpsxd9lvpVT62E45txhBcdMbFbhU1N4xusQky/YocrhVptw6fXyS7Lm3taenKm/Nifd+oOuMpStZV14tHUiwtleSv5l0J8ZusvwudVw3ocpGIPAtRZAOesexf6MwEQ2woYXp/mZrjARdcMiK8Z7sGENWgUb1XM65l5lQziCOwYguHI2i1x6ausY/TeC+287rcghbCLMLfOxLeZM/Q0ZNgS6/lwvJcA6+hqkA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr 2025 12:20:17 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99%4]) with mapi id 15.20.8655.025; Sun, 20 Apr 2025 12:20:17 +0000 From: Alexandre Courbot Date: Sun, 20 Apr 2025 21:19:40 +0900 Subject: [PATCH 08/16] gpu: nova-core: wait for GFW_BOOT completion Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-nova-frts-v1-8-ecd1cca23963@nvidia.com> References: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> In-Reply-To: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: John Hubbard , Ben Skeggs , Joel Fernandes , Timur Tabi , Alistair Popple , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alexandre Courbot X-Mailer: b4 0.14.2 X-ClientProxiedBy: TYCP286CA0304.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:38b::12) To CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) 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: CH2PR12MB3990:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: bdd25f2e-6452-4494-0ffb-08dd8005b60e X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|10070799003|1800799024|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?SDNSeUNScTZiTHZFR0lJOHp2QVFDS1BIQlZHWmYrcTlsamV0K3Fnbmc1QnBr?= =?utf-8?B?ZklMTURza21TbUlzS3dSVDlsRlQ3SFRZZjBBdDNiZ29ZN0pwL3dITHZwZlJw?= =?utf-8?B?YUhyWm5haE11U1E4bzJ1UFlCYWdYTTVwTGNwUldFNTdDMGZxemVqTTk3ZDlP?= =?utf-8?B?aXpSMUw3eDAzTDhaTjdhdGVvZkZCTXVWTk9KRkRIRmtLeGRHTldnSXpDNmkr?= =?utf-8?B?VlpQMzdNbGRXaUJGVE5tbURiTXZtSGR3WFhtL3dOeDlpYmhIemh5WVBJek1w?= =?utf-8?B?anJJRHorSDNTSEUreHJEZWJHZVZLSFFVWng0ZXJDNDNIMHBFeFlQT1NhOWhv?= =?utf-8?B?OWJ0eHlSN0p3Tk55eGllL2tPWDRwczZnQkZBcE5MdExucWNlSU9qZEJ0ZEQz?= =?utf-8?B?WElISTd1MVBYZHVZTG84LzdDN0tDaVgzaGtRYlNwRnZnMFd3Qnl0blFzWGJj?= =?utf-8?B?amVVQkw3QVF6bTZHdjFEUHlacXh4VG1TSjdmUm9BVW9ZdWVibmFRdkJNQkg5?= =?utf-8?B?cER2OGFQVjErYThvN2c3NVlGcEFwMldiWG5uOEwzMVo4dUN5U25hUEtWaFY4?= =?utf-8?B?ZVhyYk1lL1UzRktxZk9ObjhWTkVIN3BPajl4Z1ZHc0RwUDZGUW1Tb0hoUFIy?= =?utf-8?B?aDEvRTA5YVVrTzVhUTYzK0o5WXFlZ0FPVjJMT2pSNnpvVEZJanBBVEhibFZr?= =?utf-8?B?dEdkbk00Z1BqdERMVmdONXdtUnVyU1R0MTZEK0UwdmZtcDlYUFdyRXdFN0lu?= =?utf-8?B?a3ViWEw2U2x5YXBVMEx3MUt6OTFJcVhZT2lwUEN5ZnpEZ3FGckxjWDlNMWwr?= =?utf-8?B?b0lUMlB1aGRWMXl0TXJqcERieFB0d3hmRXpxK0VLYWJ6WHJPTU13ZXIxTWM2?= =?utf-8?B?QkhCWTZHUldrRzZzOExYeklxd3Mxd2ZjSjhDelNWMEo3Mm5FYzg0UUxxV1Br?= =?utf-8?B?TWxPcnkrVHhGcDZFeVFjeTU3ZXU5OVgxSGUxZjM5UXRnQkJHaFFsZXhzNHVR?= =?utf-8?B?YXRyNWRNeGczWFE2OGx5VXNrc29uVVgvSkdrazJDdVNXVGNVRFlYaWcxelJu?= =?utf-8?B?SXlqaUVUcHRGOGR0RHpDMHB3WXVybTVBcEt1U0d1eFFsMWJrTklQNzd5L2JY?= =?utf-8?B?RFlyd3JkcHczY0x4NUZJZ01UK0cxaVljV1NIeVJ5MEFqUzFOdCtsNXl5d3Qz?= =?utf-8?B?TEx4aWhTQlJuNmZUamVFRTlzeDZCTU9uMU1BNFJnUVRPY2pZS2NsQW9ENjQ3?= =?utf-8?B?VFR6V08zWnZmUEFjU2NxdEtuNncyRzFqVlZyYTVtaGgrVkFvVU85NXRYTTln?= =?utf-8?B?QU1UREN0ZEt1NkozNTI0alpSUXIwL1dFSzJWOTVMR1B3T0R1T3RmY09EM3dP?= =?utf-8?B?Umd6SEdlNmtvdm9jdG9lc1ErZkhrNit1NWJxaEk3OW1tcGJnYTZyR0cxNFoy?= =?utf-8?B?NjV1RGplWUJnNXNPNEpWc1dzblNRVXFSWS9sRWR5YkhidmMwZGR1M3pQcTI1?= =?utf-8?B?STBPbzl0WDZaaUFRWHVwbGJMTjNmeWRPUUlkS2tob2lyQ3lhaG9WaHBNdGlx?= =?utf-8?B?VUFwbjhJaWxCUlY1SXBYNWdtY2tMa0piK3QybEdKTC9uNGJPem9LT1ZoVmhM?= =?utf-8?B?SnN6eVp1MjB4VURxaVFXNURLSnB2cWZMQ1ZKNmRWaTg5UWdsMnEyeG4zaDZW?= =?utf-8?B?WW5UaDUycG5ZWnc2UHZzMG41WDdRdmh4dlZFc0pqRHNNM01UcUZkUmVkei8w?= =?utf-8?B?ZlFzVUtycVJwT0Eza2R2dWxCSlVGdmtob2h3bk1YaUZUTHdZdTZhZzBJcktk?= =?utf-8?B?amV6MU1lVzdxdEZRTTZXeFFIUmlUSVVqUjZ0RTlZbCtzVFVNUG9xSHZ2Y3Q1?= =?utf-8?B?b1VlUHU0Q0xqTTA4Z2NIRVE0MUk2WlMzVWxLcVA3Zk53dUVrSjNpeHBBaGRD?= =?utf-8?B?dThsRUNjZFZ6cjZDK1A0VkFXWk5BUDE5SkZHaGVzZnVmVW9oeWQwWDBwcHh0?= =?utf-8?B?R1RaekpYaUdBPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB3990.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(10070799003)(1800799024)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Ulh3TWdjQWJhK0NLVU50U2ZHZW1LaDV2bjZ3VVczK0lMY2piVEZBMW9abGoy?= =?utf-8?B?WTQ0S1NGVTdyVDZzZUVERzVncXZHTWUyb0gxM2p0Q1YzMkVVcGZUbHB3aVQ2?= =?utf-8?B?ZnhwNnlrWHcrMHg2MlNpNnQycWZHb3l1bys2SERMc0NzZXlHQjMrc3RuOUpT?= =?utf-8?B?cGtNeTExRTZnVWoxdUZ1WVR2cGtidmZwOGN6UVN1eC9JZWdzWnh0eThWSVpF?= =?utf-8?B?TVFjSyt4WlpXd0lQZnBFLzBHWXBNNG83NFNVMGhyQVB4bExwcXpQZzQycXM1?= =?utf-8?B?dmVkUmRiMUg4WWRBNE11Mk5xT0UzWkh2cWRCS1F1enVVR0Y4SzRDUE1aQzF3?= =?utf-8?B?YWtpTTByZ3F4L1pFQTYrbXhYZ2lBd1NvYzdLRnN5RUUvaEVPV0hvWHRyVUcx?= =?utf-8?B?MjVndWlrSFJWMUMyV2VzNnVUWGJwZDNpWmQvdWd0SXBLNDR5eEttVUNhd2ds?= =?utf-8?B?bFJvOWRqQVRPM21JMmhWdkdDUTVFUDRRWS9VT0VFcjdhSXJhS0FhU2F0MDVM?= =?utf-8?B?RmRyaTVEWjlIOEVxc2dNWFc5Ry9wekdUYkpWOGlxQ3FxSU90Q0ZDTFBIWHho?= =?utf-8?B?MkpSMm14VDNLOUhKbTN5aWJnTFc2U1pQOWNyK0VXOTduTlpleGZVelN6dS9F?= =?utf-8?B?NXB0eHFOS2ltY1ZiWGZtaWZIVnlkU0JGK1NDOGlDK2FwQVgxN2xNZzdpQjF1?= =?utf-8?B?SHBNS2NvVDBnUlNKU1RYNHZPbFRsdEhtU2VqUS8wYXdlYXluZ0tJUWJDcXM0?= =?utf-8?B?SWhTL0FHRVNIaUpuUGQ2ZU1mVVdqaXp3UDVKYSt1YmEwbHFTeFFITEVRYkJk?= =?utf-8?B?MTdSRHUzRjhXSk5xc2c2SnZvODNCMnBhZHBGczBXTGUzTlVlNE5qdFpsYlRC?= =?utf-8?B?emxJUks3NTBKWEsvNTdjZ201MW1paVlUSWtXdWFneEZmNjRZTVhpMHBSa1o1?= =?utf-8?B?MW95ZDgrQmV3THNGUGw0VHJaUWJDNThNTTZhTlMzQTVUcGdsOVVMZXFjbWt4?= =?utf-8?B?LzJEZE9CMHl5bHl5cXVjQzlnbER3ZFFvenZqQXY4cGVmMld4eVNEcndsYWQ1?= =?utf-8?B?Y1FBVEJId0dJd2psUWxHclNzdWI2aXNOQW13eklhOWd5WWFuT3NkZExnRXZu?= =?utf-8?B?VnJEcEhseG5kU0ZSd3N1QTUxb1RUQlRJOFFDK09zWndVMzQzT2UyYTdWVjhH?= =?utf-8?B?SXh5UEgwQmo1MGRBaTRsdEZ2ZHNXd2t4T2YrT3F4NEo0aDF6T0RyYjVXSk85?= =?utf-8?B?NmtjWnd4V2tibGhFbmlLNnhsZFNGenI3V0Y1anNSQlVJby83L3hWR01xcWgy?= =?utf-8?B?THk0N0hqYWVvaTNXSDl1Q1A2UDVicmlWR2crTWtDSmJXNm95eGtZV0RPNUNm?= =?utf-8?B?cG1CTW1YL1VKakJLUytjMmZpN1lxWFFoWlhwUENBWU0yTElLMlRVc24rWEU0?= =?utf-8?B?K21Cczhqc3pzYUcyZHdXYVhrUFhuSjlqK1lha1dLbXNKRWtqYWJ4dW9GNjV0?= =?utf-8?B?VHlaSkI1RnlkSGN5a2dUbWZxd0FTaTZyWk4rVVlycFBuaHJ1REtjWk5jdjJK?= =?utf-8?B?bUR6U3FuY1FCN1p2VEt2K2U4N2h5TGlTbzhxVWljS08wQnBkL1lDcWE1Z0t2?= =?utf-8?B?NGJkTHQzNllHQjhmTTgrTm9ObkU0WGJpKy9TRFEybDBXZFhKd2RRbmlMczlm?= =?utf-8?B?aHhLZTR3aVlFOTRTRzJQa2VZN1VncEZUQTdWNTZXWmJJeDBTanZxbzIweVdP?= =?utf-8?B?L24zSk5QYS9KRHFBR3JGMngyNTcxdmxueGNIUVg4REhhallZYzNwaFlUOFEw?= =?utf-8?B?dVpBQUZZS2x1UmNQNWxZTDJJcTRSaWJ3TzU5NSthTmViNm4vWS9zNldhTGds?= =?utf-8?B?SmRNazYvL1l5S25YdWJjUjBab21wZytVK25EWnlRQ1ljY1FXOXVBSGFvMkhQ?= =?utf-8?B?YkxpbHUvYzF3UkRnU1oxeHFBZ2FkNkJpblY4azQwQ0crZ2ErZnhmN2kwYkxL?= =?utf-8?B?WDF1ZGgyeVZWUkFVeWdqdDE5aDNzVGR2ZmFKQkVZZ3k3Z2xCWFJ4dG1LZ1JV?= =?utf-8?B?dUE4eFpyUDZQQTNIMUt5bVhiQ2VPTEorTjN0Wi84cHdnS2M1RWduZWFTV2Y1?= =?utf-8?B?ZjJjZGY3R01JdTczUkpGblQ3NFV3aDVZRTlJRFVqWFRtM1VoZ05lbVlPNTJQ?= =?utf-8?Q?CorU1EVZiz2BrvEo5QAw2dqkVbC7kz5Qn0n9QvmHSFWB?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: bdd25f2e-6452-4494-0ffb-08dd8005b60e X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 12:20:17.5219 (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: jcxnsq2XRIaM7amYSq+D8Cx3nfgGr7pptM0vmr9EGsQqg8IIg7YjUx/4SlUS02he6EbZZrUDhXYI+U23dXzICA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 Upon reset, the GPU executes the GFW_BOOT firmware in order to initialize its base parameters such as clocks. The driver must ensure that this step is completed before using the hardware. Signed-off-by: Alexandre Courbot --- drivers/gpu/nova-core/devinit.rs | 40 ++++++++++++++++++++++++++++++++++= ++++ drivers/gpu/nova-core/driver.rs | 2 +- drivers/gpu/nova-core/gpu.rs | 5 +++++ drivers/gpu/nova-core/nova_core.rs | 1 + drivers/gpu/nova-core/regs.rs | 11 +++++++++++ 5 files changed, 58 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/nova-core/devinit.rs b/drivers/gpu/nova-core/devin= it.rs new file mode 100644 index 0000000000000000000000000000000000000000..ee5685aff845aa97d6b0fbe9528= df9a7ba274b2c --- /dev/null +++ b/drivers/gpu/nova-core/devinit.rs @@ -0,0 +1,40 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! Methods for device initialization. + +use kernel::bindings; +use kernel::devres::Devres; +use kernel::prelude::*; + +use crate::driver::Bar0; +use crate::regs; + +/// Wait for devinit FW completion. +/// +/// Upon reset, the GPU runs some firmware code to setup its core paramete= rs. Most of the GPU is +/// considered unusable until this step is completed, so it must be waited= on very early during +/// driver initialization. +pub(crate) fn wait_gfw_boot_completion(bar: &Devres) -> Result<()> { + let mut timeout =3D 2000; + + loop { + let gfw_booted =3D with_bar!( + bar, + |b| regs::Pgc6AonSecureScratchGroup05PrivLevelMask::read(b) + .read_protection_level0_enabled() + && (regs::Pgc6AonSecureScratchGroup05::read(b).value() & 0= xff) =3D=3D 0xff + )?; + + if gfw_booted { + return Ok(()); + } + + if timeout =3D=3D 0 { + return Err(ETIMEDOUT); + } + timeout -=3D 1; + + // SAFETY: msleep should be safe to call with any parameter. + unsafe { bindings::msleep(2) }; + } +} diff --git a/drivers/gpu/nova-core/driver.rs b/drivers/gpu/nova-core/driver= .rs index a08fb6599267a960f0e07b6efd0e3b6cdc296aa4..752ba4b0fcfe8d835d366570bb2= f807840a196da 100644 --- a/drivers/gpu/nova-core/driver.rs +++ b/drivers/gpu/nova-core/driver.rs @@ -10,7 +10,7 @@ pub(crate) struct NovaCore { pub(crate) gpu: Gpu, } =20 -const BAR0_SIZE: usize =3D 8; +const BAR0_SIZE: usize =3D 0x1000000; pub(crate) type Bar0 =3D pci::Bar; =20 kernel::pci_device_table!( diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index 866c5992b9eb27735975bb4948e522bc01fadaa2..1f7799692a0ab042f2540e01414= f5ca347ae9ecc 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -2,6 +2,7 @@ =20 use kernel::{device, devres::Devres, error::code::*, pci, prelude::*}; =20 +use crate::devinit; use crate::driver::Bar0; use crate::firmware::Firmware; use crate::regs; @@ -168,6 +169,10 @@ pub(crate) fn new( spec.revision ); =20 + // We must wait for GFW_BOOT completion before doing any significa= nt setup on the GPU. + devinit::wait_gfw_boot_completion(&bar) + .inspect_err(|_| pr_err!("GFW boot did not complete"))?; + Ok(pin_init!(Self { spec, bar, fw })) } } diff --git a/drivers/gpu/nova-core/nova_core.rs b/drivers/gpu/nova-core/nov= a_core.rs index 0eecd612e34efc046dad852e6239de6ffa5fdd62..878161e060f54da7738c656f609= 8936a62dcaa93 100644 --- a/drivers/gpu/nova-core/nova_core.rs +++ b/drivers/gpu/nova-core/nova_core.rs @@ -20,6 +20,7 @@ macro_rules! with_bar { } } =20 +mod devinit; mod driver; mod firmware; mod gpu; diff --git a/drivers/gpu/nova-core/regs.rs b/drivers/gpu/nova-core/regs.rs index e315a3011660df7f18c0a3e0582b5845545b36e2..fd7096f0ddd4af90114dd1119d9= 715d2cd3aa2ac 100644 --- a/drivers/gpu/nova-core/regs.rs +++ b/drivers/gpu/nova-core/regs.rs @@ -13,3 +13,14 @@ 7:4 major_rev =3D> as u8, "major revision of the chip"; 28:20 chipset =3D> try_into Chipset, "chipset model" ); + +/* GC6 */ + +register!(Pgc6AonSecureScratchGroup05PrivLevelMask@0x00118128; + 0:0 read_protection_level0_enabled =3D> as_bit bool +); + +/* TODO: This is an array of registers. */ +register!(Pgc6AonSecureScratchGroup05@0x00118234; + 31:0 value =3D> as u32 +); --=20 2.49.0 From nobody Mon Feb 9 07:22:46 2026 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2086.outbound.protection.outlook.com [40.107.220.86]) (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 920B3204582; Sun, 20 Apr 2025 12:20:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.220.86 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151624; cv=fail; b=fPFgArmoehmTW4mpORVePns33jDDNoxtPZT8O2MoNy+zsYGoRshyBMGcysz/n9s5jOKNsMuZuJyfydVMlOSRPypCoMLChZg7M5X+iGlis6UQsPgcsRCqGigPrm5QF5AwqapYdAKsP+nCy5H7KjxsCFJLFmaWd+E5p28o1Mh7Ugc= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151624; c=relaxed/simple; bh=Kn93pes0S1+kDHGokOqN1WKDuKlgoSA1EIxEKpST/WE=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=AbcpGuzysRlVrB3tcadOSMbDarupiAKOCCXwhEAU6fR7C3pxrYaJfBmAvNcK7fbJesMCNbCuNwN5lm7J4nNlNMxUTmjGMzGzs/CoHcfiKJpZWqjyqQt7bTkLM2sdg6Qz5vOjQlyin2UXZ4avtAiM5XoYjx6YNjnggD+jcF3W7/U= 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=b7N4y8H6; arc=fail smtp.client-ip=40.107.220.86 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="b7N4y8H6" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=bziTsA/sBf+EM8MCyLjdi/aQWpmPoBUTvNFgBAArhOmEV4KOvqBOztVvUnfIZa9PKxmbtGZ5YwTAuhmwop+vPIS+wcw+Z4OP+PYu1Tx/fIirewCDFwppuqrusjBIMue4J5aP4yXQ191URej7zseDxtAnC8XSpVQZt+wweeRUt/ZOpYUgnYePbxyeSW8DI6RB/uj4VGgESF97MzGTsQ8C1g2vB7Vpi04EcPCWQ9IGOtk9U4A8p6owZ4ocoU9+z9ogAtMhjnDoHRMBoZnDJnGUAb2h3pkttrvM7/ONId4AQezpuchzg5hq5MwwYV6ZUKOH98fUElArPwVTAxY6ukat8A== 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=ffUlA9YhJCqUAiW65dyyt7h6ajOjIyw8Ht0++Qqy3hM=; b=zS/ydvuYX+tv94rUW4YptUqTEZPAXSlmkyO8nrMorCVLKq1yYrstkZG/Z5x3RCIvBm90mSioryTEy+qd0UvUhagW1LDF/N1W7VLZqpk6S/WnQr5L/tHhWn0vXhFrRxUj2Homxedd1sLoNhSamu9Ul4vAjw9HfqUtraIet38FD0DDnL5J890B3glFfwsKSrZZ7ADdOAl4w/sP5dzSpb2n2F1lSFuonaOPYla9LI5nNuOTOmK6WGx4AT+70Su1OgzpuXqgf0gOQUlaQ27xde1FUdPmMlwLPpPmLGLKPHe4OmatfnWFKckGAwVKM9dvynY0ConT0XreIilg184evyr0rQ== 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=ffUlA9YhJCqUAiW65dyyt7h6ajOjIyw8Ht0++Qqy3hM=; b=b7N4y8H6fVuLyXQhlYgNPE9mW7dKL9OtDXzZuMC3vKEaB5nSaZtNW4+cXByrKbJO4le+Rk7lCgZ0nCBQvwB53d6BNx9EFwDALxl9VTtxWnQpFyIBchQMZZEHP5w3prLf422f9BWUI71lOK8yQ0ysEWBRy1MaOwMhBsBLY9LbJPxZPYdJZKj2Wlq1/l6oohbNt20bii14PtbTEFaJOzw34mIUwhKPPK1Hos3lvyjzfPxb0dWOVaeG9UNqLnJK/yREIf3F8cn094xR1tVPnOQA/Xr0FHG3T8gOh0jZCb70E4gqSjU8zErlfuMor2c+yTn0ztHqBApBpFy8PAGercjxRA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr 2025 12:20:20 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99%4]) with mapi id 15.20.8655.025; Sun, 20 Apr 2025 12:20:20 +0000 From: Alexandre Courbot Date: Sun, 20 Apr 2025 21:19:41 +0900 Subject: [PATCH 09/16] gpu: nova-core: register sysmem flush page Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-nova-frts-v1-9-ecd1cca23963@nvidia.com> References: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> In-Reply-To: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: John Hubbard , Ben Skeggs , Joel Fernandes , Timur Tabi , Alistair Popple , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alexandre Courbot X-Mailer: b4 0.14.2 X-ClientProxiedBy: TYBP286CA0019.JPNP286.PROD.OUTLOOK.COM (2603:1096:404:ce::31) To CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) 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: CH2PR12MB3990:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: 6bb92d50-dd66-4334-5deb-08dd8005b7c4 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|10070799003|1800799024|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?a0I4VjRLTG42cC9tdGY2VUtpU1Jsdkova092ZHdCSjJsbk1HM1dldnkzR3o4?= =?utf-8?B?ZFdsaE1LK0RYWVd4S0ZzYnk5dEVLczVwOEh3SnVXamJQVWRDVHJRdjZvK0pL?= =?utf-8?B?Sm9GY0hGaWNEUWcvaHdjRTFFRHBFdEUvWWhKejBSOTVSMHpkcStIYlBYeVdF?= =?utf-8?B?KzdlRFUwVzQrdEJxN1QwUEFXV203bU4rUlRUZWFIRGJsNG1qYUhmSXFrNVI2?= =?utf-8?B?Z0VsS2VBWVdzWnRoOGxzVlIrRWNtMmc1andmbmM1UHA0aFNnN1NiQ1JwNW40?= =?utf-8?B?bFlOWVRCYjhLSmxXRkd1d1ZNOW0zcUdLdDZzWjRjUU9zRWZrOU5CZzhmSEVy?= =?utf-8?B?eFJDNXRVUXAweW9FeWVxUzBSb3hQajFickxkbFI3cXBPMXpEajBWL0txM0dO?= =?utf-8?B?N2N3TnFqOHk5c3FpbjJCZHVpZGozajFtQ2hiVmtBaCtjMUZqdDNxYllUYlR3?= =?utf-8?B?a0V4cm90TVVjNXo1OHB0TXNzbmo3RVkyRnpoVkxweExMc2hJNnp0WE9DZDl5?= =?utf-8?B?TVM2MGt0WGRBSE5IbWphbUZiZHRaN0wyem8vT3o4ZHk4dm9YUjFCbXlaekNi?= =?utf-8?B?NWh6dzNUanM3M2liWDhWSlVqOXpaT0htZ3BGZE00VXNtdjNFYnl3Q1lIUmh5?= =?utf-8?B?NUc1L3dEMkl0Y3IxZkNpMnoxOHZpR2ZRamVDMGsxeUUzZUdEbkJ4MHNqenc0?= =?utf-8?B?ZTBLYUhCaC9BdkZCY2c4eUVJZXpkbUg3LzhtQWZNOG0yS2Q3dUZCaFgxUDFZ?= =?utf-8?B?TDVMeWg3VTMwcnJLc3R5V2cyeXR0dEM5ZUdDTWo5RmlZM05HRWFMRWVVTXQ3?= =?utf-8?B?Q1ZIeExwajFRaGd4azJkaHZBM2xpRWpJV09xamgxVXJxcXM2a1YyRWJKNW1a?= =?utf-8?B?alVYMG14emFpclVLU011bmpyakZzQ3QwMnFiSEo5dkVqODFFZEhINThmSGw5?= =?utf-8?B?K1BYamJRLy9MUks3a0QwM0JtbkRKRjR5M05yV3AzSVYvYmQ4TkdDdW40YVdU?= =?utf-8?B?L3VOZnU5NWxTNjdnbzVlWDY5WURnQi9RYjFJcDkwT0pFUm5Qdm81Nks1elNh?= =?utf-8?B?SS8vR3l0Q2tLSnVLeFlFSE5ORUl1cEVRcXBYSG51bkZZVDdoQXc0M0FvSzJ2?= =?utf-8?B?dzhwQzNCd0d5UWpFTTBlQ1FNRzl5YWJzYit4cXVjQ2E5K1NWRkV2NTFFVCtV?= =?utf-8?B?QjNhV2o0bjZlNzJPSE1BamVvaDVKYnQwSW1FUUp1MVEvK2x5VVVPWGtYK0ox?= =?utf-8?B?Ym5ROGZUcUFuRm9nK3lBQUJIN2NkYVp3cGxFdUlCNGx2azBtalUxLzNhM3pD?= =?utf-8?B?dG5DRjdoMDBZcDc0MysxZTNSS3hRc2x4R0pMM0lHZC9vY0l2dlJKaWtqZU0z?= =?utf-8?B?OHVzdTdIVjlrMXRudUZmMmZ4cHlkODlLTGxJN1ZubWl5NFBHMUhTRCtpQjU2?= =?utf-8?B?ZlFTMy8xbFUrYlpLUjY2d1BSNFRYZTIzOHllbXJWOTR4UWpKMTNSNnZrUzg2?= =?utf-8?B?OW5jVGVJWHlCOFdDZVZLMForaDQvdC94UVp3Y1RNWGl2dmpXckRZenFnQ0NT?= =?utf-8?B?RXZXeFBrN1JwOElPSG1oa2FIeXU3ZlN2ejZITGJabVJ5enZxbmpTTFpXaHl0?= =?utf-8?B?ZUdzS0xRajZrZjhSWG8rYk53eE5qNE5jNy9yUUZZb0tPTmdvc0dMaDZyclRZ?= =?utf-8?B?MjVSVkgrcmR1TmxDRVpzSEx0NUdCa3ZZOGJEKzNzeDlkZzluK2JQSS81MjdM?= =?utf-8?B?VHpQRG1qblJsTXZyblBhYTJsZjJ2YWZiUER4UzJLdjhSSDVZYlQrc0h4R0VC?= =?utf-8?B?blM0cnJKQ3JvV0Jpd3JDY2FOcTcwUVlreUxPOG1pajZQeTE1R3lYZEtqeW56?= =?utf-8?B?UHhxemVxM1BldjZqOEpnNE1GTWpWbFZidnAzdEFQNFVaQVFOVTN1RzFXNkEw?= =?utf-8?B?T3lVZzYzalNBTHBrTC9MY3BiMEc3ekZ4cVB3VHg5RVNaTFVSZEtQcWhpS3N6?= =?utf-8?B?R09CZ3dveW5nPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB3990.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(10070799003)(1800799024)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?R200YkdLUTVwdGhNazlFbGRXZkY4R3ZzV1oxdGFKSUtuc3lIR1Y1N1JWTm5o?= =?utf-8?B?bGI2ejg1ZW9zZmxPMFNXOVpjWFZXZWdETjBBTGE0SE1ZcWtBWGQxTlllWFpL?= =?utf-8?B?UjE4MEhqbGlBRFRqTC93VUJ3aG0vMDd6VVQyVndmZkdtTFFUWHk5UVZPTFd3?= =?utf-8?B?aUd6RHRoUDRqZmxLN1NyVHJ3VGp6RUllYWFzTHlzb3FCM0ZEbXpRU045VjA3?= =?utf-8?B?cmoraTBpMjBuQnZ6YVpTTkNKU09LOVIxQW9zV2hiUStnSXY5YUpSNE9PQmsz?= =?utf-8?B?Y1MyeTh1SkJxcndYRGJBOFpDaWZ3amJPVCtyaFdSZUNCMFoxNWsvWTMzbVRK?= =?utf-8?B?dkVnWTEybDMySFFBMmdtdEZsMmN1T2dFaWVjZ0JJa0o4UHlrajRLMDV5Y1Rt?= =?utf-8?B?bGRva0MrQ01lNWlCV0w4MnNkbGVkZnRBbnRXeXppRGsvVVl4Yy9mTGRzUXFO?= =?utf-8?B?QzNZaGhuTTlmZjM0Z24ya2wrSHppa1N3eVdzNDFTMTlhN05EM0JLVHMxemZs?= =?utf-8?B?NjZmTncvVmxWVzk4cHYrcWh2MjF1bFpmM1o5RCtGL3JTTGV0TnBJUFJvcWdW?= =?utf-8?B?VU1hWEZUdE1jVjJPZmFzcVVVb0lreC9Md1JXazJhRFBzUDdMUThtTHZqcmp5?= =?utf-8?B?NzdRK05IRGJ1WFFiWEkxK0V6U2w1TXF1YWU5Yk5WTlpUUEVOYlBsZ0hsQ2Zm?= =?utf-8?B?dW1UZkxtalZ2ZCt4ZzFrRlFhcllNYjFoeE9RUDkvWk10emtPK1J5SzJvMDYr?= =?utf-8?B?L3FONWs4NXlCTDI4WERVdHFFczlXT0VYYzJSZiswdlRlQ002M1FLS1ArU3Q2?= =?utf-8?B?RWlQYXVxcGNDSHVBWi92UEZxT2hRcXloZTNOZUZ5bmFZQUMwT1VtRi9YZWpV?= =?utf-8?B?dXAwazNuTWtYaWI4cnpnWDdVME54MnIrYkc3ZVI1ZXBUbjUwK1MrL1hqNW5j?= =?utf-8?B?cWNZNjdmWXdpWjRQcllPSmxiZlkza1JRM1lNdXZET1BDQ1BVeGVjdnUrckpJ?= =?utf-8?B?V0RHc2lFdWVFTmFsdHlua0RWOEpoZVNKdmEwSDVoclpYbGJzR1N6YXhKTDlM?= =?utf-8?B?N3d3bWdGVTdBZjUrTUx2UDRBMlZGcGtONEl0Y2hkSjc0Vjc3R1NnU2hCMEZV?= =?utf-8?B?ZmpvcksxVTI2UG95UWVDQmNKY3dsS1p4YWQycTRxZmlCdEVVcy9wWXRxYTU3?= =?utf-8?B?M3RNdkFYMFU3TzdYR3RXcGVsa3NGenp1VWF6Z2g1SXBnOUx2dC9HTjdDQ3ln?= =?utf-8?B?aW5pTWcrU3BBL1JhRDRSVWlHVmdXM1ZGalFtZjJ2VFZUYmVxMVBENjljYkN5?= =?utf-8?B?Y09YbzczMEYrQnNIVkxuV2Y0RzcwSVo5THNJbnJGOVBucjBoWFJWN2phU3Ra?= =?utf-8?B?akRhdGgzMTFLd0RMc1BRYmlqMWNCR3BtaGJES3NKOTVNSVkvUEtlQ2FvQ3pH?= =?utf-8?B?MjRJUHdLM1VTU2tFWW9Hd3NkTlBiWGM3NGo3aSsrNm1EU3dyaThUUGdDTTdW?= =?utf-8?B?Zms2RDJPUzFJa0pMRDVWZWVnNlJUM09LMW5xZWJxSTFEL1lYYlZXZll4cGN0?= =?utf-8?B?S0xlMDVUQ2tRU3V2dWFJNDhSdUE3clE4WHJSUldwa0c3aWEvWjJ4YnZRakt6?= =?utf-8?B?NVZKM1hVaHI4ZVdudmhoaTlSS3VjVmRsTExMdmZDUmxvYk9HOVZDbU82SmVa?= =?utf-8?B?SHp0OXZ3cVZWbk5Manl0eStYTUNycjJzQkpJNnZ0dW9nOFc3V0xTajNpRis1?= =?utf-8?B?QXkrZ1BFWU14R3FURUx0VTl6bDhPWmMrclMwd1VTUm5kUENCbmYycGFPQm5F?= =?utf-8?B?emozZVpOTE16SXMwbGtLOEpTcGNoeUxsZ00yWEROVElYaDRCaHNBejBvWG91?= =?utf-8?B?aEluUTEwODNCV3Y0MVkyUjFYWUJrUzIyQkcybWxVbUN6MVdGbU9raXFxckZ5?= =?utf-8?B?NjVTLzI1SnZra0Z4ZGw1MmRpV3Z5NWVwUVBxODJDREZpS2NaT0pjL29laHFG?= =?utf-8?B?clQvNTQ1b2RVVHRmR0FNT29ZdzJhc2k5T1E2WG5wbXd2SGk3RmwvM21SWmdw?= =?utf-8?B?WXhOUmFzTDRBMFNlUzNSeFRUZnhyN3p3RUdaK09yUnFySDBVM0NzMy9rb24z?= =?utf-8?B?c2I0OWZEZk9OUWVlemY2bjQrYzBrWjlhNzM1QTR3THB3Ylg3SCs0bFUweTIx?= =?utf-8?Q?+bPpCchf/wGLYjRTulsw9qMfyoUoPQL/i5+Wqllrhx5+?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6bb92d50-dd66-4334-5deb-08dd8005b7c4 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 12:20:20.5275 (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: Gc4gNs/jRPIikNGX0U/0yjc9FqNjSEvYxPYSKRF49adDUZfogD313OZ+uUTurv6aYU2APLMnnrkJgg+oaM9T0g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 A page of system memory is reserved so sysmembar can perform a read on it if a system write occurred since the last flush. Do this early as it can be required to e.g. reset the GPU falcons. Signed-off-by: Alexandre Courbot --- drivers/gpu/nova-core/dma.rs | 54 ++++++++++++++++++++++++++++++++++= ++++ drivers/gpu/nova-core/gpu.rs | 53 ++++++++++++++++++++++++++++++++++= +-- drivers/gpu/nova-core/nova_core.rs | 1 + drivers/gpu/nova-core/regs.rs | 10 +++++++ 4 files changed, 116 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/nova-core/dma.rs b/drivers/gpu/nova-core/dma.rs new file mode 100644 index 0000000000000000000000000000000000000000..a4162bff597132a04e002b2b910= a4537bbabc287 --- /dev/null +++ b/drivers/gpu/nova-core/dma.rs @@ -0,0 +1,54 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! Simple DMA object wrapper. + +// To be removed when all code is used. +#![allow(dead_code)] + +use kernel::device; +use kernel::dma::CoherentAllocation; +use kernel::page::PAGE_SIZE; +use kernel::prelude::*; + +pub(crate) struct DmaObject { + pub dma: CoherentAllocation, + pub len: usize, + #[allow(dead_code)] + pub name: &'static str, +} + +impl DmaObject { + pub(crate) fn new( + dev: &device::Device, + len: usize, + name: &'static str, + ) -> Result { + let len =3D core::alloc::Layout::from_size_align(len, PAGE_SIZE) + .map_err(|_| EINVAL)? + .pad_to_align() + .size(); + let dma =3D CoherentAllocation::alloc_coherent(dev, len, GFP_KERNE= L | __GFP_ZERO)?; + + Ok(Self { dma, len, name }) + } + + pub(crate) fn from_data( + dev: &device::Device, + data: &[u8], + name: &'static str, + ) -> Result { + Self::new(dev, data.len(), name).and_then(|mut dma_obj| { + // SAFETY: + // - The copied data fits within the size of the allocated obj= ect. + // - We have just created this object and there is no other us= er at this stage. + unsafe { + core::ptr::copy_nonoverlapping( + data.as_ptr(), + dma_obj.dma.start_ptr_mut(), + data.len(), + ); + } + Ok(dma_obj) + }) + } +} diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index 1f7799692a0ab042f2540e01414f5ca347ae9ecc..d43e710cc983d51f053dacbd77c= bbfb79fa882c3 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -3,6 +3,7 @@ use kernel::{device, devres::Devres, error::code::*, pci, prelude::*}; =20 use crate::devinit; +use crate::dma::DmaObject; use crate::driver::Bar0; use crate::firmware::Firmware; use crate::regs; @@ -145,12 +146,30 @@ fn new(bar: &Devres) -> Result { } =20 /// Structure holding the resources required to operate the GPU. -#[pin_data] +#[pin_data(PinnedDrop)] pub(crate) struct Gpu { spec: Spec, /// MMIO mapping of PCI BAR 0 bar: Devres, fw: Firmware, + sysmem_flush: DmaObject, +} + +#[pinned_drop] +impl PinnedDrop for Gpu { + fn drop(self: Pin<&mut Self>) { + // Unregister the sysmem flush page before we release it. + let _ =3D with_bar!(&self.bar, |b| { + regs::PfbNisoFlushSysmemAddr::default() + .set_adr_39_08(0) + .write(b); + if self.spec.chipset >=3D Chipset::GA102 { + regs::PfbNisoFlushSysmemAddrHi::default() + .set_adr_63_40(0) + .write(b); + } + }); + } } =20 impl Gpu { @@ -173,6 +192,36 @@ pub(crate) fn new( devinit::wait_gfw_boot_completion(&bar) .inspect_err(|_| pr_err!("GFW boot did not complete"))?; =20 - Ok(pin_init!(Self { spec, bar, fw })) + // System memory page required for sysmembar to properly flush int= o system memory. + let sysmem_flush =3D { + let page =3D DmaObject::new( + pdev.as_ref(), + kernel::bindings::PAGE_SIZE, + "sysmem flush page", + )?; + + // Register the sysmem flush page. + with_bar!(bar, |b| { + let handle =3D page.dma.dma_handle(); + + regs::PfbNisoFlushSysmemAddr::default() + .set_adr_39_08((handle >> 8) as u32) + .write(b); + if spec.chipset >=3D Chipset::GA102 { + regs::PfbNisoFlushSysmemAddrHi::default() + .set_adr_63_40((handle >> 40) as u32) + .write(b); + } + })?; + + page + }; + + Ok(pin_init!(Self { + spec, + bar, + fw, + sysmem_flush, + })) } } diff --git a/drivers/gpu/nova-core/nova_core.rs b/drivers/gpu/nova-core/nov= a_core.rs index 878161e060f54da7738c656f6098936a62dcaa93..37c7eb0ea7a926bee4e3c661028= 847291bf07fa2 100644 --- a/drivers/gpu/nova-core/nova_core.rs +++ b/drivers/gpu/nova-core/nova_core.rs @@ -21,6 +21,7 @@ macro_rules! with_bar { } =20 mod devinit; +mod dma; mod driver; mod firmware; mod gpu; diff --git a/drivers/gpu/nova-core/regs.rs b/drivers/gpu/nova-core/regs.rs index fd7096f0ddd4af90114dd1119d9715d2cd3aa2ac..1e24787c4b5f432ac25fe399c8c= b38b7350e44ae 100644 --- a/drivers/gpu/nova-core/regs.rs +++ b/drivers/gpu/nova-core/regs.rs @@ -14,6 +14,16 @@ 28:20 chipset =3D> try_into Chipset, "chipset model" ); =20 +/* PFB */ + +register!(PfbNisoFlushSysmemAddr@0x00100c10; + 31:0 adr_39_08 =3D> as u32 +); + +register!(PfbNisoFlushSysmemAddrHi@0x00100c40; + 23:0 adr_63_40 =3D> as u32 +); + /* GC6 */ =20 register!(Pgc6AonSecureScratchGroup05PrivLevelMask@0x00118128; --=20 2.49.0 From nobody Mon Feb 9 07:22:46 2026 Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2086.outbound.protection.outlook.com [40.107.236.86]) (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 136961E9B2D; Sun, 20 Apr 2025 12:20:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.236.86 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151629; cv=fail; b=HXwjRcF2/utkg/LQkQLf6PPxFg2PZdQcmh0BVJF7O4vydKIdHgZt74kudQs/izXcytDbzScJ9EnIyCX39XhMjq9DHvayNQt5YEP35xKo/c0pTKlK0PPW0Xj4obZLht8FguVISlMS8YFUm13irGjKDKRTF1DLbZbd0wmPYMbIlrI= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151629; c=relaxed/simple; bh=PpZxn1415/MMlSAs5XkbdpNEWolrQmM/TSaZY7N1YJY=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=b5WujoReLpXy6/rWfCa9lGnWiu4nWu4MylsIv8GY0oqEslwy6Y/5qjCW/iXNJDIJvW2AcbcYg3ui+WDEmVgQ5TNexqryMZcb+5yPoK3d/nO6OIzsYrhvXLX3tKJ3RgBZTi3ZrB9IBESEAk39U8Zd22yO1UVXpUHtfdlaGNbLWFA= 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=q9SsWIon; arc=fail smtp.client-ip=40.107.236.86 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="q9SsWIon" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=D2S3EnevqhyZjXs+5IDghwrrBIAzWw6b0VtHX6vdv2xk590X5O7X7zUSmfNtUx6FJHMvWGIxDtb+Hv2m8ybbhHvIhKRpeqIhii+eDMLhfq95zl1n7LyEk9EzIQ9V6tmuJltDUqbDwBdn1GpwYPOXJZk9x7AduM073CeshrcJ984/3qKRGcQujH9iLkCm9Q8UsKN/LogiYDaoMZHFdTAuigJ2YelVtSmnU0yzLX3IMkBncE4xKUydNgxB4GhYFH/zaxDe3v8qo0VqJG/s3VQBx27GhO+sjLH7W0cxsD0h7FdSF+voTqCH+rAGwg7CwXhMmzlDgFrRrBVgyf+r8XUtsw== 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=pXypyvq/81TokM/x8hQlINagJBU7Jy1oy8dIFtqX0ZY=; b=enANoc5WRilVyyDE17rahq1pm4zQUg5fD1kB/oH5UCitMAW0jr5y8wDm922FOD881nLY95ZxxKHy6UWo2Gh2IFFZJas42AS96pbBK2IyP+TzcuEZySp4L4knuKPMzoImWzNTixZ6rpiw3kQK8I3gnjRhrxy+ud6jwJwMoDSpH58h0mQNbbEOIzFF56gNyOwuu4U27a9A0LTHNJZOZO/FEgVwv0Xq5QjFuu/5NYT8FJh1OF5EPCkxIa1UuU8A8fcuk0TRPeH4i8K5/+bccdkwKMQQz9yoM+1sSw2IJh6++n4aNsxwWjOfuq1Ia2u+oyjv1XuAYEtI2guWXZVzWqP5Kw== 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=pXypyvq/81TokM/x8hQlINagJBU7Jy1oy8dIFtqX0ZY=; b=q9SsWIonCkX0HGnAI9+B4f8FhgC3hhxISJYIr7h9XK5mQeWzzc8ypsCNV0nQjQp7T7N5Sq29xeQQCuiEiN9m3IFF4oyBTEOnoMSwtshUHcQ7fdolQJv7uXfpWvxuap3XBHN+JlPHh4u7Oo7WsjXUgmuv5Vt+ssmHgwMeWs5N7sIcOJVA93WodNrseCxqpmlHtS5Jgkt5VyRneDFQptrO+mBniwYCfoYOm74BZd0EWMsfKkKbvoExvLvKl8UQ/L6f7dWZxNEH/g9jXSflOprs94pwCtHtusmv3ZdXHl8xYQTtsZveRtqtbY2ZrkAFrH6tFSH+IB0IFW3EgDPHaDqRqw== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr 2025 12:20:24 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99%4]) with mapi id 15.20.8655.025; Sun, 20 Apr 2025 12:20:24 +0000 From: Alexandre Courbot Date: Sun, 20 Apr 2025 21:19:42 +0900 Subject: [PATCH 10/16] gpu: nova-core: add basic timer device Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-nova-frts-v1-10-ecd1cca23963@nvidia.com> References: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> In-Reply-To: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: John Hubbard , Ben Skeggs , Joel Fernandes , Timur Tabi , Alistair Popple , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alexandre Courbot X-Mailer: b4 0.14.2 X-ClientProxiedBy: TYAPR01CA0124.jpnprd01.prod.outlook.com (2603:1096:404:2d::16) To CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) 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: CH2PR12MB3990:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: d2eb29bb-3f66-4bcf-dc8b-08dd8005b9e5 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|10070799003|1800799024|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?M2dtZER1THhueTNzSW9KRUlidjhqaDYrbmlzc2ZZK3JvN3NJOFNRNjRFVmtw?= =?utf-8?B?WXRybkxPbFZrMHRoYjhhWlZxUUJHbkVSYTBMQ0RTQXpscHp4Yk5ZMFoxVm1o?= =?utf-8?B?SkovT1c3UTRpTVFIcjYrY21DRWc3ZHorb1ZVcGYwSldPbWNpUHllQTU0b0dW?= =?utf-8?B?VmcyM2I4eDVYSitpM3VoOGNhM2Roa21TOTMwUm12anNJKzBCQWM3RDBKajFt?= =?utf-8?B?aEt4R09ncG1qZ3ZkV2daZk1zQk9SYUpSS2w3S2FVV2VXdGhJTmhwc2NBcmNO?= =?utf-8?B?QkpwVUFqSTQ2TUJOUlljTld4ZGFubzBRNm9yQVNLSHU2TUljczdjUjgrZUhJ?= =?utf-8?B?TDZsZzIyNFVSOHVVTnJZcXpJKzBYdTlUU0NWRDVKTHJFYXYvZzl2VkxCMkk0?= =?utf-8?B?S3diR3ZtWnJRWWpNVzdldmJBZ2pIN0VTSXhod25JTDFDQXZOTldaazZQaFhO?= =?utf-8?B?SFlRUDdTVHdJc28xZCtKc3NTOHVWQ250UTJEaW5VUG5Hc3hzSXJpTHlNU0I1?= =?utf-8?B?WEFDampiTkZrVkRoTFQzeHRUVzMvdlA0dVQ5cFNYcDBJaFlZRlNJMFRWZE1S?= =?utf-8?B?ZW5VQ3Uzd21aUmd6Q2dZMTFvR29mVUxJL3M1R2c4TzU0ZklQMHpwVzVQdGNK?= =?utf-8?B?cm5VcGNXMkdGL2xaQWpibVNKaGhiRktnQnBMV21xb1dTOVJkZVFTRVpjKzV0?= =?utf-8?B?enhzcCtVRmZwQWJsQjdsVVJJeERrTXNJckwwMU9nR2ZmL0ZqemdkWjBGbXJ6?= =?utf-8?B?WWpDN0hMR1kzSGNvNjNYdTVhODd5ZlFrK2hXNGlNeldLeXAyalJKZGd0MkJ3?= =?utf-8?B?cTIwVFQ1RTMrR21NaDd5Z25xc25IQWZqRmVXSkdYcFM5ZFJ5TWtrOUZoRXNq?= =?utf-8?B?cmlUNldwSThxckVUSnMyL2lMQXNDcWx6cjI0Y0h6cThsOGV6MDhCTHU3UzB0?= =?utf-8?B?QXo3QUdMcnAyQzVPNG9ReG9Wc2dhYzdhb0JKUGpIOUpoK2pzNWNCQjBYd1B6?= =?utf-8?B?cXJObXp6bElJN0krOXJrajJPa2JxZnJSWXBxeURsTGh6L1RPSUZzejA5c3I0?= =?utf-8?B?T1NvSGpnaGlGbXF4ZG9JVUVDNG1VeVZGR0pTRjBrMGE5dkJGQnB1dUVRVXF2?= =?utf-8?B?bDQvOFpSQmNvTmovekVGZDFWd3FvU3RkeTBWQnpONU1GOUxUTFJybVNCVVVx?= =?utf-8?B?VDNkaDBndHlmQVdITEluQmJBb2EvN1VnS1ZlU3d3bWdORnVHMnhyekZaeXlR?= =?utf-8?B?U1dkb0M5TFpLa3djenNHVTJHTWNhdHg1azZWQzUxR2lrTzdIcU92aUUzcndK?= =?utf-8?B?ci85cVRlSHZ4QitrTFhyQXkxVW1MUUl3K3BlTDlhWWlQaSs3NVNJSW9KWnRF?= =?utf-8?B?UGpIN1hFbVA1Q003UDhaYjRpVU91UHdvTHZUNGhDUWIwWUpUdVlyVlFudnBP?= =?utf-8?B?VGY4ZVZ4amUvODVFN2RCK1pOazJEb0tBdk5KTTl5MUxYdGdJRnFKblJEUjNj?= =?utf-8?B?dUNIZlYrbEJSSXU3Qnc5UE53c3NhUnJSRW1ubVR4RHBvd2pVYTRhbDI0dGtp?= =?utf-8?B?U1JpOWdxMTNndjBZL3g0SlJsUW13bEtvN0JwUFNtUkQyMElwSVFDeDBydzZn?= =?utf-8?B?K1ZCNjBETkNSa2E1YVlVS0pleVZ2a2tKV3VsVDdyTWE4cHJRa2I4VFg2a2gw?= =?utf-8?B?MG9UMXIwa29qOWxZT2JVclhJaHhaVmt5Q2JjSXJyM0t0RmJYT3JnQ3NsQzVS?= =?utf-8?B?Z2ppR215bHZWbHRqY1VkbnYwZzIyNG5PUm8xcmd4eUZDbG41NDJleGtZb0hw?= =?utf-8?B?NW90SHN2SnpxeW5waUxtc2s3dk5sSTkyazVmMXdTcnphbG10TUFEanhWVlRl?= =?utf-8?B?bUxyc1k1Tm5vT3ZsaUNQdXNLTFJSRUtFZ2lIbU5xM1ZDSnpGaVZMTVc4QW82?= =?utf-8?B?OVYvcHk3RGUwalBYcWdqV3hTZytVbERLMCswSm93TnVLbGl2NlU3cWJxTi9a?= =?utf-8?B?TTE1ZG1MWTdRPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB3990.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(10070799003)(1800799024)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?VWdqTzBiTWlUTllhWDJJZkhlVjVDQ0VQcXg1cXpsazEvdGhUYlNvKzBiUm9q?= =?utf-8?B?cVZhQjQ2LzFraW54RXFtbE5oc3FSZVAyTlhtQU1JbWx1UTFTcDljclhRMTdl?= =?utf-8?B?WjdpV3llQ3lhRUEzbHVjWEh1ZzFHZGlIcE0zVmZsbWwzNjcwU0FJVUt6bDBY?= =?utf-8?B?MjlLNFc0YWhuNDZoZnN4MEUrUWtudEdqUkpobjBadHl6S2EwTkhsVzRVUTln?= =?utf-8?B?UWdmMGc0ZnQxbldPV1llWFM5ZkVlQUFYWkl4SUFXMnVWRlNMclN3THA1c3Zu?= =?utf-8?B?a1YzWW9DWFNmc2NTM0ZVYVpuZk9HNzZtWUIyaElEZlpiWTdkSCtIcTAzYVI1?= =?utf-8?B?dmpXeHFXdTNJQUhJbnc2aTNZd08wODVNblhiZG14LzFZYWhwMDFRNEJuRURx?= =?utf-8?B?NEQ5OTdLWXRLcHU3aGJBUTZVUTJFbGZibWd2VU82cHBxWkhxaUZrMlAzcW9G?= =?utf-8?B?Q1h4K0JzSk9pVzFmMkd3YUlTWS9HdzQvZFpHUEVhY3dzU2RJV1BRK25YRU40?= =?utf-8?B?UTIwa2FZWU0zcjdrMlBlcXg1Rk5uQXlWYTByRmxvVjFHd044dmpZMitqeXJS?= =?utf-8?B?Z1l0WThOL1hVTVppMTRoTkROby9jdjVBZ2ZBNjVmNUNwZ2ZpNzBkb1BOMExa?= =?utf-8?B?eDZ1bHg2Yi9FRXRHaWduRW02a0dzejVvK3lKNlhjYVU2RHhSTzhEa2Y0cE5v?= =?utf-8?B?T1pKNDhUdjJhM01JeDVoWUlqV1pjMU5oTXVrRTVZb3BNUXdjSGVTUG9INUlL?= =?utf-8?B?cjNmV2FNZG5XS2Fwa1g4SnZGTklRTzZ3bjVqMGZaOXhXT013b0hCdGdOYjVx?= =?utf-8?B?L05GUkIxb1liRXZLbS85VW81dnlDc0dJVHhrWXQ2OGs5bDRCYVlkK1dMLzZD?= =?utf-8?B?NE9uV2VFL2FpRkRpR250Um5ZMXZPcEZNWHo0TlZhbS9RM2tCL2ZPTjVsdllq?= =?utf-8?B?N2JiU2lvRDRXZU43M25wNjZVODNRc0pLRUpCSktwbTM5OGtTQjhXNnh6SnQx?= =?utf-8?B?dHp6eTNIS25ES0ZKdzhIU3lxb1RsajNJYVVWQVdITWlTNzZyd0hwNHVjSmRy?= =?utf-8?B?VE0wdTBJcVN6ZFZmZlZkT1pXMlhINFR1MldHTGsyMHYwbDBhdjZRZTRtUCtI?= =?utf-8?B?VE1scjhGc2VtbzFsYVpqYU9WYUg0R1dURXhhQnIwci9rNVBjZ3JzaWF5Nkow?= =?utf-8?B?c1J4bkxOOUVudVBzM3g5dEErNEU1WlhpWEZwUktST0xqTHB6T25ldnNESHRo?= =?utf-8?B?Q1NJc05lbi91aURTenFZLzFXWXdTYmVCLzhFa25VZGtFdjZ2VHJwcUVJaU1R?= =?utf-8?B?VmRiaVJaRG9XWDR6RmFhS2ZBYnVCajhMTWh6MnYvWHJuUUdRSzVZRHJYelZn?= =?utf-8?B?US8wSE9INlZFcVR3R21KZXM5V1FRQ0VadGlvWCtWWVFsbjdKd1g5dW9DTG9O?= =?utf-8?B?OE4yUWYyYW0xMkt1OXZ3MHUzditnbGdXRm1jZUN5WFNzZ0hMeUtGeDFWUDNa?= =?utf-8?B?L1laWnZPdkdEd1k2NmoyamY3c1V3ZVRlckpIai90WVNKMWRwSXBteW52Ui9o?= =?utf-8?B?NmRIcjhDa0JEdkNWY3JnZWplZkVWeVpWU2pwdFA4cUxQRFpiWW83MTNXaUk1?= =?utf-8?B?ejQyclZDb0tkV2JLUFh2bk02M1Z4K3A0U0lvUjdhNkdVOEtjNTl1azhtem4z?= =?utf-8?B?M2RXQVFweXRXaDl0aDNCUUpNZ3lGRXdUb20vRnYwc1FlNkhETVlHaWlXWmRY?= =?utf-8?B?Njk4YTdOdDdzSWRsZlZWWDhjemRqOEl3Y0RXVXVsVlBvY0FhcWx6UU9ERkxn?= =?utf-8?B?Y1JucWliWGE3SE1JTjExV21hSG91bVB4MmVMcVRtclNJMFh3VXRsdThQUXNU?= =?utf-8?B?WW81YWgwSkZVWkVaZFdYaHJqNU9HMTlHMmZrOCtiZGpReXROak1YaDdlcUJE?= =?utf-8?B?SjRJTWlobWNTZThzMjY0d0NyaHpySm50QjFaTEZ5ZXc2TXk3OE5nSjJzU0Rk?= =?utf-8?B?cWtTbm9KUmtSVW0xSkhOOGk5WmxWdVVWSkttZkJWZHhKZjdQamhyUFFDOWpy?= =?utf-8?B?eGMwTDVyL2JHOVMyRGE4dGJNcFhneFpneWVQb3RLbVRtMlk1VitGV21MeE9G?= =?utf-8?B?dlI2aFArVTF1bFl1VmpLd0tGM3ZxczNpdVZXZERqVGVhZUcrM0NkekxWUDA4?= =?utf-8?Q?vMcM/AA/fKtXb+pCLf+vFQ+3pEsemerWhvuWcoqbrlnG?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: d2eb29bb-3f66-4bcf-dc8b-08dd8005b9e5 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 12:20:23.9648 (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: /VMxJ77jturibU7y++ipi68ujmmCw5lKp91eeQUfJb561Rk43EvXduxTDeyjpvDVgh8KWGRdRJDy6uTlwrRgHg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 Add a timer that works with GPU time and provides the ability to wait on a condition with a specific timeout. The `Duration` Rust type is used to keep track is differences between timestamps ; this will be replaced by the equivalent kernel type once it lands. Signed-off-by: Alexandre Courbot --- drivers/gpu/nova-core/gpu.rs | 5 ++ drivers/gpu/nova-core/nova_core.rs | 1 + drivers/gpu/nova-core/regs.rs | 10 +++ drivers/gpu/nova-core/timer.rs | 133 +++++++++++++++++++++++++++++++++= ++++ 4 files changed, 149 insertions(+) diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index d43e710cc983d51f053dacbd77cbbfb79fa882c3..1b3e43e0412e2a2ea178c7404ea= 647c9e38d4e04 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -7,6 +7,7 @@ use crate::driver::Bar0; use crate::firmware::Firmware; use crate::regs; +use crate::timer::Timer; use crate::util; use core::fmt; =20 @@ -153,6 +154,7 @@ pub(crate) struct Gpu { bar: Devres, fw: Firmware, sysmem_flush: DmaObject, + timer: Timer, } =20 #[pinned_drop] @@ -217,11 +219,14 @@ pub(crate) fn new( page }; =20 + let timer =3D Timer::new(); + Ok(pin_init!(Self { spec, bar, fw, sysmem_flush, + timer, })) } } diff --git a/drivers/gpu/nova-core/nova_core.rs b/drivers/gpu/nova-core/nov= a_core.rs index 37c7eb0ea7a926bee4e3c661028847291bf07fa2..df3468c92c6081b3e2db218d92f= be1c40a0a75c3 100644 --- a/drivers/gpu/nova-core/nova_core.rs +++ b/drivers/gpu/nova-core/nova_core.rs @@ -26,6 +26,7 @@ macro_rules! with_bar { mod firmware; mod gpu; mod regs; +mod timer; mod util; =20 kernel::module_pci_driver! { diff --git a/drivers/gpu/nova-core/regs.rs b/drivers/gpu/nova-core/regs.rs index 1e24787c4b5f432ac25fe399c8cb38b7350e44ae..f191cf4eb44c2b950e5cfcc6d04= f95c122ce29d3 100644 --- a/drivers/gpu/nova-core/regs.rs +++ b/drivers/gpu/nova-core/regs.rs @@ -14,6 +14,16 @@ 28:20 chipset =3D> try_into Chipset, "chipset model" ); =20 +/* PTIMER */ + +register!(PtimerTime0@0x00009400; + 31:0 lo =3D> as u32, "low 32-bits of the timer" +); + +register!(PtimerTime1@0x00009410; + 31:0 hi =3D> as u32, "high 32 bits of the timer" +); + /* PFB */ =20 register!(PfbNisoFlushSysmemAddr@0x00100c10; diff --git a/drivers/gpu/nova-core/timer.rs b/drivers/gpu/nova-core/timer.rs new file mode 100644 index 0000000000000000000000000000000000000000..8987352f4192bc9b4b2fc0fb5f2= e8e62ff27be68 --- /dev/null +++ b/drivers/gpu/nova-core/timer.rs @@ -0,0 +1,133 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! Nova Core Timer subdevice + +// To be removed when all code is used. +#![allow(dead_code)] + +use core::fmt::Display; +use core::ops::{Add, Sub}; +use core::time::Duration; + +use kernel::devres::Devres; +use kernel::num::U64Ext; +use kernel::prelude::*; + +use crate::driver::Bar0; +use crate::regs; + +/// A timestamp with nanosecond granularity obtained from the GPU timer. +/// +/// A timestamp can also be substracted to another in order to obtain a [`= Duration`]. +#[derive(Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)] +pub(crate) struct Timestamp(u64); + +impl Display for Timestamp { + fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result { + write!(f, "{}", self.0) + } +} + +impl Add for Timestamp { + type Output =3D Self; + + fn add(mut self, rhs: Duration) -> Self::Output { + let mut nanos =3D rhs.as_nanos(); + while nanos > u64::MAX as u128 { + self.0 =3D self.0.wrapping_add(nanos as u64); + nanos -=3D u64::MAX as u128; + } + + Timestamp(self.0.wrapping_add(nanos as u64)) + } +} + +impl Sub for Timestamp { + type Output =3D Duration; + + fn sub(self, rhs: Self) -> Self::Output { + Duration::from_nanos(self.0.wrapping_sub(rhs.0)) + } +} + +pub(crate) struct Timer {} + +impl Timer { + pub(crate) fn new() -> Self { + Self {} + } + + /// Read the current timer timestamp. + pub(crate) fn read(&self, bar: &Bar0) -> Timestamp { + loop { + let hi =3D regs::PtimerTime1::read(bar); + let lo =3D regs::PtimerTime0::read(bar); + + if hi.hi() =3D=3D regs::PtimerTime1::read(bar).hi() { + return Timestamp(u64::from_u32s(hi.hi(), lo.lo())); + } + } + } + + #[allow(dead_code)] + pub(crate) fn time(bar: &Bar0, time: u64) { + regs::PtimerTime1::default() + .set_hi(time.upper_32_bits()) + .write(bar); + regs::PtimerTime0::default() + .set_lo(time.lower_32_bits()) + .write(bar); + } + + /// Wait until `cond` is true or `timeout` elapsed, based on GPU time. + /// + /// When `cond` evaluates to `Some`, its return value is returned. + /// + /// `Err(ETIMEDOUT)` is returned if `timeout` has been reached without= `cond` evaluating to + /// `Some`, or if the timer device is stuck for some reason. + pub(crate) fn wait_on Option>( + &self, + bar: &Devres, + timeout: Duration, + cond: F, + ) -> Result { + // Number of consecutive time reads after which we consider the ti= mer frozen if it hasn't + // moved forward. + const MAX_STALLED_READS: usize =3D 16; + + let (mut cur_time, mut prev_time, deadline) =3D { + let cur_time =3D with_bar!(bar, |b| self.read(b))?; + let deadline =3D cur_time + timeout; + + (cur_time, cur_time, deadline) + }; + let mut num_reads =3D 0; + + loop { + if let Some(ret) =3D cond() { + return Ok(ret); + } + + (|| { + cur_time =3D with_bar!(bar, |b| self.read(b))?; + + /* Check if the timer is frozen for some reason. */ + if cur_time =3D=3D prev_time { + if num_reads >=3D MAX_STALLED_READS { + return Err(ETIMEDOUT); + } + num_reads +=3D 1; + } else { + if cur_time >=3D deadline { + return Err(ETIMEDOUT); + } + + num_reads =3D 0; + prev_time =3D cur_time; + } + + Ok(()) + })()?; + } + } +} --=20 2.49.0 From nobody Mon Feb 9 07:22:46 2026 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2063.outbound.protection.outlook.com [40.107.237.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 EFB64204C17; Sun, 20 Apr 2025 12:20:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151635; cv=fail; b=dhWcFPtYyOfBTXNXyg65p6RD5nk7sgrGjlSOLOe2TBn9HoJRxyGMnymGb6s9SF5GsRW4phz69LYawtZr0T0OY6SfnJ/+8+aDn0wHPaiuuMMSVHx1pOW7LBWMNvtTi0RSlf0BIK8TyO3BH7Src2OitZQ9VoEJuxdpZM+hNN37Hm8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151635; c=relaxed/simple; bh=tx/AFPFZnPsfv9pSgkZEObHkh2xuyupgp1C815HE+KU=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=gm9oeFe55gQdw7pEumAJdO9o5lgm5fwcYXB0Uus8XH9LW2KXt8GxekXlSV2OWFHNKRMjeSG9zwquHsllEcYCcV1cp3+ahnoexhTv96SGlZ8VZHODM8/L0CefxjwFgZas+dzRGqkehJQspK4xiW72tUOSS11IBz1I62Klw/X4JRg= 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=A2ZPPiuM; arc=fail smtp.client-ip=40.107.237.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="A2ZPPiuM" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=xjRhqYiQV7beFwXE9Yfwl+VmrOhc5LJYPdhh36VyU8xMipl3kV2BmIe1G0p2l7RV8lHyG9INEksxHcTkouZnaW7QXcoF4tLNIe/2n7NdcbkfWCWEbcq9jTKzcMmb2rJUmhlYGvdrr59EoFFw69dVttG2VjjiMkRFxDv4EoivKjEA7o+Y5jCmHVvW1Ti/SE22dWL9Y4x5cP50LuBMN7XyFpawTDijWqSajfEkfZnqnR0k6BGyit0soa140PungG/MQO7GfS2YgRUnEP7YoTyiLXUJGduPagXX0sxFrPqR7XzaEYRYw4BROF3KpvrA7YTxqZ7whdtziv1RQhMUwCleng== 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=2Ql1lYeRHY1dobye17TC16ndoIcge+inHoRuMR/cpg0=; b=QI2Q/wraKiAxHdTF6GB1adfKqiJjEmdEwVleeK4Av++uFpUtIU1lmrf1tWnJ4RiDjIyBHEjxNMpbTj34AadWqvGbGNt2g/0XOev1+MRsOp9K2iVQnDhha5C6Xgp82aiub2J9VF0IEPt03WjydZoIwUQEFwwzBsO4qSiFrSC7WJ/zMYBgAlVGEXOudIIli5/y81esW5SuaaQCmxOJdirYCMZginCGqQf1vHtxeIwWEUhbIQfD1oIQIJeEp48Pe9RPIUjQnIEZYGeOiT/zKE4CrvpgF3+jfqKPuWnNVJay90x/2DXFq0JVr9y+p2keiQQggCpie/i+OSKy9VgtdpJr0A== 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=2Ql1lYeRHY1dobye17TC16ndoIcge+inHoRuMR/cpg0=; b=A2ZPPiuMGyjMxQhV4OCX1Yto/RjPd7ehkeWP+AXvDH7TF9D98LfDEQznTBdchysk1qX3vK58rHOB5TFbp7/IudIu8w945LMDjwrP93Wovjh27OdOQcKlhwiN/HPOIPKrSRVX8GJhLDegBbb0BAA6eo7NeyYfZ5A1gkFdJ9LetubYwbPfp0iIufWcHb9R4b50wuz2FeQEidhm0S5l1s24LWZqShfrTpTBUHHC9/RqPm0Ph93/LWEqFPMjR6e4MughYBlgAt9s4n7EIqlsnWGxT4y6fJiVKsfyicSobV6JuR2NchJLKyPQ1Irpz+YFud5OIu//gdg2XVnTEUw9NdPbvQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr 2025 12:20:27 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99%4]) with mapi id 15.20.8655.025; Sun, 20 Apr 2025 12:20:27 +0000 From: Alexandre Courbot Date: Sun, 20 Apr 2025 21:19:43 +0900 Subject: [PATCH 11/16] gpu: nova-core: add falcon register definitions and base code Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-nova-frts-v1-11-ecd1cca23963@nvidia.com> References: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> In-Reply-To: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: John Hubbard , Ben Skeggs , Joel Fernandes , Timur Tabi , Alistair Popple , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alexandre Courbot X-Mailer: b4 0.14.2 X-ClientProxiedBy: TYCP286CA0082.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:2b3::6) To CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) 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: CH2PR12MB3990:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: e9d8e2e0-fdd2-43e0-e543-08dd8005bbab X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|10070799003|1800799024|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?SkY5elk2TllNc1lESkZIYjVCS3M0d24xMlhBdVNiT0x2L0xab1o4TWpIVGVq?= =?utf-8?B?WHE5MVVQa0xPR2ZTYkFZcjRJQ2Y5T1NpbUJmZzVVWFUxS0ZteVhnb05la2xV?= =?utf-8?B?d3VHRjYxM0Nja2hWaUw0bTJLZy85OTJ4N3Q5OEVKWjZwWnZjZFU5dkFCaDJH?= =?utf-8?B?Z3VrV3RFaUNPUzl1bGt4Nk43dlFlR3pCd25WcWEvRU5LZ1BCdkxEc1lBODF1?= =?utf-8?B?QmMvODh5amNQVmNGRmtPeWdtL2JZdHZVbDBhR2VFZFRKQ0N4TERNK2JNQ28v?= =?utf-8?B?R1dVOHBYakNHSURTdnhLM0NDdmNlblRvRHh6M0hManQxRTRjOVFDckk0aVNw?= =?utf-8?B?RGpkdXlhR0tzeVA0NnNnU1lmNDAySmtKbjZxTWljRmU4UHk2eTZjcEdlUmwz?= =?utf-8?B?K21XaFJ1bWUwT01IUGhZN0NDNEpoeGJlZXllUS9rR1BoMzAwSmU3djZ3TC9D?= =?utf-8?B?SWJvbE9kZW55Nmtkdy9TVDRiQVZMWDUrU1JxdkJzeWFsY2RHd2R1c2hmT0o4?= =?utf-8?B?RnV6VXphN0Nuamc0S2J2UWRpeXh5cTA5Q204SlZubm9vdUhJREJYbHVjMzVa?= =?utf-8?B?VWFxemovRUNJNTNkbXgwamFLbkZ6S3pVM041Zk5KRU50bUpNaUUrSDZRUS80?= =?utf-8?B?NXBPbWxrelprS1U5aDhuNGpEdnp3WlN3eE9LbXlkTXFJSFYxbmFpYjZyMGhD?= =?utf-8?B?RmtOZyt4THhZZVpRMEUvL0dJQlNkamduVVJQaHVQcGNrZWpOdWEwQ2dlM2JE?= =?utf-8?B?OVFQVXBBVzVFN1dRMjhqbHVQTVJFdXpoaVAvSVliZTMzdi8xTGJNb2Q2R3JI?= =?utf-8?B?VCtJbWRvSko4MnRDZ2hVa2dDdkYwU01SMDhUekw2K3hwVjA5ZXRCVnk2R3NQ?= =?utf-8?B?M1lsK2hCQ3JreE0rRmNWUWxrVCtLQlYyUXFobmhmN3VFcFkyblI0SEpJUHFh?= =?utf-8?B?T0RnTzRGOWRleGNCOUliYnVFMGNhZzlxYlNYK2Z3bEtneUtxb2dibUtTT3Br?= =?utf-8?B?QnUzVS9YcU8wcm9NOFUvaVhzZmwrMGozWUVyVXRNUjZ3aCs2R3ppNGh0SllI?= =?utf-8?B?QXorM1hHa3RPMS93Z3RwcStMN1JOWVV5RXFGaUgzZnJYblFJS0RoVHpybnZG?= =?utf-8?B?N2JsZ0UzSUQrOUZqQ3RqN0FrQTRxbUNnL3lJWXZGcFVVQ05KSFhuVHdhMElx?= =?utf-8?B?VjlTQTFKdDZNaEIyY0Y2MEE1ZjhJRjdqRWNjaWV4UXRsWU9SRTQxNmg1MWFs?= =?utf-8?B?TjRwNG1OZnppc3Y1emF2ajdSODBVdlh3RGV2eGcxb0FoL0NycU5Jb3psdDh4?= =?utf-8?B?QTlmaXhnUkQ4Y0QvMHQrSUVONGExWUxJSHZSVDY5cGlvZTlYVDlrZWt4SVVV?= =?utf-8?B?ZXNTTVlCck5PcER4cW5GSTZUY1duQ0FDdzNjcHMxd205dXd0ZWxSb21pR2sw?= =?utf-8?B?ZHdBSC9IVFN0ckRLdnduaExlRVVFTE94ODlyOWVXNTloaWpDa2dCYVA3Qml6?= =?utf-8?B?RVg5L0NjcjNGcXRPYUpsYWp2WTFZelpIeFpEQ1c2NmtVdDBIbU41U2xQLyth?= =?utf-8?B?eVFrVmpqc2M0SDMvK1hCUFVKV3krUTdIT2NwS2hXT3FObWRTdmg3VisrUXBz?= =?utf-8?B?dm9YMktBczVZNUlkTGtpV0lOWThvUC9GUCs3NmJoY0xpaURSUzJXRm5tdEc0?= =?utf-8?B?TGlldW9mR3V5dlFNT1RtT2pDTUpYT3pwTGVLUGJ2dzNXdXBvRm9NeUEwZ3lv?= =?utf-8?B?Zm5MamRRc2xRdnZsQ3FKTTQ4Nk1GbHptWVN5Qk5uZ3lLTnNCOE5QaUNpbndy?= =?utf-8?B?TVNid3JSeFpqd2RxQWFTeHhoVE1oc3VianlMTFJwTVJiWGxXNTVrV2JwZnhE?= =?utf-8?B?SEt2NGdjd2YrMERpaGxuR3N4bHpKalJNNnJOalhNVG9Sa2xORXQyRVIycEZU?= =?utf-8?B?OXpMNjRZR3FqelM2cWZYK3JMRXN3UWFCM3BielY0M3l5UGM3NzJZRWRkc0Zu?= =?utf-8?B?RnVZVFc2MmJRPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB3990.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(10070799003)(1800799024)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QkJWbmdDRVFzRnNZd2tJUzVTb2FuZUhYM2VxbjV0OVZEWWFTVTdzMkpLdThs?= =?utf-8?B?NGt4N3lRMmZ4dEJVMyt3dVREeStKQXRNbFQvV0NSNGl3aisvcVo2cVlpdGtX?= =?utf-8?B?cWw4dTZmWUdOeExIZ2pOcDRUSzNvZ1oyNjFDeUN2TEZ1TVZKYWNnZjZMSnU0?= =?utf-8?B?WHB5Y3Jwd2dFb1p4Q3dzb2hENi80cWtFVUZ5bGR3amI2elZKNnFiQVJKTUN1?= =?utf-8?B?OWVaQmhkYXJ5eXNFN082b053OGxmVlg3V3Y4SFY0ZHdaWEhlYi90Sm5WWkF4?= =?utf-8?B?N29sUi9LbGQ5c3dCNitCdDI1ZDJWUHNJQVlMZ3ExdnBYYnFZN1R2VzNobG1Y?= =?utf-8?B?dWtRTTdSSzZucVZHaFhLOGd6WjRVLy9aSzlGcHFGZDhYY2R4ek9NbHZSY3Vk?= =?utf-8?B?K09ISndaOTk3M21tdjBBZ1dJaVZaUWxkV0k5eENhRjQrQzRDcCtIVEZLcms1?= =?utf-8?B?U25GTGxwd24xT2c3MUx0KzV3TzNwaEJwdHdEcm1SWmFRcWZsdDRidVhkUTdJ?= =?utf-8?B?TEhnNjlKOVE1dUhNek1rVjl5QXJCNHBXck42dlcyd0ZxVW9WQUo2T21OeFVO?= =?utf-8?B?UWxhaUFWV2NGTE1sd1RmdnA3Rk84SUFBTHI3WG1MdXRJK291eDdTaDBVV3Fz?= =?utf-8?B?VmxwV3JHQlg2eUFBZFFZbjJiUWI0RWdIZ08xdTV1d1Z3MXFnZCtsdWdNQ2lF?= =?utf-8?B?K3ZPNklCdTQ2cVhScG45TUlvQUNkVzNlczhuODd6bEpuVWVuZ3RYUUJwZ21z?= =?utf-8?B?cDFPWXhQaWRvZWd2aTZEYXQ3ZEFlU0o0UTFNZ3JQdjFMY20vTnRkVUFycW05?= =?utf-8?B?TG05UnNlNlFnYjZMS2xWZ2dRL2VLU081cW51OVJVN2ZXLzNPVWpwbEszVWdw?= =?utf-8?B?ZGxaRnlJNnhNRG9iTDRWem9NSUNieHkvRk5rWkFUSmtieEpWbGhwY0VFeGxC?= =?utf-8?B?V2NqUDZTUzJzNXZwZVBtWU5MbS9nSnZGQTJIbXMydlhzMzZkUHV2VlpobmRy?= =?utf-8?B?SkNReURNZngzRlRCclkxVWJVenJMc2lXbXJLNlVpYXpSTTA3L2phakJSTGRB?= =?utf-8?B?OVl6djQxNDNzcDdvT2xYeEFIMzlWUlBQSkJCZUFSZVZTdDM5QjdDcyswc1Y1?= =?utf-8?B?cGpjZnlkSzBLWm5wak8zbjMwT1o2cHFsYlUwSFlpMVNBcnJmTzFQRnMxbk5X?= =?utf-8?B?R2liN0FIbDdOUXlWdytmSW9DaGtRaTB1bnBSOFhzZnYxVjhPZzhUbVRKNjZ4?= =?utf-8?B?dVNYR2FnMkp1M0swVGhlR3c1QUw1eS9TY0ZpQU8wL21TdTdlOE01STJseW9r?= =?utf-8?B?c2h4Q2FzVjBkbDA0SWtZWk1XQWdoYnQzZzJNZU5pcjN4VjJVK09zeUo3NE9a?= =?utf-8?B?ekMzV29yUXQ2aGtGK2JTTmtsSmpMeDNsb0N0cVltZEZLMWVoMkZYRnZtbHFY?= =?utf-8?B?OW5yWVE3NzVERC9jV0RMRzhaQVc5d2lLRmxSaGNxWXFFclZJWm1VaWtTbUlE?= =?utf-8?B?V2VDUzM5Y0lyNmkrL3hXWkozRzFtNks5bkhRQld5VWxHWldIOXhzSkpadGdX?= =?utf-8?B?dkg4ZnhtWXZZTU1yT2pTSW1GZ0VyYnpLaFRLeXl1TjZmMW9MMFlYT2tBcVFQ?= =?utf-8?B?TS9INnZic1AzZ0xGbVU0cUM5Rmx5a2o5NDFQMUYwS2w1cjFOY1BNNzQrWU5y?= =?utf-8?B?WDM2Ky95YVZCME05N1M5QzFvdk1hajFBK2pOTFFRcEFDWmFXSUNLRnFFU0NN?= =?utf-8?B?UkpqMWhoQzhzdkwvZm0rVGZyRWprbU9WaEpob0czeXhnaEZzWjViNXZpVVBL?= =?utf-8?B?OUVjbEIzY3RMUTliMXRET2Z4L3BZRzk1emRiWmdod04yditGQTFNb3B1Lzc5?= =?utf-8?B?TTNMbVBQeUx1dmpVRitQYjJZa2sxdllBcUNWRmtmM3J2U3VhT2oxOFNVTnMx?= =?utf-8?B?VEtWeW9LV3lhKzB2T0Q3QzdGeVdnaG5iV3Y0ZktPdzJpWHdKdHE1U2dWS05U?= =?utf-8?B?NEVIYWR0WTh1Z3dJa0lXMytKc2JzQ1UxU2tWS2FHaHJBTUI4YmRWVDk2aEg3?= =?utf-8?B?Y0Y5SE8rWHozMzJRSGpuUjRjSXYveDFlb1M2cmRMcmNBTDFLWHNrdVo5a0t0?= =?utf-8?B?SjJCSk9hUTlzUnNRVWRHOUpLMlduL0hZNHVlcjlSVzd3bXNPY1FpV3h5STBt?= =?utf-8?Q?burYO7YSuhzlR5UIbdWgB3hq7c8IDswrSxG/NssuJTDL?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9d8e2e0-fdd2-43e0-e543-08dd8005bbab X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 12:20:27.1070 (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/UGVhQo0AqqQGam0NrgIoAuXSFiB/q4rKWeZcjr18tg5iFRhDuxZZCdMPuhospjSyBAmcLX1CTHMqSt/R51WQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 Add the common Falcon code and HAL for Ampere GPUs, and instantiate the GSP and SEC2 Falcons that will be required to boot the GSP. Signed-off-by: Alexandre Courbot --- drivers/gpu/nova-core/falcon.rs | 469 ++++++++++++++++++++++++++= ++++ drivers/gpu/nova-core/falcon/gsp.rs | 27 ++ drivers/gpu/nova-core/falcon/hal.rs | 54 ++++ drivers/gpu/nova-core/falcon/hal/ga102.rs | 111 +++++++ drivers/gpu/nova-core/falcon/sec2.rs | 9 + drivers/gpu/nova-core/gpu.rs | 16 + drivers/gpu/nova-core/nova_core.rs | 1 + drivers/gpu/nova-core/regs.rs | 189 ++++++++++++ drivers/gpu/nova-core/timer.rs | 3 - 9 files changed, 876 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/nova-core/falcon.rs b/drivers/gpu/nova-core/falcon= .rs new file mode 100644 index 0000000000000000000000000000000000000000..71f374445ff3277eac628e18394= 2c79f557366d5 --- /dev/null +++ b/drivers/gpu/nova-core/falcon.rs @@ -0,0 +1,469 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! Falcon microprocessor base support + +// To be removed when all code is used. +#![allow(dead_code)] + +use core::hint::unreachable_unchecked; +use core::time::Duration; +use hal::FalconHal; +use kernel::bindings; +use kernel::devres::Devres; +use kernel::sync::Arc; +use kernel::{pci, prelude::*}; + +use crate::driver::Bar0; +use crate::gpu::Chipset; +use crate::regs; +use crate::timer::Timer; + +pub(crate) mod gsp; +mod hal; +pub(crate) mod sec2; + +#[repr(u8)] +#[derive(Debug, Default, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)] +pub(crate) enum FalconCoreRev { + #[default] + Rev1 =3D 1, + Rev2 =3D 2, + Rev3 =3D 3, + Rev4 =3D 4, + Rev5 =3D 5, + Rev6 =3D 6, + Rev7 =3D 7, +} + +impl TryFrom for FalconCoreRev { + type Error =3D Error; + + fn try_from(value: u32) -> core::result::Result { + use FalconCoreRev::*; + + let rev =3D match value { + 1 =3D> Rev1, + 2 =3D> Rev2, + 3 =3D> Rev3, + 4 =3D> Rev4, + 5 =3D> Rev5, + 6 =3D> Rev6, + 7 =3D> Rev7, + _ =3D> return Err(EINVAL), + }; + + Ok(rev) + } +} + +#[repr(u8)] +#[derive(Debug, Default, Copy, Clone)] +pub(crate) enum FalconSecurityModel { + #[default] + None =3D 0, + Light =3D 2, + Heavy =3D 3, +} + +impl TryFrom for FalconSecurityModel { + type Error =3D Error; + + fn try_from(value: u32) -> core::result::Result { + use FalconSecurityModel::*; + + let sec_model =3D match value { + 0 =3D> None, + 2 =3D> Light, + 3 =3D> Heavy, + _ =3D> return Err(EINVAL), + }; + + Ok(sec_model) + } +} + +#[repr(u8)] +#[derive(Debug, Default, Copy, Clone, PartialEq, Eq, PartialOrd, Ord)] +pub(crate) enum FalconCoreRevSubversion { + #[default] + Subversion0 =3D 0, + Subversion1 =3D 1, + Subversion2 =3D 2, + Subversion3 =3D 3, +} + +impl From for FalconCoreRevSubversion { + fn from(value: u32) -> Self { + use FalconCoreRevSubversion::*; + + match value & 0b11 { + 0 =3D> Subversion0, + 1 =3D> Subversion1, + 2 =3D> Subversion2, + 3 =3D> Subversion3, + // SAFETY: the `0b11` mask limits the possible values to `0..= =3D3`. + 4..=3Du32::MAX =3D> unsafe { unreachable_unchecked() }, + } + } +} + +#[repr(u8)] +#[derive(Debug, Default, Copy, Clone, PartialEq, Eq)] +pub(crate) enum FalconModSelAlgo { + #[default] + Rsa3k =3D 1, +} + +impl TryFrom for FalconModSelAlgo { + type Error =3D Error; + + fn try_from(value: u32) -> core::result::Result { + match value { + 1 =3D> Ok(FalconModSelAlgo::Rsa3k), + _ =3D> Err(EINVAL), + } + } +} + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub(crate) enum RiscvCoreSelect { + Falcon =3D 0, + Riscv =3D 1, +} + +impl From for RiscvCoreSelect { + fn from(value: bool) -> Self { + match value { + false =3D> RiscvCoreSelect::Falcon, + true =3D> RiscvCoreSelect::Riscv, + } + } +} + +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub(crate) enum FalconMem { + Imem, + Dmem, +} + +#[derive(Debug, Clone, Default)] +pub(crate) enum FalconFbifTarget { + #[default] + LocalFb =3D 0, + CoherentSysmem =3D 1, + NoncoherentSysmem =3D 2, +} + +impl TryFrom for FalconFbifTarget { + type Error =3D Error; + + fn try_from(value: u32) -> core::result::Result { + let res =3D match value { + 0 =3D> Self::LocalFb, + 1 =3D> Self::CoherentSysmem, + 2 =3D> Self::NoncoherentSysmem, + _ =3D> return Err(EINVAL), + }; + + Ok(res) + } +} + +#[derive(Debug, Clone, Default)] +pub(crate) enum FalconFbifMemType { + #[default] + Virtual =3D 0, + Physical =3D 1, +} + +impl From for FalconFbifMemType { + fn from(value: bool) -> Self { + match value { + false =3D> Self::Virtual, + true =3D> Self::Physical, + } + } +} + +/// Trait defining the parameters of a given Falcon instance. +pub(crate) trait FalconEngine: Sync { + /// Base I/O address for the falcon, relative from which its registers= are accessed. + const BASE: usize; +} + +/// Represents a portion of the firmware to be loaded into a particular me= mory (e.g. IMEM or DMEM). +#[derive(Debug)] +pub(crate) struct FalconLoadTarget { + /// Offset from the start of the source object to copy from. + pub(crate) src_start: u32, + /// Offset from the start of the destination memory to copy into. + pub(crate) dst_start: u32, + /// Number of bytes to copy. + pub(crate) len: u32, +} + +#[derive(Debug)] +pub(crate) struct FalconBromParams { + pub(crate) pkc_data_offset: u32, + pub(crate) engine_id_mask: u16, + pub(crate) ucode_id: u8, +} + +pub(crate) trait FalconFirmware { + type Target: FalconEngine; + + /// Returns the DMA handle of the object containing the firmware. + fn dma_handle(&self) -> bindings::dma_addr_t; + + /// Returns the load parameters for `IMEM`. + fn imem_load(&self) -> FalconLoadTarget; + + /// Returns the load parameters for `DMEM`. + fn dmem_load(&self) -> FalconLoadTarget; + + /// Returns the parameters to write into the BROM registers. + fn brom_params(&self) -> FalconBromParams; + + /// Returns the start address of the firmware. + fn boot_addr(&self) -> u32; +} + +/// Contains the base parameters common to all Falcon instances. +pub(crate) struct Falcon { + pub hal: Arc>, +} + +impl Falcon { + pub(crate) fn new( + pdev: &pci::Device, + chipset: Chipset, + bar: &Devres, + need_riscv: bool, + ) -> Result { + let hwcfg1 =3D with_bar!(bar, |b| regs::FalconHwcfg1::read(b, E::B= ASE))?; + // Ensure that the revision and security model contain valid value= s. + let _rev =3D hwcfg1.core_rev()?; + let _sec_model =3D hwcfg1.security_model()?; + + if need_riscv { + let hwcfg2 =3D with_bar!(bar, |b| regs::FalconHwcfg2::read(b, = E::BASE))?; + if !hwcfg2.riscv() { + dev_err!( + pdev.as_ref(), + "riscv support requested on falcon that does not suppo= rt it\n" + ); + return Err(EINVAL); + } + } + + Ok(Self { + hal: hal::create_falcon_hal(chipset)?, + }) + } + + fn reset_wait_mem_scrubbing(&self, bar: &Devres, timer: &Timer) = -> Result<()> { + timer.wait_on(bar, Duration::from_millis(20), || { + bar.try_access_with(|b| regs::FalconHwcfg2::read(b, E::BASE)) + .and_then(|r| if r.mem_scrubbing() { Some(()) } else { Non= e }) + }) + } + + fn reset_eng(&self, bar: &Devres, timer: &Timer) -> Result<()> { + let _ =3D with_bar!(bar, |b| regs::FalconHwcfg2::read(b, E::BASE))= ?; + + // According to OpenRM's `kflcnPreResetWait_GA102` documentation, = HW sometimes does not set + // RESET_READY so a non-failing timeout is used. + let _ =3D timer.wait_on(bar, Duration::from_micros(150), || { + bar.try_access_with(|b| regs::FalconHwcfg2::read(b, E::BASE)) + .and_then(|r| if r.reset_ready() { Some(()) } else { None = }) + }); + + with_bar!(bar, |b| regs::FalconEngine::alter(b, E::BASE, |v| v + .set_reset(true)))?; + + let _: Result<()> =3D timer.wait_on(bar, Duration::from_micros(10)= , || None); + + with_bar!(bar, |b| regs::FalconEngine::alter(b, E::BASE, |v| v + .set_reset(false)))?; + + self.reset_wait_mem_scrubbing(bar, timer)?; + + Ok(()) + } + + pub(crate) fn reset(&self, bar: &Devres, timer: &Timer) -> Resul= t<()> { + self.reset_eng(bar, timer)?; + self.hal.select_core(bar, timer)?; + self.reset_wait_mem_scrubbing(bar, timer)?; + + with_bar!(bar, |b| { + regs::FalconRm::default() + .set_val(regs::Boot0::read(b).into()) + .write(b, E::BASE) + }) + } + + fn dma_wr( + &self, + bar: &Devres, + timer: &Timer, + dma_handle: bindings::dma_addr_t, + target_mem: FalconMem, + load_offsets: FalconLoadTarget, + sec: bool, + ) -> Result<()> { + const DMA_LEN: u32 =3D 256; + const DMA_LEN_ILOG2_MINUS2: u8 =3D (DMA_LEN.ilog2() - 2) as u8; + + // For IMEM, we want to use the start offset as a virtual address = tag for each page, since + // code addresses in the firmware (and the boot vector) are virtua= l. + // + // For DMEM we can fold the start offset into the DMA handle. + let (src_start, dma_start) =3D match target_mem { + FalconMem::Imem =3D> (load_offsets.src_start, dma_handle), + FalconMem::Dmem =3D> ( + 0, + dma_handle + load_offsets.src_start as bindings::dma_addr_= t, + ), + }; + if dma_start % DMA_LEN as bindings::dma_addr_t > 0 { + pr_err!( + "DMA transfer start addresses must be a multiple of {}", + DMA_LEN + ); + return Err(EINVAL); + } + if load_offsets.len % DMA_LEN > 0 { + pr_err!("DMA transfer length must be a multiple of {}", DMA_LE= N); + return Err(EINVAL); + } + + // Set up the base source DMA address. + with_bar!(bar, |b| { + regs::FalconDmaTrfBase::default() + .set_base((dma_start >> 8) as u32) + .write(b, E::BASE); + regs::FalconDmaTrfBase1::default() + .set_base((dma_start >> 40) as u16) + .write(b, E::BASE) + })?; + + let cmd =3D regs::FalconDmaTrfCmd::default() + .set_size(DMA_LEN_ILOG2_MINUS2) + .set_imem(target_mem =3D=3D FalconMem::Imem) + .set_sec(if sec { 1 } else { 0 }); + + for pos in (0..load_offsets.len).step_by(DMA_LEN as usize) { + // Perform a transfer of size `DMA_LEN`. + with_bar!(bar, |b| { + regs::FalconDmaTrfMOffs::default() + .set_offs(load_offsets.dst_start + pos) + .write(b, E::BASE); + regs::FalconDmaTrfBOffs::default() + .set_offs(src_start + pos) + .write(b, E::BASE); + cmd.write(b, E::BASE) + })?; + + // Wait for the transfer to complete. + timer.wait_on(bar, Duration::from_millis(2000), || { + bar.try_access_with(|b| regs::FalconDmaTrfCmd::read(b, E::= BASE)) + .and_then(|v| if v.idle() { Some(()) } else { None }) + })?; + } + + Ok(()) + } + + pub(crate) fn dma_load>( + &self, + bar: &Devres, + timer: &Timer, + fw: &F, + ) -> Result<()> { + let dma_handle =3D fw.dma_handle(); + + with_bar!(bar, |b| { + regs::FalconFbifCtl::alter(b, E::BASE, |v| v.set_allow_phys_no= _ctx(true)); + regs::FalconDmaCtl::default().write(b, E::BASE); + regs::FalconFbifTranscfg::alter(b, E::BASE, |v| { + v.set_target(FalconFbifTarget::CoherentSysmem) + .set_mem_type(FalconFbifMemType::Physical) + }); + })?; + + self.dma_wr( + bar, + timer, + dma_handle, + FalconMem::Imem, + fw.imem_load(), + true, + )?; + self.dma_wr( + bar, + timer, + dma_handle, + FalconMem::Dmem, + fw.dmem_load(), + true, + )?; + + self.hal.program_brom(bar, &fw.brom_params())?; + + with_bar!(bar, |b| { + // Set `BootVec` to start of non-secure code. + regs::FalconBootVec::default() + .set_boot_vec(fw.boot_addr()) + .write(b, E::BASE); + })?; + + Ok(()) + } + + pub(crate) fn boot( + &self, + bar: &Devres, + timer: &Timer, + mbox0: Option, + mbox1: Option, + ) -> Result<(u32, u32)> { + with_bar!(bar, |b| { + if let Some(mbox0) =3D mbox0 { + regs::FalconMailbox0::default() + .set_mailbox0(mbox0) + .write(b, E::BASE); + } + + if let Some(mbox1) =3D mbox1 { + regs::FalconMailbox1::default() + .set_mailbox1(mbox1) + .write(b, E::BASE); + } + + match regs::FalconCpuCtl::read(b, E::BASE).alias_en() { + true =3D> regs::FalconCpuCtlAlias::default() + .set_start_cpu(true) + .write(b, E::BASE), + false =3D> regs::FalconCpuCtl::default() + .set_start_cpu(true) + .write(b, E::BASE), + } + })?; + + timer.wait_on(bar, Duration::from_secs(2), || { + bar.try_access() + .map(|b| regs::FalconCpuCtl::read(&*b, E::BASE)) + .and_then(|v| if v.halted() { Some(()) } else { None }) + })?; + + let (mbox0, mbox1) =3D with_bar!(bar, |b| { + let mbox0 =3D regs::FalconMailbox0::read(b, E::BASE).mailbox0(= ); + let mbox1 =3D regs::FalconMailbox1::read(b, E::BASE).mailbox1(= ); + + (mbox0, mbox1) + })?; + + Ok((mbox0, mbox1)) + } +} diff --git a/drivers/gpu/nova-core/falcon/gsp.rs b/drivers/gpu/nova-core/fa= lcon/gsp.rs new file mode 100644 index 0000000000000000000000000000000000000000..44b8dc118eda1263eaede466efd= 55408c6e7cded --- /dev/null +++ b/drivers/gpu/nova-core/falcon/gsp.rs @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0 + +use kernel::devres::Devres; +use kernel::prelude::*; + +use crate::{ + driver::Bar0, + falcon::{Falcon, FalconEngine}, + regs, +}; + +pub(crate) struct Gsp; +impl FalconEngine for Gsp { + const BASE: usize =3D 0x00110000; +} + +pub(crate) type GspFalcon =3D Falcon; + +impl Falcon { + /// Clears the SWGEN0 bit in the Falcon's IRQ status clear register to + /// allow GSP to signal CPU for processing new messages in message que= ue. + pub(crate) fn clear_swgen0_intr(&self, bar: &Devres) -> Result<(= )> { + with_bar!(bar, |b| regs::FalconIrqsclr::default() + .set_swgen0(true) + .write(b, Gsp::BASE)) + } +} diff --git a/drivers/gpu/nova-core/falcon/hal.rs b/drivers/gpu/nova-core/fa= lcon/hal.rs new file mode 100644 index 0000000000000000000000000000000000000000..5ebf4e88f1f25a13cf47859a535= 07be53e795d34 --- /dev/null +++ b/drivers/gpu/nova-core/falcon/hal.rs @@ -0,0 +1,54 @@ +// SPDX-License-Identifier: GPL-2.0 + +use kernel::devres::Devres; +use kernel::prelude::*; +use kernel::sync::Arc; + +use crate::driver::Bar0; +use crate::falcon::{FalconBromParams, FalconEngine}; +use crate::gpu::Chipset; +use crate::timer::Timer; + +mod ga102; + +/// Hardware Abstraction Layer for Falcon cores. +/// +/// Implements chipset-specific low-level operations. The trait is generic= against [`FalconEngine`] +/// so its `BASE` parameter can be used in order to avoid runtime bound ch= ecks when accessing +/// registers. +pub(crate) trait FalconHal: Sync { + // Activates the Falcon core if the engine is a risvc/falcon dual engi= ne. + fn select_core(&self, _bar: &Devres, _timer: &Timer) -> Result<(= )> { + Ok(()) + } + + fn get_signature_reg_fuse_version( + &self, + bar: &Devres, + engine_id_mask: u16, + ucode_id: u8, + ) -> Result; + + // Program the BROM registers prior to starting a secure firmware. + fn program_brom(&self, bar: &Devres, params: &FalconBromParams) = -> Result<()>; +} + +/// Returns a boxed falcon HAL adequate for the passed `chipset`. +/// +/// We use this function and a heap-allocated trait object instead of stat= ically defined trait +/// objects because of the two-dimensional (Chipset, Engine) lookup requir= ed to return the +/// requested HAL. +/// +/// TODO: replace the return type with `KBox` once it gains the ability to= host trait objects. +pub(crate) fn create_falcon_hal( + chipset: Chipset, +) -> Result>> { + let hal =3D match chipset { + Chipset::GA102 | Chipset::GA103 | Chipset::GA104 | Chipset::GA106 = | Chipset::GA107 =3D> { + Arc::new(ga102::Ga102::::new(), GFP_KERNEL)? as Arc> + } + _ =3D> return Err(ENOTSUPP), + }; + + Ok(hal) +} diff --git a/drivers/gpu/nova-core/falcon/hal/ga102.rs b/drivers/gpu/nova-c= ore/falcon/hal/ga102.rs new file mode 100644 index 0000000000000000000000000000000000000000..747b02ca671f7d4a97142665a9b= a64807c87391e --- /dev/null +++ b/drivers/gpu/nova-core/falcon/hal/ga102.rs @@ -0,0 +1,111 @@ +// SPDX-License-Identifier: GPL-2.0 + +use core::marker::PhantomData; +use core::time::Duration; + +use kernel::devres::Devres; +use kernel::prelude::*; + +use crate::driver::Bar0; +use crate::falcon::{FalconBromParams, FalconEngine, FalconModSelAlgo, Risc= vCoreSelect}; +use crate::regs; +use crate::timer::Timer; + +use super::FalconHal; + +fn select_core_ga102(bar: &Devres, timer: &Timer) -= > Result<()> { + let bcr_ctrl =3D with_bar!(bar, |b| regs::RiscvBcrCtrl::read(b, E::BAS= E))?; + if bcr_ctrl.core_select() !=3D RiscvCoreSelect::Falcon { + with_bar!(bar, |b| regs::RiscvBcrCtrl::default() + .set_core_select(RiscvCoreSelect::Falcon) + .write(b, E::BASE))?; + + timer.wait_on(bar, Duration::from_millis(10), || { + bar.try_access_with(|b| regs::RiscvBcrCtrl::read(b, E::BASE)) + .and_then(|v| if v.valid() { Some(()) } else { None }) + })?; + } + + Ok(()) +} + +fn get_signature_reg_fuse_version_ga102( + bar: &Devres, + engine_id_mask: u16, + ucode_id: u8, +) -> Result { + // The ucode fuse versions are contained in the FUSE_OPT_FPF__= UCODE_VERSION + // registers, which are an array. Our register definition macros do no= t allow us to manage them + // properly, so we need to hardcode their addresses for now. + + // Each engine has 16 ucode version registers numbered from 1 to 16. + if ucode_id =3D=3D 0 || ucode_id > 16 { + pr_warn!("invalid ucode id {:#x}", ucode_id); + return Err(EINVAL); + } + let reg_fuse =3D if engine_id_mask & 0x0001 !=3D 0 { + // NV_FUSE_OPT_FPF_SEC2_UCODE1_VERSION + 0x824140 + } else if engine_id_mask & 0x0004 !=3D 0 { + // NV_FUSE_OPT_FPF_NVDEC_UCODE1_VERSION + 0x824100 + } else if engine_id_mask & 0x0400 !=3D 0 { + // NV_FUSE_OPT_FPF_GSP_UCODE1_VERSION + 0x8241c0 + } else { + pr_warn!("unexpected engine_id_mask {:#x}", engine_id_mask); + return Err(EINVAL); + } + ((ucode_id - 1) as usize * core::mem::size_of::()); + + let reg_fuse_version =3D with_bar!(bar, |b| { b.read32(reg_fuse) })?; + + // Equivalent of Find Last Set bit. + Ok(u32::BITS - reg_fuse_version.leading_zeros()) +} + +fn program_brom_ga102( + bar: &Devres, + params: &FalconBromParams, +) -> Result<()> { + with_bar!(bar, |b| { + regs::FalconBromParaaddr0::default() + .set_addr(params.pkc_data_offset) + .write(b, E::BASE); + regs::FalconBromEngidmask::default() + .set_mask(params.engine_id_mask as u32) + .write(b, E::BASE); + regs::FalconBromCurrUcodeId::default() + .set_ucode_id(params.ucode_id as u32) + .write(b, E::BASE); + regs::FalconModSel::default() + .set_algo(FalconModSelAlgo::Rsa3k) + .write(b, E::BASE) + }) +} + +pub(super) struct Ga102(PhantomData); + +impl Ga102 { + pub(super) fn new() -> Self { + Self(PhantomData) + } +} + +impl FalconHal for Ga102 { + fn select_core(&self, bar: &Devres, timer: &Timer) -> Result<()>= { + select_core_ga102::(bar, timer) + } + + fn get_signature_reg_fuse_version( + &self, + bar: &Devres, + engine_id_mask: u16, + ucode_id: u8, + ) -> Result { + get_signature_reg_fuse_version_ga102(bar, engine_id_mask, ucode_id) + } + + fn program_brom(&self, bar: &Devres, params: &FalconBromParams) = -> Result<()> { + program_brom_ga102::(bar, params) + } +} diff --git a/drivers/gpu/nova-core/falcon/sec2.rs b/drivers/gpu/nova-core/f= alcon/sec2.rs new file mode 100644 index 0000000000000000000000000000000000000000..85dda3e8380a3d31d34c92c4236= c6f81c63ce772 --- /dev/null +++ b/drivers/gpu/nova-core/falcon/sec2.rs @@ -0,0 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0 + +use crate::falcon::{Falcon, FalconEngine}; + +pub(crate) struct Sec2; +impl FalconEngine for Sec2 { + const BASE: usize =3D 0x00840000; +} +pub(crate) type Sec2Falcon =3D Falcon; diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index 1b3e43e0412e2a2ea178c7404ea647c9e38d4e04..ec4c648c6e8b4aa7d06c627ed59= c0e66a08c679e 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -5,6 +5,8 @@ use crate::devinit; use crate::dma::DmaObject; use crate::driver::Bar0; +use crate::falcon::gsp::GspFalcon; +use crate::falcon::sec2::Sec2Falcon; use crate::firmware::Firmware; use crate::regs; use crate::timer::Timer; @@ -221,6 +223,20 @@ pub(crate) fn new( =20 let timer =3D Timer::new(); =20 + let gsp_falcon =3D GspFalcon::new( + pdev, + spec.chipset, + &bar, + if spec.chipset > Chipset::GA100 { + true + } else { + false + }, + )?; + gsp_falcon.clear_swgen0_intr(&bar)?; + + let _sec2_falcon =3D Sec2Falcon::new(pdev, spec.chipset, &bar, tru= e)?; + Ok(pin_init!(Self { spec, bar, diff --git a/drivers/gpu/nova-core/nova_core.rs b/drivers/gpu/nova-core/nov= a_core.rs index df3468c92c6081b3e2db218d92fbe1c40a0a75c3..4dde8004d24882c60669b5acd6a= f9d6988c66a9c 100644 --- a/drivers/gpu/nova-core/nova_core.rs +++ b/drivers/gpu/nova-core/nova_core.rs @@ -23,6 +23,7 @@ macro_rules! with_bar { mod devinit; mod dma; mod driver; +mod falcon; mod firmware; mod gpu; mod regs; diff --git a/drivers/gpu/nova-core/regs.rs b/drivers/gpu/nova-core/regs.rs index f191cf4eb44c2b950e5cfcc6d04f95c122ce29d3..c76a16dc8e7267a4eb54cb71e1c= ca6fb9e00188f 100644 --- a/drivers/gpu/nova-core/regs.rs +++ b/drivers/gpu/nova-core/regs.rs @@ -6,6 +6,10 @@ #[macro_use] mod macros; =20 +use crate::falcon::{ + FalconCoreRev, FalconCoreRevSubversion, FalconFbifMemType, FalconFbifT= arget, FalconModSelAlgo, + FalconSecurityModel, RiscvCoreSelect, +}; use crate::gpu::Chipset; =20 register!(Boot0@0x00000000, "Basic revision information about the GPU"; @@ -44,3 +48,188 @@ register!(Pgc6AonSecureScratchGroup05@0x00118234; 31:0 value =3D> as u32 ); + +/* PFALCON */ + +register!(FalconIrqsclr@+0x00000004; + 4:4 halt =3D> as_bit bool; + 6:6 swgen0 =3D> as_bit bool; +); + +register!(FalconIrqstat@+0x00000008; + 4:4 halt =3D> as_bit bool; + 6:6 swgen0 =3D> as_bit bool; +); + +register!(FalconIrqmclr@+0x00000014; + 31:0 val =3D> as u32 +); + +register!(FalconIrqmask@+0x00000018; + 31:0 val =3D> as u32 +); + +register!(FalconRm@+0x00000084; + 31:0 val =3D> as u32 +); + +register!(FalconIrqdest@+0x0000001c; + 31:0 val =3D> as u32 +); + +register!(FalconMailbox0@+0x00000040; + 31:0 mailbox0 =3D> as u32 +); +register!(FalconMailbox1@+0x00000044; + 31:0 mailbox1 =3D> as u32 +); + +register!(FalconHwcfg2@+0x000000f4; + 10:10 riscv =3D> as_bit bool; + 12:12 mem_scrubbing =3D> as_bit bool; + 31:31 reset_ready =3D> as_bit bool; +); + +register!(FalconCpuCtl@+0x00000100; + 1:1 start_cpu =3D> as_bit bool; + 4:4 halted =3D> as_bit bool; + 6:6 alias_en =3D> as_bit bool; +); + +register!(FalconBootVec@+0x00000104; + 31:0 boot_vec =3D> as u32 +); + +register!(FalconHwCfg@+0x00000108; + 8:0 imem_size =3D> as u32; + 17:9 dmem_size =3D> as u32; +); + +register!(FalconDmaCtl@+0x0000010c; + 0:0 require_ctx =3D> as_bit bool; + 1:1 dmem_scrubbing =3D> as_bit bool; + 2:2 imem_scrubbing =3D> as_bit bool; + 6:3 dmaq_num =3D> as_bit u8; + 7:7 secure_stat =3D> as_bit bool; +); + +register!(FalconDmaTrfBase@+0x00000110; + 31:0 base =3D> as u32; +); + +register!(FalconDmaTrfMOffs@+0x00000114; + 23:0 offs =3D> as u32; +); + +register!(FalconDmaTrfCmd@+0x00000118; + 0:0 full =3D> as_bit bool; + 1:1 idle =3D> as_bit bool; + 3:2 sec =3D> as_bit u8; + 4:4 imem =3D> as_bit bool; + 5:5 is_write =3D> as_bit bool; + 10:8 size =3D> as u8; + 14:12 ctxdma =3D> as u8; + 16:16 set_dmtag =3D> as u8; +); + +register!(FalconDmaTrfBOffs@+0x0000011c; + 31:0 offs =3D> as u32; +); + +register!(FalconDmaTrfBase1@+0x00000128; + 8:0 base =3D> as u16; +); + +register!(FalconHwcfg1@+0x0000012c; + 3:0 core_rev =3D> try_into FalconCoreRev, "core revision of the fa= lcon"; + 5:4 security_model =3D> try_into FalconSecurityModel, "security mo= del of the falcon"; + 7:6 core_rev_subversion =3D> into FalconCoreRevSubversion; + 11:8 imem_ports =3D> as u8; + 15:12 dmem_ports =3D> as u8; +); + +register!(FalconCpuCtlAlias@+0x00000130; + 1:1 start_cpu =3D> as_bit bool; +); + +/* TODO: this is an array of registers */ +register!(FalconImemC@+0x00000180; + 7:2 offs =3D> as u8; + 23:8 blk =3D> as u8; + 24:24 aincw =3D> as_bit bool; + 25:25 aincr =3D> as_bit bool; + 28:28 secure =3D> as_bit bool; + 29:29 sec_atomic =3D> as_bit bool; +); + +register!(FalconImemD@+0x00000184; + 31:0 data =3D> as u32; +); + +register!(FalconImemT@+0x00000188; + 15:0 data =3D> as u16; +); + +register!(FalconDmemC@+0x000001c0; + 7:2 offs =3D> as u8; + 23:0 addr =3D> as u32; + 23:8 blk =3D> as u8; + 24:24 aincw =3D> as_bit bool; + 25:25 aincr =3D> as_bit bool; + 26:26 settag =3D> as_bit bool; + 27:27 setlvl =3D> as_bit bool; + 28:28 va =3D> as_bit bool; + 29:29 miss =3D> as_bit bool; +); + +register!(FalconDmemD@+0x000001c4; + 31:0 data =3D> as u32; +); + +register!(FalconModSel@+0x00001180; + 7:0 algo =3D> try_into FalconModSelAlgo; +); +register!(FalconBromCurrUcodeId@+0x00001198; + 31:0 ucode_id =3D> as u32; +); +register!(FalconBromEngidmask@+0x0000119c; + 31:0 mask =3D> as u32; +); +register!(FalconBromParaaddr0@+0x00001210; + 31:0 addr =3D> as u32; +); + +register!(RiscvCpuctl@+0x00000388; + 0:0 startcpu =3D> as_bit bool; + 4:4 halted =3D> as_bit bool; + 5:5 stopped =3D> as_bit bool; + 7:7 active_stat =3D> as_bit bool; +); + +register!(FalconEngine@+0x000003c0; + 0:0 reset =3D> as_bit bool; +); + +register!(RiscvIrqmask@+0x00000528; + 31:0 mask =3D> as u32; +); + +register!(RiscvIrqdest@+0x0000052c; + 31:0 dest =3D> as u32; +); + +/* TODO: this is an array of registers */ +register!(FalconFbifTranscfg@+0x00000600; + 1:0 target =3D> try_into FalconFbifTarget; + 2:2 mem_type =3D> as_bit FalconFbifMemType; +); + +register!(FalconFbifCtl@+0x00000624; + 7:7 allow_phys_no_ctx =3D> as_bit bool; +); + +register!(RiscvBcrCtrl@+0x00001668; + 0:0 valid =3D> as_bit bool; + 4:4 core_select =3D> as_bit RiscvCoreSelect; + 8:8 br_fetch =3D> as_bit bool; +); diff --git a/drivers/gpu/nova-core/timer.rs b/drivers/gpu/nova-core/timer.rs index 8987352f4192bc9b4b2fc0fb5f2e8e62ff27be68..c03a5c36d1230dfbf2bd6e02a79= 3264280c6d509 100644 --- a/drivers/gpu/nova-core/timer.rs +++ b/drivers/gpu/nova-core/timer.rs @@ -2,9 +2,6 @@ =20 //! Nova Core Timer subdevice =20 -// To be removed when all code is used. -#![allow(dead_code)] - use core::fmt::Display; use core::ops::{Add, Sub}; use core::time::Duration; --=20 2.49.0 From nobody Mon Feb 9 07:22:46 2026 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2063.outbound.protection.outlook.com [40.107.237.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 D5D25204C37; Sun, 20 Apr 2025 12:20:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.237.63 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151637; cv=fail; b=cFiTlR82xHp5+YmTKPkX9Ge2Sb3/zVjXUuyfTfx/HqpWXHpwXaLNPAF7g3kFR0WNkp7knksDdgDq9neXw5uwVY9jXvZLnCIFSQyepmZ/V/svmKBdKTCtRaSx4LWkYvWGRxYq8GTlW7dBblsczDlqT519DcXc7JLUyJty0Pq3OXQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151637; c=relaxed/simple; bh=JWpq+xFF0zL5IlDXU/L0kA35dJT8snLPFffTr6LlfCs=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=m3YKD68kXRgw5VNuRkVwjyvCZPOGpX3VlfPCQIm55Wy+aZSwDnmTjGl4Lh/1j15IQUgR8jvsPgZNGaJI3rPjJutWs2k5pxg74U2GEZ98vqBP1ODJmGnDFcrU7FC0/0hTCDmhm3ojhknYN9BjqnbRLpnek2qVVZI8cfyOItHqQKs= 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=ZKNTWKg/; arc=fail smtp.client-ip=40.107.237.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="ZKNTWKg/" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=VHBwyCLvzJhrqUpd8ZiWjmBAJT1gmQH3lAm7ycJSZpoTqhy26dB+3WwVvXtEpvu6xpD3AkryKbNeu17ku9TfHR8R5us58xbmJ6mjrdAvngOYWSnUU6lKhtaVEmGJVM/lkoIGJnIrPLo4ntdjKevBqK6PC1MGwMDfuCyxEVZIJhYI5faNY+OsgopUZDMaQeTXybODpGquSOk3z2BCV94CCMDwBaZduRkPpMJWzymsy+OferM6eFk+X7ncjeJKKg5wNOHOxC3H0bH6+dOJLVGRHXfjrWrqJNu0embATKkSQ5GgBn3dxPT04sBWHMtqtb74KqhsS84ZLFsGGYZHO3r5Sg== 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=U5FJr6TqC+thTrSaiMokRQlX+sdQC8KOP+HSJriL4kk=; b=FSseXgK2USfUJRwodil0q5I30kwm8ZG7/zxBJlU6eFqwz1r5qSmsORviin+j/bXbjhVlhhU8M9y1qFD8E85bATXzQYdLf3HDvBx5BjuUWAQc4eS4MN/dPuddrbB56P0dzU5nAUCcQ0f9PIUvjsMVtBpublefskWBnkjxJ8/B31PbG6ErzNYrCyn79VKashibp7IojtCHQQT6CGQr9Psk2TMYLbiJCQRVnmYz+4e9n/hfB8MvOh8uftR+wnzF5n8h8Su6Ncfmxx7wa2QKXD4fwQsADXPqC3ImrL/HZ2sE1jBEm+8jeVt3Bd6qUfYyo90HNm3ac+gWMg9tjZ0rWGlBfQ== 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=U5FJr6TqC+thTrSaiMokRQlX+sdQC8KOP+HSJriL4kk=; b=ZKNTWKg/fn05QKNC56L2d5Qwg1VWEjH7zgRxdAAtzzw9Crj4zvEfzXsrebpIDslyQJPrAsbf9Qnvz23wSaRrO1l1ScWPHZwEbdZobLlW6zfRQr+dID3sX6b3R0umaXsDcfOtp7cauVDOS2Jbgw9sSM5RSJ5VDgc5d7xVrSh4iI+Y5kNKq68s30QGfVgGNbBbe/R5Ccmdszp7g95pFps1QmG35Ww8AMibDUPh7meVGXSeBx5PnApgWVIGYFgHJ4uhAss9/kdlFOuGVk/anAjVdvYMxtLIAH0YzWtvRgaWt/9Td2ROjN53qpozFwpWPt4BfX37CliZ5OFB6pXmrwiMoA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr 2025 12:20:30 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99%4]) with mapi id 15.20.8655.025; Sun, 20 Apr 2025 12:20:30 +0000 From: Alexandre Courbot Date: Sun, 20 Apr 2025 21:19:44 +0900 Subject: [PATCH 12/16] gpu: nova-core: firmware: add ucode descriptor used by FWSEC-FRTS Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-nova-frts-v1-12-ecd1cca23963@nvidia.com> References: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> In-Reply-To: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: John Hubbard , Ben Skeggs , Joel Fernandes , Timur Tabi , Alistair Popple , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alexandre Courbot X-Mailer: b4 0.14.2 X-ClientProxiedBy: OSTP286CA0071.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:226::20) To CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) 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: CH2PR12MB3990:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: 187154e3-1564-4ebd-d0bd-08dd8005bdc6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|10070799003|1800799024|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?R1piczJKV2JPZUdtWnJuZHB3M3hIcmRDeEd1ZjhWS0thdm54QzdDWXl2K011?= =?utf-8?B?a3haL3JTOWNKVmV6V25VS255aHhUNzBVZjk4RWswWi8xNDJUOHZvanJJaHB6?= =?utf-8?B?dDcrRXoyS0lZUHlNWXhRNEVWYXBRQ0hWby9VNGJpWkxKYVdFQXdSRkV5T25w?= =?utf-8?B?Z3pZMjNRRGZWbEZTOTJyWkNid05QS3ltVVlQMEFMWjNCNGdLeEJGU1ZtMUVr?= =?utf-8?B?eE1xZFlHcHk4OVV4WkVOdVRBV0FnOEJHcUd4RDdZb05UUlY0cmZQb3V6KzNP?= =?utf-8?B?Q1VmbDk1RFhMdzRzUkZ2NVlEVUp6eElsRldzd0prWGhNRUU0c1hjWkJudlI0?= =?utf-8?B?MWowTlg5VDlEclVNQWJZclVkRE5WeGxzM1RWZjc4dWNhcGU2ZC9rV3VvQmlL?= =?utf-8?B?cWwxVW5Yd2thODJGMyttbTdTVmpnZmN5blFhNHEzMXh5Z2JyRXpSbUdEdldL?= =?utf-8?B?MUdvYUErdzI4T1BOQ3h6ckZxQ0RHd2dBNE9SM3FSWXMyTzJSSW44aFRLV2Uy?= =?utf-8?B?NExQVlhLVTFzUk9MNU90YzJqdlhXdDQ4ZzlWS2FuQ2JEb1Jqc1l5SGVnV2Vz?= =?utf-8?B?ODFFWWN5NHRwRTNneWRPOS9DNEYxSmJ2enN2Qm9XVlZudHpEaWI4SjN6NkFI?= =?utf-8?B?aFliVHBzVTdKOWl6R1ppQXBJOGN6TTNudWMvcFFpa3dIdS9oK1JoVUE1Y2Zh?= =?utf-8?B?K0gzaktyekM0b3RRZGEvOElNZ2h6SXFpdm5JeW45aWNqVzArc3grN05mL2VE?= =?utf-8?B?U0U0OVB1cXo2WjZkQm9YaGk0U20zNm9TbEhJbHhqQUZ6WWI3eUtUN2ErVkVL?= =?utf-8?B?eVBjci9xNEN1anhpZ2l0ZkJ5TUxoTXFhS2JBMW01UEgxZVZuUWx0VmlmWmxu?= =?utf-8?B?bGxXR1JtbVVWcG03RE5qdlhUbjVoVXc0ZUZlZm83d3M0YVNzQW9WOUEwOHdl?= =?utf-8?B?Sll2b0MyazdxYTJnQzhrTVo4V1kweDl0OG1raFI4NGFRVUFocXlCRXkyazJr?= =?utf-8?B?aUxDdTcxZzB6bUIzQUZFc3FkT2duNUFJdERuT0hMWkk5RWNlWENoeVVVaUJD?= =?utf-8?B?eS9Tcjg0SUxvNldLb2pYbk5DVndwdG9MZ3E5a2dIVVd1R3NiZ0wyRDZOODBN?= =?utf-8?B?OUIvK3F2a0l0dnhZTjV3Z29vdkFNRFBPc1QycGwyOS9PT2JsZnUwcEhBV01r?= =?utf-8?B?cFhqenFTNEo4dGRqVWF0K1hZN0h5QnV3SFJQTVlpcm05VVhEUlhaMDI3Z2pU?= =?utf-8?B?dEVmYmNMSXhvUFJOOHFtZHYwNVA1RmNPRm1nTGdHd1pkS2RaZjFKK1F3RFMy?= =?utf-8?B?SElldURSSnNEbHl4K25uVFpNam16bVBsd21OMEI3eXIxV2p1eEtidHZjbGZv?= =?utf-8?B?aVM2MlRkWjdHbFNSOVBwSGZoTmhWQm40b2FZV0s3b2QwOWw4MmY2WDRHQ1Nm?= =?utf-8?B?WldtTWMvcTVoRkFkeG1XTmdBSjRIUFdhaHZ0Q2dGTnFvOXpjMmxyQTlZZ3pT?= =?utf-8?B?WkgzODA4WTZKakl1aWZtK3NVMGdZNFNXU3pNMDUvcEYyb1dmTStmWUFHUUhn?= =?utf-8?B?M3hwa3o4dGNJWHExeFZmWm85NHl4eDErOEowRFhmazZZTmFUemZBZEZ2ZDNJ?= =?utf-8?B?bFZ4b3pPKzdlYjczYVNlclNjRFpVREQraS9lUTR2UUh0R0UzS0VNaGJkbnNZ?= =?utf-8?B?eHNFbUtRYlgrTjlGR0JUQjRsZi9rVEwwSGN4R003WU5VWlBKclNxSXVjaGJa?= =?utf-8?B?TUUzQzVZM0NtRWdySHp6TW5rVEV6TWU1TWVSTTNwbXFrUGRCK3lFa3F3OHZD?= =?utf-8?B?My9UZ21DekVmblc1b0VHZkxhcGFTVEhNbFIxN216dTV6Nzl3MmxVaFMvQUU2?= =?utf-8?B?cDFqSkkrcEFHVjRNVHpxTkh0dFllNllUbEdrQjRvQmdDTWhKK0srN2IvTUFM?= =?utf-8?B?Q0I5amkvOFByNldGS2cyd21wK0Z4YTdMcGdRdDRrbVlsaHAvaitGb1Urcytz?= =?utf-8?B?dXJiUU4yNUV3PT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB3990.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(10070799003)(1800799024)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?ODU5b2Mrd2VsMVl6eTNsU1RKZmVmaVhzVUJnMmtYUThqR1FQem13ZS9EYWEv?= =?utf-8?B?RHVGZS8xblJoUjBiOEE0QlZwSGJNWGJuZFVLK0xBNVlnaXIzWm1CQnI5aE9v?= =?utf-8?B?N29vS2pnOHA2VStFZklnNXd5bldrN21FZFhBVWk2SERVSExvZ0prMWRaUmw4?= =?utf-8?B?dFFMQVc3YmVQMGpiOWd6Yzh6UVREZVdpd3c4SDRFTWJSMDJiMGEycVdYcEJz?= =?utf-8?B?RExXQzc2aFVFUUNnL1pkWDZJYUsyazJ0Zmo4ZlpUWldVVlFlcm9NaEhRYTNj?= =?utf-8?B?dy9GRFQ3SEwrQzROV0VSNXBmWkNGaGh0cDNmL0xYdGNZSGt4Um95bWFLK2Z4?= =?utf-8?B?bytMalV6NEtoYTRpdWsvam4xeklxWHJhVzlZTUozdDBqY2lieWJnMkN1QmpF?= =?utf-8?B?c3NrdFFuZEtFcnZjMGxDTmsyeEs5RU4zSlR0YzArTXEwd1ZNaDBJTTZIUm1R?= =?utf-8?B?SWZFNmo2U0kxUTdpU1hJMmVEVHg5citJQzdkQU5kVjZLcFN6blIwK2Q3L3lk?= =?utf-8?B?Qk9YT1JyRFdFV2s2OVErdUp5VkRDQ2h1WENzWEErVDRtTXROaGx2Ymd4SE9Y?= =?utf-8?B?eUlBSVN3NmxKbi9YSzQ0UTR4eHdTKzBmL2VyMG9GM0hYWUY5eXJzamhERkVZ?= =?utf-8?B?elhYeUNFcWlkbFU1S1k3VlExM2Rrcjl1UnlqRHBpUUJFb09KNkdmUGxMZDd6?= =?utf-8?B?VzhzUFFKUHpXbmFhWGNheGpoSWpOWUZ3bmRORTFOMm5qekJVQUxLclM4V3c1?= =?utf-8?B?TlVGRXBpUWo2SkdVV01WdVdUMjBPQkIxdGdEUHg5MVo5eHhyd3VwNWVxdk1S?= =?utf-8?B?WDRjTjNhaENrdXJWYktseVRKN1o4b2JWUFhwdHVrRnQyRERPWDlxTzJnN1U0?= =?utf-8?B?aitwdzRrWGNnY3UrS2VldlpEM3AxWitiTDRvMlBBOHNWYjFnOGY1eVNFamhu?= =?utf-8?B?UlBlNmhyWkdWZDdzQmY0bjRzTVpaL2QyUG40ZUJJNDdodGlxb1hqRXVXNTZ5?= =?utf-8?B?ZGs2YmxvRFhaQWYvMzJMQ0RVNlo2NXRVdENLOUJoZ0Eya2JIYmdOTWUza0o1?= =?utf-8?B?RG1XeVBzTFpYTEJYeHlTNTRYQldHZ1cxSDBaKzE3ZE8wQ0hVRWFwZ2F0bEVa?= =?utf-8?B?TnVleDZBRTkwKytnMlN2Z0hoR3U2R0UyOXBTTDdTVmpHOVhiSlJvb1hCT01r?= =?utf-8?B?OERLWHJKcnA3dDVxQjI0SHRtaWYvdHNBS2pUY3ZPRzdJeUxjZ25PZ3ZlTW05?= =?utf-8?B?TlMwcXpBL01jaW4wZzlIVDMwT2JJd0xSNUM3VDdQT25ZTkFpS05JSzkzYmp1?= =?utf-8?B?OXBRNVM2cmRnbFdWRHltektSc0NXNWpxaEdXa2JyVlU2dTlxL2loVzVyRkxv?= =?utf-8?B?cXVoUHg0cW1EVDEwYnFUWm4zWFZOMjJsT2VBZVBncmF5dy82WWNZY0dab3gw?= =?utf-8?B?Z3hKd2dsZEdIaDhsdUt0U01XSFEweGhIRTV6OFhzMjN2UG9tM0ZYRW0rMjYz?= =?utf-8?B?a1FpQlo5QnBONU91a0lzMXZIcEloTVpiWU5SZDA0dFozZ0Q4dXUzNVgvclpN?= =?utf-8?B?cnBjOHBMbjhPZk9McGpmMjk2TzRtUFF3WWVHckUvV0xZT0dBRmJPdG44Z0Zq?= =?utf-8?B?K0VWTnQyYms0Mll0bHU2VWhIYkxob1lBRVA0OXhHcVZESXVLa3BRa1lJb05i?= =?utf-8?B?bTZSem1TVUJSVW9BWXFBK2FmL2ViWVF2cTdzZklPT3hMNml4dkt4ejdNY0V6?= =?utf-8?B?UlcxeE5HdWpYRGJKUklRQnRkbURyWVc5THpQSERSMGFLSFV6d3ZmSHdCRW5J?= =?utf-8?B?d05KTVkvbTdZdVVTRlRxR2c3NzZaK1ZZVmg1czYvNlVkeERDNWNneFlxODdy?= =?utf-8?B?MWhiVWdmQkRmSEVrM3RZWG44TmxLSEV1c0xpNkRqTGFZOFBGU01lUXJtZVRO?= =?utf-8?B?OFdSRHhQWGYxbnVNV3FsUmZTMzVqazNEaU5ROGVxWXhLVXlaR3ZQT2lISVhu?= =?utf-8?B?Mmd0b1JwVCt5M3kvYmVsK3MySDhndjN5NTgxODIwemF0bFhSUkt3bmJkZHVp?= =?utf-8?B?QXNsZ3FpUE5nY0Ftc0FVWUV6T3orS3lUamZ5clhGWG8xWHpiR25kVW1ITWIx?= =?utf-8?B?aVAwajJlanRYeVN3V3JtU3l6VVp1NTlrbVl4ZlZkZmtGajVCWnlJM3ZiRHZi?= =?utf-8?Q?4MrGJJmpZPSxnMPVVDNs0frIf8cARqcq4kvcayIdhklE?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 187154e3-1564-4ebd-d0bd-08dd8005bdc6 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 12:20:30.4730 (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: zGnfzIRjSiPfPh3pACH2uepttDQSXcBVOL9+BMR21PIi6wQAyxutSATQ/cK1O8Ylb/nC3LVByERxWXJSN3xeUg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 FWSEC-FRTS is the first firmware we need to run on the GSP falcon in order to initiate the GSP boot process. Introduce the structure that describes it. Signed-off-by: Alexandre Courbot --- drivers/gpu/nova-core/firmware.rs | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/gpu/nova-core/firmware.rs b/drivers/gpu/nova-core/firm= ware.rs index 9bad7a86382af7917b3dce7bf3087d0002bd5971..4ef5ba934b9d255635aa9a902e1= d3a732d6e5568 100644 --- a/drivers/gpu/nova-core/firmware.rs +++ b/drivers/gpu/nova-core/firmware.rs @@ -43,6 +43,34 @@ pub(crate) fn new( } } =20 +/// Structure used to describe some firmwares, notable fwsec-frts. +#[allow(dead_code)] +#[repr(C)] +#[derive(Debug, Clone)] +pub(crate) struct FalconUCodeDescV3 { + pub(crate) hdr: u32, + pub(crate) stored_size: u32, + pub(crate) pkc_data_offset: u32, + pub(crate) interface_offset: u32, + pub(crate) imem_phys_base: u32, + pub(crate) imem_load_size: u32, + pub(crate) imem_virt_base: u32, + pub(crate) dmem_phys_base: u32, + pub(crate) dmem_load_size: u32, + pub(crate) engine_id_mask: u16, + pub(crate) ucode_id: u8, + pub(crate) signature_count: u8, + pub(crate) signature_versions: u16, + _reserved: u16, +} + +#[allow(dead_code)] +impl FalconUCodeDescV3 { + pub(crate) fn size(&self) -> usize { + ((self.hdr & 0xffff0000) >> 16) as usize + } +} + pub(crate) struct ModInfoBuilder(firmware::ModInfoBuilder<= N>); =20 impl ModInfoBuilder { --=20 2.49.0 From nobody Mon Feb 9 07:22:46 2026 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2043.outbound.protection.outlook.com [40.107.244.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 B22321EB193; Sun, 20 Apr 2025 12:20:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151644; cv=fail; b=U8XMoSUO8u7eJWhJYPuoHUICXOb/jsjO5zEZy4shPTLZcLkZXGQKsCcW/S54vBqAEsyfHUbwcmbouFgd9YFDpRP9lRRxFawZ9bXP8V1jkF0WOXUfYHcKKj30NeNXz5a6zq7VzU6UeleEfMMrReTMHOrdT7Lp9pZCxOVEPaJUCvQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151644; c=relaxed/simple; bh=uLmVndj2fa3EQObqVoxEUmystbcqV8WT0AFi0FWHVSQ=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=m3AQgaMqEpZZ13ES2Lwg/yvz9nKMlL28kVVtnY2WM+e2lIKke8vcJyZBFoMgJjW9N8/33IAPhjWv2jFFAhfjIZx92HLTUOAeYegY9y/q90rPatMB/wl8vmeaOro+kKP4B6kHeV5aaCUQN1chB0fxC9iisPR18MQ9bs76fjI+6u8= 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=Rsr5TOXw; arc=fail smtp.client-ip=40.107.244.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="Rsr5TOXw" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=sr0cwzOkwho4rC18gm0A9BdZAp5x3Cc7CdR/J6nSYvZ2ykGVsf41qZuHjXA/FMe7YnjoJ8xzp7YOKj/5zmXwH//CcAlEopmR0cg0g1QLSmDGnfky+z4wNBWPLzqEBT8haPtVfe+AQCMo0DiiyIzGL0c2ZbrpSPpWhZ5yV7IgGmh4xmnnvcd6DylfwaoEKfqqy6pEc4WYDK4mKZNuhJWZOP4tBoci6Lq6kKC0Px1uV8TqQgAgJFuEJ7pgtDcBydJuJD9khBJXSg4FIsbal9KNiIK237SU1xnAwsO3ro8kd2yFmKVAfwpoVrwBFQX1j2q/ZSKxmwVkoK+le/rvbAadHQ== 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=TptxQUD2eZGl99RyKisz7nK60nH5nGpDIWnEtLe+940=; b=fu24kYaSMbovOvVsM3ohL7QK0j5Ec18SAU0m7T+LePms2IV+OQttdlhrMgGokpdxa70Y07+SrVMx0MyrownIJd9NDydCxp/JQY+cDhVF1RV2gBhd6/JJ8UJU4GlR+YRjsIWxApd5WX2sAHSwTnKZLE2ip6ZXgFGrfZ2vOe/cA0PSqB+8xlgSVpeoPNPJy1vU1CNKXuDXyY/NVnD07KmOSfHwfT/nDUXLbo59XigeRXVUVWIEYnQlORI7p6cGegF41otjdc+Iba1QeMVX1/pq+pgCVRzyZoZ4sYPptW0wqWXVnmLu8K9YdRSV/G5p0V+GsTbRQUMA07J70l1snuR2mA== 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=TptxQUD2eZGl99RyKisz7nK60nH5nGpDIWnEtLe+940=; b=Rsr5TOXw5jr6g5RNMBgJ3WvaWFxqsOnUPm3t0GxG29czeiiPx17rreMj9hNWcgWG3A7f4GFiF054VPUwUn7nWCWW3hMFQfasYeUiFFdnrXYi4n5xeqWOUhHKgnCmYbVz+tJtlOTwcSNnYuM4u5nthMvn9cn34cGot3RLDDERcSbGF2WUF2PS36JzCiNh595QsSucmWwFV9duomWAZR/SBYPnDxOTSw9De1Q+EULOhMr9vnF/3NAq/J/L7rfwsg7DBXPxKXHnztx5B33k7Dl4aSAHFN5Kq1tTZbdNq5uRZfbiXj7gX5P81YT02rxAQ2+xiRX4/RtnS7NXkYFep16OHQ== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr 2025 12:20:35 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99%4]) with mapi id 15.20.8655.025; Sun, 20 Apr 2025 12:20:35 +0000 From: Alexandre Courbot Date: Sun, 20 Apr 2025 21:19:45 +0900 Subject: [PATCH 13/16] gpu: nova-core: Add support for VBIOS ucode extraction for boot Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-nova-frts-v1-13-ecd1cca23963@nvidia.com> References: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> In-Reply-To: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: John Hubbard , Ben Skeggs , Joel Fernandes , Timur Tabi , Alistair Popple , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alexandre Courbot X-Mailer: b4 0.14.2 X-ClientProxiedBy: OSBPR01CA0111.jpnprd01.prod.outlook.com (2603:1096:604:71::27) To CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) 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: CH2PR12MB3990:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: e288b6d4-d665-47c1-57e6-08dd8005c08b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|10070799003|1800799024|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?cWpXUlNQaEIxZEVGclQ2YnJlaE9tZUpQaS9jWXNVSUZqTk1zUFUwUnAyTlVm?= =?utf-8?B?dGJ5K01TbFY5Yi9DQllNYTRSZXNZdURoQnBneC96cHJXOWRWNDRnVFE4NFFx?= =?utf-8?B?NmNTWVBPUGF5K0NVVThodDNxaWVUaEJkeDFscXRkY05kVGtLTk9pVll0TTdE?= =?utf-8?B?RzhCZjJUWUFGYzNzTFM4M2JEWXZZRWYvMDZlWnVtUnJpV2JQaWVQemQzejFx?= =?utf-8?B?T2hqTE0yQ2JlY0NyUVBmWVJacUhYWk5FRlZnWU1KbDZlTnVBVzhLMVYrMFdC?= =?utf-8?B?NTRvd3QyVklMbEFCWllvTURpaWQ5M1ZrZkhMS0xjeXkwRWhwdkg5OFVjUURP?= =?utf-8?B?VFJrMDlqQ1E1TFI1ZXhRbkJTRU84dTZva3BzQXJkUWJ0bVRRU29MQzBRUTRN?= =?utf-8?B?Si9vem8zT25uRjNITFRwODlvek1NTm10MnhqNUJYU2NMbjRRSzhqazVVWnRq?= =?utf-8?B?Y0lQRXY3ZzRpbTJSaDI5Ni9UOVErN2JnM2NEZ0VSUnI5OTMxQSs5MHlKYXRT?= =?utf-8?B?aEpJSWVZb2RkR3o0c05GSWRkQUhlQmovazZnSlkxSHBBMXpYUzcxcURxQ1Ri?= =?utf-8?B?VnpEUGJHZWFkTlVXeXh3amFZSHBsQW1acENHOC9RcGpVVVpEb09ZMEY5N3lS?= =?utf-8?B?NXRrOFdNRncvUUhKNU9meWxMU2tramY5Uk00QkQwU3Y5N0t5NWdob0gwbXRs?= =?utf-8?B?YUZBNWlQaVpFZTBaRUtoVzlqNWF3T05nNVIraHhHS056WjdHQ3g1Y0hramp2?= =?utf-8?B?NDNIcm84K0pWT2NybXUvYzROUjFDMlo5QVdqcktxaXhyTmdPOW8zT0l5bHVn?= =?utf-8?B?eDU2THBOTXFhdmoxVVFIblRmRkpEZmhjS3kweG1MM1RnazNhaW5JNGFqQStB?= =?utf-8?B?SkdBdHJVYitMcVNuR3pFdUYrMVlDc0orTWJVUjBPaUZkajJxaW1HcGJEZXBr?= =?utf-8?B?VmZURHJzTFZIa0Q4ekp5VmE0YzVnUUtrVUZEL1VRUlhGYlRjYlV2VnZBb1dq?= =?utf-8?B?STY3UHVZWExFS3BMRUxHdUpTU3BVUHlsQWlPNXpVRVM2MUNmaURRYVBGdkhH?= =?utf-8?B?dllaOXFHVDlsT3JVb3hacFFjSWtPMTBBVHlsbTZLa0tFZWJKZDE2bmxrV25J?= =?utf-8?B?RXZVZnVPUWdUWmpOZ3g2d2hQTTQ3Sm5qVDlQWWFJSnFrenptc0JtYWIrZXYr?= =?utf-8?B?bE9ic2FBVWhHSW1VUVdZL0pBVW5IbUpzMk9JNEMxbjVpUDRxZUNRQVR0cExu?= =?utf-8?B?WWVENFRUSHpHODF6MGVRUXZrUTluMU91VzZZOWFWRW9Vb2ZUMDFhQ1BlNHRJ?= =?utf-8?B?RE55NnhDSVFLNWZmemhLRERndStDc1A1OElSSE94cE1OTCs4RWxQNk14MFdZ?= =?utf-8?B?VDVuS05sMjVFTXg0NFdCUHhvZzBodndsZ0hod2tFVVZ6elpiQXJJQ0tyMjRr?= =?utf-8?B?STV4ZmhjQTlmU2Q1Y0UwUjdNY1hUbXR3WmFoRkNKdmt5ZnpjZUt3L3dDV1Ez?= =?utf-8?B?UUtRUUpPdjh1Z3pnU3RhWW1Pc0xJYyt0ZVlxUUdNWTM0cnlYZHU1eS9aUDM2?= =?utf-8?B?SUpwbnBtZjR5RUtzUWVLcCt4bUNoYU1hS2tvdVpSTDJ5d1NFSURXcnpNSUxH?= =?utf-8?B?eXdreUU3RFhKU28veEJCSzJsZGE3amFzMTM2L1pvNTBBdkNiK1BKL2MvSkZH?= =?utf-8?B?dTYvV3RNSjEzZWpRL3hFSkx5TjRZUWFYbkZvWCt4dUo3a1pBK3hNNExiVE15?= =?utf-8?B?cjZNY0hYU2JtckIzUmw1VnVyMVRCbElyZERLTEFEUG5mQzE1bUg2S3lKUnFj?= =?utf-8?B?YXZBcXhkOTI0akJPMG9oQmlFeDJmeWdDaG9zN1ZiYncrUWJ6M2FaellFVEww?= =?utf-8?B?UzBJL3BoS3ZBa0NVb2hCdGgvWVA4YlVTbHJHd0lNV21oREZNT2NvWk5RZlJT?= =?utf-8?B?SzQwdmVUQnUxM1ptTXJjMVF3czdlY3hvQ3poVitCa2lYZGdWWUk3dlZMWHdy?= =?utf-8?B?Tk51WVVlYVF3PT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB3990.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(10070799003)(1800799024)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?aGYwRDN4RjJJSnhZMjk5Q1NuZGRjRHM0RkdoVU1ualBWdll4aGNlbUZNeXhM?= =?utf-8?B?cThUVGVoczRwN21oUEZ5ampMWEE1bjQ3NlYxV0RMRnYxdDE5Nk55QjFoUWpJ?= =?utf-8?B?K2d1YlhxSmlndHJkTTU3N3BHOGJpSnhwZFRTdHF5WnFJTVRmL3NWVWVKYXBy?= =?utf-8?B?UkljYUVCNElQNUp0WGxWTkgrbXRIcHc5aHVtbm43SC82Q1hlUFhXNEFYd1lR?= =?utf-8?B?Z3FJSjdBVzlkNWNlVlIrUWhDZXc4dHRBMDd5Ukt5OGNpblVyWHg3VHNOV1Js?= =?utf-8?B?WXBjUkpEN2FsN3l2RHIvTXM1eWhOZHVDSzljVGZZbHQzdWtZYkluWFozS25i?= =?utf-8?B?LzZISnVSODBqK0NRZ1M4bTlqQWRQY1VnZXZQTG5QcmQrMXE0RGk0T1Nnazdl?= =?utf-8?B?TDVqOEgrV0RFdVNHSzFPbnZKandMQThyUlRYQ3EwOGNVSlh3L3JZemRNUUhD?= =?utf-8?B?eE5tZjUyOEpUYUlCZTZBT0xzOFY5RThaYnQ4eUVDVnhXcFhLN2RES2dpa1Q1?= =?utf-8?B?cm4zZWlubUl0dzBUbmw1eFBsQzRUYmdEZ1pOYU5kSytQS1RzTm92YWFuc1FS?= =?utf-8?B?SGNRNEN4NVNYdXkybEg3Y0w1cnNOVDN4enR4WjZHYXg2dFVlRVdhbTh2bkRy?= =?utf-8?B?VUJ6QVZycEFNRm5jUVZUSVFnWHhseUE2OXJ2S1pVOHNJRG1QcElTWFJSbElz?= =?utf-8?B?YmFUTTU3VGlKZkhRV3VhdkFETlZhUmtGQVFXbEYxbU9DTER4VytxaHpjSHoy?= =?utf-8?B?eVIvSkk3OHFqb2hJbkQrcXRhMnFnSkpKRFlBVUVIeHovMDhINW9WL0x1SURV?= =?utf-8?B?dFZPcitMbDUvak1sVkY3MlpLblpyM1NkLzM2cFlCL0VpV1U4K3piY0VNTG4w?= =?utf-8?B?Z21EeU5LQS9haXBZcnE1TlAyaGhEVjNuOHNsTUszdzJKcVUwemo2UzVBUy93?= =?utf-8?B?Q3BBaDAxRmxOdStLN0RHY3B3MEd3RTN4MzJ4NVJtSmZmanRSUHRVT3N4SmRP?= =?utf-8?B?U1FZZytUSUI4SVRVZG9sT0ZjN1ZEMDdXS251dVZPN2lEdjlDK1FteGpWcis2?= =?utf-8?B?Kzl1WHJ6cTNHTTJXY0VOSEt0MjdCdGtER2pBQWdZVGowdU1iS2JWRnQ0ODB1?= =?utf-8?B?MXdrdEdQWm5DdGVKQjR4WXE1UUpUcXFWSmVUNVJWQmlBQ2h0SFQ4OXlLR3ND?= =?utf-8?B?SEJYNS90bk1XZ3lPbkYwTFlITVl4ZnVYNHYzbDZlZ0ZoV1lMTFd4a3hXc3lw?= =?utf-8?B?SFREeDUrV2E0dGxQYlIzZWQ4V2FmQjBCZDdaVEFkNHhBdDZmdFE4M1MvdWVh?= =?utf-8?B?YVRyUU1DdFBvNmZQL1BMVm85MDVYUmkzYzJTclBiV3JGZ2xNMFAxYzNnVFUy?= =?utf-8?B?bzdvVE1waHl4TnFtQ3dSOGNDUkN3WC8rNDJzbm9LWW1ZbkNtZGRRYkE1RER0?= =?utf-8?B?cm8xVCtpRDV3c0pZRk8wNzArZ1Fmb0MwRlRmRUtWY01WdVBqR0cxeUtrUnFa?= =?utf-8?B?eENWSzcveEV1Y2NyY1NpRjlmekx4QjRqVHJVL3lhUGtlNHFXNmlhV2RSeXJv?= =?utf-8?B?UzA2K0UrVWw3amN2Kzl2US9yQ25XbmUzTm4zZnpjSUQ4V1BFZFlwdlRRei83?= =?utf-8?B?THhRU2NPVnpwSVdDWWZDZjBKRiswL3RiWGpPOUwwWVRsbGplNFV1UjQxc0N3?= =?utf-8?B?RENlbkc1Y1p2ZVJwNnFDWld4b1pnV01xQTVGa3RoVU54U1BzRmlFRXBkOHBt?= =?utf-8?B?UXNRbmRVRFhDSWVNRjVnd0lWZzZsZkFmWm9QcVNXbTRhYm8vcVAxMVRwV250?= =?utf-8?B?cjdzRE1aQWlXWW54WTdDMmNTbzBmZHl2YXNTd2ZxVDl3ejcxcWVjcTBCTjZx?= =?utf-8?B?MU0rSG1haEswMDROeE1nMWh6blRiTGYwSGVUMjJjdlpxMGs2MEt5NTB1WVZU?= =?utf-8?B?bGN6ckJpc3VyQnVqMTdpRkF5R2EvWGpFaE10MnoveWNtbkFwZGlwcHZXa0F4?= =?utf-8?B?OGRWbnhUZFlLNkw2QnRmUFhjRXU2bzYvZ0tnSHZQVXpjcUc5Ny91amo5Wndx?= =?utf-8?B?d2dmNmF4Ti9jZFBEVmtRaGtEKzN1MmMwNWRLY1B5dnpHMFd0YmE0SzR5R05R?= =?utf-8?B?N0dQeEJwdE9uWUl3ODEvY1Znd0RXaUN3MmVRTnczN1RoeEpTTlRDbUZZdFBL?= =?utf-8?Q?0xtQ98cmADr1V1SRLjrp1jrV5W6twXlnyEElfS/qHXTi?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: e288b6d4-d665-47c1-57e6-08dd8005c08b X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 12:20:35.2802 (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: SF/1BDyWpYZPoAa6F/hS5JJoKz1cPn9o2IjU9n80ni/HBjvYSE5KowKMbYky2u9WAm/la44l2tXagB0sM8oo8Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 From: Joel Fernandes Add support for navigating and setting up vBIOS ucode data required for GSP to boot. The main data extracted from the vBIOS is the FWSEC-FRTS firmware which runs on the GSP processor. This firmware runs in high secure mode, and sets up the WPR2 (Write protected region) before the Booter runs on the SEC2 processor. Also add log messages to show the BIOS images. [102141.013287] NovaCore: Found BIOS image at offset 0x0, size: 0xfe00, typ= e: PciAt [102141.080692] NovaCore: Found BIOS image at offset 0xfe00, size: 0x14800,= type: Efi [102141.098443] NovaCore: Found BIOS image at offset 0x24600, size: 0x5600,= type: FwSec [102141.415095] NovaCore: Found BIOS image at offset 0x29c00, size: 0x60800= , type: FwSec Tested on my Ampere GA102 and boot is successful. [applied changes by Alex Courbot for fwsec signatures] [applied feedback from Alex Courbot and Timur Tabi] Signed-off-by: Joel Fernandes Signed-off-by: Alexandre Courbot --- drivers/gpu/nova-core/firmware.rs | 2 - drivers/gpu/nova-core/gpu.rs | 5 + drivers/gpu/nova-core/nova_core.rs | 1 + drivers/gpu/nova-core/vbios.rs | 1103 ++++++++++++++++++++++++++++++++= ++++ 4 files changed, 1109 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/nova-core/firmware.rs b/drivers/gpu/nova-core/firm= ware.rs index 4ef5ba934b9d255635aa9a902e1d3a732d6e5568..58c0513d49e9a0cef36917c8e2b= 25c414f6fc596 100644 --- a/drivers/gpu/nova-core/firmware.rs +++ b/drivers/gpu/nova-core/firmware.rs @@ -44,7 +44,6 @@ pub(crate) fn new( } =20 /// Structure used to describe some firmwares, notable fwsec-frts. -#[allow(dead_code)] #[repr(C)] #[derive(Debug, Clone)] pub(crate) struct FalconUCodeDescV3 { @@ -64,7 +63,6 @@ pub(crate) struct FalconUCodeDescV3 { _reserved: u16, } =20 -#[allow(dead_code)] impl FalconUCodeDescV3 { pub(crate) fn size(&self) -> usize { ((self.hdr & 0xffff0000) >> 16) as usize diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index ec4c648c6e8b4aa7d06c627ed59c0e66a08c679e..2344dfc69fe4246644437d70572= 680a4450b5bd7 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -11,6 +11,7 @@ use crate::regs; use crate::timer::Timer; use crate::util; +use crate::vbios::Vbios; use core::fmt; =20 macro_rules! define_chipset { @@ -157,6 +158,7 @@ pub(crate) struct Gpu { fw: Firmware, sysmem_flush: DmaObject, timer: Timer, + bios: Vbios, } =20 #[pinned_drop] @@ -237,12 +239,15 @@ pub(crate) fn new( =20 let _sec2_falcon =3D Sec2Falcon::new(pdev, spec.chipset, &bar, tru= e)?; =20 + let bios =3D Vbios::probe(&bar)?; + Ok(pin_init!(Self { spec, bar, fw, sysmem_flush, timer, + bios, })) } } diff --git a/drivers/gpu/nova-core/nova_core.rs b/drivers/gpu/nova-core/nov= a_core.rs index 4dde8004d24882c60669b5acd6af9d6988c66a9c..2858f4a0dc35eb9d6547d5cbd81= de44c8fc47bae 100644 --- a/drivers/gpu/nova-core/nova_core.rs +++ b/drivers/gpu/nova-core/nova_core.rs @@ -29,6 +29,7 @@ macro_rules! with_bar { mod regs; mod timer; mod util; +mod vbios; =20 kernel::module_pci_driver! { type: driver::NovaCore, diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs new file mode 100644 index 0000000000000000000000000000000000000000..534107b708cab0eb8d0accf7daa= 5718edf030358 --- /dev/null +++ b/drivers/gpu/nova-core/vbios.rs @@ -0,0 +1,1103 @@ +// SPDX-License-Identifier: GPL-2.0 + +// To be removed when all code is used. +#![allow(dead_code)] + +//! VBIOS extraction and parsing. + +use crate::driver::Bar0; +use crate::firmware::FalconUCodeDescV3; +use core::convert::TryFrom; +use kernel::devres::Devres; +use kernel::error::Result; +use kernel::prelude::*; + +/// 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; + +// PMU lookup table entry types. Used to locate PMU table entries +// in the Fwsec image, corresponding to falcon ucodes. +#[allow(dead_code)] +const FALCON_UCODE_ENTRY_APPID_FIRMWARE_SEC_LIC: u8 =3D 0x05; +#[allow(dead_code)] +const FALCON_UCODE_ENTRY_APPID_FWSEC_DBG: u8 =3D 0x45; +const FALCON_UCODE_ENTRY_APPID_FWSEC_PROD: u8 =3D 0x85; + +pub(crate) struct Vbios { + pub fwsec_image: Option, +} + +impl Vbios { + /// Read bytes from the ROM at the current end of the data vector + fn read_more(bar0: &Devres, data: &mut KVec, len: usize) -> = Result { + let current_len =3D data.len(); + let start =3D ROM_OFFSET + current_len; + + // Ensure length is a multiple of 4 for 32-bit reads + if len % core::mem::size_of::() !=3D 0 { + pr_err!("VBIOS read length {} is not a multiple of 4\n", len); + return Err(EINVAL); + } + + // Allocate and zero-initialize the required memory + data.extend_with(len, 0, GFP_KERNEL)?; + with_bar!(?bar0, |bar0_ref| { + let dst =3D &mut data[current_len..current_len + len]; + for (idx, chunk) in dst + .chunks_exact_mut(core::mem::size_of::()) + .enumerate() + { + let addr =3D start + (idx * core::mem::size_of::()); + // Convert the u32 to a 4 byte array. We use the .to_ne_by= tes() + // method out of convenience to convert the 32-bit integer= as it + // is in memory into a byte array without any endianness + // conversion or byte-swapping. + chunk.copy_from_slice(&bar0_ref.try_read32(addr)?.to_ne_by= tes()); + } + Ok(()) + })?; + + Ok(()) + } + + /// Read bytes at a specific offset, filling any gap + fn read_more_at_offset( + bar0: &Devres, + data: &mut KVec, + offset: usize, + len: usize, + ) -> Result { + if offset > BIOS_MAX_SCAN_LEN { + pr_err!("Error: exceeded BIOS scan limit.\n"); + return Err(EINVAL); + } + + // If offset is beyond current data size, fill the gap first + let current_len =3D data.len(); + let gap_bytes =3D if offset > current_len { + offset - current_len + } else { + 0 + }; + + // Now read the requested bytes at the offset + Self::read_more(bar0, data, gap_bytes + len) + } + + /// Read a BIOS image at a specific offset and create a BiosImage from= it. + /// @data is extended as needed and a new BiosImage is returned. + fn read_bios_image_at_offset( + bar0: &Devres, + data: &mut KVec, + offset: usize, + len: usize, + ) -> Result { + if offset + len > data.len() { + Self::read_more_at_offset(bar0, data, offset, len).inspect_err= (|e| { + pr_err!("Failed to read more at offset {:#x}: {:?}\n", off= set, e) + })?; + } + + BiosImage::try_from(&data[offset..offset + len]).inspect_err(|e| { + pr_err!( + "Failed to create BiosImage at offset {:#x}: {:?}\n", + offset, + e + ) + }) + } + + /// Probe for VBIOS extraction + /// Once the VBIOS object is built, bar0 is not read for vbios purpose= s anymore. + pub(crate) fn probe(bar0: &Devres) -> Result { + // VBIOS data vector: As BIOS images are scanned, they are added t= o this vector + // for reference or copying into other data structures. It is the = entire + // scanned contents of the VBIOS which progressively extends. It i= s used + // so that we do not re-read any contents that are already read as= we use + // the cumulative length read so far, and re-read any gaps as we e= xtend + // the length + let mut data =3D KVec::new(); + + // Loop through all the BiosImage and extract relevant ones and re= levant data from them + let mut cur_offset =3D 0; + let mut pci_at_image: Option =3D None; + let mut first_fwsec_image: Option =3D None; + let mut second_fwsec_image: Option =3D None; + + // loop till break + loop { + // Try to parse a BIOS image at the current offset + // This will now check for all valid ROM signatures (0xAA55, 0= xBB77, 0x4E56) + let image_size =3D + Self::read_bios_image_at_offset(bar0, &mut data, cur_offse= t, BIOS_READ_AHEAD_SIZE) + .and_then(|image| image.image_size_bytes()) + .inspect_err(|e| { + pr_err!( + "Failed to parse initial BIOS image headers at= offset {:#x}: {:?}\n", + cur_offset, + e + ); + })?; + + // Create a new BiosImage with the full image data + let full_image =3D + Self::read_bios_image_at_offset(bar0, &mut data, cur_offse= t, image_size) + .inspect_err(|e| { + pr_err!( + "Failed to parse full BIOS image at offset {:#= x}: {:?}\n", + cur_offset, + e + ); + })?; + + // Determine the image type + let image_type =3D full_image.image_type_str(); + + pr_info!( + "Found BIOS image at offset {:#x}, size: {:#x}, type: {}\n= ", + cur_offset, + image_size, + image_type + ); + + let is_last =3D full_image.is_last(); + // Get references to images we will need after the loop, in or= der to + // setup the falcon data offset. + match full_image { + BiosImage::PciAt(image) =3D> { + pci_at_image =3D Some(image); + } + BiosImage::FwSec(image) =3D> { + if first_fwsec_image.is_none() { + first_fwsec_image =3D Some(image); + } else { + second_fwsec_image =3D Some(image); + } + } + // For now we don't need to handle these + BiosImage::Efi(_image) =3D> {} + BiosImage::Nbsi(_image) =3D> {} + } + + // Break if this is the last image + if is_last { + break; + } + + // Move to the next image (aligned to 512 bytes) + cur_offset +=3D image_size; + cur_offset =3D (cur_offset + 511) & !511; + + // Safety check - don't go beyond BIOS_MAX_SCAN_LEN (1MB) + if cur_offset > BIOS_MAX_SCAN_LEN { + pr_err!("Error: exceeded BIOS scan limit, stopping scan\n"= ); + break; + } + } // end of loop + + // Using all the images, setup the falcon data pointer in Fwsec. + // We need mutable access here, so we handle the Option manually. + let final_fwsec_image =3D { + let mut second =3D second_fwsec_image; // Take ownership of th= e option + let first_ref =3D first_fwsec_image.as_ref(); + let pci_at_ref =3D pci_at_image.as_ref(); + + if let (Some(second), Some(first), Some(pci_at)) =3D + (second.as_mut(), first_ref, pci_at_ref) + { + second + .setup_falcon_data(pci_at, first) + .inspect_err(|e| pr_err!("Falcon data setup failed: {:= ?}\n", e))?; + } else { + pr_err!("Missing required images for falcon data setup, sk= ipping\n"); + } + second // Return the potentially modified second image + }; + + Ok(Self { + fwsec_image: final_fwsec_image, + }) + } + + pub(crate) fn fwsec_header(&self) -> Result<&FalconUCodeDescV3> { + let image =3D self.fwsec_image.as_ref().ok_or(EINVAL)?; + image.fwsec_header() + } + + pub(crate) fn fwsec_ucode(&self) -> Result<&[u8]> { + let image =3D self.fwsec_image.as_ref().ok_or(EINVAL)?; + image.fwsec_ucode(image.fwsec_header()?) + } + + pub(crate) fn fwsec_sigs(&self) -> Result<&[u8]> { + let image =3D self.fwsec_image.as_ref().ok_or(EINVAL)?; + image.fwsec_sigs(image.fwsec_header()?) + } +} + +/// PCI Data Structure as defined in PCI Firmware Specification +#[derive(Debug, Clone)] +#[repr(C)] +#[allow(dead_code)] +struct PcirStruct { + /// PCI Data Structure signature ("PCIR" or "NPDS") + pub signature: [u8; 4], + /// PCI Vendor ID (e.g., 0x10DE for NVIDIA) + pub vendor_id: u16, + /// PCI Device ID + pub device_id: u16, + /// Device List Pointer + pub device_list_ptr: u16, + /// PCI Data Structure Length + pub pci_data_struct_len: u16, + /// PCI Data Structure Revision + pub pci_data_struct_rev: u8, + /// Class code (3 bytes, 0x03 for display controller) + pub class_code: [u8; 3], + /// Size of this image in 512-byte blocks + pub image_len: u16, + /// Revision Level of the Vendor's ROM + pub vendor_rom_rev: u16, + /// ROM image type (0x00 =3D PC-AT compatible, 0x03 =3D EFI, 0x70 =3D = NBSI) + pub code_type: u8, + /// Last image indicator (0x00 =3D Not last image, 0x80 =3D Last image) + pub last_image: u8, + /// Maximum Run-time Image Length (units of 512 bytes) + pub max_runtime_image_len: u16, +} + +impl TryFrom<&[u8]> for PcirStruct { + type Error =3D Error; + + fn try_from(data: &[u8]) -> Result { + if data.len() < core::mem::size_of::() { + pr_err!("Not enough data for PcirStruct\n"); + return Err(EINVAL); + } + + let mut signature =3D [0u8; 4]; + signature.copy_from_slice(&data[0..4]); + + // Signature should be "PCIR" (0x52494350) or "NPDS" (0x5344504e) + if &signature !=3D b"PCIR" && &signature !=3D b"NPDS" { + pr_err!("Invalid signature for PcirStruct: {:?}\n", signature); + return Err(EINVAL); + } + + let mut class_code =3D [0u8; 3]; + class_code.copy_from_slice(&data[13..16]); + + Ok(PcirStruct { + signature, + vendor_id: u16::from_le_bytes([data[4], data[5]]), + device_id: u16::from_le_bytes([data[6], data[7]]), + device_list_ptr: u16::from_le_bytes([data[8], data[9]]), + pci_data_struct_len: u16::from_le_bytes([data[10], data[11]]), + pci_data_struct_rev: data[12], + class_code, + image_len: u16::from_le_bytes([data[16], data[17]]), + vendor_rom_rev: u16::from_le_bytes([data[18], data[19]]), + code_type: data[20], + last_image: data[21], + max_runtime_image_len: u16::from_le_bytes([data[22], data[23]]= ), + }) + } +} + +impl PcirStruct { + /// Check if this is the last image in the ROM + fn is_last(&self) -> bool { + self.last_image & 0x80 !=3D 0 + } + + /// Calculate image size in bytes + fn image_size_bytes(&self) -> Result { + if self.image_len > 0 { + // Image size is in 512-byte blocks + Ok(self.image_len as usize * 512) + } else { + Err(EINVAL) + } + } +} + +/// BIOS Information Table (BIT) Header +/// This is the head of the BIT table, that is used to locate the Falcon d= ata. +/// The BIT table (with its header) is in the PciAtBiosImage and the falco= n data +/// it is pointing to is in the FwSecBiosImage. +#[derive(Debug, Clone, Copy)] +#[allow(dead_code)] +struct BitHeader { + /// 0h: BIT Header Identifier (BMP=3D0x7FFF/BIT=3D0xB8FF) + pub id: u16, + /// 2h: BIT Header Signature ("BIT\0") + pub signature: [u8; 4], + /// 6h: Binary Coded Decimal Version, ex: 0x0100 is 1.00. + pub bcd_version: u16, + /// 8h: Size of BIT Header (in bytes) + pub header_size: u8, + /// 9h: Size of BIT Tokens (in bytes) + pub token_size: u8, + /// 10h: Number of token entries that follow + pub token_entries: u8, + /// 11h: BIT Header Checksum + pub checksum: u8, +} + +impl TryFrom<&[u8]> for BitHeader { + type Error =3D Error; + + fn try_from(data: &[u8]) -> Result { + if data.len() < 12 { + return Err(EINVAL); + } + + let mut signature =3D [0u8; 4]; + signature.copy_from_slice(&data[2..6]); + + // Check header ID and signature + let id =3D u16::from_le_bytes([data[0], data[1]]); + if id !=3D 0xB8FF || &signature !=3D b"BIT\0" { + return Err(EINVAL); + } + + Ok(BitHeader { + id, + signature, + bcd_version: u16::from_le_bytes([data[6], data[7]]), + header_size: data[8], + token_size: data[9], + token_entries: data[10], + checksum: data[11], + }) + } +} + +/// BIT Token Entry: Records in the BIT table followed by the BIT header +#[derive(Debug, Clone, Copy)] +#[allow(dead_code)] +struct BitToken { + /// 00h: Token identifier + pub id: u8, + /// 01h: Version of the token data + pub data_version: u8, + /// 02h: Size of token data in bytes + pub data_size: u16, + /// 04h: Offset to the token data + pub data_offset: u16, +} + +// Define the token ID for the Falcon data +pub(in crate::vbios) const BIT_TOKEN_ID_FALCON_DATA: u8 =3D 0x70; + +impl BitToken { + /// Find a BIT token entry by BIT ID in a PciAtBiosImage + pub(in crate::vbios) fn from_id(image: &PciAtBiosImage, token_id: u8) = -> Result { + let header =3D image.bit_header.as_ref().ok_or(EINVAL)?; + + // Offset to the first token entry + let tokens_start =3D image.bit_offset.unwrap() + header.header_siz= e as usize; + + for i in 0..header.token_entries as usize { + let entry_offset =3D tokens_start + (i * header.token_size as = usize); + + // Make sure we don't go out of bounds + if entry_offset + header.token_size as usize > image.base.data= .len() { + return Err(EINVAL); + } + + // 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], + ]), + }); + } + } + + // Token not found + Err(ENOENT) + } +} + +/// 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 "NBSI" images (NoteBook System Information), the ROM +/// header deviates from the standard and contains an offset to the +/// NBSI image however we do not yet parse that in this module and keep +/// it for future reference. +#[derive(Debug, Clone, Copy)] +#[allow(dead_code)] +struct PciRomHeader { + /// 00h: Signature (0xAA55) + pub signature: u16, + /// 02h: Reserved bytes for processor architecture unique data (20 byt= es) + pub reserved: [u8; 20], + /// 16h: NBSI Data Offset (NBSI-specific, offset from header to NBSI i= mage) + pub nbsi_data_offset: Option, + /// 18h: Pointer to PCI Data Structure (offset from start of ROM image) + pub pci_data_struct_offset: u16, + /// 1Ah: Size of block (this is NBSI-specific) + pub size_of_block: Option, +} + +impl TryFrom<&[u8]> for PciRomHeader { + type Error =3D Error; + + fn try_from(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]]); + + // Check for valid ROM signatures + match signature { + 0xAA55 | 0xBB77 | 0x4E56 =3D> {} + _ =3D> { + pr_err!("ROM signature unknown {:#x}\n", signature); + return Err(EINVAL); + } + } + + // 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( + (data[29] as u32) << 24 + | (data[28] as u32) << 16 + | (data[27] as u32) << 8 + | (data[26] as u32), + ); + } + + // 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, + }) + } +} + +/// NVIDIA PCI Data Extension Structure. This is similar to the +/// PCI Data Structure, but is Nvidia-specific and is placed right after +/// the PCI Data Structure. It contains some fields that are redundant +/// with the PCI Data Structure, but are needed for traversing the +/// BIOS images. It is expected to be present in all BIOS images except +/// for NBSI images. +#[derive(Debug, Clone)] +#[allow(dead_code)] +struct NpdeStruct { + /// 00h: Signature ("NPDE") + pub signature: [u8; 4], + /// 04h: NVIDIA PCI Data Extension Revision + pub npci_data_ext_rev: u16, + /// 06h: NVIDIA PCI Data Extension Length + pub npci_data_ext_len: u16, + /// 08h: Sub-image Length (in 512-byte units) + pub subimage_len: u16, + /// 0Ah: Last image indicator flag + pub last_image: u8, +} + +impl TryFrom<&[u8]> for NpdeStruct { + type Error =3D Error; + + fn try_from(data: &[u8]) -> Result { + if data.len() < 11 { + pr_err!("Not enough data for NpdeStruct\n"); + return Err(EINVAL); + } + + let mut signature =3D [0u8; 4]; + signature.copy_from_slice(&data[0..4]); + + // Signature should be "NPDE" (0x4544504E) + if &signature !=3D b"NPDE" { + pr_err!("Invalid signature for NpdeStruct: {:?}\n", signature); + return Err(EINVAL); + } + + Ok(NpdeStruct { + signature, + npci_data_ext_rev: u16::from_le_bytes([data[4], data[5]]), + npci_data_ext_len: u16::from_le_bytes([data[6], data[7]]), + subimage_len: u16::from_le_bytes([data[8], data[9]]), + last_image: data[10], + }) + } +} + +impl NpdeStruct { + /// Check if this is the last image in the ROM + fn is_last(&self) -> bool { + self.last_image & 0x80 !=3D 0 + } + + /// Calculate image size in bytes + fn image_size_bytes(&self) -> Result { + if self.subimage_len > 0 { + // Image size is in 512-byte blocks + Ok(self.subimage_len as usize * 512) + } else { + Err(EINVAL) + } + } + + /// Try to find NPDE in the data, the NPDE is right after the PCIR. + fn find_in_data(data: &[u8], rom_header: &PciRomHeader, pcir: &PcirStr= uct) -> Option { + // Calculate the offset where NPDE might be located + // NPDE should be right after the PCIR structure, aligned to 16 by= tes + let pcir_offset =3D rom_header.pci_data_struct_offset as usize; + let npde_start =3D (pcir_offset + pcir.pci_data_struct_len as usiz= e + 0x0F) & !0x0F; + + // Check if we have enough data + if npde_start + 11 > data.len() { + pr_err!("Not enough data for NPDE\n"); + return None; + } + + // Try to create NPDE from the data + NpdeStruct::try_from(&data[npde_start..]) + .inspect_err(|e| { + pr_err!("Error creating NpdeStruct: {:?}\n", e); + }) + .ok() + } +} +// Use a macro to implement BiosImage enum and methods. This avoids having= to +// repeat each enum type when implementing functions like base() in BiosIm= age. +macro_rules! bios_image { + ( + $($variant:ident $class:ident),* $(,)? + ) =3D> { + // BiosImage enum with variants for each image type + enum BiosImage { + $($variant($class)),* + } + + impl BiosImage { + /// Get a reference to the common BIOS image data regardless o= f type + fn base(&self) -> &BiosImageBase { + match self { + $(Self::$variant(img) =3D> &img.base),* + } + } + + /// Returns a string representing the type of BIOS image + fn image_type_str(&self) -> &'static str { + match self { + $(Self::$variant(_) =3D> stringify!($variant)),* + } + } + } + } +} + +impl BiosImage { + /// Check if this is the last image + fn is_last(&self) -> bool { + let base =3D self.base(); + + // For NBSI images (type =3D=3D 0x70), return true as they're + // considered the last image + if matches!(self, Self::Nbsi(_)) { + return true; + } + + // For other image types, check NPDE first if available + if let Some(ref npde) =3D base.npde { + return npde.is_last(); + } + + // Otherwise, fall back to checking the PCIR last_image flag + base.pcir.is_last() + } + + /// Get the image size in bytes + fn image_size_bytes(&self) -> Result { + let base =3D self.base(); + + // Prefer NPDE image size if available + if let Some(ref npde) =3D base.npde { + return npde.image_size_bytes(); + } + + // Otherwise, fall back to the PCIR image size + base.pcir.image_size_bytes() + } +} + +bios_image! { + PciAt PciAtBiosImage, // PCI-AT compatible BIOS image + Efi EfiBiosImage, // EFI (Extensible Firmware Interface) + Nbsi NbsiBiosImage, // NBSI (Nvidia Bios System Interface) + FwSec FwSecBiosImage // FWSEC (Firmware Security) +} + +struct PciAtBiosImage { + base: BiosImageBase, + bit_header: Option, + bit_offset: Option, +} + +struct EfiBiosImage { + base: BiosImageBase, + // EFI-specific fields can be added here in the future. +} + +struct NbsiBiosImage { + base: BiosImageBase, + // NBSI-specific fields can be added here in the future. +} + +pub(crate) struct FwSecBiosImage { + base: BiosImageBase, + // FWSEC-specific fields + // 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 pointer + pmu_lookup_table: Option, + // The offset of the Falcon ucode + falcon_ucode_offset: Option, +} + +// Convert from BiosImageBase to BiosImage +impl TryFrom for BiosImage { + type Error =3D Error; + + fn try_from(base: BiosImageBase) -> Result { + match base.pcir.code_type { + 0x00 =3D> Ok(BiosImage::PciAt(base.try_into()?)), + 0x03 =3D> Ok(BiosImage::Efi(EfiBiosImage { base })), + 0x70 =3D> Ok(BiosImage::Nbsi(NbsiBiosImage { base })), + 0xE0 =3D> Ok(BiosImage::FwSec(FwSecBiosImage { + base, + falcon_data_offset: None, + pmu_lookup_table: None, + falcon_ucode_offset: None, + })), + _ =3D> { + pr_err!("Unknown BIOS image type {:#x}\n", base.pcir.code_= type); + Err(EINVAL) + } + } + } +} + +/// BiosImage creation from a byte slice. This creates a BiosImageBase +/// and then converts it to a BiosImage which triggers the constructor of +/// the specific BiosImage enum variant. +impl TryFrom<&[u8]> for BiosImage { + type Error =3D Error; + + fn try_from(data: &[u8]) -> Result { + let base =3D BiosImageBase::try_from(data)?; + let image =3D base.to_image()?; + + image + .image_size_bytes() + .inspect_err(|_| pr_err!("Invalid image size computed during B= iosImage creation\n"))?; + + Ok(image) + } +} + +/// BIOS Image structure containing various headers and references +/// fields base to all BIOS images. Each BiosImage type has a +/// BiosImageBase type along with other image-specific fields. +/// Note that Rust favors composition of types over inheritance. +#[derive(Debug)] +#[allow(dead_code)] +struct BiosImageBase { + /// PCI ROM Expansion Header + pub rom_header: PciRomHeader, + /// PCI Data Structure + pub pcir: PcirStruct, + /// NVIDIA PCI Data Extension (optional) + pub npde: Option, + /// Image data (includes ROM header and PCIR) + pub data: KVec, +} + +impl BiosImageBase { + fn to_image(self) -> Result { + BiosImage::try_from(self) + } +} + +impl TryFrom<&[u8]> for BiosImageBase { + type Error =3D Error; + + fn try_from(data: &[u8]) -> Result { + // Ensure we have enough data for the ROM header + if data.len() < 26 { + pr_err!("Not enough data for ROM header\n"); + return Err(EINVAL); + } + + // Parse the ROM header + let rom_header =3D PciRomHeader::try_from(&data[0..26]) + .inspect_err(|e| pr_err!("Failed to create PciRomHeader: {:?}\= n", e))?; + + // Get the PCI Data Structure using the pointer from the ROM header + let pcir_offset =3D rom_header.pci_data_struct_offset as usize; + let pcir_data =3D data + .get(pcir_offset..pcir_offset + core::mem::size_of::()) + .ok_or(EINVAL) + .inspect_err(|_| { + pr_err!( + "PCIR offset {:#x} out of bounds (data length: {})\n", + pcir_offset, + data.len() + ); + pr_err!("Consider reading more data for construction of Bi= osImage\n"); + })?; + + let pcir =3D PcirStruct::try_from(pcir_data) + .inspect_err(|e| pr_err!("Failed to create PcirStruct: {:?}\n"= , e))?; + + // Look for NPDE structure if this is not an NBSI image (type !=3D= 0x70) + let npde =3D NpdeStruct::find_in_data(data, &rom_header, &pcir); + + // Create a copy of the data + let mut data_copy =3D KVec::new(); + data_copy.extend_with(data.len(), 0, GFP_KERNEL)?; + data_copy.copy_from_slice(data); + + Ok(BiosImageBase { + rom_header, + pcir, + npde, + data: data_copy, + }) + } +} + +/// The PciAt BIOS image is typically the first BIOS image type found in t= he +/// BIOS image chain. It contains the BIT header and the BIT tokens. +impl PciAtBiosImage { + /// Find a byte pattern in a slice + fn find_byte_pattern(haystack: &[u8], needle: &[u8]) -> Option { + haystack + .windows(needle.len()) + .position(|window| window =3D=3D needle) + } + + /// Find the BIT header in the PciAtBiosImage + fn find_bit_header(data: &[u8]) -> Result<(BitHeader, usize)> { + let bit_pattern =3D [0xff, 0xb8, b'B', b'I', b'T', 0x00]; + let bit_offset =3D Self::find_byte_pattern(data, &bit_pattern); + if bit_offset.is_none() { + return Err(EINVAL); + } + + let bit_header =3D BitHeader::try_from(&data[bit_offset.unwrap()..= ])?; + Ok((bit_header, bit_offset.unwrap())) + } + + /// Get a BIT token entry from the BIT table in the PciAtBiosImage + fn get_bit_token(&self, token_id: u8) -> Result { + BitToken::from_id(self, token_id) + } + + /// Find the Falcon data pointer structure in the PciAtBiosImage + /// This is just a 4 byte structure that contains a pointer to the + /// Falcon data in the FWSEC image. + fn falcon_data_ptr(&self) -> Result { + let token =3D self.get_bit_token(BIT_TOKEN_ID_FALCON_DATA)?; + + // Make sure we don't go out of bounds + if token.data_offset as usize + 4 > self.base.data.len() { + return Err(EINVAL); + } + + // read the 4 bytes at the offset specified in the token + let offset =3D token.data_offset as usize; + let bytes: [u8; 4] =3D self.base.data[offset..offset + 4].try_into= ().map_err(|_| { + pr_err!("Failed to convert data slice to array"); + EINVAL + })?; + + let data_ptr =3D u32::from_le_bytes(bytes); + + if (data_ptr as usize) < self.base.data.len() { + pr_err!("Falcon data pointer out of bounds\n"); + return Err(EINVAL); + } + + Ok(data_ptr) + } +} + +impl TryFrom for PciAtBiosImage { + type Error =3D Error; + + fn try_from(base: BiosImageBase) -> Result { + let data_slice =3D &base.data; + let (bit_header, bit_offset) =3D PciAtBiosImage::find_bit_header(d= ata_slice)?; + + Ok(PciAtBiosImage { + base, + bit_header: Some(bit_header), + bit_offset: Some(bit_offset), + }) + } +} + +/// The PmuLookupTableEntry structure is a single entry in the PmuLookupTa= ble. +/// See the PmuLookupTable description for more information. +#[allow(dead_code)] +struct PmuLookupTableEntry { + application_id: u8, + target_id: u8, + data: u32, +} + +impl TryFrom<&[u8]> for PmuLookupTableEntry { + type Error =3D Error; + + fn try_from(data: &[u8]) -> Result { + if data.len() < 5 { + 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)?), + }) + } +} + +/// The PmuLookupTableEntry structure is used to find the PmuLookupTableEn= try +/// for a given application ID. The table of entries is pointed to by the = falcon +/// data pointer in the BIT table, and is used to locate the Falcon Ucode. +#[allow(dead_code)] +struct PmuLookupTable { + version: u8, + header_len: u8, + entry_len: u8, + entry_count: u8, + table_data: KVec, +} + +impl TryFrom<&[u8]> for PmuLookupTable { + type Error =3D Error; + + fn try_from(data: &[u8]) -> Result { + if data.len() < 4 { + return Err(EINVAL); + } + + let header_len =3D data[1] as usize; + let entry_len =3D data[2] as usize; + let entry_count =3D data[3] as usize; + + let required_bytes =3D header_len + (entry_count * entry_len); + + if data.len() < required_bytes { + return Err(EINVAL); + } + + // Create a copy of only the table data + let mut table_data =3D KVec::new(); + + // "last_entry_bytes" is a debugging aid. + // let mut last_entry_bytes: Option> =3D Some(KVec::new()= ); + + for &byte in &data[header_len..required_bytes] { + table_data.push(byte, GFP_KERNEL)?; + /* + * Uncomment for debugging (dumps the table data to dmesg): + * last_entry_bytes.as_mut().ok_or(EINVAL)?.push(byte, GFP_KER= NEL)?; + * + * let last_entry_bytes_len =3D last_entry_bytes.as_ref().ok_o= r(EINVAL)?.len(); + * if last_entry_bytes_len =3D=3D entry_len { + * pr_info!("Last entry bytes: {:02x?}\n", &last_entry_byt= es.as_ref().ok_or(EINVAL)?[..]); + * last_entry_bytes =3D Some(KVec::new()); + * } + */ + } + + Ok(PmuLookupTable { + version: data[0], + header_len: header_len as u8, + entry_len: entry_len as u8, + entry_count: entry_count as u8, + table_data, + }) + } +} + +impl PmuLookupTable { + fn lookup_index(&self, idx: u8) -> Result { + if idx >=3D self.entry_count { + return Err(EINVAL); + } + + let index =3D (idx as usize) * self.entry_len as usize; + Ok(PmuLookupTableEntry::try_from(&self.table_data[index..])?) + } + + // find entry by type value + fn find_entry_by_type(&self, entry_type: u8) -> Result { + for i in 0..self.entry_count { + let entry =3D self.lookup_index(i)?; + if entry.application_id =3D=3D entry_type { + return Ok(entry); + } + } + + Err(EINVAL) + } +} + +/// The FwSecBiosImage structure contains the PMU table and the Falcon Uco= de. +/// The PMU table contains voltage/frequency tables as well as a pointer t= o the +/// Falcon Ucode. +impl FwSecBiosImage { + fn setup_falcon_data( + &mut self, + pci_at_image: &PciAtBiosImage, + first_fwsec_image: &FwSecBiosImage, + ) -> Result<()> { + let mut offset =3D pci_at_image.falcon_data_ptr()? as usize; + + // 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 + // image from the offset to get the offset to the start of the sec= ond + // Fwsec image. + offset -=3D first_fwsec_image.base.data.len(); + + self.falcon_data_offset =3D Some(offset); + + // The PmuLookupTable starts at the offset of the falcon data poin= ter + self.pmu_lookup_table =3D Some(PmuLookupTable::try_from(&self.base= .data[offset..])?); + + match self + .pmu_lookup_table + .as_ref() + .ok_or(EINVAL)? + .find_entry_by_type(FALCON_UCODE_ENTRY_APPID_FWSEC_PROD) + { + Ok(entry) =3D> { + let mut ucode_offset =3D entry.data as usize; + ucode_offset -=3D pci_at_image.base.data.len(); + ucode_offset -=3D first_fwsec_image.base.data.len(); + self.falcon_ucode_offset =3D Some(ucode_offset); + + /* + * Uncomment for debug: print the v3_desc header + * let v3_desc =3D self.fwsec_header()?; + * pr_info!("PmuLookupTableEntry v3_desc: {:#?}\n", v3_des= c); + */ + } + Err(e) =3D> { + pr_err!("PmuLookupTableEntry not found, error: {:?}\n", e); + } + } + Ok(()) + } + + /// TODO: These were borrowed from the old code for integrating this m= odule + /// with the outside world. They should be cleaned up and integrated p= roperly. + /// + /// Get the FwSec header (FalconUCodeDescV3) + fn fwsec_header(&self) -> Result<&FalconUCodeDescV3> { + // Get the falcon ucode offset that was found in setup_falcon_data + let falcon_ucode_offset =3D self.falcon_ucode_offset.ok_or(EINVAL)= ? as usize; + + // Make sure the offset is within the data bounds + if falcon_ucode_offset + core::mem::size_of::()= > self.base.data.len() { + pr_err!("fwsec-frts header not contained within BIOS bounds\n"= ); + return Err(ERANGE); + } + + // 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; + + if ver !=3D 3 { + pr_err!("invalid fwsec firmware version\n"); + return Err(EINVAL); + } + + // Return a reference to the FalconUCodeDescV3 structure + Ok(unsafe { + &*(self.base.data.as_ptr().add(falcon_ucode_offset) as *const = FalconUCodeDescV3) + }) + } + /// Get the ucode data as a byte slice + fn fwsec_ucode(&self, v3_desc: &FalconUCodeDescV3) -> Result<&[u8]> { + let falcon_ucode_offset =3D self.falcon_ucode_offset.ok_or(EINVAL)= ? as usize; + + // The ucode data follows the descriptor + let ucode_data_offset =3D falcon_ucode_offset + v3_desc.size(); + let size =3D (v3_desc.imem_load_size + v3_desc.dmem_load_size) as = usize; + + // Get the data slice, checking bounds in a single operation + self.base + .data + .get(ucode_data_offset..ucode_data_offset + size) + .ok_or(ERANGE) + .inspect_err(|_| pr_err!("fwsec ucode data not contained withi= n BIOS bounds\n")) + } + + /// Get the signatures as a byte slice + fn fwsec_sigs(&self, v3_desc: &FalconUCodeDescV3) -> Result<&[u8]> { + const SIG_SIZE: usize =3D 96 * 4; + + let falcon_ucode_offset =3D self.falcon_ucode_offset.ok_or(EINVAL)= ? as usize; + + // The signatures data follows the descriptor + let sigs_data_offset =3D falcon_ucode_offset + core::mem::size_of:= :(); + let size =3D v3_desc.signature_count as usize * SIG_SIZE; + + // Make sure the data is within bounds + if sigs_data_offset + size > self.base.data.len() { + pr_err!("fwsec signatures data not contained within BIOS bound= s\n"); + return Err(ERANGE); + } + + Ok(&self.base.data[sigs_data_offset..sigs_data_offset + size]) + } +} --=20 2.49.0 From nobody Mon Feb 9 07:22:46 2026 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2043.outbound.protection.outlook.com [40.107.244.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 DFF64205AD7; Sun, 20 Apr 2025 12:20:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151649; cv=fail; b=VXtVfXHdLzWyIZVJrXxaZDgsjmy6jEGStB5aIibqnjU13xfKvwN2hCLcCPhrE7hq/Qk2vCLpiOfhh5uxkDNiyUH/CE3/Ha67IPtevAX9qYeU0VIfCg5m3u9wc2YXHv1wBGM2ivf3K7Sta8/3UmRAyloudBff1ukvmQLXFIMpzA4= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151649; c=relaxed/simple; bh=pxYoHAMO/VvQdvsjc5JptkrS4nE+u4pxFqz13ZyOZzI=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=XiaEGS9qfebqEOANpQMATIS8DbQ5ieYLn0M1LvaloaGlA1rgOUN9m8eWlZb/HSg4uq1HfRMVn9FSCzkXJIFHY6M/z/B9cAyLZRqVvNBtb2i70pF+VJdYgHz5gB0vYhVojTf5DF2sAC7GUzR/THkPhjtUmaSZoLVaLE11BZv37aY= 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=VKaeaClc; arc=fail smtp.client-ip=40.107.244.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="VKaeaClc" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=AmHbQX9rwW/Pe1iCCwqMC42o5++FJ5KHPErZCrOXrVYwpaTkVeR1GewzowEztzkq+YPlEieUz3l5y93sjEu1wqB99giHoDkOThn2SVuHgzdt1Itma78DoQWq6HF3yoj0n2mhP7vwDfhWh8qUw6F7x29PZrKKda+B8HgtDyGBSFF2ixKp0XjKKZLpsoAwDfY4U0O+Ss3JuLbnE/HbEJ5wMFIDuDzCIT27OnGRDdAyGGvnahA06/eTo7kinr+VS9tm8LX0eViZqwdghBefYRSM+AT0e51lBFvGt0qyQzmXjDKiWgZ36kbfzCbH5kS1mSEKDOXS35xBKTWMKDPbqspmdw== 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=77KUDAHfqUNHlaHaQ4HVlaOlqj79s+YLxgwqgvvtPj0=; b=ZyitemY9kCsvz3aU3PYP3Txi3nnTo8GCC6iRzwSFSz8l0KpexnlTIf2yEvlyR6f995icEp6/vbf9fiErmhnArA+87GhHsy64C/EVk1h57WNzxY3BTJ1oXRWuZb4KvEM6ldi9T3Bcb2S2Ngoef3LSb4FZuzPb0/xVI44SwaphDRS29LJHUYp1HXLt48vi6e9IdEi0qJvzThczr7NKbtPWa7PIUbg1HZC94b8MVvwW9MCJfv88AsgfEqjjl3lVnFKSiUtx0u9PZ8YBmiTPegawW+HtllBc83KH57KvG5ZDJWuHZes5lSJc52MMtQMGztNW/XUml2DlRCgwVDctK640vQ== 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=77KUDAHfqUNHlaHaQ4HVlaOlqj79s+YLxgwqgvvtPj0=; b=VKaeaClc7JlTa0y8mXNlwRBAOz2CLj6K6dQ2A5NASNXDRY4En+7yfS0fvRh2J4Mdf9AutqwnoOmYH5k+oQued+5s9BYLMczS+TwiPy4uOpLu1IgR3/1xOiREJrbENPOtBnW7YpQ3TLbkxong81a4oAABzI5UQz0WZdRZ1lT8l2kJREJrTg4SU8cYu1TcdCEYQJbzQWdR+o0G9X6LqKKFIPf2oVmCPCnNh1ioL/BofM7E1p/vZx57sjy0l9XVYFLQ/600lEP0O8YGXUV21FN7gWOQGDaoNLPTCSB0h7YUj2Z4f9fjVsIAnUp2phVoJmTD4CUkgjUSlXEaHBfv7+H9Yg== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr 2025 12:20:39 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99%4]) with mapi id 15.20.8655.025; Sun, 20 Apr 2025 12:20:39 +0000 From: Alexandre Courbot Date: Sun, 20 Apr 2025 21:19:46 +0900 Subject: [PATCH 14/16] gpu: nova-core: compute layout of the FRTS region Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-nova-frts-v1-14-ecd1cca23963@nvidia.com> References: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> In-Reply-To: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: John Hubbard , Ben Skeggs , Joel Fernandes , Timur Tabi , Alistair Popple , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alexandre Courbot X-Mailer: b4 0.14.2 X-ClientProxiedBy: OS0P286CA0127.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:16a::11) To CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) 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: CH2PR12MB3990:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: 6f4189c9-aa0b-4a77-3286-08dd8005c2f0 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|10070799003|1800799024|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?NTFQZnpGeE1hTnBRSVNMNmxEUERmeU5VV0o4dGNkbDlOWFZJQlUzZ0g5ZzhF?= =?utf-8?B?bzZtZXpwTGtMSFlaZTBmNkhJbUEzQm1lZ1VPU3hOcXlGeFlJa093QXVPb1VY?= =?utf-8?B?UTYzZ3dxZjRnZFVtVVFFTUVLNnRmT3BSdUVLaWJ4V0hDVUY3UkV0TjVuRTZT?= =?utf-8?B?clR5SlZNYUR3V0V4N1Y1M0FwUWFyQmZ6N21wNllZV0ZqcXpSV1h2YXJzUUpN?= =?utf-8?B?VHJKRG5lbkJvNFJ0NGNOaGh3UmpsVVpsUE54QlVheG4vNklBc05mWDhObHNE?= =?utf-8?B?N0QzM0EyRVJlK3NwMHhjbzBaZTFRVUxxcWtpQ1ZvdVZ0d3FDUHVzRXduMmVH?= =?utf-8?B?d2wvdlJPMGhVZnRpMU9kS2xZak90V0N1bU1zdWJleFRqdjVkZmxQZDcvd3Jw?= =?utf-8?B?Umx4KzVOYkV6b2ZpUjQrOHNNU01hd0pVMmY0UWMwYmRLVlNxWVJvVkZjV1kz?= =?utf-8?B?UjFmYnFQMjhiMXNkcDZaSStSMFh6RHBGMkNiNjkxT3dReGpXUjVuR3Mrem02?= =?utf-8?B?bTlFNFhBOFlOUHMxS3hwU2pLaUhVU2MrSzVQa3U2aE9OMWl5NERMZ09LTUpW?= =?utf-8?B?akd3UTZJbFRRT2p4SjJ3QytEcnpuV0t4Nit5QTR6NGlVTFRwaXFvQnJxcjc3?= =?utf-8?B?ZmpjbG1NZmNsb1d2RUczd25TMkdiakd6YzZTaGxzaDlEU0RBeFhYTHU3b1Z6?= =?utf-8?B?KzJscWw2WjRuVEJZQk1RVytZMmc4TTRXMFBHTTR0MlVScU1LS0grSFh4KytY?= =?utf-8?B?Zy9KaWpoejE4VmpLajB2dVQrWnErNTB3bDByaXZBN1NYZjlFb09KZ0o0K2Vr?= =?utf-8?B?NWpEVUc4V2o5ZzNmM1p3eTlSQkM1cUh1amw2eTdyUjNuV0lwMWhtVzJIYWVK?= =?utf-8?B?amZRWXQ2c3lnblhoVW55WFFLaVE3VXRGSFFsNHpFam4yNURzK3lJMnpxN1lo?= =?utf-8?B?YVhTbDh0dm00czFkUjVHWS85bEgrVSt0Mi8yUzNvcm5nbHVrZjVMQmZNMlBo?= =?utf-8?B?MnQ1UFpyaDBXMXhGQ3VWRTA0Z0czRWNrSGFZMmNsTzRueFNCT3ByQ3d5VTh3?= =?utf-8?B?YmVrN1lSbGpxK3NLVG9oYTFZa2FoY2ZCeXVDdXcrM0tXSmdaR2xXelRzUGMw?= =?utf-8?B?Q24zVGpFRERLakF4OHp6Ny96NDNWdlVwQW5jNCs1RVZJZjFHSm9FS0xuYnZD?= =?utf-8?B?dmc1dzFSOW0yOGpMK3BqYmpiMlZ5Ky9DOE1pUnUzQjdhNnBwQk12UXpuS0Qw?= =?utf-8?B?bmlQemUrYW5MREZ6cHhKakdkQW5DSFFXYmFqdkZUdld6ajBYL1FjeUdnMURW?= =?utf-8?B?L3FBQXNabGhlMHVTN2gvbzI5TW10TCt1azFUSFduTmljcVA3Y2RKNkw2RGRN?= =?utf-8?B?eWxEUDJOZkE5SzFUN1BBenpNeVorWnFYVFQvaGlNWmdtZm9HUFM3UUFua2NY?= =?utf-8?B?d2hubnVTRFY0cUwrQnh5R3Z1QkhoT2FQZ01zSXVGNnh2MDJJV2UvcHVKY0x0?= =?utf-8?B?TWhFWkRYWmVZclBoY2w3WjF0YmZQRnlOT3dDVzAwQVQwVFBhYTQwQXcvSmo2?= =?utf-8?B?T1BhMUZQRS92blYzOXFnZ1FNWDhhMjEwY0RmSkdCRXg1MlV6MC9HTUVkT2Rm?= =?utf-8?B?MkJZSlZtSGRRSnNGbzFLNlp4aFA3dUJqM1dibUZsN3BOOU1uRlJSa0RZaUE0?= =?utf-8?B?NFh4b3dDTHYwL1ZPaXN1Q2c2cHZ3MGxEV2NLcmNBdGpCMGVJZWlMMnNKKzNC?= =?utf-8?B?OE5pZi9Ec2xtVCsrWTNSdG1hTVdQWDRqdXJ2czlTR285cHgxY1dOZnB1V2k5?= =?utf-8?B?cThkL3Q0MzR3UWxENmNOSjhJOFZTVThzZHN5dW5rd2JvN2s1Q1ZLbHlHTjFs?= =?utf-8?B?V3NFcWxlNVBDejdBejg1cHI1TVIxZTBMRUdNYVdMa0ZwdWhWdUMxaEJseHVY?= =?utf-8?B?TmhUNmpqQ2FXbkZHQ2xYamRzQk14cEU4Z0VXTkxJZUxETnhLeW1lbGxJM0Ja?= =?utf-8?B?TTh6UVVTeWtBPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB3990.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(10070799003)(1800799024)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?eVlLaG40UzlHS2lkbk9kRTFmWTJMRjVac2w5aHpUQzZST3Bid0g4Vmo2eFMy?= =?utf-8?B?Ry9Hc1d0R0h6amQ1aFJPR0QwUzRtQUhPNEVTU2NGWEVvdURqSnhWNkpOOUFM?= =?utf-8?B?cmZFK1VTUjdMUU9oYVdYbnRCMWd4SkJWREt2QzlQUHNudVMzSmtnNUpHRkZx?= =?utf-8?B?Y0w2OXlkK1FoalpNa1R5Z083SFRWZkV1SzJ6dTlxOUhMdjNVTXN6NFBSbGtH?= =?utf-8?B?UnBLR3YwcWpOZzRveXgwSkVvbE5WdlBtSUo4YzFkdXlqbmRJVGg1blVQaWhW?= =?utf-8?B?OHBIWFhXQ2hNVWtDL3ltWlN3SGFZSkNYYTZ0aVlUN1Vlcnc2dUpLNjltc3Rn?= =?utf-8?B?Z1BrZWEraGUrZnFLWFVSRFZIUHpzK2trTk1mbjBYMnEvS255VkRXdWdMSW5l?= =?utf-8?B?a2JYWnhoY2hCRjF2MStkS0ZhaHJQR3FQUEk2SFUzdTllU3R4ZUkzSGZkUSt3?= =?utf-8?B?N0NhL2V2bHRoMnhXdWVTZzBIckpaYlBJaXV1QWwvN1RPZWRHdjBCUS8rcEpJ?= =?utf-8?B?Rjl1MVI1S25UWjNHZWlHUk5FU1BLVzFnNzVOUjlwK2NzTFFqdS9ZcXhvWHRH?= =?utf-8?B?c2VNNUNFbTlncXJHbHlDazBMcll2c0JzLzdTOFBweFlPU2ZiK2JzNUJnOWxr?= =?utf-8?B?Zks5T2JWekI5OHA2MVZBL2dodDFBVzEyaUtZVndIMEFSWTRhRnFSWWgybkIr?= =?utf-8?B?Y1laMVJtUEM4RGpITkFLL2JZaDV5TXpYZkhEcUF5aUVBT3czNEJ3Y00yS0h0?= =?utf-8?B?Ri96UFY3cFdMWkV3U3FTRm1GcExTUXp4Y2tsL2JDRnN4aGlod2t4K3ZnZDlV?= =?utf-8?B?VWdTQnl0MmlLczlzbnM2UUVDQ2MyYzVHandvUHpaeWJhMHBnYlp1dTBrc2xy?= =?utf-8?B?VkFXM2tMVDVjYWkwT2MwLzJubXkyMEpRK2Vjd3Q4OTNCa1BDRmdLTE56eXFu?= =?utf-8?B?d1dINjlhTzM2ajdIS09YLytMUndVSS84MGNSdU9iZDUvN0wvTjVCZWhHdDNn?= =?utf-8?B?Z1FWUU40Rm9OYzlwWHdwMkhaSFZ3N20yNDZWZFk0OFAraGhjbDN3WU84bVls?= =?utf-8?B?K1h5UGRlTUhyQ2lQUDdYelhHbHg3c0tjYUJLdTZ0dGo2N1dhMGJKTTBEYzBV?= =?utf-8?B?SDJXdWpFQkY1SkI0azc4b0FxcnI2aHdxL29XQnNzcGdpMjNlZVpEcUN3elFw?= =?utf-8?B?dWxvcUZYTkpBcGZUb3VZaWVsbzhUVHYyektQdkI2U09MSUp0cnlNaWVpWGRj?= =?utf-8?B?Wk11MFlUcnpMWjJ0T2ZzSW4yc0QzZzhnQzVRNm1QanRDQmUxVmZQS091ZTV0?= =?utf-8?B?dzdVNDBmQWJwODkwRmhOWDQ2K25yS3JISWJoVGZkakhNQmlock1FWllMYzRh?= =?utf-8?B?ZHBGTlh4MzJOWlUyRUk3UUZMSEF0Z0NTR1lJU3d1K0s3d3kwNjBGL2hkR1RZ?= =?utf-8?B?Q0xKZ1A1Z1dFYXRvRjZrV1dGZ2ppZk84N0NmVEZVRnZ1TjFUbm9OV2lDNnRv?= =?utf-8?B?RjlVZzM3K2RHdUpMdFpMOEg1cC91WWNFRklSdGZRZFp1ZG4xZTNUTVlYZW1L?= =?utf-8?B?ck44VXFyT3RiNUg5MTV5QTNqWmdNdzBXK1I2WlFVZGtTeGdpbW9nOFVnL01k?= =?utf-8?B?Um5vVXRpVFJQc0IxOTVDK241dW1ydXV4em5GYVU0aEZWQ1M0MHpxbEdWVWlO?= =?utf-8?B?N2J0aEZpVngzWWE5Q3g0aC9UY2FlR0E0YkZqcjhjeVFZaFc2YzZORk1TVTZ6?= =?utf-8?B?RmRVNUVnb243WXcxeG0yOXNXNnU4bFNWWlVVbHo1RHVCMGt2Sk9yTTl4ZFNE?= =?utf-8?B?eDFZRWlsQUxBRThiS05OSU5jS2lTaWRnbDJuSTY1S20wT25paWJaYWplSW80?= =?utf-8?B?RHBRenJLVEx3YmNKNk4vV1B3Q0RrTTJQSW9Tbnh4Q3UyQmNtOXNKOEYwMERo?= =?utf-8?B?a0hYNy82VEQ5cmUrdTEzV2pvbGRpaXBreTNLa3Rwa3BZUURrYW5KUHk0bTQ2?= =?utf-8?B?bDVYWG80Skp3dmZqUElrSVFYcnFvZXJSWFdCUFRSY0E3SWlVVmNHdmtZQ3BU?= =?utf-8?B?dTkxVzJ6SEwwaGtIZklHWEFtYWZxc0wxeFBTV3l5VVlXUU5Ea2U3bi9XU1pt?= =?utf-8?B?NVJ5K1lXalJvRnFjNVNqT3pvVGphc0VTK1k5QVB1cHhPa1hkMmhOSnd2dk8y?= =?utf-8?Q?IyhwdIHLF9I0LCyYJ0KjocZoRXirAK1SPxsmrkFf0LG6?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6f4189c9-aa0b-4a77-3286-08dd8005c2f0 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 12:20:39.1353 (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: +v84duASxeygktywGSL4N7TtNT3GhyOVrEagkxpl01Rse3SFn5AwXXBGOQhyAEkWgbV8yYopHFykVecYY8q6FQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 FWSEC-FRTS is run with the desired address of the FRTS region as parameter, which we need to compute depending on some hardware parameters. Do this in a `FbLayout` structure, that will be later extended to describe more memory regions used to boot the GSP. Signed-off-by: Alexandre Courbot --- drivers/gpu/nova-core/gpu.rs | 4 ++ drivers/gpu/nova-core/gsp.rs | 3 + drivers/gpu/nova-core/gsp/fb.rs | 109 +++++++++++++++++++++++++++++++++= ++++ drivers/gpu/nova-core/nova_core.rs | 1 + drivers/gpu/nova-core/regs.rs | 27 +++++++++ 5 files changed, 144 insertions(+) diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index 2344dfc69fe4246644437d70572680a4450b5bd7..b43d1fc6bba15ffd76d564eccdb= 9e2afe239a3a4 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -8,6 +8,7 @@ use crate::falcon::gsp::GspFalcon; use crate::falcon::sec2::Sec2Falcon; use crate::firmware::Firmware; +use crate::gsp::fb::FbLayout; use crate::regs; use crate::timer::Timer; use crate::util; @@ -241,6 +242,9 @@ pub(crate) fn new( =20 let bios =3D Vbios::probe(&bar)?; =20 + let fb_layout =3D FbLayout::new(spec.chipset, &bar)?; + dev_dbg!(pdev.as_ref(), "{:#x?}\n", fb_layout); + Ok(pin_init!(Self { spec, bar, diff --git a/drivers/gpu/nova-core/gsp.rs b/drivers/gpu/nova-core/gsp.rs new file mode 100644 index 0000000000000000000000000000000000000000..27616a9d2b7069b18661fc97811= fa1cac285b8f8 --- /dev/null +++ b/drivers/gpu/nova-core/gsp.rs @@ -0,0 +1,3 @@ +// SPDX-License-Identifier: GPL-2.0 + +pub(crate) mod fb; diff --git a/drivers/gpu/nova-core/gsp/fb.rs b/drivers/gpu/nova-core/gsp/fb= .rs new file mode 100644 index 0000000000000000000000000000000000000000..63f41dfa184c434aa4eb7d4cb1f= 5f1e6f0552563 --- /dev/null +++ b/drivers/gpu/nova-core/gsp/fb.rs @@ -0,0 +1,109 @@ +// SPDX-License-Identifier: GPL-2.0 + +use core::ops::Range; + +use kernel::devres::Devres; +use kernel::prelude::*; + +use crate::driver::Bar0; +use crate::gpu::Chipset; +use crate::regs; + +fn align_down(value: u64, align: u64) -> u64 { + value & !(align - 1) +} + +/// Layout of the GPU framebuffer memory. +/// +/// Contains ranges of GPU memory reserved for a given purpose during the = GSP bootup process. +#[derive(Debug)] +#[allow(dead_code)] +pub(crate) struct FbLayout { + pub fb: Range, + + pub vga_workspace: Range, + pub bios: Range, + + pub frts: Range, +} + +impl FbLayout { + pub(crate) fn new(chipset: Chipset, bar: &Devres) -> Result { + let fb =3D { + let fb_size =3D with_bar!(bar, |b| vidmem_size(b, chipset))?; + + 0..fb_size + }; + let fb_len =3D fb.end - fb.start; + + let vga_workspace =3D { + let vga_base =3D with_bar!(bar, |b| vga_workspace_addr(&b, fb_= len, chipset,))?; + + vga_base..fb.end + }; + + let bios =3D vga_workspace.clone(); + + let frts =3D { + const FRTS_DOWN_ALIGN: u64 =3D 0x20000; + const FRTS_SIZE: u64 =3D 0x100000; + let frts_base =3D align_down(vga_workspace.start, FRTS_DOWN_AL= IGN) - FRTS_SIZE; + + frts_base..frts_base + FRTS_SIZE + }; + + Ok(Self { + fb, + vga_workspace, + bios, + frts, + }) + } +} + +/// Returns `true` if the display is disabled. +fn display_disabled(bar: &Bar0, chipset: Chipset) -> bool { + if chipset >=3D Chipset::GA100 { + regs::FuseStatusOptDisplayAmpere::read(bar).display_disabled() + } else { + regs::FuseStatusOptDisplayMaxwell::read(bar).display_disabled() + } +} + +/// Returns the video memory size in bytes. +fn vidmem_size(bar: &Bar0, chipset: Chipset) -> u64 { + if chipset >=3D Chipset::GA102 { + (regs::Pgc6AonSecureScratchGroup42::read(bar).value() as u64) << 20 + } else { + let local_mem_range =3D regs::PfbPriMmuLocalMemoryRange::read(bar); + let size =3D + (local_mem_range.lower_mag() as u64) << ((local_mem_range.lowe= r_scale() as u64) + 20); + + if local_mem_range.ecc_mode_enabled() { + size / 16 * 15 + } else { + size + } + } +} + +/// Returns the vga workspace address. +fn vga_workspace_addr(bar: &Bar0, fb_size: u64, chipset: Chipset) -> u64 { + let base =3D fb_size - 0x100000; + let vga_workspace_base =3D if display_disabled(bar, chipset) { + regs::PdispVgaWorkspaceBase::read(bar) + } else { + return base; + }; + + if !vga_workspace_base.status_valid() { + return base; + } + + let addr =3D (vga_workspace_base.addr() as u64) << 16; + if addr < base { + fb_size - 0x20000 + } else { + addr + } +} diff --git a/drivers/gpu/nova-core/nova_core.rs b/drivers/gpu/nova-core/nov= a_core.rs index 2858f4a0dc35eb9d6547d5cbd81de44c8fc47bae..b78a71dea6e10707dc594fdc070= b71dbb663e505 100644 --- a/drivers/gpu/nova-core/nova_core.rs +++ b/drivers/gpu/nova-core/nova_core.rs @@ -26,6 +26,7 @@ macro_rules! with_bar { mod falcon; mod firmware; mod gpu; +mod gsp; mod regs; mod timer; mod util; diff --git a/drivers/gpu/nova-core/regs.rs b/drivers/gpu/nova-core/regs.rs index c76a16dc8e7267a4eb54cb71e1cca6fb9e00188f..3954542fdd77debd8f96d111ddd= 231d72dbf5b5a 100644 --- a/drivers/gpu/nova-core/regs.rs +++ b/drivers/gpu/nova-core/regs.rs @@ -38,6 +38,12 @@ 23:0 adr_63_40 =3D> as u32 ); =20 +register!(PfbPriMmuLocalMemoryRange@0x00100ce0; + 3:0 lower_scale =3D> as u8; + 9:4 lower_mag =3D> as u8; + 30:30 ecc_mode_enabled =3D> as_bit bool; +); + /* GC6 */ =20 register!(Pgc6AonSecureScratchGroup05PrivLevelMask@0x00118128; @@ -49,6 +55,27 @@ 31:0 value =3D> as u32 ); =20 +register!(Pgc6AonSecureScratchGroup42@0x001183a4; + 31:0 value =3D> as u32 +); + +/* PDISP */ + +register!(PdispVgaWorkspaceBase@0x00625f04; + 3:3 status_valid =3D> as_bit bool; + 31:8 addr =3D> as u32; +); + +/* FUSE */ + +register!(FuseStatusOptDisplayMaxwell@0x00021c04; + 0:0 display_disabled =3D> as_bit bool; +); + +register!(FuseStatusOptDisplayAmpere@0x00820c04; + 0:0 display_disabled =3D> as_bit bool; +); + /* PFALCON */ =20 register!(FalconIrqsclr@+0x00000004; --=20 2.49.0 From nobody Mon Feb 9 07:22:46 2026 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2043.outbound.protection.outlook.com [40.107.244.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 DAAE220766D; Sun, 20 Apr 2025 12:20:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.244.43 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151652; cv=fail; b=ovUTcuRdC4sLuBYTUF51Mf8enqIQ8H1XYf0ZJ8rsltxjxETeW7xs/xQ0ZsB4Hy2CNW9/8iWkW8J921SWQ9UPyDTP2+WHjbEGuxlWLRq4ex9Rg7bO3D+4WWnI/4YMDWYcAGohQ20w9JinYaQVXzx7zmDLoHSKb6r1wQk76KQkVk0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151652; c=relaxed/simple; bh=xh8pWOqNP5xRV5Ym0878CpLtm333GrOghh4yJYrHCpA=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=Ud/gGFeDCSY4erlqEDav/vPUgQJe9RF6EL6az9etL0tOiPr3GHCJ3ynOaWCCCUaY4q/LmcImAShDGIDsr9L6gViOvz34uQkYllQKXQiz/e1hFrntdTT6MH5YwKvp5Y/O10GtqZdR+HM0nAmeqhlfXJkhOPX1NyKVJcnenabARWI= 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=ZN5nFo5/; arc=fail smtp.client-ip=40.107.244.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="ZN5nFo5/" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=kSoB4StNdYj386GKxEmLQ8f7g2JPLpgxrmua/XvKT6kYqwkWSwZjLhZS9IQ+nSZ8SYGszAN3RukBWE9BHfSVFnRAOy39pS1Bnpi0BTFO6uNqS2EDoKiHrrXqTPSy/qa49V90o0Xf/HK0exB8yKHFD4MRhMedNsNApGSbS0fNjhmbhGNB1X6bT94PjfGjJo733zFhh93yUoEIfGLn8ewhJJg/NwVUhDLeQLdz69jeKHlm8gDr8NK0r/GAY1SzkRSy2DsKnMqIi7/mXmt8cgWnW/7dMXZp4CSM7zZ0Nt9DLcGkHtGsZqwj86T9hZMGY+5rXxcAG+Ae+cUG+HCf6j2PIQ== 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=hN88YFcCx31BSE/TsxSIP/6L65x6qlW15t23yO2gZ1k=; b=kZ2mHjdaEsRgLPzj2Jc+dpwwQ5rVcmvHVmCn2bOA7iezXaYCcVzISjtdHrFp5CJFVZPGW9NBUbur9ax+vzt4Al9qGa4ce+Ya0gDbOAKgZH5vYhBvNG23RoLcwLzxawkWBACFu2FDV9O38NNk52h5kRH2uNyX9VYKm/FCiR24I0v4Drpr5VNHh2T2PwTeI2TFMxg/4jiWj9lIG58P+9dcjUIVKaV39zNA/vfiOkzTtDDyjKToE7u01lH8dwR0G0GKDNY6dNKzI87e5mwsNs7kAl+/nlckXmPGzxLe/q9i+Vj3M2urzFUTtedS7AqbYLrvsRfKc4UaqmwiIMqTvgjS+g== 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=hN88YFcCx31BSE/TsxSIP/6L65x6qlW15t23yO2gZ1k=; b=ZN5nFo5/BY9XVmykvr/KJ5zTGZu41I+WEeSTQME8boKZOnPZufdc9M6STz16qb091Retd9uKekujOkjhvu3Coe/BALp/qlZOxKfepcXClGob1nfEqLzh+3csDQdX0Mc/367QiCIhGuw5TEFl45+v7sAL+zMbzcUEykpGIXIh3OEpvrcN0GhreFNU2IjLS2TH6cep/emDSz6wIoKMYVDWRsF8+3+MFKazqrXwsAoXenHBzk/WyqMgBS/xIu5s3loqNM8MtmPqMOiTi7fqY1EbqCpVgkG8LTQnPc9opsXOmXXtuq1TQbzewyhoKEiBJ8tDBgPJ7hEsOdoVrf6by/NXKA== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr 2025 12:20:43 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99%4]) with mapi id 15.20.8655.025; Sun, 20 Apr 2025 12:20:43 +0000 From: Alexandre Courbot Date: Sun, 20 Apr 2025 21:19:47 +0900 Subject: [PATCH 15/16] gpu: nova-core: extract FWSEC from BIOS and patch it to run FWSEC-FRTS Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-nova-frts-v1-15-ecd1cca23963@nvidia.com> References: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> In-Reply-To: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: John Hubbard , Ben Skeggs , Joel Fernandes , Timur Tabi , Alistair Popple , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alexandre Courbot X-Mailer: b4 0.14.2 X-ClientProxiedBy: OS3P286CA0088.JPNP286.PROD.OUTLOOK.COM (2603:1096:604:1f6::19) To CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) 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: CH2PR12MB3990:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: 4e86d1d3-beba-4281-1d69-08dd8005c52b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|10070799003|1800799024|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?M3Z0N0RwcnBrZ1RCK0VWZjQ1SUVJbi9UV3h2aGpMSnVqOXVQcmJQRGU3V3ZQ?= =?utf-8?B?MGN5T1RmUkl0dUMvWXptL3ZrVk1DNzA2aVEycnk3M3NNL2p1YTR6aVZuaXhi?= =?utf-8?B?R1JTZkJNZFVvUmdzSUxRT3duTis3M2trQ2pMV200elRrNDJ4Vko4ZmZHUEt3?= =?utf-8?B?akFCQ29IaGduNFhOL0RnM3VhNGFZMjlYZTNrOFo1dTRpTWZ4dWJnU0dPUHRQ?= =?utf-8?B?WFd6VmY2Vy90Mmxpa1JKWllmQXRoVmxhbmhHUHpmMEV0ZW5PNnZHTEIxbmdE?= =?utf-8?B?ZzN2bWxRVHhuLzBwRmhiUVlnZ3pYNFpLRzRHZVU4UzNCaFdQYWNReXd6L21K?= =?utf-8?B?Ym4xMHUwSEdLYklmeDVJcU5zc1hUYmlFZ2hORHNyYVgxMmRHckt2dnFoaXRU?= =?utf-8?B?QjZyU1g5TTg2UVczOVJ0c3IreWJuMi90Nm9WV1lOWVljcHFqUmcveUgzd29G?= =?utf-8?B?dG5GTmRCMTh0V29idzVuUXFFbzZWNXZJSmwxTDk1MFlRVEswQmg0RmtNdVc2?= =?utf-8?B?aXJDZG5aWjNDYm45WFFWczlzMHM1YmJrTm5yc21QQTY4d3lBZFR3Tk40TVAv?= =?utf-8?B?K3R1Sm1UYzFJQ0hjWWdiQjdzam9KU00rRDY4ZWRsTXFFbjArcTZHWjZ3UDBV?= =?utf-8?B?MkJVdEpDQVhvaXcrQ1pmRjlkNFJvNGxDanpVeFIxdjYzZGl0QXNIblJqbXY4?= =?utf-8?B?NXFQbmFzK3RuS0k3SFFVSFh6UUhDa1lENEhjcmpPZFdqQUJQeG1tbjVrVmUz?= =?utf-8?B?Q2JzZHJ3aUE4eGc0dXUxd0pxcmkyMmRweDlhVnFSK2Z3T3ZzV21TSkhxVS9B?= =?utf-8?B?cW5kZjBTK2dIemdCejlzM0dzNGd6alhsdXRaVHRCNXplVE9SODVOZjJGL215?= =?utf-8?B?TVlvRGNnVk82L0dhbElvL2pxQWxoUHpGS05oSlFkNk5VTE9zUUpzZlVjNU4x?= =?utf-8?B?UlA2QzhjeGxGWDZCUklldkVDZ3IrSDZRRWljYzZ0UVdyM0k3cm5Qb2RBOXZI?= =?utf-8?B?cTA0QjB5ZnNsb2RObUtBTDZ6SVF6OHdubmRzTWovQXk1Q2ovdm1OZ0hYYWJu?= =?utf-8?B?akxNZ3Y2MTA5Tys1Yk9KbUc4S3JWbW9nZWJ5NGtvTFdzYzVubjNDNTFuMldT?= =?utf-8?B?UE5KT0cxOVRQMEJiU0RXTnJMZlRaQmVQQUUrMjRTWGJjcDFvYjUrMzZPbjJE?= =?utf-8?B?TjFVL3dNY01abWNVajhyWCtXSG1Ta0pIVnVmRGhteWZ2ZTRtZkV2cWNzaG81?= =?utf-8?B?Z202cmhScFVRY2dYeDRhNjNQbG5PTUp6dU51Mjc5MndSMXAyUm5PZkRFcjRx?= =?utf-8?B?WEgzcktPUVJsSWRrUjVmaVlGcDFlWllZMEdmNXVWalZRRE9ZUDNXMTY0T1ky?= =?utf-8?B?T3BJUUpwMEhocGM2bHdpd3F3UEE5UkNQb001d3lhOVQ2K3dpZW1kdDA3MUZU?= =?utf-8?B?MWxlOGxwMjVrSE0yeFAxM2ZlOTlIMm01Y0t2WXNLcDcranlrdWhNekFHK1dG?= =?utf-8?B?NWxydVFmNCtSbEFOemRYV25uNHE5SUZubVNGaU8yUWhHOHlFZWg2SkNYak05?= =?utf-8?B?eStvbU42Z2RSRDI0bWNkdHM1cTVocjl1VGZQWUJ6MUx4ckdBaHV1WWlpZlUx?= =?utf-8?B?bldTazRrZHBpeWQ0c0hKWmhaQ21aRmpHYWVyaDNUT3d2ZnMrRFJMM1RNQ1No?= =?utf-8?B?Rmw5TlpIZFRadi9lbk1BSGJTU3ZxK3l4ZXlrUlFLTTI1YzR1SCtWK3NIVGtB?= =?utf-8?B?MXphblBUS3NWUWpNRDEyTlRvakJqVlFuSEtPRzZtdnRTdU1Yb0FibkJNcWxp?= =?utf-8?B?Y3VRY2VBUHZiWnhESFB5SHBMRXJ4OUlqblFVbEZ4TSthRE1pVktPZU1kc041?= =?utf-8?B?OUFVMWM4YjdLUTZrYzFQYnY1NjVXQnhyeFpxUTJVY2l3Qm9CMXlzN2ppV2RV?= =?utf-8?B?Vzh4cnBLNDdWdDNrQVhQdnhrT0laSXNBWG1yZC9vMUNqbXM0elhxTXlKcDdL?= =?utf-8?B?L250UVNWM1d3PT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB3990.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(10070799003)(1800799024)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YjJLLzJwY29UblV0TGVrU3lRVGY1ZldJc3QrSGQ5RGtCWnY2R3pSclVDQktz?= =?utf-8?B?YUNTTlNoYlpTemlFeTZWam1BOWpJYThzZmk4a3FsMTdBbVozSnpKdks3MWdK?= =?utf-8?B?cEVHN3Q2bGdNb3dud2FBb1cxQjZKazJ5Y3RhZUV1WURkM01IeXNORGtFaTZ6?= =?utf-8?B?OG9WVTFyRGZ2VzhtYUlVbjFWMXMzN2xTUTY5OUZOcm5LeDNqa1IzcEQ2R0FS?= =?utf-8?B?UWpSVmtESGdtOHNHOFU1bm41YXRWaHk0dlRTZWRlTXhvb3UyM2pkVCtseGc1?= =?utf-8?B?UmJqbXBTNks5bU41bWlkWWFRdVVFdGlHb09NQXQvNEFHSzJsTUNGOHpRWXZ4?= =?utf-8?B?MmwwNDFqNmdUMGU3dFZlMURGQlBlY0ZQUncxR2tuaGVoRENTV0pKQzltWXNx?= =?utf-8?B?dERPYjhDcnNDdnRwNWZHdzdHWC85UXRDd0dIcE1IeVZVQUo2Y2dLSGRWQnpr?= =?utf-8?B?YmZuTmR2NFNCQTQ2N3RKRXVBQmJpbEtoR1pleXdhSDI3Ui9GSkVqT3Q1bHFm?= =?utf-8?B?Z081am9aNmgyaElCcTBNVjlGQXhFNHNyYVBydEkwRkN5NTlXK0ZwNVF3N2ty?= =?utf-8?B?WkIwZTErR01pVm5uUFlSNko4VHU4NmYzdTg0MzUwV2NJblRTVnBkY1hsa2sx?= =?utf-8?B?Vk00cEJSd1I3czNMNXZkZkNvUnZqTjB1RnkxUXlhYmNhUTVyOXY3ZmtreEtm?= =?utf-8?B?QnlwZXdxQkU0dDNjOU10K0Z1V3JERmVJRGU0K3Bva0s1NFFmbmVLV1pDaUJm?= =?utf-8?B?bzdIdUdBMSsremNZOWlmeXN5aGZ5YXcrNXZFY20vbkZ0K2ZEYXR4QjMrd2px?= =?utf-8?B?TEs4azZ5dVVWT0RQdGRtZHRhaVB5OUpzZjZ2VTB6ckRhbDZuOEFWc0tCMFdD?= =?utf-8?B?cy9PRmY1ekpCYWw1WWtGSWhSQy9LTzA4MHF0eXhsZ2UxZExyUFd5R0l3OUVL?= =?utf-8?B?Y2FVNGVNSE9aYVBWM0FIQUpNU2pRN3JlQnFuSmxKbk5DSDJIU1cyMWJLOXUy?= =?utf-8?B?c0FzNWE4bEREWmR5RGVBWklaUmIydUQwbUJ1b3hYOG40Wm9PQnpTek1oY3dx?= =?utf-8?B?eXpPUllVK1I3MXh3cFRYZ1FudXJWbDhJQlh2UTBSenRFR0VOVTluYkpCT2tE?= =?utf-8?B?VkhWcnBjNjNka21OYTBNY1AyMjlnQ3EvTlQvMGl1NlNkS2JUNlQ2cXpiV1ZJ?= =?utf-8?B?VTE0TklYeXRhclJDUk9KMTc2L2xobkVYbWpITERxN1VmMm1xcmcrcGUzbTdR?= =?utf-8?B?T2hCTTZZVkZ6NmFIT2F0cno1Y1JjU0N1UXp3VFVlb2ZuZFlyaXAzNlg5aFI2?= =?utf-8?B?d2FBUHJVYU5SbG1qbHVmQ3Z2SVExUjNBQ0VHdGpCeWJiSDdkdElvRzlCeC9G?= =?utf-8?B?SU5LQ24vcVhUa2w5K2x6MURHU2R0N09xM3BSN3lQSjBNdmRFZzIwL0J5Ukpy?= =?utf-8?B?NHM0a2J1RSs1ZTVpaDRRdHlhTWFjNFdFRFFaVkRUL3ljVmZTWlJuR3EyNlRZ?= =?utf-8?B?K05wN0N1S2VmcjRrbzNkZGJ5QmlqUUZEc0w5aURCZ21LOWR5OVNsc2xsREVu?= =?utf-8?B?aitOb1pLL1JqRjZFMWRCNlc0bisxRStTekRpZmxrVHVIUGZNdWdnV2M5dENl?= =?utf-8?B?SE1zZWFsQ2FHU2t0ZHlDWW5ucXVrZE41eEF3S3dlbXlvZkNTSXFQcjRXc29N?= =?utf-8?B?QzR4OU9NaW9acU9oR2UyV0xiYjQvK1Z5NHZ2TGdaMWZhOTF4cUIyRkloYjEz?= =?utf-8?B?eDdidkJPMExGazFJMG1vdXJiemNXRlZENktpVitjZndOYU5CZCt3ZmxHZjl0?= =?utf-8?B?SG81blpKblBYanZEOS9yUForZ3FMcU5iZ1NLL2NQeTMwWXZsQnZhc2EvMzlx?= =?utf-8?B?S0E4RXdBN2IvUVl3UDlCc1YzaFpCSFFIOEx6MEtNY1IyVExyT2pFYWFnRkI0?= =?utf-8?B?TWVqWlM2RXRpbnk0aGlBa3piSmkrZWtjR3BXeDdkeWZlekVLcjF2TzRTQzI5?= =?utf-8?B?SjFlQWJlN1NnTUtvRmJvMm82Z0RtQTRMcU5VMEdzcDc4bXMrbFV5WXJiZ3U0?= =?utf-8?B?T0tDcGtVU2dNbVRyYm9xcXB1QjYvUjJ1alZmYXlSOWh6UWFGcW1scUpCUUdO?= =?utf-8?B?Skk4ZzUwZVd4OXBIVEhFZi9tMktNeXVha1BUOGJJcS9hMXpLanc5cWlZNE5B?= =?utf-8?Q?Cn8EItmasnt0aeHg8qimE3KsqoeaV529Jg0fXihjBwLs?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4e86d1d3-beba-4281-1d69-08dd8005c52b X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 12:20:43.0318 (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: ELx6rgJoeYia++3n/enmGms0MRtrNURBl5kmQZ7DvE1Q+cyty/uffUvD89cf2IDUadTc6FYAL1Gwl778ErIBog== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 The FWSEC firmware needs to be extracted from the VBIOS and patched with the desired command, as well as the right signature. Do this so we are ready to load and run this firmware into the GSP falcon and create the FRTS region. Signed-off-by: Alexandre Courbot --- drivers/gpu/nova-core/firmware.rs | 22 ++- drivers/gpu/nova-core/firmware/fwsec.rs | 340 ++++++++++++++++++++++++++++= ++++ drivers/gpu/nova-core/gpu.rs | 18 +- 3 files changed, 378 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/nova-core/firmware.rs b/drivers/gpu/nova-core/firm= ware.rs index 58c0513d49e9a0cef36917c8e2b25c414f6fc596..010763afdd74e92a4380d739a17= 319e05781007f 100644 --- a/drivers/gpu/nova-core/firmware.rs +++ b/drivers/gpu/nova-core/firmware.rs @@ -8,9 +8,14 @@ use kernel::prelude::*; use kernel::str::CString; =20 +use crate::dma::DmaObject; use crate::gpu; use crate::gpu::Chipset; =20 +pub(crate) mod fwsec; + +pub(crate) const FIRMWARE_VERSION: &'static str =3D "535.113.01"; + /// Structure encapsulating the firmware blobs required for the GPU to ope= rate. #[expect(dead_code)] pub(crate) struct Firmware { @@ -69,10 +74,25 @@ pub(crate) fn size(&self) -> usize { } } =20 +/// Patch the `ucode_dma` firmware at offset `sig_base_img` with `signatur= e`. +fn patch_signature(ucode_dma: &mut DmaObject, signature: &[u8], sig_base_i= mg: usize) -> Result<()> { + if sig_base_img + signature.len() > ucode_dma.len { + return Err(ERANGE); + } + + // SAFETY: we are the only user of this object, so there cannot be any= race. + let dst =3D unsafe { ucode_dma.dma.start_ptr_mut().offset(sig_base_img= as isize) }; + + // SAFETY: `signature` and `dst` are valid, properly aligned, and do n= ot overlap. + unsafe { core::ptr::copy_nonoverlapping(signature.as_ptr(), dst, signa= ture.len()) }; + + Ok(()) +} + pub(crate) struct ModInfoBuilder(firmware::ModInfoBuilder<= N>); =20 impl ModInfoBuilder { - const VERSION: &'static str =3D "535.113.01"; + const VERSION: &'static str =3D FIRMWARE_VERSION; =20 const fn make_entry_file(self, chipset: &str, fw: &str) -> Self { ModInfoBuilder( diff --git a/drivers/gpu/nova-core/firmware/fwsec.rs b/drivers/gpu/nova-cor= e/firmware/fwsec.rs new file mode 100644 index 0000000000000000000000000000000000000000..664319d1d31c9727bb830100641= c53b5d914be5a --- /dev/null +++ b/drivers/gpu/nova-core/firmware/fwsec.rs @@ -0,0 +1,340 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! FWSEC is a High Secure firmware that is extracted from the BIOS and pe= rforms the first step of +//! the GSP startup by creating the WPR2 memory region and copying critica= l areas of the VBIOS into +//! it after authenticating them, ensuring they haven't been tampered with= . It runs on the GSP +//! falcon. +//! +//! Before being run, it needs to be patched in two areas: +//! +//! - The command to be run, as this firmware can perform several tasks ; +//! - The ucode signature, so the GSP falcon can run FWSEC in HS mode. + +use core::alloc::Layout; + +use kernel::bindings; +use kernel::device::{self, Device}; +use kernel::devres::Devres; +use kernel::prelude::*; +use kernel::transmute::FromBytes; + +use crate::dma::DmaObject; +use crate::driver::Bar0; +use crate::falcon::gsp::Gsp; +use crate::falcon::{Falcon, FalconBromParams, FalconFirmware, FalconLoadTa= rget}; +use crate::firmware::FalconUCodeDescV3; +use crate::vbios::Vbios; + +const NVFW_FALCON_APPIF_ID_DMEMMAPPER: u32 =3D 0x4; + +#[repr(C)] +#[derive(Debug)] +struct FalconAppifHdrV1 { + ver: u8, + hdr: u8, + len: u8, + cnt: u8, +} +// SAFETY: any byte sequence is valid for this struct. +unsafe impl FromBytes for FalconAppifHdrV1 {} + +#[repr(C, packed)] +#[derive(Debug)] +struct FalconAppifV1 { + id: u32, + dmem_base: u32, +} +// SAFETY: any byte sequence is valid for this struct. +unsafe impl FromBytes for FalconAppifV1 {} + +#[derive(Debug)] +#[repr(C, packed)] +struct FalconAppifDmemmapperV3 { + signature: u32, + version: u16, + size: u16, + cmd_in_buffer_offset: u32, + cmd_in_buffer_size: u32, + cmd_out_buffer_offset: u32, + cmd_out_buffer_size: u32, + nvf_img_data_buffer_offset: u32, + nvf_img_data_buffer_size: u32, + printf_buffer_hdr: u32, + ucode_build_time_stamp: u32, + ucode_signature: u32, + init_cmd: u32, + ucode_feature: u32, + ucode_cmd_mask0: u32, + ucode_cmd_mask1: u32, + multi_tgt_tbl: u32, +} +// SAFETY: any byte sequence is valid for this struct. +unsafe impl FromBytes for FalconAppifDmemmapperV3 {} + +#[derive(Debug)] +#[repr(C, packed)] +struct ReadVbios { + ver: u32, + hdr: u32, + addr: u64, + size: u32, + flags: u32, +} +// SAFETY: any byte sequence is valid for this struct. +unsafe impl FromBytes for ReadVbios {} + +#[derive(Debug)] +#[repr(C, packed)] +struct FrtsRegion { + ver: u32, + hdr: u32, + addr: u32, + size: u32, + ftype: u32, +} +// SAFETY: any byte sequence is valid for this struct. +unsafe impl FromBytes for FrtsRegion {} + +const NVFW_FRTS_CMD_REGION_TYPE_FB: u32 =3D 2; + +#[repr(C, packed)] +struct FrtsCmd { + read_vbios: ReadVbios, + frts_region: FrtsRegion, +} +// SAFETY: any byte sequence is valid for this struct. +unsafe impl FromBytes for FrtsCmd {} + +const NVFW_FALCON_APPIF_DMEMMAPPER_CMD_FRTS: u32 =3D 0x15; +const NVFW_FALCON_APPIF_DMEMMAPPER_CMD_SB: u32 =3D 0x19; + +/// Command for the [`FwsecFirmware`] to execute. +pub(crate) enum FwsecCommand { + /// Asks [`FwsecFirmware`] to carve out the WPR2 area and place a veri= fied copy of the VBIOS + /// image into it. + Frts { frts_addr: u64, frts_size: u64 }, + /// Asks [`FwsecFirmware`] to load pre-OS apps on the PMU. + #[allow(dead_code)] + Sb, +} + +/// Reinterpret the area starting from `offset` in `fw` as an instance of = `T` (which must implement +/// [`FromBytes`]) and return a reference to it. +/// +/// # Safety +/// +/// Callers must ensure that the region of memory returned is not written = for as long as the +/// returned reference is alive. +unsafe fn transmute<'a, 'b, T: Sized + FromBytes>( + fw: &'a DmaObject, + offset: usize, +) -> Result<&'b T> { + if offset + core::mem::size_of::() > fw.len { + return Err(ERANGE); + } + if (fw.dma.start_ptr() as usize + offset) % core::mem::align_of::()= !=3D 0 { + return Err(EINVAL); + } + + // SAFETY: we have checked that the pointer is properly aligned that i= ts pointed memory is + // large enough the contains an instance of `T`, which implements `Fro= mBytes`. + Ok(unsafe { &*(fw.dma.start_ptr().offset(offset as isize) as *const T)= }) +} + +/// Reinterpret the area starting from `offset` in `fw` as a mutable insta= nce of `T` (which must +/// implement [`FromBytes`]) and return a reference to it. +/// +/// # Safety +/// +/// Callers must ensure that the region of memory returned is not read or = written for as long as +/// the returned reference is alive. +unsafe fn transmute_mut<'a, 'b, T: Sized + FromBytes>( + fw: &'a mut DmaObject, + offset: usize, +) -> Result<&'b mut T> { + if offset + core::mem::size_of::() > fw.len { + return Err(ERANGE); + } + if (fw.dma.start_ptr_mut() as usize + offset) % core::mem::align_of::<= T>() !=3D 0 { + return Err(EINVAL); + } + + // SAFETY: we have checked that the pointer is properly aligned that i= ts pointed memory is + // large enough the contains an instance of `T`, which implements `Fro= mBytes`. + Ok(unsafe { &mut *(fw.dma.start_ptr_mut().offset(offset as isize) as *= mut T) }) +} + +/// Patch the Fwsec firmware image in `fw` to run the command `cmd`. +fn patch_command(fw: &mut DmaObject, v3_desc: &FalconUCodeDescV3, cmd: Fws= ecCommand) -> Result<()> { + let hdr_offset =3D (v3_desc.imem_load_size + v3_desc.interface_offset)= as usize; + let hdr: &FalconAppifHdrV1 =3D unsafe { transmute(fw, hdr_offset) }?; + + if hdr.ver !=3D 1 { + return Err(EINVAL); + } + + // Find the DMEM mapper section in the firmware. + for i in 0..hdr.cnt as usize { + let app: &FalconAppifV1 =3D + unsafe { transmute(fw, hdr_offset + hdr.hdr as usize + i * hdr= .len as usize) }?; + + if app.id !=3D NVFW_FALCON_APPIF_ID_DMEMMAPPER { + continue; + } + + let dmem_mapper: &mut FalconAppifDmemmapperV3 =3D + unsafe { transmute_mut(fw, (v3_desc.imem_load_size + app.dmem_= base) as usize) }?; + + let frts_cmd: &mut FrtsCmd =3D unsafe { + transmute_mut( + fw, + (v3_desc.imem_load_size + dmem_mapper.cmd_in_buffer_offset= ) as usize, + ) + }?; + + frts_cmd.read_vbios =3D ReadVbios { + ver: 1, + hdr: core::mem::size_of::() as u32, + addr: 0, + size: 0, + flags: 2, + }; + + dmem_mapper.init_cmd =3D match cmd { + FwsecCommand::Frts { + frts_addr, + frts_size, + } =3D> { + frts_cmd.frts_region =3D FrtsRegion { + ver: 1, + hdr: core::mem::size_of::() as u32, + addr: (frts_addr >> 12) as u32, + size: (frts_size >> 12) as u32, + ftype: NVFW_FRTS_CMD_REGION_TYPE_FB, + }; + + NVFW_FALCON_APPIF_DMEMMAPPER_CMD_FRTS + } + FwsecCommand::Sb =3D> NVFW_FALCON_APPIF_DMEMMAPPER_CMD_SB, + }; + + // Return early as we found and patched the DMEMMAPPER region. + return Ok(()); + } + + Err(ENOTSUPP) +} + +/// Firmware extracted from the VBIOS and responsible for e.g. carving out= the WPR2 region as the +/// first step of the GSP bootflow. +pub(crate) struct FwsecFirmware { + desc: FalconUCodeDescV3, + ucode: DmaObject, +} + +impl FalconFirmware for FwsecFirmware { + type Target =3D Gsp; + + fn dma_handle(&self) -> bindings::dma_addr_t { + self.ucode.dma.dma_handle() + } + + fn imem_load(&self) -> FalconLoadTarget { + FalconLoadTarget { + src_start: 0, + dst_start: self.desc.imem_phys_base, + len: self.desc.imem_load_size, + } + } + + fn dmem_load(&self) -> FalconLoadTarget { + FalconLoadTarget { + src_start: self.desc.imem_load_size, + dst_start: self.desc.dmem_phys_base, + len: Layout::from_size_align(self.desc.dmem_load_size as usize= , 256) + // Cannot panic, as 256 is non-zero and a power of 2. + .unwrap() + .pad_to_align() + .size() as u32, + } + } + + fn brom_params(&self) -> FalconBromParams { + FalconBromParams { + pkc_data_offset: self.desc.pkc_data_offset, + engine_id_mask: self.desc.engine_id_mask, + ucode_id: self.desc.ucode_id, + } + } + + fn boot_addr(&self) -> u32 { + 0 + } +} + +impl FwsecFirmware { + /// Extract the Fwsec firmware from `bios` and patch it to run with th= e `cmd` command. + pub(crate) fn new( + falcon: &Falcon, + pdev: &Device, + bar: &Devres, + bios: &Vbios, + cmd: FwsecCommand, + ) -> Result { + let v3_desc =3D bios.fwsec_header()?; + let ucode =3D bios.fwsec_ucode()?; + + let mut ucode_dma =3D DmaObject::from_data(pdev, ucode, "fwsec-frt= s")?; + patch_command(&mut ucode_dma, v3_desc, cmd)?; + + const SIG_SIZE: usize =3D 96 * 4; + let signatures =3D bios.fwsec_sigs()?; + let sig_base_img =3D (v3_desc.imem_load_size + v3_desc.pkc_data_of= fset) as usize; + + if v3_desc.signature_count !=3D 0 { + // Patch signature. + let mut sig_fuse_version =3D v3_desc.signature_versions as u32; + pr_debug!("sig_fuse_version: {}\n", sig_fuse_version); + let reg_fuse_version =3D falcon.hal.get_signature_reg_fuse_ver= sion( + bar, + v3_desc.engine_id_mask, + v3_desc.ucode_id, + )?; + let idx =3D { + let mut reg_fuse_version =3D 1 << reg_fuse_version; + pr_debug!("reg_fuse_version: {:#x}\n", reg_fuse_version); + if (reg_fuse_version & sig_fuse_version) =3D=3D 0 { + pr_warn!( + "no matching signature: {:#x} {:#x}\n", + reg_fuse_version, + v3_desc.signature_versions + ); + return Err(EINVAL); + } + + let mut idx =3D 0; + while (reg_fuse_version & sig_fuse_version & 1) =3D=3D 0 { + idx +=3D sig_fuse_version & 1; + reg_fuse_version >>=3D 1; + sig_fuse_version >>=3D 1; + + if reg_fuse_version =3D=3D 0 || sig_fuse_version =3D= =3D 0 { + return Err(EINVAL); + } + } + + idx + }; + + pr_debug!("patching signature with idx {}\n", idx); + let signature_start =3D idx as usize * SIG_SIZE; + let signature =3D &signatures[signature_start..signature_start= + SIG_SIZE]; + super::patch_signature(&mut ucode_dma, signature, sig_base_img= )?; + } + + Ok(FwsecFirmware { + desc: v3_desc.clone(), + ucode: ucode_dma, + }) + } +} diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index b43d1fc6bba15ffd76d564eccdb9e2afe239a3a4..5d15a99f8d1eec3c2e1f6d119eb= 521361733c709 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -7,6 +7,7 @@ use crate::driver::Bar0; use crate::falcon::gsp::GspFalcon; use crate::falcon::sec2::Sec2Falcon; +use crate::firmware::fwsec::{FwsecCommand, FwsecFirmware}; use crate::firmware::Firmware; use crate::gsp::fb::FbLayout; use crate::regs; @@ -185,7 +186,11 @@ pub(crate) fn new( bar: Devres, ) -> Result> { let spec =3D Spec::new(&bar)?; - let fw =3D Firmware::new(pdev.as_ref(), spec.chipset, "535.113.01"= )?; + let fw =3D Firmware::new( + pdev.as_ref(), + spec.chipset, + crate::firmware::FIRMWARE_VERSION, + )?; =20 dev_info!( pdev.as_ref(), @@ -245,6 +250,17 @@ pub(crate) fn new( let fb_layout =3D FbLayout::new(spec.chipset, &bar)?; dev_dbg!(pdev.as_ref(), "{:#x?}\n", fb_layout); =20 + let _fwsec_frts =3D FwsecFirmware::new( + &gsp_falcon, + pdev.as_ref(), + &bar, + &bios, + FwsecCommand::Frts { + frts_addr: fb_layout.frts.start, + frts_size: fb_layout.frts.end - fb_layout.frts.start, + }, + )?; + Ok(pin_init!(Self { spec, bar, --=20 2.49.0 From nobody Mon Feb 9 07:22:46 2026 Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2085.outbound.protection.outlook.com [40.107.223.85]) (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 282CD20A5EE; Sun, 20 Apr 2025 12:20:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.107.223.85 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151655; cv=fail; b=U50Mf3dTgaJZReOQdZitdwCnRZav7hQxa04GMuJ7lELwLpguRVy3e1WD7lzWwbYrLynQktMI9UXwscO9RX7VPaYtApcFTXvNPmH5FrOU9Z83yyQ3BOZxjtqnq2aRFtZa95Pi9ul458GUp+IW5kLRbVMmK9CjPa82Kxo0YH76aGw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745151655; c=relaxed/simple; bh=Lwd4B5uff1KBPADMy/TK/nfqReqj4AeLRd1XwAmySRo=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=e6tbz6Apifxh63HpKlm9kQLhMj8D6nEiADEihOtCX7+Z8e8MwRMabtOV4zTMpLZqWQ03gDiDeAx8p/hrhUkC/AytaP8zr4ag4AFeo101crnowCx0M7fx7mkMdS0it8E1jdnNuqOxALuv/QbzTeEDuRtFOdDkZI/SOk8BB3fP4xk= 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=BigI8zzt; arc=fail smtp.client-ip=40.107.223.85 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="BigI8zzt" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pWynV7RaRyi6DXhrZ7aGNkUl/Krs2S+UuoqRk8xO2o6SWrphi0HbNwFcnIjMfV/OhN07C6nfi+v6k3HP/H1/Ap0o16meqNXl3Qy/pgVDeCsndHYU2Cq97maUIF+vOrJZDfpjtPIs+PlxQ/uz7/yH7q45KuwNRX/TGLuB4tvISQ8AFVPL6j0nHDL5ubAQRXw/3llMjkDTAOTz5VA6ztaNCmE7xI8hVe553TCT1LwKPeaWq2UEkAjqpGORjVySZ8RpmE9LpugHr6OMEF0+d6YvibR2U25lwNAi9e8lJIgB/RZFMbxlkJTzE10vHW9r2qaScpDWDfUe87bQ24fYoquTqg== 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=5q1DLsbggUy6nA/vvuMo6CHEN/wFF6JGXvl3n2fdKTQ=; b=HH0WEg+FGJ1isDpJU232vh8MxFWxFwmPy0Q1B8Sfu/piHMOk3ift0Vp7+NpJXwnmnFhGpIb6yd018UAACK3nPyFlqLbztBE8P2s5DwIM5T2GQy19vybYOX+NGou8DSVEblhqAAtVIJ2+iZJXDbXaPoepYnfJc6QfW45/KWNIllrIK/q0WNBWHfPH3+V5WLlldSR7PGCicEO2bJl86pvu1pfn5myaJ+9LhEWuEOssNu+RuA6uqmp6CYEdra1B8b8SpfR0PN3+vyPq/02GmVi6GDlUreQdTvCybUHFf/2GRbtTvjjKNo2z38fv+wvQmJrbdlvrbAkoV9VEnEq8d04aDQ== 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=5q1DLsbggUy6nA/vvuMo6CHEN/wFF6JGXvl3n2fdKTQ=; b=BigI8zztAv/9EBTCqNXQG+vvFE51e2mK/Du6VTfvas5T0xW6ohzTO8mL/8zTqKrBFaoUW2DPJvxIckjgZRFNZSyNzxY7rGwQmfcSDnQueV5u1JGRFJUerGgMNc9fyRXVWnOtWLGEYPoeNBkPmDv586iz2rSwroJapiEXusXmkvObBRXtU/ohNgGm7dFUxLj3GNMDkRVj6DYp2TSMqjrfyX/VaM8atXatLpR/3npB2vurbkEWnZd60tI2jYeDmHslcuu4sjIdxKX99Qj5d+geFypatmW/w+izZ8NPa8yF4x560Iy95c+jfkGDA+LR9TYPxLhMSWXF7QjaPFkSMvO11g== Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=nvidia.com; Received: from CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) by PH7PR12MB9175.namprd12.prod.outlook.com (2603:10b6:510:2e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8655.33; Sun, 20 Apr 2025 12:20:45 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::6e37:569f:82ee:3f99%4]) with mapi id 15.20.8655.025; Sun, 20 Apr 2025 12:20:45 +0000 From: Alexandre Courbot Date: Sun, 20 Apr 2025 21:19:48 +0900 Subject: [PATCH 16/16] gpu: nova-core: load and run FWSEC-FRTS Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250420-nova-frts-v1-16-ecd1cca23963@nvidia.com> References: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> In-Reply-To: <20250420-nova-frts-v1-0-ecd1cca23963@nvidia.com> To: Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Alice Ryhl , Trevor Gross , Danilo Krummrich , David Airlie , Simona Vetter , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Jonathan Corbet Cc: John Hubbard , Ben Skeggs , Joel Fernandes , Timur Tabi , Alistair Popple , linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, nouveau@lists.freedesktop.org, dri-devel@lists.freedesktop.org, Alexandre Courbot X-Mailer: b4 0.14.2 X-ClientProxiedBy: TYCP286CA0073.JPNP286.PROD.OUTLOOK.COM (2603:1096:400:31a::18) To CH2PR12MB3990.namprd12.prod.outlook.com (2603:10b6:610:28::18) 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: CH2PR12MB3990:EE_|PH7PR12MB9175:EE_ X-MS-Office365-Filtering-Correlation-Id: a8c0cba1-4a35-4986-41e9-08dd8005c6e6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|7416014|376014|10070799003|1800799024|366016|921020; X-Microsoft-Antispam-Message-Info: =?utf-8?B?SzFFSmhqOXRQSlY5NHp1R0M3N0I2YldMTnJ4dUFSTWZYOUNwVjhFRnd6MGJF?= =?utf-8?B?SVVGQU8wVWR5akF1aWVxdmNpS1lkd3QyQ2F5cVVHWmtsVjNMWXBXUnAzZGhC?= =?utf-8?B?d1FGSGdqbXU3M1JlT1BGWFBUMjYyeTlBZGFBaFh0ZUJxY1N1cXdqVlF4WkQy?= =?utf-8?B?WVJ2UERKV1p3RXFHR3UzMnlPNmdHTkFPam1ZNFpwY1FwU2c1cXhPdDFCWGU1?= =?utf-8?B?MmF2UlJpR2N4d0pSTFI3YldUbFRsdE5YT1J0ejh4VzlabEpFUUFnQThZcGdt?= =?utf-8?B?UTRJRkFwRWVtZXByaUpqTy90VWx6MVpTUk1JTWFrK0J4RnNCa0ZlZ3UxNUlH?= =?utf-8?B?TUJHQWowQ0JiRktLdWJPSlphckpkc0xveUpCeURLa0ZyRXpSS00yb0JEd0F0?= =?utf-8?B?NGVZckVwMTVYWExIMXVhVWJZemgyNjlYVHV4SWhMQ0FxenAxU2ZUakRLbEtm?= =?utf-8?B?MHhsWitRNHZjbjZSS0F3N2YwbHhuVExiT21vOXI4WU95THdtZi9nWUVBVFM4?= =?utf-8?B?Y25WbG9kMjJjb1JVLzdDMjk2UzB0YnkxdWYxRlNzUGYwTWZWV29RK3VZM1pI?= =?utf-8?B?YWVPNGV2Rk5xU2MyVERQR3UxY3NoMndhc2FSN0FWbDhQcVJZeGJmSkZZc2xO?= =?utf-8?B?alJRZ1JOME9vWitRWmMyOUxYWVV6WlhybUdwOXlYeHJqVGorTTdaUldRN3oy?= =?utf-8?B?bHJha05BTmxmWmptZG5QdWFndFdyZlowUkRsYUMvSDRadE1XbGUwSERNbG5t?= =?utf-8?B?Z205YkxKR2h2b3UydjkvQ2RiSkxESTVBU1llSndGaGZNR25Ma0ErSHMvWDFh?= =?utf-8?B?ODNucm9nTkZ0TVVpRzJxZlNQRCtLbmFmR3FZakN3OE9RNVpKendDYjF2Tm84?= =?utf-8?B?ZHJ1d1kxU1VSS3dGUG5BelZMU2RwWkhreWF3Qm10eWpwa3pvelA1M1FRWHM4?= =?utf-8?B?bGtaOWxwODFLaitqaCtLbXp4Q1hSY0RNU2V2eGMva01mMVdjbEdBRkp0S0J5?= =?utf-8?B?dlJFNng2QWh0UmIzMzNsR0VUandBbUtjelBnUlh5NjNxamRHL3FMVDF3c1c0?= =?utf-8?B?VTBmK3NUKzRjTjluY241Ukg4aTFJc1EzMDY4L09QekhXY296bnpRMHJ0aFBD?= =?utf-8?B?T08vQzJvbFU3d3NVSVBySU1FM21UOWh4UEtMaXFjOUpaQTNnKzVPeGdoV1VP?= =?utf-8?B?R285bk5BT3VMM3lsM1N6VEovbzBXY1ZkYk43V2I4TzVkbVJNbTJtM3R6c0dL?= =?utf-8?B?NEJvNURVaUduTDB3UUdYeG9jc0hjZzRtaW9zOTRZVks1NTVkQ1p0YkNtTElp?= =?utf-8?B?N1ZGT24rdEIxNFNDVXpqRGlEbS9IRSsvVzhacHdTYmtYYTdBR1ZMdzZqR1pY?= =?utf-8?B?d2FBdTFMeFI1VWhSb0lCZkVqKzJPTjI2ZUY4Wm9Cd0NQUG11SnBVQ2xsVVlZ?= =?utf-8?B?KzNmTHBCY1dQYWdrTU5pQU54NUJaOXN4T2FselhiVEx5enFjVEQ4YU5MUEta?= =?utf-8?B?Rzgza0FtQjQvbEdpaGlydHdOYmJSQm5jd0NjeFMvMmtaaWlhRm5nUGpvMEJH?= =?utf-8?B?Q1FWOGxRaEIxcFV5UEEzanlHdmdMNXBvaE1QL2NJNVZUeEZtelVWRVBBenlm?= =?utf-8?B?ZE1LVUc0R0RReHB4TnhhcG8zQTZCMTdkWXRUUmI5eUducnNMVisrVGZlVWJr?= =?utf-8?B?TndwK3JqaFZiWXl1YlMzcWUxak9hdjc3Rk5INGU5eDNRQUJlUm9XVEZpZ1ZQ?= =?utf-8?B?TEs5d2NxYTB1bWs0TUFFUmI5YjNOWDIyc1haeW9iQmxtRlRFS2w3WU5EZnlW?= =?utf-8?B?NUh3N216MVZiUkF3blMvdWttbVF1a0pvVXcwMmoxOHFYZ0ZNZmUrSjlpTmlE?= =?utf-8?B?TFA4RHdGUUYxM2xFTi94dHNPY2hFYkNJem1xSzMzNi9icmhhN0YxMVpuMEpl?= =?utf-8?B?Y2VQdjNRbUZVOWNVcXU1d29FeU5wcU9hUExLTGJhNlRoaTRTckhCbmNZU0J6?= =?utf-8?B?SGdMaG9TSU9nPT0=?= X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH2PR12MB3990.namprd12.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230040)(7416014)(376014)(10070799003)(1800799024)(366016)(921020);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?YmVqZjlVaUxFU3dmV0wrVW50bnhWejIvNDlUaXlxWklMVEVBcnFlR3BpT29s?= =?utf-8?B?ZnpoQ1E2cXh6NDh1QUdTdDhCUUhia1AxNGxVZVd1dmNoQnRrclNtbTI2emox?= =?utf-8?B?OTR2ZUlhQ21naERjVmEreW9QeDJrOEUzRWFIaFNuUUZ4aXRFbTNlQm05TXpB?= =?utf-8?B?dTBqNHg4d0ZrYmNuQjlVM1RsanNhT3lRajRwdGtDY0xXcTVGalpNWUlBOTFZ?= =?utf-8?B?TzV5WnN4bWlkb0ZnZ2FJTmYxMmZmMktFRHlhdUxKRVoxMTlJSFpEKzYxUXZM?= =?utf-8?B?VVFpNGlkUFRXcnFJeml0TkZtM1dQM0xGRmRGZCt4M1ZlaHRpZWc5Z3hpSnJO?= =?utf-8?B?bzVtdDZyWUlTYkkxQkhjRFFvSE0yK1VOdXA3allHb0RsYjdFUzF6RUJaMWgz?= =?utf-8?B?ZG1lRVNGbUI2cm8vQzlqSFROaCtpUWlEM0twTys0d3U1ZlNFSGFtM2Ewa1dJ?= =?utf-8?B?T0lOeSs2anhaYmx3YXZNQTlROEh0UXdHek82R2s4NTFyOS8wNzhqaUdRM1hZ?= =?utf-8?B?dHJyZ1l1YmxHdjNzQ2NQMTcrMXpqNzNVcEJYNDlnbWpscXhZeGtEWS9RYks5?= =?utf-8?B?RTdiYlEzTU1kbkgzcU5McStRaVpHNEFhL1VUSVh0OFBORlZWbkpwK1RYM3ZS?= =?utf-8?B?Z3BlUHJmaGtSdDVleE9ZTFRBTVc5OENIN09YbUZlaTN4NEtrcUpjZ2QwWHF0?= =?utf-8?B?MTZubExoRzJXRC92TXNrRXIyZDJLWitqa3hTWU1waGRhSDUzUXZzdVcvRXQ2?= =?utf-8?B?RGM4Z2ZOVzRTb1pLOUpVdlVCVi9nZEppSUs0VXJLZ25uMUJVWjFqTzgyZkV4?= =?utf-8?B?dDNjTGhVeXl2Y2pRTnNjdEtZNWgxM0tHL1NMYzQrUDFLNFF3eG4xWFNxWGNt?= =?utf-8?B?R2JpS2xibzBkU3hZVTVuQWVicWs1V29naC9zMUc3NVh1Nld5RWhjcTJGMito?= =?utf-8?B?c3o1NTVtT2hHbzZWQ3RZWVBuWDdGKzJ4UUo0MWhHQnZRT2JIVHhUU3pWUTc3?= =?utf-8?B?NldrS21sOHV5UzE2aDdFNEh2UUhLSmpYKzJyRXFVOGJhd3FkQzEzZUtkZmtI?= =?utf-8?B?R2xvQUhGWXZRdTdSZkJQQlZxNUozWno4bGs5TjNIS3FUNU9lZm9kc0JWdStB?= =?utf-8?B?TklraVhIbDBIUHE4NjNsTWNwT1RDMitiL2lVbU5uMWkzK3c2WmRmTCtCNVNY?= =?utf-8?B?OFk5M210SW1DQ1o5b1NnZU5oaXVGSm54dTF1M3hTekdrSmhoUnpKaENJWHZI?= =?utf-8?B?NXo3NUV4ZUd3N1dqbWE0NTg1d0s4ZDBQdC8yc3dMWVMrQjQrT1NkS0o1dDVm?= =?utf-8?B?bzIxVEtWVkJaM2swM0FSQVZsSEVhNVdGblRyQ0V6WThWRy9QUG9nTWcxMVY2?= =?utf-8?B?UXcycVg5bGxxMkhWMGkvTXN6UDdOckRkek9IckczOU9NQ2dYY0lpVjNKSlJj?= =?utf-8?B?c2pzUWIvampDWnJQVTFkUlFuOHg4ejFVbFRJcVE4Q1BlZzlXcnAwZk83SjdO?= =?utf-8?B?dFhMaHMxbkd2SkY3eitHNjNoTjVsMTUyd0l5ZDJvWEJZS3RTRU8zYis0NW9S?= =?utf-8?B?VzVGV3hnRWtNbVlxekJGWjNOWEVOL1pMZlBXNkFQeWtOSWo5TUZjdS9FNU1S?= =?utf-8?B?MVFwL0pPbkswMTVXUUxzaVR6NlhJUC9MdzhHSnRhWlBhbmQvQVpOL1F6QWI2?= =?utf-8?B?QzBMUEpXZWcyNWFBZUtYSFpYWC94ZnZGT2E2TlRMSlpEaW1HN3FnWlpKTlpZ?= =?utf-8?B?dW5lL1J0L0laVGQ4ekl1bUxwa0xYNzE0dHROcGlEQlFYNHZpYVRHTXpTNW1H?= =?utf-8?B?S014QjN2MXpES1dGVFFyQ0hHbVBMbXhkcUMwRmd2N1lzTDd3MHNHVEdENlVM?= =?utf-8?B?RFVsQlIyUng2UGhpdHVsSzYrNmlHLy92L1ZGMTEyRis0OFZlcVdwa29obWFC?= =?utf-8?B?VllnL0Y4MlM5SmpIYVYzOTNiSGpibmYrckpaRDR0WGV5S3Z3RlgrZmFpcVBx?= =?utf-8?B?MWh5WVkrRmQ4RHVrZks0aWtzdjVjVDFVRVBvR0JwZEg4eGtJY0lZVjh5K3dN?= =?utf-8?B?OTRLMmdqQS8zblpYVGZ1dDhvZll0dC9wWVlFZi9RVVNtc2x6WGRYcUVWa1pS?= =?utf-8?B?Q3h2VElheXBYTGVpcTR1TGpBc091TDZHd1kzdGNEZGhnMTI3N3p5ZDYwYmxp?= =?utf-8?Q?7PLWZt7l6no4NYMgHkOMAsmtt4WT0bmxVqG3SKmnZSB8?= X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: a8c0cba1-4a35-4986-41e9-08dd8005c6e6 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2025 12:20:45.7727 (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: aWxVIBl2U/ADWBLwDJiL4O07JkWnylEwB+9OkiYgYAXuAqFEe/xa2lQP52OdDe9BXk1FvcP2hpqcICyNqRA3UA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB9175 With all the required pieces in place, load FWSEC-FRTS onto the GSP falcon, run it, and check that it completed successfully by carving out the WPR2 region out of framebuffer memory. Signed-off-by: Alexandre Courbot --- drivers/gpu/nova-core/falcon.rs | 3 --- drivers/gpu/nova-core/gpu.rs | 59 +++++++++++++++++++++++++++++++++++++= +++- drivers/gpu/nova-core/regs.rs | 15 +++++++++++ drivers/gpu/nova-core/vbios.rs | 3 --- 4 files changed, 73 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/nova-core/falcon.rs b/drivers/gpu/nova-core/falcon= .rs index 71f374445ff3277eac628e183942c79f557366d5..f90bb739cb9864d88e3427c7ec7= 6953c69ec2c67 100644 --- a/drivers/gpu/nova-core/falcon.rs +++ b/drivers/gpu/nova-core/falcon.rs @@ -2,9 +2,6 @@ =20 //! Falcon microprocessor base support =20 -// To be removed when all code is used. -#![allow(dead_code)] - use core::hint::unreachable_unchecked; use core::time::Duration; use hal::FalconHal; diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index 5d15a99f8d1eec3c2e1f6d119eb521361733c709..4d03a0b11b6411e22a652183e97= 5f6889446ed46 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -250,7 +250,7 @@ pub(crate) fn new( let fb_layout =3D FbLayout::new(spec.chipset, &bar)?; dev_dbg!(pdev.as_ref(), "{:#x?}\n", fb_layout); =20 - let _fwsec_frts =3D FwsecFirmware::new( + let fwsec_frts =3D FwsecFirmware::new( &gsp_falcon, pdev.as_ref(), &bar, @@ -261,6 +261,63 @@ pub(crate) fn new( }, )?; =20 + // Check that the WPR2 region does not already exists - if it does= , the GPU needs to be + // reset. + if with_bar!(bar, |b| regs::PfbPriMmuWpr2AddrHi::read(b).hi_val())= ? !=3D 0 { + dev_err!( + pdev.as_ref(), + "WPR2 region already exists - GPU needs to be reset to pro= ceed\n" + ); + return Err(EBUSY); + } + + // Reset falcon, load FWSEC-FRTS, and run it. + gsp_falcon.reset(&bar, &timer)?; + gsp_falcon.dma_load(&bar, &timer, &fwsec_frts)?; + let (mbox0, _) =3D gsp_falcon.boot(&bar, &timer, Some(0), None)?; + if mbox0 !=3D 0 { + dev_err!(pdev.as_ref(), "FWSEC firmware returned error {}\n", = mbox0); + return Err(EINVAL); + } + + // SCRATCH_E contains FWSEC-FRTS' error code, if any. + let frts_status =3D with_bar!(bar, |b| regs::PbusSwScratche::read(= b).frts_err_code())?; + if frts_status !=3D 0 { + dev_err!( + pdev.as_ref(), + "FWSEC-FRTS returned with error code {:#x}", + frts_status + ); + return Err(EINVAL); + } + + // Check the WPR2 has been created as we requested. + let (wpr2_lo, wpr2_hi) =3D with_bar!(bar, |b| { + ( + (regs::PfbPriMmuWpr2AddrLo::read(b).lo_val() as u64) << 12, + (regs::PfbPriMmuWpr2AddrHi::read(b).hi_val() as u64) << 12, + ) + })?; + if wpr2_hi =3D=3D 0 { + dev_err!( + pdev.as_ref(), + "WPR2 region not created after running FWSEC-FRTS\n" + ); + + return Err(ENOTTY); + } else if wpr2_lo !=3D fb_layout.frts.start { + dev_err!( + pdev.as_ref(), + "WPR2 region created at unexpected address {:#x} ; expecte= d {:#x}\n", + wpr2_lo, + fb_layout.frts.start, + ); + return Err(EINVAL); + } + + dev_info!(pdev.as_ref(), "WPR2: {:#x}-{:#x}\n", wpr2_lo, wpr2_hi); + dev_info!(pdev.as_ref(), "GPU instance built\n"); + Ok(pin_init!(Self { spec, bar, diff --git a/drivers/gpu/nova-core/regs.rs b/drivers/gpu/nova-core/regs.rs index 3954542fdd77debd8f96d111ddd231d72dbf5b5a..eae5b7c13155d2da39f47661024= ae52390e04366 100644 --- a/drivers/gpu/nova-core/regs.rs +++ b/drivers/gpu/nova-core/regs.rs @@ -18,6 +18,13 @@ 28:20 chipset =3D> try_into Chipset, "chipset model" ); =20 +/* PBUS */ + +register!(PbusSwScratche@0x00001438; + 15:0 sb_err_code =3D> as u16; + 31:16 frts_err_code =3D> as u16; +); + /* PTIMER */ =20 register!(PtimerTime0@0x00009400; @@ -44,6 +51,14 @@ 30:30 ecc_mode_enabled =3D> as_bit bool; ); =20 +register!(PfbPriMmuWpr2AddrLo@0x001fa824; + 31:4 lo_val =3D> as u32 +); + +register!(PfbPriMmuWpr2AddrHi@0x001fa828; + 31:4 hi_val =3D> as u32 +); + /* GC6 */ =20 register!(Pgc6AonSecureScratchGroup05PrivLevelMask@0x00118128; diff --git a/drivers/gpu/nova-core/vbios.rs b/drivers/gpu/nova-core/vbios.rs index 534107b708cab0eb8d0accf7daa5718edf030358..74735c083d472ce955d6d3afaab= d46a8d354c792 100644 --- a/drivers/gpu/nova-core/vbios.rs +++ b/drivers/gpu/nova-core/vbios.rs @@ -1,8 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 =20 -// To be removed when all code is used. -#![allow(dead_code)] - //! VBIOS extraction and parsing. =20 use crate::driver::Bar0; --=20 2.49.0