Received: by 2002:a05:6520:4d:b0:139:a872:a4c9 with SMTP id i13csp2567293lkm; Mon, 20 Sep 2021 18:54:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxbedbWNxosqLQKUgxQC9t/TJJJNpLu7AWwQIsBsfJKLGKawsohhWGT+m7sjGJGRYkXm25k X-Received: by 2002:a92:650c:: with SMTP id z12mr20266835ilb.87.1632188845745; Mon, 20 Sep 2021 18:47:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632188845; cv=none; d=google.com; s=arc-20160816; b=oTwKG3ZAX2lDl4GF+y3mkbaHxhmXBLTP5ek3Bug9hr9e4XYuDuBmwL+m2YySM58kvP 1ga5d4Qc6d/siUTp9Xg/Nq9XNHpcWTP7P9Iwqk6Ub8d4YX7HrP8ZT8RDNq7jBON81qal 8Rjvl79xnbIR8nRXXCHnyeobBQwY4BW1n65/fm04Kvx8v9AnJZhtGFn6s6yiA/O/ldqO 9+GPFdttsXrqSsP3nBt7vwmifWd+IxtMfVDAspntRzDC4PYS7Kh1OtlTgCfIyqEJHLv/ gz5T+OqJr0NVhZhE6Fug8SRR7sHCoeJPJUF1XMI0VDpJhr60dnVk6XpfminUdk1u5cis iE7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6mRxiYtu+bhuMXbGJnoUNb2WDRQlsGrHkn/O3JyW6Q0=; b=NYsSwFnOIuVFgEDJqd+gsxe41VDEZe9ZzSKq64uwwkR5VDXjvQC9vO5PStTAm+eYI+ ee/rq6oWVWGDc6LbUdSjbRqX4aV9dmbpS42P4j1Pa1JX+njj3KyMOy23HcKHejr17zlh gJQttmt1x1bR3GtSmjH4GGBt2efR+SIJcVOT8k0dunu3V06NV06WGumPmFEZQpJJO2ys fpCIzQOvS45TbYPd6XB0aOYJ6q7y0AsLa9LZtKlMcDlsw2BHytPLjx7iTpEmp0Xkjzk8 +bVo+hyLPtlIIaWrDsR69NK7yoZ+elWcXaMic6uhayRmvkK+UeGFbHrPmptfKfouuI8/ Ut1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=riC+EjAn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id t6si14023992ilj.70.2021.09.20.18.47.14; Mon, 20 Sep 2021 18:47:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=riC+EjAn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1351241AbhITRcq (ORCPT + 99 others); Mon, 20 Sep 2021 13:32:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:35438 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350867AbhITRaN (ORCPT ); Mon, 20 Sep 2021 13:30:13 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 116A261AE3; Mon, 20 Sep 2021 17:04:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1632157446; bh=Yo1xx5wu/2PwqdkQajsx15DqBkqVN1/9NdGm4l+7Mrc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=riC+EjAnTbkeEaDJJPt+HRPfpqOTy2JavKtaFfyyWPHjbSBuPRoQs/GGnLsMvJojD Ap+bfbekhFqmWzf6841t2y2LDchNP6lfsiM5Kznz3pkJFOkZSXNdTzwA2R1ncbUNKX m/cnCADQiCEhtzI7dizifOXw/gDZ55XHx83oYC5Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Miaoqing Pan , Kalle Valo , Sasha Levin Subject: [PATCH 4.14 181/217] ath9k: fix sleeping in atomic context Date: Mon, 20 Sep 2021 18:43:22 +0200 Message-Id: <20210920163930.759479477@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210920163924.591371269@linuxfoundation.org> References: <20210920163924.591371269@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Miaoqing Pan [ Upstream commit 7c48662b9d56666219f526a71ace8c15e6e12f1f ] The problem is that gpio_free() can sleep and the cfg_soc() can be called with spinlocks held. One problematic call tree is: --> ath_reset_internal() takes &sc->sc_pcu_lock spin lock --> ath9k_hw_reset() --> ath9k_hw_gpio_request_in() --> ath9k_hw_gpio_request() --> ath9k_hw_gpio_cfg_soc() Remove gpio_free(), use error message instead, so we should make sure there is no GPIO conflict. Also remove ath9k_hw_gpio_free() from ath9k_hw_apply_gpio_override(), as gpio_mask will never be set for SOC chips. Signed-off-by: Miaoqing Pan Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/1628481916-15030-1-git-send-email-miaoqing@codeaurora.org Signed-off-by: Sasha Levin --- drivers/net/wireless/ath/ath9k/hw.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c index 933d4f49d6b0..9e3db55a8684 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -1595,7 +1595,6 @@ static void ath9k_hw_apply_gpio_override(struct ath_hw *ah) ath9k_hw_gpio_request_out(ah, i, NULL, AR_GPIO_OUTPUT_MUX_AS_OUTPUT); ath9k_hw_set_gpio(ah, i, !!(ah->gpio_val & BIT(i))); - ath9k_hw_gpio_free(ah, i); } } @@ -2702,14 +2701,17 @@ static void ath9k_hw_gpio_cfg_output_mux(struct ath_hw *ah, u32 gpio, u32 type) static void ath9k_hw_gpio_cfg_soc(struct ath_hw *ah, u32 gpio, bool out, const char *label) { + int err; + if (ah->caps.gpio_requested & BIT(gpio)) return; - /* may be requested by BSP, free anyway */ - gpio_free(gpio); - - if (gpio_request_one(gpio, out ? GPIOF_OUT_INIT_LOW : GPIOF_IN, label)) + err = gpio_request_one(gpio, out ? GPIOF_OUT_INIT_LOW : GPIOF_IN, label); + if (err) { + ath_err(ath9k_hw_common(ah), "request GPIO%d failed:%d\n", + gpio, err); return; + } ah->caps.gpio_requested |= BIT(gpio); } -- 2.30.2