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

Merge branches 'acpi-bus', 'acpi-doc' and 'acpi-pm' 

* acpi-bus:
  ACPI: bus: change _ADR representation to 64 bits

* acpi-doc:
  Documentation: ACPI: Direct references are allowed to devices only
  Documentation: ACPI: Use tabs for graph ASL indentation

* acpi-pm:
  ACPI: PM: Set enable_for_wake for wakeup GPEs during suspend-to-idle
parents 811b4c9e ca6f998c a423bd84 2f844b61

Documentation/firmware-guide/acpi/dsd/data-node-references.rst

+3 −3
Original line number Diff line number Diff line
@@ -45,8 +45,8 @@ the ANOD object which is also the final target node of the reference. 
	    Name (_DSD, Package () {

		ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),

		Package () {

		    Package () { "node@0", NOD0 },

		    Package () { "node@1", NOD1 },

		    Package () { "node@0", "NOD0" },

		    Package () { "node@1", "NOD1" },

		}

	    })

	    Name (NOD0, Package() {
@@ -58,7 +58,7 @@ the ANOD object which is also the final target node of the reference. 
	    Name (NOD1, Package() {

		ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),

		Package () {

		    Package () { "anothernode", ANOD },

		    Package () { "anothernode", "ANOD" },

		}

	    })

	    Name (ANOD, Package() {

Documentation/firmware-guide/acpi/dsd/graph.rst

+60 −60
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ with "port" and must be followed by the "@" character and the number of the 
port as its key. The target object it refers to should be called "PRTX", where

"X" is the number of the port. An example of such a package would be::



    Package() { "port@4", PRT4 }

    Package() { "port@4", "PRT4" }



Further on, endpoints are located under the port nodes. The hierarchical

data extension key of the endpoint nodes must begin with
@@ -54,7 +54,7 @@ endpoint. The object it refers to should be called "EPXY", where "X" is the 
number of the port and "Y" is the number of the endpoint. An example of such a

package would be::



    Package() { "endpoint@0", EP40 }

    Package() { "endpoint@0", "EP40" }



Each port node contains a property extension key "port", the value of which is

the number of the port. Each endpoint is similarly numbered with a property
@@ -91,7 +91,7 @@ A simple example of this is show below:: 
		},

		ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),

		Package () {

                    Package () { "port@0", PRT0 },

		    Package () { "port@0", "PRT0" },

		}

	    })

	    Name (PRT0, Package() {
@@ -101,7 +101,7 @@ A simple example of this is show below:: 
		},

		ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),

		Package () {

                    Package () { "endpoint@0", EP00 },

		    Package () { "endpoint@0", "EP00" },

		}

	    })

	    Name (EP00, Package() {
@@ -121,7 +121,7 @@ A simple example of this is show below:: 
	    Name (_DSD, Package () {

		ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),

		Package () {

                    Package () { "port@4", PRT4 },

		    Package () { "port@4", "PRT4" },

		}

	    })
@@ -132,7 +132,7 @@ A simple example of this is show below:: 
		},

		ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),

		Package () {

                    Package () { "endpoint@0", EP40 },

		    Package () { "endpoint@0", "EP40" },

		}

	    })

drivers/acpi/device_sysfs.c

+4 −2
Original line number Diff line number Diff line
@@ -428,8 +428,10 @@ static ssize_t acpi_device_adr_show(struct device *dev, 
{

	struct acpi_device *acpi_dev = to_acpi_device(dev);



	return sprintf(buf, "0x%08x\n",

		       (unsigned int)(acpi_dev->pnp.bus_address));

	if (acpi_dev->pnp.bus_address > U32_MAX)

		return sprintf(buf, "0x%016llx\n", acpi_dev->pnp.bus_address);

	else

		return sprintf(buf, "0x%08llx\n", acpi_dev->pnp.bus_address);

}

static DEVICE_ATTR(adr, 0444, acpi_device_adr_show, NULL);

drivers/acpi/sleep.c

+4 −0
Original line number Diff line number Diff line
@@ -977,6 +977,8 @@ static int acpi_s2idle_prepare(void) 
	if (acpi_sci_irq_valid())

		enable_irq_wake(acpi_sci_irq);



	acpi_enable_wakeup_devices(ACPI_STATE_S0);



	/* Change the configuration of GPEs to avoid spurious wakeup. */

	acpi_enable_all_wakeup_gpes();

	acpi_os_wait_events_complete();
@@ -1027,6 +1029,8 @@ static void acpi_s2idle_restore(void) 
{

	acpi_enable_all_runtime_gpes();



	acpi_disable_wakeup_devices(ACPI_STATE_S0);



	if (acpi_sci_irq_valid())

		disable_irq_wake(acpi_sci_irq);

include/acpi/acpi_bus.h

+1 −1
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ struct acpi_device_dir { 
/* Plug and Play */



typedef char acpi_bus_id[8];

typedef unsigned long acpi_bus_address;

typedef u64 acpi_bus_address;

typedef char acpi_device_name[40];

typedef char acpi_device_class[20];