Skip to content

L
linux
Commit 6b0b594b authored by Timur Tabi's avatar Timur Tabi Committed by Kumar Gala
Browse files
Options

[POWERPC] qe: miscellaneous code improvements and fixes to the QE library 

This patch makes numerous miscellaneous code improvements to the QE library.

1. Remove struct ucc_common and merge ucc_init_guemr() into ucc_set_type()
   (every caller of ucc_init_guemr() also calls ucc_set_type()).  Modify all
   callers of ucc_set_type() accordingly.

2. Remove the unused enum ucc_pram_initial_offset.

3. Refactor qe_setbrg(), also implement work-around for errata QE_General4.

4. Several printk() calls were missing the terminating \n.

5. Add __iomem where needed, and change u16 to __be16 and u32 to __be32 where
   appropriate.

6. In ucc_slow_init() the RBASE and TBASE registers in the PRAM were programmed
   with the wrong value.

7. Add the protocol type to struct us_info and updated ucc_slow_init() to
   use it, instead of always programming QE_CR_PROTOCOL_UNSPECIFIED.

8. Rename ucc_slow_restart_x() to ucc_slow_restart_tx()

9. Add several macros in qe.h (mostly for slow UCC support, but also to
   standardize some naming convention) and remove several unused macros.

10. Update ucc_geth.c to use the new macros.

11. Add ucc_slow_info.protocol to specify which QE_CR_PROTOCOL_xxx protcol
    to use when initializing the UCC in ucc_slow_init().

12. Rename ucc_slow_pram.rfcr to rbmr and ucc_slow_pram.tfcr to tbmr, since
    these are the real names of the registers.

13. Use the setbits, clrbits, and clrsetbits where appropriate.

14. Refactor ucc_set_qe_mux_rxtx().

15. Remove all instances of 'volatile'.

16. Simplify get_cmxucr_reg();

17. Replace qe_mux.cmxucrX with qe_mux.cmxucr[].

18. Updated struct ucc_geth because struct ucc_fast is not padded any more.
Signed-off-by: default avatarTimur Tabi <timur@freescale.com>
Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent 60396807
Expand all Show whitespace changes
Inline Side-by-side
Showing with 431 additions and 412 deletions
arch/powerpc/sysdev/qe_lib/qe.c
View file @ 6b0b594b
...@@ -141,7 +141,7 @@ EXPORT_SYMBOL(qe_issue_cmd); ...@@ -141,7 +141,7 @@ EXPORT_SYMBOL(qe_issue_cmd);
* 16 BRGs, which can be connected to the QE channels or output * 16 BRGs, which can be connected to the QE channels or output
* as clocks. The BRGs are in two different block of internal * as clocks. The BRGs are in two different block of internal
* memory mapped space. * memory mapped space.
* The baud rate clock is the system clock divided by something. * The BRG clock is the QE clock divided by 2.
* It was set up long ago during the initial boot phase and is * It was set up long ago during the initial boot phase and is
* is given to us. * is given to us.
* Baud rate clocks are zero-based in the driver code (as that maps * Baud rate clocks are zero-based in the driver code (as that maps
...@@ -165,28 +165,38 @@ unsigned int get_brg_clk(void) ...@@ -165,28 +165,38 @@ unsigned int get_brg_clk(void)
return brg_clk; return brg_clk;
} }
/* This function is used by UARTS, or anything else that uses a 16x /* Program the BRG to the given sampling rate and multiplier
* oversampled clock. *
* @brg: the BRG, 1-16
* @rate: the desired sampling rate
* @multiplier: corresponds to the value programmed in GUMR_L[RDCR] or
* GUMR_L[TDCR]. E.g., if this BRG is the RX clock, and GUMR_L[RDCR]=01,
* then 'multiplier' should be 8.
*
* Also note that the value programmed into the BRGC register must be even.
*/ */
void qe_setbrg(u32 brg, u32 rate) void qe_setbrg(unsigned int brg, unsigned int rate, unsigned int multiplier)
{ {
volatile u32 *bp;
u32 divisor, tempval; u32 divisor, tempval;
int div16 = 0; u32 div16 = 0;
bp = &qe_immr->brg.brgc[brg]; divisor = get_brg_clk() / (rate * multiplier);
divisor = (get_brg_clk() / rate);
if (divisor > QE_BRGC_DIVISOR_MAX + 1) { if (divisor > QE_BRGC_DIVISOR_MAX + 1) {
div16 = 1; div16 = QE_BRGC_DIV16;
divisor /= 16; divisor /= 16;
} }
tempval = ((divisor - 1) << QE_BRGC_DIVISOR_SHIFT) | QE_BRGC_ENABLE; /* Errata QE_General4, which affects some MPC832x and MPC836x SOCs, says
if (div16) that the BRG divisor must be even if you're not using divide-by-16
tempval |= QE_BRGC_DIV16; mode. */
if (!div16 && (divisor & 1))
divisor++;
tempval = ((divisor - 1) << QE_BRGC_DIVISOR_SHIFT) |
QE_BRGC_ENABLE | div16;
out_be32(bp, tempval); out_be32(&qe_immr->brg.brgc[brg - 1], tempval);
} }
/* Initialize SNUMs (thread serial numbers) according to /* Initialize SNUMs (thread serial numbers) according to
......
arch/powerpc/sysdev/qe_lib/qe_ic.c
View file @ 6b0b594b
...@@ -405,8 +405,6 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags) ...@@ -405,8 +405,6 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags)
set_irq_data(qe_ic->virq_high, qe_ic); set_irq_data(qe_ic->virq_high, qe_ic);
set_irq_chained_handler(qe_ic->virq_high, qe_ic_cascade_high); set_irq_chained_handler(qe_ic->virq_high, qe_ic_cascade_high);
} }
printk("QEIC (%d IRQ sources) at %p\n", NR_QE_IC_INTS, qe_ic->regs);
} }
void qe_ic_set_highest_priority(unsigned int virq, int high) void qe_ic_set_highest_priority(unsigned int virq, int high)
......
arch/powerpc/sysdev/qe_lib/qe_io.c
View file @ 6b0b594b
...@@ -195,28 +195,21 @@ EXPORT_SYMBOL(par_io_of_config); ...@@ -195,28 +195,21 @@ EXPORT_SYMBOL(par_io_of_config);
#ifdef DEBUG #ifdef DEBUG
static void dump_par_io(void) static void dump_par_io(void)
{ {
int i; unsigned int i;
printk(KERN_INFO "PAR IO registars:\n"); printk(KERN_INFO "%s: par_io=%p\n", __FUNCTION__, par_io);
printk(KERN_INFO "Base address: 0x%08x\n", (u32) par_io);
for (i = 0; i < num_par_io_ports; i++) { for (i = 0; i < num_par_io_ports; i++) {
printk(KERN_INFO "cpodr[%d] : addr - 0x%08x, val - 0x%08x\n", printk(KERN_INFO " cpodr[%u]=%08x\n", i,
i, (u32) & par_io[i].cpodr,
in_be32(&par_io[i].cpodr)); in_be32(&par_io[i].cpodr));
printk(KERN_INFO "cpdata[%d]: addr - 0x%08x, val - 0x%08x\n", printk(KERN_INFO " cpdata[%u]=%08x\n", i,
i, (u32) & par_io[i].cpdata,
in_be32(&par_io[i].cpdata)); in_be32(&par_io[i].cpdata));
printk(KERN_INFO "cpdir1[%d]: addr - 0x%08x, val - 0x%08x\n", printk(KERN_INFO " cpdir1[%u]=%08x\n", i,
i, (u32) & par_io[i].cpdir1,
in_be32(&par_io[i].cpdir1)); in_be32(&par_io[i].cpdir1));
printk(KERN_INFO "cpdir2[%d]: addr - 0x%08x, val - 0x%08x\n", printk(KERN_INFO " cpdir2[%u]=%08x\n", i,
i, (u32) & par_io[i].cpdir2,
in_be32(&par_io[i].cpdir2)); in_be32(&par_io[i].cpdir2));
printk(KERN_INFO "cppar1[%d]: addr - 0x%08x, val - 0x%08x\n", printk(KERN_INFO " cppar1[%u]=%08x\n", i,
i, (u32) & par_io[i].cppar1,
in_be32(&par_io[i].cppar1)); in_be32(&par_io[i].cppar1));
printk(KERN_INFO "cppar2[%d]: addr - 0x%08x, val - 0x%08x\n", printk(KERN_INFO " cppar2[%u]=%08x\n", i,
i, (u32) & par_io[i].cppar2,
in_be32(&par_io[i].cppar2)); in_be32(&par_io[i].cppar2));
} }
......
arch/powerpc/sysdev/qe_lib/ucc.c
View file @ 6b0b594b
...@@ -28,228 +28,188 @@ ...@@ -28,228 +28,188 @@
static DEFINE_SPINLOCK(ucc_lock); static DEFINE_SPINLOCK(ucc_lock);
int ucc_set_qe_mux_mii_mng(int ucc_num) int ucc_set_qe_mux_mii_mng(unsigned int ucc_num)
{ {
unsigned long flags; unsigned long flags;
if (ucc_num > UCC_MAX_NUM - 1)
return -EINVAL;
spin_lock_irqsave(&ucc_lock, flags); spin_lock_irqsave(&ucc_lock, flags);
out_be32(&qe_immr->qmx.cmxgcr, clrsetbits_be32(&qe_immr->qmx.cmxgcr, QE_CMXGCR_MII_ENET_MNG,
((in_be32(&qe_immr->qmx.cmxgcr) & ucc_num << QE_CMXGCR_MII_ENET_MNG_SHIFT);
~QE_CMXGCR_MII_ENET_MNG) |
(ucc_num << QE_CMXGCR_MII_ENET_MNG_SHIFT)));
spin_unlock_irqrestore(&ucc_lock, flags); spin_unlock_irqrestore(&ucc_lock, flags);
return 0; return 0;
} }
EXPORT_SYMBOL(ucc_set_qe_mux_mii_mng); EXPORT_SYMBOL(ucc_set_qe_mux_mii_mng);
int ucc_set_type(int ucc_num, struct ucc_common *regs, /* Configure the UCC to either Slow or Fast.
enum ucc_speed_type speed) *
{ * A given UCC can be figured to support either "slow" devices (e.g. UART)
u8 guemr = 0; * or "fast" devices (e.g. Ethernet).
*
/* check if the UCC number is in range. */ * 'ucc_num' is the UCC number, from 0 - 7.
if ((ucc_num > UCC_MAX_NUM - 1) || (ucc_num < 0)) *
return -EINVAL; * This function also sets the UCC_GUEMR_SET_RESERVED3 bit because that bit
* must always be set to 1.
guemr = regs->guemr; */
guemr &= ~(UCC_GUEMR_MODE_MASK_RX | UCC_GUEMR_MODE_MASK_TX); int ucc_set_type(unsigned int ucc_num, enum ucc_speed_type speed)
switch (speed) {
case UCC_SPEED_TYPE_SLOW:
guemr |= (UCC_GUEMR_MODE_SLOW_RX | UCC_GUEMR_MODE_SLOW_TX);
break;
case UCC_SPEED_TYPE_FAST:
guemr |= (UCC_GUEMR_MODE_FAST_RX | UCC_GUEMR_MODE_FAST_TX);
break;
default:
return -EINVAL;
}
regs->guemr = guemr;
return 0;
}
int ucc_init_guemr(struct ucc_common *regs)
{ {
u8 guemr = 0; u8 __iomem *guemr;
if (!regs)
return -EINVAL;
/* Set bit 3 (which is reserved in the GUEMR register) to 1 */
guemr = UCC_GUEMR_SET_RESERVED3;
regs->guemr = guemr;
return 0;
}
static void get_cmxucr_reg(int ucc_num, volatile u32 ** p_cmxucr, u8 * reg_num, /* The GUEMR register is at the same location for both slow and fast
u8 * shift) devices, so we just use uccX.slow.guemr. */
{
switch (ucc_num) { switch (ucc_num) {
case 0: *p_cmxucr = &(qe_immr->qmx.cmxucr1); case 0: guemr = &qe_immr->ucc1.slow.guemr;
*reg_num = 1;
*shift = 16;
break; break;
case 2: *p_cmxucr = &(qe_immr->qmx.cmxucr1); case 1: guemr = &qe_immr->ucc2.slow.guemr;
*reg_num = 1;
*shift = 0;
break; break;
case 4: *p_cmxucr = &(qe_immr->qmx.cmxucr2); case 2: guemr = &qe_immr->ucc3.slow.guemr;
*reg_num = 2;
*shift = 16;
break; break;
case 6: *p_cmxucr = &(qe_immr->qmx.cmxucr2); case 3: guemr = &qe_immr->ucc4.slow.guemr;
*reg_num = 2;
*shift = 0;
break; break;
case 1: *p_cmxucr = &(qe_immr->qmx.cmxucr3); case 4: guemr = &qe_immr->ucc5.slow.guemr;
*reg_num = 3;
*shift = 16;
break; break;
case 3: *p_cmxucr = &(qe_immr->qmx.cmxucr3); case 5: guemr = &qe_immr->ucc6.slow.guemr;
*reg_num = 3;
*shift = 0;
break; break;
case 5: *p_cmxucr = &(qe_immr->qmx.cmxucr4); case 6: guemr = &qe_immr->ucc7.slow.guemr;
*reg_num = 4;
*shift = 16;
break; break;
case 7: *p_cmxucr = &(qe_immr->qmx.cmxucr4); case 7: guemr = &qe_immr->ucc8.slow.guemr;
*reg_num = 4;
*shift = 0;
break; break;
default: default:
break; return -EINVAL;
} }
clrsetbits_8(guemr, UCC_GUEMR_MODE_MASK,
UCC_GUEMR_SET_RESERVED3 | speed);
return 0;
}
static void get_cmxucr_reg(unsigned int ucc_num, __be32 **cmxucr,
unsigned int *reg_num, unsigned int *shift)
{
unsigned int cmx = ((ucc_num & 1) << 1) + (ucc_num > 3);
*reg_num = cmx + 1;
*cmxucr = &qe_immr->qmx.cmxucr[cmx];
*shift = 16 - 8 * (ucc_num & 2);
} }
int ucc_mux_set_grant_tsa_bkpt(int ucc_num, int set, u32 mask) int ucc_mux_set_grant_tsa_bkpt(unsigned int ucc_num, int set, u32 mask)
{ {
volatile u32 *p_cmxucr; __be32 *cmxucr;
u8 reg_num; unsigned int reg_num;
u8 shift; unsigned int shift;
/* check if the UCC number is in range. */ /* check if the UCC number is in range. */
if ((ucc_num > UCC_MAX_NUM - 1) || (ucc_num < 0)) if (ucc_num > UCC_MAX_NUM - 1)
return -EINVAL; return -EINVAL;
get_cmxucr_reg(ucc_num, &p_cmxucr, &reg_num, &shift); get_cmxucr_reg(ucc_num, &cmxucr, &reg_num, &shift);
if (set) if (set)
out_be32(p_cmxucr, in_be32(p_cmxucr) | (mask << shift)); setbits32(cmxucr, mask << shift);
else else
out_be32(p_cmxucr, in_be32(p_cmxucr) & ~(mask << shift)); clrbits32(cmxucr, mask << shift);
return 0; return 0;
} }
int ucc_set_qe_mux_rxtx(int ucc_num, enum qe_clock clock, enum comm_dir mode) int ucc_set_qe_mux_rxtx(unsigned int ucc_num, enum qe_clock clock,
enum comm_dir mode)
{ {
volatile u32 *p_cmxucr; __be32 *cmxucr;
u8 reg_num; unsigned int reg_num;
u8 shift; unsigned int shift;
u32 clock_bits; u32 clock_bits = 0;
u32 clock_mask;
int source = -1;
/* check if the UCC number is in range. */ /* check if the UCC number is in range. */
if ((ucc_num > UCC_MAX_NUM - 1) || (ucc_num < 0)) if (ucc_num > UCC_MAX_NUM - 1)
return -EINVAL; return -EINVAL;
if (!((mode == COMM_DIR_RX) || (mode == COMM_DIR_TX))) { /* The communications direction must be RX or TX */
printk(KERN_ERR if (!((mode == COMM_DIR_RX) || (mode == COMM_DIR_TX)))
"ucc_set_qe_mux_rxtx: bad comm mode type passed.");
return -EINVAL; return -EINVAL;
}
get_cmxucr_reg(ucc_num, &p_cmxucr, &reg_num, &shift); get_cmxucr_reg(ucc_num, &cmxucr, &reg_num, &shift);
switch (reg_num) { switch (reg_num) {
case 1: case 1:
switch (clock) { switch (clock) {
case QE_BRG1: source = 1; break; case QE_BRG1: clock_bits = 1; break;
case QE_BRG2: source = 2; break; case QE_BRG2: clock_bits = 2; break;
case QE_BRG7: source = 3; break; case QE_BRG7: clock_bits = 3; break;
case QE_BRG8: source = 4; break; case QE_BRG8: clock_bits = 4; break;
case QE_CLK9: source = 5; break; case QE_CLK9: clock_bits = 5; break;
case QE_CLK10: source = 6; break; case QE_CLK10: clock_bits = 6; break;
case QE_CLK11: source = 7; break; case QE_CLK11: clock_bits = 7; break;
case QE_CLK12: source = 8; break; case QE_CLK12: clock_bits = 8; break;
case QE_CLK15: source = 9; break; case QE_CLK15: clock_bits = 9; break;
case QE_CLK16: source = 10; break; case QE_CLK16: clock_bits = 10; break;
default: source = -1; break; default: break;
} }
break; break;
case 2: case 2:
switch (clock) { switch (clock) {
case QE_BRG5: source = 1; break; case QE_BRG5: clock_bits = 1; break;
case QE_BRG6: source = 2; break; case QE_BRG6: clock_bits = 2; break;
case QE_BRG7: source = 3; break; case QE_BRG7: clock_bits = 3; break;
case QE_BRG8: source = 4; break; case QE_BRG8: clock_bits = 4; break;
case QE_CLK13: source = 5; break; case QE_CLK13: clock_bits = 5; break;
case QE_CLK14: source = 6; break; case QE_CLK14: clock_bits = 6; break;
case QE_CLK19: source = 7; break; case QE_CLK19: clock_bits = 7; break;
case QE_CLK20: source = 8; break; case QE_CLK20: clock_bits = 8; break;
case QE_CLK15: source = 9; break; case QE_CLK15: clock_bits = 9; break;
case QE_CLK16: source = 10; break; case QE_CLK16: clock_bits = 10; break;
default: source = -1; break; default: break;
} }
break; break;
case 3: case 3:
switch (clock) { switch (clock) {
case QE_BRG9: source = 1; break; case QE_BRG9: clock_bits = 1; break;
case QE_BRG10: source = 2; break; case QE_BRG10: clock_bits = 2; break;
case QE_BRG15: source = 3; break; case QE_BRG15: clock_bits = 3; break;
case QE_BRG16: source = 4; break; case QE_BRG16: clock_bits = 4; break;
case QE_CLK3: source = 5; break; case QE_CLK3: clock_bits = 5; break;
case QE_CLK4: source = 6; break; case QE_CLK4: clock_bits = 6; break;
case QE_CLK17: source = 7; break; case QE_CLK17: clock_bits = 7; break;
case QE_CLK18: source = 8; break; case QE_CLK18: clock_bits = 8; break;
case QE_CLK7: source = 9; break; case QE_CLK7: clock_bits = 9; break;
case QE_CLK8: source = 10; break; case QE_CLK8: clock_bits = 10; break;
case QE_CLK16: source = 11; break; case QE_CLK16: clock_bits = 11; break;
default: source = -1; break; default: break;
} }
break; break;
case 4: case 4:
switch (clock) { switch (clock) {
case QE_BRG13: source = 1; break; case QE_BRG13: clock_bits = 1; break;
case QE_BRG14: source = 2; break; case QE_BRG14: clock_bits = 2; break;
case QE_BRG15: source = 3; break; case QE_BRG15: clock_bits = 3; break;
case QE_BRG16: source = 4; break; case QE_BRG16: clock_bits = 4; break;
case QE_CLK5: source = 5; break; case QE_CLK5: clock_bits = 5; break;
case QE_CLK6: source = 6; break; case QE_CLK6: clock_bits = 6; break;
case QE_CLK21: source = 7; break; case QE_CLK21: clock_bits = 7; break;
case QE_CLK22: source = 8; break; case QE_CLK22: clock_bits = 8; break;
case QE_CLK7: source = 9; break; case QE_CLK7: clock_bits = 9; break;
case QE_CLK8: source = 10; break; case QE_CLK8: clock_bits = 10; break;
case QE_CLK16: source = 11; break; case QE_CLK16: clock_bits = 11; break;
default: source = -1; break; default: break;
} }
break; break;
default: default: break;
source = -1;
break;
} }
if (source == -1) { /* Check for invalid combination of clock and UCC number */
printk(KERN_ERR if (!clock_bits)
"ucc_set_qe_mux_rxtx: Bad combination of clock and UCC.");
return -ENOENT; return -ENOENT;
}
clock_bits = (u32) source; if (mode == COMM_DIR_RX)
clock_mask = QE_CMXUCR_TX_CLK_SRC_MASK; shift += 4;
if (mode == COMM_DIR_RX) {
clock_bits <<= 4; /* Rx field is 4 bits to left of Tx field */
clock_mask <<= 4; /* Rx field is 4 bits to left of Tx field */
}
clock_bits <<= shift;
clock_mask <<= shift;
out_be32(p_cmxucr, (in_be32(p_cmxucr) & ~clock_mask) | clock_bits); clrsetbits_be32(cmxucr, QE_CMXUCR_TX_CLK_SRC_MASK << shift,
clock_bits << shift);
return 0; return 0;
} }
arch/powerpc/sysdev/qe_lib/ucc_fast.c
View file @ 6b0b594b
...@@ -30,46 +30,45 @@ ...@@ -30,46 +30,45 @@
void ucc_fast_dump_regs(struct ucc_fast_private * uccf) void ucc_fast_dump_regs(struct ucc_fast_private * uccf)
{ {
printk(KERN_INFO "UCC%d Fast registers:", uccf->uf_info->ucc_num); printk(KERN_INFO "UCC%u Fast registers:\n", uccf->uf_info->ucc_num);
printk(KERN_INFO "Base address: 0x%08x", (u32) uccf->uf_regs); printk(KERN_INFO "Base address: 0x%p\n", uccf->uf_regs);
printk(KERN_INFO "gumr : addr - 0x%08x, val - 0x%08x", printk(KERN_INFO "gumr : addr=0x%p, val=0x%08x\n",
(u32) & uccf->uf_regs->gumr, in_be32(&uccf->uf_regs->gumr)); &uccf->uf_regs->gumr, in_be32(&uccf->uf_regs->gumr));
printk(KERN_INFO "upsmr : addr - 0x%08x, val - 0x%08x", printk(KERN_INFO "upsmr : addr=0x%p, val=0x%08x\n",
(u32) & uccf->uf_regs->upsmr, in_be32(&uccf->uf_regs->upsmr)); &uccf->uf_regs->upsmr, in_be32(&uccf->uf_regs->upsmr));
printk(KERN_INFO "utodr : addr - 0x%08x, val - 0x%04x", printk(KERN_INFO "utodr : addr=0x%p, val=0x%04x\n",
(u32) & uccf->uf_regs->utodr, in_be16(&uccf->uf_regs->utodr)); &uccf->uf_regs->utodr, in_be16(&uccf->uf_regs->utodr));
printk(KERN_INFO "udsr : addr - 0x%08x, val - 0x%04x", printk(KERN_INFO "udsr : addr=0x%p, val=0x%04x\n",
(u32) & uccf->uf_regs->udsr, in_be16(&uccf->uf_regs->udsr)); &uccf->uf_regs->udsr, in_be16(&uccf->uf_regs->udsr));
printk(KERN_INFO "ucce : addr - 0x%08x, val - 0x%08x", printk(KERN_INFO "ucce : addr=0x%p, val=0x%08x\n",
(u32) & uccf->uf_regs->ucce, in_be32(&uccf->uf_regs->ucce)); &uccf->uf_regs->ucce, in_be32(&uccf->uf_regs->ucce));
printk(KERN_INFO "uccm : addr - 0x%08x, val - 0x%08x", printk(KERN_INFO "uccm : addr=0x%p, val=0x%08x\n",
(u32) & uccf->uf_regs->uccm, in_be32(&uccf->uf_regs->uccm)); &uccf->uf_regs->uccm, in_be32(&uccf->uf_regs->uccm));
printk(KERN_INFO "uccs : addr - 0x%08x, val - 0x%02x", printk(KERN_INFO "uccs : addr=0x%p, val=0x%02x\n",
(u32) & uccf->uf_regs->uccs, uccf->uf_regs->uccs); &uccf->uf_regs->uccs, uccf->uf_regs->uccs);
printk(KERN_INFO "urfb : addr - 0x%08x, val - 0x%08x", printk(KERN_INFO "urfb : addr=0x%p, val=0x%08x\n",
(u32) & uccf->uf_regs->urfb, in_be32(&uccf->uf_regs->urfb)); &uccf->uf_regs->urfb, in_be32(&uccf->uf_regs->urfb));
printk(KERN_INFO "urfs : addr - 0x%08x, val - 0x%04x", printk(KERN_INFO "urfs : addr=0x%p, val=0x%04x\n",
(u32) & uccf->uf_regs->urfs, in_be16(&uccf->uf_regs->urfs)); &uccf->uf_regs->urfs, in_be16(&uccf->uf_regs->urfs));
printk(KERN_INFO "urfet : addr - 0x%08x, val - 0x%04x", printk(KERN_INFO "urfet : addr=0x%p, val=0x%04x\n",
(u32) & uccf->uf_regs->urfet, in_be16(&uccf->uf_regs->urfet)); &uccf->uf_regs->urfet, in_be16(&uccf->uf_regs->urfet));
printk(KERN_INFO "urfset: addr - 0x%08x, val - 0x%04x", printk(KERN_INFO "urfset: addr=0x%p, val=0x%04x\n",
(u32) & uccf->uf_regs->urfset, &uccf->uf_regs->urfset, in_be16(&uccf->uf_regs->urfset));
in_be16(&uccf->uf_regs->urfset)); printk(KERN_INFO "utfb : addr=0x%p, val=0x%08x\n",
printk(KERN_INFO "utfb : addr - 0x%08x, val - 0x%08x", &uccf->uf_regs->utfb, in_be32(&uccf->uf_regs->utfb));
(u32) & uccf->uf_regs->utfb, in_be32(&uccf->uf_regs->utfb)); printk(KERN_INFO "utfs : addr=0x%p, val=0x%04x\n",
printk(KERN_INFO "utfs : addr - 0x%08x, val - 0x%04x", &uccf->uf_regs->utfs, in_be16(&uccf->uf_regs->utfs));
(u32) & uccf->uf_regs->utfs, in_be16(&uccf->uf_regs->utfs)); printk(KERN_INFO "utfet : addr=0x%p, val=0x%04x\n",
printk(KERN_INFO "utfet : addr - 0x%08x, val - 0x%04x", &uccf->uf_regs->utfet, in_be16(&uccf->uf_regs->utfet));
(u32) & uccf->uf_regs->utfet, in_be16(&uccf->uf_regs->utfet)); printk(KERN_INFO "utftt : addr=0x%p, val=0x%04x\n",
printk(KERN_INFO "utftt : addr - 0x%08x, val - 0x%04x", &uccf->uf_regs->utftt, in_be16(&uccf->uf_regs->utftt));
(u32) & uccf->uf_regs->utftt, in_be16(&uccf->uf_regs->utftt)); printk(KERN_INFO "utpt : addr=0x%p, val=0x%04x\n",
printk(KERN_INFO "utpt : addr - 0x%08x, val - 0x%04x", &uccf->uf_regs->utpt, in_be16(&uccf->uf_regs->utpt));
(u32) & uccf->uf_regs->utpt, in_be16(&uccf->uf_regs->utpt)); printk(KERN_INFO "urtry : addr=0x%p, val=0x%08x\n",
printk(KERN_INFO "urtry : addr - 0x%08x, val - 0x%08x", &uccf->uf_regs->urtry, in_be32(&uccf->uf_regs->urtry));
(u32) & uccf->uf_regs->urtry, in_be32(&uccf->uf_regs->urtry)); printk(KERN_INFO "guemr : addr=0x%p, val=0x%02x\n",
printk(KERN_INFO "guemr : addr - 0x%08x, val - 0x%02x", &uccf->uf_regs->guemr, uccf->uf_regs->guemr);
(u32) & uccf->uf_regs->guemr, uccf->uf_regs->guemr);
} }
EXPORT_SYMBOL(ucc_fast_dump_regs); EXPORT_SYMBOL(ucc_fast_dump_regs);
...@@ -149,55 +148,57 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc ...@@ -149,55 +148,57 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
/* check if the UCC port number is in range. */ /* check if the UCC port number is in range. */
if ((uf_info->ucc_num < 0) || (uf_info->ucc_num > UCC_MAX_NUM - 1)) { if ((uf_info->ucc_num < 0) || (uf_info->ucc_num > UCC_MAX_NUM - 1)) {
printk(KERN_ERR "%s: illegal UCC number", __FUNCTION__); printk(KERN_ERR "%s: illegal UCC number\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
/* Check that 'max_rx_buf_length' is properly aligned (4). */ /* Check that 'max_rx_buf_length' is properly aligned (4). */
if (uf_info->max_rx_buf_length & (UCC_FAST_MRBLR_ALIGNMENT - 1)) { if (uf_info->max_rx_buf_length & (UCC_FAST_MRBLR_ALIGNMENT - 1)) {
printk(KERN_ERR "%s: max_rx_buf_length not aligned", __FUNCTION__); printk(KERN_ERR "%s: max_rx_buf_length not aligned\n",
__FUNCTION__);
return -EINVAL; return -EINVAL;
} }
/* Validate Virtual Fifo register values */ /* Validate Virtual Fifo register values */
if (uf_info->urfs < UCC_FAST_URFS_MIN_VAL) { if (uf_info->urfs < UCC_FAST_URFS_MIN_VAL) {
printk(KERN_ERR "%s: urfs is too small", __FUNCTION__); printk(KERN_ERR "%s: urfs is too small\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
if (uf_info->urfs & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) { if (uf_info->urfs & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
printk(KERN_ERR "%s: urfs is not aligned", __FUNCTION__); printk(KERN_ERR "%s: urfs is not aligned\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
if (uf_info->urfet & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) { if (uf_info->urfet & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
printk(KERN_ERR "%s: urfet is not aligned.", __FUNCTION__); printk(KERN_ERR "%s: urfet is not aligned.\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
if (uf_info->urfset & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) { if (uf_info->urfset & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
printk(KERN_ERR "%s: urfset is not aligned", __FUNCTION__); printk(KERN_ERR "%s: urfset is not aligned\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
if (uf_info->utfs & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) { if (uf_info->utfs & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
printk(KERN_ERR "%s: utfs is not aligned", __FUNCTION__); printk(KERN_ERR "%s: utfs is not aligned\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
if (uf_info->utfet & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) { if (uf_info->utfet & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
printk(KERN_ERR "%s: utfet is not aligned", __FUNCTION__); printk(KERN_ERR "%s: utfet is not aligned\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
if (uf_info->utftt & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) { if (uf_info->utftt & (UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT - 1)) {
printk(KERN_ERR "%s: utftt is not aligned", __FUNCTION__); printk(KERN_ERR "%s: utftt is not aligned\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
uccf = kzalloc(sizeof(struct ucc_fast_private), GFP_KERNEL); uccf = kzalloc(sizeof(struct ucc_fast_private), GFP_KERNEL);
if (!uccf) { if (!uccf) {
printk(KERN_ERR "%s: Cannot allocate private data", __FUNCTION__); printk(KERN_ERR "%s: Cannot allocate private data\n",
__FUNCTION__);
return -ENOMEM; return -ENOMEM;
} }
...@@ -206,7 +207,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc ...@@ -206,7 +207,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
/* Set the PHY base address */ /* Set the PHY base address */
uccf->uf_regs = ioremap(uf_info->regs, sizeof(struct ucc_fast)); uccf->uf_regs = ioremap(uf_info->regs, sizeof(struct ucc_fast));
if (uccf->uf_regs == NULL) { if (uccf->uf_regs == NULL) {
printk(KERN_ERR "%s: Cannot map UCC registers", __FUNCTION__); printk(KERN_ERR "%s: Cannot map UCC registers\n", __FUNCTION__);
return -ENOMEM; return -ENOMEM;
} }
...@@ -226,18 +227,10 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc ...@@ -226,18 +227,10 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
uccf->rx_discarded = 0; uccf->rx_discarded = 0;
#endif /* STATISTICS */ #endif /* STATISTICS */
/* Init Guemr register */
if ((ret = ucc_init_guemr((struct ucc_common *) (uf_regs)))) {
printk(KERN_ERR "%s: cannot init GUEMR", __FUNCTION__);
ucc_fast_free(uccf);
return ret;
}
/* Set UCC to fast type */ /* Set UCC to fast type */
if ((ret = ucc_set_type(uf_info->ucc_num, ret = ucc_set_type(uf_info->ucc_num, UCC_SPEED_TYPE_FAST);
(struct ucc_common *) (uf_regs), if (ret) {
UCC_SPEED_TYPE_FAST))) { printk(KERN_ERR "%s: cannot set UCC type\n", __FUNCTION__);
printk(KERN_ERR "%s: cannot set UCC type", __FUNCTION__);
ucc_fast_free(uccf); ucc_fast_free(uccf);
return ret; return ret;
} }
...@@ -276,7 +269,8 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc ...@@ -276,7 +269,8 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
uccf->ucc_fast_tx_virtual_fifo_base_offset = uccf->ucc_fast_tx_virtual_fifo_base_offset =
qe_muram_alloc(uf_info->utfs, UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT); qe_muram_alloc(uf_info->utfs, UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
if (IS_ERR_VALUE(uccf->ucc_fast_tx_virtual_fifo_base_offset)) { if (IS_ERR_VALUE(uccf->ucc_fast_tx_virtual_fifo_base_offset)) {
printk(KERN_ERR "%s: cannot allocate MURAM for TX FIFO", __FUNCTION__); printk(KERN_ERR "%s: cannot allocate MURAM for TX FIFO\n",
__FUNCTION__);
uccf->ucc_fast_tx_virtual_fifo_base_offset = 0; uccf->ucc_fast_tx_virtual_fifo_base_offset = 0;
ucc_fast_free(uccf); ucc_fast_free(uccf);
return -ENOMEM; return -ENOMEM;
...@@ -288,7 +282,8 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc ...@@ -288,7 +282,8 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
UCC_FAST_RECEIVE_VIRTUAL_FIFO_SIZE_FUDGE_FACTOR, UCC_FAST_RECEIVE_VIRTUAL_FIFO_SIZE_FUDGE_FACTOR,
UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT); UCC_FAST_VIRT_FIFO_REGS_ALIGNMENT);
if (IS_ERR_VALUE(uccf->ucc_fast_rx_virtual_fifo_base_offset)) { if (IS_ERR_VALUE(uccf->ucc_fast_rx_virtual_fifo_base_offset)) {
printk(KERN_ERR "%s: cannot allocate MURAM for RX FIFO", __FUNCTION__); printk(KERN_ERR "%s: cannot allocate MURAM for RX FIFO\n",
__FUNCTION__);
uccf->ucc_fast_rx_virtual_fifo_base_offset = 0; uccf->ucc_fast_rx_virtual_fifo_base_offset = 0;
ucc_fast_free(uccf); ucc_fast_free(uccf);
return -ENOMEM; return -ENOMEM;
...@@ -318,7 +313,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc ...@@ -318,7 +313,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
if ((uf_info->rx_clock != QE_CLK_NONE) && if ((uf_info->rx_clock != QE_CLK_NONE) &&
ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->rx_clock, ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->rx_clock,
COMM_DIR_RX)) { COMM_DIR_RX)) {
printk(KERN_ERR "%s: illegal value for RX clock", printk(KERN_ERR "%s: illegal value for RX clock\n",
__FUNCTION__); __FUNCTION__);
ucc_fast_free(uccf); ucc_fast_free(uccf);
return -EINVAL; return -EINVAL;
...@@ -327,7 +322,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc ...@@ -327,7 +322,7 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
if ((uf_info->tx_clock != QE_CLK_NONE) && if ((uf_info->tx_clock != QE_CLK_NONE) &&
ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->tx_clock, ucc_set_qe_mux_rxtx(uf_info->ucc_num, uf_info->tx_clock,
COMM_DIR_TX)) { COMM_DIR_TX)) {
printk(KERN_ERR "%s: illegal value for TX clock", printk(KERN_ERR "%s: illegal value for TX clock\n",
__FUNCTION__); __FUNCTION__);
ucc_fast_free(uccf); ucc_fast_free(uccf);
return -EINVAL; return -EINVAL;
......
arch/powerpc/sysdev/qe_lib/ucc_slow.c
View file @ 6b0b594b
...@@ -115,11 +115,15 @@ void ucc_slow_disable(struct ucc_slow_private * uccs, enum comm_dir mode) ...@@ -115,11 +115,15 @@ void ucc_slow_disable(struct ucc_slow_private * uccs, enum comm_dir mode)
out_be32(&us_regs->gumr_l, gumr_l); out_be32(&us_regs->gumr_l, gumr_l);
} }
/* Initialize the UCC for Slow operations
*
* The caller should initialize the following us_info
*/
int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** uccs_ret) int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** uccs_ret)
{ {
struct ucc_slow_private *uccs; struct ucc_slow_private *uccs;
u32 i; u32 i;
struct ucc_slow *us_regs; struct ucc_slow __iomem *us_regs;
u32 gumr; u32 gumr;
struct qe_bd *bd; struct qe_bd *bd;
u32 id; u32 id;
...@@ -131,7 +135,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc ...@@ -131,7 +135,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
/* check if the UCC port number is in range. */ /* check if the UCC port number is in range. */
if ((us_info->ucc_num < 0) || (us_info->ucc_num > UCC_MAX_NUM - 1)) { if ((us_info->ucc_num < 0) || (us_info->ucc_num > UCC_MAX_NUM - 1)) {
printk(KERN_ERR "%s: illegal UCC number", __FUNCTION__); printk(KERN_ERR "%s: illegal UCC number\n", __FUNCTION__);
return -EINVAL; return -EINVAL;
} }
...@@ -143,13 +147,14 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc ...@@ -143,13 +147,14 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
*/ */
if ((!us_info->rfw) && if ((!us_info->rfw) &&
(us_info->max_rx_buf_length & (UCC_SLOW_MRBLR_ALIGNMENT - 1))) { (us_info->max_rx_buf_length & (UCC_SLOW_MRBLR_ALIGNMENT - 1))) {
printk(KERN_ERR "max_rx_buf_length not aligned."); printk(KERN_ERR "max_rx_buf_length not aligned.\n");
return -EINVAL; return -EINVAL;
} }
uccs = kzalloc(sizeof(struct ucc_slow_private), GFP_KERNEL); uccs = kzalloc(sizeof(struct ucc_slow_private), GFP_KERNEL);
if (!uccs) { if (!uccs) {
printk(KERN_ERR "%s: Cannot allocate private data", __FUNCTION__); printk(KERN_ERR "%s: Cannot allocate private data\n",
__FUNCTION__);
return -ENOMEM; return -ENOMEM;
} }
...@@ -158,7 +163,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc ...@@ -158,7 +163,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
/* Set the PHY base address */ /* Set the PHY base address */
uccs->us_regs = ioremap(us_info->regs, sizeof(struct ucc_slow)); uccs->us_regs = ioremap(us_info->regs, sizeof(struct ucc_slow));
if (uccs->us_regs == NULL) { if (uccs->us_regs == NULL) {
printk(KERN_ERR "%s: Cannot map UCC registers", __FUNCTION__); printk(KERN_ERR "%s: Cannot map UCC registers\n", __FUNCTION__);
return -ENOMEM; return -ENOMEM;
} }
...@@ -182,22 +187,14 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc ...@@ -182,22 +187,14 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
return -ENOMEM; return -ENOMEM;
} }
id = ucc_slow_get_qe_cr_subblock(us_info->ucc_num); id = ucc_slow_get_qe_cr_subblock(us_info->ucc_num);
qe_issue_cmd(QE_ASSIGN_PAGE_TO_DEVICE, id, QE_CR_PROTOCOL_UNSPECIFIED, qe_issue_cmd(QE_ASSIGN_PAGE_TO_DEVICE, id, us_info->protocol,
uccs->us_pram_offset); uccs->us_pram_offset);
uccs->us_pram = qe_muram_addr(uccs->us_pram_offset); uccs->us_pram = qe_muram_addr(uccs->us_pram_offset);
/* Init Guemr register */
if ((ret = ucc_init_guemr((struct ucc_common *) us_regs))) {
printk(KERN_ERR "%s: cannot init GUEMR", __FUNCTION__);
ucc_slow_free(uccs);
return ret;
}
/* Set UCC to slow type */ /* Set UCC to slow type */
if ((ret = ucc_set_type(us_info->ucc_num, ret = ucc_set_type(us_info->ucc_num, UCC_SPEED_TYPE_SLOW);
(struct ucc_common *) us_regs, if (ret) {
UCC_SPEED_TYPE_SLOW))) {
printk(KERN_ERR "%s: cannot set UCC type", __FUNCTION__); printk(KERN_ERR "%s: cannot set UCC type", __FUNCTION__);
ucc_slow_free(uccs); ucc_slow_free(uccs);
return ret; return ret;
...@@ -212,7 +209,8 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc ...@@ -212,7 +209,8 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
qe_muram_alloc(us_info->rx_bd_ring_len * sizeof(struct qe_bd), qe_muram_alloc(us_info->rx_bd_ring_len * sizeof(struct qe_bd),
QE_ALIGNMENT_OF_BD); QE_ALIGNMENT_OF_BD);
if (IS_ERR_VALUE(uccs->rx_base_offset)) { if (IS_ERR_VALUE(uccs->rx_base_offset)) {
printk(KERN_ERR "%s: cannot allocate RX BDs", __FUNCTION__); printk(KERN_ERR "%s: cannot allocate %u RX BDs\n", __FUNCTION__,
us_info->rx_bd_ring_len);
uccs->rx_base_offset = 0; uccs->rx_base_offset = 0;
ucc_slow_free(uccs); ucc_slow_free(uccs);
return -ENOMEM; return -ENOMEM;
...@@ -292,12 +290,12 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc ...@@ -292,12 +290,12 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
/* 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. */
uccs->us_pram->tfcr = uccs->us_pram->rfcr = uccs->us_pram->tbmr = UCC_BMR_BO_BE;
us_info->data_mem_part | QE_BMR_BYTE_ORDER_BO_MOT; uccs->us_pram->rbmr = UCC_BMR_BO_BE;
/* rbase, tbase are offsets from MURAM base */ /* rbase, tbase are offsets from MURAM base */
out_be16(&uccs->us_pram->rbase, uccs->us_pram_offset); out_be16(&uccs->us_pram->rbase, uccs->rx_base_offset);
out_be16(&uccs->us_pram->tbase, uccs->us_pram_offset); out_be16(&uccs->us_pram->tbase, uccs->tx_base_offset);
/* Mux clocking */ /* Mux clocking */
/* Grant Support */ /* Grant Support */
...@@ -311,7 +309,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc ...@@ -311,7 +309,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
/* Rx clock routing */ /* Rx clock routing */
if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->rx_clock, if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->rx_clock,
COMM_DIR_RX)) { COMM_DIR_RX)) {
printk(KERN_ERR "%s: illegal value for RX clock", printk(KERN_ERR "%s: illegal value for RX clock\n",
__FUNCTION__); __FUNCTION__);
ucc_slow_free(uccs); ucc_slow_free(uccs);
return -EINVAL; return -EINVAL;
...@@ -319,7 +317,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc ...@@ -319,7 +317,7 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
/* Tx clock routing */ /* Tx clock routing */
if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->tx_clock, if (ucc_set_qe_mux_rxtx(us_info->ucc_num, us_info->tx_clock,
COMM_DIR_TX)) { COMM_DIR_TX)) {
printk(KERN_ERR "%s: illegal value for TX clock", printk(KERN_ERR "%s: illegal value for TX clock\n",
__FUNCTION__); __FUNCTION__);
ucc_slow_free(uccs); ucc_slow_free(uccs);
return -EINVAL; return -EINVAL;
...@@ -343,8 +341,8 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc ...@@ -343,8 +341,8 @@ int ucc_slow_init(struct ucc_slow_info * us_info, struct ucc_slow_private ** ucc
command = QE_INIT_TX; command = QE_INIT_TX;
else else
command = QE_INIT_RX; /* We know at least one is TRUE */ command = QE_INIT_RX; /* We know at least one is TRUE */
id = ucc_slow_get_qe_cr_subblock(us_info->ucc_num);
qe_issue_cmd(command, id, QE_CR_PROTOCOL_UNSPECIFIED, 0); qe_issue_cmd(command, id, us_info->protocol, 0);
*uccs_ret = uccs; *uccs_ret = uccs;
return 0; return 0;
......
drivers/net/ucc_geth.c
View file @ 6b0b594b
...@@ -2919,7 +2919,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth) ...@@ -2919,7 +2919,7 @@ static int ucc_geth_startup(struct ucc_geth_private *ugeth)
test = in_be16(&ugeth->p_tx_glbl_pram->temoder); test = in_be16(&ugeth->p_tx_glbl_pram->temoder);
/* Function code register value to be used later */ /* Function code register value to be used later */
function_code = QE_BMR_BYTE_ORDER_BO_MOT | UCC_FAST_FUNCTION_CODE_GBL; function_code = UCC_BMR_BO_BE | UCC_BMR_GBL;
/* Required for QE */ /* Required for QE */
/* function code register */ /* function code register */
......
drivers/net/ucc_geth.h
View file @ 6b0b594b
...@@ -44,6 +44,7 @@ ...@@ -44,6 +44,7 @@
struct ucc_geth { struct ucc_geth {
struct ucc_fast uccf; struct ucc_fast uccf;
u8 res0[0x100 - sizeof(struct ucc_fast)];
u32 maccfg1; /* mac configuration reg. 1 */ u32 maccfg1; /* mac configuration reg. 1 */
u32 maccfg2; /* mac configuration reg. 2 */ u32 maccfg2; /* mac configuration reg. 2 */
......
include/asm-powerpc/immap_qe.h
View file @ 6b0b594b
...@@ -97,10 +97,7 @@ struct qe_mux { ...@@ -97,10 +97,7 @@ struct qe_mux {
__be32 cmxsi1cr_l; /* CMX SI1 clock route low register */ __be32 cmxsi1cr_l; /* CMX SI1 clock route low register */
__be32 cmxsi1cr_h; /* CMX SI1 clock route high register */ __be32 cmxsi1cr_h; /* CMX SI1 clock route high register */
__be32 cmxsi1syr; /* CMX SI1 SYNC route register */ __be32 cmxsi1syr; /* CMX SI1 SYNC route register */
__be32 cmxucr1; /* CMX UCC1, UCC3 clock route register */ __be32 cmxucr[4]; /* CMX UCCx clock route registers */
__be32 cmxucr2; /* CMX UCC5, UCC7 clock route register */
__be32 cmxucr3; /* CMX UCC2, UCC4 clock route register */
__be32 cmxucr4; /* CMX UCC6, UCC8 clock route register */
__be32 cmxupcr; /* CMX UPC clock route register */ __be32 cmxupcr; /* CMX UPC clock route register */
u8 res0[0x1C]; u8 res0[0x1C];
} __attribute__ ((packed)); } __attribute__ ((packed));
...@@ -261,7 +258,6 @@ struct ucc_slow { ...@@ -261,7 +258,6 @@ struct ucc_slow {
__be16 utpt; __be16 utpt;
u8 res4[0x52]; u8 res4[0x52];
u8 guemr; /* UCC general extended mode register */ u8 guemr; /* UCC general extended mode register */
u8 res5[0x200 - 0x091];
} __attribute__ ((packed)); } __attribute__ ((packed));
/* QE UCC Fast */ /* QE UCC Fast */
...@@ -294,21 +290,13 @@ struct ucc_fast { ...@@ -294,21 +290,13 @@ struct ucc_fast {
__be32 urtry; /* UCC retry counter register */ __be32 urtry; /* UCC retry counter register */
u8 res8[0x4C]; u8 res8[0x4C];
u8 guemr; /* UCC general extended mode register */ u8 guemr; /* UCC general extended mode register */
u8 res9[0x100 - 0x091];
} __attribute__ ((packed));
/* QE UCC */
struct ucc_common {
u8 res1[0x90];
u8 guemr;
u8 res2[0x200 - 0x091];
} __attribute__ ((packed)); } __attribute__ ((packed));
struct ucc { struct ucc {
union { union {
struct ucc_slow slow; struct ucc_slow slow;
struct ucc_fast fast; struct ucc_fast fast;
struct ucc_common common; u8 res[0x200]; /* UCC blocks are 512 bytes each */
}; };
} __attribute__ ((packed)); } __attribute__ ((packed));
...@@ -407,7 +395,7 @@ struct dbg { ...@@ -407,7 +395,7 @@ struct dbg {
/* RISC Special Registers (Trap and Breakpoint) */ /* RISC Special Registers (Trap and Breakpoint) */
struct rsp { struct rsp {
u8 fixme[0x100]; u32 reg[0x40]; /* 64 32-bit registers */
} __attribute__ ((packed)); } __attribute__ ((packed));
struct qe_immap { struct qe_immap {
...@@ -436,11 +424,13 @@ struct qe_immap { ...@@ -436,11 +424,13 @@ struct qe_immap {
u8 res13[0x600]; u8 res13[0x600];
struct upc upc2; /* MultiPHY UTOPIA POS Ctrlr 2*/ struct upc upc2; /* MultiPHY UTOPIA POS Ctrlr 2*/
struct sdma sdma; /* SDMA */ struct sdma sdma; /* SDMA */
struct dbg dbg; /* Debug Space */ struct dbg dbg; /* 0x104080 - 0x1040FF
struct rsp rsp[0x2]; /* RISC Special Registers Debug Space */
struct rsp rsp[0x2]; /* 0x104100 - 0x1042FF
RISC Special Registers
(Trap and Breakpoint) */ (Trap and Breakpoint) */
u8 res14[0x300]; u8 res14[0x300]; /* 0x104300 - 0x1045FF */
u8 res15[0x3A00]; u8 res15[0x3A00]; /* 0x104600 - 0x107FFF */
u8 res16[0x8000]; /* 0x108000 - 0x110000 */ u8 res16[0x8000]; /* 0x108000 - 0x110000 */
u8 muram[0xC000]; /* 0x110000 - 0x11C000 u8 muram[0xC000]; /* 0x110000 - 0x11C000
Multi-user RAM */ Multi-user RAM */
...@@ -451,7 +441,7 @@ struct qe_immap { ...@@ -451,7 +441,7 @@ struct qe_immap {
extern struct qe_immap *qe_immr; extern struct qe_immap *qe_immr;
extern phys_addr_t get_qe_base(void); extern phys_addr_t get_qe_base(void);
static inline unsigned long immrbar_virt_to_phys(volatile void * address) static inline unsigned long immrbar_virt_to_phys(void *address)
{ {
if ( ((u32)address >= (u32)qe_immr) && if ( ((u32)address >= (u32)qe_immr) &&
((u32)address < ((u32)qe_immr + QE_IMMAP_SIZE)) ) ((u32)address < ((u32)qe_immr + QE_IMMAP_SIZE)) )
......
include/asm-powerpc/qe.h
View file @ 6b0b594b
This diff is collapsed.
include/asm-powerpc/ucc.h
View file @ 6b0b594b
...@@ -25,58 +25,38 @@ ...@@ -25,58 +25,38 @@
/* Slow or fast type for UCCs. /* Slow or fast type for UCCs.
*/ */
enum ucc_speed_type { enum ucc_speed_type {
UCC_SPEED_TYPE_FAST, UCC_SPEED_TYPE_SLOW UCC_SPEED_TYPE_FAST = UCC_GUEMR_MODE_FAST_RX | UCC_GUEMR_MODE_FAST_TX,
}; UCC_SPEED_TYPE_SLOW = UCC_GUEMR_MODE_SLOW_RX | UCC_GUEMR_MODE_SLOW_TX
/* Initial UCCs Parameter RAM address relative to: MEM_MAP_BASE (IMMR).
*/
enum ucc_pram_initial_offset {
UCC_PRAM_OFFSET_UCC1 = 0x8400,
UCC_PRAM_OFFSET_UCC2 = 0x8500,
UCC_PRAM_OFFSET_UCC3 = 0x8600,
UCC_PRAM_OFFSET_UCC4 = 0x9000,
UCC_PRAM_OFFSET_UCC5 = 0x8000,
UCC_PRAM_OFFSET_UCC6 = 0x8100,
UCC_PRAM_OFFSET_UCC7 = 0x8200,
UCC_PRAM_OFFSET_UCC8 = 0x8300
}; };
/* ucc_set_type /* ucc_set_type
* Sets UCC to slow or fast mode. * Sets UCC to slow or fast mode.
* *
* ucc_num - (In) number of UCC (0-7). * ucc_num - (In) number of UCC (0-7).
* regs - (In) pointer to registers base for the UCC.
* speed - (In) slow or fast mode for UCC. * speed - (In) slow or fast mode for UCC.
*/ */
int ucc_set_type(int ucc_num, struct ucc_common *regs, int ucc_set_type(unsigned int ucc_num, enum ucc_speed_type speed);
enum ucc_speed_type speed);
/* ucc_init_guemr
* Init the Guemr register.
*
* regs - (In) pointer to registers base for the UCC.
*/
int ucc_init_guemr(struct ucc_common *regs);
int ucc_set_qe_mux_mii_mng(int ucc_num); int ucc_set_qe_mux_mii_mng(unsigned int ucc_num);
int ucc_set_qe_mux_rxtx(int ucc_num, enum qe_clock clock, enum comm_dir mode); int ucc_set_qe_mux_rxtx(unsigned int ucc_num, enum qe_clock clock,
enum comm_dir mode);
int ucc_mux_set_grant_tsa_bkpt(int ucc_num, int set, u32 mask); int ucc_mux_set_grant_tsa_bkpt(unsigned int ucc_num, int set, u32 mask);
/* QE MUX clock routing for UCC /* QE MUX clock routing for UCC
*/ */
static inline int ucc_set_qe_mux_grant(int ucc_num, int set) static inline int ucc_set_qe_mux_grant(unsigned int ucc_num, int set)
{ {
return ucc_mux_set_grant_tsa_bkpt(ucc_num, set, QE_CMXUCR_GRANT); return ucc_mux_set_grant_tsa_bkpt(ucc_num, set, QE_CMXUCR_GRANT);
} }
static inline int ucc_set_qe_mux_tsa(int ucc_num, int set) static inline int ucc_set_qe_mux_tsa(unsigned int ucc_num, int set)
{ {
return ucc_mux_set_grant_tsa_bkpt(ucc_num, set, QE_CMXUCR_TSA); return ucc_mux_set_grant_tsa_bkpt(ucc_num, set, QE_CMXUCR_TSA);
} }
static inline int ucc_set_qe_mux_bkpt(int ucc_num, int set) static inline int ucc_set_qe_mux_bkpt(unsigned int ucc_num, int set)
{ {
return ucc_mux_set_grant_tsa_bkpt(ucc_num, set, QE_CMXUCR_BKPT); return ucc_mux_set_grant_tsa_bkpt(ucc_num, set, QE_CMXUCR_BKPT);
} }
......
include/asm-powerpc/ucc_slow.h
View file @ 6b0b594b
...@@ -148,9 +148,10 @@ enum ucc_slow_diag_mode { ...@@ -148,9 +148,10 @@ enum ucc_slow_diag_mode {
struct ucc_slow_info { struct ucc_slow_info {
int ucc_num; int ucc_num;
int protocol; /* QE_CR_PROTOCOL_xxx */
enum qe_clock rx_clock; enum qe_clock rx_clock;
enum qe_clock tx_clock; enum qe_clock tx_clock;
u32 regs; phys_addr_t regs;
int irq; int irq;
u16 uccm_mask; u16 uccm_mask;
int data_mem_part; int data_mem_part;
...@@ -186,7 +187,7 @@ struct ucc_slow_info { ...@@ -186,7 +187,7 @@ struct ucc_slow_info {
struct ucc_slow_private { struct ucc_slow_private {
struct ucc_slow_info *us_info; struct ucc_slow_info *us_info;
struct ucc_slow *us_regs; /* a pointer to memory map of UCC regs */ struct ucc_slow __iomem *us_regs; /* Ptr to memory map of UCC regs */
struct ucc_slow_pram *us_pram; /* a pointer to the parameter RAM */ struct ucc_slow_pram *us_pram; /* a pointer to the parameter RAM */
u32 us_pram_offset; u32 us_pram_offset;
int enabled_tx; /* Whether channel is enabled for Tx (ENT) */ int enabled_tx; /* Whether channel is enabled for Tx (ENT) */
...@@ -277,12 +278,12 @@ void ucc_slow_graceful_stop_tx(struct ucc_slow_private * uccs); ...@@ -277,12 +278,12 @@ void ucc_slow_graceful_stop_tx(struct ucc_slow_private * uccs);
*/ */
void ucc_slow_stop_tx(struct ucc_slow_private * uccs); void ucc_slow_stop_tx(struct ucc_slow_private * uccs);
/* ucc_slow_restart_x /* ucc_slow_restart_tx
* Restarts transmitting on a specified slow UCC. * Restarts transmitting on a specified slow UCC.
* *
* uccs - (In) pointer to the slow UCC structure. * uccs - (In) pointer to the slow UCC structure.
*/ */
void ucc_slow_restart_x(struct ucc_slow_private * uccs); void ucc_slow_restart_tx(struct ucc_slow_private *uccs);
u32 ucc_slow_get_qe_cr_subblock(int uccs_num); u32 ucc_slow_get_qe_cr_subblock(int uccs_num);
......
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