On Thu, Jan 02, 2014 at 03:37:57PM +0800, Lan Tianyu wrote:
> The aml method _BIX of NEC LZ750/LS returns a broken package which
> skip the first member "Revision" according ACPI 5.0 spec Table 10-234.
>
> This patch is to add a quirk for this machine to skip member "Revision"
> during parsing _BIX returned package.
>
> Reported-and-tested-by: Francisco Castro <f...@adinet.com.uy>
> Reference: https://bugzilla.kernel.org/show_bug.cgi?id=67351
> Cc: 3.8+ <sta...@vger.kernel.org>
> Signed-off-by: Lan Tianyu <tianyu....@intel.com>
> ---
> drivers/acpi/battery.c | 28 +++++++++++++++++++++++++++-
> 1 file changed, 27 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c
> index fbf1ace..3d64a87 100644
> --- a/drivers/acpi/battery.c
> +++ b/drivers/acpi/battery.c
> @@ -62,6 +62,7 @@ MODULE_AUTHOR("Alexey Starikovskiy
> <astarikovs...@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,24 @@ static int battery_notify(struct notifier_block *nb,
> return 0;
> }
>
> +static int battery_bix_package_quirk(const struct dmi_system_id *id)
> +{
> + battery_bix_broken_package = 1;
> + return 0;
> +}
> +
Do you really need this callback? Why don't you just do:
if (dmi_check_system(bat_dmi_table))
battery_bix_broken_package = 1;
> +static struct dmi_system_id bat_dmi_table[] = {
> + {
> + .callback = battery_bix_package_quirk,
> + .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 +870,8 @@ static void __init acpi_battery_init_async(void *unused,
> async_cookie_t cookie)
> {
> if (acpi_disabled)
> return;
> +
> + dmi_check_system(bat_dmi_table);
> acpi_bus_register_driver(&acpi_battery_driver);
> }
>
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majord...@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
Leandro Dorileo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
