diff --git a/sys/dev/ofw/ofw_fdt.c b/sys/dev/ofw/ofw_fdt.c --- a/sys/dev/ofw/ofw_fdt.c +++ b/sys/dev/ofw/ofw_fdt.c @@ -105,7 +105,14 @@ }; 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_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 @@ static int ofw_fdt_fixup(ofw_t ofw) { -#define FDT_MODEL_LEN 80 char model[FDT_MODEL_LEN]; phandle_t root; ssize_t len;