diff options
| author | Roberto Vargas <roberto.vargas@arm.com> | 2017-07-26 15:17:24 +0100 |
|---|---|---|
| committer | Roberto Vargas <roberto.vargas@arm.com> | 2017-08-22 09:41:59 +0100 |
| commit | b4b09ca5676fed17ead90f3b0ff3b08b9176f85f (patch) | |
| tree | 3eecf111c3ac46dac65dbc115cfa5eb471714245 /plat | |
| parent | 9753cb5b51794dac43fc9c4eb474207ebf369b59 (diff) | |
norflash: Clear status register before sending commands
The status register bits remain until explicitly cleared, which means
that a command can be incorrectly considered to have generated an error -
for example, after reset the status register contents may be unknown or
if a previous command had failed.
This patch clears the status register before beginning any command to
be sure that the status register only represents information about the
current operation.
Change-Id: I9e98110ee24179937215461c00b6543a3467b350
Signed-off-by: Roberto Vargas <roberto.vargas@arm.com>
Diffstat (limited to 'plat')
| -rw-r--r-- | plat/arm/board/common/drivers/norflash/norflash.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/plat/arm/board/common/drivers/norflash/norflash.c b/plat/arm/board/common/drivers/norflash/norflash.c index 18dad7b6..ee9eca7e 100644 --- a/plat/arm/board/common/drivers/norflash/norflash.c +++ b/plat/arm/board/common/drivers/norflash/norflash.c @@ -68,6 +68,8 @@ int nor_word_program(uintptr_t base_addr, unsigned long data) uint32_t status; int ret; + nor_send_cmd(base_addr, NOR_CMD_CLEAR_STATUS_REG); + /* Set the device in write word mode */ nor_send_cmd(base_addr, NOR_CMD_WORD_PROGRAM); mmio_write_32(base_addr, data); @@ -98,8 +100,10 @@ int nor_lock(uintptr_t base_addr) { int ret; + nor_send_cmd(base_addr, NOR_CMD_CLEAR_STATUS_REG); + nor_send_cmd(base_addr, NOR_CMD_LOCK_UNLOCK); - mmio_write_32(base_addr, NOR_2X16(NOR_LOCK_BLOCK)); + nor_send_cmd(base_addr, NOR_LOCK_BLOCK); ret = nor_poll_dws(base_addr, DWS_WORD_LOCK_RETRIES); nor_send_cmd(base_addr, NOR_CMD_READ_ARRAY); @@ -117,8 +121,10 @@ int nor_unlock(uintptr_t base_addr) { int ret; + nor_send_cmd(base_addr, NOR_CMD_CLEAR_STATUS_REG); + nor_send_cmd(base_addr, NOR_CMD_LOCK_UNLOCK); - mmio_write_32(base_addr, NOR_2X16(NOR_UNLOCK_BLOCK)); + nor_send_cmd(base_addr, NOR_UNLOCK_BLOCK); ret = nor_poll_dws(base_addr, DWS_WORD_LOCK_RETRIES); nor_send_cmd(base_addr, NOR_CMD_READ_ARRAY); |