openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 22:21:16 +02:00
Code Issues Releases Wiki Activity

writeprotect,ichspi,spi25: handle register access constraints

Browse Source 
Make the spi25 register read/write functions return SPI_INVALID_OPCODE
if the programmer blocks the read/write opcode for the register.

Likewise, make ichspi read/write register functions return
SPI_INVALID_OPCODE for registers >SR1 as they cannot be accessd.

Make writeprotect ignore SPI_INVALID_OPCODE unless it is trying to
read/write SR1, which should always be supported.

BUG=b:253715389,b:253713774,b:240229722
BRANCH=none
TEST=flashrom --wp-{enable,disable,range,list,status} on dedede

Change-Id: I2145749dcc51f4556550650dab5aa1049f879c45
Signed-off-by: Nikolai Artemiev <nartemiev@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/69129
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
This commit is contained in:
Nikolai Artemiev
2022-11-02 11:30:57 +11:00
committed by Edward O'Callaghan
parent 62ec7b7156
commit 49bcb78006
3 changed files with 48 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ichspi.c
View File

@ -1400,8 +1400,12 @@ static int ich_hwseq_read_status(const struct flashctx *flash, enum flash_reg re
const struct hwseq_data *hwseq_data = get_hwseq_data_from_context(flash);
if (reg != STATUS1) {
msg_perr("%s: only supports STATUS1\n", __func__);
return -1;
msg_pdbg("%s: only supports STATUS1\n", __func__);
/*
* Return SPI_INVALID_OPCODE to be consistent with spi_read_register()
* and make error handling simpler even though this isn't a SPI master.
*/
return SPI_INVALID_OPCODE;
}
msg_pdbg("Reading Status register\n");
@ -1421,8 +1425,12 @@ static int ich_hwseq_write_status(const struct flashctx *flash, enum flash_reg r
const struct hwseq_data *hwseq_data = get_hwseq_data_from_context(flash);
if (reg != STATUS1) {
msg_perr("%s: only supports STATUS1\n", __func__);
return -1;
msg_pdbg("%s: only supports STATUS1\n", __func__);
/*
* Return SPI_INVALID_OPCODE to be consistent with spi_write_register()
* and make error handling simpler even though this isn't a SPI master.
*/
return SPI_INVALID_OPCODE;
}
msg_pdbg("Writing status register\n");