Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp576839ybt; Fri, 19 Jun 2020 08:32:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJykoxaUnwYsaV8/16wnt26d1p6jR8cAAuEQWe9uUQp89rMtODXmo+4JrauGmMVa2M42zWei X-Received: by 2002:a17:907:2118:: with SMTP id qn24mr4391258ejb.252.1592580758755; Fri, 19 Jun 2020 08:32:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1592580758; cv=none; d=google.com; s=arc-20160816; b=GXl4NKr+OPO5q5rHWC6Ko/p9EMWGBG5ZuGMf/RnW6MKoHry8GU0s/Kt2IppRT6dokD FqVMpKnUTqbqrmagBNQvkOszFLRQ6B7vWrdwoaSaZhNJMHj+o+x3QwYNDwDo9uTHiBL/ P8jkAqhPs/ffWxhvvZGG3DJcmDHu8W6h3zh7+cl9bR0kW3zF1WmxfnP2QO1G5yYUpf+3 y1kCWfnWYReRdxybc4aaUMjeIwe/DPO0qJA/j4RYWBM2J+h4Y+iQJ1LIcsQgPBMJN/Zi dFD+mVJrBa/6e8tRfL3lsUCcoRWqzsP73cCkYEd8FVNUbU4XqF1Kg3+EemaNRu1Pl4eT XbYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=KHTv+11UCv5uUq96fVF36d5PbyY+gS11vIDrHLQLWtk=; b=VQrSFn9rUclsDyd5aFjb/mzn7vbVcxLn8Lt6QndsWtBEjxHlGqPMqT7d0W+jmMWwgK 6uuagB0wMAJtjSfkBEUAAPSUNdSFBFog4WUpW8btXYPpWQ42ct+C0XVL8TNRs73psveF ltAx97qt26nIAQck5Rw1NkXd8V/l7hLTF4gIlLsLOY10De/awjJ6A0jFu+uWvE393fqk KnKM2CrFM6KphVdE7KwkkpfSfxZfr5URLKZoS0gygP12y2pbHEeJagx0N2QstqnIxqIZ CxdYqkVt4GzWBb2kQrVzUlKXaH5OCigFwJVzy3QwmUfbarmoJPLkd0b6ZYJ0XDw+N5Xc GMmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=AYeu40VS; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id um13si4117147ejb.173.2020.06.19.08.32.16; Fri, 19 Jun 2020 08:32:38 -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=@kernel.org header.s=default header.b=AYeu40VS; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393696AbgFSP3v (ORCPT + 99 others); Fri, 19 Jun 2020 11:29:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:33278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404694AbgFSP3k (ORCPT ); Fri, 19 Jun 2020 11:29:40 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DD1C62193E; Fri, 19 Jun 2020 15:29:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592580579; bh=XNFn8BeRvyNMWixzmdvmz60YP1TqS0AsqFPdxRnlbQ8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AYeu40VS7qQ8SNKuwJxGyrbFxklAS4xM9JwO3kqtk9NmgQIWAVxOmFOcfIN+9tnbP S9ZP/zagksJXrBV/lCprzNg5lJg8Er++S4vdz+cBGZMy+ZKL3+bi/i2hZnmF+HxOYD DOgsJF7PLE16dGeQRd/aX9nvQ53Wc+JZOusyd+M4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= , Marcel Holtmann Subject: [PATCH 5.7 303/376] Bluetooth: hci_bcm: fix freeing not-requested IRQ Date: Fri, 19 Jun 2020 16:33:41 +0200 Message-Id: <20200619141724.682769105@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200619141710.350494719@linuxfoundation.org> References: <20200619141710.350494719@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Michał Mirosław commit 81bd5d0c62437c02caac6b3f942fcda874063cb0 upstream. When BT module can't be initialized, but it has an IRQ, unloading the driver WARNs when trying to free not-yet-requested IRQ. Fix it by noting whether the IRQ was requested. WARNING: CPU: 2 PID: 214 at kernel/irq/devres.c:144 devm_free_irq+0x49/0x4ca [...] WARNING: CPU: 2 PID: 214 at kernel/irq/manage.c:1746 __free_irq+0x8b/0x27c Trying to free already-free IRQ 264 Modules linked in: hci_uart(-) btbcm bluetooth ecdh_generic ecc libaes CPU: 2 PID: 214 Comm: rmmod Tainted: G W 5.6.1mq-00044-ga5f9ea098318-dirty #928 [...] [] (devm_free_irq) from [] (bcm_close+0x97/0x118 [hci_uart]) [] (bcm_close [hci_uart]) from [] (hci_uart_unregister_device+0x33/0x3c [hci_uart]) [] (hci_uart_unregister_device [hci_uart]) from [] (serdev_drv_remove+0x13/0x20) [] (serdev_drv_remove) from [] (device_release_driver_internal+0x97/0x118) [] (device_release_driver_internal) from [] (driver_detach+0x2f/0x58) [] (driver_detach) from [] (bus_remove_driver+0x41/0x94) [] (bus_remove_driver) from [] (bcm_deinit+0x1b/0x740 [hci_uart]) [] (bcm_deinit [hci_uart]) from [] (hci_uart_exit+0x13/0x30 [hci_uart]) [] (hci_uart_exit [hci_uart]) from [] (sys_delete_module+0x109/0x1d0) [] (sys_delete_module) from [] (ret_fast_syscall+0x1/0x5a) [...] Cc: stable@vger.kernel.org Fixes: 6cc4396c8829 ("Bluetooth: hci_bcm: Add wake-up capability") Signed-off-by: Michał Mirosław Signed-off-by: Marcel Holtmann Signed-off-by: Greg Kroah-Hartman --- drivers/bluetooth/hci_bcm.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- a/drivers/bluetooth/hci_bcm.c +++ b/drivers/bluetooth/hci_bcm.c @@ -118,6 +118,7 @@ struct bcm_device { u32 oper_speed; int irq; bool irq_active_low; + bool irq_acquired; #ifdef CONFIG_PM struct hci_uart *hu; @@ -333,6 +334,8 @@ static int bcm_request_irq(struct bcm_da goto unlock; } + bdev->irq_acquired = true; + device_init_wakeup(bdev->dev, true); pm_runtime_set_autosuspend_delay(bdev->dev, @@ -514,7 +517,7 @@ static int bcm_close(struct hci_uart *hu } if (bdev) { - if (IS_ENABLED(CONFIG_PM) && bdev->irq > 0) { + if (IS_ENABLED(CONFIG_PM) && bdev->irq_acquired) { devm_free_irq(bdev->dev, bdev->irq, bdev); device_init_wakeup(bdev->dev, false); pm_runtime_disable(bdev->dev);