Philipp Deppenwiese submitted this change.

View Change

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>
---
M src/drivers/spi/boot_device_rw_nommap.c
M src/drivers/spi/spi_flash.c
M src/drivers/spi/winbond.c
M src/include/spi_flash.h
M src/mainboard/opencellular/elgon/bootblock.c
5 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/drivers/spi/boot_device_rw_nommap.c b/src/drivers/spi/boot_device_rw_nommap.c
index a383f26..ba11d05 100644
--- a/src/drivers/spi/boot_device_rw_nommap.c
+++ b/src/drivers/spi/boot_device_rw_nommap.c
@@ -97,7 +97,7 @@
 		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 da2e868..372575e 100644
--- a/src/drivers/spi/spi_flash.c
+++ b/src/drivers/spi/spi_flash.c
@@ -555,7 +555,6 @@
 
 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 @@
 		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 d8d3cdc..0c8059d 100644
--- a/src/drivers/spi/winbond.c
+++ b/src/drivers/spi/winbond.c
@@ -422,7 +422,6 @@
  *
  * @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_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 @@
 		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;
 
diff --git a/src/include/spi_flash.h b/src/include/spi_flash.h
index 9d0e3ad..35b02db 100644
--- a/src/include/spi_flash.h
+++ b/src/include/spi_flash.h
@@ -74,7 +74,6 @@
 	int
 	(*set_write)(const struct spi_flash *flash,
 				const struct region *region,
-				const bool non_volatile,
 				const enum spi_flash_status_reg_lockdown mode);
 
 };
@@ -170,7 +169,6 @@
  *
  * @param flash : A SPI flash device
  * @param region: A subregion of the device's region
- * @param non_volatile: Write status register non-volatile
  * @param mode: Optional lock-down of status register
 
  * @return 0 on success
@@ -178,7 +176,6 @@
 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);
 
 /*
diff --git a/src/mainboard/opencellular/elgon/bootblock.c b/src/mainboard/opencellular/elgon/bootblock.c
index 5eaece2..c1b5181 100644
--- a/src/mainboard/opencellular/elgon/bootblock.c
+++ b/src/mainboard/opencellular/elgon/bootblock.c
@@ -71,7 +71,7 @@
 		* WP_RO read only and use /WP pin
 		* non-volatile programming
 		*/
-		if (spi_flash_set_write_protected(flash, &ro_rgn, 1,
+		if (spi_flash_set_write_protected(flash, &ro_rgn,
 		    SPI_WRITE_PROTECTION_PIN) != 0)
 			die("Failed to write-protect WP_RO region!");
 	}

To view, visit change 41746. To unsubscribe, or for help writing mail filters, visit settings.