From nobody Thu Mar 03 14:20:40 2022 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 4851119E5EAB; Thu, 3 Mar 2022 14:20:41 +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 4K8Y6w40Ynz3LWN; Thu, 3 Mar 2022 14:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646317240; 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=DXo158vVtLkfb3BxQ1P48OQS+wosrw7dHzvcs30pLZs=; b=Znps/PnsbW7Bsj2BHoFd8/KC0PP5L7cuaB7uBMjWKGxKRr+HTO1+YP4f0+9EeFuDrHjkET TacnaSXilXwXumNJQEydcn05FSwnN8RIYHF5EM0Elpq+0LQKBIoNODdhkxS29TABTVians jrXtnkTipZRNj+U8Sw0BFRk7qn51mAPCK9oYET0/zx2VLqhDRkl0tnBw4YAmngs9ccUL8p l4vR58czbPnGaYqIwIea6S0k3kQ5V8VMkzrj5365STPLlKI9eZHzhtlIJFGzPpPPh0k45k So9+iU0df147bYKB42vpJ8u3t9I0jvimf39IygfsRSaTFPYZYUj8iPjgH+110Q== 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 5749A194F3; Thu, 3 Mar 2022 14:20:40 +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 223EKeTg090678; Thu, 3 Mar 2022 14:20:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 223EKeQl090677; Thu, 3 Mar 2022 14:20:40 GMT (envelope-from git) Date: Thu, 3 Mar 2022 14:20:40 GMT Message-Id: <202203031420.223EKeQl090677@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric van Gyzen Subject: git: 0ea19e39ff05 - stable/13 - ipmi,smbios: move smbios_walk_table to smbios.h 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: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0ea19e39ff050b3267d17a4d5209349b77e0b28c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646317240; 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=DXo158vVtLkfb3BxQ1P48OQS+wosrw7dHzvcs30pLZs=; b=GQxYq8JreCjTI0+z0FTuw9SmCdsrqlf+7IDXS/LY14wbRyN8GeMVk6goenlEDjqxE5Xy5f fE37vEYjb5oFxZVxMn1AzSBfsiIt2gqybxMJ+2vK92LTKNm5QRgF/zxGMdLL+Ad0iHk96A rAyujbldghT9cgpYhCRdeCMSkLfC+HrMzYqJO7XImMGA+6WvtAAlS+fFEdUSysWrjQ0UMs 5kZGTNpxn3NcjHR/rkjUQiLu3GA2xy0HGXe9GqqJlEKG3WQ1bT0uE0ORsVwrsfrjPe9WKm hMsSVLLoeecQ7Yp1UBP0f4NOOnNnhmqE/1/1pUxkgh1ll+w9tRlguDiDepaTkQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646317240; a=rsa-sha256; cv=none; b=HeDOvoZqAsW1lODzInmsvdtx0PUYrYFq8op6jmXrNLMwqDxfNAiGaN+tfIbUs1eiZ8aJRl JevFdSBM8s4MVHtZB8toI/93tifq4n9fXLt+NyIH6pzxhpY2HU+0c6hn+Lc3vESdvrKIO4 wnb0fZ75wPet4usEOJtAdioq7LSsV3XC3bQDnP9YlxN2oVoKhcTC7UoeUHcT4VSXOIdKSB Bi4RxrVT3Ayj2WC86wQrY0x3RNiCd6He32bb7hpfm7C3FPMMSprHg2iRfuhTAR7AvK4QFi 05cxYpmsfFwPT0/5QPb/j0qAcQOwF19gt1NShbMMS2e6diw7RGCvJ8evJOK+hw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=0ea19e39ff050b3267d17a4d5209349b77e0b28c commit 0ea19e39ff050b3267d17a4d5209349b77e0b28c Author: Greg V AuthorDate: 2021-04-07 20:05:49 +0000 Commit: Eric van Gyzen CommitDate: 2022-03-03 14:20:07 +0000 ipmi,smbios: move smbios_walk_table to smbios.h This function will be used for exposing DMI info as sysctls in the smbios module (in an upcoming review). While here, add __packed to the structs. Reviewed by: dab MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D29270 (cherry picked from commit f689cb23b2782d0d0f586bcfabbad68f728ed1df) --- sys/dev/ipmi/ipmi_smbios.c | 29 ----------------------------- sys/dev/smbios/smbios.h | 31 +++++++++++++++++++++++++++++-- 2 files changed, 29 insertions(+), 31 deletions(-) diff --git a/sys/dev/ipmi/ipmi_smbios.c b/sys/dev/ipmi/ipmi_smbios.c index 308a3b076ef7..a1b953365d7c 100644 --- a/sys/dev/ipmi/ipmi_smbios.c +++ b/sys/dev/ipmi/ipmi_smbios.c @@ -79,8 +79,6 @@ struct ipmi_entry { #define SPACING_32 0x1 #define SPACING_16 0x2 -typedef void (*smbios_callback_t)(struct smbios_structure_header *, void *); - static struct ipmi_get_info ipmi_info; static int ipmi_probed; static struct mtx ipmi_info_mtx; @@ -88,8 +86,6 @@ MTX_SYSINIT(ipmi_info, &ipmi_info_mtx, "ipmi info", MTX_DEF); static void ipmi_smbios_probe(struct ipmi_get_info *); static int smbios_cksum(struct smbios_eps *); -static void smbios_walk_table(uint8_t *, int, smbios_callback_t, - void *); static void smbios_ipmi_info(struct smbios_structure_header *, void *); static void @@ -146,31 +142,6 @@ smbios_ipmi_info(struct smbios_structure_header *h, void *arg) info->iface_type = s->interface_type; } -static void -smbios_walk_table(uint8_t *p, int entries, smbios_callback_t cb, void *arg) -{ - struct smbios_structure_header *s; - - while (entries--) { - s = (struct smbios_structure_header *)p; - cb(s, arg); - - /* - * Look for a double-nul after the end of the - * formatted area of this structure. - */ - p += s->length; - while (!(p[0] == 0 && p[1] == 0)) - p++; - - /* - * Skip over the double-nul to the start of the next - * structure. - */ - p += 2; - } -} - /* * Walk the SMBIOS table looking for an IPMI (type 38) entry. If we find * one, return the parsed data in the passed in ipmi_get_info structure and diff --git a/sys/dev/smbios/smbios.h b/sys/dev/smbios/smbios.h index 6503cdb73c4c..ec216b676f2b 100644 --- a/sys/dev/smbios/smbios.h +++ b/sys/dev/smbios/smbios.h @@ -56,12 +56,39 @@ struct smbios_eps { uint32_t structure_table_address; uint16_t number_structures; uint8_t BCD_revision; -}; +} __packed; struct smbios_structure_header { uint8_t type; uint8_t length; uint16_t handle; -}; +} __packed; + +typedef void (*smbios_callback_t)(struct smbios_structure_header *, void *); + +static inline void +smbios_walk_table(uint8_t *p, int entries, smbios_callback_t cb, void *arg) +{ + struct smbios_structure_header *s; + + while (entries--) { + s = (struct smbios_structure_header *)p; + cb(s, arg); + + /* + * Look for a double-nul after the end of the + * formatted area of this structure. + */ + p += s->length; + while (!(p[0] == 0 && p[1] == 0)) + p++; + + /* + * Skip over the double-nul to the start of the next + * structure. + */ + p += 2; + } +} #endif /* _SMBIOS_H_ */