diff options
| author | Aubrey Li <aubrey.li@intel.com> | 2021-09-08 18:55:45 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-15 10:02:36 +0200 |
| commit | e364e3b5e4cf5d203fd12a75752a146edb245e4a (patch) | |
| tree | 769249ddbe7f42927664767e0924f3fc90a54044 | |
| parent | 5c0d1ef1aa30e58bf2142b334d79e642831b8597 (diff) | |
| download | linux-stable-e364e3b5e4cf5d203fd12a75752a146edb245e4a.tar.gz linux-stable-e364e3b5e4cf5d203fd12a75752a146edb245e4a.tar.bz2 linux-stable-e364e3b5e4cf5d203fd12a75752a146edb245e4a.zip | |
ACPI: PRM: Find PRMT table before parsing it
commit 3265cc3ec52e75fc8daf189954cebda27ad26b2e upstream.
Find and verify PRMT before parsing it, which eliminates a
warning on machines without PRMT:
[ 7.197173] ACPI: PRMT not present
Fixes: cefc7ca46235 ("ACPI: PRM: implement OperationRegion handler for the PlatformRtMechanism subtype")
Signed-off-by: Aubrey Li <aubrey.li@linux.intel.com>
Tested-by: Paul Menzel <pmenzel@molgen.mpg.de>
Cc: 5.14+ <stable@vger.kernel.org> # 5.14+
[ rjw: Subject and changelog edits ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/acpi/prmt.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/acpi/prmt.c b/drivers/acpi/prmt.c index 1f6007abcf18..89c22bc55057 100644 --- a/drivers/acpi/prmt.c +++ b/drivers/acpi/prmt.c @@ -288,10 +288,18 @@ invalid_guid: void __init init_prmt(void) { + struct acpi_table_header *tbl; acpi_status status; - int mc = acpi_table_parse_entries(ACPI_SIG_PRMT, sizeof(struct acpi_table_prmt) + + int mc; + + status = acpi_get_table(ACPI_SIG_PRMT, 0, &tbl); + if (ACPI_FAILURE(status)) + return; + + mc = acpi_table_parse_entries(ACPI_SIG_PRMT, sizeof(struct acpi_table_prmt) + sizeof (struct acpi_table_prmt_header), 0, acpi_parse_prmt, 0); + acpi_put_table(tbl); /* * Return immediately if PRMT table is not present or no PRM module found. */ |