net driver fixes
Subsystems (2)
PATCH 1/1 net driver fixes
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
to receive the following updates:
drivers/net/b44.c | 64 ++++++--------- drivers/net/bnx2.c | 2 drivers/net/hydra.h | 177 ------------------------------------------ drivers/net/ixgb/ixgb_main.c | 13 ++- drivers/net/mv643xx_eth.c | 19 +++- drivers/net/natsemi.c | 2 drivers/net/pcmcia/axnet_cs.c | 2 drivers/net/skge.c | 2 drivers/net/sky2.c | 6 - drivers/net/sky2.h | 2 drivers/net/starfire.c | 2 drivers/net/typhoon.c | 2 drivers/net/via-rhine.c | 7 - 13 files changed, 67 insertions(+), 233 deletions(-)
Adrian Bunk:
drivers/net/via-rhine.c: make a function static remove drivers/net/hydra.h
Andreas Schwab:
Use pci_set_consistent_dma_mask in ixgb driver
Brent Cook:
mv643xx_eth: Always free completed tx descs on tx interrupt
Dale Farnsworth:
mv643xx_eth: Fix tx_timeout to only conditionally wake tx queue
Gary Zambrano:
b44: disable default tx pause
b44: increase version to 1.00
Jeff Garzik:
[netdrvr b44] trim trailing whitespace
Komuro:
network: axnet_cs.c: add missing 'PRIV' in ei_rx_overrun
Randy Dunlap:
net drivers: fix section attributes for gcc
Roger Luethi:
via-rhine: execute bounce buffers code on Rhine-I only
Stephen Hemminger:
dlink pci cards using wrong driver
sky2: bad memory reference on dual port cards
drivers/net/b44.c +29 -35
@@ -2,6 +2,7 @@* * Copyright (C) 2002 David S. Miller ([email protected]) * Fixed by Pekka Pietikainen ([email protected]) +* Copyright (C) 2006 Broadcom Corporation. * * Distribute under GPL. */
@@ -28,8 +29,8 @@#define DRV_MODULE_NAME "b44"#define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "0.97" -#define DRV_MODULE_RELDATE "Nov 30, 2005" +#define DRV_MODULE_VERSION "1.00" +#define DRV_MODULE_RELDATE "Apr 7, 2006"#define B44_DEF_MSG_ENABLE \ (NETIF_MSG_DRV | \
@@ -136,7 +137,7 @@ static inline unsigned long br32(const sreturn readl (bp->regs + reg); } -static inline void bw32 (const struct b44 *bp, +static inline void bw32 (const struct b44 *bp,unsigned long reg,unsigned long val) {writel (val, bp->regs + reg);
@@ -286,13 +287,13 @@ static void __b44_cam_write(struct b44 * val |= ((u32 ) data[4 ]) <<8 ; val |= ((u32 ) data[5 ]) <<0 ;bw32 (bp,B44_CAM_DATA_LO , val); - val = (CAM_DATA_HI_VALID | + val = (CAM_DATA_HI_VALID | (((u32 ) data[0 ]) <<8 ) | (((u32 ) data[1 ]) <<0 ));bw32 (bp,B44_CAM_DATA_HI , val);bw32 (bp,B44_CAM_CTRL , (CAM_CTRL_WRITE | (index <<CAM_CTRL_INDEX_SHIFT ))); -b44_wait_bit (bp,B44_CAM_CTRL ,CAM_CTRL_BUSY ,100 ,1 ); +b44_wait_bit (bp,B44_CAM_CTRL ,CAM_CTRL_BUSY ,100 ,1 ); }static inline void __b44_disable_ints (struct b44 *bp)
@@ -410,25 +411,18 @@ static void __b44_set_flow_ctrl(struct bstatic void b44_set_flow_ctrl (struct b44 *bp,u32 local,u32 remote) { -u32 pause_enab = bp->flags & (B44_FLAG_TX_PAUSE | -B44_FLAG_RX_PAUSE ); +u32 pause_enab =0 ; -if (local &ADVERTISE_PAUSE_CAP ) { -if (local &ADVERTISE_PAUSE_ASYM ) { -if (remote &LPA_PAUSE_CAP ) - pause_enab |= (B44_FLAG_TX_PAUSE | -B44_FLAG_RX_PAUSE ); -else if (remote &LPA_PAUSE_ASYM ) - pause_enab |=B44_FLAG_RX_PAUSE ; - }else { -if (remote &LPA_PAUSE_CAP ) - pause_enab |= (B44_FLAG_TX_PAUSE | -B44_FLAG_RX_PAUSE ); - } - }else if (local &ADVERTISE_PAUSE_ASYM ) { -if ((remote &LPA_PAUSE_CAP ) && - (remote &LPA_PAUSE_ASYM )) - pause_enab |=B44_FLAG_TX_PAUSE ; +/* The driver supports only rx pause by default because +the b44 mac tx pause mechanism generates excessive +pause frames. +Use ethtool to turn on b44 tx pause if necessary. +*/ +if ((local &ADVERTISE_PAUSE_CAP ) && + (local &ADVERTISE_PAUSE_ASYM )){ +if ((remote &LPA_PAUSE_ASYM ) && + !(remote &LPA_PAUSE_CAP )) + pause_enab |=B44_FLAG_RX_PAUSE ; }__b44_set_flow_ctrl (bp, pause_enab);
@@ -1063,7 +1057,7 @@ static int b44_change_mtu(struct net_devspin_unlock_irq (&bp->lock);b44_enable_ints (bp); - +return 0 ; }
@@ -1381,7 +1375,7 @@ static void b44_init_hw(struct b44 *bp)bw32 (bp,B44_DMARX_ADDR , bp->rx_ring_dma + bp->dma_offset);bw32 (bp,B44_DMARX_PTR , bp->rx_pending); - bp->rx_prod = bp->rx_pending; + bp->rx_prod = bp->rx_pending;bw32 (bp,B44_MIB_CTRL ,MIB_CTRL_CLR_ON_READ );
@@ -1553,9 +1547,9 @@ static void __b44_set_rx_mode(struct net val |=RXCONFIG_ALLMULTI ; else i =__b44_load_mcast (bp, dev); - +for (; i <64 ; i++) { -__b44_cam_write (bp, zero, i); +__b44_cam_write (bp, zero, i); }bw32 (bp,B44_RXCONFIG , val); val =br32 (bp,B44_CAM_CTRL );
@@ -1737,7 +1731,7 @@ static int b44_set_ringparam(struct net_spin_unlock_irq (&bp->lock);b44_enable_ints (bp); - +return 0 ; }
@@ -1782,7 +1776,7 @@ static int b44_set_pauseparam(struct netspin_unlock_irq (&bp->lock);b44_enable_ints (bp); - +return 0 ; }
@@ -1898,7 +1892,7 @@ static int __devinit b44_get_invariants( bp->core_unit =ssb_core_unit (bp); bp->dma_offset =SB_PCI_DMA ; -/* XXX - really required? +/* XXX - really required? bp->flags |= B44_FLAG_BUGGY_TXPTR; */ out:
@@ -1946,7 +1940,7 @@ static int __devinit b44_init_one(struct "aborting.\n"); goto err_out_free_res; } - + err =pci_set_consistent_dma_mask (pdev, (u64 )B44_DMA_MASK );if (err) { printk(KERN_ERR PFX "No usable DMA configuration, "
@@ -2041,9 +2035,9 @@ static int __devinit b44_init_one(structpci_save_state (bp->pdev); -/* Chip reset provides power to the b44 MAC & PCI cores, which +/* Chip reset provides power to the b44 MAC & PCI cores, which * is necessary for MAC register access. -*/ +*/ b44_chip_reset (bp);printk (KERN_INFO "%s: Broadcom 4400 10/100BaseT Ethernet " , dev->name);
@@ -2091,10 +2085,10 @@ static int b44_suspend(struct pci_dev *pdel_timer_sync (&bp->timer); -spin_lock_irq (&bp->lock); +spin_lock_irq (&bp->lock);b44_halt (bp); -netif_carrier_off (bp->dev); +netif_carrier_off (bp->dev);netif_device_detach (bp->dev);b44_free_rings (bp);
drivers/net/bnx2.c +1 -1
@@ -63,7 +63,7 @@/* Time in jiffies before concluding the transmitter is hung. */ #define TX_TIMEOUT (5*HZ) -static char version[]__devinitdata = +static const char version[]__devinitdata ="Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n" ;MODULE_AUTHOR ("Michael Chan <[email protected]>" );
drivers/net/hydra.h deleted +0 -177
177 lines not on this page · raw message
drivers/net/ixgb/ixgb_main.c +9 -4
@@ -357,18 +357,20 @@ ixgb_probe(struct pci_dev *pdev,if ((err =pci_enable_device (pdev)))return err; -if (!(err =pci_set_dma_mask (pdev,DMA_64BIT_MASK ))) { +if (!(err =pci_set_dma_mask (pdev,DMA_64BIT_MASK )) && + !(err =pci_set_consistent_dma_mask (pdev,DMA_64BIT_MASK ))) { pci_using_dac =1 ; }else { -if ((err =pci_set_dma_mask (pdev,DMA_32BIT_MASK ))) { +if ((err =pci_set_dma_mask (pdev,DMA_32BIT_MASK )) || + (err =pci_set_consistent_dma_mask (pdev,DMA_32BIT_MASK ))) {IXGB_ERR ("No usable DMA configuration, aborting\n" ); -return err; + goto err_dma_mask; } pci_using_dac =0 ; }if ((err =pci_request_regions (pdev, ixgb_driver_name))) -return err; + goto err_request_regions;pci_set_master (pdev);
@@ -502,6 +504,9 @@ err_ioremap:free_netdev (netdev); err_alloc_etherdev:pci_release_regions (pdev); +err_request_regions: +err_dma_mask: +pci_disable_device (pdev);return err; }
drivers/net/mv643xx_eth.c +15 -4
@@ -281,10 +281,16 @@ static void mv643xx_eth_tx_timeout_task( {struct mv643xx_private *mp =netdev_priv (dev); -netif_device_detach (dev); +if (!netif_running (dev)) +return ; + +netif_stop_queue (dev); +eth_port_reset (mp->port_num);eth_port_start (dev); -netif_device_attach (dev); + +if (mp->tx_ring_size - mp->tx_desc_count >=MAX_DESCS_PER_SKB ) +netif_wake_queue (dev); }/**
@@ -552,9 +558,9 @@ static irqreturn_t mv643xx_eth_int_handl#else if (eth_int_cause Ð_INT_CAUSE_RX )mv643xx_eth_receive_queue (dev,INT_MAX ); +#endif if (eth_int_cause_ext Ð_INT_CAUSE_TX )mv643xx_eth_free_completed_tx_descs (dev); -#endif /* * If no real interrupt occured, exit.
@@ -1186,7 +1192,12 @@ static int mv643xx_eth_start_xmit(structBUG_ON (netif_queue_stopped (dev));BUG_ON (skb ==NULL ); -BUG_ON (mp->tx_ring_size - mp->tx_desc_count <MAX_DESCS_PER_SKB ); + +if (mp->tx_ring_size - mp->tx_desc_count <MAX_DESCS_PER_SKB ) { +printk (KERN_ERR "%s: transmit with queue full\n" , dev->name); +netif_stop_queue (dev); +return 1 ; + }if (has_tiny_unaligned_frags (skb)) {if ((skb_linearize (skb,GFP_ATOMIC ) !=0 )) {
drivers/net/natsemi.c +1 -1
@@ -238,7 +238,7 @@ static int full_duplex[MAX_UNITS];#define NATSEMI_RX_LIMIT 2046/* maximum supported by hardware */ /* These identify the driver base version and may not be removed. */ -static char version[]__devinitdata = +static const char version[]__devinitdata = KERN_INFO DRV_NAME " dp8381x driver, version "DRV_VERSION ", " DRV_RELDATE "\n" KERN_INFO " originally by Donald Becker <[email protected]>\n"
drivers/net/pcmcia/axnet_cs.c +1 -1
@@ -1560,7 +1560,7 @@ static void ei_receive(struct net_devicestatic void ei_rx_overrun (struct net_device *dev) { -axnet_dev_t *info = (axnet_dev_t *)dev; +axnet_dev_t *info =PRIV (dev);long e8390_base = dev->base_addr;unsigned char was_txing, must_resend =0 ;struct ei_device *ei_local = (struct ei_device *)netdev_priv (dev);
drivers/net/skge.c +2 -0
@@ -78,6 +78,8 @@ static const struct pci_device_id skge_i { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_GE) }, { PCI_DEVICE(PCI_VENDOR_ID_SYSKONNECT, PCI_DEVICE_ID_SYSKONNECT_YU) }, { PCI_DEVICE(PCI_VENDOR_ID_DLINK, PCI_DEVICE_ID_DLINK_DGE510T), }, + { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b00) }, + { PCI_DEVICE(PCI_VENDOR_ID_DLINK, 0x4b01) }, { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x4320) }, { PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0x5005) }, /* Belkin */ { PCI_DEVICE(PCI_VENDOR_ID_CNET, PCI_DEVICE_ID_CNET_GIGACARD) },
drivers/net/sky2.c +2 -4
@@ -99,8 +99,6 @@ MODULE_PARM_DESC(disable_msi, "Disable Mstatic const struct pci_device_id sky2_id_table[] = { {PCI_DEVICE (PCI_VENDOR_ID_SYSKONNECT ,0x9000 ) }, {PCI_DEVICE (PCI_VENDOR_ID_SYSKONNECT ,0x9E00 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_DLINK ,0x4b00 ) }, - {PCI_DEVICE (PCI_VENDOR_ID_DLINK ,0x4b01 ) }, {PCI_DEVICE (PCI_VENDOR_ID_MARVELL ,0x4340 ) }, {PCI_DEVICE (PCI_VENDOR_ID_MARVELL ,0x4341 ) }, {PCI_DEVICE (PCI_VENDOR_ID_MARVELL ,0x4342 ) },
@@ -579,8 +577,8 @@ static void sky2_mac_init(struct sky2_hw reg =gma_read16 (hw, port,GM_PHY_ADDR );gma_write16 (hw, port,GM_PHY_ADDR , reg |GM_PAR_MIB_CLR ); -for (i =0 ; i <GM_MIB_CNT_SIZE ; i++) -gma_read16 (hw, port,GM_MIB_CNT_BASE +8 * i); +for (i =GM_MIB_CNT_BASE ; i <=GM_MIB_CNT_END ; i +=4 ) +gma_read16 (hw, port, i);gma_write16 (hw, port,GM_PHY_ADDR , reg);/* transmit control */
drivers/net/sky2.h +1 -1
@@ -1375,7 +1375,7 @@ enum {GM_PHY_ADDR =0x0088 ,/* 16 bit r/w GPHY Address Register */ /* MIB Counters */ GM_MIB_CNT_BASE =0x0100 ,/* Base Address of MIB Counters */ - GM_MIB_CNT_SIZE = 256, + GM_MIB_CNT_END = 0x025C, /* Last MIB counter */ };
drivers/net/starfire.c +1 -1
@@ -335,7 +335,7 @@ do { \/* These identify the driver base version and may not be removed. */ -static char version[]__devinitdata = +static const char version[]__devinitdata =KERN_INFO "starfire.c:v1.03 7/26/2000 Written by Donald Becker <[email protected]>\n" KERN_INFO " (unofficial 2.2/2.4 kernel port, version " DRV_VERSION ", " DRV_RELDATE ")\n" ;
drivers/net/typhoon.c +1 -1
@@ -134,7 +134,7 @@ static const int multicast_filter_limit#include "typhoon.h" #include "typhoon-firmware.h" -static char version[]__devinitdata = +static const char version[]__devinitdata ="typhoon.c: version " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n" ;MODULE_AUTHOR ("David Dillow <[email protected]>" );
drivers/net/via-rhine.c +4 -3
@@ -469,7 +469,7 @@ struct rhine_private {struct sk_buff *tx_skbuff[TX_RING_SIZE ];dma_addr_t tx_skbuff_dma[TX_RING_SIZE ]; -/* Tx bounce buffers */ +/* Tx bounce buffers (Rhine-I only) */ unsigned char *tx_buf[TX_RING_SIZE ];unsigned char *tx_bufs;dma_addr_t tx_bufs_dma;
@@ -1043,7 +1043,8 @@ static void alloc_tbufs(struct net_devic rp->tx_ring[i].desc_length =cpu_to_le32 (TXDESC ); next +=sizeof (struct tx_desc ); rp->tx_ring[i].next_desc =cpu_to_le32 (next); - rp->tx_buf[i] = &rp->tx_bufs[i *PKT_BUF_SZ ]; +if (rp->quirks & rqRhineI) + rp->tx_buf[i] = &rp->tx_bufs[i *PKT_BUF_SZ ]; } rp->tx_ring[i-1 ].next_desc =cpu_to_le32 (rp->tx_ring_dma);
@@ -1091,7 +1092,7 @@ static void rhine_check_media(struct net }/* Called after status of force_media possibly changed */ -void rhine_set_carrier (struct mii_if_info *mii) +static void rhine_set_carrier (struct mii_if_info *mii) {if (mii->force_media) {/* autoneg is off: Link is always assumed to be up */
Jeff,
Noticed Andy's gianfar fixes aren't in here. I'd be good to see if we can get them in for 2.6.17
- kumar
Quoted 54 lines · Jeff Garzik
Please pull from 'upstream-linus' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
to receive the following updates:
drivers/net/b44.c | 64 ++++++--------- drivers/net/bnx2.c | 2 drivers/net/hydra.h | 177 ------------------------------------------ drivers/net/ixgb/ixgb_main.c | 13 ++- drivers/net/mv643xx_eth.c | 19 +++- drivers/net/natsemi.c | 2 drivers/net/pcmcia/axnet_cs.c | 2 drivers/net/skge.c | 2 drivers/net/sky2.c | 6 - drivers/net/sky2.h | 2 drivers/net/starfire.c | 2 drivers/net/typhoon.c | 2 drivers/net/via-rhine.c | 7 - 13 files changed, 67 insertions(+), 233 deletions(-)Adrian Bunk:
drivers/net/via-rhine.c: make a function static removedrivers/net/hydra.hAndreas Schwab:
Usepci_set_consistent_dma_maskin ixgb driverBrent Cook:
mv643xx_eth: Always free completed tx descs on tx interruptDale Farnsworth:
mv643xx_eth: Fixtx_timeoutto only conditionally wake tx queueGary Zambrano:
b44: disable default tx pause
b44: increase version to 1.00Jeff Garzik:
[netdrvr b44] trim trailing whitespaceKomuro:
network:axnet_cs.c: add missing 'PRIV' inei_rx_overrunRandy Dunlap:
net drivers: fix section attributes for gccRoger Luethi:
via-rhine: execute bounce buffers code on Rhine-I onlyStephen Hemminger:
dlink pci cards using wrong driver
sky2: bad memory reference on dual port cards
Quoted 3 lines · Kumar Gala
Jeff,
Noticed Andy's gianfar fixes aren't in here. I'd be good to see if we can get them in for 2.6.17
Never saw them...
Quoted 5 lines · Jeff Garzik
Quoted 2 lines · Kumar Gala
Jeff,
Noticed Andy's gianfar fixes aren't in here. I'd be good to see if we can get them in for 2.6.17Never saw them...
Odd, posted to netdev, Andy may not have copied you on them.
http://marc.theaimsgroup.com/?l=linux-netdev&m=114437381506340&w=2
Quoted 4 lines · Kumar Gala
Quoted 1 line · Jeff Garzik
Kumar Gala wrote:
Quoted 8 lines
Quoted 4 lines
Quoted 2 lines
Jeff,
Noticed Andy's gianfar fixes aren't in here. I'd be good to see if we can get them in for 2.6.17Never saw them...
Odd, posted to netdev, Andy may not have copied you on them.
http://marc.theaimsgroup.com/?l=linux-netdev&m=114437381506340&w=2
That's fine, but I don't have it. Please resend, git-applymbox doesn't work on URLs.
Jeff