Merge branches 'acpica' and 'acpi-property' (4a3f421b) · Commits · 戴 / test

Documentation/acpi/dsd/data-node-references.txt

0 → 100644

+89 −0

Original line number	Diff line number	Diff line
		Copyright (C) 2018 Intel Corporation
		Author: Sakari Ailus <sakari.ailus@linux.intel.com>


		Referencing hierarchical data nodes
		-----------------------------------

		ACPI in general allows referring to device objects in the tree only.
		Hierarchical data extension nodes may not be referred to directly, hence this
		document defines a scheme to implement such references.

		A reference consist of the device object name followed by one or more
		hierarchical data extension [1] keys. Specifically, the hierarchical data
		extension node which is referred to by the key shall lie directly under the
		parent object i.e. either the device object or another hierarchical data
		extension node.

		The keys in the hierarchical data nodes shall consist of the name of the node,
		"@" character and the number of the node in hexadecimal notation (without pre-
		or postfixes). The same ACPI object shall include the _DSD property extension
		with a property "reg" that shall have the same numerical value as the number of
		the node.

		In case a hierarchical data extensions node has no numerical value, then the
		"reg" property shall be omitted from the ACPI object's _DSD properties and the
		"@" character and the number shall be omitted from the hierarchical data
		extension key.


		Example
		-------

		In the ASL snippet below, the "reference" _DSD property [2] contains a
		device object reference to DEV0 and under that device object, a
		hierarchical data extension key "node@1" referring to the NOD1 object
		and lastly, a hierarchical data extension key "anothernode" referring to
		the ANOD object which is also the final target node of the reference.

		Device (DEV0)
		{
		Name (_DSD, Package () {
		ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
		Package () {
		Package () { "node@0", NOD0 },
		Package () { "node@1", NOD1 },
		}
		})
		Name (NOD0, Package() {
		ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
		Package () {
		Package () { "random-property", 3 },
		}
		})
		Name (NOD1, Package() {
		ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
		Package () {
		Package () { "anothernode", ANOD },
		}
		})
		Name (ANOD, Package() {
		ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
		Package () {
		Package () { "random-property", 0 },
		}
		})
		}

		Device (DEV1)
		{
		Name (_DSD, Package () {
		ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
		Package () {
		Package () { "reference", ^DEV0, "node@1", "anothernode" },
		}
		})
		}

		Please also see a graph example in graph.txt .

		References
		----------

		[1] Hierarchical Data Extension UUID For _DSD.
		<URL:http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf>,
		referenced 2018-07-17.

		[2] Device Properties UUID For _DSD.
		<URL:http://www.uefi.org/sites/default/files/resources/_DSD-device-properties-UUID.pdf>,
		referenced 2016-10-04.

Documentation/acpi/dsd/graph.txt

+42 −30

Original line number	Diff line number	Diff line
		@@ -36,29 +36,41 @@ The port and endpoint concepts are very similar to those in Devicetree
		[3]. A port represents an interface in a device, and an endpoint
		represents a connection to that interface.

		All port nodes are located under the device's "_DSD" node in the
		hierarchical data extension tree. The property extension related to
		each port node must contain the key "port" and an integer value which
		is the number of the port. The object it refers to should be called "PRTX",
		where "X" is the number of the port.

		Further on, endpoints are located under the individual port nodes. The
		first hierarchical data extension package list entry of the endpoint
		nodes must begin with "endpoint" and must be followed by the number
		of the 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.

		Each port node contains a property extension key "port", the value of
		which is the number of the port node. The each endpoint is similarly numbered
		with a property extension key "endpoint". Port numbers must be unique within a
		device and endpoint numbers must be unique within a port.
		All port nodes are located under the device's "_DSD" node in the hierarchical
		data extension tree. The data extension related to each port node must begin
		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 }

		Further on, endpoints are located under the port nodes. The hierarchical
		data extension key of the endpoint nodes must begin with
		"endpoint" and must be followed by the "@" character and the number of the
		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 }

		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
		extension key "reg", the value of which is the number of the endpoint. Port
		numbers must be unique within a device and endpoint numbers must be unique
		within a port. If a device object may only has a single port, then the number
		of that port shall be zero. Similarly, if a port may only have a single
		endpoint, the number of that endpoint shall be zero.

		The endpoint reference uses property extension with "remote-endpoint" property
		name followed by a reference in the same package. Such references consist of the
		the remote device reference, number of the port in the device and finally the
		number of the endpoint in that port. Individual references thus appear as:
		the remote device reference, the first package entry of the port data extension
		reference under the device and finally the first package entry of the endpoint
		data extension reference under the port. Individual references thus appear as:

		Package() { device, port_number, endpoint_number }
		Package() { device, "port@X", "endpoint@Y" }

		In the above example, "X" is the number of the port and "Y" is the number of the
		endpoint.

		The references to endpoints must be always done both ways, to the
		remote endpoint and back from the referred remote endpoint node.
		@@ -76,24 +88,24 @@ A simple example of this is show below:
		},
		ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
		Package () {
		Package () { "port0", "PRT0" },
		Package () { "port@0", PRT0 },
		}
		})
		Name (PRT0, Package() {
		ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
		Package () {
		Package () { "port", 0 },
		Package () { "reg", 0 },
		},
		ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
		Package () {
		Package () { "endpoint0", "EP00" },
		Package () { "endpoint@0", EP00 },
		}
		})
		Name (EP00, Package() {
		ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
		Package () {
		Package () { "endpoint", 0 },
		Package () { "remote-endpoint", Package() { \_SB.PCI0.ISP, 4, 0 } },
		Package () { "reg", 0 },
		Package () { "remote-endpoint", Package() { \_SB.PCI0.ISP, "port@4", "endpoint@0" } },
		}
		})
		}
		@@ -106,26 +118,26 @@ A simple example of this is show below:
		Name (_DSD, Package () {
		ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
		Package () {
		Package () { "port4", "PRT4" },
		Package () { "port@4", PRT4 },
		}
		})

		Name (PRT4, Package() {
		ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
		Package () {
		Package () { "port", 4 }, /* CSI-2 port number */
		Package () { "reg", 4 }, /* CSI-2 port number */
		},
		ToUUID("dbb8e3e6-5886-4ba6-8795-1319f52a966b"),
		Package () {
		Package () { "endpoint0", "EP40" },
		Package () { "endpoint@0", EP40 },
		}
		})

		Name (EP40, Package() {
		ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
		Package () {
		Package () { "endpoint", 0 },
		Package () { "remote-endpoint", Package () { \_SB.PCI0.I2C2.CAM0, 0, 0 } },
		Package () { "reg", 0 },
		Package () { "remote-endpoint", Package () { \_SB.PCI0.I2C2.CAM0, "port@0", "endpoint@0" } },
		}
		})
		}
		@@ -151,7 +163,7 @@ References
		referenced 2016-10-04.

		[5] Hierarchical Data Extension UUID For _DSD.
		<URL:http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.pdf>,
		<URL:http://www.uefi.org/sites/default/files/resources/_DSD-hierarchical-data-extension-UUID-v1.1.pdf>,
		referenced 2016-10-04.

		[6] Advanced Configuration and Power Interface Specification.

drivers/acpi/acpica/aclocal.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -165,7 +165,6 @@ struct acpi_namespace_node {
		#define ANOBJ_EVALUATED 0x20 /* Set on first evaluation of node */
		#define ANOBJ_ALLOCATED_BUFFER 0x40 /* Method AML buffer is dynamic (install_method) */

		#define IMPLICIT_EXTERNAL 0x02 /* iASL only: This object created implicitly via External */
		#define ANOBJ_IS_EXTERNAL 0x08 /* iASL only: This object created via External() */
		#define ANOBJ_METHOD_NO_RETVAL 0x10 /* iASL only: Method has no return value */
		#define ANOBJ_METHOD_SOME_NO_RETVAL 0x20 /* iASL only: Method has at least one return value */

drivers/acpi/acpica/nsaccess.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -613,13 +613,6 @@ acpi_ns_lookup(union acpi_generic_state *scope_info,
		/* Special handling for the last segment (num_segments == 0) */

		else {
		#ifdef ACPI_ASL_COMPILER
		if (!acpi_gbl_disasm_flag
		&& (this_node->flags & ANOBJ_IS_EXTERNAL)) {
		this_node->flags &= ~IMPLICIT_EXTERNAL;
		}
		#endif

		/*
		* Sanity typecheck of the target object:
		*

drivers/acpi/acpica/nssearch.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -381,7 +381,6 @@ acpi_ns_search_and_enter(u32 target_name,
		if (flags & ACPI_NS_EXTERNAL \|\|
		(walk_state && walk_state->opcode == AML_SCOPE_OP)) {
		new_node->flags \|= ANOBJ_IS_EXTERNAL;
		new_node->flags \|= IMPLICIT_EXTERNAL;
		}
		#endif

Admin message