From owner-dev-commits-src-main@freebsd.org Thu Jul 22 12:54:31 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 370F765A240; Thu, 22 Jul 2021 12:54:31 +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 4GVspv117jz4k1F; Thu, 22 Jul 2021 12:54:31 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 0A8BF1217D; Thu, 22 Jul 2021 12:54:31 +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 16MCsUbl041865; Thu, 22 Jul 2021 12:54:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16MCsUsf041864; Thu, 22 Jul 2021 12:54:30 GMT (envelope-from git) Date: Thu, 22 Jul 2021 12:54:30 GMT Message-Id: <202107221254.16MCsUsf041864@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 50e0dc0c4b46 - main - fdt: Expose the model, compatible and freebsd dts brandind as sysctl MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 50e0dc0c4b46ee62b898ce2d92e52be4f77383d9 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Jul 2021 12:54:31 -0000 The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=50e0dc0c4b46ee62b898ce2d92e52be4f77383d9 commit 50e0dc0c4b46ee62b898ce2d92e52be4f77383d9 Author: Emmanuel Vadot AuthorDate: 2021-07-17 15:19:22 +0000 Commit: Emmanuel Vadot CommitDate: 2021-07-22 12:53:32 +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. MFC after: 1 month Sponsored by: Diablotin Systems Differential Revision: https://reviews.freebsd.org/D31205 Reviewed by: imp Should be ok on powerpc: jhibbits (over irc) --- 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 30b02bac2fc4..304ffb6b1436 100644 --- a/sys/dev/ofw/ofw_fdt.c +++ b/sys/dev/ofw/ofw_fdt.c @@ -105,7 +105,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) @@ -125,19 +132,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); } @@ -411,7 +449,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;