Skip to contentSkip to conversation

ath9k_hw: make use of the wrapper to check for MCI init

PATCH New Mohammed Shafi Shajakhan 2 participants 5 messages Jun 27, 2012 Qualcomm Atheros ATH9K wireless driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 ath9k_hw: make use of the wrapper to check for MCI init

From: Mohammed Shafi Shajakhan <[email protected]>

ath9k_hw_mci_is_enabled wrapper also takes care of ATH9K_HW_CAP_MCI being set for the AR9462 under test.

---
 drivers/net/wireless/ath/ath9k/gpio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath9k/gpio.c +1 -1
index 26032cb..9ae6a4d 100644
@@ -416,7 +416,7 @@ int ath9k_init_btcoex(struct ath_softc *sc)
 		txq = sc->tx.txq_map[WME_AC_BE];
 		ath9k_hw_init_btcoex_hw(sc->sc_ah, txq->axq_qnum);
 		sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
-		if (AR_SREV_9462(ah)) {
+		if (ath9k_hw_mci_is_enabled(ah)) {
 			sc->btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;
 			INIT_LIST_HEAD(&sc->btcoex.mci.info);
 
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 2/2 ath9k: Fix signedness in a MCI debug message

From: Mohammed Shafi Shajakhan <[email protected]>

seems i got a message like this
ath: phy0: BT_Status_Update: is_link=0, linkId=2,
state=1, SEQ=-2085766476 initially.

---
 drivers/net/wireless/ath/ath9k/mci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath9k/mci.c +1 -1
index c40e568..64cc782 100644
@@ -348,7 +348,7 @@ static void ath_mci_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload)
 
 		seq_num = *((u32 *)(rx_payload + 12));
 		ath_dbg(common, MCI,
-			"BT_Status_Update: is_link=%d, linkId=%d, state=%d, SEQ=%d\n",
+			"BT_Status_Update: is_link=%d, linkId=%d, state=%d, SEQ=%u\n",
 			profile_status.is_link, profile_status.conn_handle,
 			profile_status.is_critical, seq_num);
 
Signature · 1 line
1.7.0.4
#2 lore raw

PATCH 2/2 ath9k: Fix signedness in a MCI debug message

Quoted 16 lines · Mohammed Shafi Shajakhan

From: Mohammed Shafi Shajakhan <[email protected]>

seems i got a message like this
ath: phy0: BT_Status_Update: is_link=0, linkId=2,
state=1, SEQ=-2085766476 initially.

---
 drivers/net/wireless/ath/ath9k/mci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath9k/mci.c +0 -0
index c40e568..64cc782 100644

drivers/net/wireless/ath/ath9k/mci.c static void ath_mci_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload) · line 353

Quoted 7 lines
drivers/net/wireless/ath/ath9k/mci.c +1 -1
@@ -348,7 +348,7 @@ static void ath_mci_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload)
 
 		seq_num = *((u32 *)(rx_payload + 12));
 		ath_dbg(common, MCI,
-			"BT_Status_Update: is_link=%d, linkId=%d, state=%d, SEQ=%d\n",
+			"BT_Status_Update: is_link=%d, linkId=%d, state=%d, SEQ=%u\n",
 			profile_status.is_link, profile_status.conn_handle,
 			profile_status.is_critical, seq_num);

What about endian here? Also, wouldn't it be better to have a struct for the rx payload data with proper endian annotation instead of using the weird way of dereferencing the rx_payload pointer?

- Felix

#3 lore raw

PATCH 2/2 ath9k: Fix signedness in a MCI debug message

Hi Felix,

Quoted 18 lines · Felix Fietkau
Quoted 17 lines · Mohammed Shafi Shajakhan

From: Mohammed Shafi Shajakhan<[email protected]>

seems i got a message like this
ath: phy0: BT_Status_Update: is_link=0, linkId=2,
state=1, SEQ=-2085766476 initially.

---
  drivers/net/wireless/ath/ath9k/mci.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath9k/mci.c +0 -0
index c40e568..64cc782 100644
@@ -348,7 +348,7 @@ static void ath_mci_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload)
 
Quoted 10 lines

drivers/net/wireless/ath/ath9k/mci.c static void ath_mci_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload) · line 353

Quoted 6 lines
drivers/net/wireless/ath/ath9k/mci.c +1 -1
  		seq_num = *((u32 *)(rx_payload + 12));
  		ath_dbg(common, MCI,
-			"BT_Status_Update: is_link=%d, linkId=%d, state=%d, SEQ=%d\n",
+			"BT_Status_Update: is_link=%d, linkId=%d, state=%d, SEQ=%u\n",
  			profile_status.is_link, profile_status.conn_handle,
  			profile_status.is_critical, seq_num);

What about endian here? Also, wouldn't it be better to have a struct for the rx payload data with proper endian annotation instead of using the weird way of dereferencing the rx_payload pointer?

ok, we shall fix it soon.

Signature · 2 lines
thanks,
shafi
#4 lore raw

PATCH 2/2 ath9k: Fix signedness in a MCI debug message

Quoted 34 lines · Mohammed Shafi Shajakhan

Hi Felix,

Quoted 20 lines · Felix Fietkau
Quoted 19 lines · Mohammed Shafi Shajakhan

From: Mohammed Shafi Shajakhan<[email protected]>

seems i got a message like this
ath: phy0: BT_Status_Update: is_link=0, linkId=2,
state=1, SEQ=-2085766476 initially.

---
drivers/net/wireless/ath/ath9k/mci.c | 2 +-

1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/wireless/ath/ath9k/mci.c +0 -0
index c40e568..64cc782 100644
@@ -348,7 +348,7 @@ static void ath_mci_msg(struct ath_softc *sc, u8
 opcode, u8 *rx_payload)
 
Quoted 10 lines

drivers/net/wireless/ath/ath9k/mci.c static void ath_mci_msg(struct ath_softc *sc, u8 opcode, u8 *rx_payload) · line 353

Quoted 6 lines
drivers/net/wireless/ath/ath9k/mci.c +1 -1
 seq_num = *((u32 *)(rx_payload + 12));
 ath_dbg(common, MCI,
- "BT_Status_Update: is_link=%d, linkId=%d, state=%d, SEQ=%d\n",
+ "BT_Status_Update: is_link=%d, linkId=%d, state=%d, SEQ=%u\n",
 profile_status.is_link, profile_status.conn_handle,
 profile_status.is_critical, seq_num);

What about endian here? Also, wouldn't it be better to have a struct for the rx payload data with proper endian annotation instead of using the weird way of dereferencing the rx_payload pointer?

Quoted 3 lines

ok, we shall fix it soon.

Hi John, please pick this patch, we shall address Felix's suggestion in a separate patch, i think it needs a bit of rework.

Signature · 2 lines
thanks,
shafi