February 2019 - flashrom-gerrit

Change in ...flashrom[master]: Fix erasing of unaligned regions
by Nico Huber (Code Review) March 4, 2019

March 4, 2019

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/31068 Change subject: Fix erasing of unaligned regions ...................................................................... Fix erasing of unaligned regions The erase (-E) feature is somehow a brute force method, but still, if we are given a region to erase, we should make sure to restore surrounding data if the erase block expands beyond the region. Change-Id: I5fc35310f0b090f218cd1d660e27fb39dd05c3c5 Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- M flashrom.c 1 file changed, 66 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/68/31068/1 diff --git a/flashrom.c b/flashrom.c index 7129a51..e141f2c 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1732,17 +1732,80 @@ const struct walk_info *const info, const erasefn_t erasefn) { const unsigned int erase_len = info->erase_end + 1 - info->erase_start; + const bool region_unaligned = info->region_start > info->erase_start || + info->erase_end > info->region_end; + uint8_t *backup_contents = NULL, *erased_contents = NULL; + int ret = 2; + /* + * If the region is not erase-block aligned, merge current flash con- + * tents into a new buffer `backup_contents`. + */ + if (region_unaligned) { + backup_contents = malloc(erase_len); + erased_contents = malloc(erase_len); + if (!backup_contents || !erased_contents) { + msg_cerr("Out of memory!\n"); + ret = 1; + goto _free_ret; + } + memset(backup_contents, ERASED_VALUE(flashctx), erase_len); + memset(erased_contents, ERASED_VALUE(flashctx), erase_len); + + msg_cdbg("R"); + /* Merge data preceding the current region. */ + if (info->region_start > info->erase_start) { + const chipoff_t start = info->erase_start; + const chipsize_t len = info->region_start - info->erase_start; + if (flashctx->chip->read(flashctx, backup_contents, start, len)) { + msg_cerr("Can't read! Aborting.\n"); + goto _free_ret; + } + } + /* Merge data following the current region. */ + if (info->erase_end > info->region_end) { + const chipoff_t start = info->region_end + 1; + const chipoff_t rel_start = start - info->erase_start; /* within this erase block */ + const chipsize_t len = info->erase_end - info->region_end; + if (flashctx->chip->read(flashctx, backup_contents + rel_start, start, len)) { + msg_cerr("Can't read! Aborting.\n"); + goto _free_ret; + } + } + } + + ret = 1; all_skipped = false; msg_cdbg("E"); if (erasefn(flashctx, info->erase_start, erase_len)) - return 1; + goto _free_ret; if (check_erased_range(flashctx, info->erase_start, erase_len)) { msg_cerr("ERASE FAILED!\n"); - return 1; + goto _free_ret; } - return 0; + + if (region_unaligned) { + unsigned int starthere = 0, lenhere = 0, writecount = 0; + /* get_next_write() sets starthere to a new value after the call. */ + while ((lenhere = get_next_write(erased_contents + starthere, backup_contents + starthere, + erase_len - starthere, &starthere, flashctx->chip->gran))) { + if (!writecount++) + msg_cdbg("W"); + /* Needs the partial write function signature. */ + if (flashctx->chip->write(flashctx, backup_contents + starthere, + info->erase_start + starthere, lenhere)) + goto _free_ret; + starthere += lenhere; + } + } + + ret = 0; + +_free_ret: + free(erased_contents); + free(backup_contents); + return ret; } /** -- To view, visit https://review.coreboot.org/c/flashrom/+/31068 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I5fc35310f0b090f218cd1d660e27fb39dd05c3c5 Gerrit-Change-Number: 31068 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newchange

4 12

Change in ...flashrom[master]: Fix several -Wno-implicit-fallthrough warnings
by Nico Huber (Code Review) Feb. 12, 2019

Feb. 12, 2019

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/c/flashrom/+/30406 ) Change subject: Fix several -Wno-implicit-fallthrough warnings ...................................................................... Fix several -Wno-implicit-fallthrough warnings GCC is picky about the comment being where the break should go. Change-Id: I05db2fb34025fefe2c6ddd1274c8e45b7cc5a4b6 Signed-off-by: Richard Hughes <richard(a)hughsie.com> Reviewed-on: https://review.coreboot.org/c/30406 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M ich_descriptors.c M ichspi.c M sb600spi.c M spi25_statusreg.c 4 files changed, 9 insertions(+), 3 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Paul Menzel: Looks good to me, but someone else must approve Angel Pons: Looks good to me, approved diff --git a/ich_descriptors.c b/ich_descriptors.c index 56e846f..944af4c 100644 --- a/ich_descriptors.c +++ b/ich_descriptors.c @@ -69,6 +69,7 @@ case CHIPSET_C620_SERIES_LEWISBURG: if (cont->NM <= MAX_NUM_MASTERS) return cont->NM; + break; default: if (cont->NM < MAX_NUM_MASTERS) return cont->NM + 1; @@ -238,6 +239,7 @@ case CHIPSET_ICH10: if (value > 1) return "reserved"; + /* Fall through. */ case CHIPSET_5_SERIES_IBEX_PEAK: case CHIPSET_6_SERIES_COUGAR_POINT: case CHIPSET_7_SERIES_PANTHER_POINT: diff --git a/ichspi.c b/ichspi.c index 911f50a..0f1470d 100644 --- a/ichspi.c +++ b/ichspi.c @@ -891,7 +891,7 @@ case 2: /* Select second preop. */ temp16 |= SPIC_SPOP; - /* And fall through. */ + /* Fall through. */ case 1: /* Atomic command (preop+op) */ temp16 |= SPIC_ACS; @@ -1013,7 +1013,7 @@ case 2: /* Select second preop. */ temp32 |= SSFC_SPOP; - /* And fall through. */ + /* Fall through. */ case 1: /* Atomic command (preop+op) */ temp32 |= SSFC_ACS; diff --git a/sb600spi.c b/sb600spi.c index 1e2e5d5..1efb2ce 100644 --- a/sb600spi.c +++ b/sb600spi.c @@ -638,6 +638,7 @@ switch (amd_gen) { case CHIPSET_SB7XX: msg_pdbg(", DropOneClkOnRd/SpiClkGate=%i", (tmp >> 28) & 0x1); + /* Fall through. */ case CHIPSET_SB89XX: case CHIPSET_HUDSON234: case CHIPSET_YANGTZE: diff --git a/spi25_statusreg.c b/spi25_statusreg.c index a5fb3b8..4cf7023 100644 --- a/spi25_statusreg.c +++ b/spi25_statusreg.c @@ -269,19 +269,22 @@ static void spi_prettyprint_status_register_bp(uint8_t status, int bp) { switch (bp) { - /* Fall through. */ case 4: msg_cdbg("Chip status register: Block Protect 4 (BP4) is %sset\n", (status & (1 << 6)) ? "" : "not "); + /* Fall through. */ case 3: msg_cdbg("Chip status register: Block Protect 3 (BP3) is %sset\n", (status & (1 << 5)) ? "" : "not "); + /* Fall through. */ case 2: msg_cdbg("Chip status register: Block Protect 2 (BP2) is %sset\n", (status & (1 << 4)) ? "" : "not "); + /* Fall through. */ case 1: msg_cdbg("Chip status register: Block Protect 1 (BP1) is %sset\n", (status & (1 << 3)) ? "" : "not "); + /* Fall through. */ case 0: msg_cdbg("Chip status register: Block Protect 0 (BP0) is %sset\n", (status & (1 << 2)) ? "" : "not "); -- To view, visit https://review.coreboot.org/c/flashrom/+/30406 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I05db2fb34025fefe2c6ddd1274c8e45b7cc5a4b6 Gerrit-Change-Number: 30406 Gerrit-PatchSet: 4 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Richard Hughes <richard(a)hughsie.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: merged

1 0

Change in ...flashrom[master]: Fix several -Wno-implicit-fallthrough warnings
by Angel Pons (Code Review) Feb. 6, 2019

Feb. 6, 2019

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/30406 ) Change subject: Fix several -Wno-implicit-fallthrough warnings ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/c/flashrom/+/30406 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I05db2fb34025fefe2c6ddd1274c8e45b7cc5a4b6 Gerrit-Change-Number: 30406 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Richard Hughes <richard(a)hughsie.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 06 Feb 2019 14:52:27 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in ...flashrom[master]: Fix several -Wno-implicit-fallthrough warnings
by Paul Menzel (Code Review) Feb. 6, 2019

Feb. 6, 2019

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/30406 ) Change subject: Fix several -Wno-implicit-fallthrough warnings ...................................................................... Patch Set 3: Code-Review+1 -- To view, visit https://review.coreboot.org/c/flashrom/+/30406 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I05db2fb34025fefe2c6ddd1274c8e45b7cc5a4b6 Gerrit-Change-Number: 30406 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Paul Menzel <paulepanter(a)users.sourceforge.net> Gerrit-Reviewer: Richard Hughes <richard(a)hughsie.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 06 Feb 2019 12:56:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in ...flashrom[master]: Fix several -Wno-implicit-fallthrough warnings
by Nico Huber (Code Review) Feb. 6, 2019

Feb. 6, 2019

Nico Huber has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/30406 ) Change subject: Fix several -Wno-implicit-fallthrough warnings ...................................................................... Patch Set 3: Code-Review+2 Thanks. And welcome to Gerrit! :) -- To view, visit https://review.coreboot.org/c/flashrom/+/30406 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I05db2fb34025fefe2c6ddd1274c8e45b7cc5a4b6 Gerrit-Change-Number: 30406 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Richard Hughes <richard(a)hughsie.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Wed, 06 Feb 2019 09:59:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

Change in ...flashrom[master]: Fix several -Wno-implicit-fallthrough warnings
by Richard Hughes (Code Review) Feb. 6, 2019

Feb. 6, 2019

Richard Hughes has uploaded a new patch set (#3) to the change originally created by Nico Huber. ( https://review.coreboot.org/c/flashrom/+/30406 ) Change subject: Fix several -Wno-implicit-fallthrough warnings ...................................................................... Fix several -Wno-implicit-fallthrough warnings GCC is picky about the comment being where the break should go. Change-Id: I05db2fb34025fefe2c6ddd1274c8e45b7cc5a4b6 Signed-off-by: Richard Hughes <richard(a)hughsie.com> --- M ich_descriptors.c M ichspi.c M sb600spi.c M spi25_statusreg.c 4 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/06/30406/3 -- To view, visit https://review.coreboot.org/c/flashrom/+/30406 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I05db2fb34025fefe2c6ddd1274c8e45b7cc5a4b6 Gerrit-Change-Number: 30406 Gerrit-PatchSet: 3 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Richard Hughes <richard(a)hughsie.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

Change in ...flashrom[master]: Fix several -Wno-implicit-fallthrough warnings
by Richard Hughes (Code Review) Feb. 5, 2019

Feb. 5, 2019

Richard Hughes has uploaded a new patch set (#2) to the change originally created by Nico Huber. ( https://review.coreboot.org/c/flashrom/+/30406 ) Change subject: Fix several -Wno-implicit-fallthrough warnings ...................................................................... Fix several -Wno-implicit-fallthrough warnings GCC is picky about the comment being where the break should go. Change-Id: I05db2fb34025fefe2c6ddd1274c8e45b7cc5a4b6 Signed-off-by: Richard Hughes <richard(a)hughsie.com> --- M ich_descriptors.c M ichspi.c M sb600spi.c M spi25_statusreg.c 4 files changed, 9 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/06/30406/2 -- To view, visit https://review.coreboot.org/c/flashrom/+/30406 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I05db2fb34025fefe2c6ddd1274c8e45b7cc5a4b6 Gerrit-Change-Number: 30406 Gerrit-PatchSet: 2 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Richard Hughes <richard(a)hughsie.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-MessageType: newpatchset

1 0

Change in ...flashrom[master]: [WIP]layout: Use a linked list for layouts
by Arthur Heymans (Code Review) Feb. 5, 2019

Feb. 5, 2019

Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/flashrom/+/27102 ) Change subject: [WIP]layout: Use a linked list for layouts ...................................................................... Patch Set 1: Note to self if this get's used. Instead of appending entries to a single linked list either: - use a double linked list - replace the list HEAD instead. -- To view, visit https://review.coreboot.org/c/flashrom/+/27102 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: I049657805ce5676ea4c4b5e49f26d0e8a1f26a3e Gerrit-Change-Number: 27102 Gerrit-PatchSet: 1 Gerrit-Owner: Arthur Heymans <arthur(a)aheymans.xyz> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Tue, 05 Feb 2019 14:38:50 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

Change in ...flashrom[master]: Fix one more -Wmissing-field-initializers warning
by Nico Huber (Code Review) Feb. 3, 2019

Feb. 3, 2019

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/31224 Change subject: Fix one more -Wmissing-field-initializers warning ...................................................................... Fix one more -Wmissing-field-initializers warning Fixes: ichspi.c: In function ‘ich_init_spi’: ichspi.c:1707:9: warning: missing initializer for field ‘component’ Change-Id: Iee5728167963fece24822ad2e3ab7bd9d444b42c Signed-off-by: Richard Hughes <richard(a)hughsie.com> --- M ichspi.c 1 file changed, 3 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/24/31224/1 diff --git a/ichspi.c b/ichspi.c index 507d443..911f50a 100644 --- a/ichspi.c +++ b/ichspi.c @@ -1704,7 +1704,7 @@ char *arg; int ich_spi_rw_restricted = 0; int desc_valid = 0; - struct ich_descriptors desc = { 0 }; + struct ich_descriptors desc; enum ich_spi_mode { ich_auto, ich_hwseq, @@ -1715,6 +1715,8 @@ ich_generation = ich_gen; ich_spibar = spibar; + memset(&desc, 0x00, sizeof(struct ich_descriptors)); + /* Moving registers / bits */ if (ich_generation == CHIPSET_100_SERIES_SUNRISE_POINT) { num_freg = 10; -- To view, visit https://review.coreboot.org/c/flashrom/+/31224 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Iee5728167963fece24822ad2e3ab7bd9d444b42c Gerrit-Change-Number: 31224 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newchange

1 2

Change in ...flashrom[master]: Fix a trivial calloc warning
by Nico Huber (Code Review) Feb. 3, 2019

Feb. 3, 2019

Nico Huber has uploaded this change for review. ( https://review.coreboot.org/c/flashrom/+/31223 Change subject: Fix a trivial calloc warning ...................................................................... Fix a trivial calloc warning Change-Id: Id457c15555a6ca6333474601f92982446afa40ab Signed-off-by: Richard Hughes <richard(a)hughsie.com> --- M flashrom.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/23/31223/1 diff --git a/flashrom.c b/flashrom.c index cb2da46..e82c32e 100644 --- a/flashrom.c +++ b/flashrom.c @@ -1461,7 +1461,7 @@ int read_flash_to_file(struct flashctx *flash, const char *filename) { unsigned long size = flash->chip->total_size * 1024; - unsigned char *buf = calloc(size, sizeof(char)); + unsigned char *buf = calloc(size, sizeof(unsigned char)); int ret = 0; msg_cinfo("Reading flash... "); -- To view, visit https://review.coreboot.org/c/flashrom/+/31223 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-Change-Id: Id457c15555a6ca6333474601f92982446afa40ab Gerrit-Change-Number: 31223 Gerrit-PatchSet: 1 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-MessageType: newchange

1 2