From patchwork Thu Dec 6 16:07:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Bianconi X-Patchwork-Id: 10716299 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-2.web.codeaurora.org (Postfix) with ESMTP id D613A109C for ; Thu, 6 Dec 2018 16:07:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C4E8D2EDF3 for ; Thu, 6 Dec 2018 16:07:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B96802EE82; Thu, 6 Dec 2018 16:07:53 +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.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham 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 69B502EDF3 for ; Thu, 6 Dec 2018 16:07:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725922AbeLFQHw (ORCPT ); Thu, 6 Dec 2018 11:07:52 -0500 Received: from mail-wr1-f68.google.com ([209.85.221.68]:40846 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725862AbeLFQHw (ORCPT ); Thu, 6 Dec 2018 11:07:52 -0500 Received: by mail-wr1-f68.google.com with SMTP id p4so1020145wrt.7 for ; Thu, 06 Dec 2018 08:07:51 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=KO8alHgWQKvOahiCxAEFRSKnwgWpInaDVHxJRKdLyOc=; b=UzQIqCIF3cK3SLHIX6lD0i33Ifrx2fW7l/Sw9hNSZirnh3iK3Sgf+HKFkSGQlDiCU9 m+LTaedvhzyE53XOmoWoo/eJiLty9vPDANGzshspEah/GVYPndoxssxAfNSlZX1XeSDQ MUl2tI+7RJTBERF3rzn1hfbxUbYi76jFnLR1of9gj0r94688kvwBpSzfcyxIh48ZZahK Peeh/c/9phaXMRIYmb7g8+O9MPwhN/KZYDE7LZQBZVcU4BYRh0Zf5nr2EDA1YysxVKNy on02FaqkL3hYsQGdGzPO8oP0a5YgZQBKXLyNtJ5tFR05Yo2y5iRkqp9AX10azcga1SZ+ zABA== X-Gm-Message-State: AA+aEWZZ8SirNYjMD/nwhi2ohG9cVMY5/DrFLCXT6xzho8SvhPNwJSpA aWHN8qYH40FOFA5wpBmBQ4/SHg== X-Google-Smtp-Source: AFSGD/VvtCYXqFsvSqN8bmZx2Tn/P5o5ErHB4AKBYkiT7aJgqqarVhOwCaZU5uXNAIEDX3Q+9o6KRg== X-Received: by 2002:adf:a58a:: with SMTP id g10mr16231317wrc.3.1544112470423; Thu, 06 Dec 2018 08:07:50 -0800 (PST) Received: from localhost.localdomain.com (nat-pool-mxp-t.redhat.com. [149.6.153.186]) by smtp.gmail.com with ESMTPSA id o8sm1027649wrx.15.2018.12.06.08.07.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 06 Dec 2018 08:07:49 -0800 (PST) From: Lorenzo Bianconi To: nbd@nbd.name Cc: linux-wireless@vger.kernel.org Subject: [PATCH] mt76: mac: run mt76x02_mac_work routine atomically Date: Thu, 6 Dec 2018 17:07:39 +0100 Message-Id: <247b18445443568012e3620025c22b5ca7b98653.1544112379.git.lorenzo.bianconi@redhat.com> X-Mailer: git-send-email 2.19.2 In-Reply-To: References: MIME-Version: 1.0 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 Grab mt76_dev mutex in mt76x02_mac_work handler since it runs concurrently with mt76x{0,2}_set_channel routines Signed-off-by: Lorenzo Bianconi --- drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c index 490368dc9325..64841f40cdcf 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x02_mac.c @@ -784,6 +784,8 @@ void mt76x02_mac_work(struct work_struct *work) mac_work.work); int i, idx; + mutex_lock(&dev->mt76.mutex); + mt76x02_update_channel(&dev->mt76); for (i = 0, idx = 0; i < 16; i++) { u32 val = mt76_rr(dev, MT_TX_AGG_CNT(i)); @@ -796,6 +798,8 @@ void mt76x02_mac_work(struct work_struct *work) if (!dev->beacon_mask) mt76x02_check_mac_err(dev); + mutex_unlock(&dev->mt76.mutex); + mt76_tx_status_check(&dev->mt76, NULL, false); ieee80211_queue_delayed_work(mt76_hw(dev), &dev->mac_work,