Commit 52331715 authored by Alexandre Courbot's avatar Alexandre Courbot
Browse files

gpu: nova-core: bindings: derive `MaybeZeroable` 



Commit 4846300b ("rust: derive `Zeroable` for all structs & unions
generated by bindgen where possible") automatically derives
`MaybeZeroable` for all bindings. This is better than selectively
deriving `Zeroable` as it ensures all types that can implement
`Zeroable` do.

Regenerate the nova-core bindings so they benefit from this, and remove
a now unneeded implementation of `Zeroable`.

Fixes: 75f6b1de ("gpu: nova-core: gsp: Add GSP command queue bindings and handling")
Reviewed-by: default avatarLyude Paul <lyude@redhat.com>
Reviewed-by: default avatarJoel Fernandes <joelagnelf@nvidia.com>
Acked-by: default avatarDanilo Krummrich <dakr@kernel.org>
Link: https://patch.msgid.link/20251216-nova-fixes-v3-3-c7469a71f7c4@nvidia.com


Signed-off-by: default avatarAlexandre Courbot <acourbot@nvidia.com>
parent 9d250ab0

drivers/gpu/nova-core/gsp/fw.rs

+0 −7
Original line number Diff line number Diff line
@@ -797,13 +797,6 @@ fn init(cmd_size: usize, function: MsgFunction) -> impl Init<Self, Error> { 
    }

}



// SAFETY: We can't derive the Zeroable trait for this binding because the

// procedural macro doesn't support the syntax used by bindgen to create the

// __IncompleteArrayField types. So instead we implement it here, which is safe

// because these are explicitly padded structures only containing types for

// which any bit pattern, including all zeros, is valid.

unsafe impl Zeroable for bindings::rpc_message_header_v {}



/// GSP Message Element.

///

/// This is essentially a message header expected to be followed by the message data.

drivers/gpu/nova-core/gsp/fw/r570_144.rs

+7 −4
Original line number Diff line number Diff line
@@ -24,8 +24,11 @@ 
    unreachable_pub,

    unsafe_op_in_unsafe_fn

)]

use kernel::{

    ffi,

    prelude::Zeroable, //

};

use kernel::ffi;

use pin_init::MaybeZeroable;



include!("r570_144/bindings.rs");



// SAFETY: This type has a size of zero, so its inclusion into another type should not affect their

// ability to implement `Zeroable`.

unsafe impl<T> kernel::prelude::Zeroable for __IncompleteArrayField<T> {}

drivers/gpu/nova-core/gsp/fw/r570_144/bindings.rs

+47 −46
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ fn fmt(&self, fmt: &mut ::core::fmt::Formatter<'_>) -> ::core::fmt::Result { 
pub const NV_VGPU_MSG_EVENT_NUM_EVENTS: _bindgen_ty_3 = 4131;

pub type _bindgen_ty_3 = ffi::c_uint;

#[repr(C)]

#[derive(Debug, Default, Copy, Clone)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct NV0080_CTRL_GPU_GET_SRIOV_CAPS_PARAMS {

    pub totalVFs: u32_,

    pub firstVfOffset: u32_,
@@ -344,7 +344,7 @@ pub struct NV0080_CTRL_GPU_GET_SRIOV_CAPS_PARAMS { 
    pub __bindgen_padding_1: [u8; 7usize],

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct NV2080_CTRL_BIOS_GET_SKU_INFO_PARAMS {

    pub BoardID: u32_,

    pub chipSKU: [ffi::c_char; 9usize],
@@ -360,7 +360,7 @@ pub struct NV2080_CTRL_BIOS_GET_SKU_INFO_PARAMS { 
}

pub type NV2080_CTRL_CMD_FB_GET_FB_REGION_SURFACE_MEM_TYPE_FLAG = [u8_; 17usize];

#[repr(C)]

#[derive(Debug, Default, Copy, Clone)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct NV2080_CTRL_CMD_FB_GET_FB_REGION_FB_REGION_INFO {

    pub base: u64_,

    pub limit: u64_,
@@ -372,14 +372,14 @@ pub struct NV2080_CTRL_CMD_FB_GET_FB_REGION_FB_REGION_INFO { 
    pub blackList: NV2080_CTRL_CMD_FB_GET_FB_REGION_SURFACE_MEM_TYPE_FLAG,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct NV2080_CTRL_CMD_FB_GET_FB_REGION_INFO_PARAMS {

    pub numFBRegions: u32_,

    pub __bindgen_padding_0: [u8; 4usize],

    pub fbRegion: [NV2080_CTRL_CMD_FB_GET_FB_REGION_FB_REGION_INFO; 16usize],

}

#[repr(C)]

#[derive(Debug, Copy, Clone)]

#[derive(Debug, Copy, Clone, MaybeZeroable)]

pub struct NV2080_CTRL_GPU_GET_GID_INFO_PARAMS {

    pub index: u32_,

    pub flags: u32_,
@@ -396,14 +396,14 @@ fn default() -> Self { 
    }

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct DOD_METHOD_DATA {

    pub status: u32_,

    pub acpiIdListLen: u32_,

    pub acpiIdList: [u32_; 16usize],

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct JT_METHOD_DATA {

    pub status: u32_,

    pub jtCaps: u32_,
@@ -412,14 +412,14 @@ pub struct JT_METHOD_DATA { 
    pub __bindgen_padding_0: u8,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct MUX_METHOD_DATA_ELEMENT {

    pub acpiId: u32_,

    pub mode: u32_,

    pub status: u32_,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct MUX_METHOD_DATA {

    pub tableLen: u32_,

    pub acpiIdMuxModeTable: [MUX_METHOD_DATA_ELEMENT; 16usize],
@@ -427,13 +427,13 @@ pub struct MUX_METHOD_DATA { 
    pub acpiIdMuxStateTable: [MUX_METHOD_DATA_ELEMENT; 16usize],

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct CAPS_METHOD_DATA {

    pub status: u32_,

    pub optimusCaps: u32_,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct ACPI_METHOD_DATA {

    pub bValid: u8_,

    pub __bindgen_padding_0: [u8; 3usize],
@@ -443,20 +443,20 @@ pub struct ACPI_METHOD_DATA { 
    pub capsMethodData: CAPS_METHOD_DATA,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct VIRTUAL_DISPLAY_GET_MAX_RESOLUTION_PARAMS {

    pub headIndex: u32_,

    pub maxHResolution: u32_,

    pub maxVResolution: u32_,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct VIRTUAL_DISPLAY_GET_NUM_HEADS_PARAMS {

    pub numHeads: u32_,

    pub maxNumHeads: u32_,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct BUSINFO {

    pub deviceID: u16_,

    pub vendorID: u16_,
@@ -466,7 +466,7 @@ pub struct BUSINFO { 
    pub __bindgen_padding_0: u8,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct GSP_VF_INFO {

    pub totalVFs: u32_,

    pub firstVFOffset: u32_,
@@ -479,25 +479,25 @@ pub struct GSP_VF_INFO { 
    pub __bindgen_padding_0: [u8; 5usize],

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct GSP_PCIE_CONFIG_REG {

    pub linkCap: u32_,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct EcidManufacturingInfo {

    pub ecidLow: u32_,

    pub ecidHigh: u32_,

    pub ecidExtended: u32_,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct FW_WPR_LAYOUT_OFFSET {

    pub nonWprHeapOffset: u64_,

    pub frtsOffset: u64_,

}

#[repr(C)]

#[derive(Debug, Copy, Clone)]

#[derive(Debug, Copy, Clone, MaybeZeroable)]

pub struct GspStaticConfigInfo_t {

    pub grCapsBits: [u8_; 23usize],

    pub __bindgen_padding_0: u8,
@@ -570,7 +570,7 @@ fn default() -> Self { 
    }

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct GspSystemInfo {

    pub gpuPhysAddr: u64_,

    pub gpuPhysFbAddr: u64_,
@@ -627,7 +627,7 @@ pub struct GspSystemInfo { 
    pub hostPageSize: u64_,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct MESSAGE_QUEUE_INIT_ARGUMENTS {

    pub sharedMemPhysAddr: u64_,

    pub pageTableEntryCount: u32_,
@@ -636,7 +636,7 @@ pub struct MESSAGE_QUEUE_INIT_ARGUMENTS { 
    pub statQueueOffset: u64_,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct GSP_SR_INIT_ARGUMENTS {

    pub oldLevel: u32_,

    pub flags: u32_,
@@ -644,7 +644,7 @@ pub struct GSP_SR_INIT_ARGUMENTS { 
    pub __bindgen_padding_0: [u8; 3usize],

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct GSP_ARGUMENTS_CACHED {

    pub messageQueueInitArguments: MESSAGE_QUEUE_INIT_ARGUMENTS,

    pub srInitArguments: GSP_SR_INIT_ARGUMENTS,
@@ -654,13 +654,13 @@ pub struct GSP_ARGUMENTS_CACHED { 
    pub profilerArgs: GSP_ARGUMENTS_CACHED__bindgen_ty_1,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct GSP_ARGUMENTS_CACHED__bindgen_ty_1 {

    pub pa: u64_,

    pub size: u64_,

}

#[repr(C)]

#[derive(Copy, Clone, Zeroable)]

#[derive(Copy, Clone, MaybeZeroable)]

pub union rpc_message_rpc_union_field_v03_00 {

    pub spare: u32_,

    pub cpuRmGfid: u32_,
@@ -676,6 +676,7 @@ fn default() -> Self { 
}

pub type rpc_message_rpc_union_field_v = rpc_message_rpc_union_field_v03_00;

#[repr(C)]

#[derive(MaybeZeroable)]

pub struct rpc_message_header_v03_00 {

    pub header_version: u32_,

    pub signature: u32_,
@@ -698,7 +699,7 @@ fn default() -> Self { 
}

pub type rpc_message_header_v = rpc_message_header_v03_00;

#[repr(C)]

#[derive(Copy, Clone, Zeroable)]

#[derive(Copy, Clone, MaybeZeroable)]

pub struct GspFwWprMeta {

    pub magic: u64_,

    pub revision: u64_,
@@ -733,19 +734,19 @@ pub struct GspFwWprMeta { 
    pub verified: u64_,

}

#[repr(C)]

#[derive(Copy, Clone, Zeroable)]

#[derive(Copy, Clone, MaybeZeroable)]

pub union GspFwWprMeta__bindgen_ty_1 {

    pub __bindgen_anon_1: GspFwWprMeta__bindgen_ty_1__bindgen_ty_1,

    pub __bindgen_anon_2: GspFwWprMeta__bindgen_ty_1__bindgen_ty_2,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct GspFwWprMeta__bindgen_ty_1__bindgen_ty_1 {

    pub sysmemAddrOfSignature: u64_,

    pub sizeOfSignature: u64_,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct GspFwWprMeta__bindgen_ty_1__bindgen_ty_2 {

    pub gspFwHeapFreeListWprOffset: u32_,

    pub unused0: u32_,
@@ -761,13 +762,13 @@ fn default() -> Self { 
    }

}

#[repr(C)]

#[derive(Copy, Clone, Zeroable)]

#[derive(Copy, Clone, MaybeZeroable)]

pub union GspFwWprMeta__bindgen_ty_2 {

    pub __bindgen_anon_1: GspFwWprMeta__bindgen_ty_2__bindgen_ty_1,

    pub __bindgen_anon_2: GspFwWprMeta__bindgen_ty_2__bindgen_ty_2,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct GspFwWprMeta__bindgen_ty_2__bindgen_ty_1 {

    pub partitionRpcAddr: u64_,

    pub partitionRpcRequestOffset: u16_,
@@ -779,7 +780,7 @@ pub struct GspFwWprMeta__bindgen_ty_2__bindgen_ty_1 { 
    pub lsUcodeVersion: u32_,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct GspFwWprMeta__bindgen_ty_2__bindgen_ty_2 {

    pub partitionRpcPadding: [u32_; 4usize],

    pub sysmemAddrOfCrashReportQueue: u64_,
@@ -814,7 +815,7 @@ fn default() -> Self { 
pub const LibosMemoryRegionLoc_LIBOS_MEMORY_REGION_LOC_FB: LibosMemoryRegionLoc = 2;

pub type LibosMemoryRegionLoc = ffi::c_uint;

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct LibosMemoryRegionInitArgument {

    pub id8: LibosAddress,

    pub pa: LibosAddress,
@@ -824,7 +825,7 @@ pub struct LibosMemoryRegionInitArgument { 
    pub __bindgen_padding_0: [u8; 6usize],

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct PACKED_REGISTRY_ENTRY {

    pub nameOffset: u32_,

    pub type_: u8_,
@@ -833,14 +834,14 @@ pub struct PACKED_REGISTRY_ENTRY { 
    pub length: u32_,

}

#[repr(C)]

#[derive(Debug, Default)]

#[derive(Debug, Default, MaybeZeroable)]

pub struct PACKED_REGISTRY_TABLE {

    pub size: u32_,

    pub numEntries: u32_,

    pub entries: __IncompleteArrayField<PACKED_REGISTRY_ENTRY>,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct msgqTxHeader {

    pub version: u32_,

    pub size: u32_,
@@ -852,13 +853,13 @@ pub struct msgqTxHeader { 
    pub entryOff: u32_,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone, Zeroable)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct msgqRxHeader {

    pub readPtr: u32_,

}

#[repr(C)]

#[repr(align(8))]

#[derive(Zeroable)]

#[derive(MaybeZeroable)]

pub struct GSP_MSG_QUEUE_ELEMENT {

    pub authTagBuffer: [u8_; 16usize],

    pub aadBuffer: [u8_; 16usize],
@@ -878,7 +879,7 @@ fn default() -> Self { 
    }

}

#[repr(C)]

#[derive(Debug, Default)]

#[derive(Debug, Default, MaybeZeroable)]

pub struct rpc_run_cpu_sequencer_v17_00 {

    pub bufferSizeDWord: u32_,

    pub cmdIndex: u32_,
@@ -896,20 +897,20 @@ pub struct rpc_run_cpu_sequencer_v17_00 { 
pub const GSP_SEQ_BUF_OPCODE_GSP_SEQ_BUF_OPCODE_CORE_RESUME: GSP_SEQ_BUF_OPCODE = 8;

pub type GSP_SEQ_BUF_OPCODE = ffi::c_uint;

#[repr(C)]

#[derive(Debug, Default, Copy, Clone)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct GSP_SEQ_BUF_PAYLOAD_REG_WRITE {

    pub addr: u32_,

    pub val: u32_,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct GSP_SEQ_BUF_PAYLOAD_REG_MODIFY {

    pub addr: u32_,

    pub mask: u32_,

    pub val: u32_,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct GSP_SEQ_BUF_PAYLOAD_REG_POLL {

    pub addr: u32_,

    pub mask: u32_,
@@ -918,24 +919,24 @@ pub struct GSP_SEQ_BUF_PAYLOAD_REG_POLL { 
    pub error: u32_,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct GSP_SEQ_BUF_PAYLOAD_DELAY_US {

    pub val: u32_,

}

#[repr(C)]

#[derive(Debug, Default, Copy, Clone)]

#[derive(Debug, Default, Copy, Clone, MaybeZeroable)]

pub struct GSP_SEQ_BUF_PAYLOAD_REG_STORE {

    pub addr: u32_,

    pub index: u32_,

}

#[repr(C)]

#[derive(Copy, Clone)]

#[derive(Copy, Clone, MaybeZeroable)]

pub struct GSP_SEQUENCER_BUFFER_CMD {

    pub opCode: GSP_SEQ_BUF_OPCODE,

    pub payload: GSP_SEQUENCER_BUFFER_CMD__bindgen_ty_1,

}

#[repr(C)]

#[derive(Copy, Clone)]

#[derive(Copy, Clone, MaybeZeroable)]

pub union GSP_SEQUENCER_BUFFER_CMD__bindgen_ty_1 {

    pub regWrite: GSP_SEQ_BUF_PAYLOAD_REG_WRITE,

    pub regModify: GSP_SEQ_BUF_PAYLOAD_REG_MODIFY,