Commit 918317ab authored Feb 13, 2022 by Maximilian Luz Committed by Greg Kroah-Hartman Mar 28, 2022

ACPI: battery: Add device HID and quirk for Microsoft Surface Go 3



commit 7dacee0b9efc8bd061f097b1a8d4daa6591af0c6 upstream.

For some reason, the Microsoft Surface Go 3 uses the standard ACPI
interface for battery information, but does not use the standard PNP0C0A
HID. Instead it uses MSHW0146 as identifier. Add that ID to the driver
as this seems to work well.

Additionally, the power state is not updated immediately after the AC
has been (un-)plugged, so add the respective quirk for that.

Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 783d2ec3

drivers/acpi/battery.c

+12 −0

Original line number	Original line	Diff line number	Diff line
	@@ -90,6 +90,10 @@ extern void acpi_unlock_battery_dir(struct proc_dir_entry acpi_battery_dir);

	static const struct acpi_device_id battery_device_ids[] = {		static const struct acpi_device_id battery_device_ids[] = {
	{"PNP0C0A", 0},		{"PNP0C0A", 0},

			/* Microsoft Surface Go 3 */
			{"MSHW0146", 0},

	{"", 0},		{"", 0},
	};		};

	@@ -1416,6 +1420,14 @@ static const struct dmi_system_id bat_dmi_table[] __initconst = {
	DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),		DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad"),
	},		},
	},		},
			{
			/* Microsoft Surface Go 3 */
			.callback = battery_notification_delay_quirk,
			.matches = {
			DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"),
			DMI_MATCH(DMI_PRODUCT_NAME, "Surface Go 3"),
			},
			},
	{},		{},
	};		};