flashrom June 2015

flashrom@flashrom.org

30 participants
88 discussions

Libflashrom draft patch - initial review
by Łukasz Dmitrowski 19 Jun '15

19 Jun '15

Hello, My name is Łukasz Dmitrowski and I am one of coreboot/flashrom GSoC students this year. You can read about my project here: http://blogs.coreboot.org/blog/author/dmitro/. One of my first steps is updating and extending Nico Hubers libflashrom patch. Work is still in progress, but some changes are already made, so I thought that it will be good idea to send a patch just for review to know if I am going in a good direction. I want to improve my skills and provide best code quality as I can, so I am open for criticism - I am here to learn :) Patch summary: Makefile: I added cli_common.o and print.o to LIB_OBJS - it solves undefined references in current libflashrom version, but spoils standard flashrom build with 'make', I did not investigated it yet as my focus is to extend library with new functions and update already existing, need to discuss it with my mentor cli_classic.c, cli_output.c, flash.h: Only Nico Hubers changes here, didn't touch it libflashrom.c, libflashrom.h: I added 8 functions and made a few changes to existing ones, as some of used functions are static, or does not exist. New functions: int fl_supported_programmers(const char **supported_programmers); int fl_supported_flash_chips(fl_flashchip_info_t *fchips); int fl_supported_boards(fl_board_info_t *boards); int fl_supported_chipsets(fl_chipset_info_t *chipsets); int fl_supported_programmers_number(); int fl_supported_flash_chips_number(); int fl_supported_boards_number(); int fl_supported_chipsets_number(); New types: fl_flashchip_info_t - smaller version of struct flashchip fl_board_info_t - smaller version of struct board_info fl_chipset_info_t - smaller version of struct penable fl_test_state - copy of enum test_state So we have 4 functions that return a list of supported programmers, chips, boards and chipsets. Next 4 functions return number of supported hardware of certain type. For example, to obtain a list of supported boards, you can create an array of structures fl_board_info of suitable size (the size is known - fl_supported_boards_number()), then pass it to fl_supported_boards(fl_board_info_t *boards) and you will have it filled with data. Regarding changes in Nico Hubers functions: I made temporary comments for every change and marked it with LD_CHANGE_NOTE. Every comment contains previous code and reason why it has been commented out. Thanks in advance for your insights! Regards, Lukasz Dmitrowski --- Signed-off-by: Łukasz Dmitrowski <lukasz.dmitrowski(a)gmail.com> Index: Makefile =================================================================== --- Makefile (revision 1891) +++ Makefile (working copy) @@ -374,7 +374,7 @@ ############################################################################### # Library code. -LIB_OBJS = layout.o flashrom.o udelay.o programmer.o helpers.o +LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o helpers.o cli_common.o print.o ############################################################################### # Frontend related stuff. Index: cli_classic.c =================================================================== --- cli_classic.c (revision 1891) +++ cli_classic.c (working copy) @@ -30,6 +30,7 @@ #include "flash.h" #include "flashchips.h" #include "programmer.h" +#include "libflashrom.h" static void cli_classic_usage(const char *name) { @@ -135,6 +136,8 @@ char *tempstr = NULL; char *pparam = NULL; + fl_set_log_callback((fl_log_callback_t *)&fl_print_cb); + print_version(); print_banner(); Index: cli_output.c =================================================================== --- cli_output.c (revision 1891) +++ cli_output.c (working copy) @@ -71,9 +71,8 @@ #endif /* !STANDALONE */ /* Please note that level is the verbosity, not the importance of the message. */ -int print(enum msglevel level, const char *fmt, ...) +int fl_print_cb(enum msglevel level, const char *fmt, va_list ap) { - va_list ap; int ret = 0; FILE *output_type = stdout; @@ -81,9 +80,7 @@ output_type = stderr; if (level <= verbose_screen) { - va_start(ap, fmt); ret = vfprintf(output_type, fmt, ap); - va_end(ap); /* msg_*spew often happens inside chip accessors in possibly * time-critical operations. Don't slow them down by flushing. */ if (level != MSG_SPEW) @@ -91,9 +88,7 @@ } #ifndef STANDALONE if ((level <= verbose_logfile) && logfile) { - va_start(ap, fmt); ret = vfprintf(logfile, fmt, ap); - va_end(ap); if (level != MSG_SPEW) fflush(logfile); } Index: flash.h =================================================================== --- flash.h (revision 1891) +++ flash.h (working copy) @@ -31,6 +31,7 @@ #include <stdint.h> #include <stddef.h> #include <stdbool.h> +#include <stdarg.h> #if IS_WINDOWS #include <windows.h> #undef min @@ -317,6 +318,7 @@ MSG_DEBUG2 = 4, MSG_SPEW = 5, }; +int fl_print_cb(enum msglevel level, const char *fmt, va_list ap); /* Let gcc and clang check for correct printf-style format strings. */ int print(enum msglevel level, const char *fmt, ...) #ifdef __MINGW32__ Index: libflashrom.c =================================================================== --- libflashrom.c (revision 0) +++ libflashrom.c (working copy) @@ -0,0 +1,603 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2012 secunet Security Networks AG + * (Written by Nico Huber <nico.huber(a)secunet.com> for secunet) + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +/** + * @mainpage + * + * Have a look at the Modules section for a function reference. + */ + +#include <stdlib.h> +#include <string.h> +#include <stdarg.h> + +#include "flash.h" +#include "programmer.h" +#include "libflashrom.h" + +/** + * @defgroup fl-general General + * @{ + */ + +/** Pointer to log callback function. */ +static fl_log_callback_t *fl_log_callback = NULL; + +/** + * @brief Initialize libflashrom. + * + * @param perform_selfcheck If not zero, perform a self check. + * @return 0 on success + */ +int fl_init(const int perform_selfcheck) +{ + if (perform_selfcheck && selfcheck()) + return 1; + myusec_calibrate_delay(); + return 0; +} + +/** + * @brief Shut down libflashrom. + * @return 0 on success + */ +int fl_shutdown(void) +{ + return 0; /* TODO: nothing to do? */ +} + +/* TODO: fl_set_loglevel()? do we need it? + For now, let the user decide in his callback. */ + +/** + * @brief Set the log callback function. + * + * Set a callback function which will be invoked whenever libflashrom wants + * to output messages. This allows frontends to do whatever they see fit with + * such messages, e.g. write them to syslog, or to file, or print them in a + * GUI window, etc. + * + * @param log_callback Pointer to the new log callback function. + */ +void fl_set_log_callback(fl_log_callback_t *const log_callback) +{ + fl_log_callback = log_callback; +} +/** @private */ +int print(const enum msglevel level, const char *const fmt, ...) +{ + if (fl_log_callback) { + int ret; + va_list args; + va_start(args, fmt); + ret = fl_log_callback(level, fmt, args); + va_end(args); + return ret; + } + return 0; +} + +/** @} */ /* end fl-general */ + + + +/** + * @defgroup fl-query Querying + * @{ + */ + +int fl_supported_programmers(const char **supported_programmers) +{ + int ret = 0; + enum programmer p = 0; + + if (supported_programmers != NULL) { + for (; p < PROGRAMMER_INVALID; ++p) + supported_programmers[p] = programmer_table[p].name; + } else { + ret = 1; + } + + return ret; +} + +int fl_supported_programmers_number() +{ + return PROGRAMMER_INVALID; +} + +int fl_supported_flash_chips(fl_flashchip_info_t *fchips) +{ + int ret = 0; + int i = 0; + + if (fchips != NULL) { + for (; i < flashchips_size; ++i) { + fchips[i].vendor = flashchips[i].vendor; + fchips[i].name = flashchips[i].name; + fchips[i].tested.erase = flashchips[i].tested.erase; + fchips[i].tested.probe = flashchips[i].tested.probe; + fchips[i].tested.read = flashchips[i].tested.read; + fchips[i].tested.write = flashchips[i].tested.write; + fchips[i].total_size = flashchips[i].total_size; + } + } else { + ret = 1; + } + + return ret; +} + +int fl_supported_flash_chips_number() +{ + return flashchips_size; +} + +int fl_supported_boards(fl_board_info_t *boards) +{ + int ret = 0; + const struct board_info *binfo = boards_known; + + if (boards != NULL) { + while (binfo->vendor != NULL) { + boards->vendor = binfo->vendor; + boards->name = binfo->name; + boards->working = binfo->working; + ++binfo; + ++boards; + } + } else { + ret = 1; + } + + return ret; +} + +int fl_supported_boards_number() +{ + int boards_number = 0; + const struct board_info *binfo = boards_known; + + while (binfo->vendor != NULL) { + ++boards_number; + ++binfo; + } + + return boards_number; +} + +int fl_supported_chipsets(fl_chipset_info_t *chipsets) +{ + int ret = 0; + const struct penable *chipset = chipset_enables; + + if (chipsets != NULL) { + while (chipset->vendor_name != NULL) { + chipsets->vendor = chipset->vendor_name; + chipsets->chipset = chipset->device_name; + chipsets->status = chipset->status; + ++chipset; + ++chipsets; + } + } else { + return ret; + } + + return ret; +} + +int fl_supported_chipsets_number() +{ + int chipsets_number = 0; + const struct penable *chipset = chipset_enables; + + while (chipset->vendor_name != NULL) { + ++chipsets_number; + ++chipset; + } + + return chipsets_number; +} + +/** @} */ /* end fl-query */ + + + +/** + * @defgroup fl-prog Programmers + * @{ + */ + +/** + * @brief Initialize the specified programmer. + * + * @param prog_name Name of the programmer to initialize. + * @param prog_param Pointer to programmer specific parameters. + * @return 0 on success + */ +int fl_programmer_init(const char *const prog_name, const char *const prog_param) +{ + unsigned prog; + + for (prog = 0; prog < PROGRAMMER_INVALID; prog++) { + if (strcmp(prog_name, programmer_table[prog].name) == 0) + break; + } + if (prog >= PROGRAMMER_INVALID) { + msg_ginfo("Error: Unknown programmer \"%s\". Valid choices are:\n", prog_name); + list_programmers_linebreak(0, 80, 0); + return 1; + } + return programmer_init(prog, prog_param); +} + +/** + * @brief Shut down the initialized programmer. + * + * @return 0 on success + */ +int fl_programmer_shutdown(void) +{ + return programmer_shutdown(); +} + +/* TODO: fl_programmer_capabilities()? */ + +/** @} */ /* end fl-prog */ + + + +/** + * @defgroup fl-flash Flash chips + * @{ + */ + +/** + * @brief Probe for a flash chip. + * + * Probes for a flash chip and returns a flash context, that can be used + * later with flash chip and @ref fl-ops "image operations", if exactly one + * matching chip is found. + * + * @param[out] flashctx Points to a pointer of type fl_flashctx_t that will + * be set if exactly one chip is found. *flashctx has + * to be freed by the caller with @ref fl_flash_release. + * @param[in] chip_name Name of a chip to probe for, or NULL to probe for + * all known chips. + * @return 0 on success, + * 3 if multiple chips were found, + * 2 if no chip was found, + * or 1 on any other error. + */ +int fl_flash_probe(fl_flashctx_t **const flashctx, const char *const chip_name) +{ + int i, ret = 2; + fl_flashctx_t second_flashctx = { 0, }; + + chip_to_probe = chip_name; /* chip_to_probe is global in flashrom.c */ + + *flashctx = malloc(sizeof(**flashctx)); + if (!*flashctx) + return 1; + memset(*flashctx, 0, sizeof(**flashctx)); + + /* LD_CHANGE_NOTE for (i = 0; i < registered_programmer_count; ++i) { + * + * Reason of change: registered_programmer_count does not exist, I assume that a proper one is + * now registered_master_count - I will check and confirm + */ + for (i = 0; i < registered_master_count; ++i) { + int flash_idx = -1; + /* LD_CHANGE_NOTE if (!ret || (flash_idx = probe_flash(&registered_programmers[i], 0, *flashctx, 0)) != -1) { + * + * Reason of change: registered_programmers does not exist, I assume that a proper one is + * now registered_masters - I will check and confirm + */ + if (!ret || (flash_idx = probe_flash(&registered_masters[i], 0, *flashctx, 0)) != -1) { + ret = 0; + /* We found one chip, now check that there is no second match. */ + /* LD_CHANGE_NOTE if (probe_flash(&registered_programmers[i], flash_idx + 1, &second_flashctx, 0) != -1) { + * + * Reason of change: registered_programmers does not exist, I assume that a proper one is + * now registered_masters - I will check and confirm + * + */ + if (probe_flash(&registered_masters[i], flash_idx + 1, &second_flashctx, 0) != -1) { + ret = 3; + break; + } + } + } + if (ret) { + free(*flashctx); + *flashctx = NULL; + } + return ret; +} + +/** + * @brief Returns the size of the specified flash chip in bytes. + * + * @param flashctx The queried flash context. + * @return Size of flash chip in bytes. + */ +size_t fl_flash_getsize(const fl_flashctx_t *const flashctx) +{ + return flashctx->chip->total_size << 10; +} + +/** @private */ +int erase_and_write_flash(struct flashctx *flash, uint8_t *oldcontents, uint8_t *newcontents); +/** @private */ +/* LD_CHANGE_NOTE void emergency_help_message(void); + * + * Reason of change: This has been commented out as emergency_help_message is static + */ +/** + * @brief Erase the specified ROM chip. + * + * @param flashctx The context of the flash chip to erase. + * @return 0 on success. + */ +int fl_flash_erase(fl_flashctx_t *const flashctx) +{ + const size_t flash_size = flashctx->chip->total_size * 1024; + + int ret = 0; + + uint8_t *const newcontents = malloc(flash_size); + if (!newcontents) { + msg_gerr("Out of memory!\n"); + return 1; + } + uint8_t *const oldcontents = malloc(flash_size); + if (!oldcontents) { + msg_gerr("Out of memory!\n"); + free(newcontents); + return 1; + } + + if (flashctx->chip->unlock) + flashctx->chip->unlock(flashctx); + + /* Assume worst case for old contents: All bits are 0. */ + memset(oldcontents, 0x00, flash_size); + /* Assume best case for new contents: All bits should be 1. */ + memset(newcontents, 0xff, flash_size); + /* Side effect of the assumptions above: Default write action is erase + * because newcontents looks like a completely erased chip, and + * oldcontents being completely 0x00 means we have to erase everything + * before we can write. + */ + + if (erase_and_write_flash(flashctx, oldcontents, newcontents)) { + /* FIXME: Do we really want the scary warning if erase failed? + * After all, after erase the chip is either blank or partially + * blank or it has the old contents. A blank chip won't boot, + * so if the user wanted erase and reboots afterwards, the user + * knows very well that booting won't work. + */ + /* LD_CHANGE_NOTE emergency_help_message(); + * + * Reason of change: This function is static + */ + ret = 1; + } + + free(oldcontents); + free(newcontents); + return ret; +} + +/** + * @brief Free a flash context. + * + * @param flashctx Flash context to free. + */ +void fl_flash_release(fl_flashctx_t *const flashctx) +{ + free(flashctx); +} + +/** @} */ /* end fl-flash */ + + + +/** + * @defgroup fl-ops Operations + * @{ + */ + +/** + * @brief Read the current image from the specified ROM chip. + * + * @param flashctx The context of the flash chip. + * @param buffer Target buffer to write image to. + * @param buffer_len Size of target buffer in bytes. + * @return 0 on success, + * 2 if buffer_len is to short for the flash chip's contents, + * or 1 on any other failure. + */ +int fl_image_read(fl_flashctx_t *const flashctx, void *const buffer, const size_t buffer_len) +{ + const size_t flash_size = flashctx->chip->total_size * 1024; + + int ret = 0; + + if (flashctx->chip->unlock) + flashctx->chip->unlock(flashctx); + + msg_cinfo("Reading flash... "); + if (flash_size > buffer_len) { + msg_cerr("Buffer to short for this flash chip (%u < %u).\n", + (unsigned int)buffer_len, (unsigned int)flash_size); + ret = 2; + goto _out; + } + if (!flashctx->chip->read) { + msg_cerr("No read function available for this flash chip.\n"); + ret = 1; + goto _out; + } + if (flashctx->chip->read(flashctx, buffer, 0, flash_size)) { + msg_cerr("Read operation failed!\n"); + ret = 1; + goto _out; + } +_out: + msg_cinfo("%s.\n", ret ? "FAILED" : "done"); + return ret; +} + +/** @private */ +/* LD_CHANGE_NOTE void nonfatal_help_message(void); + * + * Reason of change: This function is static + */ +/** + * @brief Write the specified image to the ROM chip. + * + * @param flashctx The context of the flash chip. + * @param buffer Source buffer to read image from. + * @param buffer_len Size of source buffer in bytes. + * @return 0 on success, + * 4 if buffer_len doesn't match the size of the flash chip, + * 3 if write was tried, but nothing has changed, + * 2 if write was tried, but flash contents changed, + * or 1 on any other failure. + */ +int fl_image_write(fl_flashctx_t *const flashctx, void *const buffer, const size_t buffer_len) +{ + const size_t flash_size = flashctx->chip->total_size * 1024; + + int ret = 0; + + if (buffer_len != flash_size) { + msg_cerr("Buffer size doesn't match size of flash chip (%u != %u)\n.", + (unsigned int)buffer_len, (unsigned int)flash_size); + return 4; + } + + uint8_t *const newcontents = buffer; + uint8_t *const oldcontents = malloc(flash_size); + if (!oldcontents) { + msg_gerr("Out of memory!\n"); + return 1; + } + if (fl_image_read(flashctx, oldcontents, flash_size)) { + ret = 1; + goto _free_out; + } + + /* LD_CHANGE_NOTE handle_romentries(flashctx, oldcontents, newcontents); + * + * Reason of change: This function does not exist. There is a need to investigate what was + * its purpose and how it can be replaced. + */ + + if (erase_and_write_flash(flashctx, oldcontents, newcontents)) { + msg_cerr("Uh oh. Erase/write failed. Checking if anything changed.\n"); + if (!flashctx->chip->read(flashctx, newcontents, 0, flash_size)) { + if (!memcmp(oldcontents, newcontents, flash_size)) { + msg_cinfo("Good. It seems nothing was changed.\n"); + /* LD_CHANGE_NOTE nonfatal_help_message(); + * + * Reason of change: This function is static + */ + ret = 3; + goto _free_out; + } + } + /* LD_CHANGE_NOTE emergency_help_message(); + * + * Reason of change: This function is static + */ + ret = 2; + goto _free_out; + } + +_free_out: + free(oldcontents); + return ret; +} + +/** @private */ +/* LD_CHANGE_NOTE int compare_range(const uint8_t *wantbuf, const uint8_t *havebuf, unsigned int start, unsigned int len); + * + * Reason of change: This function is static + */ +/** + * @brief Verify the ROM chip's contents with the specified image. + * + * @param flashctx The context of the flash chip. + * @param buffer Source buffer to verify with. + * @param buffer_len Size of source buffer in bytes. + * @return 0 on success, + * 2 if buffer_len doesn't match the size of the flash chip, + * or 1 on any other failure. + */ +int fl_image_verify(fl_flashctx_t *const flashctx, void *const buffer, const size_t buffer_len) +{ + const size_t flash_size = flashctx->chip->total_size * 1024; + + int ret = 0; + + if (buffer_len != flash_size) { + msg_cerr("Buffer size doesn't match size of flash chip (%u != %u)\n.", + (unsigned int)buffer_len, (unsigned int)flash_size); + return 2; + } + + /* LD_CHANGE_NOTE uint8_t *const newcontents = buffer; - used only in handle_romentries() function + * + * Reason of change: This pointer is used only in handle_romentries function, which has been + * commented out + */ + uint8_t *const oldcontents = malloc(flash_size); + if (!oldcontents) { + msg_gerr("Out of memory!\n"); + return 1; + } + if (fl_image_read(flashctx, oldcontents, flash_size)) { + ret = 1; + goto _free_out; + } + + /* LD_CHANGE_NOTE handle_romentries(flashctx, oldcontents, newcontents); + * + * Reason of change: This function does not exist + */ + + msg_cinfo("Verifying flash... "); + + /* LD_CHANGE_NOTE ret = compare_range(newcontents, oldcontents, 0, flash_size); + * + * Reason of change: This function is static. For now replaced with ret = 1 as ret must be used + */ + ret = 1; + if (!ret) + msg_cinfo("VERIFIED.\n"); + +_free_out: + free(oldcontents); + return ret; +} + +/** @} */ /* end fl-ops */ Index: libflashrom.h =================================================================== --- libflashrom.h (revision 0) +++ libflashrom.h (working copy) @@ -0,0 +1,97 @@ +/* + * This file is part of the flashrom project. + * + * Copyright (C) 2012 secunet Security Networks AG + * (Written by Nico Huber <nico.huber(a)secunet.com> for secunet) + * + * 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. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef __LIBFLASHROM_H__ +#define __LIBFLASHROM_H__ 1 + +#include <stdarg.h> + +int fl_init(int perform_selfcheck); +int fl_shutdown(void); +/** @ingroup fl-general */ +typedef enum { /* This has to match enum msglevel. */ + FL_MSG_ERROR = 0, + FL_MSG_INFO = 1, + FL_MSG_DEBUG = 2, + FL_MSG_DEBUG2 = 3, + FL_MSG_SPEW = 4, +} fl_log_level_t; +/** @ingroup fl-general */ +typedef int(fl_log_callback_t)(fl_log_level_t, const char *format, va_list); +void fl_set_log_callback(fl_log_callback_t *); + +typedef enum { + FL_TESTED_OK = 0, + FL_TESTED_NT = 1, + FL_TESTED_BAD = 2, + FL_TESTED_DEP = 3, + FL_TESTED_NA = 4, +} fl_test_state; + +typedef struct { + const char *vendor; + const char *name; + unsigned int total_size; + + struct fl_tested { + fl_test_state probe; + fl_test_state read; + fl_test_state erase; + fl_test_state write; + } tested; +} fl_flashchip_info_t; + +typedef struct { + const char *vendor; + const char *name; + fl_test_state working; +} fl_board_info_t; + +typedef struct { + const char *vendor; + const char *chipset; + fl_test_state status; +} fl_chipset_info_t; + +int fl_supported_programmers(const char **supported_programmers); +int fl_supported_flash_chips(fl_flashchip_info_t *fchips); +int fl_supported_boards(fl_board_info_t *boards); +int fl_supported_chipsets(fl_chipset_info_t *chipsets); +int fl_supported_programmers_number(); +int fl_supported_flash_chips_number(); +int fl_supported_boards_number(); +int fl_supported_chipsets_number(); + +int fl_programmer_init(const char *prog_name, const char *prog_params); +int fl_programmer_shutdown(void); + +struct flashctx; +typedef struct flashctx fl_flashctx_t; +int fl_flash_probe(fl_flashctx_t **, const char *chip_name); +size_t fl_flash_getsize(const fl_flashctx_t *); +int fl_flash_erase(fl_flashctx_t *); +void fl_flash_release(fl_flashctx_t *); + +int fl_image_read(fl_flashctx_t *, void *buffer, size_t buffer_len); +int fl_image_write(fl_flashctx_t *, void *buffer, size_t buffer_len); +int fl_image_verify(fl_flashctx_t *, void *buffer, size_t buffer_len); + +#endif /* !__LIBFLASHROM_H__ */

3 2

Re: [flashrom] Libflashrom draft patch - initial review
by Антон Кочков 19 Jun '15

19 Jun '15

So, my patches are here https://github.com/XVilka/flashrom/commits/libflashrom_layout - feel free to use them as you wish, if you want so. Best regards, Anton Kochkov. On Fri, Jun 19, 2015 at 2:54 PM, Антон Кочков <anton.kochkov(a)gmail.com> wrote: > Sorry again, that was old tree, I will rearrange patches and will push > updated version in a hour or so. > Best regards, > Anton Kochkov. > > > On Fri, Jun 19, 2015 at 2:50 PM, Антон Кочков <anton.kochkov(a)gmail.com> wrote: >> Uh, forgot to add, that loading layout will be quite useful too, in the API and >> adding romentry_t* argument for all fl_image_* functions. >> Best regards, >> Anton Kochkov. >> >> >> On Fri, Jun 19, 2015 at 2:43 PM, Антон Кочков <anton.kochkov(a)gmail.com> wrote: >>> Hi! >>> I've done also some rebasing of the libflashrom patches before (on top >>> of the layout branch from the stefanct) >>> https://github.com/XVilka/flashrom/commits/libflashrom >>> >>> May be you'll find something useful here. >>> Best regards, >>> Anton Kochkov. >>> >>> >>> On Thu, Jun 18, 2015 at 7:45 AM, Urja Rannikko <urjaman(a)gmail.com> wrote: >>>> Hi, >>>> >>>> >>>> On Fri, Jun 12, 2015 at 12:26 AM, Łukasz Dmitrowski >>>> <lukasz.dmitrowski(a)gmail.com> wrote: >>>>> Hello, >>>>> >>>>> My name is Łukasz Dmitrowski and I am one of coreboot/flashrom GSoC students >>>>> this year. You can read about my project here: >>>>> http://blogs.coreboot.org/blog/author/dmitro/. >>>>> >>>>> One of my first steps is updating and extending Nico Hubers libflashrom >>>>> patch. Work is still in progress, but some changes are already made, so I >>>>> thought that it will be good idea to send a patch just for review to know if >>>>> I am going in a good direction. I want to improve my skills and provide best >>>>> code quality as I can, so I am open for criticism - I am here to learn :) >>>>> >>>> I'm here essentially trying out reviewing stuff, so expect more from >>>> somebody a bit more experienced, but I heard my comments would be >>>> useful, so moving on :) >>>> >>>>> Patch summary: >>>>> >>>> First thing i have to say about the patch is that it has been >>>> malformed, most likely line wrapped by your email client. If you cant >>>> properly include the patch inline, attaching a .patch would be okay. >>>> (Also turn off that HTML output if you can... although it wasnt used >>>> for anything, but still.). So I didnt do any compile testing on this >>>> stuff because of this. >>>> >>>>> Makefile: I added cli_common.o and print.o to LIB_OBJS - it solves undefined >>>>> references in current libflashrom version, but spoils standard flashrom >>>>> build with 'make', I did not investigated it yet as my focus is to extend >>>>> library with new functions and update already existing, need to discuss it >>>>> with my mentor >>>>> >>>>> cli_classic.c, cli_output.c, flash.h: Only Nico Hubers changes here, didn't >>>>> touch it >>>> I might comment on any part of the patch because I havent reviewed the >>>> original and it's only about the code. >>>> >>>>> >>>>> libflashrom.c, libflashrom.h: I added 8 functions and made a few changes to >>>>> existing ones, as some of used functions are static, or does not exist. >>>>> >>>>> New functions: >>>>> >>>>> int fl_supported_programmers(const char **supported_programmers); >>>>> int fl_supported_flash_chips(fl_flashchip_info_t *fchips); >>>>> int fl_supported_boards(fl_board_info_t *boards); >>>>> int fl_supported_chipsets(fl_chipset_info_t *chipsets); >>>>> int fl_supported_programmers_number(); >>>>> int fl_supported_flash_chips_number(); >>>>> int fl_supported_boards_number(); >>>>> int fl_supported_chipsets_number(); >>>>> >>>>> New types: >>>>> fl_flashchip_info_t - smaller version of struct flashchip >>>>> fl_board_info_t - smaller version of struct board_info >>>>> fl_chipset_info_t - smaller version of struct penable >>>>> fl_test_state - copy of enum test_state >>>>> >>>>> So we have 4 functions that return a list of supported programmers, chips, >>>>> boards and chipsets. Next 4 functions return number of supported hardware of >>>>> certain type. For example, to obtain a list of supported boards, you can >>>>> create an array of structures fl_board_info of suitable size (the size is >>>>> known - fl_supported_boards_number()), then pass it to >>>>> fl_supported_boards(fl_board_info_t *boards) and you will have it filled >>>>> with data. >>>> My opinion is that the _number functions make the API unnecessarily >>>> complex to use. >>>> I'm suggesting like this: >>>> fl_flashchip_info_t * fl_supported_flash_chips(void); >>>> Have the call allocate the table using a not specified allocator >>>> (really just malloc for now, but we're not telling), and freed with a >>>> function like >>>> int fl_support_info_free(void*p); >>>> This would allow implementation using const tables or allocation, >>>> whatever we like. >>>> (if (p == const_table) return 0; in our _free() if mixed.) >>>> >>>>> >>>>> Regarding changes in Nico Hubers functions: I made temporary comments for >>>>> every change and marked it with LD_CHANGE_NOTE. Every comment contains >>>>> previous code and reason why it has been commented out. >>>>> >>>>> Thanks in advance for your insights! >>>>> >>>>> Regards, >>>>> Lukasz Dmitrowski >>>>> >>>>> --- >>>>> >>>>> Signed-off-by: Łukasz Dmitrowski <lukasz.dmitrowski(a)gmail.com> >>>>> >>>>> Index: Makefile >>>>> =================================================================== >>>>> --- Makefile (revision 1891) >>>>> +++ Makefile (working copy) >>>>> @@ -374,7 +374,7 @@ >>>>> >>>>> ############################################################################### >>>>> # Library code. >>>>> >>>>> -LIB_OBJS = layout.o flashrom.o udelay.o programmer.o helpers.o >>>>> +LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o >>>>> helpers.o cli_common.o print.o >>>>> >>>>> >>>>> ############################################################################### >>>>> # Frontend related stuff. >>>>> Index: cli_classic.c >>>>> =================================================================== >>>>> --- cli_classic.c (revision 1891) >>>>> +++ cli_classic.c (working copy) >>>>> @@ -30,6 +30,7 @@ >>>>> #include "flash.h" >>>>> #include "flashchips.h" >>>>> #include "programmer.h" >>>>> +#include "libflashrom.h" >>>>> >>>>> static void cli_classic_usage(const char *name) >>>>> { >>>>> @@ -135,6 +136,8 @@ >>>>> char *tempstr = NULL; >>>>> char *pparam = NULL; >>>>> >>>>> + fl_set_log_callback((fl_log_callback_t *)&fl_print_cb); >>>>> + >>>>> print_version(); >>>>> print_banner(); >>>>> >>>>> Index: cli_output.c >>>>> =================================================================== >>>>> --- cli_output.c (revision 1891) >>>>> +++ cli_output.c (working copy) >>>>> @@ -71,9 +71,8 @@ >>>>> #endif /* !STANDALONE */ >>>>> >>>>> /* Please note that level is the verbosity, not the importance of the >>>>> message. */ >>>>> -int print(enum msglevel level, const char *fmt, ...) >>>>> +int fl_print_cb(enum msglevel level, const char *fmt, va_list ap) >>>>> { >>>>> - va_list ap; >>>>> int ret = 0; >>>>> FILE *output_type = stdout; >>>>> >>>>> @@ -81,9 +80,7 @@ >>>>> output_type = stderr; >>>>> >>>>> if (level <= verbose_screen) { >>>>> - va_start(ap, fmt); >>>>> ret = vfprintf(output_type, fmt, ap); >>>>> - va_end(ap); >>>>> /* msg_*spew often happens inside chip accessors in possibly >>>>> * time-critical operations. Don't slow them down by flushing. */ >>>>> if (level != MSG_SPEW) >>>>> @@ -91,9 +88,7 @@ >>>>> } >>>>> #ifndef STANDALONE >>>>> if ((level <= verbose_logfile) && logfile) { >>>>> - va_start(ap, fmt); >>>>> ret = vfprintf(logfile, fmt, ap); >>>>> - va_end(ap); >>>>> if (level != MSG_SPEW) >>>>> fflush(logfile); >>>>> } >>>>> Index: flash.h >>>>> =================================================================== >>>>> --- flash.h (revision 1891) >>>>> +++ flash.h (working copy) >>>>> @@ -31,6 +31,7 @@ >>>>> #include <stdint.h> >>>>> #include <stddef.h> >>>>> #include <stdbool.h> >>>>> +#include <stdarg.h> >>>>> #if IS_WINDOWS >>>>> #include <windows.h> >>>>> #undef min >>>>> @@ -317,6 +318,7 @@ >>>>> MSG_DEBUG2 = 4, >>>>> MSG_SPEW = 5, >>>>> }; >>>>> +int fl_print_cb(enum msglevel level, const char *fmt, va_list ap); >>>>> /* Let gcc and clang check for correct printf-style format strings. */ >>>>> int print(enum msglevel level, const char *fmt, ...) >>>>> #ifdef __MINGW32__ >>>>> Index: libflashrom.c >>>>> =================================================================== >>>>> --- libflashrom.c (revision 0) >>>>> +++ libflashrom.c (working copy) >>>>> @@ -0,0 +1,603 @@ >>>>> +/* >>>>> + * This file is part of the flashrom project. >>>>> + * >>>>> + * Copyright (C) 2012 secunet Security Networks AG >>>>> + * (Written by Nico Huber <nico.huber(a)secunet.com> for secunet) >>>>> + * >>>>> + * 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. >>>>> + * >>>>> + * You should have received a copy of the GNU General Public License >>>>> + * along with this program; if not, write to the Free Software >>>>> + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 >>>>> USA >>>>> + */ >>>>> +/** >>>>> + * @mainpage >>>>> + * >>>>> + * Have a look at the Modules section for a function reference. >>>>> + */ >>>>> + >>>>> +#include <stdlib.h> >>>>> +#include <string.h> >>>>> +#include <stdarg.h> >>>>> + >>>>> +#include "flash.h" >>>>> +#include "programmer.h" >>>>> +#include "libflashrom.h" >>>>> + >>>>> +/** >>>>> + * @defgroup fl-general General >>>>> + * @{ >>>>> + */ >>>>> + >>>>> +/** Pointer to log callback function. */ >>>>> +static fl_log_callback_t *fl_log_callback = NULL; >>>>> + >>>>> +/** >>>>> + * @brief Initialize libflashrom. >>>>> + * >>>>> + * @param perform_selfcheck If not zero, perform a self check. >>>>> + * @return 0 on success >>>>> + */ >>>>> +int fl_init(const int perform_selfcheck) >>>>> +{ >>>>> + if (perform_selfcheck && selfcheck()) >>>>> + return 1; >>>>> + myusec_calibrate_delay(); >>>>> + return 0; >>>>> +} >>>>> + >>>>> +/** >>>>> + * @brief Shut down libflashrom. >>>>> + * @return 0 on success >>>>> + */ >>>>> +int fl_shutdown(void) >>>>> +{ >>>>> + return 0; /* TODO: nothing to do? */ >>>> I'm pretty sure there is, but need to investigate more. >>>> >>>>> +} >>>>> + >>>>> +/* TODO: fl_set_loglevel()? do we need it? >>>>> + For now, let the user decide in his callback. */ >>>>> + >>>>> +/** >>>>> + * @brief Set the log callback function. >>>>> + * >>>>> + * Set a callback function which will be invoked whenever libflashrom wants >>>>> + * to output messages. This allows frontends to do whatever they see fit >>>>> with >>>>> + * such messages, e.g. write them to syslog, or to file, or print them in a >>>>> + * GUI window, etc. >>>>> + * >>>>> + * @param log_callback Pointer to the new log callback function. >>>>> + */ >>>>> +void fl_set_log_callback(fl_log_callback_t *const log_callback) >>>>> +{ >>>>> + fl_log_callback = log_callback; >>>>> +} >>>>> +/** @private */ >>>>> +int print(const enum msglevel level, const char *const fmt, ...) >>>>> +{ >>>>> + if (fl_log_callback) { >>>>> + int ret; >>>>> + va_list args; >>>>> + va_start(args, fmt); >>>>> + ret = fl_log_callback(level, fmt, args); >>>>> + va_end(args); >>>>> + return ret; >>>>> + } >>>>> + return 0; >>>>> +} >>>>> + >>>>> +/** @} */ /* end fl-general */ >>>>> + >>>>> + >>>>> + >>>>> +/** >>>>> + * @defgroup fl-query Querying >>>>> + * @{ >>>>> + */ >>>>> + >>>>> +int fl_supported_programmers(const char **supported_programmers) >>>>> +{ >>>>> + int ret = 0; >>>>> + enum programmer p = 0; >>>>> + >>>>> + if (supported_programmers != NULL) { >>>>> + for (; p < PROGRAMMER_INVALID; ++p) >>>>> + supported_programmers[p] = >>>>> programmer_table[p].name; >>>>> + } else { >>>>> + ret = 1; >>>>> + } >>>>> + >>>>> + return ret; >>>>> +} >>>>> + >>>>> +int fl_supported_programmers_number() >>>>> +{ >>>>> + return PROGRAMMER_INVALID; >>>>> +} >>>>> + >>>>> +int fl_supported_flash_chips(fl_flashchip_info_t *fchips) >>>>> +{ >>>>> + int ret = 0; >>>>> + int i = 0; >>>>> + >>>>> + if (fchips != NULL) { >>>>> + for (; i < flashchips_size; ++i) { >>>>> + fchips[i].vendor = flashchips[i].vendor; >>>>> + fchips[i].name = flashchips[i].name; >>>>> + fchips[i].tested.erase = >>>>> flashchips[i].tested.erase; >>>>> + fchips[i].tested.probe = >>>>> flashchips[i].tested.probe; >>>>> + fchips[i].tested.read = flashchips[i].tested.read; >>>>> + fchips[i].tested.write = >>>>> flashchips[i].tested.write; >>>>> + fchips[i].total_size = flashchips[i].total_size; >>>>> + } >>>>> + } else { >>>>> + ret = 1; >>>>> + } >>>>> + >>>>> + return ret; >>>>> +} >>>>> + >>>>> +int fl_supported_flash_chips_number() >>>>> +{ >>>>> + return flashchips_size; >>>>> +} >>>>> + >>>>> +int fl_supported_boards(fl_board_info_t *boards) >>>>> +{ >>>>> + int ret = 0; >>>>> + const struct board_info *binfo = boards_known; >>>>> + >>>>> + if (boards != NULL) { >>>>> + while (binfo->vendor != NULL) { >>>>> + boards->vendor = binfo->vendor; >>>>> + boards->name = binfo->name; >>>>> + boards->working = binfo->working; >>>>> + ++binfo; >>>>> + ++boards; >>>>> + } >>>>> + } else { >>>>> + ret = 1; >>>>> + } >>>>> + >>>>> + return ret; >>>>> +} >>>>> + >>>>> +int fl_supported_boards_number() >>>>> +{ >>>>> + int boards_number = 0; >>>>> + const struct board_info *binfo = boards_known; >>>>> + >>>>> + while (binfo->vendor != NULL) { >>>>> + ++boards_number; >>>>> + ++binfo; >>>>> + } >>>>> + >>>>> + return boards_number; >>>>> +} >>>>> + >>>>> +int fl_supported_chipsets(fl_chipset_info_t *chipsets) >>>>> +{ >>>>> + int ret = 0; >>>>> + const struct penable *chipset = chipset_enables; >>>>> + >>>>> + if (chipsets != NULL) { >>>>> + while (chipset->vendor_name != NULL) { >>>>> + chipsets->vendor = chipset->vendor_name; >>>>> + chipsets->chipset = chipset->device_name; >>>>> + chipsets->status = chipset->status; >>>>> + ++chipset; >>>>> + ++chipsets; >>>> These names are confusing (just FYI), i first thought we're counting >>>> chipsets here.. >>>>> + } >>>>> + } else { >>>>> + return ret; >>>>> + } >>>>> + >>>>> + return ret; >>>>> +} >>>>> + >>>>> +int fl_supported_chipsets_number() >>>>> +{ >>>>> + int chipsets_number = 0; >>>>> + const struct penable *chipset = chipset_enables; >>>>> + >>>>> + while (chipset->vendor_name != NULL) { >>>>> + ++chipsets_number; >>>>> + ++chipset; >>>>> + } >>>>> + >>>>> + return chipsets_number; >>>>> +} >>>>> + >>>>> +/** @} */ /* end fl-query */ >>>>> + >>>>> + >>>>> + >>>>> +/** >>>>> + * @defgroup fl-prog Programmers >>>>> + * @{ >>>>> + */ >>>>> + >>>>> +/** >>>>> + * @brief Initialize the specified programmer. >>>>> + * >>>>> + * @param prog_name Name of the programmer to initialize. >>>>> + * @param prog_param Pointer to programmer specific parameters. >>>>> + * @return 0 on success >>>>> + */ >>>>> +int fl_programmer_init(const char *const prog_name, const char *const >>>>> prog_param) >>>>> +{ >>>>> + unsigned prog; >>>>> + >>>>> + for (prog = 0; prog < PROGRAMMER_INVALID; prog++) { >>>>> + if (strcmp(prog_name, programmer_table[prog].name) == 0) >>>>> + break; >>>>> + } >>>>> + if (prog >= PROGRAMMER_INVALID) { >>>>> + msg_ginfo("Error: Unknown programmer \"%s\". Valid choices >>>>> are:\n", prog_name); >>>>> + list_programmers_linebreak(0, 80, 0); >>>>> + return 1; >>>>> + } >>>>> + return programmer_init(prog, prog_param); >>>>> +} >>>>> + >>>>> +/** >>>>> + * @brief Shut down the initialized programmer. >>>>> + * >>>>> + * @return 0 on success >>>>> + */ >>>>> +int fl_programmer_shutdown(void) >>>>> +{ >>>>> + return programmer_shutdown(); >>>>> +} >>>>> + >>>>> +/* TODO: fl_programmer_capabilities()? */ >>>>> + >>>>> +/** @} */ /* end fl-prog */ >>>>> + >>>>> + >>>>> + >>>>> +/** >>>>> + * @defgroup fl-flash Flash chips >>>>> + * @{ >>>>> + */ >>>>> + >>>>> +/** >>>>> + * @brief Probe for a flash chip. >>>>> + * >>>>> + * Probes for a flash chip and returns a flash context, that can be used >>>>> + * later with flash chip and @ref fl-ops "image operations", if exactly one >>>>> + * matching chip is found. >>>>> + * >>>>> + * @param[out] flashctx Points to a pointer of type fl_flashctx_t that will >>>>> + * be set if exactly one chip is found. *flashctx has >>>>> + * to be freed by the caller with @ref >>>>> fl_flash_release. >>>>> + * @param[in] chip_name Name of a chip to probe for, or NULL to probe for >>>>> + * all known chips. >>>>> + * @return 0 on success, >>>>> + * 3 if multiple chips were found, >>>>> + * 2 if no chip was found, >>>>> + * or 1 on any other error. >>>>> + */ >>>> Need a way to output multiple flash chips from here, it shouldnt be an >>>> error, just a >>>> "pick from these" dialog and continue with "OK", or something like that. >>>> Maybe add int *chip_count as a parameter and the set pointer will >>>> point to an array of flashctx with the int set to the count of found >>>> chips. >>>> (Hopefully I'm not saying totally obvious stuff here...) >>>> >>>>> +int fl_flash_probe(fl_flashctx_t **const flashctx, const char *const >>>>> chip_name) >>>>> +{ >>>>> + int i, ret = 2; >>>>> + fl_flashctx_t second_flashctx = { 0, }; >>>>> + >>>>> + chip_to_probe = chip_name; /* chip_to_probe is global in flashrom.c >>>>> */ >>>>> + >>>>> + *flashctx = malloc(sizeof(**flashctx)); >>>>> + if (!*flashctx) >>>>> + return 1; >>>>> + memset(*flashctx, 0, sizeof(**flashctx)); >>>>> + >>>>> + /* LD_CHANGE_NOTE for (i = 0; i < registered_programmer_count; ++i) >>>>> { >>>>> + * >>>>> + * Reason of change: registered_programmer_count does not exist, I >>>>> assume that a proper one is >>>>> + * now registered_master_count - I will check and confirm >>>>> + */ >>>>> + for (i = 0; i < registered_master_count; ++i) { >>>>> + int flash_idx = -1; >>>>> + /* LD_CHANGE_NOTE if (!ret || (flash_idx = >>>>> probe_flash(&registered_programmers[i], 0, *flashctx, 0)) != -1) { >>>>> + * >>>>> + * Reason of change: registered_programmers does not exist, >>>>> I assume that a proper one is >>>>> + * now registered_masters - I will check and confirm >>>>> + */ >>>>> + if (!ret || (flash_idx = >>>>> probe_flash(&registered_masters[i], 0, *flashctx, 0)) != -1) { >>>>> + ret = 0; >>>>> + /* We found one chip, now check that there is no >>>>> second match. */ >>>>> + /* LD_CHANGE_NOTE if >>>>> (probe_flash(&registered_programmers[i], flash_idx + 1, &second_flashctx, 0) >>>>> != -1) { >>>>> + * >>>>> + * Reason of change: registered_programmers does >>>>> not exist, I assume that a proper one is >>>>> + * now registered_masters - I will check and >>>>> confirm >>>>> + * >>>>> + */ >>>>> + if (probe_flash(&registered_masters[i], flash_idx + >>>>> 1, &second_flashctx, 0) != -1) { >>>>> + ret = 3; >>>>> + break; >>>>> + } >>>>> + } >>>>> + } >>>>> + if (ret) { >>>>> + free(*flashctx); >>>>> + *flashctx = NULL; >>>>> + } >>>>> + return ret; >>>>> +} >>>>> + >>>>> +/** >>>>> + * @brief Returns the size of the specified flash chip in bytes. >>>>> + * >>>>> + * @param flashctx The queried flash context. >>>>> + * @return Size of flash chip in bytes. >>>>> + */ >>>>> +size_t fl_flash_getsize(const fl_flashctx_t *const flashctx) >>>>> +{ >>>>> + return flashctx->chip->total_size << 10; >>>>> +} >>>>> + >>>>> +/** @private */ >>>>> +int erase_and_write_flash(struct flashctx *flash, uint8_t *oldcontents, >>>>> uint8_t *newcontents); >>>>> +/** @private */ >>>>> +/* LD_CHANGE_NOTE void emergency_help_message(void); >>>>> + * >>>>> + * Reason of change: This has been commented out as emergency_help_message >>>>> is static >>>> Maybe have some other method to indicate that the UI should display an >>>> emergency help message, maybe ret = 2. Same comment for the _write >>>> version, but that already has ret values for these. >>>> >>>>> + */ >>>>> +/** >>>>> + * @brief Erase the specified ROM chip. >>>>> + * >>>>> + * @param flashctx The context of the flash chip to erase. >>>>> + * @return 0 on success. >>>>> + */ >>>>> +int fl_flash_erase(fl_flashctx_t *const flashctx) >>>>> +{ >>>>> + const size_t flash_size = flashctx->chip->total_size * 1024; >>>>> + >>>>> + int ret = 0; >>>>> + >>>>> + uint8_t *const newcontents = malloc(flash_size); >>>>> + if (!newcontents) { >>>>> + msg_gerr("Out of memory!\n"); >>>>> + return 1; >>>>> + } >>>>> + uint8_t *const oldcontents = malloc(flash_size); >>>>> + if (!oldcontents) { >>>>> + msg_gerr("Out of memory!\n"); >>>>> + free(newcontents); >>>>> + return 1; >>>>> + } >>>>> + >>>>> + if (flashctx->chip->unlock) >>>>> + flashctx->chip->unlock(flashctx); >>>>> + >>>>> + /* Assume worst case for old contents: All bits are 0. */ >>>>> + memset(oldcontents, 0x00, flash_size); >>>>> + /* Assume best case for new contents: All bits should be 1. */ >>>>> + memset(newcontents, 0xff, flash_size); >>>>> + /* Side effect of the assumptions above: Default write action is >>>>> erase >>>>> + * because newcontents looks like a completely erased chip, and >>>>> + * oldcontents being completely 0x00 means we have to erase >>>>> everything >>>>> + * before we can write. >>>>> + */ >>>>> + >>>>> + if (erase_and_write_flash(flashctx, oldcontents, newcontents)) { >>>>> + /* FIXME: Do we really want the scary warning if erase >>>>> failed? >>>>> + * After all, after erase the chip is either blank or >>>>> partially >>>>> + * blank or it has the old contents. A blank chip won't >>>>> boot, >>>>> + * so if the user wanted erase and reboots afterwards, the >>>>> user >>>>> + * knows very well that booting won't work. >>>>> + */ >>>>> + /* LD_CHANGE_NOTE emergency_help_message(); >>>>> + * >>>>> + * Reason of change: This function is static >>>>> + */ >>>>> + ret = 1; >>>>> + } >>>>> + >>>>> + free(oldcontents); >>>>> + free(newcontents); >>>>> + return ret; >>>>> +} >>>>> + >>>>> +/** >>>>> + * @brief Free a flash context. >>>>> + * >>>>> + * @param flashctx Flash context to free. >>>>> + */ >>>>> +void fl_flash_release(fl_flashctx_t *const flashctx) >>>>> +{ >>>>> + free(flashctx); >>>>> +} >>>>> + >>>>> +/** @} */ /* end fl-flash */ >>>>> + >>>>> + >>>>> + >>>>> +/** >>>>> + * @defgroup fl-ops Operations >>>>> + * @{ >>>>> + */ >>>>> + >>>>> +/** >>>>> + * @brief Read the current image from the specified ROM chip. >>>>> + * >>>>> + * @param flashctx The context of the flash chip. >>>>> + * @param buffer Target buffer to write image to. >>>>> + * @param buffer_len Size of target buffer in bytes. >>>>> + * @return 0 on success, >>>>> + * 2 if buffer_len is to short for the flash chip's contents, >>>>> + * or 1 on any other failure. >>>>> + */ >>>>> +int fl_image_read(fl_flashctx_t *const flashctx, void *const buffer, const >>>>> size_t buffer_len) >>>>> +{ >>>>> + const size_t flash_size = flashctx->chip->total_size * 1024; >>>>> + >>>>> + int ret = 0; >>>>> + >>>>> + if (flashctx->chip->unlock) >>>>> + flashctx->chip->unlock(flashctx); >>>>> + >>>>> + msg_cinfo("Reading flash... "); >>>>> + if (flash_size > buffer_len) { >>>>> + msg_cerr("Buffer to short for this flash chip (%u < >>>>> %u).\n", >>>>> + (unsigned int)buffer_len, (unsigned >>>>> int)flash_size); >>>>> + ret = 2; >>>>> + goto _out; >>>>> + } >>>>> + if (!flashctx->chip->read) { >>>>> + msg_cerr("No read function available for this flash >>>>> chip.\n"); >>>>> + ret = 1; >>>>> + goto _out; >>>>> + } >>>>> + if (flashctx->chip->read(flashctx, buffer, 0, flash_size)) { >>>>> + msg_cerr("Read operation failed!\n"); >>>>> + ret = 1; >>>>> + goto _out; >>>>> + } >>>>> +_out: >>>>> + msg_cinfo("%s.\n", ret ? "FAILED" : "done"); >>>>> + return ret; >>>>> +} >>>>> + >>>>> +/** @private */ >>>>> +/* LD_CHANGE_NOTE void nonfatal_help_message(void); >>>>> + * >>>>> + * Reason of change: This function is static >>>>> + */ >>>>> +/** >>>>> + * @brief Write the specified image to the ROM chip. >>>>> + * >>>>> + * @param flashctx The context of the flash chip. >>>>> + * @param buffer Source buffer to read image from. >>>>> + * @param buffer_len Size of source buffer in bytes. >>>>> + * @return 0 on success, >>>>> + * 4 if buffer_len doesn't match the size of the flash chip, >>>>> + * 3 if write was tried, but nothing has changed, >>>>> + * 2 if write was tried, but flash contents changed, >>>>> + * or 1 on any other failure. >>>>> + */ >>>>> +int fl_image_write(fl_flashctx_t *const flashctx, void *const buffer, const >>>>> size_t buffer_len) >>>>> +{ >>>>> + const size_t flash_size = flashctx->chip->total_size * 1024; >>>>> + >>>>> + int ret = 0; >>>>> + >>>>> + if (buffer_len != flash_size) { >>>>> + msg_cerr("Buffer size doesn't match size of flash chip (%u >>>>> != %u)\n.", >>>>> + (unsigned int)buffer_len, (unsigned >>>>> int)flash_size); >>>>> + return 4; >>>>> + } >>>>> + >>>>> + uint8_t *const newcontents = buffer; >>>>> + uint8_t *const oldcontents = malloc(flash_size); >>>>> + if (!oldcontents) { >>>>> + msg_gerr("Out of memory!\n"); >>>>> + return 1; >>>>> + } >>>>> + if (fl_image_read(flashctx, oldcontents, flash_size)) { >>>>> + ret = 1; >>>>> + goto _free_out; >>>>> + } >>>>> + >>>>> + /* LD_CHANGE_NOTE handle_romentries(flashctx, oldcontents, >>>>> newcontents); >>>>> + * >>>>> + * Reason of change: This function does not exist. There is a need >>>>> to investigate what was >>>>> + * its purpose and how it can be replaced. >>>>> + */ >>>>> + >>>>> + if (erase_and_write_flash(flashctx, oldcontents, newcontents)) { >>>>> + msg_cerr("Uh oh. Erase/write failed. Checking if anything >>>>> changed.\n"); >>>>> + if (!flashctx->chip->read(flashctx, newcontents, 0, >>>>> flash_size)) { >>>>> + if (!memcmp(oldcontents, newcontents, flash_size)) >>>>> { >>>>> + msg_cinfo("Good. It seems nothing was >>>>> changed.\n"); >>>>> + /* LD_CHANGE_NOTE nonfatal_help_message(); >>>>> + * >>>>> + * Reason of change: This function is >>>>> static >>>>> + */ >>>>> + ret = 3; >>>>> + goto _free_out; >>>>> + } >>>>> + } >>>>> + /* LD_CHANGE_NOTE emergency_help_message(); >>>>> + * >>>>> + * Reason of change: This function is static >>>>> + */ >>>>> + ret = 2; >>>>> + goto _free_out; >>>>> + } >>>>> + >>>>> +_free_out: >>>>> + free(oldcontents); >>>>> + return ret; >>>>> +} >>>>> + >>>>> +/** @private */ >>>>> +/* LD_CHANGE_NOTE int compare_range(const uint8_t *wantbuf, const uint8_t >>>>> *havebuf, unsigned int start, unsigned int len); >>>>> + * >>>>> + * Reason of change: This function is static >>>> For any of these "this is static"... then make it not static or figure >>>> out a cleaner way of doing it, but yes i get this is an early patch. >>>> >>>>> + */ >>>>> +/** >>>>> + * @brief Verify the ROM chip's contents with the specified image. >>>>> + * >>>>> + * @param flashctx The context of the flash chip. >>>>> + * @param buffer Source buffer to verify with. >>>>> + * @param buffer_len Size of source buffer in bytes. >>>>> + * @return 0 on success, >>>>> + * 2 if buffer_len doesn't match the size of the flash chip, >>>>> + * or 1 on any other failure. >>>>> + */ >>>>> +int fl_image_verify(fl_flashctx_t *const flashctx, void *const buffer, >>>>> const size_t buffer_len) >>>>> +{ >>>>> + const size_t flash_size = flashctx->chip->total_size * 1024; >>>>> + >>>>> + int ret = 0; >>>>> + >>>>> + if (buffer_len != flash_size) { >>>>> + msg_cerr("Buffer size doesn't match size of flash chip (%u >>>>> != %u)\n.", >>>>> + (unsigned int)buffer_len, (unsigned >>>>> int)flash_size); >>>>> + return 2; >>>>> + } >>>>> + >>>>> + /* LD_CHANGE_NOTE uint8_t *const newcontents = buffer; - used only >>>>> in handle_romentries() function >>>>> + * >>>>> + * Reason of change: This pointer is used only in handle_romentries >>>>> function, which has been >>>>> + * commented out >>>>> + */ >>>>> + uint8_t *const oldcontents = malloc(flash_size); >>>>> + if (!oldcontents) { >>>>> + msg_gerr("Out of memory!\n"); >>>>> + return 1; >>>>> + } >>>>> + if (fl_image_read(flashctx, oldcontents, flash_size)) { >>>>> + ret = 1; >>>>> + goto _free_out; >>>>> + } >>>>> + >>>>> + /* LD_CHANGE_NOTE handle_romentries(flashctx, oldcontents, >>>>> newcontents); >>>>> + * >>>>> + * Reason of change: This function does not exist >>>>> + */ >>>>> + >>>>> + msg_cinfo("Verifying flash... "); >>>>> + >>>>> + /* LD_CHANGE_NOTE ret = compare_range(newcontents, oldcontents, 0, >>>>> flash_size); >>>>> + * >>>>> + * Reason of change: This function is static. For now replaced with >>>>> ret = 1 as ret must be used >>>>> + */ >>>>> + ret = 1; >>>>> + if (!ret) >>>>> + msg_cinfo("VERIFIED.\n"); >>>>> + >>>>> +_free_out: >>>>> + free(oldcontents); >>>>> + return ret; >>>>> +} >>>>> + >>>>> +/** @} */ /* end fl-ops */ >>>>> Index: libflashrom.h >>>>> =================================================================== >>>>> --- libflashrom.h (revision 0) >>>>> +++ libflashrom.h (working copy) >>>>> @@ -0,0 +1,97 @@ >>>>> +/* >>>>> + * This file is part of the flashrom project. >>>>> + * >>>>> + * Copyright (C) 2012 secunet Security Networks AG >>>>> + * (Written by Nico Huber <nico.huber(a)secunet.com> for secunet) >>>>> + * >>>>> + * 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. >>>>> + * >>>>> + * You should have received a copy of the GNU General Public License >>>>> + * along with this program; if not, write to the Free Software >>>>> + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 >>>>> USA >>>>> + */ >>>>> + >>>>> +#ifndef __LIBFLASHROM_H__ >>>>> +#define __LIBFLASHROM_H__ 1 >>>>> + >>>>> +#include <stdarg.h> >>>>> + >>>>> +int fl_init(int perform_selfcheck); >>>>> +int fl_shutdown(void); >>>>> +/** @ingroup fl-general */ >>>>> +typedef enum { /* This has to match enum msglevel. */ >>>> Maybe you could just bring enum msglevel here from flash.h... >>>> or have some other header for this printing stuff thats >>>> used by both libflashrom.h and other parts of flashrom. >>>> >>>>> + FL_MSG_ERROR = 0, >>>>> + FL_MSG_INFO = 1, >>>>> + FL_MSG_DEBUG = 2, >>>>> + FL_MSG_DEBUG2 = 3, >>>>> + FL_MSG_SPEW = 4, >>>>> +} fl_log_level_t; >>>>> +/** @ingroup fl-general */ >>>>> +typedef int(fl_log_callback_t)(fl_log_level_t, const char *format, >>>>> va_list); >>>>> +void fl_set_log_callback(fl_log_callback_t *); >>>>> + >>>>> +typedef enum { >>>>> + FL_TESTED_OK = 0, >>>>> + FL_TESTED_NT = 1, >>>>> + FL_TESTED_BAD = 2, >>>>> + FL_TESTED_DEP = 3, >>>>> + FL_TESTED_NA = 4, >>>>> +} fl_test_state; >>>>> + >>>>> +typedef struct { >>>>> + const char *vendor; >>>>> + const char *name; >>>>> + unsigned int total_size; >>>>> + >>>>> + struct fl_tested { >>>>> + fl_test_state probe; >>>>> + fl_test_state read; >>>>> + fl_test_state erase; >>>>> + fl_test_state write; >>>>> + } tested; >>>>> +} fl_flashchip_info_t; >>>>> + >>>>> +typedef struct { >>>>> + const char *vendor; >>>>> + const char *name; >>>>> + fl_test_state working; >>>>> +} fl_board_info_t; >>>>> + >>>>> +typedef struct { >>>>> + const char *vendor; >>>>> + const char *chipset; >>>>> + fl_test_state status; >>>>> +} fl_chipset_info_t; >>>>> + >>>>> +int fl_supported_programmers(const char **supported_programmers); >>>>> +int fl_supported_flash_chips(fl_flashchip_info_t *fchips); >>>>> +int fl_supported_boards(fl_board_info_t *boards); >>>>> +int fl_supported_chipsets(fl_chipset_info_t *chipsets); >>>>> +int fl_supported_programmers_number(); >>>>> +int fl_supported_flash_chips_number(); >>>>> +int fl_supported_boards_number(); >>>>> +int fl_supported_chipsets_number(); >>>>> + >>>>> +int fl_programmer_init(const char *prog_name, const char *prog_params); >>>>> +int fl_programmer_shutdown(void); >>>>> + >>>>> +struct flashctx; >>>>> +typedef struct flashctx fl_flashctx_t; >>>>> +int fl_flash_probe(fl_flashctx_t **, const char *chip_name); >>>>> +size_t fl_flash_getsize(const fl_flashctx_t *); >>>>> +int fl_flash_erase(fl_flashctx_t *); >>>>> +void fl_flash_release(fl_flashctx_t *); >>>>> + >>>>> +int fl_image_read(fl_flashctx_t *, void *buffer, size_t buffer_len); >>>>> +int fl_image_write(fl_flashctx_t *, void *buffer, size_t buffer_len); >>>>> +int fl_image_verify(fl_flashctx_t *, void *buffer, size_t buffer_len); >>>>> + >>>>> +#endif /* !__LIBFLASHROM_H__ */ >>>>> >>>>> _______________________________________________ >>>>> flashrom mailing list >>>>> flashrom(a)flashrom.org >>>>> http://www.flashrom.org/mailman/listinfo/flashrom >>>> >>>> -- >>>> Urja Rannikko >>>> >>>> _______________________________________________ >>>> flashrom mailing list >>>> flashrom(a)flashrom.org >>>> http://www.flashrom.org/mailman/listinfo/flashrom

1 0

Re: [flashrom] Libflashrom draft patch - initial review
by Антон Кочков 19 Jun '15

19 Jun '15

Sorry again, that was old tree, I will rearrange patches and will push updated version in a hour or so. Best regards, Anton Kochkov. On Fri, Jun 19, 2015 at 2:50 PM, Антон Кочков <anton.kochkov(a)gmail.com> wrote: > Uh, forgot to add, that loading layout will be quite useful too, in the API and > adding romentry_t* argument for all fl_image_* functions. > Best regards, > Anton Kochkov. > > > On Fri, Jun 19, 2015 at 2:43 PM, Антон Кочков <anton.kochkov(a)gmail.com> wrote: >> Hi! >> I've done also some rebasing of the libflashrom patches before (on top >> of the layout branch from the stefanct) >> https://github.com/XVilka/flashrom/commits/libflashrom >> >> May be you'll find something useful here. >> Best regards, >> Anton Kochkov. >> >> >> On Thu, Jun 18, 2015 at 7:45 AM, Urja Rannikko <urjaman(a)gmail.com> wrote: >>> Hi, >>> >>> >>> On Fri, Jun 12, 2015 at 12:26 AM, Łukasz Dmitrowski >>> <lukasz.dmitrowski(a)gmail.com> wrote: >>>> Hello, >>>> >>>> My name is Łukasz Dmitrowski and I am one of coreboot/flashrom GSoC students >>>> this year. You can read about my project here: >>>> http://blogs.coreboot.org/blog/author/dmitro/. >>>> >>>> One of my first steps is updating and extending Nico Hubers libflashrom >>>> patch. Work is still in progress, but some changes are already made, so I >>>> thought that it will be good idea to send a patch just for review to know if >>>> I am going in a good direction. I want to improve my skills and provide best >>>> code quality as I can, so I am open for criticism - I am here to learn :) >>>> >>> I'm here essentially trying out reviewing stuff, so expect more from >>> somebody a bit more experienced, but I heard my comments would be >>> useful, so moving on :) >>> >>>> Patch summary: >>>> >>> First thing i have to say about the patch is that it has been >>> malformed, most likely line wrapped by your email client. If you cant >>> properly include the patch inline, attaching a .patch would be okay. >>> (Also turn off that HTML output if you can... although it wasnt used >>> for anything, but still.). So I didnt do any compile testing on this >>> stuff because of this. >>> >>>> Makefile: I added cli_common.o and print.o to LIB_OBJS - it solves undefined >>>> references in current libflashrom version, but spoils standard flashrom >>>> build with 'make', I did not investigated it yet as my focus is to extend >>>> library with new functions and update already existing, need to discuss it >>>> with my mentor >>>> >>>> cli_classic.c, cli_output.c, flash.h: Only Nico Hubers changes here, didn't >>>> touch it >>> I might comment on any part of the patch because I havent reviewed the >>> original and it's only about the code. >>> >>>> >>>> libflashrom.c, libflashrom.h: I added 8 functions and made a few changes to >>>> existing ones, as some of used functions are static, or does not exist. >>>> >>>> New functions: >>>> >>>> int fl_supported_programmers(const char **supported_programmers); >>>> int fl_supported_flash_chips(fl_flashchip_info_t *fchips); >>>> int fl_supported_boards(fl_board_info_t *boards); >>>> int fl_supported_chipsets(fl_chipset_info_t *chipsets); >>>> int fl_supported_programmers_number(); >>>> int fl_supported_flash_chips_number(); >>>> int fl_supported_boards_number(); >>>> int fl_supported_chipsets_number(); >>>> >>>> New types: >>>> fl_flashchip_info_t - smaller version of struct flashchip >>>> fl_board_info_t - smaller version of struct board_info >>>> fl_chipset_info_t - smaller version of struct penable >>>> fl_test_state - copy of enum test_state >>>> >>>> So we have 4 functions that return a list of supported programmers, chips, >>>> boards and chipsets. Next 4 functions return number of supported hardware of >>>> certain type. For example, to obtain a list of supported boards, you can >>>> create an array of structures fl_board_info of suitable size (the size is >>>> known - fl_supported_boards_number()), then pass it to >>>> fl_supported_boards(fl_board_info_t *boards) and you will have it filled >>>> with data. >>> My opinion is that the _number functions make the API unnecessarily >>> complex to use. >>> I'm suggesting like this: >>> fl_flashchip_info_t * fl_supported_flash_chips(void); >>> Have the call allocate the table using a not specified allocator >>> (really just malloc for now, but we're not telling), and freed with a >>> function like >>> int fl_support_info_free(void*p); >>> This would allow implementation using const tables or allocation, >>> whatever we like. >>> (if (p == const_table) return 0; in our _free() if mixed.) >>> >>>> >>>> Regarding changes in Nico Hubers functions: I made temporary comments for >>>> every change and marked it with LD_CHANGE_NOTE. Every comment contains >>>> previous code and reason why it has been commented out. >>>> >>>> Thanks in advance for your insights! >>>> >>>> Regards, >>>> Lukasz Dmitrowski >>>> >>>> --- >>>> >>>> Signed-off-by: Łukasz Dmitrowski <lukasz.dmitrowski(a)gmail.com> >>>> >>>> Index: Makefile >>>> =================================================================== >>>> --- Makefile (revision 1891) >>>> +++ Makefile (working copy) >>>> @@ -374,7 +374,7 @@ >>>> >>>> ############################################################################### >>>> # Library code. >>>> >>>> -LIB_OBJS = layout.o flashrom.o udelay.o programmer.o helpers.o >>>> +LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o >>>> helpers.o cli_common.o print.o >>>> >>>> >>>> ############################################################################### >>>> # Frontend related stuff. >>>> Index: cli_classic.c >>>> =================================================================== >>>> --- cli_classic.c (revision 1891) >>>> +++ cli_classic.c (working copy) >>>> @@ -30,6 +30,7 @@ >>>> #include "flash.h" >>>> #include "flashchips.h" >>>> #include "programmer.h" >>>> +#include "libflashrom.h" >>>> >>>> static void cli_classic_usage(const char *name) >>>> { >>>> @@ -135,6 +136,8 @@ >>>> char *tempstr = NULL; >>>> char *pparam = NULL; >>>> >>>> + fl_set_log_callback((fl_log_callback_t *)&fl_print_cb); >>>> + >>>> print_version(); >>>> print_banner(); >>>> >>>> Index: cli_output.c >>>> =================================================================== >>>> --- cli_output.c (revision 1891) >>>> +++ cli_output.c (working copy) >>>> @@ -71,9 +71,8 @@ >>>> #endif /* !STANDALONE */ >>>> >>>> /* Please note that level is the verbosity, not the importance of the >>>> message. */ >>>> -int print(enum msglevel level, const char *fmt, ...) >>>> +int fl_print_cb(enum msglevel level, const char *fmt, va_list ap) >>>> { >>>> - va_list ap; >>>> int ret = 0; >>>> FILE *output_type = stdout; >>>> >>>> @@ -81,9 +80,7 @@ >>>> output_type = stderr; >>>> >>>> if (level <= verbose_screen) { >>>> - va_start(ap, fmt); >>>> ret = vfprintf(output_type, fmt, ap); >>>> - va_end(ap); >>>> /* msg_*spew often happens inside chip accessors in possibly >>>> * time-critical operations. Don't slow them down by flushing. */ >>>> if (level != MSG_SPEW) >>>> @@ -91,9 +88,7 @@ >>>> } >>>> #ifndef STANDALONE >>>> if ((level <= verbose_logfile) && logfile) { >>>> - va_start(ap, fmt); >>>> ret = vfprintf(logfile, fmt, ap); >>>> - va_end(ap); >>>> if (level != MSG_SPEW) >>>> fflush(logfile); >>>> } >>>> Index: flash.h >>>> =================================================================== >>>> --- flash.h (revision 1891) >>>> +++ flash.h (working copy) >>>> @@ -31,6 +31,7 @@ >>>> #include <stdint.h> >>>> #include <stddef.h> >>>> #include <stdbool.h> >>>> +#include <stdarg.h> >>>> #if IS_WINDOWS >>>> #include <windows.h> >>>> #undef min >>>> @@ -317,6 +318,7 @@ >>>> MSG_DEBUG2 = 4, >>>> MSG_SPEW = 5, >>>> }; >>>> +int fl_print_cb(enum msglevel level, const char *fmt, va_list ap); >>>> /* Let gcc and clang check for correct printf-style format strings. */ >>>> int print(enum msglevel level, const char *fmt, ...) >>>> #ifdef __MINGW32__ >>>> Index: libflashrom.c >>>> =================================================================== >>>> --- libflashrom.c (revision 0) >>>> +++ libflashrom.c (working copy) >>>> @@ -0,0 +1,603 @@ >>>> +/* >>>> + * This file is part of the flashrom project. >>>> + * >>>> + * Copyright (C) 2012 secunet Security Networks AG >>>> + * (Written by Nico Huber <nico.huber(a)secunet.com> for secunet) >>>> + * >>>> + * 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. >>>> + * >>>> + * You should have received a copy of the GNU General Public License >>>> + * along with this program; if not, write to the Free Software >>>> + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 >>>> USA >>>> + */ >>>> +/** >>>> + * @mainpage >>>> + * >>>> + * Have a look at the Modules section for a function reference. >>>> + */ >>>> + >>>> +#include <stdlib.h> >>>> +#include <string.h> >>>> +#include <stdarg.h> >>>> + >>>> +#include "flash.h" >>>> +#include "programmer.h" >>>> +#include "libflashrom.h" >>>> + >>>> +/** >>>> + * @defgroup fl-general General >>>> + * @{ >>>> + */ >>>> + >>>> +/** Pointer to log callback function. */ >>>> +static fl_log_callback_t *fl_log_callback = NULL; >>>> + >>>> +/** >>>> + * @brief Initialize libflashrom. >>>> + * >>>> + * @param perform_selfcheck If not zero, perform a self check. >>>> + * @return 0 on success >>>> + */ >>>> +int fl_init(const int perform_selfcheck) >>>> +{ >>>> + if (perform_selfcheck && selfcheck()) >>>> + return 1; >>>> + myusec_calibrate_delay(); >>>> + return 0; >>>> +} >>>> + >>>> +/** >>>> + * @brief Shut down libflashrom. >>>> + * @return 0 on success >>>> + */ >>>> +int fl_shutdown(void) >>>> +{ >>>> + return 0; /* TODO: nothing to do? */ >>> I'm pretty sure there is, but need to investigate more. >>> >>>> +} >>>> + >>>> +/* TODO: fl_set_loglevel()? do we need it? >>>> + For now, let the user decide in his callback. */ >>>> + >>>> +/** >>>> + * @brief Set the log callback function. >>>> + * >>>> + * Set a callback function which will be invoked whenever libflashrom wants >>>> + * to output messages. This allows frontends to do whatever they see fit >>>> with >>>> + * such messages, e.g. write them to syslog, or to file, or print them in a >>>> + * GUI window, etc. >>>> + * >>>> + * @param log_callback Pointer to the new log callback function. >>>> + */ >>>> +void fl_set_log_callback(fl_log_callback_t *const log_callback) >>>> +{ >>>> + fl_log_callback = log_callback; >>>> +} >>>> +/** @private */ >>>> +int print(const enum msglevel level, const char *const fmt, ...) >>>> +{ >>>> + if (fl_log_callback) { >>>> + int ret; >>>> + va_list args; >>>> + va_start(args, fmt); >>>> + ret = fl_log_callback(level, fmt, args); >>>> + va_end(args); >>>> + return ret; >>>> + } >>>> + return 0; >>>> +} >>>> + >>>> +/** @} */ /* end fl-general */ >>>> + >>>> + >>>> + >>>> +/** >>>> + * @defgroup fl-query Querying >>>> + * @{ >>>> + */ >>>> + >>>> +int fl_supported_programmers(const char **supported_programmers) >>>> +{ >>>> + int ret = 0; >>>> + enum programmer p = 0; >>>> + >>>> + if (supported_programmers != NULL) { >>>> + for (; p < PROGRAMMER_INVALID; ++p) >>>> + supported_programmers[p] = >>>> programmer_table[p].name; >>>> + } else { >>>> + ret = 1; >>>> + } >>>> + >>>> + return ret; >>>> +} >>>> + >>>> +int fl_supported_programmers_number() >>>> +{ >>>> + return PROGRAMMER_INVALID; >>>> +} >>>> + >>>> +int fl_supported_flash_chips(fl_flashchip_info_t *fchips) >>>> +{ >>>> + int ret = 0; >>>> + int i = 0; >>>> + >>>> + if (fchips != NULL) { >>>> + for (; i < flashchips_size; ++i) { >>>> + fchips[i].vendor = flashchips[i].vendor; >>>> + fchips[i].name = flashchips[i].name; >>>> + fchips[i].tested.erase = >>>> flashchips[i].tested.erase; >>>> + fchips[i].tested.probe = >>>> flashchips[i].tested.probe; >>>> + fchips[i].tested.read = flashchips[i].tested.read; >>>> + fchips[i].tested.write = >>>> flashchips[i].tested.write; >>>> + fchips[i].total_size = flashchips[i].total_size; >>>> + } >>>> + } else { >>>> + ret = 1; >>>> + } >>>> + >>>> + return ret; >>>> +} >>>> + >>>> +int fl_supported_flash_chips_number() >>>> +{ >>>> + return flashchips_size; >>>> +} >>>> + >>>> +int fl_supported_boards(fl_board_info_t *boards) >>>> +{ >>>> + int ret = 0; >>>> + const struct board_info *binfo = boards_known; >>>> + >>>> + if (boards != NULL) { >>>> + while (binfo->vendor != NULL) { >>>> + boards->vendor = binfo->vendor; >>>> + boards->name = binfo->name; >>>> + boards->working = binfo->working; >>>> + ++binfo; >>>> + ++boards; >>>> + } >>>> + } else { >>>> + ret = 1; >>>> + } >>>> + >>>> + return ret; >>>> +} >>>> + >>>> +int fl_supported_boards_number() >>>> +{ >>>> + int boards_number = 0; >>>> + const struct board_info *binfo = boards_known; >>>> + >>>> + while (binfo->vendor != NULL) { >>>> + ++boards_number; >>>> + ++binfo; >>>> + } >>>> + >>>> + return boards_number; >>>> +} >>>> + >>>> +int fl_supported_chipsets(fl_chipset_info_t *chipsets) >>>> +{ >>>> + int ret = 0; >>>> + const struct penable *chipset = chipset_enables; >>>> + >>>> + if (chipsets != NULL) { >>>> + while (chipset->vendor_name != NULL) { >>>> + chipsets->vendor = chipset->vendor_name; >>>> + chipsets->chipset = chipset->device_name; >>>> + chipsets->status = chipset->status; >>>> + ++chipset; >>>> + ++chipsets; >>> These names are confusing (just FYI), i first thought we're counting >>> chipsets here.. >>>> + } >>>> + } else { >>>> + return ret; >>>> + } >>>> + >>>> + return ret; >>>> +} >>>> + >>>> +int fl_supported_chipsets_number() >>>> +{ >>>> + int chipsets_number = 0; >>>> + const struct penable *chipset = chipset_enables; >>>> + >>>> + while (chipset->vendor_name != NULL) { >>>> + ++chipsets_number; >>>> + ++chipset; >>>> + } >>>> + >>>> + return chipsets_number; >>>> +} >>>> + >>>> +/** @} */ /* end fl-query */ >>>> + >>>> + >>>> + >>>> +/** >>>> + * @defgroup fl-prog Programmers >>>> + * @{ >>>> + */ >>>> + >>>> +/** >>>> + * @brief Initialize the specified programmer. >>>> + * >>>> + * @param prog_name Name of the programmer to initialize. >>>> + * @param prog_param Pointer to programmer specific parameters. >>>> + * @return 0 on success >>>> + */ >>>> +int fl_programmer_init(const char *const prog_name, const char *const >>>> prog_param) >>>> +{ >>>> + unsigned prog; >>>> + >>>> + for (prog = 0; prog < PROGRAMMER_INVALID; prog++) { >>>> + if (strcmp(prog_name, programmer_table[prog].name) == 0) >>>> + break; >>>> + } >>>> + if (prog >= PROGRAMMER_INVALID) { >>>> + msg_ginfo("Error: Unknown programmer \"%s\". Valid choices >>>> are:\n", prog_name); >>>> + list_programmers_linebreak(0, 80, 0); >>>> + return 1; >>>> + } >>>> + return programmer_init(prog, prog_param); >>>> +} >>>> + >>>> +/** >>>> + * @brief Shut down the initialized programmer. >>>> + * >>>> + * @return 0 on success >>>> + */ >>>> +int fl_programmer_shutdown(void) >>>> +{ >>>> + return programmer_shutdown(); >>>> +} >>>> + >>>> +/* TODO: fl_programmer_capabilities()? */ >>>> + >>>> +/** @} */ /* end fl-prog */ >>>> + >>>> + >>>> + >>>> +/** >>>> + * @defgroup fl-flash Flash chips >>>> + * @{ >>>> + */ >>>> + >>>> +/** >>>> + * @brief Probe for a flash chip. >>>> + * >>>> + * Probes for a flash chip and returns a flash context, that can be used >>>> + * later with flash chip and @ref fl-ops "image operations", if exactly one >>>> + * matching chip is found. >>>> + * >>>> + * @param[out] flashctx Points to a pointer of type fl_flashctx_t that will >>>> + * be set if exactly one chip is found. *flashctx has >>>> + * to be freed by the caller with @ref >>>> fl_flash_release. >>>> + * @param[in] chip_name Name of a chip to probe for, or NULL to probe for >>>> + * all known chips. >>>> + * @return 0 on success, >>>> + * 3 if multiple chips were found, >>>> + * 2 if no chip was found, >>>> + * or 1 on any other error. >>>> + */ >>> Need a way to output multiple flash chips from here, it shouldnt be an >>> error, just a >>> "pick from these" dialog and continue with "OK", or something like that. >>> Maybe add int *chip_count as a parameter and the set pointer will >>> point to an array of flashctx with the int set to the count of found >>> chips. >>> (Hopefully I'm not saying totally obvious stuff here...) >>> >>>> +int fl_flash_probe(fl_flashctx_t **const flashctx, const char *const >>>> chip_name) >>>> +{ >>>> + int i, ret = 2; >>>> + fl_flashctx_t second_flashctx = { 0, }; >>>> + >>>> + chip_to_probe = chip_name; /* chip_to_probe is global in flashrom.c >>>> */ >>>> + >>>> + *flashctx = malloc(sizeof(**flashctx)); >>>> + if (!*flashctx) >>>> + return 1; >>>> + memset(*flashctx, 0, sizeof(**flashctx)); >>>> + >>>> + /* LD_CHANGE_NOTE for (i = 0; i < registered_programmer_count; ++i) >>>> { >>>> + * >>>> + * Reason of change: registered_programmer_count does not exist, I >>>> assume that a proper one is >>>> + * now registered_master_count - I will check and confirm >>>> + */ >>>> + for (i = 0; i < registered_master_count; ++i) { >>>> + int flash_idx = -1; >>>> + /* LD_CHANGE_NOTE if (!ret || (flash_idx = >>>> probe_flash(&registered_programmers[i], 0, *flashctx, 0)) != -1) { >>>> + * >>>> + * Reason of change: registered_programmers does not exist, >>>> I assume that a proper one is >>>> + * now registered_masters - I will check and confirm >>>> + */ >>>> + if (!ret || (flash_idx = >>>> probe_flash(&registered_masters[i], 0, *flashctx, 0)) != -1) { >>>> + ret = 0; >>>> + /* We found one chip, now check that there is no >>>> second match. */ >>>> + /* LD_CHANGE_NOTE if >>>> (probe_flash(&registered_programmers[i], flash_idx + 1, &second_flashctx, 0) >>>> != -1) { >>>> + * >>>> + * Reason of change: registered_programmers does >>>> not exist, I assume that a proper one is >>>> + * now registered_masters - I will check and >>>> confirm >>>> + * >>>> + */ >>>> + if (probe_flash(&registered_masters[i], flash_idx + >>>> 1, &second_flashctx, 0) != -1) { >>>> + ret = 3; >>>> + break; >>>> + } >>>> + } >>>> + } >>>> + if (ret) { >>>> + free(*flashctx); >>>> + *flashctx = NULL; >>>> + } >>>> + return ret; >>>> +} >>>> + >>>> +/** >>>> + * @brief Returns the size of the specified flash chip in bytes. >>>> + * >>>> + * @param flashctx The queried flash context. >>>> + * @return Size of flash chip in bytes. >>>> + */ >>>> +size_t fl_flash_getsize(const fl_flashctx_t *const flashctx) >>>> +{ >>>> + return flashctx->chip->total_size << 10; >>>> +} >>>> + >>>> +/** @private */ >>>> +int erase_and_write_flash(struct flashctx *flash, uint8_t *oldcontents, >>>> uint8_t *newcontents); >>>> +/** @private */ >>>> +/* LD_CHANGE_NOTE void emergency_help_message(void); >>>> + * >>>> + * Reason of change: This has been commented out as emergency_help_message >>>> is static >>> Maybe have some other method to indicate that the UI should display an >>> emergency help message, maybe ret = 2. Same comment for the _write >>> version, but that already has ret values for these. >>> >>>> + */ >>>> +/** >>>> + * @brief Erase the specified ROM chip. >>>> + * >>>> + * @param flashctx The context of the flash chip to erase. >>>> + * @return 0 on success. >>>> + */ >>>> +int fl_flash_erase(fl_flashctx_t *const flashctx) >>>> +{ >>>> + const size_t flash_size = flashctx->chip->total_size * 1024; >>>> + >>>> + int ret = 0; >>>> + >>>> + uint8_t *const newcontents = malloc(flash_size); >>>> + if (!newcontents) { >>>> + msg_gerr("Out of memory!\n"); >>>> + return 1; >>>> + } >>>> + uint8_t *const oldcontents = malloc(flash_size); >>>> + if (!oldcontents) { >>>> + msg_gerr("Out of memory!\n"); >>>> + free(newcontents); >>>> + return 1; >>>> + } >>>> + >>>> + if (flashctx->chip->unlock) >>>> + flashctx->chip->unlock(flashctx); >>>> + >>>> + /* Assume worst case for old contents: All bits are 0. */ >>>> + memset(oldcontents, 0x00, flash_size); >>>> + /* Assume best case for new contents: All bits should be 1. */ >>>> + memset(newcontents, 0xff, flash_size); >>>> + /* Side effect of the assumptions above: Default write action is >>>> erase >>>> + * because newcontents looks like a completely erased chip, and >>>> + * oldcontents being completely 0x00 means we have to erase >>>> everything >>>> + * before we can write. >>>> + */ >>>> + >>>> + if (erase_and_write_flash(flashctx, oldcontents, newcontents)) { >>>> + /* FIXME: Do we really want the scary warning if erase >>>> failed? >>>> + * After all, after erase the chip is either blank or >>>> partially >>>> + * blank or it has the old contents. A blank chip won't >>>> boot, >>>> + * so if the user wanted erase and reboots afterwards, the >>>> user >>>> + * knows very well that booting won't work. >>>> + */ >>>> + /* LD_CHANGE_NOTE emergency_help_message(); >>>> + * >>>> + * Reason of change: This function is static >>>> + */ >>>> + ret = 1; >>>> + } >>>> + >>>> + free(oldcontents); >>>> + free(newcontents); >>>> + return ret; >>>> +} >>>> + >>>> +/** >>>> + * @brief Free a flash context. >>>> + * >>>> + * @param flashctx Flash context to free. >>>> + */ >>>> +void fl_flash_release(fl_flashctx_t *const flashctx) >>>> +{ >>>> + free(flashctx); >>>> +} >>>> + >>>> +/** @} */ /* end fl-flash */ >>>> + >>>> + >>>> + >>>> +/** >>>> + * @defgroup fl-ops Operations >>>> + * @{ >>>> + */ >>>> + >>>> +/** >>>> + * @brief Read the current image from the specified ROM chip. >>>> + * >>>> + * @param flashctx The context of the flash chip. >>>> + * @param buffer Target buffer to write image to. >>>> + * @param buffer_len Size of target buffer in bytes. >>>> + * @return 0 on success, >>>> + * 2 if buffer_len is to short for the flash chip's contents, >>>> + * or 1 on any other failure. >>>> + */ >>>> +int fl_image_read(fl_flashctx_t *const flashctx, void *const buffer, const >>>> size_t buffer_len) >>>> +{ >>>> + const size_t flash_size = flashctx->chip->total_size * 1024; >>>> + >>>> + int ret = 0; >>>> + >>>> + if (flashctx->chip->unlock) >>>> + flashctx->chip->unlock(flashctx); >>>> + >>>> + msg_cinfo("Reading flash... "); >>>> + if (flash_size > buffer_len) { >>>> + msg_cerr("Buffer to short for this flash chip (%u < >>>> %u).\n", >>>> + (unsigned int)buffer_len, (unsigned >>>> int)flash_size); >>>> + ret = 2; >>>> + goto _out; >>>> + } >>>> + if (!flashctx->chip->read) { >>>> + msg_cerr("No read function available for this flash >>>> chip.\n"); >>>> + ret = 1; >>>> + goto _out; >>>> + } >>>> + if (flashctx->chip->read(flashctx, buffer, 0, flash_size)) { >>>> + msg_cerr("Read operation failed!\n"); >>>> + ret = 1; >>>> + goto _out; >>>> + } >>>> +_out: >>>> + msg_cinfo("%s.\n", ret ? "FAILED" : "done"); >>>> + return ret; >>>> +} >>>> + >>>> +/** @private */ >>>> +/* LD_CHANGE_NOTE void nonfatal_help_message(void); >>>> + * >>>> + * Reason of change: This function is static >>>> + */ >>>> +/** >>>> + * @brief Write the specified image to the ROM chip. >>>> + * >>>> + * @param flashctx The context of the flash chip. >>>> + * @param buffer Source buffer to read image from. >>>> + * @param buffer_len Size of source buffer in bytes. >>>> + * @return 0 on success, >>>> + * 4 if buffer_len doesn't match the size of the flash chip, >>>> + * 3 if write was tried, but nothing has changed, >>>> + * 2 if write was tried, but flash contents changed, >>>> + * or 1 on any other failure. >>>> + */ >>>> +int fl_image_write(fl_flashctx_t *const flashctx, void *const buffer, const >>>> size_t buffer_len) >>>> +{ >>>> + const size_t flash_size = flashctx->chip->total_size * 1024; >>>> + >>>> + int ret = 0; >>>> + >>>> + if (buffer_len != flash_size) { >>>> + msg_cerr("Buffer size doesn't match size of flash chip (%u >>>> != %u)\n.", >>>> + (unsigned int)buffer_len, (unsigned >>>> int)flash_size); >>>> + return 4; >>>> + } >>>> + >>>> + uint8_t *const newcontents = buffer; >>>> + uint8_t *const oldcontents = malloc(flash_size); >>>> + if (!oldcontents) { >>>> + msg_gerr("Out of memory!\n"); >>>> + return 1; >>>> + } >>>> + if (fl_image_read(flashctx, oldcontents, flash_size)) { >>>> + ret = 1; >>>> + goto _free_out; >>>> + } >>>> + >>>> + /* LD_CHANGE_NOTE handle_romentries(flashctx, oldcontents, >>>> newcontents); >>>> + * >>>> + * Reason of change: This function does not exist. There is a need >>>> to investigate what was >>>> + * its purpose and how it can be replaced. >>>> + */ >>>> + >>>> + if (erase_and_write_flash(flashctx, oldcontents, newcontents)) { >>>> + msg_cerr("Uh oh. Erase/write failed. Checking if anything >>>> changed.\n"); >>>> + if (!flashctx->chip->read(flashctx, newcontents, 0, >>>> flash_size)) { >>>> + if (!memcmp(oldcontents, newcontents, flash_size)) >>>> { >>>> + msg_cinfo("Good. It seems nothing was >>>> changed.\n"); >>>> + /* LD_CHANGE_NOTE nonfatal_help_message(); >>>> + * >>>> + * Reason of change: This function is >>>> static >>>> + */ >>>> + ret = 3; >>>> + goto _free_out; >>>> + } >>>> + } >>>> + /* LD_CHANGE_NOTE emergency_help_message(); >>>> + * >>>> + * Reason of change: This function is static >>>> + */ >>>> + ret = 2; >>>> + goto _free_out; >>>> + } >>>> + >>>> +_free_out: >>>> + free(oldcontents); >>>> + return ret; >>>> +} >>>> + >>>> +/** @private */ >>>> +/* LD_CHANGE_NOTE int compare_range(const uint8_t *wantbuf, const uint8_t >>>> *havebuf, unsigned int start, unsigned int len); >>>> + * >>>> + * Reason of change: This function is static >>> For any of these "this is static"... then make it not static or figure >>> out a cleaner way of doing it, but yes i get this is an early patch. >>> >>>> + */ >>>> +/** >>>> + * @brief Verify the ROM chip's contents with the specified image. >>>> + * >>>> + * @param flashctx The context of the flash chip. >>>> + * @param buffer Source buffer to verify with. >>>> + * @param buffer_len Size of source buffer in bytes. >>>> + * @return 0 on success, >>>> + * 2 if buffer_len doesn't match the size of the flash chip, >>>> + * or 1 on any other failure. >>>> + */ >>>> +int fl_image_verify(fl_flashctx_t *const flashctx, void *const buffer, >>>> const size_t buffer_len) >>>> +{ >>>> + const size_t flash_size = flashctx->chip->total_size * 1024; >>>> + >>>> + int ret = 0; >>>> + >>>> + if (buffer_len != flash_size) { >>>> + msg_cerr("Buffer size doesn't match size of flash chip (%u >>>> != %u)\n.", >>>> + (unsigned int)buffer_len, (unsigned >>>> int)flash_size); >>>> + return 2; >>>> + } >>>> + >>>> + /* LD_CHANGE_NOTE uint8_t *const newcontents = buffer; - used only >>>> in handle_romentries() function >>>> + * >>>> + * Reason of change: This pointer is used only in handle_romentries >>>> function, which has been >>>> + * commented out >>>> + */ >>>> + uint8_t *const oldcontents = malloc(flash_size); >>>> + if (!oldcontents) { >>>> + msg_gerr("Out of memory!\n"); >>>> + return 1; >>>> + } >>>> + if (fl_image_read(flashctx, oldcontents, flash_size)) { >>>> + ret = 1; >>>> + goto _free_out; >>>> + } >>>> + >>>> + /* LD_CHANGE_NOTE handle_romentries(flashctx, oldcontents, >>>> newcontents); >>>> + * >>>> + * Reason of change: This function does not exist >>>> + */ >>>> + >>>> + msg_cinfo("Verifying flash... "); >>>> + >>>> + /* LD_CHANGE_NOTE ret = compare_range(newcontents, oldcontents, 0, >>>> flash_size); >>>> + * >>>> + * Reason of change: This function is static. For now replaced with >>>> ret = 1 as ret must be used >>>> + */ >>>> + ret = 1; >>>> + if (!ret) >>>> + msg_cinfo("VERIFIED.\n"); >>>> + >>>> +_free_out: >>>> + free(oldcontents); >>>> + return ret; >>>> +} >>>> + >>>> +/** @} */ /* end fl-ops */ >>>> Index: libflashrom.h >>>> =================================================================== >>>> --- libflashrom.h (revision 0) >>>> +++ libflashrom.h (working copy) >>>> @@ -0,0 +1,97 @@ >>>> +/* >>>> + * This file is part of the flashrom project. >>>> + * >>>> + * Copyright (C) 2012 secunet Security Networks AG >>>> + * (Written by Nico Huber <nico.huber(a)secunet.com> for secunet) >>>> + * >>>> + * 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. >>>> + * >>>> + * You should have received a copy of the GNU General Public License >>>> + * along with this program; if not, write to the Free Software >>>> + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 >>>> USA >>>> + */ >>>> + >>>> +#ifndef __LIBFLASHROM_H__ >>>> +#define __LIBFLASHROM_H__ 1 >>>> + >>>> +#include <stdarg.h> >>>> + >>>> +int fl_init(int perform_selfcheck); >>>> +int fl_shutdown(void); >>>> +/** @ingroup fl-general */ >>>> +typedef enum { /* This has to match enum msglevel. */ >>> Maybe you could just bring enum msglevel here from flash.h... >>> or have some other header for this printing stuff thats >>> used by both libflashrom.h and other parts of flashrom. >>> >>>> + FL_MSG_ERROR = 0, >>>> + FL_MSG_INFO = 1, >>>> + FL_MSG_DEBUG = 2, >>>> + FL_MSG_DEBUG2 = 3, >>>> + FL_MSG_SPEW = 4, >>>> +} fl_log_level_t; >>>> +/** @ingroup fl-general */ >>>> +typedef int(fl_log_callback_t)(fl_log_level_t, const char *format, >>>> va_list); >>>> +void fl_set_log_callback(fl_log_callback_t *); >>>> + >>>> +typedef enum { >>>> + FL_TESTED_OK = 0, >>>> + FL_TESTED_NT = 1, >>>> + FL_TESTED_BAD = 2, >>>> + FL_TESTED_DEP = 3, >>>> + FL_TESTED_NA = 4, >>>> +} fl_test_state; >>>> + >>>> +typedef struct { >>>> + const char *vendor; >>>> + const char *name; >>>> + unsigned int total_size; >>>> + >>>> + struct fl_tested { >>>> + fl_test_state probe; >>>> + fl_test_state read; >>>> + fl_test_state erase; >>>> + fl_test_state write; >>>> + } tested; >>>> +} fl_flashchip_info_t; >>>> + >>>> +typedef struct { >>>> + const char *vendor; >>>> + const char *name; >>>> + fl_test_state working; >>>> +} fl_board_info_t; >>>> + >>>> +typedef struct { >>>> + const char *vendor; >>>> + const char *chipset; >>>> + fl_test_state status; >>>> +} fl_chipset_info_t; >>>> + >>>> +int fl_supported_programmers(const char **supported_programmers); >>>> +int fl_supported_flash_chips(fl_flashchip_info_t *fchips); >>>> +int fl_supported_boards(fl_board_info_t *boards); >>>> +int fl_supported_chipsets(fl_chipset_info_t *chipsets); >>>> +int fl_supported_programmers_number(); >>>> +int fl_supported_flash_chips_number(); >>>> +int fl_supported_boards_number(); >>>> +int fl_supported_chipsets_number(); >>>> + >>>> +int fl_programmer_init(const char *prog_name, const char *prog_params); >>>> +int fl_programmer_shutdown(void); >>>> + >>>> +struct flashctx; >>>> +typedef struct flashctx fl_flashctx_t; >>>> +int fl_flash_probe(fl_flashctx_t **, const char *chip_name); >>>> +size_t fl_flash_getsize(const fl_flashctx_t *); >>>> +int fl_flash_erase(fl_flashctx_t *); >>>> +void fl_flash_release(fl_flashctx_t *); >>>> + >>>> +int fl_image_read(fl_flashctx_t *, void *buffer, size_t buffer_len); >>>> +int fl_image_write(fl_flashctx_t *, void *buffer, size_t buffer_len); >>>> +int fl_image_verify(fl_flashctx_t *, void *buffer, size_t buffer_len); >>>> + >>>> +#endif /* !__LIBFLASHROM_H__ */ >>>> >>>> _______________________________________________ >>>> flashrom mailing list >>>> flashrom(a)flashrom.org >>>> http://www.flashrom.org/mailman/listinfo/flashrom >>> >>> -- >>> Urja Rannikko >>> >>> _______________________________________________ >>> flashrom mailing list >>> flashrom(a)flashrom.org >>> http://www.flashrom.org/mailman/listinfo/flashrom

1 0

Re: [flashrom] Libflashrom draft patch - initial review
by Антон Кочков 19 Jun '15

19 Jun '15

Uh, forgot to add, that loading layout will be quite useful too, in the API and adding romentry_t* argument for all fl_image_* functions. Best regards, Anton Kochkov. On Fri, Jun 19, 2015 at 2:43 PM, Антон Кочков <anton.kochkov(a)gmail.com> wrote: > Hi! > I've done also some rebasing of the libflashrom patches before (on top > of the layout branch from the stefanct) > https://github.com/XVilka/flashrom/commits/libflashrom > > May be you'll find something useful here. > Best regards, > Anton Kochkov. > > > On Thu, Jun 18, 2015 at 7:45 AM, Urja Rannikko <urjaman(a)gmail.com> wrote: >> Hi, >> >> >> On Fri, Jun 12, 2015 at 12:26 AM, Łukasz Dmitrowski >> <lukasz.dmitrowski(a)gmail.com> wrote: >>> Hello, >>> >>> My name is Łukasz Dmitrowski and I am one of coreboot/flashrom GSoC students >>> this year. You can read about my project here: >>> http://blogs.coreboot.org/blog/author/dmitro/. >>> >>> One of my first steps is updating and extending Nico Hubers libflashrom >>> patch. Work is still in progress, but some changes are already made, so I >>> thought that it will be good idea to send a patch just for review to know if >>> I am going in a good direction. I want to improve my skills and provide best >>> code quality as I can, so I am open for criticism - I am here to learn :) >>> >> I'm here essentially trying out reviewing stuff, so expect more from >> somebody a bit more experienced, but I heard my comments would be >> useful, so moving on :) >> >>> Patch summary: >>> >> First thing i have to say about the patch is that it has been >> malformed, most likely line wrapped by your email client. If you cant >> properly include the patch inline, attaching a .patch would be okay. >> (Also turn off that HTML output if you can... although it wasnt used >> for anything, but still.). So I didnt do any compile testing on this >> stuff because of this. >> >>> Makefile: I added cli_common.o and print.o to LIB_OBJS - it solves undefined >>> references in current libflashrom version, but spoils standard flashrom >>> build with 'make', I did not investigated it yet as my focus is to extend >>> library with new functions and update already existing, need to discuss it >>> with my mentor >>> >>> cli_classic.c, cli_output.c, flash.h: Only Nico Hubers changes here, didn't >>> touch it >> I might comment on any part of the patch because I havent reviewed the >> original and it's only about the code. >> >>> >>> libflashrom.c, libflashrom.h: I added 8 functions and made a few changes to >>> existing ones, as some of used functions are static, or does not exist. >>> >>> New functions: >>> >>> int fl_supported_programmers(const char **supported_programmers); >>> int fl_supported_flash_chips(fl_flashchip_info_t *fchips); >>> int fl_supported_boards(fl_board_info_t *boards); >>> int fl_supported_chipsets(fl_chipset_info_t *chipsets); >>> int fl_supported_programmers_number(); >>> int fl_supported_flash_chips_number(); >>> int fl_supported_boards_number(); >>> int fl_supported_chipsets_number(); >>> >>> New types: >>> fl_flashchip_info_t - smaller version of struct flashchip >>> fl_board_info_t - smaller version of struct board_info >>> fl_chipset_info_t - smaller version of struct penable >>> fl_test_state - copy of enum test_state >>> >>> So we have 4 functions that return a list of supported programmers, chips, >>> boards and chipsets. Next 4 functions return number of supported hardware of >>> certain type. For example, to obtain a list of supported boards, you can >>> create an array of structures fl_board_info of suitable size (the size is >>> known - fl_supported_boards_number()), then pass it to >>> fl_supported_boards(fl_board_info_t *boards) and you will have it filled >>> with data. >> My opinion is that the _number functions make the API unnecessarily >> complex to use. >> I'm suggesting like this: >> fl_flashchip_info_t * fl_supported_flash_chips(void); >> Have the call allocate the table using a not specified allocator >> (really just malloc for now, but we're not telling), and freed with a >> function like >> int fl_support_info_free(void*p); >> This would allow implementation using const tables or allocation, >> whatever we like. >> (if (p == const_table) return 0; in our _free() if mixed.) >> >>> >>> Regarding changes in Nico Hubers functions: I made temporary comments for >>> every change and marked it with LD_CHANGE_NOTE. Every comment contains >>> previous code and reason why it has been commented out. >>> >>> Thanks in advance for your insights! >>> >>> Regards, >>> Lukasz Dmitrowski >>> >>> --- >>> >>> Signed-off-by: Łukasz Dmitrowski <lukasz.dmitrowski(a)gmail.com> >>> >>> Index: Makefile >>> =================================================================== >>> --- Makefile (revision 1891) >>> +++ Makefile (working copy) >>> @@ -374,7 +374,7 @@ >>> >>> ############################################################################### >>> # Library code. >>> >>> -LIB_OBJS = layout.o flashrom.o udelay.o programmer.o helpers.o >>> +LIB_OBJS = libflashrom.o layout.o flashrom.o udelay.o programmer.o >>> helpers.o cli_common.o print.o >>> >>> >>> ############################################################################### >>> # Frontend related stuff. >>> Index: cli_classic.c >>> =================================================================== >>> --- cli_classic.c (revision 1891) >>> +++ cli_classic.c (working copy) >>> @@ -30,6 +30,7 @@ >>> #include "flash.h" >>> #include "flashchips.h" >>> #include "programmer.h" >>> +#include "libflashrom.h" >>> >>> static void cli_classic_usage(const char *name) >>> { >>> @@ -135,6 +136,8 @@ >>> char *tempstr = NULL; >>> char *pparam = NULL; >>> >>> + fl_set_log_callback((fl_log_callback_t *)&fl_print_cb); >>> + >>> print_version(); >>> print_banner(); >>> >>> Index: cli_output.c >>> =================================================================== >>> --- cli_output.c (revision 1891) >>> +++ cli_output.c (working copy) >>> @@ -71,9 +71,8 @@ >>> #endif /* !STANDALONE */ >>> >>> /* Please note that level is the verbosity, not the importance of the >>> message. */ >>> -int print(enum msglevel level, const char *fmt, ...) >>> +int fl_print_cb(enum msglevel level, const char *fmt, va_list ap) >>> { >>> - va_list ap; >>> int ret = 0; >>> FILE *output_type = stdout; >>> >>> @@ -81,9 +80,7 @@ >>> output_type = stderr; >>> >>> if (level <= verbose_screen) { >>> - va_start(ap, fmt); >>> ret = vfprintf(output_type, fmt, ap); >>> - va_end(ap); >>> /* msg_*spew often happens inside chip accessors in possibly >>> * time-critical operations. Don't slow them down by flushing. */ >>> if (level != MSG_SPEW) >>> @@ -91,9 +88,7 @@ >>> } >>> #ifndef STANDALONE >>> if ((level <= verbose_logfile) && logfile) { >>> - va_start(ap, fmt); >>> ret = vfprintf(logfile, fmt, ap); >>> - va_end(ap); >>> if (level != MSG_SPEW) >>> fflush(logfile); >>> } >>> Index: flash.h >>> =================================================================== >>> --- flash.h (revision 1891) >>> +++ flash.h (working copy) >>> @@ -31,6 +31,7 @@ >>> #include <stdint.h> >>> #include <stddef.h> >>> #include <stdbool.h> >>> +#include <stdarg.h> >>> #if IS_WINDOWS >>> #include <windows.h> >>> #undef min >>> @@ -317,6 +318,7 @@ >>> MSG_DEBUG2 = 4, >>> MSG_SPEW = 5, >>> }; >>> +int fl_print_cb(enum msglevel level, const char *fmt, va_list ap); >>> /* Let gcc and clang check for correct printf-style format strings. */ >>> int print(enum msglevel level, const char *fmt, ...) >>> #ifdef __MINGW32__ >>> Index: libflashrom.c >>> =================================================================== >>> --- libflashrom.c (revision 0) >>> +++ libflashrom.c (working copy) >>> @@ -0,0 +1,603 @@ >>> +/* >>> + * This file is part of the flashrom project. >>> + * >>> + * Copyright (C) 2012 secunet Security Networks AG >>> + * (Written by Nico Huber <nico.huber(a)secunet.com> for secunet) >>> + * >>> + * 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. >>> + * >>> + * You should have received a copy of the GNU General Public License >>> + * along with this program; if not, write to the Free Software >>> + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 >>> USA >>> + */ >>> +/** >>> + * @mainpage >>> + * >>> + * Have a look at the Modules section for a function reference. >>> + */ >>> + >>> +#include <stdlib.h> >>> +#include <string.h> >>> +#include <stdarg.h> >>> + >>> +#include "flash.h" >>> +#include "programmer.h" >>> +#include "libflashrom.h" >>> + >>> +/** >>> + * @defgroup fl-general General >>> + * @{ >>> + */ >>> + >>> +/** Pointer to log callback function. */ >>> +static fl_log_callback_t *fl_log_callback = NULL; >>> + >>> +/** >>> + * @brief Initialize libflashrom. >>> + * >>> + * @param perform_selfcheck If not zero, perform a self check. >>> + * @return 0 on success >>> + */ >>> +int fl_init(const int perform_selfcheck) >>> +{ >>> + if (perform_selfcheck && selfcheck()) >>> + return 1; >>> + myusec_calibrate_delay(); >>> + return 0; >>> +} >>> + >>> +/** >>> + * @brief Shut down libflashrom. >>> + * @return 0 on success >>> + */ >>> +int fl_shutdown(void) >>> +{ >>> + return 0; /* TODO: nothing to do? */ >> I'm pretty sure there is, but need to investigate more. >> >>> +} >>> + >>> +/* TODO: fl_set_loglevel()? do we need it? >>> + For now, let the user decide in his callback. */ >>> + >>> +/** >>> + * @brief Set the log callback function. >>> + * >>> + * Set a callback function which will be invoked whenever libflashrom wants >>> + * to output messages. This allows frontends to do whatever they see fit >>> with >>> + * such messages, e.g. write them to syslog, or to file, or print them in a >>> + * GUI window, etc. >>> + * >>> + * @param log_callback Pointer to the new log callback function. >>> + */ >>> +void fl_set_log_callback(fl_log_callback_t *const log_callback) >>> +{ >>> + fl_log_callback = log_callback; >>> +} >>> +/** @private */ >>> +int print(const enum msglevel level, const char *const fmt, ...) >>> +{ >>> + if (fl_log_callback) { >>> + int ret; >>> + va_list args; >>> + va_start(args, fmt); >>> + ret = fl_log_callback(level, fmt, args); >>> + va_end(args); >>> + return ret; >>> + } >>> + return 0; >>> +} >>> + >>> +/** @} */ /* end fl-general */ >>> + >>> + >>> + >>> +/** >>> + * @defgroup fl-query Querying >>> + * @{ >>> + */ >>> + >>> +int fl_supported_programmers(const char **supported_programmers) >>> +{ >>> + int ret = 0; >>> + enum programmer p = 0; >>> + >>> + if (supported_programmers != NULL) { >>> + for (; p < PROGRAMMER_INVALID; ++p) >>> + supported_programmers[p] = >>> programmer_table[p].name; >>> + } else { >>> + ret = 1; >>> + } >>> + >>> + return ret; >>> +} >>> + >>> +int fl_supported_programmers_number() >>> +{ >>> + return PROGRAMMER_INVALID; >>> +} >>> + >>> +int fl_supported_flash_chips(fl_flashchip_info_t *fchips) >>> +{ >>> + int ret = 0; >>> + int i = 0; >>> + >>> + if (fchips != NULL) { >>> + for (; i < flashchips_size; ++i) { >>> + fchips[i].vendor = flashchips[i].vendor; >>> + fchips[i].name = flashchips[i].name; >>> + fchips[i].tested.erase = >>> flashchips[i].tested.erase; >>> + fchips[i].tested.probe = >>> flashchips[i].tested.probe; >>> + fchips[i].tested.read = flashchips[i].tested.read; >>> + fchips[i].tested.write = >>> flashchips[i].tested.write; >>> + fchips[i].total_size = flashchips[i].total_size; >>> + } >>> + } else { >>> + ret = 1; >>> + } >>> + >>> + return ret; >>> +} >>> + >>> +int fl_supported_flash_chips_number() >>> +{ >>> + return flashchips_size; >>> +} >>> + >>> +int fl_supported_boards(fl_board_info_t *boards) >>> +{ >>> + int ret = 0; >>> + const struct board_info *binfo = boards_known; >>> + >>> + if (boards != NULL) { >>> + while (binfo->vendor != NULL) { >>> + boards->vendor = binfo->vendor; >>> + boards->name = binfo->name; >>> + boards->working = binfo->working; >>> + ++binfo; >>> + ++boards; >>> + } >>> + } else { >>> + ret = 1; >>> + } >>> + >>> + return ret; >>> +} >>> + >>> +int fl_supported_boards_number() >>> +{ >>> + int boards_number = 0; >>> + const struct board_info *binfo = boards_known; >>> + >>> + while (binfo->vendor != NULL) { >>> + ++boards_number; >>> + ++binfo; >>> + } >>> + >>> + return boards_number; >>> +} >>> + >>> +int fl_supported_chipsets(fl_chipset_info_t *chipsets) >>> +{ >>> + int ret = 0; >>> + const struct penable *chipset = chipset_enables; >>> + >>> + if (chipsets != NULL) { >>> + while (chipset->vendor_name != NULL) { >>> + chipsets->vendor = chipset->vendor_name; >>> + chipsets->chipset = chipset->device_name; >>> + chipsets->status = chipset->status; >>> + ++chipset; >>> + ++chipsets; >> These names are confusing (just FYI), i first thought we're counting >> chipsets here.. >>> + } >>> + } else { >>> + return ret; >>> + } >>> + >>> + return ret; >>> +} >>> + >>> +int fl_supported_chipsets_number() >>> +{ >>> + int chipsets_number = 0; >>> + const struct penable *chipset = chipset_enables; >>> + >>> + while (chipset->vendor_name != NULL) { >>> + ++chipsets_number; >>> + ++chipset; >>> + } >>> + >>> + return chipsets_number; >>> +} >>> + >>> +/** @} */ /* end fl-query */ >>> + >>> + >>> + >>> +/** >>> + * @defgroup fl-prog Programmers >>> + * @{ >>> + */ >>> + >>> +/** >>> + * @brief Initialize the specified programmer. >>> + * >>> + * @param prog_name Name of the programmer to initialize. >>> + * @param prog_param Pointer to programmer specific parameters. >>> + * @return 0 on success >>> + */ >>> +int fl_programmer_init(const char *const prog_name, const char *const >>> prog_param) >>> +{ >>> + unsigned prog; >>> + >>> + for (prog = 0; prog < PROGRAMMER_INVALID; prog++) { >>> + if (strcmp(prog_name, programmer_table[prog].name) == 0) >>> + break; >>> + } >>> + if (prog >= PROGRAMMER_INVALID) { >>> + msg_ginfo("Error: Unknown programmer \"%s\". Valid choices >>> are:\n", prog_name); >>> + list_programmers_linebreak(0, 80, 0); >>> + return 1; >>> + } >>> + return programmer_init(prog, prog_param); >>> +} >>> + >>> +/** >>> + * @brief Shut down the initialized programmer. >>> + * >>> + * @return 0 on success >>> + */ >>> +int fl_programmer_shutdown(void) >>> +{ >>> + return programmer_shutdown(); >>> +} >>> + >>> +/* TODO: fl_programmer_capabilities()? */ >>> + >>> +/** @} */ /* end fl-prog */ >>> + >>> + >>> + >>> +/** >>> + * @defgroup fl-flash Flash chips >>> + * @{ >>> + */ >>> + >>> +/** >>> + * @brief Probe for a flash chip. >>> + * >>> + * Probes for a flash chip and returns a flash context, that can be used >>> + * later with flash chip and @ref fl-ops "image operations", if exactly one >>> + * matching chip is found. >>> + * >>> + * @param[out] flashctx Points to a pointer of type fl_flashctx_t that will >>> + * be set if exactly one chip is found. *flashctx has >>> + * to be freed by the caller with @ref >>> fl_flash_release. >>> + * @param[in] chip_name Name of a chip to probe for, or NULL to probe for >>> + * all known chips. >>> + * @return 0 on success, >>> + * 3 if multiple chips were found, >>> + * 2 if no chip was found, >>> + * or 1 on any other error. >>> + */ >> Need a way to output multiple flash chips from here, it shouldnt be an >> error, just a >> "pick from these" dialog and continue with "OK", or something like that. >> Maybe add int *chip_count as a parameter and the set pointer will >> point to an array of flashctx with the int set to the count of found >> chips. >> (Hopefully I'm not saying totally obvious stuff here...) >> >>> +int fl_flash_probe(fl_flashctx_t **const flashctx, const char *const >>> chip_name) >>> +{ >>> + int i, ret = 2; >>> + fl_flashctx_t second_flashctx = { 0, }; >>> + >>> + chip_to_probe = chip_name; /* chip_to_probe is global in flashrom.c >>> */ >>> + >>> + *flashctx = malloc(sizeof(**flashctx)); >>> + if (!*flashctx) >>> + return 1; >>> + memset(*flashctx, 0, sizeof(**flashctx)); >>> + >>> + /* LD_CHANGE_NOTE for (i = 0; i < registered_programmer_count; ++i) >>> { >>> + * >>> + * Reason of change: registered_programmer_count does not exist, I >>> assume that a proper one is >>> + * now registered_master_count - I will check and confirm >>> + */ >>> + for (i = 0; i < registered_master_count; ++i) { >>> + int flash_idx = -1; >>> + /* LD_CHANGE_NOTE if (!ret || (flash_idx = >>> probe_flash(&registered_programmers[i], 0, *flashctx, 0)) != -1) { >>> + * >>> + * Reason of change: registered_programmers does not exist, >>> I assume that a proper one is >>> + * now registered_masters - I will check and confirm >>> + */ >>> + if (!ret || (flash_idx = >>> probe_flash(&registered_masters[i], 0, *flashctx, 0)) != -1) { >>> + ret = 0; >>> + /* We found one chip, now check that there is no >>> second match. */ >>> + /* LD_CHANGE_NOTE if >>> (probe_flash(&registered_programmers[i], flash_idx + 1, &second_flashctx, 0) >>> != -1) { >>> + * >>> + * Reason of change: registered_programmers does >>> not exist, I assume that a proper one is >>> + * now registered_masters - I will check and >>> confirm >>> + * >>> + */ >>> + if (probe_flash(&registered_masters[i], flash_idx + >>> 1, &second_flashctx, 0) != -1) { >>> + ret = 3; >>> + break; >>> + } >>> + } >>> + } >>> + if (ret) { >>> + free(*flashctx); >>> + *flashctx = NULL; >>> + } >>> + return ret; >>> +} >>> + >>> +/** >>> + * @brief Returns the size of the specified flash chip in bytes. >>> + * >>> + * @param flashctx The queried flash context. >>> + * @return Size of flash chip in bytes. >>> + */ >>> +size_t fl_flash_getsize(const fl_flashctx_t *const flashctx) >>> +{ >>> + return flashctx->chip->total_size << 10; >>> +} >>> + >>> +/** @private */ >>> +int erase_and_write_flash(struct flashctx *flash, uint8_t *oldcontents, >>> uint8_t *newcontents); >>> +/** @private */ >>> +/* LD_CHANGE_NOTE void emergency_help_message(void); >>> + * >>> + * Reason of change: This has been commented out as emergency_help_message >>> is static >> Maybe have some other method to indicate that the UI should display an >> emergency help message, maybe ret = 2. Same comment for the _write >> version, but that already has ret values for these. >> >>> + */ >>> +/** >>> + * @brief Erase the specified ROM chip. >>> + * >>> + * @param flashctx The context of the flash chip to erase. >>> + * @return 0 on success. >>> + */ >>> +int fl_flash_erase(fl_flashctx_t *const flashctx) >>> +{ >>> + const size_t flash_size = flashctx->chip->total_size * 1024; >>> + >>> + int ret = 0; >>> + >>> + uint8_t *const newcontents = malloc(flash_size); >>> + if (!newcontents) { >>> + msg_gerr("Out of memory!\n"); >>> + return 1; >>> + } >>> + uint8_t *const oldcontents = malloc(flash_size); >>> + if (!oldcontents) { >>> + msg_gerr("Out of memory!\n"); >>> + free(newcontents); >>> + return 1; >>> + } >>> + >>> + if (flashctx->chip->unlock) >>> + flashctx->chip->unlock(flashctx); >>> + >>> + /* Assume worst case for old contents: All bits are 0. */ >>> + memset(oldcontents, 0x00, flash_size); >>> + /* Assume best case for new contents: All bits should be 1. */ >>> + memset(newcontents, 0xff, flash_size); >>> + /* Side effect of the assumptions above: Default write action is >>> erase >>> + * because newcontents looks like a completely erased chip, and >>> + * oldcontents being completely 0x00 means we have to erase >>> everything >>> + * before we can write. >>> + */ >>> + >>> + if (erase_and_write_flash(flashctx, oldcontents, newcontents)) { >>> + /* FIXME: Do we really want the scary warning if erase >>> failed? >>> + * After all, after erase the chip is either blank or >>> partially >>> + * blank or it has the old contents. A blank chip won't >>> boot, >>> + * so if the user wanted erase and reboots afterwards, the >>> user >>> + * knows very well that booting won't work. >>> + */ >>> + /* LD_CHANGE_NOTE emergency_help_message(); >>> + * >>> + * Reason of change: This function is static >>> + */ >>> + ret = 1; >>> + } >>> + >>> + free(oldcontents); >>> + free(newcontents); >>> + return ret; >>> +} >>> + >>> +/** >>> + * @brief Free a flash context. >>> + * >>> + * @param flashctx Flash context to free. >>> + */ >>> +void fl_flash_release(fl_flashctx_t *const flashctx) >>> +{ >>> + free(flashctx); >>> +} >>> + >>> +/** @} */ /* end fl-flash */ >>> + >>> + >>> + >>> +/** >>> + * @defgroup fl-ops Operations >>> + * @{ >>> + */ >>> + >>> +/** >>> + * @brief Read the current image from the specified ROM chip. >>> + * >>> + * @param flashctx The context of the flash chip. >>> + * @param buffer Target buffer to write image to. >>> + * @param buffer_len Size of target buffer in bytes. >>> + * @return 0 on success, >>> + * 2 if buffer_len is to short for the flash chip's contents, >>> + * or 1 on any other failure. >>> + */ >>> +int fl_image_read(fl_flashctx_t *const flashctx, void *const buffer, const >>> size_t buffer_len) >>> +{ >>> + const size_t flash_size = flashctx->chip->total_size * 1024; >>> + >>> + int ret = 0; >>> + >>> + if (flashctx->chip->unlock) >>> + flashctx->chip->unlock(flashctx); >>> + >>> + msg_cinfo("Reading flash... "); >>> + if (flash_size > buffer_len) { >>> + msg_cerr("Buffer to short for this flash chip (%u < >>> %u).\n", >>> + (unsigned int)buffer_len, (unsigned >>> int)flash_size); >>> + ret = 2; >>> + goto _out; >>> + } >>> + if (!flashctx->chip->read) { >>> + msg_cerr("No read function available for this flash >>> chip.\n"); >>> + ret = 1; >>> + goto _out; >>> + } >>> + if (flashctx->chip->read(flashctx, buffer, 0, flash_size)) { >>> + msg_cerr("Read operation failed!\n"); >>> + ret = 1; >>> + goto _out; >>> + } >>> +_out: >>> + msg_cinfo("%s.\n", ret ? "FAILED" : "done"); >>> + return ret; >>> +} >>> + >>> +/** @private */ >>> +/* LD_CHANGE_NOTE void nonfatal_help_message(void); >>> + * >>> + * Reason of change: This function is static >>> + */ >>> +/** >>> + * @brief Write the specified image to the ROM chip. >>> + * >>> + * @param flashctx The context of the flash chip. >>> + * @param buffer Source buffer to read image from. >>> + * @param buffer_len Size of source buffer in bytes. >>> + * @return 0 on success, >>> + * 4 if buffer_len doesn't match the size of the flash chip, >>> + * 3 if write was tried, but nothing has changed, >>> + * 2 if write was tried, but flash contents changed, >>> + * or 1 on any other failure. >>> + */ >>> +int fl_image_write(fl_flashctx_t *const flashctx, void *const buffer, const >>> size_t buffer_len) >>> +{ >>> + const size_t flash_size = flashctx->chip->total_size * 1024; >>> + >>> + int ret = 0; >>> + >>> + if (buffer_len != flash_size) { >>> + msg_cerr("Buffer size doesn't match size of flash chip (%u >>> != %u)\n.", >>> + (unsigned int)buffer_len, (unsigned >>> int)flash_size); >>> + return 4; >>> + } >>> + >>> + uint8_t *const newcontents = buffer; >>> + uint8_t *const oldcontents = malloc(flash_size); >>> + if (!oldcontents) { >>> + msg_gerr("Out of memory!\n"); >>> + return 1; >>> + } >>> + if (fl_image_read(flashctx, oldcontents, flash_size)) { >>> + ret = 1; >>> + goto _free_out; >>> + } >>> + >>> + /* LD_CHANGE_NOTE handle_romentries(flashctx, oldcontents, >>> newcontents); >>> + * >>> + * Reason of change: This function does not exist. There is a need >>> to investigate what was >>> + * its purpose and how it can be replaced. >>> + */ >>> + >>> + if (erase_and_write_flash(flashctx, oldcontents, newcontents)) { >>> + msg_cerr("Uh oh. Erase/write failed. Checking if anything >>> changed.\n"); >>> + if (!flashctx->chip->read(flashctx, newcontents, 0, >>> flash_size)) { >>> + if (!memcmp(oldcontents, newcontents, flash_size)) >>> { >>> + msg_cinfo("Good. It seems nothing was >>> changed.\n"); >>> + /* LD_CHANGE_NOTE nonfatal_help_message(); >>> + * >>> + * Reason of change: This function is >>> static >>> + */ >>> + ret = 3; >>> + goto _free_out; >>> + } >>> + } >>> + /* LD_CHANGE_NOTE emergency_help_message(); >>> + * >>> + * Reason of change: This function is static >>> + */ >>> + ret = 2; >>> + goto _free_out; >>> + } >>> + >>> +_free_out: >>> + free(oldcontents); >>> + return ret; >>> +} >>> + >>> +/** @private */ >>> +/* LD_CHANGE_NOTE int compare_range(const uint8_t *wantbuf, const uint8_t >>> *havebuf, unsigned int start, unsigned int len); >>> + * >>> + * Reason of change: This function is static >> For any of these "this is static"... then make it not static or figure >> out a cleaner way of doing it, but yes i get this is an early patch. >> >>> + */ >>> +/** >>> + * @brief Verify the ROM chip's contents with the specified image. >>> + * >>> + * @param flashctx The context of the flash chip. >>> + * @param buffer Source buffer to verify with. >>> + * @param buffer_len Size of source buffer in bytes. >>> + * @return 0 on success, >>> + * 2 if buffer_len doesn't match the size of the flash chip, >>> + * or 1 on any other failure. >>> + */ >>> +int fl_image_verify(fl_flashctx_t *const flashctx, void *const buffer, >>> const size_t buffer_len) >>> +{ >>> + const size_t flash_size = flashctx->chip->total_size * 1024; >>> + >>> + int ret = 0; >>> + >>> + if (buffer_len != flash_size) { >>> + msg_cerr("Buffer size doesn't match size of flash chip (%u >>> != %u)\n.", >>> + (unsigned int)buffer_len, (unsigned >>> int)flash_size); >>> + return 2; >>> + } >>> + >>> + /* LD_CHANGE_NOTE uint8_t *const newcontents = buffer; - used only >>> in handle_romentries() function >>> + * >>> + * Reason of change: This pointer is used only in handle_romentries >>> function, which has been >>> + * commented out >>> + */ >>> + uint8_t *const oldcontents = malloc(flash_size); >>> + if (!oldcontents) { >>> + msg_gerr("Out of memory!\n"); >>> + return 1; >>> + } >>> + if (fl_image_read(flashctx, oldcontents, flash_size)) { >>> + ret = 1; >>> + goto _free_out; >>> + } >>> + >>> + /* LD_CHANGE_NOTE handle_romentries(flashctx, oldcontents, >>> newcontents); >>> + * >>> + * Reason of change: This function does not exist >>> + */ >>> + >>> + msg_cinfo("Verifying flash... "); >>> + >>> + /* LD_CHANGE_NOTE ret = compare_range(newcontents, oldcontents, 0, >>> flash_size); >>> + * >>> + * Reason of change: This function is static. For now replaced with >>> ret = 1 as ret must be used >>> + */ >>> + ret = 1; >>> + if (!ret) >>> + msg_cinfo("VERIFIED.\n"); >>> + >>> +_free_out: >>> + free(oldcontents); >>> + return ret; >>> +} >>> + >>> +/** @} */ /* end fl-ops */ >>> Index: libflashrom.h >>> =================================================================== >>> --- libflashrom.h (revision 0) >>> +++ libflashrom.h (working copy) >>> @@ -0,0 +1,97 @@ >>> +/* >>> + * This file is part of the flashrom project. >>> + * >>> + * Copyright (C) 2012 secunet Security Networks AG >>> + * (Written by Nico Huber <nico.huber(a)secunet.com> for secunet) >>> + * >>> + * 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. >>> + * >>> + * You should have received a copy of the GNU General Public License >>> + * along with this program; if not, write to the Free Software >>> + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 >>> USA >>> + */ >>> + >>> +#ifndef __LIBFLASHROM_H__ >>> +#define __LIBFLASHROM_H__ 1 >>> + >>> +#include <stdarg.h> >>> + >>> +int fl_init(int perform_selfcheck); >>> +int fl_shutdown(void); >>> +/** @ingroup fl-general */ >>> +typedef enum { /* This has to match enum msglevel. */ >> Maybe you could just bring enum msglevel here from flash.h... >> or have some other header for this printing stuff thats >> used by both libflashrom.h and other parts of flashrom. >> >>> + FL_MSG_ERROR = 0, >>> + FL_MSG_INFO = 1, >>> + FL_MSG_DEBUG = 2, >>> + FL_MSG_DEBUG2 = 3, >>> + FL_MSG_SPEW = 4, >>> +} fl_log_level_t; >>> +/** @ingroup fl-general */ >>> +typedef int(fl_log_callback_t)(fl_log_level_t, const char *format, >>> va_list); >>> +void fl_set_log_callback(fl_log_callback_t *); >>> + >>> +typedef enum { >>> + FL_TESTED_OK = 0, >>> + FL_TESTED_NT = 1, >>> + FL_TESTED_BAD = 2, >>> + FL_TESTED_DEP = 3, >>> + FL_TESTED_NA = 4, >>> +} fl_test_state; >>> + >>> +typedef struct { >>> + const char *vendor; >>> + const char *name; >>> + unsigned int total_size; >>> + >>> + struct fl_tested { >>> + fl_test_state probe; >>> + fl_test_state read; >>> + fl_test_state erase; >>> + fl_test_state write; >>> + } tested; >>> +} fl_flashchip_info_t; >>> + >>> +typedef struct { >>> + const char *vendor; >>> + const char *name; >>> + fl_test_state working; >>> +} fl_board_info_t; >>> + >>> +typedef struct { >>> + const char *vendor; >>> + const char *chipset; >>> + fl_test_state status; >>> +} fl_chipset_info_t; >>> + >>> +int fl_supported_programmers(const char **supported_programmers); >>> +int fl_supported_flash_chips(fl_flashchip_info_t *fchips); >>> +int fl_supported_boards(fl_board_info_t *boards); >>> +int fl_supported_chipsets(fl_chipset_info_t *chipsets); >>> +int fl_supported_programmers_number(); >>> +int fl_supported_flash_chips_number(); >>> +int fl_supported_boards_number(); >>> +int fl_supported_chipsets_number(); >>> + >>> +int fl_programmer_init(const char *prog_name, const char *prog_params); >>> +int fl_programmer_shutdown(void); >>> + >>> +struct flashctx; >>> +typedef struct flashctx fl_flashctx_t; >>> +int fl_flash_probe(fl_flashctx_t **, const char *chip_name); >>> +size_t fl_flash_getsize(const fl_flashctx_t *); >>> +int fl_flash_erase(fl_flashctx_t *); >>> +void fl_flash_release(fl_flashctx_t *); >>> + >>> +int fl_image_read(fl_flashctx_t *, void *buffer, size_t buffer_len); >>> +int fl_image_write(fl_flashctx_t *, void *buffer, size_t buffer_len); >>> +int fl_image_verify(fl_flashctx_t *, void *buffer, size_t buffer_len); >>> + >>> +#endif /* !__LIBFLASHROM_H__ */ >>> >>> _______________________________________________ >>> flashrom mailing list >>> flashrom(a)flashrom.org >>> http://www.flashrom.org/mailman/listinfo/flashrom >> >> -- >> Urja Rannikko >> >> _______________________________________________ >> flashrom mailing list >> flashrom(a)flashrom.org >> http://www.flashrom.org/mailman/listinfo/flashrom

1 0

Sweating by programming SPIs
by jackjean 17 Jun '15

17 Jun '15

Good evening all, After heaving sweated for months, I finally call for help at the community... My target is to program several SPI chips in order to repare some ASUS laptops, which was solved before by purchasing pre-programmed BIOS Chips I first tried to access with an SOIC "gripper" clip, directly on the chip being soldered on the main board. Facing to a lot of failures (unknown chip), I decided than to work on de-soldered chips. This allowed me to extract some dumps on failing and fresh purchased SPIs. Now, I have a satisfying database of complete images of BIOS, that I expect to use for programming new chips according each need. At that point begin my problem : After a abort during the first trial, I decided to erase my chip, and got the following advise : _"C:\Flashrom>flashrom -E -p buspirate_spi:dev=/COM3,spispeed=1M_ _flashrom v0.9.6.1-r1704 on Windows 6.1 (x86)_ _flashrom is free software, get the source code at http://www.flashrom.org [1]_ _Calibrating delay loop... OK._ _Found Winbond flash chip "W25Q32.V" (4096 kB, SPI) on buspirate_spi._ _Erasing and writing flash chip... FAILED at 0x00000800! Expected=0xff, Found=0x00, failed byte count from 0x00000000-0x00000fff: 0x600_ _ERASE FAILED!_ _Reading current flash chip contents..."_ Than I decided to purchase a DIP to SOIC adaptor in order to eliminate my doubts on the connection by gripper. Now the chips I use are soldered ... I tried to write again the BIOS image and got the following after a very long time of writing operation (more than one hour) and using the following command : _"flashrom -w flash.bin -VVV -p buspirate_spi:dev=/COM3,spispeed=1M"_ The reslult is : _"Your flash chip is in an unknown state._ _Please report this on IRC at chat.freenode.net (channel #flashrom) or_ _mail flashrom(a)flashrom.org, thanks!_ _buspirate_sendrecv: write 1, read 0 Sending 0x00_ _buspirate_sendrecv: write 0, read 4 , receiving 0x42 0x42 0x49 0x4f_ _buspirate_sendrecv: write 0, read 1 , receiving 0x31_ _Raw bitbang mode version 1_ _buspirate_sendrecv: write 1, read 0 Sending 0x0f_ _Bus Pirate shutdown completed."_ Considering than I took every possible care on the connection between Buspirate and SPI, and having a satisfying reading result (dumps are checked with Hex Editor and look OK), I am stucked at that point... I would appreciate any support from you. Thanks ! J. Links: ------ [1] http://www.flashrom.org

2 5

Re: [flashrom] Macronix flash chip "MX25U6435E/F" (8192 kB, SPI) - Gigabyte J1900N-D3V Mainboard, write operation success.
by Stefan Tauner 17 Jun '15

17 Jun '15

On Fri, 12 Jun 2015 00:00:51 +0200 Marcos Truchado <marcos.truchado(a)gmail.com> wrote: > Base Board Information > Manufacturer: Gigabyte Technology Co., Ltd. > Product Name: J1900N-D3V > Rev 1.x > > As 0.9.8 this chip is still on test, I could flash It. Unfortunately I > didn't enable the log, so I execute again with the log feature enabled. It > refuses to flash because the content is the same, but hopefully the > information that you need is still there. Hello Marcos, thanks for your report! I have marked the flash chip as fully tested as well as added your board to our list of supported hardware and will commit that later together with other small changes. -- Kind regards/Mit freundlichen Grüßen, Stefan Tauner

1 0

EN25QH64 erase/write
by david.s.alessio＠gmail.com 17 Jun '15

17 Jun '15

Hello, I'm writing to confirm that flashrom correctly erases and writes EN25QH64. The logfile is attached as requested. Thank you for maintaining flashrom! Cheers, -david

2 1

[RFC] use linux kernel list datastruct for registered masters list
by Antony Pavlov 17 Jun '15

17 Jun '15

Signed-off-by: Antony Pavlov <antonynpavlov(a)gmail.com> --- cli_classic.c | 13 +++--- flashrom.c | 1 - list.h | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ programmer.c | 27 ++++++------ programmer.h | 7 ++-- 5 files changed, 153 insertions(+), 25 deletions(-) diff --git a/cli_classic.c b/cli_classic.c index a2c2014..06ae454 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -96,7 +96,7 @@ int main(int argc, char *argv[]) struct flashctx flashes[8] = {{0}}; struct flashctx *fill_flash; const char *name; - int namelen, opt, i, j; + int namelen, opt, i; int startchip = -1, chipcount = 0, option_index = 0, force = 0; #if CONFIG_PRINT_WIKI == 1 int list_supported_wiki = 0; @@ -134,6 +134,7 @@ int main(int argc, char *argv[]) #endif /* !STANDALONE */ char *tempstr = NULL; char *pparam = NULL; + struct registered_master *master; print_version(); print_banner(); @@ -425,10 +426,10 @@ int main(int argc, char *argv[]) msg_pdbg("The following protocols are supported: %s.\n", tempstr); free(tempstr); - for (j = 0; j < registered_master_count; j++) { + list_for_each_entry(master, &registered_masters, node) { startchip = 0; while (chipcount < ARRAY_SIZE(flashes)) { - startchip = probe_flash(&registered_masters[j], startchip, &flashes[chipcount], 0); + startchip = probe_flash(master, startchip, &flashes[chipcount], 0); if (startchip == -1) break; chipcount++; @@ -455,8 +456,7 @@ int main(int argc, char *argv[]) int compatible_masters = 0; msg_cinfo("Force read (-f -r -c) requested, pretending the chip is there:\n"); /* This loop just counts compatible controllers. */ - for (j = 0; j < registered_master_count; j++) { - mst = &registered_masters[j]; + list_for_each_entry(mst, &registered_masters, node) { /* chip is still set from the chip_to_probe earlier in this function. */ if (mst->buses_supported & chip->bustype) compatible_masters++; @@ -469,8 +469,7 @@ int main(int argc, char *argv[]) if (compatible_masters > 1) msg_cinfo("More than one compatible controller found for the requested flash " "chip, using the first one.\n"); - for (j = 0; j < registered_master_count; j++) { - mst = &registered_masters[j]; + list_for_each_entry(mst, &registered_masters, node) { startchip = probe_flash(mst, 0, &flashes[0], 1); if (startchip != -1) break; diff --git a/flashrom.c b/flashrom.c index a389cb2..bd770c2 100644 --- a/flashrom.c +++ b/flashrom.c @@ -494,7 +494,6 @@ int programmer_shutdown(void) } programmer_param = NULL; - registered_master_count = 0; return ret; } diff --git a/list.h b/list.h new file mode 100644 index 0000000..7567742 --- /dev/null +++ b/list.h @@ -0,0 +1,130 @@ +#ifndef LIST_H +#define LIST_H + +/* + * Copied from include/linux/... + */ + +#undef offsetof +#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) + +/** + * container_of - cast a member of a structure out to the containing structure + * @ptr: the pointer to the member. + * @type: the type of the container struct this is embedded in. + * @member: the name of the member within the struct. + * + */ +#define container_of(ptr, type, member) ({ \ + const typeof( ((type *)0)->member ) *__mptr = (ptr); \ + (type *)( (char *)__mptr - offsetof(type,member) );}) + + +struct list_head { + struct list_head *next, *prev; +}; + +#define LIST_HEAD_INIT(name) { &(name), &(name) } + +#define LIST_HEAD(name) \ + struct list_head name = LIST_HEAD_INIT(name) + +/** + * list_entry - get the struct for this entry + * @ptr: the &struct list_head pointer. + * @type: the type of the struct this is embedded in. + * @member: the name of the list_head within the struct. + */ +#define list_entry(ptr, type, member) \ + container_of(ptr, type, member) + +/** + * list_for_each_entry - iterate over list of given type + * @pos: the type * to use as a loop cursor. + * @head: the head for your list. + * @member: the name of the list_head within the struct. + */ +#define list_for_each_entry(pos, head, member) \ + for (pos = list_entry((head)->next, typeof(*pos), member); \ + &pos->member != (head); \ + pos = list_entry(pos->member.next, typeof(*pos), member)) + +/** + * list_for_each_entry_safe - iterate over list of given type safe against removal of list entry + * @pos: the type * to use as a loop cursor. + * @n: another type * to use as temporary storage + * @head: the head for your list. + * @member: the name of the list_head within the struct. + */ +#define list_for_each_entry_safe(pos, n, head, member) \ + for (pos = list_entry((head)->next, typeof(*pos), member), \ + n = list_entry(pos->member.next, typeof(*pos), member); \ + &pos->member != (head); \ + pos = n, n = list_entry(n->member.next, typeof(*n), member)) + +/** + * list_empty - tests whether a list is empty + * @head: the list to test. + */ +static inline int list_empty(const struct list_head *head) +{ + return head->next == head; +} + +/* + * Insert a new entry between two known consecutive entries. + * + * This is only for internal list manipulation where we know + * the prev/next entries already! + */ +static inline void __list_add(struct list_head *_new, + struct list_head *prev, + struct list_head *next) +{ + next->prev = _new; + _new->next = next; + _new->prev = prev; + prev->next = _new; +} + +/** + * list_add_tail - add a new entry + * @new: new entry to be added + * @head: list head to add it before + * + * Insert a new entry before the specified head. + * This is useful for implementing queues. + */ +static inline void list_add_tail(struct list_head *_new, struct list_head *head) +{ + __list_add(_new, head->prev, head); +} + +/* + * Delete a list entry by making the prev/next entries + * point to each other. + * + * This is only for internal list manipulation where we know + * the prev/next entries already! + */ +static inline void __list_del(struct list_head *prev, struct list_head *next) +{ + next->prev = prev; + prev->next = next; +} + +#define LIST_POISON1 ((void *) 0x00100100) +#define LIST_POISON2 ((void *) 0x00200200) +/** + * list_del - deletes entry from list. + * @entry: the element to delete from the list. + * Note: list_empty() on entry does not return true after this, the entry is + * in an undefined state. + */ +static inline void list_del(struct list_head *entry) +{ + __list_del(entry->prev, entry->next); + entry->next = (struct list_head*)LIST_POISON1; + entry->prev = (struct list_head*)LIST_POISON2; +} +#endif diff --git a/programmer.c b/programmer.c index 1b27c3c..2a5df92 100644 --- a/programmer.c +++ b/programmer.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ +#include <malloc.h> +#include <string.h> #include "flash.h" #include "programmer.h" @@ -114,31 +116,28 @@ int register_par_master(const struct par_master *mst, } /* The limit of 4 is totally arbitrary. */ -#define MASTERS_MAX 4 -struct registered_master registered_masters[MASTERS_MAX]; -int registered_master_count = 0; +LIST_HEAD(registered_masters); /* This function copies the struct registered_master parameter. */ -int register_master(const struct registered_master *mst) +int register_master(struct registered_master *mst) { - if (registered_master_count >= MASTERS_MAX) { - msg_perr("Tried to register more than %i master " - "interfaces.\n", MASTERS_MAX); - return ERROR_FLASHROM_LIMIT; - } - registered_masters[registered_master_count] = *mst; - registered_master_count++; + struct registered_master *t; + + t = malloc(sizeof(struct registered_master)); + memcpy(t, mst, sizeof(struct registered_master)); + list_add_tail(&t->node, &registered_masters); return 0; } enum chipbustype get_buses_supported(void) { - int i; + struct registered_master *mst; enum chipbustype ret = BUS_NONE; - for (i = 0; i < registered_master_count; i++) - ret |= registered_masters[i].buses_supported; + list_for_each_entry(mst, &registered_masters, node) { + ret |= mst->buses_supported; + } return ret; } diff --git a/programmer.h b/programmer.h index 913522b..54d5634 100644 --- a/programmer.h +++ b/programmer.h @@ -25,6 +25,7 @@ #define __PROGRAMMER_H__ 1 #include "flash.h" /* for chipaddr and flashctx */ +#include "list.h" enum programmer { #if CONFIG_INTERNAL == 1 @@ -691,6 +692,7 @@ struct par_master { }; int register_par_master(const struct par_master *mst, const enum chipbustype buses); struct registered_master { + struct list_head node; enum chipbustype buses_supported; union { struct par_master par; @@ -698,9 +700,8 @@ struct registered_master { struct opaque_master opaque; }; }; -extern struct registered_master registered_masters[]; -extern int registered_master_count; -int register_master(const struct registered_master *mst); +extern struct list_head registered_masters; +int register_master(struct registered_master *mst); /* serprog.c */ #if CONFIG_SERPROG == 1 -- 2.1.4

2 2

W836xx: Lenovo X60 1709-7HU : flashrom -V
by Stevan C. 16 Jun '15

16 Jun '15

flashrom v0.9.8-unknown on Linux 3.2.45-smp (i686) flashrom is free software, get the source code at http://www.flashrom.org flashrom was built with libpci 3.2.1, GCC 4.8.2, little endian Command line (3 args): ./flashrom/i686/flashrom -V -p internal Calibrating delay loop... OS timer resolution is 2 usecs, 906M loops per second, 10 myus = 11 us, 100 myus = 100 us, 1000 myus = 1005 us, 10000 myus = 9998 us, 8 myus = 9 us, OK. Initializing internal programmer No coreboot table found. Using Internal DMI decoder. DMI string chassis-type: "Notebook" Laptop detected via DMI. DMI string system-manufacturer: "LENOVO" DMI string system-product-name: "17097HU" DMI string system-version: "ThinkPad X60" DMI string baseboard-manufacturer: "LENOVO" DMI string baseboard-product-name: "17097HU" DMI string baseboard-version: "Not Available" W836xx enter config mode worked or we were already in config mode. W836xx leave config mode had no effect. Active config mode, unknown reg 0x20 ID: ea. Please send the output of "flashrom -V -p internal" to flashrom(a)flashrom.org with W836xx: your board name: flashrom -V as the subject to help us finish support for your Super I/O. Thanks. Whitelisted laptop detected. Found chipset "Intel ICH7M" with PCI ID 8086:27b9. Enabling flash write... Root Complex Register Block address = 0xfed1c000 GCS = 0x460: BIOS Interface Lock-Down: disabled, Boot BIOS Straps: 0x1 (SPI) Top Swap: not enabled 0xfff80000/0xffb80000 FWH IDSEL: 0x0 0xfff00000/0xffb00000 FWH IDSEL: 0x0 0xffe80000/0xffa80000 FWH IDSEL: 0x1 0xffe00000/0xffa00000 FWH IDSEL: 0x1 0xffd80000/0xff980000 FWH IDSEL: 0x1 0xffd00000/0xff900000 FWH IDSEL: 0x2 0xffc80000/0xff880000 FWH IDSEL: 0x4 0xffc00000/0xff800000 FWH IDSEL: 0x4 0xff700000/0xff300000 FWH IDSEL: 0x4 0xff600000/0xff200000 FWH IDSEL: 0x5 0xff500000/0xff100000 FWH IDSEL: 0x6 0xff400000/0xff000000 FWH IDSEL: 0x7 0xfff80000/0xffb80000 FWH decode enabled 0xfff00000/0xffb00000 FWH decode enabled 0xffe80000/0xffa80000 FWH decode enabled 0xffe00000/0xffa00000 FWH decode enabled 0xffd80000/0xff980000 FWH decode enabled 0xffd00000/0xff900000 FWH decode enabled 0xffc80000/0xff880000 FWH decode enabled 0xffc00000/0xff800000 FWH decode enabled 0xff700000/0xff300000 FWH decode disabled 0xff600000/0xff200000 FWH decode disabled 0xff500000/0xff100000 FWH decode disabled 0xff400000/0xff000000 FWH decode disabled Maximum FWH chip size: 0x100000 bytes SPI Read Configuration: prefetching disabled, caching enabled, BIOS_CNTL = 0x01: BIOS Lock Enable: disabled, BIOS Write Enable: enabled SPIBAR = 0xb763f000 + 0x3020 0x00: 0x8004 (SPIS) 0x02: 0x4140 (SPIC) 0x04: 0x00000000 (SPIA) 0x50: 0x00000000 (BBAR) 0x54: 0x5006 (PREOP) 0x56: 0x163b (OPTYPE) 0x58: 0x05d80302 (OPMENU) 0x5c: 0x0001d8ab (OPMENU+4) 0x60: 0x80fff1f0 (PBR0) 0x64: 0x00000000 (PBR1) 0x68: 0x00000000 (PBR2) Reading OPCODES... done OK. The following protocols are supported: FWH, SPI. Probing for AMIC A25L05PT, 64 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L05PU, 64 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L10PT, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L10PU, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L20PT, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L20PU, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L40PT, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L40PU, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L80P, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L16PT, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L16PU, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L512, 64 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L010, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L020, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L040, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L080, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L016, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25L032, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25LQ16, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25LQ032/A25LQ32A, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for AMIC A25LQ64, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT25DF021, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT25DF041A, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT25DF081, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT25DF081A, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT25DF161, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT25DF321, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT25DF321A, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT25DF641(A), 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT25DL081, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT25DL161, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT25DQ161, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT25F512, 64 kB: Invalid OPCODE 0x15, will not execute. Probing for Atmel AT25F512A, 64 kB: Invalid OPCODE 0x15, will not execute. Probing for Atmel AT25F512B, 64 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT25F1024(A), 128 kB: Invalid OPCODE 0x15, will not execute. Probing for Atmel AT25F2048, 256 kB: Invalid OPCODE 0x15, will not execute. Probing for Atmel AT25F4096, 512 kB: Invalid OPCODE 0x15, will not execute. Probing for Atmel AT25FS010, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT25FS040, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT26DF041, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT26DF081A, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT26DF161, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT26DF161A, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT26F004, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT45CS1282, 16896 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT45DB011D, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT45DB021D, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT45DB041D, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT45DB081D, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT45DB161D, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT45DB321C, 4224 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT45DB321D, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT45DB321E, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel AT45DB642D, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for ESMT F25L008A, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for ESMT F25L32PA, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25B05, 64 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25B05T, 64 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25P05, 64 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25B10, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25B10T, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25P10, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25B20, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25B20T, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25P20, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25B40, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25B40T, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25P40, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25B80, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25B80T, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25P80, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25B16, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25B16T, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25P16, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25B32, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25B32T, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25P32, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25B64, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25B64T, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25P64, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25F05, 64 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25F10, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25F20, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25F40, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25F80, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25F16, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25F32, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25F64, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25Q40, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25Q80(A), 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25Q16, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25Q32(A/B), 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25Q64, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25Q128, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25QH16, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25QH32, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25QH64, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25QH128, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25S10, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25S20, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25S40, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25S80, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25S16, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25S32, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon EN25S64, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for GigaDevice GD25LQ40, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for GigaDevice GD25LQ80, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for GigaDevice GD25LQ16, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for GigaDevice GD25LQ32, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for GigaDevice GD25LQ64(B), 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for GigaDevice GD25LQ128, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for GigaDevice GD25Q512, 64 kB: Invalid OPCODE 0x9f, will not execute. Probing for GigaDevice GD25Q10, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for GigaDevice GD25Q20(B), 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for GigaDevice GD25Q40(B), 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for GigaDevice GD25Q80(B), 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for GigaDevice GD25Q16(B), 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for GigaDevice GD25Q32(B), 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for GigaDevice GD25Q64(B), 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for GigaDevice GD25Q128B, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for GigaDevice GD25T80, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Intel 25F160S33B8, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Intel 25F160S33T8, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Intel 25F320S33B8, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Intel 25F320S33T8, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Intel 25F640S33B8, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Intel 25F640S33T8, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX23L1654, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX23L3254, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX23L6454, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX23L12854, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25L512(E)/MX25V512(C), 64 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25L1005(C)/MX25L1006E, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25L2005(C)/MX25L2006E, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25L4005(A/C)/MX25L4006E, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25L8005/MX25L8006E/MX25L8008E/MX25V8005, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25L1605D/MX25L1608D/MX25L1673E, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25L1635D, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25L1635E, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25L3205D/MX25L3208D, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25L3235D, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25L6405D, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25L12805D, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25L12835F/MX25L12845E/MX25L12865E, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25U1635E, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25U3235E/F, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25U6435E/F, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25U12835F, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix MX25L6495F, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25P05-A, 64 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25P05, 64 kB: Invalid OPCODE 0x9f, will not execute. Invalid OPCODE 0x90, will not execute. probe_spi_res1: id 0xbf Probing for Micron/Numonyx/ST M25P10-A, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25P10, 128 kB: Invalid OPCODE 0x9f, will not execute. Invalid OPCODE 0x90, will not execute. probe_spi_res1: id 0xbf Probing for Micron/Numonyx/ST M25P20, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25P20-old, 256 kB: Invalid OPCODE 0x9f, will not execute. Invalid OPCODE 0x90, will not execute. probe_spi_res1: id 0xbf Probing for Micron/Numonyx/ST M25P40, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25P40-old, 512 kB: Invalid OPCODE 0x9f, will not execute. Invalid OPCODE 0x90, will not execute. probe_spi_res1: id 0xbf Probing for Micron/Numonyx/ST M25P80, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25P16, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25P32, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25P64, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25P128, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25PE10, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25PE20, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25PE40, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25PE80, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25PE16, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25PX80, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25PX16, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25PX32, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M25PX64, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M45PE10, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M45PE20, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M45PE40, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M45PE80, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST M45PE16, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST N25Q016, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST N25Q032..1E, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST N25Q032..3E, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST N25Q064..1E, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST N25Q064..3E, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST N25Q128..1E, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Micron/Numonyx/ST N25Q128..3E, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Nantronics N25S10, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for Nantronics N25S20, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for Nantronics N25S40, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Nantronics N25S80, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Nantronics N25S16, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for PMC Pm25LD256C, 32 kB: Invalid OPCODE 0x9f, will not execute. Probing for PMC Pm25LD512(C), 64 kB: Invalid OPCODE 0x9f, will not execute. Probing for PMC Pm25LD010(C), 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for PMC Pm25LD020(C), 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for PMC Pm25LD040(C), 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for PMC Pm25LV512(A), 64 kB: probe_spi_res2: id1 0xbf, id2 0x41 Probing for PMC Pm25LV010, 128 kB: probe_spi_res2: id1 0xbf, id2 0x41 Probing for PMC Pm25LV010A, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for PMC Pm25LV020, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for PMC Pm25LV040, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for PMC Pm25LV080B, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for PMC Pm25LV016B, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Sanyo LE25FW106, 128 kB: probe_spi_res2: id1 0xbf, id2 0x41 Probing for Sanyo LE25FW406A, 512 kB: probe_spi_res2: id1 0xbf, id2 0x41 Probing for Sanyo LE25FU406B, 512 kB: probe_spi_res2: id1 0xbf, id2 0x41 Probing for Sanyo LE25FW203A, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for Sanyo LE25FW403A, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Sanyo LE25FW418A, 512 kB: probe_spi_res2: id1 0xbf, id2 0x41 Probing for Sanyo LE25FW806, 1024 kB: probe_spi_res2: id1 0xbf, id2 0x41 Probing for Sanyo LE25FW808, 1024 kB: probe_spi_res2: id1 0xbf, id2 0x41 Probing for Spansion S25FL004A, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL008A, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL016A, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL032A/P, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL064A/P, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL204K, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL208K, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL116K/S25FL216K, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL132K, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL164K, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL127S-64kB, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL127S-256kB, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL128P......0, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL128P......1, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL128S......0, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL128S......1, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL129P......0, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Spansion S25FL129P......1, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for SST SST25LF020A, 256 kB: Invalid OPCODE 0x90, will not execute. Probing for SST SST25LF040A, 512 kB: probe_spi_res2: id1 0xbf, id2 0x41 Probing for SST SST25LF080(A), 1024 kB: probe_spi_res2: id1 0xbf, id2 0x41 Probing for SST SST25VF512(A), 64 kB: Invalid OPCODE 0x90, will not execute. Probing for SST SST25VF010(A), 128 kB: Invalid OPCODE 0x90, will not execute. Probing for SST SST25VF020, 256 kB: Invalid OPCODE 0x90, will not execute. Probing for SST SST25VF020B, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for SST SST25VF040, 512 kB: Invalid OPCODE 0x90, will not execute. Probing for SST SST25VF040B, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for SST SST25VF040B.REMS, 512 kB: Invalid OPCODE 0x90, will not execute. Probing for SST SST25VF080B, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for SST SST25VF016B, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for SST SST25VF032B, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for SST SST25VF064C, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for SST SST25WF512, 64 kB: Invalid OPCODE 0x9f, will not execute. Probing for SST SST25WF010, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for SST SST25WF020, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for SST SST25WF040, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for SST SST25WF080, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25Q40.V, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25Q80.V, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25Q16.V, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25Q32.V, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25Q64.V, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25Q128.V, 16384 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25Q20.W, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25Q40.W, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25Q80.W, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25Q16.W, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25Q32.W, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25Q64.W, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25X10, 128 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25X20, 256 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25X40, 512 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25X80, 1024 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25X16, 2048 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25X32, 4096 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond W25X64, 8192 kB: Invalid OPCODE 0x9f, will not execute. Probing for Unknown SFDP-capable chip, 0 kB: Invalid OPCODE 0x5a, will not execute. Receiving SFDP signature failed. Probing for AMIC unknown AMIC SPI chip, 0 kB: Invalid OPCODE 0x9f, will not execute. Probing for Atmel unknown Atmel SPI chip, 0 kB: Invalid OPCODE 0x9f, will not execute. Probing for Eon unknown Eon SPI chip, 0 kB: Invalid OPCODE 0x9f, will not execute. Probing for Macronix unknown Macronix SPI chip, 0 kB: Invalid OPCODE 0x9f, will not execute. Probing for PMC unknown PMC SPI chip, 0 kB: Invalid OPCODE 0x9f, will not execute. Probing for SST unknown SST SPI chip, 0 kB: Invalid OPCODE 0x9f, will not execute. Probing for ST unknown ST SPI chip, 0 kB: Invalid OPCODE 0x9f, will not execute. Probing for Sanyo unknown Sanyo SPI chip, 0 kB: Invalid OPCODE 0x9f, will not execute. Probing for Winbond unknown Winbond (ex Nexcom) SPI chip, 0 kB: Invalid OPCODE 0x9f, will not execute. Probing for Generic unknown SPI chip (RDID), 0 kB: Invalid OPCODE 0x9f, will not execute. Probing for Generic unknown SPI chip (REMS), 0 kB: Invalid OPCODE 0x90, will not execute. Probing for Atmel AT49LH002, 256 kB: probe_82802ab: id1 0x75, id2 0xc1, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT49LH00B4, 512 kB: probe_82802ab: id1 0x5f, id2 0x5e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Atmel AT49LH004, 512 kB: probe_82802ab: id1 0x5f, id2 0x5e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 82802AB, 512 kB: probe_82802ab: id1 0x5f, id2 0x5e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Intel 82802AC, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm49FL002, 256 kB: probe_jedec_common: id1 0x75, id2 0xc1, id1 is normal flash content, id2 is normal flash content Probing for PMC Pm49FL004, 512 kB: probe_jedec_common: id1 0x5f, id2 0x5e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Sharp LHF00L04, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF002A/B, 256 kB: probe_jedec_common: id1 0x75, id2 0xc1, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF003A/B, 384 kB: probe_jedec_common: id1 0x97, id2 0xdb, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF004A/B, 512 kB: probe_jedec_common: id1 0x5f, id2 0x5e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF004C, 512 kB: probe_82802ab: id1 0x5f, id2 0x5e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF008A, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF008C, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for SST SST49LF016C, 2048 kB: probe_82802ab: id1 0x4e, id2 0x41, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040A, 512 kB: probe_82802ab: id1 0x5f, id2 0x5e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW040B, 512 kB: probe_82802ab: id1 0x5f, id2 0x5e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW080A, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FLW080B, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW002, 256 kB: probe_82802ab: id1 0x75, id2 0xc1, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW016, 2048 kB: probe_82802ab: id1 0x4e, id2 0x41, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW040, 512 kB: probe_82802ab: id1 0x5f, id2 0x5e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for ST M50FW080, 1024 kB: probe_82802ab: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040FA, 512 kB: probe_jedec_common: id1 0x5f, id2 0x5e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040FB, 512 kB: probe_jedec_common: id1 0x5f, id2 0x5e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V040FC, 512 kB: probe_jedec_common: id1 0x5f, id2 0x5e, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W49V002FA, 256 kB: probe_jedec_common: id1 0x75, id2 0xc1, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V080FA, 1024 kB: probe_jedec_common: id1 0xff, id2 0xff, id1 parity violation, id1 is normal flash content, id2 is normal flash content Probing for Winbond W39V080FA (dual mode), 512 kB: probe_jedec_common: id1 0x5f, id2 0x5e, id1 parity violation, id1 is normal flash content, id2 is normal flash content No EEPROM/flash device found. Note: flashrom can never write if the flash chip isn't found automatically. Restoring MMIO space at 0xb7642071

1 0

FAILED: Intel Broadwell U Premium based board
by Denis Turischev 14 Jun '15

14 Jun '15

Hi Stefan, I have Intel Broadwell U Premium based board, with BIOS on 2 Winbond W39V080FA SPI flashes (2x8M=16M). I can read such bios without errors, but write fails. Logs attached. Can you please point me where to debug? Denis

1 1

← Newer
1
2
3
4
5
6
7
8
9
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom June 2015