| Message ID | 20190704105528.74028-1-chiu@endlessm.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 18e714687bea7f9f5155625aec04e335c0022128 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | [v2] rtl8xxxu: Fix wifi low signal strength issue of RTL8723BU | expand |
On 7/4/19 6:55 AM, Chris Chiu wrote: > The WiFi tx power of RTL8723BU is extremely low after booting. So > the WiFi scan gives very limited AP list and it always fails to > connect to the selected AP. This module only supports 1x1 antenna > and the antenna is switched to bluetooth due to some incorrect > register settings. > > Compare with the vendor driver https://github.com/lwfinger/rtl8723bu, > we realized that the 8723bu's enable_rf() does the same thing as > rtw_btcoex_HAL_Initialize() in vendor driver. And it by default > sets the antenna path to BTC_ANT_PATH_BT which we verified it's > the cause of the wifi weak tx power. The vendor driver will set > the antenna path to BTC_ANT_PATH_PTA in the consequent btcoexist > mechanism, by the function halbtc8723b1ant_PsTdma. > > This commit hand over the antenna control to PTA(Packet Traffic > Arbitration), which compares the weight of bluetooth/wifi traffic > then determine whether to continue current wifi traffic or not. > After PTA take control, The wifi signal will be back to normal and > the bluetooth scan can also work at the same time. However, the > btcoexist still needs to be handled under different circumstances. > If there's a BT connection established, the wifi still fails to > connect until BT disconnected. > > Signed-off-by: Chris Chiu <chiu@endlessm.com> > --- > > > Note: > v2: > - Replace BIT(11) with the descriptive definition > - Meaningful comment for the REG_S0S1_PATH_SWITCH setting > > > drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 11 ++++++++--- > drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 ++- > 2 files changed, 10 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c > index 3adb1d3d47ac..ceffe05bd65b 100644 > --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c > +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c > @@ -1525,7 +1525,7 @@ static void rtl8723b_enable_rf(struct rtl8xxxu_priv *priv) > /* > * WLAN action by PTA > */ > - rtl8xxxu_write8(priv, REG_WLAN_ACT_CONTROL_8723B, 0x04); > + rtl8xxxu_write8(priv, REG_WLAN_ACT_CONTROL_8723B, 0x0c); > > /* > * BT select S0/S1 controlled by WiFi > @@ -1568,9 +1568,14 @@ static void rtl8723b_enable_rf(struct rtl8xxxu_priv *priv) > rtl8xxxu_gen2_h2c_cmd(priv, &h2c, sizeof(h2c.ant_sel_rsv)); > > /* > - * 0x280, 0x00, 0x200, 0x80 - not clear > + * Different settings per different antenna position. > + * Antenna Position: | Normal Inverse > + * -------------------------------------------------- > + * Antenna switch to BT: | 0x280, 0x00 > + * Antenna switch to WiFi: | 0x0, 0x280 > + * Antenna switch to PTA: | 0x200, 0x80 > */ > - rtl8xxxu_write32(priv, REG_S0S1_PATH_SWITCH, 0x00); > + rtl8xxxu_write32(priv, REG_S0S1_PATH_SWITCH, 0x80); Per the documentation, shouldn't this be set to 0x200 then rather than 0x80? We may need to put in place some code to detect whether we have normal or inverse configuration of the dongle otherwise? I really appreciate you're digging into this! Cheers, Jes
On Fri, Jul 5, 2019 at 12:43 AM Jes Sorensen <jes.sorensen@gmail.com> wrote: > > On 7/4/19 6:55 AM, Chris Chiu wrote: > > The WiFi tx power of RTL8723BU is extremely low after booting. So > > the WiFi scan gives very limited AP list and it always fails to > > connect to the selected AP. This module only supports 1x1 antenna > > and the antenna is switched to bluetooth due to some incorrect > > register settings. > > > > Compare with the vendor driver https://github.com/lwfinger/rtl8723bu, > > we realized that the 8723bu's enable_rf() does the same thing as > > rtw_btcoex_HAL_Initialize() in vendor driver. And it by default > > sets the antenna path to BTC_ANT_PATH_BT which we verified it's > > the cause of the wifi weak tx power. The vendor driver will set > > the antenna path to BTC_ANT_PATH_PTA in the consequent btcoexist > > mechanism, by the function halbtc8723b1ant_PsTdma. > > > > This commit hand over the antenna control to PTA(Packet Traffic > > Arbitration), which compares the weight of bluetooth/wifi traffic > > then determine whether to continue current wifi traffic or not. > > After PTA take control, The wifi signal will be back to normal and > > the bluetooth scan can also work at the same time. However, the > > btcoexist still needs to be handled under different circumstances. > > If there's a BT connection established, the wifi still fails to > > connect until BT disconnected. > > > > Signed-off-by: Chris Chiu <chiu@endlessm.com> > > --- > > > > > > Note: > > v2: > > - Replace BIT(11) with the descriptive definition > > - Meaningful comment for the REG_S0S1_PATH_SWITCH setting > > > > > > drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 11 ++++++++--- > > drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 ++- > > 2 files changed, 10 insertions(+), 4 deletions(-) > > > > diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c > > index 3adb1d3d47ac..ceffe05bd65b 100644 > > --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c > > +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c > > @@ -1525,7 +1525,7 @@ static void rtl8723b_enable_rf(struct rtl8xxxu_priv *priv) > > /* > > * WLAN action by PTA > > */ > > - rtl8xxxu_write8(priv, REG_WLAN_ACT_CONTROL_8723B, 0x04); > > + rtl8xxxu_write8(priv, REG_WLAN_ACT_CONTROL_8723B, 0x0c); > > > > /* > > * BT select S0/S1 controlled by WiFi > > @@ -1568,9 +1568,14 @@ static void rtl8723b_enable_rf(struct rtl8xxxu_priv *priv) > > rtl8xxxu_gen2_h2c_cmd(priv, &h2c, sizeof(h2c.ant_sel_rsv)); > > > > /* > > - * 0x280, 0x00, 0x200, 0x80 - not clear > > + * Different settings per different antenna position. > > + * Antenna Position: | Normal Inverse > > + * -------------------------------------------------- > > + * Antenna switch to BT: | 0x280, 0x00 > > + * Antenna switch to WiFi: | 0x0, 0x280 > > + * Antenna switch to PTA: | 0x200, 0x80 > > */ > > - rtl8xxxu_write32(priv, REG_S0S1_PATH_SWITCH, 0x00); > > + rtl8xxxu_write32(priv, REG_S0S1_PATH_SWITCH, 0x80); > > Per the documentation, shouldn't this be set to 0x200 then rather than 0x80? > Per the code before REG_S0S1_PATH_SWITCH setting, the driver has told the co-processor the antenna is inverse. memset(&h2c, 0, sizeof(struct h2c_cmd)); h2c.ant_sel_rsv.cmd = H2C_8723B_ANT_SEL_RSV; h2c.ant_sel_rsv.ant_inverse = 1; h2c.ant_sel_rsv.int_switch_type = 0; rtl8xxxu_gen2_h2c_cmd(priv, &h2c, sizeof(h2c.ant_sel_rsv)); At least the current modification is consistent with the antenna inverse setting. I'll verify on vendor driver about when/how the inverse be determined. Chris > We may need to put in place so > > Cheers, > Jesme code to detect whether we have normal > or inverse configuration of the dongle otherwise? > > I really appreciate you're digging into this!
On Thu, Jul 4, 2019 at 6:55 PM Chris Chiu <chiu@endlessm.com> wrote: > The WiFi tx power of RTL8723BU is extremely low after booting. So > the WiFi scan gives very limited AP list and it always fails to > connect to the selected AP. This module only supports 1x1 antenna > and the antenna is switched to bluetooth due to some incorrect > register settings. > > Compare with the vendor driver https://github.com/lwfinger/rtl8723bu, > we realized that the 8723bu's enable_rf() does the same thing as > rtw_btcoex_HAL_Initialize() in vendor driver. And it by default > sets the antenna path to BTC_ANT_PATH_BT which we verified it's > the cause of the wifi weak tx power. The vendor driver will set > the antenna path to BTC_ANT_PATH_PTA in the consequent btcoexist > mechanism, by the function halbtc8723b1ant_PsTdma. Checking these details in the vendor driver: EXhalbtc8723b1ant_PowerOnSetting sets: pBoardInfo->btdmAntPos = BTC_ANTENNA_AT_AUX_PORT; Following the code flow from rtw_btcoex_HAL_Initialize(), this has a bWifiOnly parameter which will ultimately influence the final register value. Continuing the flow, we reach halbtc8723b1ant_SetAntPath() with bInitHwCfg=TRUE, bWifiOff=FALSE. antPosType is set to WIFI in the bWifiOnly case, and BT otherwise. I'm assuming that bUseExtSwitch = FALSE (existing rtl8xxxu code also seems to make the same assumption). For the bWifiOnly=FALSE case, it uses BT, pBtCoexist->fBtcWrite4Byte(pBtCoexist, 0x948, 0x0); and rtl8xxxu seems to do the same - seemingly routing the antenna path for BT only. As for halbtc8723b1ant_PsTdma() then being called in a way that causes it to switch to the PTA path a little later, it's more difficult to point out how that happens in an email, but I thin kwe can trust you on that :) There are certainly many callsites that would pass those parameters. > + * Different settings per different antenna position. > + * Antenna Position: | Normal Inverse > + * -------------------------------------------------- > + * Antenna switch to BT: | 0x280, 0x00 > + * Antenna switch to WiFi: | 0x0, 0x280 > + * Antenna switch to PTA: | 0x200, 0x80 > */ > - rtl8xxxu_write32(priv, REG_S0S1_PATH_SWITCH, 0x00); > + rtl8xxxu_write32(priv, REG_S0S1_PATH_SWITCH, 0x80); I don't really understand what we mean by an "inverse" antenna and my reading of the vendor driver leads me to another interpretation. The logic is based around an antenna position - btdmAntPos. It takes one of two values: BTC_ANTENNA_AT_MAIN_PORT = 0x1, BTC_ANTENNA_AT_AUX_PORT = 0x2, So the chip has pins to support two antennas - a "main" antenna and an "aux" one. We know we're dealing with a single antenna, so the actual module is going to only be using one of those antenna interfaces. If the chip tries to use the other antenna interface, it's effectively not using the antenna. So it's rather important to tell the chip to use the right interface. And that's exactly what happens here. btdmAntPos is hardcoded that the antenna is on the aux port for these devices, and this code is telling the chip that this is how things are wired up. The alternative way of calling this an antenna inverse (which the vendor driver also does in another section), i.e. "antenna is not connected to the main port but instead it's connected to the other one", seems less clear to me. Even if we don't fully understand what's going on here, I'm convinced that your code change is fixing an inconsistency with the vendor driver, and most significantly, making the signal level actually usable on our devices. But if you agree with my interpretation of these values then maybe you could update the comment here! Daniel
On Fri, Jul 5, 2019 at 11:41 AM Daniel Drake <drake@endlessm.com> wrote: > > On Thu, Jul 4, 2019 at 6:55 PM Chris Chiu <chiu@endlessm.com> wrote: > > The WiFi tx power of RTL8723BU is extremely low after booting. So > > the WiFi scan gives very limited AP list and it always fails to > > connect to the selected AP. This module only supports 1x1 antenna > > and the antenna is switched to bluetooth due to some incorrect > > register settings. > > > > Compare with the vendor driver https://github.com/lwfinger/rtl8723bu, > > we realized that the 8723bu's enable_rf() does the same thing as > > rtw_btcoex_HAL_Initialize() in vendor driver. And it by default > > sets the antenna path to BTC_ANT_PATH_BT which we verified it's > > the cause of the wifi weak tx power. The vendor driver will set > > the antenna path to BTC_ANT_PATH_PTA in the consequent btcoexist > > mechanism, by the function halbtc8723b1ant_PsTdma. > > Checking these details in the vendor driver: > EXhalbtc8723b1ant_PowerOnSetting sets: > pBoardInfo->btdmAntPos = BTC_ANTENNA_AT_AUX_PORT; > > Following the code flow from rtw_btcoex_HAL_Initialize(), this has a > bWifiOnly parameter which will ultimately influence the final register > value. > Continuing the flow, we reach halbtc8723b1ant_SetAntPath() with > bInitHwCfg=TRUE, bWifiOff=FALSE. antPosType is set to WIFI in the > bWifiOnly case, and BT otherwise. > > I'm assuming that bUseExtSwitch = FALSE (existing rtl8xxxu code also > seems to make the same assumption). > For the bWifiOnly=FALSE case, it uses BT, > pBtCoexist->fBtcWrite4Byte(pBtCoexist, 0x948, 0x0); > and rtl8xxxu seems to do the same - seemingly routing the antenna path > for BT only. > > As for halbtc8723b1ant_PsTdma() then being called in a way that causes > it to switch to the PTA path a little later, it's more difficult to > point out how that happens in an email, but I thin kwe can trust you > on that :) There are certainly many callsites that would pass those > parameters. > > > + * Different settings per different antenna position. > > + * Antenna Position: | Normal Inverse > > + * -------------------------------------------------- > > + * Antenna switch to BT: | 0x280, 0x00 > > + * Antenna switch to WiFi: | 0x0, 0x280 > > + * Antenna switch to PTA: | 0x200, 0x80 > > */ > > - rtl8xxxu_write32(priv, REG_S0S1_PATH_SWITCH, 0x00); > > + rtl8xxxu_write32(priv, REG_S0S1_PATH_SWITCH, 0x80); > > I don't really understand what we mean by an "inverse" antenna and my > reading of the vendor driver leads me to another interpretation. > > The logic is based around an antenna position - btdmAntPos. It takes > one of two values: > BTC_ANTENNA_AT_MAIN_PORT = 0x1, > BTC_ANTENNA_AT_AUX_PORT = 0x2, > > So the chip has pins to support two antennas - a "main" antenna and an > "aux" one. > > We know we're dealing with a single antenna, so the actual module is > going to only be using one of those antenna interfaces. If the chip > tries to use the other antenna interface, it's effectively not using > the antenna. So it's rather important to tell the chip to use the > right interface. > > And that's exactly what happens here. btdmAntPos is hardcoded that the > antenna is on the aux port for these devices, and this code is telling > the chip that this is how things are wired up. > > The alternative way of calling this an antenna inverse (which the > vendor driver also does in another section), i.e. "antenna is not > connected to the main port but instead it's connected to the other > one", seems less clear to me. > I agree with this part. From my past experience working on drivers for WiFi access point, there's always a board config to describe how the antenna wired up. The driver or firmware will select antennas from something like txchainmask/rxchainmask to perform some smart antenna and MIMO features. So The antenna position setting is quite important for each wifi(MIMO) product because it could have impact on the coverage and throughput. Back to the 1x1 rtl8723bu here, I think it's the same thing. The antenna position is fixed in the factory and wired to the AUX port. Maybe we can just take this antenna settings as the default for 8723bu based on the assumption that there will be no other antenna configuration. Chris > Even if we don't fully understand what's going on here, I'm convinced > that your code change is fixing an inconsistency with the vendor > driver, and most significantly, making the signal level actually > usable on our devices. But if you agree with my interpretation of > these values then maybe you could update the comment here! > > Daniel
On 7/4/19 10:27 PM, Chris Chiu wrote: > On Fri, Jul 5, 2019 at 12:43 AM Jes Sorensen <jes.sorensen@gmail.com> wrote: >> >> On 7/4/19 6:55 AM, Chris Chiu wrote: >>> The WiFi tx power of RTL8723BU is extremely low after booting. So >>> the WiFi scan gives very limited AP list and it always fails to >>> connect to the selected AP. This module only supports 1x1 antenna >>> and the antenna is switched to bluetooth due to some incorrect >>> register settings. >>> >>> Compare with the vendor driver https://github.com/lwfinger/rtl8723bu, >>> we realized that the 8723bu's enable_rf() does the same thing as >>> rtw_btcoex_HAL_Initialize() in vendor driver. And it by default >>> sets the antenna path to BTC_ANT_PATH_BT which we verified it's >>> the cause of the wifi weak tx power. The vendor driver will set >>> the antenna path to BTC_ANT_PATH_PTA in the consequent btcoexist >>> mechanism, by the function halbtc8723b1ant_PsTdma. >>> >>> This commit hand over the antenna control to PTA(Packet Traffic >>> Arbitration), which compares the weight of bluetooth/wifi traffic >>> then determine whether to continue current wifi traffic or not. >>> After PTA take control, The wifi signal will be back to normal and >>> the bluetooth scan can also work at the same time. However, the >>> btcoexist still needs to be handled under different circumstances. >>> If there's a BT connection established, the wifi still fails to >>> connect until BT disconnected. >>> >>> Signed-off-by: Chris Chiu <chiu@endlessm.com> >>> --- >>> >>> >>> Note: >>> v2: >>> - Replace BIT(11) with the descriptive definition >>> - Meaningful comment for the REG_S0S1_PATH_SWITCH setting >>> >>> >>> drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 11 ++++++++--- >>> drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 ++- >>> 2 files changed, 10 insertions(+), 4 deletions(-) >>> >>> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c >>> index 3adb1d3d47ac..ceffe05bd65b 100644 >>> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c >>> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c >>> @@ -1525,7 +1525,7 @@ static void rtl8723b_enable_rf(struct rtl8xxxu_priv *priv) >>> /* >>> * WLAN action by PTA >>> */ >>> - rtl8xxxu_write8(priv, REG_WLAN_ACT_CONTROL_8723B, 0x04); >>> + rtl8xxxu_write8(priv, REG_WLAN_ACT_CONTROL_8723B, 0x0c); >>> >>> /* >>> * BT select S0/S1 controlled by WiFi >>> @@ -1568,9 +1568,14 @@ static void rtl8723b_enable_rf(struct rtl8xxxu_priv *priv) >>> rtl8xxxu_gen2_h2c_cmd(priv, &h2c, sizeof(h2c.ant_sel_rsv)); >>> >>> /* >>> - * 0x280, 0x00, 0x200, 0x80 - not clear >>> + * Different settings per different antenna position. >>> + * Antenna Position: | Normal Inverse >>> + * -------------------------------------------------- >>> + * Antenna switch to BT: | 0x280, 0x00 >>> + * Antenna switch to WiFi: | 0x0, 0x280 >>> + * Antenna switch to PTA: | 0x200, 0x80 >>> */ >>> - rtl8xxxu_write32(priv, REG_S0S1_PATH_SWITCH, 0x00); >>> + rtl8xxxu_write32(priv, REG_S0S1_PATH_SWITCH, 0x80); >> >> Per the documentation, shouldn't this be set to 0x200 then rather than 0x80? >> > Per the code before REG_S0S1_PATH_SWITCH setting, the driver has told > the co-processor the antenna is inverse. > memset(&h2c, 0, sizeof(struct h2c_cmd)); > h2c.ant_sel_rsv.cmd = H2C_8723B_ANT_SEL_RSV; > h2c.ant_sel_rsv.ant_inverse = 1; > h2c.ant_sel_rsv.int_switch_type = 0; > rtl8xxxu_gen2_h2c_cmd(priv, &h2c, sizeof(h2c.ant_sel_rsv)); > > At least the current modification is consistent with the antenna > inverse setting. > I'll verify on vendor driver about when/how the inverse be determined. Fair enough :) Cheers, Jes
On Fri, Jul 5, 2019 at 10:27 AM Chris Chiu <chiu@endlessm.com> wrote: > Per the code before REG_S0S1_PATH_SWITCH setting, the driver has told > the co-processor the antenna is inverse. > memset(&h2c, 0, sizeof(struct h2c_cmd)); > h2c.ant_sel_rsv.cmd = H2C_8723B_ANT_SEL_RSV; > h2c.ant_sel_rsv.ant_inverse = 1; > h2c.ant_sel_rsv.int_switch_type = 0; > rtl8xxxu_gen2_h2c_cmd(priv, &h2c, sizeof(h2c.ant_sel_rsv)); > > At least the current modification is consistent with the antenna > inverse setting. > I'll verify on vendor driver about when/how the inverse be determined. I checked this out. The codepath hit hardcodes it to the AUX port, i.e. "inverted" setup: EXhalbtc8723b1ant_PowerOnSetting(): if(pBtCoexist->chipInterface == BTC_INTF_USB) { // fixed at S0 for USB interface pBtCoexist->fBtcWrite4Byte(pBtCoexist, 0x948, 0x0); u1Tmp |= 0x1; // antenna inverse pBtCoexist->fBtcWriteLocalReg1Byte(pBtCoexist, 0xfe08, u1Tmp); pBoardInfo->btdmAntPos = BTC_ANTENNA_AT_AUX_PORT; } So I'm further convinced that these performance-enhancing changes are increasing consistency with the vendor driver. Daniel
Chris Chiu <chiu@endlessm.com> wrote: > The WiFi tx power of RTL8723BU is extremely low after booting. So > the WiFi scan gives very limited AP list and it always fails to > connect to the selected AP. This module only supports 1x1 antenna > and the antenna is switched to bluetooth due to some incorrect > register settings. > > Compare with the vendor driver https://github.com/lwfinger/rtl8723bu, > we realized that the 8723bu's enable_rf() does the same thing as > rtw_btcoex_HAL_Initialize() in vendor driver. And it by default > sets the antenna path to BTC_ANT_PATH_BT which we verified it's > the cause of the wifi weak tx power. The vendor driver will set > the antenna path to BTC_ANT_PATH_PTA in the consequent btcoexist > mechanism, by the function halbtc8723b1ant_PsTdma. > > This commit hand over the antenna control to PTA(Packet Traffic > Arbitration), which compares the weight of bluetooth/wifi traffic > then determine whether to continue current wifi traffic or not. > After PTA take control, The wifi signal will be back to normal and > the bluetooth scan can also work at the same time. However, the > btcoexist still needs to be handled under different circumstances. > If there's a BT connection established, the wifi still fails to > connect until BT disconnected. > > Signed-off-by: Chris Chiu <chiu@endlessm.com> Patch applied to wireless-drivers-next.git, thanks. 18e714687bea rtl8xxxu: Fix wifi low signal strength issue of RTL8723BU
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c index 3adb1d3d47ac..ceffe05bd65b 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c @@ -1525,7 +1525,7 @@ static void rtl8723b_enable_rf(struct rtl8xxxu_priv *priv) /* * WLAN action by PTA */ - rtl8xxxu_write8(priv, REG_WLAN_ACT_CONTROL_8723B, 0x04); + rtl8xxxu_write8(priv, REG_WLAN_ACT_CONTROL_8723B, 0x0c); /* * BT select S0/S1 controlled by WiFi @@ -1568,9 +1568,14 @@ static void rtl8723b_enable_rf(struct rtl8xxxu_priv *priv) rtl8xxxu_gen2_h2c_cmd(priv, &h2c, sizeof(h2c.ant_sel_rsv)); /* - * 0x280, 0x00, 0x200, 0x80 - not clear + * Different settings per different antenna position. + * Antenna Position: | Normal Inverse + * -------------------------------------------------- + * Antenna switch to BT: | 0x280, 0x00 + * Antenna switch to WiFi: | 0x0, 0x280 + * Antenna switch to PTA: | 0x200, 0x80 */ - rtl8xxxu_write32(priv, REG_S0S1_PATH_SWITCH, 0x00); + rtl8xxxu_write32(priv, REG_S0S1_PATH_SWITCH, 0x80); /* * Software control, antenna at WiFi side diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c index 8136e268b4e6..c6c41fb962ff 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c @@ -3891,12 +3891,13 @@ static int rtl8xxxu_init_device(struct ieee80211_hw *hw) /* Check if MAC is already powered on */ val8 = rtl8xxxu_read8(priv, REG_CR); + val16 = rtl8xxxu_read16(priv, REG_SYS_CLKR); /* * Fix 92DU-VC S3 hang with the reason is that secondary mac is not * initialized. First MAC returns 0xea, second MAC returns 0x00 */ - if (val8 == 0xea) + if (val8 == 0xea || !(val16 & SYS_CLK_MAC_CLK_ENABLE)) macpower = false; else macpower = true;
The WiFi tx power of RTL8723BU is extremely low after booting. So the WiFi scan gives very limited AP list and it always fails to connect to the selected AP. This module only supports 1x1 antenna and the antenna is switched to bluetooth due to some incorrect register settings. Compare with the vendor driver https://github.com/lwfinger/rtl8723bu, we realized that the 8723bu's enable_rf() does the same thing as rtw_btcoex_HAL_Initialize() in vendor driver. And it by default sets the antenna path to BTC_ANT_PATH_BT which we verified it's the cause of the wifi weak tx power. The vendor driver will set the antenna path to BTC_ANT_PATH_PTA in the consequent btcoexist mechanism, by the function halbtc8723b1ant_PsTdma. This commit hand over the antenna control to PTA(Packet Traffic Arbitration), which compares the weight of bluetooth/wifi traffic then determine whether to continue current wifi traffic or not. After PTA take control, The wifi signal will be back to normal and the bluetooth scan can also work at the same time. However, the btcoexist still needs to be handled under different circumstances. If there's a BT connection established, the wifi still fails to connect until BT disconnected. Signed-off-by: Chris Chiu <chiu@endlessm.com> --- Note: v2: - Replace BIT(11) with the descriptive definition - Meaningful comment for the REG_S0S1_PATH_SWITCH setting drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 11 ++++++++--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 3 ++- 2 files changed, 10 insertions(+), 4 deletions(-)