michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: spi: stm32h7 Check nocache memory correctly

Browse source 
The way of setting a nocache region in devicetree has changed.
Adapt the H7 SPI driver to this new circumstance.

Signed-off-by: Daniel Gaston Ochoa <dgastonochoa@gmail.com>
This commit is contained in:
Daniel Gaston Ochoa 2023-09-15 19:01:08 +01:00 • committed by Fabio Baltieri
commit 8e6b401ca4
1 changed files with 7 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

45
drivers/spi/spi_ll_stm32.c
View file

@ -27,6 +27,10 @@ LOG_MODULE_REGISTER(spi_ll_stm32);
#include <zephyr/irq.h> #include <zephyr/irq.h>
#include <zephyr/mem_mgmt/mem_attr.h> #include <zephyr/mem_mgmt/mem_attr.h>
#ifdef CONFIG_SOC_SERIES_STM32H7X
#include <zephyr/dt-bindings/memory-attr/memory-attr-arm.h>
#endif
#ifdef CONFIG_NOCACHE_MEMORY #ifdef CONFIG_NOCACHE_MEMORY
#include <zephyr/linker/linker-defs.h> #include <zephyr/linker/linker-defs.h>
#endif /* CONFIG_NOCACHE_MEMORY */ #endif /* CONFIG_NOCACHE_MEMORY */
@ -57,35 +61,6 @@ LOG_MODULE_REGISTER(spi_ll_stm32);
#ifdef CONFIG_SPI_STM32_DMA #ifdef CONFIG_SPI_STM32_DMA
#ifdef CONFIG_SOC_SERIES_STM32H7X
#define IS_NOCACHE_MEM_REGION(node_id) \
COND_CODE_1(DT_ENUM_HAS_VALUE(node_id, zephyr_memory_attr, RAM_NOCACHE), \
(1), \
(0))
#define GET_MEM_REGION(node_id) \
{ \
.start = DT_REG_ADDR(node_id), \
.end = (DT_REG_ADDR(node_id) + DT_REG_SIZE(node_id)) - 1, \
},
#define GET_MEM_REGION_IF_NOCACHE(node_id) \
COND_CODE_1(IS_NOCACHE_MEM_REGION(node_id), \
( \
GET_MEM_REGION(node_id) \
), ())
struct mem_region {
uintptr_t start;
uintptr_t end;
};
static const struct mem_region nocache_mem_regions[] = {
DT_MEMORY_ATTR_FOREACH_STATUS_OKAY_NODE(GET_MEM_REGION_IF_NOCACHE)
};
#endif /* CONFIG_SOC_SERIES_STM32H7X */
/* dummy value used for transferring NOP when tx buf is null /* dummy value used for transferring NOP when tx buf is null
* and use as dummy sink for when rx buf is null * and use as dummy sink for when rx buf is null
*/ */
@ -771,16 +746,10 @@ static bool buf_in_nocache(uintptr_t buf, size_t len_bytes)
} }
#endif /* CONFIG_NOCACHE_MEMORY */ #endif /* CONFIG_NOCACHE_MEMORY */
for (size_t i = 0; i < ARRAY_SIZE(nocache_mem_regions); i++) { buf_within_nocache = mem_attr_check_buf(
const struct mem_region *mem_reg = &nocache_mem_regions[i]; (void *)buf, len_bytes, DT_MEM_ARM(ATTR_MPU_RAM_NOCACHE)) == 0;
buf_within_nocache = return buf_within_nocache;
(buf >= mem_reg->start) && ((buf + len_bytes - 1) <= mem_reg->end);
if (buf_within_nocache) {
return true;
}
}
return false;
} }
static bool is_dummy_buffer(const struct spi_buf *buf) static bool is_dummy_buffer(const struct spi_buf *buf)