From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 4D340372B5E; Tue, 21 Jul 2026 15:41:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784648497; cv=none; b=nRL8ERFAaEfAAjfQebgSnmhR1jsbwV4llxKjiT459eJeT15/rVHUuX1173cY7PP2TIGd2pqdDGKMUJqXFaK0z0mapLCAG6zKbcdLaxxzEq9x3I6p9h+N9nqxRVo0SyQlkc/xA6cWkZjSduuqDc9jGdq8RP6H3aQGfgnSkxsQouY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784648497; c=relaxed/simple; bh=xCrGYxU4hkG+PaSe09d6ghqEvxQQlBSumY/aVPg4+tg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=KNy6KdhLnZSvmdIZzu4w+fHu2CPd7UWD5Xl7mU0Qv2bMqqekSiJeJMKnKvtDyjpoaBM3zm+1lOMWt01hf1c/T2A1X2R695pk/BpKdJbJ1pGywVzmGoo2ecEvmq4QkKMLeYPHibNmZW00Zoc2zmLF1aJtnzL6UFl807uwlW7wgCo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=C0+R5mOD; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="C0+R5mOD" Received: by smtp.kernel.org (Postfix) with ESMTPS id 0CD1AC2BCFD; Tue, 21 Jul 2026 15:41:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1784648497; bh=xCrGYxU4hkG+PaSe09d6ghqEvxQQlBSumY/aVPg4+tg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=C0+R5mOD3cA1G+qhfZKoYijhGz06FvbK6WOg5/3EMdJy9SgMemmh7zvcJ6Ym6EtNf kPlAH2eRhzmTZcQ88Z7eTMzS5gpJi18tbV0G/9OTm412OA9x8iqreegJ6GkBeQCDNt TvXQ9Evo04QoN0+BplZTkdRj+4EUtiJe41VemAKO+irrO0qMCywb+ddz2k94G65Rmo H77TGitN/I5UP8vQqNavaaDt99R4IUTk06ZxtN7W8uXiMzjhPLy6XaKZLOUTV6MWP3 B5e4T+51tZCWb8IGJwuN/OGAM0BQndY4Qyf1oe3TFaxR7Ju7mnE/hItI81uNPAPO8D 6Z65Hsgkzx8Zw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id E45B4C44532; Tue, 21 Jul 2026 15:41:36 +0000 (UTC) From: Antonin Malzieu Ridolfi via B4 Relay Date: Tue, 21 Jul 2026 17:41:09 +0200 Subject: [PATCH 3/3] gpu: nova-core: Move one PBUS register definition Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260721-nova-core-regs-split-v1-3-384fa2a42244@nanonej.com> References: <20260721-nova-core-regs-split-v1-0-384fa2a42244@nanonej.com> In-Reply-To: <20260721-nova-core-regs-split-v1-0-384fa2a42244@nanonej.com> To: Danilo Krummrich , Alexandre Courbot , Alice Ryhl , David Airlie , Simona Vetter Cc: nova-gpu@lists.linux.dev, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, daniel.almeida@collabora.com, Antonin Malzieu Ridolfi X-Mailer: b4 0.15.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2078; i=dev@nanonej.com; h=from:subject:message-id; bh=bO+SB+QdzWlFEnKzthXbRE6mmjHZMmu3RJMJ0HXXY+c=; b=owEBbQKS/ZANAwAKAWaH8SMKFRX9AcsmYgBqX5Mt4IxqTt5dVTWxHBWYyBEDhr7RLWoOGDk3h AuNZoGhPPqJAjMEAAEKAB0WIQSDtk+wfJEhL1KFIn1mh/EjChUV/QUCal+TLQAKCRBmh/EjChUV /bprD/9Mkj9a4c8Z0kei+Bm3WJHQ9mUI18uUqtuwOEDF7pOwqtbhcSK0S1PGpmah3//8SUjekR7 MGa3vJv9Ahg8g8joDzOy5R2RwZWYca7gD3N0Tvw4wqMjD07vO5/3VvLHraGoe/6YtZm+3d41QsO hH74Xc6TzQAfUWdN0nr0NG9JLO0MX64aT+v+0UVEMKEZET4VAU8R0VTqflC4WzGreDM8UfTNhWV +T1LzXato0K1zUxmKdsWTvz0WqKA/UbydXkTqKmRx70ZFPKTUyQWhLcyXumlQQC8/H+fXTcqS2l NeHe/ZrO8dYs/jKS1OPIUrBSynkvusfXOZ45bj4ib+2SuvlGvDvHECBp7vemtldwTqBImIvJ+Ml bPyDX7A9P/v8jPMHkv35ViQUimt4PaVCB+nTaK77n94+AxpuJa43v3x+S+xFj6t0ipnYQgEwVkP chsIkLSiVLihToVGkukrv8dNq+PxyHYCAz1shRFbIPvav8lW+mCqOiNMg8HqT0PcyykICVFLSkI WfTYwMYgS2c5w6bWG9iKhWYyxoKSixWHkd4wfSviTW92GsZy+xXGtx+akLIqGn8Pt6wIUXDLyQa fvoJt8Tq4hyiLjJYyiUVvbeIpifbpSXIelWlLW8qXbCkKBb4sulsbYMK+/0wzhwmGpqmC3RXvm9 VJBMD3eQD6M9ieg== X-Developer-Key: i=dev@nanonej.com; a=openpgp; fpr=83B64FB07C91212F5285227D6687F1230A1515FD X-Endpoint-Received: by B4 Relay for dev@nanonej.com/default with auth_id=825 X-Original-From: Antonin Malzieu Ridolfi Reply-To: dev@nanonej.com From: Antonin Malzieu Ridolfi Suggested-by: Alexandre Courbot Suggested-by: Danilo Krummrich Signed-off-by: Antonin Malzieu Ridolfi --- drivers/gpu/nova-core/gsp/hal/tu102.rs | 2 +- drivers/gpu/nova-core/gsp/regs.rs | 11 +++++++++++ drivers/gpu/nova-core/regs.rs | 5 ----- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/nova-core/gsp/hal/tu102.rs b/drivers/gpu/nova-core/gsp/hal/tu102.rs index b3242aaeea45..91b995c2ee57 100644 --- a/drivers/gpu/nova-core/gsp/hal/tu102.rs +++ b/drivers/gpu/nova-core/gsp/hal/tu102.rs @@ -40,12 +40,12 @@ GspHal, UnloadBundle, // }, + regs, sequencer::GspSequencer, Gsp, GspBootContext, GspFwWprMeta, // }, - regs, vbios::Vbios, // }; diff --git a/drivers/gpu/nova-core/gsp/regs.rs b/drivers/gpu/nova-core/gsp/regs.rs index a76dea3c3ab0..9a48aa87e7fb 100644 --- a/drivers/gpu/nova-core/gsp/regs.rs +++ b/drivers/gpu/nova-core/gsp/regs.rs @@ -2,6 +2,8 @@ use kernel::io::register; +use crate::regs::NV_PBUS_SW_SCRATCH; + // PGSP register! { @@ -9,3 +11,12 @@ 31:0 address; } } + +// PBUS + +register! { + /// Scratch register 0xe used as FRTS firmware error code. + pub(super) NV_PBUS_SW_SCRATCH_0E_FRTS_ERR(u32) => NV_PBUS_SW_SCRATCH[0xe] { + 31:16 frts_err_code; + } +} diff --git a/drivers/gpu/nova-core/regs.rs b/drivers/gpu/nova-core/regs.rs index f7304b27ae0c..dda3be837f62 100644 --- a/drivers/gpu/nova-core/regs.rs +++ b/drivers/gpu/nova-core/regs.rs @@ -109,11 +109,6 @@ fn fmt(&self, f: &mut kernel::fmt::Formatter<'_>) -> kernel::fmt::Result { register! { pub(crate) NV_PBUS_SW_SCRATCH(u32)[64] @ 0x00001400 {} - - /// Scratch register 0xe used as FRTS firmware error code. - pub(crate) NV_PBUS_SW_SCRATCH_0E_FRTS_ERR(u32) => NV_PBUS_SW_SCRATCH[0xe] { - 31:16 frts_err_code; - } } // PGC6 register space. -- 2.55.0