External/cloud-hypervisor
1
0
Fork 0
mirror of https://github.com/cloud-hypervisor/cloud-hypervisor.git synced 2025-02-23 03:42:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

devices: change TPM_CRB_R_MAX from u32 to usize

Browse Source 
This simplifies the code a bit.

Signed-off-by: Wei Liu <liuwe@microsoft.com>
This commit is contained in:
Wei Liu 2023-01-24 23:45:10 +00:00 committed by Rob Bradford
parent 6725771dc3
commit 99d8c34861
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
devices/src/tpm.rs
View File

@ -94,7 +94,7 @@ const TPM_CRB_NO_LOCALITY: u32 = 0xff;
const TPM_CRB_ADDR_BASE: u32 = TPM_START.0 as u32; const TPM_CRB_ADDR_BASE: u32 = TPM_START.0 as u32;
const TPM_CRB_ADDR_SIZE: usize = TPM_SIZE as usize; const TPM_CRB_ADDR_SIZE: usize = TPM_SIZE as usize;
const TPM_CRB_R_MAX: u32 = CRB_DATA_BUFFER; const TPM_CRB_R_MAX: usize = CRB_DATA_BUFFER as usize;
// CRB Protocol details // CRB Protocol details
const CRB_INTF_TYPE_CRB_ACTIVE: u32 = 0b1; const CRB_INTF_TYPE_CRB_ACTIVE: u32 = 0b1;
@ -123,7 +123,7 @@ fn get_fields_map(reg: u32) -> phf::Map<&'static str, [u32; 2]> {
} }
/// Set a particular field in a Register /// Set a particular field in a Register
fn set_reg_field(regs: &mut [u32; TPM_CRB_R_MAX as usize], reg: u32, field: &str, value: u32) { fn set_reg_field(regs: &mut [u32; TPM_CRB_R_MAX], reg: u32, field: &str, value: u32) {
let reg_fields = get_fields_map(reg); let reg_fields = get_fields_map(reg);
if reg_fields.contains_key(field) { if reg_fields.contains_key(field) {
let start = reg_fields.get(field).unwrap()[0]; let start = reg_fields.get(field).unwrap()[0];
@ -139,7 +139,7 @@ fn set_reg_field(regs: &mut [u32; TPM_CRB_R_MAX as usize], reg: u32, field: &str
} }
/// Get the value of a particular field in a Register /// Get the value of a particular field in a Register
fn get_reg_field(regs: &[u32; TPM_CRB_R_MAX as usize], reg: u32, field: &str) -> u32 { fn get_reg_field(regs: &[u32; TPM_CRB_R_MAX], reg: u32, field: &str) -> u32 {
let reg_fields = get_fields_map(reg); let reg_fields = get_fields_map(reg);
if reg_fields.contains_key(field) { if reg_fields.contains_key(field) {
let start = reg_fields.get(field).unwrap()[0]; let start = reg_fields.get(field).unwrap()[0];
@ -159,7 +159,7 @@ fn locality_from_addr(addr: u32) -> u8 {
pub struct Tpm { pub struct Tpm {
emulator: Emulator, emulator: Emulator,
cmd: Option<BackendCmd>, cmd: Option<BackendCmd>,
regs: [u32; TPM_CRB_R_MAX as usize], regs: [u32; TPM_CRB_R_MAX],
backend_buff_size: usize, backend_buff_size: usize,
data_buff: [u8; TPM_CRB_BUFFER_MAX], data_buff: [u8; TPM_CRB_BUFFER_MAX],
data_buff_len: usize, data_buff_len: usize,
@ -172,7 +172,7 @@ impl Tpm {
let mut tpm = Tpm { let mut tpm = Tpm {
emulator, emulator,
cmd: None, cmd: None,
regs: [0; TPM_CRB_R_MAX as usize], regs: [0; TPM_CRB_R_MAX],
backend_buff_size: TPM_CRB_BUFFER_MAX, backend_buff_size: TPM_CRB_BUFFER_MAX,
data_buff: [0; TPM_CRB_BUFFER_MAX], data_buff: [0; TPM_CRB_BUFFER_MAX],
data_buff_len: 0, data_buff_len: 0,
@ -197,7 +197,7 @@ impl Tpm {
fn reset(&mut self) -> Result<()> { fn reset(&mut self) -> Result<()> {
let cur_buff_size = self.emulator.get_buffer_size().unwrap(); let cur_buff_size = self.emulator.get_buffer_size().unwrap();
self.regs = [0; TPM_CRB_R_MAX as usize]; self.regs = [0; TPM_CRB_R_MAX];
set_reg_field(&mut self.regs, CRB_LOC_STATE, "tpmRegValidSts", 1); set_reg_field(&mut self.regs, CRB_LOC_STATE, "tpmRegValidSts", 1);
set_reg_field(&mut self.regs, CRB_CTRL_STS, "tpmIdle", 1); set_reg_field(&mut self.regs, CRB_CTRL_STS, "tpmIdle", 1);
set_reg_field( set_reg_field(
@ -456,7 +456,7 @@ mod tests {
#[test] #[test]
fn test_set_get_reg_field() { fn test_set_get_reg_field() {
let mut regs: [u32; TPM_CRB_R_MAX as usize] = [0; TPM_CRB_R_MAX as usize]; let mut regs: [u32; TPM_CRB_R_MAX] = [0; TPM_CRB_R_MAX];
set_reg_field(&mut regs, CRB_INTF_ID, "RID", 0xAC); set_reg_field(&mut regs, CRB_INTF_ID, "RID", 0xAC);
assert_eq!( assert_eq!(
get_reg_field(&regs, CRB_INTF_ID, "RID"), get_reg_field(&regs, CRB_INTF_ID, "RID"),