From patchwork Fri Dec 20 03:30:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Huang X-Patchwork-Id: 11304685 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7D87514F6 for ; Fri, 20 Dec 2019 03:30:39 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5408124680 for ; Fri, 20 Dec 2019 03:30:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="K0ndG9gT"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="OUhpV7Qn" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5408124680 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org 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:MIME-Version:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:Subject:To: From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=eT/TGVjQwq9f9tTLHdOKlADNz28eqFxi7diYYopEDh8=; b=K0ndG9gTSUjcvK RTgFnhxYbvHKtK6Z9LRYNoGEpLsfhaWPBhSFO+Ohm91MwmyH0mHLARdv/DqDW/RKrQ9hvM4yHmkOR rkZcNOu+/yVO6fKcEPjpKgdtuv1aGwpZrfZGNYSXl7Ysbt0K5kKpAh3f3KcahYB9X+Enb3tbGzwzt gGkhvQpSPtspg5xbPjHSIQo+Qq7Au1VvRlqg1jF2ReT+X2TJPNWjzp8z4zgM4ixZ7yWT8EogCMQEj PT59HW6tlSTSXNsl8DRvGMBVoMf1el4JS+av/Y7KSdzaT/r9DoFX4HCqOnQYEmtPa0JgmZWkSIJto Zu5CPVjyYh2QmHsGGzgQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1ii8zt-0005zu-GF; Fri, 20 Dec 2019 03:30:37 +0000 Received: from mail25.static.mailgun.info ([104.130.122.25]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1ii8zk-0004RQ-Ai for ath11k@lists.infradead.org; Fri, 20 Dec 2019 03:30:30 +0000 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1576812628; h=Message-Id: Date: Subject: To: From: Sender; bh=VQcKkLPJFKfDcNgekkzdfDX29/2cBRzeCe9Qv1OB48w=; b=OUhpV7QnYJS7aeyTCdLLcp1gtXIhHCClmq+SiEiF9c91hsCtq1V3+TA2IKAplRWxlVM6CUzd uu51Dt6nRR40gNJiOf79tV4aimi1KU08zmg3eqz4zxLj1PuyVJetLhsg3Sb98KU7DBF6kUMI Ajt/73+TwLkUoVq0WDekfJ3CSqQ= X-Mailgun-Sending-Ip: 104.130.122.25 X-Mailgun-Sid: WyJmOGQ2ZiIsICJhdGgxMWtAbGlzdHMuaW5mcmFkZWFkLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by mxa.mailgun.org with ESMTP id 5dfc404f.7faf2b965570-smtp-out-n01; Fri, 20 Dec 2019 03:30:23 -0000 (UTC) Received: by smtp.codeaurora.org (Postfix, from userid 1001) id 7FBDFC447A0; Fri, 20 Dec 2019 03:30:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-caf-mail-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.0 required=2.0 tests=ALL_TRUSTED,SPF_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from cjhuang-station.qca.qualcomm.com (unknown [180.166.53.21]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: cjhuang) by smtp.codeaurora.org (Postfix) with ESMTPSA id A1678C447A3 for ; Fri, 20 Dec 2019 03:30:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org A1678C447A3 Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: aws-us-west-2-caf-mail-1.web.codeaurora.org; spf=none smtp.mailfrom=cjhuang@codeaurora.org From: Carl Huang To: ath11k@lists.infradead.org Subject: [PATCH qca6390-bringup] ath11k: fix ath11k_pci rmmod crash Date: Fri, 20 Dec 2019 11:30:15 +0800 Message-Id: <1576812615-25070-1-git-send-email-cjhuang@codeaurora.org> X-Mailer: git-send-email 2.7.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191219_193028_898641_96F12CCA X-CRM114-Status: GOOD ( 11.15 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [104.130.122.25 listed in list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [104.130.122.25 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: ath11k@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "ath11k" Errors-To: ath11k-bounces+patchwork-ath11k=patchwork.kernel.org@lists.infradead.org For QCA6390, it needs to free_irq and then disable_msi.Otherwise, crash happened. Also free other resources during ath11k_pci_remove. Fixed the typo in ath11k_debug_pdev_destroy and ath11k_debug_soc_destroy. Signed-off-by: Carl Huang --- drivers/net/wireless/ath/ath11k/debug.c | 8 ++++---- drivers/net/wireless/ath/ath11k/pci.c | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath11k/debug.c b/drivers/net/wireless/ath/ath11k/debug.c index 82522ec..3bd97b0 100644 --- a/drivers/net/wireless/ath/ath11k/debug.c +++ b/drivers/net/wireless/ath/ath11k/debug.c @@ -828,8 +828,8 @@ int ath11k_debug_pdev_create(struct ath11k_base *ab) void ath11k_debug_pdev_destroy(struct ath11k_base *ab) { - debugfs_remove_recursive(ab->debugfs_ath11k); - ab->debugfs_ath11k = NULL; + debugfs_remove_recursive(ab->debugfs_soc); + ab->debugfs_soc = NULL; } int ath11k_debug_soc_create(struct ath11k_base *ab) @@ -847,8 +847,8 @@ int ath11k_debug_soc_create(struct ath11k_base *ab) void ath11k_debug_soc_destroy(struct ath11k_base *ab) { - debugfs_remove_recursive(ab->debugfs_soc); - ab->debugfs_soc = NULL; + debugfs_remove_recursive(ab->debugfs_ath11k); + ab->debugfs_ath11k = NULL; } void ath11k_debug_fw_stats_init(struct ath11k *ar) diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c index 1673ce7..48339e2 100644 --- a/drivers/net/wireless/ath/ath11k/pci.c +++ b/drivers/net/wireless/ath/ath11k/pci.c @@ -392,6 +392,14 @@ static void ath11k_pci_free_irq(struct ath11k_base *ab) irq_idx = ATH11K_IRQ_CE0_OFFSET + i; free_irq(ab->irq_num[irq_idx], &ab->ce.ce_pipe[i]); } + + for (i = 0; i < ATH11K_EXT_IRQ_GRP_NUM_MAX; i++) { + struct ath11k_ext_irq_grp *irq_grp = &ab->ext_irq_grp[i]; + int j; + + for (j = 0; j < irq_grp->num_irq; j++) + free_irq(ab->irq_num[irq_grp->irqs[j]], irq_grp); + } } static void ath11k_pci_ce_irq_enable(struct ath11k_base *ab, u16 ce_id) @@ -1068,10 +1076,16 @@ static void ath11k_pci_remove(struct pci_dev *pdev) struct ath11k_pci *ar_pci = ath11k_pci_priv(ab); set_bit(ATH11K_FLAG_UNREGISTERING, &ab->dev_flags); + ath11k_core_deinit(ab); + ath11k_pci_unregister_mhi(ar_pci); + + ath11k_pci_free_irq(ab); ath11k_pci_disable_msi(ar_pci); ath11k_pci_free_region(ar_pci); - ath11k_pci_free_irq(ab); + + ath11k_hal_srng_deinit(ab); + ath11k_ce_free_pipes(ab); ath11k_core_free(ab); }