LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH 3/7] cxgb3 - FW version update
@ 2007-02-25  0:44 divy
  2007-02-25 19:28 ` Steve Wise
  0 siblings, 1 reply; 8+ messages in thread
From: divy @ 2007-02-25  0:44 UTC (permalink / raw)
  To: jeff; +Cc: netdev, linux-kernel, swise

From: Divy Le Ray <divy@chelsio.com>

Update FW version to 3.2

Signed-off-by: Divy Le Ray <divy@chelsio.com>
---

 drivers/net/cxgb3/t3_hw.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index 365a7f5..ec06ad6 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -884,7 +884,7 @@ int t3_check_fw_version(struct adapter *
 	major = G_FW_VERSION_MAJOR(vers);
 	minor = G_FW_VERSION_MINOR(vers);
 
-	if (type == FW_VERSION_T3 && major == 3 && minor == 1)
+	if (type == FW_VERSION_T3 && major == 3 && minor == 2)
 		return 0;
 
 	CH_ERR(adapter, "found wrong FW version(%u.%u), "

^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/7] cxgb3 - FW version update
  2007-02-25  0:44 [PATCH 3/7] cxgb3 - FW version update divy
@ 2007-02-25 19:28 ` Steve Wise
  2007-02-25 19:48   ` Jeff Garzik
  0 siblings, 1 reply; 8+ messages in thread
From: Steve Wise @ 2007-02-25 19:28 UTC (permalink / raw)
  To: divy; +Cc: jeff, netdev, linux-kernel

Hey Divy,

You missed a printk change.  Here is an updated patch.

------------

Update FW version to 3.2

Signed-off-by: Steve Wise <swise@opengridcomputing.com>
---

 drivers/net/cxgb3/t3_hw.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index 365a7f5..08a6295 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -884,11 +884,11 @@ int t3_check_fw_version(struct adapter *
 	major = G_FW_VERSION_MAJOR(vers);
 	minor = G_FW_VERSION_MINOR(vers);
 
-	if (type == FW_VERSION_T3 && major == 3 && minor == 1)
+	if (type == FW_VERSION_T3 && major == 3 && minor == 2)
 		return 0;
 
 	CH_ERR(adapter, "found wrong FW version(%u.%u), "
-	       "driver needs version 3.1\n", major, minor);
+	       "driver needs version 3.2\n", major, minor);
 	return -EINVAL;
 }
 



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/7] cxgb3 - FW version update
  2007-02-25 19:28 ` Steve Wise
@ 2007-02-25 19:48   ` Jeff Garzik
  2007-02-25 21:59     ` Steve Wise
  0 siblings, 1 reply; 8+ messages in thread
From: Jeff Garzik @ 2007-02-25 19:48 UTC (permalink / raw)
  To: Steve Wise; +Cc: divy, netdev, linux-kernel

Steve Wise wrote:
> Hey Divy,
> 
> You missed a printk change.  Here is an updated patch.
> 
> ------------
> 
> Update FW version to 3.2
> 
> Signed-off-by: Steve Wise <swise@opengridcomputing.com>
> ---
> 
>  drivers/net/cxgb3/t3_hw.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
> index 365a7f5..08a6295 100644
> --- a/drivers/net/cxgb3/t3_hw.c
> +++ b/drivers/net/cxgb3/t3_hw.c
> @@ -884,11 +884,11 @@ int t3_check_fw_version(struct adapter *
>  	major = G_FW_VERSION_MAJOR(vers);
>  	minor = G_FW_VERSION_MINOR(vers);
>  
> -	if (type == FW_VERSION_T3 && major == 3 && minor == 1)
> +	if (type == FW_VERSION_T3 && major == 3 && minor == 2)
>  		return 0;
>  
>  	CH_ERR(adapter, "found wrong FW version(%u.%u), "
> -	       "driver needs version 3.1\n", major, minor);
> +	       "driver needs version 3.2\n", major, minor);

I would rather fix the code to use constants, and thus avoid this 
problem ever happening again.

	Jeff




^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/7] cxgb3 - FW version update
  2007-02-25 19:48   ` Jeff Garzik
@ 2007-02-25 21:59     ` Steve Wise
  2007-02-25 22:39       ` Jeff Garzik
  0 siblings, 1 reply; 8+ messages in thread
From: Steve Wise @ 2007-02-25 21:59 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: divy, netdev, linux-kernel


> I would rather fix the code to use constants, and thus avoid this 
> problem ever happening again.
> 
> 	Jeff
> 

How's this (not tested)?


---

 drivers/net/cxgb3/t3_hw.c   |    6 ++++--
 drivers/net/cxgb3/version.h |    2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index 365a7f5..4b4cffb 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -884,11 +884,13 @@ int t3_check_fw_version(struct adapter *
 	major = G_FW_VERSION_MAJOR(vers);
 	minor = G_FW_VERSION_MINOR(vers);
 
-	if (type == FW_VERSION_T3 && major == 3 && minor == 1)
+	if (type == FW_VERSION_T3 && major == FW_VERSION_MAJOR && 
+	    minor == FW_VERSION_MINOR)
 		return 0;
 
 	CH_ERR(adapter, "found wrong FW version(%u.%u), "
-	       "driver needs version 3.1\n", major, minor);
+	       "driver needs version %u.%u\n", major, minor, 
+	       FW_VERSION_MAJOR, FW_VERSION_MINOR);
 	return -EINVAL;
 }
 
diff --git a/drivers/net/cxgb3/version.h b/drivers/net/cxgb3/version.h
index 2b67dd5..782a6cf 100644
--- a/drivers/net/cxgb3/version.h
+++ b/drivers/net/cxgb3/version.h
@@ -36,4 +36,6 @@ #define DRV_DESC "Chelsio T3 Network Dri
 #define DRV_NAME "cxgb3"
 /* Driver version */
 #define DRV_VERSION "1.0"
+#define FW_VERSION_MAJOR 3
+#define FW_VERSION_MINOR 2
 #endif				/* __CHELSIO_VERSION_H */



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/7] cxgb3 - FW version update
  2007-02-25 21:59     ` Steve Wise
@ 2007-02-25 22:39       ` Jeff Garzik
  2007-02-26  0:36         ` Divy Le Ray
  0 siblings, 1 reply; 8+ messages in thread
From: Jeff Garzik @ 2007-02-25 22:39 UTC (permalink / raw)
  To: Steve Wise; +Cc: divy, netdev, linux-kernel

Steve Wise wrote:
>> I would rather fix the code to use constants, and thus avoid this 
>> problem ever happening again.
>>
>> 	Jeff
>>
> 
> How's this (not tested)?

seems OK to me



^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 3/7] cxgb3 - FW version update
  2007-02-25 22:39       ` Jeff Garzik
@ 2007-02-26  0:36         ` Divy Le Ray
  0 siblings, 0 replies; 8+ messages in thread
From: Divy Le Ray @ 2007-02-26  0:36 UTC (permalink / raw)
  To: Jeff Garzik; +Cc: Steve Wise, netdev, linux-kernel

Jeff Garzik wrote:
> Steve Wise wrote:
>>> I would rather fix the code to use constants, and thus avoid this 
>>> problem ever happening again.
>>>
>>>     Jeff
>>>
>>
>> How's this (not tested)?
>
> seems OK to me
>
>
I tested it and resubmitted. Thanks fro the fix suggestion and the patch!

Cheers,
Divy

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 3/7] cxgb3 - FW version update
@ 2007-02-26  0:32 divy
  0 siblings, 0 replies; 8+ messages in thread
From: divy @ 2007-02-26  0:32 UTC (permalink / raw)
  To: jeff; +Cc: netdev, linux-kernel, swise

From: Divy Le Ray <divy@chelsio.com>

Update FW version to 3.2

Signed-off-by: Divy Le Ray <divy@chelsio.com>
---

 drivers/net/cxgb3/t3_hw.c   |    6 ++++--
 drivers/net/cxgb3/version.h |    2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index 365a7f5..eaa7a2e 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -884,11 +884,13 @@ int t3_check_fw_version(struct adapter *
 	major = G_FW_VERSION_MAJOR(vers);
 	minor = G_FW_VERSION_MINOR(vers);
 
-	if (type == FW_VERSION_T3 && major == 3 && minor == 1)
+	if (type == FW_VERSION_T3 && major == FW_VERSION_MAJOR &&
+	    minor == FW_VERSION_MINOR)
 		return 0;
 
 	CH_ERR(adapter, "found wrong FW version(%u.%u), "
-	       "driver needs version 3.1\n", major, minor);
+	       "driver needs version %u.%u\n", major, minor,
+	       FW_VERSION_MAJOR, FW_VERSION_MINOR);
 	return -EINVAL;
 }
 
diff --git a/drivers/net/cxgb3/version.h b/drivers/net/cxgb3/version.h
index 2b67dd5..782a6cf 100644
--- a/drivers/net/cxgb3/version.h
+++ b/drivers/net/cxgb3/version.h
@@ -36,4 +36,6 @@
 #define DRV_NAME "cxgb3"
 /* Driver version */
 #define DRV_VERSION "1.0"
+#define FW_VERSION_MAJOR 3
+#define FW_VERSION_MINOR 2
 #endif				/* __CHELSIO_VERSION_H */

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 3/7] cxgb3 - FW version update
@ 2007-02-22 11:59 divy
  0 siblings, 0 replies; 8+ messages in thread
From: divy @ 2007-02-22 11:59 UTC (permalink / raw)
  To: jeff; +Cc: netdev, linux-kernel, swise

From: Divy Le Ray <divy@chelsio.com>

Update FW version to 3.2

Signed-off-by: Divy Le Ray <divy@chelsio.com>
---

 drivers/net/cxgb3/t3_hw.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index 365a7f5..ec06ad6 100644
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -884,7 +884,7 @@ int t3_check_fw_version(struct adapter *
 	major = G_FW_VERSION_MAJOR(vers);
 	minor = G_FW_VERSION_MINOR(vers);
 
-	if (type == FW_VERSION_T3 && major == 3 && minor == 1)
+	if (type == FW_VERSION_T3 && major == 3 && minor == 2)
 		return 0;
 
 	CH_ERR(adapter, "found wrong FW version(%u.%u), "

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2007-02-26  0:38 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-25  0:44 [PATCH 3/7] cxgb3 - FW version update divy
2007-02-25 19:28 ` Steve Wise
2007-02-25 19:48   ` Jeff Garzik
2007-02-25 21:59     ` Steve Wise
2007-02-25 22:39       ` Jeff Garzik
2007-02-26  0:36         ` Divy Le Ray
  -- strict thread matches above, loose matches on Subject: below --
2007-02-26  0:32 divy
2007-02-22 11:59 divy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).