From patchwork Fri May 19 15:59:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9737599 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 71D57601A1 for ; Fri, 19 May 2017 16:00:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D8CD2880A for ; Fri, 19 May 2017 16:00:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 609E0288FA; Fri, 19 May 2017 16:00:04 +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 DCDF82880A for ; Fri, 19 May 2017 16:00:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756438AbdESQAC (ORCPT ); Fri, 19 May 2017 12:00:02 -0400 Received: from mail-oi0-f68.google.com ([209.85.218.68]:35851 "EHLO mail-oi0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755900AbdESP7r (ORCPT ); Fri, 19 May 2017 11:59:47 -0400 Received: by mail-oi0-f68.google.com with SMTP id w138so13040627oiw.3 for ; Fri, 19 May 2017 08:59:47 -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=4nMWv0JV84qFgVY1jIDYnK87rqLjmc4NPGsHmFUM34M=; b=e4lUbA4swUlHK3krrDKMUEB2RrmROQEqR4cK2mxIZhL9ar8YFg13Q4eY1kqRnt/jcA QtAbUnzdqfXuDpnsbOV/oFy8b3j7XY5MxLKry5reff+GWBeJD+y0n3Ao0bWUEaB0J4Dp uSTNmJqq+RQnxZd72QXs91+2am8nrJ5cira2WOC8WeIOFe5gyFNxXNR9rZKiUZtK8xK8 rnKM1kVJwf4L+14RsniroxKRzq06AYReaIDn5K6MciryZHCiKGgXiSo8oeYsY3dksKoy O6Tz/7QJ97LvtM7Xacu46tjjXhRf6lXMtOTN739La0tOy8HnlHZf0zUTGJtPjh8Pm6Kd aOxg== 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=4nMWv0JV84qFgVY1jIDYnK87rqLjmc4NPGsHmFUM34M=; b=bxFZ2fiVm28RbBahUZRJL9BltYPh4o0NZq9WiiTcMC2qW0bJ37wZlET+VX/jzF/O3O ulA/9J+u0uXGWtBlmgggbOEGx3wOTxv9GMwWpKnupIzODQoJVhCrE1SPzXn1VEZUg5n9 8VwOFxQUIsvAUozCsYacYjBGbSem5PGyFNWrxCAZLcdSlZ6l5OlbFLWeG+rkbRpGjN6J xTsMEXOP5jhPlsY3Tz94IYI0zFHfH1zWLitIfw8gi4GYvWJGuplzHDSR8FIvskr40bsA wHq/foDMuV/ge1QsWNRpPFFeiW0fw9yqtIISZDYCL3NVJrf5n3tMfe6rxNKHvnkX8sFx Wd1Q== X-Gm-Message-State: AODbwcAxXxjqqEpBGwe3JT8O9tkDjw7Wub1LAdKntC+fMZ0aCRGvyp8X ZUlyQeWRj3GEXA== X-Received: by 10.202.213.142 with SMTP id m136mr5522191oig.97.1495209587027; Fri, 19 May 2017 08:59:47 -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.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 19 May 2017 08:59:46 -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 05/10] rtlwifi: btcoex: 23b 1ant: Add power_on_setting Date: Fri, 19 May 2017 10:59:32 -0500 Message-Id: <20170519155937.17526-6-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 This change is highly related to init_hwconfig that was decomposed into two parts for better program flow. 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 | 69 ++++++++++++++++++++++ .../realtek/rtlwifi/btcoexist/halbtc8723b1ant.h | 1 + 2 files changed, 70 insertions(+) diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c index 71ce0fe886a3..f565c9e7e17b 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.c @@ -2213,6 +2213,75 @@ static void halbtc8723b1ant_init_hw_config(struct btc_coexist *btcoexist, /************************************************************** * extern function start with ex_halbtc8723b1ant_ **************************************************************/ +void ex_halbtc8723b1ant_power_on_setting(struct btc_coexist *btcoexist) +{ + struct rtl_priv *rtlpriv = btcoexist->adapter; + struct btc_board_info *board_info = &btcoexist->board_info; + u8 u8tmp = 0x0; + u16 u16tmp = 0x0; + u32 value; + + RT_TRACE(rtlpriv, COMP_BT_COEXIST, DBG_LOUD, + "xxxxxxxxxxxxxxxx Execute 8723b 1-Ant PowerOn Setting xxxxxxxxxxxxxxxx!!\n"); + + btcoexist->stop_coex_dm = true; + + btcoexist->btc_write_1byte(btcoexist, 0x67, 0x20); + + /* enable BB, REG_SYS_FUNC_EN such that we can write 0x948 correctly. */ + u16tmp = btcoexist->btc_read_2byte(btcoexist, 0x2); + btcoexist->btc_write_2byte(btcoexist, 0x2, u16tmp | BIT0 | BIT1); + + /* set GRAN_BT = 1 */ + btcoexist->btc_write_1byte(btcoexist, 0x765, 0x18); + /* set WLAN_ACT = 0 */ + btcoexist->btc_write_1byte(btcoexist, 0x76e, 0x4); + + /* S0 or S1 setting and Local register setting(By the setting fw can get + * ant number, S0/S1, ... info) + * + * Local setting bit define + * BIT0: "0" for no antenna inverse; "1" for antenna inverse + * BIT1: "0" for internal switch; "1" for external switch + * BIT2: "0" for one antenna; "1" for two antenna + * NOTE: here default all internal switch and 1-antenna ==> BIT1=0 and + * BIT2 = 0 + */ + if (btcoexist->chip_interface == BTC_INTF_USB) { + /* fixed at S0 for USB interface */ + btcoexist->btc_write_4byte(btcoexist, 0x948, 0x0); + + u8tmp |= 0x1; /* antenna inverse */ + btcoexist->btc_write_local_reg_1byte(btcoexist, 0xfe08, u8tmp); + + board_info->btdm_ant_pos = BTC_ANTENNA_AT_AUX_PORT; + } else { + /* for PCIE and SDIO interface, we check efuse 0xc3[6] */ + if (board_info->single_ant_path == 0) { + /* set to S1 */ + btcoexist->btc_write_4byte(btcoexist, 0x948, 0x280); + board_info->btdm_ant_pos = BTC_ANTENNA_AT_MAIN_PORT; + value = 1; + } else if (board_info->single_ant_path == 1) { + /* set to S0 */ + btcoexist->btc_write_4byte(btcoexist, 0x948, 0x0); + u8tmp |= 0x1; /* antenna inverse */ + board_info->btdm_ant_pos = BTC_ANTENNA_AT_AUX_PORT; + value = 0; + } + + btcoexist->btc_set(btcoexist, BTC_SET_ACT_ANTPOSREGRISTRY_CTRL, + &value); + + if (btcoexist->chip_interface == BTC_INTF_PCI) + btcoexist->btc_write_local_reg_1byte(btcoexist, 0x384, + u8tmp); + else if (btcoexist->chip_interface == BTC_INTF_SDIO) + btcoexist->btc_write_local_reg_1byte(btcoexist, 0x60, + u8tmp); + } +} + void ex_halbtc8723b1ant_init_hwconfig(struct btc_coexist *btcoexist, bool wifi_only) diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h index aadac2afc900..fd0620ef0987 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b1ant.h @@ -188,6 +188,7 @@ struct coex_sta_8723b_1ant { /************************************************************************* * The following is interface which will notify coex module. *************************************************************************/ +void ex_halbtc8723b1ant_power_on_setting(struct btc_coexist *btcoexist); void ex_halbtc8723b1ant_init_hwconfig(struct btc_coexist *btcoexist, bool wifi_only); void ex_halbtc8723b1ant_init_coex_dm(struct btc_coexist *btcoexist);