From patchwork Wed May 11 22:06:49 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Daudt X-Patchwork-Id: 9075241 X-Patchwork-Delegate: kvalo@adurom.com 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.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EFD259F372 for ; Wed, 11 May 2016 22:07:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 08BAE2017D for ; Wed, 11 May 2016 22:07:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 12FDF2010F for ; Wed, 11 May 2016 22:07:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752139AbcEKWHl (ORCPT ); Wed, 11 May 2016 18:07:41 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:36398 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751617AbcEKWHl (ORCPT ); Wed, 11 May 2016 18:07:41 -0400 Received: by mail-pa0-f52.google.com with SMTP id bt5so21659112pac.3 for ; Wed, 11 May 2016 15:07:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KHX6X+OFBrYz+gNe5EMqb2eNWKYlLMYTJpckL9Cf9K8=; b=Qbd6LnBoToDDS68lXP9LgVDmZJmC5mzxdR4KsjeZppfDz5lrpyE4CodIKGFzaqd6i1 RLYnBS7OScRgXG0KabT0p7TNmqLwW7+rfltqiwEJcOW8KGXzxtIle/SneYYVV9kz9Brz G/FSkv13gi7wlPM8nmwj+OCQ8OAMqnX7lqL4Y= 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=KHX6X+OFBrYz+gNe5EMqb2eNWKYlLMYTJpckL9Cf9K8=; b=IkpOCmcBHZkbRF8bWJHP6B1KImzeZppqpKxFSFiDzrt0MBNz3DOUSka5jUIDnEoY66 +WKi9jHRGJwsXzES728B5RaDnzdrFakVgybMQUQ1Az7XSDvLnI0qYIo/SBUXDlj2tBCo V6GTgfGwQOI6d/OePS4wjCFQ3nB3Q+37nnvszKWzlFfe9SjxDIQRL7UlOKDP8aHhR7i7 BSQ9WZYEqpov8HicW3b/ukVRj7Vp79R3Qpm3hQQBlfnKEj4MKxexFQNrkIWZ10LhaZqm Tn9Fyrz678/wqIRsbFjNDUTulfIHsFL5HLnnAdSGYvuADBeO5Ty1H/TDhgU+bsQ7OukB vKQA== X-Gm-Message-State: AOPr4FXDyYYEftQH5VRxR9Jg4E9rxs5LOrCbPid6fopFApiSxNcXVN1dU+8L0kniBf71BEmn X-Received: by 10.66.156.232 with SMTP id wh8mr8447198pab.153.1463004459990; Wed, 11 May 2016 15:07:39 -0700 (PDT) Received: from rodan.ric.broadcom.com ([216.31.219.19]) by smtp.gmail.com with ESMTPSA id wy7sm14591678pab.5.2016.05.11.15.07.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 May 2016 15:07:38 -0700 (PDT) From: Christian Daudt To: linux-wireless@vger.kernel.org Cc: Christian Daudt , brcm80211-dev-list@broadcom.com, Brett Rudley , Arend van Spriel , Franky Lin , Hante Meuleman Subject: [PATCH v2 2/2] brcmfmac: Fix 'did not remove int handler' warning Date: Wed, 11 May 2016 15:06:49 -0700 Message-Id: <1463004409-28885-3-git-send-email-csd@broadcom.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1463004409-28885-1-git-send-email-csd@broadcom.com> References: <1463004409-28885-1-git-send-email-csd@broadcom.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=-8.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 brcmf_sdiod_intr_unregister call that removes both func1 and func2 interrupt handlers only called when brcmf_ops_sdio_remove is called for func 1 (which is the 2nd call) but sdio is expecting it to be removed at the end of each sdio_remove call. This is causing 'rmmod bcmrfmac' on a 4356-sdio chip to complain with: WARNING: driver brcmfmac did not remove its interrupt handler! The modification makes calling brcmf_sdiod_intr_unregister multiple times harmless by clearing the variables that track if interrupt handlers have been installed, and then calls it on every brcmf_ops_sdio_remove call instead of just remove for func 1. Signed-off-by: Christian Daudt --- .../net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 17 +++++++++++------ drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h | 2 +- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c index 09635a9..590cd41 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c @@ -172,7 +172,7 @@ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev) return 0; } -int brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev) +void brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev) { brcmf_dbg(SDIO, "Entering oob=%d sd=%d\n", @@ -195,6 +195,7 @@ int brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev) } free_irq(pdata->oob_irq_nr, &sdiodev->func[1]->dev); sdiodev->irq_en = false; + sdiodev->oob_irq_requested = false; } if (sdiodev->sd_irq_requested) { @@ -202,9 +203,8 @@ int brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev) sdio_release_irq(sdiodev->func[2]); sdio_release_irq(sdiodev->func[1]); sdio_release_host(sdiodev->func[1]); + sdiodev->sd_irq_requested = false; } - - return 0; } void brcmf_sdiod_change_state(struct brcmf_sdio_dev *sdiodev, @@ -1200,12 +1200,17 @@ static void brcmf_ops_sdio_remove(struct sdio_func *func) brcmf_dbg(SDIO, "sdio device ID: 0x%04x\n", func->device); brcmf_dbg(SDIO, "Function: %d\n", func->num); - if (func->num != 1) - return; - bus_if = dev_get_drvdata(&func->dev); if (bus_if) { sdiodev = bus_if->bus_priv.sdio; + + /* start by unregistering irqs */ + brcmf_sdiod_intr_unregister(sdiodev); + + if (func->num != 1) + return; + + /* only proceed with rest of cleanup if func 1 */ brcmf_sdiod_remove(sdiodev); dev_set_drvdata(&sdiodev->func[1]->dev, NULL); diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h index c07ad25..f3da32f 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h @@ -294,7 +294,7 @@ struct sdpcmd_regs { /* Register/deregister interrupt handler. */ int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev); -int brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev); +void brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev); /* sdio device register access interface */ u8 brcmf_sdiod_regrb(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret);