aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorChien Tung <chien.tin.tung@intel.com>2010-06-09 16:19:53 -0400
committerRoland Dreier <rolandd@cisco.com>2010-07-28 18:12:38 -0400
commit0eec495ee69e3fbbe2ef2b244a0a988a4fe2e887 (patch)
tree1bcc89cb73c0b73aaca0ffdd8d2f029830b76987 /drivers/infiniband
parent33085bb8da9c77c2d5572125385efa87627d8b59 (diff)
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')
-rw-r--r--drivers/infiniband/hw/nes/nes_hw.h3
-rw-r--r--drivers/infiniband/hw/nes/nes_utils.c5
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 {
1100 u32 wqm_wat; 1100 u32 wqm_wat;
1101 u32 core_clock; 1101 u32 core_clock;
1102 u32 firmware_version; 1102 u32 firmware_version;
1103 u32 eeprom_version;
1103 1104
1104 u32 nic_rx_eth_route_err; 1105 u32 nic_rx_eth_route_err;
1105 1106
1106 u32 et_rx_coalesce_usecs; 1107 u32 et_rx_coalesce_usecs;
1107 u32 et_rx_max_coalesced_frames; 1108 u32 et_rx_max_coalesced_frames;
1108 u32 et_rx_coalesce_usecs_irq; 1109 u32 et_rx_coalesce_usecs_irq;
1109 u32 et_rx_max_coalesced_frames_irq; 1110 u32 et_rx_max_coalesced_frames_irq;
1110 u32 et_pkt_rate_low; 1111 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
190 nesadapter->firmware_version = (((u32)(u8)(eeprom_data>>8)) << 16) + 190 nesadapter->firmware_version = (((u32)(u8)(eeprom_data>>8)) << 16) +
191 (u32)((u8)eeprom_data); 191 (u32)((u8)eeprom_data);
192 192
193 eeprom_data = nes_read16_eeprom(nesdev->regs, next_section_address + 10);
194 printk(PFX "EEPROM version %u.%u\n", (u8)(eeprom_data>>8), (u8)eeprom_data);
195 nesadapter->eeprom_version = (((u32)(u8)(eeprom_data>>8)) << 16) +
196 (u32)((u8)eeprom_data);
197
193no_fw_rev: 198no_fw_rev:
194 /* eeprom is valid */ 199 /* eeprom is valid */
195 eeprom_offset = nesadapter->software_eeprom_offset; 200 eeprom_offset = nesadapter->software_eeprom_offset;