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

Pull ACPI and power management updates from Rafael Wysocki:
 "Again, ACPICA leads the pack (47 commits), followed by cpufreq (18
  commits) and system suspend/hibernation (9 commits).

  From the new code perspective, the ACPICA update brings ACPI 5.1 to
  the table, including a new device configuration object called _DSD
  (Device Specific Data) that will hopefully help us to operate device
  properties like Device Trees do (at least to some extent) and changes
  related to supporting ACPI on ARM.

  Apart from that we have hibernation changes making it use radix trees
  to store memory bitmaps which should speed up some operations carried
  out by it quite significantly.  We also have some power management
  changes related to suspend-to-idle (the "freeze" sleep state) support
  and more preliminary changes needed to support ACPI on ARM (outside of
  ACPICA).

  The rest is fixes and cleanups pretty much everywhere.

  Specifics:

   - ACPICA update to upstream version 20140724.  That includes ACPI 5.1
     material (support for the _CCA and _DSD predefined names, changes
     related to the DMAR and PCCT tables and ARM support among other
     things) and cleanups related to using ACPICA's header files.  A
     major part of it is related to acpidump and the core code used by
     that utility.  Changes from Bob Moore, David E Box, Lv Zheng,
     Sascha Wildner, Tomasz Nowicki, Hanjun Guo.

   - Radix trees for memory bitmaps used by the hibernation core from
     Joerg Roedel.

   - Support for waking up the system from suspend-to-idle (also known
     as the "freeze" sleep state) using ACPI-based PCI wakeup signaling
     (Rafael J Wysocki).

   - Fixes for issues related to ACPI button events (Rafael J Wysocki).

   - New device ID for an ACPI-enumerated device included into the
     Wildcat Point PCH from Jie Yang.

   - ACPI video updates related to backlight handling from Hans de Goede
     and Linus Torvalds.

   - Preliminary changes needed to support ACPI on ARM from Hanjun Guo
     and Graeme Gregory.

   - ACPI PNP core cleanups from Arjun Sreedharan and Zhang Rui.

   - Cleanups related to ACPI_COMPANION() and ACPI_HANDLE() macros
     (Rafael J Wysocki).

   - ACPI-based device hotplug cleanups from Wei Yongjun and Rafael J
     Wysocki.

   - Cleanups and improvements related to system suspend from Lan
     Tianyu, Randy Dunlap and Rafael J Wysocki.

   - ACPI battery cleanup from Wei Yongjun.

   - cpufreq core fixes from Viresh Kumar.

   - Elimination of a deadband effect from the cpufreq ondemand governor
     and intel_pstate driver cleanups from Stratos Karafotis.

   - 350MHz CPU support for the powernow-k6 cpufreq driver from Mikulas
     Patocka.

   - Fix for the imx6 cpufreq driver from Anson Huang.

   - cpuidle core and governor cleanups from Daniel Lezcano, Sandeep
     Tripathy and Mohammad Merajul Islam Molla.

   - Build fix for the big_little cpuidle driver from Sachin Kamat.

   - Configuration fix for the Operation Performance Points (OPP)
     framework from Mark Brown.

   - APM cleanup from Jean Delvare.

   - cpupower utility fixes and cleanups from Peter Senna Tschudin,
     Andrey Utkin, Himangi Saraogi, Rickard Strandqvist, Thomas
     Renninger"

* tag 'pm+acpi-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (118 commits)
  ACPI / LPSS: add LPSS device for Wildcat Point PCH
  ACPI / PNP: Replace faulty is_hex_digit() by isxdigit()
  ACPICA: Update version to 20140724.
  ACPICA: ACPI 5.1: Update for PCCT table changes.
  ACPICA/ARM: ACPI 5.1: Update for GTDT table changes.
  ACPICA/ARM: ACPI 5.1: Update for MADT changes.
  ACPICA/ARM: ACPI 5.1: Update for FADT changes.
  ACPICA: ACPI 5.1: Support for the _CCA predifined name.
  ACPICA: ACPI 5.1: New notify value for System Affinity Update.
  ACPICA: ACPI 5.1: Support for the _DSD predefined name.
  ACPICA: Debug object: Add current value of Timer() to debug line prefix.
  ACPICA: acpihelp: Add UUID support, restructure some existing files.
  ACPICA: Utilities: Fix local printf issue.
  ACPICA: Tables: Update for DMAR table changes.
  ACPICA: Remove some extraneous printf arguments.
  ACPICA: Update for comments/formatting. No functional changes.
  ACPICA: Disassembler: Add support for the ToUUID opererator (macro).
  ACPICA: Remove a redundant cast to acpi_size for ACPI_OFFSET() macro.
  ACPICA: Work around an ancient GCC bug.
  ACPI / processor: Make it possible to get local x2apic id via _MAT
  ...

1 files changed, 331 insertions, 0 deletions

diff --git a/drivers/acpi/acpica/utfileio.c b/drivers/acpi/acpica/utfileio.c
new file mode 100644
index 000000000000..4e263a8cc6f0
--- /dev/null
+++ b/drivers/acpi/acpica/utfileio.c
@@ -0,0 +1,331 @@
+/*******************************************************************************
+ *
+ * Module Name: utfileio - simple file I/O routines
+ *
+ ******************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2014, Intel Corp.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions, and the following disclaimer,
+ *    without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ *    substantially similar to the "NO WARRANTY" disclaimer below
+ *    ("Disclaimer") and any redistribution must be conditioned upon
+ *    including a substantially similar Disclaimer requirement for further
+ *    binary redistribution.
+ * 3. Neither the names of the above-listed copyright holders nor the names
+ *    of any contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * Alternatively, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") version 2 as published by the Free
+ * Software Foundation.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <acpi/acpi.h>
+#include "accommon.h"
+#include "actables.h"
+#include "acapps.h"
+
+#ifdef ACPI_ASL_COMPILER
+#include "aslcompiler.h"
+#endif
+
+#define _COMPONENT          ACPI_CA_DEBUGGER
+ACPI_MODULE_NAME("utfileio")
+
+#ifdef ACPI_APPLICATION
+/* Local prototypes */
+static acpi_status
+acpi_ut_check_text_mode_corruption(u8 *table,
+                                   u32 table_length, u32 file_length);
+
+static acpi_status
+acpi_ut_read_table(FILE * fp,
+                   struct acpi_table_header **table, u32 *table_length);
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_check_text_mode_corruption
+ *
+ * PARAMETERS:  table           - Table buffer
+ *              table_length    - Length of table from the table header
+ *              file_length     - Length of the file that contains the table
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Check table for text mode file corruption where all linefeed
+ *              characters (LF) have been replaced by carriage return linefeed
+ *              pairs (CR/LF).
+ *
+ ******************************************************************************/
+
+static acpi_status
+acpi_ut_check_text_mode_corruption(u8 *table, u32 table_length, u32 file_length)
+{
+        u32 i;
+        u32 pairs = 0;
+
+        if (table_length != file_length) {
+                ACPI_WARNING((AE_INFO,
+                              "File length (0x%X) is not the same as the table length (0x%X)",
+                              file_length, table_length));
+        }
+
+        /* Scan entire table to determine if each LF has been prefixed with a CR */
+
+        for (i = 1; i < file_length; i++) {
+                if (table[i] == 0x0A) {
+                        if (table[i - 1] != 0x0D) {
+
+                                /* The LF does not have a preceding CR, table not corrupted */
+
+                                return (AE_OK);
+                        } else {
+                                /* Found a CR/LF pair */
+
+                                pairs++;
+                        }
+                        i++;
+                }
+        }
+
+        if (!pairs) {
+                return (AE_OK);
+        }
+
+        /*
+         * Entire table scanned, each CR is part of a CR/LF pair --
+         * meaning that the table was treated as a text file somewhere.
+         *
+         * NOTE: We can't "fix" the table, because any existing CR/LF pairs in the
+         * original table are left untouched by the text conversion process --
+         * meaning that we cannot simply replace CR/LF pairs with LFs.
+         */
+        acpi_os_printf("Table has been corrupted by text mode conversion\n");
+        acpi_os_printf("All LFs (%u) were changed to CR/LF pairs\n", pairs);
+        acpi_os_printf("Table cannot be repaired!\n");
+        return (AE_BAD_VALUE);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_read_table
+ *
+ * PARAMETERS:  fp              - File that contains table
+ *              table           - Return value, buffer with table
+ *              table_length    - Return value, length of table
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Load the DSDT from the file pointer
+ *
+ ******************************************************************************/
+
+static acpi_status
+acpi_ut_read_table(FILE * fp,
+                   struct acpi_table_header **table, u32 *table_length)
+{
+        struct acpi_table_header table_header;
+        u32 actual;
+        acpi_status status;
+        u32 file_size;
+        u8 standard_header = TRUE;
+        s32 count;
+
+        /* Get the file size */
+
+        file_size = cm_get_file_size(fp);
+        if (file_size == ACPI_UINT32_MAX) {
+                return (AE_ERROR);
+        }
+
+        if (file_size < 4) {
+                return (AE_BAD_HEADER);
+        }
+
+        /* Read the signature */
+
+        fseek(fp, 0, SEEK_SET);
+
+        count = fread(&table_header, 1, sizeof(struct acpi_table_header), fp);
+        if (count != sizeof(struct acpi_table_header)) {
+                acpi_os_printf("Could not read the table header\n");
+                return (AE_BAD_HEADER);
+        }
+
+        /* The RSDP table does not have standard ACPI header */
+
+        if (ACPI_VALIDATE_RSDP_SIG(table_header.signature)) {
+                *table_length = file_size;
+                standard_header = FALSE;
+        } else {
+
+#if 0
+                /* Validate the table header/length */
+
+                status = acpi_tb_validate_table_header(&table_header);
+                if (ACPI_FAILURE(status)) {
+                        acpi_os_printf("Table header is invalid!\n");
+                        return (status);
+                }
+#endif
+
+                /* File size must be at least as long as the Header-specified length */
+
+                if (table_header.length > file_size) {
+                        acpi_os_printf
+                            ("TableHeader length [0x%X] greater than the input file size [0x%X]\n",
+                             table_header.length, file_size);
+
+#ifdef ACPI_ASL_COMPILER
+                        status = fl_check_for_ascii(fp, NULL, FALSE);
+                        if (ACPI_SUCCESS(status)) {
+                                acpi_os_printf
+                                    ("File appears to be ASCII only, must be binary\n");
+                        }
+#endif
+                        return (AE_BAD_HEADER);
+                }
+#ifdef ACPI_OBSOLETE_CODE
+                /* We only support a limited number of table types */
+
+                if (!ACPI_COMPARE_NAME
+                    ((char *)table_header.signature, ACPI_SIG_DSDT)
+                    && !ACPI_COMPARE_NAME((char *)table_header.signature,
+                                          ACPI_SIG_PSDT)
+                    && !ACPI_COMPARE_NAME((char *)table_header.signature,
+                                          ACPI_SIG_SSDT)) {
+                        acpi_os_printf
+                            ("Table signature [%4.4s] is invalid or not supported\n",
+                             (char *)table_header.signature);
+                        ACPI_DUMP_BUFFER(&table_header,
+                                         sizeof(struct acpi_table_header));
+                        return (AE_ERROR);
+                }
+#endif
+
+                *table_length = table_header.length;
+        }
+
+        /* Allocate a buffer for the table */
+
+        *table = acpi_os_allocate((size_t) file_size);
+        if (!*table) {
+                acpi_os_printf
+                    ("Could not allocate memory for ACPI table %4.4s (size=0x%X)\n",
+                     table_header.signature, *table_length);
+                return (AE_NO_MEMORY);
+        }
+
+        /* Get the rest of the table */
+
+        fseek(fp, 0, SEEK_SET);
+        actual = fread(*table, 1, (size_t) file_size, fp);
+        if (actual == file_size) {
+                if (standard_header) {
+
+                        /* Now validate the checksum */
+
+                        status = acpi_tb_verify_checksum((void *)*table,
+                                                         ACPI_CAST_PTR(struct
+                                                                       acpi_table_header,
+                                                                       *table)->
+                                                         length);
+
+                        if (status == AE_BAD_CHECKSUM) {
+                                status =
+                                    acpi_ut_check_text_mode_corruption((u8 *)
+                                                                       *table,
+                                                                       file_size,
+                                                                       (*table)->
+                                                                       length);
+                                return (status);
+                        }
+                }
+                return (AE_OK);
+        }
+
+        if (actual > 0) {
+                acpi_os_printf("Warning - reading table, asked for %X got %X\n",
+                               file_size, actual);
+                return (AE_OK);
+        }
+
+        acpi_os_printf("Error - could not read the table file\n");
+        acpi_os_free(*table);
+        *table = NULL;
+        *table_length = 0;
+        return (AE_ERROR);
+}
+
+/*******************************************************************************
+ *
+ * FUNCTION:    acpi_ut_read_table_from_file
+ *
+ * PARAMETERS:  filename         - File where table is located
+ *              table            - Where a pointer to the table is returned
+ *
+ * RETURN:      Status
+ *
+ * DESCRIPTION: Get an ACPI table from a file
+ *
+ ******************************************************************************/
+
+acpi_status
+acpi_ut_read_table_from_file(char *filename, struct acpi_table_header ** table)
+{
+        FILE *file;
+        u32 file_size;
+        u32 table_length;
+        acpi_status status = AE_ERROR;
+
+        /* Open the file, get current size */
+
+        file = fopen(filename, "rb");
+        if (!file) {
+                perror("Could not open input file");
+                return (status);
+        }
+
+        file_size = cm_get_file_size(file);
+        if (file_size == ACPI_UINT32_MAX) {
+                goto exit;
+        }
+
+        /* Get the entire file */
+
+        fprintf(stderr,
+                "Loading Acpi table from file %10s - Length %.8u (%06X)\n",
+                filename, file_size, file_size);
+
+        status = acpi_ut_read_table(file, table, &table_length);
+        if (ACPI_FAILURE(status)) {
+                acpi_os_printf("Could not get table from the file\n");
+        }
+
+exit:
+        fclose(file);
+        return (status);
+}
+
+#endif