[PATCH 01/14] Hexagon: add v85 CPU model

[Brian Cain <brian.cain@oss.qualcomm.com>]

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>
Signed-off-by: Brian Cain <brian.cain@oss.qualcomm.com>
---
 docs/system/hexagon/emulation.rst | 2 +-
 target/hexagon/cpu-qom.h          | 4 ++++
 linux-user/hexagon/elfload.c      | 4 ++++
 target/hexagon/cpu.c              | 2 ++
 4 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/docs/system/hexagon/emulation.rst b/docs/system/hexagon/emulation.rst
index 12385311aa4..fb57c77ae90 100644
--- a/docs/system/hexagon/emulation.rst
+++ b/docs/system/hexagon/emulation.rst
@@ -6,7 +6,7 @@ Hexagon CPU architecture support
 ================================
 
 QEMU's TCG emulation includes support for v65, v66, v67, v68, v69, v71, v73,
-v75, v77, v79, v81.
+v75, v77, v79, v81, v83, v85.
 It also has support for the following architecture extensions:
 
 - HVX (Hexagon Vector eXtensions)
diff --git a/target/hexagon/cpu-qom.h b/target/hexagon/cpu-qom.h
index 2bfa4d5d0fc..d4c8413ded3 100644
--- a/target/hexagon/cpu-qom.h
+++ b/target/hexagon/cpu-qom.h
@@ -28,6 +28,8 @@ typedef enum {
     HEX_VER_V75 = 0x75,
     HEX_VER_V79 = 0x79,
     HEX_VER_V81 = 0x81,
+    HEX_VER_V83 = 0x83,
+    HEX_VER_V85 = 0x85,
     HEX_VER_ANY = 0xff,
 } HexagonVersion;
 
@@ -55,6 +57,8 @@ typedef struct {
 #define TYPE_HEXAGON_CPU_V75 HEXAGON_CPU_TYPE_NAME("v75")
 #define TYPE_HEXAGON_CPU_V79 HEXAGON_CPU_TYPE_NAME("v79")
 #define TYPE_HEXAGON_CPU_V81 HEXAGON_CPU_TYPE_NAME("v81")
+#define TYPE_HEXAGON_CPU_V83 HEXAGON_CPU_TYPE_NAME("v83")
+#define TYPE_HEXAGON_CPU_V85 HEXAGON_CPU_TYPE_NAME("v85")
 
 OBJECT_DECLARE_CPU_TYPE(HexagonCPU, HexagonCPUClass, HEXAGON_CPU)
 
diff --git a/linux-user/hexagon/elfload.c b/linux-user/hexagon/elfload.c
index 3a6ba4e1304..9f98ad8fb86 100644
--- a/linux-user/hexagon/elfload.c
+++ b/linux-user/hexagon/elfload.c
@@ -113,6 +113,10 @@ const char *get_elf_cpu_model(uint32_t eflags)
         return "v79";
     case 0x81:
         return "v81";
+    case 0x83:
+        return "v83";
+    case 0x85:
+        return "v85";
     }
 
     err = snprintf(buf, sizeof(buf), "unknown (0x%x)", eflags);
diff --git a/target/hexagon/cpu.c b/target/hexagon/cpu.c
index f20d6de6f63..1e3df5d0d03 100644
--- a/target/hexagon/cpu.c
+++ b/target/hexagon/cpu.c
@@ -934,6 +934,8 @@ static const TypeInfo hexagon_cpu_type_infos[] = {
     DEFINE_CPU(TYPE_HEXAGON_CPU_V75,              HEX_VER_V75),
     DEFINE_CPU(TYPE_HEXAGON_CPU_V79,              HEX_VER_V79),
     DEFINE_CPU(TYPE_HEXAGON_CPU_V81,              HEX_VER_V81),
+    DEFINE_CPU(TYPE_HEXAGON_CPU_V83,              HEX_VER_V83),
+    DEFINE_CPU(TYPE_HEXAGON_CPU_V85,              HEX_VER_V85),
 };
 
 DEFINE_TYPES(hexagon_cpu_type_infos)
-- 
2.34.1