Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1p8EqF-0002X9-Tz for mharc-grub-devel@gnu.org; Thu, 22 Dec 2022 01:14:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p8EqD-0002WU-0G for grub-devel@gnu.org; Thu, 22 Dec 2022 01:14:05 -0500 Received: from gate.crashing.org ([63.228.1.57]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p8EqB-0002gE-7b for grub-devel@gnu.org; Thu, 22 Dec 2022 01:14:04 -0500 Received: from u0f3226c756e75a.ant.amazon.com (localhost.localdomain [127.0.0.1]) by gate.crashing.org (8.14.1/8.14.1) with ESMTP id 2BM6CxBf025856; Thu, 22 Dec 2022 00:13:01 -0600 From: Benjamin Herrenschmidt To: grub-devel@gnu.org Cc: Daniel Kiper Subject: [PATCH v2 1/8] acpi: Export a generic grub_acpi_find_table Date: Thu, 22 Dec 2022 17:12:50 +1100 Message-Id: <20221222061257.1598483-2-benh@kernel.crashing.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221222061257.1598483-1-benh@kernel.crashing.org> References: <20221222061257.1598483-1-benh@kernel.crashing.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=63.228.1.57; envelope-from=benh@kernel.crashing.org; helo=gate.crashing.org X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Dec 2022 06:14:05 -0000 And convert grub_acpi_find_fadt to use it Signed-off-by: Benjamin Herrenschmidt --- grub-core/kern/acpi.c | 43 +++++++++++++++++++++++++------------------ include/grub/acpi.h | 3 +++ 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/grub-core/kern/acpi.c b/grub-core/kern/acpi.c index 70898ddcd..5d5b54b72 100644 --- a/grub-core/kern/acpi.c +++ b/grub-core/kern/acpi.c @@ -85,35 +85,42 @@ grub_acpi_xsdt_find_table (struct grub_acpi_table_header *xsdt, const char *sig) return 0; } -struct grub_acpi_fadt * -grub_acpi_find_fadt (void) +void * +grub_acpi_find_table (const char *sig) { - struct grub_acpi_fadt *fadt = 0; + struct grub_acpi_fadt *r = 0; struct grub_acpi_rsdp_v10 *rsdpv1; struct grub_acpi_rsdp_v20 *rsdpv2; + rsdpv1 = grub_machine_acpi_get_rsdpv1 (); if (rsdpv1) - fadt = grub_acpi_rsdt_find_table ((struct grub_acpi_table_header *) - (grub_addr_t) rsdpv1->rsdt_addr, - GRUB_ACPI_FADT_SIGNATURE); - if (fadt) - return fadt; + r = grub_acpi_rsdt_find_table ((struct grub_acpi_table_header *) + (grub_addr_t) rsdpv1->rsdt_addr, + sig); + if (r) + return r; rsdpv2 = grub_machine_acpi_get_rsdpv2 (); if (rsdpv2) - fadt = grub_acpi_rsdt_find_table ((struct grub_acpi_table_header *) - (grub_addr_t) rsdpv2->rsdpv1.rsdt_addr, - GRUB_ACPI_FADT_SIGNATURE); - if (fadt) - return fadt; + r = grub_acpi_rsdt_find_table ((struct grub_acpi_table_header *) + (grub_addr_t) rsdpv2->rsdpv1.rsdt_addr, + sig); + if (r) + return r; if (rsdpv2 #if GRUB_CPU_SIZEOF_VOID_P != 8 && !(rsdpv2->xsdt_addr >> 32) #endif ) - fadt = grub_acpi_xsdt_find_table ((struct grub_acpi_table_header *) - (grub_addr_t) rsdpv2->xsdt_addr, - GRUB_ACPI_FADT_SIGNATURE); - if (fadt) - return fadt; + r = grub_acpi_xsdt_find_table ((struct grub_acpi_table_header *) + (grub_addr_t) rsdpv2->xsdt_addr, + sig); + if (r) + return r; return 0; } + +struct grub_acpi_fadt * +grub_acpi_find_fadt (void) +{ + return grub_acpi_find_table (GRUB_ACPI_FADT_SIGNATURE); +} diff --git a/include/grub/acpi.h b/include/grub/acpi.h index 84f49487d..8c126b2b9 100644 --- a/include/grub/acpi.h +++ b/include/grub/acpi.h @@ -244,4 +244,7 @@ enum struct grub_acpi_fadt * EXPORT_FUNC(grub_acpi_find_fadt) (void); +void * +EXPORT_FUNC(grub_acpi_find_table) (const char *sig); + #endif /* ! GRUB_ACPI_HEADER */ -- 2.34.1