Commit 883a2dfd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm+acpi-4.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management and ACPI updates from Rafael Wysocki:
 "These are fixes on top of the previous PM+ACPI pull requests
  (including one fix for a 4.1 regression) and two commits adding
  _CLS-based device enumeration support to the ACPI core and the ATA
  subsystem that waited for the latest ACPICA changes to be merged.

  Specifics:

   - Fix for an ACPI resources management regression introduced during
     the 4.1 cycle (that unfortunately went into -stable) effectively
     reverting the bad commit along with the recent fixups on top of it
     and using an alternative approach to address the underlying issue
     (Rafael J Wysocki).

   - Fix for a memory leak and an incorrect return value in an error
     code path in the ACPI LPSS (Low-Power Subsystem) driver (Rafael J
     Wysocki).

   - Fix for a leftover dangling pointer in an error code path in the
     new wakeup IRQ support code (Rafael J Wysocki).

   - Fix to prevent infinite loops (due to errors in other places) from
     happening in the core generic PM domains support code (Geert
     Uytterhoeven).

   - Hibernation documentation update/clarification (Uwe Geuder).

   - Support for _CLS-based device enumeration in the ACPI core and in
     the ATA subsystem (Suravee Suthikulpanit)"

* tag 'pm+acpi-4.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / wakeirq: Avoid setting power.wakeirq too hastily
  ata: ahci_platform: Add ACPI _CLS matching
  ACPI / scan: Add support for ACPI _CLS device matching
  PM / hibernate: clarify resume documentation
  PM / Domains: Avoid infinite loops in attach/detach code
  ACPI / LPSS: Fix up acpi_lpss_create_device()
  ACPI / PNP: Reserve ACPI resources at the fs_initcall_sync stage
parents 331c5841 8076ca48

Documentation/power/swsusp.txt

+11 −2
Original line number Diff line number Diff line
@@ -410,8 +410,17 @@ Documentation/usb/persist.txt. 


Q: Can I suspend-to-disk using a swap partition under LVM?



A: No. You can suspend successfully, but you'll not be able to

resume. uswsusp should be able to work with LVM. See suspend.sf.net.

A: Yes and No.  You can suspend successfully, but the kernel will not be able

to resume on its own.  You need an initramfs that can recognize the resume

situation, activate the logical volume containing the swap volume (but not

touch any filesystems!), and eventually call



echo -n "$major:$minor" > /sys/power/resume



where $major and $minor are the respective major and minor device numbers of

the swap volume.



uswsusp works with LVM, too.  See http://suspend.sourceforge.net/



Q: I upgraded the kernel from 2.6.15 to 2.6.16. Both kernels were

compiled with the similar configuration files. Anyway I found that

drivers/acpi/acpi_lpss.c

+5 −2
Original line number Diff line number Diff line
@@ -352,13 +352,16 @@ static int acpi_lpss_create_device(struct acpi_device *adev, 
				pdata->mmio_size = resource_size(rentry->res);

			pdata->mmio_base = ioremap(rentry->res->start,

						   pdata->mmio_size);

			if (!pdata->mmio_base)

				goto err_out;

			break;

		}



	acpi_dev_free_resource_list(&resource_list);



	if (!pdata->mmio_base) {

		ret = -ENOMEM;

		goto err_out;

	}



	pdata->dev_desc = dev_desc;



	if (dev_desc->setup)

drivers/acpi/osl.c

+9 −3
Original line number Diff line number Diff line
@@ -175,10 +175,14 @@ static void __init acpi_request_region (struct acpi_generic_address *gas, 
	if (!addr || !length)

		return;



	acpi_reserve_region(addr, length, gas->space_id, 0, desc);

	/* Resources are never freed */

	if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_IO)

		request_region(addr, length, desc);

	else if (gas->space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)

		request_mem_region(addr, length, desc);

}



static void __init acpi_reserve_resources(void)

static int __init acpi_reserve_resources(void)

{

	acpi_request_region(&acpi_gbl_FADT.xpm1a_event_block, acpi_gbl_FADT.pm1_event_length,

		"ACPI PM1a_EVT_BLK");
@@ -207,7 +211,10 @@ static void __init acpi_reserve_resources(void) 
	if (!(acpi_gbl_FADT.gpe1_block_length & 0x1))

		acpi_request_region(&acpi_gbl_FADT.xgpe1_block,

			       acpi_gbl_FADT.gpe1_block_length, "ACPI GPE1_BLK");



	return 0;

}

fs_initcall_sync(acpi_reserve_resources);



void acpi_os_printf(const char *fmt, ...)

{
@@ -1862,7 +1869,6 @@ acpi_status __init acpi_os_initialize(void) 


acpi_status __init acpi_os_initialize1(void)

{

	acpi_reserve_resources();

	kacpid_wq = alloc_workqueue("kacpid", 0, 1);

	kacpi_notify_wq = alloc_workqueue("kacpi_notify", 0, 1);

	kacpi_hotplug_wq = alloc_ordered_workqueue("kacpi_hotplug", 0);

drivers/acpi/resource.c

+0 −162
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/device.h>

#include <linux/export.h>

#include <linux/ioport.h>

#include <linux/list.h>

#include <linux/slab.h>



#ifdef CONFIG_X86
@@ -622,164 +621,3 @@ int acpi_dev_filter_resource_type(struct acpi_resource *ares, 
	return (type & types) ? 0 : 1;

}

EXPORT_SYMBOL_GPL(acpi_dev_filter_resource_type);
 


struct reserved_region {

	struct list_head node;

	u64 start;

	u64 end;

};



static LIST_HEAD(reserved_io_regions);

static LIST_HEAD(reserved_mem_regions);



static int request_range(u64 start, u64 end, u8 space_id, unsigned long flags,

			 char *desc)

{

	unsigned int length = end - start + 1;

	struct resource *res;



	res = space_id == ACPI_ADR_SPACE_SYSTEM_IO ?

		request_region(start, length, desc) :

		request_mem_region(start, length, desc);

	if (!res)

		return -EIO;



	res->flags &= ~flags;

	return 0;

}



static int add_region_before(u64 start, u64 end, u8 space_id,

			     unsigned long flags, char *desc,

			     struct list_head *head)

{

	struct reserved_region *reg;

	int error;



	reg = kmalloc(sizeof(*reg), GFP_KERNEL);

	if (!reg)

		return -ENOMEM;



	error = request_range(start, end, space_id, flags, desc);

	if (error) {

		kfree(reg);

		return error;

	}



	reg->start = start;

	reg->end = end;

	list_add_tail(&reg->node, head);

	return 0;

}



/**

 * acpi_reserve_region - Reserve an I/O or memory region as a system resource.

 * @start: Starting address of the region.

 * @length: Length of the region.

 * @space_id: Identifier of address space to reserve the region from.

 * @flags: Resource flags to clear for the region after requesting it.

 * @desc: Region description (for messages).

 *

 * Reserve an I/O or memory region as a system resource to prevent others from

 * using it.  If the new region overlaps with one of the regions (in the given

 * address space) already reserved by this routine, only the non-overlapping

 * parts of it will be reserved.

 *

 * Returned is either 0 (success) or a negative error code indicating a resource

 * reservation problem.  It is the code of the first encountered error, but the

 * routine doesn't abort until it has attempted to request all of the parts of

 * the new region that don't overlap with other regions reserved previously.

 *

 * The resources requested by this routine are never released.

 */

int acpi_reserve_region(u64 start, unsigned int length, u8 space_id,

			unsigned long flags, char *desc)

{

	struct list_head *regions;

	struct reserved_region *reg;

	u64 end = start + length - 1;

	int ret = 0, error = 0;



	if (space_id == ACPI_ADR_SPACE_SYSTEM_IO)

		regions = &reserved_io_regions;

	else if (space_id == ACPI_ADR_SPACE_SYSTEM_MEMORY)

		regions = &reserved_mem_regions;

	else

		return -EINVAL;



	if (list_empty(regions))

		return add_region_before(start, end, space_id, flags, desc, regions);



	list_for_each_entry(reg, regions, node)

		if (reg->start == end + 1) {

			/* The new region can be prepended to this one. */

			ret = request_range(start, end, space_id, flags, desc);

			if (!ret)

				reg->start = start;



			return ret;

		} else if (reg->start > end) {

			/* No overlap.  Add the new region here and get out. */

			return add_region_before(start, end, space_id, flags,

						 desc, &reg->node);

		} else if (reg->end == start - 1) {

			goto combine;

		} else if (reg->end >= start) {

			goto overlap;

		}



	/* The new region goes after the last existing one. */

	return add_region_before(start, end, space_id, flags, desc, regions);



 overlap:

	/*

	 * The new region overlaps an existing one.

	 *

	 * The head part of the new region immediately preceding the existing

	 * overlapping one can be combined with it right away.

	 */

	if (reg->start > start) {

		error = request_range(start, reg->start - 1, space_id, flags, desc);

		if (error)

			ret = error;

		else

			reg->start = start;

	}



 combine:

	/*

	 * The new region is adjacent to an existing one.  If it extends beyond

	 * that region all the way to the next one, it is possible to combine

	 * all three of them.

	 */

	while (reg->end < end) {

		struct reserved_region *next = NULL;

		u64 a = reg->end + 1, b = end;



		if (!list_is_last(&reg->node, regions)) {

			next = list_next_entry(reg, node);

			if (next->start <= end)

				b = next->start - 1;

		}

		error = request_range(a, b, space_id, flags, desc);

		if (!error) {

			if (next && next->start == b + 1) {

				reg->end = next->end;

				list_del(&next->node);

				kfree(next);

			} else {

				reg->end = end;

				break;

			}

		} else if (next) {

			if (!ret)

				ret = error;



			reg = next;

		} else {

			break;

		}

	}



	return ret ? ret : error;

}

EXPORT_SYMBOL_GPL(acpi_reserve_region);

drivers/acpi/scan.c

+30 −2
Original line number Diff line number Diff line
@@ -1019,6 +1019,29 @@ static bool acpi_of_match_device(struct acpi_device *adev, 
	return false;

}



static bool __acpi_match_device_cls(const struct acpi_device_id *id,

				    struct acpi_hardware_id *hwid)

{

	int i, msk, byte_shift;

	char buf[3];



	if (!id->cls)

		return false;



	/* Apply class-code bitmask, before checking each class-code byte */

	for (i = 1; i <= 3; i++) {

		byte_shift = 8 * (3 - i);

		msk = (id->cls_msk >> byte_shift) & 0xFF;

		if (!msk)

			continue;



		sprintf(buf, "%02x", (id->cls >> byte_shift) & msk);

		if (strncmp(buf, &hwid->id[(i - 1) * 2], 2))

			return false;

	}

	return true;

}



static const struct acpi_device_id *__acpi_match_device(

	struct acpi_device *device,

	const struct acpi_device_id *ids,
@@ -1036,9 +1059,12 @@ static const struct acpi_device_id *__acpi_match_device( 


	list_for_each_entry(hwid, &device->pnp.ids, list) {

		/* First, check the ACPI/PNP IDs provided by the caller. */

		for (id = ids; id->id[0]; id++)

			if (!strcmp((char *) id->id, hwid->id))

		for (id = ids; id->id[0] || id->cls; id++) {

			if (id->id[0] && !strcmp((char *) id->id, hwid->id))

				return id;

			else if (id->cls && __acpi_match_device_cls(id, hwid))

				return id;

		}



		/*

		 * Next, check ACPI_DT_NAMESPACE_HID and try to match the
@@ -2101,6 +2127,8 @@ static void acpi_set_pnp_ids(acpi_handle handle, struct acpi_device_pnp *pnp, 
		if (info->valid & ACPI_VALID_UID)

			pnp->unique_id = kstrdup(info->unique_id.string,

							GFP_KERNEL);

		if (info->valid & ACPI_VALID_CLS)

			acpi_add_id(pnp, info->class_code.string);



		kfree(info);

CRA Git | Maintained and supported by SUSTech CRA and CCSE