128 lines
4.9 KiB
Diff
128 lines
4.9 KiB
Diff
|
--- a/drivers/usb/gadget/bcm63xx_udc.c
|
||
|
|
+++ b/drivers/usb/gadget/bcm63xx_udc.c
|
||
|
|
@@ -362,24 +362,30 @@ static inline void usb_dma_writel(struct
|
||
|
|
bcm_writel(val, udc->iudma_regs + off);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static inline u32 usb_dmac_readl(struct bcm63xx_udc *udc, u32 off)
|
||
|
|
+static inline u32 usb_dmac_readl(struct bcm63xx_udc *udc, u32 off, int chan)
|
||
|
|
{
|
||
|
|
- return bcm_readl(udc->iudma_regs + IUDMA_DMAC_OFFSET + off);
|
||
|
|
+ return bcm_readl(udc->iudma_regs + IUDMA_DMAC_OFFSET + off +
|
||
|
|
+ (ENETDMA_CHAN_WIDTH * chan));
|
||
|
|
}
|
||
|
|
|
||
|
|
-static inline void usb_dmac_writel(struct bcm63xx_udc *udc, u32 val, u32 off)
|
||
|
|
+static inline void usb_dmac_writel(struct bcm63xx_udc *udc, u32 val, u32 off,
|
||
|
|
+ int chan)
|
||
|
|
{
|
||
|
|
- bcm_writel(val, udc->iudma_regs + IUDMA_DMAC_OFFSET + off);
|
||
|
|
+ bcm_writel(val, udc->iudma_regs + IUDMA_DMAC_OFFSET + off +
|
||
|
|
+ (ENETDMA_CHAN_WIDTH* chan));
|
||
|
|
}
|
||
|
|
|
||
|
|
-static inline u32 usb_dmas_readl(struct bcm63xx_udc *udc, u32 off)
|
||
|
|
+static inline u32 usb_dmas_readl(struct bcm63xx_udc *udc, u32 off, int chan)
|
||
|
|
{
|
||
|
|
- return bcm_readl(udc->iudma_regs + IUDMA_DMAS_OFFSET + off);
|
||
|
|
+ return bcm_readl(udc->iudma_regs + IUDMA_DMAS_OFFSET + off +
|
||
|
|
+ (ENETDMA_CHAN_WIDTH* chan));
|
||
|
|
}
|
||
|
|
|
||
|
|
-static inline void usb_dmas_writel(struct bcm63xx_udc *udc, u32 val, u32 off)
|
||
|
|
+static inline void usb_dmas_writel(struct bcm63xx_udc *udc, u32 val, u32 off,
|
||
|
|
+ int chan)
|
||
|
|
{
|
||
|
|
- bcm_writel(val, udc->iudma_regs + IUDMA_DMAS_OFFSET + off);
|
||
|
|
+ bcm_writel(val, udc->iudma_regs + IUDMA_DMAS_OFFSET + off +
|
||
|
|
+ (ENETDMA_CHAN_WIDTH * chan));
|
||
|
|
}
|
||
|
|
|
||
|
|
static inline void set_clocks(struct bcm63xx_udc *udc, bool is_enabled)
|
||
|
|
@@ -639,7 +645,7 @@ static void iudma_write(struct bcm63xx_u
|
||
|
|
} while (!last_bd);
|
||
|
|
|
||
|
|
usb_dmac_writel(udc, ENETDMAC_CHANCFG_EN_MASK,
|
||
|
|
- ENETDMAC_CHANCFG_REG(iudma->ch_idx));
|
||
|
|
+ ENETDMAC_CHANCFG_REG, iudma->ch_idx);
|
||
|
|
}
|
||
|
|
|
||
|
|
/**
|
||
|
|
@@ -695,9 +701,9 @@ static void iudma_reset_channel(struct b
|
||
|
|
bcm63xx_fifo_reset_ep(udc, max(0, iudma->ep_num));
|
||
|
|
|
||
|
|
/* stop DMA, then wait for the hardware to wrap up */
|
||
|
|
- usb_dmac_writel(udc, 0, ENETDMAC_CHANCFG_REG(ch_idx));
|
||
|
|
+ usb_dmac_writel(udc, 0, ENETDMAC_CHANCFG_REG, ch_idx);
|
||
|
|
|
||
|
|
- while (usb_dmac_readl(udc, ENETDMAC_CHANCFG_REG(ch_idx)) &
|
||
|
|
+ while (usb_dmac_readl(udc, ENETDMAC_CHANCFG_REG, ch_idx) &
|
||
|
|
ENETDMAC_CHANCFG_EN_MASK) {
|
||
|
|
udelay(1);
|
||
|
|
|
||
|
|
@@ -714,10 +720,10 @@ static void iudma_reset_channel(struct b
|
||
|
|
dev_warn(udc->dev, "forcibly halting IUDMA channel %d\n",
|
||
|
|
ch_idx);
|
||
|
|
usb_dmac_writel(udc, ENETDMAC_CHANCFG_BUFHALT_MASK,
|
||
|
|
- ENETDMAC_CHANCFG_REG(ch_idx));
|
||
|
|
+ ENETDMAC_CHANCFG_REG, ch_idx);
|
||
|
|
}
|
||
|
|
}
|
||
|
|
- usb_dmac_writel(udc, ~0, ENETDMAC_IR_REG(ch_idx));
|
||
|
|
+ usb_dmac_writel(udc, ~0, ENETDMAC_IR_REG, ch_idx);
|
||
|
|
|
||
|
|
/* don't leave "live" HW-owned entries for the next guy to step on */
|
||
|
|
for (d = iudma->bd_ring; d <= iudma->end_bd; d++)
|
||
|
|
@@ -729,11 +735,11 @@ static void iudma_reset_channel(struct b
|
||
|
|
|
||
|
|
/* set up IRQs, UBUS burst size, and BD base for this channel */
|
||
|
|
usb_dmac_writel(udc, ENETDMAC_IR_BUFDONE_MASK,
|
||
|
|
- ENETDMAC_IRMASK_REG(ch_idx));
|
||
|
|
- usb_dmac_writel(udc, 8, ENETDMAC_MAXBURST_REG(ch_idx));
|
||
|
|
+ ENETDMAC_IRMASK_REG, ch_idx);
|
||
|
|
+ usb_dmac_writel(udc, 8, ENETDMAC_MAXBURST_REG, ch_idx);
|
||
|
|
|
||
|
|
- usb_dmas_writel(udc, iudma->bd_ring_dma, ENETDMAS_RSTART_REG(ch_idx));
|
||
|
|
- usb_dmas_writel(udc, 0, ENETDMAS_SRAM2_REG(ch_idx));
|
||
|
|
+ usb_dmas_writel(udc, iudma->bd_ring_dma, ENETDMAS_RSTART_REG, ch_idx);
|
||
|
|
+ usb_dmas_writel(udc, 0, ENETDMAS_SRAM2_REG, ch_idx);
|
||
|
|
}
|
||
|
|
|
||
|
|
/**
|
||
|
|
@@ -2016,7 +2022,7 @@ static irqreturn_t bcm63xx_udc_data_isr(
|
||
|
|
spin_lock(&udc->lock);
|
||
|
|
|
||
|
|
usb_dmac_writel(udc, ENETDMAC_IR_BUFDONE_MASK,
|
||
|
|
- ENETDMAC_IR_REG(iudma->ch_idx));
|
||
|
|
+ ENETDMAC_IR_REG, iudma->ch_idx);
|
||
|
|
bep = iudma->bep;
|
||
|
|
rc = iudma_read(udc, iudma);
|
||
|
|
|
||
|
|
@@ -2156,18 +2162,18 @@ static int bcm63xx_iudma_dbg_show(struct
|
||
|
|
seq_printf(s, " [ep%d]:\n",
|
||
|
|
max_t(int, iudma_defaults[ch_idx].ep_num, 0));
|
||
|
|
seq_printf(s, " cfg: %08x; irqstat: %08x; irqmask: %08x; maxburst: %08x\n",
|
||
|
|
- usb_dmac_readl(udc, ENETDMAC_CHANCFG_REG(ch_idx)),
|
||
|
|
- usb_dmac_readl(udc, ENETDMAC_IR_REG(ch_idx)),
|
||
|
|
- usb_dmac_readl(udc, ENETDMAC_IRMASK_REG(ch_idx)),
|
||
|
|
- usb_dmac_readl(udc, ENETDMAC_MAXBURST_REG(ch_idx)));
|
||
|
|
+ usb_dmac_readl(udc, ENETDMAC_CHANCFG_REG, ch_idx),
|
||
|
|
+ usb_dmac_readl(udc, ENETDMAC_IR_REG, ch_idx)),
|
||
|
|
+ usb_dmac_readl(udc, ENETDMAC_IRMASK_REG, ch_idx),
|
||
|
|
+ usb_dmac_readl(udc, ENETDMAC_MAXBURST_REG, ch_idx);
|
||
|
|
|
||
|
|
- sram2 = usb_dmas_readl(udc, ENETDMAS_SRAM2_REG(ch_idx));
|
||
|
|
- sram3 = usb_dmas_readl(udc, ENETDMAS_SRAM3_REG(ch_idx));
|
||
|
|
+ sram2 = usb_dmas_readl(udc, ENETDMAS_SRAM2_REG, ch_idx);
|
||
|
|
+ sram3 = usb_dmas_readl(udc, ENETDMAS_SRAM3_REG, ch_idx);
|
||
|
|
seq_printf(s, " base: %08x; index: %04x_%04x; desc: %04x_%04x %08x\n",
|
||
|
|
- usb_dmas_readl(udc, ENETDMAS_RSTART_REG(ch_idx)),
|
||
|
|
+ usb_dmas_readl(udc, ENETDMAS_RSTART_REG, ch_idx),
|
||
|
|
sram2 >> 16, sram2 & 0xffff,
|
||
|
|
sram3 >> 16, sram3 & 0xffff,
|
||
|
|
- usb_dmas_readl(udc, ENETDMAS_SRAM4_REG(ch_idx)));
|
||
|
|
+ usb_dmas_readl(udc, ENETDMAS_SRAM4_REG, ch_idx));
|
||
|
|
seq_printf(s, " desc: %d/%d used", iudma->n_bds_used,
|
||
|
|
iudma->n_bds);
|
||
|
|
|