michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: dma: stm32 driver is using the STM32_DMA_STREAM_OFFSET

Browse source 
Includes the definition of the STM32_DMA_STREAM_OFFSET
depending on the peripheral to adjust the first DMA channel
in the list of streams.

Signed-off-by: Francois Ramu <francois.ramu@st.com>
This commit is contained in:
Francois Ramu 2022-04-29 15:19:53 +02:00 • committed by Carles Cufí
commit 005968a81f
2 changed files with 9 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

19
drivers/dma/dma_stm32.c
View file

@ -96,14 +96,13 @@ static void dma_stm32_irq_handler(const struct device *dev, uint32_t id)
#ifdef CONFIG_DMAMUX_STM32 #ifdef CONFIG_DMAMUX_STM32
callback_arg = stream->mux_channel; callback_arg = stream->mux_channel;
#else #else
callback_arg = id + STREAM_OFFSET; callback_arg = id + STM32_DMA_STREAM_OFFSET;
#endif /* CONFIG_DMAMUX_STM32 */ #endif /* CONFIG_DMAMUX_STM32 */
if (!IS_ENABLED(CONFIG_DMAMUX_STM32)) { if (!IS_ENABLED(CONFIG_DMAMUX_STM32)) {
stream->busy = false; stream->busy = false;
} }
/* the dma stream id is in range from STREAM_OFFSET..<dma-requests> */ /* the dma stream id is in range from STM32_DMA_STREAM_OFFSET..<dma-requests> */
if (stm32_dma_is_ht_irq_active(dma, id)) { if (stm32_dma_is_ht_irq_active(dma, id)) {
/* Let HAL DMA handle flags on its own */ /* Let HAL DMA handle flags on its own */
if (!stream->hal_override) { if (!stream->hal_override) {
@ -263,7 +262,7 @@ DMA_STM32_EXPORT_API int dma_stm32_configure(const struct device *dev,
{ {
const struct dma_stm32_config *dev_config = dev->config; const struct dma_stm32_config *dev_config = dev->config;
struct dma_stm32_stream *stream = struct dma_stm32_stream *stream =
&dev_config->streams[id - STREAM_OFFSET]; &dev_config->streams[id - STM32_DMA_STREAM_OFFSET];
DMA_TypeDef *dma = (DMA_TypeDef *)dev_config->base; DMA_TypeDef *dma = (DMA_TypeDef *)dev_config->base;
LL_DMA_InitTypeDef DMA_InitStruct; LL_DMA_InitTypeDef DMA_InitStruct;
int ret; int ret;
@ -271,7 +270,7 @@ DMA_STM32_EXPORT_API int dma_stm32_configure(const struct device *dev,
LL_DMA_StructInit(&DMA_InitStruct); LL_DMA_StructInit(&DMA_InitStruct);
/* give channel from index 0 */ /* give channel from index 0 */
id = id - STREAM_OFFSET; id = id - STM32_DMA_STREAM_OFFSET;
if (id >= dev_config->max_streams) { if (id >= dev_config->max_streams) {
LOG_ERR("cannot configure the dma stream %d.", id); LOG_ERR("cannot configure the dma stream %d.", id);
@ -503,7 +502,7 @@ DMA_STM32_EXPORT_API int dma_stm32_reload(const struct device *dev, uint32_t id,
struct dma_stm32_stream *stream; struct dma_stm32_stream *stream;
/* give channel from index 0 */ /* give channel from index 0 */
id = id - STREAM_OFFSET; id = id - STM32_DMA_STREAM_OFFSET;
if (id >= config->max_streams) { if (id >= config->max_streams) {
return -EINVAL; return -EINVAL;
@ -548,7 +547,7 @@ DMA_STM32_EXPORT_API int dma_stm32_start(const struct device *dev, uint32_t id)
DMA_TypeDef *dma = (DMA_TypeDef *)(config->base); DMA_TypeDef *dma = (DMA_TypeDef *)(config->base);
/* give channel from index 0 */ /* give channel from index 0 */
id = id - STREAM_OFFSET; id = id - STM32_DMA_STREAM_OFFSET;
/* Only M2P or M2M mode can be started manually. */ /* Only M2P or M2M mode can be started manually. */
if (id >= config->max_streams) { if (id >= config->max_streams) {
@ -565,11 +564,11 @@ DMA_STM32_EXPORT_API int dma_stm32_start(const struct device *dev, uint32_t id)
DMA_STM32_EXPORT_API int dma_stm32_stop(const struct device *dev, uint32_t id) DMA_STM32_EXPORT_API int dma_stm32_stop(const struct device *dev, uint32_t id)
{ {
const struct dma_stm32_config *config = dev->config; const struct dma_stm32_config *config = dev->config;
struct dma_stm32_stream *stream = &config->streams[id - STREAM_OFFSET]; struct dma_stm32_stream *stream = &config->streams[id - STM32_DMA_STREAM_OFFSET];
DMA_TypeDef *dma = (DMA_TypeDef *)(config->base); DMA_TypeDef *dma = (DMA_TypeDef *)(config->base);
/* give channel from index 0 */ /* give channel from index 0 */
id = id - STREAM_OFFSET; id = id - STM32_DMA_STREAM_OFFSET;
if (id >= config->max_streams) { if (id >= config->max_streams) {
return -EINVAL; return -EINVAL;
@ -627,7 +626,7 @@ DMA_STM32_EXPORT_API int dma_stm32_get_status(const struct device *dev,
struct dma_stm32_stream *stream; struct dma_stm32_stream *stream;
/* give channel from index 0 */ /* give channel from index 0 */
id = id - STREAM_OFFSET; id = id - STM32_DMA_STREAM_OFFSET;
if (id >= config->max_streams) { if (id >= config->max_streams) {
return -EINVAL; return -EINVAL;
} }

12
drivers/dma/dma_stm32.h
View file

@ -45,18 +45,6 @@ struct dma_stm32_config {
struct dma_stm32_stream *streams; struct dma_stm32_stream *streams;
}; };
#if !defined(CONFIG_DMA_STM32_V1)
/* from DTS the dma stream id is in range 1..<dma-requests> */
/* so decrease to set range from 0 from now on */
#define STREAM_OFFSET 1
#elif defined(CONFIG_DMA_STM32_V1) && defined(CONFIG_DMAMUX_STM32)
/* typically on the stm32H7 serie, DMA V1 with mux */
#define STREAM_OFFSET 1
#else
/* from DTS the dma stream id is in range 0..<dma-requests>-1 */
#define STREAM_OFFSET 0
#endif /* ! CONFIG_DMA_STM32_V1 */
uint32_t dma_stm32_id_to_stream(uint32_t id); uint32_t dma_stm32_id_to_stream(uint32_t id);
#if !defined(CONFIG_DMAMUX_STM32) #if !defined(CONFIG_DMAMUX_STM32)
uint32_t dma_stm32_slot_to_channel(uint32_t id); uint32_t dma_stm32_slot_to_channel(uint32_t id);