Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 26185
b: refs/heads/master
c: bcb4919
h: refs/heads/master
i:
  26183: c66bb39
v: v3
  • Loading branch information
Auke Kok authored and Auke Kok committed Apr 26, 2006
1 parent 57e0500 commit 3076267
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 101 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 25f73891c3059e9ce6ff0a02670aa98baf6cbce9
refs/heads/master: bcb49197ed9a2e8a0a8d990723dccfccffa7566f
1 change: 1 addition & 0 deletions trunk/drivers/net/e1000/e1000_main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3768,6 +3768,7 @@ e1000_clean_rx_irq_ps(struct e1000_adapter *adapter,
ps_page->ps_page[j] = NULL;
skb->len += length;
skb->data_len += length;
skb->truesize += length;
}

copydone:
Expand Down
56 changes: 28 additions & 28 deletions trunk/drivers/net/gianfar.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,7 @@ static int gfar_probe(struct platform_device *pdev)
goto regs_fail;
}

spin_lock_init(&priv->txlock);
spin_lock_init(&priv->rxlock);
spin_lock_init(&priv->lock);

platform_set_drvdata(pdev, dev);

Expand Down Expand Up @@ -516,13 +515,11 @@ void stop_gfar(struct net_device *dev)
phy_stop(priv->phydev);

/* Lock it down */
spin_lock_irqsave(&priv->txlock, flags);
spin_lock(&priv->rxlock);
spin_lock_irqsave(&priv->lock, flags);

gfar_halt(dev);

spin_unlock(&priv->rxlock);
spin_unlock_irqrestore(&priv->txlock, flags);
spin_unlock_irqrestore(&priv->lock, flags);

/* Free the IRQs */
if (priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_MULTI_INTR) {
Expand Down Expand Up @@ -608,15 +605,14 @@ void gfar_start(struct net_device *dev)
tempval |= DMACTRL_INIT_SETTINGS;
gfar_write(&priv->regs->dmactrl, tempval);

/* Clear THLT, so that the DMA starts polling now */
gfar_write(&regs->tstat, TSTAT_CLEAR_THALT);

/* Make sure we aren't stopped */
tempval = gfar_read(&priv->regs->dmactrl);
tempval &= ~(DMACTRL_GRS | DMACTRL_GTS);
gfar_write(&priv->regs->dmactrl, tempval);

/* Clear THLT/RHLT, so that the DMA starts polling now */
gfar_write(&regs->tstat, TSTAT_CLEAR_THALT);
gfar_write(&regs->rstat, RSTAT_CLEAR_RHALT);

/* Unmask the interrupts we look for */
gfar_write(&regs->imask, IMASK_DEFAULT);
}
Expand Down Expand Up @@ -932,13 +928,12 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
struct txfcb *fcb = NULL;
struct txbd8 *txbdp;
u16 status;
unsigned long flags;

/* Update transmit stats */
priv->stats.tx_bytes += skb->len;

/* Lock priv now */
spin_lock_irqsave(&priv->txlock, flags);
spin_lock_irq(&priv->lock);

/* Point at the first free tx descriptor */
txbdp = priv->cur_tx;
Expand Down Expand Up @@ -1009,7 +1004,7 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev)
gfar_write(&priv->regs->tstat, TSTAT_CLEAR_THALT);

/* Unlock priv */
spin_unlock_irqrestore(&priv->txlock, flags);
spin_unlock_irq(&priv->lock);

return 0;
}
Expand Down Expand Up @@ -1054,7 +1049,7 @@ static void gfar_vlan_rx_register(struct net_device *dev,
unsigned long flags;
u32 tempval;

spin_lock_irqsave(&priv->rxlock, flags);
spin_lock_irqsave(&priv->lock, flags);

priv->vlgrp = grp;

Expand All @@ -1081,7 +1076,7 @@ static void gfar_vlan_rx_register(struct net_device *dev,
gfar_write(&priv->regs->rctrl, tempval);
}

spin_unlock_irqrestore(&priv->rxlock, flags);
spin_unlock_irqrestore(&priv->lock, flags);
}


Expand All @@ -1090,12 +1085,12 @@ static void gfar_vlan_rx_kill_vid(struct net_device *dev, uint16_t vid)
struct gfar_private *priv = netdev_priv(dev);
unsigned long flags;

spin_lock_irqsave(&priv->rxlock, flags);
spin_lock_irqsave(&priv->lock, flags);

if (priv->vlgrp)
priv->vlgrp->vlan_devices[vid] = NULL;

spin_unlock_irqrestore(&priv->rxlock, flags);
spin_unlock_irqrestore(&priv->lock, flags);
}


Expand Down Expand Up @@ -1184,7 +1179,7 @@ static irqreturn_t gfar_transmit(int irq, void *dev_id, struct pt_regs *regs)
gfar_write(&priv->regs->ievent, IEVENT_TX_MASK);

/* Lock priv */
spin_lock(&priv->txlock);
spin_lock(&priv->lock);
bdp = priv->dirty_tx;
while ((bdp->status & TXBD_READY) == 0) {
/* If dirty_tx and cur_tx are the same, then either the */
Expand Down Expand Up @@ -1229,7 +1224,7 @@ static irqreturn_t gfar_transmit(int irq, void *dev_id, struct pt_regs *regs)
else
gfar_write(&priv->regs->txic, 0);

spin_unlock(&priv->txlock);
spin_unlock(&priv->lock);

return IRQ_HANDLED;
}
Expand Down Expand Up @@ -1310,10 +1305,9 @@ irqreturn_t gfar_receive(int irq, void *dev_id, struct pt_regs *regs)
{
struct net_device *dev = (struct net_device *) dev_id;
struct gfar_private *priv = netdev_priv(dev);

#ifdef CONFIG_GFAR_NAPI
u32 tempval;
#else
unsigned long flags;
#endif

/* Clear IEVENT, so rx interrupt isn't called again
Expand All @@ -1336,7 +1330,7 @@ irqreturn_t gfar_receive(int irq, void *dev_id, struct pt_regs *regs)
}
#else

spin_lock_irqsave(&priv->rxlock, flags);
spin_lock(&priv->lock);
gfar_clean_rx_ring(dev, priv->rx_ring_size);

/* If we are coalescing interrupts, update the timer */
Expand All @@ -1347,7 +1341,7 @@ irqreturn_t gfar_receive(int irq, void *dev_id, struct pt_regs *regs)
else
gfar_write(&priv->regs->rxic, 0);

spin_unlock_irqrestore(&priv->rxlock, flags);
spin_unlock(&priv->lock);
#endif

return IRQ_HANDLED;
Expand Down Expand Up @@ -1496,6 +1490,13 @@ int gfar_clean_rx_ring(struct net_device *dev, int rx_work_limit)
/* Update the current rxbd pointer to be the next one */
priv->cur_rx = bdp;

/* If no packets have arrived since the
* last one we processed, clear the IEVENT RX and
* BSY bits so that another interrupt won't be
* generated when we set IMASK */
if (bdp->status & RXBD_EMPTY)
gfar_write(&priv->regs->ievent, IEVENT_RX_MASK);

return howmany;
}

Expand All @@ -1515,7 +1516,7 @@ static int gfar_poll(struct net_device *dev, int *budget)
rx_work_limit -= howmany;
*budget -= howmany;

if (rx_work_limit > 0) {
if (rx_work_limit >= 0) {
netif_rx_complete(dev);

/* Clear the halt bit in RSTAT */
Expand All @@ -1532,8 +1533,7 @@ static int gfar_poll(struct net_device *dev, int *budget)
gfar_write(&priv->regs->rxic, 0);
}

/* Return 1 if there's more work to do */
return (rx_work_limit > 0) ? 0 : 1;
return (rx_work_limit < 0) ? 1 : 0;
}
#endif

Expand Down Expand Up @@ -1629,7 +1629,7 @@ static void adjust_link(struct net_device *dev)
struct phy_device *phydev = priv->phydev;
int new_state = 0;

spin_lock_irqsave(&priv->txlock, flags);
spin_lock_irqsave(&priv->lock, flags);
if (phydev->link) {
u32 tempval = gfar_read(&regs->maccfg2);
u32 ecntrl = gfar_read(&regs->ecntrl);
Expand Down Expand Up @@ -1694,7 +1694,7 @@ static void adjust_link(struct net_device *dev)
if (new_state && netif_msg_link(priv))
phy_print_status(phydev);

spin_unlock_irqrestore(&priv->txlock, flags);
spin_unlock_irqrestore(&priv->lock, flags);
}

/* Update the hash table based on the current list of multicast
Expand Down
67 changes: 21 additions & 46 deletions trunk/drivers/net/gianfar.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -656,62 +656,43 @@ struct gfar {
* the buffer descriptor determines the actual condition.
*/
struct gfar_private {
/* Fields controlled by TX lock */
spinlock_t txlock;

/* Pointer to the array of skbuffs */
/* pointers to arrays of skbuffs for tx and rx */
struct sk_buff ** tx_skbuff;
struct sk_buff ** rx_skbuff;

/* next free skb in the array */
/* indices pointing to the next free sbk in skb arrays */
u16 skb_curtx;
u16 skb_currx;

/* First skb in line to be transmitted */
/* index of the first skb which hasn't been transmitted
* yet. */
u16 skb_dirtytx;

/* Configuration info for the coalescing features */
unsigned char txcoalescing;
unsigned short txcount;
unsigned short txtime;

/* Buffer descriptor pointers */
struct txbd8 *tx_bd_base; /* First tx buffer descriptor */
struct txbd8 *cur_tx; /* Next free ring entry */
struct txbd8 *dirty_tx; /* First buffer in line
to be transmitted */
unsigned int tx_ring_size;

/* RX Locked fields */
spinlock_t rxlock;

/* skb array and index */
struct sk_buff ** rx_skbuff;
u16 skb_currx;

/* RX Coalescing values */
unsigned char rxcoalescing;
unsigned short rxcount;
unsigned short rxtime;

struct rxbd8 *rx_bd_base; /* First Rx buffers */
/* GFAR addresses */
struct rxbd8 *rx_bd_base; /* Base addresses of Rx and Tx Buffers */
struct txbd8 *tx_bd_base;
struct rxbd8 *cur_rx; /* Next free rx ring entry */

/* RX parameters */
unsigned int rx_ring_size;
struct txbd8 *cur_tx; /* Next free ring entry */
struct txbd8 *dirty_tx; /* The Ring entry to be freed. */
struct gfar __iomem *regs; /* Pointer to the GFAR memory mapped Registers */
u32 __iomem *hash_regs[16];
int hash_width;
struct net_device_stats stats; /* linux network statistics */
struct gfar_extra_stats extra_stats;
spinlock_t lock;
unsigned int rx_buffer_size;
unsigned int rx_stash_size;
unsigned int rx_stash_index;

struct vlan_group *vlgrp;

/* Unprotected fields */
/* Pointer to the GFAR memory mapped Registers */
struct gfar __iomem *regs;

/* Hash registers and their width */
u32 __iomem *hash_regs[16];
int hash_width;

/* global parameters */
unsigned int tx_ring_size;
unsigned int rx_ring_size;
unsigned int fifo_threshold;
unsigned int fifo_starve;
unsigned int fifo_starve_off;
Expand All @@ -721,26 +702,20 @@ struct gfar_private {
extended_hash:1,
bd_stash_en:1;
unsigned short padding;

struct vlan_group *vlgrp;
/* Info structure initialized by board setup code */
unsigned int interruptTransmit;
unsigned int interruptReceive;
unsigned int interruptError;

/* info structure initialized by platform code */
struct gianfar_platform_data *einfo;

/* PHY stuff */
struct phy_device *phydev;
struct mii_bus *mii_bus;
int oldspeed;
int oldduplex;
int oldlink;

uint32_t msg_enable;

/* Network Statistics */
struct net_device_stats stats;
struct gfar_extra_stats extra_stats;
};

static inline u32 gfar_read(volatile unsigned __iomem *addr)
Expand Down
20 changes: 6 additions & 14 deletions trunk/drivers/net/gianfar_ethtool.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -455,14 +455,10 @@ static int gfar_sringparam(struct net_device *dev, struct ethtool_ringparam *rva

/* Halt TX and RX, and process the frames which
* have already been received */
spin_lock_irqsave(&priv->txlock, flags);
spin_lock(&priv->rxlock);

spin_lock_irqsave(&priv->lock, flags);
gfar_halt(dev);
gfar_clean_rx_ring(dev, priv->rx_ring_size);

spin_unlock(&priv->rxlock);
spin_unlock_irqrestore(&priv->txlock, flags);
spin_unlock_irqrestore(&priv->lock, flags);

/* Now we take down the rings to rebuild them */
stop_gfar(dev);
Expand Down Expand Up @@ -492,14 +488,10 @@ static int gfar_set_rx_csum(struct net_device *dev, uint32_t data)

/* Halt TX and RX, and process the frames which
* have already been received */
spin_lock_irqsave(&priv->txlock, flags);
spin_lock(&priv->rxlock);

spin_lock_irqsave(&priv->lock, flags);
gfar_halt(dev);
gfar_clean_rx_ring(dev, priv->rx_ring_size);

spin_unlock(&priv->rxlock);
spin_unlock_irqrestore(&priv->txlock, flags);
spin_unlock_irqrestore(&priv->lock, flags);

/* Now we take down the rings to rebuild them */
stop_gfar(dev);
Expand Down Expand Up @@ -531,7 +523,7 @@ static int gfar_set_tx_csum(struct net_device *dev, uint32_t data)
if (!(priv->einfo->device_flags & FSL_GIANFAR_DEV_HAS_CSUM))
return -EOPNOTSUPP;

spin_lock_irqsave(&priv->txlock, flags);
spin_lock_irqsave(&priv->lock, flags);
gfar_halt(dev);

if (data)
Expand All @@ -540,7 +532,7 @@ static int gfar_set_tx_csum(struct net_device *dev, uint32_t data)
dev->features &= ~NETIF_F_IP_CSUM;

gfar_start(dev);
spin_unlock_irqrestore(&priv->txlock, flags);
spin_unlock_irqrestore(&priv->lock, flags);

return 0;
}
Expand Down
Loading

0 comments on commit 3076267

Please sign in to comment.