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

Commit 5001f861 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
  ACPI: EC: Don't parse DSDT for EC early init on Compal
  ACPI: EC: Rewrite DMI checks
  ACPI: dock: fix "sibiling" typo
  ACPI: kill overly verbose "throttling states" log messages
  ACPI: Fix bound checks for copy_from_user in the acpi /proc code
  ACPI: fix bus scanning memory leaks
  ACPI: EC: Restart command even if no interrupts from EC
  sony-laptop: Don't unregister the SPIC driver if it wasn't registered
  sony-laptop: remove _INI call at init time
  sony-laptop: SPIC unset IRQF_SHARED, set IRQF_DISABLED
  sony-laptop: remove device_ctrl and the SPIC mini drivers
parents 663cc813 c7db7ba5

drivers/acpi/dock.c

+8 −8
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct dock_station { 
	struct list_head dependent_devices;

	struct list_head hotplug_devices;



	struct list_head sibiling;

	struct list_head sibling;

	struct platform_device *dock_device;

};

static LIST_HEAD(dock_stations);
@@ -275,7 +275,7 @@ int is_dock_device(acpi_handle handle) 


	if (is_dock(handle))

		return 1;

	list_for_each_entry(dock_station, &dock_stations, sibiling) {

	list_for_each_entry(dock_station, &dock_stations, sibling) {

		if (find_dock_dependent_device(dock_station, handle))

			return 1;

	}
@@ -619,7 +619,7 @@ register_hotplug_dock_device(acpi_handle handle, struct acpi_dock_ops *ops, 
	 * make sure this handle is for a device dependent on the dock,

	 * this would include the dock station itself

	 */

	list_for_each_entry(dock_station, &dock_stations, sibiling) {

	list_for_each_entry(dock_station, &dock_stations, sibling) {

		/*

		 * An ATA bay can be in a dock and itself can be ejected

		 * seperately, so there are two 'dock stations' which need the
@@ -651,7 +651,7 @@ void unregister_hotplug_dock_device(acpi_handle handle) 
	if (!dock_station_count)

		return;



	list_for_each_entry(dock_station, &dock_stations, sibiling) {

	list_for_each_entry(dock_station, &dock_stations, sibling) {

		dd = find_dock_dependent_device(dock_station, handle);

		if (dd)

			dock_del_hotplug_device(dock_station, dd);
@@ -787,7 +787,7 @@ static int acpi_dock_notifier_call(struct notifier_block *this, 
	if (event != ACPI_NOTIFY_BUS_CHECK && event != ACPI_NOTIFY_DEVICE_CHECK

	   && event != ACPI_NOTIFY_EJECT_REQUEST)

		return 0;

	list_for_each_entry(dock_station, &dock_stations, sibiling) {

	list_for_each_entry(dock_station, &dock_stations, sibling) {

		if (dock_station->handle == handle) {

			struct dock_data *dock_data;
@@ -958,7 +958,7 @@ static int dock_add(acpi_handle handle) 
	dock_station->last_dock_time = jiffies - HZ;

	INIT_LIST_HEAD(&dock_station->dependent_devices);

	INIT_LIST_HEAD(&dock_station->hotplug_devices);

	INIT_LIST_HEAD(&dock_station->sibiling);

	INIT_LIST_HEAD(&dock_station->sibling);

	spin_lock_init(&dock_station->dd_lock);

	mutex_init(&dock_station->hp_lock);

	ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list);
@@ -1044,7 +1044,7 @@ static int dock_add(acpi_handle handle) 
	add_dock_dependent_device(dock_station, dd);



	dock_station_count++;

	list_add(&dock_station->sibiling, &dock_stations);

	list_add(&dock_station->sibling, &dock_stations);

	return 0;



dock_add_err_unregister:
@@ -1149,7 +1149,7 @@ static void __exit dock_exit(void) 
	struct dock_station *tmp;



	unregister_acpi_bus_notifier(&dock_acpi_notifier);

	list_for_each_entry_safe(dock_station, tmp, &dock_stations, sibiling)

	list_for_each_entry_safe(dock_station, tmp, &dock_stations, sibling)

		dock_remove(dock_station);

}

drivers/acpi/ec.c

+47 −9
Original line number Diff line number Diff line
@@ -119,6 +119,8 @@ static struct acpi_ec { 
} *boot_ec, *first_ec;



static int EC_FLAGS_MSI; /* Out-of-spec MSI controller */

static int EC_FLAGS_VALIDATE_ECDT; /* ASUStec ECDTs need to be validated */

static int EC_FLAGS_SKIP_DSDT_SCAN; /* Not all BIOS survive early DSDT scan */



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

                             Transaction Management
@@ -232,10 +234,8 @@ static int ec_poll(struct acpi_ec *ec) 
			}

			advance_transaction(ec, acpi_ec_read_status(ec));

		} while (time_before(jiffies, delay));

		if (!ec->curr->irq_count ||

		    (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF))

		if (acpi_ec_read_status(ec) & ACPI_EC_FLAG_IBF)

			break;

		/* try restart command if we get any false interrupts */

		pr_debug(PREFIX "controller reset, restart transaction\n");

		spin_lock_irqsave(&ec->curr_lock, flags);

		start_transaction(ec);
@@ -899,6 +899,44 @@ static const struct acpi_device_id ec_device_ids[] = { 
	{"", 0},

};



/* Some BIOS do not survive early DSDT scan, skip it */

static int ec_skip_dsdt_scan(const struct dmi_system_id *id)

{

	EC_FLAGS_SKIP_DSDT_SCAN = 1;

	return 0;

}



/* ASUStek often supplies us with broken ECDT, validate it */

static int ec_validate_ecdt(const struct dmi_system_id *id)

{

	EC_FLAGS_VALIDATE_ECDT = 1;

	return 0;

}



/* MSI EC needs special treatment, enable it */

static int ec_flag_msi(const struct dmi_system_id *id)

{

	EC_FLAGS_MSI = 1;

	EC_FLAGS_VALIDATE_ECDT = 1;

	return 0;

}



static struct dmi_system_id __initdata ec_dmi_table[] = {

	{

	ec_skip_dsdt_scan, "Compal JFL92", {

	DMI_MATCH(DMI_BIOS_VENDOR, "COMPAL"),

	DMI_MATCH(DMI_BOARD_NAME, "JFL92") }, NULL},

	{

	ec_flag_msi, "MSI hardware", {

	DMI_MATCH(DMI_BIOS_VENDOR, "Micro-Star"),

	DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-Star") }, NULL},

	{

	ec_validate_ecdt, "ASUS hardware", {

	DMI_MATCH(DMI_BIOS_VENDOR, "ASUS") }, NULL},

	{},

};





int __init acpi_ec_ecdt_probe(void)

{

	acpi_status status;
@@ -911,11 +949,7 @@ int __init acpi_ec_ecdt_probe(void) 
	/*

	 * Generate a boot ec context

	 */

	if (dmi_name_in_vendors("Micro-Star") ||

	    dmi_name_in_vendors("Notebook")) {

		pr_info(PREFIX "Enabling special treatment for EC from MSI.\n");

		EC_FLAGS_MSI = 1;

	}

	dmi_check_system(ec_dmi_table);

	status = acpi_get_table(ACPI_SIG_ECDT, 1,

				(struct acpi_table_header **)&ecdt_ptr);

	if (ACPI_SUCCESS(status)) {
@@ -926,7 +960,7 @@ int __init acpi_ec_ecdt_probe(void) 
		boot_ec->handle = ACPI_ROOT_OBJECT;

		acpi_get_handle(ACPI_ROOT_OBJECT, ecdt_ptr->id, &boot_ec->handle);

		/* Don't trust ECDT, which comes from ASUSTek */

		if (!dmi_name_in_vendors("ASUS") && EC_FLAGS_MSI == 0)

		if (!EC_FLAGS_VALIDATE_ECDT)

			goto install;

		saved_ec = kmalloc(sizeof(struct acpi_ec), GFP_KERNEL);

		if (!saved_ec)
@@ -934,6 +968,10 @@ int __init acpi_ec_ecdt_probe(void) 
		memcpy(saved_ec, boot_ec, sizeof(struct acpi_ec));

	/* fall through */

	}



	if (EC_FLAGS_SKIP_DSDT_SCAN)

		return -ENODEV;



	/* This workaround is needed only on some broken machines,

	 * which require early EC, but fail to provide ECDT */

	printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");

drivers/acpi/proc.c

+2 −0
Original line number Diff line number Diff line
@@ -398,6 +398,8 @@ acpi_system_write_wakeup_device(struct file *file, 


	if (len > 4)

		len = 4;

	if (len < 0)

		return -EFAULT;



	if (copy_from_user(strbuf, buffer, len))

		return -EFAULT;

drivers/acpi/processor_core.c

+0 −7
Original line number Diff line number Diff line
@@ -863,13 +863,6 @@ static int acpi_processor_add(struct acpi_device *device) 
		goto err_remove_sysfs;

	}



	if (pr->flags.throttling) {

		printk(KERN_INFO PREFIX "%s [%s] (supports",

		       acpi_device_name(device), acpi_device_bid(device));

		printk(" %d throttling states", pr->throttling.state_count);

		printk(")\n");

	}



	return 0;



err_remove_sysfs:

drivers/acpi/scan.c

+2 −5
Original line number Diff line number Diff line
@@ -1052,6 +1052,8 @@ static void acpi_device_set_id(struct acpi_device *device) 
			device->flags.bus_address = 1;

		}



		kfree(info);



		/*

		 * Some devices don't reliably have _HIDs & _CIDs, so add

		 * synthetic HIDs to make sure drivers can find them.
@@ -1325,13 +1327,8 @@ static int acpi_bus_scan(acpi_handle handle, struct acpi_bus_ops *ops, 
			 struct acpi_device **child)

{

	acpi_status status;

	struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };

	void *device = NULL;



	acpi_get_name(handle, ACPI_FULL_PATHNAME, &buffer);

	printk(KERN_INFO PREFIX "Enumerating devices from [%s]\n",

	       (char *) buffer.pointer);



	status = acpi_bus_check_add(handle, 0, ops, &device);

	if (ACPI_SUCCESS(status))

		acpi_walk_namespace(ACPI_TYPE_ANY, handle, ACPI_UINT32_MAX,