- flashrom-gerrit - mail.coreboot.org

Change in flashrom[master]: programmer_table: convert entries to pointers
by Thomas Heijligen (Code Review) 02 Jun '21

02 Jun '21

Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52945 ) Change subject: programmer_table: convert entries to pointers ...................................................................... Set Ready For Review -- To view, visit https://review.coreboot.org/c/flashrom/+/52945 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ifbb0ee4db5a85b1cd2afeafe4dca838579f79878 Gerrit-Change-Number: 52945 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Tue, 01 Jun 2021 14:30:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: programmer_table: move array content to an own file
by Thomas Heijligen (Code Review) 02 Jun '21

02 Jun '21

Thomas Heijligen has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/52944 ) Change subject: programmer_table: move array content to an own file ...................................................................... Set Ready For Review -- To view, visit https://review.coreboot.org/c/flashrom/+/52944 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8e6d704e845ee4152c8676dd19dff0934fff007b Gerrit-Change-Number: 52944 Gerrit-PatchSet: 2 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Tue, 01 Jun 2021 14:30:35 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in flashrom[master]: enum programmer: not needed anymore. Remove
by Thomas Heijligen (Code Review) 02 Jun '21

02 Jun '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/55124 ) Change subject: enum programmer: not needed anymore. Remove ...................................................................... enum programmer: not needed anymore. Remove Change-Id: I53cdb160616911a4beea6b5e8e56d582621818a4 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M flashrom.c M programmer.h 2 files changed, 0 insertions(+), 128 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/24/55124/1 diff --git a/flashrom.c b/flashrom.c index faf90c2..c0f8488 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1710,13 +1710,6 @@ unsigned int i; int ret = 0; - /* Safety check. Instead of aborting after the first error, check - * if more errors exist. - */ - if (programmer_table_size != PROGRAMMER_INVALID) { - msg_gerr("Programmer table miscompilation!\n"); - ret = 1; - } for (i = 0; i < programmer_table_size; i++) { const struct programmer_entry *p = programmer_table[i]; if (p->name == NULL) { diff --git a/programmer.h b/programmer.h index bac4733..c1d5b90 100644 --- a/programmer.h +++ b/programmer.h @@ -24,127 +24,6 @@ #include "flash.h" /* for chipaddr and flashctx */ -enum programmer { -#if CONFIG_INTERNAL == 1 - PROGRAMMER_INTERNAL, -#endif -#if CONFIG_DUMMY == 1 - PROGRAMMER_DUMMY, -#endif -#if CONFIG_MEC1308 == 1 - PROGRAMMER_MEC1308, -#endif -#if CONFIG_NIC3COM == 1 - PROGRAMMER_NIC3COM, -#endif -#if CONFIG_NICREALTEK == 1 - PROGRAMMER_NICREALTEK, -#endif -#if CONFIG_NICNATSEMI == 1 - PROGRAMMER_NICNATSEMI, -#endif -#if CONFIG_GFXNVIDIA == 1 - PROGRAMMER_GFXNVIDIA, -#endif -#if CONFIG_RAIDEN_DEBUG_SPI == 1 - PROGRAMMER_RAIDEN_DEBUG_SPI, -#endif -#if CONFIG_DRKAISER == 1 - PROGRAMMER_DRKAISER, -#endif -#if CONFIG_SATASII == 1 - PROGRAMMER_SATASII, -#endif -#if CONFIG_ATAHPT == 1 - PROGRAMMER_ATAHPT, -#endif -#if CONFIG_ATAVIA == 1 - PROGRAMMER_ATAVIA, -#endif -#if CONFIG_ATAPROMISE == 1 - PROGRAMMER_ATAPROMISE, -#endif -#if CONFIG_IT8212 == 1 - PROGRAMMER_IT8212, -#endif -#if CONFIG_FT2232_SPI == 1 - PROGRAMMER_FT2232_SPI, -#endif -#if CONFIG_SERPROG == 1 - PROGRAMMER_SERPROG, -#endif -#if CONFIG_BUSPIRATE_SPI == 1 - PROGRAMMER_BUSPIRATE_SPI, -#endif -#if CONFIG_DEDIPROG == 1 - PROGRAMMER_DEDIPROG, -#endif -#if CONFIG_DEVELOPERBOX_SPI == 1 - PROGRAMMER_DEVELOPERBOX_SPI, -#endif -#if CONFIG_ENE_LPC == 1 - PROGRAMMER_ENE_LPC, -#endif -#if CONFIG_RAYER_SPI == 1 - PROGRAMMER_RAYER_SPI, -#endif -#if CONFIG_PONY_SPI == 1 - PROGRAMMER_PONY_SPI, -#endif -#if CONFIG_NICINTEL == 1 - PROGRAMMER_NICINTEL, -#endif -#if CONFIG_NICINTEL_SPI == 1 - PROGRAMMER_NICINTEL_SPI, -#endif -#if CONFIG_NICINTEL_EEPROM == 1 - PROGRAMMER_NICINTEL_EEPROM, -#endif -#if CONFIG_OGP_SPI == 1 - PROGRAMMER_OGP_SPI, -#endif -#if CONFIG_SATAMV == 1 - PROGRAMMER_SATAMV, -#endif -#if CONFIG_LINUX_MTD == 1 - PROGRAMMER_LINUX_MTD, -#endif -#if CONFIG_LINUX_SPI == 1 - PROGRAMMER_LINUX_SPI, -#endif -#if CONFIG_USBBLASTER_SPI == 1 - PROGRAMMER_USBBLASTER_SPI, -#endif -#if CONFIG_MSTARDDC_SPI == 1 - PROGRAMMER_MSTARDDC_SPI, -#endif -#if CONFIG_PICKIT2_SPI == 1 - PROGRAMMER_PICKIT2_SPI, -#endif -#if CONFIG_CH341A_SPI == 1 - PROGRAMMER_CH341A_SPI, -#endif -#if CONFIG_DIGILENT_SPI == 1 - PROGRAMMER_DIGILENT_SPI, -#endif -#if CONFIG_JLINK_SPI == 1 - PROGRAMMER_JLINK_SPI, -#endif -#if CONFIG_NI845X_SPI == 1 - PROGRAMMER_NI845X_SPI, -#endif -#if CONFIG_STLINKV3_SPI == 1 - PROGRAMMER_STLINKV3_SPI, -#endif -#if CONFIG_LSPCON_I2C_SPI == 1 - PROGRAMMER_LSPCON_I2C_SPI, -#endif -#if CONFIG_REALTEK_MST_I2C_SPI == 1 - PROGRAMMER_REALTEK_MST_I2C_SPI, -#endif - PROGRAMMER_INVALID /* This must always be the last entry. */ -}; - enum programmer_type { PCI = 1, /* to detect uninitialized values */ USB, -- To view, visit https://review.coreboot.org/c/flashrom/+/55124 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I53cdb160616911a4beea6b5e8e56d582621818a4 Gerrit-Change-Number: 55124 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: default programmer: use programmer name instead of enum for default p...
by Thomas Heijligen (Code Review) 02 Jun '21

02 Jun '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/55123 ) Change subject: default programmer: use programmer name instead of enum for default programmer ...................................................................... default programmer: use programmer name instead of enum for default programmer Change-Id: I976447787c6f6bfbdc0145d80d61e1ddcf97ac33 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M Makefile M cli_classic.c M meson.build M meson_options.txt M tests/init_shutdown.c M util/manibuilder/README.md 6 files changed, 39 insertions(+), 16 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/23/55123/1 diff --git a/Makefile b/Makefile index 4eb4191..4f60d0b 100644 --- a/Makefile +++ b/Makefile @@ -44,14 +44,12 @@ # system attached to an external programmer while the default programmer is set to the internal programmer, and # you forget to use the -p parameter. This would (try to) overwrite the existing firmware of the computer # running flashrom). Please do not enable this without thinking about the possible consequences. Possible -# values are those specified in enum programmer in programmer.h (which depend on other CONFIG_* options -# evaluated below, namely those that enable/disable the various programmers). -# Compilation will fail for unspecified values. -CONFIG_DEFAULT_PROGRAMMER ?= PROGRAMMER_INVALID +# values can be found when running 'flashrom --list-supported' under the 'Supported programmers' section. +CONFIG_DEFAULT_PROGRAMMER_NAME ?= # The following adds a default parameter for the default programmer set above (only). -CONFIG_DEFAULT_PROGRAMMER_ARGS ?= '' +CONFIG_DEFAULT_PROGRAMMER_ARGS ?= # Example: compiling with -# make CONFIG_DEFAULT_PROGRAMMER=PROGRAMMER_SERPROG CONFIG_DEFAULT_PROGRAMMER_ARGS="dev=/dev/ttyUSB0:1500000" +# make CONFIG_DEFAULT_PROGRAMMER_NAME=serprog CONFIG_DEFAULT_PROGRAMMER_ARGS="dev=/dev/ttyUSB0:1500000" # would make executing './flashrom' (almost) equivialent to './flashrom -p serprog:dev=/dev/ttyUSB0:1500000'. # If your compiler spits out excessive warnings, run make WARNERROR=no @@ -868,8 +866,12 @@ # Programmer drivers and programmer support infrastructure. # Depending on the CONFIG_* variables set and verified above we set compiler flags and parameters below. -FEATURE_CFLAGS += -D'CONFIG_DEFAULT_PROGRAMMER=$(CONFIG_DEFAULT_PROGRAMMER)' +ifdef CONFIG_DEFAULT_PROGRAMMER_NAME +FEATURE_CFLAGS += -D'CONFIG_DEFAULT_PROGRAMMER_NAME=$(CONFIG_DEFAULT_PROGRAMMER_NAME)' +endif +ifdef CONFIG_DEFAULT_PROGRAMMER_ARGS FEATURE_CFLAGS += -D'CONFIG_DEFAULT_PROGRAMMER_ARGS="$(CONFIG_DEFAULT_PROGRAMMER_ARGS)"' +endif ifeq ($(CONFIG_INTERNAL), yes) FEATURE_CFLAGS += -D'CONFIG_INTERNAL=1' diff --git a/cli_classic.c b/cli_classic.c index 4537e1e..49bec6d 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -172,7 +172,6 @@ int read_it = 0, extract_it = 0, write_it = 0, erase_it = 0, verify_it = 0; int dont_verify_it = 0, dont_verify_all = 0, list_supported = 0, operation_specified = 0; struct flashrom_layout *layout = NULL; - // enum programmer prog = PROGRAMMER_INVALID; static const struct programmer_entry *prog = NULL; enum { OPTION_IFD = 0x0100, @@ -544,12 +543,24 @@ } if (prog == NULL) { - if (CONFIG_DEFAULT_PROGRAMMER != PROGRAMMER_INVALID) { - prog = programmer_table[CONFIG_DEFAULT_PROGRAMMER]; + #ifdef CONFIG_DEFAULT_PROGRAMMER_NAME + #define PASTER(x) &programmer_ ## x + #define EVALUATOR(x) PASTER(x) + static const struct programmer_entry *default_programmer = EVALUATOR(CONFIG_DEFAULT_PROGRAMMER_NAME); + #else + static const struct programmer_entry *default_programmer = NULL; + #endif + + #ifndef CONFIG_DEFAULT_PROGRAMMER_ARGS + #define CONFIG_DEFAULT_PROGRAMMER_ARGS "" + #endif + + if (default_programmer) { + prog = default_programmer; /* We need to strdup here because we free(pparam) unconditionally later. */ pparam = strdup(CONFIG_DEFAULT_PROGRAMMER_ARGS); msg_pinfo("Using default programmer \"%s\" with arguments \"%s\".\n", - programmer_table[CONFIG_DEFAULT_PROGRAMMER]->name, pparam); + default_programmer->name, pparam); } else { msg_perr("Please select a programmer with the --programmer parameter.\n" #if CONFIG_INTERNAL == 1 diff --git a/meson.build b/meson.build index 1912605..0ce75b7 100644 --- a/meson.build +++ b/meson.build @@ -69,6 +69,8 @@ config_lspcon_i2c_spi = get_option('config_lspcon_i2c_spi') config_realtek_mst_i2c_spi = get_option('config_realtek_mst_i2c_spi') config_print_wiki= get_option('print_wiki') +config_default_programmer_name = get_option('default_programmer_name') +config_default_programmer_args = get_option('default_programmer_args') cargs = [] deps = [] @@ -436,6 +438,14 @@ cargs += '-DCONFIG_PRINT_WIKI=1' endif +if config_default_programmer_name != '' + cargs += '-DCONFIG_DEFAULT_PROGRAMMER_NAME=' + config_default_programmer_name +endif + +if config_default_programmer_args != '' + cargs += '-DCONFIG_DEFAULT_PROGRAMMER_ARGS=' + config_default_programmer_args +endif + # we can't just link_with libflashrom as we require all the internal symbols... executable( 'flashrom', @@ -450,9 +460,7 @@ deps, ], c_args : [ - cargs, - '-DCONFIG_DEFAULT_PROGRAMMER=PROGRAMMER_INVALID', - '-DCONFIG_DEFAULT_PROGRAMMER_ARGS=""', + cargs ], install : true, install_dir : sbindir, diff --git a/meson_options.txt b/meson_options.txt index cd92f10..86a38c8 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,8 @@ option('pciutils', type : 'boolean', value : true, description : 'use pciutils') option('usb', type : 'boolean', value : true, description : 'use libusb1') option('print_wiki', type : 'boolean', value : true, description : 'Print Wiki') +option('default_programmer_name', type : 'string', description : 'default programmer') +option('default_programmer_args', type : 'string', description : 'default programmer arguments') option('config_atahpt', type : 'boolean', value : false, description : 'Highpoint (HPT) ATA/RAID controllers') option('config_atapromise', type : 'boolean', value : false, description : 'Promise ATA controller') diff --git a/tests/init_shutdown.c b/tests/init_shutdown.c index 85c29e2..e9977c5 100644 --- a/tests/init_shutdown.c +++ b/tests/init_shutdown.c @@ -44,5 +44,5 @@ * and the fallback to getpagesize(). This test does the latter (fallback to * getpagesize). */ - run_lifecycle(state, PROGRAMMER_LINUX_SPI, "dev=/dev/null"); + run_lifecycle(state, &programmer_linux_spi, "dev=/dev/null"); } diff --git a/util/manibuilder/README.md b/util/manibuilder/README.md index b00d618..193cd29 100644 --- a/util/manibuilder/README.md +++ b/util/manibuilder/README.md @@ -63,7 +63,7 @@ [...] mani@63536fc102a5:~/flashrom$ make [...] - cc -MMD -Os -Wall -Wshadow -Werror -I/usr/include/libusb-1.0 -D'CONFIG_DEFAULT_PROGRAMMER=PROGRAMMER_INVALID' -D'CONFIG_DEFAULT_PROGRAMMER_ARGS="''"' -D'CONFIG_SERPROG=1' -D'CONFIG_PONY_SPI=1' -D'CONFIG_BITBANG_SPI=1' -D'CONFIG_GFXNVIDIA=1' -D'CONFIG_SATASII=1' -D'CONFIG_ATAVIA=1' -D'CONFIG_IT8212=1' -D'CONFIG_FT2232_SPI=1' -D'CONFIG_USBBLASTER_SPI=1' -D'CONFIG_PICKIT2_SPI=1' -D'HAVE_FT232H=1' -D'CONFIG_DUMMY=1' -D'CONFIG_DRKAISER=1' -D'CONFIG_NICINTEL=1' -D'CONFIG_NICINTEL_SPI=1' -D'CONFIG_NICINTEL_EEPROM=1' -D'CONFIG_OGP_SPI=1' -D'CONFIG_BUSPIRATE_SPI=1' -D'CONFIG_DEDIPROG=1' -D'CONFIG_DEVELOPERBOX_SPI=1' -D'CONFIG_LINUX_MTD=1' -D'CONFIG_LINUX_SPI=1' -D'CONFIG_CH341A_SPI=1' -D'CONFIG_DIGILENT_SPI=1' -D'NEED_PCI=1' -D'NEED_RAW_ACCESS=1' -D'NEED_LIBUSB0=1' -D'NEED_LIBUSB1=1' -D'HAVE_UTSNAME=1' -D'HAVE_CLOCK_GETTIME=1' -D'FLASHROM_VERSION="p1.0-141-g9cecc7e"' -o libflashrom.o -c libflashrom.c + cc -MMD -Os -Wall -Wshadow -Werror -I/usr/include/libusb-1.0 -D'CONFIG_SERPROG=1' -D'CONFIG_PONY_SPI=1' -D'CONFIG_BITBANG_SPI=1' -D'CONFIG_GFXNVIDIA=1' -D'CONFIG_SATASII=1' -D'CONFIG_ATAVIA=1' -D'CONFIG_IT8212=1' -D'CONFIG_FT2232_SPI=1' -D'CONFIG_USBBLASTER_SPI=1' -D'CONFIG_PICKIT2_SPI=1' -D'HAVE_FT232H=1' -D'CONFIG_DUMMY=1' -D'CONFIG_DRKAISER=1' -D'CONFIG_NICINTEL=1' -D'CONFIG_NICINTEL_SPI=1' -D'CONFIG_NICINTEL_EEPROM=1' -D'CONFIG_OGP_SPI=1' -D'CONFIG_BUSPIRATE_SPI=1' -D'CONFIG_DEDIPROG=1' -D'CONFIG_DEVELOPERBOX_SPI=1' -D'CONFIG_LINUX_MTD=1' -D'CONFIG_LINUX_SPI=1' -D'CONFIG_CH341A_SPI=1' -D'CONFIG_DIGILENT_SPI=1' -D'NEED_PCI=1' -D'NEED_RAW_ACCESS=1' -D'NEED_LIBUSB0=1' -D'NEED_LIBUSB1=1' -D'HAVE_UTSNAME=1' -D'HAVE_CLOCK_GETTIME=1' -D'FLASHROM_VERSION="p1.0-141-g9cecc7e"' -o libflashrom.o -c libflashrom.c libflashrom.c:386:12: error: 'flashrom_layout_parse_fmap' defined but not used [-Werror=unused-function] static int flashrom_layout_parse_fmap(struct flashrom_layout **layout, ^~~~~~~~~~~~~~~~~~~~~~~~~~ -- To view, visit https://review.coreboot.org/c/flashrom/+/55123 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I976447787c6f6bfbdc0145d80d61e1ddcf97ac33 Gerrit-Change-Number: 55123 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: cli_classic: replace enum programmer by programmer_entry*
by Thomas Heijligen (Code Review) 02 Jun '21

02 Jun '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/55122 ) Change subject: cli_classic: replace enum programmer by programmer_entry* ...................................................................... cli_classic: replace enum programmer by programmer_entry* Change-Id: I4c45f278addeea0d486a316435e8dc15d93cbd70 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M cli_classic.c 1 file changed, 12 insertions(+), 8 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/22/55122/1 diff --git a/cli_classic.c b/cli_classic.c index ba6885c..4537e1e 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -172,7 +172,8 @@ int read_it = 0, extract_it = 0, write_it = 0, erase_it = 0, verify_it = 0; int dont_verify_it = 0, dont_verify_all = 0, list_supported = 0, operation_specified = 0; struct flashrom_layout *layout = NULL; - enum programmer prog = PROGRAMMER_INVALID; + // enum programmer prog = PROGRAMMER_INVALID; + static const struct programmer_entry *prog = NULL; enum { OPTION_IFD = 0x0100, OPTION_FMAP, @@ -399,15 +400,16 @@ #endif break; case 'p': - if (prog != PROGRAMMER_INVALID) { + if (prog != NULL) { cli_classic_abort_usage("Error: --programmer specified " "more than once. You can separate " "multiple\nparameters for a programmer " "with \",\". Please see the man page " "for details.\n"); } - for (prog = 0; prog < programmer_table_size; prog++) { - name = programmer_table[prog]->name; + size_t p; + for (p = 0; p < programmer_table_size; p++) { + name = programmer_table[p]->name; namelen = strlen(name); if (strncmp(optarg, name, namelen) == 0) { switch (optarg[namelen]) { @@ -417,8 +419,10 @@ free(pparam); pparam = NULL; } + prog = programmer_table[p]; break; case '\0': + prog = programmer_table[p]; break; default: /* The continue refers to the @@ -431,7 +435,7 @@ break; } } - if (prog == PROGRAMMER_INVALID) { + if (prog == NULL) { fprintf(stderr, "Error: Unknown programmer \"%s\". Valid choices are:\n", optarg); list_programmers_linebreak(0, 80, 0); @@ -539,9 +543,9 @@ /* Keep chip around for later usage in case a forced read is requested. */ } - if (prog == PROGRAMMER_INVALID) { + if (prog == NULL) { if (CONFIG_DEFAULT_PROGRAMMER != PROGRAMMER_INVALID) { - prog = CONFIG_DEFAULT_PROGRAMMER; + prog = programmer_table[CONFIG_DEFAULT_PROGRAMMER]; /* We need to strdup here because we free(pparam) unconditionally later. */ pparam = strdup(CONFIG_DEFAULT_PROGRAMMER_ARGS); msg_pinfo("Using default programmer \"%s\" with arguments \"%s\".\n", @@ -562,7 +566,7 @@ /* FIXME: Delay calibration should happen in programmer code. */ myusec_calibrate_delay(); - if (programmer_init(programmer_table[prog], pparam)) { + if (programmer_init(prog, pparam)) { msg_perr("Error: Programmer initialization failed.\n"); ret = 1; goto out_shutdown; -- To view, visit https://review.coreboot.org/c/flashrom/+/55122 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I4c45f278addeea0d486a316435e8dc15d93cbd70 Gerrit-Change-Number: 55122 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: programmer_init: use struct programmer_entry*
by Thomas Heijligen (Code Review) 02 Jun '21

02 Jun '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/55121 ) Change subject: programmer_init: use struct programmer_entry* ...................................................................... programmer_init: use struct programmer_entry* Change-Id: Iacf0f25abc94a84c5d52c8d69a3e8640817b060a Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M cli_classic.c M flashrom.c M libflashrom.c M programmer.h M tests/init_shutdown.c 5 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/21/55121/1 diff --git a/cli_classic.c b/cli_classic.c index f3ae123..ba6885c 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -562,7 +562,7 @@ /* FIXME: Delay calibration should happen in programmer code. */ myusec_calibrate_delay(); - if (programmer_init(prog, pparam)) { + if (programmer_init(programmer_table[prog], pparam)) { msg_perr("Error: Programmer initialization failed.\n"); ret = 1; goto out_shutdown; diff --git a/flashrom.c b/flashrom.c index 65fa559..faf90c2 100644 --- a/flashrom.c +++ b/flashrom.c @@ -130,15 +130,15 @@ return rc; } -int programmer_init(enum programmer prog, const char *param) +int programmer_init(const struct programmer_entry *prog, const char *param) { int ret; - if (prog >= programmer_table_size) { + if (prog == NULL) { msg_perr("Invalid programmer specified!\n"); return -1; } - programmer = programmer_table[prog]; + programmer = prog; /* Initialize all programmer specific data. */ /* Default to unlimited decode sizes. */ max_rom_decode = (const struct decode_sizes) { @@ -1582,7 +1582,7 @@ const char *pname; int pnamelen; int remaining = 0, firstline = 1; - int p; + size_t p; int i; for (p = 0; p < programmer_table_size; p++) { diff --git a/libflashrom.c b/libflashrom.c index 29a5d2c..d681f9e 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -119,7 +119,7 @@ */ const char **flashrom_supported_programmers(void) { - int p = 0; + size_t p = 0; const char **supported_programmers = malloc((programmer_table_size + 1) * sizeof(char*)); if (supported_programmers != NULL) { @@ -287,7 +287,7 @@ list_programmers_linebreak(0, 80, 0); return 1; } - return programmer_init(prog, prog_param); + return programmer_init(programmer_table[prog], prog_param); } /** diff --git a/programmer.h b/programmer.h index fa00376..bac4733 100644 --- a/programmer.h +++ b/programmer.h @@ -178,7 +178,7 @@ extern const struct programmer_entry *programmer_table[]; extern const size_t programmer_table_size; -int programmer_init(enum programmer prog, const char *param); +int programmer_init(const struct programmer_entry *prog, const char *param); int programmer_shutdown(void); struct bitbang_spi_master { diff --git a/tests/init_shutdown.c b/tests/init_shutdown.c index abaaf68..85c29e2 100644 --- a/tests/init_shutdown.c +++ b/tests/init_shutdown.c @@ -18,22 +18,22 @@ #include "programmer.h" -static void run_lifecycle(void **state, enum programmer prog, const char *param) +static void run_lifecycle(void **state, const struct programmer_entry *prog, const char *param) { (void) state; /* unused */ - printf("Testing programmer_init for programmer=%u ...\n", prog); + printf("Testing programmer_init for programmer=%s ...\n", prog->name); assert_int_equal(0, programmer_init(prog, strdup(param))); - printf("... programmer_init for programmer=%u successful\n", prog); + printf("... programmer_init for programmer=%s successful\n", prog->name); - printf("Testing programmer_shutdown for programmer=%u ...\n", prog); + printf("Testing programmer_shutdown for programmer=%s ...\n", prog->name); assert_int_equal(0, programmer_shutdown()); - printf("... programmer_shutdown for programmer=%u successful\n", prog); + printf("... programmer_shutdown for programmer=%s successful\n", prog->name); } void dummy_init_and_shutdown_test_success(void **state) { - run_lifecycle(state, PROGRAMMER_DUMMY, "bus=parallel+lpc+fwh+spi"); + run_lifecycle(state, &programmer_dummy, "bus=parallel+lpc+fwh+spi"); } void linux_spi_init_and_shutdown_test_success(void **state) -- To view, visit https://review.coreboot.org/c/flashrom/+/55121 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iacf0f25abc94a84c5d52c8d69a3e8640817b060a Gerrit-Change-Number: 55121 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: enum programmer: replace by int
by Thomas Heijligen (Code Review) 02 Jun '21

02 Jun '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/55120 ) Change subject: enum programmer: replace by int ...................................................................... enum programmer: replace by int Change-Id: Id2ad9630fbc41e98d182768b553788e069fa5095 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M flashrom.c M libflashrom.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/20/55120/1 diff --git a/flashrom.c b/flashrom.c index d9220a3..65fa559 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1582,7 +1582,7 @@ const char *pname; int pnamelen; int remaining = 0, firstline = 1; - enum programmer p; + int p; int i; for (p = 0; p < programmer_table_size; p++) { diff --git a/libflashrom.c b/libflashrom.c index 2685433..29a5d2c 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -119,7 +119,7 @@ */ const char **flashrom_supported_programmers(void) { - enum programmer p = 0; + int p = 0; const char **supported_programmers = malloc((programmer_table_size + 1) * sizeof(char*)); if (supported_programmers != NULL) { -- To view, visit https://review.coreboot.org/c/flashrom/+/55120 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id2ad9630fbc41e98d182768b553788e069fa5095 Gerrit-Change-Number: 55120 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: flashrom.c: replace enum programmer by struct programmer_entry*
by Thomas Heijligen (Code Review) 02 Jun '21

02 Jun '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/55119 ) Change subject: flashrom.c: replace enum programmer by struct programmer_entry* ...................................................................... flashrom.c: replace enum programmer by struct programmer_entry* Change-Id: I478c56354d5f482010bfe1560489700bc889717a Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M flashrom.c 1 file changed, 12 insertions(+), 12 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/19/55119/1 diff --git a/flashrom.c b/flashrom.c index bb4dd31..d9220a3 100644 --- a/flashrom.c +++ b/flashrom.c @@ -43,7 +43,7 @@ const char flashrom_version[] = FLASHROM_VERSION; const char *chip_to_probe = NULL; -static enum programmer programmer = PROGRAMMER_INVALID; +static const struct programmer_entry *programmer = NULL; static const char *programmer_param = NULL; /* @@ -138,7 +138,7 @@ msg_perr("Invalid programmer specified!\n"); return -1; } - programmer = prog; + programmer = programmer_table[prog]; /* Initialize all programmer specific data. */ /* Default to unlimited decode sizes. */ max_rom_decode = (const struct decode_sizes) { @@ -155,8 +155,8 @@ programmer_may_write = 1; programmer_param = param; - msg_pdbg("Initializing %s programmer\n", programmer_table[programmer]->name); - ret = programmer_table[programmer]->init(); + msg_pdbg("Initializing %s programmer\n", programmer->name); + ret = programmer->init(); if (programmer_param && strlen(programmer_param)) { if (ret != 0) { /* It is quite possible that any unhandled programmer parameter would have been valid, @@ -200,7 +200,7 @@ void *programmer_map_flash_region(const char *descr, uintptr_t phys_addr, size_t len) { - void *ret = programmer_table[programmer]->map_flash_region(descr, phys_addr, len); + void *ret = programmer->map_flash_region(descr, phys_addr, len); msg_gspew("%s: mapping %s from 0x%0*" PRIxPTR " to 0x%0*" PRIxPTR "\n", __func__, descr, PRIxPTR_WIDTH, phys_addr, PRIxPTR_WIDTH, (uintptr_t) ret); return ret; @@ -208,7 +208,7 @@ void programmer_unmap_flash_region(void *virt_addr, size_t len) { - programmer_table[programmer]->unmap_flash_region(virt_addr, len); + programmer->unmap_flash_region(virt_addr, len); msg_gspew("%s: unmapped 0x%0*" PRIxPTR "\n", __func__, PRIxPTR_WIDTH, (uintptr_t)virt_addr); } @@ -256,7 +256,7 @@ void programmer_delay(unsigned int usecs) { if (usecs > 0) - programmer_table[programmer]->delay(usecs); + programmer->delay(usecs); } int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, @@ -840,12 +840,12 @@ flash->chip->vendor, flash->chip->name, flash->chip->total_size, tmp); free(tmp); #if CONFIG_INTERNAL == 1 - if (programmer_table[programmer]->map_flash_region == physmap) + if (programmer->map_flash_region == physmap) msg_cinfo("mapped at physical address 0x%0*" PRIxPTR ".\n", PRIxPTR_WIDTH, flash->physical_memory); else #endif - msg_cinfo("on %s.\n", programmer_table[programmer]->name); + msg_cinfo("on %s.\n", programmer->name); /* Flash registers may more likely not be mapped if the chip was forced. * Lock info may be stored in registers, so avoid lock info printing. */ @@ -1548,7 +1548,7 @@ { msg_gerr("Good, writing to the flash chip apparently didn't do anything.\n"); #if CONFIG_INTERNAL == 1 - if (programmer == PROGRAMMER_INTERNAL) + if (programmer == &programmer_internal) msg_gerr("This means we have to add special support for your board, programmer or flash\n" "chip. Please report this on IRC at chat.freenode.net (channel #flashrom) or\n" "mail flashrom(a)flashrom.org, thanks!\n" @@ -1566,7 +1566,7 @@ { msg_gerr("Your flash chip is in an unknown state.\n"); #if CONFIG_INTERNAL == 1 - if (programmer == PROGRAMMER_INTERNAL) + if (programmer == &programmer_internal) msg_gerr("Get help on IRC at chat.freenode.net (channel #flashrom) or\n" "mail flashrom(a)flashrom.org with the subject \"FAILED: <your board name>\"!\n" "-------------------------------------------------------------------------------\n" @@ -2057,7 +2057,7 @@ } #if CONFIG_INTERNAL == 1 - if (programmer == PROGRAMMER_INTERNAL && cb_check_image(newcontents, flash_size) < 0) { + if (programmer == &programmer_internal && cb_check_image(newcontents, flash_size) < 0) { if (flashctx->flags.force_boardmismatch) { msg_pinfo("Proceeding anyway because user forced us to.\n"); } else { -- To view, visit https://review.coreboot.org/c/flashrom/+/55119 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I478c56354d5f482010bfe1560489700bc889717a Gerrit-Change-Number: 55119 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: programmer_table: replace PROGRAMMER_INVALID to programmer_table_size...
by Thomas Heijligen (Code Review) 02 Jun '21

02 Jun '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/55117 ) Change subject: programmer_table: replace PROGRAMMER_INVALID to programmer_table_size in itterations ...................................................................... programmer_table: replace PROGRAMMER_INVALID to programmer_table_size in itterations Change-Id: Icaaeefe001de604df9d7fdd06f05a5ed39fdbd84 Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M cli_classic.c M flashrom.c M libflashrom.c M print.c M print_wiki.c 5 files changed, 14 insertions(+), 14 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/17/55117/1 diff --git a/cli_classic.c b/cli_classic.c index bc2d40d..f3ae123 100644 --- a/cli_classic.c +++ b/cli_classic.c @@ -406,7 +406,7 @@ "with \",\". Please see the man page " "for details.\n"); } - for (prog = 0; prog < PROGRAMMER_INVALID; prog++) { + for (prog = 0; prog < programmer_table_size; prog++) { name = programmer_table[prog]->name; namelen = strlen(name); if (strncmp(optarg, name, namelen) == 0) { diff --git a/flashrom.c b/flashrom.c index d6b35c6..bb4dd31 100644 --- a/flashrom.c +++ b/flashrom.c @@ -134,7 +134,7 @@ { int ret; - if (prog >= PROGRAMMER_INVALID) { + if (prog >= programmer_table_size) { msg_perr("Invalid programmer specified!\n"); return -1; } @@ -1585,7 +1585,7 @@ enum programmer p; int i; - for (p = 0; p < PROGRAMMER_INVALID; p++) { + for (p = 0; p < programmer_table_size; p++) { pname = programmer_table[p]->name; pnamelen = strlen(pname); if (remaining - pnamelen - 2 < 0) { @@ -1606,7 +1606,7 @@ } msg_ginfo("%s", pname); remaining -= pnamelen; - if (p < PROGRAMMER_INVALID - 1) { + if (p < programmer_table_size - 1) { msg_ginfo(","); remaining--; } else { @@ -1717,7 +1717,7 @@ msg_gerr("Programmer table miscompilation!\n"); ret = 1; } - for (i = 0; i < PROGRAMMER_INVALID; i++) { + for (i = 0; i < programmer_table_size; i++) { const struct programmer_entry *p = programmer_table[i]; if (p->name == NULL) { msg_gerr("All programmers need a valid name, but the one with index %d does not!\n", i); diff --git a/libflashrom.c b/libflashrom.c index 09a4e4d..2685433 100644 --- a/libflashrom.c +++ b/libflashrom.c @@ -120,10 +120,10 @@ const char **flashrom_supported_programmers(void) { enum programmer p = 0; - const char **supported_programmers = malloc((PROGRAMMER_INVALID + 1) * sizeof(char*)); + const char **supported_programmers = malloc((programmer_table_size + 1) * sizeof(char*)); if (supported_programmers != NULL) { - for (; p < PROGRAMMER_INVALID; ++p) { + for (; p < programmer_table_size; ++p) { supported_programmers[p] = programmer_table[p]->name; } } else { @@ -278,11 +278,11 @@ { unsigned prog; - for (prog = 0; prog < PROGRAMMER_INVALID; prog++) { + for (prog = 0; prog < programmer_table_size; prog++) { if (strcmp(prog_name, programmer_table[prog]->name) == 0) break; } - if (prog >= PROGRAMMER_INVALID) { + if (prog >= programmer_table_size) { msg_ginfo("Error: Unknown programmer \"%s\". Valid choices are:\n", prog_name); list_programmers_linebreak(0, 80, 0); return 1; diff --git a/print.c b/print.c index fbf4882..49c1aa1 100644 --- a/print.c +++ b/print.c @@ -482,7 +482,7 @@ msg_ginfo("\n"); print_supported_boards_helper(laptops_known, "mobile devices"); #endif - for (i = 0; i < PROGRAMMER_INVALID; i++) { + for (i = 0; i < programmer_table_size; i++) { const struct programmer_entry *prog = programmer_table[i]; switch (prog->type) { case USB: diff --git a/print_wiki.c b/print_wiki.c index 4088d9f..8ca0e1e 100644 --- a/print_wiki.c +++ b/print_wiki.c @@ -380,7 +380,7 @@ unsigned int usb_count = 0; unsigned int i; - for (i = 0; i < PROGRAMMER_INVALID; i++) { + for (i = 0; i < programmer_table_size; i++) { const struct programmer_entry *prog = programmer_table[i]; switch (prog->type) { case USB: @@ -399,7 +399,7 @@ "Total amount of supported PCI devices flashrom can use as a programmer: '''%d'''\n\n" "{%s%s", pci_count, th_start, programmer_th); - for (i = 0; i < PROGRAMMER_INVALID; i++) { + for (i = 0; i < programmer_table_size; i++) { const struct programmer_entry *prog = programmer_table[i]; if (prog->type == PCI) { print_supported_devs_wiki_helper(prog); @@ -411,7 +411,7 @@ "Total amount of supported USB devices flashrom can use as a programmer: '''%d'''\n\n" "{%s%s", usb_count, th_start, programmer_th); - for (i = 0; i < PROGRAMMER_INVALID; i++) { + for (i = 0; i < programmer_table_size; i++) { const struct programmer_entry *prog = programmer_table[i]; if (prog->type == USB) { print_supported_devs_wiki_helper(prog); @@ -424,7 +424,7 @@ printf("! align=\"left\" | Programmer\n" "! align=\"left\" | Note\n\n"); - for (i = 0; i < PROGRAMMER_INVALID; i++) { + for (i = 0; i < programmer_table_size; i++) { static int c = 0; const struct programmer_entry *prog = programmer_table[i]; if (prog->type == OTHER && prog->devs.note != NULL) { -- To view, visit https://review.coreboot.org/c/flashrom/+/55117 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Icaaeefe001de604df9d7fdd06f05a5ed39fdbd84 Gerrit-Change-Number: 55117 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

Change in flashrom[master]: programmer_table: add table size variable
by Thomas Heijligen (Code Review) 02 Jun '21

02 Jun '21

Thomas Heijligen has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/55116 ) Change subject: programmer_table: add table size variable ...................................................................... programmer_table: add table size variable Change-Id: Idacb4b7b0dd98af8bc7cbecf567d33daafb4b24d Signed-off-by: Thomas Heijligen <thomas.heijligen(a)secunet.de> --- M flashrom.c M programmer.h 2 files changed, 4 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/16/55116/1 diff --git a/flashrom.c b/flashrom.c index 65f7e73..43a5599 100644 --- a/flashrom.c +++ b/flashrom.c @@ -534,6 +534,8 @@ #endif }; +const size_t programmer_table_size = ARRAY_SIZE(programmer_table); + #define SHUTDOWN_MAXFN 32 static int shutdown_fn_count = 0; /** @private */ @@ -2189,7 +2191,7 @@ /* Safety check. Instead of aborting after the first error, check * if more errors exist. */ - if (ARRAY_SIZE(programmer_table) != PROGRAMMER_INVALID) { + if (programmer_table_size != PROGRAMMER_INVALID) { msg_gerr("Programmer table miscompilation!\n"); ret = 1; } diff --git a/programmer.h b/programmer.h index 790fcc8..d3226d6 100644 --- a/programmer.h +++ b/programmer.h @@ -176,6 +176,7 @@ }; extern const struct programmer_entry programmer_table[]; +extern const size_t programmer_table_size; int programmer_init(enum programmer prog, const char *param); int programmer_shutdown(void); -- To view, visit https://review.coreboot.org/c/flashrom/+/55116 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Idacb4b7b0dd98af8bc7cbecf567d33daafb4b24d Gerrit-Change-Number: 55116 Gerrit-PatchSet: 1 Gerrit-Owner: Thomas Heijligen <src(a)posteo.de> Gerrit-MessageType: newchange

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit