[acpi] Make acpi_find_rsdt() a per-platform method

Signed-off-by: Michael Brown <mcb30@ipxe.org>

5 files changed, 171 insertions, 16 deletions

diff --git a/src/arch/arm/include/bits/acpi.h b/src/arch/arm/include/bits/acpi.h
new file mode 100644
index 00000000..f9f2f00e
--- /dev/null
+++ b/src/arch/arm/include/bits/acpi.h
@@ -0,0 +1,12 @@
+#ifndef _BITS_ACPI_H
+#define _BITS_ACPI_H
+
+/** @file
+ *
+ * ARM-specific ACPI API implementations
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#endif /* _BITS_ACPI_H */
diff --git a/src/arch/x86/include/bits/acpi.h b/src/arch/x86/include/bits/acpi.h
new file mode 100644
index 00000000..a6ff9080
--- /dev/null
+++ b/src/arch/x86/include/bits/acpi.h
@@ -0,0 +1,14 @@
+#ifndef _BITS_ACPI_H
+#define _BITS_ACPI_H
+
+/** @file
+ *
+ * x86-specific ACPI API implementations
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#include <ipxe/rsdp.h>
+
+#endif /* _BITS_ACPI_H */
diff --git a/src/arch/x86/include/ipxe/rsdp.h b/src/arch/x86/include/ipxe/rsdp.h
new file mode 100644
index 00000000..7e32c001
--- /dev/null
+++ b/src/arch/x86/include/ipxe/rsdp.h
@@ -0,0 +1,18 @@
+#ifndef _IPXE_RSDP_H
+#define _IPXE_RSDP_H
+
+/** @file
+ *
+ * Standard PC-BIOS ACPI RSDP interface
+ *
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+#ifdef ACPI_RSDP
+#define ACPI_PREFIX_rsdp
+#else
+#define ACPI_PREFIX_rsdp __rsdp_
+#endif
+
+#endif /* _IPXE_RSDP_H */
diff --git a/src/arch/x86/interface/pcbios/acpipwr.c b/src/arch/x86/interface/pcbios/acpipwr.c
index d19f972d..dc164c7d 100644
--- a/src/arch/x86/interface/pcbios/acpipwr.c
+++ b/src/arch/x86/interface/pcbios/acpipwr.c
@@ -26,8 +26,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 #include <unistd.h>
 #include <errno.h>
 #include <byteswap.h>
-#include <realmode.h>
-#include <bios.h>
 #include <ipxe/io.h>
 #include <ipxe/acpi.h>
 #include <ipxe/acpipwr.h>
@@ -51,8 +49,6 @@ FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
  */
 int acpi_poweroff ( void ) {
 	struct acpi_fadt fadtab;
-	uint16_t ebda;
-	userptr_t rsdt;
 	userptr_t fadt;
 	unsigned int pm1a_cnt_blk;
 	unsigned int pm1b_cnt_blk;
@@ -63,18 +59,8 @@ int acpi_poweroff ( void ) {
 	int s5;
 	int rc;
 
-	/* Locate EBDA */
-	get_real ( ebda, BDA_SEG, BDA_EBDA );
-
-	/* Locate RSDT */
-	rsdt = acpi_find_rsdt ( real_to_user ( ebda, 0 ) );
-	if ( ! rsdt ) {
-		DBGC ( colour, "ACPI could not find RSDT (EBDA %04x)\n", ebda );
-		return -ENOENT;
-	}
-
 	/* Locate FADT */
-	fadt = acpi_find ( rsdt, FADT_SIGNATURE, 0 );
+	fadt = acpi_find ( FADT_SIGNATURE, 0 );
 	if ( ! fadt ) {
 		DBGC ( colour, "ACPI could not find FADT\n" );
 		return -ENOENT;
@@ -88,7 +74,7 @@ int acpi_poweroff ( void ) {
 	pm1b_cnt = ( pm1b_cnt_blk + ACPI_PM1_CNT );
 
 	/* Extract \_S5 from DSDT or any SSDT */
-	s5 = acpi_sx ( rsdt, S5_SIGNATURE );
+	s5 = acpi_sx ( S5_SIGNATURE );
 	if ( s5 < 0 ) {
 		rc = s5;
 		DBGC ( colour, "ACPI could not extract \\_S5: %s\n",
diff --git a/src/arch/x86/interface/pcbios/rsdp.c b/src/arch/x86/interface/pcbios/rsdp.c
new file mode 100644
index 00000000..8da0b558
--- /dev/null
+++ b/src/arch/x86/interface/pcbios/rsdp.c
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2017 Michael Brown <mbrown@fensystems.co.uk>.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
+ */
+
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
+
+/**
+ * @file
+ *
+ * ACPI Root System Description Pointer
+ *
+ */
+
+#include <stdint.h>
+#include <realmode.h>
+#include <bios.h>
+#include <ipxe/acpi.h>
+#include <ipxe/rsdp.h>
+
+/** EBDA RSDP maximum segment */
+#define RSDP_EBDA_END_SEG 0xa000
+
+/** Fixed BIOS area RSDP start address */
+#define RSDP_BIOS_START 0xe0000
+
+/** Fixed BIOS area RSDP length */
+#define RSDP_BIOS_LEN 0x20000
+
+/** Stride at which to search for RSDP */
+#define RSDP_STRIDE 16
+
+/**
+ * Locate ACPI root system description table within a memory range
+ *
+ * @v start		Start address to search
+ * @v len		Length to search
+ * @ret rsdt		ACPI root system description table, or UNULL
+ */
+static userptr_t rsdp_find_rsdt_range ( userptr_t start, size_t len ) {
+	static const char signature[8] = RSDP_SIGNATURE;
+	struct acpi_rsdp rsdp;
+	userptr_t rsdt;
+	size_t offset;
+	uint8_t sum;
+	unsigned int i;
+
+	/* Search for RSDP */
+	for ( offset = 0 ; ( ( offset + sizeof ( rsdp ) ) < len ) ;
+	      offset += RSDP_STRIDE ) {
+
+		/* Check signature and checksum */
+		copy_from_user ( &rsdp, start, offset, sizeof ( rsdp ) );
+		if ( memcmp ( rsdp.signature, signature,
+			      sizeof ( signature ) ) != 0 )
+			continue;
+		for ( sum = 0, i = 0 ; i < sizeof ( rsdp ) ; i++ )
+			sum += *( ( ( uint8_t * ) &rsdp ) + i );
+		if ( sum != 0 )
+			continue;
+
+		/* Extract RSDT */
+		rsdt = phys_to_user ( le32_to_cpu ( rsdp.rsdt ) );
+		DBGC ( rsdt, "RSDT %#08lx found via RSDP %#08lx\n",
+		       user_to_phys ( rsdt, 0 ),
+		       user_to_phys ( start, offset ) );
+		return rsdt;
+	}
+
+	return UNULL;
+}
+
+/**
+ * Locate ACPI root system description table
+ *
+ * @ret rsdt		ACPI root system description table, or UNULL
+ */
+static userptr_t rsdp_find_rsdt ( void ) {
+	static userptr_t rsdt;
+	uint16_t ebda_seg;
+	userptr_t ebda;
+	size_t ebda_len;
+
+	/* Return existing RSDT if already found */
+	if ( rsdt )
+		return rsdt;
+
+	/* Search EBDA */
+	get_real ( ebda_seg, BDA_SEG, BDA_EBDA );
+	if ( ebda_seg < RSDP_EBDA_END_SEG ) {
+	     ebda = real_to_user ( ebda_seg, 0 );
+	     ebda_len = ( ( RSDP_EBDA_END_SEG - ebda_seg ) * 16 );
+	     rsdt = rsdp_find_rsdt_range ( ebda, ebda_len );
+	     if ( rsdt )
+		     return rsdt;
+	}
+
+	/* Search fixed BIOS area */
+	rsdt = rsdp_find_rsdt_range ( phys_to_user ( RSDP_BIOS_START ),
+				      RSDP_BIOS_LEN );
+	if ( rsdt )
+		return rsdt;
+
+	return UNULL;
+}
+
+PROVIDE_ACPI ( rsdp, acpi_find_rsdt, rsdp_find_rsdt );