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

Commit 381eaca5 authored by Jiaxun Yang's avatar Jiaxun Yang Committed by Greg Kroah-Hartman
Browse files

platform/x86: thinkpad_acpi: Disable Bluetooth for some machines 



commit f7db839fccf087664e5587966220821289b6a9cb upstream.

Some AMD based ThinkPads have a firmware bug that calling
"GBDC" will cause Bluetooth on Intel wireless cards blocked.

Probe these models by DMI match and disable Bluetooth subdriver
if specified Intel wireless card exist.

Cc: stable <stable@vger.kernel.org> # 4.14+
Signed-off-by: default avatarJiaxun Yang <jiaxun.yang@flygoat.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent efe6802e

drivers/platform/x86/thinkpad_acpi.c

+70 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ 
#include <linux/jiffies.h>

#include <linux/workqueue.h>

#include <linux/acpi.h>

#include <linux/pci_ids.h>

#include <linux/pci.h>

#include <linux/power_supply.h>

#include <linux/thinkpad_acpi.h>

#include <sound/core.h>
@@ -4496,6 +4496,74 @@ static void bluetooth_exit(void) 
	bluetooth_shutdown();

}



static const struct dmi_system_id bt_fwbug_list[] __initconst = {

	{

		.ident = "ThinkPad E485",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_BOARD_NAME, "20KU"),

		},

	},

	{

		.ident = "ThinkPad E585",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_BOARD_NAME, "20KV"),

		},

	},

	{

		.ident = "ThinkPad A285 - 20MW",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_BOARD_NAME, "20MW"),

		},

	},

	{

		.ident = "ThinkPad A285 - 20MX",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_BOARD_NAME, "20MX"),

		},

	},

	{

		.ident = "ThinkPad A485 - 20MU",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_BOARD_NAME, "20MU"),

		},

	},

	{

		.ident = "ThinkPad A485 - 20MV",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_BOARD_NAME, "20MV"),

		},

	},

	{}

};



static const struct pci_device_id fwbug_cards_ids[] __initconst = {

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x24F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x24FD) },

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2526) },

	{}

};





static int __init have_bt_fwbug(void)

{

	/*

	 * Some AMD based ThinkPads have a firmware bug that calling

	 * "GBDC" will cause bluetooth on Intel wireless cards blocked

	 */

	if (dmi_check_system(bt_fwbug_list) && pci_dev_present(fwbug_cards_ids)) {

		vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_RFKILL,

			FW_BUG "disable bluetooth subdriver for Intel cards\n");

		return 1;

	} else

		return 0;

}



static int __init bluetooth_init(struct ibm_init_struct *iibm)

{

	int res;
@@ -4508,7 +4576,7 @@ static int __init bluetooth_init(struct ibm_init_struct *iibm) 


	/* bluetooth not supported on 570, 600e/x, 770e, 770x, A21e, A2xm/p,

	   G4x, R30, R31, R40e, R50e, T20-22, X20-21 */

	tp_features.bluetooth = hkey_handle &&

	tp_features.bluetooth = !have_bt_fwbug() && hkey_handle &&

	    acpi_evalf(hkey_handle, &status, "GBDC", "qd");



	vdbg_printk(TPACPI_DBG_INIT | TPACPI_DBG_RFKILL,