Commit 4488c99b authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-resources', 'acpi-ac', 'acpi-scan' and 'acpi-battery' 

* acpi-resources:
  ACPI / resources: only reject zero length resources based at address zero

* acpi-ac:
  Revert "ACPI / AC: Remove AC's proc directory."

* acpi-scan:
  ACPI / PNP: add soc_button_array device ID to PNP IDs list

* acpi-battery:
  ACPI / battery: fix wrong value of capacity_now reported when fully charged
  ACPI / battery: Retry to get battery information if failed during probing
parents 867f9d46 e63f6e28 c128c776 232de514

drivers/acpi/ac.c

+128 −2
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ 
#include <linux/types.h>

#include <linux/dmi.h>

#include <linux/delay.h>

#ifdef CONFIG_ACPI_PROCFS_POWER

#include <linux/proc_fs.h>

#include <linux/seq_file.h>

#endif

#include <linux/platform_device.h>

#include <linux/power_supply.h>

#include <linux/acpi.h>
@@ -52,6 +56,7 @@ MODULE_AUTHOR("Paul Diefenbaugh"); 
MODULE_DESCRIPTION("ACPI AC Adapter Driver");

MODULE_LICENSE("GPL");





static int acpi_ac_add(struct acpi_device *device);

static int acpi_ac_remove(struct acpi_device *device);

static void acpi_ac_notify(struct acpi_device *device, u32 event);
@@ -67,6 +72,13 @@ static int acpi_ac_resume(struct device *dev); 
#endif

static SIMPLE_DEV_PM_OPS(acpi_ac_pm, NULL, acpi_ac_resume);



#ifdef CONFIG_ACPI_PROCFS_POWER

extern struct proc_dir_entry *acpi_lock_ac_dir(void);

extern void *acpi_unlock_ac_dir(struct proc_dir_entry *acpi_ac_dir);

static int acpi_ac_open_fs(struct inode *inode, struct file *file);

#endif





static int ac_sleep_before_get_state_ms;



static struct acpi_driver acpi_ac_driver = {
@@ -91,6 +103,16 @@ struct acpi_ac { 


#define to_acpi_ac(x) container_of(x, struct acpi_ac, charger)



#ifdef CONFIG_ACPI_PROCFS_POWER

static const struct file_operations acpi_ac_fops = {

	.owner = THIS_MODULE,

	.open = acpi_ac_open_fs,

	.read = seq_read,

	.llseek = seq_lseek,

	.release = single_release,

};

#endif



/* --------------------------------------------------------------------------

                               AC Adapter Management

   -------------------------------------------------------------------------- */
@@ -143,6 +165,83 @@ static enum power_supply_property ac_props[] = { 
	POWER_SUPPLY_PROP_ONLINE,

};



#ifdef CONFIG_ACPI_PROCFS_POWER

/* --------------------------------------------------------------------------

                              FS Interface (/proc)

   -------------------------------------------------------------------------- */



static struct proc_dir_entry *acpi_ac_dir;



static int acpi_ac_seq_show(struct seq_file *seq, void *offset)

{

	struct acpi_ac *ac = seq->private;





	if (!ac)

		return 0;



	if (acpi_ac_get_state(ac)) {

		seq_puts(seq, "ERROR: Unable to read AC Adapter state\n");

		return 0;

	}



	seq_puts(seq, "state:                   ");

	switch (ac->state) {

	case ACPI_AC_STATUS_OFFLINE:

		seq_puts(seq, "off-line\n");

		break;

	case ACPI_AC_STATUS_ONLINE:

		seq_puts(seq, "on-line\n");

		break;

	default:

		seq_puts(seq, "unknown\n");

		break;

	}



	return 0;

}



static int acpi_ac_open_fs(struct inode *inode, struct file *file)

{

	return single_open(file, acpi_ac_seq_show, PDE_DATA(inode));

}



static int acpi_ac_add_fs(struct acpi_ac *ac)

{

	struct proc_dir_entry *entry = NULL;



	printk(KERN_WARNING PREFIX "Deprecated procfs I/F for AC is loaded,"

			" please retry with CONFIG_ACPI_PROCFS_POWER cleared\n");

	if (!acpi_device_dir(ac->device)) {

		acpi_device_dir(ac->device) =

			proc_mkdir(acpi_device_bid(ac->device), acpi_ac_dir);

		if (!acpi_device_dir(ac->device))

			return -ENODEV;

	}



	/* 'state' [R] */

	entry = proc_create_data(ACPI_AC_FILE_STATE,

				 S_IRUGO, acpi_device_dir(ac->device),

				 &acpi_ac_fops, ac);

	if (!entry)

		return -ENODEV;

	return 0;

}



static int acpi_ac_remove_fs(struct acpi_ac *ac)

{



	if (acpi_device_dir(ac->device)) {

		remove_proc_entry(ACPI_AC_FILE_STATE,

				  acpi_device_dir(ac->device));

		remove_proc_entry(acpi_device_bid(ac->device), acpi_ac_dir);

		acpi_device_dir(ac->device) = NULL;

	}



	return 0;

}

#endif



/* --------------------------------------------------------------------------

                                   Driver Model

   -------------------------------------------------------------------------- */
@@ -243,6 +342,11 @@ static int acpi_ac_add(struct acpi_device *device) 
		goto end;



	ac->charger.name = acpi_device_bid(device);

#ifdef CONFIG_ACPI_PROCFS_POWER

	result = acpi_ac_add_fs(ac);

	if (result)

		goto end;

#endif

	ac->charger.type = POWER_SUPPLY_TYPE_MAINS;

	ac->charger.properties = ac_props;

	ac->charger.num_properties = ARRAY_SIZE(ac_props);
@@ -258,8 +362,12 @@ static int acpi_ac_add(struct acpi_device *device) 
	ac->battery_nb.notifier_call = acpi_ac_battery_notify;

	register_acpi_notifier(&ac->battery_nb);

end:

	if (result)

	if (result) {

#ifdef CONFIG_ACPI_PROCFS_POWER

		acpi_ac_remove_fs(ac);

#endif

		kfree(ac);

	}



	dmi_check_system(ac_dmi_table);

	return result;
@@ -303,6 +411,10 @@ static int acpi_ac_remove(struct acpi_device *device) 
		power_supply_unregister(&ac->charger);

	unregister_acpi_notifier(&ac->battery_nb);



#ifdef CONFIG_ACPI_PROCFS_POWER

	acpi_ac_remove_fs(ac);

#endif



	kfree(ac);



	return 0;
@@ -315,9 +427,20 @@ static int __init acpi_ac_init(void) 
	if (acpi_disabled)

		return -ENODEV;



#ifdef CONFIG_ACPI_PROCFS_POWER

	acpi_ac_dir = acpi_lock_ac_dir();

	if (!acpi_ac_dir)

		return -ENODEV;

#endif





	result = acpi_bus_register_driver(&acpi_ac_driver);

	if (result < 0)

	if (result < 0) {

#ifdef CONFIG_ACPI_PROCFS_POWER

		acpi_unlock_ac_dir(acpi_ac_dir);

#endif

		return -ENODEV;

	}



	return 0;

}
@@ -325,6 +448,9 @@ static int __init acpi_ac_init(void) 
static void __exit acpi_ac_exit(void)

{

	acpi_bus_unregister_driver(&acpi_ac_driver);

#ifdef CONFIG_ACPI_PROCFS_POWER

	acpi_unlock_ac_dir(acpi_ac_dir);

#endif

}

module_init(acpi_ac_init);

module_exit(acpi_ac_exit);

drivers/acpi/acpi_pnp.c

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#include <linux/module.h>



static const struct acpi_device_id acpi_pnp_device_ids[] = {

	/* soc_button_array */

	{"PNP0C40"},

	/* pata_isapnp */

	{"PNP0600"},		/* Generic ESDI/IDE/ATA compatible hard disk controller */

	/* floppy */

drivers/acpi/battery.c

+40 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/delay.h>

#include <linux/slab.h>

#include <linux/suspend.h>

#include <linux/delay.h>

#include <asm/unaligned.h>



#ifdef CONFIG_ACPI_PROCFS_POWER
@@ -534,6 +535,20 @@ static int acpi_battery_get_state(struct acpi_battery *battery) 
			" invalid.\n");

	}



	/*

	 * When fully charged, some batteries wrongly report

	 * capacity_now = design_capacity instead of = full_charge_capacity

	 */

	if (battery->capacity_now > battery->full_charge_capacity

	    && battery->full_charge_capacity != ACPI_BATTERY_VALUE_UNKNOWN) {

		battery->capacity_now = battery->full_charge_capacity;

		if (battery->capacity_now != battery->design_capacity)

			printk_once(KERN_WARNING FW_BUG

				"battery: reported current charge level (%d) "

				"is higher than reported maximum charge level (%d).\n",

				battery->capacity_now, battery->full_charge_capacity);

	}



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

	    && battery->capacity_now >= 0 && battery->capacity_now <= 100)

		battery->capacity_now = (battery->capacity_now *
@@ -1151,6 +1166,28 @@ static struct dmi_system_id bat_dmi_table[] = { 
	{},

};



/*

 * Some machines'(E,G Lenovo Z480) ECs are not stable

 * during boot up and this causes battery driver fails to be

 * probed due to failure of getting battery information

 * from EC sometimes. After several retries, the operation

 * may work. So add retry code here and 20ms sleep between

 * every retries.

 */

static int acpi_battery_update_retry(struct acpi_battery *battery)

{

	int retry, ret;



	for (retry = 5; retry; retry--) {

		ret = acpi_battery_update(battery, false);

		if (!ret)

			break;



		msleep(20);

	}

	return ret;

}



static int acpi_battery_add(struct acpi_device *device)

{

	int result = 0;
@@ -1169,9 +1206,11 @@ static int acpi_battery_add(struct acpi_device *device) 
	mutex_init(&battery->sysfs_lock);

	if (acpi_has_method(battery->device->handle, "_BIX"))

		set_bit(ACPI_BATTERY_XINFO_PRESENT, &battery->flags);

	result = acpi_battery_update(battery, false);



	result = acpi_battery_update_retry(battery);

	if (result)

		goto fail;



#ifdef CONFIG_ACPI_PROCFS_POWER

	result = acpi_battery_add_fs(device);

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE