Skip to content

Commit

Permalink
kconfig: rename HW_LLI to DMA_HW_LLI
Browse files Browse the repository at this point in the history 
Add a proper namespace prefix to CONFIG_HW_LLI. While this
option is only used by DW-DMA driver at the moment, this is
a generic option, so remove the DW-DMA specific text from
top-level documentation.

Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
  • Loading branch information
@kv2019i @lgirdwood
kv2019i authored and lgirdwood committed May 19, 2021
1 parent 79c6475 commit 0efce63
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ config INTEL_IOMUX
bool
default n

config HW_LLI
config DMA_HW_LLI
bool
default n
help
Hardware linked list is the DW-DMA feature, which allows
Hardware linked list is DMA feature, which allows
to automatically reload the next programmed linked list
item from memory without stopping the transfer. Without
it the transfer stops after every lli read and FW needs
Expand Down
42 changes: 21 additions & 21 deletions src/drivers/dw/dma.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ struct dw_dma_chan_data {
*/
static const uint32_t burst_elems[] = {1, 2, 4, 8};

#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
#define DW_DMA_BUFFER_PERIOD_COUNT 4
#else
#define DW_DMA_BUFFER_PERIOD_COUNT 2
Expand All @@ -93,7 +93,7 @@ static void dw_dma_interrupt_mask(struct dma_chan_data *channel)
static void dw_dma_interrupt_unmask(struct dma_chan_data *channel)
{
/* unmask block, transfer and error interrupts for channel */
#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
dma_reg_write(channel->dma, DW_MASK_BLOCK,
DW_CHAN_UNMASK(channel->index));
#else
Expand All @@ -118,7 +118,7 @@ static uint32_t dw_dma_interrupt_status(struct dma_chan_data *channel)
{
uint32_t status;

#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
status = dma_reg_read(channel->dma, DW_STATUS_BLOCK);
#else
status = dma_reg_read(channel->dma, DW_STATUS_TFR);
Expand All @@ -135,7 +135,7 @@ static void dw_dma_increment_pointer(struct dw_dma_chan_data *chan, int bytes)
(chan->ptr_data.current_ptr - chan->ptr_data.end_ptr);
}

#if !CONFIG_HW_LLI
#if !CONFIG_DMA_HW_LLI
/* reload using LLI data from DMA IRQ cb */
static inline void dw_dma_chan_reload_lli_cb(void *arg, enum notify_id type,
void *data)
Expand Down Expand Up @@ -202,7 +202,7 @@ static struct dma_chan_data *dw_dma_channel_get(struct dma *dma,
dma->chan[i].status = COMP_STATE_READY;

atomic_add(&dma->num_channels_busy, 1);
#if !CONFIG_HW_LLI
#if !CONFIG_DMA_HW_LLI
notifier_register(&dma->chan[i], &dma->chan[i],
NOTIFIER_ID_DMA_IRQ, dw_dma_chan_reload_lli_cb, 0);
#endif
Expand Down Expand Up @@ -265,7 +265,7 @@ static int dw_dma_start(struct dma_chan_data *channel)
struct dw_lli *lli = dw_chan->lli_current;
uint32_t flags;
int ret = 0;
#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
uint32_t words_per_tfr = 0;
#endif

Expand Down Expand Up @@ -294,7 +294,7 @@ static int dw_dma_start(struct dma_chan_data *channel)
goto out;
}

#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
/* LLP mode - write LLP pointer unless in scatter mode */
dma_reg_write(dma, DW_LLP(channel->index),
(lli->ctrl_lo & (DW_CTLL_LLP_D_EN | DW_CTLL_LLP_S_EN)) ?
Expand All @@ -312,7 +312,7 @@ static int dw_dma_start(struct dma_chan_data *channel)
dma_reg_write(dma, DW_CFG_LOW(channel->index), dw_chan->cfg_lo);
dma_reg_write(dma, DW_CFG_HIGH(channel->index), dw_chan->cfg_hi);

#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
if (lli->ctrl_lo & DW_CTLL_D_SCAT_EN) {
words_per_tfr = (lli->ctrl_hi & DW_CTLH_BLOCK_TS_MASK) >>
((lli->ctrl_lo & DW_CTLL_DST_WIDTH_MASK) >>
Expand Down Expand Up @@ -391,11 +391,11 @@ static int dw_dma_stop(struct dma_chan_data *channel)
struct dma *dma = channel->dma;
uint32_t flags;

#if CONFIG_HW_LLI || CONFIG_DMA_SUSPEND_DRAIN
#if CONFIG_DMA_HW_LLI || CONFIG_DMA_SUSPEND_DRAIN
struct dw_dma_chan_data *dw_chan = dma_chan_get_data(channel);
#endif

#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
struct dw_lli *lli = dw_chan->lli;
int i;
#endif
Expand Down Expand Up @@ -432,7 +432,7 @@ static int dw_dma_stop(struct dma_chan_data *channel)

dma_reg_write(dma, DW_DMA_CHAN_EN, DW_CHAN_MASK(channel->index));

#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
for (i = 0; i < channel->desc_count; i++) {
lli->ctrl_hi &= ~DW_CTLH_DONE(1);
lli++;
Expand Down Expand Up @@ -659,31 +659,31 @@ static int dw_dma_set_config(struct dma_chan_data *channel,
case DMA_DIR_LMEM_TO_HMEM:
lli_desc->ctrl_lo |= DW_CTLL_FC_M2M | DW_CTLL_SRC_INC |
DW_CTLL_DST_INC;
#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
lli_desc->ctrl_lo |=
DW_CTLL_LLP_S_EN | DW_CTLL_LLP_D_EN;
#endif
break;
case DMA_DIR_HMEM_TO_LMEM:
lli_desc->ctrl_lo |= DW_CTLL_FC_M2M | DW_CTLL_SRC_INC |
DW_CTLL_DST_INC;
#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
lli_desc->ctrl_lo |=
DW_CTLL_LLP_S_EN | DW_CTLL_LLP_D_EN;
#endif
break;
case DMA_DIR_MEM_TO_MEM:
lli_desc->ctrl_lo |= DW_CTLL_FC_M2M | DW_CTLL_SRC_INC |
DW_CTLL_DST_INC;
#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
lli_desc->ctrl_lo |=
DW_CTLL_LLP_S_EN | DW_CTLL_LLP_D_EN;
#endif
break;
case DMA_DIR_MEM_TO_DEV:
lli_desc->ctrl_lo |= DW_CTLL_FC_M2P | DW_CTLL_SRC_INC |
DW_CTLL_DST_FIX;
#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
lli_desc->ctrl_lo |= DW_CTLL_LLP_S_EN;
dw_chan->cfg_lo |= DW_CFG_RELOAD_DST;
#endif
Expand All @@ -694,7 +694,7 @@ static int dw_dma_set_config(struct dma_chan_data *channel,
case DMA_DIR_DEV_TO_MEM:
lli_desc->ctrl_lo |= DW_CTLL_FC_P2M | DW_CTLL_SRC_FIX |
DW_CTLL_DST_INC;
#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
if (!config->scatter)
lli_desc->ctrl_lo |= DW_CTLL_LLP_D_EN;
else
Expand All @@ -711,7 +711,7 @@ static int dw_dma_set_config(struct dma_chan_data *channel,
case DMA_DIR_DEV_TO_DEV:
lli_desc->ctrl_lo |= DW_CTLL_FC_P2P | DW_CTLL_SRC_FIX |
DW_CTLL_DST_FIX;
#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
lli_desc->ctrl_lo |=
DW_CTLL_LLP_S_EN | DW_CTLL_LLP_D_EN;
#endif
Expand Down Expand Up @@ -752,7 +752,7 @@ static int dw_dma_set_config(struct dma_chan_data *channel,
lli_desc++;
}

#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
dw_chan->cfg_lo |= DW_CFG_CTL_HI_UPD_EN;
#endif

Expand All @@ -761,7 +761,7 @@ static int dw_dma_set_config(struct dma_chan_data *channel,
lli_desc_tail->llp = (uint32_t)lli_desc_head;
} else {
lli_desc_tail->llp = 0;
#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
lli_desc_tail->ctrl_lo &=
~(DW_CTLL_LLP_S_EN | DW_CTLL_LLP_D_EN);
#endif
Expand Down Expand Up @@ -806,7 +806,7 @@ static void dw_dma_verify_transfer(struct dma_chan_data *channel,
struct dma_cb_data *next)
{
struct dw_dma_chan_data *dw_chan = dma_chan_get_data(channel);
#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
#if defined __ZEPHYR__
int i;
#else
Expand Down Expand Up @@ -1094,7 +1094,7 @@ static int dw_dma_get_data_size(struct dma_chan_data *channel,
}
spin_unlock_irq(&channel->dma->lock, flags);

#if CONFIG_HW_LLI
#if CONFIG_DMA_HW_LLI
if (!(dma_reg_read(channel->dma, DW_DMA_CHAN_EN) &
DW_CHAN(channel->index))) {
tr_err(&dwdma_tr, "dw_dma_get_data_size(): xrun detected");
Expand Down
10 changes: 5 additions & 5 deletions src/platform/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ config APOLLOLAKE
select DW
select DW_DMA
select MEM_WND
select HW_LLI
select DMA_HW_LLI
select DMA_FIFO_PARTITION
select CAVS
select CAVS_VERSION_1_5
Expand All @@ -93,7 +93,7 @@ config CANNONLAKE
select DW
select DW_DMA
select MEM_WND
select HW_LLI
select DMA_HW_LLI
select DW_DMA_AGGREGATED_IRQ
select DMA_FIFO_PARTITION
select CAVS
Expand All @@ -112,7 +112,7 @@ config SUECREEK
select DW_SPI
select INTEL_IOMUX
select DW_GPIO
select HW_LLI
select DMA_HW_LLI
select DW_DMA_AGGREGATED_IRQ
select DMA_FIFO_PARTITION
select CAVS
Expand All @@ -130,7 +130,7 @@ config ICELAKE
select DW
select DW_DMA
select MEM_WND
select HW_LLI
select DMA_HW_LLI
select DW_DMA_AGGREGATED_IRQ
select DMA_FIFO_PARTITION
select CAVS
Expand All @@ -148,7 +148,7 @@ config TIGERLAKE
select DW
select DW_DMA
select MEM_WND
select HW_LLI
select DMA_HW_LLI
select DW_DMA_AGGREGATED_IRQ
select DMA_FIFO_PARTITION
select CAVS
Expand Down

0 comments on commit 0efce63

Please sign in to comment.