Skip to contentSkip to conversation

handle broken V4 fw region code shift

PATCH In review Marek Vasut 3 participants 5 messages Jul 16, 2009 – Jul 21, 2009 Networking drivers (wireless)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 handle broken V4 fw region code shift

Dne Čt 16. července 2009 20:21:30 Dan Williams napsal(a):

Quoted 6 lines · Marek Vasut
Quoted 4 lines

Hi,

please consider applying/commenting on the following trivial fix. The description is in the patch. Thanks.

Quoted 8 lines

Please CC to [email protected] and I'll ack there so Linville will pick it up. Any patch that you consider appropriate for actual inclusion at the time you send it is better on linux-wireless. libertas-dev should really be only for hardware/firmware discussions and not-yet-ready patches.

Thanks!
Dan

Done, thanks! :-)
(sorry for sending it twice, I missed the address was incomplete in your mail)

From d69e6db9d424e40dade6bbf107dbab2ff4d692d5 Mon Sep 17 00:00:00 2001
From: Marek Vasut <[email protected]>
Date: Thu, 16 Jul 2009 19:19:53 +0200
Subject: [PATCH] Fix problem with broken V4 firmware on CF8381

Firmware V4 on CF8381 reports region code shifted by 1 byte to left. The following patch checks for this and handles it properly.

---
 drivers/net/wireless/libertas/cmd.c  |    8 +++++++-
 drivers/net/wireless/libertas/defs.h |    2 ++
 2 files changed, 9 insertions(+), 1 deletions(-)
drivers/net/wireless/libertas/cmd.c +7 -1
index 01db705..445288d 100644
@@ -135,8 +135,14 @@ int lbs_update_hw_spec(struct lbs_private *priv)
 	/* Clamp region code to 8-bit since FW spec indicates that it should
 	 * only ever be 8-bit, even though the field size is 16-bit.  Some firmware
 	 * returns non-zero high 8 bits here.
+	 *
+	 * Firmware version 4.0.102 used in CF8381 has region code shifted. We
+	 * need to check for this problem and handle it properly.
 	 */
-	priv->regioncode = le16_to_cpu(cmd.regioncode) & 0xFF;
+	if (MRVL_FW_MAJOR_REV(priv->fwrelease) == MRVL_FW_V4)
+		priv->regioncode = (le16_to_cpu(cmd.regioncode) >> 8) & 0xFF;
+	else
+		priv->regioncode = le16_to_cpu(cmd.regioncode) & 0xFF;
 
 	for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) {
 		/* use the region code to search for the index */
drivers/net/wireless/libertas/defs.h +2 -0
index 48da157..72f3479 100644
@@ -234,6 +234,8 @@ static inline void lbs_deb_hex(unsigned int grp, const char *prompt, u8 *buf, in
 /** Mesh enable bit in FW capability */
 #define MESH_CAPINFO_ENABLE_MASK			(1<<16)
 
+/** FW definition from Marvell v4 */
+#define MRVL_FW_V4					(0x04)
 /** FW definition from Marvell v5 */
 #define MRVL_FW_V5					(0x05)
 /** FW definition from Marvell v10 */
Signature · 1 line
1.6.3.3
#1 lore raw
Quoted 13 lines · Marek Vasut

Dne Čt 16. července 2009 20:21:30 Dan Williams napsal(a):

Quoted 12 lines · Marek Vasut
Quoted 4 lines

Hi,

please consider applying/commenting on the following trivial fix. The description is in the patch. Thanks.

Please CC to [email protected] and I'll ack there so Linville will pick it up.  Any patch that you consider appropriate for actual inclusion at the time you send it is better on linux-wireless. libertas-dev should really be only for hardware/firmware discussions and not-yet-ready patches.

Quoted 6 lines
Quoted 2 lines

Thanks!
Dan

Done, thanks! :-)
(sorry for sending it twice, I missed the address was incomplete in your mail)

Please resend inline

Luis

#2 lore raw

Dne Čt 16. července 2009 22:11:26 Luis R. Rodriguez napsal(a):

Quoted 17 lines · Marek Vasut
Quoted 16 lines

Dne Čt 16. července 2009 20:21:30 Dan Williams napsal(a):

Quoted 14 lines · Marek Vasut
Quoted 4 lines

Hi,

please consider applying/commenting on the following trivial fix. The description is in the patch. Thanks.

Please CC to [email protected] and I'll ack there so Linville will pick it up. Any patch that you consider appropriate for actual inclusion at the time you send it is better on linux-wireless. libertas-dev should really be only for hardware/firmware discussions and not-yet-ready patches.

Thanks!
Dan

Quoted 7 lines
Quoted 3 lines

Done, thanks! :-)
(sorry for sending it twice, I missed the address was incomplete in your mail)

Please resend inline

Luis

Here you go

Quoted 1 line

From d69e6db9d424e40dade6bbf107dbab2ff4d692d5 Mon Sep 17 00:00:00 2001

From: Marek Vasut <[email protected]>
Date: Thu, 16 Jul 2009 19:19:53 +0200
Subject: [PATCH] Fix problem with broken V4 firmware on CF8381

Firmware V4 on CF8381 reports region code shifted by 1 byte to left. The following patch checks for this and handles it properly.

---

 drivers/net/wireless/libertas/cmd.c  |    8 +++++++-
 drivers/net/wireless/libertas/defs.h |    2 ++      
 2 files changed, 9 insertions(+), 1 deletions(-)    
(quoted diff) +0 -0

b/drivers/net/wireless/libertas/cmd.c
index 01db705..445288d 100644

drivers/net/wireless/libertas/cmd.c +0 -0
@@ -135,8 +135,14 @@ int lbs_update_hw_spec(struct lbs_private *priv)                 
        /* Clamp region code to 8-bit since FW spec indicates that it should          
         * only ever be 8-bit, even though the field size is 16-bit.  Some 

firmware
* returns non-zero high 8 bits here.

+        *
+        * Firmware version 4.0.102 used in CF8381 has region code shifted. We
+        * need to check for this problem and handle it properly.
         */

- priv->regioncode = le16_to_cpu(cmd.regioncode) & 0xFF;
+ if (MRVL_FW_MAJOR_REV(priv->fwrelease) == MRVL_FW_V4)
+ priv->regioncode = (le16_to_cpu(cmd.regioncode) >> 8) & 0xFF;
+ else
+ priv->regioncode = le16_to_cpu(cmd.regioncode) & 0xFF;

        for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) {
                /* use the region code to search for the index */
(quoted diff) +0 -0

b/drivers/net/wireless/libertas/defs.h
index 48da157..72f3479 100644

drivers/net/wireless/libertas/defs.h +0 -0
@@ -234,6 +234,8 @@ static inline void lbs_deb_hex(unsigned int grp, const 

char *prompt, u8 *buf, in
/** Mesh enable bit in FW capability */
#define MESH_CAPINFO_ENABLE_MASK (1<<16)

+/** FW definition from Marvell v4 */
+#define MRVL_FW_V4 (0x04)
/** FW definition from Marvell v5 */
#define MRVL_FW_V5 (0x05)
/** FW definition from Marvell v10 */
--
1.6.3.3

#3 lore raw

Dne Čt 16. července 2009 22:29:41 Marek Vasut napsal(a):

Quoted 2 lines

Dne Čt 16. července 2009 22:11:26 Luis R. Rodriguez napsal(a):

Quoted 1 line

On Thu, Jul 16, 2009 at 11:32 AM, Marek Vasut<[email protected]>

Quoted 20 lines · wrote:
Quoted 20 lines
Quoted 19 lines

Dne Čt 16. července 2009 20:21:30 Dan Williams napsal(a):

Quoted 6 lines · Marek Vasut
Quoted 4 lines

Hi,

please consider applying/commenting on the following trivial fix. The description is in the patch. Thanks.

Quoted 8 lines

Please CC to [email protected] and I'll ack there so Linville will pick it up. Any patch that you consider appropriate for actual inclusion at the time you send it is better on linux-wireless. libertas-dev should really be only for hardware/firmware discussions and not-yet-ready patches.

Thanks!
Dan

Done, thanks! :-)
(sorry for sending it twice, I missed the address was incomplete in your mail)

Quoted 5 lines
Quoted 3 lines

Please resend inline

Luis

Here you go

Any update ?

Quoted 54 lines

From d69e6db9d424e40dade6bbf107dbab2ff4d692d5 Mon Sep 17 00:00:00 2001
From: Marek Vasut <[email protected]>
Date: Thu, 16 Jul 2009 19:19:53 +0200
Subject: [PATCH] Fix problem with broken V4 firmware on CF8381

Firmware V4 on CF8381 reports region code shifted by 1 byte to left. The following patch checks for this and handles it properly.

---
 drivers/net/wireless/libertas/cmd.c  |    8 +++++++-
 drivers/net/wireless/libertas/defs.h |    2 ++
 2 files changed, 9 insertions(+), 1 deletions(-)
drivers/net/wireless/libertas/cmd.c +0 -0
index 01db705..445288d 100644
@@ -135,8 +135,14 @@ int lbs_update_hw_spec(struct lbs_private *priv)
        /* Clamp region code to 8-bit since FW spec indicates that it

should * only ever be 8-bit, even though the field size is 16-bit. Some firmware
* returns non-zero high 8 bits here.

drivers/net/wireless/libertas/cmd.c +2 -0
+        *
+        * Firmware version 4.0.102 used in CF8381 has region code shifted.

We + * need to check for this problem and handle it properly.

         */
drivers/net/wireless/libertas/cmd.c +2 -1
-       priv->regioncode = le16_to_cpu(cmd.regioncode) & 0xFF;
+       if (MRVL_FW_MAJOR_REV(priv->fwrelease) == MRVL_FW_V4)
+               priv->regioncode = (le16_to_cpu(cmd.regioncode) >> 8) &

0xFF; + else

drivers/net/wireless/libertas/cmd.c +1 -0
+               priv->regioncode = le16_to_cpu(cmd.regioncode) & 0xFF;
 
        for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) {
                /* use the region code to search for the index */
drivers/net/wireless/libertas/defs.h +0 -0
index 48da157..72f3479 100644
@@ -234,6 +234,8 @@ static inline void lbs_deb_hex(unsigned int grp, const

char *prompt, u8 *buf, in
/** Mesh enable bit in FW capability */
#define MESH_CAPINFO_ENABLE_MASK (1<<16)

drivers/net/wireless/libertas/defs.h +2 -1
+/** FW definition from Marvell v4 */
+#define MRVL_FW_V4                                     (0x04)
 /** FW definition from Marvell v5 */
 #define MRVL_FW_V5                                     (0x05)
 /** FW definition from Marvell v10 */
--

1.6.3.3

Acked-by
#4 lore raw
In reply to Marek Vasut
Quoted 33 lines · Marek Vasut

Dne Čt 16. července 2009 22:11:26 Luis R. Rodriguez napsal(a):

Quoted 17 lines · Marek Vasut
Quoted 16 lines

Dne Čt 16. července 2009 20:21:30 Dan Williams napsal(a):

Quoted 14 lines · Marek Vasut
Quoted 4 lines

Hi,

please consider applying/commenting on the following trivial fix. The description is in the patch. Thanks.

Please CC to [email protected] and I'll ack there so Linville will pick it up. Any patch that you consider appropriate for actual inclusion at the time you send it is better on linux-wireless. libertas-dev should really be only for hardware/firmware discussions and not-yet-ready patches.

Thanks!
Dan

Quoted 7 lines
Quoted 3 lines

Done, thanks! :-)
(sorry for sending it twice, I missed the address was incomplete in your mail)

Please resend inline

Luis

Here you go

From d69e6db9d424e40dade6bbf107dbab2ff4d692d5 Mon Sep 17 00:00:00 2001
From: Marek Vasut <[email protected]>
Date: Thu, 16 Jul 2009 19:19:53 +0200
Subject: [PATCH] Fix problem with broken V4 firmware on CF8381

Quoted 4 lines

Firmware V4 on CF8381 reports region code shifted by 1 byte to left. The following patch checks for this and handles it properly.

Quoted 44 lines

---

 drivers/net/wireless/libertas/cmd.c  |    8 +++++++-
 drivers/net/wireless/libertas/defs.h |    2 ++      
 2 files changed, 9 insertions(+), 1 deletions(-)    
drivers/net/wireless/libertas/cmd.c +0 -0
index 01db705..445288d 100644                                                         
@@ -135,8 +135,14 @@ int lbs_update_hw_spec(struct lbs_private *priv)                 
        /* Clamp region code to 8-bit since FW spec indicates that it should          
         * only ever be 8-bit, even though the field size is 16-bit.  Some 

firmware
* returns non-zero high 8 bits here.

drivers/net/wireless/libertas/cmd.c +7 -1
+        *
+        * Firmware version 4.0.102 used in CF8381 has region code shifted. We
+        * need to check for this problem and handle it properly.
         */
-       priv->regioncode = le16_to_cpu(cmd.regioncode) & 0xFF;
+       if (MRVL_FW_MAJOR_REV(priv->fwrelease) == MRVL_FW_V4)
+               priv->regioncode = (le16_to_cpu(cmd.regioncode) >> 8) & 0xFF;
+       else
+               priv->regioncode = le16_to_cpu(cmd.regioncode) & 0xFF;
 
        for (i = 0; i < MRVDRV_MAX_REGION_CODE; i++) {
                /* use the region code to search for the index */
drivers/net/wireless/libertas/defs.h +0 -0
index 48da157..72f3479 100644
@@ -234,6 +234,8 @@ static inline void lbs_deb_hex(unsigned int grp, const 

char *prompt, u8 *buf, in
/** Mesh enable bit in FW capability */
#define MESH_CAPINFO_ENABLE_MASK (1<<16)

drivers/net/wireless/libertas/defs.h +2 -1
+/** FW definition from Marvell v4 */
+#define MRVL_FW_V4                                     (0x04)
 /** FW definition from Marvell v5 */
 #define MRVL_FW_V5                                     (0x05)
 /** FW definition from Marvell v10 */
--

1.6.3.3