pvmfw: Replace "BCC" with proper DICE terminology
Continue the change started in f2cc57180932 ("pvmfw: README: Rename BCC
to DICE chain", aosp/3003077), which was limited to documentation, to
replace the term "BCC" with the updated DICE terminology in code.
Properly distinguish between DICE handover (most cases) and the actual
DICE chain, where appropriate. Note that some dependencies of pvmfw
still use the deprecated term.
Bug: 329336627
Test: m libpvmfw.dice.test pvmfw_bin
Change-Id: Iafacb8fd2336ae50457af0cc0fb96c68a14654d5
diff --git a/guest/pvmfw/src/entry.rs b/guest/pvmfw/src/entry.rs
index 8ada6a1..3714173 100644
--- a/guest/pvmfw/src/entry.rs
+++ b/guest/pvmfw/src/entry.rs
@@ -33,8 +33,8 @@
#[derive(Debug, Clone)]
pub enum RebootReason {
- /// A malformed BCC was received.
- InvalidBcc,
+ /// A malformed DICE handover was received.
+ InvalidDiceHandover,
/// An invalid configuration was appended to pvmfw.
InvalidConfig,
/// An unexpected internal error happened.
@@ -54,7 +54,7 @@
impl RebootReason {
pub fn as_avf_reboot_string(&self) -> &'static str {
match self {
- Self::InvalidBcc => "PVM_FIRMWARE_INVALID_BCC",
+ Self::InvalidDiceHandover => "PVM_FIRMWARE_INVALID_DICE_HANDOVER",
Self::InvalidConfig => "PVM_FIRMWARE_INVALID_CONFIG_DATA",
Self::InternalError => "PVM_FIRMWARE_INTERNAL_ERROR",
Self::InvalidFdt => "PVM_FIRMWARE_INVALID_FDT",
@@ -135,21 +135,21 @@
let mut slices = MemorySlices::new(fdt, payload, payload_size)?;
// This wrapper allows main() to be blissfully ignorant of platform details.
- let (next_bcc, debuggable_payload) = crate::main(
+ let (next_dice_handover, debuggable_payload) = crate::main(
slices.fdt,
slices.kernel,
slices.ramdisk,
- config_entries.bcc,
+ config_entries.dice_handover,
config_entries.debug_policy,
config_entries.vm_dtbo,
config_entries.vm_ref_dt,
)?;
- slices.add_dice_chain(next_bcc);
+ slices.add_dice_handover(next_dice_handover);
// Keep UART MMIO_GUARD-ed for debuggable payloads, to enable earlycon.
let keep_uart = cfg!(debuggable_vms_improvements) && debuggable_payload;
// Writable-dirty regions will be flushed when MemoryTracker is dropped.
- config_entries.bcc.zeroize();
+ config_entries.dice_handover.zeroize();
unshare_all_mmio_except_uart().map_err(|e| {
error!("Failed to unshare MMIO ranges: {e}");
@@ -180,8 +180,8 @@
enum AppendedPayload<'a> {
/// Configuration data.
Config(config::Config<'a>),
- /// Deprecated raw BCC, as used in Android T.
- LegacyBcc(&'a mut [u8]),
+ /// Deprecated raw DICE handover, as used in Android T.
+ LegacyDiceHandover(&'a mut [u8]),
}
impl<'a> AppendedPayload<'a> {
@@ -201,9 +201,12 @@
// SAFETY: Pointer to a valid mut (not accessed elsewhere), 'a lifetime re-used.
let data: &'a mut _ = unsafe { &mut *data_ptr };
- const BCC_SIZE: usize = SIZE_4KB;
- warn!("Assuming the appended data at {:?} to be a raw BCC", data.as_ptr());
- Some(Self::LegacyBcc(&mut data[..BCC_SIZE]))
+ const DICE_CHAIN_SIZE: usize = SIZE_4KB;
+ warn!(
+ "Assuming the appended data at {:?} to be a raw DICE handover",
+ data.as_ptr()
+ );
+ Some(Self::LegacyDiceHandover(&mut data[..DICE_CHAIN_SIZE]))
}
Err(e) => {
error!("Invalid configuration data at {data_ptr:?}: {e}");
@@ -215,7 +218,9 @@
fn get_entries(self) -> config::Entries<'a> {
match self {
Self::Config(cfg) => cfg.get_entries(),
- Self::LegacyBcc(bcc) => config::Entries { bcc, ..Default::default() },
+ Self::LegacyDiceHandover(dice_handover) => {
+ config::Entries { dice_handover, ..Default::default() }
+ }
}
}
}