From 2055e12953bb538228d8d9fe627fa545d7cf82be Mon Sep 17 00:00:00 2001 From: Tianon Gravi Date: Fri, 4 Sep 2020 14:12:04 -0700 Subject: [PATCH] Add RPi1/RPi0 workaround On the very popular Raspberry Pi 1 and Zero devices, the CPU is actually ARMv6, but the chip happens to support the feature bit the kernel uses to differentiate v6/v7, so it gets reported as "CPU architecture: 7" and thus fails to run many of the images that get pulled. To account for this very popular edge case, this also checks "model name" which on these chips will begin with "ARMv6-compatible" -- we could also check uname, but getCPUInfo is already handy, low overhead, and mirrors the code before this. Signed-off-by: Tianon Gravi --- platforms/cpuinfo.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/platforms/cpuinfo.go b/platforms/cpuinfo.go index db65a726b..0512bc90e 100644 --- a/platforms/cpuinfo.go +++ b/platforms/cpuinfo.go @@ -96,6 +96,15 @@ func getCPUVariant() string { return "" } + // handle edge case for Raspberry Pi ARMv6 devices (which due to a kernel quirk, report "CPU architecture: 7") + // https://www.raspberrypi.org/forums/viewtopic.php?t=12614 + if runtime.GOARCH == "arm" && variant == "7" { + model, err := getCPUInfo("model name") + if err == nil && strings.HasPrefix(strings.ToLower(model), "armv6-compatible") { + variant = "6" + } + } + switch strings.ToLower(variant) { case "8", "aarch64": // special case: if running a 32-bit userspace on aarch64, the variant should be "v7"