ACPICA: Split resource descriptor decode strings to a new file

ACPICA commit 00906ae0aff4c6b76abc232ef99700e7d7c0e325

There are enough of these strings to justify a separate file.
Also, these strings are only used for the disassembler and
the debugger. Thus, this change improves ACPICA modularity.

Link: https://github.com/acpica/acpica/commit/00906ae0
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

3 files changed, 316 insertions, 264 deletions

diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile
index dea65306b687..b125bdd3d58b 100644
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
@@ -172,6 +172,7 @@ acpi-y +=		\
         utosi.o         \
         utownerid.o     \
         utpredef.o      \
+        utresdecode.o   \
         utresrc.o       \
         utstate.o       \
         utstring.o      \
diff --git a/drivers/acpi/acpica/utresdecode.c b/drivers/acpi/acpica/utresdecode.c
new file mode 100644
index 000000000000..e15a2538558b
--- /dev/null
+++ b/drivers/acpi/acpica/utresdecode.c
@@ -0,0 +1,315 @@
+/*******************************************************************************
+ *
+ * Module Name: utresdecode - Resource descriptor keyword strings
+ *
+ ******************************************************************************/
+
+/*
+ * Copyright (C) 2000 - 2017, 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 "acresrc.h"
+
+#define _COMPONENT          ACPI_UTILITIES
+ACPI_MODULE_NAME("utresdecode")
+
+#if defined (ACPI_DEBUG_OUTPUT) || \
+        defined (ACPI_DISASSEMBLER) || \
+        defined (ACPI_DEBUGGER)
+/*
+ * Strings used to decode resource descriptors.
+ * Used by both the disassembler and the debugger resource dump routines
+ */
+const char *acpi_gbl_bm_decode[] = {
+        "NotBusMaster",
+        "BusMaster"
+};
+
+const char *acpi_gbl_config_decode[] = {
+        "0 - Good Configuration",
+        "1 - Acceptable Configuration",
+        "2 - Suboptimal Configuration",
+        "3 - ***Invalid Configuration***",
+};
+
+const char *acpi_gbl_consume_decode[] = {
+        "ResourceProducer",
+        "ResourceConsumer"
+};
+
+const char *acpi_gbl_dec_decode[] = {
+        "PosDecode",
+        "SubDecode"
+};
+
+const char *acpi_gbl_he_decode[] = {
+        "Level",
+        "Edge"
+};
+
+const char *acpi_gbl_io_decode[] = {
+        "Decode10",
+        "Decode16"
+};
+
+const char *acpi_gbl_ll_decode[] = {
+        "ActiveHigh",
+        "ActiveLow",
+        "ActiveBoth",
+        "Reserved"
+};
+
+const char *acpi_gbl_max_decode[] = {
+        "MaxNotFixed",
+        "MaxFixed"
+};
+
+const char *acpi_gbl_mem_decode[] = {
+        "NonCacheable",
+        "Cacheable",
+        "WriteCombining",
+        "Prefetchable"
+};
+
+const char *acpi_gbl_min_decode[] = {
+        "MinNotFixed",
+        "MinFixed"
+};
+
+const char *acpi_gbl_mtp_decode[] = {
+        "AddressRangeMemory",
+        "AddressRangeReserved",
+        "AddressRangeACPI",
+        "AddressRangeNVS"
+};
+
+const char *acpi_gbl_rng_decode[] = {
+        "InvalidRanges",
+        "NonISAOnlyRanges",
+        "ISAOnlyRanges",
+        "EntireRange"
+};
+
+const char *acpi_gbl_rw_decode[] = {
+        "ReadOnly",
+        "ReadWrite"
+};
+
+const char *acpi_gbl_shr_decode[] = {
+        "Exclusive",
+        "Shared",
+        "ExclusiveAndWake",     /* ACPI 5.0 */
+        "SharedAndWake"         /* ACPI 5.0 */
+};
+
+const char *acpi_gbl_siz_decode[] = {
+        "Transfer8",
+        "Transfer8_16",
+        "Transfer16",
+        "InvalidSize"
+};
+
+const char *acpi_gbl_trs_decode[] = {
+        "DenseTranslation",
+        "SparseTranslation"
+};
+
+const char *acpi_gbl_ttp_decode[] = {
+        "TypeStatic",
+        "TypeTranslation"
+};
+
+const char *acpi_gbl_typ_decode[] = {
+        "Compatibility",
+        "TypeA",
+        "TypeB",
+        "TypeF"
+};
+
+const char *acpi_gbl_ppc_decode[] = {
+        "PullDefault",
+        "PullUp",
+        "PullDown",
+        "PullNone"
+};
+
+const char *acpi_gbl_ior_decode[] = {
+        "IoRestrictionNone",
+        "IoRestrictionInputOnly",
+        "IoRestrictionOutputOnly",
+        "IoRestrictionNoneAndPreserve"
+};
+
+const char *acpi_gbl_dts_decode[] = {
+        "Width8bit",
+        "Width16bit",
+        "Width32bit",
+        "Width64bit",
+        "Width128bit",
+        "Width256bit",
+};
+
+/* GPIO connection type */
+
+const char *acpi_gbl_ct_decode[] = {
+        "Interrupt",
+        "I/O"
+};
+
+/* Serial bus type */
+
+const char *acpi_gbl_sbt_decode[] = {
+        "/* UNKNOWN serial bus type */",
+        "I2C",
+        "SPI",
+        "UART"
+};
+
+/* I2C serial bus access mode */
+
+const char *acpi_gbl_am_decode[] = {
+        "AddressingMode7Bit",
+        "AddressingMode10Bit"
+};
+
+/* I2C serial bus slave mode */
+
+const char *acpi_gbl_sm_decode[] = {
+        "ControllerInitiated",
+        "DeviceInitiated"
+};
+
+/* SPI serial bus wire mode */
+
+const char *acpi_gbl_wm_decode[] = {
+        "FourWireMode",
+        "ThreeWireMode"
+};
+
+/* SPI serial clock phase */
+
+const char *acpi_gbl_cph_decode[] = {
+        "ClockPhaseFirst",
+        "ClockPhaseSecond"
+};
+
+/* SPI serial bus clock polarity */
+
+const char *acpi_gbl_cpo_decode[] = {
+        "ClockPolarityLow",
+        "ClockPolarityHigh"
+};
+
+/* SPI serial bus device polarity */
+
+const char *acpi_gbl_dp_decode[] = {
+        "PolarityLow",
+        "PolarityHigh"
+};
+
+/* UART serial bus endian */
+
+const char *acpi_gbl_ed_decode[] = {
+        "LittleEndian",
+        "BigEndian"
+};
+
+/* UART serial bus bits per byte */
+
+const char *acpi_gbl_bpb_decode[] = {
+        "DataBitsFive",
+        "DataBitsSix",
+        "DataBitsSeven",
+        "DataBitsEight",
+        "DataBitsNine",
+        "/* UNKNOWN Bits per byte */",
+        "/* UNKNOWN Bits per byte */",
+        "/* UNKNOWN Bits per byte */"
+};
+
+/* UART serial bus stop bits */
+
+const char *acpi_gbl_sb_decode[] = {
+        "StopBitsZero",
+        "StopBitsOne",
+        "StopBitsOnePlusHalf",
+        "StopBitsTwo"
+};
+
+/* UART serial bus flow control */
+
+const char *acpi_gbl_fc_decode[] = {
+        "FlowControlNone",
+        "FlowControlHardware",
+        "FlowControlXON",
+        "/* UNKNOWN flow control keyword */"
+};
+
+/* UART serial bus parity type */
+
+const char *acpi_gbl_pt_decode[] = {
+        "ParityTypeNone",
+        "ParityTypeEven",
+        "ParityTypeOdd",
+        "ParityTypeMark",
+        "ParityTypeSpace",
+        "/* UNKNOWN parity keyword */",
+        "/* UNKNOWN parity keyword */",
+        "/* UNKNOWN parity keyword */"
+};
+
+/* pin_config type */
+
+const char *acpi_gbl_ptyp_decode[] = {
+        "Default",
+        "Bias Pull-up",
+        "Bias Pull-down",
+        "Bias Default",
+        "Bias Disable",
+        "Bias High Impedance",
+        "Bias Bus Hold",
+        "Drive Open Drain",
+        "Drive Open Source",
+        "Drive Push Pull",
+        "Drive Strength",
+        "Slew Rate",
+        "Input Debounce",
+        "Input Schmitt Trigger",
+};
+
+#endif
diff --git a/drivers/acpi/acpica/utresrc.c b/drivers/acpi/acpica/utresrc.c
index b4282ea32262..5fa992027b74 100644
--- a/drivers/acpi/acpica/utresrc.c
+++ b/drivers/acpi/acpica/utresrc.c
@@ -48,270 +48,6 @@
 #define _COMPONENT          ACPI_UTILITIES
 ACPI_MODULE_NAME("utresrc")
 
-#if defined(ACPI_DEBUG_OUTPUT) || defined (ACPI_DISASSEMBLER) || defined (ACPI_DEBUGGER)
-/*
- * Strings used to decode resource descriptors.
- * Used by both the disassembler and the debugger resource dump routines
- */
-const char *acpi_gbl_bm_decode[] = {
-        "NotBusMaster",
-        "BusMaster"
-};
-
-const char *acpi_gbl_config_decode[] = {
-        "0 - Good Configuration",
-        "1 - Acceptable Configuration",
-        "2 - Suboptimal Configuration",
-        "3 - ***Invalid Configuration***",
-};
-
-const char *acpi_gbl_consume_decode[] = {
-        "ResourceProducer",
-        "ResourceConsumer"
-};
-
-const char *acpi_gbl_dec_decode[] = {
-        "PosDecode",
-        "SubDecode"
-};
-
-const char *acpi_gbl_he_decode[] = {
-        "Level",
-        "Edge"
-};
-
-const char *acpi_gbl_io_decode[] = {
-        "Decode10",
-        "Decode16"
-};
-
-const char *acpi_gbl_ll_decode[] = {
-        "ActiveHigh",
-        "ActiveLow",
-        "ActiveBoth",
-        "Reserved"
-};
-
-const char *acpi_gbl_max_decode[] = {
-        "MaxNotFixed",
-        "MaxFixed"
-};
-
-const char *acpi_gbl_mem_decode[] = {
-        "NonCacheable",
-        "Cacheable",
-        "WriteCombining",
-        "Prefetchable"
-};
-
-const char *acpi_gbl_min_decode[] = {
-        "MinNotFixed",
-        "MinFixed"
-};
-
-const char *acpi_gbl_mtp_decode[] = {
-        "AddressRangeMemory",
-        "AddressRangeReserved",
-        "AddressRangeACPI",
-        "AddressRangeNVS"
-};
-
-const char *acpi_gbl_rng_decode[] = {
-        "InvalidRanges",
-        "NonISAOnlyRanges",
-        "ISAOnlyRanges",
-        "EntireRange"
-};
-
-const char *acpi_gbl_rw_decode[] = {
-        "ReadOnly",
-        "ReadWrite"
-};
-
-const char *acpi_gbl_shr_decode[] = {
-        "Exclusive",
-        "Shared",
-        "ExclusiveAndWake",     /* ACPI 5.0 */
-        "SharedAndWake"         /* ACPI 5.0 */
-};
-
-const char *acpi_gbl_siz_decode[] = {
-        "Transfer8",
-        "Transfer8_16",
-        "Transfer16",
-        "InvalidSize"
-};
-
-const char *acpi_gbl_trs_decode[] = {
-        "DenseTranslation",
-        "SparseTranslation"
-};
-
-const char *acpi_gbl_ttp_decode[] = {
-        "TypeStatic",
-        "TypeTranslation"
-};
-
-const char *acpi_gbl_typ_decode[] = {
-        "Compatibility",
-        "TypeA",
-        "TypeB",
-        "TypeF"
-};
-
-const char *acpi_gbl_ppc_decode[] = {
-        "PullDefault",
-        "PullUp",
-        "PullDown",
-        "PullNone"
-};
-
-const char *acpi_gbl_ior_decode[] = {
-        "IoRestrictionNone",
-        "IoRestrictionInputOnly",
-        "IoRestrictionOutputOnly",
-        "IoRestrictionNoneAndPreserve"
-};
-
-const char *acpi_gbl_dts_decode[] = {
-        "Width8bit",
-        "Width16bit",
-        "Width32bit",
-        "Width64bit",
-        "Width128bit",
-        "Width256bit",
-};
-
-/* GPIO connection type */
-
-const char *acpi_gbl_ct_decode[] = {
-        "Interrupt",
-        "I/O"
-};
-
-/* Serial bus type */
-
-const char *acpi_gbl_sbt_decode[] = {
-        "/* UNKNOWN serial bus type */",
-        "I2C",
-        "SPI",
-        "UART"
-};
-
-/* I2C serial bus access mode */
-
-const char *acpi_gbl_am_decode[] = {
-        "AddressingMode7Bit",
-        "AddressingMode10Bit"
-};
-
-/* I2C serial bus slave mode */
-
-const char *acpi_gbl_sm_decode[] = {
-        "ControllerInitiated",
-        "DeviceInitiated"
-};
-
-/* SPI serial bus wire mode */
-
-const char *acpi_gbl_wm_decode[] = {
-        "FourWireMode",
-        "ThreeWireMode"
-};
-
-/* SPI serial clock phase */
-
-const char *acpi_gbl_cph_decode[] = {
-        "ClockPhaseFirst",
-        "ClockPhaseSecond"
-};
-
-/* SPI serial bus clock polarity */
-
-const char *acpi_gbl_cpo_decode[] = {
-        "ClockPolarityLow",
-        "ClockPolarityHigh"
-};
-
-/* SPI serial bus device polarity */
-
-const char *acpi_gbl_dp_decode[] = {
-        "PolarityLow",
-        "PolarityHigh"
-};
-
-/* UART serial bus endian */
-
-const char *acpi_gbl_ed_decode[] = {
-        "LittleEndian",
-        "BigEndian"
-};
-
-/* UART serial bus bits per byte */
-
-const char *acpi_gbl_bpb_decode[] = {
-        "DataBitsFive",
-        "DataBitsSix",
-        "DataBitsSeven",
-        "DataBitsEight",
-        "DataBitsNine",
-        "/* UNKNOWN Bits per byte */",
-        "/* UNKNOWN Bits per byte */",
-        "/* UNKNOWN Bits per byte */"
-};
-
-/* UART serial bus stop bits */
-
-const char *acpi_gbl_sb_decode[] = {
-        "StopBitsZero",
-        "StopBitsOne",
-        "StopBitsOnePlusHalf",
-        "StopBitsTwo"
-};
-
-/* UART serial bus flow control */
-
-const char *acpi_gbl_fc_decode[] = {
-        "FlowControlNone",
-        "FlowControlHardware",
-        "FlowControlXON",
-        "/* UNKNOWN flow control keyword */"
-};
-
-/* UART serial bus parity type */
-
-const char *acpi_gbl_pt_decode[] = {
-        "ParityTypeNone",
-        "ParityTypeEven",
-        "ParityTypeOdd",
-        "ParityTypeMark",
-        "ParityTypeSpace",
-        "/* UNKNOWN parity keyword */",
-        "/* UNKNOWN parity keyword */",
-        "/* UNKNOWN parity keyword */"
-};
-
-/* pin_config type */
-
-const char *acpi_gbl_ptyp_decode[] = {
-        "Default",
-        "Bias Pull-up",
-        "Bias Pull-down",
-        "Bias Default",
-        "Bias Disable",
-        "Bias High Impedance",
-        "Bias Bus Hold",
-        "Drive Open Drain",
-        "Drive Open Source",
-        "Drive Push Pull",
-        "Drive Strength",
-        "Slew Rate",
-        "Input Debounce",
-        "Input Schmitt Trigger",
-};
-
-#endif
-
 /*
  * Base sizes of the raw AML resource descriptors, indexed by resource type.
  * Zero indicates a reserved (and therefore invalid) resource type.