smsc911x: define status word positions as constants
Subsystems (2)
PATCH 1/3 smsc911x: define status word positions as constants
The vast majority of bit constants in this driver are defined in the header file, but TX and RX status word bits are not. This patch (which should make no functional change) defines these, to make the driver slightly more readable.
--- drivers/net/smsc911x.c | 18 ++++++++---------- drivers/net/smsc911x.h | 7 +++++++ 2 files changed, 15 insertions(+), 10 deletions(-)
drivers/net/smsc911x.c +8 -10
@@ -895,22 +895,22 @@ static void smsc911x_tx_update_txcounters(struct net_device *dev)SMSC_WARNING (HW ,"Packet tag reserved bit is high" ); }else { -if (unlikely (tx_stat &0x00008000 )) { +if (unlikely (tx_stat &TX_STS_ES_ )) { dev->stats.tx_errors++; }else { dev->stats.tx_packets++; dev->stats.tx_bytes += (tx_stat >>16 ); } -if (unlikely (tx_stat &0x00000100 )) { +if (unlikely (tx_stat &TX_STS_EXCESS_COL_ )) { dev->stats.collisions +=16 ; dev->stats.tx_aborted_errors +=1 ; }else { dev->stats.collisions += ((tx_stat >>3 ) &0xF ); } -if (unlikely (tx_stat &0x00000800 )) +if (unlikely (tx_stat &TX_STS_LOST_CARRIER_ )) dev->stats.tx_carrier_errors +=1 ; -if (unlikely (tx_stat &0x00000200 )) { +if (unlikely (tx_stat &TX_STS_LATE_COL_ )) { dev->stats.collisions++; dev->stats.tx_aborted_errors++; }
@@ -924,19 +924,17 @@ smsc911x_rx_counterrors(struct net_device *dev, unsigned int rxstat) {int crc_err =0 ; -if (unlikely (rxstat &0x00008000 )) { +if (unlikely (rxstat &RX_STS_ES_ )) { dev->stats.rx_errors++; -if (unlikely (rxstat &0x00000002 )) { +if (unlikely (rxstat &RX_STS_CRC_ERR_ )) { dev->stats.rx_crc_errors++; crc_err =1 ; } }if (likely (!crc_err)) { -if (unlikely ((rxstat &0x00001020 ) ==0x00001020 )) { -/* Frame type indicates length, -* and length error is set */ +if (unlikely ((rxstat &RX_STS_FRAME_TYPE_ ) && + (rxstat &RX_STS_LENGTH_ERR_ ))) dev->stats.rx_length_errors++; - }if (rxstat &RX_STS_MCAST_ ) dev->stats.multicast++; }
drivers/net/smsc911x.h +7 -0
@@ -81,12 +81,19 @@#define RX_STATUS_FIFO 0x40#define RX_STS_ES_ 0x00008000 +#define RX_STS_LENGTH_ERR_ 0x00001000#define RX_STS_MCAST_ 0x00000400 +#define RX_STS_FRAME_TYPE_ 0x00000020 +#define RX_STS_CRC_ERR_ 0x00000002#define RX_STATUS_FIFO_PEEK 0x44#define TX_STATUS_FIFO 0x48#define TX_STS_ES_ 0x00008000 +#define TX_STS_LOST_CARRIER_ 0x00000800 +#define TX_STS_NO_CARRIER_ 0x00000400 +#define TX_STS_LATE_COL_ 0x00000200 +#define TX_STS_EXCESS_COL_ 0x00000100#define TX_STATUS_FIFO_PEEK 0x4C
Signature · 1 line
1.6.0.6
PATCH 2/3 smsc911x: replace print_mac with %pM
--- drivers/net/smsc911x.c | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-)
drivers/net/smsc911x.c +1 -3
@@ -1914,7 +1914,6 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)unsigned int intcfg =0 ;int res_size, irq_flags;int retval; -DECLARE_MAC_BUF (mac);pr_info ("%s: Driver version %s.\n" ,SMSC_CHIPNAME ,SMSC_DRV_VERSION );
@@ -2049,8 +2048,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)spin_unlock_irq (&pdata->mac_lock); -dev_info (&dev->dev,"MAC Address: %s\n" , -print_mac (mac, dev->dev_addr)); +dev_info (&dev->dev,"MAC Address: %pM\n" , dev->dev_addr);return 0 ;
Signature · 1 line
1.6.0.6
PATCH 3/3 smsc911x: allow setting of mac address
This patch replaces the generic eth_mac_addr function with one that also updates the hardware mac address registers. It also renames the existing smsc911x_set_mac_address function to smsc911x_hw_set_mac_address for clarity.
Newer LAN911x and all LAN921x devices also support changing the mac address while the device is running, which is useful for some bonding modes.
--- drivers/net/smsc911x.c | 35 ++++++++++++++++++++++++++++++----- 1 files changed, 30 insertions(+), 5 deletions(-)
drivers/net/smsc911x.c +30 -5
@@ -1119,7 +1119,7 @@ static int smsc911x_soft_reset(struct smsc911x_data *pdata)/* Sets the device MAC address to dev_addr, called with mac_lock held */ static void -smsc911x_set_mac_address (struct smsc911x_data *pdata,u8 dev_addr[6 ]) +smsc911x_set_hw_mac_address (struct smsc911x_data *pdata,u8 dev_addr[6 ]) {u32 mac_high16 = (dev_addr[5 ] <<8 ) | dev_addr[4 ]; u32 mac_low32 = (dev_addr[3] << 24) | (dev_addr[2] << 16) |
@@ -1174,7 +1174,7 @@ static int smsc911x_open(struct net_device *dev)/* The soft reset above cleared the device's MAC address, * restore it from local copy (set in probe) */ spin_lock_irq (&pdata->mac_lock); -smsc911x_set_mac_address (pdata, dev->dev_addr); +smsc911x_set_hw_mac_address (pdata, dev->dev_addr);spin_unlock_irq (&pdata->mac_lock);/* Initialise irqs, but leave all sources disabled */
@@ -1508,6 +1508,31 @@ static void smsc911x_poll_controller(struct net_device *dev) }#endif /* CONFIG_NET_POLL_CONTROLLER */ +static int smsc911x_set_mac_address (struct net_device *dev,void *p) +{ +struct smsc911x_data *pdata =netdev_priv (dev); +struct sockaddr *addr = p; + +/* On older hardware revisions we cannot change the mac address +* registers while receiving data. Newer devices can safely change +* this at any time. */ +if (pdata->generation <=1 &&netif_running (dev)) +return -EBUSY ; + +if (!is_valid_ether_addr (addr->sa_data)) +return -EADDRNOTAVAIL ; + +memcpy (dev->dev_addr, addr->sa_data,ETH_ALEN ); + +spin_lock_irq (&pdata->mac_lock); +smsc911x_set_hw_mac_address (pdata, dev->dev_addr); +spin_unlock_irq (&pdata->mac_lock); + +dev_info (&dev->dev,"MAC Address: %pM\n" , dev->dev_addr); + +return 0 ; +} +/* Standard ioctls for mii-tool */ static int smsc911x_do_ioctl (struct net_device *dev,struct ifreq *ifr,int cmd) {
@@ -1738,7 +1763,7 @@ static const struct net_device_ops smsc911x_netdev_ops = { .ndo_set_multicast_list = smsc911x_set_multicast_list, .ndo_do_ioctl = smsc911x_do_ioctl, .ndo_validate_addr = eth_validate_addr, - .ndo_set_mac_address = eth_mac_addr, + .ndo_set_mac_address = smsc911x_set_mac_address,#ifdef CONFIG_NET_POLL_CONTROLLER .ndo_poll_controller = smsc911x_poll_controller,#endif
@@ -2026,7 +2051,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev)/* Check if mac address has been specified when bringing interface up */ if (is_valid_ether_addr (dev->dev_addr)) { -smsc911x_set_mac_address (pdata, dev->dev_addr); +smsc911x_set_hw_mac_address (pdata, dev->dev_addr);SMSC_TRACE (PROBE ,"MAC Address is specified by configuration" ); }else {/* Try reading mac address from device. if EEPROM is present
@@ -2040,7 +2065,7 @@ static int __devinit smsc911x_drv_probe(struct platform_device *pdev) }else {/* eeprom values are invalid, generate random MAC */ random_ether_addr (dev->dev_addr); -smsc911x_set_mac_address (pdata, dev->dev_addr); +smsc911x_set_hw_mac_address (pdata, dev->dev_addr);SMSC_TRACE (PROBE ,"MAC Address is set to random_ether_addr" ); }
Signature · 1 line
1.6.0.6
Re: [PATCH 3/3] smsc911x: allow setting of mac address
From: Steve Glendinning <[email protected]>
Date: Thu, 19 Mar 2009 10:24:46 +0000
Quoted 10 lines
This patch replaces the generic
eth_mac_addrfunction with one that also updates the hardware mac address registers. It also renames the existingsmsc911x_set_mac_addressfunction tosmsc911x_hw_set_mac_addressfor clarity.Newer LAN911x and all LAN921x devices also support changing the mac address while the device is running, which is useful for some bonding modes.
Signed-off-by Steve Glendinning <[email protected]>
Applied.
Re: [PATCH 2/3] smsc911x: replace print_mac with %pM
In reply to Steve GlendinningFrom: Steve Glendinning <[email protected]>
Date: Thu, 19 Mar 2009 10:24:45 +0000
Quoted 1 line
Signed-off-by Steve Glendinning <[email protected]>
Applied.
From: Steve Glendinning <[email protected]>
Date: Thu, 19 Mar 2009 10:24:44 +0000
Quoted 6 lines
The vast majority of bit constants in this driver are defined in the header file, but TX and RX status word bits are not. This patch (which should make no functional change) defines these, to make the driver slightly more readable.
Signed-off-by Steve Glendinning <[email protected]>
Applied.