June 2019 - flashrom-gerrit - mail.coreboot.org

Change in ...flashrom[master]: Makefile: Enable -Wmissing-prototypes
by Jacob Garber (Code Review) 23 Jun '19

23 Jun '19

Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/33670 Change subject: Makefile: Enable -Wmissing-prototypes ...................................................................... Makefile: Enable -Wmissing-prototypes Change-Id: Ia2ea3dee11e505c04a9e7956417615e39d511886 Signed-off-by: Jacob Garber <jgarber1(a)ualberta.ca> --- M Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/70/33670/1 diff --git a/Makefile b/Makefile index e08a3f6..7a21d12 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ DIFF = diff PREFIX ?= /usr/local MANDIR ?= $(PREFIX)/share/man -CFLAGS ?= -Os -Wall -Wshadow +CFLAGS ?= -Os -Wall -Wshadow -Wmissing-prototypes EXPORTDIR ?= . RANLIB ?= ranlib PKG_CONFIG ?= pkg-config -- To view, visit https://review.coreboot.org/c/flashrom/+/33670 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia2ea3dee11e505c04a9e7956417615e39d511886 Gerrit-Change-Number: 33670 Gerrit-PatchSet: 1 Gerrit-Owner: Jacob Garber <jgarber1(a)ualberta.ca> Gerrit-MessageType: newchange

3 3

Change in ...flashrom[master]: tree: Remove unused functions with no prototypes
by Jacob Garber (Code Review) 23 Jun '19

23 Jun '19

Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/33669 Change subject: tree: Remove unused functions with no prototypes ...................................................................... tree: Remove unused functions with no prototypes These functions are no longer used, or were never used in the first place. generate_testpattern() - Introduced in commit eaac68bf8b, never used list_programmers() - Introduced in commit 552420b0d6, never used pci_dev_find_filter() - Prototype removed in commit 5c316f9549 erase_chip_jedec() - Usage and prototype removed in commit f52f784bb3 printlock_regspace2_blocks() - Introduced in commit ef3ac8ac17, never used spi_write_status_enable() - Usage dropped in commit fcbdbbc0d4 Change-Id: I742164670521fea65ffa3808446594848ce63cec Signed-off-by: Jacob Garber <jgarber1(a)ualberta.ca> --- M flashrom.c M internal.c M jedec.c M spi25_statusreg.c 4 files changed, 0 insertions(+), 186 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/69/33669/1 diff --git a/flashrom.c b/flashrom.c index 5b85c14..cb1dca6 100644 --- a/flashrom.c +++ b/flashrom.c @@ -975,142 +975,6 @@ return first_len; } -/* This function generates various test patterns useful for testing controller - * and chip communication as well as chip behaviour. - * - * If a byte can be written multiple times, each time keeping 0-bits at 0 - * and changing 1-bits to 0 if the new value for that bit is 0, the effect - * is essentially an AND operation. That's also the reason why this function - * provides the result of AND between various patterns. - * - * Below is a list of patterns (and their block length). - * Pattern 0 is 05 15 25 35 45 55 65 75 85 95 a5 b5 c5 d5 e5 f5 (16 Bytes) - * Pattern 1 is 0a 1a 2a 3a 4a 5a 6a 7a 8a 9a aa ba ca da ea fa (16 Bytes) - * Pattern 2 is 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f (16 Bytes) - * Pattern 3 is a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af (16 Bytes) - * Pattern 4 is 00 10 20 30 40 50 60 70 80 90 a0 b0 c0 d0 e0 f0 (16 Bytes) - * Pattern 5 is 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f (16 Bytes) - * Pattern 6 is 00 (1 Byte) - * Pattern 7 is ff (1 Byte) - * Patterns 0-7 have a big-endian block number in the last 2 bytes of each 256 - * byte block. - * - * Pattern 8 is 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11... (256 B) - * Pattern 9 is ff fe fd fc fb fa f9 f8 f7 f6 f5 f4 f3 f2 f1 f0 ef ee... (256 B) - * Pattern 10 is 00 00 00 01 00 02 00 03 00 04... (128 kB big-endian counter) - * Pattern 11 is ff ff ff fe ff fd ff fc ff fb... (128 kB big-endian downwards) - * Pattern 12 is 00 (1 Byte) - * Pattern 13 is ff (1 Byte) - * Patterns 8-13 have no block number. - * - * Patterns 0-3 are created to detect and efficiently diagnose communication - * slips like missed bits or bytes and their repetitive nature gives good visual - * cues to the person inspecting the results. In addition, the following holds: - * AND Pattern 0/1 == Pattern 4 - * AND Pattern 2/3 == Pattern 5 - * AND Pattern 0/1/2/3 == AND Pattern 4/5 == Pattern 6 - * A weakness of pattern 0-5 is the inability to detect swaps/copies between - * any two 16-byte blocks except for the last 16-byte block in a 256-byte bloc. - * They work perfectly for detecting any swaps/aliasing of blocks >= 256 bytes. - * 0x5 and 0xa were picked because they are 0101 and 1010 binary. - * Patterns 8-9 are best for detecting swaps/aliasing of blocks < 256 bytes. - * Besides that, they provide for bit testing of the last two bytes of every - * 256 byte block which contains the block number for patterns 0-6. - * Patterns 10-11 are special purpose for detecting subblock aliasing with - * block sizes >256 bytes (some Dataflash chips etc.) - * AND Pattern 8/9 == Pattern 12 - * AND Pattern 10/11 == Pattern 12 - * Pattern 13 is the completely erased state. - * None of the patterns can detect aliasing at boundaries which are a multiple - * of 16 MBytes (but such chips do not exist anyway for Parallel/LPC/FWH/SPI). - */ -int generate_testpattern(uint8_t *buf, uint32_t size, int variant) -{ - int i; - - if (!buf) { - msg_gerr("Invalid buffer!\n"); - return 1; - } - - switch (variant) { - case 0: - for (i = 0; i < size; i++) - buf[i] = (i & 0xf) << 4 | 0x5; - break; - case 1: - for (i = 0; i < size; i++) - buf[i] = (i & 0xf) << 4 | 0xa; - break; - case 2: - for (i = 0; i < size; i++) - buf[i] = 0x50 | (i & 0xf); - break; - case 3: - for (i = 0; i < size; i++) - buf[i] = 0xa0 | (i & 0xf); - break; - case 4: - for (i = 0; i < size; i++) - buf[i] = (i & 0xf) << 4; - break; - case 5: - for (i = 0; i < size; i++) - buf[i] = i & 0xf; - break; - case 6: - memset(buf, 0x00, size); - break; - case 7: - memset(buf, 0xff, size); - break; - case 8: - for (i = 0; i < size; i++) - buf[i] = i & 0xff; - break; - case 9: - for (i = 0; i < size; i++) - buf[i] = ~(i & 0xff); - break; - case 10: - for (i = 0; i < size % 2; i++) { - buf[i * 2] = (i >> 8) & 0xff; - buf[i * 2 + 1] = i & 0xff; - } - if (size & 0x1) - buf[i * 2] = (i >> 8) & 0xff; - break; - case 11: - for (i = 0; i < size % 2; i++) { - buf[i * 2] = ~((i >> 8) & 0xff); - buf[i * 2 + 1] = ~(i & 0xff); - } - if (size & 0x1) - buf[i * 2] = ~((i >> 8) & 0xff); - break; - case 12: - memset(buf, 0x00, size); - break; - case 13: - memset(buf, 0xff, size); - break; - } - - if ((variant >= 0) && (variant <= 7)) { - /* Write block number in the last two bytes of each 256-byte - * block, big endian for easier reading of the hexdump. - * Note that this wraps around for chips larger than 2^24 bytes - * (16 MB). - */ - for (i = 0; i < size / 256; i++) { - buf[i * 256 + 254] = (i >> 8) & 0xff; - buf[i * 256 + 255] = i & 0xff; - } - } - - return 0; -} - /* Returns the number of busses commonly supported by the current programmer and flash chip where the latter * can not be completely accessed due to size/address limits of the programmer. */ unsigned int count_max_decode_exceedings(const struct flashctx *flash) @@ -2003,18 +1867,6 @@ "mail flashrom(a)flashrom.org, thanks!\n"); } -/* The way to go if you want a delimited list of programmers */ -void list_programmers(const char *delim) -{ - enum programmer p; - for (p = 0; p < PROGRAMMER_INVALID; p++) { - msg_ginfo("%s", programmer_table[p].name); - if (p < PROGRAMMER_INVALID - 1) - msg_ginfo("%s", delim); - } - msg_ginfo("\n"); -} - void list_programmers_linebreak(int startcol, int cols, int paren) { const char *pname; diff --git a/internal.c b/internal.c index 2bb437c..12c0ba3 100644 --- a/internal.c +++ b/internal.c @@ -21,17 +21,6 @@ #include "programmer.h" #include "hwaccess.h" -struct pci_dev *pci_dev_find_filter(struct pci_filter filter) -{ - struct pci_dev *temp; - - for (temp = pacc->devices; temp; temp = temp->next) - if (pci_filter_match(&filter, temp)) - return temp; - - return NULL; -} - struct pci_dev *pci_dev_find_vendorclass(uint16_t vendor, uint16_t devclass) { struct pci_dev *temp; diff --git a/jedec.c b/jedec.c index 54b7da7..ac1ea0d 100644 --- a/jedec.c +++ b/jedec.c @@ -550,14 +550,6 @@ return erase_block_jedec_common(flash, page, size, mask); } -int erase_chip_jedec(struct flashctx *flash) -{ - unsigned int mask; - - mask = getaddrmask(flash->chip); - return erase_chip_jedec_common(flash, mask); -} - struct unlockblock { unsigned int size; unsigned int count; @@ -616,11 +608,6 @@ return 0; } -int printlock_regspace2_blocks(const struct flashctx *flash, const struct unlockblock *blocks) -{ - return regspace2_walk_unlockblocks(flash, blocks, &printlock_regspace2_block); -} - static int printlock_regspace2_uniform(struct flashctx *flash, unsigned long block_size) { const unsigned int elems = flash->chip->total_size * 1024 / block_size; diff --git a/spi25_statusreg.c b/spi25_statusreg.c index 4cf7023..8cd5a28 100644 --- a/spi25_statusreg.c +++ b/spi25_statusreg.c @@ -22,20 +22,6 @@ #include "spi.h" /* === Generic functions === */ -int spi_write_status_enable(struct flashctx *flash) -{ - static const unsigned char cmd[JEDEC_EWSR_OUTSIZE] = { JEDEC_EWSR }; - int result; - - /* Send EWSR (Enable Write Status Register). */ - result = spi_send_command(flash, sizeof(cmd), JEDEC_EWSR_INSIZE, cmd, NULL); - - if (result) - msg_cerr("%s failed\n", __func__); - - return result; -} - static int spi_write_status_register_flag(struct flashctx *flash, int status, const unsigned char enable_opcode) { int result; -- To view, visit https://review.coreboot.org/c/flashrom/+/33669 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I742164670521fea65ffa3808446594848ce63cec Gerrit-Change-Number: 33669 Gerrit-PatchSet: 1 Gerrit-Owner: Jacob Garber <jgarber1(a)ualberta.ca> Gerrit-MessageType: newchange

2 2

Change in ...flashrom[master]: tree: Include missing headers for function prototypes
by Jacob Garber (Code Review) 23 Jun '19

23 Jun '19

Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/33668 Change subject: tree: Include missing headers for function prototypes ...................................................................... tree: Include missing headers for function prototypes These files all contain functions whose prototypes are in header files, so make sure those header files are included. Change-Id: I0189a1550bf90d4a0b87dcef9f8a8449590cc9d7 Signed-off-by: Jacob Garber <jgarber1(a)ualberta.ca> --- M edi.c M hwaccess.c M sst_fwhub.c M udelay.c M w29ee011.c 5 files changed, 5 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/68/33668/1 diff --git a/edi.c b/edi.c index bd5b269..a2219ac 100644 --- a/edi.c +++ b/edi.c @@ -16,6 +16,7 @@ #include <string.h> #include "flash.h" +#include "chipdrivers.h" #include "ene.h" #include "edi.h" diff --git a/hwaccess.c b/hwaccess.c index bb5aac4..48ccb34 100644 --- a/hwaccess.c +++ b/hwaccess.c @@ -27,6 +27,7 @@ #include <fcntl.h> #endif #include "flash.h" +#include "programmer.h" #include "hwaccess.h" #if !(IS_LINUX || IS_MACOSX || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) || defined(__DJGPP__) || defined(__LIBPAYLOAD__) || defined(__sun) || defined(__gnu_hurd__)) diff --git a/sst_fwhub.c b/sst_fwhub.c index 398b01b..c712303 100644 --- a/sst_fwhub.c +++ b/sst_fwhub.c @@ -19,6 +19,7 @@ /* Adapted from the Intel FW hub stuff for 82802ax parts. */ #include "flash.h" +#include "chipdrivers.h" static int check_sst_fwhub_block_lock(struct flashctx *flash, int offset) { diff --git a/udelay.c b/udelay.c index f6fd103..6c0efc4 100644 --- a/udelay.c +++ b/udelay.c @@ -25,6 +25,7 @@ #include <stdlib.h> #include <limits.h> #include "flash.h" +#include "programmer.h" static bool use_clock_gettime = false; diff --git a/w29ee011.c b/w29ee011.c index 8a62e4c..a570bd6 100644 --- a/w29ee011.c +++ b/w29ee011.c @@ -16,6 +16,7 @@ #include <string.h> #include "flash.h" +#include "chipdrivers.h" /* According to the Winbond W29EE011, W29EE012, W29C010M, W29C011A * datasheets this is the only valid probe function for those chips. -- To view, visit https://review.coreboot.org/c/flashrom/+/33668 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I0189a1550bf90d4a0b87dcef9f8a8449590cc9d7 Gerrit-Change-Number: 33668 Gerrit-PatchSet: 1 Gerrit-Owner: Jacob Garber <jgarber1(a)ualberta.ca> Gerrit-MessageType: newchange

2 2

Change in ...flashrom[master]: tree: Make internal functions static
by Jacob Garber (Code Review) 23 Jun '19

23 Jun '19

Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/33667 Change subject: tree: Make internal functions static ...................................................................... tree: Make internal functions static None of these functions are used outside of the files they are defined in, so make them all static. Change-Id: Ie9cbe12d289bcedacf2f1bf483ae64ef8039ccc1 Signed-off-by: Jacob Garber <jgarber1(a)ualberta.ca> --- M board_enable.c M dmi.c M edi.c M flashrom.c M hwaccess.c M ich_descriptors.c M it85spi.c M it87spi.c M pcidev.c M physmap.c M print.c M spi25.c M usbblaster_spi.c 13 files changed, 29 insertions(+), 30 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/67/33667/1 diff --git a/board_enable.c b/board_enable.c index b5a5442..5876036 100644 --- a/board_enable.c +++ b/board_enable.c @@ -67,7 +67,7 @@ } /* Winbond W83697 documentation indicates that the index register has to be written for each access. */ -void sio_mask_alzheimer(uint16_t port, uint8_t reg, uint8_t data, uint8_t mask) +static void sio_mask_alzheimer(uint16_t port, uint8_t reg, uint8_t data, uint8_t mask) { uint8_t tmp; @@ -519,7 +519,7 @@ * Supported chips: * W83697HF/F/HG, W83697SF/UF/UG */ -void w83697xx_memw_enable(uint16_t port) +static void w83697xx_memw_enable(uint16_t port) { w836xx_ext_enter(port); if (!(sio_read(port, 0x24) & 0x02)) { /* Flash ROM enabled? */ diff --git a/dmi.c b/dmi.c index c32a8da..ae90f7c 100644 --- a/dmi.c +++ b/dmi.c @@ -250,7 +250,7 @@ return 0; } -int dmi_fill(void) +static int dmi_fill(void) { size_t fp; uint8_t *dmi_mem; @@ -344,7 +344,7 @@ return result; } -int dmi_fill(void) +static int dmi_fill(void) { int i; char *chassis_type; diff --git a/edi.c b/edi.c index 2afd032..bd5b269 100644 --- a/edi.c +++ b/edi.c @@ -457,7 +457,7 @@ return 0; } -int edi_shutdown(void *data) +static int edi_shutdown(void *data) { struct flashctx *flash; int rc; diff --git a/flashrom.c b/flashrom.c index b47d0a2..5b85c14 100644 --- a/flashrom.c +++ b/flashrom.c @@ -738,8 +738,7 @@ } /* start is an offset to the base address of the flash chip */ -int check_erased_range(struct flashctx *flash, unsigned int start, - unsigned int len) +static int check_erased_range(struct flashctx *flash, unsigned int start, unsigned int len) { int ret; uint8_t *cmpbuf = malloc(len); @@ -2055,7 +2054,7 @@ } } -void print_sysinfo(void) +static void print_sysinfo(void) { #if IS_WINDOWS SYSTEM_INFO si; @@ -2235,8 +2234,8 @@ /* FIXME: This function signature needs to be improved once doit() has a better * function signature. */ -int chip_safety_check(const struct flashctx *flash, int force, int read_it, int write_it, int erase_it, - int verify_it) +static int chip_safety_check(const struct flashctx *flash, int force, + int read_it, int write_it, int erase_it, int verify_it) { const struct flashchip *chip = flash->chip; diff --git a/hwaccess.c b/hwaccess.c index acb99f8..bb5aac4 100644 --- a/hwaccess.c +++ b/hwaccess.c @@ -223,7 +223,7 @@ }; }; -int undo_mmio_write(void *p) +static int undo_mmio_write(void *p) { struct undo_mmio_write_data *data = p; msg_pdbg("Restoring MMIO space at %p\n", data->addr); diff --git a/ich_descriptors.c b/ich_descriptors.c index 0a4cf75..bfe92bb 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -442,7 +442,7 @@ msg_pdbg2("\n"); } -void prettyprint_ich_descriptor_straps_ich8(const struct ich_descriptors *desc) +static void prettyprint_ich_descriptor_straps_ich8(const struct ich_descriptors *desc) { static const char * const str_GPIO12[4] = { "GPIO12", @@ -504,7 +504,7 @@ msg_pdbg2("\n"); } -void prettyprint_ich_descriptor_pchstraps45678_56(const struct ich_desc_south_strap *s) +static void prettyprint_ich_descriptor_pchstraps45678_56(const struct ich_desc_south_strap *s) { /* PCHSTRP4 */ msg_pdbg2("Intel PHY is %s.\n", @@ -528,7 +528,7 @@ /* PCHSTRP8 */ } -void prettyprint_ich_descriptor_pchstraps111213_56(const struct ich_desc_south_strap *s) +static void prettyprint_ich_descriptor_pchstraps111213_56(const struct ich_desc_south_strap *s) { /* PCHSTRP11 */ msg_pdbg2("SMLink1 GP Address is %sabled.\n", @@ -544,7 +544,7 @@ /* PCHSTRP13 */ } -void prettyprint_ich_descriptor_straps_ibex(const struct ich_desc_south_strap *s) +static void prettyprint_ich_descriptor_straps_ibex(const struct ich_desc_south_strap *s) { static const uint8_t dec_t209min[4] = { 100, @@ -642,7 +642,7 @@ msg_pdbg2("\n"); } -void prettyprint_ich_descriptor_straps_cougar(const struct ich_desc_south_strap *s) +static void prettyprint_ich_descriptor_straps_cougar(const struct ich_desc_south_strap *s) { msg_pdbg2("--- PCH ---\n"); @@ -811,7 +811,7 @@ } } -void prettyprint_rdid(uint32_t reg_val) +static void prettyprint_rdid(uint32_t reg_val) { uint8_t mid = reg_val & 0xFF; uint16_t did = ((reg_val >> 16) & 0xFF) | (reg_val & 0xFF00); diff --git a/it85spi.c b/it85spi.c index e47cabb..1d1ecad 100644 --- a/it85spi.c +++ b/it85spi.c @@ -106,7 +106,7 @@ /* IT8502 employs a scratch RAM when flash is being updated. Call the following * two functions before/after flash erase/program. */ -void it85xx_enter_scratch_rom(void) +static void it85xx_enter_scratch_rom(void) { int ret, tries; @@ -163,7 +163,7 @@ } } -void it85xx_exit_scratch_rom(void) +static void it85xx_exit_scratch_rom(void) { #if 0 int ret; diff --git a/it87spi.c b/it87spi.c index 13b3aae..9e7a8ea 100644 --- a/it87spi.c +++ b/it87spi.c @@ -57,7 +57,7 @@ sio_write(port, 0x02, 0x02); } -uint16_t probe_id_ite(uint16_t port) +static uint16_t probe_id_ite(uint16_t port) { uint16_t id; diff --git a/pcidev.c b/pcidev.c index f5ad819..54c1fd3 100644 --- a/pcidev.c +++ b/pcidev.c @@ -266,7 +266,7 @@ }; }; -int undo_pci_write(void *p) +static int undo_pci_write(void *p) { struct undo_pci_write_data *data = p; if (pacc == NULL || data->dev == NULL) { diff --git a/physmap.c b/physmap.c index 8e80925..ad38ad3 100644 --- a/physmap.c +++ b/physmap.c @@ -97,7 +97,7 @@ #define sys_physmap_rw_uncached sys_physmap #define sys_physmap_ro_cached sys_physmap -void sys_physunmap_unaligned(void *virt_addr, size_t len) +static void sys_physunmap_unaligned(void *virt_addr, size_t len) { __dpmi_meminfo mi; @@ -126,7 +126,7 @@ #define sys_physmap_rw_uncached sys_physmap #define sys_physmap_ro_cached sys_physmap -void sys_physunmap_unaligned(void *virt_addr, size_t len) +static void sys_physunmap_unaligned(void *virt_addr, size_t len) { } #elif defined(__MACH__) && defined(__APPLE__) @@ -147,7 +147,7 @@ #define sys_physmap_rw_uncached sys_physmap #define sys_physmap_ro_cached sys_physmap -void sys_physunmap_unaligned(void *virt_addr, size_t len) +static void sys_physunmap_unaligned(void *virt_addr, size_t len) { unmap_physical(virt_addr, len); } @@ -200,7 +200,7 @@ return MAP_FAILED == virt_addr ? ERROR_PTR : virt_addr; } -void sys_physunmap_unaligned(void *virt_addr, size_t len) +static void sys_physunmap_unaligned(void *virt_addr, size_t len) { munmap(virt_addr, len); } diff --git a/print.c b/print.c index 7eb5485..cfe6267 100644 --- a/print.c +++ b/print.c @@ -423,7 +423,7 @@ } #endif -void print_supported_devs(const struct programmer_entry prog, const char *const type) +static void print_supported_devs(const struct programmer_entry prog, const char *const type) { const struct dev_entry *const devs = prog.devs.dev; msg_ginfo("\nSupported %s devices for the %s programmer:\n", type, prog.name); diff --git a/spi25.c b/spi25.c index 611cd72..ecb1893 100644 --- a/spi25.c +++ b/spi25.c @@ -455,19 +455,19 @@ return result ? result : status; } -int spi_chip_erase_60(struct flashctx *flash) +static int spi_chip_erase_60(struct flashctx *flash) { /* This usually takes 1-85s, so wait in 1s steps. */ return spi_simple_write_cmd(flash, 0x60, 1000 * 1000); } -int spi_chip_erase_62(struct flashctx *flash) +static int spi_chip_erase_62(struct flashctx *flash) { /* This usually takes 2-5s, so wait in 100ms steps. */ return spi_simple_write_cmd(flash, 0x62, 100 * 1000); } -int spi_chip_erase_c7(struct flashctx *flash) +static int spi_chip_erase_c7(struct flashctx *flash) { /* This usually takes 1-85s, so wait in 1s steps. */ return spi_simple_write_cmd(flash, 0xc7, 1000 * 1000); diff --git a/usbblaster_spi.c b/usbblaster_spi.c index fa984e5..f9d72c2 100644 --- a/usbblaster_spi.c +++ b/usbblaster_spi.c @@ -67,7 +67,7 @@ /* The programmer shifts bits in the wrong order for SPI, so we use this method to reverse the bits when needed. * http://graphics.stanford.edu/~seander/bithacks.html#ReverseByteWith32Bits */ -uint8_t reverse(uint8_t b) +static uint8_t reverse(uint8_t b) { return ((b * 0x0802LU & 0x22110LU) | (b * 0x8020LU & 0x88440LU)) * 0x10101LU >> 16; } -- To view, visit https://review.coreboot.org/c/flashrom/+/33667 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie9cbe12d289bcedacf2f1bf483ae64ef8039ccc1 Gerrit-Change-Number: 33667 Gerrit-PatchSet: 1 Gerrit-Owner: Jacob Garber <jgarber1(a)ualberta.ca> Gerrit-MessageType: newchange

3 3

Change in ...flashrom[master]: bitbang_spi: Drop bitbang_spi_master_type
by Nico Huber (Code Review) 23 Jun '19

23 Jun '19

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/33638 Change subject: bitbang_spi: Drop bitbang_spi_master_type ...................................................................... bitbang_spi: Drop bitbang_spi_master_type It only existed to make maintenance harder and waste our time. Change-Id: I7a3b5d9ff1e99d2d4f873c6f19fb318f93762037 Signed-off-by: Nico Huber <nico.h(a)gmx.de> --- M bitbang_spi.c M developerbox_spi.c M mcp6x_spi.c M nicintel_spi.c M ogp_spi.c M pony_spi.c M programmer.h M rayer_spi.c 8 files changed, 2 insertions(+), 38 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/38/33638/1 diff --git a/bitbang_spi.c b/bitbang_spi.c index 4b39164..2dad149 100644 --- a/bitbang_spi.c +++ b/bitbang_spi.c @@ -70,7 +70,6 @@ unsigned char *readarr); static const struct spi_master spi_master_bitbang = { - .type = SPI_CONTROLLER_BITBANG, .features = SPI_MASTER_4BA, .max_data_read = MAX_DATA_READ_UNLIMITED, .max_data_write = MAX_DATA_WRITE_UNLIMITED, @@ -92,11 +91,8 @@ int register_spi_bitbang_master(const struct bitbang_spi_master *master) { struct spi_master mst = spi_master_bitbang; - /* BITBANG_SPI_INVALID is 0, so if someone forgot to initialize ->type, - * we catch it here. Same goes for missing initialization of bitbanging - * functions. - */ - if (!master || master->type == BITBANG_SPI_INVALID || !master->set_cs || + /* If someone forgot to initialize a bitbang function, we catch it here. */ + if (!master || !master->set_cs || !master->set_sck || !master->set_mosi || !master->get_miso || (master->request_bus && !master->release_bus) || (!master->request_bus && master->release_bus)) { diff --git a/developerbox_spi.c b/developerbox_spi.c index 4ad966e..c80a794 100644 --- a/developerbox_spi.c +++ b/developerbox_spi.c @@ -121,7 +121,6 @@ } static const struct bitbang_spi_master bitbang_spi_master_cp210x = { - .type = BITBANG_SPI_MASTER_DEVELOPERBOX, .set_cs = cp210x_bitbang_set_cs, .set_sck = cp210x_bitbang_set_sck, .set_mosi = cp210x_bitbang_set_mosi, diff --git a/mcp6x_spi.c b/mcp6x_spi.c index 971780d..f369277 100644 --- a/mcp6x_spi.c +++ b/mcp6x_spi.c @@ -88,7 +88,6 @@ } static const struct bitbang_spi_master bitbang_spi_master_mcp6x = { - .type = BITBANG_SPI_MASTER_MCP, .set_cs = mcp6x_bitbang_set_cs, .set_sck = mcp6x_bitbang_set_sck, .set_mosi = mcp6x_bitbang_set_mosi, diff --git a/nicintel_spi.c b/nicintel_spi.c index f31a2f9..bdb70a7 100644 --- a/nicintel_spi.c +++ b/nicintel_spi.c @@ -168,7 +168,6 @@ } static const struct bitbang_spi_master bitbang_spi_master_nicintel = { - .type = BITBANG_SPI_MASTER_NICINTEL, .set_cs = nicintel_bitbang_set_cs, .set_sck = nicintel_bitbang_set_sck, .set_mosi = nicintel_bitbang_set_mosi, diff --git a/ogp_spi.c b/ogp_spi.c index 9a9e7fa..e603edb 100644 --- a/ogp_spi.c +++ b/ogp_spi.c @@ -83,7 +83,6 @@ } static const struct bitbang_spi_master bitbang_spi_master_ogp = { - .type = BITBANG_SPI_MASTER_OGP, .set_cs = ogp_bitbang_set_cs, .set_sck = ogp_bitbang_set_sck, .set_mosi = ogp_bitbang_set_mosi, diff --git a/pony_spi.c b/pony_spi.c index 39a468b..6c03308 100644 --- a/pony_spi.c +++ b/pony_spi.c @@ -91,7 +91,6 @@ } static const struct bitbang_spi_master bitbang_spi_master_pony = { - .type = BITBANG_SPI_MASTER_PONY, .set_cs = pony_bitbang_set_cs, .set_sck = pony_bitbang_set_sck, .set_mosi = pony_bitbang_set_mosi, diff --git a/programmer.h b/programmer.h index 9da49f8..8f0183f 100644 --- a/programmer.h +++ b/programmer.h @@ -159,33 +159,7 @@ int programmer_init(enum programmer prog, const char *param); int programmer_shutdown(void); -enum bitbang_spi_master_type { - BITBANG_SPI_INVALID = 0, /* This must always be the first entry. */ -#if CONFIG_RAYER_SPI == 1 - BITBANG_SPI_MASTER_RAYER, -#endif -#if CONFIG_PONY_SPI == 1 - BITBANG_SPI_MASTER_PONY, -#endif -#if CONFIG_NICINTEL_SPI == 1 - BITBANG_SPI_MASTER_NICINTEL, -#endif -#if CONFIG_INTERNAL == 1 -#if defined(__i386__) || defined(__x86_64__) - BITBANG_SPI_MASTER_MCP, -#endif -#endif -#if CONFIG_OGP_SPI == 1 - BITBANG_SPI_MASTER_OGP, -#endif -#if CONFIG_DEVELOPERBOX_SPI == 1 - BITBANG_SPI_MASTER_DEVELOPERBOX, -#endif -}; - struct bitbang_spi_master { - enum bitbang_spi_master_type type; - /* Note that CS# is active low, so val=0 means the chip is active. */ void (*set_cs) (int val); void (*set_sck) (int val); diff --git a/rayer_spi.c b/rayer_spi.c index ef8ac26..8e869e6 100644 --- a/rayer_spi.c +++ b/rayer_spi.c @@ -157,7 +157,6 @@ } static const struct bitbang_spi_master bitbang_spi_master_rayer = { - .type = BITBANG_SPI_MASTER_RAYER, .set_cs = rayer_bitbang_set_cs, .set_sck = rayer_bitbang_set_sck, .set_mosi = rayer_bitbang_set_mosi, -- To view, visit https://review.coreboot.org/c/flashrom/+/33638 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7a3b5d9ff1e99d2d4f873c6f19fb318f93762037 Gerrit-Change-Number: 33638 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newchange

3 5

Change in ...flashrom[master]: ich_descriptors: Make internal functions static
by Jacob Garber (Code Review) 21 Jun '19

21 Jun '19

Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/33653 Change subject: ich_descriptors: Make internal functions static ...................................................................... ich_descriptors: Make internal functions static These functions are only used in this file, so they can be static. Change-Id: I7c39e5d52a86de660cbb0bb7821c8ecea18075a2 Signed-off-by: Jacob Garber <jgarber1(a)ualberta.ca> --- M ich_descriptors.c 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/53/33653/1 diff --git a/ich_descriptors.c b/ich_descriptors.c index 0a4cf75..bfe92bb 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -442,7 +442,7 @@ msg_pdbg2("\n"); } -void prettyprint_ich_descriptor_straps_ich8(const struct ich_descriptors *desc) +static void prettyprint_ich_descriptor_straps_ich8(const struct ich_descriptors *desc) { static const char * const str_GPIO12[4] = { "GPIO12", @@ -504,7 +504,7 @@ msg_pdbg2("\n"); } -void prettyprint_ich_descriptor_pchstraps45678_56(const struct ich_desc_south_strap *s) +static void prettyprint_ich_descriptor_pchstraps45678_56(const struct ich_desc_south_strap *s) { /* PCHSTRP4 */ msg_pdbg2("Intel PHY is %s.\n", @@ -528,7 +528,7 @@ /* PCHSTRP8 */ } -void prettyprint_ich_descriptor_pchstraps111213_56(const struct ich_desc_south_strap *s) +static void prettyprint_ich_descriptor_pchstraps111213_56(const struct ich_desc_south_strap *s) { /* PCHSTRP11 */ msg_pdbg2("SMLink1 GP Address is %sabled.\n", @@ -544,7 +544,7 @@ /* PCHSTRP13 */ } -void prettyprint_ich_descriptor_straps_ibex(const struct ich_desc_south_strap *s) +static void prettyprint_ich_descriptor_straps_ibex(const struct ich_desc_south_strap *s) { static const uint8_t dec_t209min[4] = { 100, @@ -642,7 +642,7 @@ msg_pdbg2("\n"); } -void prettyprint_ich_descriptor_straps_cougar(const struct ich_desc_south_strap *s) +static void prettyprint_ich_descriptor_straps_cougar(const struct ich_desc_south_strap *s) { msg_pdbg2("--- PCH ---\n"); @@ -811,7 +811,7 @@ } } -void prettyprint_rdid(uint32_t reg_val) +static void prettyprint_rdid(uint32_t reg_val) { uint8_t mid = reg_val & 0xFF; uint16_t did = ((reg_val >> 16) & 0xFF) | (reg_val & 0xFF00); -- To view, visit https://review.coreboot.org/c/flashrom/+/33653 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7c39e5d52a86de660cbb0bb7821c8ecea18075a2 Gerrit-Change-Number: 33653 Gerrit-PatchSet: 1 Gerrit-Owner: Jacob Garber <jgarber1(a)ualberta.ca> Gerrit-MessageType: newchange

2 2

Change in ...flashrom[master]: spi25: Make internal functions static
by Jacob Garber (Code Review) 21 Jun '19

21 Jun '19

Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/33654 Change subject: spi25: Make internal functions static ...................................................................... spi25: Make internal functions static These functions are only used in this file, so they can be made static. Change-Id: I609971c79860e5697638714cf299ec4a4dcea038 Signed-off-by: Jacob Garber <jgarber1(a)ualberta.ca> --- M spi25.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/54/33654/1 diff --git a/spi25.c b/spi25.c index fd87dc9..ba9eb0a 100644 --- a/spi25.c +++ b/spi25.c @@ -455,19 +455,19 @@ return result ? result : status; } -int spi_chip_erase_60(struct flashctx *flash) +static int spi_chip_erase_60(struct flashctx *flash) { /* This usually takes 1-85s, so wait in 1s steps. */ return spi_simple_write_cmd(flash, 0x60, 1000 * 1000); } -int spi_chip_erase_62(struct flashctx *flash) +static int spi_chip_erase_62(struct flashctx *flash) { /* This usually takes 2-5s, so wait in 100ms steps. */ return spi_simple_write_cmd(flash, 0x62, 100 * 1000); } -int spi_chip_erase_c7(struct flashctx *flash) +static int spi_chip_erase_c7(struct flashctx *flash) { /* This usually takes 1-85s, so wait in 1s steps. */ return spi_simple_write_cmd(flash, 0xc7, 1000 * 1000); -- To view, visit https://review.coreboot.org/c/flashrom/+/33654 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I609971c79860e5697638714cf299ec4a4dcea038 Gerrit-Change-Number: 33654 Gerrit-PatchSet: 1 Gerrit-Owner: Jacob Garber <jgarber1(a)ualberta.ca> Gerrit-MessageType: newchange

2 2

Change in ...flashrom[master]: flashrom: Make internal functions static
by Jacob Garber (Code Review) 21 Jun '19

21 Jun '19

Jacob Garber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/33666 Change subject: flashrom: Make internal functions static ...................................................................... flashrom: Make internal functions static These functions are only used in this file, so they can be made static. Change-Id: I7b63464bb8b5a25fc004350a188dab6ee5c1a204 Signed-off-by: Jacob Garber <jgarber1(a)ualberta.ca> --- M flashrom.c 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/66/33666/1 diff --git a/flashrom.c b/flashrom.c index b47d0a2..ea3d002 100644 --- a/flashrom.c +++ b/flashrom.c @@ -738,7 +738,7 @@ } /* start is an offset to the base address of the flash chip */ -int check_erased_range(struct flashctx *flash, unsigned int start, +static int check_erased_range(struct flashctx *flash, unsigned int start, unsigned int len) { int ret; @@ -2055,7 +2055,7 @@ } } -void print_sysinfo(void) +static void print_sysinfo(void) { #if IS_WINDOWS SYSTEM_INFO si; @@ -2235,7 +2235,7 @@ /* FIXME: This function signature needs to be improved once doit() has a better * function signature. */ -int chip_safety_check(const struct flashctx *flash, int force, int read_it, int write_it, int erase_it, +static int chip_safety_check(const struct flashctx *flash, int force, int read_it, int write_it, int erase_it, int verify_it) { const struct flashchip *chip = flash->chip; -- To view, visit https://review.coreboot.org/c/flashrom/+/33666 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I7b63464bb8b5a25fc004350a188dab6ee5c1a204 Gerrit-Change-Number: 33666 Gerrit-PatchSet: 1 Gerrit-Owner: Jacob Garber <jgarber1(a)ualberta.ca> Gerrit-MessageType: newchange

2 5

Change in ...flashrom[master]: Add support for National Instruments USB-845x devices
by Nico Huber (Code Review) 21 Jun '19

21 Jun '19

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/25683 ) Change subject: Add support for National Instruments USB-845x devices ...................................................................... Patch Set 17: (19 comments) First time I looked through all the code. I know it's already been lying around for more than a year, sorry for that. It looks nearly ready, although I added some serious comments. Also, there is still a lot of CamelCase. And generally, we try to follow the coding style of the Linux kernel. There is a nice tool to help with that (checkpatch.pl [1]). That is, if you have perl installed. I don't use it myself, but let me try... ./checkpath.pl --no-tree --max-line-length=112 --file ni845x_spi.c The first warning is spurious, but the errors should be checked. And the other warnings might give some nice hints. [1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/plain/sc… https://review.coreboot.org/#/c/25683/17/flashrom.8.tmpl File flashrom.8.tmpl: https://review.coreboot.org/#/c/25683/17/flashrom.8.tmpl@1144 PS17, Line 1144: 1230A2 Nit, example has only 6 digits. https://review.coreboot.org/#/c/25683/10/ni845x_spi.c File ni845x_spi.c: https://review.coreboot.org/#/c/25683/10/ni845x_spi.c@123 PS10, Line 123: %ld > int32 is coming from the NI's header where it is defined as a long: […] Stefan is correct. You shouldn't know what the header file defines. The header file could change, for instance if NI would issue a 64-bit version of the library. Please either cast `tmp` to the expected type or use the `inttypes.h` definitions as Stefan suggested. https://review.coreboot.org/#/c/25683/17/ni845x_spi.c File ni845x_spi.c: https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@43 PS17, Line 43: static char error_string_buffer[1024]; Writing a function around this would probably save a lot lines below and the buffer could be local. e.g. void ni845x_report_error(const char *const func, const int32 err) { static char buf[1024]; ni845xStatusToString(err, sizeof(buf), buf); msg_perr("%s failed with: %s (%d)\n", func, buf, (int)err); } Callers could use `__func__` to reduce copy-paste errors: ni845x_report_error(__func__, tmp); https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@107 PS17, Line 107: * @brief ni845x_spi_open Nit, adds no information. https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@109 PS17, Line 109: competition completion? https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@134 PS17, Line 134: "USB%d::0x%04X::0x%04X::%08X::RAW", %d expects an `int`, %X an `unsigned int`. If the pointers you pass are compatible, is implementation specific. A generally portable version would be (assuming bus numbers are >= 0): unsigned int usb_bus, vid, device_pid; unsigned long int serial_as_number; sccanf(resource_name, "USB%u::0x%04X::0x%04X::%08lX::RAW", &usb_bus, &vid, &device_pid, &serial_as_number); https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@207 PS17, Line 207: IO_voltage_100mV = ((float)IOVoltage_mV / 100.0f); Doing the calculation as `float` shouldn't make a difference. https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@219 PS17, Line 219: msg_pwarn Shouldn't be a warning, msg_pinfo() maybe? https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@226 PS17, Line 226: if (selected_voltage_100mV == 0) { This looks odd. I would have expect it to select 1.2V automatically here. The loop above doesn't look like it's possible to select 1.2V. https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@266 PS17, Line 266: Set Get https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@301 PS17, Line 301: &usb_bus, &vid, &pid, &serial_as_number); Check return code? https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@317 PS17, Line 317: ni845xFindDeviceNext(device_find_handle, resource_handle); Check return code? https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@342 PS17, Line 342: CS_number = atoi(CS_str); atoi() isn't a good choice, it would return a valid `0` on any error. One good pattern is to use strtoul() and check `endptr`, e.g.: cs_number = strtoul(cs_str, &endptr, 0); if (!*cs_str || *endptr || cs_number < 0 || 7 < cs_number) { return 1; } In this case, however, as there is only a single digit to parse, this should be safe too: cs_number = cs_str[0] - '0'; if (cs_str[1] || cs_number < 0 || 7 < cs_number) { return 1; } https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@345 PS17, Line 345: return 1; leaking `CS_str` https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@382 PS17, Line 382: if (serial_number) Not needed, as `free(NULL);` is valid. https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@391 PS17, Line 391: atoi atoi(), see above. https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@399 PS17, Line 399: None of the error paths (early `return`s) after opening the device closes the device. Maybe just call ni845x_spi_shutdown() directly, in case. It would be nice to sort the code blocks here: 1. do all the parameter parsing, 2. open the device and apply the settings. This should also ease the error path handling. https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@441 PS17, Line 441: msg_cinfo("FAILED.\n"); Why the second message? https://review.coreboot.org/#/c/25683/17/ni845x_spi.c@449 PS17, Line 449: (uInt32) the cast seems unnecessary -- To view, visit https://review.coreboot.org/c/flashrom/+/25683 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I9477b6f0193bfdf20bbe63421a7fb97b597ec549 Gerrit-Change-Number: 25683 Gerrit-PatchSet: 17 Gerrit-Owner: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-CC: Márton Miklós <martonmiklosqdev(a)gmail.com> Gerrit-CC: Stefan T <stefan.tauner(a)gmx.at> Gerrit-Comment-Date: Fri, 21 Jun 2019 17:09:24 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: Stefan T <stefan.tauner(a)gmx.at> Comment-In-Reply-To: Márton Miklós <martonmiklosqdev(a)gmail.com> Gerrit-MessageType: comment

1 0

Change in ...flashrom[master]: ft2232_spi.c: Remove unneeded 'else'
by HAOUAS Elyes (Code Review) 21 Jun '19

21 Jun '19

HAOUAS Elyes has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/33346 Change subject: ft2232_spi.c: Remove unneeded 'else' ...................................................................... ft2232_spi.c: Remove unneeded 'else' 'else' is not needed after a 'break' or 'return'. Change-Id: Ia4762d0c0601d56528de56658b869b62fbe5b263 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> --- M ft2232_spi.c 1 file changed, 4 insertions(+), 6 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/46/33346/1 diff --git a/ft2232_spi.c b/ft2232_spi.c index 95584aa..5c4d06b 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -321,9 +321,8 @@ "Valid are even values between 2 and 131072.\n", arg); free(arg); return -2; - } else { - divisor = (uint32_t)temp; } + divisor = (uint32_t)temp; } free(arg); @@ -336,11 +335,10 @@ "Valid values are between 0 and 3.\n", arg); free(arg); return -2; - } else { - unsigned int pin = temp + 4; - cs_bits |= 1 << pin; - pindir |= 1 << pin; } + unsigned int pin = temp + 4; + cs_bits |= 1 << pin; + pindir |= 1 << pin; } free(arg); -- To view, visit https://review.coreboot.org/c/flashrom/+/33346 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ia4762d0c0601d56528de56658b869b62fbe5b263 Gerrit-Change-Number: 33346 Gerrit-PatchSet: 1 Gerrit-Owner: HAOUAS Elyes <ehaouas(a)noos.fr> Gerrit-MessageType: newchange

3 2

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit June 2019