[flashrom-gerrit] Change in flashrom[master]: flashchips: Fix W25Q256.W

[Nico Huber (Code Review)]

Nico Huber has submitted this change. ( https://review.coreboot.org/c/flashrom/+/44810 )

Change subject: flashchips: Fix W25Q256.W
......................................................................

flashchips: Fix W25Q256.W

The JW is the only known variant. A W25Q256FW may have existed with
less 4BA instructions supported, but it never showed up and no data-
sheet is available.

Used the datasheet from here:
https://www.winbond.com/resource-files/w25q256jw%20spi%20revb%2012082017.pdf

Change-Id: I9a3995c66ad7b74823e17984bf1ffac50b5663e0
Signed-off-by: Patrick Rudolph 
Signed-off-by: Nico Huber 
Ticket: https://ticket.coreboot.org/issues/362
Reviewed-on: https://review.coreboot.org/c/flashrom/+/44810
Tested-by: build bot (Jenkins) 
Reviewed-by: Arthur Heymans 
---
M flashchips.c
1 file changed, 8 insertions(+), 3 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Nico Huber: Looks good to me, but someone else must approve
  Arthur Heymans: Looks good to me, approved

diff --git a/flashchips.c b/flashchips.c
index 82bb5b5..a9fd1bf 100644
--- a/flashchips.c
+++ b/flashchips.c
@@ -17597,7 +17597,7 @@

{
    	.vendor		= "Winbond",
-		.name		= "W25Q256.W",
+		.name		= "W25Q256JW",
    	.bustype	= BUS_SPI,
    	.manufacture_id	= WINBOND_NEX_ID,
    	.model_id	= WINBOND_NEX_W25Q256_W,
@@ -17605,8 +17605,7 @@
    	.page_size	= 256,
    	/* supports SFDP */
    	/* OTP: 1024B total, 256B reserved; read 0x48; write 0x42, erase 0x44, read ID 0x4B */
-		.feature_bits	= FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA_ENTER_WREN
-			| FEATURE_4BA_EXT_ADDR | FEATURE_4BA_READ | FEATURE_4BA_FAST_READ,
+		.feature_bits	= FEATURE_WRSR_WREN | FEATURE_OTP | FEATURE_4BA,
    	.tested		= TEST_OK_PREW,
    	.probe		= probe_spi_rdid,
    	.probe_timing	= TIMING_ZERO,
@@ -17614,12 +17613,18 @@
    	{
    		{
    			.eraseblocks = { {4 * 1024, 8192} },
+				.block_erase = spi_block_erase_21,
+			}, {
+				.eraseblocks = { {4 * 1024, 8192} },
    			.block_erase = spi_block_erase_20,
    		}, {
    			.eraseblocks = { {32 * 1024, 1024} },
    			.block_erase = spi_block_erase_52,
    		}, {
    			.eraseblocks = { {64 * 1024, 512} },
+				.block_erase = spi_block_erase_dc,
+			}, {
+				.eraseblocks = { {64 * 1024, 512} },
    			.block_erase = spi_block_erase_d8,
    		}, {
    			.eraseblocks = { {32 * 1024 * 1024, 1} },

3 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted one.