mirror of
https://review.coreboot.org/flashrom.git
synced 2025-07-01 22:21:16 +02:00
flashrom_tester: Fix partial_lock_test on libflashrom
partial_lock_test (Lock_top_quad, Lock_bottom_quad, Lock_bottom_half, and Lock_top_half) tries to: 1. Disable HWWP 2. Lock partial 3. Enable HWWP 4. Try to write the locked partial and expect a failure ... The 4th step only works on flashrom binary since the binary will set FLASHROM_FLAG_VERIFY_AFTER_WRITE=1 by default and it will error out while verifying. But libflashrom does not set any flag beforehand, so it has FLASHROM_FLAG_VERIFY_AFTER_WRITE=0 and thus it will think the write command works normally and raise no error. This causes the issue that flashrom_tester with libflashrom has been failed until today. To solve this issue, there are two solutions: 1. Take care of the default flags in libflashrom 2. Always pass --noverify to flashrom binary and verify it afterwards. To make both methods more consistent, I fix it with approach 1. BUG=b:304439294 BRANCH=none TEST=flashrom_tester internal --libflashrom Lock_top_quad Change-Id: I7a8ac0c0984fef3cd9e73ed8d8097ddf429e54b2 Signed-off-by: roccochen@chromium.com <roccochen@chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/79304 Reviewed-by: Anastasia Klimchuk <aklm@chromium.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:

committed by
Anastasia Klimchuk

parent
c52f949b62
commit
04deed8c8f
@ -473,6 +473,87 @@ impl Drop for Programmer {
|
||||
}
|
||||
}
|
||||
|
||||
/// A translation of the flashrom_flag type
|
||||
///
|
||||
/// Keep this list in sync with libflashrom.h
|
||||
#[derive(Clone, Debug, Eq, Hash, PartialEq)]
|
||||
pub enum FlashromFlag {
|
||||
FlashromFlagForce,
|
||||
FlashromFlagForceBoardmismatch,
|
||||
FlashromFlagVerifyAfterWrite,
|
||||
FlashromFlagVerifyWholeChip,
|
||||
FlashromFlagSkipUnreadableRegions,
|
||||
FlashromFlagSkipUnwritableRegions,
|
||||
}
|
||||
|
||||
impl From<FlashromFlag> for libflashrom_sys::flashrom_flag {
|
||||
fn from(e: FlashromFlag) -> Self {
|
||||
match e {
|
||||
FlashromFlag::FlashromFlagForce => libflashrom_sys::flashrom_flag::FLASHROM_FLAG_FORCE,
|
||||
FlashromFlag::FlashromFlagForceBoardmismatch => {
|
||||
libflashrom_sys::flashrom_flag::FLASHROM_FLAG_FORCE_BOARDMISMATCH
|
||||
}
|
||||
FlashromFlag::FlashromFlagVerifyAfterWrite => {
|
||||
libflashrom_sys::flashrom_flag::FLASHROM_FLAG_VERIFY_AFTER_WRITE
|
||||
}
|
||||
FlashromFlag::FlashromFlagVerifyWholeChip => {
|
||||
libflashrom_sys::flashrom_flag::FLASHROM_FLAG_VERIFY_WHOLE_CHIP
|
||||
}
|
||||
FlashromFlag::FlashromFlagSkipUnreadableRegions => {
|
||||
libflashrom_sys::flashrom_flag::FLASHROM_FLAG_SKIP_UNREADABLE_REGIONS
|
||||
}
|
||||
FlashromFlag::FlashromFlagSkipUnwritableRegions => {
|
||||
libflashrom_sys::flashrom_flag::FLASHROM_FLAG_SKIP_UNWRITABLE_REGIONS
|
||||
}
|
||||
e => panic!("Unexpected FlashromFlag: {:?}", e),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Various flags of the flashrom context
|
||||
///
|
||||
/// Keep the struct in sync with the flags in flash.h
|
||||
#[derive(Debug)]
|
||||
pub struct FlashromFlags {
|
||||
pub force: bool,
|
||||
pub force_boardmismatch: bool,
|
||||
pub verify_after_write: bool,
|
||||
pub verify_whole_chip: bool,
|
||||
pub skip_unreadable_regions: bool,
|
||||
pub skip_unwritable_regions: bool,
|
||||
}
|
||||
|
||||
/// Keep the default values in sync with cli_classic.c
|
||||
impl Default for FlashromFlags {
|
||||
fn default() -> Self {
|
||||
Self {
|
||||
force: false,
|
||||
force_boardmismatch: false,
|
||||
verify_after_write: true,
|
||||
verify_whole_chip: true,
|
||||
// These flags are introduced to address issues related to CSME locking parts. Setting
|
||||
// them to false as default values
|
||||
skip_unreadable_regions: false,
|
||||
skip_unwritable_regions: false,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Display for FlashromFlags {
|
||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
||||
write!(
|
||||
f,
|
||||
"FlashromFlags {{ force: {}, force_boardmismatch: {}, verify_after_write: {}, verify_whole_chip: {}, skip_unreadable_regions: {}, skip_unwritable_regions: {} }}",
|
||||
self.force,
|
||||
self.force_boardmismatch,
|
||||
self.verify_after_write,
|
||||
self.verify_whole_chip,
|
||||
self.skip_unreadable_regions,
|
||||
self.skip_unwritable_regions,
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
impl Chip {
|
||||
/// Probe for a chip
|
||||
///
|
||||
@ -705,6 +786,11 @@ impl Chip {
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// Set a flag in the given flash context
|
||||
pub fn flag_set(&mut self, flag: FlashromFlag, value: bool) -> () {
|
||||
unsafe { libflashrom_sys::flashrom_flag_set(self.ctx.as_mut(), flag.into(), value) }
|
||||
}
|
||||
}
|
||||
|
||||
impl Drop for Chip {
|
||||
|
Reference in New Issue
Block a user