From patchwork Fri Jan 20 21:27:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9529519 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 0087D60113 for ; Fri, 20 Jan 2017 21:30:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0FC9E286D5 for ; Fri, 20 Jan 2017 21:30:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 04E10286D9; Fri, 20 Jan 2017 21:30:47 +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=-4.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID, URIBL_BLACK 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 99253286D5 for ; Fri, 20 Jan 2017 21:30:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752244AbdATV3A (ORCPT ); Fri, 20 Jan 2017 16:29:00 -0500 Received: from mail-ot0-f193.google.com ([74.125.82.193]:35625 "EHLO mail-ot0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752120AbdATV13 (ORCPT ); Fri, 20 Jan 2017 16:27:29 -0500 Received: by mail-ot0-f193.google.com with SMTP id 65so8829367otq.2 for ; Fri, 20 Jan 2017 13:27:29 -0800 (PST) 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=TirBZsk0Crkuxdm1ocY0CzDtnGivJs8oxLazI7iWnvw=; b=NwTbr3Uswt2BBFSvcRjd+cALrjsXZKhBwrFzrzp+4lXPXYDTn0LhGq/uHB0PQhxYcz +DDEYKupbjWekO1VLfJiANy6J/cr2wt0KmxjoDcKK9CfveNzfSau/nxeTHIFYsw0U0ia Myn8o/uEvu0tAZx4szt7lLfyBObnr47eL/62fWzt0ZPI2Jt9kV/pN/xfOdGCgY4eap29 YIPdPaPnX3avHXQfqja1uC+CktJ2okRg5XX7f5+WU9JyzLL7u7pjGtMaLHo7H4Nib+VT 5P3On1zCdqUA11+610DraYGCIwGWG35XRyEwea7U7p3qd16conDU1LfflLJoeljgfbQL j7ig== 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=TirBZsk0Crkuxdm1ocY0CzDtnGivJs8oxLazI7iWnvw=; b=k4LxxbDlfejUkQ/+t0Jm0O3NZPibyq0YvmKzyvHRuO9ldjR12fkvYDHxA1AeuOnBs0 eoqbs+HJDnEpPum+guqBnhEHU8MhZiwpy6jFe4F0vowavQPMOwUn1pdD95x3d1rTS134 XWq+fXnKvAKx02AyD3k8IWG5bsAmPUkBjZ+9TMNsML5m1Kc3XZu1q45z/d028zPVqmS/ SCh1aI6XErFQtOdVeqGC1uZDqrtPP8fEns6P2lifwlqyBV4brswmJBxnScQRpH7mRQmP HAnKf+tSTWHPET7BG00IYcU8j7Ys+/hwqUDc29LPqy+5D9SXLaZdZvRb5eIai64GFTVJ wKHg== X-Gm-Message-State: AIkVDXKNz/chjlVTfe2vyuM9j84Raf1hf5/XXrDLGbEG4GBmXknjLVLDhqv/uHTtlLLUOA== X-Received: by 10.157.48.47 with SMTP id d44mr8809475otc.111.1484947648134; Fri, 20 Jan 2017 13:27:28 -0800 (PST) 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 r94sm4320403ota.33.2017.01.20.13.27.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 20 Jan 2017 13:27:27 -0800 (PST) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Ping-Ke Shih , Larry Finger Subject: [PATCH 06/11] rtlwifi: rtl8723be: btcoexist: Add single_ant_path Date: Fri, 20 Jan 2017 15:27:11 -0600 Message-Id: <20170120212716.29887-7-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20170120212716.29887-1-Larry.Finger@lwfinger.net> References: <20170120212716.29887-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 Some devices with RTL8732BE wifi/Bluetooth adapters are shipped with only a single antenna. On a subset of these, the EEPROM is incorectly coded to indicate the wrong connection. The resulting problems have been fixed for wifi. This change handles them for BT. Signed-off-by: Ping-Ke Shih Signed-off-by: Larry Finger --- drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 5 +++++ drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h | 1 + drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 1 + drivers/net/wireless/realtek/rtlwifi/wifi.h | 1 + 4 files changed, 8 insertions(+) diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c index 8a0e773..8e382a8 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c @@ -146,6 +146,11 @@ static u8 halbtc_get_wifi_central_chnl(struct btc_coexist *btcoexist) return chnl; } +u8 rtl_get_hwpg_single_ant_path(struct rtl_priv *rtlpriv) +{ + return rtlpriv->btcoexist.btc_info.single_ant_path; +} + static void halbtc_leave_lps(struct btc_coexist *btcoexist) { struct rtl_priv *rtlpriv; diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h index ccd5a0f..65c1c52 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/rtl_btc.h @@ -49,6 +49,7 @@ struct rtl_btc_ops *rtl_btc_get_ops_pointer(void); u8 rtl_get_hwpg_ant_num(struct rtl_priv *rtlpriv); u8 rtl_get_hwpg_bt_exist(struct rtl_priv *rtlpriv); u8 rtl_get_hwpg_bt_type(struct rtl_priv *rtlpriv); +u8 rtl_get_hwpg_single_ant_path(struct rtl_priv *rtlpriv); enum rt_media_status mgnt_link_status_query(struct ieee80211_hw *hw); #endif diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c index 7b4c66c..8e82c0c 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8723be/hw.c @@ -2657,6 +2657,7 @@ void rtl8723be_read_bt_coexist_info_from_hwpg(struct ieee80211_hw *hw, rtlpriv->btcoexist.btc_info.btcoexist = 0; rtlpriv->btcoexist.btc_info.bt_type = BT_RTL8723B; rtlpriv->btcoexist.btc_info.ant_num = ANT_X2; + rtlpriv->btcoexist.btc_info.single_ant_path = 0; } /* override ant_num / ant_path */ diff --git a/drivers/net/wireless/realtek/rtlwifi/wifi.h b/drivers/net/wireless/realtek/rtlwifi/wifi.h index 310fa90..9a5a8a9 100644 --- a/drivers/net/wireless/realtek/rtlwifi/wifi.h +++ b/drivers/net/wireless/realtek/rtlwifi/wifi.h @@ -2454,6 +2454,7 @@ struct rtl_btc_info { u8 bt_type; u8 btcoexist; u8 ant_num; + u8 single_ant_path; }; struct bt_coexist_info {