qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-12-26 03:07:41 +02:00
Code

Working korina driver for 2.6.24, still needs fixing in the tx tasklet which introduces high latency when transmitting packets, rx path works ok

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11853 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2008-07-17 10:09:15 +00:00
parent 46860d789c
commit e35ac592ae
1 changed files with 37 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
target/linux/rb532/files-2.6.24/drivers/net/korina.c
View File

@ -627,14 +627,12 @@ rc32434_rx_dma_interrupt(int irq, void *dev_id)
lp = (struct rc32434_local *)dev->priv; lp = (struct rc32434_local *)dev->priv;
spin_lock(&lp->lock);
dmas = __raw_readl(&lp->rx_dma_regs->dmas); dmas = __raw_readl(&lp->rx_dma_regs->dmas);
if(dmas & (DMAS_d_m|DMAS_h_m|DMAS_e_m)) { if(dmas & (DMAS_d_m|DMAS_h_m|DMAS_e_m)) {
/* Mask D H E bit in Rx DMA */ /* Mask D H E bit in Rx DMA */
dmasm = __raw_readl(&lp->rx_dma_regs->dmasm); dmasm = __raw_readl(&lp->rx_dma_regs->dmasm);
__raw_writel(dmasm | (DMASM_d_m | DMASM_h_m | DMASM_e_m), &lp->rx_dma_regs->dmasm); __raw_writel(dmasm | (DMASM_d_m | DMASM_h_m | DMASM_e_m), &lp->rx_dma_regs->dmasm);
netif_rx_schedule(dev, &lp->napi);
netif_rx_schedule_prep(dev, &lp->napi);
if (dmas & DMAS_e_m) if (dmas & DMAS_e_m)
ERR(": DMA error\n"); ERR(": DMA error\n");
@ -644,39 +642,29 @@ rc32434_rx_dma_interrupt(int irq, void *dev_id)
else else
retval = IRQ_NONE; retval = IRQ_NONE;
spin_unlock(&lp->lock);
return retval; return retval;
} }
static int rc32434_poll(struct napi_struct *napi, int budget)
static int rc32434_rx(struct net_device *dev, int limit)
{ {
struct rc32434_local* lp = container_of(napi, struct rc32434_local, napi); struct rc32434_local *lp = netdev_priv(dev);
struct net_device *dev = lp->dev;
volatile DMAD_t rd = &lp->rd_ring[lp->rx_next_done]; volatile DMAD_t rd = &lp->rd_ring[lp->rx_next_done];
struct sk_buff *skb, *skb_new; struct sk_buff *skb, *skb_new;
u8 *pkt_buf; u8 *pkt_buf;
u32 devcs, count, pkt_len, pktuncrc_len; u32 devcs, pkt_len, dmas, rx_free_desc;
volatile u32 dmas; u32 pktuncrc_len;
u32 received = 0; int count;
int rx_work_limit = min(budget, 64);
dma_cache_inv((u32)rd, sizeof(*rd)); dma_cache_inv((u32)rd, sizeof(*rd));
while ( (count = RC32434_RBSIZE - (u32)DMA_COUNT(rd->control)) != 0) { for (count = 0; count < limit; count++) {
if(--rx_work_limit <0)
{
break;
}
/* init the var. used for the later operations within the while loop */ /* init the var. used for the later operations within the while loop */
skb_new = NULL; skb_new = NULL;
devcs = rd->devcs; devcs = rd->devcs;
pkt_len = RCVPKT_LENGTH(devcs); pkt_len = RCVPKT_LENGTH(devcs);
skb = lp->rx_skb[lp->rx_next_done]; skb = lp->rx_skb[lp->rx_next_done];
if (count < 64) { if ((devcs & ( ETHRX_ld_m)) != ETHRX_ld_m) {
lp->stats.rx_errors++;
lp->stats.rx_dropped++;
}
else if ((devcs & ( ETHRX_ld_m)) != ETHRX_ld_m) {
/* check that this is a whole packet */ /* check that this is a whole packet */
/* WARNING: DMA_FD bit incorrectly set in Rc32434 (errata ref #077) */ /* WARNING: DMA_FD bit incorrectly set in Rc32434 (errata ref #077) */
lp->stats.rx_errors++; lp->stats.rx_errors++;
@ -684,7 +672,6 @@ static int rc32434_poll(struct napi_struct *napi, int budget)
} }
else if ( (devcs & ETHRX_rok_m) ) { else if ( (devcs & ETHRX_rok_m) ) {
{
/* must be the (first and) last descriptor then */ /* must be the (first and) last descriptor then */
pkt_buf = (u8*)lp->rx_skb[lp->rx_next_done]->data; pkt_buf = (u8*)lp->rx_skb[lp->rx_next_done]->data;
@ -693,7 +680,7 @@ static int rc32434_poll(struct napi_struct *napi, int budget)
dma_cache_inv((unsigned long)pkt_buf, pktuncrc_len); dma_cache_inv((unsigned long)pkt_buf, pktuncrc_len);
/* Malloc up new buffer. */ /* Malloc up new buffer. */
skb_new = dev_alloc_skb(RC32434_RBSIZE + 2); skb_new = netdev_alloc_skb(dev, RC32434_RBSIZE + 2);
if (skb_new != NULL){ if (skb_new != NULL){
/* Make room */ /* Make room */
@ -723,8 +710,6 @@ static int rc32434_poll(struct napi_struct *napi, int budget)
lp->stats.rx_dropped++; lp->stats.rx_dropped++;
} }
} }
}
else { else {
/* This should only happen if we enable accepting broken packets */ /* This should only happen if we enable accepting broken packets */
lp->stats.rx_errors++; lp->stats.rx_errors++;
@ -755,12 +740,12 @@ static int rc32434_poll(struct napi_struct *napi, int budget)
DBG(2, "RX Preamble error\n"); DBG(2, "RX Preamble error\n");
} }
} }
rd->devcs = 0; rd->devcs = 0;
/* restore descriptor's curr_addr */ /* restore descriptor's curr_addr */
if(skb_new) if(skb_new) {
rd->ca = CPHYSADDR(skb_new->data); rd->ca = CPHYSADDR(skb_new->data);
}
else else
rd->ca = CPHYSADDR(skb->data); rd->ca = CPHYSADDR(skb->data);
@ -772,13 +757,11 @@ static int rc32434_poll(struct napi_struct *napi, int budget)
rd = &lp->rd_ring[lp->rx_next_done]; rd = &lp->rd_ring[lp->rx_next_done];
__raw_writel( ~DMAS_d_m, &lp->rx_dma_regs->dmas); __raw_writel( ~DMAS_d_m, &lp->rx_dma_regs->dmas);
} }
budget =- received;
if(rx_work_limit < 0)
goto not_done;
dmas = __raw_readl(&lp->rx_dma_regs->dmas); dmas = __raw_readl(&lp->rx_dma_regs->dmas);
if(dmas & DMAS_h_m) { if(dmas & DMAS_h_m) {
/* Mask off halt and error bits */
__raw_writel( ~(DMAS_h_m | DMAS_e_m), &lp->rx_dma_regs->dmas); __raw_writel( ~(DMAS_h_m | DMAS_e_m), &lp->rx_dma_regs->dmas);
#ifdef RC32434_PROC_DEBUG #ifdef RC32434_PROC_DEBUG
lp->dma_halt_cnt++; lp->dma_halt_cnt++;
@ -790,12 +773,26 @@ static int rc32434_poll(struct napi_struct *napi, int budget)
rc32434_chain_rx(lp,rd); rc32434_chain_rx(lp,rd);
} }
netif_rx_complete(dev, &lp->napi); return count;
/* Enable D H E bit in Rx DMA */ }
__raw_writel(__raw_readl(&lp->rx_dma_regs->dmasm) & ~(DMASM_d_m | DMASM_h_m |DMASM_e_m), &lp->rx_dma_regs->dmasm);
return 0; static int rc32434_poll(struct napi_struct *napi, int budget)
not_done: {
return 1; struct rc32434_local *lp =
container_of(napi, struct rc32434_local, napi);
struct net_device *dev = lp->dev;
int work_done;
work_done = rc32434_rx(dev, budget);
if (work_done < budget) {
netif_rx_complete(dev, napi);
/* Mask off interrupts */
writel(readl(&lp->rx_dma_regs->dmasm) &
(DMASM_d_m | DMASM_h_m |DMASM_e_m),
&lp->rx_dma_regs->dmasm);
}
return work_done;
} }
@ -813,8 +810,6 @@ rc32434_tx_dma_interrupt(int irq, void *dev_id)
lp = (struct rc32434_local *)dev->priv; lp = (struct rc32434_local *)dev->priv;
spin_lock(&lp->lock);
dmas = __raw_readl(&lp->tx_dma_regs->dmas); dmas = __raw_readl(&lp->tx_dma_regs->dmas);
if (dmas & (DMAS_f_m | DMAS_e_m)) { if (dmas & (DMAS_f_m | DMAS_e_m)) {
@ -839,8 +834,6 @@ rc32434_tx_dma_interrupt(int irq, void *dev_id)
else else
retval = IRQ_NONE; retval = IRQ_NONE;
spin_unlock(&lp->lock);
return retval; return retval;
} }
@ -995,9 +988,6 @@ static int rc32434_init(struct net_device *dev)
/* Enable Ethernet Interface */ /* Enable Ethernet Interface */
__raw_writel(ETHINTFC_en_m, &lp->eth_regs->ethintfc); __raw_writel(ETHINTFC_en_m, &lp->eth_regs->ethintfc);
#ifndef CONFIG_IDT_USE_NAPI
tasklet_disable(lp->rx_tasklet);
#endif
tasklet_disable(lp->tx_tasklet); tasklet_disable(lp->tx_tasklet);
/* Initialize the transmit Descriptors */ /* Initialize the transmit Descriptors */