September 2022 - flashrom-gerrit

[S] Change in flashrom[master]: ich_descriptors.c: Retype variable `has_forbidden_opcode` with bool
by Anastasia Klimchuk (Code Review) 08 Sep '22

08 Sep '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66899 ) Change subject: ich_descriptors.c: Retype variable `has_forbidden_opcode` with bool ...................................................................... ich_descriptors.c: Retype variable `has_forbidden_opcode` with bool Use the bool type instead of an integer for the variable `has_forbidden_opcode`, since this represents its purpose much better. Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I6214956e377547b894fc76237832b6f7b2db41dd Reviewed-on: https://review.coreboot.org/c/flashrom/+/66899 Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M ich_descriptors.c 1 file changed, 21 insertions(+), 3 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/ich_descriptors.c b/ich_descriptors.c index 1cb7583..b37ce6d 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -31,6 +31,7 @@ #define UPPER_MAP_OFFSET (4096 - 256 - 4) #define getVTBA(flumap) (((flumap)->FLUMAP1 << 4) & 0x00000ff0) +#include <stdbool.h> #include <sys/types.h> #include <string.h> #include "flash.h" /* for msg_* */ @@ -398,9 +399,9 @@ msg_pdbg2("Dual Output Fast Read Support: %sabled\n", desc->component.modes.dual_output ? "en" : "dis"); - int has_forbidden_opcode = 0; + bool has_forbidden_opcode = false; if (desc->component.FLILL != 0) { - has_forbidden_opcode = 1; + has_forbidden_opcode = true; msg_pdbg2("Invalid instruction 0: 0x%02x\n", desc->component.invalid_instr0); msg_pdbg2("Invalid instruction 1: 0x%02x\n", @@ -412,7 +413,7 @@ } if (has_flill1) { if (desc->component.FLILL1 != 0) { - has_forbidden_opcode = 1; + has_forbidden_opcode = true; msg_pdbg2("Invalid instruction 4: 0x%02x\n", desc->component.invalid_instr4); msg_pdbg2("Invalid instruction 5: 0x%02x\n", -- To view, visit https://review.coreboot.org/c/flashrom/+/66899 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I6214956e377547b894fc76237832b6f7b2db41dd Gerrit-Change-Number: 66899 Gerrit-PatchSet: 15 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: fmap.c: Retype appropriate variables with bool
by Anastasia Klimchuk (Code Review) 08 Sep '22

08 Sep '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66896 ) Change subject: fmap.c: Retype appropriate variables with bool ...................................................................... fmap.c: Retype appropriate variables with bool Use the bool type instead of an integer for appropriate variables, since this represents their purpose much better. Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I323d40cabe9c580057d870e742b3b55942c78321 Reviewed-on: https://review.coreboot.org/c/flashrom/+/66896 Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M fmap.c 1 file changed, 25 insertions(+), 5 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/fmap.c b/fmap.c index bd847bd..69824ea 100644 --- a/fmap.c +++ b/fmap.c @@ -35,6 +35,7 @@ */ #include <ctype.h> +#include <stdbool.h> #include <stdlib.h> #include <string.h> #include <sys/types.h> @@ -94,14 +95,14 @@ static ssize_t fmap_lsearch(const uint8_t *buf, size_t len) { ssize_t offset; - bool fmap_found = 0; + bool fmap_found = false; if (len < sizeof(struct fmap)) return -1; for (offset = 0; offset <= (ssize_t)(len - sizeof(struct fmap)); offset++) { if (is_valid_fmap((struct fmap *)&buf[offset])) { - fmap_found = 1; + fmap_found = true; break; } } @@ -184,7 +185,9 @@ size_t rom_offset, size_t len, size_t min_stride) { size_t stride, fmap_len = 0; - int ret = 1, fmap_found = 0, check_offset_0 = 1; + int ret = 1; + bool fmap_found = false; + bool check_offset_0 = true; struct fmap *fmap; const unsigned int chip_size = flashctx->chip->total_size * 1024; const int sig_len = strlen(FMAP_SIGNATURE); @@ -225,7 +228,7 @@ continue; if (offset == 0 && !check_offset_0) continue; - check_offset_0 = 0; + check_offset_0 = false; /* Read errors are considered non-fatal since we may * encounter locked regions and want to continue. */ @@ -251,7 +254,7 @@ if (is_valid_fmap(fmap)) { msg_gdbg("fmap found at offset 0x%06zx\n", offset); - fmap_found = 1; + fmap_found = true; break; } msg_gerr("fmap signature found at %zu but header is invalid.\n", offset); -- To view, visit https://review.coreboot.org/c/flashrom/+/66896 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I323d40cabe9c580057d870e742b3b55942c78321 Gerrit-Change-Number: 66896 Gerrit-PatchSet: 15 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: ft2232_spi.c: Retype variable `clock_5x` with bool
by Anastasia Klimchuk (Code Review) 08 Sep '22

08 Sep '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66895 ) Change subject: ft2232_spi.c: Retype variable `clock_5x` with bool ...................................................................... ft2232_spi.c: Retype variable `clock_5x` with bool Use the bool type instead of an integer for the variable `clock_5x`, since this represents its purpose much better. Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: Ie3005f9dcb2dcfe63261c52a36d865d175a0a75c Reviewed-on: https://review.coreboot.org/c/flashrom/+/66895 Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M ft2232_spi.c 1 file changed, 20 insertions(+), 2 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/ft2232_spi.c b/ft2232_spi.c index 2971c2e..5b45d7e 100644 --- a/ft2232_spi.c +++ b/ft2232_spi.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ +#include <stdbool.h> #include <stdio.h> #include <strings.h> #include <string.h> @@ -317,7 +318,7 @@ * but the non-H chips can only run at 12 MHz. We disable the divide-by-5 * prescaler on 'H' chips so they run at 60MHz. */ - uint8_t clock_5x = 1; + bool clock_5x = true; /* In addition to the prescaler mentioned above there is also another * configurable one on all versions of the chips. Its divisor div can be * set by a 16 bit value x according to the following formula: @@ -618,7 +619,7 @@ if (ftdic.type != TYPE_2232H && ftdic.type != TYPE_4232H && ftdic.type != TYPE_232H) { msg_pdbg("FTDI chip type %d is not high-speed.\n", ftdic.type); - clock_5x = 0; + clock_5x = false; } if (ftdi_usb_reset(&ftdic) < 0) { -- To view, visit https://review.coreboot.org/c/flashrom/+/66895 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Ie3005f9dcb2dcfe63261c52a36d865d175a0a75c Gerrit-Change-Number: 66895 Gerrit-PatchSet: 15 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: spi25.c: Retype appropriate variables with bool
by Anastasia Klimchuk (Code Review) 08 Sep '22

08 Sep '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66890 ) Change subject: spi25.c: Retype appropriate variables with bool ...................................................................... spi25.c: Retype appropriate variables with bool Use the bool type instead of an integer for appropriate variables, since this represents their purpose much better. Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: Icd7e6478848c6f72817da16a5350d450bcc0bb5d Reviewed-on: https://review.coreboot.org/c/flashrom/+/66890 Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M spi25.c 1 file changed, 22 insertions(+), 5 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/spi25.c b/spi25.c index 4454106..6d160eb 100644 --- a/spi25.c +++ b/spi25.c @@ -37,7 +37,7 @@ }; static struct { - int is_cached; + bool is_cached; unsigned char bytes[4]; /* enough to hold largest ID type */ } id_cache[NUM_ID_TYPES]; @@ -167,7 +167,7 @@ msg_cinfo("%d byte RDID not supported on this SPI controller\n", bytes); if (ret) return 0; - id_cache[idty].is_cached = 1; + id_cache[idty].is_cached = true; } rdid_get_ids(id_cache[idty].bytes, bytes, &id1, &id2); @@ -191,7 +191,7 @@ if (!id_cache[REMS].is_cached) { if (spi_rems(flash, id_cache[REMS].bytes)) return 0; - id_cache[REMS].is_cached = 1; + id_cache[REMS].is_cached = true; } id1 = id_cache[REMS].bytes[0]; @@ -247,7 +247,7 @@ if (!id_cache[RES2].is_cached) { if (spi_res(flash, id_cache[RES2].bytes, 2)) return 0; - id_cache[RES2].is_cached = 1; + id_cache[RES2].is_cached = true; } id1 = id_cache[RES2].bytes[0]; @@ -267,7 +267,7 @@ if (!id_cache[RES3].is_cached) { if (spi_res(flash, id_cache[RES3].bytes, 3)) return 0; - id_cache[RES3].is_cached = 1; + id_cache[RES3].is_cached = true; } id1 = (id_cache[RES3].bytes[0] << 8) | id_cache[RES3].bytes[1]; -- To view, visit https://review.coreboot.org/c/flashrom/+/66890 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Icd7e6478848c6f72817da16a5350d450bcc0bb5d Gerrit-Change-Number: 66890 Gerrit-PatchSet: 14 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: tree: Retype variable `laptop_ok` with bool
by Anastasia Klimchuk (Code Review) 08 Sep '22

08 Sep '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66891 ) Change subject: tree: Retype variable `laptop_ok` with bool ...................................................................... tree: Retype variable `laptop_ok` with bool Use the bool type instead of an integer for the variable `laptop_ok`, since this represents its purpose much better. Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I5d9fc3516bc2d29f11b056e35b3e5e324ce93423 Reviewed-on: https://review.coreboot.org/c/flashrom/+/66891 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> --- M board_enable.c M chipset_enable.c M include/programmer.h M internal.c 4 files changed, 25 insertions(+), 7 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/board_enable.c b/board_enable.c index 3d9ec21..4903c0f 100644 --- a/board_enable.c +++ b/board_enable.c @@ -22,6 +22,7 @@ #include <strings.h> #include <string.h> +#include <stdbool.h> #include <stdlib.h> #include "flash.h" #include "programmer.h" @@ -2292,7 +2293,7 @@ static int p2_whitelist_laptop(void) { is_laptop = 1; - laptop_ok = 1; + laptop_ok = true; msg_pdbg("Whitelisted laptop detected.\n"); return 0; } diff --git a/chipset_enable.c b/chipset_enable.c index ae06989..d6103c1 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -826,7 +826,7 @@ /* Suppress unknown laptop warning if we booted from SPI. */ if (boot_buses & BUS_SPI) - laptop_ok = 1; + laptop_ok = true; return 0; } @@ -971,7 +971,7 @@ /* Suppress unknown laptop warning if we booted from SPI. */ if (!ret && (boot_buses & BUS_SPI)) - laptop_ok = 1; + laptop_ok = true; _freepci_ret: pci_free_dev(spi_dev); @@ -1087,7 +1087,7 @@ /* Suppress unknown laptop warning if we booted from SPI. */ if (boot_buses & BUS_SPI) - laptop_ok = 1; + laptop_ok = true; return 0; } @@ -1676,7 +1676,7 @@ /* Suppress unknown laptop warning if we booted from SPI. */ if (!ret && want_spi) - laptop_ok = 1; + laptop_ok = true; return ret; } diff --git a/include/programmer.h b/include/programmer.h index abb7cfd..a7cea5e 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -265,7 +265,7 @@ #if CONFIG_INTERNAL == 1 extern int is_laptop; -extern int laptop_ok; +extern bool laptop_ok; extern bool force_boardenable; extern bool force_boardmismatch; void probe_superio(void); diff --git a/internal.c b/internal.c index ce1debe..43aa51b 100644 --- a/internal.c +++ b/internal.c @@ -28,7 +28,7 @@ #endif int is_laptop = 0; -int laptop_ok = 0; +bool laptop_ok = false; bool force_boardenable = false; bool force_boardmismatch = false; -- To view, visit https://review.coreboot.org/c/flashrom/+/66891 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5d9fc3516bc2d29f11b056e35b3e5e324ce93423 Gerrit-Change-Number: 66891 Gerrit-PatchSet: 14 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: tree: Retype variable `laptop_ok` with bool
by Anastasia Klimchuk (Code Review) 08 Sep '22

08 Sep '22

Attention is currently required from: Felix Singer. Anastasia Klimchuk has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/66891 ) Change subject: tree: Retype variable `laptop_ok` with bool ...................................................................... Patch Set 13: Code-Review+2 (1 comment) File board_enable.c: https://review.coreboot.org/c/flashrom/+/66891/comment/38100f9d_dd874fc3 PS13, Line 2295: is_laptop = 1; > For another patch: please consider turning `is_laptop` into an enum. I suggested to create a ticket for this, not to forget https://ticket.coreboot.org/issues/416 It starts being useful to have a list of Easy projects things to do, and in any case whoever will do this, ticket helps not to forget. -- To view, visit https://review.coreboot.org/c/flashrom/+/66891 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5d9fc3516bc2d29f11b056e35b3e5e324ce93423 Gerrit-Change-Number: 66891 Gerrit-PatchSet: 13 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Attention: Felix Singer <felixsinger(a)posteo.net> Gerrit-Comment-Date: Thu, 08 Sep 2022 02:12:06 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: Angel Pons <th3fanbus(a)gmail.com> Gerrit-MessageType: comment

1 0

[S] Change in flashrom[master]: ichspi.c: Retype appropriate variables with bool
by Anastasia Klimchuk (Code Review) 08 Sep '22

08 Sep '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66892 ) Change subject: ichspi.c: Retype appropriate variables with bool ...................................................................... ichspi.c: Retype appropriate variables with bool Use the bool type instead of an integer for appropriate variables, since this represents their purpose much better. Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: If7eeacc44921f52aa593ab1302f17a5c5190f830 Reviewed-on: https://review.coreboot.org/c/flashrom/+/66892 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M ichspi.c 1 file changed, 28 insertions(+), 10 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, but someone else must approve Anastasia Klimchuk: Looks good to me, approved diff --git a/ichspi.c b/ichspi.c index 855b7fb..f5876b7 100644 --- a/ichspi.c +++ b/ichspi.c @@ -20,6 +20,7 @@ */ #include <string.h> +#include <stdbool.h> #include <stdlib.h> #include "flash.h" #include "programmer.h" @@ -255,7 +256,7 @@ }; /* ICH SPI configuration lock-down. May be set during chipset enabling. */ -static int ichspi_lock = 0; +static bool ichspi_lock = false; static enum ich_chipset ich_generation = CHIPSET_ICH_UNKNOWN; static uint32_t ichspi_bbar; @@ -859,7 +860,7 @@ static int ich7_run_opcode(OPCODE op, uint32_t offset, uint8_t datalength, uint8_t * data, int maxdata) { - int write_cmd = 0; + bool write_cmd = false; int timeout; uint32_t temp32; uint16_t temp16; @@ -869,7 +870,7 @@ /* Is it a write command? */ if ((op.spi_type == SPI_OPCODE_TYPE_WRITE_NO_ADDRESS) || (op.spi_type == SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS)) { - write_cmd = 1; + write_cmd = true; } timeout = 100 * 60; /* 60 ms are 9.6 million cycles at 16 MHz. */ @@ -976,7 +977,7 @@ static int ich9_run_opcode(OPCODE op, uint32_t offset, uint8_t datalength, uint8_t * data) { - int write_cmd = 0; + bool write_cmd = false; int timeout; uint32_t temp32; uint64_t opmenu; @@ -985,7 +986,7 @@ /* Is it a write command? */ if ((op.spi_type == SPI_OPCODE_TYPE_WRITE_NO_ADDRESS) || (op.spi_type == SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS)) { - write_cmd = 1; + write_cmd = true; } timeout = 100 * 60; /* 60 ms are 9.6 million cycles at 16 MHz. */ @@ -1857,7 +1858,7 @@ } if (mmio_readw(spibar) & (1 << 15)) { msg_pwarn("WARNING: SPI Configuration Lockdown activated.\n"); - ichspi_lock = 1; + ichspi_lock = true; } ich_init_opcodes(ich_gen); ich_set_bbar(0, ich_gen); @@ -1970,7 +1971,7 @@ uint16_t tmp2; uint32_t tmp; int ich_spi_rw_restricted = 0; - int desc_valid = 0; + bool desc_valid = false; struct ich_descriptors desc = { 0 }; enum ich_spi_mode ich_spi_mode = ich_auto; size_t num_freg, num_pr, reg_pr0; @@ -1986,10 +1987,10 @@ prettyprint_ich9_reg_hsfs(tmp2, ich_gen); if (tmp2 & HSFS_FLOCKDN) { msg_pinfo("SPI Configuration is locked down.\n"); - ichspi_lock = 1; + ichspi_lock = true; } if (tmp2 & HSFS_FDV) - desc_valid = 1; + desc_valid = true; if (!(tmp2 & HSFS_FDOPSS) && desc_valid) msg_pinfo("The Flash Descriptor Override Strap-Pin is set. Restrictions implied by\n" "the Master Section of the flash descriptor are NOT in effect. Please note\n" @@ -2278,7 +2279,7 @@ msg_pdbg("0x6c: 0x%04x (CLOCK/DEBUG)\n", mmio_readw(ich_spibar + 0x6c)); if (mmio_readw(ich_spibar) & (1 << 15)) { msg_pwarn("Warning: SPI Configuration Lockdown activated.\n"); - ichspi_lock = 1; + ichspi_lock = true; } ich_set_bbar(0, ich_generation); -- To view, visit https://review.coreboot.org/c/flashrom/+/66892 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: If7eeacc44921f52aa593ab1302f17a5c5190f830 Gerrit-Change-Number: 66892 Gerrit-PatchSet: 14 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: tree: Retype variable `programmer_may_write` with bool
by Anastasia Klimchuk (Code Review) 08 Sep '22

08 Sep '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66885 ) Change subject: tree: Retype variable `programmer_may_write` with bool ...................................................................... tree: Retype variable `programmer_may_write` with bool Use the bool type instead of an integer for the variable `programmer_may_write`, since this represents its purpose much better. Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I69958527ae018a92f1c42734a7990d0c532dee0c Reviewed-on: https://review.coreboot.org/c/flashrom/+/66885 Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M chipset_enable.c M flashrom.c M gfxnvidia.c M include/programmer.h M sb600spi.c 5 files changed, 26 insertions(+), 6 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/chipset_enable.c b/chipset_enable.c index e205a83..ae06989 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -26,6 +26,7 @@ #define _LARGEFILE64_SOURCE +#include <stdbool.h> #include <stdlib.h> #include <string.h> #include <unistd.h> @@ -1526,7 +1527,7 @@ if (err > 0) { msg_pinfo("%d locks could not be disabled, disabling writes (reads may also fail).\n", err); - programmer_may_write = 0; + programmer_may_write = false; } reg = 0x88; diff --git a/flashrom.c b/flashrom.c index a1e4d23..b68ba55 100644 --- a/flashrom.c +++ b/flashrom.c @@ -50,7 +50,7 @@ unsigned long flashbase; /* Is writing allowed with this programmer? */ -int programmer_may_write; +bool programmer_may_write; #define SHUTDOWN_MAXFN 32 static int shutdown_fn_count = 0; @@ -148,7 +148,7 @@ /* Registering shutdown functions is now allowed. */ may_register_shutdown = true; /* Default to allowing writes. Broken programmers set this to 0. */ - programmer_may_write = 1; + programmer_may_write = true; programmer_param = param; msg_pdbg("Initializing %s programmer\n", programmer->name); diff --git a/gfxnvidia.c b/gfxnvidia.c index 941f0e8..ff510ef 100644 --- a/gfxnvidia.c +++ b/gfxnvidia.c @@ -14,6 +14,7 @@ * GNU General Public License for more details. */ +#include <stdbool.h> #include <stdlib.h> #include <string.h> #include "flash.h" @@ -140,7 +141,7 @@ pci_write_long(dev, REG_FLASH_ACCESS, reg32); /* Write/erase doesn't work. */ - programmer_may_write = 0; + programmer_may_write = false; return register_par_master(&par_master_gfxnvidia, BUS_PARALLEL, data); } diff --git a/include/programmer.h b/include/programmer.h index 776ac21..abb7cfd 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -286,7 +286,7 @@ }; // FIXME: These need to be local, not global extern struct decode_sizes max_rom_decode; -extern int programmer_may_write; +extern bool programmer_may_write; extern unsigned long flashbase; unsigned int count_max_decode_exceedings(const struct flashctx *flash); char *extract_programmer_param_str(const struct programmer_cfg *cfg, const char *param_name); diff --git a/sb600spi.c b/sb600spi.c index 40a6dbb..8b02b51 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -18,6 +18,7 @@ * GNU General Public License for more details. */ +#include <stdbool.h> #include <string.h> #include <stdlib.h> #include "flash.h" @@ -554,7 +555,7 @@ } if (!amd_imc_force) - programmer_may_write = 0; + programmer_may_write = false; msg_pinfo("Writes have been disabled for safety reasons because the presence of the IMC\n" "was detected and it could interfere with accessing flash memory. Flashrom will\n" "try to disable it temporarily but even then this might not be safe:\n" -- To view, visit https://review.coreboot.org/c/flashrom/+/66885 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I69958527ae018a92f1c42734a7990d0c532dee0c Gerrit-Change-Number: 66885 Gerrit-PatchSet: 15 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: flashrom.c: Retype appropriate variables with bool
by Anastasia Klimchuk (Code Review) 08 Sep '22

08 Sep '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66883 ) Change subject: flashrom.c: Retype appropriate variables with bool ...................................................................... flashrom.c: Retype appropriate variables with bool Use the bool type instead of an integer for appropriate variables, since this represents their purpose much better. Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I6629f391284c8f1266e4ba66c9976f3df43955d4 Reviewed-on: https://review.coreboot.org/c/flashrom/+/66883 Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M flashrom.c 1 file changed, 23 insertions(+), 5 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/flashrom.c b/flashrom.c index 0e2fa42..a1e4d23 100644 --- a/flashrom.c +++ b/flashrom.c @@ -19,6 +19,7 @@ * GNU General Public License for more details. */ +#include <stdbool.h> #include <stdio.h> #include <sys/types.h> #include <string.h> @@ -61,7 +62,7 @@ /* Initialize to 0 to make sure nobody registers a shutdown function before * programmer init. */ -static int may_register_shutdown = 0; +static bool may_register_shutdown = false; /* Did we change something or was every erase/write skipped (if any)? */ static bool all_skipped = true; @@ -145,7 +146,7 @@ /* Default to top aligned flash at 4 GB. */ flashbase = 0; /* Registering shutdown functions is now allowed. */ - may_register_shutdown = 1; + may_register_shutdown = true; /* Default to allowing writes. Broken programmers set this to 0. */ programmer_may_write = 1; @@ -181,7 +182,7 @@ int ret = 0; /* Registering shutdown functions is no longer allowed. */ - may_register_shutdown = 0; + may_register_shutdown = false; while (shutdown_fn_count > 0) { int i = --shutdown_fn_count; ret |= shutdown_fn[i].func(shutdown_fn[i].data); @@ -517,7 +518,7 @@ unsigned int *first_start, enum write_granularity gran) { - int need_write = 0; + bool need_write = false; unsigned int rel_start = 0, first_len = 0; unsigned int i, limit, stride; @@ -562,7 +563,7 @@ if (memcmp(have + i * stride, want + i * stride, limit)) { if (!need_write) { /* First location where have and want differ. */ - need_write = 1; + need_write = true; rel_start = i * stride; } } else { -- To view, visit https://review.coreboot.org/c/flashrom/+/66883 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I6629f391284c8f1266e4ba66c9976f3df43955d4 Gerrit-Change-Number: 66883 Gerrit-PatchSet: 13 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Thomas Heijligen <src(a)posteo.de> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

[S] Change in flashrom[master]: linux_mtd.c: Retype appropriate attributes with bool
by Anastasia Klimchuk (Code Review) 08 Sep '22

08 Sep '22

Anastasia Klimchuk has submitted this change. ( https://review.coreboot.org/c/flashrom/+/66881 ) Change subject: linux_mtd.c: Retype appropriate attributes with bool ...................................................................... linux_mtd.c: Retype appropriate attributes with bool Use the bool type instead of an integer for appropriate attributes, since this represents their purpose much better. Signed-off-by: Felix Singer <felixsinger(a)posteo.net> Change-Id: I8be4e08e714047d155dcc032cc3d8dabb422b27f Reviewed-on: https://review.coreboot.org/c/flashrom/+/66881 Reviewed-by: Anastasia Klimchuk <aklm(a)chromium.org> Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M linux_mtd.c 1 file changed, 22 insertions(+), 4 deletions(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Anastasia Klimchuk: Looks good to me, approved diff --git a/linux_mtd.c b/linux_mtd.c index c5dc451..c0147f6 100644 --- a/linux_mtd.c +++ b/linux_mtd.c @@ -17,6 +17,7 @@ #include <ctype.h> #include <errno.h> #include <fcntl.h> +#include <stdbool.h> #include <stdio.h> #include <stdlib.h> #include <mtd/mtd-user.h> @@ -33,8 +34,8 @@ struct linux_mtd_data { FILE *dev_fp; - int device_is_writeable; - int no_erase; + bool device_is_writeable; + bool no_erase; /* Size info is presented in bytes in sysfs. */ unsigned long int total_size; unsigned long int numeraseregions; @@ -130,10 +131,10 @@ return 1; if (tmp & MTD_WRITEABLE) { /* cache for later use by write function */ - data->device_is_writeable = 1; + data->device_is_writeable = true; } if (tmp & MTD_NO_ERASE) { - data->no_erase = 1; + data->no_erase = true; } /* Device name */ -- To view, visit https://review.coreboot.org/c/flashrom/+/66881 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I8be4e08e714047d155dcc032cc3d8dabb422b27f Gerrit-Change-Number: 66881 Gerrit-PatchSet: 13 Gerrit-Owner: Felix Singer <felixsinger(a)posteo.net> Gerrit-Reviewer: Anastasia Klimchuk <aklm(a)chromium.org> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Edward O'Callaghan <quasisec(a)chromium.org> Gerrit-Reviewer: Nikolai Artemiev <nartemiev(a)google.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit September 2022