From nobody Wed Nov 15 16:49:08 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 4SVpz902XNz50TmB; Wed, 15 Nov 2023 16:49:09 +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 4SVpz86f6Gz3ddg; Wed, 15 Nov 2023 16:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700066948; 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=toRB9PpmWrbhDNThBKHLee/4nF2o+DUNVYtY6DzdPSw=; b=SiiCYl8SyMM5RDBLEHj8UVRavDJGOrYV6fbh2d1yuzwT94ZPj8TvqZUdeKqB+0iRcP7WFZ 5NAF+ACl2g516A+FxN33KHbxsgwVIHE07ImEYuYcD3t5yyTrhm1hiirM9ypl33fvia7JhD m2VEPf57KPZdUCTsXeTxG2p9hBV9bv2uELXg+kp/ULJKt3U5fna7/ht6Xq+kW8xF+tP7Ra AVnsL/f48fHjcsoXcRZKxWqLunRfHFuaaemXfx9wzmAwnJlte3KMILER3G9KHZmLPA9/cM EoWmmju+0DIT2cXTG3hGZz9HVRp3sPZ+SPOv9k8AjOkMtSB7M0A7wQmTgHKYdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700066948; 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=toRB9PpmWrbhDNThBKHLee/4nF2o+DUNVYtY6DzdPSw=; b=cI+cUwRjTy1YymZBl46DRX1vxjTXT8EWZbYqkAPEYxJ4kmSYUB7/klcGZKz/2bwPyvE01i IfenogLQyD01J3VF8Z2w+6hSmcpWOCJIQnnPt+eBY1POGufXhylibhmYlKX4hwXUnoFUCW 1Zdg6maHO4sj7qZcnIDtNiADZVIsYAC9uq6X6/epGoVM3nWpze0PiQ8pq8TmkTDjUohYs9 o48mQqbdOoPliGGZkIlyMrCM6gu17YxNXG0kn34qvZMBb/+eLUrMDSCdP9rKVs2KR9Gnz6 k+HYDzRWvHHNg4GaF/nv56qbZ3PTcx34RS2nwmmx6/7fmrhomef3JtSzPgrBuQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700066948; a=rsa-sha256; cv=none; b=nLltGCmyvvraqeUXP4AC71dRCgLDFF5Wf5qYWCc7usaNq0b2cqgIGjCj7IBOp2GW2Y2tq1 BKt7QOxAyb/pM4S3Tp5+Ip7J3WMncfo+MoO+nLHevB4HtTT5eWvpQE/BX06up5RyldX5OQ e2sNNFfzvXeQwmtnBeJHRJSt6t7YEMtf7nmzJow6hZKkoii2TeotfXkNHtJMoCWypeeBAS c3RDU9gWiscZk6EI7C9df/iNQFfMK/7y8NSsWXMXZ6fzwlzEiCs3tUUR6yv9/qLllrVboF UV2xdC8Egiy8+zJ67rq3qBDAGP6zV/tiqsHPKhuDb1CcS1sAugEGMlYT0WSr8w== 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 4SVpz85h4vz8lN; Wed, 15 Nov 2023 16:49:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AFGn89g027730; Wed, 15 Nov 2023 16:49:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AFGn8L6027727; Wed, 15 Nov 2023 16:49:08 GMT (envelope-from git) Date: Wed, 15 Nov 2023 16:49:08 GMT Message-Id: <202311151649.3AFGn8L6027727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Gallatin Subject: git: ba0e4d7971e0 - main - smbios: handle smbios3 for arm64 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: gallatin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba0e4d7971e05ee64281a4fc49a2fb408c8ad816 Auto-Submitted: auto-generated The branch main has been updated by gallatin: URL: https://cgit.FreeBSD.org/src/commit/?id=ba0e4d7971e05ee64281a4fc49a2fb408c8ad816 commit ba0e4d7971e05ee64281a4fc49a2fb408c8ad816 Author: Andrew Gallatin AuthorDate: 2023-11-15 16:11:53 +0000 Commit: Andrew Gallatin CommitDate: 2023-11-15 16:20:04 +0000 smbios: handle smbios3 for arm64 Get smbios working on arm64 where it seems to be exclusively smbios version 3.x The "interesting" thing here is that the smbios table seems to be RAM in the EFI runtime services table. This makes it owned by "ram0", and not io memory. That prevents bus_alloc_resource() from being able to claim it, since ram0 already owns it. According to jhb, this is how things are supposed to work. Eg, bus_alloc_resource() is meant to be used with IO memory, not physical memory. Following his suggestion, I converted the driver to simply use pmap_mapbios(). This is a prerequisite for getting IPMI to attach via the SSIF attachment on arm64 servers, where all IPMI that I've seen uses SSIF. Note that this change is based on initial work by Allan Jude in https://reviews.freebsd.org/D28739. Reviewed by: imp Sponsored by: Netflix, Ampere Computing LLC (D28739) Differential Revision: https://reviews.freebsd.org/D42592 --- sys/dev/smbios/smbios.c | 176 ++++++++++++++++++++++++++++++++---------------- sys/dev/smbios/smbios.h | 15 +++++ 2 files changed, 132 insertions(+), 59 deletions(-) diff --git a/sys/dev/smbios/smbios.c b/sys/dev/smbios/smbios.c index b9dd8a40e9e4..7f89430226c8 100644 --- a/sys/dev/smbios/smbios.c +++ b/sys/dev/smbios/smbios.c @@ -57,41 +57,49 @@ struct smbios_softc { device_t dev; - struct resource * res; - int rid; - - struct smbios_eps * eps; + union { + struct smbios_eps * eps; + struct smbios3_eps * eps3; + }; + bool is_eps3; }; -#define RES2EPS(res) ((struct smbios_eps *)rman_get_virtual(res)) - static void smbios_identify (driver_t *, device_t); static int smbios_probe (device_t); static int smbios_attach (device_t); static int smbios_detach (device_t); static int smbios_modevent (module_t, int, void *); -static int smbios_cksum (struct smbios_eps *); +static int smbios_cksum (void *); +static bool smbios_eps3 (void *); static void smbios_identify (driver_t *driver, device_t parent) { #ifdef ARCH_MAY_USE_EFI struct uuid efi_smbios = EFI_TABLE_SMBIOS; + struct uuid efi_smbios3 = EFI_TABLE_SMBIOS3; void *addr_efi; #endif struct smbios_eps *eps; + struct smbios3_eps *eps3; + void *ptr; device_t child; vm_paddr_t addr = 0; + size_t map_size = sizeof (*eps); int length; - int rid; if (!device_is_alive(parent)) return; #ifdef ARCH_MAY_USE_EFI - if (!efi_get_table(&efi_smbios, &addr_efi)) + if (!efi_get_table(&efi_smbios3, &addr_efi)) { addr = (vm_paddr_t)addr_efi; + map_size = sizeof (*eps3); + } else if (!efi_get_table(&efi_smbios, &addr_efi)) { + addr = (vm_paddr_t)addr_efi; + } + #endif #if defined(__amd64__) || defined(__i386__) @@ -101,28 +109,50 @@ smbios_identify (driver_t *driver, device_t parent) #endif if (addr != 0) { - eps = pmap_mapbios(addr, 0x1f); - rid = 0; - length = eps->length; - - if (length != 0x1f) { + ptr = pmap_mapbios(addr, map_size); + if (ptr == NULL) + return; + if (map_size == sizeof (*eps3)) { + eps3 = ptr; + length = eps3->length; + if (memcmp(eps3->anchor_string, + SMBIOS3_SIG, SMBIOS3_LEN) != 0) { + printf("smbios3: corrupt sig %s found\n", + eps3->anchor_string); + return; + } + } else { + eps = ptr; + length = eps->length; + if (memcmp(eps->anchor_string, + SMBIOS_SIG, SMBIOS_LEN) != 0) { + printf("smbios: corrupt sig %s found\n", + eps->anchor_string); + return; + } + } + if (length != map_size) { u_int8_t major, minor; major = eps->major_version; minor = eps->minor_version; /* SMBIOS v2.1 implementation might use 0x1e. */ - if (length == 0x1e && major == 2 && minor == 1) + if (length == 0x1e && major == 2 && minor == 1) { length = 0x1f; - else + } else { + pmap_unmapbios(eps, map_size); return; + } } child = BUS_ADD_CHILD(parent, 5, "smbios", -1); device_set_driver(child, driver); - bus_set_resource(child, SYS_RES_MEMORY, rid, addr, length); + + /* smuggle the phys addr into probe and attach */ + bus_set_resource(child, SYS_RES_MEMORY, 0, addr, length); device_set_desc(child, "System Management BIOS"); - pmap_unmapbios(eps, 0x1f); + pmap_unmapbios(ptr, map_size); } return; @@ -131,28 +161,27 @@ smbios_identify (driver_t *driver, device_t parent) static int smbios_probe (device_t dev) { - struct resource *res; - int rid; + vm_paddr_t pa; + vm_size_t size; + void *va; int error; error = 0; - rid = 0; - res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); - if (res == NULL) { - device_printf(dev, "Unable to allocate memory resource.\n"); - error = ENOMEM; - goto bad; + + pa = bus_get_resource_start(dev, SYS_RES_MEMORY, 0); + size = bus_get_resource_count(dev, SYS_RES_MEMORY, 0); + va = pmap_mapbios(pa, size); + if (va == NULL) { + device_printf(dev, "Unable to map memory.\n"); + return (ENOMEM); } - if (smbios_cksum(RES2EPS(res))) { + if (smbios_cksum(va)) { device_printf(dev, "SMBIOS checksum failed.\n"); error = ENXIO; - goto bad; } -bad: - if (res) - bus_release_resource(dev, SYS_RES_MEMORY, rid, res); + pmap_unmapbios(va, size); return (error); } @@ -160,46 +189,55 @@ static int smbios_attach (device_t dev) { struct smbios_softc *sc; - int error; + void *va; + vm_paddr_t pa; + vm_size_t size; sc = device_get_softc(dev); - error = 0; - sc->dev = dev; - sc->rid = 0; - sc->res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->rid, - RF_ACTIVE); - if (sc->res == NULL) { - device_printf(dev, "Unable to allocate memory resource.\n"); - error = ENOMEM; - goto bad; + pa = bus_get_resource_start(dev, SYS_RES_MEMORY, 0); + size = bus_get_resource_count(dev, SYS_RES_MEMORY, 0); + va = pmap_mapbios(pa, size); + if (va == NULL) { + device_printf(dev, "Unable to map memory.\n"); + return (ENOMEM); + } + sc->is_eps3 = smbios_eps3(va); + + if (sc->is_eps3) { + sc->eps3 = va; + device_printf(dev, "Version: %u.%u", + sc->eps3->major_version, sc->eps3->minor_version); + } else { + sc->eps = va; + device_printf(dev, "Version: %u.%u", + sc->eps->major_version, sc->eps->minor_version); + if (bcd2bin(sc->eps->BCD_revision)) + printf(", BCD Revision: %u.%u", + bcd2bin(sc->eps->BCD_revision >> 4), + bcd2bin(sc->eps->BCD_revision & 0x0f)); } - sc->eps = RES2EPS(sc->res); - - device_printf(dev, "Version: %u.%u", - sc->eps->major_version, sc->eps->minor_version); - if (bcd2bin(sc->eps->BCD_revision)) - printf(", BCD Revision: %u.%u", - bcd2bin(sc->eps->BCD_revision >> 4), - bcd2bin(sc->eps->BCD_revision & 0x0f)); printf("\n"); - return (0); -bad: - if (sc->res) - bus_release_resource(dev, SYS_RES_MEMORY, sc->rid, sc->res); - return (error); } static int smbios_detach (device_t dev) { struct smbios_softc *sc; + vm_size_t size; + void *va; sc = device_get_softc(dev); + va = (sc->is_eps3 ? (void *)sc->eps3 : (void *)sc->eps); + if (sc->is_eps3) + va = sc->eps3; + else + va = sc->eps; + size = bus_get_resource_count(dev, SYS_RES_MEMORY, 0); - if (sc->res) - bus_release_resource(dev, SYS_RES_MEMORY, sc->rid, sc->res); + if (va != NULL) + pmap_unmapbios(va, size); return (0); } @@ -249,16 +287,36 @@ MODULE_DEPEND(smbios, efirt, 1, 1, 1); #endif MODULE_VERSION(smbios, 1); + +static bool +smbios_eps3 (void *v) +{ + struct smbios3_eps *e; + + e = (struct smbios3_eps *)v; + return (memcmp(e->anchor_string, SMBIOS3_SIG, SMBIOS3_LEN) == 0); +} + static int -smbios_cksum (struct smbios_eps *e) +smbios_cksum (void *v) { + struct smbios3_eps *eps3; + struct smbios_eps *eps; u_int8_t *ptr; u_int8_t cksum; + u_int8_t length; int i; - ptr = (u_int8_t *)e; + if (smbios_eps3(v)) { + eps3 = (struct smbios3_eps *)v; + length = eps3->length; + } else { + eps = (struct smbios_eps *)v; + length = eps->length; + } + ptr = (u_int8_t *)v; cksum = 0; - for (i = 0; i < e->length; i++) { + for (i = 0; i < length; i++) { cksum += ptr[i]; } diff --git a/sys/dev/smbios/smbios.h b/sys/dev/smbios/smbios.h index 286f4f4ca3ac..42b7e1181486 100644 --- a/sys/dev/smbios/smbios.h +++ b/sys/dev/smbios/smbios.h @@ -38,6 +38,8 @@ #define SMBIOS_OFF 0 #define SMBIOS_LEN 4 #define SMBIOS_SIG "_SM_" +#define SMBIOS3_LEN 5 +#define SMBIOS3_SIG "_SM3_" struct smbios_eps { uint8_t anchor_string[4]; /* '_SM_' */ @@ -56,6 +58,19 @@ struct smbios_eps { uint8_t BCD_revision; } __packed; +struct smbios3_eps { + uint8_t anchor_string[5]; /* '_SM3_' */ + uint8_t checksum; + uint8_t length; + uint8_t major_version; + uint8_t minor_version; + uint8_t docrev; + uint8_t entry_point_revision; + uint8_t reserved; + uint32_t structure_table_max_size; + uint64_t structure_table_address; +}; + struct smbios_structure_header { uint8_t type; uint8_t length;