RE: [PATCH rtw-next] wifi: rtw89: Override antenna number for RTL8852BE-VS

[Ping-Ke Shih <pkshih@realtek.com>]

Bitterblue Smith <rtl8821cerfe2@gmail.com> wrote:

[...]

> diff --git a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
> b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
> index c3c53a6b8119..9d834ea36c1a 100644
> --- a/drivers/net/wireless/realtek/rtw89/rtw8852b.c
> +++ b/drivers/net/wireless/realtek/rtw89/rtw8852b.c
> @@ -353,6 +353,19 @@ static const struct rtw89_btc_fbtc_mreg rtw89_btc_8852b_mon_reg[] = {
>  static const u8 rtw89_btc_8852b_wl_rssi_thres[BTC_WL_RSSI_THMAX] = {70, 60, 50, 40};
>  static const u8 rtw89_btc_8852b_bt_rssi_thres[BTC_BT_RSSI_THMAX] = {50, 40, 30, 20};
> 
> +static int rtw8852b_read_efuse(struct rtw89_dev *rtwdev, u8 *log_map,
> +                              enum rtw89_efuse_block block)
> +{
> +       int ret;
> +
> +       ret = rtw8852bx_read_efuse(rtwdev, log_map, block);

I think here should check ret and return directly if not zero. 

> +
> +       if (rtwdev->efuse.rfe_type == 41)
> +               set_bit(RTW89_QUIRK_1ANT, rtwdev->quirks);
> +
> +       return ret;

here, return 0;

Though the result is the same, it looks reasonable.

> +}
> +
>  static void rtw8852b_pwr_sps_ana(struct rtw89_dev *rtwdev)
>  {
>         rtw89_write16(rtwdev, R_AX_SPS_ANA_ON_CTRL2, RTL8852B_DEFAULT_SPS_ANA);
> @@ -768,6 +781,13 @@ static void rtw8852b_btc_set_rfe(struct rtw89_dev *rtwdev)
>         } else {
>                 md->ant.type = BTC_ANT_SHARED;
>                 md->bt0_pos = BTC_BT_BTG;
> +
> +               if (test_bit(RTW89_QUIRK_1ANT, rtwdev->quirks)) {
> +                       md->ant.num = 1;
> +                       md->ant.single_pos = RF_PATH_B;
> +                       md->ant.btg_pos = RF_PATH_B;
> +                       md->ant.stream_cnt = 1;
> +               }

The patch [1] in progress also modify here. Maybe, you can rebase after I
merge the patch, or just send v2 based on the patchset if you hurry.
(I'd merge the patch and send pull-request for -next tomorrow.)

[1] https://patchwork.kernel.org/project/linux-wireless/patch/20261004034520.33695-12-pkshih@realtek.com/

>         }
>         rtwdev->btc.btg_pos = md->ant.btg_pos;
>         rtwdev->btc.ant_type = md->ant.type;