adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

drivers: dma_xmc4xxx: Support calling dma_stop() after dma_config()

Browse source 
In the dma loop_transfer test (test_loop_repeated_start_stop()), the
order of calls is dma_config() -> dma_stop() -> dma_start().  This
currently does not work on xmc4xxx because after calling dma_stop(), the
dma would be in a suspended state. Fix this by leaving the suspended state
before exiting dma_stop().

Also don't clear the context (dma_channel->dlr_line and dma_channel->cb)
that was setup by dma_config().

Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
This commit is contained in:
Andriy Gelman 2025-01-12 15:34:24 -05:00 committed by Benjamin Cabé
parent 9c4cd3057d
commit f5bf7df50c
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/dma/dma_xmc4xxx.c
View file

@ -221,6 +221,7 @@ static int dma_xmc4xxx_config(const struct device *dev, uint32_t channel, struct
config->source_burst_length / 4 << GPDMA0_CH_CTLL_SRC_MSIZE_Pos | config->source_burst_length / 4 << GPDMA0_CH_CTLL_SRC_MSIZE_Pos |
BIT(GPDMA0_CH_CTLL_INT_EN_Pos); BIT(GPDMA0_CH_CTLL_INT_EN_Pos);
dma->CH[channel].CFGH = 0;
if (config->channel_direction == MEMORY_TO_PERIPHERAL || if (config->channel_direction == MEMORY_TO_PERIPHERAL ||
config->channel_direction == PERIPHERAL_TO_MEMORY) { config->channel_direction == PERIPHERAL_TO_MEMORY) {
uint8_t request_source = XMC4XXX_DMA_GET_REQUEST_SOURCE(config->dma_slot); uint8_t request_source = XMC4XXX_DMA_GET_REQUEST_SOURCE(config->dma_slot);
@ -315,8 +316,14 @@ static int dma_xmc4xxx_config(const struct device *dev, uint32_t channel, struct
static int dma_xmc4xxx_start(const struct device *dev, uint32_t channel) static int dma_xmc4xxx_start(const struct device *dev, uint32_t channel)
{ {
const struct dma_xmc4xxx_config *dev_cfg = dev->config; const struct dma_xmc4xxx_config *dev_cfg = dev->config;
struct dma_xmc4xxx_data *dev_data = dev->data;
uint8_t dlr_line = dev_data->channels[channel].dlr_line;
LOG_DBG("Starting channel %d", channel); LOG_DBG("Starting channel %d", channel);
if (dlr_line != DLR_LINE_UNSET && (DLR->LNEN & BIT(dlr_line)) == 0) {
DLR->LNEN |= BIT(dlr_line);
}
XMC_DMA_CH_Enable(dev_cfg->dma, channel); XMC_DMA_CH_Enable(dev_cfg->dma, channel);
return 0; return 0;
} }
@ -341,10 +348,8 @@ static int dma_xmc4xxx_stop(const struct device *dev, uint32_t channel)
DLR->LNEN &= ~BIT(dma_channel->dlr_line); DLR->LNEN &= ~BIT(dma_channel->dlr_line);
} }
dma_channel->dlr_line = DLR_LINE_UNSET;
dma_channel->cb = NULL;
XMC_DMA_CH_Disable(dma, channel); XMC_DMA_CH_Disable(dma, channel);
XMC_DMA_CH_Resume(dma, channel);
return 0; return 0;
} }