Skip to contentSkip to conversation

ACPI/PRM: Find PRMT table before parse it

PATCH Applied Aubrey Li 2 participants 2 messages Sep 8, 2021 ACPI

lore
Share & tools
lore

Aubrey Li

author
#0 lore raw

PATCH v2 1/1 ACPI/PRM: Find PRMT table before parse it

Find and verify PRMT table before parse it, this eliminates a warning on machines without PRMT table.

	[    7.197173] ACPI: PRMT not present
Fixes cefc7ca46235 ("ACPI: PRM: implement OperationRegion handler for the PlatformRtMechanism subtype")
---
 drivers/acpi/prmt.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/acpi/prmt.c +9 -1
index 1f6007a..89c22bc 100644
@@ -288,10 +288,18 @@ static acpi_status acpi_platformrt_space_handler(u32 function,
 
 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.
 	 */
Signature · 1 line
2.7.4
maintainer Applied
#1 lore raw
Quoted 28 lines · Aubrey Li

Find and verify PRMT table before parse it, this eliminates a warning on machines without PRMT table.

        [    7.197173] ACPI: PRMT not present
Fixes cefc7ca46235 ("ACPI: PRM: implement OperationRegion handler for the PlatformRtMechanism subtype")
---
 drivers/acpi/prmt.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)
drivers/acpi/prmt.c +5 -1
index 1f6007a..89c22bc 100644
@@ -288,10 +288,18 @@ static acpi_status acpi_platformrt_space_handler(u32 function,
 
 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))

drivers/acpi/prmt.c static acpi_status acpi_platformrt_space_handler(u32 function,

Quoted 10 lines
drivers/acpi/prmt.c +4 -1
+               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.
         */
--

Applied as 5.15-rc material with some edits in the subject and changelog, thanks!