From owner-p4-projects@FreeBSD.ORG  Mon Sep  8 04:51:04 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 4C0724BF; Mon,  8 Sep 2014 04:51:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 8D192939
 for <perforce@freebsd.org>; Mon,  8 Sep 2014 04:50:10 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3F7011C5D
 for <perforce@freebsd.org>; Mon,  8 Sep 2014 04:50:10 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id s884o9cO023805
 for <perforce@freebsd.org>; Mon, 8 Sep 2014 04:50:09 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id s884o9sS023802
 for perforce@freebsd.org; Mon, 8 Sep 2014 04:50:09 GMT
 (envelope-from jhb@freebsd.org)
Date: Mon, 8 Sep 2014 04:50:09 GMT
Message-Id: <201409080450.s884o9sS023802@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 1199101 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Sep 2014 04:51:04 -0000

http://p4web.freebsd.org/@@1199101?ac=10

Change 1199101 by jhb@jhb_pippin on 2014/08/22 21:16:36

	- Add a bios_smap_xattr structure.
	- Don't return an SMAP data for the EFI case instead of panicing.

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#126 edit
.. //depot/projects/smpng/sys/amd64/include/pc/bios.h#8 edit
.. //depot/projects/smpng/sys/i386/include/pc/bios.h#11 edit

Differences ...

==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#126 (text+ko) ====

@@ -2106,6 +2106,8 @@
 		kmdp = preload_search_by_type("elf64 kernel");
 	smapbase = (struct bios_smap *)preload_search_info(kmdp,
 	    MODINFO_METADATA | MODINFOMD_SMAP);
+	if (smapbase == NULL)
+		return (0);
 	smapsize = *((u_int32_t *)smapbase - 1);
 	return (SYSCTL_OUT(req, smapbase, smapsize));
 }

==== //depot/projects/smpng/sys/amd64/include/pc/bios.h#8 (text+ko) ====

@@ -51,6 +51,14 @@
     u_int32_t	type;
 } __packed;
 
+/* Structure extended to include extended attribute field in ACPI 3.0. */
+struct bios_smap_xattr {
+    u_int64_t	base;
+    u_int64_t	length;
+    u_int32_t	type;
+    u_int32_t	xattr;
+} __packed;
+	
 /*
  * System Management BIOS
  */

==== //depot/projects/smpng/sys/i386/include/pc/bios.h#11 (text+ko) ====

@@ -221,6 +221,14 @@
     u_int32_t	type;
 } __packed;
 
+/* Structure extended to include extended attribute field in ACPI 3.0. */
+struct bios_smap_xattr {
+    u_int64_t	base;
+    u_int64_t	length;
+    u_int32_t	type;
+    u_int32_t	xattr;
+} __packed;
+
 /*
  * System Management BIOS
  */