2015-02-06 22:24:42

by Jes Sorensen

Subject: [PATCH 0/1] Clear correct ACM bit

From: Jes Sorensen <[email protected]>

Hi,

Reading over the RTL driver code, I noticed that most of the
components in the rtlwifi driver would clear the wrong bit if it was
processing the VO queue and ACM was not set.

I am unable to test this, as I don't have the hardware, so please
double check before applying.

Jes

Jes Sorensen (1):
rtlwifi: Clear ACM_CTRL AC3_VO bit correctly

drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192ee/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)

--
2.1.0

2015-02-26 13:20:11

by Kalle Valo

Subject: Re: [PATCH 1/1] rtlwifi: Clear ACM_CTRL AC3_VO bit correctly

Larry Finger <[email protected]> writes:

> On 02/06/2015 04:24 PM, [email protected] wrote:
>> From: Jes Sorensen <[email protected]>
>>
>> All hw driver components in the rtlwifi driver, except for the
>> rtl8192de component has this bug. They would clear BE bit in the
>> ACM_CTRL register instead of the VO bit when processing the VO queue.
>>
>> Signed-off-by: Jes Sorensen <[email protected]>
>
> Jes,
>
> Good catch. Acked-by: Larry Finger <[email protected]>

BTW, if you want patchwork to use that Acked-by line add it to a line of
it's own. Otherwise it will ignore it.

--
Kalle Valo

2015-02-10 03:23:11

by Larry Finger

Subject: Re: [PATCH 1/1] rtlwifi: Clear ACM_CTRL AC3_VO bit correctly

On 02/06/2015 04:24 PM, [email protected] wrote:
> From: Jes Sorensen <[email protected]>
>
> All hw driver components in the rtlwifi driver, except for the
> rtl8192de component has this bug. They would clear BE bit in the
> ACM_CTRL register instead of the VO bit when processing the VO queue.
>
> Signed-off-by: Jes Sorensen <[email protected]>

Jes,

Good catch. Acked-by: Larry Finger <[email protected]>

Thanks,

Larry

> ---
> drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 2 +-
> drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 2 +-
> drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 +-
> drivers/net/wireless/rtlwifi/rtl8192ee/hw.c | 2 +-
> drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 2 +-
> drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 2 +-
> drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 2 +-
> drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 2 +-
> 8 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
> index f2b9713..edc2cbb 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
> @@ -566,7 +566,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
> acm_ctrl &= (~ACMHW_VIQEN);
> break;
> case AC3_VO:
> - acm_ctrl &= (~ACMHW_BEQEN);
> + acm_ctrl &= (~ACMHW_VOQEN);
> break;
> default:
> RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
> index 5c646d5..545b2c1 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
> @@ -363,7 +363,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
> acm_ctrl &= (~AcmHw_ViqEn);
> break;
> case AC3_VO:
> - acm_ctrl &= (~AcmHw_BeqEn);
> + acm_ctrl &= (~AcmHw_VoqEn);
> break;
> default:
> RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
> index 5513217..ab38e68 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
> @@ -1867,7 +1867,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
> acm_ctrl &= (~AcmHw_ViqEn);
> break;
> case AC3_VO:
> - acm_ctrl &= (~AcmHw_BeqEn);
> + acm_ctrl &= (~AcmHw_VoqEn);
> break;
> default:
> RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
> index 1a87edc..bac42e4 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
> @@ -588,7 +588,7 @@ void rtl92ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
> acm_ctrl &= (~ACMHW_VIQEN);
> break;
> case AC3_VO:
> - acm_ctrl &= (~ACMHW_BEQEN);
> + acm_ctrl &= (~ACMHW_VOQEN);
> break;
> default:
> RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,
> diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
> index 5761d5b..dee88a8 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
> @@ -293,7 +293,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
> acm_ctrl &= (~AcmHw_ViqEn);
> break;
> case AC3_VO:
> - acm_ctrl &= (~AcmHw_BeqEn);
> + acm_ctrl &= (~AcmHw_VoqEn);
> break;
> default:
> RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
> diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
> index aa08546..b3b0947 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
> @@ -362,7 +362,7 @@ void rtl8723e_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
> acm_ctrl &= (~ACMHW_VIQEN);
> break;
> case AC3_VO:
> - acm_ctrl &= (~ACMHW_BEQEN);
> + acm_ctrl &= (~ACMHW_VOQEN);
> break;
> default:
> RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
> diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
> index 6dad28e..b469983 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
> @@ -603,7 +603,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
> acm_ctrl &= (~ACMHW_VIQEN);
> break;
> case AC3_VO:
> - acm_ctrl &= (~ACMHW_BEQEN);
> + acm_ctrl &= (~ACMHW_VOQEN);
> break;
> default:
> RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
> diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
> index 8ec8200..ac235df 100644
> --- a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
> +++ b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
> @@ -667,7 +667,7 @@ void rtl8821ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
> acm_ctrl &= (~ACMHW_VIQEN);
> break;
> case AC3_VO:
> - acm_ctrl &= (~ACMHW_BEQEN);
> + acm_ctrl &= (~ACMHW_VOQEN);
> break;
> default:
> RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
>

2015-02-26 13:19:54

by Kalle Valo

Subject: Re: [1/1] rtlwifi: Clear ACM_CTRL AC3_VO bit correctly

> From: Jes Sorensen <[email protected]>
>
> All hw driver components in the rtlwifi driver, except for the
> rtl8192de component has this bug. They would clear BE bit in the
> ACM_CTRL register instead of the VO bit when processing the VO queue.
>
> Signed-off-by: Jes Sorensen <[email protected]>

Thanks, applied to wireless-drivers-next.git.

Kalle Valo

2015-02-06 22:24:43

by Jes Sorensen

Subject: [PATCH 1/1] rtlwifi: Clear ACM_CTRL AC3_VO bit correctly

From: Jes Sorensen <[email protected]>

All hw driver components in the rtlwifi driver, except for the
rtl8192de component has this bug. They would clear BE bit in the
ACM_CTRL register instead of the VO bit when processing the VO queue.

Signed-off-by: Jes Sorensen <[email protected]>
---
drivers/net/wireless/rtlwifi/rtl8188ee/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192ce/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192cu/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192ee/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8192se/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8723ae/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8723be/hw.c | 2 +-
drivers/net/wireless/rtlwifi/rtl8821ae/hw.c | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
index f2b9713..edc2cbb 100644
--- a/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8188ee/hw.c
@@ -566,7 +566,7 @@ void rtl88ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
acm_ctrl &= (~ACMHW_VIQEN);
break;
case AC3_VO:
- acm_ctrl &= (~ACMHW_BEQEN);
+ acm_ctrl &= (~ACMHW_VOQEN);
break;
default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
index 5c646d5..545b2c1 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/hw.c
@@ -363,7 +363,7 @@ void rtl92ce_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
acm_ctrl &= (~AcmHw_ViqEn);
break;
case AC3_VO:
- acm_ctrl &= (~AcmHw_BeqEn);
+ acm_ctrl &= (~AcmHw_VoqEn);
break;
default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
index 5513217..ab38e68 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192cu/hw.c
@@ -1867,7 +1867,7 @@ void rtl92cu_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
acm_ctrl &= (~AcmHw_ViqEn);
break;
case AC3_VO:
- acm_ctrl &= (~AcmHw_BeqEn);
+ acm_ctrl &= (~AcmHw_VoqEn);
break;
default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
index 1a87edc..bac42e4 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192ee/hw.c
@@ -588,7 +588,7 @@ void rtl92ee_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
acm_ctrl &= (~ACMHW_VIQEN);
break;
case AC3_VO:
- acm_ctrl &= (~ACMHW_BEQEN);
+ acm_ctrl &= (~ACMHW_VOQEN);
break;
default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_DMESG,
diff --git a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
index 5761d5b..dee88a8 100644
--- a/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8192se/hw.c
@@ -293,7 +293,7 @@ void rtl92se_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
acm_ctrl &= (~AcmHw_ViqEn);
break;
case AC3_VO:
- acm_ctrl &= (~AcmHw_BeqEn);
+ acm_ctrl &= (~AcmHw_VoqEn);
break;
default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
diff --git a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
index aa08546..b3b0947 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723ae/hw.c
@@ -362,7 +362,7 @@ void rtl8723e_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
acm_ctrl &= (~ACMHW_VIQEN);
break;
case AC3_VO:
- acm_ctrl &= (~ACMHW_BEQEN);
+ acm_ctrl &= (~ACMHW_VOQEN);
break;
default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
diff --git a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
index 6dad28e..b469983 100644
--- a/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8723be/hw.c
@@ -603,7 +603,7 @@ void rtl8723be_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
acm_ctrl &= (~ACMHW_VIQEN);
break;
case AC3_VO:
- acm_ctrl &= (~ACMHW_BEQEN);
+ acm_ctrl &= (~ACMHW_VOQEN);
break;
default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
diff --git a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
index 8ec8200..ac235df 100644
--- a/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
+++ b/drivers/net/wireless/rtlwifi/rtl8821ae/hw.c
@@ -667,7 +667,7 @@ void rtl8821ae_set_hw_reg(struct ieee80211_hw *hw, u8 variable, u8 *val)
acm_ctrl &= (~ACMHW_VIQEN);
break;
case AC3_VO:
- acm_ctrl &= (~ACMHW_BEQEN);
+ acm_ctrl &= (~ACMHW_VOQEN);
break;
default:
RT_TRACE(rtlpriv, COMP_ERR, DBG_LOUD,
--
2.1.0