Commit 77410baf authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-battery' and 'pm-cpufreq' 

* acpi-battery:
  ACPI / Battery: Add a _BIX quirk for NEC LZ750/LS

* pm-cpufreq:
  intel_pstate: Add X86_FEATURE_APERFMPERF to cpu match parameters.
parents c8d15076 a90b4038 6cbd7ee1

drivers/acpi/battery.c

+21 −1
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ MODULE_AUTHOR("Alexey Starikovskiy <astarikovskiy@suse.de>"); 
MODULE_DESCRIPTION("ACPI Battery Driver");

MODULE_LICENSE("GPL");



static int battery_bix_broken_package;

static unsigned int cache_time = 1000;

module_param(cache_time, uint, 0644);

MODULE_PARM_DESC(cache_time, "cache time in milliseconds");
@@ -416,7 +417,12 @@ static int acpi_battery_get_info(struct acpi_battery *battery) 
		ACPI_EXCEPTION((AE_INFO, status, "Evaluating %s", name));

		return -ENODEV;

	}

	if (test_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags))



	if (battery_bix_broken_package)

		result = extract_package(battery, buffer.pointer,

				extended_info_offsets + 1,

				ARRAY_SIZE(extended_info_offsets) - 1);

	else if (test_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags))

		result = extract_package(battery, buffer.pointer,

				extended_info_offsets,

				ARRAY_SIZE(extended_info_offsets));
@@ -754,6 +760,17 @@ static int battery_notify(struct notifier_block *nb, 
	return 0;

}



static struct dmi_system_id bat_dmi_table[] = {

	{

		.ident = "NEC LZ750/LS",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "NEC"),

			DMI_MATCH(DMI_PRODUCT_NAME, "PC-LZ750LS"),

		},

	},

	{},

};



static int acpi_battery_add(struct acpi_device *device)

{

	int result = 0;
@@ -846,6 +863,9 @@ static void __init acpi_battery_init_async(void *unused, async_cookie_t cookie) 
{

	if (acpi_disabled)

		return;



	if (dmi_check_system(bat_dmi_table))

		battery_bix_broken_package = 1;

	acpi_bus_register_driver(&acpi_battery_driver);

}

drivers/cpufreq/intel_pstate.c

+2 −1
Original line number Diff line number Diff line
@@ -581,7 +581,8 @@ static void intel_pstate_timer_func(unsigned long __data) 
}



#define ICPU(model, policy) \

	{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_ANY, (unsigned long)&policy }

	{ X86_VENDOR_INTEL, 6, model, X86_FEATURE_APERFMPERF,\

			(unsigned long)&policy }



static const struct x86_cpu_id intel_pstate_cpu_ids[] = {

	ICPU(0x2a, core_params),