From owner-p4-projects@FreeBSD.ORG  Fri Nov  1 19:38:48 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 0333C9A1; Fri,  1 Nov 2013 19:38:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTP id B9EE099F
 for <perforce@freebsd.org>; Fri,  1 Nov 2013 19:38:47 +0000 (UTC)
 (envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id A6B69239E
 for <perforce@freebsd.org>; Fri,  1 Nov 2013 19:38:47 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id rA1Jclca087088
 for <perforce@freebsd.org>; Fri, 1 Nov 2013 19:38:47 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id rA1JclxJ087085
 for perforce@freebsd.org; Fri, 1 Nov 2013 19:38:47 GMT
 (envelope-from jhb@freebsd.org)
Date: Fri, 1 Nov 2013 19:38:47 GMT
Message-Id: <201311011938.rA1JclxJ087085@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 1187757 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
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: Fri, 01 Nov 2013 19:38:48 -0000

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

Change 1187757 by jhb@jhb_jhbbsd on 2013/11/01 19:38:28

	An old patch I had lying around to export the SMAP table to
	userland.

Affected files ...

.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#119 edit

Differences ...

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

@@ -1938,6 +1938,25 @@
 	pcpu->pc_acpi_id = 0xffffffff;
 }
 
+static int
+smap_sysctl_handler(SYSCTL_HANDLER_ARGS)
+{
+	struct bios_smap *smapbase;
+	caddr_t kmdp;
+	uint32_t smapsize;
+
+	/* Retrieve the system memory map from the loader. */
+	kmdp = preload_search_by_type("elf kernel");
+	if (kmdp == NULL)
+		kmdp = preload_search_by_type("elf64 kernel");
+	smapbase = (struct bios_smap *)preload_search_info(kmdp,
+	    MODINFO_METADATA | MODINFOMD_SMAP);
+	smapsize = *((u_int32_t *)smapbase - 1);
+	return (SYSCTL_OUT(req, smapbase, smapsize));
+}
+SYSCTL_PROC(_machdep, OID_AUTO, smap, CTLTYPE_OPAQUE|CTLFLAG_RD, NULL, 0,
+    smap_sysctl_handler, "S,bios_smap", "Raw BIOS SMAP data");
+
 void
 spinlock_enter(void)
 {