- flashrom-gerrit - mail.coreboot.org

[M] Change in flashrom[master]: tests: Emulate multithreading environment for unit tests
by Anastasia Klimchuk (Code Review) 04 Apr '23

04 Apr '23

Attention is currently required from: Thomas Heijligen, Anastasia Klimchuk. Hello build bot (Jenkins), Thomas Heijligen, Peter Marheine, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/74157 to look at the new patch set (#3). Change subject: tests: Emulate multithreading environment for unit tests ...................................................................... tests: Emulate multithreading environment for unit tests The main purpose of this patch is to run unit tests on BSD family of OSes. The root cause is `fileno` syscall which is a macro that can be expanded to either a function call (for multi-threaded environment) or to inline code (for single-threaded environment). Said inline code accesses private field of file descriptor, and this construction is impossible to mock in unit tests. Multi- threaded environment has `fileno` as a function, which can be mocked in unit tests. On other OSes the patch just creates a thread which is doing nothing. We avoid adding pre-processor conditionals since the cost is small. Tested on FreeBSD 13.1-RELEASE-p6 GENERIC amd64 NetBSD 9.2 (GENERIC) amd64 OpenBSD 7.2 GENERIC#7 amd64 [WIP] DragonFly v6.4.0-RELEASE x86_64 Ubuntu 22.04.1 x86_64 Change-Id: I3d65c125183e60037ad07b9d54b8fffdece5a4e8 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M tests/meson.build M tests/tests.c 2 files changed, 49 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/57/74157/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/74157 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3d65c125183e60037ad07b9d54b8fffdece5a4e8 Gerrit-Change-Number: 74157 Gerrit-PatchSet: 3 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-MessageType: newpatchset

1 0

[L] Change in flashrom[master]: util/flashchips_db_parser: Add initial rust flashchip json parser
by Edward O'Callaghan (Code Review) 04 Apr '23

04 Apr '23

Attention is currently required from: Nikolai Artemiev. Hello build bot (Jenkins), Nikolai Artemiev, I'd like you to reexamine a change. Please visit https://review.coreboot.org/c/flashrom/+/74166 to look at the new patch set (#2). Change subject: util/flashchips_db_parser: Add initial rust flashchip json parser ...................................................................... util/flashchips_db_parser: Add initial rust flashchip json parser Change-Id: I48346a3da5923e614728a1cc0567ed2bb1ba2e2f Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- A util/flashchips_db_parser/Cargo.lock A util/flashchips_db_parser/Cargo.toml A util/flashchips_db_parser/src/main.rs A util/flashchips_db_parser/src/parser.rs 4 files changed, 438 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/66/74166/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/74166 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I48346a3da5923e614728a1cc0567ed2bb1ba2e2f Gerrit-Change-Number: 74166 Gerrit-PatchSet: 2 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-MessageType: newpatchset

1 0

[S] Change in flashrom[master]: [WIP] Emulate multithreading env for unit tests on OpenBSD
by Peter Marheine (Code Review) 04 Apr '23

04 Apr '23

Attention is currently required from: Thomas Heijligen, Anastasia Klimchuk. Peter Marheine has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/74157 ) Change subject: [WIP] Emulate multithreading env for unit tests on OpenBSD ...................................................................... Patch Set 2: (2 comments) Patchset: PS2: > Good news: tests pass on OpenBSD with the patchset2! […] Yes, I'd prefer to always create a thread and get rid of the `__isthreaded` poke for other BSDs. It seems fine to also spawn a do-nothing thread on platforms where we don't need to, since the cost is small. File tests/meson.build: https://review.coreboot.org/c/flashrom/+/74157/comment/f9accb29_aef3d6bb PS1, Line 124: '-Dpthread', > Thank you! […] Might be that it ends up included through a pthread header; I fixed an error relating to that by adding the include before I fixed the pthread errors. If it works without changing the includes I don't think it needs any changes. -- To view, visit https://review.coreboot.org/c/flashrom/+/74157 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3d65c125183e60037ad07b9d54b8fffdece5a4e8 Gerrit-Change-Number: 74157 Gerrit-PatchSet: 2 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Comment-Date: Mon, 03 Apr 2023 23:32:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Anastasia Klimchuk <aklm(a)chromium.org> Comment-In-Reply-To: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: [WIP] Emulate multithreading env for unit tests on OpenBSD
by Anastasia Klimchuk (Code Review) 03 Apr '23

03 Apr '23

Attention is currently required from: Thomas Heijligen, Peter Marheine. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/74157 ) Change subject: [WIP] Emulate multithreading env for unit tests on OpenBSD ...................................................................... Patch Set 2: (3 comments) This change is ready for review. Patchset: PS2: Good news: tests pass on OpenBSD with the patchset2! I want however to try and reduce the number of `#` here, maybe merge all BSDs hacks into one, maybe hiding them in separate c file. A wilder idea: maybe we can just always unconditionally create "doing nothing" thread (for all OSes), how bad that would be? Which would be the same code but without `#` File tests/meson.build: https://review.coreboot.org/c/flashrom/+/74157/comment/4d5c538b_9d86f85d PS1, Line 114: '-lpthread', > The meson documentation says you should use `dependency('threads')` for this: https://mesonbuild. […] Peter, thank you so much, this really helped! this is what was missing! https://review.coreboot.org/c/flashrom/+/74157/comment/1ae61daa_256e234e PS1, Line 124: '-Dpthread', > This is causing your problem; it makes the preprocessor expand `struct pthread;` to `struct ;`. […] Thank you! For some reason, tests pass even without including `sys/time.h`. Could that be because it is already included via some other include? -- To view, visit https://review.coreboot.org/c/flashrom/+/74157 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I3d65c125183e60037ad07b9d54b8fffdece5a4e8 Gerrit-Change-Number: 74157 Gerrit-PatchSet: 2 Gerrit-Owner: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Mon, 03 Apr 2023 11:44:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: internal: Move laptop_ok into board_cfg
by Sam McNally (Code Review) 03 Apr '23

03 Apr '23

Attention is currently required from: Thomas Heijligen, Edward O'Callaghan, Angel Pons. Sam McNally has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73456 ) Change subject: internal: Move laptop_ok into board_cfg ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/73456 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I459215253845c2af73262943ce91a36464e9eb06 Gerrit-Change-Number: 73456 Gerrit-PatchSet: 5 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Sam McNally <sammc(a)google.com> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Attention: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Mon, 03 Apr 2023 00:58:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: tree/: Case write_granularity enum values
by Angel Pons (Code Review) 03 Apr '23

03 Apr '23

Attention is currently required from: Thomas Heijligen, Edward O'Callaghan. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/74165 ) Change subject: tree/: Case write_granularity enum values ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/74165 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic8c655225abe477c1b618dc685b743e691c16ebd Gerrit-Change-Number: 74165 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Thomas Heijligen <src(a)posteo.de> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Sun, 02 Apr 2023 16:17:25 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: board_enable.c: Invert branch for readability
by Angel Pons (Code Review) 03 Apr '23

03 Apr '23

Attention is currently required from: Edward O'Callaghan. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/74164 ) Change subject: board_enable.c: Invert branch for readability ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/74164 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9bd96d4d077270697c329d7e6cac1d32ed513ed3 Gerrit-Change-Number: 74164 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Sun, 02 Apr 2023 16:10:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in flashrom[master]: board_enable.c: Avoid excessive forward declarations
by Angel Pons (Code Review) 03 Apr '23

03 Apr '23

Attention is currently required from: Edward O'Callaghan. Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/74163 ) Change subject: board_enable.c: Avoid excessive forward declarations ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/74163 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5d416a023c17568c6275426edc1edb77268ea331 Gerrit-Change-Number: 74163 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Comment-Date: Sun, 02 Apr 2023 16:09:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in flashrom[master]: util/flashchips_db_parser: Add initial rust flashchip json parser
by Edward O'Callaghan (Code Review) 02 Apr '23

02 Apr '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/74166 ) Change subject: util/flashchips_db_parser: Add initial rust flashchip json parser ...................................................................... util/flashchips_db_parser: Add initial rust flashchip json parser Change-Id: I48346a3da5923e614728a1cc0567ed2bb1ba2e2f Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- A util/flashchips_db_parser/Cargo.lock A util/flashchips_db_parser/Cargo.toml A util/flashchips_db_parser/src/main.rs A util/flashchips_db_parser/src/parser.rs 4 files changed, 403 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/66/74166/1 diff --git a/util/flashchips_db_parser/Cargo.lock b/util/flashchips_db_parser/Cargo.lock new file mode 100644 index 0000000..b8e7070 --- /dev/null +++ b/util/flashchips_db_parser/Cargo.lock @@ -0,0 +1,89 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "flashchips_db_parser_rust" +version = "0.1.0" +dependencies = [ + "serde", + "serde_json", +] + +[[package]] +name = "itoa" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6" + +[[package]] +name = "proc-macro2" +version = "1.0.54" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e472a104799c74b514a57226160104aa483546de37e839ec50e3c2e41dd87534" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "quote" +version = "1.0.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4424af4bf778aae2051a77b60283332f386554255d722233d09fbfc7e30da2fc" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "ryu" +version = "1.0.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041" + +[[package]] +name = "serde" +version = "1.0.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c04e8343c3daeec41f58990b9d77068df31209f2af111e059e9fe9646693065" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.159" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c614d17805b093df4b147b51339e7e44bf05ef59fba1e45d83500bcfb4d8585" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "serde_json" +version = "1.0.95" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d721eca97ac802aa7777b701877c8004d950fc142651367300d21c1cc0194744" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "syn" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79d9531f94112cfc3e4c8f5f02cb2b58f72c97b7efd85f70203cc6d8efda5927" +dependencies = [ + "proc-macro2", + "quote", + "unicode-ident", +] + +[[package]] +name = "unicode-ident" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" diff --git a/util/flashchips_db_parser/Cargo.toml b/util/flashchips_db_parser/Cargo.toml new file mode 100644 index 0000000..a402ebc --- /dev/null +++ b/util/flashchips_db_parser/Cargo.toml @@ -0,0 +1,10 @@ +[package] +name = "flashchips_db_parser_rust" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] +serde = { version = "1.0.159", features = ["derive"] } +serde_json = "1.0.95" diff --git a/util/flashchips_db_parser/src/main.rs b/util/flashchips_db_parser/src/main.rs new file mode 100644 index 0000000..9ac1d4b --- /dev/null +++ b/util/flashchips_db_parser/src/main.rs @@ -0,0 +1,30 @@ +// +// This file is part of the flashrom project. +// +// Copyright (C) 2023 Google Australia. +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// + +use std::fs; + +pub mod parser; + +fn main() { + let file_path = "../../data/flashchips.json".to_owned(); + let contents = fs::read_to_string(file_path).expect("Couldn't find or load that file."); + + let result = parser::flashchips(&contents); + match result { + Ok(result) => (), + Err(error) => print!("{}", error), + } +} diff --git a/util/flashchips_db_parser/src/parser.rs b/util/flashchips_db_parser/src/parser.rs new file mode 100644 index 0000000..c02799c --- /dev/null +++ b/util/flashchips_db_parser/src/parser.rs @@ -0,0 +1,264 @@ +// +// This file is part of the flashrom project. +// +// Copyright (C) 2023 Google Australia. +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// + +use std::collections::HashMap; + +use serde::{Deserialize, Serialize}; +use serde_json::Result; //{Result, Value}; + +//#[derive(Serialize, Deserialize)] +//enum ChipBusType { +// BUS_NONE = 0, +// BUS_PARALLEL = 1 << 0, +// BUS_LPC = 1 << 1, +// BUS_FWH = 1 << 2, +// BUS_SPI = 1 << 3, +// BUS_PROG = 1 << 4, +// BUS_NONSPI = (1 << 0) | (1 << 1) | (1 << 2), // BUS_PARALLEL | BUS_LPC | BUS_FWH, +//} + +#[derive(Serialize, Deserialize)] +enum WriteGranularity { + WRITE_GRAN_256BYTES = 0, + WRITE_GRAN_1BIT, + WRITE_GRAN_1BYTE, + WRITE_GRAN_128BYTES, + WRITE_GRAN_264BYTES, + WRITE_GRAN_512BYTES, + WRITE_GRAN_528BYTES, + WRITE_GRAN_1024BYTES, + WRITE_GRAN_1056BYTES, + WRITE_GRAN_1BYTE_IMPLICIT_ERASE, +} + +#[derive(Serialize, Deserialize)] +struct EraseBlock { + size: u32, + count: u32, +} + +#[derive(Serialize, Deserialize)] +enum BlockEraseFunc { + NO_BLOCK_ERASE_FUNC = 0, /* 0 indicates no block erase function set. */ + SPI_BLOCK_ERASE_EMULATION = 1, + SPI_BLOCK_ERASE_20, + SPI_BLOCK_ERASE_21, + SPI_BLOCK_ERASE_40, + SPI_BLOCK_ERASE_50, + SPI_BLOCK_ERASE_52, + SPI_BLOCK_ERASE_53, + SPI_BLOCK_ERASE_5C, + SPI_BLOCK_ERASE_60, + SPI_BLOCK_ERASE_62, + SPI_BLOCK_ERASE_81, + SPI_BLOCK_ERASE_C4, + SPI_BLOCK_ERASE_C7, + SPI_BLOCK_ERASE_D7, + SPI_BLOCK_ERASE_D8, + SPI_BLOCK_ERASE_DB, + SPI_BLOCK_ERASE_DC, + S25FL_BLOCK_ERASE, + S25FS_BLOCK_ERASE_D8, + JEDEC_SECTOR_ERASE, + JEDEC_BLOCK_ERASE, + JEDEC_CHIP_BLOCK_ERASE, + OPAQUE_ERASE, + SPI_ERASE_AT45CS_SECTOR, + SPI_ERASE_AT45DB_BLOCK, + SPI_ERASE_AT45DB_CHIP, + SPI_ERASE_AT45DB_PAGE, + SPI_ERASE_AT45DB_SECTOR, + ERASE_CHIP_28SF040, + ERASE_SECTOR_28SF040, + ERASE_BLOCK_82802AB, + ERASE_SECTOR_49LFXXXC, + STM50_SECTOR_ERASE, + EDI_CHIP_BLOCK_ERASE, +} + +#[derive(Serialize, Deserialize)] +struct BlockEraser { + eraseblocks: Option<Vec<EraseBlock>>, + block_erase: BlockEraseFunc, +} + +#[derive(Serialize, Deserialize)] +struct Voltage { + min: u16, + max: u16, +} + +#[derive(Serialize, Deserialize, Debug)] +enum FlashReg { + INVALID_REG = 0, + STATUS1, + STATUS2, + STATUS3, + SECURITY, + CONFIG, + MAX_REGISTERS, +} + +#[derive(Serialize, Deserialize, Debug)] +enum Writability { + RO, + RW, + OTP, +} + +#[derive(Serialize, Deserialize, Debug)] +struct RegBitInfo { + reg: FlashReg, + bit_index: u8, + writability: Writability, +} + +#[derive(Serialize, Deserialize, Debug)] +struct RegBitMap { + srp: Option<RegBitInfo>, + srl: Option<RegBitInfo>, + bp: Vec<RegBitInfo>, + tb: Option<RegBitInfo>, + sec: Option<RegBitInfo>, + cmp: Option<RegBitInfo>, + wps: Option<RegBitInfo>, +} + +#[derive(Serialize, Deserialize)] +enum DecodeRangeFunc { + NO_DECODE_RANGE_FUNC = 0, /* 0 indicates no range decode function is set. */ + DECODE_RANGE_SPI25 = 1, + DECODE_RANGE_SPI25_64K_BLOCK = 2, + DECODE_RANGE_SPI25_BIT_CMP = 3, + DECODE_RANGE_SPI25_2X_BLOCK = 4, +} + +#[derive(Serialize, Deserialize)] +struct Tested { + probe: u32, // enum test_state probe; + read: u32, // enum test_state read; + erase: u32, // enum test_state erase; + write: u32, // enum test_state write; + wp: u32, // enum test_state wp; +} + +#[derive(Serialize, Deserialize)] +enum ProbeFunc { + NO_PROBE_FUNC = 0, /* 0 indicates no probe function set. */ + PROBE_JEDEC = 1, + PROBE_JEDEC_29GL, + PROBE_OPAQUE, + PROBE_EDI_KB9012, + PROBE_AT82802AB, + PROBE_W29EE011, + PROBE_EN29LV640B, + PROBE_SPI_AT25F, + PROBE_SPI_AT45DB, + PROBE_SPI_BIG_SPANSION, + PROBE_SPI_RDID, + PROBE_SPI_RDID4, + PROBE_SPI_REMS, + PROBE_SPI_RES1, + PROBE_SPI_RES2, + PROBE_SPI_SFDP, + PROBE_SPI_ST95, +} + +#[derive(Serialize, Deserialize)] +enum WriteFunc { + NO_WRITE_FUNC = 0, /* 0 indicates no write function set. */ + WRITE_JEDEC = 1, + WRITE_JEDEC1, + WRITE_OPAQUE, + SPI_CHIP_WRITE1, + SPI_CHIP_WRITE256, + SPI_WRITE_AAI, + SPI_WRITE_AT45DB, + WRITE_28SF040, + WRITE_82802AB, + WRITE_EN29LV640B, + EDI_CHIP_WRITE, +} + +#[derive(Serialize, Deserialize, Debug)] // XXX +enum ReadFunc { + NO_READ_FUNC = 0, /* 0 indicates no read function set. */ + SPI_CHIP_READ = 1, + READ_OPAQUE, + READ_MEMMAPPED, + EDI_CHIP_READ, + SPI_READ_AT45DB, + SPI_READ_AT45DB_E8, +} + +#[derive(Serialize, Deserialize)] +enum SpiCmdSet { + SPI25 = 0, + SPI_EDI = 1, +} + +#[derive(Serialize, Deserialize)] +struct FlashChip { + vendor: String, + name: String, + + bustype: String, // XXX Vec<ChipBusType>, + + manufacture_id: u32, + model_id: u32, + + total_size: u32, + page_size: u32, + + feature_bits: u32, + + tested: Option<Tested>, + + spi_cmd_set: SpiCmdSet, + + probe: ProbeFunc, + + probe_timing: i32, + + block_erasers: Vec<BlockEraser>, + + printlock: Option<u32>, // Obsolete printlock_func + unlock: Option<u32>, // Obsolete blockprotect_func + + write: WriteFunc, + read: ReadFunc, + + voltage: Voltage, + + gran: WriteGranularity, + + reg_bits: Option<RegBitMap>, + + decode_range: Option<DecodeRangeFunc>, +} + +pub fn flashchips(json_data: &str) -> Result<()> { + //let v: Value = serde_json::from_str(json_data)?; + let m: HashMap<String, Vec<FlashChip>> = serde_json::from_str(json_data)?; + let v: &Vec<FlashChip> = &m["flashchips"]; + + for fc in v { + println!("{}", fc.name); +// println!("read func {:#?}", fc.read); + } + + Ok(()) +} -- To view, visit https://review.coreboot.org/c/flashrom/+/74166 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I48346a3da5923e614728a1cc0567ed2bb1ba2e2f Gerrit-Change-Number: 74166 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: tree/: Case write_granularity enum values
by Edward O'Callaghan (Code Review) 02 Apr '23

02 Apr '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/74165 ) Change subject: tree/: Case write_granularity enum values ...................................................................... tree/: Case write_granularity enum values Change-Id: Ic8c655225abe477c1b618dc685b743e691c16ebd Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M at45db.c M flashchips.c M flashrom.c M include/flash.h M nicintel_eeprom.c 5 files changed, 51 insertions(+), 41 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/65/74165/1 diff --git a/at45db.c b/at45db.c index 7877330..6d66a6e 100644 --- a/at45db.c +++ b/at45db.c @@ -200,12 +200,12 @@ } switch (chip->page_size) { - case 256: chip->gran = write_gran_256bytes; break; - case 264: chip->gran = write_gran_264bytes; break; - case 512: chip->gran = write_gran_512bytes; break; - case 528: chip->gran = write_gran_528bytes; break; - case 1024: chip->gran = write_gran_1024bytes; break; - case 1056: chip->gran = write_gran_1056bytes; break; + case 256: chip->gran = WRITE_GRAN_256BYTES; break; + case 264: chip->gran = WRITE_GRAN_264BYTES; break; + case 512: chip->gran = WRITE_GRAN_512BYTES; break; + case 528: chip->gran = WRITE_GRAN_528BYTES; break; + case 1024: chip->gran = WRITE_GRAN_1024BYTES; break; + case 1056: chip->gran = WRITE_GRAN_1056BYTES; break; default: msg_cerr("%s: unknown page size %d.\n", __func__, chip->page_size); return 0; diff --git a/flashchips.c b/flashchips.c index dc6e882..6a5cf49 100644 --- a/flashchips.c +++ b/flashchips.c @@ -2762,7 +2762,7 @@ .write = SPI_WRITE_AT45DB, .read = SPI_READ_AT45DB, .voltage = {2700, 3600}, - .gran = write_gran_1056bytes, + .gran = WRITE_GRAN_1056BYTES, }, { @@ -3015,7 +3015,7 @@ .write = SPI_WRITE_AT45DB, .read = SPI_READ_AT45DB_E8, /* 3 address and 4 dummy bytes */ .voltage = {2700, 3600}, - .gran = write_gran_528bytes, + .gran = WRITE_GRAN_528BYTES, }, { @@ -3638,7 +3638,7 @@ .write = EDI_CHIP_WRITE, .read = EDI_CHIP_READ, .voltage = {2700, 3600}, - .gran = write_gran_128bytes, + .gran = WRITE_GRAN_128BYTES, }, { diff --git a/flashrom.c b/flashrom.c index b135e58..cee96d6 100644 --- a/flashrom.c +++ b/flashrom.c @@ -723,42 +723,42 @@ unsigned int i; switch (gran) { - case write_gran_1bit: + case WRITE_GRAN_1BIT: for (i = 0; i < len; i++) if ((have[i] & want[i]) != want[i]) { result = 1; break; } break; - case write_gran_1byte: + case WRITE_GRAN_1BYTE: for (i = 0; i < len; i++) if ((have[i] != want[i]) && (have[i] != erased_value)) { result = 1; break; } break; - case write_gran_128bytes: + case WRITE_GRAN_128BYTES: result = need_erase_gran_bytes(have, want, len, 128, erased_value); break; - case write_gran_256bytes: + case WRITE_GRAN_256BYTES: result = need_erase_gran_bytes(have, want, len, 256, erased_value); break; - case write_gran_264bytes: + case WRITE_GRAN_264BYTES: result = need_erase_gran_bytes(have, want, len, 264, erased_value); break; - case write_gran_512bytes: + case WRITE_GRAN_512BYTES: result = need_erase_gran_bytes(have, want, len, 512, erased_value); break; - case write_gran_528bytes: + case WRITE_GRAN_528BYTES: result = need_erase_gran_bytes(have, want, len, 528, erased_value); break; - case write_gran_1024bytes: + case WRITE_GRAN_1024BYTES: result = need_erase_gran_bytes(have, want, len, 1024, erased_value); break; - case write_gran_1056bytes: + case WRITE_GRAN_1056BYTES: result = need_erase_gran_bytes(have, want, len, 1056, erased_value); break; - case write_gran_1byte_implicit_erase: + case WRITE_GRAN_1BYTE_IMPLICIT_ERASE: /* Do not erase, handle content changes from anything->0xff by writing 0xff. */ result = 0; break; @@ -801,30 +801,30 @@ unsigned int i, limit, stride; switch (gran) { - case write_gran_1bit: - case write_gran_1byte: - case write_gran_1byte_implicit_erase: + case WRITE_GRAN_1BIT: + case WRITE_GRAN_1BYTE: + case WRITE_GRAN_1BYTE_IMPLICIT_ERASE: stride = 1; break; - case write_gran_128bytes: + case WRITE_GRAN_128BYTES: stride = 128; break; - case write_gran_256bytes: + case WRITE_GRAN_256BYTES: stride = 256; break; - case write_gran_264bytes: + case WRITE_GRAN_264BYTES: stride = 264; break; - case write_gran_512bytes: + case WRITE_GRAN_512BYTES: stride = 512; break; - case write_gran_528bytes: + case WRITE_GRAN_528BYTES: stride = 528; break; - case write_gran_1024bytes: + case WRITE_GRAN_1024BYTES: stride = 1024; break; - case write_gran_1056bytes: + case WRITE_GRAN_1056BYTES: stride = 1056; break; default: diff --git a/include/flash.h b/include/flash.h index f0357cb..3e9c885 100644 --- a/include/flash.h +++ b/include/flash.h @@ -83,17 +83,17 @@ */ enum write_granularity { /* We assume 256 byte granularity by default. */ - write_gran_256bytes = 0,/* If less than 256 bytes are written, the unwritten bytes are undefined. */ - write_gran_1bit, /* Each bit can be cleared individually. */ - write_gran_1byte, /* A byte can be written once. Further writes to an already written byte cause + WRITE_GRAN_256BYTES = 0,/* If less than 256 bytes are written, the unwritten bytes are undefined. */ + WRITE_GRAN_1BIT, /* Each bit can be cleared individually. */ + WRITE_GRAN_1BYTE, /* A byte can be written once. Further writes to an already written byte cause * its contents to be either undefined or to stay unchanged. */ - write_gran_128bytes, /* If less than 128 bytes are written, the unwritten bytes are undefined. */ - write_gran_264bytes, /* If less than 264 bytes are written, the unwritten bytes are undefined. */ - write_gran_512bytes, /* If less than 512 bytes are written, the unwritten bytes are undefined. */ - write_gran_528bytes, /* If less than 528 bytes are written, the unwritten bytes are undefined. */ - write_gran_1024bytes, /* If less than 1024 bytes are written, the unwritten bytes are undefined. */ - write_gran_1056bytes, /* If less than 1056 bytes are written, the unwritten bytes are undefined. */ - write_gran_1byte_implicit_erase, /* EEPROMs and other chips with implicit erase and 1-byte writes. */ + WRITE_GRAN_128BYTES, /* If less than 128 bytes are written, the unwritten bytes are undefined. */ + WRITE_GRAN_264BYTES, /* If less than 264 bytes are written, the unwritten bytes are undefined. */ + WRITE_GRAN_512BYTES, /* If less than 512 bytes are written, the unwritten bytes are undefined. */ + WRITE_GRAN_528BYTES, /* If less than 528 bytes are written, the unwritten bytes are undefined. */ + WRITE_GRAN_1024BYTES, /* If less than 1024 bytes are written, the unwritten bytes are undefined. */ + WRITE_GRAN_1056BYTES, /* If less than 1056 bytes are written, the unwritten bytes are undefined. */ + WRITE_GRAN_1BYTE_IMPLICIT_ERASE, /* EEPROMs and other chips with implicit erase and 1-byte writes. */ }; /* diff --git a/nicintel_eeprom.c b/nicintel_eeprom.c index 80ccd88..2c351da 100644 --- a/nicintel_eeprom.c +++ b/nicintel_eeprom.c @@ -116,7 +116,7 @@ flash->chip->total_size = 4; flash->chip->page_size = flash->chip->total_size * 1024; flash->chip->tested = TEST_OK_PREWB; - flash->chip->gran = write_gran_1byte_implicit_erase; + flash->chip->gran = WRITE_GRAN_1BYTE_IMPLICIT_ERASE; flash->chip->block_erasers->eraseblocks[0].size = flash->chip->page_size; flash->chip->block_erasers->eraseblocks[0].count = 1; @@ -147,7 +147,7 @@ flash->chip->page_size = EE_PAGE_MASK + 1; flash->chip->tested = TEST_OK_PREWB; - flash->chip->gran = write_gran_1byte_implicit_erase; + flash->chip->gran = WRITE_GRAN_1BYTE_IMPLICIT_ERASE; flash->chip->block_erasers->eraseblocks[0].size = (EE_PAGE_MASK + 1); flash->chip->block_erasers->eraseblocks[0].count = (flash->chip->total_size * 1024) / (EE_PAGE_MASK + 1); -- To view, visit https://review.coreboot.org/c/flashrom/+/74165 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic8c655225abe477c1b618dc685b743e691c16ebd Gerrit-Change-Number: 74165 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