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>

diff --git a/drivers/infiniband/hw/nes/nes_hw.h b/drivers/infiniband/hw/nes/nes_hw.h
index bbbfe9fc5a5a4dbf4642ecbbf954c5093c73e861..aa9183db32b104aaaa7bfad081c3c969699cec72 100644 (file)
--- 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 a9f5dd272f1ac838c093b5b375dee2410a69202a..f9c417c6b3b370cd98051584929c86358c46dc24 100644 (file)
--- 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;