 @@ -1,16 +1,16 @@
-/*	$NetBSD: bios32.c,v 1.1 2017/08/15 06:27:40 maxv Exp $	*/
+/*	$NetBSD: bios32.c,v 1.2 2017/08/15 06:37:50 maxv 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
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -31,38 +31,38 @@
  */
 /*
  * Copyright (c) 1999, by UCHIYAMA Yasushi
  * All rights reserved.
+ *
  * 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.
  * 2. The name of the developer may NOT be used to endorse or promote products
  *    derived from this software without specific prior written permission.
+ *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR 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 CONTRIBUTORS 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 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.
  */
 /*
  * Copyright (c) 1997-2001 Michael Shalayeff
  * All rights reserved.
+ *
  * 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -76,31 +76,31 @@
  * (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.
  */
 /*
  * Basic interface to BIOS32 services.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bios32.c,v 1.1 2017/08/15 06:27:40 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bios32.c,v 1.2 2017/08/15 06:37:50 maxv Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <dev/isa/isareg.h>
 #include <machine/isa_machdep.h>
 #include <machine/segments.h>
 #include <machine/bios32.h>
 #include <x86/smbiosvar.h>
 #include <x86/efi.h>
 #include <uvm/uvm.h>
 #include "ipmi.h"
 #include "opt_xen.h"
 @@ -182,26 +182,75 @@ bios32_init(void)
 	for (p = ISA_HOLE_VADDR(SMBIOS_START);
 	    p < (uint8_t *)ISA_HOLE_VADDR(SMBIOS_END); p+= 16) {
 		if (smbios3_check_header(p)) {
 			smbios3_map_kva(p);
 			return;
+		}
 		if (smbios2_check_header(p)) {
 			smbios2_map_kva(p);
 			return;
+		}
+	}
+}
 /*
  * Call BIOS32 to locate the specified BIOS32 service, and fill
  * in the entry point information.
  */
 int
 bios32_service(uint32_t service, bios32_entry_t e, bios32_entry_info_t ei)
+{
 #ifdef i386
 	uint32_t eax, ebx, ecx, edx;
 	paddr_t entry;
 	if (bios32_entry.offset == 0)
 		return 0;	/* BIOS32 not present */
 	__asm volatile("lcall *(%%edi)"
 		: "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
 		: "0" (service), "1" (0), "D" (&bios32_entry));
 	if ((eax & 0xff) != 0)
 		return 0;	/* service not found */
 	entry = ebx + edx;
 	if (entry < BIOS32_START || entry >= BIOS32_END) {
 		aprint_error("BIOS32: entry point for service %c%c%c%c is "
 		    "outside allowable range\n",
 		    service & 0xff,
 		    (service >> 8) & 0xff,
 		    (service >> 16) & 0xff,
 		    (service >> 24) & 0xff);
 		return 0;
+	}
 	e->offset = (void *)ISA_HOLE_VADDR(entry);
 	e->segment = GSEL(GCODE_SEL, SEL_KPL);
 	ei->bei_base = ebx;
 	ei->bei_size = ecx;
 	ei->bei_entry = entry;
 #else
 	(void)service;
 	(void)e;
 	(void)ei;
 	panic("bios32_service not implemented on amd64");
 #endif
 	return 1;
+}
 static int
 smbios2_check_header(const uint8_t *p)
+{
 	const struct smbhdr *sh = (const struct smbhdr *)p;
 	uint8_t chksum;
 	int i;
 	if (sh->sig != BIOS32_MAKESIG('_', 'S', 'M', '_'))
 		return 0;
 	i = sh->len;
 	for (chksum = 0; i--; )
 		chksum += p[i];
 	if (chksum != 0)
 @@ -238,28 +287,27 @@ smbios2_map_kva(const uint8_t *p)
 	smbios_entry.min = sh->minrev;
 	smbios_entry.doc = 0;
 	smbios_entry.count = sh->count;
 	for (; pa < end; pa+= NBPG, eva+= NBPG)
 #ifdef XEN
 		pmap_kenter_ma(eva, pa, VM_PROT_READ, 0);
 #else
 		pmap_kenter_pa(eva, pa, VM_PROT_READ, 0);
 #endif
 	pmap_update(pmap_kernel());
 	aprint_debug("SMBIOS rev. %d.%d @ 0x%lx (%d entries)\n",
-		    sh->majrev, sh->minrev, (u_long)sh->addr,
+	    sh->majrev, sh->minrev, (u_long)sh->addr, sh->count);
 		    sh->count);
+}
 static int
 smbios3_check_header(const uint8_t *p)
+{
 	const struct smb3hdr *sh = (const struct smb3hdr *)p;
 	uint8_t chksum;
 	int i;
 	if (p[0] != '_' || p[1] != 'S' || p[2] != 'M' ||
 	    p[3] != '3' || p[4] != '_')
 		return 0;
 	i = sh->len;
 @@ -292,77 +340,28 @@ smbios3_map_kva(const uint8_t *p)
 	smbios_entry.mjr = sh->majrev;
 	smbios_entry.min = sh->minrev;
 	smbios_entry.doc = sh->docrev;
 	smbios_entry.count = UINT16_MAX;
 	for (; pa < end; pa += NBPG, eva += NBPG)
 #ifdef XEN
 		pmap_kenter_ma(eva, pa, VM_PROT_READ, 0);
 #else
 		pmap_kenter_pa(eva, pa, VM_PROT_READ, 0);
 #endif
 	pmap_update(pmap_kernel());
-	aprint_debug("SMBIOS rev. %d.%d.%d @ 0x%lx\n",
+	aprint_debug("SMBIOS rev. %d.%d.%d @ 0x%lx\n", sh->majrev,
-		    sh->majrev, sh->minrev, sh->docrev, (u_long)sh->addr);
+	    sh->minrev, sh->docrev, (u_long)sh->addr);
 /*
  * Call BIOS32 to locate the specified BIOS32 service, and fill
  * in the entry point information.
  */
 int
 bios32_service(uint32_t service, bios32_entry_t e, bios32_entry_info_t ei)
 #ifdef i386
 	uint32_t eax, ebx, ecx, edx;
 	paddr_t entry;
 	if (bios32_entry.offset == 0)
 		return (0);	/* BIOS32 not present */
 	__asm volatile("lcall *(%%edi)"
 		: "=a" (eax), "=b" (ebx), "=c" (ecx), "=d" (edx)
 		: "0" (service), "1" (0), "D" (&bios32_entry));
 	if ((eax & 0xff) != 0)
 		return (0);	/* service not found */
 	entry = ebx + edx;
 	if (entry < BIOS32_START || entry >= BIOS32_END) {
 		aprint_error("BIOS32: entry point for service %c%c%c%c is "
 		    "outside allowable range\n",
 		    service & 0xff,
 		    (service >> 8) & 0xff,
 		    (service >> 16) & 0xff,
 		    (service >> 24) & 0xff);
 		return (0);
 	e->offset = (void *)ISA_HOLE_VADDR(entry);
 	e->segment = GSEL(GCODE_SEL, SEL_KPL);
 	ei->bei_base = ebx;
 	ei->bei_size = ecx;
 	ei->bei_entry = entry;
 #else
 	(void)service;
 	(void)e;
 	(void)ei;
 	panic("bios32_service not implemented on amd64");
 #endif
 	return (1);
+}
 /*
  * smbios_find_table() takes a caller supplied smbios struct type and
  * a pointer to a handle (struct smbtable) returning one if the structure
  * is sucessfully 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)