summaryrefslogtreecommitdiff
path: root/src/drivers/spi
diff options
context:
space:
mode:
authorDaniel Gröber <dxld@darkboxed.org>2020-05-26 22:12:14 +0200
committerPhilipp Deppenwiese <zaolin.daisuki@gmail.com>2020-06-08 07:51:18 +0000
commit0d0b2f45f65afa6c845c4754de50d71f98a69394 (patch)
treec70b392d2bdbf13dbf6e0985740a8f6776c43ac3 /src/drivers/spi
parentbcb4a77fb11dc3cc8b0c74559e4f47549db368e4 (diff)
downloadcoreboot-0d0b2f45f65afa6c845c4754de50d71f98a69394.tar.xz
spi: Remove non_volatile flag from block protection interface
Only Winbond parts seem to support making status register writes volatile. So this flag should not be exposed in the generic interface. Change-Id: Idadb65ffaff0dd7809b18c53086a466122b37c12 Signed-off-by: Daniel Gröber <dxld@darkboxed.org> Reviewed-on: https://review.coreboot.org/c/coreboot/+/41746 Reviewed-by: Patrick Rudolph <siro@das-labor.org> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/drivers/spi')
-rw-r--r--src/drivers/spi/boot_device_rw_nommap.c2
-rw-r--r--src/drivers/spi/spi_flash.c3
-rw-r--r--src/drivers/spi/winbond.c4
3 files changed, 3 insertions, 6 deletions
diff --git a/src/drivers/spi/boot_device_rw_nommap.c b/src/drivers/spi/boot_device_rw_nommap.c
index a383f268db..ba11d05d99 100644
--- a/src/drivers/spi/boot_device_rw_nommap.c
+++ b/src/drivers/spi/boot_device_rw_nommap.c
@@ -97,7 +97,7 @@ int boot_device_wp_region(const struct region_device *rd,
if (spi_flash_is_write_protected(boot_dev,
region_device_region(rd)) != 1) {
return spi_flash_set_write_protected(boot_dev,
- region_device_region(rd), true,
+ region_device_region(rd),
SPI_WRITE_PROTECTION_REBOOT);
}
diff --git a/src/drivers/spi/spi_flash.c b/src/drivers/spi/spi_flash.c
index da2e8685df..372575e2d9 100644
--- a/src/drivers/spi/spi_flash.c
+++ b/src/drivers/spi/spi_flash.c
@@ -555,7 +555,6 @@ int spi_flash_is_write_protected(const struct spi_flash *flash,
int spi_flash_set_write_protected(const struct spi_flash *flash,
const struct region *region,
- const bool non_volatile,
const enum spi_flash_status_reg_lockdown mode)
{
struct region flash_region = { 0 };
@@ -575,7 +574,7 @@ int spi_flash_set_write_protected(const struct spi_flash *flash,
return -1;
}
- ret = flash->prot_ops->set_write(flash, region, non_volatile, mode);
+ ret = flash->prot_ops->set_write(flash, region, mode);
if (ret == 0 && mode != SPI_WRITE_PROTECTION_PRESERVE) {
printk(BIOS_INFO, "SPI: SREG lock-down was set to ");
diff --git a/src/drivers/spi/winbond.c b/src/drivers/spi/winbond.c
index d8d3cdc855..0c8059dced 100644
--- a/src/drivers/spi/winbond.c
+++ b/src/drivers/spi/winbond.c
@@ -422,7 +422,6 @@ static int winbond_flash_cmd_status(const struct spi_flash *flash,
*
* @param flash: The flash to operate on
* @param region: The region to write protect
- * @param non_volatile: Make setting permanent
* @param mode: Optional status register lock-down mode
*
* @return 0 on success
@@ -430,7 +429,6 @@ static int winbond_flash_cmd_status(const struct spi_flash *flash,
static int
winbond_set_write_protection(const struct spi_flash *flash,
const struct region *region,
- const bool non_volatile,
const enum spi_flash_status_reg_lockdown mode)
{
const struct spi_flash_part_id *params;
@@ -527,7 +525,7 @@ winbond_set_write_protection(const struct spi_flash *flash,
mask.reg2.srp1 = 1;
}
- ret = winbond_flash_cmd_status(flash, mask.u, val.u, non_volatile);
+ ret = winbond_flash_cmd_status(flash, mask.u, val.u, true);
if (ret)
return ret;