From nobody Wed Mar 09 15:35:47 2022 X-Original-To: dev-commits-src-branches@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 A9D2519F5481; Wed, 9 Mar 2022 15:35:47 +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 4KDGVq4P9lz4TyL; Wed, 9 Mar 2022 15:35:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646840147; 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=6n/MabCdGp2eACUap3n96tIYZyHuhAtmL10Be6+nmLE=; b=byIlpKneqsj4bA0IDS44rRV92NnoaxgCEahG81sLj1k6sbXwdZjCYbK/lTbmISEyy9cwTM APmkArxfR2sN+jEZB1rGY+72ZPA8u7cT0m8IbVtUEVKek0oS5vP9PwvXO65YwW4sr75s37 owjDLQ7J3EGqoDB0A1KXN2rhIXPsWreXNbFu6X/JPx5sEZluxZZdfP5cAj70E0rNQhP/A5 pFRWWkQUDWT7WJcQ1HPyI2wu4CIDWl/9wQz4ozIC3ySqT9BR5DqP5PQlRrqklUo6TyzR7L 28EEiHOKGaWbpHJvIeAsAnpaCoPKEoaVBcvg/nGFZKra+4aZ9uQXwR2G4cW8Pg== 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 733D5136C7; Wed, 9 Mar 2022 15:35:47 +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 229FZlGv031945; Wed, 9 Mar 2022 15:35:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 229FZl90031944; Wed, 9 Mar 2022 15:35:47 GMT (envelope-from git) Date: Wed, 9 Mar 2022 15:35:47 GMT Message-Id: <202203091535.229FZl90031944@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: caa14c7b600d - stable/13 - fdt: Expose the model, compatible and freebsd dts brandind as sysctl List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: caa14c7b600d3d15042ada340665f7b0aed4b415 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646840147; 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=6n/MabCdGp2eACUap3n96tIYZyHuhAtmL10Be6+nmLE=; b=bBMz5eJU2wBPSzrOK9XTMLbqJJRY8rW/cEfC4IN0cWwBfCLCge4eAlwH8pLvWJbrxb+561 dnPhyt9cCH2DJf/VWRA5ZQ1M3JQrkmU8JfMlgWTU905eTI8izlHyvygLa/WewEmdQv0Zhz G50Yhl0K5bTUfphg8s20ihH21aQLWQ8sm7U2Ogep9iQU04r6hh7XAcecvQYctio7wYXAfb PASbAIEkYbxlep+cjWtBGIMM7zYOcO8PfaJ0GFZ2anZ1drjxcZDT5BIfQSom3/YugBNLfY BAiLbJ00Nl9UXRpZZhA6lFqTKX3XuKU5McSWBUey93o0JgGhn3jn2K19LWr+Ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646840147; a=rsa-sha256; cv=none; b=uXyXZE1spdyfZL6kgQMOkFbrHuwl/9IEvbNYRTbepsThm3SY4tQ9xuDQvMvbqHKWxNpP9T W37NSoWYWAFm+J4AS43YqMYoA2KLVuzH9cjTNRHY5Y4TTJH/EVcPpqqEOpkVMT5H3ax+kW xR+Q7qXhjpQiP2ERVRrhlPFhIERQWHTbdZ/6bW1dnWe2iM3iifHWSbQdIXscoPlDmi3zZc krFB3X2dNQZZlxuomRKpNeqxc2mejZLOab7Uh7Vcc60slhHXFEuvNDivj1xEjcUdbDtaJ1 rNM/JwR0Vy0nNG8WGLZxiCEIeEJr5biHO43BAFKDUj9rq18xg4TbOML3Y0MHig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=caa14c7b600d3d15042ada340665f7b0aed4b415 commit caa14c7b600d3d15042ada340665f7b0aed4b415 Author: Emmanuel Vadot AuthorDate: 2021-07-17 15:19:22 +0000 Commit: Mike Karels CommitDate: 2022-03-09 15:27:28 +0000 fdt: Expose the model, compatible and freebsd dts brandind as sysctl This make it easier for script to get the hardware on which they are running. Sponsored by: Diablotin Systems Differential Revision: https://reviews.freebsd.org/D31205 Reviewed by: imp Should be ok on powerpc: jhibbits (over irc) (cherry picked from commit 50e0dc0c4b46ee62b898ce2d92e52be4f77383d9) --- sys/dev/ofw/ofw_fdt.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/sys/dev/ofw/ofw_fdt.c b/sys/dev/ofw/ofw_fdt.c index 8e5840424860..a83f7cbdcb60 100644 --- a/sys/dev/ofw/ofw_fdt.c +++ b/sys/dev/ofw/ofw_fdt.c @@ -104,7 +104,14 @@ static ofw_def_t ofw_fdt = { }; OFW_DEF(ofw_fdt); +#define FDT_FBSDVER_LEN 16 +#define FDT_MODEL_LEN 80 +#define FDT_COMPAT_LEN 255 + static void *fdtp = NULL; +static char fdt_model[FDT_MODEL_LEN]; +static char fdt_compatible[FDT_COMPAT_LEN]; +static char fdt_fbsd_version[FDT_FBSDVER_LEN]; static int sysctl_handle_dtb(SYSCTL_HANDLER_ARGS) @@ -124,19 +131,50 @@ sysctl_register_fdt_oid(void *arg) SYSCTL_ADD_PROC(NULL, SYSCTL_STATIC_CHILDREN(_hw_fdt), OID_AUTO, "dtb", CTLTYPE_OPAQUE | CTLFLAG_RD | CTLFLAG_MPSAFE, NULL, 0, sysctl_handle_dtb, "", "Device Tree Blob"); + if (fdt_model[0] != '\0') + SYSCTL_ADD_STRING(NULL, SYSCTL_STATIC_CHILDREN(_hw_fdt), + OID_AUTO, "model", CTLFLAG_RD, fdt_model, + FDT_MODEL_LEN, "System board model"); + if (fdt_compatible[0] != '\0') + SYSCTL_ADD_STRING(NULL, SYSCTL_STATIC_CHILDREN(_hw_fdt), + OID_AUTO, "compatible", CTLFLAG_RD, fdt_compatible, + FDT_COMPAT_LEN, "Compatible platforms"); + if (fdt_fbsd_version[0] != '\0') + SYSCTL_ADD_STRING(NULL, SYSCTL_STATIC_CHILDREN(_hw_fdt), + OID_AUTO, "freebsd-version", CTLFLAG_RD, fdt_fbsd_version, + FDT_FBSDVER_LEN, "FreeBSD DTS branding version"); } SYSINIT(dtb_oid, SI_SUB_KMEM, SI_ORDER_ANY, sysctl_register_fdt_oid, NULL); static int ofw_fdt_init(ofw_t ofw, void *data) { + phandle_t root; + ssize_t len; int err; + int i; /* Check FDT blob integrity */ if ((err = fdt_check_header(data)) != 0) return (err); fdtp = data; + root = ofw_fdt_finddevice(NULL, "/"); + len = ofw_fdt_getproplen(NULL, root, "model"); + bzero(fdt_model, FDT_MODEL_LEN); + ofw_fdt_getprop(NULL, root, "model", fdt_model, FDT_MODEL_LEN); + len = ofw_fdt_getproplen(NULL, root, "compatible"); + bzero(fdt_compatible, FDT_COMPAT_LEN); + ofw_fdt_getprop(NULL, root, "compatible", fdt_compatible, FDT_COMPAT_LEN); + /* Replace the middle '\0' with ' ' */ + for (i = 0; i < len - 1; i++) + if (fdt_compatible[i] == '\0') + fdt_compatible[i] = ' '; + if ((len = ofw_fdt_getproplen(NULL, root, "freebsd,dts-version")) > 0) { + bzero(fdt_fbsd_version, FDT_FBSDVER_LEN); + ofw_fdt_getprop(NULL, root, "freebsd,dts-version", + fdt_fbsd_version, FDT_FBSDVER_LEN); + } return (0); } @@ -410,7 +448,6 @@ ofw_fdt_package_to_path(ofw_t ofw, phandle_t package, char *buf, size_t len) static int ofw_fdt_fixup(ofw_t ofw) { -#define FDT_MODEL_LEN 80 char model[FDT_MODEL_LEN]; phandle_t root; ssize_t len;