gtdt: general fix

Author: sunflower2333

include/common/gtdt.h

@@ -82,9 +82,26 @@ enum GTDT_BLOCK_PVT_TIMER_INTERRUPT_POLARITY {
 };
 #define GTDT_BLOCK_PVT_FLAG_TIMER_RESERVED GEN_MSK(31, 2)
 
-#define GTDT_BLOCK_COMMONT_FLAGS_TIMER_SECURE_TIMER BIT(0)
-#define GTDT_BLOCK_COMMONT_FLAGS_TIMER_ALWAYS_ON_CAP BIT(1)
-#define GTDT_BLOCK_COMMONR_FLAG_TIMER_RESERVED GEN_MSK(31, 2)
+#define GTDT_BLOCK_COMMONT_FLAG_TIMER_SECURE_TIMER BIT(0)
+#define GTDT_BLOCK_COMMONT_FLAG_TIMER_ALWAYS_ON_CAP BIT(1)
+#define GTDT_BLOCK_COMMONT_FLAG_TIMER_RESERVED GEN_MSK(31, 2)
+
+#define GTDT_BLOCK_S_NS_ELX_TIMER_FLAG_TIMER_INTERRUPT_MODE BIT(0)
+enum GTDT_BLOCK_S_NS_ELX_TIMER_INTERRUPT_MODE {
+  GTDT_BLOCK_S_NS_ELX_TIMER_INTERRUPT_MODE_LVL_TRIGGERED = 0,
+  GTDT_BLOCK_S_NS_ELX_TIMER_INTERRUPT_MODE_EDGE_TRIGGERED = 1,
+};
+#define GTDT_BLOCK_S_NS_ELX_TIMER_FLAG_TIMER_INTERRUPT_POLARITY BIT(1)
+enum GTDT_BLOCK_S_NS_ELX_TIMER_INTERRUPT_POLARITY {
+  GTDT_BLOCK_S_NS_ELX_TIMER_INTERRUPT_POLARITY_ACTIVE_HIGH = 0,
+  GTDT_BLOCK_S_NS_ELX_TIMER_INTERRUPT_POLARITY_ACTIVE_LOW = 1,
+};
+#define GTDT_BLOCK_S_NS_ELX_TIMER_FLAG_ALWATS_ON_CAP BIT(2)
+enum GTDT_BLOCK_S_NS_ELX_TIMER_ALWATS_ON_CAP {
+  GTDT_BLOCK_S_NS_ELX_TIMER_ALWATS_ON_CAP_NO = 0,
+  GTDT_BLOCK_S_NS_ELX_TIMER_ALWATS_ON_CAP_YES = 1,
+};
+#define GTDT_BLOCK_S_NS_ELX_TIMER_FLAG_RESERVED GEN_MSK(31, 3)
 
 typedef struct {
   UINT8 Type;    // 0x1 => WDT

include/vendor/qcom/sm8150/gtdt.h

@@ -37,6 +37,6 @@ GTDT_START{
                  .CNTEL0BaseX = 0x17C22000,
                  .PhysicalTimerGSI = 0x28,
                  .VirtualTimerGSI = 0x26,
-                 .CommonFlags = GTDT_BLOCK_COMMONT_FLAGS_TIMER_ALWAYS_ON_CAP,
+                 .CommonFlags = GTDT_BLOCK_COMMONT_FLAG_TIMER_ALWAYS_ON_CAP,
              }},
 } GTDT_END;

include/vendor/qcom/sm8850/dbg2.h

@@ -15,14 +15,6 @@
 /* typedef */
 DBG2_DEFINE_DEBUG_DEVICE_INFO_STRUCTURE(UARD, UARD_NUM_GAS,
                                         sizeof(UARD_NAMESPACE_STRING), 0);
-_Static_assert(sizeof(DBG2_DEBUG_DEVICE_INFO_STRUCTURE_UARD) ==
-                   22 + sizeof(ACPI_GAS) * 1 + sizeof(UINT32) * 1 +
-                       sizeof("\\_SB.UARD") + 0,
-               "DBG2_DEBUG_DEVICE_INFO_STRUCTURE_"
-               "UARD"
-               " size incorrect");
-;
-
 DBG2_DEFINE_DEBUG_DEVICE_INFO_STRUCTURE(URS0HS, URS0_NUM_GAS,
                                         sizeof(URS0_NAMESPACE_STRING),
                                         USB_OEM_DATA_SIZE);

include/vendor/qcom/sm8850/gtdt.h

@@ -0,0 +1,24 @@
+#pragma once
+#include "table_header.h"
+#include <common/gtdt.h>
+#include <stddef.h>
+
+GTDT_DEFINE_TABLE();
+GTDT_DEFINE_WITH_MAGIC;
+
+GTDT_START{
+    GTDT_DECLARE_HEADER,
+    .GTDTHeaderExtraData =
+        {
+            .CntControlBasePhyAddress = 0xFFFFFFFFFFFFFFFFULL,
+            .SecureEL1TimerGSI = 0x1D,
+            .SecureEL1TimerFlags = GTDT_BLOCK_S_NS_ELX_TIMER_FLAG_ALWATS_ON_CAP,
+            .NSEL1TimerGSI = 0x1E,
+            .NSEL1TimerFlags = GTDT_BLOCK_S_NS_ELX_TIMER_FLAG_ALWATS_ON_CAP,
+            .VirtualEL1TimerGSI = 0x1B,
+            .VirtualEL1TimerFlags = GTDT_BLOCK_S_NS_ELX_TIMER_FLAG_ALWATS_ON_CAP,
+            .EL2TimerGSI = 0x1A,
+            .EL2TimerFlags = GTDT_BLOCK_S_NS_ELX_TIMER_FLAG_ALWATS_ON_CAP,
+            .CntReadBasePhyAddress = 0xFFFFFFFFFFFFFFFFULL,
+        },
+} GTDT_END;