From patchwork Mon Mar 2 09:09:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 5910791 Return-Path: X-Original-To: patchwork-ath10k@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id A60B39F749 for ; Mon, 2 Mar 2015 09:11:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id ACE26201EF for ; Mon, 2 Mar 2015 09:10:59 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 3E35820212 for ; Mon, 2 Mar 2015 09:10:58 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YSMNF-0007ye-Mn; Mon, 02 Mar 2015 09:10:49 +0000 Received: from mail-la0-x234.google.com ([2a00:1450:4010:c03::234]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YSMND-0007t2-2v for ath10k@lists.infradead.org; Mon, 02 Mar 2015 09:10:47 +0000 Received: by lamq1 with SMTP id q1so5722644lam.9 for ; Mon, 02 Mar 2015 01:10:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=MwoSBDsy0D8lvZdC5yNQ/Ut1Ptyz/wi2FVgDnHnP6mo=; b=4K7JhTQmPMtywbm0NbErsvu5ZHAg6zTbkWZtO3JOdHuGD2g8Nb8wpWYO8kFsXF15qJ 4PjFqfZbgUqtvsAKR7amWINRMeHp3qaX9C2BCAGWkWAnIJ936aCEcoaEsQ0dBDOueBaa 1BiGU1BGrx//yW+8TBTvCuSuV9TqWCtLYYVbw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=MwoSBDsy0D8lvZdC5yNQ/Ut1Ptyz/wi2FVgDnHnP6mo=; b=XF950iOqRFMm+v++XxDlfYE1cyIievsFMgRkt2J+82XQH0E9vBQS/CQmkxIo3qpHKD /17J3/dITt69AB+YOMUbuaJSn1zG8sNWNHQY0xWz2QGpXrPN/SDI/pXZtD9/XRpbu4j0 Npif97R5zRYRulzI3uUOb02xypcPFrfP+oNe59cJ8u7P4toXm0Q/PYc5gGdp5pgOqhIm 71pyRVD9+j3eWTBXF+E0a7Ly3QzDgPYLLWrym+2T5rZFtXEzv68Vr/ZTSLJ8ui0GvFYO UQN12hTKcePlcXyAcJKLbccLYFfMBeQvgakNJM/qdrBUUnVz3U37UJBA44zt2jJrgLK0 865g== X-Gm-Message-State: ALoCoQm2G8y0iec5tcx7wThw37jh0pARRBJv4Q3LTygyAJJTM/jL4BCjCFZco8pRBPM6sf714/QY3hO888JMwU514rBw4wL8n5HqYOfu9oXInxl8ByRjFgceu9HNvwJmFRSvlILph2ihBuyj79EzIc1Vhm8gvtkG/RyPH0vcDYA7Xh77VD89ySc= X-Received: by 10.112.24.235 with SMTP id x11mr23142106lbf.18.1425287423693; Mon, 02 Mar 2015 01:10:23 -0800 (PST) Received: from bob.homerouter.cpe (apn-77-113-114-198.dynamic.gprs.plus.pl. [77.113.114.198]) by mx.google.com with ESMTPSA id ud4sm2407775lac.28.2015.03.02.01.10.22 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 02 Mar 2015 01:10:23 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Subject: [PATCH 2/3] ath10k: always save/restore pci config space Date: Mon, 2 Mar 2015 10:09:03 +0100 Message-Id: <1425287344-30594-2-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1425287344-30594-1-git-send-email-michal.kazior@tieto.com> References: <1425287344-30594-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150302_011047_312283_E70BD874 X-CRM114-Status: UNSURE ( 9.81 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.8 (/) Cc: linux-wireless@vger.kernel.org, Michal Kazior X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 The check isn't really necessary and couldn't even work because becase pci_restore_state() restores only first 64 bytes of PCI configuration space. This is necessary for future WoWLAN support. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/pci.c | 37 +++++++++++------------------------ 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index cbf82ff..d06b264 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -2053,24 +2053,15 @@ static void ath10k_pci_hif_power_down(struct ath10k *ar) #ifdef CONFIG_PM -#define ATH10K_PCI_PM_CONTROL 0x44 - static int ath10k_pci_hif_suspend(struct ath10k *ar) { struct ath10k_pci *ar_pci = ath10k_pci_priv(ar); struct pci_dev *pdev = ar_pci->pdev; - u32 val; ath10k_pci_sleep(ar); - pci_read_config_dword(pdev, ATH10K_PCI_PM_CONTROL, &val); - - if ((val & 0x000000ff) != 0x3) { - pci_save_state(pdev); - pci_disable_device(pdev); - pci_write_config_dword(pdev, ATH10K_PCI_PM_CONTROL, - (val & 0xffffff00) | 0x03); - } + pci_save_state(pdev); + pci_disable_device(pdev); return 0; } @@ -2088,22 +2079,16 @@ static int ath10k_pci_hif_resume(struct ath10k *ar) return ret; } - pci_read_config_dword(pdev, ATH10K_PCI_PM_CONTROL, &val); + pci_restore_state(pdev); - if ((val & 0x000000ff) != 0) { - pci_restore_state(pdev); - pci_write_config_dword(pdev, ATH10K_PCI_PM_CONTROL, - val & 0xffffff00); - /* - * Suspend/Resume resets the PCI configuration space, - * so we have to re-disable the RETRY_TIMEOUT register (0x41) - * to keep PCI Tx retries from interfering with C3 CPU state - */ - pci_read_config_dword(pdev, 0x40, &val); - - if ((val & 0x0000ff00) != 0) - pci_write_config_dword(pdev, 0x40, val & 0xffff00ff); - } + /* Suspend/Resume resets the PCI configuration space, so we have to + * re-disable the RETRY_TIMEOUT register (0x41) to keep PCI Tx retries + * from interfering with C3 CPU state. pci_restore_state won't help + * here since it only restores the first 64 bytes pci config header. + */ + pci_read_config_dword(pdev, 0x40, &val); + if ((val & 0x0000ff00) != 0) + pci_write_config_dword(pdev, 0x40, val & 0xffff00ff); return ret; }