Skip to content

L
linux
Commit e96b1f64 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Vinod Koul
Browse files
Options

dmaengine: ti: edma: Clean up the 2x32bit array register accesses 

Introduce defines for getting the array index and the bit number within the
64bit array register pairs.
Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Link: https://lore.kernel.org/r/20190716082655.1620-2-peter.ujfalusi@ti.comSigned-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 4689d35c
Hide whitespace changes
Inline Side-by-side
Showing with 61 additions and 45 deletions
drivers/dma/ti/edma.c
View file @ e96b1f64
...@@ -132,6 +132,17 @@ ...@@ -132,6 +132,17 @@
#define EDMA_CONT_PARAMS_FIXED_EXACT 1002 #define EDMA_CONT_PARAMS_FIXED_EXACT 1002
#define EDMA_CONT_PARAMS_FIXED_NOT_EXACT 1003 #define EDMA_CONT_PARAMS_FIXED_NOT_EXACT 1003
/*
* 64bit array registers are split into two 32bit registers:
* reg0: channel/event 0-31
* reg1: channel/event 32-63
*
* bit 5 in the channel number tells the array index (0/1)
* bit 0-4 (0x1f) is the bit offset within the register
*/
#define EDMA_REG_ARRAY_INDEX(channel) ((channel) >> 5)
#define EDMA_CHANNEL_BIT(channel) (BIT((channel) & 0x1f))
/* PaRAM slots are laid out like this */ /* PaRAM slots are laid out like this */
struct edmacc_param { struct edmacc_param {
u32 opt; u32 opt;
...@@ -440,15 +451,14 @@ static void edma_setup_interrupt(struct edma_chan *echan, bool enable) ...@@ -440,15 +451,14 @@ static void edma_setup_interrupt(struct edma_chan *echan, bool enable)
{ {
struct edma_cc *ecc = echan->ecc; struct edma_cc *ecc = echan->ecc;
int channel = EDMA_CHAN_SLOT(echan->ch_num); int channel = EDMA_CHAN_SLOT(echan->ch_num);
int idx = EDMA_REG_ARRAY_INDEX(channel);
int ch_bit = EDMA_CHANNEL_BIT(channel);
if (enable) { if (enable) {
edma_shadow0_write_array(ecc, SH_ICR, channel >> 5, edma_shadow0_write_array(ecc, SH_ICR, idx, ch_bit);
BIT(channel & 0x1f)); edma_shadow0_write_array(ecc, SH_IESR, idx, ch_bit);
edma_shadow0_write_array(ecc, SH_IESR, channel >> 5,
BIT(channel & 0x1f));
} else { } else {
edma_shadow0_write_array(ecc, SH_IECR, channel >> 5, edma_shadow0_write_array(ecc, SH_IECR, idx, ch_bit);
BIT(channel & 0x1f));
} }
} }
...@@ -586,26 +596,26 @@ static void edma_start(struct edma_chan *echan) ...@@ -586,26 +596,26 @@ static void edma_start(struct edma_chan *echan)
{ {
struct edma_cc *ecc = echan->ecc; struct edma_cc *ecc = echan->ecc;
int channel = EDMA_CHAN_SLOT(echan->ch_num); int channel = EDMA_CHAN_SLOT(echan->ch_num);
int j = (channel >> 5); int idx = EDMA_REG_ARRAY_INDEX(channel);
unsigned int mask = BIT(channel & 0x1f); int ch_bit = EDMA_CHANNEL_BIT(channel);
if (!echan->hw_triggered) { if (!echan->hw_triggered) {
/* EDMA channels without event association */ /* EDMA channels without event association */
dev_dbg(ecc->dev, "ESR%d %08x\n", j, dev_dbg(ecc->dev, "ESR%d %08x\n", idx,
edma_shadow0_read_array(ecc, SH_ESR, j)); edma_shadow0_read_array(ecc, SH_ESR, idx));
edma_shadow0_write_array(ecc, SH_ESR, j, mask); edma_shadow0_write_array(ecc, SH_ESR, idx, ch_bit);
} else { } else {
/* EDMA channel with event association */ /* EDMA channel with event association */
dev_dbg(ecc->dev, "ER%d %08x\n", j, dev_dbg(ecc->dev, "ER%d %08x\n", idx,
edma_shadow0_read_array(ecc, SH_ER, j)); edma_shadow0_read_array(ecc, SH_ER, idx));
/* Clear any pending event or error */ /* Clear any pending event or error */
edma_write_array(ecc, EDMA_ECR, j, mask); edma_write_array(ecc, EDMA_ECR, idx, ch_bit);
edma_write_array(ecc, EDMA_EMCR, j, mask); edma_write_array(ecc, EDMA_EMCR, idx, ch_bit);
/* Clear any SER */ /* Clear any SER */
edma_shadow0_write_array(ecc, SH_SECR, j, mask); edma_shadow0_write_array(ecc, SH_SECR, idx, ch_bit);
edma_shadow0_write_array(ecc, SH_EESR, j, mask); edma_shadow0_write_array(ecc, SH_EESR, idx, ch_bit);
dev_dbg(ecc->dev, "EER%d %08x\n", j, dev_dbg(ecc->dev, "EER%d %08x\n", idx,
edma_shadow0_read_array(ecc, SH_EER, j)); edma_shadow0_read_array(ecc, SH_EER, idx));
} }
} }
...@@ -613,19 +623,19 @@ static void edma_stop(struct edma_chan *echan) ...@@ -613,19 +623,19 @@ static void edma_stop(struct edma_chan *echan)
{ {
struct edma_cc *ecc = echan->ecc; struct edma_cc *ecc = echan->ecc;
int channel = EDMA_CHAN_SLOT(echan->ch_num); int channel = EDMA_CHAN_SLOT(echan->ch_num);
int j = (channel >> 5); int idx = EDMA_REG_ARRAY_INDEX(channel);
unsigned int mask = BIT(channel & 0x1f); int ch_bit = EDMA_CHANNEL_BIT(channel);
edma_shadow0_write_array(ecc, SH_EECR, j, mask); edma_shadow0_write_array(ecc, SH_EECR, idx, ch_bit);
edma_shadow0_write_array(ecc, SH_ECR, j, mask); edma_shadow0_write_array(ecc, SH_ECR, idx, ch_bit);
edma_shadow0_write_array(ecc, SH_SECR, j, mask); edma_shadow0_write_array(ecc, SH_SECR, idx, ch_bit);
edma_write_array(ecc, EDMA_EMCR, j, mask); edma_write_array(ecc, EDMA_EMCR, idx, ch_bit);
/* clear possibly pending completion interrupt */ /* clear possibly pending completion interrupt */
edma_shadow0_write_array(ecc, SH_ICR, j, mask); edma_shadow0_write_array(ecc, SH_ICR, idx, ch_bit);
dev_dbg(ecc->dev, "EER%d %08x\n", j, dev_dbg(ecc->dev, "EER%d %08x\n", idx,
edma_shadow0_read_array(ecc, SH_EER, j)); edma_shadow0_read_array(ecc, SH_EER, idx));
/* REVISIT: consider guarding against inappropriate event /* REVISIT: consider guarding against inappropriate event
* chaining by overwriting with dummy_paramset. * chaining by overwriting with dummy_paramset.
...@@ -639,45 +649,49 @@ static void edma_stop(struct edma_chan *echan) ...@@ -639,45 +649,49 @@ static void edma_stop(struct edma_chan *echan)
static void edma_pause(struct edma_chan *echan) static void edma_pause(struct edma_chan *echan)
{ {
int channel = EDMA_CHAN_SLOT(echan->ch_num); int channel = EDMA_CHAN_SLOT(echan->ch_num);
unsigned int mask = BIT(channel & 0x1f);
edma_shadow0_write_array(echan->ecc, SH_EECR, channel >> 5, mask); edma_shadow0_write_array(echan->ecc, SH_EECR,
EDMA_REG_ARRAY_INDEX(channel),
EDMA_CHANNEL_BIT(channel));
} }
/* Re-enable EDMA hardware events on the specified channel. */ /* Re-enable EDMA hardware events on the specified channel. */
static void edma_resume(struct edma_chan *echan) static void edma_resume(struct edma_chan *echan)
{ {
int channel = EDMA_CHAN_SLOT(echan->ch_num); int channel = EDMA_CHAN_SLOT(echan->ch_num);
unsigned int mask = BIT(channel & 0x1f);
edma_shadow0_write_array(echan->ecc, SH_EESR, channel >> 5, mask); edma_shadow0_write_array(echan->ecc, SH_EESR,
EDMA_REG_ARRAY_INDEX(channel),
EDMA_CHANNEL_BIT(channel));
} }
static void edma_trigger_channel(struct edma_chan *echan) static void edma_trigger_channel(struct edma_chan *echan)
{ {
struct edma_cc *ecc = echan->ecc; struct edma_cc *ecc = echan->ecc;
int channel = EDMA_CHAN_SLOT(echan->ch_num); int channel = EDMA_CHAN_SLOT(echan->ch_num);
unsigned int mask = BIT(channel & 0x1f); int idx = EDMA_REG_ARRAY_INDEX(channel);
int ch_bit = EDMA_CHANNEL_BIT(channel);
edma_shadow0_write_array(ecc, SH_ESR, (channel >> 5), mask); edma_shadow0_write_array(ecc, SH_ESR, idx, ch_bit);
dev_dbg(ecc->dev, "ESR%d %08x\n", (channel >> 5), dev_dbg(ecc->dev, "ESR%d %08x\n", idx,
edma_shadow0_read_array(ecc, SH_ESR, (channel >> 5))); edma_shadow0_read_array(ecc, SH_ESR, idx));
} }
static void edma_clean_channel(struct edma_chan *echan) static void edma_clean_channel(struct edma_chan *echan)
{ {
struct edma_cc *ecc = echan->ecc; struct edma_cc *ecc = echan->ecc;
int channel = EDMA_CHAN_SLOT(echan->ch_num); int channel = EDMA_CHAN_SLOT(echan->ch_num);
int j = (channel >> 5); int idx = EDMA_REG_ARRAY_INDEX(channel);
unsigned int mask = BIT(channel & 0x1f); int ch_bit = EDMA_CHANNEL_BIT(channel);
dev_dbg(ecc->dev, "EMR%d %08x\n", j, edma_read_array(ecc, EDMA_EMR, j)); dev_dbg(ecc->dev, "EMR%d %08x\n", idx,
edma_shadow0_write_array(ecc, SH_ECR, j, mask); edma_read_array(ecc, EDMA_EMR, idx));
edma_shadow0_write_array(ecc, SH_ECR, idx, ch_bit);
/* Clear the corresponding EMR bits */ /* Clear the corresponding EMR bits */
edma_write_array(ecc, EDMA_EMCR, j, mask); edma_write_array(ecc, EDMA_EMCR, idx, ch_bit);
/* Clear any SER */ /* Clear any SER */
edma_shadow0_write_array(ecc, SH_SECR, j, mask); edma_shadow0_write_array(ecc, SH_SECR, idx, ch_bit);
edma_write(ecc, EDMA_CCERRCLR, BIT(16) | BIT(1) | BIT(0)); edma_write(ecc, EDMA_CCERRCLR, BIT(16) | BIT(1) | BIT(0));
} }
...@@ -707,7 +721,8 @@ static int edma_alloc_channel(struct edma_chan *echan, ...@@ -707,7 +721,8 @@ static int edma_alloc_channel(struct edma_chan *echan,
int channel = EDMA_CHAN_SLOT(echan->ch_num); int channel = EDMA_CHAN_SLOT(echan->ch_num);
/* ensure access through shadow region 0 */ /* ensure access through shadow region 0 */
edma_or_array2(ecc, EDMA_DRAE, 0, channel >> 5, BIT(channel & 0x1f)); edma_or_array2(ecc, EDMA_DRAE, 0, EDMA_REG_ARRAY_INDEX(channel),
EDMA_CHANNEL_BIT(channel));
/* ensure no events are pending */ /* ensure no events are pending */
edma_stop(echan); edma_stop(echan);
...@@ -2483,8 +2498,9 @@ static int edma_pm_resume(struct device *dev) ...@@ -2483,8 +2498,9 @@ static int edma_pm_resume(struct device *dev)
for (i = 0; i < ecc->num_channels; i++) { for (i = 0; i < ecc->num_channels; i++) {
if (echan[i].alloced) { if (echan[i].alloced) {
/* ensure access through shadow region 0 */ /* ensure access through shadow region 0 */
edma_or_array2(ecc, EDMA_DRAE, 0, i >> 5, edma_or_array2(ecc, EDMA_DRAE, 0,
BIT(i & 0x1f)); EDMA_REG_ARRAY_INDEX(i),
EDMA_CHANNEL_BIT(i));
edma_setup_interrupt(&echan[i], true); edma_setup_interrupt(&echan[i], true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7