2007-02-25 00:44:39

by Divy Le ray

Subject: [PATCH 3/7] cxgb3 - FW version update

From: Divy Le Ray <[email protected]>

Update FW version to 3.2

Signed-off-by: Divy Le Ray <[email protected]>
---

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), "

2007-02-25 19:28:42

by Steve Wise

Subject: Re: [PATCH 3/7] cxgb3 - FW version update

Hey Divy,

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

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

Update FW version to 3.2

Signed-off-by: Steve Wise <[email protected]>
---

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;
}

2007-02-25 19:48:50

by Jeff Garzik

Subject: Re: [PATCH 3/7] cxgb3 - FW version update

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 <[email protected]>
> ---
>
> 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

2007-02-25 21:59:21

by Steve Wise

Subject: Re: [PATCH 3/7] cxgb3 - FW version update

> 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 */

2007-02-25 22:39:11

by Jeff Garzik

Subject: Re: [PATCH 3/7] cxgb3 - FW version update

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

2007-02-26 00:38:13

by Divy Le ray

Subject: Re: [PATCH 3/7] cxgb3 - FW version update

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