From nobody Mon May 01 21:28:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q9GYD2kpgz492gT; Mon, 1 May 2023 21:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q9GYD22PSz3jx1; Mon, 1 May 2023 21:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682976528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3cxwkESzsjNm9nXqINQUPNdClWBzFWw3uTVD0m0UY/c=; b=pcg/5MHJDrkwmw3TBjkneNSIlZgvUbUVg00bUNTlI6w1Vypw16pYxJWcX7lajN3ELTKwUq Iy6e0iGICIcqOWLR1612p7i4pKUR2YEe/vHt1Ya8ZZTJuTuD0jjqgKUdTQVFyeAh3jFLpj R3/++7AZ8/amI8r4qVQZ5mx8YG5Hln/psqTgWO9EHfNTWC0aA0TT7LpnSyrOgB2zPNRrol AyVBOraz4JovJ/pO2uzG+oM3IEnK6DdbrI8bWVkRQrWBBob/CYD0xSvygFpKRBtJrJp5q0 Rmygv3A5Hmy3N2GRklQN0yDcJjX/XD1RxyQrnid05Wu/scywiaKNtTVP+CGLZw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682976528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3cxwkESzsjNm9nXqINQUPNdClWBzFWw3uTVD0m0UY/c=; b=bFZ4oVmRkGxsSA20BvG6Ea3Al+oxoDePRjRz6FO3GXomS1d1f5qCTGiTIAX5F7UoVeJBGJ lkfSuhxKTfaRkesxK2xr6/hJtl1yvqxzASzylc5O7cUVdnuwhkFCokw1eAcRzHOKoTjUFM lT7Kg5t6Z6SyIpjxb/l8jzFEfCcyM2P4ZjkE4owuPv43bTAsy+wHHXRBdq8L0/SHw4myUQ itBHueus181mtaTZzfvdAGZuA/ZV/s9W6JdETO9htndBTKR4Prk7RYVGLxpTQIAxmGBU9G YA/10KEqbEdotAmZrrpLtfH0NHGqy0D8V5+LPDqOCrvd4zP68b2Ni4vAC6cXig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682976528; a=rsa-sha256; cv=none; b=AL35dV9bEpqvSp1ZjRvMmmhM6eS99CbxXk/iHaPK7HXkFatSnFmXAKieR2FFt4VvVTQUks UWV3akr2in9Om/Q58zW99IVaR3IaboGFhWaZciLtbfabGCzzVKQNkIQrCGp3lQk1SWoRNe zQ62pAilIddjmS/IQkdfTm7hkMX+tE0bumoKJ7Ry/hAoV9qfuW1zAeuv3scx1mFj7LknsA 3WnSMQydHQhcR+UhPDSJH18dsa9fZ3v8oXHcfSUHgdMi4iTNmX6F4kTE3tnoxJGS0dEZvA P8tL/ZosOowUlTibWYgj6L21W+9IaDSyO4oIXYInGIggzypLBQdFC3nZXRbD1g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q9GYD17XKzLj7; Mon, 1 May 2023 21:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 341LSmsJ085868; Mon, 1 May 2023 21:28:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 341LSmDU085867; Mon, 1 May 2023 21:28:48 GMT (envelope-from git) Date: Mon, 1 May 2023 21:28:48 GMT Message-Id: <202305012128.341LSmDU085867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: cf6044857e2b - main - stand: Testing program for smbios List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cf6044857e2b20f2ecf90929027e9dd335b38803 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=cf6044857e2b20f2ecf90929027e9dd335b38803 commit cf6044857e2b20f2ecf90929027e9dd335b38803 Author: Warner Losh AuthorDate: 2023-05-01 21:12:19 +0000 Commit: Warner Losh CommitDate: 2023-05-01 21:12:19 +0000 stand: Testing program for smbios Write a quick and dirty testing program to dump physical memory to help test and debug the smbios.c code in new environments. Sponsored by: Netflix Differential Revision: https://reviews.freebsd.org/D39791 --- tools/boot/smbios/Makefile | 11 ++++++ tools/boot/smbios/main.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++ tools/boot/smbios/stand.h | 18 +++++++++ 3 files changed, 125 insertions(+) diff --git a/tools/boot/smbios/Makefile b/tools/boot/smbios/Makefile new file mode 100644 index 000000000000..a555470aab14 --- /dev/null +++ b/tools/boot/smbios/Makefile @@ -0,0 +1,11 @@ +# $FreeBSD$ + +PROG= smbios +MAN= +.PATH: ${SRCTOP}/stand/libsa +SRCS= main.c +CFLAGS+= -I${.CURDIR} -I${SRCTOP}/stand/libsa + +.include + +CFLAGS+= -Wno-cast-align diff --git a/tools/boot/smbios/main.c b/tools/boot/smbios/main.c new file mode 100644 index 000000000000..60263d2ea8d9 --- /dev/null +++ b/tools/boot/smbios/main.c @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2023 Warner Losh + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +/* + * Test program for smbios support in the boot loader. This program will mmap + * physical memory, and print the smbios table at the passed in PA. This is + * intended to test the code and debug problems in a debugger friendly + * environment. + */ + +#include +#define setenv my_setenv + +#define SMBIOS_SERIAL_NUMBERS 1 +#define SMBIOS_LITTLE_ENDIAN_UUID 1 + +#include + +#include "smbios.h" +#include "smbios.c" + +#include + +#define MAX_MAP 10 +#define PAGE (64<<10) + +static struct mapping +{ + uintptr_t pa; + caddr_t va; +} map[MAX_MAP]; +static int fd; +static int nmap; + +caddr_t ptov(uintptr_t pa) +{ + caddr_t va; + uintptr_t pa2; + struct mapping *m = map; + + pa2 = rounddown(pa, PAGE); + for (int i = 0; i < nmap; i++, m++) { + if (m->pa == pa2) { + return (m->va + pa - m->pa); + } + } + if (nmap == MAX_MAP) + errx(1, "Too many maps"); + va = mmap(0, PAGE, PROT_READ, MAP_SHARED, fd, pa2); + if (va == MAP_FAILED) + err(1, "mmap offset %#lx", (long)pa2); + m = &map[nmap++]; + m->pa = pa2; + m->va = va; + return (m->va + pa - m->pa); +} + +static void +cleanup(void) +{ + for (int i = 0; i < nmap; i++) { + munmap(map[i].va, PAGE); + } +} + +int +my_setenv(const char *name, const char *value, int overwrite __unused) +{ + printf("%s=%s\n", name, value); + return 0; +} + +static void +usage(void) +{ + errx(1, "smbios address"); +} + +int +main(int argc, char **argv) +{ + uintptr_t addr; + + if (argc != 2) + usage(); + addr = strtoull(argv[1], NULL, 0); + /* For mmap later */ + fd = open("/dev/mem", O_RDONLY); + if (fd < 0) + err(1, "Opening /dev/mem"); + smbios_detect(ptov(addr)); + cleanup(); +} diff --git a/tools/boot/smbios/stand.h b/tools/boot/smbios/stand.h new file mode 100644 index 000000000000..d754189fad13 --- /dev/null +++ b/tools/boot/smbios/stand.h @@ -0,0 +1,18 @@ +/* + * Copyright (c) 2023 Warner Losh + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +caddr_t ptov(uintptr_t pa);