Re: [PATCH 09/10] hw/riscv/virt-acpi-build.c: Add MMU node in RHCT

[Daniel Henrique Barboza]

On 7/12/23 13:39, Sunil V L wrote:

MMU type information is available via MMU node in RHCT.
Add this node in RHCT.

Signed-off-by: Sunil V L <suni...@ventanamicro.com>
---

Reviewed-by: Daniel Henrique Barboza <dbarb...@ventanamicro.com>

  hw/riscv/virt-acpi-build.c | 36 ++++++++++++++++++++++++++++++++++++
  1 file changed, 36 insertions(+)

diff --git a/hw/riscv/virt-acpi-build.c b/hw/riscv/virt-acpi-build.c
index 2d2bd3b970..25745eee4c 100644
--- a/hw/riscv/virt-acpi-build.c
+++ b/hw/riscv/virt-acpi-build.c
@@ -158,6 +158,8 @@ static void build_rhct(GArray *table_data,
      size_t len, aligned_len;
      uint32_t isa_offset, num_rhct_nodes, cmo_offset = 0;
      RISCVCPU *cpu = &s->soc[0].harts[0];
+    uint32_t mmu_offset = 0;
+    uint8_t satp_mode_max;
      char *isa;

AcpiTable table = { .sig = "RHCT", .rev = 1, .oem_id = s->oem_id,

@@ -177,6 +179,10 @@ static void build_rhct(GArray *table_data,
          num_rhct_nodes++;
      }

+ if (cpu->cfg.satp_mode.supported != 0) {

+        num_rhct_nodes++;
+    }
+
      /* Number of RHCT nodes*/
      build_append_int_noprefix(table_data, num_rhct_nodes, 4);

@@ -202,6 +208,26 @@ static void build_rhct(GArray *table_data,

          build_append_int_noprefix(table_data, 0x0, 1);   /* Optional Padding 
*/
      }

+ /* MMU node structure */

+    if (cpu->cfg.satp_mode.supported != 0) {
+        satp_mode_max = satp_mode_max_from_map(cpu->cfg.satp_mode.map);
+        mmu_offset = table_data->len - table.table_offset;
+        build_append_int_noprefix(table_data, 1, 2);    /* Type */
+        build_append_int_noprefix(table_data, 8, 2);    /* Total Length */
+        build_append_int_noprefix(table_data, 0x1, 2);  /* Revision */
+        build_append_int_noprefix(table_data, 0, 1);    /* Reserved */
+        /* Virtual Address Scheme */
+        if (satp_mode_max == VM_1_10_SV57) {
+            build_append_int_noprefix(table_data, 2, 1);    /* Sv57 */
+        } else if (satp_mode_max == VM_1_10_SV48) {
+            build_append_int_noprefix(table_data, 1, 1);    /* Sv48 */
+        } else if (satp_mode_max == VM_1_10_SV39) {
+            build_append_int_noprefix(table_data, 0, 1);    /* Sv39 */
+        } else {
+            assert(1);
+        }
+    }
+
      /* CMO node */
      if (cpu->cfg.ext_icbom || cpu->cfg.ext_icboz) {
          cmo_offset = table_data->len - table.table_offset;
@@ -244,6 +270,11 @@ static void build_rhct(GArray *table_data,
              num_offsets++;
          }

+ if (mmu_offset) {

+            len += 4;
+            num_offsets++;
+        }
+
          build_append_int_noprefix(table_data, len, 2);
          build_append_int_noprefix(table_data, 0x1, 2); /* Revision */
          /* Number of offsets */
@@ -252,9 +283,14 @@ static void build_rhct(GArray *table_data,

/* Offsets */

          build_append_int_noprefix(table_data, isa_offset, 4);
+
          if (cmo_offset) {
              build_append_int_noprefix(table_data, cmo_offset, 4);
          }
+
+        if (mmu_offset) {
+            build_append_int_noprefix(table_data, mmu_offset, 4);
+        }
      }

acpi_table_end(linker, &table);