From patchwork Fri May 19 15:59:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9737589 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F338C6041F for ; Fri, 19 May 2017 15:59:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F06B0288FA for ; Fri, 19 May 2017 15:59:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E54F92892F; Fri, 19 May 2017 15:59:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7B23328929 for ; Fri, 19 May 2017 15:59:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756426AbdESP7w (ORCPT ); Fri, 19 May 2017 11:59:52 -0400 Received: from mail-oi0-f67.google.com ([209.85.218.67]:35308 "EHLO mail-oi0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756377AbdESP7u (ORCPT ); Fri, 19 May 2017 11:59:50 -0400 Received: by mail-oi0-f67.google.com with SMTP id m17so13044733oik.2 for ; Fri, 19 May 2017 08:59:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=zrBFtAFkzdKauV2BJllS4f4wNIvvDlkJy7yX89nJ6Oc=; b=glffe5wNrjkTbwO3iMEnJB8WIlpwIuN6+t9OuCSZt5uD+I/7qQffP+zsV0c6CTQ3CV sKASRzN5QjXB+AZKMi9ww8isFSFO5cdDL4VLvCtAF5BRMt4P7cHoV9opZxufq1VOmZCC LBbnXE3klSifpR9j86N+T1k+h53KB43yiu/pDgSg/9FZw8Th9X4jjsLXPJGBq3onsJ4f aJA9C7392bs/xP8rE+e+Oil3Hx56L9WY3L/ru1L87vMrTb/2exGAN9PovZOs2PXjGNUX W2UMKwpUSaSz5yqD/Dwi6DcCRd5CtdggmLv+XI390fvORsVkuuDKCc4ay2PiTw2fMXwi i6WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=zrBFtAFkzdKauV2BJllS4f4wNIvvDlkJy7yX89nJ6Oc=; b=h5qWaxy725b7qyDOom71p5APpAa7wy0U89MEoE8Wuy6Gkwiq+EdtImjGfncigeZa1U R69u0wvQypGTKsNJfGbWHSOAqXW7l94ci7vqCwkNcO3ILyhE4WltYmRjlSRPF9xt8UOl UP7EmLluGNMW/Vlavn990m0beWe0SfW4s/VaTyj8ZSsp+dslwfwttLE/mBbelXf8hUWJ +wDAc1/PrEe0KJS0oJV9J5RnrwYXKggDIO6fGHH6n2OfggCjuv2rCGrqbezqZPQnDerB 00YkC2IRAKk3YpwdZ6rr7xeFex/g3BGqwPGhfAYA8XM8mBBvLA3DOrvfCKntcWb04Orr 0Hmg== X-Gm-Message-State: AODbwcDf5qOiwmD2ZheCkdKC3rR0wL4wSubnwufYUgXkU4RFPXUXihik CAE+PGFaEBnu/8Hs X-Received: by 10.157.20.182 with SMTP id d51mr5693201ote.238.1495209588812; Fri, 19 May 2017 08:59:48 -0700 (PDT) Received: from linux-4v1g.suse (cpe-24-31-249-175.kc.res.rr.com. [24.31.249.175]) by smtp.gmail.com with ESMTPSA id v202sm4267684oie.31.2017.05.19.08.59.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 May 2017 08:59:48 -0700 (PDT) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Ping-Ke Shih , Larry Finger , Yan-Hsuan Chuang , Birming Chiu , Shaofu , Steven Ting Subject: [PATCH 07/10] rtlwifi: btcoex: 23b 1ant: Setup register for BT WHCK test Date: Fri, 19 May 2017 10:59:34 -0500 Message-Id: <20170519155937.17526-8-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170519155937.17526-1-Larry.Finger@lwfinger.net> References: <20170519155937.17526-1-Larry.Finger@lwfinger.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ping-Ke Shih If BT is under WHCK, we enter a special mode. Signed-off-by: Ping-Ke Shih Signed-off-by: Larry Finger Cc: Yan-Hsuan Chuang Cc: Birming Chiu Cc: Shaofu Cc: Steven Ting --- .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.c | 25 ++++++++++++++++++++++ .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.h | 1 + 2 files changed, 26 insertions(+) diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c index 9509bf4a4635..4279678502d9 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c @@ -1701,6 +1701,18 @@ static void halbtc8723b1ant_monitor_bt_enable_disable(struct btc_coexist * Non-Software Coex Mechanism start * *****************************************************/ + +static void halbtc8723b1ant_action_bt_whck_test(struct btc_coexist *btcoexist) +{ + halbtc8723b1ant_power_save_state(btcoexist, BTC_PS_WIFI_NATIVE, 0x0, + 0x0); + + halbtc8723b1ant_ps_tdma(btcoexist, NORMAL_EXEC, false, 8); + halbtc8723b1ant_set_ant_path(btcoexist, BTC_ANT_PATH_PTA, NORMAL_EXEC, + false, false); + halbtc8723b1ant_coex_table_with_type(btcoexist, NORMAL_EXEC, 0); +} + static void halbtc8723b1ant_action_wifi_multiport(struct btc_coexist *btcoexist) { halbtc8723b1ant_power_save_state(btcoexist, BTC_PS_WIFI_NATIVE, @@ -2074,6 +2086,13 @@ static void halbtc8723b1ant_run_coexist_mechanism(struct btc_coexist *btcoexist) return; } + if (coex_sta->bt_whck_test) { + RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD, + "[BTCoex], wifi is under IPS !!!\n"); + halbtc8723b1ant_action_bt_whck_test(btcoexist); + return; + } + if (coex_dm->bt_status == BT_8723B_1ANT_BT_STATUS_ACL_BUSY || coex_dm->bt_status == BT_8723B_1ANT_BT_STATUS_SCO_BUSY || coex_dm->bt_status == BT_8723B_1ANT_BT_STATUS_ACL_SCO_BUSY) @@ -2883,6 +2902,12 @@ void ex_halbtc8723b1ant_bt_info_notify(struct btc_coexist *btcoexist, "0x%02x, ", tmp_buf[i]); } + /* if 0xff, it means BT is under WHCK test */ + if (bt_info == 0xff) + coex_sta->bt_whck_test = true; + else + coex_sta->bt_whck_test = false; + if (rsp_source != BT_INFO_SRC_8723B_1ANT_WIFI_FW) { coex_sta->bt_retry_cnt = /* [3:0] */ coex_sta->bt_info_c2h[rsp_source][2] & 0xf; diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h index 1cac98e3cc85..47b709159146 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h @@ -162,6 +162,7 @@ struct coex_sta_8723b_1ant { bool c2h_bt_info_req_sent; u8 bt_info_c2h[BT_INFO_SRC_8723B_1ANT_MAX][10]; u32 bt_info_c2h_cnt[BT_INFO_SRC_8723B_1ANT_MAX]; + bool bt_whck_test; bool c2h_bt_inquiry_page; bool c2h_bt_remote_name_req; u8 bt_retry_cnt;