 @@ -1,14 +1,14 @@
-/* $NetBSD: efiacpi.c,v 1.9 2021/05/21 21:53:15 jmcneill Exp $ */
+/* $NetBSD: efiacpi.c,v 1.10 2021/07/23 21:33:00 jmcneill Exp $ */
 /*-
  * Copyright (c) 2018 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jared McNeill <jmcneill@invisible.ca>.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -42,43 +42,48 @@ struct acpi_rdsp {
 	uint32_t rsdtphys;
 	uint32_t length;
 	uint64_t xsdtphys;
 	uint8_t extcsum;
 	uint8_t reserved[3];
 };
 #include <libfdt.h>
 #define	ACPI_FDT_SIZE	(128 * 1024)
 static EFI_GUID Acpi20TableGuid = ACPI_20_TABLE_GUID;
 static EFI_GUID Smbios3TableGuid = SMBIOS3_TABLE_GUID;
 static EFI_GUID SmbiosTableGuid = SMBIOS_TABLE_GUID;
 static int acpi_enable = 1;
 static void *acpi_root = NULL;
-static void *smbios3_table = NULL;
+static void *smbios_table = NULL;
 int
 efi_acpi_probe(void)
+{
 	EFI_STATUS status;
 	status = LibGetSystemConfigurationTable(&Acpi20TableGuid, &acpi_root);
 	if (EFI_ERROR(status))
 		return EIO;
-	status = LibGetSystemConfigurationTable(&Smbios3TableGuid, &smbios3_table);
+	status = LibGetSystemConfigurationTable(&Smbios3TableGuid, &smbios_table);
-	if (EFI_ERROR(status))
+	if (EFI_ERROR(status)) {
-		smbios3_table = NULL;
+		status = LibGetSystemConfigurationTable(&SmbiosTableGuid, &smbios_table);
+	}
 	if (EFI_ERROR(status)) {
 		smbios_table = NULL;
+	}
 	return 0;
+}
 int
 efi_acpi_available(void)
+{
 	return acpi_root != NULL;
+}
 int
 efi_acpi_enabled(void)
+{
 @@ -93,28 +98,28 @@ efi_acpi_enable(int enable)
 static char model_buf[128];
 static const char *
 efi_acpi_get_model(void)
+{
 	struct smbtable smbios;
 	struct smbios_sys *psys;
 	const char *s;
 	char *buf;
 	memset(model_buf, 0, sizeof(model_buf));
-	if (smbios3_table != NULL) {
+	if (smbios_table != NULL) {
-		smbios_init(smbios3_table);
+		smbios_init(smbios_table);
 		buf = model_buf;
 		smbios.cookie = 0;
 		if (smbios_find_table(SMBIOS_TYPE_SYSTEM, &smbios)) {
 			psys = smbios.tblhdr;
 			if ((s = smbios_get_string(&smbios, psys->vendor, buf, 64)) != NULL) {
 				buf += strlen(s);
 				*buf++ = ' ';
+			}
 			smbios_get_string(&smbios, psys->product, buf, 64);
+		}
+	}
 @@ -126,27 +131,27 @@ efi_acpi_get_model(void)
 void
 efi_acpi_show(void)
+{
 	struct acpi_rdsp *rsdp = acpi_root;
 	if (!efi_acpi_available())
 		return;
 	printf("ACPI: v%02d %c%c%c%c%c%c\n", rsdp->revision,
 	    rsdp->oemid[0], rsdp->oemid[1], rsdp->oemid[2],
 	    rsdp->oemid[3], rsdp->oemid[4], rsdp->oemid[5]);
-	if (smbios3_table)
+	if (smbios_table)
 		printf("SMBIOS: %s\n", efi_acpi_get_model());
+}
 int
 efi_acpi_create_fdt(void)
+{
 	int error;
 	void *fdt;
 	if (acpi_root == NULL)
 		return EINVAL;
 	fdt = AllocatePool(ACPI_FDT_SIZE);
 @@ -156,21 +161,21 @@ efi_acpi_create_fdt(void)
 	error = fdt_create_empty_tree(fdt, ACPI_FDT_SIZE);
 	if (error)
 		return EIO;
 	const char *model = efi_acpi_get_model();
 	fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "compatible", "netbsd,generic-acpi");
 	fdt_setprop_string(fdt, fdt_path_offset(fdt, "/"), "model", model);
 	fdt_setprop_cell(fdt, fdt_path_offset(fdt, "/"), "#address-cells", 2);
 	fdt_setprop_cell(fdt, fdt_path_offset(fdt, "/"), "#size-cells", 2);
 	fdt_add_subnode(fdt, fdt_path_offset(fdt, "/"), "chosen");
 	fdt_setprop_u64(fdt, fdt_path_offset(fdt, "/chosen"), "netbsd,acpi-root-table", (uint64_t)(uintptr_t)acpi_root);
-	if (smbios3_table)
+	if (smbios_table)
-		fdt_setprop_u64(fdt, fdt_path_offset(fdt, "/chosen"), "netbsd,smbios-table", (uint64_t)(uintptr_t)smbios3_table);
+		fdt_setprop_u64(fdt, fdt_path_offset(fdt, "/chosen"), "netbsd,smbios-table", (uint64_t)(uintptr_t)smbios_table);
 	fdt_add_subnode(fdt, fdt_path_offset(fdt, "/"), "acpi");
 	fdt_setprop_string(fdt, fdt_path_offset(fdt, "/acpi"), "compatible", "netbsd,acpi");
 	return efi_fdt_set_data(fdt);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: smbios.c,v 1.2 2019/12/27 09:45:27 msaitoh Exp $	*/
+/*	$NetBSD: smbios.c,v 1.3 2021/07/23 21:33:00 jmcneill Exp $	*/
 /*
  * Copyright (c) 1999 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -72,65 +72,93 @@
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR OR HIS RELATIVES BE LIABLE FOR ANY DIRECT,
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF MIND, USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: smbios.c,v 1.2 2019/12/27 09:45:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: smbios.c,v 1.3 2021/07/23 21:33:00 jmcneill Exp $");
 #include <sys/param.h>
 #include "efiboot.h"
 #include "smbios.h"
 struct smbios_entry smbios_entry;
-void
+static void
-smbios_init(uint8_t *p)
+smbios2_init(uint8_t *p)
+{
 	const struct smbhdr *sh = (const struct smbhdr *)p;
 	smbios_entry.addr = (void *)(uintptr_t)sh->addr;
 	smbios_entry.len = sh->size;
 	smbios_entry.rev = 0;
 	smbios_entry.mjr = sh->majrev;
 	smbios_entry.min = sh->minrev;
 	smbios_entry.doc = 0;
 	smbios_entry.count = sh->count;
+}
 static void
 smbios3_init(uint8_t *p)
+{
 	const struct smb3hdr *sh = (const struct smb3hdr *)p;
 	smbios_entry.addr = (void *)(uintptr_t)sh->addr;
 	smbios_entry.len = sh->size;
 	smbios_entry.rev = sh->eprev;
 	smbios_entry.mjr = sh->majrev;
 	smbios_entry.min = sh->minrev;
 	smbios_entry.doc = sh->docrev;
 	smbios_entry.count = UINT16_MAX;
+}
 void
 smbios_init(uint8_t *p)
+{
 	if (memcmp(p, "_SM3_", 5) == 0) {
 		smbios3_init(p);
 	} else if (memcmp(p, "_SM_", 4) == 0) {
 		smbios2_init(p);
+	}
+}
 /*
  * smbios_find_table() takes a caller supplied smbios struct type and
  * a pointer to a handle (struct smbtable) returning one if the structure
  * is successfully located and zero otherwise. Callers should take care
  * to initilize the cookie field of the smbtable structure to zero before
  * the first invocation of this function.
  * Multiple tables of the same type can be located by repeadtly calling
  * smbios_find_table with the same arguments.
  */
 int
 smbios_find_table(uint8_t type, struct smbtable *st)
+{
 	uint8_t *va, *end;
 	struct smbtblhdr *hdr;
 	int ret = 0, tcount = 1;
 	if (smbios_entry.addr == 0) {
 		return 0;
+	}
 	va = smbios_entry.addr;
 	end = va + smbios_entry.len;
 	/*
 	 * The cookie field of the smtable structure is used to locate
 	 * multiple instances of a table of an arbitrary type. Following the
 	 * sucessful location of a table, the type is encoded as bits 0:7 of
 	 * the cookie value, the offset in terms of the number of structures
 	 * preceding that referenced by the handle is encoded in bits 15:31.
 	 */
 	if ((st->cookie & 0xfff) == type && st->cookie >> 16) {
 		if ((uint8_t *)st->hdr >= va && (uint8_t *)st->hdr < end) {
 			hdr = st->hdr;
 @@ -163,26 +191,30 @@ smbios_find_table(uint8_t type, struct s
 		va+=2;
+	}
 	return ret;
+}
 char *
 smbios_get_string(struct smbtable *st, uint8_t indx, char *dest, size_t len)
+{
 	uint8_t *va, *end;
 	char *ret = NULL;
 	int i;
 	if (smbios_entry.addr == 0) {
 		return NULL;
+	}
 	va = (uint8_t *)st->hdr + st->hdr->size;
 	end = smbios_entry.addr + smbios_entry.len;
 	for (i = 1; va < end && i < indx && *va; i++)
 		while (*va++)
+			;
 	if (i == indx) {
 		if (va + len < end) {
 			ret = dest;
 			memcpy(ret, va, len);
 			ret[len - 1] = '\0';
+		}
+	}