From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from DM1PR04CU001.outbound.protection.outlook.com (mail-centralusazon11010055.outbound.protection.outlook.com [52.101.61.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3217030DEA6 for ; Wed, 10 Jun 2026 17:50:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=fail smtp.client-ip=52.101.61.55 ARC-Seal:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781113817; cv=fail; b=GCKZ6yUzag1ddWmTOnxqHCEoygis0525cmjoVORHmJP/GOOUec5Gr37sc+kf9x3DUvW4DGxnkkCK/TNk+32KPTgFGEwfF9P816jjA3K5ViX527bvU5lwzumLe+GE/XwL+Eni4B4trN7D3/G9XPEzDeZvKy664p4aWJPY/XBsoTQ= ARC-Message-Signature:i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781113817; c=relaxed/simple; bh=NZr7Ci2zzvynUMTHzafjqd2sU6kgRhquwLNnLXB9yNo=; h=From:To:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=jZn1lEvvSgW2/y9uat25imcm3tLfzIyGFvt02MhzYkRtHdYq+z2LnvwuZJ16HGMp7D7V4m4enrrgYDZymd4RbIBhsX/9/kCek1V5yRB331RU8LgddBx9FAUh1igzpQC0z+QV0zsL8Ped4QyQG2tAjcfaQXP/hhIGqTDU8N/gyXg= 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=XfFTBG/E; arc=fail smtp.client-ip=52.101.61.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=nvidia.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=nvidia.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com header.b="XfFTBG/E" ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=r0yumTIbHQbl2ClXXom1RB8VNDKH3iO0+rwcRNLUuPciU8lJTtr08eMcXZH2+ccUyYJAO6FyHORz3BX5CwXuj+kUb6AGXSe71kRSixLOVrQGzbLip0CquBu6IRE2vE5BMyK+idBc4RNknULkcJcR8XCjtMqBZVnW19L9H9jcs4mLq29ds1b84N9QG86kL34HyJGVDsQww6kIMFN0xhGXmPEQ/s1fLSTGuMBs5+kGVVE1mi7Gmyd915mxi16KItXbmcob1Lj1h1WqN7VdJ1e9oidDfupxptU55UicI30aDNZMskHU4OIAytJyk3QDURvVgLavWd3IeUmFmQMUM3Q/Yg== 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=/AzGStLSOA07yWLugGGeVau6Lq8ekDhYMFwmmUvs9xA=; b=CY3g4ynnUgNIjPD21Bun7sP5NAqPevOvyyBbkHmyVh/NdcBsVjKJ+yBrfUX9r6nK6gnMeXSfVqfCghLe7CDOIgnRHIFnOCiSUTJlCfWdsDr6ZLapnliKKsl2Tvnzl8HZ222OqB7PacKJcv/E/FdtEH0cRsVDiOMJ4uTQHcg+YzM2Ly8sXipv5dX68yIvhqxqLwBxTYViXR5ZcE0JBmA1PMCORZTyoMNdWX6k9GnNYyFyTK9uyhLJzFNaRd8miD5BNs/N41Qq3h1iFYX2l+sRjXCwRBpu/2O1V1GFcfO5MBVJGCd3axP98HShMS4OuS5AHcI7twfY7uq7J3SCD2zJvg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=kernel.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=/AzGStLSOA07yWLugGGeVau6Lq8ekDhYMFwmmUvs9xA=; b=XfFTBG/EWOWW5XfsyJ4UunV6wDE7Lc5Fl1MmNEyj5s/ishAkwmb0tLX/Bl7wd3BeWZBGfRXOpETjw0Gba++g/9pxxPC4CvqxFnw32bix48dk+H5ZFEHmK1L5YH9/N48Vx38DdncKR8HVbV9t8AcGMShfZwtq3tkPuZF7yihOkSNJrBumMkn99SNVT6xmOgRZh+lA5RQN58ns2IbBVo7EO6dNpEqnOmvWP5/5AVhDd2Cio+HfGlDePx/7eRIoWPvbLqW6E2Itf1vOlvHk1QxC2Gif7uHElr7CWpIObdb7cI+5TrEcq7YPWzOM/QZe28SJ4BvwEWMPtTAqDTf7ilC+9g== Received: from CH0P220CA0028.NAMP220.PROD.OUTLOOK.COM (2603:10b6:610:ef::7) by IA1PR12MB8540.namprd12.prod.outlook.com (2603:10b6:208:454::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.92.14; Wed, 10 Jun 2026 17:50:08 +0000 Received: from CH1PEPF0000A34A.namprd04.prod.outlook.com (2603:10b6:610:ef:cafe::3b) by CH0P220CA0028.outlook.office365.com (2603:10b6:610:ef::7) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.21.113.10 via Frontend Transport; Wed, 10 Jun 2026 17:50:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CH1PEPF0000A34A.mail.protection.outlook.com (10.167.244.5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.21.113.7 via Frontend Transport; Wed, 10 Jun 2026 17:50:08 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Wed, 10 Jun 2026 10:49:46 -0700 Received: from ttabi.nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Wed, 10 Jun 2026 10:49:44 -0700 From: Timur Tabi To: Danilo Krummrich , Gary Guo , "Alexandre Courbot" , , Eliot Courtney , John Hubbard , Subject: [PATCH 5/8] gpu: nova-core: transition gsp to TLV images Date: Wed, 10 Jun 2026 12:49:26 -0500 Message-ID: <20260610174929.744477-6-ttabi@nvidia.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260610174929.744477-1-ttabi@nvidia.com> References: <20260610174929.744477-1-ttabi@nvidia.com> Precedence: bulk X-Mailing-List: nova-gpu@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-NVConfidentiality: public Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CH1PEPF0000A34A:EE_|IA1PR12MB8540:EE_ X-MS-Office365-Filtering-Correlation-Id: 8ec987eb-ab52-41e4-ca68-08dec718b62a X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0;ARA:13230040|36860700016|1800799024|376014|23010399003|82310400026|56012099006|11063799006|6133799003|18002099003|22082099003; X-Microsoft-Antispam-Message-Info: Aq7dmhy0xRn9v/eJybix1ZpBRnIAJQcsibWE9ahWWzvv3sp4PRn8voP6SBor9lkCSjhKfvtKC45IV22cshyv2CxGKYASmXZkGt30q89Omd+ulpnVKZj+cZnRi+xneA5CeP4N8zQc5GmkqdVrgdowFCYSofXQE8crmBHvJt4HC4xnBneK6ZAHTIOyqN3HXNuDkyK2cux8OnEYfA8N4p6oZRrDwcdBlzAsIZvEOT1IMvroDKWfOa9HhCgnp8G65FkTWnanIyrcNxGIWTRDAiDDXBoH6Ly9hWS62+b2UpzMx6W5GPYytfowLRmyv6rYT0cBPKvEafRQ129nLOWm7AU35AuVUPy6dLlM6ZUBENdZUdLKhDMUdDXRcqhUUj1XggWP6kyMkDs26gSVTakBYFooX69QBRoyLQeN90BRhdALxI7HbyJ0hNbkgXolJugV7TVyGSGY8Ery75fCHPfvJh96nfRGQ92oVS5zswmxGgg4EIyQXFFcx0+o745k+znjdIPn+keQN+qAPgvkkWzGSq29e0vGK0+w+MtTL0j+mn+NVI29QIbpFDWva15YmvMl842jLAwHG24D5leLZUvwYmJ0RZhwEw3Raao8A91dL3hU4yG9FMvwIp6n8FhiIz/T4rW611zeGFrYPaYJ5cSI+t4uhNfWmuhiQuljtOxv4qDYl4f+A3BlbiXWa3TYls4KbEWgvR25JPYWE4ffwFQFU79IA4D+OeC1QX+EUfajB4bGREg= X-Forefront-Antispam-Report: CIP:216.228.117.160;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc6edge1.nvidia.com;CAT:NONE;SFS:(13230040)(36860700016)(1800799024)(376014)(23010399003)(82310400026)(56012099006)(11063799006)(6133799003)(18002099003)(22082099003);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TdA/XzFaFyJQPAclYcREbkx/cmoXTx8CM0DJ5+e+uc3hAFDwKL8Y4E1MBx0LtWUnMfUSxGxMDGcQnRcaCxgaLDiCLqTVIOVIoHpcrx5TP1T77csRCmumGuZtEtvK2IH9BN2GTD8QCk+a/FdbvDyYQ3ud18AtMcJ3161qIInmyVyoirLXkunGq5lWT5tMIDVAzWtmfu/8HsbKbIYqVBOLbk1OGSzwYqNozhNNq3ioZdmiDjQQNgvIW9fv/GkkYcpppI2jsO9lHk4c/el4frsevT5PKNioFd4YnSFpA5PvR8piTA68rpzfQWEfpDG23m1Inoupl4rL3lr8mPUSOQCk/e9RU0rZ3NPUu9DLTfhTkd6xAH+Hp7sjqpOc/qOiID+qPG2gZOWV3Ro2Tp/Ue3BLT+RQl04YcG9uh4MbX66FYyPHL0iOPasO+daazW3x6hW6 X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jun 2026 17:50:08.1372 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8ec987eb-ab52-41e4-ca68-08dec718b62a X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.117.160];Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CH1PEPF0000A34A.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR12MB8540 Switch the GSP firmware loader from the legacy binary format to the TLV format. This change requires the new TLV versions of the r570.144 firmware images. Unlike the other TLV firmware images, gsp.tlv contains a pointer to the actual GSP firmware file instead of its contents. This allows each small gsp.tlv file to contain the distinct metadata for each GPU while still allowing the very large gsp.bin to be shared by all GPUs. One key piece of metadata is the signature. The legacy GSP firmware image is an ELF file that contains multiple sections that needed to be parsed, and the driver needed to determine which section is relevant for the GPU. Instead, gsp.tlv contains the pre-processed metadata, so all the driver needs to do is to extract it. Signed-off-by: Timur Tabi --- drivers/gpu/nova-core/firmware.rs | 22 -------- drivers/gpu/nova-core/firmware/gsp.rs | 56 ++++++------------- drivers/gpu/nova-core/firmware/riscv.rs | 71 +++++-------------------- drivers/gpu/nova-core/gsp/boot.rs | 7 +-- 4 files changed, 30 insertions(+), 126 deletions(-) diff --git a/drivers/gpu/nova-core/firmware.rs b/drivers/gpu/nova-core/firmware.rs index f632db8283f0..8ef7f084f834 100644 --- a/drivers/gpu/nova-core/firmware.rs +++ b/drivers/gpu/nova-core/firmware.rs @@ -387,28 +387,6 @@ struct BinHdr { // SAFETY: all bit patterns are valid for this type, and it doesn't use interior mutability. unsafe impl FromBytes for BinHdr {} -// A firmware blob starting with a `BinHdr`. -struct BinFirmware<'a> { - hdr: BinHdr, - fw: &'a [u8], -} - -impl<'a> BinFirmware<'a> { - /// Interpret `fw` as a firmware image starting with a [`BinHdr`], and returns the - /// corresponding [`BinFirmware`] that can be used to extract its payload. - fn new(fw: &'a firmware::Firmware) -> Result { - const BIN_MAGIC: u32 = 0x10de; - let fw = fw.data(); - - fw.get(0..size_of::()) - // Extract header. - .and_then(BinHdr::from_bytes_copy) - // Validate header. - .filter(|hdr| hdr.bin_magic == BIN_MAGIC) - .map(|hdr| Self { hdr, fw }) - .ok_or(EINVAL) - } -} pub(crate) struct ModInfoBuilder(firmware::ModInfoBuilder); diff --git a/drivers/gpu/nova-core/firmware/gsp.rs b/drivers/gpu/nova-core/firmware/gsp.rs index 99a302bae567..382005be8516 100644 --- a/drivers/gpu/nova-core/firmware/gsp.rs +++ b/drivers/gpu/nova-core/firmware/gsp.rs @@ -8,6 +8,7 @@ DataDirection, DmaAddress, // }, + firmware, prelude::*, scatterlist::{ Owned, @@ -17,13 +18,11 @@ use crate::{ firmware::{ - elf, riscv::RiscvFirmware, // + CString, + Tlv, }, - gpu::{ - Architecture, - Chipset, // - }, + gpu::Chipset, gsp::GSP_PAGE_SIZE, num::FromSafeCast, }; @@ -63,43 +62,26 @@ pub(crate) struct GspFirmware { } impl GspFirmware { - fn find_gsp_sigs_section(chipset: Chipset) -> &'static str { - match chipset.arch() { - Architecture::Turing if matches!(chipset, Chipset::TU116 | Chipset::TU117) => { - ".fwsignature_tu11x" - } - Architecture::Turing => ".fwsignature_tu10x", - Architecture::Ampere if chipset == Chipset::GA100 => ".fwsignature_ga100", - Architecture::Ampere => ".fwsignature_ga10x", - Architecture::Ada => ".fwsignature_ad10x", - Architecture::Hopper => ".fwsignature_gh10x", - Architecture::BlackwellGB10x => ".fwsignature_gb10x", - Architecture::BlackwellGB20x => ".fwsignature_gb20x", - } - } - /// Loads the GSP firmware binaries, map them into `dev`'s address-space, and creates the page /// tables expected by the GSP bootloader to load it. pub(crate) fn new<'a>( dev: &'a device::Device, chipset: Chipset, - ver: &'a str, ) -> impl PinInit + 'a { pin_init::pin_init_scope(move || { - let firmware = super::request_firmware(dev, chipset, "gsp", ver)?; + let firmware = super::request_tlv(dev, chipset, "gsp")?; + let tlv = Tlv::new(firmware.data())?; + dev_info!(dev, "loaded gsp firmware v{}\n", tlv.get_string("VERS")?); - let fw_section = elf::elf_section(firmware.data(), ".fwimage").ok_or(EINVAL)?; + let size = usize::from_safe_cast(tlv.get_u32("SIZE")?); + let mut fw_vvec = VVec::from_elem(0u8, size, GFP_KERNEL).map_err(|_| ENOMEM)?; - let size = fw_section.len(); + let chip_name = chipset.name(); + let file = tlv.get_string("FILE")?; + let filename = CString::try_from_fmt(fmt!("nvidia/{chip_name}/gsp/{file}"))?; + firmware::request_into_buf(&filename, dev, fw_vvec.as_mut_slice())?; - // Move the firmware into a vmalloc'd vector and map it into the device address - // space. - let fw_vvec = VVec::with_capacity(fw_section.len(), GFP_KERNEL) - .and_then(|mut v| { - v.extend_from_slice(fw_section, GFP_KERNEL)?; - Ok(v) - }) - .map_err(|_| ENOMEM)?; + let signatures = Coherent::from_slice(dev, tlv.get_bytes("SIGN")?, GFP_KERNEL)?; Ok(try_pin_init!(Self { fw <- SGTable::new(dev, fw_vvec, DataDirection::ToDevice, GFP_KERNEL), @@ -145,15 +127,9 @@ pub(crate) fn new<'a>( level0.into() }, size, - signatures: { - let sigs_section = Self::find_gsp_sigs_section(chipset); - - elf::elf_section(firmware.data(), sigs_section) - .ok_or(EINVAL) - .and_then(|data| Coherent::from_slice(dev, data, GFP_KERNEL))? - }, + signatures, bootloader: { - let bl = super::request_firmware(dev, chipset, "bootloader", ver)?; + let bl = super::request_tlv(dev, chipset, "gsp_bootloader")?; RiscvFirmware::new(dev, &bl)? }, diff --git a/drivers/gpu/nova-core/firmware/riscv.rs b/drivers/gpu/nova-core/firmware/riscv.rs index 2afa7f36404e..52087b6bc0ed 100644 --- a/drivers/gpu/nova-core/firmware/riscv.rs +++ b/drivers/gpu/nova-core/firmware/riscv.rs @@ -7,53 +7,10 @@ device, dma::Coherent, firmware::Firmware, - prelude::*, - transmute::FromBytes, // + prelude::*, // }; -use crate::{ - firmware::BinFirmware, - num::FromSafeCast, // -}; - -/// Descriptor for microcode running on a RISC-V core. -#[repr(C)] -#[derive(Debug)] -struct RmRiscvUCodeDesc { - version: u32, - bootloader_offset: u32, - bootloader_size: u32, - bootloader_param_offset: u32, - bootloader_param_size: u32, - riscv_elf_offset: u32, - riscv_elf_size: u32, - app_version: u32, - manifest_offset: u32, - manifest_size: u32, - monitor_data_offset: u32, - monitor_data_size: u32, - monitor_code_offset: u32, - monitor_code_size: u32, -} - -// SAFETY: all bit patterns are valid for this type, and it doesn't use interior mutability. -unsafe impl FromBytes for RmRiscvUCodeDesc {} - -impl RmRiscvUCodeDesc { - /// Interprets the header of `bin_fw` as a [`RmRiscvUCodeDesc`] and returns it. - /// - /// Fails if the header pointed at by `bin_fw` is not within the bounds of the firmware image. - fn new(bin_fw: &BinFirmware<'_>) -> Result { - let offset = usize::from_safe_cast(bin_fw.hdr.header_offset); - let end = offset.checked_add(size_of::()).ok_or(EINVAL)?; - - bin_fw - .fw - .get(offset..end) - .and_then(Self::from_bytes_copy) - .ok_or(EINVAL) - } -} +use crate::firmware::Tlv; /// A parsed firmware for a RISC-V core, ready to be loaded and run. pub(crate) struct RiscvFirmware { @@ -70,26 +27,22 @@ pub(crate) struct RiscvFirmware { } impl RiscvFirmware { - /// Parses the RISC-V firmware image contained in `fw`. pub(crate) fn new(dev: &device::Device, fw: &Firmware) -> Result { - let bin_fw = BinFirmware::new(fw)?; - - let riscv_desc = RmRiscvUCodeDesc::new(&bin_fw)?; + let tlv = Tlv::new(fw.data())?; - let ucode = { - let start = usize::from_safe_cast(bin_fw.hdr.data_offset); - let len = usize::from_safe_cast(bin_fw.hdr.data_size); - let end = start.checked_add(len).ok_or(EINVAL)?; + let code_offset = tlv.get_u32("CDOF")?; + let data_offset = tlv.get_u32("DAOF")?; + let manifest_offset = tlv.get_u32("MFOF")?; + let app_version = tlv.get_u32("APPV")?; - Coherent::from_slice(dev, fw.data().get(start..end).ok_or(EINVAL)?, GFP_KERNEL)? - }; + let ucode = Coherent::from_slice(dev, tlv.get_bytes("BLOB")?, GFP_KERNEL)?; Ok(Self { ucode, - code_offset: riscv_desc.monitor_code_offset, - data_offset: riscv_desc.monitor_data_offset, - manifest_offset: riscv_desc.manifest_offset, - app_version: riscv_desc.app_version, + code_offset, + data_offset, + manifest_offset, + app_version, }) } } diff --git a/drivers/gpu/nova-core/gsp/boot.rs b/drivers/gpu/nova-core/gsp/boot.rs index 8afb62d689cb..84fb426a7113 100644 --- a/drivers/gpu/nova-core/gsp/boot.rs +++ b/drivers/gpu/nova-core/gsp/boot.rs @@ -20,10 +20,7 @@ Falcon, // }, fb::FbLayout, - firmware::{ - gsp::GspFirmware, - FIRMWARE_VERSION, // - }, + firmware::gsp::GspFirmware, gpu::Chipset, gsp::{ cmdq::Cmdq, @@ -112,7 +109,7 @@ pub(crate) fn boot( let dev = pdev.as_ref(); let hal = super::hal::gsp_hal(chipset); - let gsp_fw = KBox::pin_init(GspFirmware::new(dev, chipset, FIRMWARE_VERSION), GFP_KERNEL)?; + let gsp_fw = KBox::pin_init(GspFirmware::new(dev, chipset), GFP_KERNEL)?; let fb_layout = FbLayout::new(chipset, bar, &gsp_fw)?; dev_dbg!(dev, "{:#x?}\n", fb_layout); -- 2.54.0