From 69eb06f39e5134565babfe96c66a3786c0a571cf Mon Sep 17 00:00:00 2001 From: Steffen Eiden Date: Tue, 20 Feb 2024 14:50:47 +0100 Subject: [PATCH] rust/pv_core: Update ffi.rs to linux/uvdevice.h v6.13 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While at it, add a file global #[allow(dead_code)]. The file is a rustified copy of linux/arch/s390/include/uapi/asm/uvdevice.h and there might be things that are not needed here but are defined in that header. Acked-by: Marc Hartmayer Reviewed-by: Christoph Schlameuss Signed-off-by: Steffen Eiden Signed-off-by: Jan Höppner --- rust/pv_core/src/uvdevice/ffi.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/rust/pv_core/src/uvdevice/ffi.rs b/rust/pv_core/src/uvdevice/ffi.rs index bbcc5867..3d9998db 100644 --- a/rust/pv_core/src/uvdevice/ffi.rs +++ b/rust/pv_core/src/uvdevice/ffi.rs @@ -2,6 +2,13 @@ // // Copyright IBM Corp. 2023 +// This file is a rustified copy of linux/arch/s390/include/uapi/asm/uvdevice.h +// There might be things that are not needed here but nontheless defined in that header. +// Those two files should be in sync -> there might be unused/dead code. +// +// The `UVIO_IOCTL_*` and `UVIO_SUPP_*` macros +#![allow(dead_code)] + use std::mem::size_of; use crate::{assert_size, static_assert}; @@ -11,9 +18,8 @@ pub const UVIO_ATT_ARCB_MAX_LEN: usize = 0x100000; pub const UVIO_ATT_MEASUREMENT_MAX_LEN: usize = 0x8000; pub const UVIO_ATT_ADDITIONAL_MAX_LEN: usize = 0x8000; pub const UVIO_ADD_SECRET_MAX_LEN: usize = 0x100000; -#[allow(unused)] -// here for completeness pub const UVIO_LIST_SECRETS_LEN: usize = 0x1000; +pub const UVIO_RETR_SECRET_MAX_LEN: usize = 0x2000; // equal to ascii 'u' pub const UVIO_TYPE_UVC: u8 = 117u8; @@ -23,6 +29,7 @@ pub const UVIO_IOCTL_ATT_NR: u8 = 1; pub const UVIO_IOCTL_ADD_SECRET_NR: u8 = 2; pub const UVIO_IOCTL_LIST_SECRETS_NR: u8 = 3; pub const UVIO_IOCTL_LOCK_SECRETS_NR: u8 = 4; +pub const UVIO_IOCTL_RETR_SECRET_NR: u8 = 5; /// Uvdevice IOCTL control block /// Programs can use this struct to communicate with the uvdevice via IOCTLs