[PATCH v2 net-next 0/4] bnx2x: refactor nvram related code and update version

[PATCH v2 net-next 0/4] bnx2x: refactor nvram related code and update version

[Dmitry Kravkov]

Hi Dave,

Please cosider appliyng the series to net-next.

Changes for v2:
	* 1/4: remove boolean parameter and introduce bnx2x_nvram_read32
	*      pointed out by Francois Romieu <romieu@fr.zoreil.com>
	* 2/4: adopt to changes in [1/4] 

Thanks
Dmitry

[PATCH v2 net-next 1/4] bnx2x: refactor nvram read procedure

[Dmitry Kravkov]

introduce a procedure to read in u32 granularity.

CC: Francois Romieu <romieu@fr.zoreil.com>
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
 .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    | 54 +++++++++++++---------
 1 file changed, 31 insertions(+), 23 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 129d6b2..e7e0ac1 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -1364,11 +1364,25 @@ static int bnx2x_nvram_read(struct bnx2x *bp, u32 offset, u8 *ret_buf,
 	return rc;
 }
 
+static int bnx2x_nvram_read32(struct bnx2x *bp, u32 offset, u32 *buf,
+			      int buf_size)
+{
+	int i, rc = bnx2x_nvram_read(bp, offset, (u8 *)buf, buf_size);
+	__be32 *be = (__be32 *)buf;
+
+	if (rc)
+		return rc;
+
+	for (i = 0; i < buf_size; i += 4)
+		*buf++ = be32_to_cpu(*be++);
+
+	return 0;
+}
+
 static int bnx2x_get_eeprom(struct net_device *dev,
 			    struct ethtool_eeprom *eeprom, u8 *eebuf)
 {
 	struct bnx2x *bp = netdev_priv(dev);
-	int rc;
 
 	if (!netif_running(dev)) {
 		DP(BNX2X_MSG_ETHTOOL  | BNX2X_MSG_NVM,
@@ -1383,9 +1397,7 @@ static int bnx2x_get_eeprom(struct net_device *dev,
 
 	/* parameters already validated in ethtool_get_eeprom */
 
-	rc = bnx2x_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
-
-	return rc;
+	return bnx2x_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
 }
 
 static int bnx2x_get_module_eeprom(struct net_device *dev,
@@ -1552,9 +1564,8 @@ static int bnx2x_nvram_write1(struct bnx2x *bp, u32 offset, u8 *data_buf,
 			      int buf_size)
 {
 	int rc;
-	u32 cmd_flags;
-	u32 align_offset;
-	__be32 val;
+	u32 cmd_flags, align_offset, val;
+	__be32 val_be;
 
 	if (offset + buf_size > bp->common.flash_size) {
 		DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
@@ -1573,16 +1584,16 @@ static int bnx2x_nvram_write1(struct bnx2x *bp, u32 offset, u8 *data_buf,
 
 	cmd_flags = (MCPR_NVM_COMMAND_FIRST | MCPR_NVM_COMMAND_LAST);
 	align_offset = (offset & ~0x03);
-	rc = bnx2x_nvram_read_dword(bp, align_offset, &val, cmd_flags);
+	rc = bnx2x_nvram_read_dword(bp, align_offset, &val_be, cmd_flags);
 
-	if (rc == 0) {
-		val &= ~(0xff << BYTE_OFFSET(offset));
-		val |= (*data_buf << BYTE_OFFSET(offset));
+	/* nvram data is returned as an array of bytes
+	 * convert it back to cpu order
+	 */
+	val = be32_to_cpu(val_be);
 
-		/* nvram data is returned as an array of bytes
-		 * convert it back to cpu order
-		 */
-		val = be32_to_cpu(val);
+	if (rc == 0) {
+		val &= ~le32_to_cpu(0xff << BYTE_OFFSET(offset));
+		val |= le32_to_cpu(*data_buf << BYTE_OFFSET(offset));
 
 		rc = bnx2x_nvram_write_dword(bp, align_offset, val,
 					     cmd_flags);
@@ -2598,8 +2609,7 @@ static int bnx2x_test_nvram(struct bnx2x *bp)
 		{ 0x708,  0x70 }, /* manuf_key_info */
 		{     0,     0 }
 	};
-	__be32 *buf;
-	u8 *data;
+	u8 *buf;
 	int i, rc;
 	u32 magic, crc;
 
@@ -2612,26 +2622,24 @@ static int bnx2x_test_nvram(struct bnx2x *bp)
 		rc = -ENOMEM;
 		goto test_nvram_exit;
 	}
-	data = (u8 *)buf;
 
-	rc = bnx2x_nvram_read(bp, 0, data, 4);
+	rc = bnx2x_nvram_read32(bp, 0, &magic, sizeof(magic));
 	if (rc) {
 		DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
 		   "magic value read (rc %d)\n", rc);
 		goto test_nvram_exit;
 	}
 
-	magic = be32_to_cpu(buf[0]);
 	if (magic != 0x669955aa) {
 		DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
 		   "wrong magic value (0x%08x)\n", magic);
-		rc = -ENODEV;
+		rc = -EINVAL;
 		goto test_nvram_exit;
 	}
 
 	for (i = 0; nvram_tbl[i].size; i++) {
 
-		rc = bnx2x_nvram_read(bp, nvram_tbl[i].offset, data,
+		rc = bnx2x_nvram_read(bp, nvram_tbl[i].offset, buf,
 				      nvram_tbl[i].size);
 		if (rc) {
 			DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
@@ -2639,7 +2647,7 @@ static int bnx2x_test_nvram(struct bnx2x *bp)
 			goto test_nvram_exit;
 		}
 
-		crc = ether_crc_le(nvram_tbl[i].size, data);
+		crc = ether_crc_le(nvram_tbl[i].size, buf);
 		if (crc != CRC32_RESIDUAL) {
 			DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
 			   "nvram_tbl[%d] wrong crc value (0x%08x)\n", i, crc);
-- 
1.8.1.4

Re: [PATCH v2 net-next 1/4] bnx2x: refactor nvram read procedure

[Francois Romieu]

Dmitry Kravkov <dmitry@broadcom.com> :
> introduce a procedure to read in u32 granularity.
> 
> CC: Francois Romieu <romieu@fr.zoreil.com>
> Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
> Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
> ---
>  .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    | 54 +++++++++++++---------
>  1 file changed, 31 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> index 129d6b2..e7e0ac1 100644
> --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> @@ -1364,11 +1364,25 @@ static int bnx2x_nvram_read(struct bnx2x *bp, u32 offset, u8 *ret_buf,
>  	return rc;
>  }
>  
> +static int bnx2x_nvram_read32(struct bnx2x *bp, u32 offset, u32 *buf,
> +			      int buf_size)
> +{
> +	int i, rc = bnx2x_nvram_read(bp, offset, (u8 *)buf, buf_size);
> +	__be32 *be = (__be32 *)buf;
> +
> +	if (rc)
> +		return rc;

Nit: one of those may be a tad more idiomatic. Not sure.

	__be32 *be = (__be32 *)buf;
	int i, rc;

	rc = bnx2x_nvram_read(bp, offset, (u8 *)buf, buf_size);
	if (rc)
		...
or:
	int rc;

	rc = bnx2x_nvram_read(bp, offset, (u8 *)buf, buf_size);
	if (!rc) {
		__be32 *be = (__be32 *)buf;

		while ((buf_size -= 4) >= 0)
			*buf++ = be32_to_cpu(*be++);
	}

[...]
> @@ -1383,9 +1397,7 @@ static int bnx2x_get_eeprom(struct net_device *dev,
>  
>  	/* parameters already validated in ethtool_get_eeprom */
>  
> -	rc = bnx2x_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
> -
> -	return rc;
> +	return bnx2x_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
>  }

Nit--: it's a bit off-topic.

[...]
> @@ -1573,16 +1584,16 @@ static int bnx2x_nvram_write1(struct bnx2x *bp, u32 offset, u8 *data_buf,
>  
>  	cmd_flags = (MCPR_NVM_COMMAND_FIRST | MCPR_NVM_COMMAND_LAST);
>  	align_offset = (offset & ~0x03);
> -	rc = bnx2x_nvram_read_dword(bp, align_offset, &val, cmd_flags);
> +	rc = bnx2x_nvram_read_dword(bp, align_offset, &val_be, cmd_flags);
>  
> -	if (rc == 0) {
> -		val &= ~(0xff << BYTE_OFFSET(offset));
> -		val |= (*data_buf << BYTE_OFFSET(offset));
> +	/* nvram data is returned as an array of bytes
> +	 * convert it back to cpu order
> +	 */
> +	val = be32_to_cpu(val_be);

(1)

>  
> -		/* nvram data is returned as an array of bytes
> -		 * convert it back to cpu order
> -		 */
> -		val = be32_to_cpu(val);
> +	if (rc == 0) {
> +		val &= ~le32_to_cpu(0xff << BYTE_OFFSET(offset));
> +		val |= le32_to_cpu(*data_buf << BYTE_OFFSET(offset));

(2)

Either be32_to_cpu or le32_to_cpu above isn't a nop but the commit
message only talks of refactoring. It imho lacks a statement about
a fix.

-- 
Ueimor

RE: [PATCH v2 net-next 1/4] bnx2x: refactor nvram read procedure

[Dmitry Kravkov]

> -----Original Message-----
> From: Francois Romieu [mailto:romieu@fr.zoreil.com]
> Sent: Friday, April 19, 2013 2:15 AM
> To: Dmitry Kravkov
> Cc: davem@davemloft.net; netdev@vger.kernel.org; Eilon Greenstein
> Subject: Re: [PATCH v2 net-next 1/4] bnx2x: refactor nvram read procedure
> 
> Dmitry Kravkov <dmitry@broadcom.com> :
> > introduce a procedure to read in u32 granularity.
> >
> > CC: Francois Romieu <romieu@fr.zoreil.com>
> > Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
> > Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
> > ---
> >  .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    | 54 +++++++++++++---------
> >  1 file changed, 31 insertions(+), 23 deletions(-)
> >
> > diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> > index 129d6b2..e7e0ac1 100644
> > --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> > +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> > @@ -1364,11 +1364,25 @@ static int bnx2x_nvram_read(struct bnx2x *bp, u32 offset, u8 *ret_buf,
> >  	return rc;
> >  }
> >
> > +static int bnx2x_nvram_read32(struct bnx2x *bp, u32 offset, u32 *buf,
> > +			      int buf_size)
> > +{
> > +	int i, rc = bnx2x_nvram_read(bp, offset, (u8 *)buf, buf_size);
> > +	__be32 *be = (__be32 *)buf;
> > +
> > +	if (rc)
> > +		return rc;
> 
> Nit: one of those may be a tad more idiomatic. Not sure.
> 
> 	__be32 *be = (__be32 *)buf;
> 	int i, rc;
> 
> 	rc = bnx2x_nvram_read(bp, offset, (u8 *)buf, buf_size);
> 	if (rc)
> 		...
> or:
> 	int rc;
> 
> 	rc = bnx2x_nvram_read(bp, offset, (u8 *)buf, buf_size);
> 	if (!rc) {
> 		__be32 *be = (__be32 *)buf;
> 
> 		while ((buf_size -= 4) >= 0)
> 			*buf++ = be32_to_cpu(*be++);
> 	}
I will adopt this one :)

> [...]
> > @@ -1383,9 +1397,7 @@ static int bnx2x_get_eeprom(struct net_device *dev,
> >
> >  	/* parameters already validated in ethtool_get_eeprom */
> >
> > -	rc = bnx2x_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
> > -
> > -	return rc;
> > +	return bnx2x_nvram_read(bp, eeprom->offset, eebuf, eeprom->len);
> >  }
> 
> Nit--: it's a bit off-topic.
Will separate it
 
> [...]
> > @@ -1573,16 +1584,16 @@ static int bnx2x_nvram_write1(struct bnx2x *bp, u32 offset, u8 *data_buf,
> >
> >  	cmd_flags = (MCPR_NVM_COMMAND_FIRST | MCPR_NVM_COMMAND_LAST);
> >  	align_offset = (offset & ~0x03);
> > -	rc = bnx2x_nvram_read_dword(bp, align_offset, &val, cmd_flags);
> > +	rc = bnx2x_nvram_read_dword(bp, align_offset, &val_be, cmd_flags);
> >
> > -	if (rc == 0) {
> > -		val &= ~(0xff << BYTE_OFFSET(offset));
> > -		val |= (*data_buf << BYTE_OFFSET(offset));
> > +	/* nvram data is returned as an array of bytes
> > +	 * convert it back to cpu order
> > +	 */
> > +	val = be32_to_cpu(val_be);
> 
> (1)
> 
> >
> > -		/* nvram data is returned as an array of bytes
> > -		 * convert it back to cpu order
> > -		 */
> > -		val = be32_to_cpu(val);
> > +	if (rc == 0) {
> > +		val &= ~le32_to_cpu(0xff << BYTE_OFFSET(offset));
> > +		val |= le32_to_cpu(*data_buf << BYTE_OFFSET(offset));
> 
> (2)
> 
> Either be32_to_cpu or le32_to_cpu above isn't a nop but the commit
> message only talks of refactoring. It imho lacks a statement about
> a fix.

Good catch  - this one should go to -net,
I will leave it in net-next series as separate patch with proper message to avoid painful merging, if Dave does not objection for this.  
 
> --
> Ueimor

[PATCH v2 net-next 2/4] bnx2x: add additional regions for CRC memory test

[Dmitry Kravkov]

a. Common tree of `dir` structures.
b. Multi-port devices structures.

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h        |   7 +-
 .../net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c    | 171 ++++++++++++++++++---
 2 files changed, 155 insertions(+), 23 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index c630342..87629fd 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -850,6 +850,9 @@ struct bnx2x_common {
 #define CHIP_IS_57840_VF(bp)		(CHIP_NUM(bp) == CHIP_NUM_57840_VF)
 #define CHIP_IS_E1H(bp)			(CHIP_IS_57711(bp) || \
 					 CHIP_IS_57711E(bp))
+#define CHIP_IS_57811xx(bp)		(CHIP_IS_57811(bp) || \
+					 CHIP_IS_57811_MF(bp) || \
+					 CHIP_IS_57811_VF(bp))
 #define CHIP_IS_E2(bp)			(CHIP_IS_57712(bp) || \
 					 CHIP_IS_57712_MF(bp) || \
 					 CHIP_IS_57712_VF(bp))
@@ -859,9 +862,7 @@ struct bnx2x_common {
 					 CHIP_IS_57810(bp) || \
 					 CHIP_IS_57810_MF(bp) || \
 					 CHIP_IS_57810_VF(bp) || \
-					 CHIP_IS_57811(bp) || \
-					 CHIP_IS_57811_MF(bp) || \
-					 CHIP_IS_57811_VF(bp) || \
+					 CHIP_IS_57811xx(bp) || \
 					 CHIP_IS_57840(bp) || \
 					 CHIP_IS_57840_MF(bp) || \
 					 CHIP_IS_57840_VF(bp))
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index e7e0ac1..65ac870 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -2593,14 +2593,138 @@ static int bnx2x_test_ext_loopback(struct bnx2x *bp)
 	return rc;
 }
 
+struct code_entry {
+	u32 sram_start_addr;
+	u32 code_attribute;
+#define CODE_IMAGE_TYPE_MASK			0xf0800003
+#define CODE_IMAGE_VNTAG_PROFILES_DATA		0xd0000003
+#define CODE_IMAGE_LENGTH_MASK			0x007ffffc
+#define CODE_IMAGE_TYPE_EXTENDED_DIR		0xe0000000
+	u32 nvm_start_addr;
+};
+
+#define CODE_ENTRY_MAX			16
+#define CODE_ENTRY_EXTENDED_DIR_IDX	15
+#define MAX_IMAGES_IN_EXTENDED_DIR	64
+
 #define CRC32_RESIDUAL			0xdebb20e3
+#define CRC_BUFF_SIZE			256
+
+static int bnx2x_nvram_crc(struct bnx2x *bp,
+			   int offset,
+			   int size,
+			   u8 *buff)
+{
+	u32 crc = ~0;
+	int done = 0;
+
+	DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+	   "NVRAM CRC from 0x%08x to 0x%08x\n", offset, offset + size);
+
+	while (done < size) {
+		int count = min_t(int, size - done, CRC_BUFF_SIZE);
+
+		if (bnx2x_nvram_read(bp, offset + done, buff, count))
+			return -EIO;
+		crc = crc32_le(crc, buff, count);
+		done += count;
+	}
+
+	if (crc != CRC32_RESIDUAL)
+		return -EINVAL;
+
+	return 0;
+}
+
+static int bnx2x_test_nvram_dir(struct bnx2x *bp,
+				struct code_entry *entry,
+				u8 *buff)
+{
+	size_t size = entry->code_attribute & CODE_IMAGE_LENGTH_MASK;
+	u32 type = entry->code_attribute & CODE_IMAGE_TYPE_MASK;
+	int rc = 0;
+
+	/* Zero-length images and AFEX profiles do not have CRC */
+	if (size == 0 || type == CODE_IMAGE_VNTAG_PROFILES_DATA)
+		return 0;
+
+	rc = bnx2x_nvram_crc(bp, entry->nvm_start_addr, size, buff);
+	if (rc == -EIO)
+		DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+		   "Unable to read image %x\n", type);
+	else if (rc)
+		DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+		   "image %x has wrong crc value\n", type);
+
+	return rc;
+}
+
+static int bnx2x_test_nvram_dirs(struct bnx2x *bp, u8 *buff)
+{
+	u32 res = 0, ext_cnt, dir_offset = 0x14;
+	struct code_entry entry;
+	int i;
+
+	DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM, "NVRAM DIRS CRC test-set\n");
+
+	for (i = 0; i < CODE_ENTRY_EXTENDED_DIR_IDX; i++) {
+		bnx2x_nvram_read32(bp, dir_offset + sizeof(entry) * i,
+				   (u32 *)&entry, sizeof(entry));
+		res |= bnx2x_test_nvram_dir(bp, &entry, buff);
+	}
+
+	bnx2x_nvram_read32(bp, dir_offset +
+			       sizeof(entry) * CODE_ENTRY_EXTENDED_DIR_IDX,
+			   (u32 *)&entry, sizeof(entry));
+	if ((entry.code_attribute & CODE_IMAGE_TYPE_MASK)
+		!= CODE_IMAGE_TYPE_EXTENDED_DIR ||
+	    (entry.code_attribute & CODE_IMAGE_LENGTH_MASK) == 0)
+		return res;
+
+	/* handle extended dir */
+	bnx2x_nvram_read32(bp, entry.nvm_start_addr, (u32 *)&ext_cnt,
+			   sizeof(u32));
+
+	dir_offset = entry.nvm_start_addr + 8;
+	for (i = 0; i < ext_cnt && i < MAX_IMAGES_IN_EXTENDED_DIR; i++) {
+		bnx2x_nvram_read32(bp, dir_offset + sizeof(entry) * i,
+				   (u32 *)&entry, sizeof(entry));
+		res |= bnx2x_test_nvram_dir(bp, &entry, buff);
+	}
+
+	return res;
+}
+
+struct crc_pair {
+	int offset;
+	int size;
+};
+
+static int bnx2x_test_nvram_tbl(struct bnx2x *bp,
+				const struct crc_pair *nvram_tbl, u8 *buf)
+{
+	int i;
+
+	for (i = 0; nvram_tbl[i].size; i++) {
+		int res = bnx2x_nvram_crc(bp, nvram_tbl[i].offset,
+					  nvram_tbl[i].size, buf);
+		if (res == -EIO) {
+			DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+			   "nvram_tbl[%d] unable to read section\n", i);
+			return -EINVAL;
+		} else if (res) {
+			DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
+			   "nvram_tbl[%d] wrong crc value\n", i);
+			return -ENODEV;
+		}
+	}
+
+	return 0;
+}
 
 static int bnx2x_test_nvram(struct bnx2x *bp)
 {
-	static const struct {
-		int offset;
-		int size;
-	} nvram_tbl[] = {
+	const struct crc_pair nvram_tbl[] = {
 		{     0,  0x14 }, /* bootstrap */
 		{  0x14,  0xec }, /* dir */
 		{ 0x100, 0x350 }, /* manuf_info */
@@ -2609,14 +2733,20 @@ static int bnx2x_test_nvram(struct bnx2x *bp)
 		{ 0x708,  0x70 }, /* manuf_key_info */
 		{     0,     0 }
 	};
+	const struct crc_pair nvram_tbl2[] = {
+		{ 0x7e8, 0x350 }, /* manuf_info2 */
+		{ 0xb38,  0xf0 }, /* feature_info */
+		{     0,     0 }
+	};
+
 	u8 *buf;
-	int i, rc;
-	u32 magic, crc;
+	int rc;
+	u32 magic;
 
 	if (BP_NOMCP(bp))
 		return 0;
 
-	buf = kmalloc(0x350, GFP_KERNEL);
+	buf = kmalloc(CRC_BUFF_SIZE, GFP_KERNEL);
 	if (!buf) {
 		DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM, "kmalloc failed\n");
 		rc = -ENOMEM;
@@ -2637,25 +2767,26 @@ static int bnx2x_test_nvram(struct bnx2x *bp)
 		goto test_nvram_exit;
 	}
 
-	for (i = 0; nvram_tbl[i].size; i++) {
+	DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM, "Port 0 CRC test-set\n");
+	rc = bnx2x_test_nvram_tbl(bp, nvram_tbl, buf);
+	if (rc)
+		goto test_nvram_exit;
 
-		rc = bnx2x_nvram_read(bp, nvram_tbl[i].offset, buf,
-				      nvram_tbl[i].size);
-		if (rc) {
-			DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
-			   "nvram_tbl[%d] read data (rc %d)\n", i, rc);
-			goto test_nvram_exit;
-		}
+	if (!CHIP_IS_E1x(bp) && !CHIP_IS_57811xx(bp)) {
+		u32 hide = SHMEM_RD(bp, dev_info.shared_hw_config.config2) &
+			   SHARED_HW_CFG_HIDE_PORT1;
 
-		crc = ether_crc_le(nvram_tbl[i].size, buf);
-		if (crc != CRC32_RESIDUAL) {
+		if (!hide) {
 			DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
-			   "nvram_tbl[%d] wrong crc value (0x%08x)\n", i, crc);
-			rc = -ENODEV;
-			goto test_nvram_exit;
+			   "Port 1 CRC test-set\n");
+			rc = bnx2x_test_nvram_tbl(bp, nvram_tbl2, buf);
+			if (rc)
+				goto test_nvram_exit;
 		}
 	}
 
+	rc = bnx2x_test_nvram_dirs(bp, buf);
+
 test_nvram_exit:
 	kfree(buf);
 	return rc;
-- 
1.8.1.4

Re: [PATCH v2 net-next 2/4] bnx2x: add additional regions for CRC memory test

[Francois Romieu]

Dmitry Kravkov <dmitry@broadcom.com> :
[...]
> diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> index e7e0ac1..65ac870 100644
> --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> @@ -2593,14 +2593,138 @@ static int bnx2x_test_ext_loopback(struct bnx2x *bp)
>  	return rc;
>  }
>  
> +struct code_entry {
> +	u32 sram_start_addr;
> +	u32 code_attribute;
> +#define CODE_IMAGE_TYPE_MASK			0xf0800003
> +#define CODE_IMAGE_VNTAG_PROFILES_DATA		0xd0000003
> +#define CODE_IMAGE_LENGTH_MASK			0x007ffffc
> +#define CODE_IMAGE_TYPE_EXTENDED_DIR		0xe0000000
> +	u32 nvm_start_addr;
> +};
> +
> +#define CODE_ENTRY_MAX			16
> +#define CODE_ENTRY_EXTENDED_DIR_IDX	15
> +#define MAX_IMAGES_IN_EXTENDED_DIR	64
> +
>  #define CRC32_RESIDUAL			0xdebb20e3
> +#define CRC_BUFF_SIZE			256
> +
> +static int bnx2x_nvram_crc(struct bnx2x *bp,
> +			   int offset,
> +			   int size,
> +			   u8 *buff)

static int bnx2x_nvram_crc(struct bnx2x *bp, int offset, int size, u8 *buff)

> +{
> +	u32 crc = ~0;
> +	int done = 0;
> +
> +	DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
> +	   "NVRAM CRC from 0x%08x to 0x%08x\n", offset, offset + size);
> +
> +	while (done < size) {
> +		int count = min_t(int, size - done, CRC_BUFF_SIZE);
> +
> +		if (bnx2x_nvram_read(bp, offset + done, buff, count))
> +			return -EIO;

You may propagate the status code from bnx2x_nvram_read.

> +		crc = crc32_le(crc, buff, count);
> +		done += count;
> +	}
> +
> +	if (crc != CRC32_RESIDUAL)
> +		return -EINVAL;
> +
> +	return 0;

A ternary operator could be used. Your choice of style.

> +}
> +
> +static int bnx2x_test_nvram_dir(struct bnx2x *bp,
> +				struct code_entry *entry,
> +				u8 *buff)
> +{
> +	size_t size = entry->code_attribute & CODE_IMAGE_LENGTH_MASK;
> +	u32 type = entry->code_attribute & CODE_IMAGE_TYPE_MASK;
> +	int rc = 0;

Useless init.

> +
> +	/* Zero-length images and AFEX profiles do not have CRC */
> +	if (size == 0 || type == CODE_IMAGE_VNTAG_PROFILES_DATA)
> +		return 0;
> +
> +	rc = bnx2x_nvram_crc(bp, entry->nvm_start_addr, size, buff);
> +	if (rc == -EIO)
> +		DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
> +		   "Unable to read image %x\n", type);
> +	else if (rc)
> +		DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
> +		   "image %x has wrong crc value\n", type);

It's a bit ugly.

bnx2x_nvram_crc perfectly knowns if a read failure or a crc problem
happened. It can print messages and you won't need to analyze the 
failure status. You may still print some different message in its
callers (here and bnx2x_test_nvram_tbl).

I must stop here, sorry.

-- 
Ueimor

RE: [PATCH v2 net-next 2/4] bnx2x: add additional regions for CRC memory test

[Dmitry Kravkov]

> -----Original Message-----
> From: Francois Romieu [mailto:romieu@fr.zoreil.com]
> Sent: Friday, April 19, 2013 2:15 AM
> To: Dmitry Kravkov
> Cc: davem@davemloft.net; netdev@vger.kernel.org; Eilon Greenstein
> Subject: Re: [PATCH v2 net-next 2/4] bnx2x: add additional regions for CRC memory test
> 
> Dmitry Kravkov <dmitry@broadcom.com> :
> [...]
> > diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> > index e7e0ac1..65ac870 100644
> > --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> > +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
> > @@ -2593,14 +2593,138 @@ static int bnx2x_test_ext_loopback(struct bnx2x *bp)
> >  	return rc;
> >  }
> >
> > +struct code_entry {
> > +	u32 sram_start_addr;
> > +	u32 code_attribute;
> > +#define CODE_IMAGE_TYPE_MASK			0xf0800003
> > +#define CODE_IMAGE_VNTAG_PROFILES_DATA		0xd0000003
> > +#define CODE_IMAGE_LENGTH_MASK			0x007ffffc
> > +#define CODE_IMAGE_TYPE_EXTENDED_DIR		0xe0000000
> > +	u32 nvm_start_addr;
> > +};
> > +
> > +#define CODE_ENTRY_MAX			16
> > +#define CODE_ENTRY_EXTENDED_DIR_IDX	15
> > +#define MAX_IMAGES_IN_EXTENDED_DIR	64
> > +
> >  #define CRC32_RESIDUAL			0xdebb20e3
> > +#define CRC_BUFF_SIZE			256
> > +
> > +static int bnx2x_nvram_crc(struct bnx2x *bp,
> > +			   int offset,
> > +			   int size,
> > +			   u8 *buff)
> 
> static int bnx2x_nvram_crc(struct bnx2x *bp, int offset, int size, u8 *buff)
> 
> > +{
> > +	u32 crc = ~0;
> > +	int done = 0;
> > +
> > +	DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
> > +	   "NVRAM CRC from 0x%08x to 0x%08x\n", offset, offset + size);
> > +
> > +	while (done < size) {
> > +		int count = min_t(int, size - done, CRC_BUFF_SIZE);
> > +
> > +		if (bnx2x_nvram_read(bp, offset + done, buff, count))
> > +			return -EIO;
> 
> You may propagate the status code from bnx2x_nvram_read.
> 
> > +		crc = crc32_le(crc, buff, count);
> > +		done += count;
> > +	}
> > +
> > +	if (crc != CRC32_RESIDUAL)
> > +		return -EINVAL;
> > +
> > +	return 0;
> 
> A ternary operator could be used. Your choice of style.
> 
> > +}
> > +
> > +static int bnx2x_test_nvram_dir(struct bnx2x *bp,
> > +				struct code_entry *entry,
> > +				u8 *buff)
> > +{
> > +	size_t size = entry->code_attribute & CODE_IMAGE_LENGTH_MASK;
> > +	u32 type = entry->code_attribute & CODE_IMAGE_TYPE_MASK;
> > +	int rc = 0;
> 
> Useless init.
To be fixed

> > +
> > +	/* Zero-length images and AFEX profiles do not have CRC */
> > +	if (size == 0 || type == CODE_IMAGE_VNTAG_PROFILES_DATA)
> > +		return 0;
> > +
> > +	rc = bnx2x_nvram_crc(bp, entry->nvm_start_addr, size, buff);
> > +	if (rc == -EIO)
> > +		DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
> > +		   "Unable to read image %x\n", type);
> > +	else if (rc)
> > +		DP(BNX2X_MSG_ETHTOOL | BNX2X_MSG_NVM,
> > +		   "image %x has wrong crc value\n", type);
> 
> It's a bit ugly.
> 
> bnx2x_nvram_crc perfectly knowns if a read failure or a crc problem
> happened. It can print messages and you won't need to analyze the
> failure status. You may still print some different message in its
> callers (here and bnx2x_test_nvram_tbl).
I will fix to common mesaage for type only 
> 
> I must stop here, sorry.
Thank you!!

> --
> Ueimor

[PATCH v2 net-next 3/4] bnx2x: allow nvram test to run when device is down

[Dmitry Kravkov]

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index 65ac870..738e287 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -2832,9 +2832,16 @@ static void bnx2x_self_test(struct net_device *dev,
 
 	memset(buf, 0, sizeof(u64) * BNX2X_NUM_TESTS(bp));
 
+	if (bnx2x_test_nvram(bp) != 0) {
+		if (!IS_MF(bp))
+			buf[4] = 1;
+		else
+			buf[0] = 1;
+		etest->flags |= ETH_TEST_FL_FAILED;
+	}
+
 	if (!netif_running(dev)) {
-		DP(BNX2X_MSG_ETHTOOL,
-		   "Can't perform self-test when interface is down\n");
+		DP(BNX2X_MSG_ETHTOOL, "Interface is down\n");
 		return;
 	}
 
@@ -2896,13 +2903,7 @@ static void bnx2x_self_test(struct net_device *dev,
 		/* wait until link state is restored */
 		bnx2x_wait_for_link(bp, link_up, is_serdes);
 	}
-	if (bnx2x_test_nvram(bp) != 0) {
-		if (!IS_MF(bp))
-			buf[4] = 1;
-		else
-			buf[0] = 1;
-		etest->flags |= ETH_TEST_FL_FAILED;
-	}
+
 	if (bnx2x_test_intr(bp) != 0) {
 		if (!IS_MF(bp))
 			buf[5] = 1;
-- 
1.8.1.4

[PATCH v2 net-next 4/4] bnx2x: update version to 1.78.17-0

[Dmitry Kravkov]

Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
---
 drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index 87629fd..3dba2a7 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -26,8 +26,8 @@
  * (you will need to reboot afterwards) */
 /* #define BNX2X_STOP_ON_ERROR */
 
-#define DRV_MODULE_VERSION      "1.78.02-0"
-#define DRV_MODULE_RELDATE      "2013/01/14"
+#define DRV_MODULE_VERSION      "1.78.17-0"
+#define DRV_MODULE_RELDATE      "2013/04/11"
 #define BNX2X_BC_VER            0x040200
 
 #if defined(CONFIG_DCB)
-- 
1.8.1.4