diff options
| author | Pierre-Clément Tosi <ptosi@google.com> | 2024-04-17 19:49:24 +0100 |
|---|---|---|
| committer | Pierre-Clément Tosi <ptosi@google.com> | 2024-04-18 11:15:33 +0100 |
| commit | 637ca5991c8b7e5550afa56d567ed64556c7dccd (patch) | |
| tree | 8743cf36f65cad8eea84a2a2ee251cd7d6c6a1ae | |
| parent | 3eba8661914b15dc34bde33d6a8201cfc76c7675 (diff) | |
| download | crosvm-637ca5991c8b7e5550afa56d567ed64556c7dccd.tar.gz | |
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
| -rw-r--r-- | aarch64/src/fdt.rs | 2 | ||||
| -rw-r--r-- | cros_fdt/test-files/base.dtb | bin | 808 -> 808 bytes | |||
| -rw-r--r-- | cros_fdt/test-files/base.dts | 4 |
3 files changed, 3 insertions, 3 deletions
diff --git a/aarch64/src/fdt.rs b/aarch64/src/fdt.rs index 36baca4fc..b01ffa186 100644 --- a/aarch64/src/fdt.rs +++ b/aarch64/src/fdt.rs @@ -152,7 +152,7 @@ fn create_cpu_nodes( 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 Binary files differindex c0884ed9d..84736d282 100644 --- a/cros_fdt/test-files/base.dtb +++ b/cros_fdt/test-files/base.dtb diff --git a/cros_fdt/test-files/base.dts b/cros_fdt/test-files/base.dts index abb90ce9c..6b081a4b7 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>; }; |