Merge tag 'acpica-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull ACPICA updates from Rafael Wysocki:
 "Additional ACPICA material for v4.2-rc1

  This will update the ACPICA code in the kernel to upstream revision
  20150619 (a bug-fix release mostly including stable-candidate fixes)
  and restore an earlier ACPICA commit that had to be reverted due to a
  regression introduced by it (the regression is addressed by
  blacklisting the only known system affected by it to date).

  The only new feature added by this update is the support for
  overriding objects in the ACPI namespace and a new ACPI table that can
  be used for that called the Override System Definition Table (OSDT).
  That should allow us to "patch" the ACPI namespace built from
  incomplete or incorrect ACPI System Definition tables (DSDT, SSDT)
  during system startup without the need to provide replacements for all
  of those tables in the future.

  Specifics:

   - Fix system resume problems related to 32-bit and 64-bit versions of
     the Firmware ACPI Control Structure (FACS) in the firmare (Lv
     Zheng)

   - Fix double initialization of the FACS (Lv Zheng)

   - Add _CLS object processing code to ACPICA (Suravee Suthikulpanit)

   - Add support for the (currently missing) new GIC version field in
     the Multiple APIC Description Table (MADT) (Hanjun Guo)

   - Add support for overriding objects in the ACPI namespace to ACPICA
     and OSDT support (Lv Zheng, Bob Moore, Zhang Rui)

   - Updates related to the TCPA and TPM2 ACPI tables (Bob Moore)

   - Restore the commit modifying _REV to always return "2" (as required
     by ACPI 6) and add a blacklisting mechanism for systems that may be
     affected by that change (Rafael J Wysocki)

   - Assorted fixes and cleanups (Bob Moore, Lv Zheng, Sascha Wildner)"

* tag 'acpica-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (28 commits)
  Revert 'Revert "ACPICA: Permanently set _REV to the value '2'."'
  ACPI / init: Make it possible to override _REV
  ACPICA: Update version to 20150619
  ACPICA: Comment update, no functional change
  ACPICA: Update TPM2 ACPI table
  ACPICA: Update definitions for the TCPA and TPM2 ACPI tables
  ACPICA: Split C library prototypes to new header
  ACPICA: De-macroize calls to standard C library functions
  ACPI / acpidump: Update acpidump manual
  ACPICA: acpidump: Convert the default behavior to dump from /sys/firmware/acpi/tables
  ACPICA: acpidump: Allow customized tables to be dumped without accessing /dev/mem
  ACPICA: Cleanup output for the ASL Debug object
  ACPICA: Update for acpi_install_table memory types
  ACPICA: Namespace: Change namespace override to avoid node deletion
  ACPICA: Namespace: Add support of OSDT table
  ACPICA: Namespace: Add support to allow overriding objects
  ACPICA: ACPI 6.0: Add values for MADT GIC version field
  ACPICA: Utilities: Add _CLS processing
  ACPICA: Add dragon_fly support to unix file mapping file
  ACPICA: EFI: Add EFI interface definitions to eliminate dependency of GNU EFI
  ...

8 files changed, 87 insertions, 68 deletions

diff --git a/tools/power/acpi/common/getopt.c b/tools/power/acpi/common/getopt.c
index 5da129e10aa2..326e826a5d20 100644
--- a/tools/power/acpi/common/getopt.c
+++ b/tools/power/acpi/common/getopt.c
@@ -127,7 +127,7 @@ int acpi_getopt(int argc, char **argv, char *opts)
                     argv[acpi_gbl_optind][0] != '-' ||
                     argv[acpi_gbl_optind][1] == '\0') {
                         return (ACPI_OPT_END);
-                } else if (ACPI_STRCMP(argv[acpi_gbl_optind], "--") == 0) {
+                } else if (strcmp(argv[acpi_gbl_optind], "--") == 0) {
                         acpi_gbl_optind++;
                         return (ACPI_OPT_END);
                 }
@@ -140,7 +140,7 @@ int acpi_getopt(int argc, char **argv, char *opts)
         /* Make sure that the option is legal */
 
         if (current_char == ':' ||
-            (opts_ptr = ACPI_STRCHR(opts, current_char)) == NULL) {
+            (opts_ptr = strchr(opts, current_char)) == NULL) {
                 ACPI_OPTION_ERROR("Illegal option: -", current_char);
 
                 if (argv[acpi_gbl_optind][++current_char_ptr] == '\0') {
diff --git a/tools/power/acpi/man/acpidump.8 b/tools/power/acpi/man/acpidump.8
index 38f095d86b52..79e2d1d435d1 100644
--- a/tools/power/acpi/man/acpidump.8
+++ b/tools/power/acpi/man/acpidump.8
@@ -22,9 +22,6 @@ acpidump options are as follow:
 .B \-b
 Dump tables to binary files
 .TP
-.B \-c
-Dump customized tables
-.TP
 .B \-h \-?
 This help message
 .TP
@@ -48,15 +45,25 @@ Verbose mode
 .B \-a <Address>
 Get table via a physical address
 .TP
+.B \-c <on|off>
+Turning on/off customized table dumping
+.TP
 .B \-f <BinaryFile>
 Get table via a binary file
 .TP
 .B \-n <Signature>
 Get table via a name/signature
 .TP
-Invocation without parameters dumps all available tables
+.B \-x
+Do not use but dump XSDT
+.TP
+.B \-x \-x
+Do not use or dump XSDT
+.TP
+.fi
+Invocation without parameters dumps all available tables.
 .TP
-Multiple mixed instances of -a, -f, and -n are supported
+Multiple mixed instances of -a, -f, and -n are supported.
 
 .SH EXAMPLES
 
diff --git a/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c b/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
index db15c9d2049e..dd5008b0617a 100644
--- a/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
+++ b/tools/power/acpi/os_specific/service_layers/oslinuxtbl.c
@@ -222,7 +222,7 @@ acpi_os_get_table_by_address(acpi_physical_address address,
                 goto exit;
         }
 
-        ACPI_MEMCPY(local_table, mapped_table, table_length);
+        memcpy(local_table, mapped_table, table_length);
 
 exit:
         osl_unmap_table(mapped_table);
@@ -531,7 +531,7 @@ static acpi_status osl_load_rsdp(void)
         gbl_rsdp_address =
             rsdp_base + (ACPI_CAST8(mapped_table) - rsdp_address);
 
-        ACPI_MEMCPY(&gbl_rsdp, mapped_table, sizeof(struct acpi_table_rsdp));
+        memcpy(&gbl_rsdp, mapped_table, sizeof(struct acpi_table_rsdp));
         acpi_os_unmap_memory(rsdp_address, rsdp_size);
 
         return (AE_OK);
@@ -582,64 +582,67 @@ static acpi_status osl_table_initialize(void)
                 return (AE_OK);
         }
 
-        /* Get RSDP from memory */
+        if (!gbl_dump_customized_tables) {
 
-        status = osl_load_rsdp();
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
+                /* Get RSDP from memory */
+
+                status = osl_load_rsdp();
+                if (ACPI_FAILURE(status)) {
+                        return (status);
+                }
 
-        /* Get XSDT from memory */
+                /* Get XSDT from memory */
 
-        if (gbl_rsdp.revision && !gbl_do_not_dump_xsdt) {
-                if (gbl_xsdt) {
-                        free(gbl_xsdt);
-                        gbl_xsdt = NULL;
+                if (gbl_rsdp.revision && !gbl_do_not_dump_xsdt) {
+                        if (gbl_xsdt) {
+                                free(gbl_xsdt);
+                                gbl_xsdt = NULL;
+                        }
+
+                        gbl_revision = 2;
+                        status = osl_get_bios_table(ACPI_SIG_XSDT, 0,
+                                                    ACPI_CAST_PTR(struct
+                                                                  acpi_table_header
+                                                                  *, &gbl_xsdt),
+                                                    &address);
+                        if (ACPI_FAILURE(status)) {
+                                return (status);
+                        }
                 }
 
-                gbl_revision = 2;
-                status = osl_get_bios_table(ACPI_SIG_XSDT, 0,
-                                            ACPI_CAST_PTR(struct
-                                                          acpi_table_header *,
-                                                          &gbl_xsdt), &address);
-                if (ACPI_FAILURE(status)) {
-                        return (status);
+                /* Get RSDT from memory */
+
+                if (gbl_rsdp.rsdt_physical_address) {
+                        if (gbl_rsdt) {
+                                free(gbl_rsdt);
+                                gbl_rsdt = NULL;
+                        }
+
+                        status = osl_get_bios_table(ACPI_SIG_RSDT, 0,
+                                                    ACPI_CAST_PTR(struct
+                                                                  acpi_table_header
+                                                                  *, &gbl_rsdt),
+                                                    &address);
+                        if (ACPI_FAILURE(status)) {
+                                return (status);
+                        }
                 }
-        }
 
-        /* Get RSDT from memory */
+                /* Get FADT from memory */
 
-        if (gbl_rsdp.rsdt_physical_address) {
-                if (gbl_rsdt) {
-                        free(gbl_rsdt);
-                        gbl_rsdt = NULL;
+                if (gbl_fadt) {
+                        free(gbl_fadt);
+                        gbl_fadt = NULL;
                 }
 
-                status = osl_get_bios_table(ACPI_SIG_RSDT, 0,
+                status = osl_get_bios_table(ACPI_SIG_FADT, 0,
                                             ACPI_CAST_PTR(struct
                                                           acpi_table_header *,
-                                                          &gbl_rsdt), &address);
+                                                          &gbl_fadt),
+                                            &gbl_fadt_address);
                 if (ACPI_FAILURE(status)) {
                         return (status);
                 }
-        }
-
-        /* Get FADT from memory */
-
-        if (gbl_fadt) {
-                free(gbl_fadt);
-                gbl_fadt = NULL;
-        }
-
-        status = osl_get_bios_table(ACPI_SIG_FADT, 0,
-                                    ACPI_CAST_PTR(struct acpi_table_header *,
-                                                  &gbl_fadt),
-                                    &gbl_fadt_address);
-        if (ACPI_FAILURE(status)) {
-                return (status);
-        }
-
-        if (!gbl_dump_customized_tables) {
 
                 /* Add mandatory tables to global table list first */
 
@@ -961,7 +964,7 @@ osl_get_bios_table(char *signature,
                 goto exit;
         }
 
-        ACPI_MEMCPY(local_table, mapped_table, table_length);
+        memcpy(local_table, mapped_table, table_length);
         *address = table_address;
         *table = local_table;
 
diff --git a/tools/power/acpi/os_specific/service_layers/osunixmap.c b/tools/power/acpi/os_specific/service_layers/osunixmap.c
index 0b1fa290245a..44ad4889d468 100644
--- a/tools/power/acpi/os_specific/service_layers/osunixmap.c
+++ b/tools/power/acpi/os_specific/service_layers/osunixmap.c
@@ -54,7 +54,7 @@ ACPI_MODULE_NAME("osunixmap")
 #ifndef O_BINARY
 #define O_BINARY 0
 #endif
-#ifdef _free_BSD
+#if defined(_dragon_fly) || defined(_free_BSD)
 #define MMAP_FLAGS          MAP_SHARED
 #else
 #define MMAP_FLAGS          MAP_PRIVATE
diff --git a/tools/power/acpi/tools/acpidump/acpidump.h b/tools/power/acpi/tools/acpidump/acpidump.h
index 84bdef0136cb..eed534481434 100644
--- a/tools/power/acpi/tools/acpidump/acpidump.h
+++ b/tools/power/acpi/tools/acpidump/acpidump.h
@@ -66,7 +66,7 @@
 EXTERN u8 INIT_GLOBAL(gbl_summary_mode, FALSE);
 EXTERN u8 INIT_GLOBAL(gbl_verbose_mode, FALSE);
 EXTERN u8 INIT_GLOBAL(gbl_binary_mode, FALSE);
-EXTERN u8 INIT_GLOBAL(gbl_dump_customized_tables, FALSE);
+EXTERN u8 INIT_GLOBAL(gbl_dump_customized_tables, TRUE);
 EXTERN u8 INIT_GLOBAL(gbl_do_not_dump_xsdt, FALSE);
 EXTERN ACPI_FILE INIT_GLOBAL(gbl_output_file, NULL);
 EXTERN char INIT_GLOBAL(*gbl_output_filename, NULL);
diff --git a/tools/power/acpi/tools/acpidump/apdump.c b/tools/power/acpi/tools/acpidump/apdump.c
index c736adf5fb55..61d0de804b70 100644
--- a/tools/power/acpi/tools/acpidump/apdump.c
+++ b/tools/power/acpi/tools/acpidump/apdump.c
@@ -329,7 +329,7 @@ int ap_dump_table_by_name(char *signature)
         acpi_status status;
         int table_status;
 
-        if (ACPI_STRLEN(signature) != ACPI_NAME_SIZE) {
+        if (strlen(signature) != ACPI_NAME_SIZE) {
                 acpi_log_error
                     ("Invalid table signature [%s]: must be exactly 4 characters\n",
                      signature);
@@ -338,15 +338,15 @@ int ap_dump_table_by_name(char *signature)
 
         /* Table signatures are expected to be uppercase */
 
-        ACPI_STRCPY(local_signature, signature);
+        strcpy(local_signature, signature);
         acpi_ut_strupr(local_signature);
 
         /* To be friendly, handle tables whose signatures do not match the name */
 
         if (ACPI_COMPARE_NAME(local_signature, "FADT")) {
-                ACPI_STRCPY(local_signature, ACPI_SIG_FADT);
+                strcpy(local_signature, ACPI_SIG_FADT);
         } else if (ACPI_COMPARE_NAME(local_signature, "MADT")) {
-                ACPI_STRCPY(local_signature, ACPI_SIG_MADT);
+                strcpy(local_signature, ACPI_SIG_MADT);
         }
 
         /* Dump all instances of this signature (to handle multiple SSDTs) */
diff --git a/tools/power/acpi/tools/acpidump/apfiles.c b/tools/power/acpi/tools/acpidump/apfiles.c
index 8f2fe168228e..a37f9702b2a9 100644
--- a/tools/power/acpi/tools/acpidump/apfiles.c
+++ b/tools/power/acpi/tools/acpidump/apfiles.c
@@ -136,10 +136,10 @@ int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)
         } else {
                 ACPI_MOVE_NAME(filename, table->signature);
         }
-        filename[0] = (char)ACPI_TOLOWER(filename[0]);
-        filename[1] = (char)ACPI_TOLOWER(filename[1]);
-        filename[2] = (char)ACPI_TOLOWER(filename[2]);
-        filename[3] = (char)ACPI_TOLOWER(filename[3]);
+        filename[0] = (char)tolower((int)filename[0]);
+        filename[1] = (char)tolower((int)filename[1]);
+        filename[2] = (char)tolower((int)filename[2]);
+        filename[3] = (char)tolower((int)filename[3]);
         filename[ACPI_NAME_SIZE] = 0;
 
         /* Handle multiple SSDts - create different filenames for each */
@@ -147,10 +147,10 @@ int ap_write_to_binary_file(struct acpi_table_header *table, u32 instance)
         if (instance > 0) {
                 acpi_ut_snprintf(instance_str, sizeof(instance_str), "%u",
                                  instance);
-                ACPI_STRCAT(filename, instance_str);
+                strcat(filename, instance_str);
         }
 
-        ACPI_STRCAT(filename, ACPI_TABLE_FILE_SUFFIX);
+        strcat(filename, ACPI_TABLE_FILE_SUFFIX);
 
         if (gbl_verbose_mode) {
                 acpi_log_error
diff --git a/tools/power/acpi/tools/acpidump/apmain.c b/tools/power/acpi/tools/acpidump/apmain.c
index d0ba6535f5af..57620f66ae6c 100644
--- a/tools/power/acpi/tools/acpidump/apmain.c
+++ b/tools/power/acpi/tools/acpidump/apmain.c
@@ -80,7 +80,7 @@ struct ap_dump_action action_table[AP_MAX_ACTIONS];
 u32 current_action = 0;
 
 #define AP_UTILITY_NAME             "ACPI Binary Table Dump Utility"
-#define AP_SUPPORTED_OPTIONS        "?a:bcf:hn:o:r:svxz"
+#define AP_SUPPORTED_OPTIONS        "?a:bc:f:hn:o:r:svxz"
 
 /******************************************************************************
  *
@@ -96,7 +96,6 @@ static void ap_display_usage(void)
         ACPI_USAGE_HEADER("acpidump [options]");
 
         ACPI_OPTION("-b", "Dump tables to binary files");
-        ACPI_OPTION("-c", "Dump customized tables");
         ACPI_OPTION("-h -?", "This help message");
         ACPI_OPTION("-o <File>", "Redirect output to file");
         ACPI_OPTION("-r <Address>", "Dump tables from specified RSDP");
@@ -107,6 +106,7 @@ static void ap_display_usage(void)
         ACPI_USAGE_TEXT("\nTable Options:\n");
 
         ACPI_OPTION("-a <Address>", "Get table via a physical address");
+        ACPI_OPTION("-c <on|off>", "Turning on/off customized table dumping");
         ACPI_OPTION("-f <BinaryFile>", "Get table via a binary file");
         ACPI_OPTION("-n <Signature>", "Get table via a name/signature");
         ACPI_OPTION("-x", "Do not use but dump XSDT");
@@ -181,7 +181,16 @@ static int ap_do_options(int argc, char **argv)
 
                 case 'c':       /* Dump customized tables */
 
-                        gbl_dump_customized_tables = TRUE;
+                        if (!strcmp(acpi_gbl_optarg, "on")) {
+                                gbl_dump_customized_tables = TRUE;
+                        } else if (!strcmp(acpi_gbl_optarg, "off")) {
+                                gbl_dump_customized_tables = FALSE;
+                        } else {
+                                acpi_log_error
+                                    ("%s: Cannot handle this switch, please use on|off\n",
+                                     acpi_gbl_optarg);
+                                return (-1);
+                        }
                         continue;
 
                 case 'h':