UPSTREAM: aarch64: fdt: Fix CPU compatible to "arm,armv8"
The "arm,arm-v8" compatible string is not documented in the Linux kernel
DT bindings [1] and the intended string probably was "arm,armv8" so
update the DT generation code and test files to use that instead.
[1]: https://www.kernel.org/doc/Documentation/devicetree/bindings/arm/cpus.yaml
BUG=b:335470851
Change-Id: I537b7599a89988244714e2c7af766d6b01e398bc
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/5464099
Auto-Submit: Pierre-Clément Tosi <ptosi@google.com>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Test: TH
Bug: 335470851
Change-Id: I954569a6c9c3c7dc59ffd8c1eee38c32776999fd
diff --git a/aarch64/src/fdt.rs b/aarch64/src/fdt.rs
index 36baca4..b01ffa1 100644
--- a/aarch64/src/fdt.rs
+++ b/aarch64/src/fdt.rs
@@ -152,7 +152,7 @@
let cpu_name = format!("cpu@{:x}", reg);
let cpu_node = cpus_node.subnode_mut(&cpu_name)?;
cpu_node.set_prop("device_type", "cpu")?;
- cpu_node.set_prop("compatible", "arm,arm-v8")?;
+ cpu_node.set_prop("compatible", "arm,armv8")?;
if num_cpus > 1 {
cpu_node.set_prop("enable-method", "psci")?;
}
diff --git a/cros_fdt/test-files/base.dtb b/cros_fdt/test-files/base.dtb
index c0884ed..84736d2 100644
--- a/cros_fdt/test-files/base.dtb
+++ b/cros_fdt/test-files/base.dtb
Binary files differ
diff --git a/cros_fdt/test-files/base.dts b/cros_fdt/test-files/base.dts
index abb90ce..6b081a4 100644
--- a/cros_fdt/test-files/base.dts
+++ b/cros_fdt/test-files/base.dts
@@ -17,14 +17,14 @@
cpu@0 {
device_type = "cpu";
- compatible = "arm,arm-v8";
+ compatible = "arm,armv8";
enable-method = "psci";
reg = <0x00>;
};
cpu@1 {
device_type = "cpu";
- compatible = "arm,arm-v8";
+ compatible = "arm,armv8";
enable-method = "psci";
reg = <0x01>;
};
