mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 14:19:16 +00:00
Code Issues Releases Wiki Activity

soc: fsl: qe: replace qe_io{read,write}* wrappers by generic io{read,write}*

Browse source 
Commit 6ac9b61786 ("soc: fsl: qe: introduce qe_io{read,write}*
wrappers") added specific I/O accessors for qe because at that
time ioread/iowrite functions were sub-optimal on powerpc/32
compared to the architecture specific in_/out_ IO accessors.

But as ioread/iowrite accessors are now equivalent since
commit 894fa235eb ("powerpc: inline iomap accessors"),
use them in order to allow removal of the qe specific ones.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Li Yang <leoyang.li@nxp.com>
This commit is contained in:
Christophe Leroy 2021-03-06 18:09:29 +00:00 committed by Li Yang
parent dc67dac617
commit 3f39f38ea9
6 changed files with 97 additions and 97 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/soc/fsl/qe/gpio.c
View file

@ -41,13 +41,13 @@ static void qe_gpio_save_regs(struct of_mm_gpio_chip *mm_gc)
container_of(mm_gc, struct qe_gpio_chip, mm_gc); container_of(mm_gc, struct qe_gpio_chip, mm_gc);
struct qe_pio_regs __iomem *regs = mm_gc->regs; struct qe_pio_regs __iomem *regs = mm_gc->regs;
qe_gc->cpdata = qe_ioread32be(&regs->cpdata); qe_gc->cpdata = ioread32be(&regs->cpdata);
qe_gc->saved_regs.cpdata = qe_gc->cpdata; qe_gc->saved_regs.cpdata = qe_gc->cpdata;
qe_gc->saved_regs.cpdir1 = qe_ioread32be(&regs->cpdir1); qe_gc->saved_regs.cpdir1 = ioread32be(&regs->cpdir1);
qe_gc->saved_regs.cpdir2 = qe_ioread32be(&regs->cpdir2); qe_gc->saved_regs.cpdir2 = ioread32be(&regs->cpdir2);
qe_gc->saved_regs.cppar1 = qe_ioread32be(&regs->cppar1); qe_gc->saved_regs.cppar1 = ioread32be(&regs->cppar1);
qe_gc->saved_regs.cppar2 = qe_ioread32be(&regs->cppar2); qe_gc->saved_regs.cppar2 = ioread32be(&regs->cppar2);
qe_gc->saved_regs.cpodr = qe_ioread32be(&regs->cpodr); qe_gc->saved_regs.cpodr = ioread32be(&regs->cpodr);
} }
static int qe_gpio_get(struct gpio_chip *gc, unsigned int gpio) static int qe_gpio_get(struct gpio_chip *gc, unsigned int gpio)
@ -56,7 +56,7 @@ static int qe_gpio_get(struct gpio_chip *gc, unsigned int gpio)
struct qe_pio_regs __iomem *regs = mm_gc->regs; struct qe_pio_regs __iomem *regs = mm_gc->regs;
u32 pin_mask = 1 << (QE_PIO_PINS - 1 - gpio); u32 pin_mask = 1 << (QE_PIO_PINS - 1 - gpio);
return !!(qe_ioread32be(&regs->cpdata) & pin_mask); return !!(ioread32be(&regs->cpdata) & pin_mask);
} }
static void qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val) static void qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
@ -74,7 +74,7 @@ static void qe_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
else else
qe_gc->cpdata &= ~pin_mask; qe_gc->cpdata &= ~pin_mask;
qe_iowrite32be(qe_gc->cpdata, &regs->cpdata); iowrite32be(qe_gc->cpdata, &regs->cpdata);
spin_unlock_irqrestore(&qe_gc->lock, flags); spin_unlock_irqrestore(&qe_gc->lock, flags);
} }
@ -101,7 +101,7 @@ static void qe_gpio_set_multiple(struct gpio_chip *gc,
} }
} }
qe_iowrite32be(qe_gc->cpdata, &regs->cpdata); iowrite32be(qe_gc->cpdata, &regs->cpdata);
spin_unlock_irqrestore(&qe_gc->lock, flags); spin_unlock_irqrestore(&qe_gc->lock, flags);
} }
@ -269,7 +269,7 @@ void qe_pin_set_dedicated(struct qe_pin *qe_pin)
else else
qe_gc->cpdata &= ~mask1; qe_gc->cpdata &= ~mask1;
qe_iowrite32be(qe_gc->cpdata, &regs->cpdata); iowrite32be(qe_gc->cpdata, &regs->cpdata);
qe_clrsetbits_be32(&regs->cpodr, mask1, sregs->cpodr & mask1); qe_clrsetbits_be32(&regs->cpodr, mask1, sregs->cpodr & mask1);
spin_unlock_irqrestore(&qe_gc->lock, flags); spin_unlock_irqrestore(&qe_gc->lock, flags);

24
drivers/soc/fsl/qe/qe.c
View file

@ -109,7 +109,7 @@ int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input)
spin_lock_irqsave(&qe_lock, flags); spin_lock_irqsave(&qe_lock, flags);
if (cmd == QE_RESET) { if (cmd == QE_RESET) {
qe_iowrite32be((u32)(cmd | QE_CR_FLG), &qe_immr->cp.cecr); iowrite32be((u32)(cmd | QE_CR_FLG), &qe_immr->cp.cecr);
} else { } else {
if (cmd == QE_ASSIGN_PAGE) { if (cmd == QE_ASSIGN_PAGE) {
/* Here device is the SNUM, not sub-block */ /* Here device is the SNUM, not sub-block */
@ -126,13 +126,13 @@ int qe_issue_cmd(u32 cmd, u32 device, u8 mcn_protocol, u32 cmd_input)
mcn_shift = QE_CR_MCN_NORMAL_SHIFT; mcn_shift = QE_CR_MCN_NORMAL_SHIFT;
} }
qe_iowrite32be(cmd_input, &qe_immr->cp.cecdr); iowrite32be(cmd_input, &qe_immr->cp.cecdr);
qe_iowrite32be((cmd | QE_CR_FLG | ((u32)device << dev_shift) | (u32)mcn_protocol << mcn_shift), iowrite32be((cmd | QE_CR_FLG | ((u32)device << dev_shift) | (u32)mcn_protocol << mcn_shift),
&qe_immr->cp.cecr); &qe_immr->cp.cecr);
} }
/* wait for the QE_CR_FLG to clear */ /* wait for the QE_CR_FLG to clear */
ret = readx_poll_timeout_atomic(qe_ioread32be, &qe_immr->cp.cecr, val, ret = readx_poll_timeout_atomic(ioread32be, &qe_immr->cp.cecr, val,
(val & QE_CR_FLG) == 0, 0, 100); (val & QE_CR_FLG) == 0, 0, 100);
/* On timeout, ret is -ETIMEDOUT, otherwise it will be 0. */ /* On timeout, ret is -ETIMEDOUT, otherwise it will be 0. */
spin_unlock_irqrestore(&qe_lock, flags); spin_unlock_irqrestore(&qe_lock, flags);
@ -231,7 +231,7 @@ int qe_setbrg(enum qe_clock brg, unsigned int rate, unsigned int multiplier)
tempval = ((divisor - 1) << QE_BRGC_DIVISOR_SHIFT) | tempval = ((divisor - 1) << QE_BRGC_DIVISOR_SHIFT) |
QE_BRGC_ENABLE | div16; QE_BRGC_ENABLE | div16;
qe_iowrite32be(tempval, &qe_immr->brg.brgc[brg - QE_BRG1]); iowrite32be(tempval, &qe_immr->brg.brgc[brg - QE_BRG1]);
return 0; return 0;
} }
@ -375,9 +375,9 @@ static int qe_sdma_init(void)
return -ENOMEM; return -ENOMEM;
} }
qe_iowrite32be((u32)sdma_buf_offset & QE_SDEBCR_BA_MASK, iowrite32be((u32)sdma_buf_offset & QE_SDEBCR_BA_MASK,
&sdma->sdebcr); &sdma->sdebcr);
qe_iowrite32be((QE_SDMR_GLB_1_MSK | (0x1 << QE_SDMR_CEN_SHIFT)), iowrite32be((QE_SDMR_GLB_1_MSK | (0x1 << QE_SDMR_CEN_SHIFT)),
&sdma->sdmr); &sdma->sdmr);
return 0; return 0;
@ -416,14 +416,14 @@ static void qe_upload_microcode(const void *base,
"uploading microcode '%s'\n", ucode->id); "uploading microcode '%s'\n", ucode->id);
/* Use auto-increment */ /* Use auto-increment */
qe_iowrite32be(be32_to_cpu(ucode->iram_offset) | QE_IRAM_IADD_AIE | QE_IRAM_IADD_BADDR, iowrite32be(be32_to_cpu(ucode->iram_offset) | QE_IRAM_IADD_AIE | QE_IRAM_IADD_BADDR,
&qe_immr->iram.iadd); &qe_immr->iram.iadd);
for (i = 0; i < be32_to_cpu(ucode->count); i++) for (i = 0; i < be32_to_cpu(ucode->count); i++)
qe_iowrite32be(be32_to_cpu(code[i]), &qe_immr->iram.idata); iowrite32be(be32_to_cpu(code[i]), &qe_immr->iram.idata);
/* Set I-RAM Ready Register */ /* Set I-RAM Ready Register */
qe_iowrite32be(QE_IRAM_READY, &qe_immr->iram.iready); iowrite32be(QE_IRAM_READY, &qe_immr->iram.iready);
} }
/* /*
@ -542,12 +542,12 @@ int qe_upload_firmware(const struct qe_firmware *firmware)
u32 trap = be32_to_cpu(ucode->traps[j]); u32 trap = be32_to_cpu(ucode->traps[j]);
if (trap) if (trap)
qe_iowrite32be(trap, iowrite32be(trap,
&qe_immr->rsp[i].tibcr[j]); &qe_immr->rsp[i].tibcr[j]);
} }
/* Enable traps */ /* Enable traps */
qe_iowrite32be(be32_to_cpu(ucode->eccr), iowrite32be(be32_to_cpu(ucode->eccr),
&qe_immr->rsp[i].eccr); &qe_immr->rsp[i].eccr);
} }

4
drivers/soc/fsl/qe/qe_ic.c
View file

@ -222,13 +222,13 @@ static struct qe_ic_info qe_ic_info[] = {
static inline u32 qe_ic_read(__be32 __iomem *base, unsigned int reg) static inline u32 qe_ic_read(__be32 __iomem *base, unsigned int reg)
{ {
return qe_ioread32be(base + (reg >> 2)); return ioread32be(base + (reg >> 2));
} }
static inline void qe_ic_write(__be32 __iomem *base, unsigned int reg, static inline void qe_ic_write(__be32 __iomem *base, unsigned int reg,
u32 value) u32 value)
{ {
qe_iowrite32be(value, base + (reg >> 2)); iowrite32be(value, base + (reg >> 2));
} }
static inline struct qe_ic *qe_ic_from_irq(unsigned int virq) static inline struct qe_ic *qe_ic_from_irq(unsigned int virq)

36
drivers/soc/fsl/qe/qe_io.c
View file

@ -54,16 +54,16 @@ void __par_io_config_pin(struct qe_pio_regs __iomem *par_io, u8 pin, int dir,
pin_mask1bit = (u32) (1 << (QE_PIO_PINS - (pin + 1))); pin_mask1bit = (u32) (1 << (QE_PIO_PINS - (pin + 1)));
/* Set open drain, if required */ /* Set open drain, if required */
tmp_val = qe_ioread32be(&par_io->cpodr); tmp_val = ioread32be(&par_io->cpodr);
if (open_drain) if (open_drain)
qe_iowrite32be(pin_mask1bit | tmp_val, &par_io->cpodr); iowrite32be(pin_mask1bit | tmp_val, &par_io->cpodr);
else else
qe_iowrite32be(~pin_mask1bit & tmp_val, &par_io->cpodr); iowrite32be(~pin_mask1bit & tmp_val, &par_io->cpodr);
/* define direction */ /* define direction */
tmp_val = (pin > (QE_PIO_PINS / 2) - 1) ? tmp_val = (pin > (QE_PIO_PINS / 2) - 1) ?
qe_ioread32be(&par_io->cpdir2) : ioread32be(&par_io->cpdir2) :
qe_ioread32be(&par_io->cpdir1); ioread32be(&par_io->cpdir1);
/* get all bits mask for 2 bit per port */ /* get all bits mask for 2 bit per port */
pin_mask2bits = (u32) (0x3 << (QE_PIO_PINS - pin_mask2bits = (u32) (0x3 << (QE_PIO_PINS -
@ -75,30 +75,30 @@ void __par_io_config_pin(struct qe_pio_regs __iomem *par_io, u8 pin, int dir,
/* clear and set 2 bits mask */ /* clear and set 2 bits mask */
if (pin > (QE_PIO_PINS / 2) - 1) { if (pin > (QE_PIO_PINS / 2) - 1) {
qe_iowrite32be(~pin_mask2bits & tmp_val, &par_io->cpdir2); iowrite32be(~pin_mask2bits & tmp_val, &par_io->cpdir2);
tmp_val &= ~pin_mask2bits; tmp_val &= ~pin_mask2bits;
qe_iowrite32be(new_mask2bits | tmp_val, &par_io->cpdir2); iowrite32be(new_mask2bits | tmp_val, &par_io->cpdir2);
} else { } else {
qe_iowrite32be(~pin_mask2bits & tmp_val, &par_io->cpdir1); iowrite32be(~pin_mask2bits & tmp_val, &par_io->cpdir1);
tmp_val &= ~pin_mask2bits; tmp_val &= ~pin_mask2bits;
qe_iowrite32be(new_mask2bits | tmp_val, &par_io->cpdir1); iowrite32be(new_mask2bits | tmp_val, &par_io->cpdir1);
} }
/* define pin assignment */ /* define pin assignment */
tmp_val = (pin > (QE_PIO_PINS / 2) - 1) ? tmp_val = (pin > (QE_PIO_PINS / 2) - 1) ?
qe_ioread32be(&par_io->cppar2) : ioread32be(&par_io->cppar2) :
qe_ioread32be(&par_io->cppar1); ioread32be(&par_io->cppar1);
new_mask2bits = (u32) (assignment << (QE_PIO_PINS - new_mask2bits = (u32) (assignment << (QE_PIO_PINS -
(pin % (QE_PIO_PINS / 2) + 1) * 2)); (pin % (QE_PIO_PINS / 2) + 1) * 2));
/* clear and set 2 bits mask */ /* clear and set 2 bits mask */
if (pin > (QE_PIO_PINS / 2) - 1) { if (pin > (QE_PIO_PINS / 2) - 1) {
qe_iowrite32be(~pin_mask2bits & tmp_val, &par_io->cppar2); iowrite32be(~pin_mask2bits & tmp_val, &par_io->cppar2);
tmp_val &= ~pin_mask2bits; tmp_val &= ~pin_mask2bits;
qe_iowrite32be(new_mask2bits | tmp_val, &par_io->cppar2); iowrite32be(new_mask2bits | tmp_val, &par_io->cppar2);
} else { } else {
qe_iowrite32be(~pin_mask2bits & tmp_val, &par_io->cppar1); iowrite32be(~pin_mask2bits & tmp_val, &par_io->cppar1);
tmp_val &= ~pin_mask2bits; tmp_val &= ~pin_mask2bits;
qe_iowrite32be(new_mask2bits | tmp_val, &par_io->cppar1); iowrite32be(new_mask2bits | tmp_val, &par_io->cppar1);
} }
} }
EXPORT_SYMBOL(__par_io_config_pin); EXPORT_SYMBOL(__par_io_config_pin);
@ -126,12 +126,12 @@ int par_io_data_set(u8 port, u8 pin, u8 val)
/* calculate pin location */ /* calculate pin location */
pin_mask = (u32) (1 << (QE_PIO_PINS - 1 - pin)); pin_mask = (u32) (1 << (QE_PIO_PINS - 1 - pin));
tmp_val = qe_ioread32be(&par_io[port].cpdata); tmp_val = ioread32be(&par_io[port].cpdata);
if (val == 0) /* clear */ if (val == 0) /* clear */
qe_iowrite32be(~pin_mask & tmp_val, &par_io[port].cpdata); iowrite32be(~pin_mask & tmp_val, &par_io[port].cpdata);
else /* set */ else /* set */
qe_iowrite32be(pin_mask | tmp_val, &par_io[port].cpdata); iowrite32be(pin_mask | tmp_val, &par_io[port].cpdata);
return 0; return 0;
} }

68
drivers/soc/fsl/qe/ucc_fast.c
View file

@ -29,42 +29,42 @@ void ucc_fast_dump_regs(struct ucc_fast_private * uccf)
printk(KERN_INFO "Base address: 0x%p\n", uccf->uf_regs); printk(KERN_INFO "Base address: 0x%p\n", uccf->uf_regs);
printk(KERN_INFO "gumr : addr=0x%p, val=0x%08x\n", printk(KERN_INFO "gumr : addr=0x%p, val=0x%08x\n",
&uccf->uf_regs->gumr, qe_ioread32be(&uccf->uf_regs->gumr)); &uccf->uf_regs->gumr, ioread32be(&uccf->uf_regs->gumr));
printk(KERN_INFO "upsmr : addr=0x%p, val=0x%08x\n", printk(KERN_INFO "upsmr : addr=0x%p, val=0x%08x\n",
&uccf->uf_regs->upsmr, qe_ioread32be(&uccf->uf_regs->upsmr)); &uccf->uf_regs->upsmr, ioread32be(&uccf->uf_regs->upsmr));
printk(KERN_INFO "utodr : addr=0x%p, val=0x%04x\n", printk(KERN_INFO "utodr : addr=0x%p, val=0x%04x\n",
&uccf->uf_regs->utodr, qe_ioread16be(&uccf->uf_regs->utodr)); &uccf->uf_regs->utodr, ioread16be(&uccf->uf_regs->utodr));
printk(KERN_INFO "udsr : addr=0x%p, val=0x%04x\n", printk(KERN_INFO "udsr : addr=0x%p, val=0x%04x\n",
&uccf->uf_regs->udsr, qe_ioread16be(&uccf->uf_regs->udsr)); &uccf->uf_regs->udsr, ioread16be(&uccf->uf_regs->udsr));
printk(KERN_INFO "ucce : addr=0x%p, val=0x%08x\n", printk(KERN_INFO "ucce : addr=0x%p, val=0x%08x\n",
&uccf->uf_regs->ucce, qe_ioread32be(&uccf->uf_regs->ucce)); &uccf->uf_regs->ucce, ioread32be(&uccf->uf_regs->ucce));
printk(KERN_INFO "uccm : addr=0x%p, val=0x%08x\n", printk(KERN_INFO "uccm : addr=0x%p, val=0x%08x\n",
&uccf->uf_regs->uccm, qe_ioread32be(&uccf->uf_regs->uccm)); &uccf->uf_regs->uccm, ioread32be(&uccf->uf_regs->uccm));
printk(KERN_INFO "uccs : addr=0x%p, val=0x%02x\n", printk(KERN_INFO "uccs : addr=0x%p, val=0x%02x\n",
&uccf->uf_regs->uccs, qe_ioread8(&uccf->uf_regs->uccs)); &uccf->uf_regs->uccs, ioread8(&uccf->uf_regs->uccs));
printk(KERN_INFO "urfb : addr=0x%p, val=0x%08x\n", printk(KERN_INFO "urfb : addr=0x%p, val=0x%08x\n",
&uccf->uf_regs->urfb, qe_ioread32be(&uccf->uf_regs->urfb)); &uccf->uf_regs->urfb, ioread32be(&uccf->uf_regs->urfb));
printk(KERN_INFO "urfs : addr=0x%p, val=0x%04x\n", printk(KERN_INFO "urfs : addr=0x%p, val=0x%04x\n",
&uccf->uf_regs->urfs, qe_ioread16be(&uccf->uf_regs->urfs)); &uccf->uf_regs->urfs, ioread16be(&uccf->uf_regs->urfs));
printk(KERN_INFO "urfet : addr=0x%p, val=0x%04x\n", printk(KERN_INFO "urfet : addr=0x%p, val=0x%04x\n",
&uccf->uf_regs->urfet, qe_ioread16be(&uccf->uf_regs->urfet)); &uccf->uf_regs->urfet, ioread16be(&uccf->uf_regs->urfet));
printk(KERN_INFO "urfset: addr=0x%p, val=0x%04x\n", printk(KERN_INFO "urfset: addr=0x%p, val=0x%04x\n",
&uccf->uf_regs->urfset, &uccf->uf_regs->urfset,
qe_ioread16be(&uccf->uf_regs->urfset)); ioread16be(&uccf->uf_regs->urfset));
printk(KERN_INFO "utfb : addr=0x%p, val=0x%08x\n", printk(KERN_INFO "utfb : addr=0x%p, val=0x%08x\n",
&uccf->uf_regs->utfb, qe_ioread32be(&uccf->uf_regs->utfb)); &uccf->uf_regs->utfb, ioread32be(&uccf->uf_regs->utfb));
printk(KERN_INFO "utfs : addr=0x%p, val=0x%04x\n", printk(KERN_INFO "utfs : addr=0x%p, val=0x%04x\n",
&uccf->uf_regs->utfs, qe_ioread16be(&uccf->uf_regs->utfs)); &uccf->uf_regs->utfs, ioread16be(&uccf->uf_regs->utfs));
printk(KERN_INFO "utfet : addr=0x%p, val=0x%04x\n", printk(KERN_INFO "utfet : addr=0x%p, val=0x%04x\n",
&uccf->uf_regs->utfet, qe_ioread16be(&uccf->uf_regs->utfet)); &uccf->uf_regs->utfet, ioread16be(&uccf->uf_regs->utfet));
printk(KERN_INFO "utftt : addr=0x%p, val=0x%04x\n", printk(KERN_INFO "utftt : addr=0x%p, val=0x%04x\n",
&uccf->uf_regs->utftt, qe_ioread16be(&uccf->uf_regs->utftt)); &uccf->uf_regs->utftt, ioread16be(&uccf->uf_regs->utftt));
printk(KERN_INFO "utpt : addr=0x%p, val=0x%04x\n", printk(KERN_INFO "utpt : addr=0x%p, val=0x%04x\n",
&uccf->uf_regs->utpt, qe_ioread16be(&uccf->uf_regs->utpt)); &uccf->uf_regs->utpt, ioread16be(&uccf->uf_regs->utpt));
printk(KERN_INFO "urtry : addr=0x%p, val=0x%08x\n", printk(KERN_INFO "urtry : addr=0x%p, val=0x%08x\n",
&uccf->uf_regs->urtry, qe_ioread32be(&uccf->uf_regs->urtry)); &uccf->uf_regs->urtry, ioread32be(&uccf->uf_regs->urtry));
printk(KERN_INFO "guemr : addr=0x%p, val=0x%02x\n", printk(KERN_INFO "guemr : addr=0x%p, val=0x%02x\n",
&uccf->uf_regs->guemr, qe_ioread8(&uccf->uf_regs->guemr)); &uccf->uf_regs->guemr, ioread8(&uccf->uf_regs->guemr));
} }
EXPORT_SYMBOL(ucc_fast_dump_regs); EXPORT_SYMBOL(ucc_fast_dump_regs);
@ -86,7 +86,7 @@ EXPORT_SYMBOL(ucc_fast_get_qe_cr_subblock);
void ucc_fast_transmit_on_demand(struct ucc_fast_private * uccf) void ucc_fast_transmit_on_demand(struct ucc_fast_private * uccf)
{ {
qe_iowrite16be(UCC_FAST_TOD, &uccf->uf_regs->utodr); iowrite16be(UCC_FAST_TOD, &uccf->uf_regs->utodr);
} }
EXPORT_SYMBOL(ucc_fast_transmit_on_demand); EXPORT_SYMBOL(ucc_fast_transmit_on_demand);
@ -98,7 +98,7 @@ void ucc_fast_enable(struct ucc_fast_private * uccf, enum comm_dir mode)
uf_regs = uccf->uf_regs; uf_regs = uccf->uf_regs;
/* Enable reception and/or transmission on this UCC. */ /* Enable reception and/or transmission on this UCC. */
gumr = qe_ioread32be(&uf_regs->gumr); gumr = ioread32be(&uf_regs->gumr);
if (mode & COMM_DIR_TX) { if (mode & COMM_DIR_TX) {
gumr |= UCC_FAST_GUMR_ENT; gumr |= UCC_FAST_GUMR_ENT;
uccf->enabled_tx = 1; uccf->enabled_tx = 1;
@ -107,7 +107,7 @@ void ucc_fast_enable(struct ucc_fast_private * uccf, enum comm_dir mode)
gumr |= UCC_FAST_GUMR_ENR; gumr |= UCC_FAST_GUMR_ENR;
uccf->enabled_rx = 1; uccf->enabled_rx = 1;
} }
qe_iowrite32be(gumr, &uf_regs->gumr); iowrite32be(gumr, &uf_regs->gumr);
} }
EXPORT_SYMBOL(ucc_fast_enable); EXPORT_SYMBOL(ucc_fast_enable);
@ -119,7 +119,7 @@ void ucc_fast_disable(struct ucc_fast_private * uccf, enum comm_dir mode)
uf_regs = uccf->uf_regs; uf_regs = uccf->uf_regs;
/* Disable reception and/or transmission on this UCC. */ /* Disable reception and/or transmission on this UCC. */
gumr = qe_ioread32be(&uf_regs->gumr); gumr = ioread32be(&uf_regs->gumr);
if (mode & COMM_DIR_TX) { if (mode & COMM_DIR_TX) {
gumr &= ~UCC_FAST_GUMR_ENT; gumr &= ~UCC_FAST_GUMR_ENT;
uccf->enabled_tx = 0; uccf->enabled_tx = 0;
@ -128,7 +128,7 @@ void ucc_fast_disable(struct ucc_fast_private * uccf, enum comm_dir mode)
gumr &= ~UCC_FAST_GUMR_ENR; gumr &= ~UCC_FAST_GUMR_ENR;
uccf->enabled_rx = 0; uccf->enabled_rx = 0;
} }
qe_iowrite32be(gumr, &uf_regs->gumr); iowrite32be(gumr, &uf_regs->gumr);
} }
EXPORT_SYMBOL(ucc_fast_disable); EXPORT_SYMBOL(ucc_fast_disable);
@ -262,7 +262,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
gumr |= uf_info->tenc; gumr |= uf_info->tenc;
gumr |= uf_info->tcrc; gumr |= uf_info->tcrc;
gumr |= uf_info->mode; gumr |= uf_info->mode;
qe_iowrite32be(gumr, &uf_regs->gumr); iowrite32be(gumr, &uf_regs->gumr);
/* Allocate memory for Tx Virtual Fifo */ /* Allocate memory for Tx Virtual Fifo */
uccf->ucc_fast_tx_virtual_fifo_base_offset = uccf->ucc_fast_tx_virtual_fifo_base_offset =
@ -287,16 +287,16 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
} }
/* Set Virtual Fifo registers */ /* Set Virtual Fifo registers */
qe_iowrite16be(uf_info->urfs, &uf_regs->urfs); iowrite16be(uf_info->urfs, &uf_regs->urfs);
qe_iowrite16be(uf_info->urfet, &uf_regs->urfet); iowrite16be(uf_info->urfet, &uf_regs->urfet);
qe_iowrite16be(uf_info->urfset, &uf_regs->urfset); iowrite16be(uf_info->urfset, &uf_regs->urfset);
qe_iowrite16be(uf_info->utfs, &uf_regs->utfs); iowrite16be(uf_info->utfs, &uf_regs->utfs);
qe_iowrite16be(uf_info->utfet, &uf_regs->utfet); iowrite16be(uf_info->utfet, &uf_regs->utfet);
qe_iowrite16be(uf_info->utftt, &uf_regs->utftt); iowrite16be(uf_info->utftt, &uf_regs->utftt);
/* utfb, urfb are offsets from MURAM base */ /* utfb, urfb are offsets from MURAM base */
qe_iowrite32be(uccf->ucc_fast_tx_virtual_fifo_base_offset, iowrite32be(uccf->ucc_fast_tx_virtual_fifo_base_offset,
&uf_regs->utfb); &uf_regs->utfb);
qe_iowrite32be(uccf->ucc_fast_rx_virtual_fifo_base_offset, iowrite32be(uccf->ucc_fast_rx_virtual_fifo_base_offset,
&uf_regs->urfb); &uf_regs->urfb);
/* Mux clocking */ /* Mux clocking */
@ -365,14 +365,14 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
} }
/* Set interrupt mask register at UCC level. */ /* Set interrupt mask register at UCC level. */
qe_iowrite32be(uf_info->uccm_mask, &uf_regs->uccm); iowrite32be(uf_info->uccm_mask, &uf_regs->uccm);
/* First, clear anything pending at UCC level, /* First, clear anything pending at UCC level,
* otherwise, old garbage may come through * otherwise, old garbage may come through
* as soon as the dam is opened. */ * as soon as the dam is opened. */
/* Writing '1' clears */ /* Writing '1' clears */
qe_iowrite32be(0xffffffff, &uf_regs->ucce); iowrite32be(0xffffffff, &uf_regs->ucce);
*uccf_ret = uccf; *uccf_ret = uccf;
return 0; return 0;

42
drivers/soc/fsl/qe/ucc_slow.c
View file

@ -78,7 +78,7 @@ void ucc_slow_enable(struct ucc_slow_private * uccs, enum comm_dir mode)
us_regs = uccs->us_regs; us_regs = uccs->us_regs;
/* Enable reception and/or transmission on this UCC. */ /* Enable reception and/or transmission on this UCC. */
gumr_l = qe_ioread32be(&us_regs->gumr_l); gumr_l = ioread32be(&us_regs->gumr_l);
if (mode & COMM_DIR_TX) { if (mode & COMM_DIR_TX) {
gumr_l |= UCC_SLOW_GUMR_L_ENT; gumr_l |= UCC_SLOW_GUMR_L_ENT;
uccs->enabled_tx = 1; uccs->enabled_tx = 1;
@ -87,7 +87,7 @@ void ucc_slow_enable(struct ucc_slow_private * uccs, enum comm_dir mode)
gumr_l |= UCC_SLOW_GUMR_L_ENR; gumr_l |= UCC_SLOW_GUMR_L_ENR;
uccs->enabled_rx = 1; uccs->enabled_rx = 1;
} }
qe_iowrite32be(gumr_l, &us_regs->gumr_l); iowrite32be(gumr_l, &us_regs->gumr_l);
} }
EXPORT_SYMBOL(ucc_slow_enable); EXPORT_SYMBOL(ucc_slow_enable);
@ -99,7 +99,7 @@ void ucc_slow_disable(struct ucc_slow_private * uccs, enum comm_dir mode)
us_regs = uccs->us_regs; us_regs = uccs->us_regs;
/* Disable reception and/or transmission on this UCC. */ /* Disable reception and/or transmission on this UCC. */
gumr_l = qe_ioread32be(&us_regs->gumr_l); gumr_l = ioread32be(&us_regs->gumr_l);
if (mode & COMM_DIR_TX) { if (mode & COMM_DIR_TX) {
gumr_l &= ~UCC_SLOW_GUMR_L_ENT; gumr_l &= ~UCC_SLOW_GUMR_L_ENT;
uccs->enabled_tx = 0; uccs->enabled_tx = 0;
@ -108,7 +108,7 @@ void ucc_slow_disable(struct ucc_slow_private * uccs, enum comm_dir mode)
gumr_l &= ~UCC_SLOW_GUMR_L_ENR; gumr_l &= ~UCC_SLOW_GUMR_L_ENR;
uccs->enabled_rx = 0; uccs->enabled_rx = 0;
} }
qe_iowrite32be(gumr_l, &us_regs->gumr_l); iowrite32be(gumr_l, &us_regs->gumr_l);
} }
EXPORT_SYMBOL(ucc_slow_disable); EXPORT_SYMBOL(ucc_slow_disable);
@ -194,7 +194,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
return ret; return ret;
} }
qe_iowrite16be(us_info->max_rx_buf_length, &uccs->us_pram->mrblr); iowrite16be(us_info->max_rx_buf_length, &uccs->us_pram->mrblr);
INIT_LIST_HEAD(&uccs->confQ); INIT_LIST_HEAD(&uccs->confQ);
@ -222,27 +222,27 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
bd = uccs->confBd = uccs->tx_bd = qe_muram_addr(uccs->tx_base_offset); bd = uccs->confBd = uccs->tx_bd = qe_muram_addr(uccs->tx_base_offset);
for (i = 0; i < us_info->tx_bd_ring_len - 1; i++) { for (i = 0; i < us_info->tx_bd_ring_len - 1; i++) {
/* clear bd buffer */ /* clear bd buffer */
qe_iowrite32be(0, &bd->buf); iowrite32be(0, &bd->buf);
/* set bd status and length */ /* set bd status and length */
qe_iowrite32be(0, (u32 __iomem *)bd); iowrite32be(0, (u32 __iomem *)bd);
bd++; bd++;
} }
/* for last BD set Wrap bit */ /* for last BD set Wrap bit */
qe_iowrite32be(0, &bd->buf); iowrite32be(0, &bd->buf);
qe_iowrite32be(T_W, (u32 __iomem *)bd); iowrite32be(T_W, (u32 __iomem *)bd);
/* Init Rx bds */ /* Init Rx bds */
bd = uccs->rx_bd = qe_muram_addr(uccs->rx_base_offset); bd = uccs->rx_bd = qe_muram_addr(uccs->rx_base_offset);
for (i = 0; i < us_info->rx_bd_ring_len - 1; i++) { for (i = 0; i < us_info->rx_bd_ring_len - 1; i++) {
/* set bd status and length */ /* set bd status and length */
qe_iowrite32be(0, (u32 __iomem *)bd); iowrite32be(0, (u32 __iomem *)bd);
/* clear bd buffer */ /* clear bd buffer */
qe_iowrite32be(0, &bd->buf); iowrite32be(0, &bd->buf);
bd++; bd++;
} }
/* for last BD set Wrap bit */ /* for last BD set Wrap bit */
qe_iowrite32be(R_W, (u32 __iomem *)bd); iowrite32be(R_W, (u32 __iomem *)bd);
qe_iowrite32be(0, &bd->buf); iowrite32be(0, &bd->buf);
/* Set GUMR (For more details see the hardware spec.). */ /* Set GUMR (For more details see the hardware spec.). */
/* gumr_h */ /* gumr_h */
@ -263,7 +263,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
gumr |= UCC_SLOW_GUMR_H_TXSY; gumr |= UCC_SLOW_GUMR_H_TXSY;
if (us_info->rtsm) if (us_info->rtsm)
gumr |= UCC_SLOW_GUMR_H_RTSM; gumr |= UCC_SLOW_GUMR_H_RTSM;
qe_iowrite32be(gumr, &us_regs->gumr_h); iowrite32be(gumr, &us_regs->gumr_h);
/* gumr_l */ /* gumr_l */
gumr = (u32)us_info->tdcr | (u32)us_info->rdcr | (u32)us_info->tenc | gumr = (u32)us_info->tdcr | (u32)us_info->rdcr | (u32)us_info->tenc |
@ -276,18 +276,18 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
gumr |= UCC_SLOW_GUMR_L_TINV; gumr |= UCC_SLOW_GUMR_L_TINV;
if (us_info->tend) if (us_info->tend)
gumr |= UCC_SLOW_GUMR_L_TEND; gumr |= UCC_SLOW_GUMR_L_TEND;
qe_iowrite32be(gumr, &us_regs->gumr_l); iowrite32be(gumr, &us_regs->gumr_l);
/* Function code registers */ /* Function code registers */
/* if the data is in cachable memory, the 'global' */ /* if the data is in cachable memory, the 'global' */
/* in the function code should be set. */ /* in the function code should be set. */
qe_iowrite8(UCC_BMR_BO_BE, &uccs->us_pram->tbmr); iowrite8(UCC_BMR_BO_BE, &uccs->us_pram->tbmr);
qe_iowrite8(UCC_BMR_BO_BE, &uccs->us_pram->rbmr); iowrite8(UCC_BMR_BO_BE, &uccs->us_pram->rbmr);
/* rbase, tbase are offsets from MURAM base */ /* rbase, tbase are offsets from MURAM base */
qe_iowrite16be(uccs->rx_base_offset, &uccs->us_pram->rbase); iowrite16be(uccs->rx_base_offset, &uccs->us_pram->rbase);
qe_iowrite16be(uccs->tx_base_offset, &uccs->us_pram->tbase); iowrite16be(uccs->tx_base_offset, &uccs->us_pram->tbase);
/* Mux clocking */ /* Mux clocking */
/* Grant Support */ /* Grant Support */
@ -317,14 +317,14 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
} }
/* Set interrupt mask register at UCC level. */ /* Set interrupt mask register at UCC level. */
qe_iowrite16be(us_info->uccm_mask, &us_regs->uccm); iowrite16be(us_info->uccm_mask, &us_regs->uccm);
/* First, clear anything pending at UCC level, /* First, clear anything pending at UCC level,
* otherwise, old garbage may come through * otherwise, old garbage may come through
* as soon as the dam is opened. */ * as soon as the dam is opened. */
/* Writing '1' clears */ /* Writing '1' clears */
qe_iowrite16be(0xffff, &us_regs->ucce); iowrite16be(0xffff, &us_regs->ucce);
/* Issue QE Init command */ /* Issue QE Init command */
if (us_info->init_tx && us_info->init_rx) if (us_info->init_tx && us_info->init_rx)