From patchwork Mon Mar 20 15:22:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mohammed Shafi Shajakhan X-Patchwork-Id: 9634379 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 D489C602D6 for ; Mon, 20 Mar 2017 15:20:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C32B927F80 for ; Mon, 20 Mar 2017 15:20:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B759927F89; Mon, 20 Mar 2017 15:20:56 +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=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 26C7427F80 for ; Mon, 20 Mar 2017 15:20:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=TV5SPAtDaacrp/8uIeo/LLIl1/eAVhHsKWa6ohAwKLU=; b=cy/V5CimIyp9dI zkfA4Pnq5Kkbn+XXwHAs7y7OKVidybC7k0gg8MvR5atBOoauv0rKuW4al+ATeJJZkUHWMkEJh9NaQ zVcMggoSUOtNeR1q9mcSPjr80srxvyGFnl6SSSPL4OYmP5AlxbJxsT/AgF1RNvLDFqksgzev+/KT8 xgNN3rp0SJDL7zGeecCb8WA/+To9TMD6XlEdYj45AOwo9Kr5+ke2317GAaQHY8uzeo7xez9ROlIIZ 7kxiRXrJTTaojHhe4DeB4wfjBBsVvDSIK4r6H3XYXf+e7VEizaGQayiG3L9wGpEUVY3qk5e6LgVB9 g1ANVbqHHlQyFA08ZKGg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cpz75-000868-4p; Mon, 20 Mar 2017 15:20:51 +0000 Received: from wolverine02.qualcomm.com ([199.106.114.251]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cpz71-0007zG-BV for ath10k@lists.infradead.org; Mon, 20 Mar 2017 15:20:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=qti.qualcomm.com; i=@qti.qualcomm.com; q=dns/txt; s=qcdkim; t=1490023247; x=1521559247; h=from:to:cc:subject:date:message-id:mime-version; bh=ZoTc/6e3ipKzytPNqvEUY09adB9IAPJ/40TUmwg2BNY=; b=MoKjYR7/jr4Gr6toW/5fkNHnTUGkg9nZfOeor0F4Ruvpj9B2pYsvHeuu HI/tqrJtSNPmFwyH1hdyLlI3Jd9mXSos8t2j7FxdzeB+7duVwmbXdvDyU PMxmWlcMY+Xc8LewN8n/BvF4L3i/Z2CK9ejRBj01a34DN2J6OIQFhXj5l s=; X-IronPort-AV: E=Sophos;i="5.36,194,1486454400"; d="scan'208";a="366879871" Received: from unknown (HELO Ironmsg03-R.qualcomm.com) ([10.53.140.107]) by wolverine02.qualcomm.com with ESMTP; 20 Mar 2017 08:20:26 -0700 From: Mohammed Shafi Shajakhan X-IronPort-AV: E=McAfee;i="5800,7501,8473"; a="1330903843" X-MGA-submission: =?us-ascii?q?MDENdqY1DcAe/E57i8PoyEJykU8/GiAR/782rC?= =?us-ascii?q?N7dOuGt1xKsE1taXg3RmUBwyn0oRHWGJecPgFcb2NGaC1X01ZF75n0nq?= =?us-ascii?q?OXwg83MkOqNtPwwwN+e1fNN4ndVoaZXUjEhW+hRdfzz6XVZBjT89j99c?= =?us-ascii?q?Ox?= Received: from nasanexm01g.na.qualcomm.com ([10.85.0.33]) by Ironmsg03-R.qualcomm.com with ESMTP/TLS/RC4-SHA; 20 Mar 2017 08:20:25 -0700 Received: from aphydexm01b.ap.qualcomm.com (10.252.127.11) by NASANEXM01G.na.qualcomm.com (10.85.0.33) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Mon, 20 Mar 2017 08:20:24 -0700 Received: from qcmail1.qualcomm.com (10.80.80.8) by aphydexm01b.ap.qualcomm.com (10.252.127.11) with Microsoft SMTP Server (TLS) id 15.0.1178.4; Mon, 20 Mar 2017 20:50:17 +0530 Received: by qcmail1.qualcomm.com (sSMTP sendmail emulation); Mon, 20 Mar 2017 20:52:50 +0530 To: Subject: [PATCH] ath10k: Fix NAPI enable/disable symmetry for AHB interface Date: Mon, 20 Mar 2017 20:52:46 +0530 Message-ID: <1490023366-8176-1-git-send-email-mohammed@qca.qualcomm.com> X-Mailer: git-send-email 1.9.1 MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: NASANEXM01B.na.qualcomm.com (10.85.0.82) To aphydexm01b.ap.qualcomm.com (10.252.127.11) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170320_082047_510075_F40B8A2C X-CRM114-Status: UNSURE ( 9.23 ) X-CRM114-Notice: Please train this message. X-BeenThere: ath10k@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mohammed@codeaurora.org, linux-wireless@vger.kernel.org, Mohammed Shafi Shajakhan Sender: "ath10k" Errors-To: ath10k-bounces+patchwork-ath10k=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Mohammed Shafi Shajakhan Move NAPI enable to 'ath10k_ahb_hif_start' from 'ath10k_ahb_hif_power_up'. This is to maintain the symmetry of calling napi_enable() from ath10k_ahb_hif_start() so that it matches with napi_disable() being called from ath10k_pci_hif_stop(). This change is based on the crash fix from Kalle for PCI interface in commit 1427228d5869 ("ath10k: fix napi crash during rmmod when probe firmware fails"). Signed-off-by: Mohammed Shafi Shajakhan --- drivers/net/wireless/ath/ath10k/ahb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/ath/ath10k/ahb.c b/drivers/net/wireless/ath/ath10k/ahb.c index 45226db..da770af 100644 --- a/drivers/net/wireless/ath/ath10k/ahb.c +++ b/drivers/net/wireless/ath/ath10k/ahb.c @@ -640,6 +640,7 @@ static int ath10k_ahb_hif_start(struct ath10k *ar) { ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot ahb hif start\n"); + napi_enable(&ar->napi); ath10k_ce_enable_interrupts(ar); ath10k_pci_enable_legacy_irq(ar); @@ -692,7 +693,6 @@ static int ath10k_ahb_hif_power_up(struct ath10k *ar) ath10k_err(ar, "could not wake up target CPU: %d\n", ret); goto err_ce_deinit; } - napi_enable(&ar->napi); return 0;