Merge branches 'acpica' and 'acpi-tables'

* acpica:
  ACPICA: Update version to 20200430
  ACPICA: Fix required parameters for _NIG and _NIH
  ACPICA: Dispatcher: add status checks
  ACPICA: Disassembler: ignore AE_ALREADY_EXISTS status when parsing create operators
  ACPICA: Move acpi_gbl_next_cmd_num definition to acglobal.h
  ACPICA: Make acpi_protocol_lengths static

* acpi-tables:
  ACPI: sleep: Put the FACS table after using it
  ACPI: scan: Put SPCR and STAO table after using it
  ACPI: EC: Put the ACPI table after using it
  ACPI: APEI: Put the HEST table for error path
  ACPI: APEI: Put the error record serialization table for error path
  ACPI: APEI: Put the error injection table for error path and module exit
  ACPI: APEI: Put the boot error record table after parsing
  ACPI: watchdog: Put the watchdog action table after parsing
  ACPI: LPIT: Put the low power idle table after using it

diff --git a/drivers/acpi/acpi_lpit.c b/drivers/acpi/acpi_lpit.c
index 953437a..48e5059 100644 (file)
--- a/drivers/acpi/acpi_lpit.c
+++ b/drivers/acpi/acpi_lpit.c
@@ -151,10 +151,11 @@ void acpi_init_lpit(void)
        struct acpi_table_lpit *lpit;
 
        status = acpi_get_table(ACPI_SIG_LPIT, 0, (struct acpi_table_header **)&lpit);
-
        if (ACPI_FAILURE(status))
                return;
 
        lpit_process((u64)lpit + sizeof(*lpit),
                     (u64)lpit + lpit->header.length);
+
+       acpi_put_table((struct acpi_table_header *)lpit);
 }

diff --git a/drivers/acpi/acpi_watchdog.c b/drivers/acpi/acpi_watchdog.c
index 6e9ec6e..5c1e9ea 100644 (file)
--- a/drivers/acpi/acpi_watchdog.c
+++ b/drivers/acpi/acpi_watchdog.c
@@ -73,6 +73,7 @@ static const struct acpi_table_wdat *acpi_watchdog_get_wdat(void)
        }
 
        if (acpi_watchdog_uses_rtc(wdat)) {
+               acpi_put_table((struct acpi_table_header *)wdat);
                pr_info("Skipping WDAT on this system because it uses RTC SRAM\n");
                return NULL;
        }
@@ -117,12 +118,12 @@ void __init acpi_watchdog_init(void)
 
        /* Watchdog disabled by BIOS */
        if (!(wdat->flags & ACPI_WDAT_ENABLED))
-               return;
+               goto fail_put_wdat;
 
        /* Skip legacy PCI WDT devices */
        if (wdat->pci_segment != 0xff || wdat->pci_bus != 0xff ||
            wdat->pci_device != 0xff || wdat->pci_function != 0xff)
-               return;
+               goto fail_put_wdat;
 
        INIT_LIST_HEAD(&resource_list);
 
@@ -188,4 +189,6 @@ void __init acpi_watchdog_init(void)
 
 fail_free_resource_list:
        resource_list_free(&resource_list);
+fail_put_wdat:
+       acpi_put_table((struct acpi_table_header *)wdat);
 }

diff --git a/drivers/acpi/acpica/acglobal.h b/drivers/acpi/acpica/acglobal.h
index 38ffa2c..1030a0c 100644 (file)
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
@@ -290,6 +290,7 @@ ACPI_GLOBAL(struct acpi_external_file *, acpi_gbl_external_file_list);
 #ifdef ACPI_DEBUGGER
 ACPI_INIT_GLOBAL(u8, acpi_gbl_abort_method, FALSE);
 ACPI_INIT_GLOBAL(acpi_thread_id, acpi_gbl_db_thread_id, ACPI_INVALID_THREAD_ID);
+ACPI_INIT_GLOBAL(u32, acpi_gbl_next_cmd_num, 1);
 
 ACPI_GLOBAL(u8, acpi_gbl_db_opt_no_ini_methods);
 ACPI_GLOBAL(u8, acpi_gbl_db_opt_no_region_support);

diff --git a/drivers/acpi/acpica/acpredef.h b/drivers/acpi/acpica/acpredef.h
index cd0f5df..2cbb566 100644 (file)
--- a/drivers/acpi/acpica/acpredef.h
+++ b/drivers/acpi/acpica/acpredef.h
@@ -640,10 +640,10 @@ const union acpi_predefined_info acpi_gbl_predefined_methods[] = {
        {{"_NIC", METHOD_0ARGS, /* ACPI 6.3 */
          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
 
-       {{"_NIG", METHOD_1ARGS(ACPI_TYPE_BUFFER),       /* ACPI 6.3 */
+       {{"_NIG", METHOD_0ARGS, /* ACPI 6.3 */
          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
 
-       {{"_NIH", METHOD_0ARGS, /* ACPI 6.3 */
+       {{"_NIH", METHOD_1ARGS(ACPI_TYPE_BUFFER), /* ACPI 6.3 */
          METHOD_RETURNS(ACPI_RTYPE_BUFFER)}},
 
        {{"_NTT", METHOD_0ARGS,

diff --git a/drivers/acpi/acpica/dbhistry.c b/drivers/acpi/acpica/dbhistry.c
index bb9600b..f5fba14 100644 (file)
--- a/drivers/acpi/acpica/dbhistry.c
+++ b/drivers/acpi/acpica/dbhistry.c
@@ -27,7 +27,6 @@ static HISTORY_INFO acpi_gbl_history_buffer[HISTORY_SIZE];
 static u16 acpi_gbl_lo_history = 0;
 static u16 acpi_gbl_num_history = 0;
 static u16 acpi_gbl_next_history_index = 0;
-u32 acpi_gbl_next_cmd_num = 1;
 
 /*******************************************************************************
  *

diff --git a/drivers/acpi/acpica/dsfield.c b/drivers/acpi/acpica/dsfield.c
index c901f5a..fa768b3 100644 (file)
--- a/drivers/acpi/acpica/dsfield.c
+++ b/drivers/acpi/acpica/dsfield.c
@@ -177,7 +177,10 @@ acpi_ds_create_buffer_field(union acpi_parse_object *op,
                                        arg->common.value.string, ACPI_TYPE_ANY,
                                        ACPI_IMODE_LOAD_PASS1, flags,
                                        walk_state, &node);
-               if (ACPI_FAILURE(status)) {
+               if ((walk_state->parse_flags & ACPI_PARSE_DISASSEMBLE)
+                   && status == AE_ALREADY_EXISTS) {
+                       status = AE_OK;
+               } else if (ACPI_FAILURE(status)) {
                        ACPI_ERROR_NAMESPACE(walk_state->scope_info,
                                             arg->common.value.string, status);
                        return_ACPI_STATUS(status);
@@ -514,13 +517,20 @@ acpi_ds_create_field(union acpi_parse_object *op,
        info.region_node = region_node;
 
        status = acpi_ds_get_field_names(&info, walk_state, arg->common.next);
+       if (ACPI_FAILURE(status)) {
+               return_ACPI_STATUS(status);
+       }
+
        if (info.region_node->object->region.space_id ==
-           ACPI_ADR_SPACE_PLATFORM_COMM
-           && !(region_node->object->field.internal_pcc_buffer =
-                ACPI_ALLOCATE_ZEROED(info.region_node->object->region.
-                                     length))) {
-               return_ACPI_STATUS(AE_NO_MEMORY);
+           ACPI_ADR_SPACE_PLATFORM_COMM) {
+               region_node->object->field.internal_pcc_buffer =
+                   ACPI_ALLOCATE_ZEROED(info.region_node->object->region.
+                                        length);
+               if (!region_node->object->field.internal_pcc_buffer) {
+                       return_ACPI_STATUS(AE_NO_MEMORY);
+               }
        }
+
        return_ACPI_STATUS(status);
 }
 

diff --git a/drivers/acpi/acpica/exfield.c b/drivers/acpi/acpica/exfield.c
index e85eb31..3323a2b 100644 (file)
--- a/drivers/acpi/acpica/exfield.c
+++ b/drivers/acpi/acpica/exfield.c
@@ -22,7 +22,7 @@ ACPI_MODULE_NAME("exfield")
  */
 #define ACPI_INVALID_PROTOCOL_ID        0x80
 #define ACPI_MAX_PROTOCOL_ID            0x0F
-const u8 acpi_protocol_lengths[] = {
+static const u8 acpi_protocol_lengths[] = {
        ACPI_INVALID_PROTOCOL_ID,       /* 0 - reserved */
        ACPI_INVALID_PROTOCOL_ID,       /* 1 - reserved */
        0x00,                   /* 2 - ATTRIB_QUICK */

diff --git a/drivers/acpi/apei/bert.c b/drivers/acpi/apei/bert.c
index 1155fb9..19e50fc 100644 (file)
--- a/drivers/acpi/apei/bert.c
+++ b/drivers/acpi/apei/bert.c
@@ -119,7 +119,7 @@ static int __init bert_init(void)
        rc = bert_check_table(bert_tab);
        if (rc) {
                pr_err(FW_BUG "table invalid.\n");
-               return rc;
+               goto out_put_bert_tab;
        }
 
        region_len = bert_tab->region_length;
@@ -127,7 +127,7 @@ static int __init bert_init(void)
        rc = apei_resources_add(&bert_resources, bert_tab->address,
                                region_len, true);
        if (rc)
-               return rc;
+               goto out_put_bert_tab;
        rc = apei_resources_request(&bert_resources, "APEI BERT");
        if (rc)
                goto out_fini;
@@ -142,6 +142,8 @@ static int __init bert_init(void)
        apei_resources_release(&bert_resources);
 out_fini:
        apei_resources_fini(&bert_resources);
+out_put_bert_tab:
+       acpi_put_table((struct acpi_table_header *)bert_tab);
 
        return rc;
 }

diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index 086373f..1331567 100644 (file)
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -692,7 +692,7 @@ static int __init einj_init(void)
        rc = einj_check_table(einj_tab);
        if (rc) {
                pr_warn(FW_BUG "Invalid EINJ table.\n");
-               return -EINVAL;
+               goto err_put_table;
        }
 
        rc = -ENOMEM;
@@ -760,6 +760,8 @@ err_release:
 err_fini:
        apei_resources_fini(&einj_resources);
        debugfs_remove_recursive(einj_debug_dir);
+err_put_table:
+       acpi_put_table((struct acpi_table_header *)einj_tab);
 
        return rc;
 }
@@ -780,6 +782,7 @@ static void __exit einj_exit(void)
        apei_resources_release(&einj_resources);
        apei_resources_fini(&einj_resources);
        debugfs_remove_recursive(einj_debug_dir);
+       acpi_put_table((struct acpi_table_header *)einj_tab);
 }
 
 module_init(einj_init);

diff --git a/drivers/acpi/apei/erst.c b/drivers/acpi/apei/erst.c
index 2015a09..2e0b0fc 100644 (file)
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
@@ -1122,7 +1122,7 @@ static int __init erst_init(void)
        rc = erst_check_table(erst_tab);
        if (rc) {
                pr_err(FW_BUG "ERST table is invalid.\n");
-               goto err;
+               goto err_put_erst_tab;
        }
 
        apei_resources_init(&erst_resources);
@@ -1196,6 +1196,8 @@ err_release:
        apei_resources_release(&erst_resources);
 err_fini:
        apei_resources_fini(&erst_resources);
+err_put_erst_tab:
+       acpi_put_table((struct acpi_table_header *)erst_tab);
 err:
        erst_disable = 1;
        return rc;

diff --git a/drivers/acpi/apei/hest.c b/drivers/acpi/apei/hest.c
index 8224024..953a2fa 100644 (file)
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
@@ -243,8 +243,8 @@ void __init acpi_hest_init(void)
        } else if (ACPI_FAILURE(status)) {
                const char *msg = acpi_format_exception(status);
                pr_err(HEST_PFX "Failed to get table, %s\n", msg);
-               rc = -EINVAL;
-               goto err;
+               hest_disable = HEST_DISABLED;
+               return;
        }
 
        rc = apei_hest_parse(hest_parse_cmc, NULL);
@@ -266,4 +266,5 @@ void __init acpi_hest_init(void)
        return;
 err:
        hest_disable = HEST_DISABLED;
+       acpi_put_table((struct acpi_table_header *)hest_tab);
 }

diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
index 1af2125..599937d 100644 (file)
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
@@ -1783,13 +1783,14 @@ static void __init acpi_ec_ecdt_start(void)
                return;
 
        status = acpi_get_handle(NULL, ecdt_ptr->id, &handle);
-       if (ACPI_FAILURE(status))
-               return;
+       if (ACPI_SUCCESS(status)) {
+               boot_ec->handle = handle;
 
-       boot_ec->handle = handle;
+               /* Add a special ACPI device object to represent the boot EC. */
+               acpi_bus_register_early_device(ACPI_BUS_TYPE_ECDT_EC);
+       }
 
-       /* Add a special ACPI device object to represent the boot EC. */
-       acpi_bus_register_early_device(ACPI_BUS_TYPE_ECDT_EC);
+       acpi_put_table((struct acpi_table_header *)ecdt_ptr);
 }
 
 /*
@@ -1891,12 +1892,12 @@ void __init acpi_ec_ecdt_probe(void)
                 * Asus X50GL:
                 * https://bugzilla.kernel.org/show_bug.cgi?id=11880
                 */
-               return;
+               goto out;
        }
 
        ec = acpi_ec_alloc();
        if (!ec)
-               return;
+               goto out;
 
        if (EC_FLAGS_CORRECT_ECDT) {
                ec->command_addr = ecdt_ptr->data.address;
@@ -1922,13 +1923,16 @@ void __init acpi_ec_ecdt_probe(void)
        ret = acpi_ec_setup(ec, NULL);
        if (ret) {
                acpi_ec_free(ec);
-               return;
+               goto out;
        }
 
        boot_ec = ec;
        boot_ec_is_ecdt = true;
 
        pr_info("Boot ECDT EC used to handle transactions\n");
+
+out:
+       acpi_put_table((struct acpi_table_header *)ecdt_ptr);
 }
 
 #ifdef CONFIG_PM_SLEEP

diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 6d34488..5287ab9 100644 (file)
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2157,10 +2157,13 @@ static void __init acpi_get_spcr_uart_addr(void)
 
        status = acpi_get_table(ACPI_SIG_SPCR, 0,
                                (struct acpi_table_header **)&spcr_ptr);
-       if (ACPI_SUCCESS(status))
-               spcr_uart_addr = spcr_ptr->serial_port.address;
-       else
-               printk(KERN_WARNING PREFIX "STAO table present, but SPCR is missing\n");
+       if (ACPI_FAILURE(status)) {
+               pr_warn(PREFIX "STAO table present, but SPCR is missing\n");
+               return;
+       }
+
+       spcr_uart_addr = spcr_ptr->serial_port.address;
+       acpi_put_table((struct acpi_table_header *)spcr_ptr);
 }
 
 static bool acpi_scan_initialized;
@@ -2196,10 +2199,12 @@ int __init acpi_scan_init(void)
                                (struct acpi_table_header **)&stao_ptr);
        if (ACPI_SUCCESS(status)) {
                if (stao_ptr->header.length > sizeof(struct acpi_table_stao))
-                       printk(KERN_INFO PREFIX "STAO Name List not yet supported.");
+                       pr_info(PREFIX "STAO Name List not yet supported.\n");
 
                if (stao_ptr->ignore_uart)
                        acpi_get_spcr_uart_addr();
+
+               acpi_put_table((struct acpi_table_header *)stao_ptr);
        }
 
        acpi_gpe_apply_masked_gpes();

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index fd9d4e8..2a0e1c0 100644 (file)
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -1280,8 +1280,10 @@ static void acpi_sleep_hibernate_setup(void)
                return;
 
        acpi_get_table(ACPI_SIG_FACS, 1, (struct acpi_table_header **)&facs);
-       if (facs)
+       if (facs) {
                s4_hardware_signature = facs->hardware_signature;
+               acpi_put_table((struct acpi_table_header *)facs);
+       }
 }
 #else /* !CONFIG_HIBERNATION */
 static inline void acpi_sleep_hibernate_setup(void) {}

diff --git a/include/acpi/acpixf.h b/include/acpi/acpixf.h
index 49b519f..1dc8d26 100644 (file)
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
@@ -12,7 +12,7 @@
 
 /* Current ACPICA subsystem version in YYYYMMDD format */
 
-#define ACPI_CA_VERSION                 0x20200326
+#define ACPI_CA_VERSION                 0x20200430
 
 #include <acpi/acconfig.h>
 #include <acpi/actypes.h>