From 5737ff972e8361b6ebf673b8954e86cb6a28da46 Mon Sep 17 00:00:00 2001 From: Brian Norris Date: Wed, 24 Apr 2024 12:59:59 -0700 Subject: [PATCH] flashrom_tester: Correct "WP screw" message flashrom_tester prints hints on how to modify hardware write protect state as follows: ... > connect the battery (and/or open the WP screw) ... > disconnect the battery (and/or open the WP screw) ... The first advice should be "[...] close the WP screw". TEST=`flashrom_tester --flashrom_binary=$(which flashrom) \ internal Erase_and_Write Fail_to_verify` Change-Id: I45f06db51e92e68bf724b13bdf5b31bba511d270 Signed-off-by: Brian Norris Reviewed-on: https://review.coreboot.org/c/flashrom/+/82083 Reviewed-by: Hsuan-ting Chen Reviewed-by: Evan Benn Reviewed-by: Anastasia Klimchuk Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- util/flashrom_tester/src/utils.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/util/flashrom_tester/src/utils.rs b/util/flashrom_tester/src/utils.rs index 4e8dd7cce..017d77d99 100644 --- a/util/flashrom_tester/src/utils.rs +++ b/util/flashrom_tester/src/utils.rs @@ -101,8 +101,9 @@ pub fn construct_layout_file(mut target: F, ls: &LayoutSizes) -> std:: pub fn toggle_hw_wp(dis: bool) -> Result<(), String> { // The easist way to toggle the hardware write-protect is - // to {dis}connect the battery (and/or open the WP screw). + // to {dis}connect the battery (and/or {open,close} the WP screw). let s = if dis { "dis" } else { "" }; + let screw_state = if dis { "open" } else { "close" }; // Print a failure message, but not on the first try. let mut fail_msg = None; while dis == get_hardware_wp()? { @@ -112,7 +113,7 @@ pub fn toggle_hw_wp(dis: bool) -> Result<(), String> { fail_msg = Some(format!("Hardware write protect is still {}!", !dis)); // The following message is read by the tast test. Do not modify. info!("Prompt for hardware WP {}able", s); - eprintln!(" > {}connect the battery (and/or open the WP screw)", s); + eprintln!(" > {}connect the battery (and/or {} the WP screw)", s, screw_state); pause(); } Ok(())