michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers/spi: Handle ressource locking and release in DW driver

Browse source 
Again this is made as generic as possible through driver's
spi_context API.

Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@linux.intel.com>
This commit is contained in:
Tomasz Bursztyka 2017-05-10 14:13:59 +02:00 • committed by Anas Nashif
commit c2913ad025
2 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/spi/spi_context.h
View file

@ -64,6 +64,10 @@ static inline void spi_context_lock(struct spi_context *ctx,
static inline void spi_context_release(struct spi_context *ctx, int status) static inline void spi_context_release(struct spi_context *ctx, int status)
{ {
if (!status && (ctx->config->operation & SPI_LOCK_ON)) {
return;
}
#ifdef CONFIG_POLL #ifdef CONFIG_POLL
if (!ctx->asynchronous || status) { if (!ctx->asynchronous || status) {
k_sem_give(&ctx->lock); k_sem_give(&ctx->lock);
@ -73,6 +77,13 @@ static inline void spi_context_release(struct spi_context *ctx, int status)
#endif #endif
} }
static inline void spi_context_unlock_unconditionally(struct spi_context *ctx)
{
if (!k_sem_count_get(&ctx->lock)) {
k_sem_give(&ctx->lock);
}
}
static inline void spi_context_wait_for_completion(struct spi_context *ctx) static inline void spi_context_wait_for_completion(struct spi_context *ctx)
{ {
#ifdef CONFIG_POLL #ifdef CONFIG_POLL
@ -94,8 +105,10 @@ static inline void spi_context_complete(struct spi_context *ctx, int status)
k_poll_signal(ctx->signal, status); k_poll_signal(ctx->signal, status);
} }
if (!(ctx->config->operation & SPI_LOCK_ON)) {
k_sem_give(&ctx->lock); k_sem_give(&ctx->lock);
} }
}
#else #else
k_sem_give(&ctx->sync); k_sem_give(&ctx->sync);
#endif #endif

10
drivers/spi/spi_dw.c
View file

@ -339,6 +339,16 @@ static int spi_dw_transceive_async(struct spi_config *config,
static int spi_dw_release(struct spi_config *config) static int spi_dw_release(struct spi_config *config)
{ {
const struct spi_dw_config *info = config->dev->config->config_info;
struct spi_dw_data *spi = config->dev->driver_data;
if (!spi_context_configured(&spi->ctx, config) ||
test_bit_ssienr(info->regs) || test_bit_sr_busy(info->regs)) {
return -EBUSY;
}
spi_context_unlock_unconditionally(&spi->ctx);
return 0; return 0;
} }