Skip to contentSkip to conversation

ACPICA Version 20120620 linuxized patches.

PATCH Lin Ming 2 participants 2 messages Jun 29, 2012 – Jul 14, 2012

Subsystems (2)
lore
Share & tools
lore

Lin Ming

author
#0 lore raw

Hi Len,

ACPICA Version 20120620 linuxized patches attached. Applied on top of your acpi/next branch.

[PATCH 1/5] ACPICA: Disassembler: Emit descriptions for ACPI [PATCH 2/5] ACPICA: Utilities: conditionally compile backslash [PATCH 3/5] ACPICA: Update comments; no functional change [PATCH 4/5] ACPICA: Add support for implicit notify on multiple devices [PATCH 5/5] ACPICA: Update to version 20120620

Regards,
Lin Ming

Quoted 1 line

From f39c01bb24b2a7f34e2997c8191ecaba240f099a Mon Sep 17 00:00:00 2001

From: Bob Moore <[email protected]>
Date: Fri, 29 Jun 2012 09:12:59 +0800
Subject: [PATCH 1/5] ACPICA: Disassembler: Emit descriptions for ACPI
predefined names

For each predefined name, emit a short description within a comment.

https://www.acpica.org/bugzilla/show_bug.cgi?id=959

---
 drivers/acpi/acpica/acglobal.h |    8 ++++++++
 drivers/acpi/acpica/aclocal.h  |   15 +++++++++++++++
 2 files changed, 23 insertions(+)
drivers/acpi/acpica/acglobal.h +8 -0
index dec7994..92fab6a 100644
@@ -462,4 +462,12 @@ ACPI_EXTERN u32 acpi_gbl_size_of_acpi_objects;
 
 #endif				/* ACPI_DEBUGGER */
 
+/*****************************************************************************
+ *
+ * Info/help support
+ *
+ ****************************************************************************/
+
+extern const struct ah_predefined_name asl_predefined_info[];
+
 #endif				/* __ACGLOBAL_H__ */
drivers/acpi/acpica/aclocal.h +15 -0
index 28f6778..af7330f 100644
@@ -796,6 +796,7 @@ struct acpi_parse_state {
 #define ACPI_PARSEOP_IGNORE             0x01
 #define ACPI_PARSEOP_PARAMLIST          0x02
 #define ACPI_PARSEOP_EMPTY_TERMLIST     0x04
+#define ACPI_PARSEOP_PREDEF_CHECKED     0x08
 #define ACPI_PARSEOP_SPECIAL            0x10
 
 /*****************************************************************************
@@ -1084,4 +1085,18 @@ struct acpi_debug_mem_block {
 #define ACPI_MEM_LIST_MAX               1
 #define ACPI_NUM_MEM_LISTS              2
 
+/*****************************************************************************
+ *
+ * Info/help support
+ *
+ ****************************************************************************/
+
+struct ah_predefined_name {
+	char *name;
+	char *description;
+#ifndef ACPI_ASL_COMPILER
+	char *action;
+#endif
+};
+
 #endif				/* __ACLOCAL_H__ */
Signature · 1 line
1.7.10
Quoted 1 line

From fa164246ed36477a146a18cf136783ae3aeb1420 Mon Sep 17 00:00:00 2001

From: Bob Moore <[email protected]>
Date: Fri, 29 Jun 2012 09:16:30 +0800
Subject: [PATCH 2/5] ACPICA: Utilities: conditionally compile backslash
removal function

Only used for iASL and AcpiExec.

---
 drivers/acpi/acpica/utmisc.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/acpi/acpica/utmisc.c +2 -0
index e86f897..577a44e 100644
@@ -50,6 +50,7 @@
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utmisc")
 
+#if defined ACPI_ASL_COMPILER || defined ACPI_EXEC_APP
 /*******************************************************************************
  *
  * FUNCTION:    ut_convert_backslashes
@@ -77,6 +78,7 @@ void ut_convert_backslashes(char *pathname)
 		pathname++;
 	}
 }
+#endif
 
 /*******************************************************************************
  *
Signature · 1 line
1.7.10
Quoted 1 line

From a24ffb6ee9a7779d991dbf7f7c38b6694121179c Mon Sep 17 00:00:00 2001

From: Bob Moore <[email protected]>
Date: Fri, 29 Jun 2012 09:19:16 +0800
Subject: [PATCH 3/5] ACPICA: Update comments; no functional change

Cleanup a couple of comments.

---
 drivers/acpi/acpica/acpredef.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/acpi/acpica/acpredef.h +3 -3
index bbb34c9..c8e5756 100644
@@ -511,14 +511,14 @@ static const union acpi_predefined_info predefined_names[] =
 	{{"_TMP", 0, ACPI_RTYPE_INTEGER}},
 	{{"_TPC", 0, ACPI_RTYPE_INTEGER}},
 	{{"_TPT", 1, 0}},
-	{{"_TRT", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 2_ref/6_int */
+	{{"_TRT", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 2 Ref/6 Int */
 			  {{{ACPI_PTYPE2, ACPI_RTYPE_REFERENCE, 2, ACPI_RTYPE_INTEGER}, 6, 0}},
 
-	{{"_TSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5_int with count */
+	{{"_TSD", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5 Int with count */
 			  {{{ACPI_PTYPE2_COUNT,ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
 
 	{{"_TSP", 0, ACPI_RTYPE_INTEGER}},
-	{{"_TSS", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5_int */
+	{{"_TSS", 0, ACPI_RTYPE_PACKAGE}}, /* Variable-length (Pkgs) each 5 Int */
 			  {{{ACPI_PTYPE2, ACPI_RTYPE_INTEGER, 5,0}, 0,0}},
 
 	{{"_TST", 0, ACPI_RTYPE_INTEGER}},
Signature · 1 line
1.7.10
Quoted 1 line

From 4cafe72b533217e631676cad107f1a3dab3d4620 Mon Sep 17 00:00:00 2001

From: Bob Moore <[email protected]>
Date: Fri, 29 Jun 2012 10:04:17 +0800
Subject: [PATCH 4/5] ACPICA: Add support for implicit notify on multiple
devices

Adds basic support to allow multiple devices to be implicitly notified.

This change is partially derived from original commit 981858b("ACPI /
ACPICA: Implicit notify for multiple devices") by Rafael.

---
 drivers/acpi/acpica/aclocal.h   |   11 +++-
 drivers/acpi/acpica/evgpe.c     |   22 ++++----
 drivers/acpi/acpica/evgpeutil.c |   20 ++++++++
 drivers/acpi/acpica/evxfgpe.c   |  106 +++++++++++++++++++++++++--------------
 4 files changed, 109 insertions(+), 50 deletions(-)
drivers/acpi/acpica/aclocal.h +9 -2
index af7330f..6b225e8 100644
@@ -404,6 +404,13 @@ struct acpi_gpe_handler_info {
 	u8 originally_enabled;  /* True if GPE was originally enabled */
 };
 
+/* Notify info for implicit notify, multiple device objects */
+
+struct acpi_gpe_notify_info {
+	struct acpi_namespace_node *device_node;	/* Device to be notified */
+	struct acpi_gpe_notify_info *next;
+};
+
 struct acpi_gpe_notify_object {
 	struct acpi_namespace_node *node;
 	struct acpi_gpe_notify_object *next;
@@ -412,7 +419,7 @@ struct acpi_gpe_notify_object {
 union acpi_gpe_dispatch_info {
 	struct acpi_namespace_node *method_node;	/* Method node for this GPE level */
 	struct acpi_gpe_handler_info *handler;  /* Installed GPE handler */
-	struct acpi_gpe_notify_object device;   /* List of _PRW devices for implicit notify */
+	struct acpi_gpe_notify_info *notify_list;	/* List of _PRW devices for implicit notifies */
 };
 
 /*
@@ -420,7 +427,7 @@ union acpi_gpe_dispatch_info {
  * NOTE: Important to keep this struct as small as possible.
  */
 struct acpi_gpe_event_info {
-	union acpi_gpe_dispatch_info dispatch;	/* Either Method or Handler */
+	union acpi_gpe_dispatch_info dispatch;	/* Either Method, Handler, or notify_list */
 	struct acpi_gpe_register_info *register_info;	/* Backpointer to register info */
 	u8 flags;		/* Misc info about this GPE */
 	u8 gpe_number;		/* This GPE */
drivers/acpi/acpica/evgpe.c +11 -11
index 8ba0e5f..afbd5cb 100644
@@ -466,7 +466,7 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
 	acpi_status status;
 	struct acpi_gpe_event_info *local_gpe_event_info;
 	struct acpi_evaluate_info *info;
-	struct acpi_gpe_notify_object *notify_object;
+	struct acpi_gpe_notify_info *notify;
 
 	ACPI_FUNCTION_TRACE(ev_asynch_execute_gpe_method);
 
@@ -517,17 +517,17 @@ static void ACPI_SYSTEM_XFACE acpi_ev_asynch_execute_gpe_method(void *context)
 		 * completes. The notify handlers are NOT invoked synchronously
 		 * from this thread -- because handlers may in turn run other
 		 * control methods.
+		 *
+		 * June 2012: Expand implicit notify mechanism to support
+		 * notifies on multiple device objects.
 		 */
-		status = acpi_ev_queue_notify_request(
-				local_gpe_event_info->dispatch.device.node,
-				ACPI_NOTIFY_DEVICE_WAKE);
-
-		notify_object = local_gpe_event_info->dispatch.device.next;
-		while (ACPI_SUCCESS(status) && notify_object) {
-			status = acpi_ev_queue_notify_request(
-					notify_object->node,
-					ACPI_NOTIFY_DEVICE_WAKE);
-			notify_object = notify_object->next;
+		notify = local_gpe_event_info->dispatch.notify_list;
+		while (ACPI_SUCCESS(status) && notify) {
+			status =
+			    acpi_ev_queue_notify_request(notify->device_node,
+							 ACPI_NOTIFY_DEVICE_WAKE);
+
+			notify = notify->next;
 		}
 
 		break;
drivers/acpi/acpica/evgpeutil.c +20 -0
index 3c43796..0c33c62 100644
@@ -347,6 +347,8 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 			    void *context)
 {
 	struct acpi_gpe_event_info *gpe_event_info;
+	struct acpi_gpe_notify_info *notify;
+	struct acpi_gpe_notify_info *next;
 	u32 i;
 	u32 j;
 
@@ -365,10 +367,28 @@ acpi_ev_delete_gpe_handlers(struct acpi_gpe_xrupt_info *gpe_xrupt_info,
 
 			if ((gpe_event_info->flags & ACPI_GPE_DISPATCH_MASK) ==
 			    ACPI_GPE_DISPATCH_HANDLER) {
+
+				/* Delete an installed handler block */
+
 				ACPI_FREE(gpe_event_info->dispatch.handler);
 				gpe_event_info->dispatch.handler = NULL;
 				gpe_event_info->flags &=
 				    ~ACPI_GPE_DISPATCH_MASK;
+			} else if ((gpe_event_info->
+				 flags & ACPI_GPE_DISPATCH_MASK) ==
+				ACPI_GPE_DISPATCH_NOTIFY) {
+
+				/* Delete the implicit notification device list */
+
+				notify = gpe_event_info->dispatch.notify_list;
+				while (notify) {
+					next = notify->next;
+					ACPI_FREE(notify);
+					notify = next;
+				}
+				gpe_event_info->dispatch.notify_list = NULL;
+				gpe_event_info->flags &=
+				    ~ACPI_GPE_DISPATCH_MASK;
 			}
 		}
 	}
drivers/acpi/acpica/evxfgpe.c +69 -37

144 lines not on this page · raw message

Signature · 1 line
1.7.10
Quoted 1 line

From 6b12452431a695ae68fb9398f50f4ed422371194 Mon Sep 17 00:00:00 2001

From: Bob Moore <[email protected]>
Date: Fri, 29 Jun 2012 11:06:33 +0800
Subject: [PATCH 5/5] ACPICA: Update to version 20120620

Version 20120620.

---
 include/acpi/acpixf.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
include/acpi/acpixf.h +1 -1
index 381c940..18f023a 100644
@@ -47,7 +47,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20120518
+#define ACPI_CA_VERSION                 0x20120620
 
 #include "acconfig.h"
 #include "actypes.h"
Signature · 1 line
1.7.10
reviewer
#1 lore raw

The sign-off's below are not quite right.

Please see section Documentation/SubmittingPatches section 12/13/14

A series of Signed-off by's means the patch passed though that sequence of people. If if they simply Acked it, then it should be Acked-by, or Reviewed-by, Tested-by, Reported-by etc.

-Len

---
ACPICA: Add support for implicit notify on multiple devices

Adds basic support to allow multiple devices to be implicitly notified.

This change is partially derived from original commit 981858b("ACPI /
ACPICA: Implicit notify for multiple devices") by Rafael.