rtlwifi: btcoex: Add wifi_only series ops to control solo card

Originally, btcoex controls the antenna of combo card, but solo card
is also needed to setup properly. The new ops are named with suffix
'_wifi_only' opposited to original btc_ops, and new structures and
definitions are also introduced. The wifi_only oly contains four ops that
are initial variable, hw config, scan notify, and switch band notify.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
index 8dc6461..73ef5b2 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c
@@ -1247,6 +1247,40 @@ bool exhalbtc_initlize_variables(struct rtl_priv *rtlpriv)
        return true;
 }
 
+bool exhalbtc_initlize_variables_wifi_only(struct rtl_priv *rtlpriv)
+{
+       struct wifi_only_cfg *wifionly_cfg = rtl_btc_wifi_only(rtlpriv);
+       struct wifi_only_haldata *wifionly_haldata;
+
+       if (!wifionly_cfg)
+               return false;
+
+       wifionly_cfg->adapter = rtlpriv;
+
+       switch (rtlpriv->rtlhal.interface) {
+       case INTF_PCI:
+               wifionly_cfg->chip_interface = BTC_INTF_PCI;
+               break;
+       case INTF_USB:
+               wifionly_cfg->chip_interface = BTC_INTF_USB;
+               break;
+       default:
+               wifionly_cfg->chip_interface = BTC_INTF_UNKNOWN;
+               break;
+       }
+
+       wifionly_haldata = &wifionly_cfg->haldata_info;
+
+       wifionly_haldata->customer_id = CUSTOMER_NORMAL;
+       wifionly_haldata->efuse_pg_antnum = rtl_get_hwpg_ant_num(rtlpriv);
+       wifionly_haldata->efuse_pg_antpath =
+                                       rtl_get_hwpg_single_ant_path(rtlpriv);
+       wifionly_haldata->rfe_type = rtl_get_hwpg_rfe_type(rtlpriv);
+       wifionly_haldata->ant_div_cfg = 0;
+
+       return true;
+}
+
 bool exhalbtc_bind_bt_coex_withadapter(void *adapter)
 {
        struct rtl_priv *rtlpriv = adapter;
@@ -1368,6 +1402,10 @@ void exhalbtc_init_hw_config(struct btc_coexist *btcoexist, bool wifi_only)
        }
 }
 
+void exhalbtc_init_hw_config_wifi_only(struct wifi_only_cfg *wifionly_cfg)
+{
+}
+
 void exhalbtc_init_coex_dm(struct btc_coexist *btcoexist)
 {
        if (!halbtc_is_bt_coexist_available(btcoexist))
@@ -1494,6 +1532,11 @@ void exhalbtc_scan_notify(struct btc_coexist *btcoexist, u8 type)
        halbtc_normal_low_power(btcoexist);
 }
 
+void exhalbtc_scan_notify_wifi_only(struct wifi_only_cfg *wifionly_cfg,
+                                   u8 is_5g)
+{
+}
+
 void exhalbtc_connect_notify(struct btc_coexist *btcoexist, u8 action)
 {
        u8 asso_type;
@@ -1924,3 +1967,8 @@ void exhalbtc_switch_band_notify(struct btc_coexist *btcoexist, u8 type)
 
        halbtc_normal_low_power(btcoexist);
 }
+
+void exhalbtc_switch_band_notify_wifi_only(struct wifi_only_cfg *wifionly_cfg,
+                                          u8 is_5g)
+{
+}

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
index e0818f6..6c14531 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.h
@@ -636,15 +636,23 @@ bool halbtc_is_wifi_uplink(struct rtl_priv *adapter);
 
 #define rtl_btc_coexist(rtlpriv)                               \
        ((struct btc_coexist *)((rtlpriv)->btcoexist.btc_context))
+#define rtl_btc_wifi_only(rtlpriv)                             \
+       ((struct wifi_only_cfg *)((rtlpriv)->btcoexist.wifi_only_context))
+
+struct wifi_only_cfg;
 
 bool exhalbtc_initlize_variables(struct rtl_priv *rtlpriv);
+bool exhalbtc_initlize_variables_wifi_only(struct rtl_priv *rtlpriv);
 bool exhalbtc_bind_bt_coex_withadapter(void *adapter);
 void exhalbtc_power_on_setting(struct btc_coexist *btcoexist);
 void exhalbtc_init_hw_config(struct btc_coexist *btcoexist, bool wifi_only);
+void exhalbtc_init_hw_config_wifi_only(struct wifi_only_cfg *wifionly_cfg);
 void exhalbtc_init_coex_dm(struct btc_coexist *btcoexist);
 void exhalbtc_ips_notify(struct btc_coexist *btcoexist, u8 type);
 void exhalbtc_lps_notify(struct btc_coexist *btcoexist, u8 type);
 void exhalbtc_scan_notify(struct btc_coexist *btcoexist, u8 type);
+void exhalbtc_scan_notify_wifi_only(struct wifi_only_cfg *wifionly_cfg,
+                                   u8 is_5g);
 void exhalbtc_connect_notify(struct btc_coexist *btcoexist, u8 action);
 void exhalbtc_mediastatus_notify(struct btc_coexist *btcoexist,
                                 enum rt_media_status media_status);
@@ -669,6 +677,8 @@ void exhalbtc_set_ant_num(struct rtl_priv *rtlpriv, u8 type, u8 ant_num);
 void exhalbtc_display_bt_coex_info(struct btc_coexist *btcoexist,
                                   struct seq_file *m);
 void exhalbtc_switch_band_notify(struct btc_coexist *btcoexist, u8 type);
+void exhalbtc_switch_band_notify_wifi_only(struct wifi_only_cfg *wifionly_cfg,
+                                          u8 is_5g);
 void exhalbtc_signal_compensation(struct btc_coexist *btcoexist,
                                  u8 *rssi_wifi, u8 *rssi_bt);
 void exhalbtc_lps_leave(struct btc_coexist *btcoexist);
@@ -676,4 +686,41 @@ void exhalbtc_low_wifi_traffic_notify(struct btc_coexist *btcoexist);
 void exhalbtc_set_single_ant_path(struct btc_coexist *btcoexist,
                                  u8 single_ant_path);
 
+/* The following are used by wifi_only case */
+enum wifionly_chip_interface {
+       WIFIONLY_INTF_UNKNOWN   = 0,
+       WIFIONLY_INTF_PCI               = 1,
+       WIFIONLY_INTF_USB               = 2,
+       WIFIONLY_INTF_SDIO              = 3,
+       WIFIONLY_INTF_MAX
+};
+
+enum wifionly_customer_id {
+       CUSTOMER_NORMAL                 = 0,
+       CUSTOMER_HP_1                   = 1,
+};
+
+struct wifi_only_haldata {
+       u16             customer_id;
+       u8              efuse_pg_antnum;
+       u8              efuse_pg_antpath;
+       u8              rfe_type;
+       u8              ant_div_cfg;
+};
+
+struct wifi_only_cfg {
+       void                            *adapter;
+       struct wifi_only_haldata        haldata_info;
+       enum wifionly_chip_interface    chip_interface;
+};
+
+static inline
+void halwifionly_phy_set_bb_reg(struct wifi_only_cfg *wifi_conly_cfg,
+                               u32 regaddr, u32 bitmask, u32 data)
+{
+       struct rtl_priv *rtlpriv = (struct rtl_priv *)wifi_conly_cfg->adapter;
+
+       rtl_set_bbreg(rtlpriv->hw, regaddr, bitmask, data);
+}
+
 #endif

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
index 0111ab9..cce4a37 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.c
@@ -31,13 +31,16 @@
 
 static struct rtl_btc_ops rtl_btc_operation = {
        .btc_init_variables = rtl_btc_init_variables,
+       .btc_init_variables_wifi_only = rtl_btc_init_variables_wifi_only,
        .btc_deinit_variables = rtl_btc_deinit_variables,
        .btc_init_hal_vars = rtl_btc_init_hal_vars,
        .btc_power_on_setting = rtl_btc_power_on_setting,
        .btc_init_hw_config = rtl_btc_init_hw_config,
+       .btc_init_hw_config_wifi_only = rtl_btc_init_hw_config_wifi_only,
        .btc_ips_notify = rtl_btc_ips_notify,
        .btc_lps_notify = rtl_btc_lps_notify,
        .btc_scan_notify = rtl_btc_scan_notify,
+       .btc_scan_notify_wifi_only = rtl_btc_scan_notify_wifi_only,
        .btc_connect_notify = rtl_btc_connect_notify,
        .btc_mediastatus_notify = rtl_btc_mediastatus_notify,
        .btc_periodical = rtl_btc_periodical,
@@ -49,6 +52,7 @@ static struct rtl_btc_ops rtl_btc_operation = {
        .btc_is_bt_disabled = rtl_btc_is_bt_disabled,
        .btc_special_packet_notify = rtl_btc_special_packet_notify,
        .btc_switch_band_notify = rtl_btc_switch_band_notify,
+       .btc_switch_band_notify_wifi_only = rtl_btc_switch_band_notify_wifionly,
        .btc_record_pwr_mode = rtl_btc_record_pwr_mode,
        .btc_get_lps_val = rtl_btc_get_lps_val,
        .btc_get_rpwm_val = rtl_btc_get_rpwm_val,
@@ -147,7 +151,11 @@ void rtl_btc_get_ampdu_cfg(struct rtl_priv *rtlpriv, u8 *reject_agg,
 
 static void rtl_btc_alloc_variable(struct rtl_priv *rtlpriv, bool wifi_only)
 {
-       rtlpriv->btcoexist.btc_context =
+       if (wifi_only)
+               rtlpriv->btcoexist.wifi_only_context =
+                       kzalloc(sizeof(struct wifi_only_cfg), GFP_KERNEL);
+       else
+               rtlpriv->btcoexist.btc_context =
                        kzalloc(sizeof(struct btc_coexist), GFP_KERNEL);
 }
 
@@ -155,6 +163,9 @@ static void rtl_btc_free_variable(struct rtl_priv *rtlpriv)
 {
        kfree(rtlpriv->btcoexist.btc_context);
        rtlpriv->btcoexist.btc_context = NULL;
+
+       kfree(rtlpriv->btcoexist.wifi_only_context);
+       rtlpriv->btcoexist.wifi_only_context = NULL;
 }
 
 void rtl_btc_init_variables(struct rtl_priv *rtlpriv)
@@ -165,6 +176,13 @@ void rtl_btc_init_variables(struct rtl_priv *rtlpriv)
        exhalbtc_bind_bt_coex_withadapter(rtlpriv);
 }
 
+void rtl_btc_init_variables_wifi_only(struct rtl_priv *rtlpriv)
+{
+       rtl_btc_alloc_variable(rtlpriv, true);
+
+       exhalbtc_initlize_variables_wifi_only(rtlpriv);
+}
+
 void rtl_btc_deinit_variables(struct rtl_priv *rtlpriv)
 {
        rtl_btc_free_variable(rtlpriv);
@@ -204,6 +222,16 @@ void rtl_btc_init_hw_config(struct rtl_priv *rtlpriv)
        exhalbtc_init_coex_dm(btcoexist);
 }
 
+void rtl_btc_init_hw_config_wifi_only(struct rtl_priv *rtlpriv)
+{
+       struct wifi_only_cfg *wifionly_cfg = rtl_btc_wifi_only(rtlpriv);
+
+       if (!wifionly_cfg)
+               return;
+
+       exhalbtc_init_hw_config_wifi_only(wifionly_cfg);
+}
+
 void rtl_btc_ips_notify(struct rtl_priv *rtlpriv, u8 type)
 {
        struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);
@@ -242,6 +270,18 @@ void rtl_btc_scan_notify(struct rtl_priv *rtlpriv, u8 scantype)
        exhalbtc_scan_notify(btcoexist, scantype);
 }
 
+void rtl_btc_scan_notify_wifi_only(struct rtl_priv *rtlpriv, u8 scantype)
+{
+       struct rtl_hal *rtlhal = rtl_hal(rtlpriv);
+       struct wifi_only_cfg *wifionly_cfg = rtl_btc_wifi_only(rtlpriv);
+       u8 is_5g = (rtlhal->current_bandtype == BAND_ON_5G);
+
+       if (!wifionly_cfg)
+               return;
+
+       exhalbtc_scan_notify_wifi_only(wifionly_cfg, is_5g);
+}
+
 void rtl_btc_connect_notify(struct rtl_priv *rtlpriv, u8 action)
 {
        struct btc_coexist *btcoexist = rtl_btc_coexist(rtlpriv);
@@ -458,6 +498,18 @@ void rtl_btc_switch_band_notify(struct rtl_priv *rtlpriv, u8 band_type,
                exhalbtc_switch_band_notify(btcoexist, type);
 }
 
+void rtl_btc_switch_band_notify_wifionly(struct rtl_priv *rtlpriv, u8 band_type,
+                                        bool scanning)
+{
+       struct wifi_only_cfg *wifionly_cfg = rtl_btc_wifi_only(rtlpriv);
+       u8 is_5g = (band_type == BAND_ON_5G);
+
+       if (!wifionly_cfg)
+               return;
+
+       exhalbtc_switch_band_notify_wifi_only(wifionly_cfg, is_5g);
+}
+
 struct rtl_btc_ops *rtl_btc_get_ops_pointer(void)
 {
        return &rtl_btc_operation;

diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h
index 1d98741..8c99605 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h
+++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h
@@ -28,13 +28,16 @@
 #include "halbt_precomp.h"
 
 void rtl_btc_init_variables(struct rtl_priv *rtlpriv);
+void rtl_btc_init_variables_wifi_only(struct rtl_priv *rtlpriv);
 void rtl_btc_deinit_variables(struct rtl_priv *rtlpriv);
 void rtl_btc_init_hal_vars(struct rtl_priv *rtlpriv);
 void rtl_btc_power_on_setting(struct rtl_priv *rtlpriv);
 void rtl_btc_init_hw_config(struct rtl_priv *rtlpriv);
+void rtl_btc_init_hw_config_wifi_only(struct rtl_priv *rtlpriv);
 void rtl_btc_ips_notify(struct rtl_priv *rtlpriv, u8 type);
 void rtl_btc_lps_notify(struct rtl_priv *rtlpriv, u8 type);
 void rtl_btc_scan_notify(struct rtl_priv *rtlpriv, u8 scantype);
+void rtl_btc_scan_notify_wifi_only(struct rtl_priv *rtlpriv, u8 scantype);
 void rtl_btc_connect_notify(struct rtl_priv *rtlpriv, u8 action);
 void rtl_btc_mediastatus_notify(struct rtl_priv *rtlpriv,
                                enum rt_media_status mstatus);
@@ -48,6 +51,8 @@ bool rtl_btc_is_bt_disabled(struct rtl_priv *rtlpriv);
 void rtl_btc_special_packet_notify(struct rtl_priv *rtlpriv, u8 pkt_type);
 void rtl_btc_switch_band_notify(struct rtl_priv *rtlpriv, u8 band_type,
                                bool scanning);
+void rtl_btc_switch_band_notify_wifionly(struct rtl_priv *rtlpriv, u8 band_type,
+                                        bool scanning);
 void rtl_btc_display_bt_coex_info(struct rtl_priv *rtlpriv, struct seq_file *m);
 void rtl_btc_record_pwr_mode(struct rtl_priv *rtlpriv, u8 *buf, u8 len);
 u8   rtl_btc_get_lps_val(struct rtl_priv *rtlpriv);

diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
index a16aa94..cfea57e 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/core.c
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
@@ -1453,6 +1453,9 @@ static void rtl_op_sw_scan_start(struct ieee80211_hw *hw,
 
        if (rtlpriv->cfg->ops->get_btc_status())
                rtlpriv->btcoexist.btc_ops->btc_scan_notify(rtlpriv, 1);
+       else if (rtlpriv->btcoexist.btc_ops)
+               rtlpriv->btcoexist.btc_ops->btc_scan_notify_wifi_only(rtlpriv,
+                                                                     1);
 
        if (rtlpriv->dm.supp_phymode_switch) {
                if (rtlpriv->cfg->ops->chk_switch_dmdp)
@@ -1508,6 +1511,9 @@ static void rtl_op_sw_scan_complete(struct ieee80211_hw *hw,
        rtlpriv->cfg->ops->scan_operation_backup(hw, SCAN_OPT_RESTORE);
        if (rtlpriv->cfg->ops->get_btc_status())
                rtlpriv->btcoexist.btc_ops->btc_scan_notify(rtlpriv, 0);
+       else if (rtlpriv->btcoexist.btc_ops)
+               rtlpriv->btcoexist.btc_ops->btc_scan_notify_wifi_only(rtlpriv,
+                                                                     0);
 }
 
 static int rtl_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,

diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.c b/drivers/net/wireless/realtek/rtlwifi/pci.c
index aa1d3ae..01ccf88 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/pci.c
+++ b/drivers/net/wireless/realtek/rtlwifi/pci.c
@@ -1794,6 +1794,7 @@ static int rtl_pci_start(struct ieee80211_hw *hw)
        struct rtl_pci *rtlpci = rtl_pcidev(rtl_pcipriv(hw));
        struct rtl_ps_ctl *ppsc = rtl_psc(rtl_priv(hw));
        struct rtl_mac *rtlmac = rtl_mac(rtl_priv(hw));
+       struct rtl_btc_ops *btc_ops = rtlpriv->btcoexist.btc_ops;
 
        int err;
 
@@ -1803,9 +1804,12 @@ static int rtl_pci_start(struct ieee80211_hw *hw)
        if (rtlpriv->cfg->ops->get_btc_status &&
            rtlpriv->cfg->ops->get_btc_status()) {
                rtlpriv->btcoexist.btc_info.ap_num = 36;
-               rtlpriv->btcoexist.btc_ops->btc_init_variables(rtlpriv);
-               rtlpriv->btcoexist.btc_ops->btc_init_hal_vars(rtlpriv);
+               btc_ops->btc_init_variables(rtlpriv);
+               btc_ops->btc_init_hal_vars(rtlpriv);
+       } else if (btc_ops) {
+               btc_ops->btc_init_variables_wifi_only(rtlpriv);
        }
+
        err = rtlpriv->cfg->ops->hw_init(hw);
        if (err) {
                RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG,

diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h
index 8ed0207..111f81b 100644 (file)
--- a/drivers/net/wireless/realtek/rtlwifi/wifi.h
+++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h
@@ -2502,6 +2502,7 @@ struct bt_coexist_info {
        struct rtl_btc_info btc_info;
        /* btc context */
        void *btc_context;
+       void *wifi_only_context;
        /* EEPROM BT info. */
        u8 eeprom_bt_coexist;
        u8 eeprom_bt_type;
@@ -2558,13 +2559,17 @@ struct bt_coexist_info {
 
 struct rtl_btc_ops {
        void (*btc_init_variables) (struct rtl_priv *rtlpriv);
+       void (*btc_init_variables_wifi_only)(struct rtl_priv *rtlpriv);
        void (*btc_deinit_variables)(struct rtl_priv *rtlpriv);
        void (*btc_init_hal_vars) (struct rtl_priv *rtlpriv);
        void (*btc_power_on_setting)(struct rtl_priv *rtlpriv);
        void (*btc_init_hw_config) (struct rtl_priv *rtlpriv);
+       void (*btc_init_hw_config_wifi_only)(struct rtl_priv *rtlpriv);
        void (*btc_ips_notify) (struct rtl_priv *rtlpriv, u8 type);
        void (*btc_lps_notify)(struct rtl_priv *rtlpriv, u8 type);
        void (*btc_scan_notify) (struct rtl_priv *rtlpriv, u8 scantype);
+       void (*btc_scan_notify_wifi_only)(struct rtl_priv *rtlpriv,
+                                         u8 scantype);
        void (*btc_connect_notify) (struct rtl_priv *rtlpriv, u8 action);
        void (*btc_mediastatus_notify) (struct rtl_priv *rtlpriv,
                                        enum rt_media_status mstatus);
@@ -2581,6 +2586,8 @@ struct rtl_btc_ops {
                                          u8 pkt_type);
        void (*btc_switch_band_notify)(struct rtl_priv *rtlpriv, u8 type,
                                       bool scanning);
+       void (*btc_switch_band_notify_wifi_only)(struct rtl_priv *rtlpriv,
+                                                u8 type, bool scanning);
        void (*btc_display_bt_coex_info)(struct rtl_priv *rtlpriv,
                                         struct seq_file *m);
        void (*btc_record_pwr_mode)(struct rtl_priv *rtlpriv, u8 *buf, u8 len);