From nobody Wed Jun 17 04:13:43 2026 Received: from SN4PR0501CU005.outbound.protection.outlook.com (mail-southcentralusazon11011006.outbound.protection.outlook.com [40.93.194.6]) (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 90163233722; Wed, 22 Apr 2026 13:41:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.194.6 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776865270; cv=fail; b=Iy6t5xXknyVqGv3HwQBOnI5EnmCeUScZmua6Y96HEf2mha4PU09Dl0HDEczN6hlZWos7uZcSY5EMgyHL66xhABIuS2zFLX2J8jxfk+PyxeMNnakxHFPNabPT9sASAK+9vWwIVA89aC9yWjyxfihB5mXjZAUMBXkQJQyOTBYmNbM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776865270; c=relaxed/simple; bh=8GShq/LcUxTlJPAmwbrGrzGE8uK4aOQHDsJGJ0GvKDA=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=hlWkAKosec8zfOEWiEj5KwRBu4ChfjyP1GY6XPhmHfRlVPg4nnd/T82aXONRiyRrxr8QdtrSlbdPDbGREWbsGzSBe/9vE77oErF3b0xzk8FPbXDAM1bfDmtPW2IOFtbP5YGdJmL4u0QLIOcel0fLBywqLPncgKulMHTxEJF9B24= 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=V6qXfBRE; arc=fail smtp.client-ip=40.93.194.6 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="V6qXfBRE" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=EMNjdg0y0e0BKnHM0YQZU6Mp5/VvvKKoKKid3FqRNLz2W98xBVYm+jWarDqjwWFihKw/arhOJxZlyyPGYakD1KmCeBkNtAkXw20j6XI9Hqrm+SMzBbcNsukSHlYWMuXjYSJ1WmlDQoEdjvhhsZrbmrhmoX/lr0X5YCtBQGGyyF+JLouDntfZs+VzQeTqHRzuevTWRzt239kuSYQHnzVuPURT4mV1t4yor4XsloMpzB4O58scyL8NC4jFp64UsIQs2wYodTeCCbS09s8sEKKU6KACjHI+k8QkDkt3ZvOvi/qK0U6sfFtAXpO/WETcM42bOLQ8K71TEWkj959LQJT8VA== 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=YqiGqQxZe4rTMJ2YqaEkwki7AbVhCs3yw9p3h/46i5I=; b=oLgB8Hu9q97yxEY0fIeVa5AFoxoXrLZFlZoE9gPxmgXBI2M3ydQZ3JSdotfX+dr14VwNBk/uyO0h6Npn65LqB3fZiPxRUqmgm0uWZFi3UPz+za9074GqK8SeuOjn6isPJOAdoIMECVVpDElhNJU3b3F7RwtRuvCmWhmHpbLwoEdYheyUlsiE/rQ6sZ821Inj7us6TQ1NBFCbWQOt5bFCC42OBnRCjpfTrtFTL7Isb9a98cTpZnnCxm6VJChgDEyB8SZ1vBA8Ov6QzjePp31UKQg9qEDEGSkugioLUKCSrvY01J0vbmuwxoEKBmL5bGBSAOm1FluDBN3IV7yc52ChyA== 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=YqiGqQxZe4rTMJ2YqaEkwki7AbVhCs3yw9p3h/46i5I=; b=V6qXfBREwYGqitqgdDAUlXKfFV+ZzfdbORkmVkwY0YLUS00Mveipj4UdHxDyegpGpyc7h/uEBcpGjrbtiun4Mipp/UD8Av2OQahsKVkjdtmXqo5HrKyB38KOXa21wNKMLnjb9yLdF0IuTI6caxpBeH1fDSKH34BssxDJQ4jko+/5cDzUWvn26Uq6y84PCPpu7F6CPz4HlWlvSu2lhF2WKQw2t5QJSMj4Q2GbrlttfZXGd9vokMj0LYDy2Cvqm+a0/3SDhHITJfsrk6AdSEmbtqCPXyn1G3T0MG9h70I81m1AxK9LmFQlaaYOmHOTQUhT867jc7J1ZHRGkWqhzE9G7A== 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 DS4PR12MB9682.namprd12.prod.outlook.com (2603:10b6:8:27f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.20; Wed, 22 Apr 2026 13:41:02 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::7de1:4fe5:8ead:5989]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::7de1:4fe5:8ead:5989%4]) with mapi id 15.20.9846.019; Wed, 22 Apr 2026 13:41:02 +0000 From: Alexandre Courbot Date: Wed, 22 Apr 2026 22:40:51 +0900 Subject: [PATCH v3 1/6] rust: add warn_on_err macro Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260422-nova-unload-v3-1-1d2c81bd3ced@nvidia.com> References: <20260422-nova-unload-v3-0-1d2c81bd3ced@nvidia.com> In-Reply-To: <20260422-nova-unload-v3-0-1d2c81bd3ced@nvidia.com> To: Danilo Krummrich , Alice Ryhl , David Airlie , Simona Vetter , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Miguel Ojeda , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Trevor Gross , Boqun Feng Cc: John Hubbard , Alistair Popple , Joel Fernandes , Timur Tabi , Eliot Courtney , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Alexandre Courbot X-Mailer: b4 0.15.2 X-ClientProxiedBy: TY4P286CA0024.JPNP286.PROD.OUTLOOK.COM (2603:1096:405:2b0::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_|DS4PR12MB9682:EE_ X-MS-Office365-Filtering-Correlation-Id: feb2347c-a2c8-4c90-b76f-08dea074cb5c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|10070799003|366016|921020|56012099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: 8EMUahyddUPtl2Fry76Q7uFonK1UKoDhSNQcDeQYd0wvQKwcETguvw+SZab0p0yw3bAVd8Eq55wrQJ2KU/doMvxbB6wRqE/bvijZCbV3d5cTYOFn/mxBoRBZQEBaj+hKeEwNsw+pYK/mfoYwB1lGVO9mSK+ihj50ptbaZynQCdXsfooNSVhAhcy0VffoUBmO1D0kfA+ou9ifpl6ibpA0nbNF1e0XzchaTQ9iPGfOelcwFVxY+7sAlysAqVit+uZpWfVQCrz9X1iGaITNrEsGnshg4gwTSiPTjoaipvcHEadATRbCzVSlNt33fsNXGsP9MIf0+OsZf0oSIgnvFqBq4w3ihxTZjtQDXoiaaJPNRuZT6FeWhdbFvhrxD64+8lp/GLxMjABTzUMCp2azOEBwGvTkeXo73T7gCJo/mw/0GNwvG6cXQgWGhzuW5Vj113hBrvlZo0qjOsfYSYZQU4k9lII/jnpxM0aeLMjSVVmziS79Jt05EMa78eV5bnKjD1wYROTj6QjoVJJGauWXdKpvGpl70ATru1FOH5DaZnRB+EXfqzgNI0mQOxxHHYGWNW5Zk3ehwnj6CJHDrE7VpXcTm7jGNZaN92XytCtGLW3S/N2dC1bc0CwktI5oB3oqgf49UDDXPUKoEF7gBtp/m6bL8VW3hiiy4/Hq26NwctOy+UT4yewV/bVXFFFMGBEirh531lX898Aqijm5tm1ycK/cffwX+7HLFM3uHI5eaOmgkhSisT3JmhiPZArWpQfMGnNNV0sd+eLdMdt5YXxhGP6fgQ== 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)(376014)(7416014)(1800799024)(10070799003)(366016)(921020)(56012099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dmVHV1k1WlB5QjhsWjZxcmlXbjR1Z1d0MktJL2xYa1dYa29ISEFpamN5K0wy?= =?utf-8?B?cDZ4QTBzMXdSZUNkUkxhbk8xWUpWVEgxVUMxZm1pVGc1M2E4R1laeEhKaVd5?= =?utf-8?B?ZTVNelJmbnJCeFJmdy81UkZFYzFBbGhuTzBLZHh4T2dYTC9nei9nY0liMW9C?= =?utf-8?B?TjR6RTMrUHltS1hMTU9ZbnlacHYyYW9YREdDalh2MDNadzJRMHJKNlgwYTFK?= =?utf-8?B?djA5UzE1ckhVbmVSQ2RZaE4yV3FWNkVvb3pHQlBXR0pXaU1tUDY2S0w0cEVZ?= =?utf-8?B?UnlEVHllR1JlblJBZlAvVGNrSDgwSVJhdGdRVjNpdXU3MjJ0V0x5U2w4cS9p?= =?utf-8?B?U3p1YW1CMVZwbGhyNjQ1U3pYMk5DQjVsWjZ1RFp4ZWxkQkZ0UUMwb2M1LzFz?= =?utf-8?B?L29XMFFNQTIrZFFVa1JlMjFhZFRnTFBTcWxmWWxYcWR4NGZmVk11RG5RMHdY?= =?utf-8?B?QjBuaE1ORk1FbTIxbXBsM09ON0ZvTTJQNG10Y21HdUd4Z2RUZExjbEx2MDc1?= =?utf-8?B?bjdubGRXZlRjWHdsYkRGOG0rM01sMnVCTEQ1bzc5TVZWT2pFcDVUVVgyVUFB?= =?utf-8?B?bjRnTWhYTXRFWStSeUlySW1FY2pISjRvMGZLOS9hRjVkQ3VTYUVCNDVlclBw?= =?utf-8?B?dEliSGhQMGtZK3NydFk0aS9CZlpwaDlUeTRndG1vQ2VJMXJaNGtRaExXR3F1?= =?utf-8?B?VExuc3BCc0pOOEhxbURxT3NwSmRZVitVd1pERG9YWkpoaUluVHZob2xuemlt?= =?utf-8?B?cEY5R2EzaGJKYnZDZTVVd2p0K1NvVUdtK0xLeU9DVjFESUZRZVlxQktyU01I?= =?utf-8?B?Yzd1eVY5YjdzYVJudnNMVFJlSWZkcUZyUVdvK2J1ekIybERCSTlDbUQ5T1pP?= =?utf-8?B?OGx0ZUQrMWMwNFRTOUhJa1NnczRyRW84ZldlRjZMbHdneGtzK1VpOVpxUkRN?= =?utf-8?B?eWFSZEcwODFReSsrVnZqa3J1aTV3WG4xUTJtUXRqQllDRWdYWUJHV21naUF4?= =?utf-8?B?b1pDa1RGbnFsZWt5NnhQS1YvTzBTellWdFExZ3kxKy9IT0dpUDQyMHdZUy9N?= =?utf-8?B?U3BYdEw0L01ZR1ZScGxHOHdCQnpDRWozNFBMRFQxUDQ1cVlzZUd3ZTV2UjBr?= =?utf-8?B?ZGwrN2V5VEFoNHdzbFVHK0czVmtpMWNCSzZaajF1b1lGWWhVejRITzVFUkk4?= =?utf-8?B?QlNwTHdQdi9BVmZFNjR3b2hzLzVPb2hwaEpJWEoycDNONk5jNW4zUTdlMnRO?= =?utf-8?B?d0tQMUVnVFY5b2pZK29XOWhSbERxbC9YSWJSaWpqdzVBSEFIbU1jaVhnbFZU?= =?utf-8?B?VTYzc1dGekxqNUp2VldiaEg4TlM0WERqcDdLLzc4ck9ibFgzMVBtNnZTUXps?= =?utf-8?B?Rm1qY2lKd0hJdVcrNjFKUU4yKzJqSmM0QXppL0g2V1BXQ1VZQ3g2c1FuVUlK?= =?utf-8?B?alVrQmYrRk9BazJ4aGNEcVBUWjc4V3cwYjlxL0Y5QmRsVUdpK21lYklJK0hK?= =?utf-8?B?SDRQaVBPbU1nVUJIZll6ZGc1aXlKZVUvZDBtekxlTmExdnJWVURuWHVTZjFv?= =?utf-8?B?QUM4TURiVjBCZ2lRaXNmdDA2VHMvUEc2STM1WUdrZVRVNXM0dU8xczBlaG1W?= =?utf-8?B?cVBtQ2FxcU03UDc5THF0b1hqdkkyTVFEakJBNmhZTndPTVFnekpidEM3QnI0?= =?utf-8?B?NCt4N2RPbUJTbmwxUG1VSmk2b3BsYjdTdlBqcU9KYjErSE9jZ1kyc2NtQzUx?= =?utf-8?B?cDkzT0tFZ2ZKU2dwcjRTbTg2VDdjY1BFeFNLMHgwRDB0YkFWVytRYVliUDlJ?= =?utf-8?B?RWhmUkJYZkExWVkrdmxqcER1UUtqTmVaVHpnZTRBcnRsVVJidEM4RDdVSVFK?= =?utf-8?B?MjZuT09ZY08wOW16Sk5KbW15Y1RWOGxPWm5OY3NZL3BNSS84YjJCckx6Ry9p?= =?utf-8?B?R0h2c1UydXp6MGNkSit1QTJTcFNNR1ljckdIL0ZQWDF6c210UG84TmtHdEJs?= =?utf-8?B?OWRZczNCVVRONjlXa3JCRTlFNUFRS2tkYnIza2FVbkE4QnVtN2tuTFVxdHJB?= =?utf-8?B?ei9peXNQcWRwNjhNZ3V5QXlKOC9Zazg0TXpZK0U5RFN6amlDWW1pK0QxM1Ri?= =?utf-8?B?S0JVSUI4RU9sd0xublJZRmFLNFo1Tmw1Mm5rbWtZSzArTHhyRUdoRW1NUlBT?= =?utf-8?B?TUZqblg5Mk1tU1FaUkh5cUlOWVNmMUlTWmhxVjZTVXg1d0FxZzg5VXRHUk5G?= =?utf-8?B?OWdBVTZ0eTVTKytEMEtLbzBUYzZ2dDBXdjhuSjFJOVRpZndQcW9PcVYzR3ly?= =?utf-8?B?Und5LzMwM0NvK0tIV2RmOGt1Wk92WDhLRFdhNUZzRVFzVThhcERwc2dtbnZU?= =?utf-8?Q?aenMCzu6KAwtoKyLGW/K2XXBOUo1/jYhmG4QJCitbgMn/?= X-MS-Exchange-AntiSpam-MessageData-1: /HznuY9sRaySlw== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: feb2347c-a2c8-4c90-b76f-08dea074cb5c X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2026 13:41:02.3528 (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: 6XrFpqmII0kpgY7vjbtmnt/rUu3LeTME9OlPjS+ZTlAS1NKH0hfNl7Wr1g9kRtfr/Mk9K40Qu1vKfbHAAFKWIg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PR12MB9682 While we already have the `warn_on` macro, a common usage pattern in Rust is to check whether a `Result` is an error. Add a helper macro that allows this. Reviewed-by: Eliot Courtney Signed-off-by: Alexandre Courbot Acked-by: Miguel Ojeda --- rust/kernel/bug.rs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/rust/kernel/bug.rs b/rust/kernel/bug.rs index ed943960f851..c5809c554da7 100644 --- a/rust/kernel/bug.rs +++ b/rust/kernel/bug.rs @@ -130,3 +130,13 @@ macro_rules! warn_on { cond }}; } + +/// Report a warning if `res` is an error and return `res` unmodified. +#[macro_export] +macro_rules! warn_on_err { + ($res:expr) =3D> {{ + let res =3D $res; + let _ =3D $crate::warn_on!(res.is_err()); + res + }}; +} --=20 2.53.0 From nobody Wed Jun 17 04:13:43 2026 Received: from CY7PR03CU001.outbound.protection.outlook.com (mail-westcentralusazon11010027.outbound.protection.outlook.com [40.93.198.27]) (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 8810623EAAD; Wed, 22 Apr 2026 13:41:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.198.27 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776865273; cv=fail; b=YS3xN7xA1egvAAiPswxHW/mAsgzcFaR7XB2O9d2tsQH/wartIk8O82GYlLOpdtXrqZ8iKhj9isW8zSz7hWjuKi2NIlJIKtpZjXneboMl6CC0caS5Vfe81jUBDRjwRRPg0SqRzVm1OKGUczJsV2NyfcC9IPtMAt/6cfI6yQDA/+Q= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776865273; c=relaxed/simple; bh=i91+zUPNe6ZmPwF3083NFPDQoznHKP0FOr2KahIpnCc=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=Jkbbxi6ADOmARnHh8YWXSEOyWSVFTSnU4VLTvnMMfa0PA0jvJE+Db1i0ZJbWjXC66atVLvzY67PQPl6sNug9KNVfIwF9PLgdvHZcAX1drtKD2nvSXGqmMmfgm79Vc2mcPZVm+O2Ie+EZlIrFvbPEZPnfceukO6idQB0v5HCh3ss= 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=akhSVuLb; arc=fail smtp.client-ip=40.93.198.27 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="akhSVuLb" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=MA8/sAT0Ii/Bue4TKr0PBj4bwFA1y7Q5c85xnz0FMMn8Fc141J5RjTFso7LbK3bl//8MCU3JMmagEytcIVQxxei9eHkjgrjoQfIa0cCWCoSstODm0CMs4EdMfHAlm/8cysqkWBfnH7JQBG1tUXIastxX2xVl0D4moLYHhv6PLQZ3jwgeFMkPT8NVUOHTT0NyDM1rG3SWquw/sOJGRRuoWdNK223b/CoS2Y4wAIJLD99SoDwCjl8xItAhxtuVTkN5PSSbVmNbqioTYPXR2D33atGbx7hCadPz/Vl13yNMIrhjeAaAPCIu8UjecXQAXclTSPXIA9xo2mbSbk84t4w7LA== 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=vc7x6uoYP0xSBehRQcbJQUOhQ02pYsjSCZ9aDX/um44=; b=NQigsQM8uoHVd/0SwaBJ6Zih9NbELMq0uERFYb14V6BfAjKhWV2/aVnxES2N114AOX+vrGgAigyjRYNyj55metAkPh9+47bqhlpuAI8ZsmUyqAGPjhnGuA6HVLiQbzCKpiCNki5VA4/eNZQrCwhYYM1Cq/gmKYyECtD2kkFw9nh0XQ19xPKtOa9deVfe9rBCR43BRmT04rLlFw8PZqes3WjwDT3hoYWXtWv6DvU3ngw3Y808PlLJXJfTIYIz94kRwMDCCqiH2k2IBoxbRQkNTfVN6jSnF4yt4WiZ78bZLbS0oWYnqWSlN1Wl29mFwWZASHtHuRzJ3UZAZfK6ds12RA== 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=vc7x6uoYP0xSBehRQcbJQUOhQ02pYsjSCZ9aDX/um44=; b=akhSVuLbCQT4XgWknaj5jhqP402x7Y6vfGlI47i8h3ck+VYY8vT6kO6F/LqiDsDT92uCTFMFw1uF/W6GvXCo5N1tOZqIeyrtAcXmcsGdEXBT1tPfO3p2N/CiHSH7UpcLqFKl0LrV09csUkzgLvJ7fEO5MIrbsb+2AmGVrmgU2UBYwKiHrl/6Vwe/GaRsgKPNc8iktETlu9PNscJlpgolKegpw8mktDC4zW1Ck2KjS6wdg8syXhGBlamXvsnO+R6fkZ1kFvieQVfhSI1Y5hAckIistp6qzi2THsgCbXIessnMCd53iRGbFJwU+al/5tcOTDYxliMjc26W/T/LbYCMYQ== 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 DS4PR12MB9682.namprd12.prod.outlook.com (2603:10b6:8:27f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.20; Wed, 22 Apr 2026 13:41:07 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::7de1:4fe5:8ead:5989]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::7de1:4fe5:8ead:5989%4]) with mapi id 15.20.9846.019; Wed, 22 Apr 2026 13:41:07 +0000 From: Alexandre Courbot Date: Wed, 22 Apr 2026 22:40:52 +0900 Subject: [PATCH v3 2/6] gpu: nova-core: use warn_on_err macro Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260422-nova-unload-v3-2-1d2c81bd3ced@nvidia.com> References: <20260422-nova-unload-v3-0-1d2c81bd3ced@nvidia.com> In-Reply-To: <20260422-nova-unload-v3-0-1d2c81bd3ced@nvidia.com> To: Danilo Krummrich , Alice Ryhl , David Airlie , Simona Vetter , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Miguel Ojeda , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Trevor Gross , Boqun Feng Cc: John Hubbard , Alistair Popple , Joel Fernandes , Timur Tabi , Eliot Courtney , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Alexandre Courbot X-Mailer: b4 0.15.2 X-ClientProxiedBy: TY4PR01CA0057.jpnprd01.prod.outlook.com (2603:1096:405:372::9) 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_|DS4PR12MB9682:EE_ X-MS-Office365-Filtering-Correlation-Id: 71afb6c9-a3df-40d0-cf26-08dea074ce4b X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|10070799003|366016|921020|56012099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: Zme0Qrec1/0L+JxK4Qwgd60aoN4eni/7dB9ggv4OtFW1x+QbuX13k+zv4VODhNGhuLmFkAyfM0o1ZgrIdPCpdAuY10g6HXMmGDYL3LDib3048zNf7OP6aZIBibftXL/UyY1UsOBePHEaiTEBGZozWx3MJUyl01HPFmcEGNNfYLgqUW92dlHkUPPQQbmCrbhtcnRXl37F7/fZ9QvkvNpUxvchBpPNF2qtQQQz3vBZFolde0LP+dxKcebsXzh53gNSModBoDfRPW6tp32j2hxRAal/EYk7SgpkDpv8C0pZojjK4kTISrgm5en2SvNYllycU1RWOXB6Bu2b0GXL3/dhKsReu6oI31mOzUAMxqRl6Yk4pqAULIS7PiIXAexd2vCAE/qp98lKKTtvSwKb/9KUScoeIhNlghzPTo1DabxhZ7Bzha7Dc3AzjdDZ5+CKbuA/EzlpzlLnIRA5BQ+yT8Am8N1Js0Mso/NsbxglrGZsaytzGajtY8jLeTYOshIbCVP+6FiXQOJY9KbNipIhFnydGulTE+850oRnrI1TyEL/mowBrHAACpN7sSjwXeP++DwxdlzG2Rgaz+B3s7AI/Se5BVmzjMo+SehaMLQp+wBW+rOaBqN4B+rxf4axfPRiKyqPl4TWSiTIomUYdfU4/AZR0KgM514XBILt79FamtljfQYhdibHj5Ru8e0OIIVt+TaJSYtRmx1iqxQv1g7lMiRsp+Ehfx2r81OOcfuqFnbkHyyNKBy9phT1iyYb3PDPJf1UC+kw5EzJGNdP3QtSq2OngQ== 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)(376014)(7416014)(1800799024)(10070799003)(366016)(921020)(56012099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?d1VraG92dHdHN1hUSG55UjZBZnNUdjdzYXlXMk5TOHRpQ2ovSXRucDZybFVk?= =?utf-8?B?Y3ZvMlcvbFNGdTNJSXBHaVhxUTlwYUY2dkQ3OWRRTkhYNENmYkxGRlQ5Z2ZL?= =?utf-8?B?eDFGUkRqdWltb1NrUUh2V1hndUliQTNJMEhaQmdVTG1IbFNwVkRTS2h4bWNY?= =?utf-8?B?L0RNUmFGSjA5eTVFdmpUYUYvYjZkL0VvdFdjb2VGM3V6bFpRdjBBMzYvaHVH?= =?utf-8?B?Ynk0L29FT3lJbnZCY3pZeW5nRmJRTHFldXpDNzRLNTRweWczbEJRMTVNanZL?= =?utf-8?B?YytEbCtnK1VmUmFOWU95ajNqZm9kT3BscUt2YmQxMXUyeEpSSEVFMEZ3aG8w?= =?utf-8?B?bnEzbXVJaWtnaFpIekpWRmpZc2NCZ0dJVFJ4ZGplbkpnbmpjQTJHRlRRUzdN?= =?utf-8?B?Q3BxRy80WnZwUVAwcUdiVllpTzNaWkt6NDhzTkE3ckR2dVVEb1RoYllBSzYz?= =?utf-8?B?Q1JrYURmclZ3ZXkrK2RGOEFic0pCTWV5MWYwZkkzMzRsQkxnVEw3aGIyOXlM?= =?utf-8?B?YVdZbW9BK25BcElXMzZjaVpia1Fqcm0ySHFHMnA3Tk5ycExtamZjMitjblk1?= =?utf-8?B?Wm1UR3N6Uk42VXhGUGdDUXB2cnlOeVVpSG9EaGxOVG5malJ2WlBiMTNYanVS?= =?utf-8?B?UkxkU1BkaDl4ZlZheGFrd3lnSVB4eEhHYVBaTWdpZ05QRmdIQjE5Y1dWRStP?= =?utf-8?B?WXl6NG9ZTmlNazBPL0hIN0g4R1I5TjdiMHJXSThXTkFGem1PRjhsSm5wZlhY?= =?utf-8?B?YmMySnF4bThUNFg5TERodXVJeFhTODBJamVlSTZpRENRUGZiSVl2ZEtxL3dF?= =?utf-8?B?MmtGVTB3aWNIbVRDUDBlRFVmMDdtQi9NZDJ6Y1ZwRGlYTXpaWUd0TUdZYnJr?= =?utf-8?B?U3dnUnJEL3FlWVQwWmREZy9samljYmowVVV1S3Y1MyszSEMvM3RyaXlQQWpJ?= =?utf-8?B?R0c2dFF6eGVoUHVraGNZWmpXNXo0NTg0b29KMm1tYkhGZWhoQUZNZWllcUNC?= =?utf-8?B?U1kyZGlUSFhuR2JJKytPWnNGYjdCYWdDSTZBZHBGV1VYem5MVGpwb3hZd1Fv?= =?utf-8?B?SGcwL1ZySTN0b3pzYTJ5RzNsdDYydFpkeUJaL014NDg3VEpXaisrcG5rQ1g4?= =?utf-8?B?SjlCSFpCQTgva0E4NERtQ2NySHdrMTJYeWJyS2NrRVFrU01oMFB6K1FRUUND?= =?utf-8?B?MmF4aERNalZ3YmswWGR1Snp0MGdaOENNUEFGamEvREE1TTVBT0NKS3dWcllq?= =?utf-8?B?WEFsaWJpZGNjWm9ONlk1aEZUdnlHeUUwc29BVkNxZTFLRGJTSVIrY0xqWUl2?= =?utf-8?B?bCsxTUZrZGJPWWhvNWFtR1M0TUllRFJYQi9iYTQ2WUVTWWtGdGt4ZjBTWU5V?= =?utf-8?B?bDhIY3U4ckxLNzFlVnNhZGhxRkFnaENOdkJHZFdWQ0puUmk0WDlyQzArL1d2?= =?utf-8?B?QmZ4dmIyOUNTTzFFb0xxckFXMjh4UEN5MHBISjQvMjhkUjh4ZkJPYVZiMi9r?= =?utf-8?B?STFzOEhhRjRCUWZCMUxxeEoxdVVkQ1RvZWNVNTAwSCtaTlRIaUJnZjI2MkE5?= =?utf-8?B?UDZRSmQwNDVCYlkvRGZNQUdwNTB6WE54TlY5cXZSeXdGdkxxTXNpTThKTlE4?= =?utf-8?B?Z2YxZXAvdC9jL1VWemJOTysxNkdxTGwzdysxL1FPR2xpNWtLdG9qYVZtSkdn?= =?utf-8?B?NG9uY1ZETGpVbWhLOHNpNys0OWZXeW0xTUFLcDFpazVGdW5PeWUwZVJoekRR?= =?utf-8?B?VjFKM0hvQ3NSYUZta05LMnBRT1h4NUhxdER3THdnbUdMU0Y3b2U2TWQ4QXE2?= =?utf-8?B?d2VrQ2h0TEttZHAxYmVZSTJ4MjhFdzl1Vmozb0NiMUtESHNaUDFCdmpCSklJ?= =?utf-8?B?R2NjUVRjQk5VakE5NlZBTXBhZWRieW9xK0I4ZmNUS2V1Q0YvTXdRUnM5WnBm?= =?utf-8?B?Vm1odC9KYXV6Y0hkeWluZmE3ajFsVUNoQTlEWHY2Tm1FKy9ya3E4SWVwbGJp?= =?utf-8?B?OXY4ZVViT0cwMHl5a2w3T3NLdzhXRlMvK1hHMFhGWXYvaUJPVlR5Z0IyRWxN?= =?utf-8?B?akRoV3plS1ZVRkdHdklveTlpZnR1YWc1VC9ub0c1ZWN6MjRpRko4VTI5amVa?= =?utf-8?B?eE5BNkxjbWxOWnlCUnp1dDVhQWp6YW9VOEIySHkzMDJQdGVzdnQ0aytJRXhk?= =?utf-8?B?OVBucEpyNEYxUlRRR3VTeGs4cnhaMkZoRFhCdUtBd2hBMm9uSnJ5Y3RNMHF0?= =?utf-8?B?MUFySTVzSlBCaXo4QmNmcGlmSlZrZzRxRUtCdUlqNFRMMDEvaGV3NERpTFVO?= =?utf-8?B?MEZHQ1pKVUVxRzJRbDd3czNQRWozaU8ydXNRNDUrdndVdFJTNUp3eDhuNXVw?= =?utf-8?Q?goqOc6yAFwFMG7FzF2b3jwqZ/JOll4syiCtilaAC94kvz?= X-MS-Exchange-AntiSpam-MessageData-1: VJj/DHk/dYyQfA== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71afb6c9-a3df-40d0-cf26-08dea074ce4b X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2026 13:41:07.2418 (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: ah8/w0JnWR52VrZMdhxcwa7lS1CBCQFHDdLGYj8/E44SJ4aipxhsI80kfYq6zjfolsmAkHxgtTqUmfkfYJUUeA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PR12MB9682 Use the warn_on_err macro in the unbind sequence, and refactor it to early-exit on the failure path as we will need to use the bar for other purposes. Reviewed-by: Eliot Courtney Signed-off-by: Alexandre Courbot --- drivers/gpu/nova-core/gpu.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index 0f6fe9a1b955..1701c2600538 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -279,10 +279,10 @@ pub(crate) fn new<'a>( /// /// Note: This method must only be called from `Driver::unbind`. pub(crate) fn unbind(&self, dev: &device::Device) { - kernel::warn_on!(self - .bar - .access(dev) - .inspect(|bar| self.sysmem_flush.unregister(bar)) - .is_err()); + let Ok(bar) =3D kernel::warn_on_err!(self.bar.access(dev)) else { + return; + }; + + self.sysmem_flush.unregister(bar); } } --=20 2.53.0 From nobody Wed Jun 17 04:13:43 2026 Received: from CY7PR03CU001.outbound.protection.outlook.com (mail-westcentralusazon11010069.outbound.protection.outlook.com [40.93.198.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 20F0623E33D; Wed, 22 Apr 2026 13:41:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.198.69 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776865279; cv=fail; b=EJP3pQa4hhRSit4NQoBpXeHQK22Ik4ovCBmg0hiDQ2fTNKC2/AgCVonaIPZqGdSETVNLUl/bvR70DmDgct9TE2f8RHNXTgNksiG+rjuIPQVMLXdaEiHRbmYCpGVgALieo/0Fzo3B9aKPJYFr89dBg3eVm/mwQgxoKWxIREkETi0= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776865279; c=relaxed/simple; bh=RXH6GaXUxQE+3AU7JxnXclTqAMIe6im+QTf2RZcMWwM=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=CWbtB8cBaHSU5WjQKlM0VB6nXxwMJBGai+ik56ydxXEgCe2m50lE1Q1rMRGdNfLCWubYLr2qYwbKh87AyGFGbBTMVcKVrBA1alFbA0QPcXWwx97QvOaLn5cCZyBFvkD1v7wbrZk/CxW1lo3ztK+YjBnWgb2BWW803FP/eJNgfNE= 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=bU6w1XSx; arc=fail smtp.client-ip=40.93.198.69 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="bU6w1XSx" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=BkNE8ZdbzTjsXTa3YLm0ruAQkoO/0LDdTwcp8EuewtzapeQcOSyTpQ+ffkOgBHBmc9WloQjB1NmVzKBtTkFTJgsxukTl0mLsmu63wx5de7y7NqrqZ7D/47Bo52fAU8T7RDHgelqTyM29nJWCVeIgPBrNLWiaG1X3I/IMHeNFAKbxUC3qtvRk0PP0h3j8qJf3SEdIlAiZb9Gyrw+Mb/nAK1ydPE/C79hqAOfGH3goVFM+/2rlXmhWzKrDrWvqJDw9eq2Ouy5pL+YgzrjaoCKaB2k1VkDP0kZYCJT4tpa/tMBbYc6cvlxUN34PPts4mxM+Yi/Sa8X3q0AE9k0GuxdI6Q== 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=DZf3zbUIXpxZGwY+LxKvkuVOlZNZWEOeNs223MK7yvI=; b=ElxL0qzwkSvO9jPszmuu982cIYeteUiKPJZ/L1PyFmeobI/7It5QqtrCD0F+o2GqAEKKQP1UJGihAnxJ5/5Iq0Y0zupYl15ZJq+dK4B0IVaZUL/xLi/G4RjEOUunsunNQGgMEJWYSKProVelDMNie4iQqXw2+5KvO9zscfhGy5Q/Q8MC6ssAMQKOLIR9ave1I+fq/o9wGmVDgDje0BHPxwOT5wo+T+BQVRTDyqQoRd3asaSBBG8afIL9Qoff5rCgVst8z4/2Ew0fCYCvmoa4Rhk49l0UWDOGI0CwMT5EVOisrYHbcONMZKNEj+VhUDOwd5mSm/LbX2Kms+4jWkRWKg== 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=DZf3zbUIXpxZGwY+LxKvkuVOlZNZWEOeNs223MK7yvI=; b=bU6w1XSx41I0WqQ6ZQMt526EXbH0Eyn5RtuVCV4fTOa4p5ogiCU1VF2BulEylFECifGjm+SpyqvwuDv4RFEsI4Eu3Nl58T1kqxvhyDbpDE/7W9jz5QbfAgyCWA4g4168KWGmz9IoZFj1p7l5nvT1oaMclcu9a0yLGKbuyQVJd5zw1zErsOx96n6vPGo9cVf7c6Xr2/il5iSE4GfNsJkvnrSW/R1hT8CV3w4iilpFoxswEVbczykNL5M3FQ8ZOH1LbRyq52stvc7H+3l3G1oI2PVJq4Zhrv8k33XVxl/J7kRUhVDfRTtknwaR4woJlfPixlsxKn6BP6YjIwq/60QsdA== 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 DS4PR12MB9682.namprd12.prod.outlook.com (2603:10b6:8:27f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.20; Wed, 22 Apr 2026 13:41:11 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::7de1:4fe5:8ead:5989]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::7de1:4fe5:8ead:5989%4]) with mapi id 15.20.9846.019; Wed, 22 Apr 2026 13:41:11 +0000 From: Alexandre Courbot Date: Wed, 22 Apr 2026 22:40:53 +0900 Subject: [PATCH v3 3/6] gpu: nova-core: remove unneeded get_gsp_info proxy function Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260422-nova-unload-v3-3-1d2c81bd3ced@nvidia.com> References: <20260422-nova-unload-v3-0-1d2c81bd3ced@nvidia.com> In-Reply-To: <20260422-nova-unload-v3-0-1d2c81bd3ced@nvidia.com> To: Danilo Krummrich , Alice Ryhl , David Airlie , Simona Vetter , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Miguel Ojeda , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Trevor Gross , Boqun Feng Cc: John Hubbard , Alistair Popple , Joel Fernandes , Timur Tabi , Eliot Courtney , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Alexandre Courbot X-Mailer: b4 0.15.2 X-ClientProxiedBy: TY4PR01CA0031.jpnprd01.prod.outlook.com (2603:1096:405:2bd::9) 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_|DS4PR12MB9682:EE_ X-MS-Office365-Filtering-Correlation-Id: dfa9fa05-3090-4056-d9d5-08dea074d0c3 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|10070799003|366016|921020|56012099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: 0iPQ+Nf9247GpUq/2HQ94LhMzs9uQwM1MELIbVLdHJsbZk9uvgC1C3iLHQxbEmo5MK4fLOAUJk4o02QFtA145Dj6SIt1UHhtVbCDtiAYOM+O2GPzuWfdGP2cf8Sc4qP8Nflazk//GYQSgGxgmuzaXgL5F+3O/CoU5ZYYxnJPHTCQZLzswoZhiKMnvEVwvc/uxapfGJfZ0reh7aIjg9zzj3BwlIpECuNAX3GuYND7qsHNfNBPoiP8xrMxp/H0/IMFh14TqXyOAgDVq2YWtRhX0wUGoJEyB8iydN7dfKWT5EdLFYJjW2F6Ev8JVckPgxwQnbUBSHSSd2bqqn11omuAi8lIV/I8GMAqNmDgRAqCuh+gIVhB5oivli9UdWmVxVP1/KIUKtGwRFh6pVSPK6NrVexGYZHhiNS5G8byDxWVrzQBNMDO7pVKVqwrQfkkuXMbT+GS4YxzGBIcTnxecVVsLSe/qrkcgAaS5U3LzCfNNxFV/7CqT6/bcXTiQ6CTeWVshJED+zSw1xT0sCPnLAAmQ7aj6SVeUDXOVM+6FOxysrZCjyQB+K2cS2K2ZuaRrMcCaxIwBLvIcWy0zRJ4fXEib6DfUvgwPaw8eUd7D8cVaqc6nSwclixxpi38mdZEzcuqA0h9TCM6jrOCq6XdySCP0bTiC+Mv30Kstci0BlcrvzmZDBMDYCXKHKxVlmpNCHIdPcoF4EmjUhACWXDFngI92y3d58FFzbt/q+QQ8KeZ1dvNUFmJ3MXLef5gqQbxn2lc1KZXMwbnV3wfjsxkqbO7zA== 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)(376014)(7416014)(1800799024)(10070799003)(366016)(921020)(56012099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?SHRXTUdoaU9xSHEwN3g2ajhobDBUajJ3MTJnSktTc09tWnRaNmQ2L1cvTWFM?= =?utf-8?B?WFgrTitTK0J1YTBJTVZIMktML1pOOHdTcHlEek5ZbWI4KzU3Rlo3d2lKUDIy?= =?utf-8?B?UWFQdVVsY0o0VFFwaDJkb1V3elVaYzlnSUxvYlhSSXo1Ui9qU3dmUVllTUJO?= =?utf-8?B?RU5QeUhwZUNTdXBuamd2U2xsYXlXUVFnQjV6UVZLV0xqU1ZKS05FelR2d0RG?= =?utf-8?B?cDVuNnh5czZlN05vUjRRbyt3S3IwZjkrM0VVbVlEMXB0Q3FnQUtOQW1lWG5G?= =?utf-8?B?cUFyN2hwUEpXaGVmcjE3Y3l1TUh4MjVsMTEyUmYxVWV0aitkY21pTzFyTjBQ?= =?utf-8?B?QjFjTUQxaGhISlZaWHpVaGYxeGJ1U29CZ3pvT21janVCUnB2ZzQvUUVtamJK?= =?utf-8?B?bm1xbEl4c3dtUHZZZUVQeTFwaXdwMmVJY2N2cCs5ZWE3eWRVMzliRDVSSmIw?= =?utf-8?B?VkdsaGpLTENsRzdxdkNJbDVUV3Q2U0pTNlZ4dFVKd0g0dTFTYzZyTnNUclZm?= =?utf-8?B?QTh1TGdtQ1oyczdaVUVTOHd0QUZzQ2RqVlUyOTRqRDB0UGhqSWwzTlJNTVk0?= =?utf-8?B?REswYm9FQWFDN3ZwMXZqREdDSGFzcGRlUHozS0pKZXhMTlY5R2NaemNYQmZ3?= =?utf-8?B?anMwTU1nVHhWdU1sdHA4NEpxNzQ4djRmK0Jxd1BjbTc3S2JjSUJkQVpZMEFl?= =?utf-8?B?WC9PUmx5NFZGUkVGd1d3cUZ1Wkh6cVlNYURjaEx1Q1FPSFdERVN5dzZaRmx3?= =?utf-8?B?SXREMjQwTVFQUHM0ZDRyczNoRnl0M3R5OGhha3lkM3R2blZkRURHWThidWpx?= =?utf-8?B?ZlZXNDlZVnZ4Y2U2VjZweWt0eFhMaFk3Qk5ERHltV2Z2MmZBdmFWUHovSDZL?= =?utf-8?B?NFpDRFhyYXVtaHp2S1p2VktUdllYbWNHZUZybGdWbU1pRllyM3l1YzQyTVNj?= =?utf-8?B?b1dJSjJwYzB2UTVXczZ3andEa2YvaUJFY0Z2eDFXQWxDZVRjOEJHbk5sWTVW?= =?utf-8?B?amJPTTRJeG9sWkRvaUdPK1dBckpmZFRuUHNiSTJVMkhFVWs5ekhnc05KMlhS?= =?utf-8?B?b0VWYmV2WTRxWGJhK2NCOE5YeGthaklqR2Q2RjdnLzRDZWNGUk9jbVhLUUpT?= =?utf-8?B?TjRkTjVaekcvcWtuNm9udDVCaWtpeUozKzhXdWVheFMzd0ZrRzJYZ1ZtaEty?= =?utf-8?B?NHJnaS9oMHl2TWxHem54cjU2Y1ozRzdSV0VQamplZHRzUEluNi90MVdIZ2xq?= =?utf-8?B?VGNLUGNSZ0NaTzBzWkVjTGF1WHcvV013eWdvOGZxRyt1cjduS1g5bnlKbERj?= =?utf-8?B?V1lRb1Q1MDVOUHZzaUVQakFlVXZia1UyM3Z5ZWV0T1FvOEZTb2JncWMzSWE5?= =?utf-8?B?MERidTFBMmxSaXV3SE5SS1g1THozSnJxMUxwR2U0WFNiYVhnbm1vZ3g1RjJN?= =?utf-8?B?MkVwSGs3WjBtM3ZnZ2RCL1N0MkRUWndrOUd3RWNnN2ZIZHRyTXpIakNuVWcv?= =?utf-8?B?cGVUN1Jod2RFNjBvWFlDZFBEOFk5TmRDTVhMcGVXeGRrREI2MzFqWEF2TUJC?= =?utf-8?B?YnZOL21VYnRlWm9EVmp5RXVReHNNV0xuZXdEVGpjMVNRRzVRODNzRlQyZE0y?= =?utf-8?B?SGtVMXZmbGNnbkowUXE5ZGVka0xYQjA2SDkzR1BWNmFYcURIai9SQ3hubFVl?= =?utf-8?B?YVNTV2hIVGJmWi9DbU5LU1RZcUZqUlJuUWxqR0pSZkNlcEFiV3d3a0ZqR1FR?= =?utf-8?B?YkxXNjJUeTBXaTF5TDNCWUpBSzdUblVVY1pzQ0Z0NjMxdnRibGtTblVlSWI0?= =?utf-8?B?emwySnF2eGY1eE9obUZxbURrYlA1RnY4cFl6Z3BBT00wbFNpcWtGNU1qTHpJ?= =?utf-8?B?Rm5GOTJTcTAydVMzeWdsckxIUzhoQmkzSlNIOU1sZllLZ1VsVjVNd25XR1RX?= =?utf-8?B?bjZFSkxIK3dCTmlNOXI0QkFzSGM2L1dRUVhiRkVkNU05YzlEbE5nLzNlRTRz?= =?utf-8?B?WnBDTkp1TEZrZEcwVVN2cXdVNVYrdGxiZGdDRUlmZVh2WmkwMFIxN0VTWXlX?= =?utf-8?B?dHV2Z0p0eGFJdmtHcWFEY1BMYThIcVBrTWhFNHV5NjQ2TldpeWlVNDN0dnh4?= =?utf-8?B?THFnbDBoYTNpVUhiQVF2dEVEbmUrbWU5VE1JN1VKQnhOdk9qaFZlMWNIL3hn?= =?utf-8?B?YjM1V0FiOGFOVUtnSWhBVW5XTkVwUEk3b0VyMVovTXd5cmVkMjFvbWI2dFVN?= =?utf-8?B?OGxJbDE1citFTFdPZktlMGgwM1dQYkR2aHlBVVhITnpobk14c1RHa0tXV21C?= =?utf-8?B?TStoeG5VbTRwcmVBdVFmWi9mNTI2dDQyV043NDVDemlDc3VXODNLTWhEanU1?= =?utf-8?Q?nqHquWhgMY5r6yGUFoCLXmfnCRgG9BLbJBRTdCgTNPyfx?= X-MS-Exchange-AntiSpam-MessageData-1: mZgqmVDXJ/yRZQ== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: dfa9fa05-3090-4056-d9d5-08dea074d0c3 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2026 13:41:11.4354 (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: 8ojC21XRF+HWx71v/ClCVN2fYWKmq9CpQ4oyfhu5WSceoj9ftzQHVf8vLTSQ3TomzONQpUC504io8hz3I/pATg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PR12MB9682 This function was useful before the generic command-queue send methods got merged, but it is just boilerplate now. Replace it with the correct sequence to queue the `GetGspStaticInfo` command directly. Signed-off-by: Alexandre Courbot Reviewed-by: Eliot Courtney --- drivers/gpu/nova-core/gsp/boot.rs | 2 +- drivers/gpu/nova-core/gsp/commands.rs | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/gpu/nova-core/gsp/boot.rs b/drivers/gpu/nova-core/gsp/= boot.rs index 18f356c9178e..9b6f349d3339 100644 --- a/drivers/gpu/nova-core/gsp/boot.rs +++ b/drivers/gpu/nova-core/gsp/boot.rs @@ -229,7 +229,7 @@ pub(crate) fn boot( commands::wait_gsp_init_done(&self.cmdq)?; =20 // Obtain and display basic GPU information. - let info =3D commands::get_gsp_info(&self.cmdq, bar)?; + let info =3D self.cmdq.send_command(bar, commands::GetGspStaticInf= o)?; match info.gpu_name() { Ok(name) =3D> dev_info!(pdev, "GPU name: {}\n", name), Err(e) =3D> dev_warn!(pdev, "GPU name unavailable: {:?}\n", e), diff --git a/drivers/gpu/nova-core/gsp/commands.rs b/drivers/gpu/nova-core/= gsp/commands.rs index c89c7b57a751..e81a865050e0 100644 --- a/drivers/gpu/nova-core/gsp/commands.rs +++ b/drivers/gpu/nova-core/gsp/commands.rs @@ -18,7 +18,6 @@ }; =20 use crate::{ - driver::Bar0, gsp::{ cmdq::{ Cmdq, @@ -176,7 +175,7 @@ pub(crate) fn wait_gsp_init_done(cmdq: &Cmdq) -> Result= { } =20 /// The `GetGspStaticInfo` command. -struct GetGspStaticInfo; +pub(crate) struct GetGspStaticInfo; =20 impl CommandToGsp for GetGspStaticInfo { const FUNCTION: MsgFunction =3D MsgFunction::GetGspStaticInfo; @@ -232,8 +231,3 @@ pub(crate) fn gpu_name(&self) -> core::result::Result<&= str, GpuNameError> { .map_err(GpuNameError::InvalidUtf8) } } - -/// Send the [`GetGspInfo`] command and awaits for its reply. -pub(crate) fn get_gsp_info(cmdq: &Cmdq, bar: &Bar0) -> Result { - cmdq.send_command(bar, GetGspStaticInfo) -} --=20 2.53.0 From nobody Wed Jun 17 04:13:43 2026 Received: from CY7PR03CU001.outbound.protection.outlook.com (mail-westcentralusazon11010032.outbound.protection.outlook.com [40.93.198.32]) (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 F3EC4266581; Wed, 22 Apr 2026 13:41:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.198.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776865284; cv=fail; b=eJY4++BgLU/8KyWYrX1GQtTBwOXFJ28zg/5GbUtpcccEKIyGzWw8ilWk+shTkC6YFkoDMDVALX94RfRbwy8bFVohHtrMtVofFK91UFXr8THT8QZJrHDm6duJrW/baobceu4BUgpu8N+oc0kkNuQF7tWgZ3IMvOsAK+mDS54mzXE= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776865284; c=relaxed/simple; bh=aCp8jjao+am3P4wJEIGjhsh72fqwZ9uT9TaGqZweW/Y=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=W78o4xkmTi39pdXzJK8W8vBDgmnO/2pOOBg7e4VddGKzkP2iUpyJdQTU/fAYeNuTEFkVB9MbAJ45SejAK2D8L9DJVs7OYXXQPKUoR1UEl5iNFKAwWH4wrLiUffajPLmWFcQrN9FeCgKBkmqfsPURcDYFmPQuBavRT3bpbkYaLJc= 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=ACMU274A; arc=fail smtp.client-ip=40.93.198.32 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="ACMU274A" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=Rfm/G4hZhtiJ4oHUDjLEWyDDEqW98noAuoezBOmmqP6UC4ai6WC26/tr8G4AwyV9MwkzcQMRJtMx7GnTCPr05KsMsndoyf3m2LYTPgDuVghgZFSN/ZOAWMhKa4+iFwbAgR7jZdW2wnSli6Lhhuetw3XHlNVKd36N2Uu8ktIYJtQnbkmOqVEbbjQOGd006QaQWVTkfJYjcIP81/3EhHRJkHnHa7lTnACxWC1qFuR1DsbV52gM/lQf12OgdgnrHnQVY1mX4WBsCEqH0AC1t3mpw5eFcCrsTQ3obL+ZG25jDxvKSmN7JpWZnggVottbEl/O29I8oOsPgXdAeFE7W1QB7Q== 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=VV6eukYANmNvNouhkF8m6FkmU2yWhQaU9nfaxU5oro8=; b=OpAAoiCjuk9/ecjxq8CWlsZLrslzlrZOMc/eyfRWOgSxKL+kd+uNlDnGMC5A95ryr5RjSvvUe4Srva5bpEYuGwXR2OQnKXWdSoE9kn/hmKza8USxbRk3ZqMg2onMQBwm1Yzene1Dz59OL6ITHCcV8MH/S1QVAz/GqWFEjelGnNp3YiuousUyw8TzEj/VJwV427vNipteL9H8JSNIQnJTnMaDD6GngKbZb2QfsxrQUr3G8rexcA+s8eHnVMxJ+XWbs/mvcfDtMHOlR+/3X116IfqJfR2USB6SgEFiz3Y2eaUnMHXytMxh3LuxwKtns5pBn7IoFHFDFKukdC/A7dLJsQ== 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=VV6eukYANmNvNouhkF8m6FkmU2yWhQaU9nfaxU5oro8=; b=ACMU274AyixfIOjvSZw/C99AzF6bcrVj0t25szTR254ITQ1y/Acl7DqohqGMbJ8khTA+wvKzNIYY7fn4+aYzJal2NLy7og9cElR4E7lhtGtbHYwILqVH0XmSORWkxGxV/Qe+v7uH2sASaQuo33iKfApRBffFMo7/ZTEAaOK/B4wNYMVJmido4b/RbTeTzi09FU9DJDuvblOG81UvIOlHBYkUCHas+S85j/6F4hKCggx7oFDhfylWtAmWCKeJRENj1Q28lqTRo7H/yptYx3fqCc9OxTEH5idVzyW0X0bjgf5+sVdskZmXv1yu1xnlp/HkCRqxgVarfH+p/c9QqQCeRA== 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 DS4PR12MB9682.namprd12.prod.outlook.com (2603:10b6:8:27f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.20; Wed, 22 Apr 2026 13:41:17 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::7de1:4fe5:8ead:5989]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::7de1:4fe5:8ead:5989%4]) with mapi id 15.20.9846.019; Wed, 22 Apr 2026 13:41:15 +0000 From: Alexandre Courbot Date: Wed, 22 Apr 2026 22:40:54 +0900 Subject: [PATCH v3 4/6] gpu: nova-core: do not import firmware commands into GSP command module Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260422-nova-unload-v3-4-1d2c81bd3ced@nvidia.com> References: <20260422-nova-unload-v3-0-1d2c81bd3ced@nvidia.com> In-Reply-To: <20260422-nova-unload-v3-0-1d2c81bd3ced@nvidia.com> To: Danilo Krummrich , Alice Ryhl , David Airlie , Simona Vetter , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Miguel Ojeda , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Trevor Gross , Boqun Feng Cc: John Hubbard , Alistair Popple , Joel Fernandes , Timur Tabi , Eliot Courtney , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Alexandre Courbot X-Mailer: b4 0.15.2 X-ClientProxiedBy: TYCP286CA0348.JPNP286.PROD.OUTLOOK.COM (2603:1096:405:7c::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_|DS4PR12MB9682:EE_ X-MS-Office365-Filtering-Correlation-Id: 641b5e00-cabd-487a-5e58-08dea074d327 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|10070799003|366016|921020|56012099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: QxVMzWOmvr/y8eu2ZUwC2VnEXGFRH7sFuChtX0SJcB6ipHZ90VUh7bghZ9MX7IKGW6y/DZKM3xNcMAcjujjXr0pofAWcDBcMrdssRmNRqEMqaNfl9TwyHNfiEs38OjF7rbGWx8eb44cQ2a8xmSdAJZz3h1S57NNFqRPYko+9dAiOVYeZrqzQmFEYWkY/I+cMcXTj2sNB30tUclxYe1KWmmX4cBjyXbaxr11iDSWA/IJqYSj/OESpKaF4u61jt2Ge4e4audKWKfD/WeT/bHDR3WftAbUNvMuqUd0teXfspZY7Ahin9Kv2+7HmOAWVoU3c9M7ZwFJSiT3PjELXPrTg+LrtVb8UwXytZ1ZZZAP8zNNUZqkNTq8WyTtQgedEVFJNePLQJe5DMY6Xo1CEbml4YFprCQxAGZXdCFgwL0NEjnniXY4cS+5evuBPJdxgc6qnuQtXoA7qltqnV2BrDXN+5sHEHMtt9Kbb82J5J1izsfJej9I0zYYNAeCVnLbdGwt9VVlgmKazJY0hV3Hjy3GY6BTlvLHCJy1AKj8ZwSSQbXhbDJADbVDUMWrdHfhvhSNwY0tNssQS3+17D62BNiAUZKEUQlOq66SoloBpkWwJ6gJnWEzxw/Xc5A37hno74u0/Zv+vShc5Akihe42cwZt/CduE+7rrjPCb3KX71aLXCwzkOW7X7uSmKV1PdIZoUF0EJ25k+i1mQbUcBB3M4eUUF9HbDm06aDlbrrEHwHyvAihBeHQQ+7cgjDeI6aTaMJph0ywbp7r7TJ5IiGQ4eVoKkg== 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)(376014)(7416014)(1800799024)(10070799003)(366016)(921020)(56012099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Z1VVQkdlOTRjbitKTTFPYnZMdjltMzd4UW4weTVxdVlXY0ZRY3BWcnFVRmV0?= =?utf-8?B?S28yY0NTaUc4eGtPM3JodW5Ocitobm4ySm56TjROM3A4ZXUvWktzUGx2Q3pN?= =?utf-8?B?VHJIZjlDdm4yNjVUY0loYkVUYlBxbEtPaGVQS2d0aUV4a1VRZWxoSGh1VXVa?= =?utf-8?B?NWV0b0xFOTBkeWpQbmxyMDUwYXJJNGNucG5vQXdGdVE3UU5pQmRkcWhiaG55?= =?utf-8?B?YlQycWJSVXJRUHdmRmFOczY5T2w4RWd3azhvREd1N1ZwL0M1T2V0UGgrS3hJ?= =?utf-8?B?RzZ1b2JYV3lkUGwvL2RuOFMvZHlWb0owWkVuMFVYNS9sNkE3Z2p3cWRvL0lR?= =?utf-8?B?TzYrd2p5MFJCd3VHOW9kcWlWa2Q4S2UybFY0K3lKd0VLWGxMN3VoRVBteisr?= =?utf-8?B?WkQxWTJGdDdISnFEM3Z1a2ZRMnVHR1pxVm94ZFllOVp4UU85N3lML09ucWNi?= =?utf-8?B?b2xiOHM0aXN1ZGl3MXkzQWtBRmNTYnhQejNqTDRGcEtmaFdycEtURU9YYTdv?= =?utf-8?B?U3E0KzVtaDZBdTFXNWUwU1dVNlBwbUlzYXlUTEt6UGVuNEtHcE1JemVNREh0?= =?utf-8?B?djd2b285L2hacWxWZkRLQzA3U3E0elV4NHR5cll1MWJFeUZVbTczR3hoRVIv?= =?utf-8?B?SnBsZDltY3lTMmNoTmpsRE5HLzMyZG1CRmR4d1M4T2RvdXJiTlE2ZjhpRzZu?= =?utf-8?B?Q2xobHd5dTZlZWpqVDFqZkNUbjdiMGFCRWJ1TVFpcmVNUDJjWXo2N0dpR0tG?= =?utf-8?B?dnJyckVMSnM5SVc5T0pVNlJvWmx4R3VBV0FVM1dCMG1Ca0V3bGhyLzFxK1Nh?= =?utf-8?B?Y3JtK1QyU1dwR0szbmEzamVObzUvaG82R3BpY3lCLy9CcVVDQmVsZXVMSjBI?= =?utf-8?B?SDk5WmY2RjZTbkZ0enRzdnpSUVpmZjNBdStUZlkrQlZmVTRjV1B3ZVpGNmdX?= =?utf-8?B?RnRVMTViSUhVaEpSN1NjYUVOWmFYRjZsZVVyOUwxU3hLU2d5Q0Y0NFlVZWhC?= =?utf-8?B?Qnc2b1BvNjQrZnk4anZDRE5iNUZPMitFQkFKbi91OWpXekZHU29rNnNjSU1Y?= =?utf-8?B?dWlBNlpNWVZQcTkxZy9DKzhRNlVPTkhHb0ZZcXNlN2RBYURYeDgrU1FSbkFX?= =?utf-8?B?aVZXNElkTXN5T29lOWtUUzY3Qjd0V0FmRURWVU5zVTBHODIvTGNlNXljUWlB?= =?utf-8?B?VGt4R2U2U09ZSGZPbEo0K2YvckNBcTVCQTRmSGoxdmFKOHNmeHJMMzBTaWI0?= =?utf-8?B?QkU1ZXdZVFZ6NGJOOEswaU5qN1diNG1IaitvbnlGeStSMUxUaTNkK09EdHVz?= =?utf-8?B?ZWZOV21qQWhJYThFZkFHN1lsam1sNHVHOG5KeXBxVVpxZ0hHMzQzK3VuS3R5?= =?utf-8?B?bEFUTEpiTzVYRFRueXhRRlFFN0pHN1JOQTF4NVBrM0JCUHFwZ085MVE2dmw3?= =?utf-8?B?aEF1cFJyQnk5d0JGblFyenN6RDlyRzVHaUs1R3ZwS3JybnJNN1Z6WEtjZC90?= =?utf-8?B?Z2NsK0pEUnZDclJlVWdwd3JxSHBTMVJnMXJ6VVoxK0NXc2VVbVozWkxyRkpL?= =?utf-8?B?ZHRCL0JjNlRYT0ZyWlN4UGF1dENmYVpSVVgxRmQ1c1dXdjZnV2JrSmVZNk52?= =?utf-8?B?aHBnOUFwRGlMc1dNb2lzSGpCaXhnVitvVGwzZlVacVUya1QxL2FqeWkrZ2N4?= =?utf-8?B?Sm53eGxwY1lQamhhLzNsdmxwSE9KTUZyTWlZNW5XVGw1QlU4UjNUdmxNRUJw?= =?utf-8?B?YmJ2bUVhVktkUWxKTDZWMmpFTjNxZlo3K2kxM3FHNXU0ZWR0YkJIdW5Qbm12?= =?utf-8?B?d09sMHRpeFh5blM3Q3RBT3R3STBlN3dHck1vaUhWOFk2c0JPU2tlSlJCLyti?= =?utf-8?B?QnpST1FDV003a0t2S1ErNE5Kd1BwOUk1YUpETFFFUjh2Uk5jdXFnUytzaDJy?= =?utf-8?B?TjZtTzlraXd6MXVtTm1IZU9DYlBOMVQ4MnFmWGwwdm1pQjdWalE4QnI1ZTRt?= =?utf-8?B?elJvay9mZzFmUXkyNC8xY0ZvVHRhbVZXMEg0VWVmb21UY1dEdCs1Yk53Smpa?= =?utf-8?B?OU9kbHliaGpqSmtmMXIrTDBkU2FIUUJLSE81U3JaTWhMZjM2dXlkZUJBTDF6?= =?utf-8?B?QzBvTkU3K3FFTktBaHh5eG5BTWdydGE5Z0cvOW1RdXBrNUxLaUUvL1NPWHV0?= =?utf-8?B?R0ZQNGdLaGFEMkM2K3c5Zy8xWnNGa1FXcTFtNjBWdUczL0hKdUMvWVBpV1Yz?= =?utf-8?B?SGhKdWtabXFteTA0ekwvVWQzMWJPSkJDT1AzSEtzZGpzM0I4dklZWHVuWEtq?= =?utf-8?B?TSs2bTEyRVhGTUM2Y0NCdFB1NXVsUGVZQkNwMlZ5ZWlobU5SVHlVVUE2RmtV?= =?utf-8?Q?jzjYUE3fdfVo+x0WIQQ1GDSIBFcH+EryLCQVZZrGTsntk?= X-MS-Exchange-AntiSpam-MessageData-1: OmhyaqR2EAcB6Q== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 641b5e00-cabd-487a-5e58-08dea074d327 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2026 13:41:15.5332 (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: aoI137Ly8t0c31GVdfht0ZqYUPKUIA/qvyFXCQVQ7jW4BzCa9X7ZlHxtbknAk4qyvnEKueyyJeiHz+SFlAJJ9w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PR12MB9682 Importing all the firmware commands like we did is a bit confusing, as the layer of a command type (fw or GSP) cannot be inferred from looking at its name alone. Furthermore it makes it impossible to create commands that have the same name as their firmware command. Thus, stop importing all commands and refer to them from the `fw` module instead. Reviewed-by: Eliot Courtney Signed-off-by: Alexandre Courbot --- drivers/gpu/nova-core/gsp/commands.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/nova-core/gsp/commands.rs b/drivers/gpu/nova-core/= gsp/commands.rs index e81a865050e0..484aeb7dfd39 100644 --- a/drivers/gpu/nova-core/gsp/commands.rs +++ b/drivers/gpu/nova-core/gsp/commands.rs @@ -26,7 +26,7 @@ NoReply, // }, fw::{ - commands::*, + self, MsgFunction, // }, }, @@ -47,12 +47,12 @@ pub(crate) fn new(pdev: &'a pci::Device)= -> Self { =20 impl<'a> CommandToGsp for SetSystemInfo<'a> { const FUNCTION: MsgFunction =3D MsgFunction::GspSetSystemInfo; - type Command =3D GspSetSystemInfo; + type Command =3D fw::commands::GspSetSystemInfo; type Reply =3D NoReply; type InitError =3D Error; =20 fn init(&self) -> impl Init { - GspSetSystemInfo::init(self.pdev) + Self::Command::init(self.pdev) } } =20 @@ -99,12 +99,12 @@ pub(crate) fn new() -> Self { =20 impl CommandToGsp for SetRegistry { const FUNCTION: MsgFunction =3D MsgFunction::SetRegistry; - type Command =3D PackedRegistryTable; + type Command =3D fw::commands::PackedRegistryTable; type Reply =3D NoReply; type InitError =3D Infallible; =20 fn init(&self) -> impl Init { - PackedRegistryTable::init(Self::NUM_ENTRIES as u32, self.variable_= payload_len() as u32) + Self::Command::init(Self::NUM_ENTRIES as u32, self.variable_payloa= d_len() as u32) } =20 fn variable_payload_len(&self) -> usize { @@ -112,22 +112,22 @@ fn variable_payload_len(&self) -> usize { for i in 0..Self::NUM_ENTRIES { key_size +=3D self.entries[i].key.len() + 1; // +1 for NULL te= rminator } - Self::NUM_ENTRIES * size_of::() + key_size + Self::NUM_ENTRIES * size_of::()= + key_size } =20 fn init_variable_payload( &self, dst: &mut SBufferIter>, ) -> Result { - let string_data_start_offset =3D - size_of::() + Self::NUM_ENTRIES * size_of= ::(); + let string_data_start_offset =3D size_of::() + + Self::NUM_ENTRIES * size_of::(); =20 // Array for string data. let mut string_data =3D KVec::new(); =20 for entry in self.entries.iter().take(Self::NUM_ENTRIES) { dst.write_all( - PackedRegistryEntry::new( + fw::commands::PackedRegistryEntry::new( (string_data_start_offset + string_data.len()) as u32, entry.value, ) @@ -179,12 +179,12 @@ pub(crate) fn wait_gsp_init_done(cmdq: &Cmdq) -> Resu= lt { =20 impl CommandToGsp for GetGspStaticInfo { const FUNCTION: MsgFunction =3D MsgFunction::GetGspStaticInfo; - type Command =3D GspStaticConfigInfo; + type Command =3D fw::commands::GspStaticConfigInfo; type Reply =3D GetGspStaticInfoReply; type InitError =3D Infallible; =20 fn init(&self) -> impl Init { - GspStaticConfigInfo::init_zeroed() + Self::Command::init_zeroed() } } =20 @@ -195,7 +195,7 @@ pub(crate) struct GetGspStaticInfoReply { =20 impl MessageFromGsp for GetGspStaticInfoReply { const FUNCTION: MsgFunction =3D MsgFunction::GetGspStaticInfo; - type Message =3D GspStaticConfigInfo; + type Message =3D fw::commands::GspStaticConfigInfo; type InitError =3D Infallible; =20 fn read( --=20 2.53.0 From nobody Wed Jun 17 04:13:43 2026 Received: from CY7PR03CU001.outbound.protection.outlook.com (mail-westcentralusazon11010032.outbound.protection.outlook.com [40.93.198.32]) (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 77C4526CE11; Wed, 22 Apr 2026 13:41:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.198.32 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776865286; cv=fail; b=NCEJewS+DfqwtC4nmBOKlGy1qncq6zVCrw481B1XKadm0nNpNiQ6cdbjDvatdvO4dLeMQVD2dqbKV80jd+fgwOQ+tyCl0uTFYpxy+KwohYkF59JDLr+jpc5aafULrAs+fY2biaZhOwS9t3/gAUN8YLy8/BVL7hofRWdHcG6+ux8= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776865286; c=relaxed/simple; bh=fRnnMRdNzmh3m7TATjXQC36GshXXm89bT5e34n8Yb5g=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=sujiGLyvAX4tubMdf5dlA+susQ88vDgPONUh2IcBpVTrzm4flbi9wA7/Ymu2zOno8+z1h3QUra/I844ewZQwNo69uQtB/OWYpgxRF4R89cJdIqEK0rdt7lCB7ArF6FRLnu+B/c/Dtr6+WZhgK0NrKRdvLWaH4QsHnn8OvH9GvAg= 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=S9kICvtJ; arc=fail smtp.client-ip=40.93.198.32 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="S9kICvtJ" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hrPNEJkeN2HkO8Eqb1mC/Plr1Bs3EjyA1xy+v3mzDBHIR6XceOnOx0+o34EPb73PBHfVthf+0PQraZbkeUGs/qS55Im6SXEKm6d9XOk5hs7zRu2ygwZRHAA2keVYhakjagu+9cQg7XHDBKvoB/ic528s/lEr1mq7BnQGeh9wLy3Sc7NNDnqsK3/LtVVS86KQzFI2HKZTnN0MnVvWj22O5jN1zoQJHZnWU7C8VkGpuOtxnrRuafoNcutXlap23azWr7CMSEfarAuBuqav5fm/+vqeZYcZaGP27mNbXA52efAV8aF6TpnXp7sbQ7HGRC/d6pbcQHxZZhX3S8oLbYzIsA== 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=quVfT2SpU81pvySJ5gTNtu1ujIf0RlidsIFMJ0Qmiys=; b=UhnZVJ+UoTLt7aH75eZAjVZ5L0QQiALbMq7lTBBUWQ+wDjfR25mDMYM6gohuzLAIkf+ZIBnVkeYd40uiRuyQbW3nTK7lWyhMKNgW+X/r2jQq507md8mXrZQJvtIQxOFd1ZfX6ZW85y1HboGGZJRTFnPOojFQO0HnW1+NnKZYrnHwoHrZWtFnvOmtEvBxd/ow/j+Vjw0Uneo1iRWjk+JRJs4vWPLg99KmPJwHDlz2h2e92rA4AxIFlNYAq4LDazIzV4cvXV+j57+xw3+6NlqGQENaCth95nUfDV3Z48sqAJv8BZJP1zKVQYXvfSG6X4ZXsFW4E2upCQq6IPvFFkgQ5Q== 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=quVfT2SpU81pvySJ5gTNtu1ujIf0RlidsIFMJ0Qmiys=; b=S9kICvtJupl74/mzHFTbaZ/q5T+cpBykjRgJcAnk7UUbZ7pddK8w9s450lCn3ZwtXF/0/wJz1Wzx/qk5TDo8k2ngSMQe/D4n+Xg50PKSqlcppgKLI7jV2EpkuKe+ljuIJn7hRlnwOuygE8ne2Vpg1iXYPRtRkrjP0bTTceBKiLG3Mf19lg8KKyL3qxODkoti0DEsz+ohdEhNEEtO7kVpjLYubxwtPGwpuFecH6lGLOrkeTz6g2gxMeAjy1FjTJrYmApaJZmPRJbMlTifu/vP4vw/y7/+HYmCGAkCvgRlsBnf0WzbPRQNcgChQcfjIg0sNXMwf61wCd5SJYU/noimww== 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 DS4PR12MB9682.namprd12.prod.outlook.com (2603:10b6:8:27f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.20; Wed, 22 Apr 2026 13:41:19 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::7de1:4fe5:8ead:5989]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::7de1:4fe5:8ead:5989%4]) with mapi id 15.20.9846.019; Wed, 22 Apr 2026 13:41:19 +0000 From: Alexandre Courbot Date: Wed, 22 Apr 2026 22:40:55 +0900 Subject: [PATCH v3 5/6] gpu: nova-core: send UNLOADING_GUEST_DRIVER GSP command upon unloading Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260422-nova-unload-v3-5-1d2c81bd3ced@nvidia.com> References: <20260422-nova-unload-v3-0-1d2c81bd3ced@nvidia.com> In-Reply-To: <20260422-nova-unload-v3-0-1d2c81bd3ced@nvidia.com> To: Danilo Krummrich , Alice Ryhl , David Airlie , Simona Vetter , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Miguel Ojeda , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Trevor Gross , Boqun Feng Cc: John Hubbard , Alistair Popple , Joel Fernandes , Timur Tabi , Eliot Courtney , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Alexandre Courbot X-Mailer: b4 0.15.2 X-ClientProxiedBy: TY4PR01CA0055.jpnprd01.prod.outlook.com (2603:1096:405:372::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_|DS4PR12MB9682:EE_ X-MS-Office365-Filtering-Correlation-Id: 412898d1-8880-4bea-304a-08dea074d594 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|10070799003|366016|921020|56012099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: 7pvdKnmR4zN+k5qduPt9OxhIk9N5Bk/eHdq7rWUnzsGsbo75tNZnQIlAEDv4f6Jbzmq0XbZ5r1ykWTwb0McM9Sm83y5XegdTnx0kJpwoRoyn1/ucG+qUVzpy+qwUr3Ib3Y9veGNuIg1pxZZ8ZbStGmeStPJo+vN8Ss1Peq2gWODOC/wn12zOP9CboTT6+yAuccvkYvvh2OIl5aFKRU7ciy/4oJRg8lFkFErtsb5JW4baKDp9KdS6XnZ/OgfM1nXnXJYcvXl05LMTd9X/ajfjNtSBv4oUy1FWWQ76M52lbUsQNuSyBDCRkJeNUe1dD7RioEUdgS7UYOJQTw9f8mavpkq3z3k5qmJC1KfYYAiS22/qYEDsW52FXkplBqumWDEBxO8kFEcUYniKD/fJElwSyQwo/Npeo93FZWG/DqLD5SbI98KbLEA0LfPvlhaoD2F5vVlQhAn0deM5E2OmxJ+m2JFFQjxn88fQxXYV+uLRjPe4OWtHxlFoYViwdi+AAHO4UiSwbg0HAWtcwlXnqYHctoxfxvWP8NAuqdyFn88K8YNF6hbLUZPU99b6hxe14m5L5KW6Q1xvMJ7l2fU4jEN1iKh8SiSl7MUx8lhs0+ecqI1sDWx70XgxRKh00ca2Dptw24TlMwZq0ob9MNZtnBrF1y0HdapUYahIUkqbRJPb6E/j6AfJvpSPEuxLm1tm8LqnmsjM6zFCzzWqNKJv+2vnPdukrYXqGY/HBFW2Mw5FkJjGJoRFHfMpNSnBNofz25lhPSPD3d1jeIMcqCUhrCS6Jw== 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)(376014)(7416014)(1800799024)(10070799003)(366016)(921020)(56012099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?TzA1QXJ2UW1mV0krSjQ1ODE4UHV3R1crRkExWFBKYXN1YlRmSndBRFpuYjVF?= =?utf-8?B?MFAzRFZEdHNaZ2g2eWF0djhMNmdIRldITlMyV0NsQkw4SDhQdytxaU1QaThs?= =?utf-8?B?QTNVSmxtQ1FpU3A5WGdQM2ZrSEJkS1ZWVktzeThFai9pb2xlU1BlSjZrUmpL?= =?utf-8?B?OGQrYzhaNkNyN0xHYVRyZ0JhNlF3S0lvQzk3ZXZJTEJlRjQ3TmxnRjVuNUFu?= =?utf-8?B?UzdPZENNWnJpc0tqVmZiUE00SGpRY1IyUmNZSThqQk50b3NCcTFOcmt2Y3Nj?= =?utf-8?B?TTc5NTdPejJXK2J4Snp3U1lNWC9PYmhBaXZGaURTVndCNzBGNlE1MU93dnBB?= =?utf-8?B?NkhCZlgrSmx0ZDlMRExHYm9rK2xIZmlDTjdlSFVyeGJnVExGNUs2MlgvcVov?= =?utf-8?B?SHVBZ2xyNEhTazg4Ujg3ZXRncERQWHZWOFhQQlFlR2xFSDBCeGtxMVdET3gw?= =?utf-8?B?NjZyNkVzeVJTY3FwcHZhbEFOS2thWThUOW9uMldtdko0THpRdjNwNStCS29G?= =?utf-8?B?VEtHVjh2Rkx3bEFQdURrVDBTZDhDdUEram9yTVBkVG9CNHFSN2NjRXpzbEhS?= =?utf-8?B?aThmSWZianhqcHFHWk5BR2t2VC93OHFtb2lxWVE2N2VrbEZBcEFNV1dDM3FM?= =?utf-8?B?WW40OVh0UlRKeFc3OHJWTnBZaWN2OHpWNzVRc0tBK0c3enYwWFZwTWN5eVU1?= =?utf-8?B?SHRheWxqN1V1UEFUd3pRSnUyV2hwMkNXOC9EanNRTHB0QWp0S2M4elFsUzMy?= =?utf-8?B?NjlST2xtaWVWUlE5SndtMGdub0llOHNJZUFuWXM1Y0d5VVJPSjhnR3ZpNEJi?= =?utf-8?B?MlkxWUhyZEwzamloRkc1ZU9jV04rdG9vSGtmY2E0OFZlTFV3eGN6eGxkRVFw?= =?utf-8?B?TDJ5MXg0cEVBYUdXZ3pRaUw4OEtkYzZmSTBqMmRENXJMWVpWei9Od1FURDYv?= =?utf-8?B?K0pYNGZNMXhhemp1b2ZENlJqN0c1V24vNGJrVm40ZVlRWE4rb0YxNW5CR2lC?= =?utf-8?B?SXJpRHRMOTVmMFB6anVFY3dXWlcvcm95KzdHaU5GYTFzWFEvTkRqaEE0NWNh?= =?utf-8?B?K3cvQzZGazdHUzhXUDBFbmwrZXRjZ2hTRElyeFhEa1hKTXcyc3hEQSthZWo4?= =?utf-8?B?SUY1VnM2blJiOWtqOGUvVjFrbkZ3ME5YOEpEYS9pSVdHdGRnbjc1blRzRnAv?= =?utf-8?B?RzBRQ2dNT1B1eVlDamNaTmNCOGNOTmRDSE5oeWRRS3hwTDZiY1ZJMnR1cG0v?= =?utf-8?B?UlJMZmUydjgwU080VHorZzkxWEc5VkJXNGxnQm5hMXZpUXlhaDMrVnEvYnFa?= =?utf-8?B?L0RKVHh3ZUJEWnUwaStRTXlJS1N0R1BGU3RRdnNkNStEeFVjL2p5RHdlcHQ2?= =?utf-8?B?SjZvM1FjTDdBd2tER29MdDR2aHJISDA5SmhPbTJxbWJzREZnZllGRWhrNDNC?= =?utf-8?B?dU1IZjgwN2x3KzdFb2kvTG1wZEdzQm1Memw3QnhDU1BVZVhuUU1yV3J5K2F5?= =?utf-8?B?elJYVms4dkhDbWdvblErd21OaDJaemNTajhaS1JONEU0VmdKTWZzY09FRXAw?= =?utf-8?B?d2Z3aloxQ2tUM1ZCVE5vZ0lreGxoa0FCeVZnTWk4OFYvSUFvbzNRWTkvYnBj?= =?utf-8?B?YmxhcWtDbzY4ZW9mdmg2QXhjVmI4UFBMbm8rT2VTS1FWcVZtaEl6bHYwbWZR?= =?utf-8?B?NEsrTkx3QW00M3JNZ2xsNkI1aFBTRks2M29tdCtrRnpJYmgxQWtFQjVyQllY?= =?utf-8?B?dTZjb0RPbUpnRWVEMDRzOVIzQ0FGOFhmS09XU2MrYnY3aGI0c3NOZmxWL1Vw?= =?utf-8?B?eURJU0lNM0FvWTBWMFp2RWcwRmtPVmFpbDE2TVZ0QVVtcEM5OWVVNlVCbUFR?= =?utf-8?B?QXVOTm9nS2k2TjhmSzZsQ2hhQW9NYlo3aC9rTUxiR1IxaGJMaW1ham5udDQv?= =?utf-8?B?dkcwZUlWWVFSa0JnS3dJdHhUWXdaVUxQbW84MDkrN21saDZmOEdRMEV1UXdM?= =?utf-8?B?YVI0ZE1PcWlSYmpQeWphVHlUR2xkYWs2MS9TWUVIZVVxTGs2QU1Ka3V4YUZD?= =?utf-8?B?Y3hRb05Xd2hkdEdyeUZXWXYwR3VZYS9mY25ZeGp1N0hTc1gzVzNUdkJyOHdE?= =?utf-8?B?Wk9nRzQ4eXZFUXkrT1R5ZTY3Y3E2YUtXYys2RFpCQTJnSmpkVGZQZVZRVWJp?= =?utf-8?B?WEs1TWJjUHg5aVJhWWxLZ01tcUw5WUdYSFQyR1ZrbnIvNHlFdkt5NDB1ak9h?= =?utf-8?B?Z0tTS1E1R3hhaSt2ajZyNEJaOUtrQVJQNEVwS0hVYVR3VTVOeURwWEJjemlV?= =?utf-8?B?OHg1VTlPMmxGclZ6N1BlYjBUUVUvd1RMN2hkZk5VZTQ1UFhSejN6cytvdUgr?= =?utf-8?Q?nMYUBHWL3+ny8KodiimXHl3KzGd20D4Tq+VwPA4aNCkNM?= X-MS-Exchange-AntiSpam-MessageData-1: iLXEcK2NvJBuKg== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 412898d1-8880-4bea-304a-08dea074d594 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2026 13:41:19.4621 (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: Plwu+PRsQ8c/WyluEawNCDn40FBCFkMw7piIxAceJhW0g6wZVsLCO8JzYENgkAaakFsyerNXNyXHNI4sRycw/Q== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PR12MB9682 Currently, the GSP is left running after the driver is unbound. This is not great for several reasons, notably that it can still access shared memory areas that the kernel will now reclaim (especially problematic on setups without an IOMMU). Fix this by sending the `UNLOADING_GUEST_DRIVER` GSP command when unbinding. This stops the GSP and lets us proceed with the rest of the unbind sequence in the next patch. Signed-off-by: Alexandre Courbot Reviewed-by: Eliot Courtney --- drivers/gpu/nova-core/gpu.rs | 5 +++ drivers/gpu/nova-core/gsp/boot.rs | 45 +++++++++++++++++++= ++++ drivers/gpu/nova-core/gsp/commands.rs | 41 +++++++++++++++++++= ++ drivers/gpu/nova-core/gsp/fw.rs | 4 ++ drivers/gpu/nova-core/gsp/fw/commands.rs | 44 +++++++++++++++++++= +++ drivers/gpu/nova-core/gsp/fw/r570_144/bindings.rs | 11 ++++++ 6 files changed, 150 insertions(+) diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index 1701c2600538..8f2ae9e8a519 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -277,12 +277,17 @@ pub(crate) fn new<'a>( =20 /// Called when the corresponding [`Device`](device::Device) is unboun= d. /// + /// Prepares the GPU for unbinding by shutting down the GSP and unregi= stering the sysmem flush + /// memory page. + /// /// Note: This method must only be called from `Driver::unbind`. pub(crate) fn unbind(&self, dev: &device::Device) { let Ok(bar) =3D kernel::warn_on_err!(self.bar.access(dev)) else { return; }; =20 + let _ =3D kernel::warn_on_err!(self.gsp.unload(dev, bar, &self.gsp= _falcon)); + self.sysmem_flush.unregister(bar); } } diff --git a/drivers/gpu/nova-core/gsp/boot.rs b/drivers/gpu/nova-core/gsp/= boot.rs index 9b6f349d3339..cd11df319640 100644 --- a/drivers/gpu/nova-core/gsp/boot.rs +++ b/drivers/gpu/nova-core/gsp/boot.rs @@ -1,6 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 =20 use kernel::{ + bits, device, dma::Coherent, io::poll::read_poll_timeout, @@ -33,6 +34,7 @@ }, gpu::Chipset, gsp::{ + cmdq::Cmdq, commands, sequencer::{ GspSequencer, @@ -237,4 +239,47 @@ pub(crate) fn boot( =20 Ok(()) } + + /// Shut down the GSP and wait until it is offline. + fn shutdown_gsp( + cmdq: &Cmdq, + bar: &Bar0, + gsp_falcon: &Falcon, + mode: commands::PowerStateLevel, + ) -> Result<()> { + // Send command to shutdown GSP and wait for response. + cmdq.send_command(bar, commands::UnloadingGuestDriver::new(mode))?; + + // Wait until GSP signals it is suspended. + const LIBOS_INTERRUPT_PROCESSOR_SUSPENDED: u32 =3D bits::bit_u32(3= 1); + read_poll_timeout( + || Ok(gsp_falcon.read_mailbox0(bar)), + |&mb0| mb0 & LIBOS_INTERRUPT_PROCESSOR_SUSPENDED !=3D 0, + Delta::from_millis(10), + Delta::from_secs(5), + ) + .map(|_| ()) + } + + /// Attempts to unload the GSP firmware. + /// + /// This stops all activity on the GSP. + pub(crate) fn unload( + &self, + dev: &device::Device, + bar: &Bar0, + gsp_falcon: &Falcon, + ) -> Result { + // Shut down the GSP. + + Self::shutdown_gsp( + &self.cmdq, + bar, + gsp_falcon, + commands::PowerStateLevel::Level0, + ) + .inspect_err(|e| dev_err!(dev, "unload guest driver failed: {:?}\n= ", e))?; + + Ok(()) + } } diff --git a/drivers/gpu/nova-core/gsp/commands.rs b/drivers/gpu/nova-core/= gsp/commands.rs index 484aeb7dfd39..5f6997cdb911 100644 --- a/drivers/gpu/nova-core/gsp/commands.rs +++ b/drivers/gpu/nova-core/gsp/commands.rs @@ -231,3 +231,44 @@ pub(crate) fn gpu_name(&self) -> core::result::Result<= &str, GpuNameError> { .map_err(GpuNameError::InvalidUtf8) } } + +pub(crate) use fw::commands::PowerStateLevel; + +/// The `UnloadingGuestDriver` command, used to shut down the GSP. +pub(crate) struct UnloadingGuestDriver { + level: PowerStateLevel, +} + +impl UnloadingGuestDriver { + /// Creates a new `UnloadingGuestDriver` command for the given [`Power= StateLevel`]. + pub(crate) fn new(level: PowerStateLevel) -> Self { + Self { level } + } +} + +impl CommandToGsp for UnloadingGuestDriver { + const FUNCTION: MsgFunction =3D MsgFunction::UnloadingGuestDriver; + type Command =3D fw::commands::UnloadingGuestDriver; + type Reply =3D UnloadingGuestDriverReply; + type InitError =3D Infallible; + + fn init(&self) -> impl Init { + fw::commands::UnloadingGuestDriver::new(self.level) + } +} + +/// The reply from the GSP to the [`UnloadingGuestDriver`] command. +pub(crate) struct UnloadingGuestDriverReply; + +impl MessageFromGsp for UnloadingGuestDriverReply { + const FUNCTION: MsgFunction =3D MsgFunction::UnloadingGuestDriver; + type InitError =3D Infallible; + type Message =3D (); + + fn read( + _msg: &Self::Message, + _sbuffer: &mut SBufferIter>, + ) -> Result { + Ok(UnloadingGuestDriverReply) + } +} diff --git a/drivers/gpu/nova-core/gsp/fw.rs b/drivers/gpu/nova-core/gsp/fw= .rs index 0c8a74f0e8ac..59b4c4883185 100644 --- a/drivers/gpu/nova-core/gsp/fw.rs +++ b/drivers/gpu/nova-core/gsp/fw.rs @@ -278,6 +278,7 @@ pub(crate) enum MsgFunction { Nop =3D bindings::NV_VGPU_MSG_FUNCTION_NOP, SetGuestSystemInfo =3D bindings::NV_VGPU_MSG_FUNCTION_SET_GUEST_SYSTEM= _INFO, SetRegistry =3D bindings::NV_VGPU_MSG_FUNCTION_SET_REGISTRY, + UnloadingGuestDriver =3D bindings::NV_VGPU_MSG_FUNCTION_UNLOADING_GUES= T_DRIVER, =20 // Event codes GspInitDone =3D bindings::NV_VGPU_MSG_EVENT_GSP_INIT_DONE, @@ -322,6 +323,9 @@ fn try_from(value: u32) -> Result { Ok(MsgFunction::SetGuestSystemInfo) } bindings::NV_VGPU_MSG_FUNCTION_SET_REGISTRY =3D> Ok(MsgFunctio= n::SetRegistry), + bindings::NV_VGPU_MSG_FUNCTION_UNLOADING_GUEST_DRIVER =3D> { + Ok(MsgFunction::UnloadingGuestDriver) + } =20 // Event codes bindings::NV_VGPU_MSG_EVENT_GSP_INIT_DONE =3D> Ok(MsgFunction:= :GspInitDone), diff --git a/drivers/gpu/nova-core/gsp/fw/commands.rs b/drivers/gpu/nova-co= re/gsp/fw/commands.rs index db46276430be..e0f1cd92681c 100644 --- a/drivers/gpu/nova-core/gsp/fw/commands.rs +++ b/drivers/gpu/nova-core/gsp/fw/commands.rs @@ -129,3 +129,47 @@ unsafe impl AsBytes for GspStaticConfigInfo {} // SAFETY: This struct only contains integer types for which all bit patte= rns // are valid. unsafe impl FromBytes for GspStaticConfigInfo {} + +/// Power level requested to the [`UnloadingGuestDriver`] command. +#[derive(Clone, Copy, Debug, PartialEq, Eq)] +#[repr(u32)] +#[expect(unused)] +pub(crate) enum PowerStateLevel { + /// Full unload. + Level0 =3D bindings::NV2080_CTRL_GPU_SET_POWER_STATE_GPU_LEVEL_0, + /// S3 (suspend to RAM). + Level3 =3D bindings::NV2080_CTRL_GPU_SET_POWER_STATE_GPU_LEVEL_3, + /// Hibernate (suspend to disk). + Level7 =3D bindings::NV2080_CTRL_GPU_SET_POWER_STATE_GPU_LEVEL_7, +} + +impl PowerStateLevel { + /// Returns `true` if this state represents a power management transit= ion, i.e. some GPU state + /// must survive it (as opposed to a full unload). + pub(crate) fn is_power_transition(self) -> bool { + self !=3D PowerStateLevel::Level0 + } +} + +/// Payload of the `UnloadingGuestDriver` command and message. +#[repr(transparent)] +#[derive(Clone, Copy, Debug, Zeroable)] +pub(crate) struct UnloadingGuestDriver(bindings::rpc_unloading_guest_drive= r_v1F_07); + +impl UnloadingGuestDriver { + pub(crate) fn new(level: PowerStateLevel) -> Self { + Self(bindings::rpc_unloading_guest_driver_v1F_07 { + bInPMTransition: u8::from(level.is_power_transition()), + bGc6Entering: 0, + newLevel: level as u32, + ..Zeroable::zeroed() + }) + } +} + +// SAFETY: Padding is explicit and will not contain uninitialized data. +unsafe impl AsBytes for UnloadingGuestDriver {} + +// SAFETY: This struct only contains integer types for which all bit patte= rns +// are valid. +unsafe impl FromBytes for UnloadingGuestDriver {} diff --git a/drivers/gpu/nova-core/gsp/fw/r570_144/bindings.rs b/drivers/gp= u/nova-core/gsp/fw/r570_144/bindings.rs index 334e8be5fde8..f82ed097b283 100644 --- a/drivers/gpu/nova-core/gsp/fw/r570_144/bindings.rs +++ b/drivers/gpu/nova-core/gsp/fw/r570_144/bindings.rs @@ -30,6 +30,9 @@ fn fmt(&self, fmt: &mut ::core::fmt::Formatter<'_>) -> ::= core::fmt::Result { fmt.write_str("__IncompleteArrayField") } } +pub const NV2080_CTRL_GPU_SET_POWER_STATE_GPU_LEVEL_0: u32 =3D 0; +pub const NV2080_CTRL_GPU_SET_POWER_STATE_GPU_LEVEL_3: u32 =3D 3; +pub const NV2080_CTRL_GPU_SET_POWER_STATE_GPU_LEVEL_7: u32 =3D 7; pub const NV_VGPU_MSG_SIGNATURE_VALID: u32 =3D 1129337430; pub const GSP_FW_HEAP_PARAM_OS_SIZE_LIBOS2: u32 =3D 0; pub const GSP_FW_HEAP_PARAM_OS_SIZE_LIBOS3_BAREMETAL: u32 =3D 23068672; @@ -880,6 +883,14 @@ fn default() -> Self { } } #[repr(C)] +#[derive(Debug, Default, Copy, Clone, MaybeZeroable)] +pub struct rpc_unloading_guest_driver_v1F_07 { + pub bInPMTransition: u8_, + pub bGc6Entering: u8_, + pub __bindgen_padding_0: [u8; 2usize], + pub newLevel: u32_, +} +#[repr(C)] #[derive(Debug, Default, MaybeZeroable)] pub struct rpc_run_cpu_sequencer_v17_00 { pub bufferSizeDWord: u32_, --=20 2.53.0 From nobody Wed Jun 17 04:13:43 2026 Received: from CY3PR05CU001.outbound.protection.outlook.com (mail-westcentralusazon11013055.outbound.protection.outlook.com [40.93.201.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C8B6327FB35; Wed, 22 Apr 2026 13:41:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=40.93.201.55 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776865289; cv=fail; b=ZvOJ8ZhvRKUif2SDjgeAz2LAA6ZX1Z6UWcyA+9PbBiV88yTeu/iBX66eMKbLhEy2skTK2ZHMyu21xS9e+g49P6wZfdoSXf+0hdR8peYQJl/QZmJx2MS3lLUV4HlLwHY6ZMawVK+oOuEAh0Kfia8b/WOFlG241GLwVJg8DGFucGM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776865289; c=relaxed/simple; bh=ILKQ86iJ5I/i17BuiF6PbkYtUqR3OHZ0M5oRK8gyJvU=; h=From:Date:Subject:Content-Type:Message-Id:References:In-Reply-To: To:Cc:MIME-Version; b=gtATXe6Gm8B4RwN2avwFl6FwBbjFWP1Cu3ETBwDaFbweGfS/SxtTo8mrDDSjMYbiSjmLYTskhtYz9on8Iq6MfJM1s5Fwj+GPZYmyuuJFyUoW9qvEFiPsiN9YalRlCdsBwI+G7xIsHlqz3XCkhMN3sdAJGz7ZaCLBRkz0ILS3CgA= 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=oNh9FSbr; arc=fail smtp.client-ip=40.93.201.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="oNh9FSbr" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=flSbWIuwXKHURBch/hfJEI33JLBH/doPop4VcFoLFBTzsABVEin5cMCM+gquZIBrqet6nA0aB89cvKo+tlGMrqQtdYHCt//0TQVxlh09gydQzRvyZ3gRe9Z8bCidhpQsvHppWbBArUyUOMwLrbs2gTf/4kRHiMG66monNAef9mA+MqUnNM+JvIudaz8U+0tX1XTLnBUdDMBTPo+ovdmsypdDubWBoaKeJE1AJLsTmCEKxFTkDlZaI9LeMVMmLMAzpLDXI1BtnJC8LneRcaSSCwSIfjDCvzbHU/sgtmSVstJn1HQIntFnkRVX3ui2m8XwFvV5Iy34D646K2uzSpQ84A== 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=cU+xgcFbPdC6SH9Rz6la9XdD4fP49qgz8gXtUnasCis=; b=jfonCzl7ffmvTvuM6pWuc0udz/rH8DOUC+q043LW+60rwtnkbtXl+26ETkaNAo3+b07be2kp2R00WZrnhX6BDwIUudpf8Mrz15VwlHDB4TTYq2p6cZwhg6yluUG2gNLRcWZJyzRot6KvRvWnJrvWU5b4io595W86hC472N896SgP6JPBKKWrb2v4FMGlJb5p4eYTCqkLsOzfJvOpzYI1UDOxodnoM5oUSGW/Wrr8Aln+wDeo1MnHjEUisUPtbgJqg4YS2mfHf/ZU4rnvjfQgn/r4KYjscRFFAkx2Bn22lvrgiRqXFn7R3lCyWT9N3fruYvVeLQ5I0ve8G83bTvGHYg== 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=cU+xgcFbPdC6SH9Rz6la9XdD4fP49qgz8gXtUnasCis=; b=oNh9FSbrNnXboj5JVQhn7XVyTQsO5MD6uJ68kuVgIFaNJRu87NlPsVR7vxm1uUu3t98ranSh9U7Z3be0eMd0dlxOmKa5woP0Hpbsf5WFgOs5cplIVDLcuKtGn46l0JuxYI7x28iwhHRShAR5WyjcZWYJi5gc7X2sjkf6B10N2NNTUjW7FrxxbTEsWWk1qw/Q/HKuVmW3wI39qLHTx0qPKcMS6ZU2d9vKUG7PVusMEg/jn+N8ejk8B/zh3Yfr0SaFS0eWp+GdJADpood64d3Lkkn7ih5HuKl84Zu/NvFocaSnB+rwt0WivjoMObggk8f60I8YYlP1/hE0n9twHKymVQ== 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 DS4PR12MB9682.namprd12.prod.outlook.com (2603:10b6:8:27f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9846.20; Wed, 22 Apr 2026 13:41:23 +0000 Received: from CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::7de1:4fe5:8ead:5989]) by CH2PR12MB3990.namprd12.prod.outlook.com ([fe80::7de1:4fe5:8ead:5989%4]) with mapi id 15.20.9846.019; Wed, 22 Apr 2026 13:41:23 +0000 From: Alexandre Courbot Date: Wed, 22 Apr 2026 22:40:56 +0900 Subject: [PATCH v3 6/6] gpu: nova-core: run Booter Unloader and FWSEC-SB upon unbinding Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260422-nova-unload-v3-6-1d2c81bd3ced@nvidia.com> References: <20260422-nova-unload-v3-0-1d2c81bd3ced@nvidia.com> In-Reply-To: <20260422-nova-unload-v3-0-1d2c81bd3ced@nvidia.com> To: Danilo Krummrich , Alice Ryhl , David Airlie , Simona Vetter , Bjorn Helgaas , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Miguel Ojeda , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Benno Lossin , Andreas Hindborg , Trevor Gross , Boqun Feng Cc: John Hubbard , Alistair Popple , Joel Fernandes , Timur Tabi , Eliot Courtney , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, rust-for-linux@vger.kernel.org, Alexandre Courbot X-Mailer: b4 0.15.2 X-ClientProxiedBy: TY4P301CA0033.JPNP301.PROD.OUTLOOK.COM (2603:1096:405:2be::13) 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_|DS4PR12MB9682:EE_ X-MS-Office365-Filtering-Correlation-Id: e9a15c13-5cfa-4cf8-89ef-08dea074d7c6 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|376014|7416014|1800799024|10070799003|366016|921020|56012099003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: EBfKE1iPDdQzByyvCbz+JzhlNnNr8e1IwWeCFqnZy+rxmjUB1HFIKl6/OpPvoRyNiMp23oK44iNnQ9SgPI96mfBrTAl0xDDDWxV31WynGCtddUJMMkEC4pBaowgoLlwTcDGeXMHc0VDOCf8rpUAX/Yqg7r2J0Xo2ge9br4svMOBFhrgOz+2ZavhaZ49H6HmbDxGL2kRytmQusm5bLT1/mifK6HsuIT1sqIc5sKmB05gEAgt6RpJKHpXrT6t1c4eO45YWUhrUq02//gSs28Fjnf+qJfwRsHQ2PZkWUViwmV9zfqtOfpTKTKjqD1/EpEC2x9wpaoe5t34seOZEpn30CksG2L9GX8BxuFlchKbzJ5nQQSZ45yccQEANQlSg/VdEMirJLmUsB57MRF2li2Q5whOSz4vaVEkdj3LTXTW+9fObw6f/2Oz6pjI/YufPDxWJuU5yhOe289K91seWWWf65P5iyTZ2P1+JE7+gcRef5dr0wRwUg7jy69bXm6aZu+95ay3fp4huvVQv8tbqcVIr7nG7TOF9JqmUaKdPtxe4T3WdNFrxM1r7WLAz09Kz/0FaaeoNxZ9ZrEuxM3PY++q8neCo0SCp88r6Qu9qsLVYEukWRLuZ9J7MvnSfjVZh0ahZc1NA9uSFjLCkD6X60IfRwip9DAJeqw4/hmPpKYGvA7aV7CY8ReUQmPWHFpfeAIVxkj7p5eMRksPwllZ3bMDdPa++JSP0oczhnhhlNkoqxvBFpVZ54O+PKfCnZhR3b2Da1AFHprXqVBptBni4HwJ8ZA== 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)(376014)(7416014)(1800799024)(10070799003)(366016)(921020)(56012099003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2 X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?dWY1Y3BPdHE3QXlJcDR5SWdCSlhUT3NEeVZqSEtrTGhMdy9JRnhtYi9zbkRN?= =?utf-8?B?cHZ5TjR0aG9OVHBhM0oxNDlsaW5yZE16U3RDL0RwSkdlR3I4ZEt2WGNiL1Fj?= =?utf-8?B?RWRxV2tlYi9zcjZHbENDSUVFMWdCNmxMTysxc1NIaU8zMElGRlhnNzZjMS8w?= =?utf-8?B?WVR5bE85dnFkemVqdjArUGZFcy9NdW4za0M4QUJjWUVTZlVaYTAyZk9vWlhv?= =?utf-8?B?QUtiUWNIYTJ6dmNqUEt1SDZlSjkxeVgwd1cybEh0eWJRZWpzSEdkQStFNGwy?= =?utf-8?B?WnpBYUZjNlRTelQ5Q0d3ZFVBdnkwM2dGT1dxN2xEOGxmT1QwZTVvTjBWeEpR?= =?utf-8?B?a09QVE9kTGwyRmczL29ha3dCZStaMGE5amsrbUlLSFF5dXpzdWk0NkRrTDFq?= =?utf-8?B?RjlBTlJteUdvR0ZEUy9jOTg5bFFTMDkwR05tL21FRXhlM2ZlZ254UFBRK3ZQ?= =?utf-8?B?YmppQ3BLWS9VazRSNUF3UE0rK2ZKMTZ0YnYwTmdaVVFBUWcwRjgxL0s1RTZM?= =?utf-8?B?Yk05b2k0V2VpZ2dxcGxtOEdVQ3NIMUJIS3FaY2RGaks0VnowbGtncW9ET1Zo?= =?utf-8?B?c1N6Y2Y4L29JVjZBZDNXZnBKSEgxbURMTzdkeExEUEN2bTBVckpxUnU4S0lZ?= =?utf-8?B?QVp2VjJKTDFmeXI3c3RsMWt3cm9nK0lBeXZ2bFZ2dGJPZE1vdHZuSTBaSXY0?= =?utf-8?B?K0IyUEJQVzJ5UDdoN0p1b09TRit4LzYzTlo5WGVtMG1xNzNDOVlGRjhHNEc3?= =?utf-8?B?TkpWcGN4YWYydGU0VStKUm1Eb1RiZkt2eXlZNXZ3Vno4K2hoQ3E4NHIycGc5?= =?utf-8?B?WHR2Z0tMWk5ZMEdFOWNzMzlGWnY2cTllNkMrdVBKWUpHb0QxclF5MWhaQm8v?= =?utf-8?B?S2JkVkRmL2ZSM0JzOXdESHJQTHltT1A5MGYvbVZTbmRlajUyVnNRMEZFK0ps?= =?utf-8?B?dmdnU0xOdUc1bHVxbC9LMExLcHVZcW1QU1k4ankxWEEwRm9ZWHVkUldZUXZV?= =?utf-8?B?RktzM0t4TnZ3emtjSTFPeWVHNGRxcnRoZ3FSUTc5QWJSaHliK1JFVW8vZWl6?= =?utf-8?B?eVdPS2VrNzB5MEwzWUlOYkg2SWtjdVRkUzZWSUV0Umg0VG1UazZobUdodXMv?= =?utf-8?B?SENTK1ZqUmFrb1BHNUZFdzVhSzU3dEtIUXVGOHNLaFJ0UHU0cytLY0ZiT0Nm?= =?utf-8?B?cU1ldUZxTEJ3QzM4V2RrQTBnNWxhcDVUMTg0ejBtdG14ekQ4d2RoSWR3WFpl?= =?utf-8?B?cTJDRk5VVEY3NXBVVmYwWG1oYkcxZnh5cDNvSUJxdEtSQkRkV0RvQmdiQU1G?= =?utf-8?B?d2NSSkZQVWxMdkFhREgyOVBnQ0o0dnVZL3BEdHJKNVRueERSVUMybnJXcFBx?= =?utf-8?B?bkV1cFBmSUJYam93dlU0ZDFhZSs4dlh0R2RlUWFSM2xLUzUxcDR5WXhCN281?= =?utf-8?B?c0dqWWkzajIyK3E2NTAycGVKOHlOczFGd1Nxd0hsaHVSMlVHa2pyd1VLYnVs?= =?utf-8?B?eVBESEJGaFRCWlVESHZBd3d2TFdKcUR1UUQ3TTZMSi9ZL1ZGNHFJY2Nyc3JX?= =?utf-8?B?UE00R29URTJzV1IxeVBHZ3ZPMWd2aTB3MVNmSzlKcXMwanNIWm5jTUJFK2RT?= =?utf-8?B?Q1J4ZCt1TEpGYm1oV29MTCtJY0NzNDI5M0Z4MUZvb1N6YlVUL2pqL21HSVcw?= =?utf-8?B?Tk5qVU1nVlVYcGU4eTVqUkJFaENZVHVkNVFMbHAvQkM0aUt6UjlDUzZWNGVy?= =?utf-8?B?K3NFMVFuSHpkd2Y4WXc4UHFiVWJLR0c2MEVkbWxIUGJKdCtRT09RWHVORVU4?= =?utf-8?B?TW50Nnpjb0dBMWVsTS9EZnBRR1IzS2JKNG91VC9lVUNjS1Yza0RFblVKWmNq?= =?utf-8?B?YnRIWmwzU3ROVENhaTFIem5nb0xuWkJtNG5IK1ZuYWVWemgvWGlncjgzeVJK?= =?utf-8?B?TWtFWjRiN1NEd0lZcFB4QzA5c0t3N0hJczUrSFRCS2kvS2dTcmlma3JHNitJ?= =?utf-8?B?RzhKZUJyY0xDWkszRUh2QnAwYk50QUg2a21FbXBnMGk1QmFQcjA5eFV6a0RN?= =?utf-8?B?b2JaOW9FM1RSbGpqSFpBOG9zNDBRdWUxYi91SnJPdGs1L29FMEdDSndFbzMw?= =?utf-8?B?eCtXSGM3VFdWMExkcWJMOWd1eWREMGpQWE55RDFNVS9UYnJ5Rzh6aTBLOHNi?= =?utf-8?B?TUhWRm1uLy82eHZtVG8zUE5IbkNEWlFVNHJFTitxVDJTbHR0bDBaNjIzZFNP?= =?utf-8?B?MG1YRmFJcXJGcnRzWFlaOUJMdnV6aitBSjc2YmZaUjZ6RjRuS1EwL3F3ZnRJ?= =?utf-8?B?Y1FKS2d5Vk01TFdrRFAxZ2o2WHVLV3pjQnhxYmMwRWNzL2tGRWh5VnNwbFQr?= =?utf-8?Q?f3yZVSVOOAtzL0OgBapOxbhWTNMubW7zqyYY4P08uW88W?= X-MS-Exchange-AntiSpam-MessageData-1: IJ9BQ9+KCyO4VA== X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-Network-Message-Id: e9a15c13-5cfa-4cf8-89ef-08dea074d7c6 X-MS-Exchange-CrossTenant-AuthSource: CH2PR12MB3990.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2026 13:41:23.1530 (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: XsRa02NyrSGg7Yyq78+DVwq255FFiDME7MbJF2iCiF05a7UcDUtfutAMju2UC5JDUX5QyXeQBqhHifDquplwWg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS4PR12MB9682 When probing the driver, the FWSEC-FRTS firmware creates a WPR2 secure memory region to store the GSP firmware, and the Booter Loader loads and starts that firmware into the GSP, making it run in RISC-V mode. These operations need to be reverted upon unloading, particularly the WPR2 secure region creation, as its presence prevents the driver from subsequently probing. Thus, load and run the Booter Unloader and FWSEC-SB firmwares at unbind time to put the GPU into a state where it can be probed again. Reviewed-by: Eliot Courtney Signed-off-by: Alexandre Courbot --- drivers/gpu/nova-core/firmware/booter.rs | 1 - drivers/gpu/nova-core/firmware/fwsec.rs | 1 - drivers/gpu/nova-core/gpu.rs | 8 ++++- drivers/gpu/nova-core/gsp/boot.rs | 53 ++++++++++++++++++++++++++++= ++++ drivers/gpu/nova-core/regs.rs | 5 +++ 5 files changed, 65 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/nova-core/firmware/booter.rs b/drivers/gpu/nova-co= re/firmware/booter.rs index de2a4536b532..771b018ba580 100644 --- a/drivers/gpu/nova-core/firmware/booter.rs +++ b/drivers/gpu/nova-core/firmware/booter.rs @@ -280,7 +280,6 @@ fn new_booter(data: &[u8]) -> Result { #[derive(Copy, Clone, Debug, PartialEq)] pub(crate) enum BooterKind { Loader, - #[expect(unused)] Unloader, } =20 diff --git a/drivers/gpu/nova-core/firmware/fwsec.rs b/drivers/gpu/nova-cor= e/firmware/fwsec.rs index 8810cb49db67..4108f28cd338 100644 --- a/drivers/gpu/nova-core/firmware/fwsec.rs +++ b/drivers/gpu/nova-core/firmware/fwsec.rs @@ -144,7 +144,6 @@ pub(crate) enum FwsecCommand { /// image into it. Frts { frts_addr: u64, frts_size: u64 }, /// Asks [`FwsecFirmware`] to load pre-OS apps on the PMU. - #[expect(dead_code)] Sb, } =20 diff --git a/drivers/gpu/nova-core/gpu.rs b/drivers/gpu/nova-core/gpu.rs index 8f2ae9e8a519..37d0e4587ed3 100644 --- a/drivers/gpu/nova-core/gpu.rs +++ b/drivers/gpu/nova-core/gpu.rs @@ -286,7 +286,13 @@ pub(crate) fn unbind(&self, dev: &device::Device) { return; }; =20 - let _ =3D kernel::warn_on_err!(self.gsp.unload(dev, bar, &self.gsp= _falcon)); + let _ =3D kernel::warn_on_err!(self.gsp.unload( + dev, + bar, + self.spec.chipset, + &self.gsp_falcon, + &self.sec2_falcon, + )); =20 self.sysmem_flush.unregister(bar); } diff --git a/drivers/gpu/nova-core/gsp/boot.rs b/drivers/gpu/nova-core/gsp/= boot.rs index cd11df319640..a35ef4481f55 100644 --- a/drivers/gpu/nova-core/gsp/boot.rs +++ b/drivers/gpu/nova-core/gsp/boot.rs @@ -268,7 +268,9 @@ pub(crate) fn unload( &self, dev: &device::Device, bar: &Bar0, + chipset: Chipset, gsp_falcon: &Falcon, + sec2_falcon: &Falcon, ) -> Result { // Shut down the GSP. =20 @@ -280,6 +282,57 @@ pub(crate) fn unload( ) .inspect_err(|e| dev_err!(dev, "unload guest driver failed: {:?}\n= ", e))?; =20 + // Run FWSEC-SB to reset the GSP falcon to its pre-libos state. + + let bios =3D Vbios::new(dev, bar)?; + let fwsec_sb =3D FwsecFirmware::new(dev, gsp_falcon, bar, &bios, F= wsecCommand::Sb)?; + + if chipset.needs_fwsec_bootloader() { + let fwsec_sb_bl =3D FwsecFirmwareWithBl::new(fwsec_sb, dev, ch= ipset)?; + // Load and run the bootloader, which will load FWSEC-SB and r= un it. + fwsec_sb_bl.run(dev, gsp_falcon, bar)?; + } else { + // Load and run FWSEC-SB directly. + fwsec_sb.run(dev, gsp_falcon, bar)?; + } + + // Remove WPR2 region if set. + + let wpr2_hi =3D bar.read(regs::NV_PFB_PRI_MMU_WPR2_ADDR_HI); + if wpr2_hi.is_wpr2_set() { + let booter_unloader =3D BooterFirmware::new( + dev, + BooterKind::Unloader, + chipset, + FIRMWARE_VERSION, + sec2_falcon, + bar, + )?; + + sec2_falcon.reset(bar)?; + sec2_falcon.load(dev, bar, &booter_unloader)?; + + // Sentinel value to confirm that Booter Unloader has run. + const MAILBOX_SENTINEL: u32 =3D 0xff; + let (mbox0, _) =3D sec2_falcon.boot(bar, Some(MAILBOX_SENTINEL= ), None)?; + if mbox0 !=3D 0 { + dev_err!(dev, "Booter Unloader returned error 0x{:x}\n", m= box0); + return Err(EINVAL); + } + + // Confirm that the WPR2 region has been removed. + let wpr2_hi =3D bar.read(regs::NV_PFB_PRI_MMU_WPR2_ADDR_HI); + if wpr2_hi.is_wpr2_set() { + dev_err!( + dev, + "WPR2 region still set after Booter Unloader returned\= n" + ); + return Err(EBUSY); + } + } + + dev_info!(dev, "successfully unloaded\n"); + Ok(()) } } diff --git a/drivers/gpu/nova-core/regs.rs b/drivers/gpu/nova-core/regs.rs index 2f171a4ff9ba..21ff5d15f648 100644 --- a/drivers/gpu/nova-core/regs.rs +++ b/drivers/gpu/nova-core/regs.rs @@ -176,6 +176,11 @@ impl NV_PFB_PRI_MMU_WPR2_ADDR_HI { pub(crate) fn higher_bound(self) -> u64 { u64::from(self.hi_val()) << 12 } + + /// Returns whether the WPR2 region is currently set. + pub(crate) fn is_wpr2_set(self) -> bool { + self.hi_val() !=3D 0 + } } =20 // PGSP --=20 2.53.0