From patchwork Mon May 28 07:50:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Nazzareno Trimarchi X-Patchwork-Id: 10430013 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 168D3602CC for ; Mon, 28 May 2018 07:51:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08A6F28B56 for ; Mon, 28 May 2018 07:51:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F123228B73; Mon, 28 May 2018 07:51:06 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E81228B56 for ; Mon, 28 May 2018 07:51:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754013AbeE1HvE (ORCPT ); Mon, 28 May 2018 03:51:04 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:34922 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753942AbeE1HvA (ORCPT ); Mon, 28 May 2018 03:51:00 -0400 Received: by mail-wr0-f195.google.com with SMTP id i14-v6so18685419wre.2 for ; Mon, 28 May 2018 00:51:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id; bh=h2z8SXKaelFxN50zXGukZ2dcswvkhrll5fdJhO9qLQM=; b=pxE7VAUxCn57NEgRvFsFkKozVPf+9c6QXsZtkID2Fkm6AusE/nHa1+9LB+PIg/CzBB CmNFtUU95toBklkBgQP+QYBrq2a2dIr4MV17Hl1mJxAbLtWyb0MRTYDyE0SAM6E6il1u bWEZ5UrGDjor+8lCNvdvdSiQKUXmGGvJuJRHg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=h2z8SXKaelFxN50zXGukZ2dcswvkhrll5fdJhO9qLQM=; b=EloXxMrB4/33USltvTEeXfRaC/DkWhdiH94g1XGgGGF/+t8pvD/fJ6SQ4mbwTW623m RAX3jyVnvrdPos2eAGG/nJtDOl1Hom+A4dnpEfvBhcuTM4F7SqQFApY7+Ig9pAkE/KO1 MBmqMRtjfXi89+HR94e722rYC1YZ4Lmq4y031zwy7JuRoZ9UrTcybz0K1qsz0nEICFKm G/eZ4PHo7WdUbtQ9PI9TQcm7WVI2JWZ2+i0htZUxnEjfDTdTep8rWSbEr4eqG6kQfzYx FM2OMYdbW1/wnyupfYDY2avIz+lDJy89XnBVXWw5SlPoqBTpZ7Ga6J/iTzsc73cIfbon Kz3A== X-Gm-Message-State: ALKqPwfy5j04U8DZdg6DBYEB3RKiTYJZOpD2Nmvk74MYE4V6WyNOcFCm 5m3i+VOmt5jXfQoWsnJbaGg4EQ== X-Google-Smtp-Source: ADUXVKLCFU7wdag27qvMyz99shUPt0gJe91Wo+N4/1WuNI+StAHrgYFJzY5UFciiZbxjUcRcwGDPdw== X-Received: by 2002:adf:8211:: with SMTP id 17-v6mr5751958wrb.144.1527493859312; Mon, 28 May 2018 00:50:59 -0700 (PDT) Received: from localhost.localdomain (ip-163-227.sn-213-198.clouditalia.com. [213.198.163.227]) by smtp.gmail.com with ESMTPSA id 88-v6sm22486818wro.49.2018.05.28.00.50.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 May 2018 00:50:58 -0700 (PDT) From: Michael Trimarchi Cc: michael@amarulasolutions.com, Arend van Spriel , Franky Lin , Hante Meuleman , Chi-Hsien Lin , Wright Feng , Kalle Valo , "David S. Miller" , Pieter-Paul Giesberts , Ian Molton , linux-wireless@vger.kernel.org, brcm80211-dev-list.pdl@broadcom.com, brcm80211-dev-list@cypress.com, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] brcmfmac: stop watchdog before detach and free everything Date: Mon, 28 May 2018 09:50:54 +0200 Message-Id: <1527493857-2220-1-git-send-email-michael@amarulasolutions.com> X-Mailer: git-send-email 2.7.4 To: unlisted-recipients:; (no To-header on input) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Watchdog need to be stopped in brcmf_sdio_remove to avoid i The system is going down NOW! [ 1348.110759] Unable to handle kernel NULL pointer dereference at virtual address 000002f8 Sent SIGTERM to all processes [ 1348.121412] Mem abort info: [ 1348.126962] ESR = 0x96000004 [ 1348.130023] Exception class = DABT (current EL), IL = 32 bits [ 1348.135948] SET = 0, FnV = 0 [ 1348.138997] EA = 0, S1PTW = 0 [ 1348.142154] Data abort info: [ 1348.145045] ISV = 0, ISS = 0x00000004 [ 1348.148884] CM = 0, WnR = 0 [ 1348.151861] user pgtable: 4k pages, 48-bit VAs, pgdp = (____ptrval____) [ 1348.158475] [00000000000002f8] pgd=0000000000000000 [ 1348.163364] Internal error: Oops: 96000004 [#1] PREEMPT SMP [ 1348.168927] Modules linked in: ipv6 [ 1348.172421] CPU: 3 PID: 1421 Comm: brcmf_wdog/mmc0 Not tainted 4.17.0-rc5-next-20180517 #18 [ 1348.180757] Hardware name: Amarula A64-Relic (DT) [ 1348.185455] pstate: 60000005 (nZCv daif -PAN -UAO) [ 1348.190251] pc : brcmf_sdiod_freezer_count+0x0/0x20 [ 1348.195124] lr : brcmf_sdio_watchdog_thread+0x64/0x290 [ 1348.200253] sp : ffff00000b85be30 [ 1348.203561] x29: ffff00000b85be30 x28: 0000000000000000 [ 1348.208868] x27: ffff00000b6cb918 x26: ffff80003b990638 [ 1348.214176] x25: ffff0000087b1a20 x24: ffff80003b94f800 [ 1348.219483] x23: ffff000008e620c8 x22: ffff000008f0b660 [ 1348.224790] x21: ffff000008c6a858 x20: 00000000fffffe00 [ 1348.230097] x19: ffff80003b94f800 x18: 0000000000000001 [ 1348.235404] x17: 0000ffffab2e8a74 x16: ffff0000080d7de8 [ 1348.240711] x15: 0000000000000000 x14: 0000000000000400 [ 1348.246018] x13: 0000000000000400 x12: 0000000000000001 [ 1348.251324] x11: 00000000000002c4 x10: 0000000000000a10 [ 1348.256631] x9 : ffff00000b85bc40 x8 : ffff80003be11870 [ 1348.261937] x7 : ffff80003dfc7308 x6 : 000000078ff08b55 [ 1348.267243] x5 : 00000139e1058400 x4 : 0000000000000000 [ 1348.272550] x3 : dead000000000100 x2 : 958f2788d6618100 [ 1348.277856] x1 : 00000000fffffe00 x0 : 0000000000000000 Signed-off-by: Michael Trimarchi Reviewed-by: Arend van Spriel --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 412a05b..061f69d 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c @@ -4294,6 +4294,13 @@ void brcmf_sdio_remove(struct brcmf_sdio *bus) brcmf_dbg(TRACE, "Enter\n"); if (bus) { + /* Stop watchdog task */ + if (bus->watchdog_tsk) { + send_sig(SIGTERM, bus->watchdog_tsk, 1); + kthread_stop(bus->watchdog_tsk); + bus->watchdog_tsk = NULL; + } + /* De-register interrupt handler */ brcmf_sdiod_intr_unregister(bus->sdiodev);