Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp1854530pxb; Thu, 16 Sep 2021 18:01:48 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzHxMNB7Lf2BUuLEwQk6owx8IFnheRPyjAYdK3LSsEs26GP45S0TVDLJR8eQiMYhZ25jXdt X-Received: by 2002:a02:1081:: with SMTP id 123mr6432491jay.83.1631840508789; Thu, 16 Sep 2021 18:01:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631840508; cv=none; d=google.com; s=arc-20160816; b=KPTOAPEmsH6uvw00AxGKEDAIwo/IgsDD/HGaDKrPx1njmRFrMhkQIwXP09ZSgt/YWK T1uKkG4/AQEXWUUXftpSIC++UYYN88V1BNSBntIeJmZuiazE8KrUk2uP/yxOAaTX/YwJ MKLbyl5Isz3TdTTa6+Yl14xt5r+xYe+98wIU1VkfNYZz1cbwjXgD156cYDUO+7yV1fx9 44ASYpuRxfWqj1bnePoFJzbdV0FkrPYvDxWue+NkQfva8S++VFA41ygptVc1YVoKAbbj rZcKfcegrWuu+P3I4g4T2p+POEyfo/uUo2xvPHU13tPDNbyg44PB6EBcJQ2P6D1WIEB7 NvXg== 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=ZN3XWyRDDOvHU1mb1RyvA4hw2jE2HEIECbO3YWTHfiw=; b=0G55Le3s8x9wVvnjOQPyLiR5pmJ7KTeo6LgL049apz76ZkHc6CRm5wlbcyl0dhEbJ1 MpBLkDzplwcwyHolR1hS7dPuuGisdv6Oe8aBhshqMLGrnyo7730qI4ImBRbchqIKglC4 zKsK+ZcL8xyTCHZi5y6dQxRyzPHh8CfzkAX+11VU5WrcnhELWx+Xf2j/ZKkrjXD6ZLa/ 5xttHKXTCtfRIQg9xAYsSf1t79u/1N675h3Bued6vsrWdERXVfijxlo2DWLbtOUyu+pz /mTOaAf0N8ls0vtTq55SXS+rV2x8XUGfv9MRfhPcemYHUh9D6CKrNMhjRkCs2khsJ59M HZ2A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=tSJl2Euc; 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 x5si1869338ilp.149.2021.09.16.18.01.37; Thu, 16 Sep 2021 18:01:48 -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=tSJl2Euc; 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 S245093AbhIPRIv (ORCPT + 99 others); Thu, 16 Sep 2021 13:08:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:54398 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347559AbhIPQ7s (ORCPT ); Thu, 16 Sep 2021 12:59:48 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 94A99615E6; Thu, 16 Sep 2021 16:32:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631809943; bh=SOPpvKtzb0tg3krV8vKQe7HXELjbnHOL7sw10xfYj78=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tSJl2Euc+1uLkkWlgx3/Iff1nJSO0CwtJzxHON2++ta/SftGvGt4Dut8xUVgztzoU 6/pLVTfJNUTM+SgH91Vk7PeG+nQw6A0HffIzRkp3A57sMGqhYNWEWyj8YuDorGRSu8 3V8X7LwC/lI0pa+8WXtm6VLTeX1MRkTZL6xjmCKo= 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 5.13 340/380] ath9k: fix sleeping in atomic context Date: Thu, 16 Sep 2021 18:01:37 +0200 Message-Id: <20210916155815.606375996@linuxfoundation.org> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210916155803.966362085@linuxfoundation.org> References: <20210916155803.966362085@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 2ca3b86714a9..172081ffe477 100644 --- a/drivers/net/wireless/ath/ath9k/hw.c +++ b/drivers/net/wireless/ath/ath9k/hw.c @@ -1621,7 +1621,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); } } @@ -2728,14 +2727,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