Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-05-03 09:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge changes from topic "fix_st_spi" into integration

Browse source 
* changes:
  fix(st-spi): remove SR_BUSY bit check before sending command
  fix(st-spi): always check SR_TCF flags in stm32_qspi_wait_cmd()
This commit is contained in:
Madhukar Pappireddy 2022-05-11 17:31:44 +02:00 • committed by TrustedFirmware Code Review
commit 15ff61f5ce
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/st/spi/stm32_qspi.c
View file

@ -1,13 +1,10 @@
/* /*
* Copyright (c) 2019-2021, STMicroelectronics - All Rights Reserved * Copyright (c) 2019-2022, STMicroelectronics - All Rights Reserved
* *
* SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause * SPDX-License-Identifier: GPL-2.0+ OR BSD-3-Clause
*/ */
#include <inttypes.h> #include <inttypes.h>
#include <libfdt.h>
#include <platform_def.h>
#include <common/debug.h> #include <common/debug.h>
#include <common/fdt_wrappers.h> #include <common/fdt_wrappers.h>
@ -19,6 +16,9 @@
#include <drivers/st/stm32mp_reset.h> #include <drivers/st/stm32mp_reset.h>
#include <lib/mmio.h> #include <lib/mmio.h>
#include <lib/utils_def.h> #include <lib/utils_def.h>
#include <libfdt.h>
#include <platform_def.h>
/* Timeout for device interface reset */ /* Timeout for device interface reset */
#define TIMEOUT_US_1_MS 1000U #define TIMEOUT_US_1_MS 1000U
@ -139,10 +139,6 @@ static int stm32_qspi_wait_cmd(const struct spi_mem_op *op)
int ret = 0; int ret = 0;
uint64_t timeout; uint64_t timeout;
if (op->data.nbytes == 0U) {
return stm32_qspi_wait_for_not_busy();
}
timeout = timeout_init_us(QSPI_CMD_TIMEOUT_US); timeout = timeout_init_us(QSPI_CMD_TIMEOUT_US);
while ((mmio_read_32(qspi_base() + QSPI_SR) & QSPI_SR_TCF) == 0U) { while ((mmio_read_32(qspi_base() + QSPI_SR) & QSPI_SR_TCF) == 0U) {
if (timeout_elapsed(timeout)) { if (timeout_elapsed(timeout)) {
@ -163,6 +159,10 @@ static int stm32_qspi_wait_cmd(const struct spi_mem_op *op)
/* Clear flags */ /* Clear flags */
mmio_write_32(qspi_base() + QSPI_FCR, QSPI_FCR_CTCF | QSPI_FCR_CTEF); mmio_write_32(qspi_base() + QSPI_FCR, QSPI_FCR_CTCF | QSPI_FCR_CTEF);
if (ret == 0) {
ret = stm32_qspi_wait_for_not_busy();
}
return ret; return ret;
} }
@ -251,11 +251,6 @@ static int stm32_qspi_exec_op(const struct spi_mem_op *op)
op->dummy.buswidth, op->data.buswidth, op->dummy.buswidth, op->data.buswidth,
op->addr.val, op->data.nbytes); op->addr.val, op->data.nbytes);
ret = stm32_qspi_wait_for_not_busy();
if (ret != 0) {
return ret;
}
addr_max = op->addr.val + op->data.nbytes + 1U; addr_max = op->addr.val + op->data.nbytes + 1U;
if ((op->data.dir == SPI_MEM_DATA_IN) && (op->data.nbytes != 0U)) { if ((op->data.dir == SPI_MEM_DATA_IN) && (op->data.nbytes != 0U)) {