pvmfw: Expand number of cpus allowed per cluster
Some devices uses a flattened cpu-map to describe
their topology, expand the max number of CPUs per
clusters to 10.
Bug: 335130218
Test: Boot protected microdroid
Change-Id: I922acd358b23abe3ddfafc488319a379f34b8c41
Signed-off-by: David Dai <davidai@google.com>
diff --git a/pvmfw/platform.dts b/pvmfw/platform.dts
index 237b1cb..92ab19c 100644
--- a/pvmfw/platform.dts
+++ b/pvmfw/platform.dts
@@ -61,6 +61,10 @@
core3 { cpu = <PLACEHOLDER>; };
core4 { cpu = <PLACEHOLDER>; };
core5 { cpu = <PLACEHOLDER>; };
+ core6 { cpu = <PLACEHOLDER>; };
+ core7 { cpu = <PLACEHOLDER>; };
+ core8 { cpu = <PLACEHOLDER>; };
+ core9 { cpu = <PLACEHOLDER>; };
};
cluster1 {
core0 { cpu = <PLACEHOLDER>; };
@@ -69,6 +73,10 @@
core3 { cpu = <PLACEHOLDER>; };
core4 { cpu = <PLACEHOLDER>; };
core5 { cpu = <PLACEHOLDER>; };
+ core6 { cpu = <PLACEHOLDER>; };
+ core7 { cpu = <PLACEHOLDER>; };
+ core8 { cpu = <PLACEHOLDER>; };
+ core9 { cpu = <PLACEHOLDER>; };
};
cluster2 {
core0 { cpu = <PLACEHOLDER>; };
@@ -77,6 +85,10 @@
core3 { cpu = <PLACEHOLDER>; };
core4 { cpu = <PLACEHOLDER>; };
core5 { cpu = <PLACEHOLDER>; };
+ core6 { cpu = <PLACEHOLDER>; };
+ core7 { cpu = <PLACEHOLDER>; };
+ core8 { cpu = <PLACEHOLDER>; };
+ core9 { cpu = <PLACEHOLDER>; };
};
};
diff --git a/pvmfw/src/fdt.rs b/pvmfw/src/fdt.rs
index 7e7d641..6038f12 100644
--- a/pvmfw/src/fdt.rs
+++ b/pvmfw/src/fdt.rs
@@ -219,7 +219,7 @@
}
impl ClusterTopology {
- const MAX_CORES_PER_CLUSTER: usize = 6;
+ const MAX_CORES_PER_CLUSTER: usize = 10;
}
#[derive(Debug, Default)]