[PATCH net-next 0/3] Add support in ethtool to get expansion ROM version

[PATCH net-next 0/3] Add support in ethtool to get expansion ROM version

[Hariprasad Shenai]

Hi

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.

Thanks

Hariprasad Shenai (3):
  ethtool: rename reserved1 memeber in ethtool_drvinfo for expansion
    ROM version
  cxgb4: Add support in cxgb4 to get expansion rom version via ethtool
  ethtool: Add support to get expansion ROM version in ethtool getdrvinfo

 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h      |    1 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c |    9 +++++
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c      |   37 +++++++++++++++++++++++
 drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h   |    8 +++++
 include/uapi/linux/ethtool.h                    |    3 +-
 5 files changed, 57 insertions(+), 1 deletions(-)
---
 ethtool-copy.h |    3 ++-
 ethtool.c      |    2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)

[PATCH net-next 1/3] ethtool: rename reserved1 memeber in ethtool_drvinfo for expansion ROM version

[Hariprasad Shenai]

Renamed the reserved1 member of struct ethtool_drvinfo to erom_version to get
expansion/option ROM version of the adapter if present.

Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
---
 include/uapi/linux/ethtool.h |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/include/uapi/linux/ethtool.h b/include/uapi/linux/ethtool.h
index 5f66d9c..bd80f0f 100644
--- a/include/uapi/linux/ethtool.h
+++ b/include/uapi/linux/ethtool.h
@@ -148,6 +148,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 +177,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[32];
 	char	reserved2[12];
 	__u32	n_priv_flags;
 	__u32	n_stats;
-- 
1.7.1

[PATCH net-next 2/3] cxgb4: Add support in cxgb4 to get expansion rom version via ethtool

[Hariprasad Shenai]

Add support to get option/expansion rom version flashed in the adapter via
ethtool getdrvinfo function.

Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
---
 drivers/net/ethernet/chelsio/cxgb4/cxgb4.h      |    1 +
 drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c |    9 +++++
 drivers/net/ethernet/chelsio/cxgb4/t4_hw.c      |   37 +++++++++++++++++++++++
 drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h   |    8 +++++
 4 files changed, 55 insertions(+), 0 deletions(-)

diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
index 55019c9..63231bf 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4.h
@@ -1120,6 +1120,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 041742b..16639c7 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 ea16c62..ae69796 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 1e72cda..c009627 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4fw_api.h
@@ -3012,21 +3012,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)
 
-- 
1.7.1

[PATCH 3/3] ethtool: Add support to get expansion ROM version in ethtool getdrvinfo

[Hariprasad Shenai]

Rename the reserved1 field of ethtool_drvinfo to erom_version, and use it to get
the expansion ROM version of the adapter.

Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
---
 ethtool-copy.h |    3 ++-
 ethtool.c      |    2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ethtool-copy.h b/ethtool-copy.h
index 61b78fc..e2df0e5 100644
--- a/ethtool-copy.h
+++ b/ethtool-copy.h
@@ -148,6 +148,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 +177,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[32];
 	char	reserved2[12];
 	__u32	n_priv_flags;
 	__u32	n_stats;
diff --git a/ethtool.c b/ethtool.c
index bf583f3..b7d2206 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -701,6 +701,7 @@ static int dump_drvinfo(struct ethtool_drvinfo *info)
 		"driver: %.*s\n"
 		"version: %.*s\n"
 		"firmware-version: %.*s\n"
+		"expansion-rom-version: %.*s\n"
 		"bus-info: %.*s\n"
 		"supports-statistics: %s\n"
 		"supports-test: %s\n"
@@ -710,6 +711,7 @@ static int dump_drvinfo(struct ethtool_drvinfo *info)
 		(int)sizeof(info->driver), info->driver,
 		(int)sizeof(info->version), info->version,
 		(int)sizeof(info->fw_version), info->fw_version,
+		(int)sizeof(info->erom_version), info->erom_version,
 		(int)sizeof(info->bus_info), info->bus_info,
 		info->n_stats ? "yes" : "no",
 		info->testinfo_len ? "yes" : "no",
-- 
1.7.1

Re: [PATCH net-next 1/3] ethtool: rename reserved1 memeber in ethtool_drvinfo for expansion ROM version

[David Miller]

From: Hariprasad Shenai <hariprasad@chelsio.com>
Date: Wed,  4 Feb 2015 18:19:34 +0530

> Renamed the reserved1 member of struct ethtool_drvinfo to erom_version to get
> expansion/option ROM version of the adapter if present.
> 
> Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
 ...
> @@ -148,6 +148,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 +177,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[32];

Please add a define like ETHTOOL_FWVERS_LEN and ETHTOOL_BUSINFO_LEN
and use it here.

Re: [PATCH 3/3] ethtool: Add support to get expansion ROM version in ethtool getdrvinfo

[Hariprasad S]

On Wed, Feb 04, 2015 at 18:19:36 +0530, Hariprasad Shenai wrote:
> Rename the reserved1 field of ethtool_drvinfo to erom_version, and use it to get
> the expansion ROM version of the adapter.
> 
> Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
> ---
>  ethtool-copy.h |    3 ++-
>  ethtool.c      |    2 ++
>  2 files changed, 4 insertions(+), 1 deletions(-)
> 
> diff --git a/ethtool-copy.h b/ethtool-copy.h
> index 61b78fc..e2df0e5 100644
> --- a/ethtool-copy.h
> +++ b/ethtool-copy.h
> @@ -148,6 +148,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 +177,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[32];
>  	char	reserved2[12];
>  	__u32	n_priv_flags;
>  	__u32	n_stats;
> diff --git a/ethtool.c b/ethtool.c
> index bf583f3..b7d2206 100644
> --- a/ethtool.c
> +++ b/ethtool.c
> @@ -701,6 +701,7 @@ static int dump_drvinfo(struct ethtool_drvinfo *info)
>  		"driver: %.*s\n"
>  		"version: %.*s\n"
>  		"firmware-version: %.*s\n"
> +		"expansion-rom-version: %.*s\n"
>  		"bus-info: %.*s\n"
>  		"supports-statistics: %s\n"
>  		"supports-test: %s\n"
> @@ -710,6 +711,7 @@ static int dump_drvinfo(struct ethtool_drvinfo *info)
>  		(int)sizeof(info->driver), info->driver,
>  		(int)sizeof(info->version), info->version,
>  		(int)sizeof(info->fw_version), info->fw_version,
> +		(int)sizeof(info->erom_version), info->erom_version,
>  		(int)sizeof(info->bus_info), info->bus_info,
>  		info->n_stats ? "yes" : "no",
>  		info->testinfo_len ? "yes" : "no",
> -- 
> 1.7.1
> 


Hi Ben,

Can you pull this one to the ethtool repo?

Thanks,
Hariprasad Shenai

Re: [PATCH 3/3] ethtool: Add support to get expansion ROM version in ethtool getdrvinfo

[Ben Hutchings]

[-- Attachment #1: Type: text/plain, Size: 2469 bytes --]

On Wed, 2015-03-25 at 14:11 +0530, Hariprasad S wrote:
> On Wed, Feb 04, 2015 at 18:19:36 +0530, Hariprasad Shenai wrote:
> > Rename the reserved1 field of ethtool_drvinfo to erom_version, and use it to get
> > the expansion ROM version of the adapter.
> > 
> > Signed-off-by: Hariprasad Shenai <hariprasad@chelsio.com>
> > ---
> >  ethtool-copy.h |    3 ++-
> >  ethtool.c      |    2 ++
> >  2 files changed, 4 insertions(+), 1 deletions(-)
> > 
> > diff --git a/ethtool-copy.h b/ethtool-copy.h
> > index 61b78fc..e2df0e5 100644
> > --- a/ethtool-copy.h
> > +++ b/ethtool-copy.h
> > @@ -148,6 +148,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 +177,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[32];
> >  	char	reserved2[12];
> >  	__u32	n_priv_flags;
> >  	__u32	n_stats;
> > diff --git a/ethtool.c b/ethtool.c
> > index bf583f3..b7d2206 100644
> > --- a/ethtool.c
> > +++ b/ethtool.c
> > @@ -701,6 +701,7 @@ static int dump_drvinfo(struct ethtool_drvinfo *info)
> >  		"driver: %.*s\n"
> >  		"version: %.*s\n"
> >  		"firmware-version: %.*s\n"
> > +		"expansion-rom-version: %.*s\n"
> >  		"bus-info: %.*s\n"
> >  		"supports-statistics: %s\n"
> >  		"supports-test: %s\n"
> > @@ -710,6 +711,7 @@ static int dump_drvinfo(struct ethtool_drvinfo *info)
> >  		(int)sizeof(info->driver), info->driver,
> >  		(int)sizeof(info->version), info->version,
> >  		(int)sizeof(info->fw_version), info->fw_version,
> > +		(int)sizeof(info->erom_version), info->erom_version,
> >  		(int)sizeof(info->bus_info), info->bus_info,
> >  		info->n_stats ? "yes" : "no",
> >  		info->testinfo_len ? "yes" : "no",
> > -- 
> > 1.7.1
> > 
> 
> 
> Hi Ben,
> 
> Can you pull this one to the ethtool repo?

Applied, thanks.

Ben.

-- 
Ben Hutchings
Quantity is no substitute for quality, but it's the only one we've got.

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 811 bytes --]