michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: spi: xmc4xxx: Fix comp with interrupt enabled and dma disabled

Browse source 
When dma is enabled, spi_xmc4xxx_transcieve_dma() needs to disable the
isr used by spi_xmc4xxx_transceive(). Renable the isr at the
end of spi_xmc4xxx_transceive_dma() instead of in spi_xmc4xxx_transceive().
Doing this in latter function will fail compilation when interrupt
support is enabled but dma is disabled.

This is regression from 8494b6413a
but was only caught when xmc47_relax_kit was added which tested this
scenario in tests/drivers/spi/spi_loopback.

Fixes #57494

Signed-off-by: Andriy Gelman <andriy.gelman@gmail.com>
This commit is contained in:
Andriy Gelman 2023-05-02 14:49:16 -04:00 • committed by Stephanos Ioannidis
commit 760d1588e8
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/spi/spi_xmc4xxx.c
View file

@ -292,7 +292,6 @@ static int spi_xmc4xxx_transceive(const struct device *dev, const struct spi_con
#if defined(CONFIG_SPI_XMC4XXX_INTERRUPT) #if defined(CONFIG_SPI_XMC4XXX_INTERRUPT)
XMC_SPI_CH_EnableEvent(config->spi, XMC_SPI_CH_EVENT_STANDARD_RECEIVE | XMC_SPI_CH_EnableEvent(config->spi, XMC_SPI_CH_EVENT_STANDARD_RECEIVE |
XMC_SPI_CH_EVENT_ALTERNATIVE_RECEIVE); XMC_SPI_CH_EVENT_ALTERNATIVE_RECEIVE);
irq_enable(config->irq_num_rx);
spi_xmc4xxx_shift_frames(dev); spi_xmc4xxx_shift_frames(dev);
ret = spi_context_wait_for_completion(ctx); ret = spi_context_wait_for_completion(ctx);
/* cs released in isr */ /* cs released in isr */
@ -469,6 +468,7 @@ static int spi_xmc4xxx_transceive_dma(const struct device *dev, const struct spi
spi_context_cs_control(ctx, false); spi_context_cs_control(ctx, false);
} }
irq_enable(config->irq_num_rx);
spi_context_release(ctx, ret); spi_context_release(ctx, ret);
return ret; return ret;
@ -645,6 +645,8 @@ static const struct spi_driver_api spi_xmc4xxx_driver_api = {
IRQ_CONNECT(DT_INST_IRQ_BY_NAME(index, rx, irq), \ IRQ_CONNECT(DT_INST_IRQ_BY_NAME(index, rx, irq), \
DT_INST_IRQ_BY_NAME(index, rx, priority), spi_xmc4xxx_isr, \ DT_INST_IRQ_BY_NAME(index, rx, priority), spi_xmc4xxx_isr, \
DEVICE_DT_INST_GET(index), 0); \ DEVICE_DT_INST_GET(index), 0); \
\
irq_enable(irq_num); \
} }
#define XMC4XXX_IRQ_HANDLER_STRUCT_INIT(index) .irq_config_func = spi_xmc4xxx_irq_setup_##index, #define XMC4XXX_IRQ_HANDLER_STRUCT_INIT(index) .irq_config_func = spi_xmc4xxx_irq_setup_##index,