Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4aa9ef8a authored by Hans de Goede's avatar Hans de Goede Committed by Greg Kroah-Hartman
Browse files

Bluetooth: btusb: Only check needs_reset_resume DMI table for QCA rome chipsets 

commit fc54910280eb38bde923cdf0898e74687d8e6989 upstream.

Jeremy Cline correctly points out in rhbz#1514836 that a device where the
QCA rome chipset needs the USB_QUIRK_RESET_RESUME quirk, may also ship
with a different wifi/bt chipset in some configurations.

If that is the case then we are needlessly penalizing those other chipsets
with a reset-resume quirk, typically causing 0.4W extra power use because
this disables runtime-pm.

This commit moves the DMI table check to a btusb_check_needs_reset_resume()
helper (so that we can easily also call it for other chipsets) and calls
this new helper only for QCA_ROME chipsets for now.

BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1514836


Cc: stable@vger.kernel.org
Cc: Jeremy Cline <jcline@redhat.com>
Suggested-by: default avatarJeremy Cline <jcline@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4fcd0333

drivers/bluetooth/btusb.c

+7 −3
Original line number Diff line number Diff line
@@ -2902,6 +2902,12 @@ static int btusb_config_oob_wake(struct hci_dev *hdev) 
}

#endif



static void btusb_check_needs_reset_resume(struct usb_interface *intf)

{

	if (dmi_check_system(btusb_needs_reset_resume_table))

		interface_to_usbdev(intf)->quirks |= USB_QUIRK_RESET_RESUME;

}



static int btusb_probe(struct usb_interface *intf,

		       const struct usb_device_id *id)

{
@@ -3037,9 +3043,6 @@ static int btusb_probe(struct usb_interface *intf, 
	hdev->send   = btusb_send_frame;

	hdev->notify = btusb_notify;



	if (dmi_check_system(btusb_needs_reset_resume_table))

		interface_to_usbdev(intf)->quirks |= USB_QUIRK_RESET_RESUME;



#ifdef CONFIG_PM

	err = btusb_config_oob_wake(hdev);

	if (err)
@@ -3126,6 +3129,7 @@ static int btusb_probe(struct usb_interface *intf, 
	if (id->driver_info & BTUSB_QCA_ROME) {

		data->setup_on_usb = btusb_setup_qca;

		hdev->set_bdaddr = btusb_set_bdaddr_ath3012;

		btusb_check_needs_reset_resume(intf);

	}



#ifdef CONFIG_BT_HCIBTUSB_RTL