Date: Mon, 16 Aug 2021 16:11:32 GMT From: Emmanuel Vadot <manu@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 920a66c0a3b8 - stable/13 - arm64: Only check for freebsd, dts-version if we are booted in FDT mode. Message-ID: <202108161611.17GGBWU2045798@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=920a66c0a3b879418b5ff0393b0bf07b87758999 commit 920a66c0a3b879418b5ff0393b0bf07b87758999 Author: Emmanuel Vadot <manu@FreeBSD.org> AuthorDate: 2021-03-23 15:37:25 +0000 Commit: Emmanuel Vadot <manu@FreeBSD.org> CommitDate: 2021-08-16 16:07:54 +0000 arm64: Only check for freebsd,dts-version if we are booted in FDT mode. Reported by: andrew (cherry picked from commit 6bcba8dac9a4ddaeabf84ad8d31b1113a9dcf8c2) --- sys/arm64/arm64/machdep.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 3c77300f6f2b..6b7e4be7c9d1 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -1359,16 +1359,18 @@ initarm(struct arm64_bootparams *abp) strlcpy(kernelname, env, sizeof(kernelname)); #ifdef FDT - root = OF_finddevice("/"); - if (OF_getprop(root, "freebsd,dts-version", dts_version, sizeof(dts_version)) > 0) { - if (strcmp(LINUX_DTS_VERSION, dts_version) != 0) - printf("WARNING: DTB version is %s while kernel expects %s, " - "please update the DTB in the ESP\n", - dts_version, - LINUX_DTS_VERSION); - } else { - printf("WARNING: Cannot find freebsd,dts-version property, " - "cannot check DTB compliance\n"); + if (arm64_bus_method == ARM64_BUS_FDT) { + root = OF_finddevice("/"); + if (OF_getprop(root, "freebsd,dts-version", dts_version, sizeof(dts_version)) > 0) { + if (strcmp(LINUX_DTS_VERSION, dts_version) != 0) + printf("WARNING: DTB version is %s while kernel expects %s, " + "please update the DTB in the ESP\n", + dts_version, + LINUX_DTS_VERSION); + } else { + printf("WARNING: Cannot find freebsd,dts-version property, " + "cannot check DTB compliance\n"); + } } #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202108161611.17GGBWU2045798>