summaryrefslogtreecommitdiff
path: root/src/soc/mediatek
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/soc/mediatek
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/soc/mediatek')
-rw-r--r--src/soc/mediatek/mt8173/flash_controller.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/soc/mediatek/mt8173/flash_controller.c b/src/soc/mediatek/mt8173/flash_controller.c
index 3799c6ac10..2aee66834f 100644
--- a/src/soc/mediatek/mt8173/flash_controller.c
+++ b/src/soc/mediatek/mt8173/flash_controller.c
@@ -236,12 +236,13 @@ static int nor_erase(const struct spi_flash *flash, u32 offset, size_t len)
struct spi_flash *spi_flash_programmer_probe(struct spi_slave *spi, int force)
{
static struct spi_flash flash = {0};
+ static int done = 0;
- if (flash.spi)
+ if (done)
return &flash;
write32(&mt8173_nor->wrprot, SFLASH_COMMAND_ENABLE);
- flash.spi = spi;
+ memcpy(&flash.spi, spi, sizeof(*spi));
flash.name = "mt8173 flash controller";
flash.internal_write = nor_write;
flash.internal_erase = nor_erase;
@@ -250,5 +251,6 @@ struct spi_flash *spi_flash_programmer_probe(struct spi_slave *spi, int force)
flash.sector_size = 0x1000;
flash.erase_cmd = SECTOR_ERASE_CMD;
flash.size = CONFIG_ROM_SIZE;
+ done = 1;
return &flash;
}