March 2023 - flashrom-gerrit - mail.coreboot.org

[M] Change in flashrom[master]: flashchips: Add support for Boya BY25D80A
by Piotr Halama (Code Review) 06 Mar '23

06 Mar '23

Piotr Halama has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/73513 ) Change subject: flashchips: Add support for Boya BY25D80A ...................................................................... flashchips: Add support for Boya BY25D80A Read tested on Raspberry Pico with pico-serprog Change-Id: I586f3455d925132bbda3fccdad00f0b1e22c2ea7 Signed-off-by: Piotr Halama <skrzynka(a)halamix2.pl> --- M flashchips.c M include/flashchips.h 2 files changed, 51 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/13/73513/1 diff --git a/flashchips.c b/flashchips.c index c24e264..4f4f162 100644 --- a/flashchips.c +++ b/flashchips.c @@ -3530,6 +3530,44 @@ { .vendor = "Boya/BoHong Microelectronics", + .name = "B.25D80A", + .bustype = BUS_SPI, + .manufacture_id = BOYA_BOHONG_ID, + .model_id = BOYA_BOHONG_B_25D80A, + .total_size = 1024, + .page_size = 256, + .feature_bits = FEATURE_WRSR_WREN, + .tested = TEST_OK_PR, + .probe = PROBE_SPI_RDID, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {2 * 1024, 512} }, + .block_erase = SPI_BLOCK_ERASE_20, + }, { + .eraseblocks = { {16 * 1024, 64} }, + .block_erase = SPI_BLOCK_ERASE_52, + }, { + .eraseblocks = { {32 * 1024, 32} }, + .block_erase = SPI_BLOCK_ERASE_D8, + }, { + .eraseblocks = { {1 * 1024 * 1024, 1} }, + .block_erase = SPI_BLOCK_ERASE_60, + }, { + .eraseblocks = { {1 * 1024 * 1024, 1} }, + .block_erase = SPI_BLOCK_ERASE_C7, + } + }, + .printlock = SPI_PRETTYPRINT_STATUS_REGISTER_BP2_SRWD, + .unlock = SPI_DISABLE_BLOCKPROTECT_BP2_SRWD, + .write = SPI_CHIP_WRITE256, + .read = SPI_CHIP_READ, + .voltage = {2700, 3600}, + }, + + { + .vendor = "Boya/BoHong Microelectronics", .name = "B.25Q128AS", .bustype = BUS_SPI, .manufacture_id = BOYA_BOHONG_ID, diff --git a/include/flashchips.h b/include/flashchips.h index 5df42dc..5cadbc0 100644 --- a/include/flashchips.h +++ b/include/flashchips.h @@ -210,6 +210,7 @@ /* Boya/BoHong Microelectronics Inc. */ #define BOYA_BOHONG_ID 0x68 +#define BOYA_BOHONG_B_25D80A 0x4014 #define BOYA_BOHONG_B_25D16A 0x4015 #define BOYA_BOHONG_B_25Q128AS 0x4018 -- To view, visit https://review.coreboot.org/c/flashrom/+/73513 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I586f3455d925132bbda3fccdad00f0b1e22c2ea7 Gerrit-Change-Number: 73513 Gerrit-PatchSet: 1 Gerrit-Owner: Piotr Halama <skrzynka(a)halamix2.pl> Gerrit-MessageType: newchange

1 0

[L] Change in flashrom[master]: doc: Add build instructions
by Thomas Heijligen (Code Review) 06 Mar '23

06 Mar '23

Attention is currently required from: Stefan Reinauer, Anastasia Klimchuk, Peter Marheine. Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73359 ) Change subject: doc: Add build instructions ...................................................................... Patch Set 3: (4 comments) File doc/developers_doc/building_from_source.rst: https://review.coreboot.org/c/flashrom/+/73359/comment/421502b0_20305b6c PS3, Line 105: py- This is py39-sphinx https://review.coreboot.org/c/flashrom/+/73359/comment/dda257ab_52ac5d2f PS3, Line 113: install just `pkg_add`, no `install` needed https://review.coreboot.org/c/flashrom/+/73359/comment/0d4c81fe_b19d8f7f PS3, Line 114: py-sphinx py3-sphinx https://review.coreboot.org/c/flashrom/+/73359/comment/9dea45ef_c7f09493 PS3, Line 175: .. todo:: Write a sphinx extension to render ``meson_options.txt`` here > `meson configure` will print out all options including project-specific ones, and the inline documen […] IIRC `meson configure` will only work when you already have a builddir configured. I'll document the options manually. -- To view, visit https://review.coreboot.org/c/flashrom/+/73359 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I96771e98b313a6d26dd2be940ff37998d4124324 Gerrit-Change-Number: 73359 Gerrit-PatchSet: 3 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Alexander Goncharov <chat(a)joursoir.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: Angel Pons <th3fanbus(a)gmail.com> Gerrit-CC: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-CC: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Attention: Stefan Reinauer <stefan.reinauer(a)coreboot.org> Gerrit-Attention: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Attention: Peter Marheine <pmarheine(a)chromium.org> Gerrit-Comment-Date: Mon, 06 Mar 2023 14:58:11 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Peter Marheine <pmarheine(a)chromium.org> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: flashchips: Mark AM29LV040B as write-tested
by Thomas Heijligen (Code Review) 06 Mar '23

06 Mar '23

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/73429 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: flashchips: Mark AM29LV040B as write-tested ...................................................................... flashchips: Mark AM29LV040B as write-tested Reported by Alex Perez on the mailing list, write operation done successfully with satasii programmer. https://mail.coreboot.org/hyperkitty/list/flashrom@flashrom.org/thread/67OX… Change-Id: I8a42f8214b09c455a10a1f1e9e69feaeca2c62a1 Signed-off-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-on: https://review.coreboot.org/c/flashrom/+/73429 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Thomas Heijligen <src(a)posteo.de> --- M flashchips.c 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Thomas Heijligen: Looks good to me, approved diff --git a/flashchips.c b/flashchips.c index 4c778ec..6764c33 100644 --- a/flashchips.c +++ b/flashchips.c @@ -572,7 +572,7 @@ .total_size = 512, .page_size = 64 * 1024, .feature_bits = FEATURE_ADDR_2AA | FEATURE_SHORT_RESET, - .tested = TEST_OK_PRE, + .tested = TEST_OK_PREW, .probe = PROBE_JEDEC, .probe_timing = TIMING_ZERO, .block_erasers = -- To view, visit https://review.coreboot.org/c/flashrom/+/73429 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8a42f8214b09c455a10a1f1e9e69feaeca2c62a1 Gerrit-Change-Number: 73429 Gerrit-PatchSet: 3 Gerrit-Owner: Anastasia Klimchuk <aklm(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-MessageType: merged

1 0

[S] Change in flashrom[master]: flashchips: Mark XMC XM25QH64C as TEST_OK_PREW
by Thomas Heijligen (Code Review) 06 Mar '23

06 Mar '23

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/73363 ) Change subject: flashchips: Mark XMC XM25QH64C as TEST_OK_PREW ...................................................................... flashchips: Mark XMC XM25QH64C as TEST_OK_PREW As reported on the mailing list[0] this flashchip was successfully probed, read, erased and written with a ch341a programmer. [0] https://mail.coreboot.org/hyperkitty/list/flashrom@flashrom.org/message/SMI… Change-Id: Ifca84d9a44bb20091293356f5b1643de41220b64 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/73363 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M flashchips.c 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Anastasia Klimchuk: Looks good to me, approved diff --git a/flashchips.c b/flashchips.c index 70e9fa9..4c778ec 100644 --- a/flashchips.c +++ b/flashchips.c @@ -20191,7 +20191,7 @@ .total_size = 8192, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PREW, .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = -- To view, visit https://review.coreboot.org/c/flashrom/+/73363 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ifca84d9a44bb20091293356f5b1643de41220b64 Gerrit-Change-Number: 73363 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: flashchips: Mark XMC XM25QH256C as TEST_OK_PR
by Thomas Heijligen (Code Review) 06 Mar '23

06 Mar '23

Thomas Heijligen has submitted this change. ( https://review.coreboot.org/c/flashrom/+/73362 ) Change subject: flashchips: Mark XMC XM25QH256C as TEST_OK_PR ...................................................................... flashchips: Mark XMC XM25QH256C as TEST_OK_PR As reported on the mailing list[0] this flashchip was successfully probed and read with a ch341a programmer. [0] https://mail.coreboot.org/hyperkitty/list/flashrom@flashrom.org/message/BFB… Change-Id: I68d0315f7b29f27ac84374ea7cc69dca207bbacb Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/73362 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M flashchips.c 1 file changed, 19 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Anastasia Klimchuk: Looks good to me, approved diff --git a/flashchips.c b/flashchips.c index c24e264..70e9fa9 100644 --- a/flashchips.c +++ b/flashchips.c @@ -20359,7 +20359,7 @@ .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_ENTER_WREN | FEATURE_4BA_EAR_C5C8 | FEATURE_4BA_READ | FEATURE_4BA_FAST_READ | FEATURE_4BA_WRITE | FEATURE_WRSR2, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PR, .probe = PROBE_SPI_RDID, .probe_timing = TIMING_ZERO, .block_erasers = -- To view, visit https://review.coreboot.org/c/flashrom/+/73362 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I68d0315f7b29f27ac84374ea7cc69dca207bbacb Gerrit-Change-Number: 73362 Gerrit-PatchSet: 3 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[M] Change in flashrom[master]: linux_mtd.c: Factor out detection phases from setup func
by Edward O'Callaghan (Code Review) 06 Mar '23

06 Mar '23

Attention is currently required from: Nikolai Artemiev. Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/73495 ) Change subject: linux_mtd.c: Factor out detection phases from setup func ...................................................................... linux_mtd.c: Factor out detection phases from setup func The setup phase function is performing detection logic, move this to a earlier phase in the init sequence such that it can be used seperately. Change-Id: I15915b71e1a030548c5f082cde78c42ece28bb37 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M linux_mtd.c 1 file changed, 70 insertions(+), 59 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/95/73495/1 diff --git a/linux_mtd.c b/linux_mtd.c index b3be72a..708e340 100644 --- a/linux_mtd.c +++ b/linux_mtd.c @@ -443,57 +443,6 @@ .wp_get_ranges = linux_mtd_wp_get_available_ranges, }; -/* Returns 0 if setup is successful, non-zero to indicate error */ -static int linux_mtd_setup(int dev_num, struct linux_mtd_data *data) -{ - char sysfs_path[32]; - int ret = 1; - - /* Start by checking /sys/class/mtd/mtdN/type which should be "nor" for NOR flash */ - if (snprintf(sysfs_path, sizeof(sysfs_path), "%s/mtd%d/", LINUX_MTD_SYSFS_ROOT, dev_num) < 0) - goto linux_mtd_setup_exit; - - char buf[4] = { 0 }; - if (read_sysfs_string(sysfs_path, "type", buf, sizeof(buf))) - return 1; - - if (strcmp(buf, "nor")) { - msg_perr("MTD device %d type is not \"nor\"\n", dev_num); - goto linux_mtd_setup_exit; - } - - /* sysfs shows the correct device type, see if corresponding device node exists */ - char dev_path[32]; - struct stat s; - snprintf(dev_path, sizeof(dev_path), "%s/mtd%d", LINUX_DEV_ROOT, dev_num); - errno = 0; - if (stat(dev_path, &s) < 0) { - msg_pdbg("Cannot stat \"%s\": %s\n", dev_path, strerror(errno)); - goto linux_mtd_setup_exit; - } - - /* so far so good, get more info from other files in this dir */ - if (snprintf(sysfs_path, sizeof(sysfs_path), "%s/mtd%d/", LINUX_MTD_SYSFS_ROOT, dev_num) < 0) - goto linux_mtd_setup_exit; - if (get_mtd_info(sysfs_path, data)) - goto linux_mtd_setup_exit; - - /* open file stream and go! */ - if ((data->dev_fp = fopen(dev_path, "r+")) == NULL) { - msg_perr("Cannot open file stream for %s\n", dev_path); - goto linux_mtd_setup_exit; - } - ret = setvbuf(data->dev_fp, NULL, _IONBF, 0); - if (ret) - msg_pwarn("Failed to set MTD device to unbuffered: %d\n", ret); - - msg_pinfo("Opened %s successfully\n", dev_path); - - ret = 0; -linux_mtd_setup_exit: - return ret; -} - static int get_params(const struct programmer_cfg *cfg, int *dev_num) { char *param_str = extract_programmer_param_str(cfg, "dev"); @@ -516,17 +465,18 @@ return 0; } -static int check_sysfs_devnum_path(int dev_num) +static int detect_spinor_in_sysfs(int dev_num, char *dev_path, size_t dp_len) { + /* Start by checking /sys/class/mtd/mtdN/type which should be "nor" for NOR flash */ + char sysfs_path[32]; + if (snprintf(sysfs_path, sizeof(sysfs_path), "%s/mtd%d", LINUX_MTD_SYSFS_ROOT, dev_num) < 0) + return -1; + /* * If user specified the MTD device number then error out if it doesn't * appear to exist. Otherwise assume the error is benign and print a * debug message. Bail out in either case. */ - char sysfs_path[32]; - if (snprintf(sysfs_path, sizeof(sysfs_path), "%s/mtd%d", LINUX_MTD_SYSFS_ROOT, dev_num) < 0) - return -1; - struct stat s; if (stat(sysfs_path, &s) < 0) { if (dev_num) @@ -535,17 +485,64 @@ msg_pdbg("%s does not exist\n", sysfs_path); return -1; } + + /* Check sysfs shows the correct device type. */ + char buf[4] = { 0 }; + if (read_sysfs_string(sysfs_path, "type", buf, sizeof(buf))) + return -1; + + if (strcmp(buf, "nor")) { + msg_perr("MTD device %d type is not \"nor\"\n", dev_num); + return -1; + } + + /* Check if the corresponding device node exists. */ + snprintf(dev_path, dp_len, "%s/mtd%d", LINUX_DEV_ROOT, dev_num); + errno = 0; + if (stat(dev_path, &s) < 0) { + msg_pdbg("Cannot stat \"%s\": %s\n", dev_path, strerror(errno)); + return -1; + } + return 0; } +/* Returns 0 if setup is successful, non-zero to indicate error */ +static int linux_mtd_setup(int dev_num, const char *dev_path, struct linux_mtd_data *data) +{ + char sysfs_path[32]; + int ret = 1; + + /* Get more info from other files in the sysfs_path dir. */ + if (snprintf(sysfs_path, sizeof(sysfs_path), "%s/mtd%d/", LINUX_MTD_SYSFS_ROOT, dev_num) < 0) + goto linux_mtd_setup_exit; + if (get_mtd_info(sysfs_path, data)) + goto linux_mtd_setup_exit; + + /* open file stream and go! */ + if ((data->dev_fp = fopen(dev_path, "r+")) == NULL) { + msg_perr("Cannot open file stream for %s\n", dev_path); + goto linux_mtd_setup_exit; + } + ret = setvbuf(data->dev_fp, NULL, _IONBF, 0); + if (ret) + msg_pwarn("Failed to set MTD device to unbuffered: %d\n", ret); + + msg_pinfo("Opened %s successfully\n", dev_path); + + ret = 0; +linux_mtd_setup_exit: + return ret; +} + static int linux_mtd_init(const struct programmer_cfg *cfg) { int dev_num; - if (get_params(cfg, &dev_num) < 0) return 1; - if (check_sysfs_devnum_path(dev_num) < 0) + char dev_path[32]; + if (detect_spinor_in_sysfs(dev_num, dev_path, sizeof(dev_path)) < 0) return 1; struct linux_mtd_data *data = calloc(1, sizeof(*data)); @@ -555,7 +552,7 @@ } /* Get MTD info and store it in `data` */ - if (linux_mtd_setup(dev_num, data)) { + if (linux_mtd_setup(dev_num, dev_path, data)) { free(data); return 1; } -- To view, visit https://review.coreboot.org/c/flashrom/+/73495 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I15915b71e1a030548c5f082cde78c42ece28bb37 Gerrit-Change-Number: 73495 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: linux_mtd.c: Split linux_mtd_init() into sub-functions
by Edward O'Callaghan (Code Review) 06 Mar '23

06 Mar '23

Attention is currently required from: Nikolai Artemiev. Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/73494 ) Change subject: linux_mtd.c: Split linux_mtd_init() into sub-functions ...................................................................... linux_mtd.c: Split linux_mtd_init() into sub-functions Here we split up the linux_mtd_init() entry-point into its constituent phases; get_params -> check_sysfs_path -> alloc resources -> setup drv -> register. The motivation is that we wish for linux_mtd to have a pre_init hook for the purposes of detection only. This is a requirement for the internal programmer via the current try_mtd() hack. Change-Id: Ic81068adbc7da8b28de07a161b5cec2fff0fce49 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M linux_mtd.c 1 file changed, 56 insertions(+), 26 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/94/73494/1 diff --git a/linux_mtd.c b/linux_mtd.c index 495db9a..b3be72a 100644 --- a/linux_mtd.c +++ b/linux_mtd.c @@ -494,26 +494,30 @@ return ret; } -static int linux_mtd_init(const struct programmer_cfg *cfg) +static int get_params(const struct programmer_cfg *cfg, int *dev_num) { - char *param_str; - int dev_num = 0; - int ret = 1; - struct linux_mtd_data *data = NULL; - - param_str = extract_programmer_param_str(cfg, "dev"); - if (param_str) { - char *endptr; - - dev_num = strtol(param_str, &endptr, 0); - if ((*endptr != '\0') || (dev_num < 0)) { - msg_perr("Invalid device number %s. Use flashrom -p " - "linux_mtd:dev=N where N is a valid MTD\n" - "device number.\n", param_str); - goto linux_mtd_init_exit; - } + char *param_str = extract_programmer_param_str(cfg, "dev"); + if (!param_str) { + *dev_num = 0; + return 0; } + char *endptr; + *dev_num = strtol(param_str, &endptr, 0); + if ((*endptr != '\0') || (*dev_num < 0)) { + msg_perr("Invalid device number %s. Use flashrom -p " + "linux_mtd:dev=N where N is a valid MTD\n" + "device number.\n", param_str); + free(param_str); + return -1; + } + + free(param_str); + return 0; +} + +static int check_sysfs_devnum_path(int dev_num) +{ /* * If user specified the MTD device number then error out if it doesn't * appear to exist. Otherwise assume the error is benign and print a @@ -521,19 +525,30 @@ */ char sysfs_path[32]; if (snprintf(sysfs_path, sizeof(sysfs_path), "%s/mtd%d", LINUX_MTD_SYSFS_ROOT, dev_num) < 0) - goto linux_mtd_init_exit; + return -1; struct stat s; if (stat(sysfs_path, &s) < 0) { - if (param_str) + if (dev_num) msg_perr("%s does not exist\n", sysfs_path); else msg_pdbg("%s does not exist\n", sysfs_path); - goto linux_mtd_init_exit; + return -1; } - free(param_str); + return 0; +} - data = calloc(1, sizeof(*data)); +static int linux_mtd_init(const struct programmer_cfg *cfg) +{ + int dev_num; + + if (get_params(cfg, &dev_num) < 0) + return 1; + + if (check_sysfs_devnum_path(dev_num) < 0) + return 1; + + struct linux_mtd_data *data = calloc(1, sizeof(*data)); if (!data) { msg_perr("Unable to allocate memory for linux_mtd_data\n"); return 1; @@ -546,10 +561,6 @@ } return register_opaque_master(&linux_mtd_opaque_master, data); - -linux_mtd_init_exit: - free(param_str); - return ret; } const struct programmer_entry programmer_linux_mtd = { -- To view, visit https://review.coreboot.org/c/flashrom/+/73494 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ic81068adbc7da8b28de07a161b5cec2fff0fce49 Gerrit-Change-Number: 73494 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Attention: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: tree/: Move max_rom_decode into board_cfg
by Edward O'Callaghan (Code Review) 06 Mar '23

06 Mar '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/73493 ) Change subject: tree/: Move max_rom_decode into board_cfg ...................................................................... tree/: Move max_rom_decode into board_cfg TEST=`./flashrom -p internal --flash-name`. Change-Id: Ifa077d867f29ca7bf9c47529a9cd23273badec94 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M atapromise.c M board_enable.c M chipset_enable.c M cli_classic.c M drkaiser.c M flashrom.c M include/programmer.h M it8212.c M nic3com.c M nicintel.c M nicnatsemi.c M satamv.c M wbsio_spi.c 13 files changed, 57 insertions(+), 43 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/93/73493/1 diff --git a/atapromise.c b/atapromise.c index 9beebf1..3cd24bb 100644 --- a/atapromise.c +++ b/atapromise.c @@ -169,7 +169,7 @@ data->bar = bar; data->rom_size = rom_size; - max_rom_decode.parallel = rom_size; + cfg->bcfg->max_rom_decode.parallel = rom_size; return register_par_master(&par_master_atapromise, BUS_PARALLEL, data); } diff --git a/board_enable.c b/board_enable.c index efb4131..e45ab48 100644 --- a/board_enable.c +++ b/board_enable.c @@ -620,16 +620,16 @@ msg_pdbg("Enabling IT8705F flash ROM interface write.\n"); if (tmp & 0x02) { /* The data sheet contradicts itself about max size. */ - max_rom_decode.parallel = 1024 * 1024; + bcfg->max_rom_decode.parallel = 1024 * 1024; msg_pinfo("IT8705F with very unusual settings.\n" "Please send the output of \"flashrom -V -p internal\" to flashrom(a)flashrom.org\n" "with \"IT8705: your board name: flashrom -V\" as the subject to help us finish\n" "support for your Super I/O. Thanks.\n"); ret = 1; } else if (tmp & 0x08) { - max_rom_decode.parallel = 512 * 1024; + bcfg->max_rom_decode.parallel = 512 * 1024; } else { - max_rom_decode.parallel = 256 * 1024; + bcfg->max_rom_decode.parallel = 256 * 1024; } /* Safety checks. The data sheet is unclear here: Segments 1+3 * overlap, no segment seems to cover top - 1MB to top - 512kB. @@ -673,7 +673,7 @@ ret = 1; } msg_pdbg("Maximum IT8705F parallel flash decode size is %u.\n", - max_rom_decode.parallel); + bcfg->max_rom_decode.parallel); if (ret) { msg_pinfo("Not enabling IT8705F flash write.\n"); } else { @@ -2765,7 +2765,7 @@ /* limit the maximum size of the parallel bus */ if (board->max_rom_decode_parallel) - max_rom_decode.parallel = board->max_rom_decode_parallel * 1024; + cfg->max_rom_decode.parallel = board->max_rom_decode_parallel * 1024; if (board->enable) { msg_pinfo("Enabling full flash access for board \"%s %s\"... ", diff --git a/chipset_enable.c b/chipset_enable.c index 84206b2..c93480e 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -549,8 +549,8 @@ contiguous = 0; } } - max_rom_decode.fwh = min(max_decode_fwh_idsel, max_decode_fwh_decode); - msg_pdbg("Maximum FWH chip size: 0x%x bytes\n", max_rom_decode.fwh); + cfg->bcfg->max_rom_decode.fwh = min(max_decode_fwh_idsel, max_decode_fwh_decode); + msg_pdbg("Maximum FWH chip size: 0x%x bytes\n", cfg->bcfg->max_rom_decode.fwh); return 0; } @@ -1239,18 +1239,18 @@ reg8 = pci_read_byte(dev, CS5530_RESET_CONTROL_REG); if (reg8 & CS5530_ISA_MASTER) { /* We have A0-A23 available. */ - max_rom_decode.parallel = 16 * 1024 * 1024; + cfg->bcfg->max_rom_decode.parallel = 16 * 1024 * 1024; } else { reg8 = pci_read_byte(dev, CS5530_USB_SHADOW_REG); if (reg8 & CS5530_ENABLE_SA2320) { /* We have A0-19, A20-A23 available. */ - max_rom_decode.parallel = 16 * 1024 * 1024; + cfg->bcfg->max_rom_decode.parallel = 16 * 1024 * 1024; } else if (reg8 & CS5530_ENABLE_SA20) { /* We have A0-19, A20 available. */ - max_rom_decode.parallel = 2 * 1024 * 1024; + cfg->bcfg->max_rom_decode.parallel = 2 * 1024 * 1024; } else { /* A20 and above are not active. */ - max_rom_decode.parallel = 1024 * 1024; + cfg->bcfg->max_rom_decode.parallel = 1024 * 1024; } } @@ -1356,14 +1356,14 @@ static int enable_flash_amd_768_8111(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { /* Enable decoding of 0xFFB00000 to 0xFFFFFFFF (5 MB). */ - max_rom_decode.lpc = 5 * 1024 * 1024; + cfg->bcfg->max_rom_decode.lpc = 5 * 1024 * 1024; return enable_flash_amd_via(cfg, dev, name, 0xC0); } static int enable_flash_vt82c586(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { /* Enable decoding of 0xFFF80000 to 0xFFFFFFFF. (512 kB) */ - max_rom_decode.parallel = 512 * 1024; + cfg->bcfg->max_rom_decode.parallel = 512 * 1024; return enable_flash_amd_via(cfg, dev, name, 0xC0); } @@ -1371,7 +1371,7 @@ static int enable_flash_vt82c596(const struct programmer_cfg *cfg, struct pci_dev *dev, const char *name) { /* Enable decoding of 0xFFF00000 to 0xFFFFFFFF. (1 MB) */ - max_rom_decode.parallel = 1024 * 1024; + cfg->bcfg->max_rom_decode.parallel = 1024 * 1024; return enable_flash_amd_via(cfg, dev, name, 0xE0); } diff --git a/cli_classic.c b/cli_classic.c index da68919..96e0b81 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -524,43 +524,43 @@ /* Returns the number of buses commonly supported by the current programmer and flash chip where the latter * can not be completely accessed due to size/address limits of the programmer. */ static unsigned int count_max_decode_exceedings(const struct flashctx *flash, - const struct decode_sizes *max_rom_decode_) + const struct decode_sizes *max_rom_decode) { unsigned int limitexceeded = 0; uint32_t size = flash->chip->total_size * 1024; enum chipbustype buses = flash->mst->buses_supported & flash->chip->bustype; - if ((buses & BUS_PARALLEL) && (max_rom_decode_->parallel < size)) { + if ((buses & BUS_PARALLEL) && (max_rom_decode->parallel < size)) { limitexceeded++; msg_pdbg("Chip size %u kB is bigger than supported " "size %u kB of chipset/board/programmer " "for %s interface, " "probe/read/erase/write may fail. ", size / 1024, - max_rom_decode_->parallel / 1024, "Parallel"); + max_rom_decode->parallel / 1024, "Parallel"); } - if ((buses & BUS_LPC) && (max_rom_decode_->lpc < size)) { + if ((buses & BUS_LPC) && (max_rom_decode->lpc < size)) { limitexceeded++; msg_pdbg("Chip size %u kB is bigger than supported " "size %u kB of chipset/board/programmer " "for %s interface, " "probe/read/erase/write may fail. ", size / 1024, - max_rom_decode_->lpc / 1024, "LPC"); + max_rom_decode->lpc / 1024, "LPC"); } - if ((buses & BUS_FWH) && (max_rom_decode_->fwh < size)) { + if ((buses & BUS_FWH) && (max_rom_decode->fwh < size)) { limitexceeded++; msg_pdbg("Chip size %u kB is bigger than supported " "size %u kB of chipset/board/programmer " "for %s interface, " "probe/read/erase/write may fail. ", size / 1024, - max_rom_decode_->fwh / 1024, "FWH"); + max_rom_decode->fwh / 1024, "FWH"); } - if ((buses & BUS_SPI) && (max_rom_decode_->spi < size)) { + if ((buses & BUS_SPI) && (max_rom_decode->spi < size)) { limitexceeded++; msg_pdbg("Chip size %u kB is bigger than supported " "size %u kB of chipset/board/programmer " "for %s interface, " "probe/read/erase/write may fail. ", size / 1024, - max_rom_decode_->spi / 1024, "SPI"); + max_rom_decode->spi / 1024, "SPI"); } return limitexceeded; } @@ -1064,7 +1064,7 @@ print_chip_support_status(fill_flash->chip); - unsigned int limitexceeded = count_max_decode_exceedings(fill_flash, &max_rom_decode); + unsigned int limitexceeded = count_max_decode_exceedings(fill_flash, &g_max_rom_decode); if (limitexceeded > 0 && !force) { enum chipbustype commonbuses = fill_flash->mst->buses_supported & fill_flash->chip->bustype; diff --git a/drkaiser.c b/drkaiser.c index ebf5119..36c9a01 100644 --- a/drkaiser.c +++ b/drkaiser.c @@ -106,7 +106,7 @@ data->flash_access = pci_read_word(dev, PCI_MAGIC_DRKAISER_ADDR); pci_write_word(dev, PCI_MAGIC_DRKAISER_ADDR, PCI_MAGIC_DRKAISER_VALUE); - max_rom_decode.parallel = 128 * 1024; + cfg->bcfg->max_rom_decode.parallel = 128 * 1024; return register_par_master(&par_master_drkaiser, BUS_PARALLEL, data); } diff --git a/flashrom.c b/flashrom.c index f2ee3a9..a9d34f1 100644 --- a/flashrom.c +++ b/flashrom.c @@ -45,7 +45,7 @@ * Programmers supporting multiple buses can have differing size limits on * each bus. Store the limits for each bus in a common struct. */ -struct decode_sizes max_rom_decode; +struct decode_sizes g_max_rom_decode; /* If nonzero, used as the start address of bottom-aligned flash. */ unsigned long flashbase; @@ -131,7 +131,7 @@ programmer = prog; /* Initialize all programmer specific data. */ /* Default to unlimited decode sizes. */ - max_rom_decode = (const struct decode_sizes) { + g_max_rom_decode = (const struct decode_sizes) { .parallel = 0xffffffff, .lpc = 0xffffffff, .fwh = 0xffffffff, @@ -144,8 +144,8 @@ /* Default to allowing writes. Broken programmers set this to 0. */ programmer_may_write = true; - struct board_cfg bcfg = {0}; - struct programmer_cfg cfg = { .bcfg = &bcfg }; + struct board_cfg bcfg = { .max_rom_decode = g_max_rom_decode }; + struct programmer_cfg cfg = { .bcfg = &bcfg, }; if (param) { cfg.params = strdup(param); diff --git a/include/programmer.h b/include/programmer.h index 2477c80..0f60767 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -158,6 +158,13 @@ extern const struct penable chipset_enables[]; +struct decode_sizes { + uint32_t parallel; + uint32_t lpc; + uint32_t fwh; + uint32_t spi; +}; + enum board_match_phase { P1, P2, @@ -168,6 +175,7 @@ int is_laptop; bool laptop_ok; enum chipbustype internal_buses_supported; + struct decode_sizes max_rom_decode; }; struct board_match { @@ -283,14 +291,8 @@ /* flashrom.c */ -struct decode_sizes { - uint32_t parallel; - uint32_t lpc; - uint32_t fwh; - uint32_t spi; -}; // FIXME: These need to be local, not global -extern struct decode_sizes max_rom_decode; +extern struct decode_sizes g_max_rom_decode; extern bool programmer_may_write; extern unsigned long flashbase; char *extract_programmer_param_str(const struct programmer_cfg *cfg, const char *param_name); diff --git a/it8212.c b/it8212.c index 3c1161d..6cee140 100644 --- a/it8212.c +++ b/it8212.c @@ -97,7 +97,7 @@ data->decode_access = pci_read_long(dev, PCI_ROM_ADDRESS); pci_write_long(dev, PCI_ROM_ADDRESS, io_base_addr | 0x01); - max_rom_decode.parallel = IT8212_MEMMAP_SIZE; + cfg->bcfg->max_rom_decode.parallel = IT8212_MEMMAP_SIZE; return register_par_master(&par_master_it8212, BUS_PARALLEL, data); } const struct programmer_entry programmer_it8212 = { diff --git a/nic3com.c b/nic3com.c index a578d48..25ec05c 100644 --- a/nic3com.c +++ b/nic3com.c @@ -142,7 +142,7 @@ data->internal_conf = internal_conf; data->id = id; - max_rom_decode.parallel = 128 * 1024; + cfg->bcfg->max_rom_decode.parallel = 128 * 1024; return register_par_master(&par_master_nic3com, BUS_PARALLEL, data); diff --git a/nicintel.c b/nicintel.c index feb07b6..0e700b6 100644 --- a/nicintel.c +++ b/nicintel.c @@ -118,7 +118,7 @@ data->nicintel_bar = bar; data->nicintel_control_bar = control_bar; - max_rom_decode.parallel = NICINTEL_MEMMAP_SIZE; + cfg->bcfg->max_rom_decode.parallel = NICINTEL_MEMMAP_SIZE; return register_par_master(&par_master_nicintel, BUS_PARALLEL, data); } diff --git a/nicnatsemi.c b/nicnatsemi.c index 65377dc..f0bfd0b 100644 --- a/nicnatsemi.c +++ b/nicnatsemi.c @@ -111,7 +111,7 @@ * max_rom_decode.parallel = 65536; and the mask in the read/write * functions below wants to be 0x0000FFFF. */ - max_rom_decode.parallel = 131072; + cfg->bcfg->max_rom_decode.parallel = 131072; return register_par_master(&par_master_nicnatsemi, BUS_PARALLEL, data); } diff --git a/satamv.c b/satamv.c index fea4c2b..8a0cebf 100644 --- a/satamv.c +++ b/satamv.c @@ -196,7 +196,7 @@ /* 512 kByte with two 8-bit latches, and * 4 MByte with additional 3-bit latch. */ - max_rom_decode.parallel = 4 * 1024 * 1024; + cfg->bcfg->max_rom_decode.parallel = 4 * 1024 * 1024; return register_par_master(&par_master_satamv, BUS_PARALLEL, data); } diff --git a/wbsio_spi.c b/wbsio_spi.c index 9f33b18..d779012 100644 --- a/wbsio_spi.c +++ b/wbsio_spi.c @@ -206,7 +206,7 @@ msg_pdbg("%s: Winbond saved on 4 register bits so max chip size is " "1024 kB!\n", __func__); - max_rom_decode.spi = 1024 * 1024; + cfg->max_rom_decode.spi = 1024 * 1024; struct wbsio_spi_data *data = calloc(1, sizeof(*data)); if (!data) { -- To view, visit https://review.coreboot.org/c/flashrom/+/73493 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ifa077d867f29ca7bf9c47529a9cd23273badec94 Gerrit-Change-Number: 73493 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[S] Change in flashrom[master]: flashrom,internal: Move board_cfg up in the CFG to prog_init
by Edward O'Callaghan (Code Review) 06 Mar '23

06 Mar '23

Edward O'Callaghan has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/73492 ) Change subject: flashrom,internal: Move board_cfg up in the CFG to prog_init ...................................................................... flashrom,internal: Move board_cfg up in the CFG to prog_init Avoid the need for a copy of the programmer_cfg within the internal programmer. Move the board_cfg up into programmer_init(). TEST=`$ ./flashrom -p internal --flash-name`. Change-Id: I30bc4eefeb589d3ee7827fcfea81985292c88a10 Signed-off-by: Edward O'Callaghan <quasisec(a)google.com> --- M flashrom.c M internal.c 2 files changed, 29 insertions(+), 15 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/92/73492/1 diff --git a/flashrom.c b/flashrom.c index da46354..f2ee3a9 100644 --- a/flashrom.c +++ b/flashrom.c @@ -144,7 +144,8 @@ /* Default to allowing writes. Broken programmers set this to 0. */ programmer_may_write = true; - struct programmer_cfg cfg; + struct board_cfg bcfg = {0}; + struct programmer_cfg cfg = { .bcfg = &bcfg }; if (param) { cfg.params = strdup(param); diff --git a/internal.c b/internal.c index bba7043..f2fff0d 100644 --- a/internal.c +++ b/internal.c @@ -149,7 +149,6 @@ const char *cb_model = NULL; #endif bool force_boardenable = false; - struct board_cfg bcfg = {0}; ret = get_params(cfg, &force_boardenable, &force_boardmismatch, @@ -162,7 +161,7 @@ * is found, the host controller init routine sets the * internal_buses_supported bitfield. */ - bcfg.internal_buses_supported = BUS_NONSPI; + cfg->bcfg->internal_buses_supported = BUS_NONSPI; if (try_mtd(cfg) == 0) { ret = 0; @@ -201,12 +200,12 @@ } } - bcfg.is_laptop = 2; /* Assume that we don't know by default. */ + cfg->bcfg->is_laptop = 2; /* Assume that we don't know by default. */ - dmi_init(&bcfg.is_laptop); + dmi_init(&(cfg->bcfg->is_laptop)); /* In case Super I/O probing would cause pretty explosions. */ - board_handle_before_superio(&bcfg, force_boardenable); + board_handle_before_superio(cfg->bcfg, force_boardenable); /* Probe for the Super I/O chip and fill global struct superio. */ probe_superio(); @@ -219,22 +218,21 @@ #endif /* Check laptop whitelist. */ - board_handle_before_laptop(&bcfg, force_boardenable); + board_handle_before_laptop(cfg->bcfg, force_boardenable); /* * Disable all internal buses by default if we are not sure * this isn't a laptop. Board-enables may override this, * non-legacy buses (SPI and opaque atm) are probed anyway. */ - if (bcfg.is_laptop && !(bcfg.laptop_ok || force_laptop || (not_a_laptop && bcfg.is_laptop == 2))) - bcfg.internal_buses_supported = BUS_NONE; + if (cfg->bcfg->is_laptop && !(cfg->bcfg->laptop_ok || + force_laptop || (not_a_laptop && cfg->bcfg->is_laptop == 2))) + cfg->bcfg->internal_buses_supported = BUS_NONE; /* try to enable it. Failure IS an option, since not all motherboards * really need this to be done, etc., etc. */ - struct programmer_cfg icfg = *cfg; - icfg.bcfg = &bcfg; - ret = chipset_flash_enable(&icfg); + ret = chipset_flash_enable(cfg); if (ret == -2) { msg_perr("WARNING: No chipset found. Flash detection " "will most likely fail.\n"); @@ -247,7 +245,7 @@ * parallel writes on IT8705F. Also, this handles the manual chip select for Gigabyte's DualBIOS. */ init_superio_ite(cfg); - if (board_flash_enable(&bcfg, + if (board_flash_enable(cfg->bcfg, board_vendor, board_model, cb_vendor, cb_model, force_boardenable)) { msg_perr("Aborting to be safe.\n"); ret = 1; @@ -255,10 +253,10 @@ } #endif - internal_par_init(bcfg.internal_buses_supported); + internal_par_init(cfg->bcfg->internal_buses_supported); /* Report if a non-whitelisted laptop is detected that likely uses a legacy bus. */ - report_nonwl_laptop_detected(&bcfg); + report_nonwl_laptop_detected(cfg->bcfg); ret = 0; -- To view, visit https://review.coreboot.org/c/flashrom/+/73492 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I30bc4eefeb589d3ee7827fcfea81985292c88a10 Gerrit-Change-Number: 73492 Gerrit-PatchSet: 1 Gerrit-Owner: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: newchange

1 0

[M] Change in flashrom[master]: internal: Move laptop_ok into board_cfg
by Edward O'Callaghan (Code Review) 06 Mar '23

06 Mar '23

Attention is currently required from: Thomas Heijligen, Angel Pons. Edward O'Callaghan has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/73456 ) Change subject: internal: Move laptop_ok into board_cfg ...................................................................... Patch Set 2: (1 comment) File internal.c: https://review.coreboot.org/c/flashrom/+/73456/comment/082790bb_9b72befa PS1, Line 158: : /* Unconditionally reset global state from previous operation. */ : bcfg.laptop_ok = false; > actually can delete this now. Ack -- 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: 2 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: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Comment-Date: Mon, 06 Mar 2023 06:20:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-MessageType: comment

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit March 2023