Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29AB5C43219 for ; Sat, 27 Apr 2019 01:40:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E65A0214C6 for ; Sat, 27 Apr 2019 01:40:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556329213; bh=PaBdpQYTDkeWTBvbme9CHTRjkjUnvPZZFO9sENKgmY8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=z79//Ly1i9vqik32Yi7BOLraTeyXpthqePXnaBIpjUGJMn/1fsBuGCVVmNGA5q/f/ g1bEmuTuYDAwM4lIHIPy1AYGntC8kfPc7FK0Uda95UIDOv4v3Zx2ixxlWUoK0rMPDQ 3iKar/IiTZusMCH7+x1jhl7jre7A7DLj+f6lC66w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727917AbfD0BkM (ORCPT ); Fri, 26 Apr 2019 21:40:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:43616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727914AbfD0BkK (ORCPT ); Fri, 26 Apr 2019 21:40:10 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EFF342146E; Sat, 27 Apr 2019 01:40:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556329209; bh=PaBdpQYTDkeWTBvbme9CHTRjkjUnvPZZFO9sENKgmY8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=J07/zRDj3MHI7weQepHMMOpu5ME/Ary/HYhwMGxuH8creH7bMm0R9PtsyF1Wf4Z/r 6Tbbbi7OooGLynHRD7/jJmrHfv2OCYLIvJlHM1MS/jdw488DX6AwuSmTfjhngScHoq qdeBnZhUsEdv6QmSf5S0UE5AcQY64eZdIDngJWqI= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Brian Norris , Linus Torvalds , Sasha Levin , linux-bluetooth@vger.kernel.org Subject: [PATCH AUTOSEL 5.0 60/79] Bluetooth: btusb: request wake pin with NOAUTOEN Date: Fri, 26 Apr 2019 21:38:19 -0400 Message-Id: <20190427013838.6596-60-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190427013838.6596-1-sashal@kernel.org> References: <20190427013838.6596-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-bluetooth-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Brian Norris [ Upstream commit 771acc7e4a6e5dba779cb1a7fd851a164bc81033 ] Badly-designed systems might have (for example) active-high wake pins that default to high (e.g., because of external pull ups) until they have an active firmware which starts driving it low. This can cause an interrupt storm in the time between request_irq() and disable_irq(). We don't support shared interrupts here, so let's just pre-configure the interrupt to avoid auto-enabling it. Fixes: fd913ef7ce61 ("Bluetooth: btusb: Add out-of-band wakeup support") Fixes: 5364a0b4f4be ("arm64: dts: rockchip: move QCA6174A wakeup pin into its USB node") Signed-off-by: Brian Norris Reviewed-by: Matthias Kaehlcke Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- drivers/bluetooth/btusb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 4761499db9ee..470ee68555d9 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2885,6 +2885,7 @@ static int btusb_config_oob_wake(struct hci_dev *hdev) return 0; } + irq_set_status_flags(irq, IRQ_NOAUTOEN); ret = devm_request_irq(&hdev->dev, irq, btusb_oob_wake_handler, 0, "OOB Wake-on-BT", data); if (ret) { @@ -2899,7 +2900,6 @@ static int btusb_config_oob_wake(struct hci_dev *hdev) } data->oob_wake_irq = irq; - disable_irq(irq); bt_dev_info(hdev, "OOB Wake-on-BT configured at IRQ %u", irq); return 0; } -- 2.19.1