net driver updates
Subsystems (5)
PATCH 1/1 net driver updates
Please pull from the 'upstream' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git upstream
to receive the following changes:
Adrian Bunk (1):
drivers/net/cxgb3/xgmac.c: remove dead code
Chris Snook (1):
atl1: explain 32-bit DMA restriction
Ed Swierk (1):
forcedeth: "no link" is informational
Jeff Garzik (1):
[netdrvr] sundance: fix phy scanning on IP100A
Jesper Juhl (1):
Avoid possible NULL pointer deref in 3c359 driver
Krishna Kumar (1):
e1000e: Do not allow requeue of freed skb
Maciej W. Rozycki (5):
sb1250-mac.c: De-typedef, de-volatile, de-etc...
sb1250-mac: Driver model & phylib update
PHYLIB: Spinlock fixes for softirqs
PHYLIB: IRQ event workqueue handling fixes
PHYLIB: fix an interrupt loop potential when halting
Magnus Damm (1):
ax88796: add 93cx6 eeprom support
Mariusz Kozlowski (1):
skge: remove broken and unused PHY_M_PC_MDI_XMODE macro
Micah Gruber (1):
Fix a potential NULL pointer dereference in uli526x_interrupt() in drivers/net/tulip/uli526x.c
Nathanael Nerode (1):
dgrs: remove from build, config, and maintainer list
Olof Johansson (4):
pasemi_mac: set interface speed correctly on XAUI ports
pasemi_mac: flags as passed to spin_*_irqsave() should be unsigned long
pasemi_mac: don't enable rx before there are buffers on the ring
pasemi_mac: pass in count of buffers to replenish rx ring with
Peter Oruba (1):
PCI-X/PCI-Express read control interfaces: use them in e1000
Roy Zang (1):
Clean up redundant PHY write line for ULi526x Ethernet driver
Stephen Hemminger (2):
via-velocity: use standard VLAN interface (resend)
via-velocity: more cleanup
Vitaly Bordug (1):
PHY fixed driver: rework release path and update phy_id notation
Documentation/networking/dgrs.txt | 52 MAINTAINERS | 6 drivers/net/Kconfig | 23 drivers/net/Makefile | 1 drivers/net/atl1/atl1_main.c | 10 drivers/net/ax88796.c | 49 drivers/net/cxgb3/xgmac.c | 5 drivers/net/dgrs.c | 1593 ------ drivers/net/dgrs.h | 38 drivers/net/dgrs_asstruct.h | 37 drivers/net/dgrs_bcomm.h | 148 drivers/net/dgrs_es4h.h | 183 drivers/net/dgrs_ether.h | 135 drivers/net/dgrs_firmware.c | 9966 -------------------------------------- drivers/net/dgrs_i82596.h | 473 - drivers/net/dgrs_plx9060.h | 175 drivers/net/e1000/e1000_hw.c | 25 drivers/net/e1000/e1000_hw.h | 2 drivers/net/e1000/e1000_main.c | 14 drivers/net/e1000e/netdev.c | 2 drivers/net/forcedeth.c | 2 drivers/net/pasemi_mac.c | 43 drivers/net/phy/Kconfig | 14 drivers/net/phy/fixed.c | 310 - drivers/net/phy/phy.c | 52 drivers/net/phy/phy_device.c | 4 drivers/net/sb1250-mac.c | 1367 ++--- drivers/net/skge.h | 2 drivers/net/sundance.c | 14 drivers/net/tokenring/3c359.c | 5 drivers/net/tulip/uli526x.c | 6 drivers/net/via-velocity.c | 247 drivers/net/via-velocity.h | 207 include/linux/eeprom_93cx6.h | 3 include/linux/phy.h | 3 include/linux/phy_fixed.h | 38 include/net/ax88796.h | 1 37 files changed, 1233 insertions(+), 14022 deletions(-)
Documentation/networking/dgrs.txt deleted +0 -52
@@ -1,52 +0,0 @@ - The Digi International RightSwitch SE-X (dgrs) Device Driver - -This is a Linux driver for the Digi International RightSwitch SE-X -EISA and PCI boards. These are 4 (EISA) or 6 (PCI) port Ethernet -switches and a NIC combined into a single board. This driver can -be compiled into the kernel statically or as a loadable module. - -There is also a companion management tool, called "xrightswitch". -The management tool lets you watch the performance graphically, -as well as set the SNMP agent IP and IPX addresses, IEEE Spanning -Tree, and Aging time. These can also be set from the command line -when the driver is loaded. The driver command line options are: - - debug=NNN Debug printing level - dma=0/1 Disable/Enable DMA on PCI card - spantree=0/1 Disable/Enable IEEE spanning tree - hashexpire=NNN Change address aging time (default 300 seconds) - ipaddr=A,B,C,D Set SNMP agent IP address i.e. 199,86,8,221 - iptrap=A,B,C,D Set SNMP agent IP trap address i.e. 199,86,8,221 - ipxnet=NNN Set SNMP agent IPX network number - nicmode=0/1 Disable/Enable multiple NIC mode - -There is also a tool for setting up input and output packet filters -on each port, called "dgrsfilt". - -Both the management tool and the filtering tool are available -separately from the following FTP site: - - ftp://ftp.dgii.com/drivers/rightswitch/linux/ - -When nicmode=1, the board and driver operate as 4 or 6 individual -NIC ports (eth0...eth5) instead of as a switch. All switching -functions are disabled. In the future, the board firmware may include -a routing cache when in this mode. - -Copyright 1995-1996 Digi International Inc. - -This software may be used and distributed according to the terms -of the GNU General Public License, incorporated herein by reference. - -For information on purchasing a RightSwitch SE-4 or SE-6 -board, please contact Digi's sales department at 1-612-912-3444 -or 1-800-DIGIBRD. Outside the U.S., please check our Web page at: - - http://www.dgii.com - -for sales offices worldwide. Tech support is also available through -the channels listed on the Web site, although as long as I am -employed on networking products at Digi I will be happy to provide -any bug fixes that may be needed. - --Rick Richardson, [email protected]
MAINTAINERS +0 -6
@@ -1274,12 +1274,6 @@ L: [email protected] W: http://www.digi.com S: Orphaned -DIGI RIGHTSWITCH NETWORK DRIVER -P: Rick Richardson -L: [email protected] -W: http://www.digi.com -S: Orphaned - DIRECTORY NOTIFICATION P: Stephen Rothwell M: [email protected]
drivers/net/Kconfig +8 -15
@@ -240,6 +240,13 @@ config AX88796 AX88796 driver, using platform bus to provide chip detection and resources +config AX88796_93CX6 + bool "ASIX AX88796 external 93CX6 eeprom support" + depends on AX88796 + select EEPROM_93CX6 + help + Select this if your platform comes with an external 93CX6 eeprom. + config MACE tristate "MACE (Power Mac ethernet) support" depends on PPC_PMAC && PPC32
@@ -1459,21 +1466,6 @@ config TC35815 depends on NET_PCI && PCI && MIPS select MII -config DGRS - tristate "Digi Intl. RightSwitch SE-X support" - depends on NET_PCI && (PCI || EISA) - ---help--- - This is support for the Digi International RightSwitch series of - PCI/EISA Ethernet switch cards. These include the SE-4 and the SE-6 - models. If you have a network card of this type, say Y and read the - Ethernet-HOWTO, available from - <http://www.tldp.org/docs.html#howto>. More specific - information is contained in <file:Documentation/networking/dgrs.txt>. - - To compile this driver as a module, choose M here and read - <file:Documentation/networking/net-modules.txt>. The module - will be called dgrs. - config EEPRO100 tristate "EtherExpressPro/100 support (eepro100, original Becker driver)" depends on NET_PCI && PCI
@@ -2126,6 +2118,7 @@ config R8169_VLAN config SB1250_MAC tristate "SB1250 Gigabit Ethernet support" depends on SIBYTE_SB1xxx_SOC + select PHYLIB ---help--- This driver supports Gigabit Ethernet interfaces based on the Broadcom SiByte family of System-On-a-Chip parts. They include
drivers/net/Makefile +0 -1
@@ -44,7 +44,6 @@ obj-$(CONFIG_SUNVNET) += sunvnet.o obj-$(CONFIG_MACE) += mace.o obj-$(CONFIG_BMAC) += bmac.o -obj-$(CONFIG_DGRS) += dgrs.o obj-$(CONFIG_VORTEX) += 3c59x.o obj-$(CONFIG_TYPHOON) += typhoon.o obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
drivers/net/atl1/atl1_main.c +8 -2
@@ -2209,8 +2209,14 @@ static int __devinit atl1_probe(struct pci_dev *pdev,return err;/* -* 64-bit DMA currently has data corruption problems, so let's just -* use 32-bit DMA for now. This is a big hack that is probably wrong. +* The atl1 chip can DMA to 64-bit addresses, but it uses a single +* shared register for the high 32 bits, so only a single, aligned, +* 4 GB physical address range can be used at a time. +* +* Supporting 64-bit DMA on this hardware is more trouble than it's +* worth. It is far easier to limit to 32-bit DMA than update +* various kernel subsystems to support the mechanics required by a +* fixed-high-32-bit system. */ err =pci_set_dma_mask (pdev,DMA_32BIT_MASK );if (err) {
drivers/net/ax88796.c +49 -0
67 lines not on this page · raw message
drivers/net/cxgb3/xgmac.c +1 -4
@@ -522,10 +522,7 @@ int t3b2_mac_watchdog_task(struct cmac *mac) goto rxcheck; } -if (((tx_tcnt != mac->tx_tcnt) && - (tx_xcnt ==0 ) && (mac->tx_xcnt ==0 )) || - ((mac->tx_mcnt == tx_mcnt) && - (tx_xcnt !=0 ) && (mac->tx_xcnt !=0 ))) { +if ((tx_tcnt != mac->tx_tcnt) && (mac->tx_xcnt ==0 )) {if (mac->toggle_cnt >4 ) { status =2 ; goto out;
drivers/net/dgrs.c deleted +0 -0
[SNIPPED AS OBVIOUS, for file size reasons]
drivers/net/dgrs.h deleted +0 -38
@@ -1,38 +0,0 @@ -/* -* ioctl's for the Digi Intl. RightSwitch -* -* These network driver ioctl's are a bit obtuse compared to the usual -* ioctl's for a "normal" device driver. Hey, I didn't invent it. -* -* Typical use: -* -* struct ifreq ifr; -* DGRS_IOCTL ioc; -* int x; -* -* strcpy(ifr.ifr_name, "eth1"); -* ifr.ifr_data = (caddr_t) &ioc; -* ioc.cmd = DGRS_GETMEM; -* ioc.len = sizeof(x); -* ioc.data = (caddr_t) &x; -* rc = ioctl(fd, DGRSIOCTL, &ifr); -* printf("rc=%d mem=%x\n", rc, x); -* -*/ -#include <linux/sockios.h> - -#define DGRSIOCTL SIOCDEVPRIVATE - -typedef struct dgrs_ioctl { -unsigned short cmd;/* Command to run */ -unsigned short len;/* Length of the data buffer */ -unsigned char __user *data;/* Pointer to the data buffer */ -unsigned short port;/* port number for command, if needed */ -unsigned short filter;/* filter number for command, if needed */ -}DGRS_IOCTL ; - -/* -* Commands for the driver -*/ -#define DGRS_GETMEM 0x01/* Get the dual port memory address */ -#define DGRS_SETFILTER 0x02/* Set a filter */
drivers/net/dgrs_asstruct.h deleted +0 -37
@@ -1,37 +0,0 @@ -/* -* For declaring structures shared with assembly routines -* -* $Id: asstruct.h,v 1.1.1.1 1994/10/23 05:08:32 rick Exp $ -*/ - -#ifdef ASSEMBLER - -# define MO (t,a) (a) -# define VMO (t,a) (a) - -# define BEGIN_STRUCT (x) _Off=0 -# define S1A (t,x,n) _Off=(_Off+0)&~0; x=_Off; _Off=_Off+(1*n) -# define S2A (t,x,n) _Off=(_Off+1)&~1; x=_Off; _Off=_Off+(2*n) -# define S4A (t,x,n) _Off=(_Off+3)&~3; x=_Off; _Off=_Off+(4*n) -# define WORD (x) _Off=(_Off+3)&~3; x=_Off; _Off=_Off+4 -# define WORDA (x,n) _Off=(_Off+3)&~3; x=_Off; _Off=_Off+(4*n) -# define VWORD (x) _Off=(_Off+3)&~3; x=_Off; _Off=_Off+4 -# define S1 (t,x) _Off=(_Off+0)&~0; x=_Off; _Off=_Off+1 -# define S2 (t,x) _Off=(_Off+1)&~1; x=_Off; _Off=_Off+2 -# define S4 (t,x) _Off=(_Off+3)&~3; x=_Off; _Off=_Off+4 -# define END_STRUCT (x) _Off=(_Off+3)&~3; x=_Off - -#else /* C */ - -#define VMO (t,a) (*(volatile t *)(a)) - -# define BEGIN_STRUCT (x) struct x { -# define S1 (t,x) t x ; -# define S1A (t,x,n) t x[n] ; -# define S2 (t,x) t x ; -# define S2A (t,x,n) t x[n] ; -# define S4 (t,x) t x ; -# define S4A (t,x,n) t x[n] ; -# define END_STRUCT (x) } ; - -#endif
drivers/net/dgrs_bcomm.h deleted +0 -148
148 lines not on this page · raw message
drivers/net/dgrs_es4h.h deleted +0 -183
183 lines not on this page · raw message
drivers/net/dgrs_ether.h deleted +0 -135
135 lines not on this page · raw message
drivers/net/dgrs_firmware.c deleted +0 -0
[SNIPPED AS OBVIOUS, for file size reasons]
drivers/net/dgrs_i82596.h deleted +0 -0
[SNIPPED AS OBVIOUS, for file size reasons]
drivers/net/dgrs_plx9060.h deleted +0 -0
[SNIPPED AS OBVIOUS, for file size reasons]
drivers/net/e1000/e1000_hw.c +3 -22
@@ -870,10 +870,6 @@ e1000_init_hw(struct e1000_hw *hw)uint32_t ctrl;uint32_t i;int32_t ret_val; -uint16_t pcix_cmd_word; -uint16_t pcix_stat_hi_word; -uint16_t cmd_mmrbc; -uint16_t stat_mmrbc;uint32_t mta_size;uint32_t reg_data;uint32_t ctrl_ext;
@@ -963,24 +959,9 @@ e1000_init_hw(struct e1000_hw *hw)break ;default :/* Workaround for PCI-X problem when BIOS sets MMRBC incorrectly. */ -if (hw->bus_type == e1000_bus_type_pcix) { -e1000_read_pci_cfg (hw,PCIX_COMMAND_REGISTER , &pcix_cmd_word); -e1000_read_pci_cfg (hw,PCIX_STATUS_REGISTER_HI , - &pcix_stat_hi_word); - cmd_mmrbc = (pcix_cmd_word &PCIX_COMMAND_MMRBC_MASK ) >> -PCIX_COMMAND_MMRBC_SHIFT ; - stat_mmrbc = (pcix_stat_hi_word &PCIX_STATUS_HI_MMRBC_MASK ) >> -PCIX_STATUS_HI_MMRBC_SHIFT ; -if (stat_mmrbc ==PCIX_STATUS_HI_MMRBC_4K ) - stat_mmrbc =PCIX_STATUS_HI_MMRBC_2K ; -if (cmd_mmrbc > stat_mmrbc) { - pcix_cmd_word &= ~PCIX_COMMAND_MMRBC_MASK ; - pcix_cmd_word |= stat_mmrbc <<PCIX_COMMAND_MMRBC_SHIFT ; -e1000_write_pci_cfg (hw,PCIX_COMMAND_REGISTER , - &pcix_cmd_word); - } - } -break ; +if (hw->bus_type == e1000_bus_type_pcix &&e1000_pcix_get_mmrbc (hw) >2048 ) +e1000_pcix_set_mmrbc (hw,2048 ); +break ; }/* More time needed for PHY to initialize */
drivers/net/e1000/e1000_hw.h +2 -0
@@ -424,6 +424,8 @@ void e1000_pci_clear_mwi(struct e1000_hw *hw);void e1000_read_pci_cfg (struct e1000_hw *hw,uint32_t reg,uint16_t * value);void e1000_write_pci_cfg (struct e1000_hw *hw,uint32_t reg,uint16_t * value);int32_t e1000_read_pcie_cap_reg (struct e1000_hw *hw,uint32_t reg,uint16_t *value); +void e1000_pcix_set_mmrbc (struct e1000_hw *hw,int mmrbc); +int e1000_pcix_get_mmrbc (struct e1000_hw *hw);/* Port I/O is only supported on 82544 and newer */ void e1000_io_write (struct e1000_hw *hw,unsigned long port,uint32_t value);int32_t e1000_disable_pciex_master (struct e1000_hw *hw);
drivers/net/e1000/e1000_main.c +14 -0
@@ -4901,6 +4901,20 @@ e1000_write_pci_cfg(struct e1000_hw *hw, uint32_t reg, uint16_t *value)pci_write_config_word (adapter->pdev, reg, *value); } +int +e1000_pcix_get_mmrbc (struct e1000_hw *hw) +{ +struct e1000_adapter *adapter = hw->back; +return pcix_get_mmrbc (adapter->pdev); +} + +void +e1000_pcix_set_mmrbc (struct e1000_hw *hw,int mmrbc) +{ +struct e1000_adapter *adapter = hw->back; +pcix_set_mmrbc (adapter->pdev, mmrbc); +} +int32_t e1000_read_pcie_cap_reg (struct e1000_hw *hw,uint32_t reg,uint16_t *value) {
drivers/net/e1000e/netdev.c +1 -1
@@ -3531,7 +3531,7 @@ static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)/* handle pci_map_single() error in e1000_tx_map */ dev_kfree_skb_any (skb);spin_unlock_irqrestore (&adapter->tx_queue_lock, irq_flags); -return NETDEV_TX_BUSY ; +return NETDEV_TX_OK ; }e1000_tx_queue (adapter, tx_flags, count);
drivers/net/forcedeth.c +1 -1
@@ -4917,7 +4917,7 @@ static int nv_open(struct net_device *dev)if (ret) {netif_carrier_on (dev); }else { -printk ("%s: no link during initialization.\n" , dev->name); +printk (KERN_INFO "%s: no link during initialization.\n" , dev->name);netif_carrier_off (dev); }if (oom)
drivers/net/pasemi_mac.c +21 -22
101 lines not on this page · raw message
drivers/net/phy/Kconfig +14 -0
@@ -76,4 +76,18 @@ config FIXED_MII_100_FDX bool "Emulation for 100M Fdx fixed PHY behavior" depends on FIXED_PHY +config FIXED_MII_1000_FDX + bool "Emulation for 1000M Fdx fixed PHY behavior" + depends on FIXED_PHY + +config FIXED_MII_AMNT + int "Number of emulated PHYs to allocate " + depends on FIXED_PHY + default "1" + ---help--- + Sometimes it is required to have several independent emulated + PHYs on the bus (in case of multi-eth but phy-less HW for instance). + This control will have specified number allocated for each fixed + PHY type enabled. + endif # PHYLIB
drivers/net/phy/fixed.c +155 -155
477 lines not on this page · raw message
drivers/net/phy/phy.c +33 -19
156 lines not on this page · raw message
drivers/net/phy/phy_device.c +2 -2
@@ -670,9 +670,9 @@ static int phy_remove(struct device *dev) phydev =to_phy_device (dev); -spin_lock (&phydev->lock); +spin_lock_bh (&phydev->lock); phydev->state =PHY_DOWN ; -spin_unlock (&phydev->lock); +spin_unlock_bh (&phydev->lock);if (phydev->drv->remove) phydev->drv->remove (phydev);
drivers/net/sb1250-mac.c +646 -721
1,409 lines not on this page · raw message
drivers/net/via-velocity.c +209 -38
247 lines not on this page · raw message
drivers/net/via-velocity.h +11 -196
207 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.