nova-core: remove HWCFG1 and need_riscv
Subsystems (4)
cover nova-core: remove HWCFG1 and need_riscv
The second patch builds upon the first one. The series applies cleanly to today's drm-rust-next.
The first patch is identical to what I sent out as a single patch just now in [1], because I forgot at the time that they should go together as a tiny patchset.
[1] https://lore.kernel.org/[email protected]
John Hubbard (2):
nova-core: remove an unnecessary register read: HWCFG1
nova-core: remove unnecessary need_riscv, bar parameters
drivers/gpu/nova-core/falcon.rs | 26 +------------------------- drivers/gpu/nova-core/gpu.rs | 4 +--- 2 files changed, 2 insertions(+), 28 deletions(-)
base-commit: d3917368ebc5cd89d7d08eab4673e5c4c73ff42f
Signature · 1 line
2.51.1
PATCH 1/2 nova-core: remove an unnecessary register read: HWCFG1
This register read is not required in order to bring up any of the GPUs, and it is read too early on Hopper/Blackwell+ GPUs anyway. So just stop doing this.
--- drivers/gpu/nova-core/falcon.rs | 5 ----- 1 file changed, 5 deletions(-)
drivers/gpu/nova-core/falcon.rs +0 -5
@@ -371,11 +371,6 @@ pub(crate) fn new( bar: &Bar0, need_riscv: bool, ) -> Result<Self> { -let hwcfg1 = regs::NV_PFALCON_FALCON_HWCFG1 ::read (bar, &E ::ID ); -// Check that the revision and security model contain valid values. -let _ = hwcfg1.core_rev ()?; -let _ = hwcfg1.security_model ()?; -if need_riscv {let hwcfg2 = regs::NV_PFALCON_FALCON_HWCFG2 ::read (bar, &E ::ID );if !hwcfg2.riscv () {
Signature · 1 line
2.51.1
PATCH 2/2 nova-core: remove unnecessary need_riscv, bar parameters
In reply to John HubbardThe need_riscv parameter and its associated RISCV validation logic are are actually unnecessary for correct operation. Remove it, along with the now-unused bar parameter as well.
--- drivers/gpu/nova-core/falcon.rs | 21 +-------------------- drivers/gpu/nova-core/gpu.rs | 4 +--- 2 files changed, 2 insertions(+), 23 deletions(-)
drivers/gpu/nova-core/falcon.rs +1 -20
@@ -362,26 +362,7 @@ pub(crate) struct Falcon<E: FalconEngine> {impl <E :FalconEngine + 'static>Falcon <E > {/// Create a new falcon instance. -/// -/// `need_riscv` is set to `true` if the caller expects the falcon to be a dual falcon/riscv -/// controller. -pub (crate )fn new ( - dev: &device::Device , - chipset:Chipset , - bar: &Bar0 , - need_riscv:bool , - ) ->Result <Self > { -if need_riscv { -let hwcfg2 = regs::NV_PFALCON_FALCON_HWCFG2 ::read (bar, &E ::ID ); -if !hwcfg2.riscv () { -dev_err! ( - dev, -"riscv support requested on a controller that does not support it\n" - ); -return Err (EINVAL ); - } - } - +pub (crate )fn new (dev: &device::Device , chipset:Chipset ) ->Result <Self > {Ok (Self { hal: hal::falcon_hal (chipset)?, dev: dev.into (),
drivers/gpu/nova-core/gpu.rs +1 -3
@@ -213,12 +213,10 @@ pub(crate) fn new<'a>( gsp_falcon: Falcon::new( pdev.as_ref(), spec.chipset, - bar, - spec.chipset > Chipset::GA100, ) .inspect(|falcon| falcon.clear_swgen0_intr(bar))?, - sec2_falcon: Falcon::new(pdev.as_ref(), spec.chipset, bar, true)?, + sec2_falcon: Falcon::new(pdev.as_ref(), spec.chipset)?, gsp <- Gsp::new(),
Signature · 1 line
2.51.1
Alexandre Courbot
maintainerQuoted 8 lines · John Hubbard
The second patch builds upon the first one. The series applies cleanly to today's drm-rust-next.
The first patch is identical to what I sent out as a single patch just now in [1], because I forgot at the time that they should go together as a tiny patchset.
Thanks! This is pretty uncontroversial, so planning to merge this quickly.
Quoted 3 lines · John Hubbard
John Hubbard (2):
nova-core: remove an unnecessary register read: HWCFG1
nova-core: remove unnecessaryneed_riscv, bar parameters