October 2018 - flashrom-gerrit

Change in flashrom[master]: flashchips: Mark S25FL208K as tested
by Nico Huber (Code Review) 04 Oct '18

04 Oct '18

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/28883 ) Change subject: flashchips: Mark S25FL208K as tested ...................................................................... flashchips: Mark S25FL208K as tested As report by Frédéric Germain on 2017-12-17. Change-Id: I0a7fc10e75f4a675de41e9765525defe2d2640e4 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/28883 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M flashchips.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved diff --git a/flashchips.c b/flashchips.c index e517a49..d2773d6 100644 --- a/flashchips.c +++ b/flashchips.c @@ -12215,7 +12215,7 @@ .total_size = 1024, .page_size = 256, .feature_bits = FEATURE_WRSR_WREN, - .tested = TEST_UNTESTED, + .tested = TEST_OK_PREW, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, .block_erasers = { -- To view, visit https://review.coreboot.org/28883 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0a7fc10e75f4a675de41e9765525defe2d2640e4 Gerrit-Change-Number: 28883 Gerrit-PatchSet: 5 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: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[master]: flashchips: Add ISSI IS25WP064 and IS25WP032
by Nico Huber (Code Review) 04 Oct '18

04 Oct '18

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/28884 ) Change subject: flashchips: Add ISSI IS25WP064 and IS25WP032 ...................................................................... flashchips: Add ISSI IS25WP064 and IS25WP032 The IS25WP064 was tested successfully by Simon Buhrow as reported on 2018-9-4. While we are at it, also add the 32Mbit version which shares the datasheet (as does the already supported 128Mbit version). Change-Id: Ie0887b4ae6e6465118a5dc2e20b784f783d161b8 Signed-off-by: Nico Huber <nico.h(a)gmx.de> Reviewed-on: https://review.coreboot.org/28884 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M flashchips.c M flashchips.h 2 files changed, 88 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved diff --git a/flashchips.c b/flashchips.c index 242dc02..e517a49 100644 --- a/flashchips.c +++ b/flashchips.c @@ -7376,6 +7376,90 @@ { .vendor = "ISSI", + .name = "IS25WP032", + .bustype = BUS_SPI, + .manufacture_id = ISSI_ID_SPI, + .model_id = ISSI_IS25WP032, + .total_size = 4096, + .page_size = 256, + /* OTP: 1024B total; read 0x48; write 0x42 */ + /* QPI enable 0x35, disable 0xF5 */ + .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, + .tested = TEST_UNTESTED, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 1024} }, + .block_erase = spi_block_erase_20, + }, { + .eraseblocks = { {4 * 1024, 1024} }, + .block_erase = spi_block_erase_d7, + }, { + .eraseblocks = { {32 * 1024, 128} }, + .block_erase = spi_block_erase_52, + }, { + .eraseblocks = { {64 * 1024, 64} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {4 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_60, + }, { + .eraseblocks = { {4 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .unlock = spi_disable_blockprotect, + .write = spi_chip_write_256, + .read = spi_chip_read, + .voltage = {1650, 1950}, + }, + + { + .vendor = "ISSI", + .name = "IS25WP064", + .bustype = BUS_SPI, + .manufacture_id = ISSI_ID_SPI, + .model_id = ISSI_IS25WP064, + .total_size = 8192, + .page_size = 256, + /* OTP: 1024B total; read 0x48; write 0x42 */ + /* QPI enable 0x35, disable 0xF5 */ + .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, + .tested = TEST_OK_PREW, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 2048} }, + .block_erase = spi_block_erase_20, + }, { + .eraseblocks = { {4 * 1024, 2048} }, + .block_erase = spi_block_erase_d7, + }, { + .eraseblocks = { {32 * 1024, 256} }, + .block_erase = spi_block_erase_52, + }, { + .eraseblocks = { {64 * 1024, 128} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {8 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_60, + }, { + .eraseblocks = { {8 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .unlock = spi_disable_blockprotect, + .write = spi_chip_write_256, + .read = spi_chip_read, + .voltage = {1650, 1950}, + }, + + { + .vendor = "ISSI", .name = "IS25WP128", .bustype = BUS_SPI, .manufacture_id = ISSI_ID_SPI, @@ -7383,7 +7467,8 @@ .total_size = 16384, .page_size = 256, /* OTP: 1024B total; read 0x48; write 0x42 */ - .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP, + /* QPI enable 0x35, disable 0xF5 */ + .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, diff --git a/flashchips.h b/flashchips.h index 317510c..6bc4094 100644 --- a/flashchips.h +++ b/flashchips.h @@ -456,6 +456,8 @@ #define ISSI_ID_SPI 0x9D /* ISSI ID used for SPI flash, see also PMC_ID_NOPREFIX */ #define ISSI_IS25LP064 0x6017 #define ISSI_IS25LP128 0x6018 +#define ISSI_IS25WP032 0x7016 +#define ISSI_IS25WP064 0x7017 #define ISSI_IS25WP128 0x7018 #define ISSI_PMC_IS29GL032B 0xF9 #define ISSI_PMC_IS29GL032T 0xF6 -- To view, visit https://review.coreboot.org/28884 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ie0887b4ae6e6465118a5dc2e20b784f783d161b8 Gerrit-Change-Number: 28884 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: build bot (Jenkins) <no-reply(a)coreboot.org>

1 0

Change in flashrom[master]: flashchips: Add ATMEL AT25SL128A
by Nico Huber (Code Review) 03 Oct '18

03 Oct '18

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/26576 ) Change subject: flashchips: Add ATMEL AT25SL128A ...................................................................... flashchips: Add ATMEL AT25SL128A Change-Id: I60c433ffe9e34663c2cfc608b8b76943cd92a8ba Signed-off-by: Hal Martin <hal.martin(a)gmail.com> Reviewed-on: https://review.coreboot.org/26576 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: Nico Huber <nico.h(a)gmx.de> Reviewed-by: Angel Pons <th3fanbus(a)gmail.com> --- M flashchips.c M flashchips.h 2 files changed, 40 insertions(+), 0 deletions(-) Approvals: build bot (Jenkins): Verified Nico Huber: Looks good to me, approved Angel Pons: Looks good to me, approved diff --git a/flashchips.c b/flashchips.c index fdaaa2f..242dc02 100644 --- a/flashchips.c +++ b/flashchips.c @@ -2325,6 +2325,45 @@ }, { + .vendor = "ATMEL", + .name = "AT25SL128A", + .bustype = BUS_SPI, + .manufacture_id = ATMEL_ID, + .model_id = ATMEL_AT25SL128A, + .total_size = 16384, + .page_size = 256, + /* supports SFDP */ + .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_QPI, + .tested = TEST_OK_PREW, + .probe = probe_spi_rdid, + .probe_timing = TIMING_ZERO, + .block_erasers = + { + { + .eraseblocks = { {4 * 1024, 4096} }, + .block_erase = spi_block_erase_20, + }, { + .eraseblocks = { {32 * 1024, 512} }, + .block_erase = spi_block_erase_52, + }, { + .eraseblocks = { {64 * 1024, 256} }, + .block_erase = spi_block_erase_d8, + }, { + .eraseblocks = { {16 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_60, + }, { + .eraseblocks = { {16 * 1024 * 1024, 1} }, + .block_erase = spi_block_erase_c7, + } + }, + .printlock = spi_prettyprint_status_register_plain, /* TODO: improve */ + .unlock = spi_disable_blockprotect, + .write = spi_chip_write_256, + .read = spi_chip_read, + .voltage = {1700, 2000}, + }, + + { .vendor = "Atmel", .name = "AT26DF041", .bustype = BUS_SPI, diff --git a/flashchips.h b/flashchips.h index d17d26d..317510c 100644 --- a/flashchips.h +++ b/flashchips.h @@ -150,6 +150,7 @@ #define ATMEL_AT25SF041 0x8401 #define ATMEL_AT25SF081 0x8501 #define ATMEL_AT25SF161 0x8601 +#define ATMEL_AT25SL128A 0x4218 #define ATMEL_AT26DF041 0x4400 #define ATMEL_AT26DF081 0x4500 /* guessed, no datasheet available */ #define ATMEL_AT26DF081A 0x4501 -- To view, visit https://review.coreboot.org/26576 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I60c433ffe9e34663c2cfc608b8b76943cd92a8ba Gerrit-Change-Number: 26576 Gerrit-PatchSet: 4 Gerrit-Owner: Hal Martin <hal.martin+coreboot(a)gmail.com> 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: David Hendricks <david.hendricks(a)gmail.com>

1 0

Change in flashrom[master]: flashchips: Add ATMEL AT25SL128A
by Angel Pons (Code Review) 03 Oct '18

03 Oct '18

Angel Pons has posted comments on this change. ( https://review.coreboot.org/26576 ) Change subject: flashchips: Add ATMEL AT25SL128A ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://review.coreboot.org/26576 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I60c433ffe9e34663c2cfc608b8b76943cd92a8ba Gerrit-Change-Number: 26576 Gerrit-PatchSet: 3 Gerrit-Owner: Hal Martin <hal.martin+coreboot(a)gmail.com> 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Comment-Date: Wed, 03 Oct 2018 14:40:07 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in flashrom[master]: flashchips: Add ATMEL AT25SL128A
by Nico Huber (Code Review) 03 Oct '18

03 Oct '18

Nico Huber has posted comments on this change. ( https://review.coreboot.org/26576 ) Change subject: flashchips: Add ATMEL AT25SL128A ...................................................................... Patch Set 3: Code-Review+2 needed a manual rebase, *sigh* -- To view, visit https://review.coreboot.org/26576 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I60c433ffe9e34663c2cfc608b8b76943cd92a8ba Gerrit-Change-Number: 26576 Gerrit-PatchSet: 3 Gerrit-Owner: Hal Martin <hal.martin+coreboot(a)gmail.com> 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Comment-Date: Wed, 03 Oct 2018 14:18:47 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in flashrom[master]: flashchips: Add ATMEL AT25SL128A
by Nico Huber (Code Review) 03 Oct '18

03 Oct '18

Nico Huber has uploaded a new patch set (#3) to the change originally created by Hal Martin. ( https://review.coreboot.org/26576 ) Change subject: flashchips: Add ATMEL AT25SL128A ...................................................................... flashchips: Add ATMEL AT25SL128A Change-Id: I60c433ffe9e34663c2cfc608b8b76943cd92a8ba Signed-off-by: Hal Martin <hal.martin(a)gmail.com> --- M flashchips.c M flashchips.h 2 files changed, 40 insertions(+), 0 deletions(-) git pull ssh://review.coreboot.org:29418/flashrom refs/changes/76/26576/3 -- To view, visit https://review.coreboot.org/26576 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: newpatchset Gerrit-Change-Id: I60c433ffe9e34663c2cfc608b8b76943cd92a8ba Gerrit-Change-Number: 26576 Gerrit-PatchSet: 3 Gerrit-Owner: Hal Martin <hal.martin+coreboot(a)gmail.com> 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: David Hendricks <david.hendricks(a)gmail.com>

1 0

Change in flashrom[master]: flashchips: Add ATMEL AT25SL128A
by Angel Pons (Code Review) 03 Oct '18

03 Oct '18

Angel Pons has posted comments on this change. ( https://review.coreboot.org/26576 ) Change subject: flashchips: Add ATMEL AT25SL128A ...................................................................... Patch Set 2: Code-Review+2 > Patch Set 2: Code-Review+2 > > +2 on the original. Would be nice if somebody acks my changes too, but > I guess it's not so important here. Acked your changes. -- To view, visit https://review.coreboot.org/26576 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I60c433ffe9e34663c2cfc608b8b76943cd92a8ba Gerrit-Change-Number: 26576 Gerrit-PatchSet: 2 Gerrit-Owner: Hal Martin <hal.martin+coreboot(a)gmail.com> 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Comment-Date: Wed, 03 Oct 2018 14:04:41 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in flashrom[master]: flashchips: Add ATMEL AT25SL128A
by Nico Huber (Code Review) 03 Oct '18

03 Oct '18

Nico Huber has posted comments on this change. ( https://review.coreboot.org/26576 ) Change subject: flashchips: Add ATMEL AT25SL128A ...................................................................... Patch Set 2: Code-Review+2 +2 on the original. Would be nice if somebody acks my changes too, but I guess it's not so important here. -- To view, visit https://review.coreboot.org/26576 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I60c433ffe9e34663c2cfc608b8b76943cd92a8ba Gerrit-Change-Number: 26576 Gerrit-PatchSet: 2 Gerrit-Owner: Hal Martin <hal.martin+coreboot(a)gmail.com> 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: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-CC: David Hendricks <david.hendricks(a)gmail.com> Gerrit-Comment-Date: Wed, 03 Oct 2018 13:18:52 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in flashrom[master]: Enable native 4BA instructions for Spansion 25FL256S
by Nico Huber (Code Review) 03 Oct '18

03 Oct '18

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/25134 ) Change subject: Enable native 4BA instructions for Spansion 25FL256S ...................................................................... Enable native 4BA instructions for Spansion 25FL256S Change-Id: I0ffc816ca714ecce5b89b1eaadb5e73ccb38d9ab Signed-off-by: Nico Huber <nico.h(a)gmx.de> Tested-by: Michael Fuckner <michael(a)fuckner.net> Reviewed-on: https://review.coreboot.org/25134 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> --- M flashchips.c 1 file changed, 4 insertions(+), 1 deletion(-) Approvals: build bot (Jenkins): Verified David Hendricks: Looks good to me, approved diff --git a/flashchips.c b/flashchips.c index c75e0b8..fdaaa2f 100644 --- a/flashchips.c +++ b/flashchips.c @@ -12524,7 +12524,7 @@ .total_size = 32768, .page_size = 256, /* OTP: 1024B total, 32B reserved; read 0x4B; write 0x42 */ - .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_ENTER_EAR7, + .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_EAR7, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, @@ -12540,6 +12540,9 @@ .block_erase = spi_block_erase_20, }, { */ .eraseblocks = { { 64 * 1024, 512} }, + .block_erase = spi_block_erase_dc, + }, { + .eraseblocks = { { 64 * 1024, 512} }, .block_erase = spi_block_erase_d8, }, { .eraseblocks = { { 32768 * 1024, 1} }, -- To view, visit https://review.coreboot.org/25134 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I0ffc816ca714ecce5b89b1eaadb5e73ccb38d9ab Gerrit-Change-Number: 25134 Gerrit-PatchSet: 9 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> 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>

1 0

Change in flashrom[master]: Enable 4BA mode for Spansion 25FL256S
by Nico Huber (Code Review) 03 Oct '18

03 Oct '18

Nico Huber has submitted this change and it was merged. ( https://review.coreboot.org/25133 ) Change subject: Enable 4BA mode for Spansion 25FL256S ...................................................................... Enable 4BA mode for Spansion 25FL256S 4BA mode is entered by setting bit 7 for the extended address register. Change-Id: I807bf55d65763a9f48a6a3377f14f4e5288a7a4c Signed-off-by: Nico Huber <nico.h(a)gmx.de> Tested-by: Michael Fuckner <michael(a)fuckner.net> Reviewed-on: https://review.coreboot.org/25133 Tested-by: build bot (Jenkins) <no-reply(a)coreboot.org> Reviewed-by: David Hendricks <david.hendricks(a)gmail.com> --- M flash.h M flashchips.c M flashrom.c M spi25.c 4 files changed, 12 insertions(+), 8 deletions(-) Approvals: build bot (Jenkins): Verified David Hendricks: Looks good to me, approved diff --git a/flash.h b/flash.h index 8eb8a7b..911214c 100644 --- a/flash.h +++ b/flash.h @@ -117,21 +117,23 @@ #define FEATURE_QPI (1 << 9) #define FEATURE_4BA_ENTER (1 << 10) /**< Can enter/exit 4BA mode with instructions 0xb7/0xe9 w/o WREN */ #define FEATURE_4BA_ENTER_WREN (1 << 11) /**< Can enter/exit 4BA mode with instructions 0xb7/0xe9 after WREN */ -#define FEATURE_4BA_EXT_ADDR (1 << 12) /**< Regular 3-byte operations can be used by writing the most +#define FEATURE_4BA_ENTER_EAR7 (1 << 12) /**< Can enter/exit 4BA mode by setting bit7 of the ext addr reg */ +#define FEATURE_4BA_EXT_ADDR (1 << 13) /**< Regular 3-byte operations can be used by writing the most significant address byte into an extended address register. */ -#define FEATURE_4BA_READ (1 << 13) /**< Native 4BA read instruction (0x13) is supported. */ -#define FEATURE_4BA_FAST_READ (1 << 14) /**< Native 4BA fast read instruction (0x0c) is supported. */ -#define FEATURE_4BA_WRITE (1 << 15) /**< Native 4BA byte program (0x12) is supported. */ +#define FEATURE_4BA_READ (1 << 14) /**< Native 4BA read instruction (0x13) is supported. */ +#define FEATURE_4BA_FAST_READ (1 << 15) /**< Native 4BA fast read instruction (0x0c) is supported. */ +#define FEATURE_4BA_WRITE (1 << 16) /**< Native 4BA byte program (0x12) is supported. */ /* 4BA Shorthands */ #define FEATURE_4BA_NATIVE (FEATURE_4BA_READ | FEATURE_4BA_FAST_READ | FEATURE_4BA_WRITE) #define FEATURE_4BA (FEATURE_4BA_ENTER | FEATURE_4BA_EXT_ADDR | FEATURE_4BA_NATIVE) #define FEATURE_4BA_WREN (FEATURE_4BA_ENTER_WREN | FEATURE_4BA_EXT_ADDR | FEATURE_4BA_NATIVE) +#define FEATURE_4BA_EAR7 (FEATURE_4BA_ENTER_EAR7 | FEATURE_4BA_EXT_ADDR | FEATURE_4BA_NATIVE) /* * Most flash chips are erased to ones and programmed to zeros. However, some * other flash chips, such as the ENE KB9012 internal flash, work the opposite way. */ -#define FEATURE_ERASED_ZERO (1 << 16) -#define FEATURE_NO_ERASE (1 << 17) +#define FEATURE_ERASED_ZERO (1 << 17) +#define FEATURE_NO_ERASE (1 << 18) #define ERASED_VALUE(flash) (((flash)->chip->feature_bits & FEATURE_ERASED_ZERO) ? 0x00 : 0xff) diff --git a/flashchips.c b/flashchips.c index 7853849..c75e0b8 100644 --- a/flashchips.c +++ b/flashchips.c @@ -12524,7 +12524,7 @@ .total_size = 32768, .page_size = 256, /* OTP: 1024B total, 32B reserved; read 0x4B; write 0x42 */ - .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_EXT_ADDR, + .feature_bits = FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_ENTER_EAR7, .tested = TEST_OK_PREW, .probe = probe_spi_rdid, .probe_timing = TIMING_ZERO, diff --git a/flashrom.c b/flashrom.c index 094630c..c41801a 100644 --- a/flashrom.c +++ b/flashrom.c @@ -2260,7 +2260,7 @@ flash->in_4ba_mode = false; /* Enable/disable 4-byte addressing mode if flash chip supports it */ - if (flash->chip->feature_bits & (FEATURE_4BA_ENTER | FEATURE_4BA_ENTER_WREN)) { + if (flash->chip->feature_bits & (FEATURE_4BA_ENTER | FEATURE_4BA_ENTER_WREN | FEATURE_4BA_ENTER_EAR7)) { int ret; if (spi_master_4ba(flash)) ret = spi_enter_4ba(flash); diff --git a/spi25.c b/spi25.c index 3b5e50e..f3a35a1 100644 --- a/spi25.c +++ b/spi25.c @@ -849,6 +849,8 @@ ret = spi_send_command(flash, sizeof(cmd), 0, &cmd, NULL); else if (flash->chip->feature_bits & FEATURE_4BA_ENTER_WREN) ret = spi_simple_write_cmd(flash, cmd, 0); + else if (flash->chip->feature_bits & FEATURE_4BA_ENTER_EAR7) + ret = spi_set_extended_address(flash, enter ? 0x80 : 0x00); if (!ret) flash->in_4ba_mode = enter; -- To view, visit https://review.coreboot.org/25133 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: flashrom Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I807bf55d65763a9f48a6a3377f14f4e5288a7a4c Gerrit-Change-Number: 25133 Gerrit-PatchSet: 8 Gerrit-Owner: Nico Huber <nico.h(a)gmx.de> Gerrit-Reviewer: Angel Pons <th3fanbus(a)gmail.com> Gerrit-Reviewer: Arthur Heymans <arthur(a)aheymans.xyz> 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>

1 0

2024

2023

2022

2021

2020

2019

2018

2017

flashrom-gerrit October 2018