From 054c036e81dc8b61001bb0e276e08b95fb80290e Mon Sep 17 00:00:00 2001
From: Henry Wang <Henry.Wang@arm.com>
Date: Fri, 25 Jun 2021 10:53:55 +0800
Subject: [PATCH] vmm: acpi: Add AArch64 vCPUs to SRAT table

This commit introduces the `ProcessorGiccAffinity` struct for the
AArch64 platform. This struct will be created and included into
the SRAT table to enable AArch64 NUMA setup.

Signed-off-by: Henry Wang <Henry.Wang@arm.com>
---
 vmm/src/acpi.rs | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/vmm/src/acpi.rs b/vmm/src/acpi.rs
index a6b5f28d8..9760d142f 100644
--- a/vmm/src/acpi.rs
+++ b/vmm/src/acpi.rs
@@ -76,6 +76,18 @@ struct ProcessorLocalX2ApicAffinity {
     _reserved2: u32,
 }
 
+#[allow(dead_code)]
+#[repr(packed)]
+#[derive(Default)]
+struct ProcessorGiccAffinity {
+    pub type_: u8,
+    pub length: u8,
+    pub proximity_domain: u32,
+    pub acpi_processor_uid: u32,
+    pub flags: u32,
+    pub clock_domain: u32,
+}
+
 bitflags! {
     pub struct MemAffinityFlags: u32 {
         const NOFLAGS = 0;
@@ -250,6 +262,7 @@ fn create_srat_table(numa_nodes: &NumaNodes) -> Sdt {
             // - Reserved bits 1-31
             let flags = 1;
 
+            #[cfg(target_arch = "x86_64")]
             srat.append(ProcessorLocalX2ApicAffinity {
                 type_: 2,
                 length: 24,
@@ -259,6 +272,15 @@ fn create_srat_table(numa_nodes: &NumaNodes) -> Sdt {
                 clock_domain: 0,
                 ..Default::default()
             });
+            #[cfg(target_arch = "aarch64")]
+            srat.append(ProcessorGiccAffinity {
+                type_: 3,
+                length: 18,
+                proximity_domain,
+                acpi_processor_uid: x2apic_id,
+                flags,
+                clock_domain: 0,
+            });
         }
     }
     srat