Blackwell GPUs moved the sysmem flush page registers away from the legacy NV_PFB_NISO_FLUSH_SYSMEM_ADDR used by Ampere/Ada.
GB10x uses HSHUB0 registers, with both a primary and EG (egress) pair that must be programmed to the same address. GB20x uses FBHUB0 registers. Add separate GB100 and GB202 fb HALs, and split the Blackwell HAL dispatch so that each uses its respective registers. Signed-off-by: John Hubbard <[email protected]> --- drivers/gpu/nova-core/fb/hal.rs | 6 ++- drivers/gpu/nova-core/fb/hal/gb100.rs | 42 ++++++++++++++++-- drivers/gpu/nova-core/fb/hal/gb202.rs | 62 +++++++++++++++++++++++++++ drivers/gpu/nova-core/regs.rs | 36 ++++++++++++++++ 4 files changed, 142 insertions(+), 4 deletions(-) create mode 100644 drivers/gpu/nova-core/fb/hal/gb202.rs diff --git a/drivers/gpu/nova-core/fb/hal.rs b/drivers/gpu/nova-core/fb/hal.rs index ebd12247f771..01f19a00685c 100644 --- a/drivers/gpu/nova-core/fb/hal.rs +++ b/drivers/gpu/nova-core/fb/hal.rs @@ -13,6 +13,7 @@ mod ga100; mod ga102; mod gb100; +mod gb202; mod gh100; mod tu102; @@ -46,6 +47,9 @@ pub(crate) fn fb_hal(chipset: Chipset) -> &'static dyn FbHal { Architecture::Ampere if chipset == Chipset::GA100 => ga100::GA100_HAL, Architecture::Ampere | Architecture::Ada => ga102::GA102_HAL, Architecture::Hopper => gh100::GH100_HAL, - Architecture::Blackwell => gb100::GB100_HAL, + Architecture::Blackwell => match chipset { + Chipset::GB100 | Chipset::GB102 => gb100::GB100_HAL, + _ => gb202::GB202_HAL, + }, } } diff --git a/drivers/gpu/nova-core/fb/hal/gb100.rs b/drivers/gpu/nova-core/fb/hal/gb100.rs index eaab3f934f6e..6039f66b12cc 100644 --- a/drivers/gpu/nova-core/fb/hal/gb100.rs +++ b/drivers/gpu/nova-core/fb/hal/gb100.rs @@ -1,21 +1,57 @@ // SPDX-License-Identifier: GPL-2.0 +//! Blackwell GB10x framebuffer HAL. +//! +//! GB10x GPUs use HSHUB0 registers for the sysmem flush page. Both the primary and EG (egress) +//! register pairs must be programmed to the same address, as required by hardware. + use kernel::prelude::*; use crate::{ driver::Bar0, - fb::hal::FbHal, // + fb::hal::FbHal, + regs, // }; struct Gb100; +fn read_sysmem_flush_page_gb100(bar: &Bar0) -> u64 { + let lo = u64::from(regs::NV_PFB_HSHUB0_PCIE_FLUSH_SYSMEM_ADDR_LO::read(bar).adr()); + let hi = u64::from(regs::NV_PFB_HSHUB0_PCIE_FLUSH_SYSMEM_ADDR_HI::read(bar).adr()); + + lo | (hi << 32) +} + +fn write_sysmem_flush_page_gb100(bar: &Bar0, addr: u64) { + let addr_lo = addr as u32; + let addr_hi = (addr >> 32) as u32; + + // Write HI first: the hardware may trigger the flush on the LO write. + + // Primary HSHUB pair. + regs::NV_PFB_HSHUB0_PCIE_FLUSH_SYSMEM_ADDR_HI::default() + .set_adr(addr_hi) + .write(bar); + regs::NV_PFB_HSHUB0_PCIE_FLUSH_SYSMEM_ADDR_LO::default() + .set_adr(addr_lo) + .write(bar); + + // EG (egress) pair -- must match the primary pair. + regs::NV_PFB_HSHUB0_EG_PCIE_FLUSH_SYSMEM_ADDR_HI::default() + .set_adr(addr_hi) + .write(bar); + regs::NV_PFB_HSHUB0_EG_PCIE_FLUSH_SYSMEM_ADDR_LO::default() + .set_adr(addr_lo) + .write(bar); +} + impl FbHal for Gb100 { fn read_sysmem_flush_page(&self, bar: &Bar0) -> u64 { - super::ga100::read_sysmem_flush_page_ga100(bar) + read_sysmem_flush_page_gb100(bar) } fn write_sysmem_flush_page(&self, bar: &Bar0, addr: u64) -> Result { - super::ga100::write_sysmem_flush_page_ga100(bar, addr); + write_sysmem_flush_page_gb100(bar, addr); Ok(()) } diff --git a/drivers/gpu/nova-core/fb/hal/gb202.rs b/drivers/gpu/nova-core/fb/hal/gb202.rs new file mode 100644 index 000000000000..7fa9a49d2cca --- /dev/null +++ b/drivers/gpu/nova-core/fb/hal/gb202.rs @@ -0,0 +1,62 @@ +// SPDX-License-Identifier: GPL-2.0 + +//! Blackwell GB20x framebuffer HAL. +//! +//! GB20x GPUs moved the sysmem flush registers from `NV_PFB_NISO_FLUSH_SYSMEM_ADDR` to +//! `NV_PFB_FBHUB0_PCIE_FLUSH_SYSMEM_ADDR_{LO,HI}`. + +use kernel::prelude::*; + +use crate::{ + driver::Bar0, + fb::hal::FbHal, + regs, // +}; + +struct Gb202; + +fn read_sysmem_flush_page_gb202(bar: &Bar0) -> u64 { + let lo = u64::from(regs::NV_PFB_FBHUB0_PCIE_FLUSH_SYSMEM_ADDR_LO::read(bar).adr()); + let hi = u64::from(regs::NV_PFB_FBHUB0_PCIE_FLUSH_SYSMEM_ADDR_HI::read(bar).adr()); + + lo | (hi << 32) +} + +fn write_sysmem_flush_page_gb202(bar: &Bar0, addr: u64) { + // Write HI first. The hardware will trigger the flush on the LO write. + regs::NV_PFB_FBHUB0_PCIE_FLUSH_SYSMEM_ADDR_HI::default() + // CAST: upper 32 bits, then masked to 20 bits by the register field. + .set_adr((addr >> 32) as u32) + .write(bar); + regs::NV_PFB_FBHUB0_PCIE_FLUSH_SYSMEM_ADDR_LO::default() + // CAST: lower 32 bits. Hardware ignores bits 7:0. + .set_adr(addr as u32) + .write(bar); +} + +impl FbHal for Gb202 { + fn read_sysmem_flush_page(&self, bar: &Bar0) -> u64 { + read_sysmem_flush_page_gb202(bar) + } + + fn write_sysmem_flush_page(&self, bar: &Bar0, addr: u64) -> Result { + write_sysmem_flush_page_gb202(bar, addr); + + Ok(()) + } + + fn supports_display(&self, bar: &Bar0) -> bool { + super::ga100::display_enabled_ga100(bar) + } + + fn vidmem_size(&self, bar: &Bar0) -> u64 { + super::ga102::vidmem_size_ga102(bar) + } + + fn non_wpr_heap_size(&self) -> Option<u32> { + Some(0x220000) + } +} + +const GB202: Gb202 = Gb202; +pub(super) const GB202_HAL: &dyn FbHal = &GB202; diff --git a/drivers/gpu/nova-core/regs.rs b/drivers/gpu/nova-core/regs.rs index 0d3ad4755a81..dfc30247bca6 100644 --- a/drivers/gpu/nova-core/regs.rs +++ b/drivers/gpu/nova-core/regs.rs @@ -116,6 +116,42 @@ fn fmt(&self, f: &mut kernel::fmt::Formatter<'_>) -> kernel::fmt::Result { 23:0 adr_63_40 as u32; }); +// Blackwell GB10x sysmem flush registers (HSHUB0). +// +// GB10x GPUs use two pairs of HSHUB registers for sysmembar: a primary pair and an EG +// (egress) pair. Both must be programmed to the same address. Hardware ignores bits 7:0 +// of each LO register. HSHUB0 base is 0x00891000. + +register!(NV_PFB_HSHUB0_PCIE_FLUSH_SYSMEM_ADDR_LO @ 0x00891e50 { + 31:0 adr as u32; +}); + +register!(NV_PFB_HSHUB0_PCIE_FLUSH_SYSMEM_ADDR_HI @ 0x00891e54 { + 19:0 adr as u32; +}); + +register!(NV_PFB_HSHUB0_EG_PCIE_FLUSH_SYSMEM_ADDR_LO @ 0x008916c0 { + 31:0 adr as u32; +}); + +register!(NV_PFB_HSHUB0_EG_PCIE_FLUSH_SYSMEM_ADDR_HI @ 0x008916c4 { + 19:0 adr as u32; +}); + +// Blackwell GB20x sysmem flush registers (FBHUB0). +// +// Unlike the older NV_PFB_NISO_FLUSH_SYSMEM_ADDR registers which encode the address with an +// 8-bit right-shift, these registers take the raw address split into lower/upper 32-bit halves. +// The hardware ignores bits 7:0 of the LO register. + +register!(NV_PFB_FBHUB0_PCIE_FLUSH_SYSMEM_ADDR_LO @ 0x008a1d58 { + 31:0 adr as u32; +}); + +register!(NV_PFB_FBHUB0_PCIE_FLUSH_SYSMEM_ADDR_HI @ 0x008a1d5c { + 19:0 adr as u32; +}); + register!(NV_PFB_PRI_MMU_LOCAL_MEMORY_RANGE @ 0x00100ce0 { 3:0 lower_scale as u8; 9:4 lower_mag as u8; -- 2.53.0
