lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

e1000e: store EEPROM version number to prevent unnecessary NVM reads

Browse Source 
Rather than reading the NVM to get the EEPROM version number everytime the
ethool get_drvinfo function is called, read it once during probe and save
it for future reference.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Bruce Allan
2008-11-21 17:00:22 -08:00
committed by David S. Miller
parent 0285c8dcae
commit 8452759060
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/e1000e/e1000.h
View File

@@ -193,6 +193,7 @@ struct e1000_adapter {
u16 mng_vlan_id; u16 mng_vlan_id;
u16 link_speed; u16 link_speed;
u16 link_duplex; u16 link_duplex;
u16 eeprom_vers;
spinlock_t tx_queue_lock; /* prevent concurrent tail updates */ spinlock_t tx_queue_lock; /* prevent concurrent tail updates */

8
drivers/net/e1000e/ethtool.c
View File

@@ -588,7 +588,6 @@ static void e1000_get_drvinfo(struct net_device *netdev,
{ {
struct e1000_adapter *adapter = netdev_priv(netdev); struct e1000_adapter *adapter = netdev_priv(netdev);
char firmware_version[32]; char firmware_version[32];
u16 eeprom_data;
strncpy(drvinfo->driver, e1000e_driver_name, 32); strncpy(drvinfo->driver, e1000e_driver_name, 32);
strncpy(drvinfo->version, e1000e_driver_version, 32); strncpy(drvinfo->version, e1000e_driver_version, 32);
@@ -597,11 +596,10 @@ static void e1000_get_drvinfo(struct net_device *netdev,
* EEPROM image version # is reported as firmware version # for * EEPROM image version # is reported as firmware version # for
* PCI-E controllers * PCI-E controllers
*/ */
e1000_read_nvm(&adapter->hw, 5, 1, &eeprom_data);
sprintf(firmware_version, "%d.%d-%d", sprintf(firmware_version, "%d.%d-%d",
(eeprom_data & 0xF000) >> 12, (adapter->eeprom_vers & 0xF000) >> 12,
(eeprom_data & 0x0FF0) >> 4, (adapter->eeprom_vers & 0x0FF0) >> 4,
eeprom_data & 0x000F); (adapter->eeprom_vers & 0x000F));
strncpy(drvinfo->fw_version, firmware_version, 32); strncpy(drvinfo->fw_version, firmware_version, 32);
strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32); strncpy(drvinfo->bus_info, pci_name(adapter->pdev), 32);

3
drivers/net/e1000e/netdev.c
View File

@@ -5025,6 +5025,9 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
adapter->wol = adapter->eeprom_wol; adapter->wol = adapter->eeprom_wol;
device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol); device_set_wakeup_enable(&adapter->pdev->dev, adapter->wol);
/* save off EEPROM version number */
e1000_read_nvm(&adapter->hw, 5, 1, &adapter->eeprom_vers);
/* reset the hardware with the new settings */ /* reset the hardware with the new settings */
e1000e_reset(adapter); e1000e_reset(adapter);