From patchwork Thu Jan 31 05:53:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siva Rebbagondla X-Patchwork-Id: 10789687 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-2.web.codeaurora.org (Postfix) with ESMTP id 27C3C91E for ; Thu, 31 Jan 2019 05:53:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2250530783 for ; Thu, 31 Jan 2019 05:53:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 15703307A6; Thu, 31 Jan 2019 05:53:35 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 AFB6030783 for ; Thu, 31 Jan 2019 05:53:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726221AbfAaFxd (ORCPT ); Thu, 31 Jan 2019 00:53:33 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:46986 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725875AbfAaFxd (ORCPT ); Thu, 31 Jan 2019 00:53:33 -0500 Received: by mail-pf1-f194.google.com with SMTP id c73so972246pfe.13 for ; Wed, 30 Jan 2019 21:53:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=N962v1NYYO1siutE7EpJRXlUasnp8tyEzinNsSx9Z9I=; b=CvLcYvmYnS+/lBJWY3lEfrfk5xJLL1UqLZ1XyUt+Gg54Zte1oayYBeVn4ptda3xixb mrxUwu1kdCy5oTxwt6nHVV2sJOzCw7d3eeavHS3L7vioL4HPQO7W+ewZMruuVaFg6CAI 358JscH/8UTwvmDL/IyYSSnjBxuuetHa1Uq0oBxJOTyUw+9xZ2D280/ltPoIuahDltP+ 7ThFIxmJa2jl+bd3BjDT6H2LIFo8K5uMYoezTAG5iNmNT2a0ZPkIl1NPjshuX2Acl5uw fkGT+SFT64T+uH141spbC7Fn9EoNnqqK7H1WsdZRspXZR1h6faNdI00P6U4UaQPOKKfr 0a4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=N962v1NYYO1siutE7EpJRXlUasnp8tyEzinNsSx9Z9I=; b=clExEPiSvzAe+hQ17EYM9JGSh1MOOWvJUhZd1zhaDCdh/RgPCyIY33+1zVrOutzB3l knIKNxV5keIsyRV95TG66oG7InLRimVsr9OyRYjD0R/7pnmbiFKS4nYdyGFInK1IwHdE K0uXyD5ACMt+mrYucZyoMwkf1doetJU0oE7TUvpepcvfkTe/vWEimBzi0CqRemGMaWCF GtqcuunNJdSVA2qqfLdH3Kq3cSMjM0MXXK4JWYH/yQSgDJE0ljqiRLe0CJykXKfv4xGe lL4hUhDxuPCey8QqRE9segU4n9dLAYfPUj3tilf6s+Wj6sbNKCvD+4KBYQ1zh4UYN7KH Wibw== X-Gm-Message-State: AJcUukcqbUlpWx4jscg765P39P8+ls2nrtpQaDu0D2VjLBUYVrNDDxpB e/HfnWYQuY7IcNnjdyBkC1kUGSEr+WqErg== X-Google-Smtp-Source: ALg8bN6LHIuMziC4HR9iw1deqzAeeV4lfiHOCA6jl9/08/09yc1OdFyljh3kojxYNshwZzH84l0ICg== X-Received: by 2002:a62:4bcf:: with SMTP id d76mr35044979pfj.170.1548914012559; Wed, 30 Jan 2019 21:53:32 -0800 (PST) Received: from cpu459.localdomain ([203.196.161.90]) by smtp.gmail.com with ESMTPSA id h19sm4314493pfn.114.2019.01.30.21.53.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 21:53:31 -0800 (PST) From: Siva Rebbagondla To: Kalle Valo Cc: linux-wireless@vger.kernel.org, rishikesh.basu@redpinesignals.com, siva.rebbagondla@redpinesignals.com, krishna.pedda@redpinesignals.com, ganapathi.kondraju@redpinesignals.com Subject: [v2 1/5] rsi: Add debug support for wowlan wakeup confirmation Date: Thu, 31 Jan 2019 11:23:01 +0530 Message-Id: <1548913985-7180-2-git-send-email-siva8118@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1548913985-7180-1-git-send-email-siva8118@gmail.com> References: <1548913985-7180-1-git-send-email-siva8118@gmail.com> 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: Siva Rebbagondla When a wowlan magic-packet has received to wake up the device, currently driver is not taking care of what kind of packet has received. This patch will add debug support for wakeup reason in driver. Signed-off-by: Siva Rebbagondla --- drivers/net/wireless/rsi/rsi_91x_mgmt.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/net/wireless/rsi/rsi_91x_mgmt.c b/drivers/net/wireless/rsi/rsi_91x_mgmt.c index 4042414..4c2c776 100644 --- a/drivers/net/wireless/rsi/rsi_91x_mgmt.c +++ b/drivers/net/wireless/rsi/rsi_91x_mgmt.c @@ -2003,6 +2003,35 @@ int rsi_mgmt_pkt_recv(struct rsi_common *common, u8 *msg) return -1; rsi_send_beacon(common); break; + case WOWLAN_WAKEUP_REASON: + rsi_dbg(ERR_ZONE, "\n\nWakeup Type: %x\n", msg[15]); + switch (msg[15]) { + case RSI_UNICAST_MAGIC_PKT: + rsi_dbg(ERR_ZONE, + "*** Wakeup for Unicast magic packet ***\n"); + break; + case RSI_BROADCAST_MAGICPKT: + rsi_dbg(ERR_ZONE, + "*** Wakeup for Broadcast magic packet ***\n"); + break; + case RSI_EAPOL_PKT: + rsi_dbg(ERR_ZONE, + "*** Wakeup for GTK renewal ***\n"); + break; + case RSI_DISCONNECT_PKT: + rsi_dbg(ERR_ZONE, + "*** Wakeup for Disconnect ***\n"); + break; + case RSI_HW_BMISS_PKT: + rsi_dbg(ERR_ZONE, + "*** Wakeup for HW Beacon miss ***\n"); + break; + default: + rsi_dbg(ERR_ZONE, + "##### Un-intentional Wakeup #####\n"); + break; + } + break; case RX_DOT11_MGMT: return rsi_mgmt_pkt_to_core(common, msg, msg_len); default: From patchwork Thu Jan 31 05:53:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siva Rebbagondla X-Patchwork-Id: 10789689 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-2.web.codeaurora.org (Postfix) with ESMTP id 042EE1390 for ; Thu, 31 Jan 2019 05:53:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F37BC30783 for ; Thu, 31 Jan 2019 05:53:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7B35307A6; Thu, 31 Jan 2019 05:53:37 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 7597F30783 for ; Thu, 31 Jan 2019 05:53:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726481AbfAaFxg (ORCPT ); Thu, 31 Jan 2019 00:53:36 -0500 Received: from mail-pg1-f195.google.com ([209.85.215.195]:43277 "EHLO mail-pg1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725875AbfAaFxg (ORCPT ); Thu, 31 Jan 2019 00:53:36 -0500 Received: by mail-pg1-f195.google.com with SMTP id v28so901332pgk.10 for ; Wed, 30 Jan 2019 21:53:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=mOOs7UQhuK6GwgAZ91QxThX+Nje2eRRW7C8mfuKoxy4=; b=JVpSPlivXO4DTErW3uTW5g6Q3LytePrNU+HS8zf/wQJWsOgB2juHmX3M0dT014LaIt QnYjwlKgkovE/lhgSpXqzbBZEZGKA0DvE/N0XdTH4eenZVgUwkuDxrHD8JCYeMyDa6Rl Y0HYZ7e9bFYM9jt8WH14jEq9+fEIrUc4QTkZ3MjPCkIA+o7PNY4dlBD3Ab4QPSeH06ne HMBUJiK8+dxB+ghjpRKqglvueKw0bXBidrjqfwhZgFQZ+j0RcH7T/o4tydQOrgRAojs4 7X2RR6kc66XFeFBXyXsRyjWjqELgUVctGxHVjogSCszT/o4hjJFFP7lNfrEr71g0108u y7Qg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=mOOs7UQhuK6GwgAZ91QxThX+Nje2eRRW7C8mfuKoxy4=; b=id5Vo8zBYme8KRwkpBYJK0mQkFmKNubmyto55V5tf5ir+dzLILuvk23XM4XM27ui4a HtMiUoKmxUh2Oq1wx5+vEGpuWiB5QGt9mp8cZQCg1CKn2r3dh41juT46gN+FXLgHiqag +fgomB9mm50MVEQc6ef8J/GiJUwJPqLzghnhojyMw948E+z9TsOO5V/6wXYO3Uakvxyg h75d+oMC78wG5mFpzuH0ZDAUGhSxwnxQ7Oy97H2m494BN7i4teNDt2b9nxONNUuqL2Ku ckptm6oMbMGUOUDDDCGqpZCfAURR2jQPfI7bAgFeHLmcHbauPZVpBO7YOPsEcd09o767 IL5w== X-Gm-Message-State: AJcUukdmGw15zWVdT7Nl7JH926hmsPY44DO6AaAn89DhD8f8em4wkPzN KTxQ+bDU4g1YPFYfZr/KHOE= X-Google-Smtp-Source: ALg8bN4Q9VvUXhQMMVbe0E5djb0ifYaJubFMaJFFAGZqrEXTXXZY6f5RkaxdQa1N1e6zgWEyEg3oRw== X-Received: by 2002:a63:5518:: with SMTP id j24mr29734873pgb.208.1548914015443; Wed, 30 Jan 2019 21:53:35 -0800 (PST) Received: from cpu459.localdomain ([203.196.161.90]) by smtp.gmail.com with ESMTPSA id h19sm4314493pfn.114.2019.01.30.21.53.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 21:53:34 -0800 (PST) From: Siva Rebbagondla To: Kalle Valo Cc: linux-wireless@vger.kernel.org, rishikesh.basu@redpinesignals.com, siva.rebbagondla@redpinesignals.com, krishna.pedda@redpinesignals.com, ganapathi.kondraju@redpinesignals.com Subject: [v2 2/5] rsi: add hci detach for hibernation and poweroff Date: Thu, 31 Jan 2019 11:23:02 +0530 Message-Id: <1548913985-7180-3-git-send-email-siva8118@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1548913985-7180-1-git-send-email-siva8118@gmail.com> References: <1548913985-7180-1-git-send-email-siva8118@gmail.com> 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: Siva Rebbagondla As we missed to detach HCI, while entering power off or hibernation, an extra hci interface gets created whenever system is woken up, to avoid this we added hci_detach() in rsi_disconnect(), rsi_freeze(), and rsi_shutdown() functions which are invoked for these tests. This patch fixes the issue Signed-off-by: Siva Rebbagondla --- drivers/net/wireless/rsi/rsi_91x_sdio.c | 15 +++++++++++++++ drivers/net/wireless/rsi/rsi_91x_usb.c | 6 ++++++ 2 files changed, 21 insertions(+) diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c index b412b65e..4005c1d 100644 --- a/drivers/net/wireless/rsi/rsi_91x_sdio.c +++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c @@ -1132,6 +1132,11 @@ static void rsi_disconnect(struct sdio_func *pfunction) rsi_mac80211_detach(adapter); mdelay(10); + if (adapter->priv->coex_mode > 1 && adapter->priv->bt_adapter) { + rsi_bt_ops.detach(adapter->priv->bt_adapter); + adapter->priv->bt_adapter = NULL; + } + /* Reset Chip */ rsi_reset_chip(adapter); @@ -1308,6 +1313,11 @@ static int rsi_freeze(struct device *dev) rsi_dbg(ERR_ZONE, "##### Device can not wake up through WLAN\n"); + if (common->coex_mode > 1 && common->bt_adapter) { + rsi_bt_ops.detach(common->bt_adapter); + common->bt_adapter = NULL; + } + ret = rsi_sdio_disable_interrupts(pfunction); if (sdev->write_fail) @@ -1355,6 +1365,11 @@ static void rsi_shutdown(struct device *dev) if (rsi_config_wowlan(adapter, wowlan)) rsi_dbg(ERR_ZONE, "Failed to configure WoWLAN\n"); + if (adapter->priv->coex_mode > 1 && adapter->priv->bt_adapter) { + rsi_bt_ops.detach(adapter->priv->bt_adapter); + adapter->priv->bt_adapter = NULL; + } + rsi_sdio_disable_interrupts(sdev->pfunction); if (sdev->write_fail) diff --git a/drivers/net/wireless/rsi/rsi_91x_usb.c b/drivers/net/wireless/rsi/rsi_91x_usb.c index f360690..38b4880b 100644 --- a/drivers/net/wireless/rsi/rsi_91x_usb.c +++ b/drivers/net/wireless/rsi/rsi_91x_usb.c @@ -816,6 +816,12 @@ static void rsi_disconnect(struct usb_interface *pfunction) return; rsi_mac80211_detach(adapter); + + if (adapter->priv->coex_mode > 1 && adapter->priv->bt_adapter) { + rsi_bt_ops.detach(adapter->priv->bt_adapter); + adapter->priv->bt_adapter = NULL; + } + rsi_reset_card(adapter); rsi_deinit_usb_interface(adapter); rsi_91x_deinit(adapter); From patchwork Thu Jan 31 05:53:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siva Rebbagondla X-Patchwork-Id: 10789691 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-2.web.codeaurora.org (Postfix) with ESMTP id EBA391390 for ; Thu, 31 Jan 2019 05:53:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5015307A6 for ; Thu, 31 Jan 2019 05:53:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D8838307B3; Thu, 31 Jan 2019 05:53:40 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 8391C307A6 for ; Thu, 31 Jan 2019 05:53:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726490AbfAaFxj (ORCPT ); Thu, 31 Jan 2019 00:53:39 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:33445 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725875AbfAaFxj (ORCPT ); Thu, 31 Jan 2019 00:53:39 -0500 Received: by mail-pf1-f195.google.com with SMTP id c123so1008662pfb.0 for ; Wed, 30 Jan 2019 21:53:39 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bE161hYCDVB1Ui5bpyCuPHmtXVi+qYjmnQvupFiQdGs=; b=Wx4vJTe5uKAEbSP0GUUj4qE9UWDWB+m+aKGrkijvGbwkgeEQefllHGnESS0r0/Abq9 t/cjjDvZDwYWYFvwGSPm0zl6B85tErga9tOl0eTrhe69uKtohyfAdFJkGoaAe/0R21CC 81ykQJbwnUvQWbovIExl+1l7oPLVUXrVJatF60w1NmFPU4OOPVMXvGV2ZRH6UIG4ygKG kjnN7x/umM3f4DkB9ooUJfKjq6ScFL6iNW0C3OktmOekidmd+ktovwAnb/c3u7oEp9RL EWSXhG5Pk3w7gvzfSo1sGCz3Uidzl5arHR2OHm+ERb4SrFdPH30Ig7AG5V4l9ePyUqTe SqGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bE161hYCDVB1Ui5bpyCuPHmtXVi+qYjmnQvupFiQdGs=; b=o0HwBBlIDd/yC5qBCPIc70sk3Y8/a/eLYzrYcz4qE1+mQ7fz2JmBRZjd9trkONc6f8 TT5CDKDYtxQhFTSZXusGI34u3AO5lKzSaa3vBvzigzMVgLD/y6TZem3C0IWFv/Gj36Yd daUcu9YZrGk10sXyJcPAKNMjkBfNmq+9EpjI5Z8mB+Xf2gXr/7q5xeZXIedfCfTroxeM nhqTyu4YKju6rkq7d3/jCzODd+LBhNAtbPOlqCWpnIn9f2z6pY1PRyB7oxg8z2AgMeMl GWKRxcFZhZmnOmMKhlxJlx400+leVpG81+7aOZuIaS9c7LaseaGxx0awNGq0etshibCr Y9Ow== X-Gm-Message-State: AJcUukcoaruQgd28AgyRSGcnBMs6THYVFu/vAp7+G82n1ibMqZOKNKQ1 TZ4QLfnj/7fqimHazQmXHq0= X-Google-Smtp-Source: ALg8bN4YZJptqghIDkFTJk7Q5rih6A7USyKOb39LAejv6L4cWlo0eRgncCO4IvUAqFejwKkBecDLAg== X-Received: by 2002:a62:4641:: with SMTP id t62mr33159804pfa.141.1548914018459; Wed, 30 Jan 2019 21:53:38 -0800 (PST) Received: from cpu459.localdomain ([203.196.161.90]) by smtp.gmail.com with ESMTPSA id h19sm4314493pfn.114.2019.01.30.21.53.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 21:53:37 -0800 (PST) From: Siva Rebbagondla To: Kalle Valo Cc: linux-wireless@vger.kernel.org, rishikesh.basu@redpinesignals.com, siva.rebbagondla@redpinesignals.com, krishna.pedda@redpinesignals.com, ganapathi.kondraju@redpinesignals.com Subject: [v2 3/5] rsi: fix wowlan wakeup issue for hibernate(S4) Date: Thu, 31 Jan 2019 11:23:03 +0530 Message-Id: <1548913985-7180-4-git-send-email-siva8118@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1548913985-7180-1-git-send-email-siva8118@gmail.com> References: <1548913985-7180-1-git-send-email-siva8118@gmail.com> 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: Siva Rebbagondla At SDIO restore ieee80211_restart_hw() is getting called to restart all MAC operations. This step is not required. Returning 1 from mac80211_resume() will serve this purpose. Signed-off-by: Siva Rebbagondla --- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 8 ++++++-- drivers/net/wireless/rsi/rsi_91x_sdio.c | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_mac80211.c b/drivers/net/wireless/rsi/rsi_91x_mac80211.c index aded1ae..8d1282f 100644 --- a/drivers/net/wireless/rsi/rsi_91x_mac80211.c +++ b/drivers/net/wireless/rsi/rsi_91x_mac80211.c @@ -1938,8 +1938,12 @@ static int rsi_mac80211_resume(struct ieee80211_hw *hw) rsi_dbg(INFO_ZONE, "%s: mac80211 resume\n", __func__); - if (common->hibernate_resume) - return 0; + if (common->hibernate_resume) { + /* Device need a complete restart of all MAC operations. + * returning 1 will serve this purpose. + */ + return 1; + } mutex_lock(&common->mutex); rsi_send_wowlan_request(common, 0, 0); diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c index 4005c1d..43e8a0d 100644 --- a/drivers/net/wireless/rsi/rsi_91x_sdio.c +++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c @@ -1393,7 +1393,6 @@ static int rsi_restore(struct device *dev) common->iface_down = true; adapter->sc_nvifs = 0; - ieee80211_restart_hw(adapter->hw); common->wow_flags = 0; common->iface_down = false; From patchwork Thu Jan 31 05:53:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siva Rebbagondla X-Patchwork-Id: 10789693 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-2.web.codeaurora.org (Postfix) with ESMTP id 8D95091E for ; Thu, 31 Jan 2019 05:53:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 887E4307A6 for ; Thu, 31 Jan 2019 05:53:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D136307B3; Thu, 31 Jan 2019 05:53:44 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 6B88C307A6 for ; Thu, 31 Jan 2019 05:53:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726537AbfAaFxm (ORCPT ); Thu, 31 Jan 2019 00:53:42 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:44671 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725875AbfAaFxm (ORCPT ); Thu, 31 Jan 2019 00:53:42 -0500 Received: by mail-pf1-f196.google.com with SMTP id u6so981435pfh.11 for ; Wed, 30 Jan 2019 21:53:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=95+0R5e9tO+mrTmXWMYgJ7rnYO4TYDfqt2dLLXk7Eno=; b=Au8Dm169H1gtrNyzyDjyIgRWKXnADt3v8OjPhhLviwNSJFvNcahR815sOJhHvxqOSN nGbdOELYuOHAtV1KNzCGaZDKONYQZOMCri4wVPEbZX/jOC7UK4JKUydt/WrHdghdpCms 1Vh2KlQ38cj4JnF8cT5Iyp+XGjaXt6Iv7oFCAMu1uRzlW62EdCXEiee6MTNw4V1cXNvE 5XWNfW1OiH9IUniBdHoIFlqeU7e88c2r67N1Tpz2CHk7182Spk1mih3TfyUIGsfo3S0d D9QzMAXpeNqEypDBZlyu0AtCJzDRCtIb031JPIsMX/h080z3n8/rmC0sW93KPc65gD/U Azqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=95+0R5e9tO+mrTmXWMYgJ7rnYO4TYDfqt2dLLXk7Eno=; b=L5h8cH5KE+phXRhZah/yUKpIErlC2BNP1yvnEIE1Mold3U2kY6g6FQeiFTaoM/8iLU voqoXMHCKyUXg2vrgZylfl9HPsIqDSFQaOBVc+ZwDixy6bWT+b/kQj04PsQKJSHFj3bc PK8y8Tfz4UDmK1Jh0UUsAV21rBX4UNZUhYQiYdfKSrKZJE595EELc9M2uCelFXjW2IZT tW6Pswuyse+QxMeUUj7eG/QmNuJLeW7jagdghRpsL9FYbb39PH0npncNlkyLAROErIhL evv+G2z8GpcOvSGSk609CIgvuHAE9Put+6aGIrvm4y37tQP61sP/vByaiTl5t90Cuh2l uN7g== X-Gm-Message-State: AJcUukdXjJyST3ty6NUCHMxGaQGe9/5I8Fl5vdGLxoUaBjUhzu+JAQC6 2acC7PvuoIzf+nbQSWeJuCUFKW7d6C5IbQ== X-Google-Smtp-Source: ALg8bN6NOqVUVjqHGJsEyvEFEVzRH4gkK5V1MGx6jqT8oAaakQW/ywfm+ObfQgm6BKNhg1JoYCQzmA== X-Received: by 2002:a63:1408:: with SMTP id u8mr30458705pgl.271.1548914021318; Wed, 30 Jan 2019 21:53:41 -0800 (PST) Received: from cpu459.localdomain ([203.196.161.90]) by smtp.gmail.com with ESMTPSA id h19sm4314493pfn.114.2019.01.30.21.53.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 21:53:40 -0800 (PST) From: Siva Rebbagondla To: Kalle Valo Cc: linux-wireless@vger.kernel.org, rishikesh.basu@redpinesignals.com, siva.rebbagondla@redpinesignals.com, krishna.pedda@redpinesignals.com, ganapathi.kondraju@redpinesignals.com Subject: [v2 4/5] rsi: resolve power save issue after S4 resume Date: Thu, 31 Jan 2019 11:23:04 +0530 Message-Id: <1548913985-7180-5-git-send-email-siva8118@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1548913985-7180-1-git-send-email-siva8118@gmail.com> References: <1548913985-7180-1-git-send-email-siva8118@gmail.com> 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: Siva Rebbagondla We are redownloading the firmware after S4 restore and observed in stress test that mac80211 sometimes gives power save request after resume which causes the firmware in bad state. mac_ops_resumed flag is added to skip that request until initialisation is done and Keeping power save state is NONE. Signed-off-by: Siva Rebbagondla --- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 9 ++++++++- drivers/net/wireless/rsi/rsi_91x_sdio.c | 1 + drivers/net/wireless/rsi/rsi_main.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/rsi/rsi_91x_mac80211.c b/drivers/net/wireless/rsi/rsi_91x_mac80211.c index 8d1282f..7bc8da6 100644 --- a/drivers/net/wireless/rsi/rsi_91x_mac80211.c +++ b/drivers/net/wireless/rsi/rsi_91x_mac80211.c @@ -239,6 +239,7 @@ static int rsi_mac80211_hw_scan_start(struct ieee80211_hw *hw, struct ieee80211_bss_conf *bss = &vif->bss_conf; rsi_dbg(INFO_ZONE, "***** Hardware scan start *****\n"); + common->mac_ops_resumed = false; if (common->fsm_state != FSM_MAC_INIT_DONE) return -ENODEV; @@ -370,6 +371,10 @@ static void rsi_mac80211_tx(struct ieee80211_hw *hw, { struct rsi_hw *adapter = hw->priv; struct rsi_common *common = adapter->priv; + struct ieee80211_hdr *wlh = (struct ieee80211_hdr *)skb->data; + + if (ieee80211_is_auth(wlh->frame_control)) + common->mac_ops_resumed = false; rsi_core_xmit(common, skb); } @@ -677,7 +682,8 @@ static int rsi_mac80211_config(struct ieee80211_hw *hw, } /* Power save parameters */ - if (changed & IEEE80211_CONF_CHANGE_PS) { + if ((changed & IEEE80211_CONF_CHANGE_PS) && + !common->mac_ops_resumed) { struct ieee80211_vif *vif, *sta_vif = NULL; unsigned long flags; int i, set_ps = 1; @@ -1939,6 +1945,7 @@ static int rsi_mac80211_resume(struct ieee80211_hw *hw) rsi_dbg(INFO_ZONE, "%s: mac80211 resume\n", __func__); if (common->hibernate_resume) { + common->mac_ops_resumed = true; /* Device need a complete restart of all MAC operations. * returning 1 will serve this purpose. */ diff --git a/drivers/net/wireless/rsi/rsi_91x_sdio.c b/drivers/net/wireless/rsi/rsi_91x_sdio.c index 43e8a0d..f8db5f5 100644 --- a/drivers/net/wireless/rsi/rsi_91x_sdio.c +++ b/drivers/net/wireless/rsi/rsi_91x_sdio.c @@ -1393,6 +1393,7 @@ static int rsi_restore(struct device *dev) common->iface_down = true; adapter->sc_nvifs = 0; + adapter->ps_state = PS_NONE; common->wow_flags = 0; common->iface_down = false; diff --git a/drivers/net/wireless/rsi/rsi_main.h b/drivers/net/wireless/rsi/rsi_main.h index 4dc0c01..35d13f3 100644 --- a/drivers/net/wireless/rsi/rsi_main.h +++ b/drivers/net/wireless/rsi/rsi_main.h @@ -311,6 +311,7 @@ struct rsi_common { struct cfg80211_scan_request *hwscan; struct rsi_bgscan_params bgscan; u8 bgscan_en; + u8 mac_ops_resumed; }; struct eepromrw_info { From patchwork Thu Jan 31 05:53:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siva Rebbagondla X-Patchwork-Id: 10789695 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-2.web.codeaurora.org (Postfix) with ESMTP id 4251C91E for ; Thu, 31 Jan 2019 05:53:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3D153307A6 for ; Thu, 31 Jan 2019 05:53:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F676307B3; Thu, 31 Jan 2019 05:53:46 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 D9101307A6 for ; Thu, 31 Jan 2019 05:53:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726557AbfAaFxp (ORCPT ); Thu, 31 Jan 2019 00:53:45 -0500 Received: from mail-pf1-f174.google.com ([209.85.210.174]:41896 "EHLO mail-pf1-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725875AbfAaFxp (ORCPT ); Thu, 31 Jan 2019 00:53:45 -0500 Received: by mail-pf1-f174.google.com with SMTP id b7so987082pfi.8 for ; Wed, 30 Jan 2019 21:53:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=9c5Qv3xKOnSbwK7hxSyqCi1So4hNP+y66JHHTtRgqGg=; b=jcRzsuhoMegy5GqpQuRW6YshrEZveMoW1wUIkca8UPAy4AnJcw3jS3qEbCpmdNbe1V UXJhrnb634JUmnZJqXWXKX7TrtOpOnWf7/Kv3KwnBwEac9yepxYJ880yHb2nXVIGrYO2 /+cE5tJbtK1XAKg8dWG2JyfiGHNF8sGFA/wfLQZcRHJCNht6M7HubedAO6OWUmYPGhtj +8zxFJjKWp1o5zi3IunbQLa+r07mb6qq7hT95ucs6vzFlozsp4N9+nGJS3NiXzqjkb/o DTVNybLXpGdBCCtolc8Pi47hSVvMXLQ9qVduETKIDslew8t645vVeUqlZFrCRNhRbvAj s+Vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9c5Qv3xKOnSbwK7hxSyqCi1So4hNP+y66JHHTtRgqGg=; b=r9w4yy9TcRr6CYMpklS8/JduVdp/Q6chOKtO21PvjtNhx7LF3WZS/pPu/uTrzzY9p3 nXj3w5YEAm8vdWOQ+sz4PCLdy2nSy8FaXTSdfzYgyVEyj93fMjOyYSNkmzOic+WKAFD9 QgUjAQ/Gt9+3+sp3XvMMwNWKQLCULb7L7WYaVBvToPWYwSvfP9zZwojh8QONTYXYVPoQ twuH4C3v4nJb1ZDXPVAM7u4im2Qw6JJ38aKV4rVAvDKEeC9bNV+HjYNoSrPelQhgY9IB f9IzfsTQmspl8RS52YSzcQX7ENrHeqIpqhrJCA/iI20mbxHlRSQu24oe7wq8AnYj88sb hLzw== X-Gm-Message-State: AJcUuke3dw6JzOkGtlXp+ulewz5t+qUROu1U6GzE52vCPWAm00sHWDIS OQyxLM4AYC32EhZ5QvsrCtw= X-Google-Smtp-Source: ALg8bN4hU40aogGLINOl003AD/rUOer6QD656XZirKrZohpfFYAmqpxjYkJ9c2M87dkJJ6MAHd/ZxA== X-Received: by 2002:a63:2f07:: with SMTP id v7mr22284932pgv.368.1548914024154; Wed, 30 Jan 2019 21:53:44 -0800 (PST) Received: from cpu459.localdomain ([203.196.161.90]) by smtp.gmail.com with ESMTPSA id h19sm4314493pfn.114.2019.01.30.21.53.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 30 Jan 2019 21:53:43 -0800 (PST) From: Siva Rebbagondla To: Kalle Valo Cc: linux-wireless@vger.kernel.org, rishikesh.basu@redpinesignals.com, siva.rebbagondla@redpinesignals.com, krishna.pedda@redpinesignals.com, ganapathi.kondraju@redpinesignals.com Subject: [v2 5/5] rsi: fix for wowlan wakeup failure Date: Thu, 31 Jan 2019 11:23:05 +0530 Message-Id: <1548913985-7180-6-git-send-email-siva8118@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1548913985-7180-1-git-send-email-siva8118@gmail.com> References: <1548913985-7180-1-git-send-email-siva8118@gmail.com> 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: Siva Rebbagondla During wowlan regression tests, sometimes radio is not waking up for wowlan packet in coex mode. This is because of power save is enabled by default in case of coex mode greater than one. Hence, disable power save in coex mode to avoid radio loss. Signed-off-by: Siva Rebbagondla --- drivers/net/wireless/rsi/rsi_91x_mac80211.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/rsi/rsi_91x_mac80211.c b/drivers/net/wireless/rsi/rsi_91x_mac80211.c index 7bc8da6..3fd2571 100644 --- a/drivers/net/wireless/rsi/rsi_91x_mac80211.c +++ b/drivers/net/wireless/rsi/rsi_91x_mac80211.c @@ -1901,6 +1901,10 @@ int rsi_config_wowlan(struct rsi_hw *adapter, struct cfg80211_wowlan *wowlan) return 0; } rsi_dbg(INFO_ZONE, "TRIGGERS %x\n", triggers); + + if (common->coex_mode > 1) + rsi_disable_ps(adapter, adapter->vifs[0]); + rsi_send_wowlan_request(common, triggers, 1); /**