From patchwork Fri Mar 28 07:34:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 3901291 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 C59F09F2E8 for ; Fri, 28 Mar 2014 07:40:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E998F202A7 for ; Fri, 28 Mar 2014 07:40:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 1808920303 for ; Fri, 28 Mar 2014 07:40:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751397AbaC1Hk3 (ORCPT ); Fri, 28 Mar 2014 03:40:29 -0400 Received: from mail-ee0-f42.google.com ([74.125.83.42]:59670 "EHLO mail-ee0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751068AbaC1HkZ (ORCPT ); Fri, 28 Mar 2014 03:40:25 -0400 Received: by mail-ee0-f42.google.com with SMTP id d17so3703758eek.15 for ; Fri, 28 Mar 2014 00:40:24 -0700 (PDT) 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=DI+D4hn1UU9zbBSS0DvbsxK4QiMSPCA2vx0m2ZHMa70=; b=Jw16xCJTEft6yYL3gxCkNrMnkuxdUls9s4f4JW5deup+lr2phdxTh44/wGGjh35sPe UmpQtIw3KOfEILGziysayOOvidkQYmFgDq6ZGyEf5gBLH37XgmN+f8o5R4LgipIT+1fJ uYAkf4+tF++QCzPbbfl+q4zFyBijdzLGVaE1E= 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=DI+D4hn1UU9zbBSS0DvbsxK4QiMSPCA2vx0m2ZHMa70=; b=DhbeZPDNaH0W7fLQMpKpBfBvirAeyE7LSNk2Ip1SMp/QXIicu68vnRUXCsPYPpHEwK vnM4mjiHsr+ELcH4lu6cAAfUD50wf++U2oj5TGC4EeMKeXjbBwJfl28ZO0nNaW5If+Hp He7gDY8eAF+9JUp+HsNJcibTO77GdnlWzqx7d577W85wzNGkOeIOMn/NEjs3TMUGgFRI 4Qg8EmnA36bB/lwo7nP/1mFySiWHSy3Vr91hQTxUjTrb3kdFKHoWOLkNxTp7epDQ6NMo HSX/8Q3vWOJSzy2A/8yvwEnpzY85mNKeUV2mfvgwqgyjDVfzo9RAhtkx638040D152te wLCg== X-Gm-Message-State: ALoCoQlQAYjb+hMcZVL6Z3ntzzGh7siP1D0zhXIXZQJT3Zq4PZ1fetnobFdVxd4wNuMGgPWc4xNKqMtuTazk4rvc7D6NwI0spd6og+BYKdwhiolxOiM9Gtk= X-Received: by 10.14.194.133 with SMTP id m5mr8041273een.38.1395992423947; Fri, 28 Mar 2014 00:40:23 -0700 (PDT) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id m8sm9785734eeg.11.2014.03.28.00.40.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 28 Mar 2014 00:40:23 -0700 (PDT) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH v2 3/3] ath10k: deinit copy engine before resetting Date: Fri, 28 Mar 2014 08:34:25 +0100 Message-Id: <1395992065-10086-4-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1395992065-10086-1-git-send-email-michal.kazior@tieto.com> References: <1395745943-29492-1-git-send-email-michal.kazior@tieto.com> <1395992065-10086-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com 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.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, 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 Since copy engine allocation has been revised the ath10k_pci_ce_deinit() now simply zeroes copy engine registers. It's probably a good idea to do that before reseting for a more graceful device reset. Before ath10k_pci_ce_deinit() freed copy engine ringbuffer memory so it was required to call it after resetting. Otherwise it was possible for device to access unmapped/freed copy engine ringbuffer memory. Signed-off-by: Michal Kazior --- v2: * added as a result of splitting another patch drivers/net/wireless/ath/ath10k/pci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index 10bf612..52c8c0d 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c @@ -2000,9 +2000,9 @@ static void ath10k_pci_hif_power_down(struct ath10k *ar) ath10k_pci_free_early_irq(ar); ath10k_pci_kill_tasklet(ar); ath10k_pci_deinit_irq(ar); + ath10k_pci_ce_deinit(ar); ath10k_pci_warm_reset(ar); - ath10k_pci_ce_deinit(ar); if (!test_bit(ATH10K_PCI_FEATURE_SOC_POWER_SAVE, ar_pci->features)) ath10k_do_pci_sleep(ar); }