Merge branch 'expansion_rom'

Hariprasad Shenai says:

====================
Add support in ethtool to get expansion ROM version

This series adds support to get expansion ROM version via ethtool getdrvinfo.
PATCH 1/3 ("ethtool: rename reserved1 memeber in ethtool_drvinfo for expansion
    ROM version") is created against net-next tree.
PATCH 2/3 ("cxgb4: Add support in cxgb4 to get expansion rom version via
ethtool") is created against net-next tree.
PATCH 3/3 ("ethtool: Add support to get expansion ROM version in ethtool
getdrvinfo") is created against ethtool tree.

We have included all the maintainers of respective trees. Kindly review the
change and let us know in case of any review comments.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 58 insertions, 1 deletions

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index 0fe3a52fb0b8..d6cda17efe6e 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -1121,6 +1121,7 @@ int t4_fw_upgrade(struct adapter *adap, unsigned int mbox,
 unsigned int t4_flash_cfg_addr(struct adapter *adapter);
 int t4_get_fw_version(struct adapter *adapter, u32 *vers);
 int t4_get_tp_version(struct adapter *adapter, u32 *vers);
+int t4_get_exprom_version(struct adapter *adapter, u32 *vers);
 int t4_prep_fw(struct adapter *adap, struct fw_info *fw_info,
                const u8 *fw_data, unsigned int fw_size,
                struct fw_hdr *card_fw, enum dev_state state, int *reset);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 5db5b4f7b94d..a22cf932ca35 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -1419,6 +1419,7 @@ static int get_eeprom_len(struct net_device *dev)
 static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
 {
         struct adapter *adapter = netdev2adap(dev);
+        u32 exprom_vers;
 
         strlcpy(info->driver, KBUILD_MODNAME, sizeof(info->driver));
         strlcpy(info->version, DRV_VERSION, sizeof(info->version));
@@ -1436,6 +1437,14 @@ static void get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
                         FW_HDR_FW_VER_MINOR_G(adapter->params.tp_vers),
                         FW_HDR_FW_VER_MICRO_G(adapter->params.tp_vers),
                         FW_HDR_FW_VER_BUILD_G(adapter->params.tp_vers));
+
+        if (!t4_get_exprom_version(adapter, &exprom_vers))
+                snprintf(info->erom_version, sizeof(info->erom_version),
+                         "%u.%u.%u.%u",
+                         FW_HDR_FW_VER_MAJOR_G(exprom_vers),
+                         FW_HDR_FW_VER_MINOR_G(exprom_vers),
+                         FW_HDR_FW_VER_MICRO_G(exprom_vers),
+                         FW_HDR_FW_VER_BUILD_G(exprom_vers));
 }
 
 static void get_strings(struct net_device *dev, u32 stringset, u8 *data)
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
index 2c13e8005319..4d643b65265e 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_hw.c
@@ -948,6 +948,43 @@ int t4_get_tp_version(struct adapter *adapter, u32 *vers)
                              1, vers, 0);
 }
 
+/**
+ *      t4_get_exprom_version - return the Expansion ROM version (if any)
+ *      @adapter: the adapter
+ *      @vers: where to place the version
+ *
+ *      Reads the Expansion ROM header from FLASH and returns the version
+ *      number (if present) through the @vers return value pointer.  We return
+ *      this in the Firmware Version Format since it's convenient.  Return
+ *      0 on success, -ENOENT if no Expansion ROM is present.
+ */
+int t4_get_exprom_version(struct adapter *adap, u32 *vers)
+{
+        struct exprom_header {
+                unsigned char hdr_arr[16];      /* must start with 0x55aa */
+                unsigned char hdr_ver[4];       /* Expansion ROM version */
+        } *hdr;
+        u32 exprom_header_buf[DIV_ROUND_UP(sizeof(struct exprom_header),
+                                           sizeof(u32))];
+        int ret;
+
+        ret = t4_read_flash(adap, FLASH_EXP_ROM_START,
+                            ARRAY_SIZE(exprom_header_buf), exprom_header_buf,
+                            0);
+        if (ret)
+                return ret;
+
+        hdr = (struct exprom_header *)exprom_header_buf;
+        if (hdr->hdr_arr[0] != 0x55 || hdr->hdr_arr[1] != 0xaa)
+                return -ENOENT;
+
+        *vers = (FW_HDR_FW_VER_MAJOR_V(hdr->hdr_ver[0]) |
+                 FW_HDR_FW_VER_MINOR_V(hdr->hdr_ver[1]) |
+                 FW_HDR_FW_VER_MICRO_V(hdr->hdr_ver[2]) |
+                 FW_HDR_FW_VER_BUILD_V(hdr->hdr_ver[3]));
+        return 0;
+}
+
 /* Is the given firmware API compatible with the one the driver was compiled
  * with?
  */
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h b/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
index 95fc425375c4..9b353a88cbda 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
@@ -3018,21 +3018,29 @@ enum fw_hdr_chip {
 
 #define FW_HDR_FW_VER_MAJOR_S   24
 #define FW_HDR_FW_VER_MAJOR_M   0xff
+#define FW_HDR_FW_VER_MAJOR_V(x) \
+        ((x) << FW_HDR_FW_VER_MAJOR_S)
 #define FW_HDR_FW_VER_MAJOR_G(x) \
         (((x) >> FW_HDR_FW_VER_MAJOR_S) & FW_HDR_FW_VER_MAJOR_M)
 
 #define FW_HDR_FW_VER_MINOR_S   16
 #define FW_HDR_FW_VER_MINOR_M   0xff
+#define FW_HDR_FW_VER_MINOR_V(x) \
+        ((x) << FW_HDR_FW_VER_MINOR_S)
 #define FW_HDR_FW_VER_MINOR_G(x) \
         (((x) >> FW_HDR_FW_VER_MINOR_S) & FW_HDR_FW_VER_MINOR_M)
 
 #define FW_HDR_FW_VER_MICRO_S   8
 #define FW_HDR_FW_VER_MICRO_M   0xff
+#define FW_HDR_FW_VER_MICRO_V(x) \
+        ((x) << FW_HDR_FW_VER_MICRO_S)
 #define FW_HDR_FW_VER_MICRO_G(x) \
         (((x) >> FW_HDR_FW_VER_MICRO_S) & FW_HDR_FW_VER_MICRO_M)
 
 #define FW_HDR_FW_VER_BUILD_S   0
 #define FW_HDR_FW_VER_BUILD_M   0xff
+#define FW_HDR_FW_VER_BUILD_V(x) \
+        ((x) << FW_HDR_FW_VER_BUILD_S)
 #define FW_HDR_FW_VER_BUILD_G(x) \
         (((x) >> FW_HDR_FW_VER_BUILD_S) & FW_HDR_FW_VER_BUILD_M)
 
diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index 5f66d9c2889d..2e49fc880d29 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -139,6 +139,7 @@ static inline __u32 ethtool_cmd_speed(const struct ethtool_cmd *ep)
 
 #define ETHTOOL_FWVERS_LEN      32
 #define ETHTOOL_BUSINFO_LEN     32
+#define ETHTOOL_EROMVERS_LEN    32
 
 /**
  * struct ethtool_drvinfo - general driver and device information
@@ -148,6 +149,7 @@ static inline __u32 ethtool_cmd_speed(const struct ethtool_cmd *ep)
  *      not be an empty string.
  * @version: Driver version string; may be an empty string
  * @fw_version: Firmware version string; may be an empty string
+ * @erom_version: Expansion ROM version string; may be an empty string
  * @bus_info: Device bus address.  This should match the dev_name()
  *      string for the underlying bus device, if there is one.  May be
  *      an empty string.
@@ -176,7 +178,7 @@ struct ethtool_drvinfo {
         char    version[32];
         char    fw_version[ETHTOOL_FWVERS_LEN];
         char    bus_info[ETHTOOL_BUSINFO_LEN];
-        char    reserved1[32];
+        char    erom_version[ETHTOOL_EROMVERS_LEN];
         char    reserved2[12];
         __u32   n_priv_flags;
         __u32   n_stats;