From patchwork Wed Oct 29 11:50:32 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 5186881 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1DE249F349 for ; Wed, 29 Oct 2014 11:52:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3FF7D20179 for ; Wed, 29 Oct 2014 11:52:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6B00B20158 for ; Wed, 29 Oct 2014 11:52:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932747AbaJ2LvR (ORCPT ); Wed, 29 Oct 2014 07:51:17 -0400 Received: from mail-wi0-f178.google.com ([209.85.212.178]:37705 "EHLO mail-wi0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932718AbaJ2LvQ (ORCPT ); Wed, 29 Oct 2014 07:51:16 -0400 Received: by mail-wi0-f178.google.com with SMTP id q5so4315946wiv.17 for ; Wed, 29 Oct 2014 04:51:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RUsz/43iX9qpFGnUC2InyS4K2PKEIxkbs82F/FJ83FI=; b=Gg3rGM28O9Mi82VgmTzp/w3yNPomh5Jlrf3Lt3+YtY9HL2TxMXM8o2EV13MkIGTlx8 rd6nuosLG+zU2glAY0bCtoMI80JtgSzU0SE1xckKIzaPXu3L7IkvkDz89oTgq/c0P2gP RRRUaY8i6ozViRhDQ8yzCtalxaA2M0tG5LC6eVjPOcig7vvBBt6xarinPyv4uZTm+yiU O6JUmQjN7AdrjL9eVEm0cthToPGfeTDi1wcRN0wZhojso3SyKXM5bwHNk1W7ofeqjqgN eJl8tdr3ycA0rdPk13F6IwKiuipqtyUyWMpOxUvC0T7lJeHch9MTcyWfCPR9mH055Bwy 2o7g== X-Received: by 10.194.71.84 with SMTP id s20mr1997762wju.128.1414583474919; Wed, 29 Oct 2014 04:51:14 -0700 (PDT) Received: from localhost.localdomain (109-186-77-39.bb.netvision.net.il. [109.186.77.39]) by mx.google.com with ESMTPSA id el4sm18476402wid.11.2014.10.29.04.51.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Oct 2014 04:51:14 -0700 (PDT) From: Emmanuel Grumbach To: linux-wireless@vger.kernel.org Cc: Emmanuel Grumbach Subject: [PATCH 11/25] iwlwifi: pcie: fix recovery from ARC reset in WoWLAN Date: Wed, 29 Oct 2014 13:50:32 +0200 Message-Id: <1414583446-11032-11-git-send-email-egrumbach@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Emmanuel Grumbach When the ARC is reset when we exit from Sx in case we had WoWLAN running, we can't access the prph before we reset the NIC. Reviewed-by: Johannes Berg Signed-off-by: Emmanuel Grumbach --- drivers/net/wireless/iwlwifi/pcie/trans.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/pcie/trans.c b/drivers/net/wireless/iwlwifi/pcie/trans.c index 5c9064f..aea0fe9 100644 --- a/drivers/net/wireless/iwlwifi/pcie/trans.c +++ b/drivers/net/wireless/iwlwifi/pcie/trans.c @@ -1023,14 +1023,6 @@ static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans, return 0; } - iwl_pcie_set_pwr(trans, false); - - val = iwl_read32(trans, CSR_RESET); - if (val & CSR_RESET_REG_FLAG_NEVO_RESET) { - *status = IWL_D3_STATUS_RESET; - return 0; - } - /* * Also enables interrupts - none will happen as the device doesn't * know we're waking it up, only when the opmode actually tells it @@ -1050,6 +1042,8 @@ static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans, return ret; } + iwl_pcie_set_pwr(trans, false); + iwl_trans_pcie_tx_reset(trans); ret = iwl_pcie_rx_init(trans); @@ -1058,7 +1052,12 @@ static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans, return ret; } - *status = IWL_D3_STATUS_ALIVE; + val = iwl_read32(trans, CSR_RESET); + if (val & CSR_RESET_REG_FLAG_NEVO_RESET) + *status = IWL_D3_STATUS_RESET; + else + *status = IWL_D3_STATUS_ALIVE; + return 0; }