From patchwork Fri Jun 2 21:27:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9763523 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 15C1D60360 for ; Fri, 2 Jun 2017 21:28:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08BB928599 for ; Fri, 2 Jun 2017 21:28:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F121C285D9; Fri, 2 Jun 2017 21:28:10 +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 8DCAC28599 for ; Fri, 2 Jun 2017 21:28:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751264AbdFBV2J (ORCPT ); Fri, 2 Jun 2017 17:28:09 -0400 Received: from mail-oi0-f66.google.com ([209.85.218.66]:35344 "EHLO mail-oi0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751164AbdFBV2F (ORCPT ); Fri, 2 Jun 2017 17:28:05 -0400 Received: by mail-oi0-f66.google.com with SMTP id f206so3956182oig.2 for ; Fri, 02 Jun 2017 14:28:05 -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=gRy84DRHbc5XZecqtuqdXc3vj3EA8959m2EqODEKkcA=; b=iZ3LX9+A+YITD4I9O72jbnI2TecH3Pl8IFjbmVYvlWOeVd7FOMx3vzvydFk4stlqas VKT5PG/qg7tRgKfoPPlbsNNpo7md91KMEySUfXpiqAMvdoktNu/6qjAzGWiDXtrhyXcC SyemzTkzHWOzMawHhlRfHO7OMlA1v5dA1iX3uZVfxC+Kh2zTow4xMWgqYRRtrUzapJk+ t75KVSjG2rqgzydsuDaniyhWqv6HFW3nzZ++sRs//E7NPHOrOBGQmKLqrUp6zdNNCx3k kepWYUomE1CAJwDt+47335FWjbYgAQ3QDL/SuXWC0n5XP1FoTS7KMwy78BZMl8gdmKzw fQBg== 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=gRy84DRHbc5XZecqtuqdXc3vj3EA8959m2EqODEKkcA=; b=rdbqJ0CQtWMV4pxPWR+jw2BN9bXhOIL5fTBkgBzqRtRkwdHO6pzjdbKaXM8sLE6e7u 6LdpSfOSgm0Y6bPJFcBnInjfmut/Ft+MLfPc6AHvrNf7Ru+XkRQLB2fun7VkJqmJk5nE a1M1AzZnvUQenkhpeJgaAxzDXs7ZmUtyJU1S1OHF84o7YUiBIsTkoLffCw6TC0+j5znw jzJ4hFOsWVud5jIzQmjUgZAI9sGLGrx41tEfZ6HaGXnI1hZWxPgqKS6em6Ir/cuTl6sD /1mD4dUZFsW91scw0ZF88iFJjM4S75XJ3VNow+0A/jPzqkYgyOZYFcF5QE81SpGhm9WQ sczA== X-Gm-Message-State: AKS2vOxT5at79yaDIOeZaieccBPcY8hHFy1J+xf1q7O4NTb5hFj55xoh gvmqVzrWtBdtGQ== X-Received: by 10.157.38.138 with SMTP id l10mr5322308otb.195.1496438885200; Fri, 02 Jun 2017 14:28:05 -0700 (PDT) Received: from localhost.localdomain (cpe-24-31-249-175.kc.res.rr.com. [24.31.249.175]) by smtp.gmail.com with ESMTPSA id z23sm1577041otz.11.2017.06.02.14.28.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 02 Jun 2017 14:28:04 -0700 (PDT) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Yan-Hsuan Chuang , Larry Finger , Ping-Ke Shih , Birming Chiu , Shaofu , Steven Ting Subject: [PATCH 4/9] rtlwifi: btcoex: hook external PnP notify by chip for wifi driver Date: Fri, 2 Jun 2017 16:27:43 -0500 Message-Id: <20170602212748.23857-5-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.13.0 In-Reply-To: <20170602212748.23857-1-Larry.Finger@lwfinger.net> References: <20170602212748.23857-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: Yan-Hsuan Chuang Hook the chip-specific PnP notify functions for the wifi driver to notify btcoexistence. Signed-off-by: Yan-Hsuan Chuang Signed-off-by: Larry Finger Cc: Ping-Ke Shih Cc: Birming Chiu Cc: Shaofu Cc: Steven Ting --- .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.h | 1 + .../wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.h b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.h index a98b9548c3c7..ae3e450c5966 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.h +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtc8723b2ant.h @@ -196,6 +196,7 @@ void ex_btc8723b2ant_bt_info_notify(struct btc_coexist *btcoexist, void ex_btc8723b2ant_halt_notify(struct btc_coexist *btcoexist); void ex_btc8723b2ant_periodical(struct btc_coexist *btcoexist); void ex_btc8723b2ant_display_coex_info(struct btc_coexist *btcoexist); +void ex_btc8723b2ant_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state); void ex_btc8723b2ant_pre_load_firmware(struct btc_coexist *btcoexist); #endif diff --git a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c index 0cd4926c1ed7..5e6e14fd8c85 100644 --- a/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c +++ b/drivers/net/wireless/realtek/rtlwifi/btcoexist/halbtcoutsrc.c @@ -916,6 +916,24 @@ void exhalbtc_pnp_notify(struct btc_coexist *btcoexist, u8 pnp_state) { if (!halbtc_is_bt_coexist_available(btcoexist)) return; + + /* currently only 1ant we have to do the notification, + * once pnp is notified to sleep state, we have to leave LPS that + * we can sleep normally. + */ + + if (IS_HARDWARE_TYPE_8723B(btcoexist->adapter)) { + if (btcoexist->board_info.btdm_ant_num == 1) + ex_btc8723b1ant_pnp_notify(btcoexist, pnp_state); + else if (btcoexist->board_info.btdm_ant_num == 2) + ex_btc8723b2ant_pnp_notify(btcoexist, pnp_state); + } else if (IS_HARDWARE_TYPE_8821(btcoexist->adapter)) { + if (btcoexist->board_info.btdm_ant_num == 1) + ex_btc8821a1ant_pnp_notify(btcoexist, pnp_state); + else if (btcoexist->board_info.btdm_ant_num == 2) + ex_btc8821a2ant_pnp_notify(btcoexist, pnp_state); + } else if (IS_HARDWARE_TYPE_8192E(btcoexist->adapter)) { + } } void exhalbtc_periodical(struct btc_coexist *btcoexist)