summaryrefslogtreecommitdiff
path: root/src/southbridge/intel/common
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@chromium.org>2016-12-05 20:32:24 -0800
committerFurquan Shaikh <furquan@google.com>2016-12-06 07:17:28 +0100
commit810e2cde30035d0de691805041ffeeff57f68027 (patch)
tree99706a026be4551118b334773ccb61a6f5772005 /src/southbridge/intel/common
parentd3d1f13599a042bfd7ecb5f11f5a8a76853b7f88 (diff)
downloadcoreboot-810e2cde30035d0de691805041ffeeff57f68027.tar.xz
spi_flash: Make a deep copy of spi_slave structure
Commit 36b81af (spi: Pass pointer to spi_slave structure in spi_setup_slave) changes the way spi_setup_slave handles the spi_slave structure. Instead of expecting spi controller drivers to maintain spi_slave structure in CAR_GLOBAL/data section, caller is expected to manage the spi_slave structure. This requires that spi_flash drivers maintain spi_slave structure and flash probe function needs to make a copy of the passed in spi_slave structure. This change fixes the regression on Lenovo X230 and other mainboards. Change-Id: I0ad971eecaf3bfe301e9f95badc043193cc27cab Signed-off-by: Furquan Shaikh <furquan@chromium.org> Reviewed-on: https://review.coreboot.org/17728 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Iru Cai <mytbk920423@gmail.com>
Diffstat (limited to 'src/southbridge/intel/common')
-rw-r--r--src/southbridge/intel/common/spi.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/southbridge/intel/common/spi.c b/src/southbridge/intel/common/spi.c
index 42a2a748de..c58f402195 100644
--- a/src/southbridge/intel/common/spi.c
+++ b/src/southbridge/intel/common/spi.c
@@ -733,7 +733,7 @@ static int ich_hwseq_erase(const struct spi_flash *flash, u32 offset,
return -1;
}
- ret = spi_claim_bus(flash->spi);
+ ret = spi_claim_bus(&flash->spi);
if (ret) {
printk(BIOS_ERR, "SF: Unable to claim SPI bus\n");
return ret;
@@ -766,7 +766,7 @@ static int ich_hwseq_erase(const struct spi_flash *flash, u32 offset,
printk(BIOS_DEBUG, "SF: Successfully erased %zu bytes @ %#x\n", len, start);
out:
- spi_release_bus(flash->spi);
+ spi_release_bus(&flash->spi);
return ret;
}
@@ -921,7 +921,7 @@ struct spi_flash *spi_flash_programmer_probe(struct spi_slave *spi, int force)
return NULL;
}
- flash->spi = spi;
+ memcpy(&flash->spi, spi, sizeof(*spi));
flash->name = "Opaque HW-sequencing";
flash->internal_write = ich_hwseq_write;