February 2023 - flashrom-gerrit

[M] Change in flashrom[master]: flashrom_tester: Add positive check to verify_fail_test
by Edward O'Callaghan (Code Review) 06 Feb '23

06 Feb '23

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/71974 ) Change subject: flashrom_tester: Add positive check to verify_fail_test ...................................................................... flashrom_tester: Add positive check to verify_fail_test In verify_fail_test test that verify works when expected, as well as fails when expected. A verify_region_from_file function is added to support this. BUG=b:235916336 BRANCH=None TEST=None Change-Id: Ibbcc97086466b67cfab4f6c32140bb5f2c456beb Signed-off-by: Evan Benn <evanbenn(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/71974 Reviewed-by: Peter Marheine <pmarheine(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M util/flashrom_tester/flashrom/src/cmd.rs M util/flashrom_tester/flashrom/src/flashromlib.rs M util/flashrom_tester/flashrom/src/lib.rs M util/flashrom_tester/src/tests.rs 4 files changed, 72 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved Peter Marheine: Looks good to me, but someone else must approve diff --git a/util/flashrom_tester/flashrom/src/cmd.rs b/util/flashrom_tester/flashrom/src/cmd.rs index 85cbb12..1f13a8e 100644 --- a/util/flashrom_tester/flashrom/src/cmd.rs +++ b/util/flashrom_tester/flashrom/src/cmd.rs @@ -269,6 +269,18 @@ Ok(()) } + fn verify_region_from_file(&self, path: &Path, region: &str) -> Result<(), FlashromError> { + let opts = FlashromOpt { + io_opt: Some(IOOpt::Verify(OperationArgs::RegionFileRegion( + region, path, None, + ))), + ..Default::default() + }; + + self.dispatch(opts, "verify_region_from_file")?; + Ok(()) + } + fn erase(&self) -> Result<(), FlashromError> { let opts = FlashromOpt { io_opt: Some(IOOpt::Erase), diff --git a/util/flashrom_tester/flashrom/src/flashromlib.rs b/util/flashrom_tester/flashrom/src/flashromlib.rs index bf09e6d..5e1747b 100644 --- a/util/flashrom_tester/flashrom/src/flashromlib.rs +++ b/util/flashrom_tester/flashrom/src/flashromlib.rs @@ -152,6 +152,27 @@ Ok(()) } + fn verify_region_from_file(&self, path: &Path, region: &str) -> Result<(), FlashromError> { + let mut layout = self.flashrom.borrow_mut().layout_read_fmap_from_rom()?; + layout.include_region(region)?; + let range = layout.get_region_range(region)?; + let region_data = fs::read(path).map_err(|error| error.to_string())?; + if region_data.len() != range.len() { + return Err(format!( + "verify region range ({}) does not match provided file size ({})", + range.len(), + region_data.len() + ) + .into()); + } + let mut buf = vec![0; self.get_size()? as usize]; + buf[range].copy_from_slice(&region_data); + self.flashrom + .borrow_mut() + .image_verify(&buf, Some(layout))?; + Ok(()) + } + fn erase(&self) -> Result<(), FlashromError> { self.flashrom.borrow_mut().erase()?; Ok(()) diff --git a/util/flashrom_tester/flashrom/src/lib.rs b/util/flashrom_tester/flashrom/src/lib.rs index 7c86649..41393e8 100644 --- a/util/flashrom_tester/flashrom/src/lib.rs +++ b/util/flashrom_tester/flashrom/src/lib.rs @@ -133,7 +133,8 @@ /// Read the whole flash to the file specified by `path`. fn read_into_file(&self, path: &Path) -> Result<(), FlashromError>; - /// Read only a region of the flash. + /// Read only a region of the flash into the file specified by `path`. Note + /// the first byte written to the file is the first byte from the region. fn read_region_into_file(&self, path: &Path, region: &str) -> Result<(), FlashromError>; /// Write the whole flash to the file specified by `path`. @@ -152,6 +153,10 @@ /// Verify the whole flash against the file specified by `path`. fn verify_from_file(&self, path: &Path) -> Result<(), FlashromError>; + /// Verify only the region against the file specified by `path`. + /// Note the first byte in the file is matched against the first byte of the region. + fn verify_region_from_file(&self, path: &Path, region: &str) -> Result<(), FlashromError>; + /// Erase the whole flash. fn erase(&self) -> Result<(), FlashromError>; diff --git a/util/flashrom_tester/src/tests.rs b/util/flashrom_tester/src/tests.rs index 847bfec..721a789 100644 --- a/util/flashrom_tester/src/tests.rs +++ b/util/flashrom_tester/src/tests.rs @@ -44,6 +44,7 @@ use std::sync::atomic::AtomicBool; const ELOG_FILE: &str = "/tmp/elog.file"; +const FW_MAIN_B_PATH: &str = "/tmp/FW_MAIN_B.bin"; /// Iterate over tests, yielding only those tests with names matching filter_names. /// @@ -312,7 +313,16 @@ /// Check that flashrom 'verify' will fail if the provided data does not match the chip data. fn verify_fail_test(env: &mut TestEnv) -> TestResult { - // Comparing the flash contents to random data says they're not the same. + env.ensure_golden()?; + // Verify that verify is Ok when the data matches. We verify only a region + // and not the whole chip because coprocessors or firmware may have written + // some data in other regions. + env.cmd + .read_region_into_file(FW_MAIN_B_PATH.as_ref(), "FW_MAIN_B")?; + env.cmd + .verify_region_from_file(FW_MAIN_B_PATH.as_ref(), "FW_MAIN_B")?; + + // Verify that verify is false when the data does not match match env.verify(env.random_data_file()) { Ok(_) => Err("Verification says flash is full of random data".into()), Err(_) => Ok(()), -- To view, visit https://review.coreboot.org/c/flashrom/+/71974 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ibbcc97086466b67cfab4f6c32140bb5f2c456beb Gerrit-Change-Number: 71974 Gerrit-PatchSet: 10 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[L] Change in flashrom[master]: flashrom_tester: Rewrite IOOpts to support more operations
by Edward O'Callaghan (Code Review) 06 Feb '23

06 Feb '23

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/71973 ) Change subject: flashrom_tester: Rewrite IOOpts to support more operations ...................................................................... flashrom_tester: Rewrite IOOpts to support more operations flashrom cli supports include regions for all of read write and verify, as well as omitting the read/write/verify file if an include region with file is specified. Use an enum to allow only one operation at a time. Unify the read and write region implementations. BUG=b:235916336 BRANCH=None TEST=None Change-Id: I1cb46bb1b26949fd9c19949c43708a8b652e00da Signed-off-by: Evan Benn <evanbenn(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/71973 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Peter Marheine <pmarheine(a)chromium.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M util/flashrom_tester/flashrom/src/cmd.rs M util/flashrom_tester/flashrom/src/flashromlib.rs M util/flashrom_tester/flashrom/src/lib.rs M util/flashrom_tester/src/tests.rs 4 files changed, 156 insertions(+), 134 deletions(-) Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved Peter Marheine: Looks good to me, but someone else must approve diff --git a/util/flashrom_tester/flashrom/src/cmd.rs b/util/flashrom_tester/flashrom/src/cmd.rs index f24a2c9..85cbb12 100644 --- a/util/flashrom_tester/flashrom/src/cmd.rs +++ b/util/flashrom_tester/flashrom/src/cmd.rs @@ -33,7 +33,7 @@ // Software Foundation. // -use crate::{FlashChip, FlashromError, ROMWriteSpecifics}; +use crate::{FlashChip, FlashromError}; use std::{ ffi::{OsStr, OsString}, @@ -44,10 +44,7 @@ #[derive(Default)] pub struct FlashromOpt<'a> { pub wp_opt: WPOpt, - pub io_opt: IOOpt<'a>, - - pub layout: Option<&'a Path>, // -l <file> - pub image: Option<&'a str>, // -i <name> + pub io_opt: Option<IOOpt<'a>>, pub flash_name: bool, // --flash-name pub verbose: bool, // -V @@ -62,13 +59,28 @@ pub disable: bool, // --wp-disable } -#[derive(Default)] -pub struct IOOpt<'a> { - pub read: Option<&'a Path>, // -r <file> - pub write: Option<&'a Path>, // -w <file> - pub verify: Option<&'a Path>, // -v <file> - pub erase: bool, // -E - pub region: Option<(&'a str, &'a Path)>, // --image +pub enum OperationArgs<'a> { + /// The file is the whole chip. + EntireChip(&'a Path), + /// File is the size of the full chip, limited to a single named region. + /// + /// The required path is the file to use, and the optional path is a layout file + /// specifying how to locate regions (if unspecified, flashrom will attempt + /// to discover the layout itself). + FullFileRegion(&'a str, &'a Path, Option<&'a Path>), + /// File is the size of the single named region only. + /// + /// The required path is the file to use, and the optional path is a layout file + /// specifying how to locate regions (if unspecified, flashrom will attempt + /// to discover the layout itself). + RegionFileRegion(&'a str, &'a Path, Option<&'a Path>), // The file contains only the region +} + +pub enum IOOpt<'a> { + Read(OperationArgs<'a>), // -r <file> + Write(OperationArgs<'a>), // -w <file> + Verify(OperationArgs<'a>), // -v <file> + Erase, // -E } #[derive(PartialEq, Eq, Debug)] @@ -116,12 +128,7 @@ fn name(&self) -> Result<(String, String), FlashromError> { let opts = FlashromOpt { - io_opt: IOOpt { - ..Default::default() - }, - flash_name: true, - ..Default::default() }; @@ -132,16 +139,18 @@ } } - fn write_file_with_layout(&self, rws: &ROMWriteSpecifics) -> Result<bool, FlashromError> { + fn write_from_file_region( + &self, + path: &Path, + region: &str, + layout: &Path, + ) -> Result<bool, FlashromError> { let opts = FlashromOpt { - io_opt: IOOpt { - write: rws.write_file, - ..Default::default() - }, - - layout: rws.layout_file, - image: rws.name_file, - + io_opt: Some(IOOpt::Write(OperationArgs::FullFileRegion( + region, + path, + Some(layout), + ))), ..Default::default() }; @@ -220,10 +229,7 @@ fn read_into_file(&self, path: &Path) -> Result<(), FlashromError> { let opts = FlashromOpt { - io_opt: IOOpt { - read: Some(path), - ..Default::default() - }, + io_opt: Some(IOOpt::Read(OperationArgs::EntireChip(path))), ..Default::default() }; @@ -233,10 +239,9 @@ fn read_region_into_file(&self, path: &Path, region: &str) -> Result<(), FlashromError> { let opts = FlashromOpt { - io_opt: IOOpt { - region: Some((region, path)), - ..Default::default() - }, + io_opt: Some(IOOpt::Read(OperationArgs::RegionFileRegion( + region, path, None, + ))), ..Default::default() }; @@ -246,10 +251,7 @@ fn write_from_file(&self, path: &Path) -> Result<(), FlashromError> { let opts = FlashromOpt { - io_opt: IOOpt { - write: Some(path), - ..Default::default() - }, + io_opt: Some(IOOpt::Write(OperationArgs::EntireChip(path))), ..Default::default() }; @@ -259,10 +261,7 @@ fn verify_from_file(&self, path: &Path) -> Result<(), FlashromError> { let opts = FlashromOpt { - io_opt: IOOpt { - verify: Some(path), - ..Default::default() - }, + io_opt: Some(IOOpt::Verify(OperationArgs::EntireChip(path))), ..Default::default() }; @@ -272,10 +271,7 @@ fn erase(&self) -> Result<(), FlashromError> { let opts = FlashromOpt { - io_opt: IOOpt { - erase: true, - ..Default::default() - }, + io_opt: Some(IOOpt::Erase), ..Default::default() }; @@ -312,37 +308,49 @@ } // io_opt - if let Some((region, path)) = opts.io_opt.region { - params.push("--image".into()); - let mut p = OsString::new(); - p.push(region); - p.push(":"); - p.push(path); - params.push(p); - params.push("-r".into()); - } else if opts.io_opt.read.is_some() { - params.push("-r".into()); - params.push(opts.io_opt.read.unwrap().into()); - } else if opts.io_opt.write.is_some() { - params.push("-w".into()); - params.push(opts.io_opt.write.unwrap().into()); - } else if opts.io_opt.verify.is_some() { - params.push("-v".into()); - params.push(opts.io_opt.verify.unwrap().into()); - } else if opts.io_opt.erase { - params.push("-E".into()); + fn add_operation_args(opts: OperationArgs, params: &mut Vec<OsString>) { + let (file, region, layout) = match opts { + OperationArgs::EntireChip(file) => (Some(file), None, None), + OperationArgs::FullFileRegion(region, file, layout) => { + (Some(file), Some(region.to_string()), layout) + } + OperationArgs::RegionFileRegion(region, file, layout) => ( + None, + Some(format!("{region}:{}", file.to_string_lossy())), + layout, + ), + }; + if let Some(file) = file { + params.push(file.into()) + } + if let Some(region) = region { + params.push("--include".into()); + params.push(region.into()) + } + if let Some(layout) = layout { + params.push("--layout".into()); + params.push(layout.into()) + } + } + if let Some(io) = opts.io_opt { + match io { + IOOpt::Read(args) => { + params.push("-r".into()); + add_operation_args(args, &mut params); + } + IOOpt::Write(args) => { + params.push("-w".into()); + add_operation_args(args, &mut params); + } + IOOpt::Verify(args) => { + params.push("-v".into()); + add_operation_args(args, &mut params); + } + IOOpt::Erase => params.push("-E".into()), + } } // misc_opt - if opts.layout.is_some() { - params.push("-l".into()); - params.push(opts.layout.unwrap().into()); - } - if opts.image.is_some() { - params.push("-i".into()); - params.push(opts.image.unwrap().into()); - } - if opts.flash_name { params.push("--flash-name".into()); } @@ -474,7 +482,7 @@ fn test_io_opt(opts: IOOpt, expected: &[&str]) { assert_eq!( flashrom_decode_opts(FlashromOpt { - io_opt: opts, + io_opt: Some(opts), ..Default::default() }), expected @@ -482,53 +490,40 @@ } test_io_opt( - IOOpt { - read: Some(Path::new("foo.bin")), - ..Default::default() - }, + IOOpt::Read(crate::cmd::OperationArgs::EntireChip(Path::new("foo.bin"))), &["-r", "foo.bin"], ); test_io_opt( - IOOpt { - write: Some(Path::new("bar.bin")), - ..Default::default() - }, + IOOpt::Write(crate::cmd::OperationArgs::EntireChip(Path::new("bar.bin"))), &["-w", "bar.bin"], ); test_io_opt( - IOOpt { - verify: Some(Path::new("/tmp/baz.bin")), - ..Default::default() - }, - &["-v", "/tmp/baz.bin"], + IOOpt::Verify(crate::cmd::OperationArgs::EntireChip(Path::new("baz.bin"))), + &["-v", "baz.bin"], ); + test_io_opt(IOOpt::Erase, &["-E"]); test_io_opt( - IOOpt { - erase: true, - ..Default::default() - }, - &["-E"], + IOOpt::Read(crate::cmd::OperationArgs::FullFileRegion( + "RO", + Path::new("foo.bin"), + Some(Path::new("baz.bin")), + )), + &["-r", "foo.bin", "--include", "RO", "--layout", "baz.bin"], ); + + test_io_opt( + IOOpt::Read(crate::cmd::OperationArgs::RegionFileRegion( + "foo", + Path::new("bar.bin"), + None, + )), + &["-r", "--include", "foo:bar.bin"], + ) } #[test] fn decode_misc() { //use Default::default; - assert_eq!( - flashrom_decode_opts(FlashromOpt { - layout: Some(Path::new("TestLayout")), - ..Default::default() - }), - &["-l", "TestLayout"] - ); - - assert_eq!( - flashrom_decode_opts(FlashromOpt { - image: Some("TestImage"), - ..Default::default() - }), - &["-i", "TestImage"] - ); assert_eq!( flashrom_decode_opts(FlashromOpt { diff --git a/util/flashrom_tester/flashrom/src/flashromlib.rs b/util/flashrom_tester/flashrom/src/flashromlib.rs index 6cdd55d..bf09e6d 100644 --- a/util/flashrom_tester/flashrom/src/flashromlib.rs +++ b/util/flashrom_tester/flashrom/src/flashromlib.rs @@ -36,7 +36,7 @@ use std::{cell::RefCell, convert::TryFrom, fs, path::Path}; -use crate::{FlashChip, FlashromError, ROMWriteSpecifics}; +use crate::{FlashChip, FlashromError}; #[derive(Debug)] pub struct FlashromLib { @@ -127,14 +127,19 @@ Ok(()) } - fn write_file_with_layout(&self, rws: &ROMWriteSpecifics) -> Result<bool, FlashromError> { - let buf = fs::read(rws.layout_file.unwrap()).map_err(|error| error.to_string())?; + fn write_from_file_region( + &self, + path: &Path, + region: &str, + layout: &Path, + ) -> Result<bool, FlashromError> { + let buf = fs::read(layout).map_err(|error| error.to_string())?; let buf = String::from_utf8(buf).unwrap(); let mut layout: libflashrom::Layout = buf .parse() .map_err(|e: Box<dyn std::error::Error>| e.to_string())?; - layout.include_region(rws.name_file.unwrap())?; - let mut buf = fs::read(rws.write_file.unwrap()).map_err(|error| error.to_string())?; + layout.include_region(region)?; + let mut buf = fs::read(path).map_err(|error| error.to_string())?; self.flashrom .borrow_mut() .image_write(&mut buf, Some(layout))?; diff --git a/util/flashrom_tester/flashrom/src/lib.rs b/util/flashrom_tester/flashrom/src/lib.rs index 6b0cca3..7c86649 100644 --- a/util/flashrom_tester/flashrom/src/lib.rs +++ b/util/flashrom_tester/flashrom/src/lib.rs @@ -107,12 +107,6 @@ } } -pub struct ROMWriteSpecifics<'a> { - pub layout_file: Option<&'a Path>, - pub write_file: Option<&'a Path>, - pub name_file: Option<&'a str>, -} - pub trait Flashrom { /// Returns the size of the flash in bytes. fn get_size(&self) -> Result<i64, FlashromError>; @@ -120,9 +114,6 @@ /// Returns the vendor name and the flash name. fn name(&self) -> Result<(String, String), FlashromError>; - /// Write only a region of the flash. - fn write_file_with_layout(&self, rws: &ROMWriteSpecifics) -> Result<bool, FlashromError>; - /// Set write protect status and range. fn wp_range(&self, range: (i64, i64), wp_enable: bool) -> Result<bool, FlashromError>; @@ -148,6 +139,16 @@ /// Write the whole flash to the file specified by `path`. fn write_from_file(&self, path: &Path) -> Result<(), FlashromError>; + /// Write only a region of the flash. + /// `path` is a file of the size of the whole flash. + /// The `region` name corresponds to a region name in the `layout` file, not the flash. + fn write_from_file_region( + &self, + path: &Path, + region: &str, + layout: &Path, + ) -> Result<bool, FlashromError>; + /// Verify the whole flash against the file specified by `path`. fn verify_from_file(&self, path: &Path) -> Result<(), FlashromError>; diff --git a/util/flashrom_tester/src/tests.rs b/util/flashrom_tester/src/tests.rs index 13ba050..847bfec 100644 --- a/util/flashrom_tester/src/tests.rs +++ b/util/flashrom_tester/src/tests.rs @@ -283,12 +283,11 @@ env.wp.set_hw(true)?; // Check that we cannot write to the protected region. - let rws = flashrom::ROMWriteSpecifics { - layout_file: Some(&env.layout_file), - write_file: Some(env.random_data_file()), - name_file: Some(wp_section_name), - }; - if env.cmd.write_file_with_layout(&rws).is_ok() { + if env + .cmd + .write_from_file_region(env.random_data_file(), wp_section_name, &env.layout_file) + .is_ok() + { return Err( "Section should be locked, should not have been overwritable with random data" .into(), @@ -301,12 +300,11 @@ // Check that we can write to the non protected region. let (non_wp_section_name, _, _) = utils::layout_section(env.layout(), section.get_non_overlapping_section()); - let rws = flashrom::ROMWriteSpecifics { - layout_file: Some(&env.layout_file), - write_file: Some(env.random_data_file()), - name_file: Some(non_wp_section_name), - }; - env.cmd.write_file_with_layout(&rws)?; + env.cmd.write_from_file_region( + env.random_data_file(), + non_wp_section_name, + &env.layout_file, + )?; Ok(()) } -- To view, visit https://review.coreboot.org/c/flashrom/+/71973 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I1cb46bb1b26949fd9c19949c43708a8b652e00da Gerrit-Change-Number: 71973 Gerrit-PatchSet: 9 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: flashrom_tester: Rename lock_test hwwp_locks_swwp_test
by Edward O'Callaghan (Code Review) 06 Feb '23

06 Feb '23

Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/71972 ) Change subject: flashrom_tester: Rename lock_test hwwp_locks_swwp_test ...................................................................... flashrom_tester: Rename lock_test hwwp_locks_swwp_test Rename lock_test to hwwp_locks_swwp_test. BUG=b:235916336 BRANCH=None TEST=None Change-Id: I6080622755ff16d8fba7044b38f9e09db0c62f97 Signed-off-by: Evan Benn <evanbenn(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/71972 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Peter Marheine <pmarheine(a)chromium.org> Reviewed-by: Edward O'Callaghan <quasisec(a)chromium.org> --- M util/flashrom_tester/src/tests.rs 1 file changed, 22 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Edward O'Callaghan: Looks good to me, approved Peter Marheine: Looks good to me, but someone else must approve diff --git a/util/flashrom_tester/src/tests.rs b/util/flashrom_tester/src/tests.rs index 8369a94..13ba050 100644 --- a/util/flashrom_tester/src/tests.rs +++ b/util/flashrom_tester/src/tests.rs @@ -100,7 +100,7 @@ &("WP_Region_List", wp_region_list_test), &("Erase_and_Write", erase_write_test), &("Fail_to_verify", verify_fail_test), - &("Lock", lock_test), + &("HWWP_Locks_SWWP", hwwp_locks_swwp_test), &("Lock_top_quad", partial_lock_test(LayoutNames::TopQuad)), &( "Lock_bottom_quad", @@ -196,7 +196,7 @@ } /// Verify that enabling hardware write protect prevents disabling software write protect. -fn lock_test(env: &mut TestEnv) -> TestResult { +fn hwwp_locks_swwp_test(env: &mut TestEnv) -> TestResult { if !env.wp.can_control_hw_wp() { return Err("Lock test requires ability to control hardware write protect".into()); } -- To view, visit https://review.coreboot.org/c/flashrom/+/71972 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I6080622755ff16d8fba7044b38f9e09db0c62f97 Gerrit-Change-Number: 71972 Gerrit-PatchSet: 4 Gerrit-Owner: Evan Benn <evanbenn(a)google.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: programmer_table.c: Simplify name_to_entry() fn
by Edward O'Callaghan (Code Review) 05 Feb '23

05 Feb '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72824 ) Change subject: programmer_table.c: Simplify name_to_entry() fn ...................................................................... programmer_table.c: Simplify name_to_entry() fn Change-Id: I0fea6b16bca3024dd49ad56f5d2e39eb998159fa Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M programmer_table.c 1 file changed, 17 insertions(+), 10 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/24/72824/1 diff --git a/programmer_table.c b/programmer_table.c index c4834d0..2568ea8 100644 --- a/programmer_table.c +++ b/programmer_table.c @@ -179,22 +179,19 @@ const struct programmer_entry *programmer_name_to_entry(const char *name) { - unsigned prog; - if (strlen(name) == 0) { const struct programmer_entry *const default_programmer = CONFIG_DEFAULT_PROGRAMMER_NAME; if (default_programmer) return default_programmer; } - for (prog = 0; prog < programmer_table_size; prog++) { + for (unsigned int prog = 0; prog < programmer_table_size; prog++) { if (strcmp(name, programmer_table[prog]->name) == 0) - break; + return programmer_table[prog]; } - if (prog >= programmer_table_size) { - msg_ginfo("Error: Unknown programmer \"%s\". Valid choices are:\n", name); - list_programmers_linebreak(0, 80, 0); - return NULL; - } - return programmer_table[prog]; + + msg_ginfo("Error: Unknown programmer \"%s\". Valid choices are:\n", name); + list_programmers_linebreak(0, 80, 0); + + return NULL; } -- To view, visit https://review.coreboot.org/c/flashrom/+/72824 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I0fea6b16bca3024dd49ad56f5d2e39eb998159fa Gerrit-Change-Number: 72824 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: cli_classic.c: Use libflashrom API over internal symb for init
by Edward O'Callaghan (Code Review) 05 Feb '23

05 Feb '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72823 ) Change subject: cli_classic.c: Use libflashrom API over internal symb for init ...................................................................... cli_classic.c: Use libflashrom API over internal symb for init Change-Id: I6f14082b8af8e7cbe829f1449cbcaaa420853d70 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M cli_classic.c 1 file changed, 12 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/23/72823/1 diff --git a/cli_classic.c b/cli_classic.c index d4aa27a..dd9b1d6 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -571,7 +571,7 @@ /* Probe for up to eight flash chips. */ struct flashctx flashes[8] = {{0}}; struct flashctx *fill_flash; - const char *name; + const char *name = NULL; int opt, i, j; int startchip = -1, chipcount = 0, option_index = 0; int operation_specified = 0; @@ -951,7 +951,7 @@ } } - if (programmer_init(prog, pparam)) { + if (flashrom_programmer_init(NULL, name, pparam)) { msg_perr("Error: Programmer initialization failed.\n"); ret = 1; goto out_shutdown; -- To view, visit https://review.coreboot.org/c/flashrom/+/72823 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I6f14082b8af8e7cbe829f1449cbcaaa420853d70 Gerrit-Change-Number: 72823 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: cli_classic.c: Replace weird strtok() implementation with canonical
by Edward O'Callaghan (Code Review) 05 Feb '23

05 Feb '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72822 ) Change subject: cli_classic.c: Replace weird strtok() implementation with canonical ...................................................................... cli_classic.c: Replace weird strtok() implementation with canonical Prepare to use libflashrom flashrom_programmer_init() API over internal programmer_init() implementation from flashrom.c Change-Id: Icc9473b5b60012a736371dc8545ee0491cb06dc4 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M cli_classic.c 1 file changed, 20 insertions(+), 28 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/22/72822/1 diff --git a/cli_classic.c b/cli_classic.c index c72836f..d4aa27a 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -572,7 +572,7 @@ struct flashctx flashes[8] = {{0}}; struct flashctx *fill_flash; const char *name; - int namelen, opt, i, j; + int opt, i, j; int startchip = -1, chipcount = 0, option_index = 0; int operation_specified = 0; unsigned int wp_start = 0, wp_len = 0; @@ -825,33 +825,11 @@ "with \",\". Please see the man page " "for details.\n"); } - size_t p; - for (p = 0; p < programmer_table_size; p++) { - name = programmer_table[p]->name; - namelen = strlen(name); - if (strncmp(optarg, name, namelen) == 0) { - switch (optarg[namelen]) { - case ':': - pparam = strdup(optarg + namelen + 1); - if (!strlen(pparam)) { - free(pparam); - pparam = NULL; - } - prog = programmer_table[p]; - break; - case '\0': - prog = programmer_table[p]; - break; - default: - /* The continue refers to the - * for loop. It is here to be - * able to differentiate between - * foo and foobar. - */ - continue; - } - break; - } + name = strtok(optarg, ":"); + if (name) { + const char *params = strtok(NULL, ":"); + pparam = params ? strdup(params) : NULL; + prog = programmer_name_to_entry(name); } if (prog == NULL) { fprintf(stderr, "Error: Unknown programmer \"%s\". Valid choices are:\n", -- To view, visit https://review.coreboot.org/c/flashrom/+/72822 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Icc9473b5b60012a736371dc8545ee0491cb06dc4 Gerrit-Change-Number: 72822 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: programmer_table.c: Allow name_to_entry() to return default when set
by Edward O'Callaghan (Code Review) 05 Feb '23

05 Feb '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72821 ) Change subject: programmer_table.c: Allow name_to_entry() to return default when set ...................................................................... programmer_table.c: Allow name_to_entry() to return default when set Change-Id: I75fd24a76d0f6f25072428a8d992a1977c4ad1f8 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M programmer_table.c 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/21/72821/1 diff --git a/programmer_table.c b/programmer_table.c index 46f7c61..c4834d0 100644 --- a/programmer_table.c +++ b/programmer_table.c @@ -181,6 +181,12 @@ { unsigned prog; + if (strlen(name) == 0) { + const struct programmer_entry *const default_programmer = CONFIG_DEFAULT_PROGRAMMER_NAME; + if (default_programmer) + return default_programmer; + } + for (prog = 0; prog < programmer_table_size; prog++) { if (strcmp(name, programmer_table[prog]->name) == 0) break; -- To view, visit https://review.coreboot.org/c/flashrom/+/72821 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I75fd24a76d0f6f25072428a8d992a1977c4ad1f8 Gerrit-Change-Number: 72821 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: programmer_table.c: Move name to entry to own function
by Edward O'Callaghan (Code Review) 05 Feb '23

05 Feb '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72820 ) Change subject: programmer_table.c: Move name to entry to own function ...................................................................... programmer_table.c: Move name to entry to own function Change-Id: I5da3861b47d0d0b527e7cde5dd61bb696de6fedb Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M include/programmer.h M libflashrom.c M programmer_table.c 3 files changed, 32 insertions(+), 10 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/20/72820/1 diff --git a/include/programmer.h b/include/programmer.h index db32b2c..84d8fa9 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -53,6 +53,7 @@ extern const struct programmer_entry *const programmer_table[]; extern const size_t programmer_table_size; +const struct programmer_entry *programmer_name_to_entry(const char *name); /* programmer drivers */ extern const struct programmer_entry programmer_atahpt; diff --git a/libflashrom.c b/libflashrom.c index 2e89fe5..090dbd4 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -193,18 +193,11 @@ int flashrom_programmer_init(struct flashrom_programmer **const flashprog, const char *const prog_name, const char *const prog_param) { - unsigned prog; - - for (prog = 0; prog < programmer_table_size; prog++) { - if (strcmp(prog_name, programmer_table[prog]->name) == 0) - break; - } - if (prog >= programmer_table_size) { - msg_ginfo("Error: Unknown programmer \"%s\". Valid choices are:\n", prog_name); - list_programmers_linebreak(0, 80, 0); + const struct programmer_entry *entry = programmer_name_to_entry(prog_name); + if (!entry) { return 1; } - return programmer_init(programmer_table[prog], prog_param); + return programmer_init(entry, prog_param); } int flashrom_programmer_shutdown(struct flashrom_programmer *const flashprog) diff --git a/programmer_table.c b/programmer_table.c index d58a155..46f7c61 100644 --- a/programmer_table.c +++ b/programmer_table.c @@ -12,6 +12,8 @@ * GNU General Public License for more details. */ +#include <string.h> + #include "programmer.h" const struct programmer_entry *const programmer_table[] = { @@ -174,3 +176,19 @@ }; const size_t programmer_table_size = ARRAY_SIZE(programmer_table); + +const struct programmer_entry *programmer_name_to_entry(const char *name) +{ + unsigned prog; + + for (prog = 0; prog < programmer_table_size; prog++) { + if (strcmp(name, programmer_table[prog]->name) == 0) + break; + } + if (prog >= programmer_table_size) { + msg_ginfo("Error: Unknown programmer \"%s\". Valid choices are:\n", name); + list_programmers_linebreak(0, 80, 0); + return NULL; + } + return programmer_table[prog]; +} -- To view, visit https://review.coreboot.org/c/flashrom/+/72820 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5da3861b47d0d0b527e7cde5dd61bb696de6fedb Gerrit-Change-Number: 72820 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: pcidev: Pass flashprg down to pcidev_init() entry
by Edward O'Callaghan (Code Review) 05 Feb '23

05 Feb '23

Attention is currently required from: Anastasia Klimchuk. Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72819 ) Change subject: pcidev: Pass flashprg down to pcidev_init() entry ...................................................................... pcidev: Pass flashprg down to pcidev_init() entry MAYBE needed to remove singletons. Change-Id: I77bd8e85db770d1105a0c49838b2559aa2615cf1 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M atahpt.c M atapromise.c M atavia.c M drkaiser.c M gfxnvidia.c M include/programmer.h M it8212.c M nic3com.c M nicintel.c M nicintel_eeprom.c M nicintel_spi.c M nicnatsemi.c M nicrealtek.c M ogp_spi.c M pcidev.c M satamv.c M satasii.c M tests/tests.c 18 files changed, 30 insertions(+), 18 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/19/72819/1 diff --git a/atahpt.c b/atahpt.c index f059b19..8283c40 100644 --- a/atahpt.c +++ b/atahpt.c @@ -86,7 +86,7 @@ if (rget_io_perms()) return 1; - dev = pcidev_init(cfg, ata_hpt, PCI_BASE_ADDRESS_4); + dev = pcidev_init(flashprog, cfg, ata_hpt, PCI_BASE_ADDRESS_4); if (!dev) return 1; diff --git a/atapromise.c b/atapromise.c index 208597b..fe97b69 100644 --- a/atapromise.c +++ b/atapromise.c @@ -128,7 +128,7 @@ if (rget_io_perms()) return 1; - dev = pcidev_init(cfg, ata_promise, PCI_BASE_ADDRESS_4); + dev = pcidev_init(flashprog, cfg, ata_promise, PCI_BASE_ADDRESS_4); if (!dev) return 1; diff --git a/atavia.c b/atavia.c index ba3c2ec..bc38cc0 100644 --- a/atavia.c +++ b/atavia.c @@ -158,7 +158,7 @@ } free(arg); - dev = pcidev_init(cfg, ata_via, PCI_ROM_ADDRESS); /* Actually no BAR setup needed at all. */ + dev = pcidev_init(flashprog, cfg, ata_via, PCI_ROM_ADDRESS); /* Actually no BAR setup needed at all. */ if (!dev) return 1; diff --git a/drkaiser.c b/drkaiser.c index 8be5dba..96178fc 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -81,7 +81,7 @@ uint32_t addr; uint8_t *bar; - dev = pcidev_init(cfg, drkaiser_pcidev, PCI_BASE_ADDRESS_2); + dev = pcidev_init(flashprog, cfg, drkaiser_pcidev, PCI_BASE_ADDRESS_2); if (!dev) return 1; diff --git a/gfxnvidia.c b/gfxnvidia.c index d445ab7..24063d4 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -106,7 +106,7 @@ uint32_t reg32; uint8_t *bar; - dev = pcidev_init(cfg, gfx_nvidia, PCI_BASE_ADDRESS_0); + dev = pcidev_init(flashprog, cfg, gfx_nvidia, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/include/programmer.h b/include/programmer.h index 4e8aedd..f658882 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -121,7 +121,7 @@ extern struct pci_access *pacc; int pci_init_common(void); uintptr_t pcidev_readbar(struct pci_dev *dev, int bar); -struct pci_dev *pcidev_init(const struct programmer_cfg *cfg, const struct dev_entry *devs, int bar); +struct pci_dev *pcidev_init(struct flashrom_programmer *, const struct programmer_cfg *cfg, const struct dev_entry *devs, int bar); struct pci_dev *pcidev_scandev(struct pci_filter *filter, struct pci_dev *start); struct pci_dev *pcidev_getdevfn(struct pci_dev *dev, const int func); struct pci_dev *pcidev_find_vendorclass(uint16_t vendor, uint16_t devclass); diff --git a/it8212.c b/it8212.c index 9528b4d..9e1a9c4 100644 --- a/it8212.c +++ b/it8212.c @@ -72,7 +72,7 @@ { uint8_t *bar; - struct pci_dev *dev = pcidev_init(cfg, devs_it8212, PCI_ROM_ADDRESS); + struct pci_dev *dev = pcidev_init(flashprog, cfg, devs_it8212, PCI_ROM_ADDRESS); if (!dev) return 1; diff --git a/nic3com.c b/nic3com.c index de9762e..9c24f3c 100644 --- a/nic3com.c +++ b/nic3com.c @@ -105,7 +105,7 @@ if (rget_io_perms()) return 1; - dev = pcidev_init(cfg, nics_3com, PCI_BASE_ADDRESS_0); + dev = pcidev_init(flashprog, cfg, nics_3com, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/nicintel.c b/nicintel.c index 444b894..0940d39 100644 --- a/nicintel.c +++ b/nicintel.c @@ -79,7 +79,7 @@ uint8_t *control_bar; /* FIXME: BAR2 is not available if the device uses the CardBus function. */ - dev = pcidev_init(cfg, nics_intel, PCI_BASE_ADDRESS_2); + dev = pcidev_init(flashprog, cfg, nics_intel, PCI_BASE_ADDRESS_2); if (!dev) return 1; diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index 58a14fd..cc1c7ce 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -485,7 +485,7 @@ uint32_t eec = 0; uint8_t *eebar; - struct pci_dev *dev = pcidev_init(cfg, nics_intel_ee, PCI_BASE_ADDRESS_0); + struct pci_dev *dev = pcidev_init(flashprog, cfg, nics_intel_ee, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/nicintel_spi.c b/nicintel_spi.c index 16cf5f6..643bb2e 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -289,7 +289,7 @@ { struct pci_dev *dev = NULL; - dev = pcidev_init(cfg, nics_intel_spi, PCI_BASE_ADDRESS_0); + dev = pcidev_init(flashprog, cfg, nics_intel_spi, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/nicnatsemi.c b/nicnatsemi.c index 5ec356a..3455ee5 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -90,7 +90,7 @@ if (rget_io_perms()) return 1; - dev = pcidev_init(cfg, nics_natsemi, PCI_BASE_ADDRESS_0); + dev = pcidev_init(flashprog, cfg, nics_natsemi, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/nicrealtek.c b/nicrealtek.c index 68868e5..25f0fa0 100644 --- a/nicrealtek.c +++ b/nicrealtek.c @@ -101,7 +101,7 @@ if (rget_io_perms()) return 1; - dev = pcidev_init(cfg, nics_realtek, PCI_BASE_ADDRESS_0); + dev = pcidev_init(flashprog, cfg, nics_realtek, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/ogp_spi.c b/ogp_spi.c index bee97ec..4b9ad8d 100644 --- a/ogp_spi.c +++ b/ogp_spi.c @@ -140,7 +140,7 @@ } free(type); - dev = pcidev_init(cfg, ogp_spi, PCI_BASE_ADDRESS_0); + dev = pcidev_init(flashprog, cfg, ogp_spi, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/pcidev.c b/pcidev.c index 0b35944..8d7ddbe 100644 --- a/pcidev.c +++ b/pcidev.c @@ -257,7 +257,7 @@ * also matches the specified bus:device.function. * For convenience, this function also registers its own undo handlers. */ -struct pci_dev *pcidev_init(const struct programmer_cfg *cfg, const struct dev_entry *devs, int bar) +struct pci_dev *pcidev_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, const struct dev_entry *devs, int bar) { struct pci_dev *dev; struct pci_dev *found_dev = NULL; diff --git a/satamv.c b/satamv.c index c2592d4..8bb92ee 100644 --- a/satamv.c +++ b/satamv.c @@ -120,7 +120,7 @@ return 1; /* BAR0 has all internal registers memory mapped. */ - dev = pcidev_init(cfg, satas_mv, PCI_BASE_ADDRESS_0); + dev = pcidev_init(flashprog, cfg, satas_mv, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/satasii.c b/satasii.c index 8b9c794..214d4c9 100644 --- a/satasii.c +++ b/satasii.c @@ -106,7 +106,7 @@ uint16_t reg_offset, id; uint8_t *bar; - dev = pcidev_init(cfg, satas_sii, PCI_BASE_ADDRESS_0); + dev = pcidev_init(flashprog, cfg, satas_sii, PCI_BASE_ADDRESS_0); if (!dev) return 1; diff --git a/tests/tests.c b/tests/tests.c index 0912f35..76430b7 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -53,7 +53,7 @@ .device_id = NON_ZERO, }; -struct pci_dev *__wrap_pcidev_init(const struct programmer_cfg *cfg, void *devs, int bar) +struct pci_dev *__wrap_pcidev_init(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, void *devs, int bar) { LOG_ME; return &mock_pci_dev; -- To view, visit https://review.coreboot.org/c/flashrom/+/72819 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I77bd8e85db770d1105a0c49838b2559aa2615cf1 Gerrit-Change-Number: 72819 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: superio/: Pass flashprog to drv init() entry
by Edward O'Callaghan (Code Review) 05 Feb '23

05 Feb '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/72818 ) Change subject: superio/: Pass flashprog to drv init() entry ...................................................................... superio/: Pass flashprog to drv init() entry MAYBE needed to remove singletons. Change-Id: I81f39789152ac6d44a44197fa25154597e8855fa Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M include/programmer.h M internal.c M it87spi.c 3 files changed, 18 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/18/72818/1 diff --git a/include/programmer.h b/include/programmer.h index b4a4cfb..4e8aedd 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -372,7 +372,7 @@ void enter_conf_mode_ite(uint16_t port); void exit_conf_mode_ite(uint16_t port); void probe_superio_ite(void); -int init_superio_ite(const struct programmer_cfg *cfg); +int init_superio_ite(struct flashrom_programmer *, const struct programmer_cfg *cfg); /* trivial wrapper to avoid cluttering internal_init() with #if */ static inline int try_mtd(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) diff --git a/internal.c b/internal.c index 0928f6e..654f696 100644 --- a/internal.c +++ b/internal.c @@ -270,7 +270,7 @@ #if defined(__i386__) || defined(__x86_64__) /* Probe unconditionally for ITE Super I/O chips. This enables LPC->SPI translation on IT87* and * parallel writes on IT8705F. Also, this handles the manual chip select for Gigabyte's DualBIOS. */ - init_superio_ite(cfg); + init_superio_ite(flashprog, cfg); if (board_flash_enable(board_vendor, board_model, cb_vendor, cb_model, force_boardenable)) { msg_perr("Aborting to be safe.\n"); diff --git a/it87spi.c b/it87spi.c index 1820ef4..1f38336 100644 --- a/it87spi.c +++ b/it87spi.c @@ -324,7 +324,7 @@ .probe_opcode = default_spi_probe_opcode, }; -static uint16_t it87spi_probe(const struct programmer_cfg *cfg, uint16_t port) +static uint16_t it87spi_probe(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg, uint16_t port) { uint8_t tmp = 0; uint16_t flashport = 0; @@ -440,10 +440,10 @@ if (internal_buses_supported & BUS_SPI) msg_pdbg("Overriding chipset SPI with IT87 SPI.\n"); /* FIXME: Add the SPI bus or replace the other buses with it? */ - return register_spi_master(NULL, &spi_master_it87xx, data); /* FIXME(quasisec): pass flashprog. */ + return register_spi_master(flashprog, &spi_master_it87xx, data); } -int init_superio_ite(const struct programmer_cfg *cfg) +int init_superio_ite(struct flashrom_programmer *flashprog, const struct programmer_cfg *cfg) { int i; int ret = 0; @@ -461,7 +461,7 @@ case 0x8718: case 0x8720: case 0x8728: - ret |= it87spi_probe(cfg, superios[i].port); + ret |= it87spi_probe(flashprog, cfg, superios[i].port); break; default: msg_pdbg2("Super I/O ID 0x%04hx is not on the list of flash-capable controllers.\n", -- To view, visit https://review.coreboot.org/c/flashrom/+/72818 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I81f39789152ac6d44a44197fa25154597e8855fa Gerrit-Change-Number: 72818 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit February 2023