diff options
| author |   Chien Tung <chien.tin.tung@intel.com> | 2010-06-09 20:19:53 +0000 |
|---|---|---|
| committer |   Roland Dreier <rolandd@cisco.com> | 2010-07-28 15:12:38 -0700 |
| commit | 0eec495ee69e3fbbe2ef2b244a0a988a4fe2e887 (patch) | |
| tree | 1bcc89cb73c0b73aaca0ffdd8d2f029830b76987 /drivers/infiniband/hw | |
| parent | RDMA/nes: Convert pci_table entries to PCI_VDEVICE (diff) | |
| download | linux-dev-0eec495ee69e3fbbe2ef2b244a0a988a4fe2e887.tar.xz linux-dev-0eec495ee69e3fbbe2ef2b244a0a988a4fe2e887.zip | |
RDMA/nes: Store and print eeprom version
Read and print eeprom version and save it off for later use.
Also delete a tab.
Signed-off-by: Chien Tung <chien.tin.tung@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Diffstat (limited to 'drivers/infiniband/hw')
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_hw.h | 3 | ||||
| -rw-r--r-- | drivers/infiniband/hw/nes/nes_utils.c | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/drivers/infiniband/hw/nes/nes_hw.h b/drivers/infiniband/hw/nes/nes_hw.h index bbbfe9fc5a5a..aa9183db32b1 100644 --- a/drivers/infiniband/hw/nes/nes_hw.h +++ b/drivers/infiniband/hw/nes/nes_hw.h @@ -1100,11 +1100,12 @@ struct nes_adapter { u32 wqm_wat; u32 core_clock; u32 firmware_version; + u32 eeprom_version; u32 nic_rx_eth_route_err; u32 et_rx_coalesce_usecs; - u32 et_rx_max_coalesced_frames; + u32 et_rx_max_coalesced_frames; u32 et_rx_coalesce_usecs_irq; u32 et_rx_max_coalesced_frames_irq; u32 et_pkt_rate_low; diff --git a/drivers/infiniband/hw/nes/nes_utils.c b/drivers/infiniband/hw/nes/nes_utils.c index a9f5dd272f1a..f9c417c6b3b3 100644 --- a/drivers/infiniband/hw/nes/nes_utils.c +++ b/drivers/infiniband/hw/nes/nes_utils.c @@ -190,6 +190,11 @@ int nes_read_eeprom_values(struct nes_device *nesdev, struct nes_adapter *nesada nesadapter->firmware_version = (((u32)(u8)(eeprom_data>>8)) << 16) + (u32)((u8)eeprom_data); + eeprom_data = nes_read16_eeprom(nesdev->regs, next_section_address + 10); + printk(PFX "EEPROM version %u.%u\n", (u8)(eeprom_data>>8), (u8)eeprom_data); + nesadapter->eeprom_version = (((u32)(u8)(eeprom_data>>8)) << 16) + + (u32)((u8)eeprom_data); + no_fw_rev: /* eeprom is valid */ eeprom_offset = nesadapter->software_eeprom_offset; |