x86/platform/uv: Update UV MMRs for UV5
authorMike Travis <mike.travis@hpe.com>
Mon, 5 Oct 2020 20:39:20 +0000 (15:39 -0500)
committerBorislav Petkov <bp@suse.de>
Wed, 7 Oct 2020 07:00:57 +0000 (09:00 +0200)
Update UV MMRs in uv_mmrs.h for UV5 based on Verilog output from the
UV Hub hardware design files.  This is the next UV architecture with
a new class (UVY) being defined for 52 bit physical address masks.
Uses a bitmask for UV arch identification so a single test can cover
multiple versions.  Includes other adjustments to match the uv_mmrs.h
file to keep from encountering compile errors.  New UV5 functionality
is added in the patches that follow.

[ Fix W=1 build warnings. ]
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: Mike Travis <mike.travis@hpe.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Steve Wahl <steve.wahl@hpe.com>
Link: https://lkml.kernel.org/r/20201005203929.148656-5-mike.travis@hpe.com
arch/x86/include/asm/uv/uv_hub.h
arch/x86/include/asm/uv/uv_mmrs.h
arch/x86/kernel/apic/x2apic_uv_x.c
arch/x86/platform/uv/uv_time.c
drivers/misc/sgi-gru/grufile.c

index b21228d..76969be 100644 (file)
@@ -144,6 +144,8 @@ struct uv_gam_range_s {
  * available in the L3 cache on the cpu socket for the node.
  */
 struct uv_hub_info_s {
+       unsigned int            hub_type;
+       unsigned char           hub_revision;
        unsigned long           global_mmr_base;
        unsigned long           global_mmr_shift;
        unsigned long           gpa_mask;
@@ -156,7 +158,6 @@ struct uv_hub_info_s {
        unsigned char           m_val;
        unsigned char           n_val;
        unsigned char           gr_table_len;
-       unsigned char           hub_revision;
        unsigned char           apic_pnode_shift;
        unsigned char           gpa_shift;
        unsigned char           m_shift;
@@ -205,6 +206,17 @@ static inline struct uv_hub_info_s *uv_cpu_hub_info(int cpu)
        return (struct uv_hub_info_s *)uv_cpu_info_per(cpu)->p_uv_hub_info;
 }
 
+static inline int uv_hub_type(void)
+{
+       return uv_hub_info->hub_type;
+}
+
+static inline __init void uv_hub_type_set(int uvmask)
+{
+       uv_hub_info->hub_type = uvmask;
+}
+
+
 /*
  * HUB revision ranges for each UV HUB architecture.
  * This is a software convention - NOT the hardware revision numbers in
@@ -215,38 +227,29 @@ static inline struct uv_hub_info_s *uv_cpu_hub_info(int cpu)
 #define UV4_HUB_REVISION_BASE          7
 #define UV4A_HUB_REVISION_BASE         8       /* UV4 (fixed) rev 2 */
 
-static inline int is_uv2_hub(void)
-{
-       return is_uv_hubbed(uv(2));
-}
-
-static inline int is_uv3_hub(void)
-{
-       return is_uv_hubbed(uv(3));
-}
+static inline int is_uv(int uvmask) { return uv_hub_type() & uvmask; }
+static inline int is_uv1_hub(void) { return 0; }
+static inline int is_uv2_hub(void) { return is_uv(UV2); }
+static inline int is_uv3_hub(void) { return is_uv(UV3); }
+static inline int is_uv4a_hub(void) { return is_uv(UV4A); }
+static inline int is_uv4_hub(void) { return is_uv(UV4); }
+static inline int is_uv5_hub(void) { return 0; }
 
-/* First test "is UV4A", then "is UV4" */
-static inline int is_uv4a_hub(void)
-{
-       if (is_uv_hubbed(uv(4)))
-               return (uv_hub_info->hub_revision == UV4A_HUB_REVISION_BASE);
-       return 0;
-}
+/*
+ * UV4A is a revision of UV4.  So on UV4A, both is_uv4_hub() and
+ * is_uv4a_hub() return true, While on UV4, only is_uv4_hub()
+ * returns true.  So to get true results, first test if is UV4A,
+ * then test if is UV4.
+ */
 
-static inline int is_uv4_hub(void)
-{
-       return is_uv_hubbed(uv(4));
-}
+/* UVX class: UV2,3,4 */
+static inline int is_uvx_hub(void) { return is_uv(UVX); }
 
-static inline int is_uvx_hub(void)
-{
-       return (is_uv_hubbed(-2) >= uv(2));
-}
+/* UVY class: UV5,..? */
+static inline int is_uvy_hub(void) { return 0; }
 
-static inline int is_uv_hub(void)
-{
-       return is_uvx_hub();
-}
+/* Any UV Hubbed System */
+static inline int is_uv_hub(void) { return is_uv(UV_ANY); }
 
 union uvh_apicid {
     unsigned long       v;
index 775bf14..06ea2d1 100644 (file)
@@ -3,7 +3,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * SGI UV MMR definitions
+ * HPE UV MMR definitions
  *
  * Copyright (C) 2007-2016 Silicon Graphics, Inc. All rights reserved.
  */
  * grouped by architecture types.
  *
  * UVH  - definitions common to all UV hub types.
- * UVXH - definitions common to all UV eXtended hub types (currently 2, 3, 4).
- * UV2H - definitions specific to UV type 2 hub.
- * UV3H - definitions specific to UV type 3 hub.
+ * UVXH - definitions common to UVX class (2, 3, 4).
+ * UVYH - definitions common to UVY class (5).
+ * UV5H - definitions specific to UV type 5 hub.
+ * UV4AH - definitions specific to UV type 4A hub.
  * UV4H - definitions specific to UV type 4 hub.
- *
- * So in general, MMR addresses and structures are identical on all hubs types.
- * These MMRs are identified as:
- *     #define UVH_xxx         <address>
- *     union uvh_xxx {
- *             unsigned long       v;
- *             struct uvh_int_cmpd_s {
- *             } s;
- *     };
+ * UV3H - definitions specific to UV type 3 hub.
+ * UV2H - definitions specific to UV type 2 hub.
  *
  * If the MMR exists on all hub types but have different addresses,
- * use a conditional operator to define the value at runtime.
- *     #define UV2Hxxx b
- *     #define UV3Hxxx c
- *     #define UV4Hxxx d
- *     #define UV4AHxxx e
- *     #define UVHxxx  (is_uv2_hub() ? UV2Hxxx :
- *                     (is_uv3_hub() ? UV3Hxxx :
- *                     (is_uv4a_hub() ? UV4AHxxx :
- *                                     UV4Hxxx))
+ * use a conditional operator to define the value at runtime.  Any
+ * that are not defined are blank.
+ *     (UV4A variations only generated if different from uv4)
+ *     #define UVHxxx (
+ *             is_uv(UV5) ? UV5Hxxx value :
+ *             is_uv(UV4A) ? UV4AHxxx value :
+ *             is_uv(UV4) ? UV4Hxxx value :
+ *             is_uv(UV3) ? UV3Hxxx value :
+ *             is_uv(UV2) ? UV2Hxxx value :
+ *             <ucv> or <undef value>)
+ *
+ * Class UVX has UVs (2|3|4|4A).
+ * Class UVY has UVs (5).
  *
  *     union uvh_xxx {
  *             unsigned long       v;
  *             struct uvh_xxx_s {       # Common fields only
  *             } s;
- *             struct uv2h_xxx_s {      # Full UV2 definition (*)
- *             } s2;
- *             struct uv3h_xxx_s {      # Full UV3 definition (*)
- *             } s3;
- *             (NOTE: No struct uv4ah_xxx_s members exist)
+ *             struct uv5h_xxx_s {      # Full UV5 definition (*)
+ *             } s5;
+ *             struct uv4ah_xxx_s {     # Full UV4A definition (*)
+ *             } s4a;
  *             struct uv4h_xxx_s {      # Full UV4 definition (*)
  *             } s4;
+ *             struct uv3h_xxx_s {      # Full UV3 definition (*)
+ *             } s3;
+ *             struct uv2h_xxx_s {      # Full UV2 definition (*)
+ *             } s2;
  *     };
  *             (* - if present and different than the common struct)
  *
  * if the contents is the same for all hubs, only the "s" structure is
  * generated.
  *
- * If the MMR exists on ONLY 1 type of hub, no generic definition is
- * generated:
- *     #define UVnH_xxx        <uvn address>
- *     union uvnh_xxx {
- *             unsigned long       v;
- *             struct uvh_int_cmpd_s {
- *             } sn;
- *     };
- *
- * (GEN Flags: mflags_opt= undefs=function UV234=UVXH)
+ * (GEN Flags: undefs=function)
  */
 
+ /* UV bit masks */
+#define        UV2     (1 << 0)
+#define        UV3     (1 << 1)
+#define        UV4     (1 << 2)
+#define        UV4A    (1 << 3)
+#define        UV5     (1 << 4)
+#define        UVX     (UV2|UV3|UV4)
+#define        UVY     (UV5)
+#define        UV_ANY  (~0)
+
+
+
+
 #define UV_MMR_ENABLE          (1UL << 63)
 
+#define UV1_HUB_PART_NUMBER    0x88a5
 #define UV2_HUB_PART_NUMBER    0x8eb8
 #define UV2_HUB_PART_NUMBER_X  0x1111
 #define UV3_HUB_PART_NUMBER    0x9578
 #define UV3_HUB_PART_NUMBER_X  0x4321
 #define UV4_HUB_PART_NUMBER    0x99a1
+#define UV5_HUB_PART_NUMBER    0xa171
 
 /* Error function to catch undefined references */
 extern unsigned long uv_undefined(char *str);
 
 /* ========================================================================= */
-/*                          UVH_BAU_DATA_BROADCAST                           */
-/* ========================================================================= */
-#define UVH_BAU_DATA_BROADCAST 0x61688UL
-
-#define UV2H_BAU_DATA_BROADCAST_32 0x440
-#define UV3H_BAU_DATA_BROADCAST_32 0x440
-#define UV4H_BAU_DATA_BROADCAST_32 0x360
-#define UVH_BAU_DATA_BROADCAST_32 (                                    \
-       is_uv2_hub() ? UV2H_BAU_DATA_BROADCAST_32 :                     \
-       is_uv3_hub() ? UV3H_BAU_DATA_BROADCAST_32 :                     \
-       /*is_uv4_hub*/ UV4H_BAU_DATA_BROADCAST_32)
-
-#define UVH_BAU_DATA_BROADCAST_ENABLE_SHFT             0
-#define UVH_BAU_DATA_BROADCAST_ENABLE_MASK             0x0000000000000001UL
-
-
-union uvh_bau_data_broadcast_u {
-       unsigned long   v;
-       struct uvh_bau_data_broadcast_s {
-               unsigned long   enable:1;                       /* RW */
-               unsigned long   rsvd_1_63:63;
-       } s;
-};
-
-/* ========================================================================= */
-/*                           UVH_BAU_DATA_CONFIG                             */
-/* ========================================================================= */
-#define UVH_BAU_DATA_CONFIG 0x61680UL
-
-#define UV2H_BAU_DATA_CONFIG_32 0x438
-#define UV3H_BAU_DATA_CONFIG_32 0x438
-#define UV4H_BAU_DATA_CONFIG_32 0x358
-#define UVH_BAU_DATA_CONFIG_32 (                                       \
-       is_uv2_hub() ? UV2H_BAU_DATA_CONFIG_32 :                        \
-       is_uv3_hub() ? UV3H_BAU_DATA_CONFIG_32 :                        \
-       /*is_uv4_hub*/ UV4H_BAU_DATA_CONFIG_32)
-
-#define UVH_BAU_DATA_CONFIG_VECTOR_SHFT                        0
-#define UVH_BAU_DATA_CONFIG_DM_SHFT                    8
-#define UVH_BAU_DATA_CONFIG_DESTMODE_SHFT              11
-#define UVH_BAU_DATA_CONFIG_STATUS_SHFT                        12
-#define UVH_BAU_DATA_CONFIG_P_SHFT                     13
-#define UVH_BAU_DATA_CONFIG_T_SHFT                     15
-#define UVH_BAU_DATA_CONFIG_M_SHFT                     16
-#define UVH_BAU_DATA_CONFIG_APIC_ID_SHFT               32
-#define UVH_BAU_DATA_CONFIG_VECTOR_MASK                        0x00000000000000ffUL
-#define UVH_BAU_DATA_CONFIG_DM_MASK                    0x0000000000000700UL
-#define UVH_BAU_DATA_CONFIG_DESTMODE_MASK              0x0000000000000800UL
-#define UVH_BAU_DATA_CONFIG_STATUS_MASK                        0x0000000000001000UL
-#define UVH_BAU_DATA_CONFIG_P_MASK                     0x0000000000002000UL
-#define UVH_BAU_DATA_CONFIG_T_MASK                     0x0000000000008000UL
-#define UVH_BAU_DATA_CONFIG_M_MASK                     0x0000000000010000UL
-#define UVH_BAU_DATA_CONFIG_APIC_ID_MASK               0xffffffff00000000UL
-
-
-union uvh_bau_data_config_u {
-       unsigned long   v;
-       struct uvh_bau_data_config_s {
-               unsigned long   vector_:8;                      /* RW */
-               unsigned long   dm:3;                           /* RW */
-               unsigned long   destmode:1;                     /* RW */
-               unsigned long   status:1;                       /* RO */
-               unsigned long   p:1;                            /* RO */
-               unsigned long   rsvd_14:1;
-               unsigned long   t:1;                            /* RO */
-               unsigned long   m:1;                            /* RW */
-               unsigned long   rsvd_17_31:15;
-               unsigned long   apic_id:32;                     /* RW */
-       } s;
-};
-
-/* ========================================================================= */
 /*                           UVH_EVENT_OCCURRED0                             */
 /* ========================================================================= */
 #define UVH_EVENT_OCCURRED0 0x70000UL
-#define UVH_EVENT_OCCURRED0_32 0x5e8
 
+/* UVH common defines*/
 #define UVH_EVENT_OCCURRED0_LB_HCERR_SHFT              0
-#define UVH_EVENT_OCCURRED0_RH_AOERR0_SHFT             11
 #define UVH_EVENT_OCCURRED0_LB_HCERR_MASK              0x0000000000000001UL
-#define UVH_EVENT_OCCURRED0_RH_AOERR0_MASK             0x0000000000000800UL
 
+/* UVXH common defines */
 #define UVXH_EVENT_OCCURRED0_RH_HCERR_SHFT             2
-#define UVXH_EVENT_OCCURRED0_LH0_HCERR_SHFT            3
-#define UVXH_EVENT_OCCURRED0_LH1_HCERR_SHFT            4
-#define UVXH_EVENT_OCCURRED0_GR0_HCERR_SHFT            5
-#define UVXH_EVENT_OCCURRED0_GR1_HCERR_SHFT            6
-#define UVXH_EVENT_OCCURRED0_NI0_HCERR_SHFT            7
-#define UVXH_EVENT_OCCURRED0_NI1_HCERR_SHFT            8
-#define UVXH_EVENT_OCCURRED0_LB_AOERR0_SHFT            9
-#define UVXH_EVENT_OCCURRED0_LH0_AOERR0_SHFT           12
-#define UVXH_EVENT_OCCURRED0_LH1_AOERR0_SHFT           13
-#define UVXH_EVENT_OCCURRED0_GR0_AOERR0_SHFT           14
-#define UVXH_EVENT_OCCURRED0_GR1_AOERR0_SHFT           15
-#define UVXH_EVENT_OCCURRED0_XB_AOERR0_SHFT            16
 #define UVXH_EVENT_OCCURRED0_RH_HCERR_MASK             0x0000000000000004UL
+#define UVXH_EVENT_OCCURRED0_LH0_HCERR_SHFT            3
 #define UVXH_EVENT_OCCURRED0_LH0_HCERR_MASK            0x0000000000000008UL
+#define UVXH_EVENT_OCCURRED0_LH1_HCERR_SHFT            4
 #define UVXH_EVENT_OCCURRED0_LH1_HCERR_MASK            0x0000000000000010UL
+#define UVXH_EVENT_OCCURRED0_GR0_HCERR_SHFT            5
 #define UVXH_EVENT_OCCURRED0_GR0_HCERR_MASK            0x0000000000000020UL
+#define UVXH_EVENT_OCCURRED0_GR1_HCERR_SHFT            6
 #define UVXH_EVENT_OCCURRED0_GR1_HCERR_MASK            0x0000000000000040UL
+#define UVXH_EVENT_OCCURRED0_NI0_HCERR_SHFT            7
 #define UVXH_EVENT_OCCURRED0_NI0_HCERR_MASK            0x0000000000000080UL
+#define UVXH_EVENT_OCCURRED0_NI1_HCERR_SHFT            8
 #define UVXH_EVENT_OCCURRED0_NI1_HCERR_MASK            0x0000000000000100UL
+#define UVXH_EVENT_OCCURRED0_LB_AOERR0_SHFT            9
 #define UVXH_EVENT_OCCURRED0_LB_AOERR0_MASK            0x0000000000000200UL
+#define UVXH_EVENT_OCCURRED0_RH_AOERR0_SHFT            11
+#define UVXH_EVENT_OCCURRED0_RH_AOERR0_MASK            0x0000000000000800UL
+#define UVXH_EVENT_OCCURRED0_LH0_AOERR0_SHFT           12
 #define UVXH_EVENT_OCCURRED0_LH0_AOERR0_MASK           0x0000000000001000UL
+#define UVXH_EVENT_OCCURRED0_LH1_AOERR0_SHFT           13
 #define UVXH_EVENT_OCCURRED0_LH1_AOERR0_MASK           0x0000000000002000UL
+#define UVXH_EVENT_OCCURRED0_GR0_AOERR0_SHFT           14
 #define UVXH_EVENT_OCCURRED0_GR0_AOERR0_MASK           0x0000000000004000UL
+#define UVXH_EVENT_OCCURRED0_GR1_AOERR0_SHFT           15
 #define UVXH_EVENT_OCCURRED0_GR1_AOERR0_MASK           0x0000000000008000UL
+#define UVXH_EVENT_OCCURRED0_XB_AOERR0_SHFT            16
 #define UVXH_EVENT_OCCURRED0_XB_AOERR0_MASK            0x0000000000010000UL
 
-#define UV2H_EVENT_OCCURRED0_QP_HCERR_SHFT             1
-#define UV2H_EVENT_OCCURRED0_QP_AOERR0_SHFT            10
-#define UV2H_EVENT_OCCURRED0_RT_AOERR0_SHFT            17
-#define UV2H_EVENT_OCCURRED0_NI0_AOERR0_SHFT           18
-#define UV2H_EVENT_OCCURRED0_NI1_AOERR0_SHFT           19
-#define UV2H_EVENT_OCCURRED0_LB_AOERR1_SHFT            20
-#define UV2H_EVENT_OCCURRED0_QP_AOERR1_SHFT            21
-#define UV2H_EVENT_OCCURRED0_RH_AOERR1_SHFT            22
-#define UV2H_EVENT_OCCURRED0_LH0_AOERR1_SHFT           23
-#define UV2H_EVENT_OCCURRED0_LH1_AOERR1_SHFT           24
-#define UV2H_EVENT_OCCURRED0_GR0_AOERR1_SHFT           25
-#define UV2H_EVENT_OCCURRED0_GR1_AOERR1_SHFT           26
-#define UV2H_EVENT_OCCURRED0_XB_AOERR1_SHFT            27
-#define UV2H_EVENT_OCCURRED0_RT_AOERR1_SHFT            28
-#define UV2H_EVENT_OCCURRED0_NI0_AOERR1_SHFT           29
-#define UV2H_EVENT_OCCURRED0_NI1_AOERR1_SHFT           30
-#define UV2H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_SHFT  31
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_0_SHFT         32
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_1_SHFT         33
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_2_SHFT         34
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_3_SHFT         35
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_4_SHFT         36
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_5_SHFT         37
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_6_SHFT         38
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_7_SHFT         39
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_8_SHFT         40
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_9_SHFT         41
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_10_SHFT                42
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_11_SHFT                43
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_12_SHFT                44
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_13_SHFT                45
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_14_SHFT                46
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_15_SHFT                47
-#define UV2H_EVENT_OCCURRED0_L1_NMI_INT_SHFT           48
-#define UV2H_EVENT_OCCURRED0_STOP_CLOCK_SHFT           49
-#define UV2H_EVENT_OCCURRED0_ASIC_TO_L1_SHFT           50
-#define UV2H_EVENT_OCCURRED0_L1_TO_ASIC_SHFT           51
-#define UV2H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_SHFT       52
-#define UV2H_EVENT_OCCURRED0_IPI_INT_SHFT              53
-#define UV2H_EVENT_OCCURRED0_EXTIO_INT0_SHFT           54
-#define UV2H_EVENT_OCCURRED0_EXTIO_INT1_SHFT           55
-#define UV2H_EVENT_OCCURRED0_EXTIO_INT2_SHFT           56
-#define UV2H_EVENT_OCCURRED0_EXTIO_INT3_SHFT           57
-#define UV2H_EVENT_OCCURRED0_PROFILE_INT_SHFT          58
-#define UV2H_EVENT_OCCURRED0_QP_HCERR_MASK             0x0000000000000002UL
-#define UV2H_EVENT_OCCURRED0_QP_AOERR0_MASK            0x0000000000000400UL
-#define UV2H_EVENT_OCCURRED0_RT_AOERR0_MASK            0x0000000000020000UL
-#define UV2H_EVENT_OCCURRED0_NI0_AOERR0_MASK           0x0000000000040000UL
-#define UV2H_EVENT_OCCURRED0_NI1_AOERR0_MASK           0x0000000000080000UL
-#define UV2H_EVENT_OCCURRED0_LB_AOERR1_MASK            0x0000000000100000UL
-#define UV2H_EVENT_OCCURRED0_QP_AOERR1_MASK            0x0000000000200000UL
-#define UV2H_EVENT_OCCURRED0_RH_AOERR1_MASK            0x0000000000400000UL
-#define UV2H_EVENT_OCCURRED0_LH0_AOERR1_MASK           0x0000000000800000UL
-#define UV2H_EVENT_OCCURRED0_LH1_AOERR1_MASK           0x0000000001000000UL
-#define UV2H_EVENT_OCCURRED0_GR0_AOERR1_MASK           0x0000000002000000UL
-#define UV2H_EVENT_OCCURRED0_GR1_AOERR1_MASK           0x0000000004000000UL
-#define UV2H_EVENT_OCCURRED0_XB_AOERR1_MASK            0x0000000008000000UL
-#define UV2H_EVENT_OCCURRED0_RT_AOERR1_MASK            0x0000000010000000UL
-#define UV2H_EVENT_OCCURRED0_NI0_AOERR1_MASK           0x0000000020000000UL
-#define UV2H_EVENT_OCCURRED0_NI1_AOERR1_MASK           0x0000000040000000UL
-#define UV2H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_MASK  0x0000000080000000UL
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_0_MASK         0x0000000100000000UL
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_1_MASK         0x0000000200000000UL
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_2_MASK         0x0000000400000000UL
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_3_MASK         0x0000000800000000UL
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_4_MASK         0x0000001000000000UL
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_5_MASK         0x0000002000000000UL
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_6_MASK         0x0000004000000000UL
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_7_MASK         0x0000008000000000UL
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_8_MASK         0x0000010000000000UL
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_9_MASK         0x0000020000000000UL
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_10_MASK                0x0000040000000000UL
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_11_MASK                0x0000080000000000UL
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_12_MASK                0x0000100000000000UL
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_13_MASK                0x0000200000000000UL
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_14_MASK                0x0000400000000000UL
-#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_15_MASK                0x0000800000000000UL
-#define UV2H_EVENT_OCCURRED0_L1_NMI_INT_MASK           0x0001000000000000UL
-#define UV2H_EVENT_OCCURRED0_STOP_CLOCK_MASK           0x0002000000000000UL
-#define UV2H_EVENT_OCCURRED0_ASIC_TO_L1_MASK           0x0004000000000000UL
-#define UV2H_EVENT_OCCURRED0_L1_TO_ASIC_MASK           0x0008000000000000UL
-#define UV2H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_MASK       0x0010000000000000UL
-#define UV2H_EVENT_OCCURRED0_IPI_INT_MASK              0x0020000000000000UL
-#define UV2H_EVENT_OCCURRED0_EXTIO_INT0_MASK           0x0040000000000000UL
-#define UV2H_EVENT_OCCURRED0_EXTIO_INT1_MASK           0x0080000000000000UL
-#define UV2H_EVENT_OCCURRED0_EXTIO_INT2_MASK           0x0100000000000000UL
-#define UV2H_EVENT_OCCURRED0_EXTIO_INT3_MASK           0x0200000000000000UL
-#define UV2H_EVENT_OCCURRED0_PROFILE_INT_MASK          0x0400000000000000UL
-
-#define UV3H_EVENT_OCCURRED0_QP_HCERR_SHFT             1
-#define UV3H_EVENT_OCCURRED0_QP_AOERR0_SHFT            10
-#define UV3H_EVENT_OCCURRED0_RT_AOERR0_SHFT            17
-#define UV3H_EVENT_OCCURRED0_NI0_AOERR0_SHFT           18
-#define UV3H_EVENT_OCCURRED0_NI1_AOERR0_SHFT           19
-#define UV3H_EVENT_OCCURRED0_LB_AOERR1_SHFT            20
-#define UV3H_EVENT_OCCURRED0_QP_AOERR1_SHFT            21
-#define UV3H_EVENT_OCCURRED0_RH_AOERR1_SHFT            22
-#define UV3H_EVENT_OCCURRED0_LH0_AOERR1_SHFT           23
-#define UV3H_EVENT_OCCURRED0_LH1_AOERR1_SHFT           24
-#define UV3H_EVENT_OCCURRED0_GR0_AOERR1_SHFT           25
-#define UV3H_EVENT_OCCURRED0_GR1_AOERR1_SHFT           26
-#define UV3H_EVENT_OCCURRED0_XB_AOERR1_SHFT            27
-#define UV3H_EVENT_OCCURRED0_RT_AOERR1_SHFT            28
-#define UV3H_EVENT_OCCURRED0_NI0_AOERR1_SHFT           29
-#define UV3H_EVENT_OCCURRED0_NI1_AOERR1_SHFT           30
-#define UV3H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_SHFT  31
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_0_SHFT         32
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_1_SHFT         33
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_2_SHFT         34
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_3_SHFT         35
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_4_SHFT         36
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_5_SHFT         37
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_6_SHFT         38
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_7_SHFT         39
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_8_SHFT         40
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_9_SHFT         41
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_10_SHFT                42
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_11_SHFT                43
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_12_SHFT                44
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_13_SHFT                45
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_14_SHFT                46
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_15_SHFT                47
-#define UV3H_EVENT_OCCURRED0_L1_NMI_INT_SHFT           48
-#define UV3H_EVENT_OCCURRED0_STOP_CLOCK_SHFT           49
-#define UV3H_EVENT_OCCURRED0_ASIC_TO_L1_SHFT           50
-#define UV3H_EVENT_OCCURRED0_L1_TO_ASIC_SHFT           51
-#define UV3H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_SHFT       52
-#define UV3H_EVENT_OCCURRED0_IPI_INT_SHFT              53
-#define UV3H_EVENT_OCCURRED0_EXTIO_INT0_SHFT           54
-#define UV3H_EVENT_OCCURRED0_EXTIO_INT1_SHFT           55
-#define UV3H_EVENT_OCCURRED0_EXTIO_INT2_SHFT           56
-#define UV3H_EVENT_OCCURRED0_EXTIO_INT3_SHFT           57
-#define UV3H_EVENT_OCCURRED0_PROFILE_INT_SHFT          58
-#define UV3H_EVENT_OCCURRED0_QP_HCERR_MASK             0x0000000000000002UL
-#define UV3H_EVENT_OCCURRED0_QP_AOERR0_MASK            0x0000000000000400UL
-#define UV3H_EVENT_OCCURRED0_RT_AOERR0_MASK            0x0000000000020000UL
-#define UV3H_EVENT_OCCURRED0_NI0_AOERR0_MASK           0x0000000000040000UL
-#define UV3H_EVENT_OCCURRED0_NI1_AOERR0_MASK           0x0000000000080000UL
-#define UV3H_EVENT_OCCURRED0_LB_AOERR1_MASK            0x0000000000100000UL
-#define UV3H_EVENT_OCCURRED0_QP_AOERR1_MASK            0x0000000000200000UL
-#define UV3H_EVENT_OCCURRED0_RH_AOERR1_MASK            0x0000000000400000UL
-#define UV3H_EVENT_OCCURRED0_LH0_AOERR1_MASK           0x0000000000800000UL
-#define UV3H_EVENT_OCCURRED0_LH1_AOERR1_MASK           0x0000000001000000UL
-#define UV3H_EVENT_OCCURRED0_GR0_AOERR1_MASK           0x0000000002000000UL
-#define UV3H_EVENT_OCCURRED0_GR1_AOERR1_MASK           0x0000000004000000UL
-#define UV3H_EVENT_OCCURRED0_XB_AOERR1_MASK            0x0000000008000000UL
-#define UV3H_EVENT_OCCURRED0_RT_AOERR1_MASK            0x0000000010000000UL
-#define UV3H_EVENT_OCCURRED0_NI0_AOERR1_MASK           0x0000000020000000UL
-#define UV3H_EVENT_OCCURRED0_NI1_AOERR1_MASK           0x0000000040000000UL
-#define UV3H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_MASK  0x0000000080000000UL
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_0_MASK         0x0000000100000000UL
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_1_MASK         0x0000000200000000UL
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_2_MASK         0x0000000400000000UL
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_3_MASK         0x0000000800000000UL
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_4_MASK         0x0000001000000000UL
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_5_MASK         0x0000002000000000UL
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_6_MASK         0x0000004000000000UL
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_7_MASK         0x0000008000000000UL
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_8_MASK         0x0000010000000000UL
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_9_MASK         0x0000020000000000UL
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_10_MASK                0x0000040000000000UL
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_11_MASK                0x0000080000000000UL
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_12_MASK                0x0000100000000000UL
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_13_MASK                0x0000200000000000UL
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_14_MASK                0x0000400000000000UL
-#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_15_MASK                0x0000800000000000UL
-#define UV3H_EVENT_OCCURRED0_L1_NMI_INT_MASK           0x0001000000000000UL
-#define UV3H_EVENT_OCCURRED0_STOP_CLOCK_MASK           0x0002000000000000UL
-#define UV3H_EVENT_OCCURRED0_ASIC_TO_L1_MASK           0x0004000000000000UL
-#define UV3H_EVENT_OCCURRED0_L1_TO_ASIC_MASK           0x0008000000000000UL
-#define UV3H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_MASK       0x0010000000000000UL
-#define UV3H_EVENT_OCCURRED0_IPI_INT_MASK              0x0020000000000000UL
-#define UV3H_EVENT_OCCURRED0_EXTIO_INT0_MASK           0x0040000000000000UL
-#define UV3H_EVENT_OCCURRED0_EXTIO_INT1_MASK           0x0080000000000000UL
-#define UV3H_EVENT_OCCURRED0_EXTIO_INT2_MASK           0x0100000000000000UL
-#define UV3H_EVENT_OCCURRED0_EXTIO_INT3_MASK           0x0200000000000000UL
-#define UV3H_EVENT_OCCURRED0_PROFILE_INT_MASK          0x0400000000000000UL
-
+/* UVYH common defines */
+#define UVYH_EVENT_OCCURRED0_KT_HCERR_SHFT             1
+#define UVYH_EVENT_OCCURRED0_KT_HCERR_MASK             0x0000000000000002UL
+#define UVYH_EVENT_OCCURRED0_RH0_HCERR_SHFT            2
+#define UVYH_EVENT_OCCURRED0_RH0_HCERR_MASK            0x0000000000000004UL
+#define UVYH_EVENT_OCCURRED0_RH1_HCERR_SHFT            3
+#define UVYH_EVENT_OCCURRED0_RH1_HCERR_MASK            0x0000000000000008UL
+#define UVYH_EVENT_OCCURRED0_LH0_HCERR_SHFT            4
+#define UVYH_EVENT_OCCURRED0_LH0_HCERR_MASK            0x0000000000000010UL
+#define UVYH_EVENT_OCCURRED0_LH1_HCERR_SHFT            5
+#define UVYH_EVENT_OCCURRED0_LH1_HCERR_MASK            0x0000000000000020UL
+#define UVYH_EVENT_OCCURRED0_LH2_HCERR_SHFT            6
+#define UVYH_EVENT_OCCURRED0_LH2_HCERR_MASK            0x0000000000000040UL
+#define UVYH_EVENT_OCCURRED0_LH3_HCERR_SHFT            7
+#define UVYH_EVENT_OCCURRED0_LH3_HCERR_MASK            0x0000000000000080UL
+#define UVYH_EVENT_OCCURRED0_XB_HCERR_SHFT             8
+#define UVYH_EVENT_OCCURRED0_XB_HCERR_MASK             0x0000000000000100UL
+#define UVYH_EVENT_OCCURRED0_RDM_HCERR_SHFT            9
+#define UVYH_EVENT_OCCURRED0_RDM_HCERR_MASK            0x0000000000000200UL
+#define UVYH_EVENT_OCCURRED0_NI0_HCERR_SHFT            10
+#define UVYH_EVENT_OCCURRED0_NI0_HCERR_MASK            0x0000000000000400UL
+#define UVYH_EVENT_OCCURRED0_NI1_HCERR_SHFT            11
+#define UVYH_EVENT_OCCURRED0_NI1_HCERR_MASK            0x0000000000000800UL
+#define UVYH_EVENT_OCCURRED0_LB_AOERR0_SHFT            12
+#define UVYH_EVENT_OCCURRED0_LB_AOERR0_MASK            0x0000000000001000UL
+#define UVYH_EVENT_OCCURRED0_KT_AOERR0_SHFT            13
+#define UVYH_EVENT_OCCURRED0_KT_AOERR0_MASK            0x0000000000002000UL
+#define UVYH_EVENT_OCCURRED0_RH0_AOERR0_SHFT           14
+#define UVYH_EVENT_OCCURRED0_RH0_AOERR0_MASK           0x0000000000004000UL
+#define UVYH_EVENT_OCCURRED0_RH1_AOERR0_SHFT           15
+#define UVYH_EVENT_OCCURRED0_RH1_AOERR0_MASK           0x0000000000008000UL
+#define UVYH_EVENT_OCCURRED0_LH0_AOERR0_SHFT           16
+#define UVYH_EVENT_OCCURRED0_LH0_AOERR0_MASK           0x0000000000010000UL
+#define UVYH_EVENT_OCCURRED0_LH1_AOERR0_SHFT           17
+#define UVYH_EVENT_OCCURRED0_LH1_AOERR0_MASK           0x0000000000020000UL
+#define UVYH_EVENT_OCCURRED0_LH2_AOERR0_SHFT           18
+#define UVYH_EVENT_OCCURRED0_LH2_AOERR0_MASK           0x0000000000040000UL
+#define UVYH_EVENT_OCCURRED0_LH3_AOERR0_SHFT           19
+#define UVYH_EVENT_OCCURRED0_LH3_AOERR0_MASK           0x0000000000080000UL
+#define UVYH_EVENT_OCCURRED0_XB_AOERR0_SHFT            20
+#define UVYH_EVENT_OCCURRED0_XB_AOERR0_MASK            0x0000000000100000UL
+#define UVYH_EVENT_OCCURRED0_RDM_AOERR0_SHFT           21
+#define UVYH_EVENT_OCCURRED0_RDM_AOERR0_MASK           0x0000000000200000UL
+#define UVYH_EVENT_OCCURRED0_RT0_AOERR0_SHFT           22
+#define UVYH_EVENT_OCCURRED0_RT0_AOERR0_MASK           0x0000000000400000UL
+#define UVYH_EVENT_OCCURRED0_RT1_AOERR0_SHFT           23
+#define UVYH_EVENT_OCCURRED0_RT1_AOERR0_MASK           0x0000000000800000UL
+#define UVYH_EVENT_OCCURRED0_NI0_AOERR0_SHFT           24
+#define UVYH_EVENT_OCCURRED0_NI0_AOERR0_MASK           0x0000000001000000UL
+#define UVYH_EVENT_OCCURRED0_NI1_AOERR0_SHFT           25
+#define UVYH_EVENT_OCCURRED0_NI1_AOERR0_MASK           0x0000000002000000UL
+#define UVYH_EVENT_OCCURRED0_LB_AOERR1_SHFT            26
+#define UVYH_EVENT_OCCURRED0_LB_AOERR1_MASK            0x0000000004000000UL
+#define UVYH_EVENT_OCCURRED0_KT_AOERR1_SHFT            27
+#define UVYH_EVENT_OCCURRED0_KT_AOERR1_MASK            0x0000000008000000UL
+#define UVYH_EVENT_OCCURRED0_RH0_AOERR1_SHFT           28
+#define UVYH_EVENT_OCCURRED0_RH0_AOERR1_MASK           0x0000000010000000UL
+#define UVYH_EVENT_OCCURRED0_RH1_AOERR1_SHFT           29
+#define UVYH_EVENT_OCCURRED0_RH1_AOERR1_MASK           0x0000000020000000UL
+#define UVYH_EVENT_OCCURRED0_LH0_AOERR1_SHFT           30
+#define UVYH_EVENT_OCCURRED0_LH0_AOERR1_MASK           0x0000000040000000UL
+#define UVYH_EVENT_OCCURRED0_LH1_AOERR1_SHFT           31
+#define UVYH_EVENT_OCCURRED0_LH1_AOERR1_MASK           0x0000000080000000UL
+#define UVYH_EVENT_OCCURRED0_LH2_AOERR1_SHFT           32
+#define UVYH_EVENT_OCCURRED0_LH2_AOERR1_MASK           0x0000000100000000UL
+#define UVYH_EVENT_OCCURRED0_LH3_AOERR1_SHFT           33
+#define UVYH_EVENT_OCCURRED0_LH3_AOERR1_MASK           0x0000000200000000UL
+#define UVYH_EVENT_OCCURRED0_XB_AOERR1_SHFT            34
+#define UVYH_EVENT_OCCURRED0_XB_AOERR1_MASK            0x0000000400000000UL
+#define UVYH_EVENT_OCCURRED0_RDM_AOERR1_SHFT           35
+#define UVYH_EVENT_OCCURRED0_RDM_AOERR1_MASK           0x0000000800000000UL
+#define UVYH_EVENT_OCCURRED0_RT0_AOERR1_SHFT           36
+#define UVYH_EVENT_OCCURRED0_RT0_AOERR1_MASK           0x0000001000000000UL
+#define UVYH_EVENT_OCCURRED0_RT1_AOERR1_SHFT           37
+#define UVYH_EVENT_OCCURRED0_RT1_AOERR1_MASK           0x0000002000000000UL
+#define UVYH_EVENT_OCCURRED0_NI0_AOERR1_SHFT           38
+#define UVYH_EVENT_OCCURRED0_NI0_AOERR1_MASK           0x0000004000000000UL
+#define UVYH_EVENT_OCCURRED0_NI1_AOERR1_SHFT           39
+#define UVYH_EVENT_OCCURRED0_NI1_AOERR1_MASK           0x0000008000000000UL
+#define UVYH_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_SHFT  40
+#define UVYH_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_MASK  0x0000010000000000UL
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_0_SHFT         41
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_0_MASK         0x0000020000000000UL
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_1_SHFT         42
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_1_MASK         0x0000040000000000UL
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_2_SHFT         43
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_2_MASK         0x0000080000000000UL
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_3_SHFT         44
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_3_MASK         0x0000100000000000UL
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_4_SHFT         45
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_4_MASK         0x0000200000000000UL
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_5_SHFT         46
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_5_MASK         0x0000400000000000UL
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_6_SHFT         47
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_6_MASK         0x0000800000000000UL
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_7_SHFT         48
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_7_MASK         0x0001000000000000UL
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_8_SHFT         49
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_8_MASK         0x0002000000000000UL
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_9_SHFT         50
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_9_MASK         0x0004000000000000UL
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_10_SHFT                51
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_10_MASK                0x0008000000000000UL
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_11_SHFT                52
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_11_MASK                0x0010000000000000UL
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_12_SHFT                53
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_12_MASK                0x0020000000000000UL
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_13_SHFT                54
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_13_MASK                0x0040000000000000UL
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_14_SHFT                55
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_14_MASK                0x0080000000000000UL
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_15_SHFT                56
+#define UVYH_EVENT_OCCURRED0_LB_IRQ_INT_15_MASK                0x0100000000000000UL
+#define UVYH_EVENT_OCCURRED0_L1_NMI_INT_SHFT           57
+#define UVYH_EVENT_OCCURRED0_L1_NMI_INT_MASK           0x0200000000000000UL
+#define UVYH_EVENT_OCCURRED0_STOP_CLOCK_SHFT           58
+#define UVYH_EVENT_OCCURRED0_STOP_CLOCK_MASK           0x0400000000000000UL
+#define UVYH_EVENT_OCCURRED0_ASIC_TO_L1_SHFT           59
+#define UVYH_EVENT_OCCURRED0_ASIC_TO_L1_MASK           0x0800000000000000UL
+#define UVYH_EVENT_OCCURRED0_L1_TO_ASIC_SHFT           60
+#define UVYH_EVENT_OCCURRED0_L1_TO_ASIC_MASK           0x1000000000000000UL
+#define UVYH_EVENT_OCCURRED0_LA_SEQ_TRIGGER_SHFT       61
+#define UVYH_EVENT_OCCURRED0_LA_SEQ_TRIGGER_MASK       0x2000000000000000UL
+
+/* UV4 unique defines */
 #define UV4H_EVENT_OCCURRED0_KT_HCERR_SHFT             1
+#define UV4H_EVENT_OCCURRED0_KT_HCERR_MASK             0x0000000000000002UL
 #define UV4H_EVENT_OCCURRED0_KT_AOERR0_SHFT            10
-#define UV4H_EVENT_OCCURRED0_RTQ0_AOERR0_SHFT          17
-#define UV4H_EVENT_OCCURRED0_RTQ1_AOERR0_SHFT          18
-#define UV4H_EVENT_OCCURRED0_RTQ2_AOERR0_SHFT          19
-#define UV4H_EVENT_OCCURRED0_RTQ3_AOERR0_SHFT          20
-#define UV4H_EVENT_OCCURRED0_NI0_AOERR0_SHFT           21
-#define UV4H_EVENT_OCCURRED0_NI1_AOERR0_SHFT           22
-#define UV4H_EVENT_OCCURRED0_LB_AOERR1_SHFT            23
-#define UV4H_EVENT_OCCURRED0_KT_AOERR1_SHFT            24
-#define UV4H_EVENT_OCCURRED0_RH_AOERR1_SHFT            25
-#define UV4H_EVENT_OCCURRED0_LH0_AOERR1_SHFT           26
-#define UV4H_EVENT_OCCURRED0_LH1_AOERR1_SHFT           27
-#define UV4H_EVENT_OCCURRED0_GR0_AOERR1_SHFT           28
-#define UV4H_EVENT_OCCURRED0_GR1_AOERR1_SHFT           29
-#define UV4H_EVENT_OCCURRED0_XB_AOERR1_SHFT            30
-#define UV4H_EVENT_OCCURRED0_RTQ0_AOERR1_SHFT          31
-#define UV4H_EVENT_OCCURRED0_RTQ1_AOERR1_SHFT          32
-#define UV4H_EVENT_OCCURRED0_RTQ2_AOERR1_SHFT          33
-#define UV4H_EVENT_OCCURRED0_RTQ3_AOERR1_SHFT          34
-#define UV4H_EVENT_OCCURRED0_NI0_AOERR1_SHFT           35
-#define UV4H_EVENT_OCCURRED0_NI1_AOERR1_SHFT           36
-#define UV4H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_SHFT  37
-#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_0_SHFT         38
-#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_1_SHFT         39
-#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_2_SHFT         40
-#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_3_SHFT         41
-#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_4_SHFT         42
-#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_5_SHFT         43
-#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_6_SHFT         44
-#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_7_SHFT         45
-#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_8_SHFT         46
-#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_9_SHFT         47
-#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_10_SHFT                48
-#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_11_SHFT                49
-#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_12_SHFT                50
-#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_13_SHFT                51
-#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_14_SHFT                52
-#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_15_SHFT                53
-#define UV4H_EVENT_OCCURRED0_L1_NMI_INT_SHFT           54
-#define UV4H_EVENT_OCCURRED0_STOP_CLOCK_SHFT           55
-#define UV4H_EVENT_OCCURRED0_ASIC_TO_L1_SHFT           56
-#define UV4H_EVENT_OCCURRED0_L1_TO_ASIC_SHFT           57
-#define UV4H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_SHFT       58
-#define UV4H_EVENT_OCCURRED0_IPI_INT_SHFT              59
-#define UV4H_EVENT_OCCURRED0_EXTIO_INT0_SHFT           60
-#define UV4H_EVENT_OCCURRED0_EXTIO_INT1_SHFT           61
-#define UV4H_EVENT_OCCURRED0_EXTIO_INT2_SHFT           62
-#define UV4H_EVENT_OCCURRED0_EXTIO_INT3_SHFT           63
-#define UV4H_EVENT_OCCURRED0_KT_HCERR_MASK             0x0000000000000002UL
 #define UV4H_EVENT_OCCURRED0_KT_AOERR0_MASK            0x0000000000000400UL
+#define UV4H_EVENT_OCCURRED0_RTQ0_AOERR0_SHFT          17
 #define UV4H_EVENT_OCCURRED0_RTQ0_AOERR0_MASK          0x0000000000020000UL
+#define UV4H_EVENT_OCCURRED0_RTQ1_AOERR0_SHFT          18
 #define UV4H_EVENT_OCCURRED0_RTQ1_AOERR0_MASK          0x0000000000040000UL
+#define UV4H_EVENT_OCCURRED0_RTQ2_AOERR0_SHFT          19
 #define UV4H_EVENT_OCCURRED0_RTQ2_AOERR0_MASK          0x0000000000080000UL
+#define UV4H_EVENT_OCCURRED0_RTQ3_AOERR0_SHFT          20
 #define UV4H_EVENT_OCCURRED0_RTQ3_AOERR0_MASK          0x0000000000100000UL
+#define UV4H_EVENT_OCCURRED0_NI0_AOERR0_SHFT           21
 #define UV4H_EVENT_OCCURRED0_NI0_AOERR0_MASK           0x0000000000200000UL
+#define UV4H_EVENT_OCCURRED0_NI1_AOERR0_SHFT           22
 #define UV4H_EVENT_OCCURRED0_NI1_AOERR0_MASK           0x0000000000400000UL
+#define UV4H_EVENT_OCCURRED0_LB_AOERR1_SHFT            23
 #define UV4H_EVENT_OCCURRED0_LB_AOERR1_MASK            0x0000000000800000UL
+#define UV4H_EVENT_OCCURRED0_KT_AOERR1_SHFT            24
 #define UV4H_EVENT_OCCURRED0_KT_AOERR1_MASK            0x0000000001000000UL
+#define UV4H_EVENT_OCCURRED0_RH_AOERR1_SHFT            25
 #define UV4H_EVENT_OCCURRED0_RH_AOERR1_MASK            0x0000000002000000UL
+#define UV4H_EVENT_OCCURRED0_LH0_AOERR1_SHFT           26
 #define UV4H_EVENT_OCCURRED0_LH0_AOERR1_MASK           0x0000000004000000UL
+#define UV4H_EVENT_OCCURRED0_LH1_AOERR1_SHFT           27
 #define UV4H_EVENT_OCCURRED0_LH1_AOERR1_MASK           0x0000000008000000UL
+#define UV4H_EVENT_OCCURRED0_GR0_AOERR1_SHFT           28
 #define UV4H_EVENT_OCCURRED0_GR0_AOERR1_MASK           0x0000000010000000UL
+#define UV4H_EVENT_OCCURRED0_GR1_AOERR1_SHFT           29
 #define UV4H_EVENT_OCCURRED0_GR1_AOERR1_MASK           0x0000000020000000UL
+#define UV4H_EVENT_OCCURRED0_XB_AOERR1_SHFT            30
 #define UV4H_EVENT_OCCURRED0_XB_AOERR1_MASK            0x0000000040000000UL
+#define UV4H_EVENT_OCCURRED0_RTQ0_AOERR1_SHFT          31
 #define UV4H_EVENT_OCCURRED0_RTQ0_AOERR1_MASK          0x0000000080000000UL
+#define UV4H_EVENT_OCCURRED0_RTQ1_AOERR1_SHFT          32
 #define UV4H_EVENT_OCCURRED0_RTQ1_AOERR1_MASK          0x0000000100000000UL
+#define UV4H_EVENT_OCCURRED0_RTQ2_AOERR1_SHFT          33
 #define UV4H_EVENT_OCCURRED0_RTQ2_AOERR1_MASK          0x0000000200000000UL
+#define UV4H_EVENT_OCCURRED0_RTQ3_AOERR1_SHFT          34
 #define UV4H_EVENT_OCCURRED0_RTQ3_AOERR1_MASK          0x0000000400000000UL
+#define UV4H_EVENT_OCCURRED0_NI0_AOERR1_SHFT           35
 #define UV4H_EVENT_OCCURRED0_NI0_AOERR1_MASK           0x0000000800000000UL
+#define UV4H_EVENT_OCCURRED0_NI1_AOERR1_SHFT           36
 #define UV4H_EVENT_OCCURRED0_NI1_AOERR1_MASK           0x0000001000000000UL
+#define UV4H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_SHFT  37
 #define UV4H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_MASK  0x0000002000000000UL
+#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_0_SHFT         38
 #define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_0_MASK         0x0000004000000000UL
+#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_1_SHFT         39
 #define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_1_MASK         0x0000008000000000UL
+#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_2_SHFT         40
 #define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_2_MASK         0x0000010000000000UL
+#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_3_SHFT         41
 #define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_3_MASK         0x0000020000000000UL
+#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_4_SHFT         42
 #define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_4_MASK         0x0000040000000000UL
+#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_5_SHFT         43
 #define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_5_MASK         0x0000080000000000UL
+#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_6_SHFT         44
 #define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_6_MASK         0x0000100000000000UL
+#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_7_SHFT         45
 #define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_7_MASK         0x0000200000000000UL
+#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_8_SHFT         46
 #define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_8_MASK         0x0000400000000000UL
+#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_9_SHFT         47
 #define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_9_MASK         0x0000800000000000UL
+#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_10_SHFT                48
 #define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_10_MASK                0x0001000000000000UL
+#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_11_SHFT                49
 #define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_11_MASK                0x0002000000000000UL
+#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_12_SHFT                50
 #define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_12_MASK                0x0004000000000000UL
+#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_13_SHFT                51
 #define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_13_MASK                0x0008000000000000UL
+#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_14_SHFT                52
 #define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_14_MASK                0x0010000000000000UL
+#define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_15_SHFT                53
 #define UV4H_EVENT_OCCURRED0_LB_IRQ_INT_15_MASK                0x0020000000000000UL
+#define UV4H_EVENT_OCCURRED0_L1_NMI_INT_SHFT           54
 #define UV4H_EVENT_OCCURRED0_L1_NMI_INT_MASK           0x0040000000000000UL
+#define UV4H_EVENT_OCCURRED0_STOP_CLOCK_SHFT           55
 #define UV4H_EVENT_OCCURRED0_STOP_CLOCK_MASK           0x0080000000000000UL
+#define UV4H_EVENT_OCCURRED0_ASIC_TO_L1_SHFT           56
 #define UV4H_EVENT_OCCURRED0_ASIC_TO_L1_MASK           0x0100000000000000UL
+#define UV4H_EVENT_OCCURRED0_L1_TO_ASIC_SHFT           57
 #define UV4H_EVENT_OCCURRED0_L1_TO_ASIC_MASK           0x0200000000000000UL
+#define UV4H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_SHFT       58
 #define UV4H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_MASK       0x0400000000000000UL
+#define UV4H_EVENT_OCCURRED0_IPI_INT_SHFT              59
 #define UV4H_EVENT_OCCURRED0_IPI_INT_MASK              0x0800000000000000UL
+#define UV4H_EVENT_OCCURRED0_EXTIO_INT0_SHFT           60
 #define UV4H_EVENT_OCCURRED0_EXTIO_INT0_MASK           0x1000000000000000UL
+#define UV4H_EVENT_OCCURRED0_EXTIO_INT1_SHFT           61
 #define UV4H_EVENT_OCCURRED0_EXTIO_INT1_MASK           0x2000000000000000UL
+#define UV4H_EVENT_OCCURRED0_EXTIO_INT2_SHFT           62
 #define UV4H_EVENT_OCCURRED0_EXTIO_INT2_MASK           0x4000000000000000UL
+#define UV4H_EVENT_OCCURRED0_EXTIO_INT3_SHFT           63
 #define UV4H_EVENT_OCCURRED0_EXTIO_INT3_MASK           0x8000000000000000UL
 
-#define UVH_EVENT_OCCURRED0_EXTIO_INT0_SHFT (                          \
-       is_uv2_hub() ? UV2H_EVENT_OCCURRED0_EXTIO_INT0_SHFT :           \
-       is_uv3_hub() ? UV3H_EVENT_OCCURRED0_EXTIO_INT0_SHFT :           \
-       /*is_uv4_hub*/ UV4H_EVENT_OCCURRED0_EXTIO_INT0_SHFT)
+/* UV3 unique defines */
+#define UV3H_EVENT_OCCURRED0_QP_HCERR_SHFT             1
+#define UV3H_EVENT_OCCURRED0_QP_HCERR_MASK             0x0000000000000002UL
+#define UV3H_EVENT_OCCURRED0_QP_AOERR0_SHFT            10
+#define UV3H_EVENT_OCCURRED0_QP_AOERR0_MASK            0x0000000000000400UL
+#define UV3H_EVENT_OCCURRED0_RT_AOERR0_SHFT            17
+#define UV3H_EVENT_OCCURRED0_RT_AOERR0_MASK            0x0000000000020000UL
+#define UV3H_EVENT_OCCURRED0_NI0_AOERR0_SHFT           18
+#define UV3H_EVENT_OCCURRED0_NI0_AOERR0_MASK           0x0000000000040000UL
+#define UV3H_EVENT_OCCURRED0_NI1_AOERR0_SHFT           19
+#define UV3H_EVENT_OCCURRED0_NI1_AOERR0_MASK           0x0000000000080000UL
+#define UV3H_EVENT_OCCURRED0_LB_AOERR1_SHFT            20
+#define UV3H_EVENT_OCCURRED0_LB_AOERR1_MASK            0x0000000000100000UL
+#define UV3H_EVENT_OCCURRED0_QP_AOERR1_SHFT            21
+#define UV3H_EVENT_OCCURRED0_QP_AOERR1_MASK            0x0000000000200000UL
+#define UV3H_EVENT_OCCURRED0_RH_AOERR1_SHFT            22
+#define UV3H_EVENT_OCCURRED0_RH_AOERR1_MASK            0x0000000000400000UL
+#define UV3H_EVENT_OCCURRED0_LH0_AOERR1_SHFT           23
+#define UV3H_EVENT_OCCURRED0_LH0_AOERR1_MASK           0x0000000000800000UL
+#define UV3H_EVENT_OCCURRED0_LH1_AOERR1_SHFT           24
+#define UV3H_EVENT_OCCURRED0_LH1_AOERR1_MASK           0x0000000001000000UL
+#define UV3H_EVENT_OCCURRED0_GR0_AOERR1_SHFT           25
+#define UV3H_EVENT_OCCURRED0_GR0_AOERR1_MASK           0x0000000002000000UL
+#define UV3H_EVENT_OCCURRED0_GR1_AOERR1_SHFT           26
+#define UV3H_EVENT_OCCURRED0_GR1_AOERR1_MASK           0x0000000004000000UL
+#define UV3H_EVENT_OCCURRED0_XB_AOERR1_SHFT            27
+#define UV3H_EVENT_OCCURRED0_XB_AOERR1_MASK            0x0000000008000000UL
+#define UV3H_EVENT_OCCURRED0_RT_AOERR1_SHFT            28
+#define UV3H_EVENT_OCCURRED0_RT_AOERR1_MASK            0x0000000010000000UL
+#define UV3H_EVENT_OCCURRED0_NI0_AOERR1_SHFT           29
+#define UV3H_EVENT_OCCURRED0_NI0_AOERR1_MASK           0x0000000020000000UL
+#define UV3H_EVENT_OCCURRED0_NI1_AOERR1_SHFT           30
+#define UV3H_EVENT_OCCURRED0_NI1_AOERR1_MASK           0x0000000040000000UL
+#define UV3H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_SHFT  31
+#define UV3H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_MASK  0x0000000080000000UL
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_0_SHFT         32
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_0_MASK         0x0000000100000000UL
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_1_SHFT         33
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_1_MASK         0x0000000200000000UL
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_2_SHFT         34
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_2_MASK         0x0000000400000000UL
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_3_SHFT         35
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_3_MASK         0x0000000800000000UL
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_4_SHFT         36
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_4_MASK         0x0000001000000000UL
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_5_SHFT         37
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_5_MASK         0x0000002000000000UL
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_6_SHFT         38
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_6_MASK         0x0000004000000000UL
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_7_SHFT         39
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_7_MASK         0x0000008000000000UL
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_8_SHFT         40
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_8_MASK         0x0000010000000000UL
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_9_SHFT         41
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_9_MASK         0x0000020000000000UL
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_10_SHFT                42
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_10_MASK                0x0000040000000000UL
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_11_SHFT                43
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_11_MASK                0x0000080000000000UL
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_12_SHFT                44
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_12_MASK                0x0000100000000000UL
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_13_SHFT                45
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_13_MASK                0x0000200000000000UL
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_14_SHFT                46
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_14_MASK                0x0000400000000000UL
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_15_SHFT                47
+#define UV3H_EVENT_OCCURRED0_LB_IRQ_INT_15_MASK                0x0000800000000000UL
+#define UV3H_EVENT_OCCURRED0_L1_NMI_INT_SHFT           48
+#define UV3H_EVENT_OCCURRED0_L1_NMI_INT_MASK           0x0001000000000000UL
+#define UV3H_EVENT_OCCURRED0_STOP_CLOCK_SHFT           49
+#define UV3H_EVENT_OCCURRED0_STOP_CLOCK_MASK           0x0002000000000000UL
+#define UV3H_EVENT_OCCURRED0_ASIC_TO_L1_SHFT           50
+#define UV3H_EVENT_OCCURRED0_ASIC_TO_L1_MASK           0x0004000000000000UL
+#define UV3H_EVENT_OCCURRED0_L1_TO_ASIC_SHFT           51
+#define UV3H_EVENT_OCCURRED0_L1_TO_ASIC_MASK           0x0008000000000000UL
+#define UV3H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_SHFT       52
+#define UV3H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_MASK       0x0010000000000000UL
+#define UV3H_EVENT_OCCURRED0_IPI_INT_SHFT              53
+#define UV3H_EVENT_OCCURRED0_IPI_INT_MASK              0x0020000000000000UL
+#define UV3H_EVENT_OCCURRED0_EXTIO_INT0_SHFT           54
+#define UV3H_EVENT_OCCURRED0_EXTIO_INT0_MASK           0x0040000000000000UL
+#define UV3H_EVENT_OCCURRED0_EXTIO_INT1_SHFT           55
+#define UV3H_EVENT_OCCURRED0_EXTIO_INT1_MASK           0x0080000000000000UL
+#define UV3H_EVENT_OCCURRED0_EXTIO_INT2_SHFT           56
+#define UV3H_EVENT_OCCURRED0_EXTIO_INT2_MASK           0x0100000000000000UL
+#define UV3H_EVENT_OCCURRED0_EXTIO_INT3_SHFT           57
+#define UV3H_EVENT_OCCURRED0_EXTIO_INT3_MASK           0x0200000000000000UL
+#define UV3H_EVENT_OCCURRED0_PROFILE_INT_SHFT          58
+#define UV3H_EVENT_OCCURRED0_PROFILE_INT_MASK          0x0400000000000000UL
 
-union uvh_event_occurred0_u {
-       unsigned long   v;
-       struct uvh_event_occurred0_s {
-               unsigned long   lb_hcerr:1;                     /* RW, W1C */
-               unsigned long   rsvd_1_10:10;
-               unsigned long   rh_aoerr0:1;                    /* RW, W1C */
-               unsigned long   rsvd_12_63:52;
-       } s;
-       struct uvxh_event_occurred0_s {
-               unsigned long   lb_hcerr:1;                     /* RW */
-               unsigned long   rsvd_1:1;
-               unsigned long   rh_hcerr:1;                     /* RW */
-               unsigned long   lh0_hcerr:1;                    /* RW */
-               unsigned long   lh1_hcerr:1;                    /* RW */
-               unsigned long   gr0_hcerr:1;                    /* RW */
-               unsigned long   gr1_hcerr:1;                    /* RW */
-               unsigned long   ni0_hcerr:1;                    /* RW */
-               unsigned long   ni1_hcerr:1;                    /* RW */
-               unsigned long   lb_aoerr0:1;                    /* RW */
-               unsigned long   rsvd_10:1;
-               unsigned long   rh_aoerr0:1;                    /* RW */
-               unsigned long   lh0_aoerr0:1;                   /* RW */
-               unsigned long   lh1_aoerr0:1;                   /* RW */
-               unsigned long   gr0_aoerr0:1;                   /* RW */
-               unsigned long   gr1_aoerr0:1;                   /* RW */
-               unsigned long   xb_aoerr0:1;                    /* RW */
-               unsigned long   rsvd_17_63:47;
-       } sx;
-       struct uv4h_event_occurred0_s {
-               unsigned long   lb_hcerr:1;                     /* RW */
-               unsigned long   kt_hcerr:1;                     /* RW */
-               unsigned long   rh_hcerr:1;                     /* RW */
-               unsigned long   lh0_hcerr:1;                    /* RW */
-               unsigned long   lh1_hcerr:1;                    /* RW */
-               unsigned long   gr0_hcerr:1;                    /* RW */
-               unsigned long   gr1_hcerr:1;                    /* RW */
-               unsigned long   ni0_hcerr:1;                    /* RW */
-               unsigned long   ni1_hcerr:1;                    /* RW */
-               unsigned long   lb_aoerr0:1;                    /* RW */
-               unsigned long   kt_aoerr0:1;                    /* RW */
-               unsigned long   rh_aoerr0:1;                    /* RW */
-               unsigned long   lh0_aoerr0:1;                   /* RW */
-               unsigned long   lh1_aoerr0:1;                   /* RW */
-               unsigned long   gr0_aoerr0:1;                   /* RW */
-               unsigned long   gr1_aoerr0:1;                   /* RW */
-               unsigned long   xb_aoerr0:1;                    /* RW */
-               unsigned long   rtq0_aoerr0:1;                  /* RW */
-               unsigned long   rtq1_aoerr0:1;                  /* RW */
-               unsigned long   rtq2_aoerr0:1;                  /* RW */
-               unsigned long   rtq3_aoerr0:1;                  /* RW */
-               unsigned long   ni0_aoerr0:1;                   /* RW */
-               unsigned long   ni1_aoerr0:1;                   /* RW */
-               unsigned long   lb_aoerr1:1;                    /* RW */
-               unsigned long   kt_aoerr1:1;                    /* RW */
-               unsigned long   rh_aoerr1:1;                    /* RW */
-               unsigned long   lh0_aoerr1:1;                   /* RW */
-               unsigned long   lh1_aoerr1:1;                   /* RW */
-               unsigned long   gr0_aoerr1:1;                   /* RW */
-               unsigned long   gr1_aoerr1:1;                   /* RW */
-               unsigned long   xb_aoerr1:1;                    /* RW */
-               unsigned long   rtq0_aoerr1:1;                  /* RW */
-               unsigned long   rtq1_aoerr1:1;                  /* RW */
-               unsigned long   rtq2_aoerr1:1;                  /* RW */
-               unsigned long   rtq3_aoerr1:1;                  /* RW */
-               unsigned long   ni0_aoerr1:1;                   /* RW */
-               unsigned long   ni1_aoerr1:1;                   /* RW */
-               unsigned long   system_shutdown_int:1;          /* RW */
-               unsigned long   lb_irq_int_0:1;                 /* RW */
-               unsigned long   lb_irq_int_1:1;                 /* RW */
-               unsigned long   lb_irq_int_2:1;                 /* RW */
-               unsigned long   lb_irq_int_3:1;                 /* RW */
-               unsigned long   lb_irq_int_4:1;                 /* RW */
-               unsigned long   lb_irq_int_5:1;                 /* RW */
-               unsigned long   lb_irq_int_6:1;                 /* RW */
-               unsigned long   lb_irq_int_7:1;                 /* RW */
+/* UV2 unique defines */
+#define UV2H_EVENT_OCCURRED0_QP_HCERR_SHFT             1
+#define UV2H_EVENT_OCCURRED0_QP_HCERR_MASK             0x0000000000000002UL
+#define UV2H_EVENT_OCCURRED0_QP_AOERR0_SHFT            10
+#define UV2H_EVENT_OCCURRED0_QP_AOERR0_MASK            0x0000000000000400UL
+#define UV2H_EVENT_OCCURRED0_RT_AOERR0_SHFT            17
+#define UV2H_EVENT_OCCURRED0_RT_AOERR0_MASK            0x0000000000020000UL
+#define UV2H_EVENT_OCCURRED0_NI0_AOERR0_SHFT           18
+#define UV2H_EVENT_OCCURRED0_NI0_AOERR0_MASK           0x0000000000040000UL
+#define UV2H_EVENT_OCCURRED0_NI1_AOERR0_SHFT           19
+#define UV2H_EVENT_OCCURRED0_NI1_AOERR0_MASK           0x0000000000080000UL
+#define UV2H_EVENT_OCCURRED0_LB_AOERR1_SHFT            20
+#define UV2H_EVENT_OCCURRED0_LB_AOERR1_MASK            0x0000000000100000UL
+#define UV2H_EVENT_OCCURRED0_QP_AOERR1_SHFT            21
+#define UV2H_EVENT_OCCURRED0_QP_AOERR1_MASK            0x0000000000200000UL
+#define UV2H_EVENT_OCCURRED0_RH_AOERR1_SHFT            22
+#define UV2H_EVENT_OCCURRED0_RH_AOERR1_MASK            0x0000000000400000UL
+#define UV2H_EVENT_OCCURRED0_LH0_AOERR1_SHFT           23
+#define UV2H_EVENT_OCCURRED0_LH0_AOERR1_MASK           0x0000000000800000UL
+#define UV2H_EVENT_OCCURRED0_LH1_AOERR1_SHFT           24
+#define UV2H_EVENT_OCCURRED0_LH1_AOERR1_MASK           0x0000000001000000UL
+#define UV2H_EVENT_OCCURRED0_GR0_AOERR1_SHFT           25
+#define UV2H_EVENT_OCCURRED0_GR0_AOERR1_MASK           0x0000000002000000UL
+#define UV2H_EVENT_OCCURRED0_GR1_AOERR1_SHFT           26
+#define UV2H_EVENT_OCCURRED0_GR1_AOERR1_MASK           0x0000000004000000UL
+#define UV2H_EVENT_OCCURRED0_XB_AOERR1_SHFT            27
+#define UV2H_EVENT_OCCURRED0_XB_AOERR1_MASK            0x0000000008000000UL
+#define UV2H_EVENT_OCCURRED0_RT_AOERR1_SHFT            28
+#define UV2H_EVENT_OCCURRED0_RT_AOERR1_MASK            0x0000000010000000UL
+#define UV2H_EVENT_OCCURRED0_NI0_AOERR1_SHFT           29
+#define UV2H_EVENT_OCCURRED0_NI0_AOERR1_MASK           0x0000000020000000UL
+#define UV2H_EVENT_OCCURRED0_NI1_AOERR1_SHFT           30
+#define UV2H_EVENT_OCCURRED0_NI1_AOERR1_MASK           0x0000000040000000UL
+#define UV2H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_SHFT  31
+#define UV2H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_MASK  0x0000000080000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_0_SHFT         32
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_0_MASK         0x0000000100000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_1_SHFT         33
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_1_MASK         0x0000000200000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_2_SHFT         34
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_2_MASK         0x0000000400000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_3_SHFT         35
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_3_MASK         0x0000000800000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_4_SHFT         36
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_4_MASK         0x0000001000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_5_SHFT         37
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_5_MASK         0x0000002000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_6_SHFT         38
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_6_MASK         0x0000004000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_7_SHFT         39
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_7_MASK         0x0000008000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_8_SHFT         40
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_8_MASK         0x0000010000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_9_SHFT         41
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_9_MASK         0x0000020000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_10_SHFT                42
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_10_MASK                0x0000040000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_11_SHFT                43
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_11_MASK                0x0000080000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_12_SHFT                44
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_12_MASK                0x0000100000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_13_SHFT                45
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_13_MASK                0x0000200000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_14_SHFT                46
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_14_MASK                0x0000400000000000UL
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_15_SHFT                47
+#define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_15_MASK                0x0000800000000000UL
+#define UV2H_EVENT_OCCURRED0_L1_NMI_INT_SHFT           48
+#define UV2H_EVENT_OCCURRED0_L1_NMI_INT_MASK           0x0001000000000000UL
+#define UV2H_EVENT_OCCURRED0_STOP_CLOCK_SHFT           49
+#define UV2H_EVENT_OCCURRED0_STOP_CLOCK_MASK           0x0002000000000000UL
+#define UV2H_EVENT_OCCURRED0_ASIC_TO_L1_SHFT           50
+#define UV2H_EVENT_OCCURRED0_ASIC_TO_L1_MASK           0x0004000000000000UL
+#define UV2H_EVENT_OCCURRED0_L1_TO_ASIC_SHFT           51
+#define UV2H_EVENT_OCCURRED0_L1_TO_ASIC_MASK           0x0008000000000000UL
+#define UV2H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_SHFT       52
+#define UV2H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_MASK       0x0010000000000000UL
+#define UV2H_EVENT_OCCURRED0_IPI_INT_SHFT              53
+#define UV2H_EVENT_OCCURRED0_IPI_INT_MASK              0x0020000000000000UL
+#define UV2H_EVENT_OCCURRED0_EXTIO_INT0_SHFT           54
+#define UV2H_EVENT_OCCURRED0_EXTIO_INT0_MASK           0x0040000000000000UL
+#define UV2H_EVENT_OCCURRED0_EXTIO_INT1_SHFT           55
+#define UV2H_EVENT_OCCURRED0_EXTIO_INT1_MASK           0x0080000000000000UL
+#define UV2H_EVENT_OCCURRED0_EXTIO_INT2_SHFT           56
+#define UV2H_EVENT_OCCURRED0_EXTIO_INT2_MASK           0x0100000000000000UL
+#define UV2H_EVENT_OCCURRED0_EXTIO_INT3_SHFT           57
+#define UV2H_EVENT_OCCURRED0_EXTIO_INT3_MASK           0x0200000000000000UL
+#define UV2H_EVENT_OCCURRED0_PROFILE_INT_SHFT          58
+#define UV2H_EVENT_OCCURRED0_PROFILE_INT_MASK          0x0400000000000000UL
+
+#define UVH_EVENT_OCCURRED0_EXTIO_INT0_MASK (                          \
+       is_uv(UV4) ? 0x1000000000000000UL :                             \
+       is_uv(UV3) ? 0x0040000000000000UL :                             \
+       is_uv(UV2) ? 0x0040000000000000UL :                             \
+       0)
+#define UVH_EVENT_OCCURRED0_EXTIO_INT0_SHFT (                          \
+       is_uv(UV4) ? 60 :                                               \
+       is_uv(UV3) ? 54 :                                               \
+       is_uv(UV2) ? 54 :                                               \
+       -1)
+
+union uvh_event_occurred0_u {
+       unsigned long   v;
+
+       /* UVH common struct */
+       struct uvh_event_occurred0_s {
+               unsigned long   lb_hcerr:1;                     /* RW */
+               unsigned long   rsvd_1_63:63;
+       } s;
+
+       /* UVXH common struct */
+       struct uvxh_event_occurred0_s {
+               unsigned long   lb_hcerr:1;                     /* RW */
+               unsigned long   rsvd_1:1;
+               unsigned long   rh_hcerr:1;                     /* RW */
+               unsigned long   lh0_hcerr:1;                    /* RW */
+               unsigned long   lh1_hcerr:1;                    /* RW */
+               unsigned long   gr0_hcerr:1;                    /* RW */
+               unsigned long   gr1_hcerr:1;                    /* RW */
+               unsigned long   ni0_hcerr:1;                    /* RW */
+               unsigned long   ni1_hcerr:1;                    /* RW */
+               unsigned long   lb_aoerr0:1;                    /* RW */
+               unsigned long   rsvd_10:1;
+               unsigned long   rh_aoerr0:1;                    /* RW */
+               unsigned long   lh0_aoerr0:1;                   /* RW */
+               unsigned long   lh1_aoerr0:1;                   /* RW */
+               unsigned long   gr0_aoerr0:1;                   /* RW */
+               unsigned long   gr1_aoerr0:1;                   /* RW */
+               unsigned long   xb_aoerr0:1;                    /* RW */
+               unsigned long   rsvd_17_63:47;
+       } sx;
+
+       /* UVYH common struct */
+       struct uvyh_event_occurred0_s {
+               unsigned long   lb_hcerr:1;                     /* RW */
+               unsigned long   kt_hcerr:1;                     /* RW */
+               unsigned long   rh0_hcerr:1;                    /* RW */
+               unsigned long   rh1_hcerr:1;                    /* RW */
+               unsigned long   lh0_hcerr:1;                    /* RW */
+               unsigned long   lh1_hcerr:1;                    /* RW */
+               unsigned long   lh2_hcerr:1;                    /* RW */
+               unsigned long   lh3_hcerr:1;                    /* RW */
+               unsigned long   xb_hcerr:1;                     /* RW */
+               unsigned long   rdm_hcerr:1;                    /* RW */
+               unsigned long   ni0_hcerr:1;                    /* RW */
+               unsigned long   ni1_hcerr:1;                    /* RW */
+               unsigned long   lb_aoerr0:1;                    /* RW */
+               unsigned long   kt_aoerr0:1;                    /* RW */
+               unsigned long   rh0_aoerr0:1;                   /* RW */
+               unsigned long   rh1_aoerr0:1;                   /* RW */
+               unsigned long   lh0_aoerr0:1;                   /* RW */
+               unsigned long   lh1_aoerr0:1;                   /* RW */
+               unsigned long   lh2_aoerr0:1;                   /* RW */
+               unsigned long   lh3_aoerr0:1;                   /* RW */
+               unsigned long   xb_aoerr0:1;                    /* RW */
+               unsigned long   rdm_aoerr0:1;                   /* RW */
+               unsigned long   rt0_aoerr0:1;                   /* RW */
+               unsigned long   rt1_aoerr0:1;                   /* RW */
+               unsigned long   ni0_aoerr0:1;                   /* RW */
+               unsigned long   ni1_aoerr0:1;                   /* RW */
+               unsigned long   lb_aoerr1:1;                    /* RW */
+               unsigned long   kt_aoerr1:1;                    /* RW */
+               unsigned long   rh0_aoerr1:1;                   /* RW */
+               unsigned long   rh1_aoerr1:1;                   /* RW */
+               unsigned long   lh0_aoerr1:1;                   /* RW */
+               unsigned long   lh1_aoerr1:1;                   /* RW */
+               unsigned long   lh2_aoerr1:1;                   /* RW */
+               unsigned long   lh3_aoerr1:1;                   /* RW */
+               unsigned long   xb_aoerr1:1;                    /* RW */
+               unsigned long   rdm_aoerr1:1;                   /* RW */
+               unsigned long   rt0_aoerr1:1;                   /* RW */
+               unsigned long   rt1_aoerr1:1;                   /* RW */
+               unsigned long   ni0_aoerr1:1;                   /* RW */
+               unsigned long   ni1_aoerr1:1;                   /* RW */
+               unsigned long   system_shutdown_int:1;          /* RW */
+               unsigned long   lb_irq_int_0:1;                 /* RW */
+               unsigned long   lb_irq_int_1:1;                 /* RW */
+               unsigned long   lb_irq_int_2:1;                 /* RW */
+               unsigned long   lb_irq_int_3:1;                 /* RW */
+               unsigned long   lb_irq_int_4:1;                 /* RW */
+               unsigned long   lb_irq_int_5:1;                 /* RW */
+               unsigned long   lb_irq_int_6:1;                 /* RW */
+               unsigned long   lb_irq_int_7:1;                 /* RW */
+               unsigned long   lb_irq_int_8:1;                 /* RW */
+               unsigned long   lb_irq_int_9:1;                 /* RW */
+               unsigned long   lb_irq_int_10:1;                /* RW */
+               unsigned long   lb_irq_int_11:1;                /* RW */
+               unsigned long   lb_irq_int_12:1;                /* RW */
+               unsigned long   lb_irq_int_13:1;                /* RW */
+               unsigned long   lb_irq_int_14:1;                /* RW */
+               unsigned long   lb_irq_int_15:1;                /* RW */
+               unsigned long   l1_nmi_int:1;                   /* RW */
+               unsigned long   stop_clock:1;                   /* RW */
+               unsigned long   asic_to_l1:1;                   /* RW */
+               unsigned long   l1_to_asic:1;                   /* RW */
+               unsigned long   la_seq_trigger:1;               /* RW */
+               unsigned long   rsvd_62_63:2;
+       } sy;
+
+       /* UV5 unique struct */
+       struct uv5h_event_occurred0_s {
+               unsigned long   lb_hcerr:1;                     /* RW */
+               unsigned long   kt_hcerr:1;                     /* RW */
+               unsigned long   rh0_hcerr:1;                    /* RW */
+               unsigned long   rh1_hcerr:1;                    /* RW */
+               unsigned long   lh0_hcerr:1;                    /* RW */
+               unsigned long   lh1_hcerr:1;                    /* RW */
+               unsigned long   lh2_hcerr:1;                    /* RW */
+               unsigned long   lh3_hcerr:1;                    /* RW */
+               unsigned long   xb_hcerr:1;                     /* RW */
+               unsigned long   rdm_hcerr:1;                    /* RW */
+               unsigned long   ni0_hcerr:1;                    /* RW */
+               unsigned long   ni1_hcerr:1;                    /* RW */
+               unsigned long   lb_aoerr0:1;                    /* RW */
+               unsigned long   kt_aoerr0:1;                    /* RW */
+               unsigned long   rh0_aoerr0:1;                   /* RW */
+               unsigned long   rh1_aoerr0:1;                   /* RW */
+               unsigned long   lh0_aoerr0:1;                   /* RW */
+               unsigned long   lh1_aoerr0:1;                   /* RW */
+               unsigned long   lh2_aoerr0:1;                   /* RW */
+               unsigned long   lh3_aoerr0:1;                   /* RW */
+               unsigned long   xb_aoerr0:1;                    /* RW */
+               unsigned long   rdm_aoerr0:1;                   /* RW */
+               unsigned long   rt0_aoerr0:1;                   /* RW */
+               unsigned long   rt1_aoerr0:1;                   /* RW */
+               unsigned long   ni0_aoerr0:1;                   /* RW */
+               unsigned long   ni1_aoerr0:1;                   /* RW */
+               unsigned long   lb_aoerr1:1;                    /* RW */
+               unsigned long   kt_aoerr1:1;                    /* RW */
+               unsigned long   rh0_aoerr1:1;                   /* RW */
+               unsigned long   rh1_aoerr1:1;                   /* RW */
+               unsigned long   lh0_aoerr1:1;                   /* RW */
+               unsigned long   lh1_aoerr1:1;                   /* RW */
+               unsigned long   lh2_aoerr1:1;                   /* RW */
+               unsigned long   lh3_aoerr1:1;                   /* RW */
+               unsigned long   xb_aoerr1:1;                    /* RW */
+               unsigned long   rdm_aoerr1:1;                   /* RW */
+               unsigned long   rt0_aoerr1:1;                   /* RW */
+               unsigned long   rt1_aoerr1:1;                   /* RW */
+               unsigned long   ni0_aoerr1:1;                   /* RW */
+               unsigned long   ni1_aoerr1:1;                   /* RW */
+               unsigned long   system_shutdown_int:1;          /* RW */
+               unsigned long   lb_irq_int_0:1;                 /* RW */
+               unsigned long   lb_irq_int_1:1;                 /* RW */
+               unsigned long   lb_irq_int_2:1;                 /* RW */
+               unsigned long   lb_irq_int_3:1;                 /* RW */
+               unsigned long   lb_irq_int_4:1;                 /* RW */
+               unsigned long   lb_irq_int_5:1;                 /* RW */
+               unsigned long   lb_irq_int_6:1;                 /* RW */
+               unsigned long   lb_irq_int_7:1;                 /* RW */
+               unsigned long   lb_irq_int_8:1;                 /* RW */
+               unsigned long   lb_irq_int_9:1;                 /* RW */
+               unsigned long   lb_irq_int_10:1;                /* RW */
+               unsigned long   lb_irq_int_11:1;                /* RW */
+               unsigned long   lb_irq_int_12:1;                /* RW */
+               unsigned long   lb_irq_int_13:1;                /* RW */
+               unsigned long   lb_irq_int_14:1;                /* RW */
+               unsigned long   lb_irq_int_15:1;                /* RW */
+               unsigned long   l1_nmi_int:1;                   /* RW */
+               unsigned long   stop_clock:1;                   /* RW */
+               unsigned long   asic_to_l1:1;                   /* RW */
+               unsigned long   l1_to_asic:1;                   /* RW */
+               unsigned long   la_seq_trigger:1;               /* RW */
+               unsigned long   rsvd_62_63:2;
+       } s5;
+
+       /* UV4 unique struct */
+       struct uv4h_event_occurred0_s {
+               unsigned long   lb_hcerr:1;                     /* RW */
+               unsigned long   kt_hcerr:1;                     /* RW */
+               unsigned long   rh_hcerr:1;                     /* RW */
+               unsigned long   lh0_hcerr:1;                    /* RW */
+               unsigned long   lh1_hcerr:1;                    /* RW */
+               unsigned long   gr0_hcerr:1;                    /* RW */
+               unsigned long   gr1_hcerr:1;                    /* RW */
+               unsigned long   ni0_hcerr:1;                    /* RW */
+               unsigned long   ni1_hcerr:1;                    /* RW */
+               unsigned long   lb_aoerr0:1;                    /* RW */
+               unsigned long   kt_aoerr0:1;                    /* RW */
+               unsigned long   rh_aoerr0:1;                    /* RW */
+               unsigned long   lh0_aoerr0:1;                   /* RW */
+               unsigned long   lh1_aoerr0:1;                   /* RW */
+               unsigned long   gr0_aoerr0:1;                   /* RW */
+               unsigned long   gr1_aoerr0:1;                   /* RW */
+               unsigned long   xb_aoerr0:1;                    /* RW */
+               unsigned long   rtq0_aoerr0:1;                  /* RW */
+               unsigned long   rtq1_aoerr0:1;                  /* RW */
+               unsigned long   rtq2_aoerr0:1;                  /* RW */
+               unsigned long   rtq3_aoerr0:1;                  /* RW */
+               unsigned long   ni0_aoerr0:1;                   /* RW */
+               unsigned long   ni1_aoerr0:1;                   /* RW */
+               unsigned long   lb_aoerr1:1;                    /* RW */
+               unsigned long   kt_aoerr1:1;                    /* RW */
+               unsigned long   rh_aoerr1:1;                    /* RW */
+               unsigned long   lh0_aoerr1:1;                   /* RW */
+               unsigned long   lh1_aoerr1:1;                   /* RW */
+               unsigned long   gr0_aoerr1:1;                   /* RW */
+               unsigned long   gr1_aoerr1:1;                   /* RW */
+               unsigned long   xb_aoerr1:1;                    /* RW */
+               unsigned long   rtq0_aoerr1:1;                  /* RW */
+               unsigned long   rtq1_aoerr1:1;                  /* RW */
+               unsigned long   rtq2_aoerr1:1;                  /* RW */
+               unsigned long   rtq3_aoerr1:1;                  /* RW */
+               unsigned long   ni0_aoerr1:1;                   /* RW */
+               unsigned long   ni1_aoerr1:1;                   /* RW */
+               unsigned long   system_shutdown_int:1;          /* RW */
+               unsigned long   lb_irq_int_0:1;                 /* RW */
+               unsigned long   lb_irq_int_1:1;                 /* RW */
+               unsigned long   lb_irq_int_2:1;                 /* RW */
+               unsigned long   lb_irq_int_3:1;                 /* RW */
+               unsigned long   lb_irq_int_4:1;                 /* RW */
+               unsigned long   lb_irq_int_5:1;                 /* RW */
+               unsigned long   lb_irq_int_6:1;                 /* RW */
+               unsigned long   lb_irq_int_7:1;                 /* RW */
                unsigned long   lb_irq_int_8:1;                 /* RW */
                unsigned long   lb_irq_int_9:1;                 /* RW */
                unsigned long   lb_irq_int_10:1;                /* RW */
@@ -571,538 +778,1650 @@ union uvh_event_occurred0_u {
                unsigned long   extio_int2:1;                   /* RW */
                unsigned long   extio_int3:1;                   /* RW */
        } s4;
-};
-
-/* ========================================================================= */
-/*                        UVH_EVENT_OCCURRED0_ALIAS                          */
-/* ========================================================================= */
-#define UVH_EVENT_OCCURRED0_ALIAS 0x70008UL
-#define UVH_EVENT_OCCURRED0_ALIAS_32 0x5f0
-
-
-/* ========================================================================= */
-/*                         UVH_EXTIO_INT0_BROADCAST                          */
-/* ========================================================================= */
-#define UVH_EXTIO_INT0_BROADCAST 0x61448UL
-
-#define UV2H_EXTIO_INT0_BROADCAST_32 0x3f0
-#define UV3H_EXTIO_INT0_BROADCAST_32 0x3f0
-#define UV4H_EXTIO_INT0_BROADCAST_32 0x310
-#define UVH_EXTIO_INT0_BROADCAST_32 (                                  \
-       is_uv2_hub() ? UV2H_EXTIO_INT0_BROADCAST_32 :                   \
-       is_uv3_hub() ? UV3H_EXTIO_INT0_BROADCAST_32 :                   \
-       /*is_uv4_hub*/ UV4H_EXTIO_INT0_BROADCAST_32)
-
-#define UVH_EXTIO_INT0_BROADCAST_ENABLE_SHFT           0
-#define UVH_EXTIO_INT0_BROADCAST_ENABLE_MASK           0x0000000000000001UL
 
+       /* UV3 unique struct */
+       struct uv3h_event_occurred0_s {
+               unsigned long   lb_hcerr:1;                     /* RW */
+               unsigned long   qp_hcerr:1;                     /* RW */
+               unsigned long   rh_hcerr:1;                     /* RW */
+               unsigned long   lh0_hcerr:1;                    /* RW */
+               unsigned long   lh1_hcerr:1;                    /* RW */
+               unsigned long   gr0_hcerr:1;                    /* RW */
+               unsigned long   gr1_hcerr:1;                    /* RW */
+               unsigned long   ni0_hcerr:1;                    /* RW */
+               unsigned long   ni1_hcerr:1;                    /* RW */
+               unsigned long   lb_aoerr0:1;                    /* RW */
+               unsigned long   qp_aoerr0:1;                    /* RW */
+               unsigned long   rh_aoerr0:1;                    /* RW */
+               unsigned long   lh0_aoerr0:1;                   /* RW */
+               unsigned long   lh1_aoerr0:1;                   /* RW */
+               unsigned long   gr0_aoerr0:1;                   /* RW */
+               unsigned long   gr1_aoerr0:1;                   /* RW */
+               unsigned long   xb_aoerr0:1;                    /* RW */
+               unsigned long   rt_aoerr0:1;                    /* RW */
+               unsigned long   ni0_aoerr0:1;                   /* RW */
+               unsigned long   ni1_aoerr0:1;                   /* RW */
+               unsigned long   lb_aoerr1:1;                    /* RW */
+               unsigned long   qp_aoerr1:1;                    /* RW */
+               unsigned long   rh_aoerr1:1;                    /* RW */
+               unsigned long   lh0_aoerr1:1;                   /* RW */
+               unsigned long   lh1_aoerr1:1;                   /* RW */
+               unsigned long   gr0_aoerr1:1;                   /* RW */
+               unsigned long   gr1_aoerr1:1;                   /* RW */
+               unsigned long   xb_aoerr1:1;                    /* RW */
+               unsigned long   rt_aoerr1:1;                    /* RW */
+               unsigned long   ni0_aoerr1:1;                   /* RW */
+               unsigned long   ni1_aoerr1:1;                   /* RW */
+               unsigned long   system_shutdown_int:1;          /* RW */
+               unsigned long   lb_irq_int_0:1;                 /* RW */
+               unsigned long   lb_irq_int_1:1;                 /* RW */
+               unsigned long   lb_irq_int_2:1;                 /* RW */
+               unsigned long   lb_irq_int_3:1;                 /* RW */
+               unsigned long   lb_irq_int_4:1;                 /* RW */
+               unsigned long   lb_irq_int_5:1;                 /* RW */
+               unsigned long   lb_irq_int_6:1;                 /* RW */
+               unsigned long   lb_irq_int_7:1;                 /* RW */
+               unsigned long   lb_irq_int_8:1;                 /* RW */
+               unsigned long   lb_irq_int_9:1;                 /* RW */
+               unsigned long   lb_irq_int_10:1;                /* RW */
+               unsigned long   lb_irq_int_11:1;                /* RW */
+               unsigned long   lb_irq_int_12:1;                /* RW */
+               unsigned long   lb_irq_int_13:1;                /* RW */
+               unsigned long   lb_irq_int_14:1;                /* RW */
+               unsigned long   lb_irq_int_15:1;                /* RW */
+               unsigned long   l1_nmi_int:1;                   /* RW */
+               unsigned long   stop_clock:1;                   /* RW */
+               unsigned long   asic_to_l1:1;                   /* RW */
+               unsigned long   l1_to_asic:1;                   /* RW */
+               unsigned long   la_seq_trigger:1;               /* RW */
+               unsigned long   ipi_int:1;                      /* RW */
+               unsigned long   extio_int0:1;                   /* RW */
+               unsigned long   extio_int1:1;                   /* RW */
+               unsigned long   extio_int2:1;                   /* RW */
+               unsigned long   extio_int3:1;                   /* RW */
+               unsigned long   profile_int:1;                  /* RW */
+               unsigned long   rsvd_59_63:5;
+       } s3;
 
-union uvh_extio_int0_broadcast_u {
-       unsigned long   v;
-       struct uvh_extio_int0_broadcast_s {
-               unsigned long   enable:1;                       /* RW */
-               unsigned long   rsvd_1_63:63;
-       } s;
+       /* UV2 unique struct */
+       struct uv2h_event_occurred0_s {
+               unsigned long   lb_hcerr:1;                     /* RW */
+               unsigned long   qp_hcerr:1;                     /* RW */
+               unsigned long   rh_hcerr:1;                     /* RW */
+               unsigned long   lh0_hcerr:1;                    /* RW */
+               unsigned long   lh1_hcerr:1;                    /* RW */
+               unsigned long   gr0_hcerr:1;                    /* RW */
+               unsigned long   gr1_hcerr:1;                    /* RW */
+               unsigned long   ni0_hcerr:1;                    /* RW */
+               unsigned long   ni1_hcerr:1;                    /* RW */
+               unsigned long   lb_aoerr0:1;                    /* RW */
+               unsigned long   qp_aoerr0:1;                    /* RW */
+               unsigned long   rh_aoerr0:1;                    /* RW */
+               unsigned long   lh0_aoerr0:1;                   /* RW */
+               unsigned long   lh1_aoerr0:1;                   /* RW */
+               unsigned long   gr0_aoerr0:1;                   /* RW */
+               unsigned long   gr1_aoerr0:1;                   /* RW */
+               unsigned long   xb_aoerr0:1;                    /* RW */
+               unsigned long   rt_aoerr0:1;                    /* RW */
+               unsigned long   ni0_aoerr0:1;                   /* RW */
+               unsigned long   ni1_aoerr0:1;                   /* RW */
+               unsigned long   lb_aoerr1:1;                    /* RW */
+               unsigned long   qp_aoerr1:1;                    /* RW */
+               unsigned long   rh_aoerr1:1;                    /* RW */
+               unsigned long   lh0_aoerr1:1;                   /* RW */
+               unsigned long   lh1_aoerr1:1;                   /* RW */
+               unsigned long   gr0_aoerr1:1;                   /* RW */
+               unsigned long   gr1_aoerr1:1;                   /* RW */
+               unsigned long   xb_aoerr1:1;                    /* RW */
+               unsigned long   rt_aoerr1:1;                    /* RW */
+               unsigned long   ni0_aoerr1:1;                   /* RW */
+               unsigned long   ni1_aoerr1:1;                   /* RW */
+               unsigned long   system_shutdown_int:1;          /* RW */
+               unsigned long   lb_irq_int_0:1;                 /* RW */
+               unsigned long   lb_irq_int_1:1;                 /* RW */
+               unsigned long   lb_irq_int_2:1;                 /* RW */
+               unsigned long   lb_irq_int_3:1;                 /* RW */
+               unsigned long   lb_irq_int_4:1;                 /* RW */
+               unsigned long   lb_irq_int_5:1;                 /* RW */
+               unsigned long   lb_irq_int_6:1;                 /* RW */
+               unsigned long   lb_irq_int_7:1;                 /* RW */
+               unsigned long   lb_irq_int_8:1;                 /* RW */
+               unsigned long   lb_irq_int_9:1;                 /* RW */
+               unsigned long   lb_irq_int_10:1;                /* RW */
+               unsigned long   lb_irq_int_11:1;                /* RW */
+               unsigned long   lb_irq_int_12:1;                /* RW */
+               unsigned long   lb_irq_int_13:1;                /* RW */
+               unsigned long   lb_irq_int_14:1;                /* RW */
+               unsigned long   lb_irq_int_15:1;                /* RW */
+               unsigned long   l1_nmi_int:1;                   /* RW */
+               unsigned long   stop_clock:1;                   /* RW */
+               unsigned long   asic_to_l1:1;                   /* RW */
+               unsigned long   l1_to_asic:1;                   /* RW */
+               unsigned long   la_seq_trigger:1;               /* RW */
+               unsigned long   ipi_int:1;                      /* RW */
+               unsigned long   extio_int0:1;                   /* RW */
+               unsigned long   extio_int1:1;                   /* RW */
+               unsigned long   extio_int2:1;                   /* RW */
+               unsigned long   extio_int3:1;                   /* RW */
+               unsigned long   profile_int:1;                  /* RW */
+               unsigned long   rsvd_59_63:5;
+       } s2;
 };
 
 /* ========================================================================= */
-/*                         UVH_GR0_TLB_INT0_CONFIG                           */
+/*                        UVH_EVENT_OCCURRED0_ALIAS                          */
 /* ========================================================================= */
-#define UVH_GR0_TLB_INT0_CONFIG 0x61b00UL
-
-#define UVH_GR0_TLB_INT0_CONFIG_VECTOR_SHFT            0
-#define UVH_GR0_TLB_INT0_CONFIG_DM_SHFT                        8
-#define UVH_GR0_TLB_INT0_CONFIG_DESTMODE_SHFT          11
-#define UVH_GR0_TLB_INT0_CONFIG_STATUS_SHFT            12
-#define UVH_GR0_TLB_INT0_CONFIG_P_SHFT                 13
-#define UVH_GR0_TLB_INT0_CONFIG_T_SHFT                 15
-#define UVH_GR0_TLB_INT0_CONFIG_M_SHFT                 16
-#define UVH_GR0_TLB_INT0_CONFIG_APIC_ID_SHFT           32
-#define UVH_GR0_TLB_INT0_CONFIG_VECTOR_MASK            0x00000000000000ffUL
-#define UVH_GR0_TLB_INT0_CONFIG_DM_MASK                        0x0000000000000700UL
-#define UVH_GR0_TLB_INT0_CONFIG_DESTMODE_MASK          0x0000000000000800UL
-#define UVH_GR0_TLB_INT0_CONFIG_STATUS_MASK            0x0000000000001000UL
-#define UVH_GR0_TLB_INT0_CONFIG_P_MASK                 0x0000000000002000UL
-#define UVH_GR0_TLB_INT0_CONFIG_T_MASK                 0x0000000000008000UL
-#define UVH_GR0_TLB_INT0_CONFIG_M_MASK                 0x0000000000010000UL
-#define UVH_GR0_TLB_INT0_CONFIG_APIC_ID_MASK           0xffffffff00000000UL
-
+#define UVH_EVENT_OCCURRED0_ALIAS 0x70008UL
 
-union uvh_gr0_tlb_int0_config_u {
-       unsigned long   v;
-       struct uvh_gr0_tlb_int0_config_s {
-               unsigned long   vector_:8;                      /* RW */
-               unsigned long   dm:3;                           /* RW */
-               unsigned long   destmode:1;                     /* RW */
-               unsigned long   status:1;                       /* RO */
-               unsigned long   p:1;                            /* RO */
-               unsigned long   rsvd_14:1;
-               unsigned long   t:1;                            /* RO */
-               unsigned long   m:1;                            /* RW */
-               unsigned long   rsvd_17_31:15;
-               unsigned long   apic_id:32;                     /* RW */
-       } s;
-};
 
 /* ========================================================================= */
-/*                         UVH_GR0_TLB_INT1_CONFIG                           */
+/*                           UVH_EVENT_OCCURRED1                             */
 /* ========================================================================= */
-#define UVH_GR0_TLB_INT1_CONFIG 0x61b40UL
-
-#define UVH_GR0_TLB_INT1_CONFIG_VECTOR_SHFT            0
-#define UVH_GR0_TLB_INT1_CONFIG_DM_SHFT                        8
-#define UVH_GR0_TLB_INT1_CONFIG_DESTMODE_SHFT          11
-#define UVH_GR0_TLB_INT1_CONFIG_STATUS_SHFT            12
-#define UVH_GR0_TLB_INT1_CONFIG_P_SHFT                 13
-#define UVH_GR0_TLB_INT1_CONFIG_T_SHFT                 15
-#define UVH_GR0_TLB_INT1_CONFIG_M_SHFT                 16
-#define UVH_GR0_TLB_INT1_CONFIG_APIC_ID_SHFT           32
-#define UVH_GR0_TLB_INT1_CONFIG_VECTOR_MASK            0x00000000000000ffUL
-#define UVH_GR0_TLB_INT1_CONFIG_DM_MASK                        0x0000000000000700UL
-#define UVH_GR0_TLB_INT1_CONFIG_DESTMODE_MASK          0x0000000000000800UL
-#define UVH_GR0_TLB_INT1_CONFIG_STATUS_MASK            0x0000000000001000UL
-#define UVH_GR0_TLB_INT1_CONFIG_P_MASK                 0x0000000000002000UL
-#define UVH_GR0_TLB_INT1_CONFIG_T_MASK                 0x0000000000008000UL
-#define UVH_GR0_TLB_INT1_CONFIG_M_MASK                 0x0000000000010000UL
-#define UVH_GR0_TLB_INT1_CONFIG_APIC_ID_MASK           0xffffffff00000000UL
-
-
-union uvh_gr0_tlb_int1_config_u {
+#define UVH_EVENT_OCCURRED1 0x70080UL
+
+
+
+/* UVYH common defines */
+#define UVYH_EVENT_OCCURRED1_IPI_INT_SHFT              0
+#define UVYH_EVENT_OCCURRED1_IPI_INT_MASK              0x0000000000000001UL
+#define UVYH_EVENT_OCCURRED1_EXTIO_INT0_SHFT           1
+#define UVYH_EVENT_OCCURRED1_EXTIO_INT0_MASK           0x0000000000000002UL
+#define UVYH_EVENT_OCCURRED1_EXTIO_INT1_SHFT           2
+#define UVYH_EVENT_OCCURRED1_EXTIO_INT1_MASK           0x0000000000000004UL
+#define UVYH_EVENT_OCCURRED1_EXTIO_INT2_SHFT           3
+#define UVYH_EVENT_OCCURRED1_EXTIO_INT2_MASK           0x0000000000000008UL
+#define UVYH_EVENT_OCCURRED1_EXTIO_INT3_SHFT           4
+#define UVYH_EVENT_OCCURRED1_EXTIO_INT3_MASK           0x0000000000000010UL
+#define UVYH_EVENT_OCCURRED1_PROFILE_INT_SHFT          5
+#define UVYH_EVENT_OCCURRED1_PROFILE_INT_MASK          0x0000000000000020UL
+#define UVYH_EVENT_OCCURRED1_BAU_DATA_SHFT             6
+#define UVYH_EVENT_OCCURRED1_BAU_DATA_MASK             0x0000000000000040UL
+#define UVYH_EVENT_OCCURRED1_PROC_GENERAL_SHFT         7
+#define UVYH_EVENT_OCCURRED1_PROC_GENERAL_MASK         0x0000000000000080UL
+#define UVYH_EVENT_OCCURRED1_XH_TLB_INT0_SHFT          8
+#define UVYH_EVENT_OCCURRED1_XH_TLB_INT0_MASK          0x0000000000000100UL
+#define UVYH_EVENT_OCCURRED1_XH_TLB_INT1_SHFT          9
+#define UVYH_EVENT_OCCURRED1_XH_TLB_INT1_MASK          0x0000000000000200UL
+#define UVYH_EVENT_OCCURRED1_XH_TLB_INT2_SHFT          10
+#define UVYH_EVENT_OCCURRED1_XH_TLB_INT2_MASK          0x0000000000000400UL
+#define UVYH_EVENT_OCCURRED1_XH_TLB_INT3_SHFT          11
+#define UVYH_EVENT_OCCURRED1_XH_TLB_INT3_MASK          0x0000000000000800UL
+#define UVYH_EVENT_OCCURRED1_XH_TLB_INT4_SHFT          12
+#define UVYH_EVENT_OCCURRED1_XH_TLB_INT4_MASK          0x0000000000001000UL
+#define UVYH_EVENT_OCCURRED1_XH_TLB_INT5_SHFT          13
+#define UVYH_EVENT_OCCURRED1_XH_TLB_INT5_MASK          0x0000000000002000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT0_SHFT         14
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT0_MASK         0x0000000000004000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT1_SHFT         15
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT1_MASK         0x0000000000008000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT2_SHFT         16
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT2_MASK         0x0000000000010000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT3_SHFT         17
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT3_MASK         0x0000000000020000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT4_SHFT         18
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT4_MASK         0x0000000000040000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT5_SHFT         19
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT5_MASK         0x0000000000080000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT6_SHFT         20
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT6_MASK         0x0000000000100000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT7_SHFT         21
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT7_MASK         0x0000000000200000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT8_SHFT         22
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT8_MASK         0x0000000000400000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT9_SHFT         23
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT9_MASK         0x0000000000800000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT10_SHFT                24
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT10_MASK                0x0000000001000000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT11_SHFT                25
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT11_MASK                0x0000000002000000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT12_SHFT                26
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT12_MASK                0x0000000004000000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT13_SHFT                27
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT13_MASK                0x0000000008000000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT14_SHFT                28
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT14_MASK                0x0000000010000000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT15_SHFT                29
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT15_MASK                0x0000000020000000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT16_SHFT                30
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT16_MASK                0x0000000040000000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT17_SHFT                31
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT17_MASK                0x0000000080000000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT18_SHFT                32
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT18_MASK                0x0000000100000000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT19_SHFT                33
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT19_MASK                0x0000000200000000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT20_SHFT                34
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT20_MASK                0x0000000400000000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT21_SHFT                35
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT21_MASK                0x0000000800000000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT22_SHFT                36
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT22_MASK                0x0000001000000000UL
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT23_SHFT                37
+#define UVYH_EVENT_OCCURRED1_RDM_TLB_INT23_MASK                0x0000002000000000UL
+
+/* UV4 unique defines */
+#define UV4H_EVENT_OCCURRED1_PROFILE_INT_SHFT          0
+#define UV4H_EVENT_OCCURRED1_PROFILE_INT_MASK          0x0000000000000001UL
+#define UV4H_EVENT_OCCURRED1_BAU_DATA_SHFT             1
+#define UV4H_EVENT_OCCURRED1_BAU_DATA_MASK             0x0000000000000002UL
+#define UV4H_EVENT_OCCURRED1_PROC_GENERAL_SHFT         2
+#define UV4H_EVENT_OCCURRED1_PROC_GENERAL_MASK         0x0000000000000004UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT0_SHFT         3
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT0_MASK         0x0000000000000008UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT1_SHFT         4
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT1_MASK         0x0000000000000010UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT2_SHFT         5
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT2_MASK         0x0000000000000020UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT3_SHFT         6
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT3_MASK         0x0000000000000040UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT4_SHFT         7
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT4_MASK         0x0000000000000080UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT5_SHFT         8
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT5_MASK         0x0000000000000100UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT6_SHFT         9
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT6_MASK         0x0000000000000200UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT7_SHFT         10
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT7_MASK         0x0000000000000400UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT8_SHFT         11
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT8_MASK         0x0000000000000800UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT9_SHFT         12
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT9_MASK         0x0000000000001000UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT10_SHFT                13
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT10_MASK                0x0000000000002000UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT11_SHFT                14
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT11_MASK                0x0000000000004000UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT12_SHFT                15
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT12_MASK                0x0000000000008000UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT13_SHFT                16
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT13_MASK                0x0000000000010000UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT14_SHFT                17
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT14_MASK                0x0000000000020000UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT15_SHFT                18
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT15_MASK                0x0000000000040000UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT16_SHFT                19
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT16_MASK                0x0000000000080000UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT17_SHFT                20
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT17_MASK                0x0000000000100000UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT18_SHFT                21
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT18_MASK                0x0000000000200000UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT19_SHFT                22
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT19_MASK                0x0000000000400000UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT20_SHFT                23
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT20_MASK                0x0000000000800000UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT21_SHFT                24
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT21_MASK                0x0000000001000000UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT22_SHFT                25
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT22_MASK                0x0000000002000000UL
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT23_SHFT                26
+#define UV4H_EVENT_OCCURRED1_GR0_TLB_INT23_MASK                0x0000000004000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT0_SHFT         27
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT0_MASK         0x0000000008000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT1_SHFT         28
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT1_MASK         0x0000000010000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT2_SHFT         29
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT2_MASK         0x0000000020000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT3_SHFT         30
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT3_MASK         0x0000000040000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT4_SHFT         31
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT4_MASK         0x0000000080000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT5_SHFT         32
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT5_MASK         0x0000000100000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT6_SHFT         33
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT6_MASK         0x0000000200000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT7_SHFT         34
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT7_MASK         0x0000000400000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT8_SHFT         35
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT8_MASK         0x0000000800000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT9_SHFT         36
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT9_MASK         0x0000001000000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT10_SHFT                37
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT10_MASK                0x0000002000000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT11_SHFT                38
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT11_MASK                0x0000004000000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT12_SHFT                39
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT12_MASK                0x0000008000000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT13_SHFT                40
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT13_MASK                0x0000010000000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT14_SHFT                41
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT14_MASK                0x0000020000000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT15_SHFT                42
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT15_MASK                0x0000040000000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT16_SHFT                43
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT16_MASK                0x0000080000000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT17_SHFT                44
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT17_MASK                0x0000100000000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT18_SHFT                45
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT18_MASK                0x0000200000000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT19_SHFT                46
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT19_MASK                0x0000400000000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT20_SHFT                47
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT20_MASK                0x0000800000000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT21_SHFT                48
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT21_MASK                0x0001000000000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT22_SHFT                49
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT22_MASK                0x0002000000000000UL
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT23_SHFT                50
+#define UV4H_EVENT_OCCURRED1_GR1_TLB_INT23_MASK                0x0004000000000000UL
+
+/* UV3 unique defines */
+#define UV3H_EVENT_OCCURRED1_BAU_DATA_SHFT             0
+#define UV3H_EVENT_OCCURRED1_BAU_DATA_MASK             0x0000000000000001UL
+#define UV3H_EVENT_OCCURRED1_POWER_MANAGEMENT_REQ_SHFT 1
+#define UV3H_EVENT_OCCURRED1_POWER_MANAGEMENT_REQ_MASK 0x0000000000000002UL
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT0_SHFT 2
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT0_MASK 0x0000000000000004UL
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT1_SHFT 3
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT1_MASK 0x0000000000000008UL
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT2_SHFT 4
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT2_MASK 0x0000000000000010UL
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT3_SHFT 5
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT3_MASK 0x0000000000000020UL
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT4_SHFT 6
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT4_MASK 0x0000000000000040UL
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT5_SHFT 7
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT5_MASK 0x0000000000000080UL
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT6_SHFT 8
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT6_MASK 0x0000000000000100UL
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT7_SHFT 9
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT7_MASK 0x0000000000000200UL
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT8_SHFT 10
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT8_MASK 0x0000000000000400UL
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT9_SHFT 11
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT9_MASK 0x0000000000000800UL
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT10_SHFT 12
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT10_MASK 0x0000000000001000UL
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT11_SHFT 13
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT11_MASK 0x0000000000002000UL
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT12_SHFT 14
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT12_MASK 0x0000000000004000UL
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT13_SHFT 15
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT13_MASK 0x0000000000008000UL
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT14_SHFT 16
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT14_MASK 0x0000000000010000UL
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT15_SHFT 17
+#define UV3H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT15_MASK 0x0000000000020000UL
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT0_SHFT         18
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT0_MASK         0x0000000000040000UL
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT1_SHFT         19
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT1_MASK         0x0000000000080000UL
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT2_SHFT         20
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT2_MASK         0x0000000000100000UL
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT3_SHFT         21
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT3_MASK         0x0000000000200000UL
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT4_SHFT         22
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT4_MASK         0x0000000000400000UL
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT5_SHFT         23
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT5_MASK         0x0000000000800000UL
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT6_SHFT         24
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT6_MASK         0x0000000001000000UL
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT7_SHFT         25
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT7_MASK         0x0000000002000000UL
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT8_SHFT         26
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT8_MASK         0x0000000004000000UL
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT9_SHFT         27
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT9_MASK         0x0000000008000000UL
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT10_SHFT                28
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT10_MASK                0x0000000010000000UL
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT11_SHFT                29
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT11_MASK                0x0000000020000000UL
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT12_SHFT                30
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT12_MASK                0x0000000040000000UL
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT13_SHFT                31
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT13_MASK                0x0000000080000000UL
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT14_SHFT                32
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT14_MASK                0x0000000100000000UL
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT15_SHFT                33
+#define UV3H_EVENT_OCCURRED1_GR0_TLB_INT15_MASK                0x0000000200000000UL
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT0_SHFT         34
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT0_MASK         0x0000000400000000UL
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT1_SHFT         35
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT1_MASK         0x0000000800000000UL
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT2_SHFT         36
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT2_MASK         0x0000001000000000UL
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT3_SHFT         37
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT3_MASK         0x0000002000000000UL
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT4_SHFT         38
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT4_MASK         0x0000004000000000UL
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT5_SHFT         39
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT5_MASK         0x0000008000000000UL
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT6_SHFT         40
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT6_MASK         0x0000010000000000UL
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT7_SHFT         41
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT7_MASK         0x0000020000000000UL
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT8_SHFT         42
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT8_MASK         0x0000040000000000UL
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT9_SHFT         43
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT9_MASK         0x0000080000000000UL
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT10_SHFT                44
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT10_MASK                0x0000100000000000UL
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT11_SHFT                45
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT11_MASK                0x0000200000000000UL
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT12_SHFT                46
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT12_MASK                0x0000400000000000UL
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT13_SHFT                47
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT13_MASK                0x0000800000000000UL
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT14_SHFT                48
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT14_MASK                0x0001000000000000UL
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT15_SHFT                49
+#define UV3H_EVENT_OCCURRED1_GR1_TLB_INT15_MASK                0x0002000000000000UL
+#define UV3H_EVENT_OCCURRED1_RTC_INTERVAL_INT_SHFT     50
+#define UV3H_EVENT_OCCURRED1_RTC_INTERVAL_INT_MASK     0x0004000000000000UL
+#define UV3H_EVENT_OCCURRED1_BAU_DASHBOARD_INT_SHFT    51
+#define UV3H_EVENT_OCCURRED1_BAU_DASHBOARD_INT_MASK    0x0008000000000000UL
+
+/* UV2 unique defines */
+#define UV2H_EVENT_OCCURRED1_BAU_DATA_SHFT             0
+#define UV2H_EVENT_OCCURRED1_BAU_DATA_MASK             0x0000000000000001UL
+#define UV2H_EVENT_OCCURRED1_POWER_MANAGEMENT_REQ_SHFT 1
+#define UV2H_EVENT_OCCURRED1_POWER_MANAGEMENT_REQ_MASK 0x0000000000000002UL
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT0_SHFT 2
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT0_MASK 0x0000000000000004UL
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT1_SHFT 3
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT1_MASK 0x0000000000000008UL
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT2_SHFT 4
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT2_MASK 0x0000000000000010UL
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT3_SHFT 5
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT3_MASK 0x0000000000000020UL
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT4_SHFT 6
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT4_MASK 0x0000000000000040UL
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT5_SHFT 7
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT5_MASK 0x0000000000000080UL
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT6_SHFT 8
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT6_MASK 0x0000000000000100UL
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT7_SHFT 9
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT7_MASK 0x0000000000000200UL
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT8_SHFT 10
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT8_MASK 0x0000000000000400UL
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT9_SHFT 11
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT9_MASK 0x0000000000000800UL
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT10_SHFT 12
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT10_MASK 0x0000000000001000UL
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT11_SHFT 13
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT11_MASK 0x0000000000002000UL
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT12_SHFT 14
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT12_MASK 0x0000000000004000UL
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT13_SHFT 15
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT13_MASK 0x0000000000008000UL
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT14_SHFT 16
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT14_MASK 0x0000000000010000UL
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT15_SHFT 17
+#define UV2H_EVENT_OCCURRED1_MESSAGE_ACCELERATOR_INT15_MASK 0x0000000000020000UL
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT0_SHFT         18
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT0_MASK         0x0000000000040000UL
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT1_SHFT         19
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT1_MASK         0x0000000000080000UL
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT2_SHFT         20
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT2_MASK         0x0000000000100000UL
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT3_SHFT         21
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT3_MASK         0x0000000000200000UL
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT4_SHFT         22
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT4_MASK         0x0000000000400000UL
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT5_SHFT         23
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT5_MASK         0x0000000000800000UL
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT6_SHFT         24
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT6_MASK         0x0000000001000000UL
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT7_SHFT         25
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT7_MASK         0x0000000002000000UL
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT8_SHFT         26
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT8_MASK         0x0000000004000000UL
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT9_SHFT         27
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT9_MASK         0x0000000008000000UL
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT10_SHFT                28
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT10_MASK                0x0000000010000000UL
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT11_SHFT                29
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT11_MASK                0x0000000020000000UL
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT12_SHFT                30
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT12_MASK                0x0000000040000000UL
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT13_SHFT                31
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT13_MASK                0x0000000080000000UL
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT14_SHFT                32
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT14_MASK                0x0000000100000000UL
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT15_SHFT                33
+#define UV2H_EVENT_OCCURRED1_GR0_TLB_INT15_MASK                0x0000000200000000UL
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT0_SHFT         34
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT0_MASK         0x0000000400000000UL
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT1_SHFT         35
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT1_MASK         0x0000000800000000UL
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT2_SHFT         36
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT2_MASK         0x0000001000000000UL
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT3_SHFT         37
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT3_MASK         0x0000002000000000UL
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT4_SHFT         38
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT4_MASK         0x0000004000000000UL
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT5_SHFT         39
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT5_MASK         0x0000008000000000UL
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT6_SHFT         40
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT6_MASK         0x0000010000000000UL
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT7_SHFT         41
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT7_MASK         0x0000020000000000UL
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT8_SHFT         42
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT8_MASK         0x0000040000000000UL
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT9_SHFT         43
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT9_MASK         0x0000080000000000UL
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT10_SHFT                44
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT10_MASK                0x0000100000000000UL
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT11_SHFT                45
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT11_MASK                0x0000200000000000UL
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT12_SHFT                46
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT12_MASK                0x0000400000000000UL
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT13_SHFT                47
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT13_MASK                0x0000800000000000UL
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT14_SHFT                48
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT14_MASK                0x0001000000000000UL
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT15_SHFT                49
+#define UV2H_EVENT_OCCURRED1_GR1_TLB_INT15_MASK                0x0002000000000000UL
+#define UV2H_EVENT_OCCURRED1_RTC_INTERVAL_INT_SHFT     50
+#define UV2H_EVENT_OCCURRED1_RTC_INTERVAL_INT_MASK     0x0004000000000000UL
+#define UV2H_EVENT_OCCURRED1_BAU_DASHBOARD_INT_SHFT    51
+#define UV2H_EVENT_OCCURRED1_BAU_DASHBOARD_INT_MASK    0x0008000000000000UL
+
+#define UVH_EVENT_OCCURRED1_EXTIO_INT0_MASK (                          \
+       is_uv(UV5) ? 0x0000000000000002UL :                             \
+       0)
+#define UVH_EVENT_OCCURRED1_EXTIO_INT0_SHFT (                          \
+       is_uv(UV5) ? 1 :                                                \
+       -1)
+
+union uvyh_event_occurred1_u {
        unsigned long   v;
-       struct uvh_gr0_tlb_int1_config_s {
-               unsigned long   vector_:8;                      /* RW */
-               unsigned long   dm:3;                           /* RW */
-               unsigned long   destmode:1;                     /* RW */
-               unsigned long   status:1;                       /* RO */
-               unsigned long   p:1;                            /* RO */
-               unsigned long   rsvd_14:1;
-               unsigned long   t:1;                            /* RO */
-               unsigned long   m:1;                            /* RW */
-               unsigned long   rsvd_17_31:15;
-               unsigned long   apic_id:32;                     /* RW */
-       } s;
-};
 
-/* ========================================================================= */
-/*                         UVH_GR0_TLB_MMR_CONTROL                           */
-/* ========================================================================= */
-#define UV2H_GR0_TLB_MMR_CONTROL 0xc01080UL
-#define UV3H_GR0_TLB_MMR_CONTROL 0xc01080UL
-#define UV4H_GR0_TLB_MMR_CONTROL 0x601080UL
-#define UVH_GR0_TLB_MMR_CONTROL (                                      \
-       is_uv2_hub() ? UV2H_GR0_TLB_MMR_CONTROL :                       \
-       is_uv3_hub() ? UV3H_GR0_TLB_MMR_CONTROL :                       \
-       /*is_uv4_hub*/ UV4H_GR0_TLB_MMR_CONTROL)
-
-#define UVH_GR0_TLB_MMR_CONTROL_INDEX_SHFT             0
-#define UVH_GR0_TLB_MMR_CONTROL_AUTO_VALID_EN_SHFT     16
-#define UVH_GR0_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_SHFT 20
-#define UVH_GR0_TLB_MMR_CONTROL_MMR_WRITE_SHFT         30
-#define UVH_GR0_TLB_MMR_CONTROL_MMR_READ_SHFT          31
-#define UVH_GR0_TLB_MMR_CONTROL_AUTO_VALID_EN_MASK     0x0000000000010000UL
-#define UVH_GR0_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_MASK 0x0000000000100000UL
-#define UVH_GR0_TLB_MMR_CONTROL_MMR_WRITE_MASK         0x0000000040000000UL
-#define UVH_GR0_TLB_MMR_CONTROL_MMR_READ_MASK          0x0000000080000000UL
-
-#define UVXH_GR0_TLB_MMR_CONTROL_INDEX_SHFT            0
-#define UVXH_GR0_TLB_MMR_CONTROL_AUTO_VALID_EN_SHFT    16
-#define UVXH_GR0_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_SHFT        20
-#define UVXH_GR0_TLB_MMR_CONTROL_MMR_WRITE_SHFT                30
-#define UVXH_GR0_TLB_MMR_CONTROL_MMR_READ_SHFT         31
-#define UVXH_GR0_TLB_MMR_CONTROL_MMR_OP_DONE_SHFT      32
-#define UVXH_GR0_TLB_MMR_CONTROL_AUTO_VALID_EN_MASK    0x0000000000010000UL
-#define UVXH_GR0_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_MASK        0x0000000000100000UL
-#define UVXH_GR0_TLB_MMR_CONTROL_MMR_WRITE_MASK                0x0000000040000000UL
-#define UVXH_GR0_TLB_MMR_CONTROL_MMR_READ_MASK         0x0000000080000000UL
-#define UVXH_GR0_TLB_MMR_CONTROL_MMR_OP_DONE_MASK      0x0000000100000000UL
-
-#define UV2H_GR0_TLB_MMR_CONTROL_INDEX_SHFT            0
-#define UV2H_GR0_TLB_MMR_CONTROL_MEM_SEL_SHFT          12
-#define UV2H_GR0_TLB_MMR_CONTROL_AUTO_VALID_EN_SHFT    16
-#define UV2H_GR0_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_SHFT        20
-#define UV2H_GR0_TLB_MMR_CONTROL_MMR_WRITE_SHFT                30
-#define UV2H_GR0_TLB_MMR_CONTROL_MMR_READ_SHFT         31
-#define UV2H_GR0_TLB_MMR_CONTROL_MMR_OP_DONE_SHFT      32
-#define UV2H_GR0_TLB_MMR_CONTROL_MMR_INJ_CON_SHFT      48
-#define UV2H_GR0_TLB_MMR_CONTROL_MMR_INJ_TLBRAM_SHFT   52
-#define UV2H_GR0_TLB_MMR_CONTROL_INDEX_MASK            0x0000000000000fffUL
-#define UV2H_GR0_TLB_MMR_CONTROL_MEM_SEL_MASK          0x0000000000003000UL
-#define UV2H_GR0_TLB_MMR_CONTROL_AUTO_VALID_EN_MASK    0x0000000000010000UL
-#define UV2H_GR0_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_MASK        0x0000000000100000UL
-#define UV2H_GR0_TLB_MMR_CONTROL_MMR_WRITE_MASK                0x0000000040000000UL
-#define UV2H_GR0_TLB_MMR_CONTROL_MMR_READ_MASK         0x0000000080000000UL
-#define UV2H_GR0_TLB_MMR_CONTROL_MMR_OP_DONE_MASK      0x0000000100000000UL
-#define UV2H_GR0_TLB_MMR_CONTROL_MMR_INJ_CON_MASK      0x0001000000000000UL
-#define UV2H_GR0_TLB_MMR_CONTROL_MMR_INJ_TLBRAM_MASK   0x0010000000000000UL
-
-#define UV3H_GR0_TLB_MMR_CONTROL_INDEX_SHFT            0
-#define UV3H_GR0_TLB_MMR_CONTROL_MEM_SEL_SHFT          12
-#define UV3H_GR0_TLB_MMR_CONTROL_AUTO_VALID_EN_SHFT    16
-#define UV3H_GR0_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_SHFT        20
-#define UV3H_GR0_TLB_MMR_CONTROL_ECC_SEL_SHFT          21
-#define UV3H_GR0_TLB_MMR_CONTROL_MMR_WRITE_SHFT                30
-#define UV3H_GR0_TLB_MMR_CONTROL_MMR_READ_SHFT         31
-#define UV3H_GR0_TLB_MMR_CONTROL_MMR_OP_DONE_SHFT      32
-#define UV3H_GR0_TLB_MMR_CONTROL_INDEX_MASK            0x0000000000000fffUL
-#define UV3H_GR0_TLB_MMR_CONTROL_MEM_SEL_MASK          0x0000000000003000UL
-#define UV3H_GR0_TLB_MMR_CONTROL_AUTO_VALID_EN_MASK    0x0000000000010000UL
-#define UV3H_GR0_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_MASK        0x0000000000100000UL
-#define UV3H_GR0_TLB_MMR_CONTROL_ECC_SEL_MASK          0x0000000000200000UL
-#define UV3H_GR0_TLB_MMR_CONTROL_MMR_WRITE_MASK                0x0000000040000000UL
-#define UV3H_GR0_TLB_MMR_CONTROL_MMR_READ_MASK         0x0000000080000000UL
-#define UV3H_GR0_TLB_MMR_CONTROL_MMR_OP_DONE_MASK      0x0000000100000000UL
-
-#define UV4H_GR0_TLB_MMR_CONTROL_INDEX_SHFT            0
-#define UV4H_GR0_TLB_MMR_CONTROL_MEM_SEL_SHFT          13
-#define UV4H_GR0_TLB_MMR_CONTROL_AUTO_VALID_EN_SHFT    16
-#define UV4H_GR0_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_SHFT        20
-#define UV4H_GR0_TLB_MMR_CONTROL_ECC_SEL_SHFT          21
-#define UV4H_GR0_TLB_MMR_CONTROL_MMR_WRITE_SHFT                30
-#define UV4H_GR0_TLB_MMR_CONTROL_MMR_READ_SHFT         31
-#define UV4H_GR0_TLB_MMR_CONTROL_MMR_OP_DONE_SHFT      32
-#define UV4H_GR0_TLB_MMR_CONTROL_PAGE_SIZE_SHFT                59
-#define UV4H_GR0_TLB_MMR_CONTROL_INDEX_MASK            0x0000000000001fffUL
-#define UV4H_GR0_TLB_MMR_CONTROL_MEM_SEL_MASK          0x0000000000006000UL
-#define UV4H_GR0_TLB_MMR_CONTROL_AUTO_VALID_EN_MASK    0x0000000000010000UL
-#define UV4H_GR0_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_MASK        0x0000000000100000UL
-#define UV4H_GR0_TLB_MMR_CONTROL_ECC_SEL_MASK          0x0000000000200000UL
-#define UV4H_GR0_TLB_MMR_CONTROL_MMR_WRITE_MASK                0x0000000040000000UL
-#define UV4H_GR0_TLB_MMR_CONTROL_MMR_READ_MASK         0x0000000080000000UL
-#define UV4H_GR0_TLB_MMR_CONTROL_MMR_OP_DONE_MASK      0x0000000100000000UL
-#define UV4H_GR0_TLB_MMR_CONTROL_PAGE_SIZE_MASK                0xf800000000000000UL
-
-#define UVH_GR0_TLB_MMR_CONTROL_INDEX_MASK (                           \
-       is_uv2_hub() ? UV2H_GR0_TLB_MMR_CONTROL_INDEX_MASK :            \
-       is_uv3_hub() ? UV3H_GR0_TLB_MMR_CONTROL_INDEX_MASK :            \
-       /*is_uv4_hub*/ UV4H_GR0_TLB_MMR_CONTROL_INDEX_MASK)
-#define UVH_GR0_TLB_MMR_CONTROL_MEM_SEL_MASK (                         \
-       is_uv2_hub() ? UV2H_GR0_TLB_MMR_CONTROL_MEM_SEL_MASK :          \
-       is_uv3_hub() ? UV3H_GR0_TLB_MMR_CONTROL_MEM_SEL_MASK :          \
-       /*is_uv4_hub*/ UV4H_GR0_TLB_MMR_CONTROL_MEM_SEL_MASK)
-#define UVH_GR0_TLB_MMR_CONTROL_MEM_SEL_SHFT (                         \
-       is_uv2_hub() ? UV2H_GR0_TLB_MMR_CONTROL_MEM_SEL_SHFT :          \
-       is_uv3_hub() ? UV3H_GR0_TLB_MMR_CONTROL_MEM_SEL_SHFT :          \
-       /*is_uv4_hub*/ UV4H_GR0_TLB_MMR_CONTROL_MEM_SEL_SHFT)
-
-union uvh_gr0_tlb_mmr_control_u {
-       unsigned long   v;
-       struct uvh_gr0_tlb_mmr_control_s {
-               unsigned long   rsvd_0_15:16;
-               unsigned long   auto_valid_en:1;                /* RW */
-               unsigned long   rsvd_17_19:3;
-               unsigned long   mmr_hash_index_en:1;            /* RW */
-               unsigned long   rsvd_21_29:9;
-               unsigned long   mmr_write:1;                    /* WP */
-               unsigned long   mmr_read:1;                     /* WP */
-               unsigned long   rsvd_32_48:17;
-               unsigned long   rsvd_49_51:3;
-               unsigned long   rsvd_52_63:12;
-       } s;
-       struct uvxh_gr0_tlb_mmr_control_s {
-               unsigned long   rsvd_0_15:16;
-               unsigned long   auto_valid_en:1;                /* RW */
-               unsigned long   rsvd_17_19:3;
-               unsigned long   mmr_hash_index_en:1;            /* RW */
-               unsigned long   rsvd_21_29:9;
-               unsigned long   mmr_write:1;                    /* WP */
-               unsigned long   mmr_read:1;                     /* WP */
-               unsigned long   mmr_op_done:1;                  /* RW */
-               unsigned long   rsvd_33_47:15;
-               unsigned long   rsvd_48:1;
-               unsigned long   rsvd_49_51:3;
-               unsigned long   rsvd_52_63:12;
-       } sx;
-       struct uv2h_gr0_tlb_mmr_control_s {
-               unsigned long   index:12;                       /* RW */
-               unsigned long   mem_sel:2;                      /* RW */
-               unsigned long   rsvd_14_15:2;
-               unsigned long   auto_valid_en:1;                /* RW */
-               unsigned long   rsvd_17_19:3;
-               unsigned long   mmr_hash_index_en:1;            /* RW */
-               unsigned long   rsvd_21_29:9;
-               unsigned long   mmr_write:1;                    /* WP */
-               unsigned long   mmr_read:1;                     /* WP */
-               unsigned long   mmr_op_done:1;                  /* RW */
-               unsigned long   rsvd_33_47:15;
-               unsigned long   mmr_inj_con:1;                  /* RW */
-               unsigned long   rsvd_49_51:3;
-               unsigned long   mmr_inj_tlbram:1;               /* RW */
-               unsigned long   rsvd_53_63:11;
-       } s2;
-       struct uv3h_gr0_tlb_mmr_control_s {
-               unsigned long   index:12;                       /* RW */
-               unsigned long   mem_sel:2;                      /* RW */
-               unsigned long   rsvd_14_15:2;
-               unsigned long   auto_valid_en:1;                /* RW */
-               unsigned long   rsvd_17_19:3;
-               unsigned long   mmr_hash_index_en:1;            /* RW */
-               unsigned long   ecc_sel:1;                      /* RW */
-               unsigned long   rsvd_22_29:8;
-               unsigned long   mmr_write:1;                    /* WP */
-               unsigned long   mmr_read:1;                     /* WP */
-               unsigned long   mmr_op_done:1;                  /* RW */
-               unsigned long   rsvd_33_47:15;
-               unsigned long   undef_48:1;                     /* Undefined */
-               unsigned long   rsvd_49_51:3;
-               unsigned long   undef_52:1;                     /* Undefined */
-               unsigned long   rsvd_53_63:11;
-       } s3;
-       struct uv4h_gr0_tlb_mmr_control_s {
-               unsigned long   index:13;                       /* RW */
-               unsigned long   mem_sel:2;                      /* RW */
-               unsigned long   rsvd_15:1;
-               unsigned long   auto_valid_en:1;                /* RW */
-               unsigned long   rsvd_17_19:3;
-               unsigned long   mmr_hash_index_en:1;            /* RW */
-               unsigned long   ecc_sel:1;                      /* RW */
-               unsigned long   rsvd_22_29:8;
-               unsigned long   mmr_write:1;                    /* WP */
-               unsigned long   mmr_read:1;                     /* WP */
-               unsigned long   mmr_op_done:1;                  /* RW */
-               unsigned long   rsvd_33_47:15;
-               unsigned long   undef_48:1;                     /* Undefined */
-               unsigned long   rsvd_49_51:3;
-               unsigned long   rsvd_52_58:7;
-               unsigned long   page_size:5;                    /* RW */
+       /* UVYH common struct */
+       struct uvyh_event_occurred1_s {
+               unsigned long   ipi_int:1;                      /* RW */
+               unsigned long   extio_int0:1;                   /* RW */
+               unsigned long   extio_int1:1;                   /* RW */
+               unsigned long   extio_int2:1;                   /* RW */
+               unsigned long   extio_int3:1;                   /* RW */
+               unsigned long   profile_int:1;                  /* RW */
+               unsigned long   bau_data:1;                     /* RW */
+               unsigned long   proc_general:1;                 /* RW */
+               unsigned long   xh_tlb_int0:1;                  /* RW */
+               unsigned long   xh_tlb_int1:1;                  /* RW */
+               unsigned long   xh_tlb_int2:1;                  /* RW */
+               unsigned long   xh_tlb_int3:1;                  /* RW */
+               unsigned long   xh_tlb_int4:1;                  /* RW */
+               unsigned long   xh_tlb_int5:1;                  /* RW */
+               unsigned long   rdm_tlb_int0:1;                 /* RW */
+               unsigned long   rdm_tlb_int1:1;                 /* RW */
+               unsigned long   rdm_tlb_int2:1;                 /* RW */
+               unsigned long   rdm_tlb_int3:1;                 /* RW */
+               unsigned long   rdm_tlb_int4:1;                 /* RW */
+               unsigned long   rdm_tlb_int5:1;                 /* RW */
+               unsigned long   rdm_tlb_int6:1;                 /* RW */
+               unsigned long   rdm_tlb_int7:1;                 /* RW */
+               unsigned long   rdm_tlb_int8:1;                 /* RW */
+               unsigned long   rdm_tlb_int9:1;                 /* RW */
+               unsigned long   rdm_tlb_int10:1;                /* RW */
+               unsigned long   rdm_tlb_int11:1;                /* RW */
+               unsigned long   rdm_tlb_int12:1;                /* RW */
+               unsigned long   rdm_tlb_int13:1;                /* RW */
+               unsigned long   rdm_tlb_int14:1;                /* RW */
+               unsigned long   rdm_tlb_int15:1;                /* RW */
+               unsigned long   rdm_tlb_int16:1;                /* RW */
+               unsigned long   rdm_tlb_int17:1;                /* RW */
+               unsigned long   rdm_tlb_int18:1;                /* RW */
+               unsigned long   rdm_tlb_int19:1;                /* RW */
+               unsigned long   rdm_tlb_int20:1;                /* RW */
+               unsigned long   rdm_tlb_int21:1;                /* RW */
+               unsigned long   rdm_tlb_int22:1;                /* RW */
+               unsigned long   rdm_tlb_int23:1;                /* RW */
+               unsigned long   rsvd_38_63:26;
+       } sy;
+
+       /* UV5 unique struct */
+       struct uv5h_event_occurred1_s {
+               unsigned long   ipi_int:1;                      /* RW */
+               unsigned long   extio_int0:1;                   /* RW */
+               unsigned long   extio_int1:1;                   /* RW */
+               unsigned long   extio_int2:1;                   /* RW */
+               unsigned long   extio_int3:1;                   /* RW */
+               unsigned long   profile_int:1;                  /* RW */
+               unsigned long   bau_data:1;                     /* RW */
+               unsigned long   proc_general:1;                 /* RW */
+               unsigned long   xh_tlb_int0:1;                  /* RW */
+               unsigned long   xh_tlb_int1:1;                  /* RW */
+               unsigned long   xh_tlb_int2:1;                  /* RW */
+               unsigned long   xh_tlb_int3:1;                  /* RW */
+               unsigned long   xh_tlb_int4:1;                  /* RW */
+               unsigned long   xh_tlb_int5:1;                  /* RW */
+               unsigned long   rdm_tlb_int0:1;                 /* RW */
+               unsigned long   rdm_tlb_int1:1;                 /* RW */
+               unsigned long   rdm_tlb_int2:1;                 /* RW */
+               unsigned long   rdm_tlb_int3:1;                 /* RW */
+               unsigned long   rdm_tlb_int4:1;                 /* RW */
+               unsigned long   rdm_tlb_int5:1;                 /* RW */
+               unsigned long   rdm_tlb_int6:1;                 /* RW */
+               unsigned long   rdm_tlb_int7:1;                 /* RW */
+               unsigned long   rdm_tlb_int8:1;                 /* RW */
+               unsigned long   rdm_tlb_int9:1;                 /* RW */
+               unsigned long   rdm_tlb_int10:1;                /* RW */
+               unsigned long   rdm_tlb_int11:1;                /* RW */
+               unsigned long   rdm_tlb_int12:1;                /* RW */
+               unsigned long   rdm_tlb_int13:1;                /* RW */
+               unsigned long   rdm_tlb_int14:1;                /* RW */
+               unsigned long   rdm_tlb_int15:1;                /* RW */
+               unsigned long   rdm_tlb_int16:1;                /* RW */
+               unsigned long   rdm_tlb_int17:1;                /* RW */
+               unsigned long   rdm_tlb_int18:1;                /* RW */
+               unsigned long   rdm_tlb_int19:1;                /* RW */
+               unsigned long   rdm_tlb_int20:1;                /* RW */
+               unsigned long   rdm_tlb_int21:1;                /* RW */
+               unsigned long   rdm_tlb_int22:1;                /* RW */
+               unsigned long   rdm_tlb_int23:1;                /* RW */
+               unsigned long   rsvd_38_63:26;
+       } s5;
+
+       /* UV4 unique struct */
+       struct uv4h_event_occurred1_s {
+               unsigned long   profile_int:1;                  /* RW */
+               unsigned long   bau_data:1;                     /* RW */
+               unsigned long   proc_general:1;                 /* RW */
+               unsigned long   gr0_tlb_int0:1;                 /* RW */
+               unsigned long   gr0_tlb_int1:1;                 /* RW */
+               unsigned long   gr0_tlb_int2:1;                 /* RW */
+               unsigned long   gr0_tlb_int3:1;                 /* RW */
+               unsigned long   gr0_tlb_int4:1;                 /* RW */
+               unsigned long   gr0_tlb_int5:1;                 /* RW */
+               unsigned long   gr0_tlb_int6:1;                 /* RW */
+               unsigned long   gr0_tlb_int7:1;                 /* RW */
+               unsigned long   gr0_tlb_int8:1;                 /* RW */
+               unsigned long   gr0_tlb_int9:1;                 /* RW */
+               unsigned long   gr0_tlb_int10:1;                /* RW */
+               unsigned long   gr0_tlb_int11:1;                /* RW */
+               unsigned long   gr0_tlb_int12:1;                /* RW */
+               unsigned long   gr0_tlb_int13:1;                /* RW */
+               unsigned long   gr0_tlb_int14:1;                /* RW */
+               unsigned long   gr0_tlb_int15:1;                /* RW */
+               unsigned long   gr0_tlb_int16:1;                /* RW */
+               unsigned long   gr0_tlb_int17:1;                /* RW */
+               unsigned long   gr0_tlb_int18:1;                /* RW */
+               unsigned long   gr0_tlb_int19:1;                /* RW */
+               unsigned long   gr0_tlb_int20:1;                /* RW */
+               unsigned long   gr0_tlb_int21:1;                /* RW */
+               unsigned long   gr0_tlb_int22:1;                /* RW */
+               unsigned long   gr0_tlb_int23:1;                /* RW */
+               unsigned long   gr1_tlb_int0:1;                 /* RW */
+               unsigned long   gr1_tlb_int1:1;                 /* RW */
+               unsigned long   gr1_tlb_int2:1;                 /* RW */
+               unsigned long   gr1_tlb_int3:1;                 /* RW */
+               unsigned long   gr1_tlb_int4:1;                 /* RW */
+               unsigned long   gr1_tlb_int5:1;                 /* RW */
+               unsigned long   gr1_tlb_int6:1;                 /* RW */
+               unsigned long   gr1_tlb_int7:1;                 /* RW */
+               unsigned long   gr1_tlb_int8:1;                 /* RW */
+               unsigned long   gr1_tlb_int9:1;                 /* RW */
+               unsigned long   gr1_tlb_int10:1;                /* RW */
+               unsigned long   gr1_tlb_int11:1;                /* RW */
+               unsigned long   gr1_tlb_int12:1;                /* RW */
+               unsigned long   gr1_tlb_int13:1;                /* RW */
+               unsigned long   gr1_tlb_int14:1;                /* RW */
+               unsigned long   gr1_tlb_int15:1;                /* RW */
+               unsigned long   gr1_tlb_int16:1;                /* RW */
+               unsigned long   gr1_tlb_int17:1;                /* RW */
+               unsigned long   gr1_tlb_int18:1;                /* RW */
+               unsigned long   gr1_tlb_int19:1;                /* RW */
+               unsigned long   gr1_tlb_int20:1;                /* RW */
+               unsigned long   gr1_tlb_int21:1;                /* RW */
+               unsigned long   gr1_tlb_int22:1;                /* RW */
+               unsigned long   gr1_tlb_int23:1;                /* RW */
+               unsigned long   rsvd_51_63:13;
        } s4;
-};
 
-/* ========================================================================= */
-/*                       UVH_GR0_TLB_MMR_READ_DATA_HI                        */
-/* ========================================================================= */
-#define UV2H_GR0_TLB_MMR_READ_DATA_HI 0xc010a0UL
-#define UV3H_GR0_TLB_MMR_READ_DATA_HI 0xc010a0UL
-#define UV4H_GR0_TLB_MMR_READ_DATA_HI 0x6010a0UL
-#define UVH_GR0_TLB_MMR_READ_DATA_HI (                                 \
-       is_uv2_hub() ? UV2H_GR0_TLB_MMR_READ_DATA_HI :                  \
-       is_uv3_hub() ? UV3H_GR0_TLB_MMR_READ_DATA_HI :                  \
-       /*is_uv4_hub*/ UV4H_GR0_TLB_MMR_READ_DATA_HI)
-
-#define UVH_GR0_TLB_MMR_READ_DATA_HI_PFN_SHFT          0
-
-#define UVXH_GR0_TLB_MMR_READ_DATA_HI_PFN_SHFT         0
-
-#define UV2H_GR0_TLB_MMR_READ_DATA_HI_PFN_SHFT         0
-#define UV2H_GR0_TLB_MMR_READ_DATA_HI_GAA_SHFT         41
-#define UV2H_GR0_TLB_MMR_READ_DATA_HI_DIRTY_SHFT       43
-#define UV2H_GR0_TLB_MMR_READ_DATA_HI_LARGER_SHFT      44
-#define UV2H_GR0_TLB_MMR_READ_DATA_HI_PFN_MASK         0x000001ffffffffffUL
-#define UV2H_GR0_TLB_MMR_READ_DATA_HI_GAA_MASK         0x0000060000000000UL
-#define UV2H_GR0_TLB_MMR_READ_DATA_HI_DIRTY_MASK       0x0000080000000000UL
-#define UV2H_GR0_TLB_MMR_READ_DATA_HI_LARGER_MASK      0x0000100000000000UL
-
-#define UV3H_GR0_TLB_MMR_READ_DATA_HI_PFN_SHFT         0
-#define UV3H_GR0_TLB_MMR_READ_DATA_HI_GAA_SHFT         41
-#define UV3H_GR0_TLB_MMR_READ_DATA_HI_DIRTY_SHFT       43
-#define UV3H_GR0_TLB_MMR_READ_DATA_HI_LARGER_SHFT      44
-#define UV3H_GR0_TLB_MMR_READ_DATA_HI_AA_EXT_SHFT      45
-#define UV3H_GR0_TLB_MMR_READ_DATA_HI_WAY_ECC_SHFT     55
-#define UV3H_GR0_TLB_MMR_READ_DATA_HI_PFN_MASK         0x000001ffffffffffUL
-#define UV3H_GR0_TLB_MMR_READ_DATA_HI_GAA_MASK         0x0000060000000000UL
-#define UV3H_GR0_TLB_MMR_READ_DATA_HI_DIRTY_MASK       0x0000080000000000UL
-#define UV3H_GR0_TLB_MMR_READ_DATA_HI_LARGER_MASK      0x0000100000000000UL
-#define UV3H_GR0_TLB_MMR_READ_DATA_HI_AA_EXT_MASK      0x0000200000000000UL
-#define UV3H_GR0_TLB_MMR_READ_DATA_HI_WAY_ECC_MASK     0xff80000000000000UL
-
-#define UV4H_GR0_TLB_MMR_READ_DATA_HI_PFN_SHFT         0
-#define UV4H_GR0_TLB_MMR_READ_DATA_HI_PNID_SHFT                34
-#define UV4H_GR0_TLB_MMR_READ_DATA_HI_GAA_SHFT         49
-#define UV4H_GR0_TLB_MMR_READ_DATA_HI_DIRTY_SHFT       51
-#define UV4H_GR0_TLB_MMR_READ_DATA_HI_LARGER_SHFT      52
-#define UV4H_GR0_TLB_MMR_READ_DATA_HI_AA_EXT_SHFT      53
-#define UV4H_GR0_TLB_MMR_READ_DATA_HI_WAY_ECC_SHFT     55
-#define UV4H_GR0_TLB_MMR_READ_DATA_HI_PFN_MASK         0x00000003ffffffffUL
-#define UV4H_GR0_TLB_MMR_READ_DATA_HI_PNID_MASK                0x0001fffc00000000UL
-#define UV4H_GR0_TLB_MMR_READ_DATA_HI_GAA_MASK         0x0006000000000000UL
-#define UV4H_GR0_TLB_MMR_READ_DATA_HI_DIRTY_MASK       0x0008000000000000UL
-#define UV4H_GR0_TLB_MMR_READ_DATA_HI_LARGER_MASK      0x0010000000000000UL
-#define UV4H_GR0_TLB_MMR_READ_DATA_HI_AA_EXT_MASK      0x0020000000000000UL
-#define UV4H_GR0_TLB_MMR_READ_DATA_HI_WAY_ECC_MASK     0xff80000000000000UL
-
-
-union uvh_gr0_tlb_mmr_read_data_hi_u {
-       unsigned long   v;
-       struct uv2h_gr0_tlb_mmr_read_data_hi_s {
-               unsigned long   pfn:41;                         /* RO */
-               unsigned long   gaa:2;                          /* RO */
-               unsigned long   dirty:1;                        /* RO */
-               unsigned long   larger:1;                       /* RO */
-               unsigned long   rsvd_45_63:19;
-       } s2;
-       struct uv3h_gr0_tlb_mmr_read_data_hi_s {
-               unsigned long   pfn:41;                         /* RO */
-               unsigned long   gaa:2;                          /* RO */
-               unsigned long   dirty:1;                        /* RO */
-               unsigned long   larger:1;                       /* RO */
-               unsigned long   aa_ext:1;                       /* RO */
-               unsigned long   undef_46_54:9;                  /* Undefined */
-               unsigned long   way_ecc:9;                      /* RO */
+       /* UV3 unique struct */
+       struct uv3h_event_occurred1_s {
+               unsigned long   bau_data:1;                     /* RW */
+               unsigned long   power_management_req:1;         /* RW */
+               unsigned long   message_accelerator_int0:1;     /* RW */
+               unsigned long   message_accelerator_int1:1;     /* RW */
+               unsigned long   message_accelerator_int2:1;     /* RW */
+               unsigned long   message_accelerator_int3:1;     /* RW */
+               unsigned long   message_accelerator_int4:1;     /* RW */
+               unsigned long   message_accelerator_int5:1;     /* RW */
+               unsigned long   message_accelerator_int6:1;     /* RW */
+               unsigned long   message_accelerator_int7:1;     /* RW */
+               unsigned long   message_accelerator_int8:1;     /* RW */
+               unsigned long   message_accelerator_int9:1;     /* RW */
+               unsigned long   message_accelerator_int10:1;    /* RW */
+               unsigned long   message_accelerator_int11:1;    /* RW */
+               unsigned long   message_accelerator_int12:1;    /* RW */
+               unsigned long   message_accelerator_int13:1;    /* RW */
+               unsigned long   message_accelerator_int14:1;    /* RW */
+               unsigned long   message_accelerator_int15:1;    /* RW */
+               unsigned long   gr0_tlb_int0:1;                 /* RW */
+               unsigned long   gr0_tlb_int1:1;                 /* RW */
+               unsigned long   gr0_tlb_int2:1;                 /* RW */
+               unsigned long   gr0_tlb_int3:1;                 /* RW */
+               unsigned long   gr0_tlb_int4:1;                 /* RW */
+               unsigned long   gr0_tlb_int5:1;                 /* RW */
+               unsigned long   gr0_tlb_int6:1;                 /* RW */
+               unsigned long   gr0_tlb_int7:1;                 /* RW */
+               unsigned long   gr0_tlb_int8:1;                 /* RW */
+               unsigned long   gr0_tlb_int9:1;                 /* RW */
+               unsigned long   gr0_tlb_int10:1;                /* RW */
+               unsigned long   gr0_tlb_int11:1;                /* RW */
+               unsigned long   gr0_tlb_int12:1;                /* RW */
+               unsigned long   gr0_tlb_int13:1;                /* RW */
+               unsigned long   gr0_tlb_int14:1;                /* RW */
+               unsigned long   gr0_tlb_int15:1;                /* RW */
+               unsigned long   gr1_tlb_int0:1;                 /* RW */
+               unsigned long   gr1_tlb_int1:1;                 /* RW */
+               unsigned long   gr1_tlb_int2:1;                 /* RW */
+               unsigned long   gr1_tlb_int3:1;                 /* RW */
+               unsigned long   gr1_tlb_int4:1;                 /* RW */
+               unsigned long   gr1_tlb_int5:1;                 /* RW */
+               unsigned long   gr1_tlb_int6:1;                 /* RW */
+               unsigned long   gr1_tlb_int7:1;                 /* RW */
+               unsigned long   gr1_tlb_int8:1;                 /* RW */
+               unsigned long   gr1_tlb_int9:1;                 /* RW */
+               unsigned long   gr1_tlb_int10:1;                /* RW */
+               unsigned long   gr1_tlb_int11:1;                /* RW */
+               unsigned long   gr1_tlb_int12:1;                /* RW */
+               unsigned long   gr1_tlb_int13:1;                /* RW */
+               unsigned long   gr1_tlb_int14:1;                /* RW */
+               unsigned long   gr1_tlb_int15:1;                /* RW */
+               unsigned long   rtc_interval_int:1;             /* RW */
+               unsigned long   bau_dashboard_int:1;            /* RW */
+               unsigned long   rsvd_52_63:12;
        } s3;
-       struct uv4h_gr0_tlb_mmr_read_data_hi_s {
-               unsigned long   pfn:34;                         /* RO */
-               unsigned long   pnid:15;                        /* RO */
-               unsigned long   gaa:2;                          /* RO */
-               unsigned long   dirty:1;                        /* RO */
-               unsigned long   larger:1;                       /* RO */
-               unsigned long   aa_ext:1;                       /* RO */
-               unsigned long   undef_54:1;                     /* Undefined */
-               unsigned long   way_ecc:9;                      /* RO */
-       } s4;
-};
 
-/* ========================================================================= */
-/*                       UVH_GR0_TLB_MMR_READ_DATA_LO                        */
-/* ========================================================================= */
-#define UV2H_GR0_TLB_MMR_READ_DATA_LO 0xc010a8UL
-#define UV3H_GR0_TLB_MMR_READ_DATA_LO 0xc010a8UL
-#define UV4H_GR0_TLB_MMR_READ_DATA_LO 0x6010a8UL
-#define UVH_GR0_TLB_MMR_READ_DATA_LO (                                 \
-       is_uv2_hub() ? UV2H_GR0_TLB_MMR_READ_DATA_LO :                  \
-       is_uv3_hub() ? UV3H_GR0_TLB_MMR_READ_DATA_LO :                  \
-       /*is_uv4_hub*/ UV4H_GR0_TLB_MMR_READ_DATA_LO)
-
-#define UVH_GR0_TLB_MMR_READ_DATA_LO_VPN_SHFT          0
-#define UVH_GR0_TLB_MMR_READ_DATA_LO_ASID_SHFT         39
-#define UVH_GR0_TLB_MMR_READ_DATA_LO_VALID_SHFT                63
-#define UVH_GR0_TLB_MMR_READ_DATA_LO_VPN_MASK          0x0000007fffffffffUL
-#define UVH_GR0_TLB_MMR_READ_DATA_LO_ASID_MASK         0x7fffff8000000000UL
-#define UVH_GR0_TLB_MMR_READ_DATA_LO_VALID_MASK                0x8000000000000000UL
-
-#define UVXH_GR0_TLB_MMR_READ_DATA_LO_VPN_SHFT         0
-#define UVXH_GR0_TLB_MMR_READ_DATA_LO_ASID_SHFT                39
-#define UVXH_GR0_TLB_MMR_READ_DATA_LO_VALID_SHFT       63
-#define UVXH_GR0_TLB_MMR_READ_DATA_LO_VPN_MASK         0x0000007fffffffffUL
-#define UVXH_GR0_TLB_MMR_READ_DATA_LO_ASID_MASK                0x7fffff8000000000UL
-#define UVXH_GR0_TLB_MMR_READ_DATA_LO_VALID_MASK       0x8000000000000000UL
-
-#define UV2H_GR0_TLB_MMR_READ_DATA_LO_VPN_SHFT         0
-#define UV2H_GR0_TLB_MMR_READ_DATA_LO_ASID_SHFT                39
-#define UV2H_GR0_TLB_MMR_READ_DATA_LO_VALID_SHFT       63
-#define UV2H_GR0_TLB_MMR_READ_DATA_LO_VPN_MASK         0x0000007fffffffffUL
-#define UV2H_GR0_TLB_MMR_READ_DATA_LO_ASID_MASK                0x7fffff8000000000UL
-#define UV2H_GR0_TLB_MMR_READ_DATA_LO_VALID_MASK       0x8000000000000000UL
-
-#define UV3H_GR0_TLB_MMR_READ_DATA_LO_VPN_SHFT         0
-#define UV3H_GR0_TLB_MMR_READ_DATA_LO_ASID_SHFT                39
-#define UV3H_GR0_TLB_MMR_READ_DATA_LO_VALID_SHFT       63
-#define UV3H_GR0_TLB_MMR_READ_DATA_LO_VPN_MASK         0x0000007fffffffffUL
-#define UV3H_GR0_TLB_MMR_READ_DATA_LO_ASID_MASK                0x7fffff8000000000UL
-#define UV3H_GR0_TLB_MMR_READ_DATA_LO_VALID_MASK       0x8000000000000000UL
-
-#define UV4H_GR0_TLB_MMR_READ_DATA_LO_VPN_SHFT         0
-#define UV4H_GR0_TLB_MMR_READ_DATA_LO_ASID_SHFT                39
-#define UV4H_GR0_TLB_MMR_READ_DATA_LO_VALID_SHFT       63
-#define UV4H_GR0_TLB_MMR_READ_DATA_LO_VPN_MASK         0x0000007fffffffffUL
-#define UV4H_GR0_TLB_MMR_READ_DATA_LO_ASID_MASK                0x7fffff8000000000UL
-#define UV4H_GR0_TLB_MMR_READ_DATA_LO_VALID_MASK       0x8000000000000000UL
-
-
-union uvh_gr0_tlb_mmr_read_data_lo_u {
-       unsigned long   v;
-       struct uvh_gr0_tlb_mmr_read_data_lo_s {
-               unsigned long   vpn:39;                         /* RO */
-               unsigned long   asid:24;                        /* RO */
-               unsigned long   valid:1;                        /* RO */
-       } s;
-       struct uvxh_gr0_tlb_mmr_read_data_lo_s {
-               unsigned long   vpn:39;                         /* RO */
-               unsigned long   asid:24;                        /* RO */
-               unsigned long   valid:1;                        /* RO */
-       } sx;
-       struct uv2h_gr0_tlb_mmr_read_data_lo_s {
-               unsigned long   vpn:39;                         /* RO */
-               unsigned long   asid:24;                        /* RO */
-               unsigned long   valid:1;                        /* RO */
+       /* UV2 unique struct */
+       struct uv2h_event_occurred1_s {
+               unsigned long   bau_data:1;                     /* RW */
+               unsigned long   power_management_req:1;         /* RW */
+               unsigned long   message_accelerator_int0:1;     /* RW */
+               unsigned long   message_accelerator_int1:1;     /* RW */
+               unsigned long   message_accelerator_int2:1;     /* RW */
+               unsigned long   message_accelerator_int3:1;     /* RW */
+               unsigned long   message_accelerator_int4:1;     /* RW */
+               unsigned long   message_accelerator_int5:1;     /* RW */
+               unsigned long   message_accelerator_int6:1;     /* RW */
+               unsigned long   message_accelerator_int7:1;     /* RW */
+               unsigned long   message_accelerator_int8:1;     /* RW */
+               unsigned long   message_accelerator_int9:1;     /* RW */
+               unsigned long   message_accelerator_int10:1;    /* RW */
+               unsigned long   message_accelerator_int11:1;    /* RW */
+               unsigned long   message_accelerator_int12:1;    /* RW */
+               unsigned long   message_accelerator_int13:1;    /* RW */
+               unsigned long   message_accelerator_int14:1;    /* RW */
+               unsigned long   message_accelerator_int15:1;    /* RW */
+               unsigned long   gr0_tlb_int0:1;                 /* RW */
+               unsigned long   gr0_tlb_int1:1;                 /* RW */
+               unsigned long   gr0_tlb_int2:1;                 /* RW */
+               unsigned long   gr0_tlb_int3:1;                 /* RW */
+               unsigned long   gr0_tlb_int4:1;                 /* RW */
+               unsigned long   gr0_tlb_int5:1;                 /* RW */
+               unsigned long   gr0_tlb_int6:1;                 /* RW */
+               unsigned long   gr0_tlb_int7:1;                 /* RW */
+               unsigned long   gr0_tlb_int8:1;                 /* RW */
+               unsigned long   gr0_tlb_int9:1;                 /* RW */
+               unsigned long   gr0_tlb_int10:1;                /* RW */
+               unsigned long   gr0_tlb_int11:1;                /* RW */
+               unsigned long   gr0_tlb_int12:1;                /* RW */
+               unsigned long   gr0_tlb_int13:1;                /* RW */
+               unsigned long   gr0_tlb_int14:1;                /* RW */
+               unsigned long   gr0_tlb_int15:1;                /* RW */
+               unsigned long   gr1_tlb_int0:1;                 /* RW */
+               unsigned long   gr1_tlb_int1:1;                 /* RW */
+               unsigned long   gr1_tlb_int2:1;                 /* RW */
+               unsigned long   gr1_tlb_int3:1;                 /* RW */
+               unsigned long   gr1_tlb_int4:1;                 /* RW */
+               unsigned long   gr1_tlb_int5:1;                 /* RW */
+               unsigned long   gr1_tlb_int6:1;                 /* RW */
+               unsigned long   gr1_tlb_int7:1;                 /* RW */
+               unsigned long   gr1_tlb_int8:1;                 /* RW */
+               unsigned long   gr1_tlb_int9:1;                 /* RW */
+               unsigned long   gr1_tlb_int10:1;                /* RW */
+               unsigned long   gr1_tlb_int11:1;                /* RW */
+               unsigned long   gr1_tlb_int12:1;                /* RW */
+               unsigned long   gr1_tlb_int13:1;                /* RW */
+               unsigned long   gr1_tlb_int14:1;                /* RW */
+               unsigned long   gr1_tlb_int15:1;                /* RW */
+               unsigned long   rtc_interval_int:1;             /* RW */
+               unsigned long   bau_dashboard_int:1;            /* RW */
+               unsigned long   rsvd_52_63:12;
        } s2;
-       struct uv3h_gr0_tlb_mmr_read_data_lo_s {
-               unsigned long   vpn:39;                         /* RO */
-               unsigned long   asid:24;                        /* RO */
-               unsigned long   valid:1;                        /* RO */
-       } s3;
-       struct uv4h_gr0_tlb_mmr_read_data_lo_s {
-               unsigned long   vpn:39;                         /* RO */
-               unsigned long   asid:24;                        /* RO */
-               unsigned long   valid:1;                        /* RO */
-       } s4;
 };
 
 /* ========================================================================= */
-/*                         UVH_GR1_TLB_INT0_CONFIG                           */
+/*                        UVH_EVENT_OCCURRED1_ALIAS                          */
 /* ========================================================================= */
-#define UV2H_GR1_TLB_INT0_CONFIG 0x61f00UL
-#define UV3H_GR1_TLB_INT0_CONFIG 0x61f00UL
-#define UV4H_GR1_TLB_INT0_CONFIG 0x62100UL
-#define UVH_GR1_TLB_INT0_CONFIG (                                      \
-       is_uv2_hub() ? UV2H_GR1_TLB_INT0_CONFIG :                       \
-       is_uv3_hub() ? UV3H_GR1_TLB_INT0_CONFIG :                       \
-       /*is_uv4_hub*/ UV4H_GR1_TLB_INT0_CONFIG)
-
-#define UVH_GR1_TLB_INT0_CONFIG_VECTOR_SHFT            0
-#define UVH_GR1_TLB_INT0_CONFIG_DM_SHFT                        8
-#define UVH_GR1_TLB_INT0_CONFIG_DESTMODE_SHFT          11
-#define UVH_GR1_TLB_INT0_CONFIG_STATUS_SHFT            12
-#define UVH_GR1_TLB_INT0_CONFIG_P_SHFT                 13
-#define UVH_GR1_TLB_INT0_CONFIG_T_SHFT                 15
-#define UVH_GR1_TLB_INT0_CONFIG_M_SHFT                 16
-#define UVH_GR1_TLB_INT0_CONFIG_APIC_ID_SHFT           32
-#define UVH_GR1_TLB_INT0_CONFIG_VECTOR_MASK            0x00000000000000ffUL
-#define UVH_GR1_TLB_INT0_CONFIG_DM_MASK                        0x0000000000000700UL
-#define UVH_GR1_TLB_INT0_CONFIG_DESTMODE_MASK          0x0000000000000800UL
-#define UVH_GR1_TLB_INT0_CONFIG_STATUS_MASK            0x0000000000001000UL
-#define UVH_GR1_TLB_INT0_CONFIG_P_MASK                 0x0000000000002000UL
-#define UVH_GR1_TLB_INT0_CONFIG_T_MASK                 0x0000000000008000UL
-#define UVH_GR1_TLB_INT0_CONFIG_M_MASK                 0x0000000000010000UL
-#define UVH_GR1_TLB_INT0_CONFIG_APIC_ID_MASK           0xffffffff00000000UL
+#define UVH_EVENT_OCCURRED1_ALIAS 0x70088UL
 
 
-union uvh_gr1_tlb_int0_config_u {
-       unsigned long   v;
-       struct uvh_gr1_tlb_int0_config_s {
-               unsigned long   vector_:8;                      /* RW */
-               unsigned long   dm:3;                           /* RW */
-               unsigned long   destmode:1;                     /* RW */
-               unsigned long   status:1;                       /* RO */
-               unsigned long   p:1;                            /* RO */
-               unsigned long   rsvd_14:1;
-               unsigned long   t:1;                            /* RO */
-               unsigned long   m:1;                            /* RW */
-               unsigned long   rsvd_17_31:15;
-               unsigned long   apic_id:32;                     /* RW */
-       } s;
-};
-
 /* ========================================================================= */
-/*                         UVH_GR1_TLB_INT1_CONFIG                           */
+/*                           UVH_EVENT_OCCURRED2                             */
 /* ========================================================================= */
-#define UV2H_GR1_TLB_INT1_CONFIG 0x61f40UL
-#define UV3H_GR1_TLB_INT1_CONFIG 0x61f40UL
-#define UV4H_GR1_TLB_INT1_CONFIG 0x62140UL
-#define UVH_GR1_TLB_INT1_CONFIG (                                      \
-       is_uv2_hub() ? UV2H_GR1_TLB_INT1_CONFIG :                       \
-       is_uv3_hub() ? UV3H_GR1_TLB_INT1_CONFIG :                       \
-       /*is_uv4_hub*/ UV4H_GR1_TLB_INT1_CONFIG)
-
-#define UVH_GR1_TLB_INT1_CONFIG_VECTOR_SHFT            0
-#define UVH_GR1_TLB_INT1_CONFIG_DM_SHFT                        8
-#define UVH_GR1_TLB_INT1_CONFIG_DESTMODE_SHFT          11
-#define UVH_GR1_TLB_INT1_CONFIG_STATUS_SHFT            12
-#define UVH_GR1_TLB_INT1_CONFIG_P_SHFT                 13
-#define UVH_GR1_TLB_INT1_CONFIG_T_SHFT                 15
-#define UVH_GR1_TLB_INT1_CONFIG_M_SHFT                 16
-#define UVH_GR1_TLB_INT1_CONFIG_APIC_ID_SHFT           32
-#define UVH_GR1_TLB_INT1_CONFIG_VECTOR_MASK            0x00000000000000ffUL
-#define UVH_GR1_TLB_INT1_CONFIG_DM_MASK                        0x0000000000000700UL
-#define UVH_GR1_TLB_INT1_CONFIG_DESTMODE_MASK          0x0000000000000800UL
-#define UVH_GR1_TLB_INT1_CONFIG_STATUS_MASK            0x0000000000001000UL
-#define UVH_GR1_TLB_INT1_CONFIG_P_MASK                 0x0000000000002000UL
-#define UVH_GR1_TLB_INT1_CONFIG_T_MASK                 0x0000000000008000UL
-#define UVH_GR1_TLB_INT1_CONFIG_M_MASK                 0x0000000000010000UL
-#define UVH_GR1_TLB_INT1_CONFIG_APIC_ID_MASK           0xffffffff00000000UL
+#define UVH_EVENT_OCCURRED2 0x70100UL
+
+
+
+/* UVYH common defines */
+#define UVYH_EVENT_OCCURRED2_RTC_INTERVAL_INT_SHFT     0
+#define UVYH_EVENT_OCCURRED2_RTC_INTERVAL_INT_MASK     0x0000000000000001UL
+#define UVYH_EVENT_OCCURRED2_BAU_DASHBOARD_INT_SHFT    1
+#define UVYH_EVENT_OCCURRED2_BAU_DASHBOARD_INT_MASK    0x0000000000000002UL
+#define UVYH_EVENT_OCCURRED2_RTC_0_SHFT                        2
+#define UVYH_EVENT_OCCURRED2_RTC_0_MASK                        0x0000000000000004UL
+#define UVYH_EVENT_OCCURRED2_RTC_1_SHFT                        3
+#define UVYH_EVENT_OCCURRED2_RTC_1_MASK                        0x0000000000000008UL
+#define UVYH_EVENT_OCCURRED2_RTC_2_SHFT                        4
+#define UVYH_EVENT_OCCURRED2_RTC_2_MASK                        0x0000000000000010UL
+#define UVYH_EVENT_OCCURRED2_RTC_3_SHFT                        5
+#define UVYH_EVENT_OCCURRED2_RTC_3_MASK                        0x0000000000000020UL
+#define UVYH_EVENT_OCCURRED2_RTC_4_SHFT                        6
+#define UVYH_EVENT_OCCURRED2_RTC_4_MASK                        0x0000000000000040UL
+#define UVYH_EVENT_OCCURRED2_RTC_5_SHFT                        7
+#define UVYH_EVENT_OCCURRED2_RTC_5_MASK                        0x0000000000000080UL
+#define UVYH_EVENT_OCCURRED2_RTC_6_SHFT                        8
+#define UVYH_EVENT_OCCURRED2_RTC_6_MASK                        0x0000000000000100UL
+#define UVYH_EVENT_OCCURRED2_RTC_7_SHFT                        9
+#define UVYH_EVENT_OCCURRED2_RTC_7_MASK                        0x0000000000000200UL
+#define UVYH_EVENT_OCCURRED2_RTC_8_SHFT                        10
+#define UVYH_EVENT_OCCURRED2_RTC_8_MASK                        0x0000000000000400UL
+#define UVYH_EVENT_OCCURRED2_RTC_9_SHFT                        11
+#define UVYH_EVENT_OCCURRED2_RTC_9_MASK                        0x0000000000000800UL
+#define UVYH_EVENT_OCCURRED2_RTC_10_SHFT               12
+#define UVYH_EVENT_OCCURRED2_RTC_10_MASK               0x0000000000001000UL
+#define UVYH_EVENT_OCCURRED2_RTC_11_SHFT               13
+#define UVYH_EVENT_OCCURRED2_RTC_11_MASK               0x0000000000002000UL
+#define UVYH_EVENT_OCCURRED2_RTC_12_SHFT               14
+#define UVYH_EVENT_OCCURRED2_RTC_12_MASK               0x0000000000004000UL
+#define UVYH_EVENT_OCCURRED2_RTC_13_SHFT               15
+#define UVYH_EVENT_OCCURRED2_RTC_13_MASK               0x0000000000008000UL
+#define UVYH_EVENT_OCCURRED2_RTC_14_SHFT               16
+#define UVYH_EVENT_OCCURRED2_RTC_14_MASK               0x0000000000010000UL
+#define UVYH_EVENT_OCCURRED2_RTC_15_SHFT               17
+#define UVYH_EVENT_OCCURRED2_RTC_15_MASK               0x0000000000020000UL
+#define UVYH_EVENT_OCCURRED2_RTC_16_SHFT               18
+#define UVYH_EVENT_OCCURRED2_RTC_16_MASK               0x0000000000040000UL
+#define UVYH_EVENT_OCCURRED2_RTC_17_SHFT               19
+#define UVYH_EVENT_OCCURRED2_RTC_17_MASK               0x0000000000080000UL
+#define UVYH_EVENT_OCCURRED2_RTC_18_SHFT               20
+#define UVYH_EVENT_OCCURRED2_RTC_18_MASK               0x0000000000100000UL
+#define UVYH_EVENT_OCCURRED2_RTC_19_SHFT               21
+#define UVYH_EVENT_OCCURRED2_RTC_19_MASK               0x0000000000200000UL
+#define UVYH_EVENT_OCCURRED2_RTC_20_SHFT               22
+#define UVYH_EVENT_OCCURRED2_RTC_20_MASK               0x0000000000400000UL
+#define UVYH_EVENT_OCCURRED2_RTC_21_SHFT               23
+#define UVYH_EVENT_OCCURRED2_RTC_21_MASK               0x0000000000800000UL
+#define UVYH_EVENT_OCCURRED2_RTC_22_SHFT               24
+#define UVYH_EVENT_OCCURRED2_RTC_22_MASK               0x0000000001000000UL
+#define UVYH_EVENT_OCCURRED2_RTC_23_SHFT               25
+#define UVYH_EVENT_OCCURRED2_RTC_23_MASK               0x0000000002000000UL
+#define UVYH_EVENT_OCCURRED2_RTC_24_SHFT               26
+#define UVYH_EVENT_OCCURRED2_RTC_24_MASK               0x0000000004000000UL
+#define UVYH_EVENT_OCCURRED2_RTC_25_SHFT               27
+#define UVYH_EVENT_OCCURRED2_RTC_25_MASK               0x0000000008000000UL
+#define UVYH_EVENT_OCCURRED2_RTC_26_SHFT               28
+#define UVYH_EVENT_OCCURRED2_RTC_26_MASK               0x0000000010000000UL
+#define UVYH_EVENT_OCCURRED2_RTC_27_SHFT               29
+#define UVYH_EVENT_OCCURRED2_RTC_27_MASK               0x0000000020000000UL
+#define UVYH_EVENT_OCCURRED2_RTC_28_SHFT               30
+#define UVYH_EVENT_OCCURRED2_RTC_28_MASK               0x0000000040000000UL
+#define UVYH_EVENT_OCCURRED2_RTC_29_SHFT               31
+#define UVYH_EVENT_OCCURRED2_RTC_29_MASK               0x0000000080000000UL
+#define UVYH_EVENT_OCCURRED2_RTC_30_SHFT               32
+#define UVYH_EVENT_OCCURRED2_RTC_30_MASK               0x0000000100000000UL
+#define UVYH_EVENT_OCCURRED2_RTC_31_SHFT               33
+#define UVYH_EVENT_OCCURRED2_RTC_31_MASK               0x0000000200000000UL
+
+/* UV4 unique defines */
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT0_SHFT 0
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT0_MASK 0x0000000000000001UL
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT1_SHFT 1
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT1_MASK 0x0000000000000002UL
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT2_SHFT 2
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT2_MASK 0x0000000000000004UL
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT3_SHFT 3
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT3_MASK 0x0000000000000008UL
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT4_SHFT 4
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT4_MASK 0x0000000000000010UL
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT5_SHFT 5
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT5_MASK 0x0000000000000020UL
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT6_SHFT 6
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT6_MASK 0x0000000000000040UL
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT7_SHFT 7
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT7_MASK 0x0000000000000080UL
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT8_SHFT 8
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT8_MASK 0x0000000000000100UL
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT9_SHFT 9
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT9_MASK 0x0000000000000200UL
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT10_SHFT 10
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT10_MASK 0x0000000000000400UL
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT11_SHFT 11
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT11_MASK 0x0000000000000800UL
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT12_SHFT 12
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT12_MASK 0x0000000000001000UL
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT13_SHFT 13
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT13_MASK 0x0000000000002000UL
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT14_SHFT 14
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT14_MASK 0x0000000000004000UL
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT15_SHFT 15
+#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT15_MASK 0x0000000000008000UL
+#define UV4H_EVENT_OCCURRED2_RTC_INTERVAL_INT_SHFT     16
+#define UV4H_EVENT_OCCURRED2_RTC_INTERVAL_INT_MASK     0x0000000000010000UL
+#define UV4H_EVENT_OCCURRED2_BAU_DASHBOARD_INT_SHFT    17
+#define UV4H_EVENT_OCCURRED2_BAU_DASHBOARD_INT_MASK    0x0000000000020000UL
+#define UV4H_EVENT_OCCURRED2_RTC_0_SHFT                        18
+#define UV4H_EVENT_OCCURRED2_RTC_0_MASK                        0x0000000000040000UL
+#define UV4H_EVENT_OCCURRED2_RTC_1_SHFT                        19
+#define UV4H_EVENT_OCCURRED2_RTC_1_MASK                        0x0000000000080000UL
+#define UV4H_EVENT_OCCURRED2_RTC_2_SHFT                        20
+#define UV4H_EVENT_OCCURRED2_RTC_2_MASK                        0x0000000000100000UL
+#define UV4H_EVENT_OCCURRED2_RTC_3_SHFT                        21
+#define UV4H_EVENT_OCCURRED2_RTC_3_MASK                        0x0000000000200000UL
+#define UV4H_EVENT_OCCURRED2_RTC_4_SHFT                        22
+#define UV4H_EVENT_OCCURRED2_RTC_4_MASK                        0x0000000000400000UL
+#define UV4H_EVENT_OCCURRED2_RTC_5_SHFT                        23
+#define UV4H_EVENT_OCCURRED2_RTC_5_MASK                        0x0000000000800000UL
+#define UV4H_EVENT_OCCURRED2_RTC_6_SHFT                        24
+#define UV4H_EVENT_OCCURRED2_RTC_6_MASK                        0x0000000001000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_7_SHFT                        25
+#define UV4H_EVENT_OCCURRED2_RTC_7_MASK                        0x0000000002000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_8_SHFT                        26
+#define UV4H_EVENT_OCCURRED2_RTC_8_MASK                        0x0000000004000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_9_SHFT                        27
+#define UV4H_EVENT_OCCURRED2_RTC_9_MASK                        0x0000000008000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_10_SHFT               28
+#define UV4H_EVENT_OCCURRED2_RTC_10_MASK               0x0000000010000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_11_SHFT               29
+#define UV4H_EVENT_OCCURRED2_RTC_11_MASK               0x0000000020000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_12_SHFT               30
+#define UV4H_EVENT_OCCURRED2_RTC_12_MASK               0x0000000040000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_13_SHFT               31
+#define UV4H_EVENT_OCCURRED2_RTC_13_MASK               0x0000000080000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_14_SHFT               32
+#define UV4H_EVENT_OCCURRED2_RTC_14_MASK               0x0000000100000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_15_SHFT               33
+#define UV4H_EVENT_OCCURRED2_RTC_15_MASK               0x0000000200000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_16_SHFT               34
+#define UV4H_EVENT_OCCURRED2_RTC_16_MASK               0x0000000400000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_17_SHFT               35
+#define UV4H_EVENT_OCCURRED2_RTC_17_MASK               0x0000000800000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_18_SHFT               36
+#define UV4H_EVENT_OCCURRED2_RTC_18_MASK               0x0000001000000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_19_SHFT               37
+#define UV4H_EVENT_OCCURRED2_RTC_19_MASK               0x0000002000000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_20_SHFT               38
+#define UV4H_EVENT_OCCURRED2_RTC_20_MASK               0x0000004000000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_21_SHFT               39
+#define UV4H_EVENT_OCCURRED2_RTC_21_MASK               0x0000008000000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_22_SHFT               40
+#define UV4H_EVENT_OCCURRED2_RTC_22_MASK               0x0000010000000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_23_SHFT               41
+#define UV4H_EVENT_OCCURRED2_RTC_23_MASK               0x0000020000000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_24_SHFT               42
+#define UV4H_EVENT_OCCURRED2_RTC_24_MASK               0x0000040000000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_25_SHFT               43
+#define UV4H_EVENT_OCCURRED2_RTC_25_MASK               0x0000080000000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_26_SHFT               44
+#define UV4H_EVENT_OCCURRED2_RTC_26_MASK               0x0000100000000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_27_SHFT               45
+#define UV4H_EVENT_OCCURRED2_RTC_27_MASK               0x0000200000000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_28_SHFT               46
+#define UV4H_EVENT_OCCURRED2_RTC_28_MASK               0x0000400000000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_29_SHFT               47
+#define UV4H_EVENT_OCCURRED2_RTC_29_MASK               0x0000800000000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_30_SHFT               48
+#define UV4H_EVENT_OCCURRED2_RTC_30_MASK               0x0001000000000000UL
+#define UV4H_EVENT_OCCURRED2_RTC_31_SHFT               49
+#define UV4H_EVENT_OCCURRED2_RTC_31_MASK               0x0002000000000000UL
+
+/* UV3 unique defines */
+#define UV3H_EVENT_OCCURRED2_RTC_0_SHFT                        0
+#define UV3H_EVENT_OCCURRED2_RTC_0_MASK                        0x0000000000000001UL
+#define UV3H_EVENT_OCCURRED2_RTC_1_SHFT                        1
+#define UV3H_EVENT_OCCURRED2_RTC_1_MASK                        0x0000000000000002UL
+#define UV3H_EVENT_OCCURRED2_RTC_2_SHFT                        2
+#define UV3H_EVENT_OCCURRED2_RTC_2_MASK                        0x0000000000000004UL
+#define UV3H_EVENT_OCCURRED2_RTC_3_SHFT                        3
+#define UV3H_EVENT_OCCURRED2_RTC_3_MASK                        0x0000000000000008UL
+#define UV3H_EVENT_OCCURRED2_RTC_4_SHFT                        4
+#define UV3H_EVENT_OCCURRED2_RTC_4_MASK                        0x0000000000000010UL
+#define UV3H_EVENT_OCCURRED2_RTC_5_SHFT                        5
+#define UV3H_EVENT_OCCURRED2_RTC_5_MASK                        0x0000000000000020UL
+#define UV3H_EVENT_OCCURRED2_RTC_6_SHFT                        6
+#define UV3H_EVENT_OCCURRED2_RTC_6_MASK                        0x0000000000000040UL
+#define UV3H_EVENT_OCCURRED2_RTC_7_SHFT                        7
+#define UV3H_EVENT_OCCURRED2_RTC_7_MASK                        0x0000000000000080UL
+#define UV3H_EVENT_OCCURRED2_RTC_8_SHFT                        8
+#define UV3H_EVENT_OCCURRED2_RTC_8_MASK                        0x0000000000000100UL
+#define UV3H_EVENT_OCCURRED2_RTC_9_SHFT                        9
+#define UV3H_EVENT_OCCURRED2_RTC_9_MASK                        0x0000000000000200UL
+#define UV3H_EVENT_OCCURRED2_RTC_10_SHFT               10
+#define UV3H_EVENT_OCCURRED2_RTC_10_MASK               0x0000000000000400UL
+#define UV3H_EVENT_OCCURRED2_RTC_11_SHFT               11
+#define UV3H_EVENT_OCCURRED2_RTC_11_MASK               0x0000000000000800UL
+#define UV3H_EVENT_OCCURRED2_RTC_12_SHFT               12
+#define UV3H_EVENT_OCCURRED2_RTC_12_MASK               0x0000000000001000UL
+#define UV3H_EVENT_OCCURRED2_RTC_13_SHFT               13
+#define UV3H_EVENT_OCCURRED2_RTC_13_MASK               0x0000000000002000UL
+#define UV3H_EVENT_OCCURRED2_RTC_14_SHFT               14
+#define UV3H_EVENT_OCCURRED2_RTC_14_MASK               0x0000000000004000UL
+#define UV3H_EVENT_OCCURRED2_RTC_15_SHFT               15
+#define UV3H_EVENT_OCCURRED2_RTC_15_MASK               0x0000000000008000UL
+#define UV3H_EVENT_OCCURRED2_RTC_16_SHFT               16
+#define UV3H_EVENT_OCCURRED2_RTC_16_MASK               0x0000000000010000UL
+#define UV3H_EVENT_OCCURRED2_RTC_17_SHFT               17
+#define UV3H_EVENT_OCCURRED2_RTC_17_MASK               0x0000000000020000UL
+#define UV3H_EVENT_OCCURRED2_RTC_18_SHFT               18
+#define UV3H_EVENT_OCCURRED2_RTC_18_MASK               0x0000000000040000UL
+#define UV3H_EVENT_OCCURRED2_RTC_19_SHFT               19
+#define UV3H_EVENT_OCCURRED2_RTC_19_MASK               0x0000000000080000UL
+#define UV3H_EVENT_OCCURRED2_RTC_20_SHFT               20
+#define UV3H_EVENT_OCCURRED2_RTC_20_MASK               0x0000000000100000UL
+#define UV3H_EVENT_OCCURRED2_RTC_21_SHFT               21
+#define UV3H_EVENT_OCCURRED2_RTC_21_MASK               0x0000000000200000UL
+#define UV3H_EVENT_OCCURRED2_RTC_22_SHFT               22
+#define UV3H_EVENT_OCCURRED2_RTC_22_MASK               0x0000000000400000UL
+#define UV3H_EVENT_OCCURRED2_RTC_23_SHFT               23
+#define UV3H_EVENT_OCCURRED2_RTC_23_MASK               0x0000000000800000UL
+#define UV3H_EVENT_OCCURRED2_RTC_24_SHFT               24
+#define UV3H_EVENT_OCCURRED2_RTC_24_MASK               0x0000000001000000UL
+#define UV3H_EVENT_OCCURRED2_RTC_25_SHFT               25
+#define UV3H_EVENT_OCCURRED2_RTC_25_MASK               0x0000000002000000UL
+#define UV3H_EVENT_OCCURRED2_RTC_26_SHFT               26
+#define UV3H_EVENT_OCCURRED2_RTC_26_MASK               0x0000000004000000UL
+#define UV3H_EVENT_OCCURRED2_RTC_27_SHFT               27
+#define UV3H_EVENT_OCCURRED2_RTC_27_MASK               0x0000000008000000UL
+#define UV3H_EVENT_OCCURRED2_RTC_28_SHFT               28
+#define UV3H_EVENT_OCCURRED2_RTC_28_MASK               0x0000000010000000UL
+#define UV3H_EVENT_OCCURRED2_RTC_29_SHFT               29
+#define UV3H_EVENT_OCCURRED2_RTC_29_MASK               0x0000000020000000UL
+#define UV3H_EVENT_OCCURRED2_RTC_30_SHFT               30
+#define UV3H_EVENT_OCCURRED2_RTC_30_MASK               0x0000000040000000UL
+#define UV3H_EVENT_OCCURRED2_RTC_31_SHFT               31
+#define UV3H_EVENT_OCCURRED2_RTC_31_MASK               0x0000000080000000UL
+
+/* UV2 unique defines */
+#define UV2H_EVENT_OCCURRED2_RTC_0_SHFT                        0
+#define UV2H_EVENT_OCCURRED2_RTC_0_MASK                        0x0000000000000001UL
+#define UV2H_EVENT_OCCURRED2_RTC_1_SHFT                        1
+#define UV2H_EVENT_OCCURRED2_RTC_1_MASK                        0x0000000000000002UL
+#define UV2H_EVENT_OCCURRED2_RTC_2_SHFT                        2
+#define UV2H_EVENT_OCCURRED2_RTC_2_MASK                        0x0000000000000004UL
+#define UV2H_EVENT_OCCURRED2_RTC_3_SHFT                        3
+#define UV2H_EVENT_OCCURRED2_RTC_3_MASK                        0x0000000000000008UL
+#define UV2H_EVENT_OCCURRED2_RTC_4_SHFT                        4
+#define UV2H_EVENT_OCCURRED2_RTC_4_MASK                        0x0000000000000010UL
+#define UV2H_EVENT_OCCURRED2_RTC_5_SHFT                        5
+#define UV2H_EVENT_OCCURRED2_RTC_5_MASK                        0x0000000000000020UL
+#define UV2H_EVENT_OCCURRED2_RTC_6_SHFT                        6
+#define UV2H_EVENT_OCCURRED2_RTC_6_MASK                        0x0000000000000040UL
+#define UV2H_EVENT_OCCURRED2_RTC_7_SHFT                        7
+#define UV2H_EVENT_OCCURRED2_RTC_7_MASK                        0x0000000000000080UL
+#define UV2H_EVENT_OCCURRED2_RTC_8_SHFT                        8
+#define UV2H_EVENT_OCCURRED2_RTC_8_MASK                        0x0000000000000100UL
+#define UV2H_EVENT_OCCURRED2_RTC_9_SHFT                        9
+#define UV2H_EVENT_OCCURRED2_RTC_9_MASK                        0x0000000000000200UL
+#define UV2H_EVENT_OCCURRED2_RTC_10_SHFT               10
+#define UV2H_EVENT_OCCURRED2_RTC_10_MASK               0x0000000000000400UL
+#define UV2H_EVENT_OCCURRED2_RTC_11_SHFT               11
+#define UV2H_EVENT_OCCURRED2_RTC_11_MASK               0x0000000000000800UL
+#define UV2H_EVENT_OCCURRED2_RTC_12_SHFT               12
+#define UV2H_EVENT_OCCURRED2_RTC_12_MASK               0x0000000000001000UL
+#define UV2H_EVENT_OCCURRED2_RTC_13_SHFT               13
+#define UV2H_EVENT_OCCURRED2_RTC_13_MASK               0x0000000000002000UL
+#define UV2H_EVENT_OCCURRED2_RTC_14_SHFT               14
+#define UV2H_EVENT_OCCURRED2_RTC_14_MASK               0x0000000000004000UL
+#define UV2H_EVENT_OCCURRED2_RTC_15_SHFT               15
+#define UV2H_EVENT_OCCURRED2_RTC_15_MASK               0x0000000000008000UL
+#define UV2H_EVENT_OCCURRED2_RTC_16_SHFT               16
+#define UV2H_EVENT_OCCURRED2_RTC_16_MASK               0x0000000000010000UL
+#define UV2H_EVENT_OCCURRED2_RTC_17_SHFT               17
+#define UV2H_EVENT_OCCURRED2_RTC_17_MASK               0x0000000000020000UL
+#define UV2H_EVENT_OCCURRED2_RTC_18_SHFT               18
+#define UV2H_EVENT_OCCURRED2_RTC_18_MASK               0x0000000000040000UL
+#define UV2H_EVENT_OCCURRED2_RTC_19_SHFT               19
+#define UV2H_EVENT_OCCURRED2_RTC_19_MASK               0x0000000000080000UL
+#define UV2H_EVENT_OCCURRED2_RTC_20_SHFT               20
+#define UV2H_EVENT_OCCURRED2_RTC_20_MASK               0x0000000000100000UL
+#define UV2H_EVENT_OCCURRED2_RTC_21_SHFT               21
+#define UV2H_EVENT_OCCURRED2_RTC_21_MASK               0x0000000000200000UL
+#define UV2H_EVENT_OCCURRED2_RTC_22_SHFT               22
+#define UV2H_EVENT_OCCURRED2_RTC_22_MASK               0x0000000000400000UL
+#define UV2H_EVENT_OCCURRED2_RTC_23_SHFT               23
+#define UV2H_EVENT_OCCURRED2_RTC_23_MASK               0x0000000000800000UL
+#define UV2H_EVENT_OCCURRED2_RTC_24_SHFT               24
+#define UV2H_EVENT_OCCURRED2_RTC_24_MASK               0x0000000001000000UL
+#define UV2H_EVENT_OCCURRED2_RTC_25_SHFT               25
+#define UV2H_EVENT_OCCURRED2_RTC_25_MASK               0x0000000002000000UL
+#define UV2H_EVENT_OCCURRED2_RTC_26_SHFT               26
+#define UV2H_EVENT_OCCURRED2_RTC_26_MASK               0x0000000004000000UL
+#define UV2H_EVENT_OCCURRED2_RTC_27_SHFT               27
+#define UV2H_EVENT_OCCURRED2_RTC_27_MASK               0x0000000008000000UL
+#define UV2H_EVENT_OCCURRED2_RTC_28_SHFT               28
+#define UV2H_EVENT_OCCURRED2_RTC_28_MASK               0x0000000010000000UL
+#define UV2H_EVENT_OCCURRED2_RTC_29_SHFT               29
+#define UV2H_EVENT_OCCURRED2_RTC_29_MASK               0x0000000020000000UL
+#define UV2H_EVENT_OCCURRED2_RTC_30_SHFT               30
+#define UV2H_EVENT_OCCURRED2_RTC_30_MASK               0x0000000040000000UL
+#define UV2H_EVENT_OCCURRED2_RTC_31_SHFT               31
+#define UV2H_EVENT_OCCURRED2_RTC_31_MASK               0x0000000080000000UL
+
+#define UVH_EVENT_OCCURRED2_RTC_1_MASK (                               \
+       is_uv(UV5) ? 0x0000000000000008UL :                             \
+       is_uv(UV4) ? 0x0000000000080000UL :                             \
+       is_uv(UV3) ? 0x0000000000000002UL :                             \
+       is_uv(UV2) ? 0x0000000000000002UL :                             \
+       0)
+#define UVH_EVENT_OCCURRED2_RTC_1_SHFT (                               \
+       is_uv(UV5) ? 3 :                                                \
+       is_uv(UV4) ? 19 :                                               \
+       is_uv(UV3) ? 1 :                                                \
+       is_uv(UV2) ? 1 :                                                \
+       -1)
+
+union uvyh_event_occurred2_u {
+       unsigned long   v;
+
+       /* UVYH common struct */
+       struct uvyh_event_occurred2_s {
+               unsigned long   rtc_interval_int:1;             /* RW */
+               unsigned long   bau_dashboard_int:1;            /* RW */
+               unsigned long   rtc_0:1;                        /* RW */
+               unsigned long   rtc_1:1;                        /* RW */
+               unsigned long   rtc_2:1;                        /* RW */
+               unsigned long   rtc_3:1;                        /* RW */
+               unsigned long   rtc_4:1;                        /* RW */
+               unsigned long   rtc_5:1;                        /* RW */
+               unsigned long   rtc_6:1;                        /* RW */
+               unsigned long   rtc_7:1;                        /* RW */
+               unsigned long   rtc_8:1;                        /* RW */
+               unsigned long   rtc_9:1;                        /* RW */
+               unsigned long   rtc_10:1;                       /* RW */
+               unsigned long   rtc_11:1;                       /* RW */
+               unsigned long   rtc_12:1;                       /* RW */
+               unsigned long   rtc_13:1;                       /* RW */
+               unsigned long   rtc_14:1;                       /* RW */
+               unsigned long   rtc_15:1;                       /* RW */
+               unsigned long   rtc_16:1;                       /* RW */
+               unsigned long   rtc_17:1;                       /* RW */
+               unsigned long   rtc_18:1;                       /* RW */
+               unsigned long   rtc_19:1;                       /* RW */
+               unsigned long   rtc_20:1;                       /* RW */
+               unsigned long   rtc_21:1;                       /* RW */
+               unsigned long   rtc_22:1;                       /* RW */
+               unsigned long   rtc_23:1;                       /* RW */
+               unsigned long   rtc_24:1;                       /* RW */
+               unsigned long   rtc_25:1;                       /* RW */
+               unsigned long   rtc_26:1;                       /* RW */
+               unsigned long   rtc_27:1;                       /* RW */
+               unsigned long   rtc_28:1;                       /* RW */
+               unsigned long   rtc_29:1;                       /* RW */
+               unsigned long   rtc_30:1;                       /* RW */
+               unsigned long   rtc_31:1;                       /* RW */
+               unsigned long   rsvd_34_63:30;
+       } sy;
+
+       /* UV5 unique struct */
+       struct uv5h_event_occurred2_s {
+               unsigned long   rtc_interval_int:1;             /* RW */
+               unsigned long   bau_dashboard_int:1;            /* RW */
+               unsigned long   rtc_0:1;                        /* RW */
+               unsigned long   rtc_1:1;                        /* RW */
+               unsigned long   rtc_2:1;                        /* RW */
+               unsigned long   rtc_3:1;                        /* RW */
+               unsigned long   rtc_4:1;                        /* RW */
+               unsigned long   rtc_5:1;                        /* RW */
+               unsigned long   rtc_6:1;                        /* RW */
+               unsigned long   rtc_7:1;                        /* RW */
+               unsigned long   rtc_8:1;                        /* RW */
+               unsigned long   rtc_9:1;                        /* RW */
+               unsigned long   rtc_10:1;                       /* RW */
+               unsigned long   rtc_11:1;                       /* RW */
+               unsigned long   rtc_12:1;                       /* RW */
+               unsigned long   rtc_13:1;                       /* RW */
+               unsigned long   rtc_14:1;                       /* RW */
+               unsigned long   rtc_15:1;                       /* RW */
+               unsigned long   rtc_16:1;                       /* RW */
+               unsigned long   rtc_17:1;                       /* RW */
+               unsigned long   rtc_18:1;                       /* RW */
+               unsigned long   rtc_19:1;                       /* RW */
+               unsigned long   rtc_20:1;                       /* RW */
+               unsigned long   rtc_21:1;                       /* RW */
+               unsigned long   rtc_22:1;                       /* RW */
+               unsigned long   rtc_23:1;                       /* RW */
+               unsigned long   rtc_24:1;                       /* RW */
+               unsigned long   rtc_25:1;                       /* RW */
+               unsigned long   rtc_26:1;                       /* RW */
+               unsigned long   rtc_27:1;                       /* RW */
+               unsigned long   rtc_28:1;                       /* RW */
+               unsigned long   rtc_29:1;                       /* RW */
+               unsigned long   rtc_30:1;                       /* RW */
+               unsigned long   rtc_31:1;                       /* RW */
+               unsigned long   rsvd_34_63:30;
+       } s5;
+
+       /* UV4 unique struct */
+       struct uv4h_event_occurred2_s {
+               unsigned long   message_accelerator_int0:1;     /* RW */
+               unsigned long   message_accelerator_int1:1;     /* RW */
+               unsigned long   message_accelerator_int2:1;     /* RW */
+               unsigned long   message_accelerator_int3:1;     /* RW */
+               unsigned long   message_accelerator_int4:1;     /* RW */
+               unsigned long   message_accelerator_int5:1;     /* RW */
+               unsigned long   message_accelerator_int6:1;     /* RW */
+               unsigned long   message_accelerator_int7:1;     /* RW */
+               unsigned long   message_accelerator_int8:1;     /* RW */
+               unsigned long   message_accelerator_int9:1;     /* RW */
+               unsigned long   message_accelerator_int10:1;    /* RW */
+               unsigned long   message_accelerator_int11:1;    /* RW */
+               unsigned long   message_accelerator_int12:1;    /* RW */
+               unsigned long   message_accelerator_int13:1;    /* RW */
+               unsigned long   message_accelerator_int14:1;    /* RW */
+               unsigned long   message_accelerator_int15:1;    /* RW */
+               unsigned long   rtc_interval_int:1;             /* RW */
+               unsigned long   bau_dashboard_int:1;            /* RW */
+               unsigned long   rtc_0:1;                        /* RW */
+               unsigned long   rtc_1:1;                        /* RW */
+               unsigned long   rtc_2:1;                        /* RW */
+               unsigned long   rtc_3:1;                        /* RW */
+               unsigned long   rtc_4:1;                        /* RW */
+               unsigned long   rtc_5:1;                        /* RW */
+               unsigned long   rtc_6:1;                        /* RW */
+               unsigned long   rtc_7:1;                        /* RW */
+               unsigned long   rtc_8:1;                        /* RW */
+               unsigned long   rtc_9:1;                        /* RW */
+               unsigned long   rtc_10:1;                       /* RW */
+               unsigned long   rtc_11:1;                       /* RW */
+               unsigned long   rtc_12:1;                       /* RW */
+               unsigned long   rtc_13:1;                       /* RW */
+               unsigned long   rtc_14:1;                       /* RW */
+               unsigned long   rtc_15:1;                       /* RW */
+               unsigned long   rtc_16:1;                       /* RW */
+               unsigned long   rtc_17:1;                       /* RW */
+               unsigned long   rtc_18:1;                       /* RW */
+               unsigned long   rtc_19:1;                       /* RW */
+               unsigned long   rtc_20:1;                       /* RW */
+               unsigned long   rtc_21:1;                       /* RW */
+               unsigned long   rtc_22:1;                       /* RW */
+               unsigned long   rtc_23:1;                       /* RW */
+               unsigned long   rtc_24:1;                       /* RW */
+               unsigned long   rtc_25:1;                       /* RW */
+               unsigned long   rtc_26:1;                       /* RW */
+               unsigned long   rtc_27:1;                       /* RW */
+               unsigned long   rtc_28:1;                       /* RW */
+               unsigned long   rtc_29:1;                       /* RW */
+               unsigned long   rtc_30:1;                       /* RW */
+               unsigned long   rtc_31:1;                       /* RW */
+               unsigned long   rsvd_50_63:14;
+       } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_event_occurred2_s {
+               unsigned long   rtc_0:1;                        /* RW */
+               unsigned long   rtc_1:1;                        /* RW */
+               unsigned long   rtc_2:1;                        /* RW */
+               unsigned long   rtc_3:1;                        /* RW */
+               unsigned long   rtc_4:1;                        /* RW */
+               unsigned long   rtc_5:1;                        /* RW */
+               unsigned long   rtc_6:1;                        /* RW */
+               unsigned long   rtc_7:1;                        /* RW */
+               unsigned long   rtc_8:1;                        /* RW */
+               unsigned long   rtc_9:1;                        /* RW */
+               unsigned long   rtc_10:1;                       /* RW */
+               unsigned long   rtc_11:1;                       /* RW */
+               unsigned long   rtc_12:1;                       /* RW */
+               unsigned long   rtc_13:1;                       /* RW */
+               unsigned long   rtc_14:1;                       /* RW */
+               unsigned long   rtc_15:1;                       /* RW */
+               unsigned long   rtc_16:1;                       /* RW */
+               unsigned long   rtc_17:1;                       /* RW */
+               unsigned long   rtc_18:1;                       /* RW */
+               unsigned long   rtc_19:1;                       /* RW */
+               unsigned long   rtc_20:1;                       /* RW */
+               unsigned long   rtc_21:1;                       /* RW */
+               unsigned long   rtc_22:1;                       /* RW */
+               unsigned long   rtc_23:1;                       /* RW */
+               unsigned long   rtc_24:1;                       /* RW */
+               unsigned long   rtc_25:1;                       /* RW */
+               unsigned long   rtc_26:1;                       /* RW */
+               unsigned long   rtc_27:1;                       /* RW */
+               unsigned long   rtc_28:1;                       /* RW */
+               unsigned long   rtc_29:1;                       /* RW */
+               unsigned long   rtc_30:1;                       /* RW */
+               unsigned long   rtc_31:1;                       /* RW */
+               unsigned long   rsvd_32_63:32;
+       } s3;
+
+       /* UV2 unique struct */
+       struct uv2h_event_occurred2_s {
+               unsigned long   rtc_0:1;                        /* RW */
+               unsigned long   rtc_1:1;                        /* RW */
+               unsigned long   rtc_2:1;                        /* RW */
+               unsigned long   rtc_3:1;                        /* RW */
+               unsigned long   rtc_4:1;                        /* RW */
+               unsigned long   rtc_5:1;                        /* RW */
+               unsigned long   rtc_6:1;                        /* RW */
+               unsigned long   rtc_7:1;                        /* RW */
+               unsigned long   rtc_8:1;                        /* RW */
+               unsigned long   rtc_9:1;                        /* RW */
+               unsigned long   rtc_10:1;                       /* RW */
+               unsigned long   rtc_11:1;                       /* RW */
+               unsigned long   rtc_12:1;                       /* RW */
+               unsigned long   rtc_13:1;                       /* RW */
+               unsigned long   rtc_14:1;                       /* RW */
+               unsigned long   rtc_15:1;                       /* RW */
+               unsigned long   rtc_16:1;                       /* RW */
+               unsigned long   rtc_17:1;                       /* RW */
+               unsigned long   rtc_18:1;                       /* RW */
+               unsigned long   rtc_19:1;                       /* RW */
+               unsigned long   rtc_20:1;                       /* RW */
+               unsigned long   rtc_21:1;                       /* RW */
+               unsigned long   rtc_22:1;                       /* RW */
+               unsigned long   rtc_23:1;                       /* RW */
+               unsigned long   rtc_24:1;                       /* RW */
+               unsigned long   rtc_25:1;                       /* RW */
+               unsigned long   rtc_26:1;                       /* RW */
+               unsigned long   rtc_27:1;                       /* RW */
+               unsigned long   rtc_28:1;                       /* RW */
+               unsigned long   rtc_29:1;                       /* RW */
+               unsigned long   rtc_30:1;                       /* RW */
+               unsigned long   rtc_31:1;                       /* RW */
+               unsigned long   rsvd_32_63:32;
+       } s2;
+};
+
+/* ========================================================================= */
+/*                        UVH_EVENT_OCCURRED2_ALIAS                          */
+/* ========================================================================= */
+#define UVH_EVENT_OCCURRED2_ALIAS 0x70108UL
+
+
+/* ========================================================================= */
+/*                         UVH_EXTIO_INT0_BROADCAST                          */
+/* ========================================================================= */
+#define UVH_EXTIO_INT0_BROADCAST 0x61448UL
+
+/* UVH common defines*/
+#define UVH_EXTIO_INT0_BROADCAST_ENABLE_SHFT           0
+#define UVH_EXTIO_INT0_BROADCAST_ENABLE_MASK           0x0000000000000001UL
+
+
+union uvh_extio_int0_broadcast_u {
+       unsigned long   v;
+
+       /* UVH common struct */
+       struct uvh_extio_int0_broadcast_s {
+               unsigned long   enable:1;                       /* RW */
+               unsigned long   rsvd_1_63:63;
+       } s;
+
+       /* UV5 unique struct */
+       struct uv5h_extio_int0_broadcast_s {
+               unsigned long   enable:1;                       /* RW */
+               unsigned long   rsvd_1_63:63;
+       } s5;
+
+       /* UV4 unique struct */
+       struct uv4h_extio_int0_broadcast_s {
+               unsigned long   enable:1;                       /* RW */
+               unsigned long   rsvd_1_63:63;
+       } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_extio_int0_broadcast_s {
+               unsigned long   enable:1;                       /* RW */
+               unsigned long   rsvd_1_63:63;
+       } s3;
+
+       /* UV2 unique struct */
+       struct uv2h_extio_int0_broadcast_s {
+               unsigned long   enable:1;                       /* RW */
+               unsigned long   rsvd_1_63:63;
+       } s2;
+};
+
+/* ========================================================================= */
+/*                          UVH_GR0_GAM_GR_CONFIG                            */
+/* ========================================================================= */
+#define UVH_GR0_GAM_GR_CONFIG (                                                \
+       is_uv(UV5) ? 0x600028UL :                                       \
+       is_uv(UV4) ? 0x600028UL :                                       \
+       is_uv(UV3) ? 0xc00028UL :                                       \
+       is_uv(UV2) ? 0xc00028UL :                                       \
+       0)
+
+
+
+/* UVYH common defines */
+#define UVYH_GR0_GAM_GR_CONFIG_SUBSPACE_SHFT           10
+#define UVYH_GR0_GAM_GR_CONFIG_SUBSPACE_MASK           0x0000000000000400UL
+
+/* UV4 unique defines */
+#define UV4H_GR0_GAM_GR_CONFIG_SUBSPACE_SHFT           10
+#define UV4H_GR0_GAM_GR_CONFIG_SUBSPACE_MASK           0x0000000000000400UL
+
+/* UV3 unique defines */
+#define UV3H_GR0_GAM_GR_CONFIG_M_SKT_SHFT              0
+#define UV3H_GR0_GAM_GR_CONFIG_M_SKT_MASK              0x000000000000003fUL
+#define UV3H_GR0_GAM_GR_CONFIG_SUBSPACE_SHFT           10
+#define UV3H_GR0_GAM_GR_CONFIG_SUBSPACE_MASK           0x0000000000000400UL
+
+/* UV2 unique defines */
+#define UV2H_GR0_GAM_GR_CONFIG_N_GR_SHFT               0
+#define UV2H_GR0_GAM_GR_CONFIG_N_GR_MASK               0x000000000000000fUL
+
+
+union uvyh_gr0_gam_gr_config_u {
+       unsigned long   v;
 
+       /* UVYH common struct */
+       struct uvyh_gr0_gam_gr_config_s {
+               unsigned long   rsvd_0_9:10;
+               unsigned long   subspace:1;                     /* RW */
+               unsigned long   rsvd_11_63:53;
+       } sy;
+
+       /* UV5 unique struct */
+       struct uv5h_gr0_gam_gr_config_s {
+               unsigned long   rsvd_0_9:10;
+               unsigned long   subspace:1;                     /* RW */
+               unsigned long   rsvd_11_63:53;
+       } s5;
+
+       /* UV4 unique struct */
+       struct uv4h_gr0_gam_gr_config_s {
+               unsigned long   rsvd_0_9:10;
+               unsigned long   subspace:1;                     /* RW */
+               unsigned long   rsvd_11_63:53;
+       } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_gr0_gam_gr_config_s {
+               unsigned long   m_skt:6;                        /* RW */
+               unsigned long   undef_6_9:4;                    /* Undefined */
+               unsigned long   subspace:1;                     /* RW */
+               unsigned long   reserved:53;
+       } s3;
+
+       /* UV2 unique struct */
+       struct uv2h_gr0_gam_gr_config_s {
+               unsigned long   n_gr:4;                         /* RW */
+               unsigned long   reserved:60;
+       } s2;
+};
+
+/* ========================================================================= */
+/*                         UVH_GR0_TLB_INT0_CONFIG                           */
+/* ========================================================================= */
+#define UVH_GR0_TLB_INT0_CONFIG (                                      \
+       is_uv(UV4) ? 0x61b00UL :                                        \
+       is_uv(UV3) ? 0x61b00UL :                                        \
+       is_uv(UV2) ? 0x61b00UL :                                        \
+       uv_undefined("UVH_GR0_TLB_INT0_CONFIG"))
+
+
+/* UVXH common defines */
+#define UVXH_GR0_TLB_INT0_CONFIG_VECTOR_SHFT           0
+#define UVXH_GR0_TLB_INT0_CONFIG_VECTOR_MASK           0x00000000000000ffUL
+#define UVXH_GR0_TLB_INT0_CONFIG_DM_SHFT               8
+#define UVXH_GR0_TLB_INT0_CONFIG_DM_MASK               0x0000000000000700UL
+#define UVXH_GR0_TLB_INT0_CONFIG_DESTMODE_SHFT         11
+#define UVXH_GR0_TLB_INT0_CONFIG_DESTMODE_MASK         0x0000000000000800UL
+#define UVXH_GR0_TLB_INT0_CONFIG_STATUS_SHFT           12
+#define UVXH_GR0_TLB_INT0_CONFIG_STATUS_MASK           0x0000000000001000UL
+#define UVXH_GR0_TLB_INT0_CONFIG_P_SHFT                        13
+#define UVXH_GR0_TLB_INT0_CONFIG_P_MASK                        0x0000000000002000UL
+#define UVXH_GR0_TLB_INT0_CONFIG_T_SHFT                        15
+#define UVXH_GR0_TLB_INT0_CONFIG_T_MASK                        0x0000000000008000UL
+#define UVXH_GR0_TLB_INT0_CONFIG_M_SHFT                        16
+#define UVXH_GR0_TLB_INT0_CONFIG_M_MASK                        0x0000000000010000UL
+#define UVXH_GR0_TLB_INT0_CONFIG_APIC_ID_SHFT          32
+#define UVXH_GR0_TLB_INT0_CONFIG_APIC_ID_MASK          0xffffffff00000000UL
+
+
+union uvh_gr0_tlb_int0_config_u {
+       unsigned long   v;
+
+       /* UVH common struct */
+       struct uvh_gr0_tlb_int0_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } s;
+
+       /* UVXH common struct */
+       struct uvxh_gr0_tlb_int0_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } sx;
+
+       /* UV4 unique struct */
+       struct uv4h_gr0_tlb_int0_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_gr0_tlb_int0_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } s3;
+
+       /* UV2 unique struct */
+       struct uv2h_gr0_tlb_int0_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } s2;
+};
+
+/* ========================================================================= */
+/*                         UVH_GR0_TLB_INT1_CONFIG                           */
+/* ========================================================================= */
+#define UVH_GR0_TLB_INT1_CONFIG (                                      \
+       is_uv(UV4) ? 0x61b40UL :                                        \
+       is_uv(UV3) ? 0x61b40UL :                                        \
+       is_uv(UV2) ? 0x61b40UL :                                        \
+       uv_undefined("UVH_GR0_TLB_INT1_CONFIG"))
+
+
+/* UVXH common defines */
+#define UVXH_GR0_TLB_INT1_CONFIG_VECTOR_SHFT           0
+#define UVXH_GR0_TLB_INT1_CONFIG_VECTOR_MASK           0x00000000000000ffUL
+#define UVXH_GR0_TLB_INT1_CONFIG_DM_SHFT               8
+#define UVXH_GR0_TLB_INT1_CONFIG_DM_MASK               0x0000000000000700UL
+#define UVXH_GR0_TLB_INT1_CONFIG_DESTMODE_SHFT         11
+#define UVXH_GR0_TLB_INT1_CONFIG_DESTMODE_MASK         0x0000000000000800UL
+#define UVXH_GR0_TLB_INT1_CONFIG_STATUS_SHFT           12
+#define UVXH_GR0_TLB_INT1_CONFIG_STATUS_MASK           0x0000000000001000UL
+#define UVXH_GR0_TLB_INT1_CONFIG_P_SHFT                        13
+#define UVXH_GR0_TLB_INT1_CONFIG_P_MASK                        0x0000000000002000UL
+#define UVXH_GR0_TLB_INT1_CONFIG_T_SHFT                        15
+#define UVXH_GR0_TLB_INT1_CONFIG_T_MASK                        0x0000000000008000UL
+#define UVXH_GR0_TLB_INT1_CONFIG_M_SHFT                        16
+#define UVXH_GR0_TLB_INT1_CONFIG_M_MASK                        0x0000000000010000UL
+#define UVXH_GR0_TLB_INT1_CONFIG_APIC_ID_SHFT          32
+#define UVXH_GR0_TLB_INT1_CONFIG_APIC_ID_MASK          0xffffffff00000000UL
+
+
+union uvh_gr0_tlb_int1_config_u {
+       unsigned long   v;
+
+       /* UVH common struct */
+       struct uvh_gr0_tlb_int1_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } s;
+
+       /* UVXH common struct */
+       struct uvxh_gr0_tlb_int1_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } sx;
+
+       /* UV4 unique struct */
+       struct uv4h_gr0_tlb_int1_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } s4;
 
-union uvh_gr1_tlb_int1_config_u {
-       unsigned long   v;
-       struct uvh_gr1_tlb_int1_config_s {
+       /* UV3 unique struct */
+       struct uv3h_gr0_tlb_int1_config_s {
                unsigned long   vector_:8;                      /* RW */
                unsigned long   dm:3;                           /* RW */
                unsigned long   destmode:1;                     /* RW */
@@ -1113,1326 +2432,403 @@ union uvh_gr1_tlb_int1_config_u {
                unsigned long   m:1;                            /* RW */
                unsigned long   rsvd_17_31:15;
                unsigned long   apic_id:32;                     /* RW */
-       } s;
-};
-
-/* ========================================================================= */
-/*                         UVH_GR1_TLB_MMR_CONTROL                           */
-/* ========================================================================= */
-#define UV2H_GR1_TLB_MMR_CONTROL 0x1001080UL
-#define UV3H_GR1_TLB_MMR_CONTROL 0x1001080UL
-#define UV4H_GR1_TLB_MMR_CONTROL 0x701080UL
-#define UVH_GR1_TLB_MMR_CONTROL (                                      \
-       is_uv2_hub() ? UV2H_GR1_TLB_MMR_CONTROL :                       \
-       is_uv3_hub() ? UV3H_GR1_TLB_MMR_CONTROL :                       \
-       /*is_uv4_hub*/ UV4H_GR1_TLB_MMR_CONTROL)
-
-#define UVH_GR1_TLB_MMR_CONTROL_INDEX_SHFT             0
-#define UVH_GR1_TLB_MMR_CONTROL_AUTO_VALID_EN_SHFT     16
-#define UVH_GR1_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_SHFT 20
-#define UVH_GR1_TLB_MMR_CONTROL_MMR_WRITE_SHFT         30
-#define UVH_GR1_TLB_MMR_CONTROL_MMR_READ_SHFT          31
-#define UVH_GR1_TLB_MMR_CONTROL_AUTO_VALID_EN_MASK     0x0000000000010000UL
-#define UVH_GR1_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_MASK 0x0000000000100000UL
-#define UVH_GR1_TLB_MMR_CONTROL_MMR_WRITE_MASK         0x0000000040000000UL
-#define UVH_GR1_TLB_MMR_CONTROL_MMR_READ_MASK          0x0000000080000000UL
-
-#define UVXH_GR1_TLB_MMR_CONTROL_INDEX_SHFT            0
-#define UVXH_GR1_TLB_MMR_CONTROL_AUTO_VALID_EN_SHFT    16
-#define UVXH_GR1_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_SHFT        20
-#define UVXH_GR1_TLB_MMR_CONTROL_MMR_WRITE_SHFT                30
-#define UVXH_GR1_TLB_MMR_CONTROL_MMR_READ_SHFT         31
-#define UVXH_GR1_TLB_MMR_CONTROL_MMR_OP_DONE_SHFT      32
-#define UVXH_GR1_TLB_MMR_CONTROL_AUTO_VALID_EN_MASK    0x0000000000010000UL
-#define UVXH_GR1_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_MASK        0x0000000000100000UL
-#define UVXH_GR1_TLB_MMR_CONTROL_MMR_WRITE_MASK                0x0000000040000000UL
-#define UVXH_GR1_TLB_MMR_CONTROL_MMR_READ_MASK         0x0000000080000000UL
-#define UVXH_GR1_TLB_MMR_CONTROL_MMR_OP_DONE_MASK      0x0000000100000000UL
-
-#define UV2H_GR1_TLB_MMR_CONTROL_INDEX_SHFT            0
-#define UV2H_GR1_TLB_MMR_CONTROL_MEM_SEL_SHFT          12
-#define UV2H_GR1_TLB_MMR_CONTROL_AUTO_VALID_EN_SHFT    16
-#define UV2H_GR1_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_SHFT        20
-#define UV2H_GR1_TLB_MMR_CONTROL_MMR_WRITE_SHFT                30
-#define UV2H_GR1_TLB_MMR_CONTROL_MMR_READ_SHFT         31
-#define UV2H_GR1_TLB_MMR_CONTROL_MMR_OP_DONE_SHFT      32
-#define UV2H_GR1_TLB_MMR_CONTROL_MMR_INJ_CON_SHFT      48
-#define UV2H_GR1_TLB_MMR_CONTROL_MMR_INJ_TLBRAM_SHFT   52
-#define UV2H_GR1_TLB_MMR_CONTROL_INDEX_MASK            0x0000000000000fffUL
-#define UV2H_GR1_TLB_MMR_CONTROL_MEM_SEL_MASK          0x0000000000003000UL
-#define UV2H_GR1_TLB_MMR_CONTROL_AUTO_VALID_EN_MASK    0x0000000000010000UL
-#define UV2H_GR1_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_MASK        0x0000000000100000UL
-#define UV2H_GR1_TLB_MMR_CONTROL_MMR_WRITE_MASK                0x0000000040000000UL
-#define UV2H_GR1_TLB_MMR_CONTROL_MMR_READ_MASK         0x0000000080000000UL
-#define UV2H_GR1_TLB_MMR_CONTROL_MMR_OP_DONE_MASK      0x0000000100000000UL
-#define UV2H_GR1_TLB_MMR_CONTROL_MMR_INJ_CON_MASK      0x0001000000000000UL
-#define UV2H_GR1_TLB_MMR_CONTROL_MMR_INJ_TLBRAM_MASK   0x0010000000000000UL
-
-#define UV3H_GR1_TLB_MMR_CONTROL_INDEX_SHFT            0
-#define UV3H_GR1_TLB_MMR_CONTROL_MEM_SEL_SHFT          12
-#define UV3H_GR1_TLB_MMR_CONTROL_AUTO_VALID_EN_SHFT    16
-#define UV3H_GR1_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_SHFT        20
-#define UV3H_GR1_TLB_MMR_CONTROL_ECC_SEL_SHFT          21
-#define UV3H_GR1_TLB_MMR_CONTROL_MMR_WRITE_SHFT                30
-#define UV3H_GR1_TLB_MMR_CONTROL_MMR_READ_SHFT         31
-#define UV3H_GR1_TLB_MMR_CONTROL_MMR_OP_DONE_SHFT      32
-#define UV3H_GR1_TLB_MMR_CONTROL_INDEX_MASK            0x0000000000000fffUL
-#define UV3H_GR1_TLB_MMR_CONTROL_MEM_SEL_MASK          0x0000000000003000UL
-#define UV3H_GR1_TLB_MMR_CONTROL_AUTO_VALID_EN_MASK    0x0000000000010000UL
-#define UV3H_GR1_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_MASK        0x0000000000100000UL
-#define UV3H_GR1_TLB_MMR_CONTROL_ECC_SEL_MASK          0x0000000000200000UL
-#define UV3H_GR1_TLB_MMR_CONTROL_MMR_WRITE_MASK                0x0000000040000000UL
-#define UV3H_GR1_TLB_MMR_CONTROL_MMR_READ_MASK         0x0000000080000000UL
-#define UV3H_GR1_TLB_MMR_CONTROL_MMR_OP_DONE_MASK      0x0000000100000000UL
-
-#define UV4H_GR1_TLB_MMR_CONTROL_INDEX_SHFT            0
-#define UV4H_GR1_TLB_MMR_CONTROL_MEM_SEL_SHFT          13
-#define UV4H_GR1_TLB_MMR_CONTROL_AUTO_VALID_EN_SHFT    16
-#define UV4H_GR1_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_SHFT        20
-#define UV4H_GR1_TLB_MMR_CONTROL_ECC_SEL_SHFT          21
-#define UV4H_GR1_TLB_MMR_CONTROL_MMR_WRITE_SHFT                30
-#define UV4H_GR1_TLB_MMR_CONTROL_MMR_READ_SHFT         31
-#define UV4H_GR1_TLB_MMR_CONTROL_MMR_OP_DONE_SHFT      32
-#define UV4H_GR1_TLB_MMR_CONTROL_PAGE_SIZE_SHFT                59
-#define UV4H_GR1_TLB_MMR_CONTROL_INDEX_MASK            0x0000000000001fffUL
-#define UV4H_GR1_TLB_MMR_CONTROL_MEM_SEL_MASK          0x0000000000006000UL
-#define UV4H_GR1_TLB_MMR_CONTROL_AUTO_VALID_EN_MASK    0x0000000000010000UL
-#define UV4H_GR1_TLB_MMR_CONTROL_MMR_HASH_INDEX_EN_MASK        0x0000000000100000UL
-#define UV4H_GR1_TLB_MMR_CONTROL_ECC_SEL_MASK          0x0000000000200000UL
-#define UV4H_GR1_TLB_MMR_CONTROL_MMR_WRITE_MASK                0x0000000040000000UL
-#define UV4H_GR1_TLB_MMR_CONTROL_MMR_READ_MASK         0x0000000080000000UL
-#define UV4H_GR1_TLB_MMR_CONTROL_MMR_OP_DONE_MASK      0x0000000100000000UL
-#define UV4H_GR1_TLB_MMR_CONTROL_PAGE_SIZE_MASK                0xf800000000000000UL
-
-
-union uvh_gr1_tlb_mmr_control_u {
-       unsigned long   v;
-       struct uvh_gr1_tlb_mmr_control_s {
-               unsigned long   rsvd_0_15:16;
-               unsigned long   auto_valid_en:1;                /* RW */
-               unsigned long   rsvd_17_19:3;
-               unsigned long   mmr_hash_index_en:1;            /* RW */
-               unsigned long   rsvd_21_29:9;
-               unsigned long   mmr_write:1;                    /* WP */
-               unsigned long   mmr_read:1;                     /* WP */
-               unsigned long   rsvd_32_48:17;
-               unsigned long   rsvd_49_51:3;
-               unsigned long   rsvd_52_63:12;
-       } s;
-       struct uvxh_gr1_tlb_mmr_control_s {
-               unsigned long   rsvd_0_15:16;
-               unsigned long   auto_valid_en:1;                /* RW */
-               unsigned long   rsvd_17_19:3;
-               unsigned long   mmr_hash_index_en:1;            /* RW */
-               unsigned long   rsvd_21_29:9;
-               unsigned long   mmr_write:1;                    /* WP */
-               unsigned long   mmr_read:1;                     /* WP */
-               unsigned long   mmr_op_done:1;                  /* RW */
-               unsigned long   rsvd_33_47:15;
-               unsigned long   rsvd_48:1;
-               unsigned long   rsvd_49_51:3;
-               unsigned long   rsvd_52_63:12;
-       } sx;
-       struct uv2h_gr1_tlb_mmr_control_s {
-               unsigned long   index:12;                       /* RW */
-               unsigned long   mem_sel:2;                      /* RW */
-               unsigned long   rsvd_14_15:2;
-               unsigned long   auto_valid_en:1;                /* RW */
-               unsigned long   rsvd_17_19:3;
-               unsigned long   mmr_hash_index_en:1;            /* RW */
-               unsigned long   rsvd_21_29:9;
-               unsigned long   mmr_write:1;                    /* WP */
-               unsigned long   mmr_read:1;                     /* WP */
-               unsigned long   mmr_op_done:1;                  /* RW */
-               unsigned long   rsvd_33_47:15;
-               unsigned long   mmr_inj_con:1;                  /* RW */
-               unsigned long   rsvd_49_51:3;
-               unsigned long   mmr_inj_tlbram:1;               /* RW */
-               unsigned long   rsvd_53_63:11;
-       } s2;
-       struct uv3h_gr1_tlb_mmr_control_s {
-               unsigned long   index:12;                       /* RW */
-               unsigned long   mem_sel:2;                      /* RW */
-               unsigned long   rsvd_14_15:2;
-               unsigned long   auto_valid_en:1;                /* RW */
-               unsigned long   rsvd_17_19:3;
-               unsigned long   mmr_hash_index_en:1;            /* RW */
-               unsigned long   ecc_sel:1;                      /* RW */
-               unsigned long   rsvd_22_29:8;
-               unsigned long   mmr_write:1;                    /* WP */
-               unsigned long   mmr_read:1;                     /* WP */
-               unsigned long   mmr_op_done:1;                  /* RW */
-               unsigned long   rsvd_33_47:15;
-               unsigned long   undef_48:1;                     /* Undefined */
-               unsigned long   rsvd_49_51:3;
-               unsigned long   undef_52:1;                     /* Undefined */
-               unsigned long   rsvd_53_63:11;
-       } s3;
-       struct uv4h_gr1_tlb_mmr_control_s {
-               unsigned long   index:13;                       /* RW */
-               unsigned long   mem_sel:2;                      /* RW */
-               unsigned long   rsvd_15:1;
-               unsigned long   auto_valid_en:1;                /* RW */
-               unsigned long   rsvd_17_19:3;
-               unsigned long   mmr_hash_index_en:1;            /* RW */
-               unsigned long   ecc_sel:1;                      /* RW */
-               unsigned long   rsvd_22_29:8;
-               unsigned long   mmr_write:1;                    /* WP */
-               unsigned long   mmr_read:1;                     /* WP */
-               unsigned long   mmr_op_done:1;                  /* RW */
-               unsigned long   rsvd_33_47:15;
-               unsigned long   undef_48:1;                     /* Undefined */
-               unsigned long   rsvd_49_51:3;
-               unsigned long   rsvd_52_58:7;
-               unsigned long   page_size:5;                    /* RW */
-       } s4;
-};
-
-/* ========================================================================= */
-/*                       UVH_GR1_TLB_MMR_READ_DATA_HI                        */
-/* ========================================================================= */
-#define UV2H_GR1_TLB_MMR_READ_DATA_HI 0x10010a0UL
-#define UV3H_GR1_TLB_MMR_READ_DATA_HI 0x10010a0UL
-#define UV4H_GR1_TLB_MMR_READ_DATA_HI 0x7010a0UL
-#define UVH_GR1_TLB_MMR_READ_DATA_HI (                                 \
-       is_uv2_hub() ? UV2H_GR1_TLB_MMR_READ_DATA_HI :                  \
-       is_uv3_hub() ? UV3H_GR1_TLB_MMR_READ_DATA_HI :                  \
-       /*is_uv4_hub*/ UV4H_GR1_TLB_MMR_READ_DATA_HI)
-
-#define UVH_GR1_TLB_MMR_READ_DATA_HI_PFN_SHFT          0
-
-#define UVXH_GR1_TLB_MMR_READ_DATA_HI_PFN_SHFT         0
-
-#define UV2H_GR1_TLB_MMR_READ_DATA_HI_PFN_SHFT         0
-#define UV2H_GR1_TLB_MMR_READ_DATA_HI_GAA_SHFT         41
-#define UV2H_GR1_TLB_MMR_READ_DATA_HI_DIRTY_SHFT       43
-#define UV2H_GR1_TLB_MMR_READ_DATA_HI_LARGER_SHFT      44
-#define UV2H_GR1_TLB_MMR_READ_DATA_HI_PFN_MASK         0x000001ffffffffffUL
-#define UV2H_GR1_TLB_MMR_READ_DATA_HI_GAA_MASK         0x0000060000000000UL
-#define UV2H_GR1_TLB_MMR_READ_DATA_HI_DIRTY_MASK       0x0000080000000000UL
-#define UV2H_GR1_TLB_MMR_READ_DATA_HI_LARGER_MASK      0x0000100000000000UL
-
-#define UV3H_GR1_TLB_MMR_READ_DATA_HI_PFN_SHFT         0
-#define UV3H_GR1_TLB_MMR_READ_DATA_HI_GAA_SHFT         41
-#define UV3H_GR1_TLB_MMR_READ_DATA_HI_DIRTY_SHFT       43
-#define UV3H_GR1_TLB_MMR_READ_DATA_HI_LARGER_SHFT      44
-#define UV3H_GR1_TLB_MMR_READ_DATA_HI_AA_EXT_SHFT      45
-#define UV3H_GR1_TLB_MMR_READ_DATA_HI_WAY_ECC_SHFT     55
-#define UV3H_GR1_TLB_MMR_READ_DATA_HI_PFN_MASK         0x000001ffffffffffUL
-#define UV3H_GR1_TLB_MMR_READ_DATA_HI_GAA_MASK         0x0000060000000000UL
-#define UV3H_GR1_TLB_MMR_READ_DATA_HI_DIRTY_MASK       0x0000080000000000UL
-#define UV3H_GR1_TLB_MMR_READ_DATA_HI_LARGER_MASK      0x0000100000000000UL
-#define UV3H_GR1_TLB_MMR_READ_DATA_HI_AA_EXT_MASK      0x0000200000000000UL
-#define UV3H_GR1_TLB_MMR_READ_DATA_HI_WAY_ECC_MASK     0xff80000000000000UL
-
-#define UV4H_GR1_TLB_MMR_READ_DATA_HI_PFN_SHFT         0
-#define UV4H_GR1_TLB_MMR_READ_DATA_HI_PNID_SHFT                34
-#define UV4H_GR1_TLB_MMR_READ_DATA_HI_GAA_SHFT         49
-#define UV4H_GR1_TLB_MMR_READ_DATA_HI_DIRTY_SHFT       51
-#define UV4H_GR1_TLB_MMR_READ_DATA_HI_LARGER_SHFT      52
-#define UV4H_GR1_TLB_MMR_READ_DATA_HI_AA_EXT_SHFT      53
-#define UV4H_GR1_TLB_MMR_READ_DATA_HI_WAY_ECC_SHFT     55
-#define UV4H_GR1_TLB_MMR_READ_DATA_HI_PFN_MASK         0x00000003ffffffffUL
-#define UV4H_GR1_TLB_MMR_READ_DATA_HI_PNID_MASK                0x0001fffc00000000UL
-#define UV4H_GR1_TLB_MMR_READ_DATA_HI_GAA_MASK         0x0006000000000000UL
-#define UV4H_GR1_TLB_MMR_READ_DATA_HI_DIRTY_MASK       0x0008000000000000UL
-#define UV4H_GR1_TLB_MMR_READ_DATA_HI_LARGER_MASK      0x0010000000000000UL
-#define UV4H_GR1_TLB_MMR_READ_DATA_HI_AA_EXT_MASK      0x0020000000000000UL
-#define UV4H_GR1_TLB_MMR_READ_DATA_HI_WAY_ECC_MASK     0xff80000000000000UL
-
-
-union uvh_gr1_tlb_mmr_read_data_hi_u {
-       unsigned long   v;
-       struct uv2h_gr1_tlb_mmr_read_data_hi_s {
-               unsigned long   pfn:41;                         /* RO */
-               unsigned long   gaa:2;                          /* RO */
-               unsigned long   dirty:1;                        /* RO */
-               unsigned long   larger:1;                       /* RO */
-               unsigned long   rsvd_45_63:19;
-       } s2;
-       struct uv3h_gr1_tlb_mmr_read_data_hi_s {
-               unsigned long   pfn:41;                         /* RO */
-               unsigned long   gaa:2;                          /* RO */
-               unsigned long   dirty:1;                        /* RO */
-               unsigned long   larger:1;                       /* RO */
-               unsigned long   aa_ext:1;                       /* RO */
-               unsigned long   undef_46_54:9;                  /* Undefined */
-               unsigned long   way_ecc:9;                      /* RO */
        } s3;
-       struct uv4h_gr1_tlb_mmr_read_data_hi_s {
-               unsigned long   pfn:34;                         /* RO */
-               unsigned long   pnid:15;                        /* RO */
-               unsigned long   gaa:2;                          /* RO */
-               unsigned long   dirty:1;                        /* RO */
-               unsigned long   larger:1;                       /* RO */
-               unsigned long   aa_ext:1;                       /* RO */
-               unsigned long   undef_54:1;                     /* Undefined */
-               unsigned long   way_ecc:9;                      /* RO */
-       } s4;
-};
 
-/* ========================================================================= */
-/*                       UVH_GR1_TLB_MMR_READ_DATA_LO                        */
-/* ========================================================================= */
-#define UV2H_GR1_TLB_MMR_READ_DATA_LO 0x10010a8UL
-#define UV3H_GR1_TLB_MMR_READ_DATA_LO 0x10010a8UL
-#define UV4H_GR1_TLB_MMR_READ_DATA_LO 0x7010a8UL
-#define UVH_GR1_TLB_MMR_READ_DATA_LO (                                 \
-       is_uv2_hub() ? UV2H_GR1_TLB_MMR_READ_DATA_LO :                  \
-       is_uv3_hub() ? UV3H_GR1_TLB_MMR_READ_DATA_LO :                  \
-       /*is_uv4_hub*/ UV4H_GR1_TLB_MMR_READ_DATA_LO)
-
-#define UVH_GR1_TLB_MMR_READ_DATA_LO_VPN_SHFT          0
-#define UVH_GR1_TLB_MMR_READ_DATA_LO_ASID_SHFT         39
-#define UVH_GR1_TLB_MMR_READ_DATA_LO_VALID_SHFT                63
-#define UVH_GR1_TLB_MMR_READ_DATA_LO_VPN_MASK          0x0000007fffffffffUL
-#define UVH_GR1_TLB_MMR_READ_DATA_LO_ASID_MASK         0x7fffff8000000000UL
-#define UVH_GR1_TLB_MMR_READ_DATA_LO_VALID_MASK                0x8000000000000000UL
-
-#define UVXH_GR1_TLB_MMR_READ_DATA_LO_VPN_SHFT         0
-#define UVXH_GR1_TLB_MMR_READ_DATA_LO_ASID_SHFT                39
-#define UVXH_GR1_TLB_MMR_READ_DATA_LO_VALID_SHFT       63
-#define UVXH_GR1_TLB_MMR_READ_DATA_LO_VPN_MASK         0x0000007fffffffffUL
-#define UVXH_GR1_TLB_MMR_READ_DATA_LO_ASID_MASK                0x7fffff8000000000UL
-#define UVXH_GR1_TLB_MMR_READ_DATA_LO_VALID_MASK       0x8000000000000000UL
-
-#define UV2H_GR1_TLB_MMR_READ_DATA_LO_VPN_SHFT         0
-#define UV2H_GR1_TLB_MMR_READ_DATA_LO_ASID_SHFT                39
-#define UV2H_GR1_TLB_MMR_READ_DATA_LO_VALID_SHFT       63
-#define UV2H_GR1_TLB_MMR_READ_DATA_LO_VPN_MASK         0x0000007fffffffffUL
-#define UV2H_GR1_TLB_MMR_READ_DATA_LO_ASID_MASK                0x7fffff8000000000UL
-#define UV2H_GR1_TLB_MMR_READ_DATA_LO_VALID_MASK       0x8000000000000000UL
-
-#define UV3H_GR1_TLB_MMR_READ_DATA_LO_VPN_SHFT         0
-#define UV3H_GR1_TLB_MMR_READ_DATA_LO_ASID_SHFT                39
-#define UV3H_GR1_TLB_MMR_READ_DATA_LO_VALID_SHFT       63
-#define UV3H_GR1_TLB_MMR_READ_DATA_LO_VPN_MASK         0x0000007fffffffffUL
-#define UV3H_GR1_TLB_MMR_READ_DATA_LO_ASID_MASK                0x7fffff8000000000UL
-#define UV3H_GR1_TLB_MMR_READ_DATA_LO_VALID_MASK       0x8000000000000000UL
-
-#define UV4H_GR1_TLB_MMR_READ_DATA_LO_VPN_SHFT         0
-#define UV4H_GR1_TLB_MMR_READ_DATA_LO_ASID_SHFT                39
-#define UV4H_GR1_TLB_MMR_READ_DATA_LO_VALID_SHFT       63
-#define UV4H_GR1_TLB_MMR_READ_DATA_LO_VPN_MASK         0x0000007fffffffffUL
-#define UV4H_GR1_TLB_MMR_READ_DATA_LO_ASID_MASK                0x7fffff8000000000UL
-#define UV4H_GR1_TLB_MMR_READ_DATA_LO_VALID_MASK       0x8000000000000000UL
-
-
-union uvh_gr1_tlb_mmr_read_data_lo_u {
-       unsigned long   v;
-       struct uvh_gr1_tlb_mmr_read_data_lo_s {
-               unsigned long   vpn:39;                         /* RO */
-               unsigned long   asid:24;                        /* RO */
-               unsigned long   valid:1;                        /* RO */
-       } s;
-       struct uvxh_gr1_tlb_mmr_read_data_lo_s {
-               unsigned long   vpn:39;                         /* RO */
-               unsigned long   asid:24;                        /* RO */
-               unsigned long   valid:1;                        /* RO */
-       } sx;
-       struct uv2h_gr1_tlb_mmr_read_data_lo_s {
-               unsigned long   vpn:39;                         /* RO */
-               unsigned long   asid:24;                        /* RO */
-               unsigned long   valid:1;                        /* RO */
+       /* UV2 unique struct */
+       struct uv2h_gr0_tlb_int1_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
        } s2;
-       struct uv3h_gr1_tlb_mmr_read_data_lo_s {
-               unsigned long   vpn:39;                         /* RO */
-               unsigned long   asid:24;                        /* RO */
-               unsigned long   valid:1;                        /* RO */
-       } s3;
-       struct uv4h_gr1_tlb_mmr_read_data_lo_s {
-               unsigned long   vpn:39;                         /* RO */
-               unsigned long   asid:24;                        /* RO */
-               unsigned long   valid:1;                        /* RO */
-       } s4;
 };
 
 /* ========================================================================= */
-/*                               UVH_INT_CMPB                                */
+/*                         UVH_GR1_TLB_INT0_CONFIG                           */
 /* ========================================================================= */
-#define UVH_INT_CMPB 0x22080UL
-
-#define UVH_INT_CMPB_REAL_TIME_CMPB_SHFT               0
-#define UVH_INT_CMPB_REAL_TIME_CMPB_MASK               0x00ffffffffffffffUL
+#define UVH_GR1_TLB_INT0_CONFIG (                                      \
+       is_uv(UV4) ? 0x62100UL :                                        \
+       is_uv(UV3) ? 0x61f00UL :                                        \
+       is_uv(UV2) ? 0x61f00UL :                                        \
+       uv_undefined("UVH_GR1_TLB_INT0_CONFIG"))
+
+
+/* UVXH common defines */
+#define UVXH_GR1_TLB_INT0_CONFIG_VECTOR_SHFT           0
+#define UVXH_GR1_TLB_INT0_CONFIG_VECTOR_MASK           0x00000000000000ffUL
+#define UVXH_GR1_TLB_INT0_CONFIG_DM_SHFT               8
+#define UVXH_GR1_TLB_INT0_CONFIG_DM_MASK               0x0000000000000700UL
+#define UVXH_GR1_TLB_INT0_CONFIG_DESTMODE_SHFT         11
+#define UVXH_GR1_TLB_INT0_CONFIG_DESTMODE_MASK         0x0000000000000800UL
+#define UVXH_GR1_TLB_INT0_CONFIG_STATUS_SHFT           12
+#define UVXH_GR1_TLB_INT0_CONFIG_STATUS_MASK           0x0000000000001000UL
+#define UVXH_GR1_TLB_INT0_CONFIG_P_SHFT                        13
+#define UVXH_GR1_TLB_INT0_CONFIG_P_MASK                        0x0000000000002000UL
+#define UVXH_GR1_TLB_INT0_CONFIG_T_SHFT                        15
+#define UVXH_GR1_TLB_INT0_CONFIG_T_MASK                        0x0000000000008000UL
+#define UVXH_GR1_TLB_INT0_CONFIG_M_SHFT                        16
+#define UVXH_GR1_TLB_INT0_CONFIG_M_MASK                        0x0000000000010000UL
+#define UVXH_GR1_TLB_INT0_CONFIG_APIC_ID_SHFT          32
+#define UVXH_GR1_TLB_INT0_CONFIG_APIC_ID_MASK          0xffffffff00000000UL
 
 
-union uvh_int_cmpb_u {
+union uvh_gr1_tlb_int0_config_u {
        unsigned long   v;
-       struct uvh_int_cmpb_s {
-               unsigned long   real_time_cmpb:56;              /* RW */
-               unsigned long   rsvd_56_63:8;
-       } s;
-};
-
-/* ========================================================================= */
-/*                               UVH_INT_CMPC                                */
-/* ========================================================================= */
-#define UVH_INT_CMPC 0x22100UL
-
-
-#define UVXH_INT_CMPC_REAL_TIME_CMP_2_SHFT             0
-#define UVXH_INT_CMPC_REAL_TIME_CMP_2_MASK             0x00ffffffffffffffUL
-
 
-union uvh_int_cmpc_u {
-       unsigned long   v;
-       struct uvh_int_cmpc_s {
-               unsigned long   real_time_cmpc:56;              /* RW */
-               unsigned long   rsvd_56_63:8;
+       /* UVH common struct */
+       struct uvh_gr1_tlb_int0_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
        } s;
-};
-
-/* ========================================================================= */
-/*                               UVH_INT_CMPD                                */
-/* ========================================================================= */
-#define UVH_INT_CMPD 0x22180UL
 
+       /* UVXH common struct */
+       struct uvxh_gr1_tlb_int0_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } sx;
 
-#define UVXH_INT_CMPD_REAL_TIME_CMP_3_SHFT             0
-#define UVXH_INT_CMPD_REAL_TIME_CMP_3_MASK             0x00ffffffffffffffUL
+       /* UV4 unique struct */
+       struct uv4h_gr1_tlb_int0_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } s4;
 
+       /* UV3 unique struct */
+       struct uv3h_gr1_tlb_int0_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } s3;
 
-union uvh_int_cmpd_u {
-       unsigned long   v;
-       struct uvh_int_cmpd_s {
-               unsigned long   real_time_cmpd:56;              /* RW */
-               unsigned long   rsvd_56_63:8;
-       } s;
+       /* UV2 unique struct */
+       struct uv2h_gr1_tlb_int0_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } s2;
 };
 
 /* ========================================================================= */
-/*                               UVH_IPI_INT                                 */
+/*                         UVH_GR1_TLB_INT1_CONFIG                           */
 /* ========================================================================= */
-#define UVH_IPI_INT 0x60500UL
-
-#define UV2H_IPI_INT_32 0x348
-#define UV3H_IPI_INT_32 0x348
-#define UV4H_IPI_INT_32 0x268
-#define UVH_IPI_INT_32 (                                               \
-       is_uv2_hub() ? UV2H_IPI_INT_32 :                                \
-       is_uv3_hub() ? UV3H_IPI_INT_32 :                                \
-       /*is_uv4_hub*/ UV4H_IPI_INT_32)
-
-#define UVH_IPI_INT_VECTOR_SHFT                                0
-#define UVH_IPI_INT_DELIVERY_MODE_SHFT                 8
-#define UVH_IPI_INT_DESTMODE_SHFT                      11
-#define UVH_IPI_INT_APIC_ID_SHFT                       16
-#define UVH_IPI_INT_SEND_SHFT                          63
-#define UVH_IPI_INT_VECTOR_MASK                                0x00000000000000ffUL
-#define UVH_IPI_INT_DELIVERY_MODE_MASK                 0x0000000000000700UL
-#define UVH_IPI_INT_DESTMODE_MASK                      0x0000000000000800UL
-#define UVH_IPI_INT_APIC_ID_MASK                       0x0000ffffffff0000UL
-#define UVH_IPI_INT_SEND_MASK                          0x8000000000000000UL
+#define UVH_GR1_TLB_INT1_CONFIG (                                      \
+       is_uv(UV4) ? 0x62140UL :                                        \
+       is_uv(UV3) ? 0x61f40UL :                                        \
+       is_uv(UV2) ? 0x61f40UL :                                        \
+       uv_undefined("UVH_GR1_TLB_INT1_CONFIG"))
+
+
+/* UVXH common defines */
+#define UVXH_GR1_TLB_INT1_CONFIG_VECTOR_SHFT           0
+#define UVXH_GR1_TLB_INT1_CONFIG_VECTOR_MASK           0x00000000000000ffUL
+#define UVXH_GR1_TLB_INT1_CONFIG_DM_SHFT               8
+#define UVXH_GR1_TLB_INT1_CONFIG_DM_MASK               0x0000000000000700UL
+#define UVXH_GR1_TLB_INT1_CONFIG_DESTMODE_SHFT         11
+#define UVXH_GR1_TLB_INT1_CONFIG_DESTMODE_MASK         0x0000000000000800UL
+#define UVXH_GR1_TLB_INT1_CONFIG_STATUS_SHFT           12
+#define UVXH_GR1_TLB_INT1_CONFIG_STATUS_MASK           0x0000000000001000UL
+#define UVXH_GR1_TLB_INT1_CONFIG_P_SHFT                        13
+#define UVXH_GR1_TLB_INT1_CONFIG_P_MASK                        0x0000000000002000UL
+#define UVXH_GR1_TLB_INT1_CONFIG_T_SHFT                        15
+#define UVXH_GR1_TLB_INT1_CONFIG_T_MASK                        0x0000000000008000UL
+#define UVXH_GR1_TLB_INT1_CONFIG_M_SHFT                        16
+#define UVXH_GR1_TLB_INT1_CONFIG_M_MASK                        0x0000000000010000UL
+#define UVXH_GR1_TLB_INT1_CONFIG_APIC_ID_SHFT          32
+#define UVXH_GR1_TLB_INT1_CONFIG_APIC_ID_MASK          0xffffffff00000000UL
 
 
-union uvh_ipi_int_u {
+union uvh_gr1_tlb_int1_config_u {
        unsigned long   v;
-       struct uvh_ipi_int_s {
+
+       /* UVH common struct */
+       struct uvh_gr1_tlb_int1_config_s {
                unsigned long   vector_:8;                      /* RW */
-               unsigned long   delivery_mode:3;                /* RW */
+               unsigned long   dm:3;                           /* RW */
                unsigned long   destmode:1;                     /* RW */
-               unsigned long   rsvd_12_15:4;
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
                unsigned long   apic_id:32;                     /* RW */
-               unsigned long   rsvd_48_62:15;
-               unsigned long   send:1;                         /* WP */
        } s;
-};
-
-/* ========================================================================= */
-/*                   UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST                     */
-/* ========================================================================= */
-#define UV2H_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST 0x320050UL
-#define UV3H_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST 0x320050UL
-#define UV4H_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST uv_undefined("UV4H_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST")
-#define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST (                          \
-       is_uv2_hub() ? UV2H_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST :           \
-       is_uv3_hub() ? UV3H_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST :           \
-       /*is_uv4_hub*/ UV4H_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST)
-#define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_32 0x9c0
 
+       /* UVXH common struct */
+       struct uvxh_gr1_tlb_int1_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } sx;
 
-#define UV2H_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_ADDRESS_SHFT 4
-#define UV2H_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_NODE_ID_SHFT 49
-#define UV2H_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_ADDRESS_MASK 0x000007fffffffff0UL
-#define UV2H_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_NODE_ID_MASK 0x7ffe000000000000UL
-
-#define UV3H_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_ADDRESS_SHFT 4
-#define UV3H_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_NODE_ID_SHFT 49
-#define UV3H_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_ADDRESS_MASK 0x000007fffffffff0UL
-#define UV3H_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_NODE_ID_MASK 0x7ffe000000000000UL
+       /* UV4 unique struct */
+       struct uv4h_gr1_tlb_int1_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } s4;
 
+       /* UV3 unique struct */
+       struct uv3h_gr1_tlb_int1_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } s3;
 
-union uvh_lb_bau_intd_payload_queue_first_u {
-       unsigned long   v;
-       struct uv2h_lb_bau_intd_payload_queue_first_s {
-               unsigned long   rsvd_0_3:4;
-               unsigned long   address:39;                     /* RW */
-               unsigned long   rsvd_43_48:6;
-               unsigned long   node_id:14;                     /* RW */
-               unsigned long   rsvd_63:1;
+       /* UV2 unique struct */
+       struct uv2h_gr1_tlb_int1_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
        } s2;
-       struct uv3h_lb_bau_intd_payload_queue_first_s {
-               unsigned long   rsvd_0_3:4;
-               unsigned long   address:39;                     /* RW */
-               unsigned long   rsvd_43_48:6;
-               unsigned long   node_id:14;                     /* RW */
-               unsigned long   rsvd_63:1;
-       } s3;
 };
 
 /* ========================================================================= */
-/*                    UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST                     */
+/*                               UVH_INT_CMPB                                */
 /* ========================================================================= */
-#define UV2H_LB_BAU_INTD_PAYLOAD_QUEUE_LAST 0x320060UL
-#define UV3H_LB_BAU_INTD_PAYLOAD_QUEUE_LAST 0x320060UL
-#define UV4H_LB_BAU_INTD_PAYLOAD_QUEUE_LAST uv_undefined("UV4H_LB_BAU_INTD_PAYLOAD_QUEUE_LAST")
-#define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST (                           \
-       is_uv2_hub() ? UV2H_LB_BAU_INTD_PAYLOAD_QUEUE_LAST :            \
-       is_uv3_hub() ? UV3H_LB_BAU_INTD_PAYLOAD_QUEUE_LAST :            \
-       /*is_uv4_hub*/ UV4H_LB_BAU_INTD_PAYLOAD_QUEUE_LAST)
-#define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST_32 0x9c8
-
-
-#define UV2H_LB_BAU_INTD_PAYLOAD_QUEUE_LAST_ADDRESS_SHFT 4
-#define UV2H_LB_BAU_INTD_PAYLOAD_QUEUE_LAST_ADDRESS_MASK 0x000007fffffffff0UL
+#define UVH_INT_CMPB 0x22080UL
 
-#define UV3H_LB_BAU_INTD_PAYLOAD_QUEUE_LAST_ADDRESS_SHFT 4
-#define UV3H_LB_BAU_INTD_PAYLOAD_QUEUE_LAST_ADDRESS_MASK 0x000007fffffffff0UL
+/* UVH common defines*/
+#define UVH_INT_CMPB_REAL_TIME_CMPB_SHFT               0
+#define UVH_INT_CMPB_REAL_TIME_CMPB_MASK               0x00ffffffffffffffUL
 
 
-union uvh_lb_bau_intd_payload_queue_last_u {
+union uvh_int_cmpb_u {
        unsigned long   v;
-       struct uv2h_lb_bau_intd_payload_queue_last_s {
-               unsigned long   rsvd_0_3:4;
-               unsigned long   address:39;                     /* RW */
-               unsigned long   rsvd_43_63:21;
-       } s2;
-       struct uv3h_lb_bau_intd_payload_queue_last_s {
-               unsigned long   rsvd_0_3:4;
-               unsigned long   address:39;                     /* RW */
-               unsigned long   rsvd_43_63:21;
-       } s3;
-};
-
-/* ========================================================================= */
-/*                    UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL                     */
-/* ========================================================================= */
-#define UV2H_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL 0x320070UL
-#define UV3H_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL 0x320070UL
-#define UV4H_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL uv_undefined("UV4H_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL")
-#define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL (                           \
-       is_uv2_hub() ? UV2H_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL :            \
-       is_uv3_hub() ? UV3H_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL :            \
-       /*is_uv4_hub*/ UV4H_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL)
-#define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL_32 0x9d0
-
 
-#define UV2H_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL_ADDRESS_SHFT 4
-#define UV2H_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL_ADDRESS_MASK 0x000007fffffffff0UL
-
-#define UV3H_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL_ADDRESS_SHFT 4
-#define UV3H_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL_ADDRESS_MASK 0x000007fffffffff0UL
+       /* UVH common struct */
+       struct uvh_int_cmpb_s {
+               unsigned long   real_time_cmpb:56;              /* RW */
+               unsigned long   rsvd_56_63:8;
+       } s;
 
+       /* UV5 unique struct */
+       struct uv5h_int_cmpb_s {
+               unsigned long   real_time_cmpb:56;              /* RW */
+               unsigned long   rsvd_56_63:8;
+       } s5;
 
-union uvh_lb_bau_intd_payload_queue_tail_u {
-       unsigned long   v;
-       struct uv2h_lb_bau_intd_payload_queue_tail_s {
-               unsigned long   rsvd_0_3:4;
-               unsigned long   address:39;                     /* RW */
-               unsigned long   rsvd_43_63:21;
-       } s2;
-       struct uv3h_lb_bau_intd_payload_queue_tail_s {
-               unsigned long   rsvd_0_3:4;
-               unsigned long   address:39;                     /* RW */
-               unsigned long   rsvd_43_63:21;
-       } s3;
-};
+       /* UV4 unique struct */
+       struct uv4h_int_cmpb_s {
+               unsigned long   real_time_cmpb:56;              /* RW */
+               unsigned long   rsvd_56_63:8;
+       } s4;
 
-/* ========================================================================= */
-/*                   UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE                    */
-/* ========================================================================= */
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE 0x320080UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE 0x320080UL
-#define UV4H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE uv_undefined("UV4H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE")
-#define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE (                         \
-       is_uv2_hub() ? UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE :          \
-       is_uv3_hub() ? UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE :          \
-       /*is_uv4_hub*/ UV4H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE)
-#define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_32 0xa68
-
-
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_0_SHFT 0
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_1_SHFT 1
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_2_SHFT 2
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_3_SHFT 3
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_4_SHFT 4
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_5_SHFT 5
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_6_SHFT 6
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_7_SHFT 7
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_0_SHFT 8
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_1_SHFT 9
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_2_SHFT 10
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_3_SHFT 11
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_4_SHFT 12
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_5_SHFT 13
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_6_SHFT 14
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_7_SHFT 15
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_0_MASK 0x0000000000000001UL
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_1_MASK 0x0000000000000002UL
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_2_MASK 0x0000000000000004UL
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_3_MASK 0x0000000000000008UL
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_4_MASK 0x0000000000000010UL
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_5_MASK 0x0000000000000020UL
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_6_MASK 0x0000000000000040UL
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_7_MASK 0x0000000000000080UL
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_0_MASK 0x0000000000000100UL
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_1_MASK 0x0000000000000200UL
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_2_MASK 0x0000000000000400UL
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_3_MASK 0x0000000000000800UL
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_4_MASK 0x0000000000001000UL
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_5_MASK 0x0000000000002000UL
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_6_MASK 0x0000000000004000UL
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_7_MASK 0x0000000000008000UL
-
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_0_SHFT 0
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_1_SHFT 1
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_2_SHFT 2
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_3_SHFT 3
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_4_SHFT 4
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_5_SHFT 5
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_6_SHFT 6
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_7_SHFT 7
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_0_SHFT 8
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_1_SHFT 9
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_2_SHFT 10
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_3_SHFT 11
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_4_SHFT 12
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_5_SHFT 13
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_6_SHFT 14
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_7_SHFT 15
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_0_MASK 0x0000000000000001UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_1_MASK 0x0000000000000002UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_2_MASK 0x0000000000000004UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_3_MASK 0x0000000000000008UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_4_MASK 0x0000000000000010UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_5_MASK 0x0000000000000020UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_6_MASK 0x0000000000000040UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_7_MASK 0x0000000000000080UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_0_MASK 0x0000000000000100UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_1_MASK 0x0000000000000200UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_2_MASK 0x0000000000000400UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_3_MASK 0x0000000000000800UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_4_MASK 0x0000000000001000UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_5_MASK 0x0000000000002000UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_6_MASK 0x0000000000004000UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_7_MASK 0x0000000000008000UL
-
-
-union uvh_lb_bau_intd_software_acknowledge_u {
-       unsigned long   v;
-       struct uv2h_lb_bau_intd_software_acknowledge_s {
-               unsigned long   pending_0:1;                    /* RW */
-               unsigned long   pending_1:1;                    /* RW */
-               unsigned long   pending_2:1;                    /* RW */
-               unsigned long   pending_3:1;                    /* RW */
-               unsigned long   pending_4:1;                    /* RW */
-               unsigned long   pending_5:1;                    /* RW */
-               unsigned long   pending_6:1;                    /* RW */
-               unsigned long   pending_7:1;                    /* RW */
-               unsigned long   timeout_0:1;                    /* RW */
-               unsigned long   timeout_1:1;                    /* RW */
-               unsigned long   timeout_2:1;                    /* RW */
-               unsigned long   timeout_3:1;                    /* RW */
-               unsigned long   timeout_4:1;                    /* RW */
-               unsigned long   timeout_5:1;                    /* RW */
-               unsigned long   timeout_6:1;                    /* RW */
-               unsigned long   timeout_7:1;                    /* RW */
-               unsigned long   rsvd_16_63:48;
-       } s2;
-       struct uv3h_lb_bau_intd_software_acknowledge_s {
-               unsigned long   pending_0:1;                    /* RW */
-               unsigned long   pending_1:1;                    /* RW */
-               unsigned long   pending_2:1;                    /* RW */
-               unsigned long   pending_3:1;                    /* RW */
-               unsigned long   pending_4:1;                    /* RW */
-               unsigned long   pending_5:1;                    /* RW */
-               unsigned long   pending_6:1;                    /* RW */
-               unsigned long   pending_7:1;                    /* RW */
-               unsigned long   timeout_0:1;                    /* RW */
-               unsigned long   timeout_1:1;                    /* RW */
-               unsigned long   timeout_2:1;                    /* RW */
-               unsigned long   timeout_3:1;                    /* RW */
-               unsigned long   timeout_4:1;                    /* RW */
-               unsigned long   timeout_5:1;                    /* RW */
-               unsigned long   timeout_6:1;                    /* RW */
-               unsigned long   timeout_7:1;                    /* RW */
-               unsigned long   rsvd_16_63:48;
+       /* UV3 unique struct */
+       struct uv3h_int_cmpb_s {
+               unsigned long   real_time_cmpb:56;              /* RW */
+               unsigned long   rsvd_56_63:8;
        } s3;
-};
-
-/* ========================================================================= */
-/*                UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS                 */
-/* ========================================================================= */
-#define UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS 0x320088UL
-#define UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS 0x320088UL
-#define UV4H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS uv_undefined("UV4H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS")
-#define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS (                   \
-       is_uv2_hub() ? UV2H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS :    \
-       is_uv3_hub() ? UV3H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS :    \
-       /*is_uv4_hub*/ UV4H_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS)
-#define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS_32 0xa70
 
-
-/* ========================================================================= */
-/*                         UVH_LB_BAU_MISC_CONTROL                           */
-/* ========================================================================= */
-#define UV2H_LB_BAU_MISC_CONTROL 0x320170UL
-#define UV3H_LB_BAU_MISC_CONTROL 0x320170UL
-#define UV4H_LB_BAU_MISC_CONTROL 0xc8170UL
-#define UVH_LB_BAU_MISC_CONTROL (                                      \
-       is_uv2_hub() ? UV2H_LB_BAU_MISC_CONTROL :                       \
-       is_uv3_hub() ? UV3H_LB_BAU_MISC_CONTROL :                       \
-       /*is_uv4_hub*/ UV4H_LB_BAU_MISC_CONTROL)
-
-#define UV2H_LB_BAU_MISC_CONTROL_32 0xa10
-#define UV3H_LB_BAU_MISC_CONTROL_32 0xa10
-#define UV4H_LB_BAU_MISC_CONTROL_32 0xa18
-#define UVH_LB_BAU_MISC_CONTROL_32 (                                   \
-       is_uv2_hub() ? UV2H_LB_BAU_MISC_CONTROL_32 :                    \
-       is_uv3_hub() ? UV3H_LB_BAU_MISC_CONTROL_32 :                    \
-       /*is_uv4_hub*/ UV4H_LB_BAU_MISC_CONTROL_32)
-
-#define UVH_LB_BAU_MISC_CONTROL_REJECTION_DELAY_SHFT   0
-#define UVH_LB_BAU_MISC_CONTROL_APIC_MODE_SHFT         8
-#define UVH_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_SHFT   9
-#define UVH_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_SHFT    10
-#define UVH_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_SHFT 11
-#define UVH_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_SHFT 14
-#define UVH_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_SHFT 20
-#define UVH_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_SHFT 21
-#define UVH_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_SHFT 22
-#define UVH_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_SHFT 23
-#define UVH_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_SHFT 24
-#define UVH_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_SHFT 27
-#define UVH_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_SHFT 28
-#define UVH_LB_BAU_MISC_CONTROL_FUN_SHFT               48
-#define UVH_LB_BAU_MISC_CONTROL_REJECTION_DELAY_MASK   0x00000000000000ffUL
-#define UVH_LB_BAU_MISC_CONTROL_APIC_MODE_MASK         0x0000000000000100UL
-#define UVH_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_MASK   0x0000000000000200UL
-#define UVH_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_MASK    0x0000000000000400UL
-#define UVH_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_MASK 0x0000000000003800UL
-#define UVH_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_MASK 0x0000000000004000UL
-#define UVH_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_MASK 0x0000000000100000UL
-#define UVH_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_MASK 0x0000000000200000UL
-#define UVH_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_MASK 0x0000000000400000UL
-#define UVH_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_MASK 0x0000000000800000UL
-#define UVH_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000007000000UL
-#define UVH_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_MASK 0x0000000008000000UL
-#define UVH_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000010000000UL
-#define UVH_LB_BAU_MISC_CONTROL_FUN_MASK               0xffff000000000000UL
-
-#define UVXH_LB_BAU_MISC_CONTROL_REJECTION_DELAY_SHFT  0
-#define UVXH_LB_BAU_MISC_CONTROL_APIC_MODE_SHFT                8
-#define UVXH_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_SHFT  9
-#define UVXH_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_SHFT   10
-#define UVXH_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_SHFT 11
-#define UVXH_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_SHFT 14
-#define UVXH_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_SHFT 20
-#define UVXH_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_SHFT 21
-#define UVXH_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_SHFT 22
-#define UVXH_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_SHFT 23
-#define UVXH_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_SHFT 24
-#define UVXH_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_SHFT 27
-#define UVXH_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_SHFT 28
-#define UVXH_LB_BAU_MISC_CONTROL_ENABLE_AUTOMATIC_APIC_MODE_SELECTION_SHFT 29
-#define UVXH_LB_BAU_MISC_CONTROL_APIC_MODE_STATUS_SHFT 30
-#define UVXH_LB_BAU_MISC_CONTROL_SUPPRESS_INTERRUPTS_TO_SELF_SHFT 31
-#define UVXH_LB_BAU_MISC_CONTROL_ENABLE_LOCK_BASED_SYSTEM_FLUSH_SHFT 32
-#define UVXH_LB_BAU_MISC_CONTROL_ENABLE_EXTENDED_SB_STATUS_SHFT 33
-#define UVXH_LB_BAU_MISC_CONTROL_SUPPRESS_INT_PRIO_UDT_TO_SELF_SHFT 34
-#define UVXH_LB_BAU_MISC_CONTROL_USE_LEGACY_DESCRIPTOR_FORMATS_SHFT 35
-#define UVXH_LB_BAU_MISC_CONTROL_FUN_SHFT              48
-#define UVXH_LB_BAU_MISC_CONTROL_REJECTION_DELAY_MASK  0x00000000000000ffUL
-#define UVXH_LB_BAU_MISC_CONTROL_APIC_MODE_MASK                0x0000000000000100UL
-#define UVXH_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_MASK  0x0000000000000200UL
-#define UVXH_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_MASK   0x0000000000000400UL
-#define UVXH_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_MASK 0x0000000000003800UL
-#define UVXH_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_MASK 0x0000000000004000UL
-#define UVXH_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_MASK 0x0000000000100000UL
-#define UVXH_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_MASK 0x0000000000200000UL
-#define UVXH_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_MASK 0x0000000000400000UL
-#define UVXH_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_MASK 0x0000000000800000UL
-#define UVXH_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000007000000UL
-#define UVXH_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_MASK 0x0000000008000000UL
-#define UVXH_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000010000000UL
-#define UVXH_LB_BAU_MISC_CONTROL_ENABLE_AUTOMATIC_APIC_MODE_SELECTION_MASK 0x0000000020000000UL
-#define UVXH_LB_BAU_MISC_CONTROL_APIC_MODE_STATUS_MASK 0x0000000040000000UL
-#define UVXH_LB_BAU_MISC_CONTROL_SUPPRESS_INTERRUPTS_TO_SELF_MASK 0x0000000080000000UL
-#define UVXH_LB_BAU_MISC_CONTROL_ENABLE_LOCK_BASED_SYSTEM_FLUSH_MASK 0x0000000100000000UL
-#define UVXH_LB_BAU_MISC_CONTROL_ENABLE_EXTENDED_SB_STATUS_MASK 0x0000000200000000UL
-#define UVXH_LB_BAU_MISC_CONTROL_SUPPRESS_INT_PRIO_UDT_TO_SELF_MASK 0x0000000400000000UL
-#define UVXH_LB_BAU_MISC_CONTROL_USE_LEGACY_DESCRIPTOR_FORMATS_MASK 0x0000000800000000UL
-#define UVXH_LB_BAU_MISC_CONTROL_FUN_MASK              0xffff000000000000UL
-
-#define UV2H_LB_BAU_MISC_CONTROL_REJECTION_DELAY_SHFT  0
-#define UV2H_LB_BAU_MISC_CONTROL_APIC_MODE_SHFT                8
-#define UV2H_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_SHFT  9
-#define UV2H_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_SHFT   10
-#define UV2H_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_SHFT 11
-#define UV2H_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_SHFT 14
-#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT 15
-#define UV2H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT 16
-#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_SHFT 20
-#define UV2H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_SHFT 21
-#define UV2H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_SHFT 22
-#define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_SHFT 23
-#define UV2H_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_SHFT 24
-#define UV2H_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_SHFT 27
-#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_SHFT 28
-#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_AUTOMATIC_APIC_MODE_SELECTION_SHFT 29
-#define UV2H_LB_BAU_MISC_CONTROL_APIC_MODE_STATUS_SHFT 30
-#define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_INTERRUPTS_TO_SELF_SHFT 31
-#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_LOCK_BASED_SYSTEM_FLUSH_SHFT 32
-#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_EXTENDED_SB_STATUS_SHFT 33
-#define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_INT_PRIO_UDT_TO_SELF_SHFT 34
-#define UV2H_LB_BAU_MISC_CONTROL_USE_LEGACY_DESCRIPTOR_FORMATS_SHFT 35
-#define UV2H_LB_BAU_MISC_CONTROL_FUN_SHFT              48
-#define UV2H_LB_BAU_MISC_CONTROL_REJECTION_DELAY_MASK  0x00000000000000ffUL
-#define UV2H_LB_BAU_MISC_CONTROL_APIC_MODE_MASK                0x0000000000000100UL
-#define UV2H_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_MASK  0x0000000000000200UL
-#define UV2H_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_MASK   0x0000000000000400UL
-#define UV2H_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_MASK 0x0000000000003800UL
-#define UV2H_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_MASK 0x0000000000004000UL
-#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_MASK 0x0000000000008000UL
-#define UV2H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_MASK 0x00000000000f0000UL
-#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_MASK 0x0000000000100000UL
-#define UV2H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_MASK 0x0000000000200000UL
-#define UV2H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_MASK 0x0000000000400000UL
-#define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_MASK 0x0000000000800000UL
-#define UV2H_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000007000000UL
-#define UV2H_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_MASK 0x0000000008000000UL
-#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000010000000UL
-#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_AUTOMATIC_APIC_MODE_SELECTION_MASK 0x0000000020000000UL
-#define UV2H_LB_BAU_MISC_CONTROL_APIC_MODE_STATUS_MASK 0x0000000040000000UL
-#define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_INTERRUPTS_TO_SELF_MASK 0x0000000080000000UL
-#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_LOCK_BASED_SYSTEM_FLUSH_MASK 0x0000000100000000UL
-#define UV2H_LB_BAU_MISC_CONTROL_ENABLE_EXTENDED_SB_STATUS_MASK 0x0000000200000000UL
-#define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_INT_PRIO_UDT_TO_SELF_MASK 0x0000000400000000UL
-#define UV2H_LB_BAU_MISC_CONTROL_USE_LEGACY_DESCRIPTOR_FORMATS_MASK 0x0000000800000000UL
-#define UV2H_LB_BAU_MISC_CONTROL_FUN_MASK              0xffff000000000000UL
-
-#define UV3H_LB_BAU_MISC_CONTROL_REJECTION_DELAY_SHFT  0
-#define UV3H_LB_BAU_MISC_CONTROL_APIC_MODE_SHFT                8
-#define UV3H_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_SHFT  9
-#define UV3H_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_SHFT   10
-#define UV3H_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_SHFT 11
-#define UV3H_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_SHFT 14
-#define UV3H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT 15
-#define UV3H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT 16
-#define UV3H_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_SHFT 20
-#define UV3H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_SHFT 21
-#define UV3H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_SHFT 22
-#define UV3H_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_SHFT 23
-#define UV3H_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_SHFT 24
-#define UV3H_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_SHFT 27
-#define UV3H_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_SHFT 28
-#define UV3H_LB_BAU_MISC_CONTROL_ENABLE_AUTOMATIC_APIC_MODE_SELECTION_SHFT 29
-#define UV3H_LB_BAU_MISC_CONTROL_APIC_MODE_STATUS_SHFT 30
-#define UV3H_LB_BAU_MISC_CONTROL_SUPPRESS_INTERRUPTS_TO_SELF_SHFT 31
-#define UV3H_LB_BAU_MISC_CONTROL_ENABLE_LOCK_BASED_SYSTEM_FLUSH_SHFT 32
-#define UV3H_LB_BAU_MISC_CONTROL_ENABLE_EXTENDED_SB_STATUS_SHFT 33
-#define UV3H_LB_BAU_MISC_CONTROL_SUPPRESS_INT_PRIO_UDT_TO_SELF_SHFT 34
-#define UV3H_LB_BAU_MISC_CONTROL_USE_LEGACY_DESCRIPTOR_FORMATS_SHFT 35
-#define UV3H_LB_BAU_MISC_CONTROL_SUPPRESS_QUIESCE_MSGS_TO_QPI_SHFT 36
-#define UV3H_LB_BAU_MISC_CONTROL_ENABLE_INTD_PREFETCH_HINT_SHFT 37
-#define UV3H_LB_BAU_MISC_CONTROL_THREAD_KILL_TIMEBASE_SHFT 38
-#define UV3H_LB_BAU_MISC_CONTROL_FUN_SHFT              48
-#define UV3H_LB_BAU_MISC_CONTROL_REJECTION_DELAY_MASK  0x00000000000000ffUL
-#define UV3H_LB_BAU_MISC_CONTROL_APIC_MODE_MASK                0x0000000000000100UL
-#define UV3H_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_MASK  0x0000000000000200UL
-#define UV3H_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_MASK   0x0000000000000400UL
-#define UV3H_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_MASK 0x0000000000003800UL
-#define UV3H_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_MASK 0x0000000000004000UL
-#define UV3H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_MASK 0x0000000000008000UL
-#define UV3H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_MASK 0x00000000000f0000UL
-#define UV3H_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_MASK 0x0000000000100000UL
-#define UV3H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_MASK 0x0000000000200000UL
-#define UV3H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_MASK 0x0000000000400000UL
-#define UV3H_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_MASK 0x0000000000800000UL
-#define UV3H_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000007000000UL
-#define UV3H_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_MASK 0x0000000008000000UL
-#define UV3H_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000010000000UL
-#define UV3H_LB_BAU_MISC_CONTROL_ENABLE_AUTOMATIC_APIC_MODE_SELECTION_MASK 0x0000000020000000UL
-#define UV3H_LB_BAU_MISC_CONTROL_APIC_MODE_STATUS_MASK 0x0000000040000000UL
-#define UV3H_LB_BAU_MISC_CONTROL_SUPPRESS_INTERRUPTS_TO_SELF_MASK 0x0000000080000000UL
-#define UV3H_LB_BAU_MISC_CONTROL_ENABLE_LOCK_BASED_SYSTEM_FLUSH_MASK 0x0000000100000000UL
-#define UV3H_LB_BAU_MISC_CONTROL_ENABLE_EXTENDED_SB_STATUS_MASK 0x0000000200000000UL
-#define UV3H_LB_BAU_MISC_CONTROL_SUPPRESS_INT_PRIO_UDT_TO_SELF_MASK 0x0000000400000000UL
-#define UV3H_LB_BAU_MISC_CONTROL_USE_LEGACY_DESCRIPTOR_FORMATS_MASK 0x0000000800000000UL
-#define UV3H_LB_BAU_MISC_CONTROL_SUPPRESS_QUIESCE_MSGS_TO_QPI_MASK 0x0000001000000000UL
-#define UV3H_LB_BAU_MISC_CONTROL_ENABLE_INTD_PREFETCH_HINT_MASK 0x0000002000000000UL
-#define UV3H_LB_BAU_MISC_CONTROL_THREAD_KILL_TIMEBASE_MASK 0x00003fc000000000UL
-#define UV3H_LB_BAU_MISC_CONTROL_FUN_MASK              0xffff000000000000UL
-
-#define UV4H_LB_BAU_MISC_CONTROL_REJECTION_DELAY_SHFT  0
-#define UV4H_LB_BAU_MISC_CONTROL_APIC_MODE_SHFT                8
-#define UV4H_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_SHFT  9
-#define UV4H_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_SHFT   10
-#define UV4H_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_SHFT 11
-#define UV4H_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_SHFT 14
-#define UV4H_LB_BAU_MISC_CONTROL_RESERVED_15_19_SHFT   15
-#define UV4H_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_SHFT 20
-#define UV4H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_SHFT 21
-#define UV4H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_SHFT 22
-#define UV4H_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_SHFT 23
-#define UV4H_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_SHFT 24
-#define UV4H_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_SHFT 27
-#define UV4H_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_SHFT 28
-#define UV4H_LB_BAU_MISC_CONTROL_ENABLE_AUTOMATIC_APIC_MODE_SELECTION_SHFT 29
-#define UV4H_LB_BAU_MISC_CONTROL_APIC_MODE_STATUS_SHFT 30
-#define UV4H_LB_BAU_MISC_CONTROL_SUPPRESS_INTERRUPTS_TO_SELF_SHFT 31
-#define UV4H_LB_BAU_MISC_CONTROL_ENABLE_LOCK_BASED_SYSTEM_FLUSH_SHFT 32
-#define UV4H_LB_BAU_MISC_CONTROL_ENABLE_EXTENDED_SB_STATUS_SHFT 33
-#define UV4H_LB_BAU_MISC_CONTROL_SUPPRESS_INT_PRIO_UDT_TO_SELF_SHFT 34
-#define UV4H_LB_BAU_MISC_CONTROL_USE_LEGACY_DESCRIPTOR_FORMATS_SHFT 35
-#define UV4H_LB_BAU_MISC_CONTROL_SUPPRESS_QUIESCE_MSGS_TO_QPI_SHFT 36
-#define UV4H_LB_BAU_MISC_CONTROL_RESERVED_37_SHFT      37
-#define UV4H_LB_BAU_MISC_CONTROL_THREAD_KILL_TIMEBASE_SHFT 38
-#define UV4H_LB_BAU_MISC_CONTROL_ADDRESS_INTERLEAVE_SELECT_SHFT 46
-#define UV4H_LB_BAU_MISC_CONTROL_FUN_SHFT              48
-#define UV4H_LB_BAU_MISC_CONTROL_REJECTION_DELAY_MASK  0x00000000000000ffUL
-#define UV4H_LB_BAU_MISC_CONTROL_APIC_MODE_MASK                0x0000000000000100UL
-#define UV4H_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_MASK  0x0000000000000200UL
-#define UV4H_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_MASK   0x0000000000000400UL
-#define UV4H_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_MASK 0x0000000000003800UL
-#define UV4H_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_MASK 0x0000000000004000UL
-#define UV4H_LB_BAU_MISC_CONTROL_RESERVED_15_19_MASK   0x00000000000f8000UL
-#define UV4H_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_MASK 0x0000000000100000UL
-#define UV4H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_MASK 0x0000000000200000UL
-#define UV4H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_MASK 0x0000000000400000UL
-#define UV4H_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_MASK 0x0000000000800000UL
-#define UV4H_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000007000000UL
-#define UV4H_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_MASK 0x0000000008000000UL
-#define UV4H_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000010000000UL
-#define UV4H_LB_BAU_MISC_CONTROL_ENABLE_AUTOMATIC_APIC_MODE_SELECTION_MASK 0x0000000020000000UL
-#define UV4H_LB_BAU_MISC_CONTROL_APIC_MODE_STATUS_MASK 0x0000000040000000UL
-#define UV4H_LB_BAU_MISC_CONTROL_SUPPRESS_INTERRUPTS_TO_SELF_MASK 0x0000000080000000UL
-#define UV4H_LB_BAU_MISC_CONTROL_ENABLE_LOCK_BASED_SYSTEM_FLUSH_MASK 0x0000000100000000UL
-#define UV4H_LB_BAU_MISC_CONTROL_ENABLE_EXTENDED_SB_STATUS_MASK 0x0000000200000000UL
-#define UV4H_LB_BAU_MISC_CONTROL_SUPPRESS_INT_PRIO_UDT_TO_SELF_MASK 0x0000000400000000UL
-#define UV4H_LB_BAU_MISC_CONTROL_USE_LEGACY_DESCRIPTOR_FORMATS_MASK 0x0000000800000000UL
-#define UV4H_LB_BAU_MISC_CONTROL_SUPPRESS_QUIESCE_MSGS_TO_QPI_MASK 0x0000001000000000UL
-#define UV4H_LB_BAU_MISC_CONTROL_RESERVED_37_MASK      0x0000002000000000UL
-#define UV4H_LB_BAU_MISC_CONTROL_THREAD_KILL_TIMEBASE_MASK 0x00003fc000000000UL
-#define UV4H_LB_BAU_MISC_CONTROL_ADDRESS_INTERLEAVE_SELECT_MASK 0x0000400000000000UL
-#define UV4H_LB_BAU_MISC_CONTROL_FUN_MASK              0xffff000000000000UL
-
-#define UV4H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_MASK        \
-       uv_undefined("UV4H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_MASK")
-#define UVH_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_MASK (       \
-       is_uv2_hub() ? UV2H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_MASK : \
-       is_uv3_hub() ? UV3H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_MASK : \
-       /*is_uv4_hub*/ UV4H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_MASK)
-#define UV4H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT        \
-       uv_undefined("UV4H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT")
-#define UVH_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT (       \
-       is_uv2_hub() ? UV2H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT : \
-       is_uv3_hub() ? UV3H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT : \
-       /*is_uv4_hub*/ UV4H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT)
-#define UV4H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_MASK     \
-       uv_undefined("UV4H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_MASK")
-#define UVH_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_MASK (    \
-       is_uv2_hub() ? UV2H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_MASK : \
-       is_uv3_hub() ? UV3H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_MASK : \
-       /*is_uv4_hub*/ UV4H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_MASK)
-#define UV4H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT     \
-       uv_undefined("UV4H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT")
-#define UVH_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT (    \
-       is_uv2_hub() ? UV2H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT : \
-       is_uv3_hub() ? UV3H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT : \
-       /*is_uv4_hub*/ UV4H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT)
-
-union uvh_lb_bau_misc_control_u {
-       unsigned long   v;
-       struct uvh_lb_bau_misc_control_s {
-               unsigned long   rejection_delay:8;              /* RW */
-               unsigned long   apic_mode:1;                    /* RW */
-               unsigned long   force_broadcast:1;              /* RW */
-               unsigned long   force_lock_nop:1;               /* RW */
-               unsigned long   qpi_agent_presence_vector:3;    /* RW */
-               unsigned long   descriptor_fetch_mode:1;        /* RW */
-               unsigned long   rsvd_15_19:5;
-               unsigned long   enable_dual_mapping_mode:1;     /* RW */
-               unsigned long   vga_io_port_decode_enable:1;    /* RW */
-               unsigned long   vga_io_port_16_bit_decode:1;    /* RW */
-               unsigned long   suppress_dest_registration:1;   /* RW */
-               unsigned long   programmed_initial_priority:3;  /* RW */
-               unsigned long   use_incoming_priority:1;        /* RW */
-               unsigned long   enable_programmed_initial_priority:1;/* RW */
-               unsigned long   rsvd_29_47:19;
-               unsigned long   fun:16;                         /* RW */
-       } s;
-       struct uvxh_lb_bau_misc_control_s {
-               unsigned long   rejection_delay:8;              /* RW */
-               unsigned long   apic_mode:1;                    /* RW */
-               unsigned long   force_broadcast:1;              /* RW */
-               unsigned long   force_lock_nop:1;               /* RW */
-               unsigned long   qpi_agent_presence_vector:3;    /* RW */
-               unsigned long   descriptor_fetch_mode:1;        /* RW */
-               unsigned long   rsvd_15_19:5;
-               unsigned long   enable_dual_mapping_mode:1;     /* RW */
-               unsigned long   vga_io_port_decode_enable:1;    /* RW */
-               unsigned long   vga_io_port_16_bit_decode:1;    /* RW */
-               unsigned long   suppress_dest_registration:1;   /* RW */
-               unsigned long   programmed_initial_priority:3;  /* RW */
-               unsigned long   use_incoming_priority:1;        /* RW */
-               unsigned long   enable_programmed_initial_priority:1;/* RW */
-               unsigned long   enable_automatic_apic_mode_selection:1;/* RW */
-               unsigned long   apic_mode_status:1;             /* RO */
-               unsigned long   suppress_interrupts_to_self:1;  /* RW */
-               unsigned long   enable_lock_based_system_flush:1;/* RW */
-               unsigned long   enable_extended_sb_status:1;    /* RW */
-               unsigned long   suppress_int_prio_udt_to_self:1;/* RW */
-               unsigned long   use_legacy_descriptor_formats:1;/* RW */
-               unsigned long   rsvd_36_47:12;
-               unsigned long   fun:16;                         /* RW */
-       } sx;
-       struct uv2h_lb_bau_misc_control_s {
-               unsigned long   rejection_delay:8;              /* RW */
-               unsigned long   apic_mode:1;                    /* RW */
-               unsigned long   force_broadcast:1;              /* RW */
-               unsigned long   force_lock_nop:1;               /* RW */
-               unsigned long   qpi_agent_presence_vector:3;    /* RW */
-               unsigned long   descriptor_fetch_mode:1;        /* RW */
-               unsigned long   enable_intd_soft_ack_mode:1;    /* RW */
-               unsigned long   intd_soft_ack_timeout_period:4; /* RW */
-               unsigned long   enable_dual_mapping_mode:1;     /* RW */
-               unsigned long   vga_io_port_decode_enable:1;    /* RW */
-               unsigned long   vga_io_port_16_bit_decode:1;    /* RW */
-               unsigned long   suppress_dest_registration:1;   /* RW */
-               unsigned long   programmed_initial_priority:3;  /* RW */
-               unsigned long   use_incoming_priority:1;        /* RW */
-               unsigned long   enable_programmed_initial_priority:1;/* RW */
-               unsigned long   enable_automatic_apic_mode_selection:1;/* RW */
-               unsigned long   apic_mode_status:1;             /* RO */
-               unsigned long   suppress_interrupts_to_self:1;  /* RW */
-               unsigned long   enable_lock_based_system_flush:1;/* RW */
-               unsigned long   enable_extended_sb_status:1;    /* RW */
-               unsigned long   suppress_int_prio_udt_to_self:1;/* RW */
-               unsigned long   use_legacy_descriptor_formats:1;/* RW */
-               unsigned long   rsvd_36_47:12;
-               unsigned long   fun:16;                         /* RW */
+       /* UV2 unique struct */
+       struct uv2h_int_cmpb_s {
+               unsigned long   real_time_cmpb:56;              /* RW */
+               unsigned long   rsvd_56_63:8;
        } s2;
-       struct uv3h_lb_bau_misc_control_s {
-               unsigned long   rejection_delay:8;              /* RW */
-               unsigned long   apic_mode:1;                    /* RW */
-               unsigned long   force_broadcast:1;              /* RW */
-               unsigned long   force_lock_nop:1;               /* RW */
-               unsigned long   qpi_agent_presence_vector:3;    /* RW */
-               unsigned long   descriptor_fetch_mode:1;        /* RW */
-               unsigned long   enable_intd_soft_ack_mode:1;    /* RW */
-               unsigned long   intd_soft_ack_timeout_period:4; /* RW */
-               unsigned long   enable_dual_mapping_mode:1;     /* RW */
-               unsigned long   vga_io_port_decode_enable:1;    /* RW */
-               unsigned long   vga_io_port_16_bit_decode:1;    /* RW */
-               unsigned long   suppress_dest_registration:1;   /* RW */
-               unsigned long   programmed_initial_priority:3;  /* RW */
-               unsigned long   use_incoming_priority:1;        /* RW */
-               unsigned long   enable_programmed_initial_priority:1;/* RW */
-               unsigned long   enable_automatic_apic_mode_selection:1;/* RW */
-               unsigned long   apic_mode_status:1;             /* RO */
-               unsigned long   suppress_interrupts_to_self:1;  /* RW */
-               unsigned long   enable_lock_based_system_flush:1;/* RW */
-               unsigned long   enable_extended_sb_status:1;    /* RW */
-               unsigned long   suppress_int_prio_udt_to_self:1;/* RW */
-               unsigned long   use_legacy_descriptor_formats:1;/* RW */
-               unsigned long   suppress_quiesce_msgs_to_qpi:1; /* RW */
-               unsigned long   enable_intd_prefetch_hint:1;    /* RW */
-               unsigned long   thread_kill_timebase:8;         /* RW */
-               unsigned long   rsvd_46_47:2;
-               unsigned long   fun:16;                         /* RW */
-       } s3;
-       struct uv4h_lb_bau_misc_control_s {
-               unsigned long   rejection_delay:8;              /* RW */
-               unsigned long   apic_mode:1;                    /* RW */
-               unsigned long   force_broadcast:1;              /* RW */
-               unsigned long   force_lock_nop:1;               /* RW */
-               unsigned long   qpi_agent_presence_vector:3;    /* RW */
-               unsigned long   descriptor_fetch_mode:1;        /* RW */
-               unsigned long   rsvd_15_19:5;
-               unsigned long   enable_dual_mapping_mode:1;     /* RW */
-               unsigned long   vga_io_port_decode_enable:1;    /* RW */
-               unsigned long   vga_io_port_16_bit_decode:1;    /* RW */
-               unsigned long   suppress_dest_registration:1;   /* RW */
-               unsigned long   programmed_initial_priority:3;  /* RW */
-               unsigned long   use_incoming_priority:1;        /* RW */
-               unsigned long   enable_programmed_initial_priority:1;/* RW */
-               unsigned long   enable_automatic_apic_mode_selection:1;/* RW */
-               unsigned long   apic_mode_status:1;             /* RO */
-               unsigned long   suppress_interrupts_to_self:1;  /* RW */
-               unsigned long   enable_lock_based_system_flush:1;/* RW */
-               unsigned long   enable_extended_sb_status:1;    /* RW */
-               unsigned long   suppress_int_prio_udt_to_self:1;/* RW */
-               unsigned long   use_legacy_descriptor_formats:1;/* RW */
-               unsigned long   suppress_quiesce_msgs_to_qpi:1; /* RW */
-               unsigned long   rsvd_37:1;
-               unsigned long   thread_kill_timebase:8;         /* RW */
-               unsigned long   address_interleave_select:1;    /* RW */
-               unsigned long   rsvd_47:1;
-               unsigned long   fun:16;                         /* RW */
-       } s4;
 };
 
 /* ========================================================================= */
-/*                     UVH_LB_BAU_SB_ACTIVATION_CONTROL                      */
+/*                               UVH_IPI_INT                                 */
 /* ========================================================================= */
-#define UV2H_LB_BAU_SB_ACTIVATION_CONTROL 0x320020UL
-#define UV3H_LB_BAU_SB_ACTIVATION_CONTROL 0x320020UL
-#define UV4H_LB_BAU_SB_ACTIVATION_CONTROL 0xc8020UL
-#define UVH_LB_BAU_SB_ACTIVATION_CONTROL (                             \
-       is_uv2_hub() ? UV2H_LB_BAU_SB_ACTIVATION_CONTROL :              \
-       is_uv3_hub() ? UV3H_LB_BAU_SB_ACTIVATION_CONTROL :              \
-       /*is_uv4_hub*/ UV4H_LB_BAU_SB_ACTIVATION_CONTROL)
-
-#define UV2H_LB_BAU_SB_ACTIVATION_CONTROL_32 0x9a8
-#define UV3H_LB_BAU_SB_ACTIVATION_CONTROL_32 0x9a8
-#define UV4H_LB_BAU_SB_ACTIVATION_CONTROL_32 0x9c8
-#define UVH_LB_BAU_SB_ACTIVATION_CONTROL_32 (                          \
-       is_uv2_hub() ? UV2H_LB_BAU_SB_ACTIVATION_CONTROL_32 :           \
-       is_uv3_hub() ? UV3H_LB_BAU_SB_ACTIVATION_CONTROL_32 :           \
-       /*is_uv4_hub*/ UV4H_LB_BAU_SB_ACTIVATION_CONTROL_32)
-
-#define UVH_LB_BAU_SB_ACTIVATION_CONTROL_INDEX_SHFT    0
-#define UVH_LB_BAU_SB_ACTIVATION_CONTROL_PUSH_SHFT     62
-#define UVH_LB_BAU_SB_ACTIVATION_CONTROL_INIT_SHFT     63
-#define UVH_LB_BAU_SB_ACTIVATION_CONTROL_INDEX_MASK    0x000000000000003fUL
-#define UVH_LB_BAU_SB_ACTIVATION_CONTROL_PUSH_MASK     0x4000000000000000UL
-#define UVH_LB_BAU_SB_ACTIVATION_CONTROL_INIT_MASK     0x8000000000000000UL
-
-
-union uvh_lb_bau_sb_activation_control_u {
-       unsigned long   v;
-       struct uvh_lb_bau_sb_activation_control_s {
-               unsigned long   index:6;                        /* RW */
-               unsigned long   rsvd_6_61:56;
-               unsigned long   push:1;                         /* WP */
-               unsigned long   init:1;                         /* WP */
-       } s;
-};
+#define UVH_IPI_INT 0x60500UL
 
-/* ========================================================================= */
-/*                    UVH_LB_BAU_SB_ACTIVATION_STATUS_0                      */
-/* ========================================================================= */
-#define UV2H_LB_BAU_SB_ACTIVATION_STATUS_0 0x320030UL
-#define UV3H_LB_BAU_SB_ACTIVATION_STATUS_0 0x320030UL
-#define UV4H_LB_BAU_SB_ACTIVATION_STATUS_0 0xc8030UL
-#define UVH_LB_BAU_SB_ACTIVATION_STATUS_0 (                            \
-       is_uv2_hub() ? UV2H_LB_BAU_SB_ACTIVATION_STATUS_0 :             \
-       is_uv3_hub() ? UV3H_LB_BAU_SB_ACTIVATION_STATUS_0 :             \
-       /*is_uv4_hub*/ UV4H_LB_BAU_SB_ACTIVATION_STATUS_0)
-
-#define UV2H_LB_BAU_SB_ACTIVATION_STATUS_0_32 0x9b0
-#define UV3H_LB_BAU_SB_ACTIVATION_STATUS_0_32 0x9b0
-#define UV4H_LB_BAU_SB_ACTIVATION_STATUS_0_32 0x9d0
-#define UVH_LB_BAU_SB_ACTIVATION_STATUS_0_32 (                         \
-       is_uv2_hub() ? UV2H_LB_BAU_SB_ACTIVATION_STATUS_0_32 :          \
-       is_uv3_hub() ? UV3H_LB_BAU_SB_ACTIVATION_STATUS_0_32 :          \
-       /*is_uv4_hub*/ UV4H_LB_BAU_SB_ACTIVATION_STATUS_0_32)
-
-#define UVH_LB_BAU_SB_ACTIVATION_STATUS_0_STATUS_SHFT  0
-#define UVH_LB_BAU_SB_ACTIVATION_STATUS_0_STATUS_MASK  0xffffffffffffffffUL
-
-
-union uvh_lb_bau_sb_activation_status_0_u {
-       unsigned long   v;
-       struct uvh_lb_bau_sb_activation_status_0_s {
-               unsigned long   status:64;                      /* RW */
-       } s;
-};
+/* UVH common defines*/
+#define UVH_IPI_INT_VECTOR_SHFT                                0
+#define UVH_IPI_INT_VECTOR_MASK                                0x00000000000000ffUL
+#define UVH_IPI_INT_DELIVERY_MODE_SHFT                 8
+#define UVH_IPI_INT_DELIVERY_MODE_MASK                 0x0000000000000700UL
+#define UVH_IPI_INT_DESTMODE_SHFT                      11
+#define UVH_IPI_INT_DESTMODE_MASK                      0x0000000000000800UL
+#define UVH_IPI_INT_APIC_ID_SHFT                       16
+#define UVH_IPI_INT_APIC_ID_MASK                       0x0000ffffffff0000UL
+#define UVH_IPI_INT_SEND_SHFT                          63
+#define UVH_IPI_INT_SEND_MASK                          0x8000000000000000UL
 
-/* ========================================================================= */
-/*                    UVH_LB_BAU_SB_ACTIVATION_STATUS_1                      */
-/* ========================================================================= */
-#define UV2H_LB_BAU_SB_ACTIVATION_STATUS_1 0x320040UL
-#define UV3H_LB_BAU_SB_ACTIVATION_STATUS_1 0x320040UL
-#define UV4H_LB_BAU_SB_ACTIVATION_STATUS_1 0xc8040UL
-#define UVH_LB_BAU_SB_ACTIVATION_STATUS_1 (                            \
-       is_uv2_hub() ? UV2H_LB_BAU_SB_ACTIVATION_STATUS_1 :             \
-       is_uv3_hub() ? UV3H_LB_BAU_SB_ACTIVATION_STATUS_1 :             \
-       /*is_uv4_hub*/ UV4H_LB_BAU_SB_ACTIVATION_STATUS_1)
-
-#define UV2H_LB_BAU_SB_ACTIVATION_STATUS_1_32 0x9b8
-#define UV3H_LB_BAU_SB_ACTIVATION_STATUS_1_32 0x9b8
-#define UV4H_LB_BAU_SB_ACTIVATION_STATUS_1_32 0x9d8
-#define UVH_LB_BAU_SB_ACTIVATION_STATUS_1_32 (                         \
-       is_uv2_hub() ? UV2H_LB_BAU_SB_ACTIVATION_STATUS_1_32 :          \
-       is_uv3_hub() ? UV3H_LB_BAU_SB_ACTIVATION_STATUS_1_32 :          \
-       /*is_uv4_hub*/ UV4H_LB_BAU_SB_ACTIVATION_STATUS_1_32)
-
-#define UVH_LB_BAU_SB_ACTIVATION_STATUS_1_STATUS_SHFT  0
-#define UVH_LB_BAU_SB_ACTIVATION_STATUS_1_STATUS_MASK  0xffffffffffffffffUL
-
-
-union uvh_lb_bau_sb_activation_status_1_u {
+
+union uvh_ipi_int_u {
        unsigned long   v;
-       struct uvh_lb_bau_sb_activation_status_1_s {
-               unsigned long   status:64;                      /* RW */
+
+       /* UVH common struct */
+       struct uvh_ipi_int_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   delivery_mode:3;                /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   rsvd_12_15:4;
+               unsigned long   apic_id:32;                     /* RW */
+               unsigned long   rsvd_48_62:15;
+               unsigned long   send:1;                         /* WP */
        } s;
-};
 
-/* ========================================================================= */
-/*                      UVH_LB_BAU_SB_DESCRIPTOR_BASE                        */
-/* ========================================================================= */
-#define UV2H_LB_BAU_SB_DESCRIPTOR_BASE 0x320010UL
-#define UV3H_LB_BAU_SB_DESCRIPTOR_BASE 0x320010UL
-#define UV4H_LB_BAU_SB_DESCRIPTOR_BASE 0xc8010UL
-#define UVH_LB_BAU_SB_DESCRIPTOR_BASE (                                        \
-       is_uv2_hub() ? UV2H_LB_BAU_SB_DESCRIPTOR_BASE :                 \
-       is_uv3_hub() ? UV3H_LB_BAU_SB_DESCRIPTOR_BASE :                 \
-       /*is_uv4_hub*/ UV4H_LB_BAU_SB_DESCRIPTOR_BASE)
-
-#define UV2H_LB_BAU_SB_DESCRIPTOR_BASE_32 0x9a0
-#define UV3H_LB_BAU_SB_DESCRIPTOR_BASE_32 0x9a0
-#define UV4H_LB_BAU_SB_DESCRIPTOR_BASE_32 0x9c0
-#define UVH_LB_BAU_SB_DESCRIPTOR_BASE_32 (                             \
-       is_uv2_hub() ? UV2H_LB_BAU_SB_DESCRIPTOR_BASE_32 :              \
-       is_uv3_hub() ? UV3H_LB_BAU_SB_DESCRIPTOR_BASE_32 :              \
-       /*is_uv4_hub*/ UV4H_LB_BAU_SB_DESCRIPTOR_BASE_32)
-
-#define UVH_LB_BAU_SB_DESCRIPTOR_BASE_PAGE_ADDRESS_SHFT        12
-
-#define UV2H_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_SHFT    49
-#define UV2H_LB_BAU_SB_DESCRIPTOR_BASE_PAGE_ADDRESS_MASK 0x000007fffffff000UL
-#define UV2H_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_MASK    0x7ffe000000000000UL
-
-#define UV3H_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_SHFT    49
-#define UV3H_LB_BAU_SB_DESCRIPTOR_BASE_PAGE_ADDRESS_MASK 0x000007fffffff000UL
-#define UV3H_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_MASK    0x7ffe000000000000UL
-
-#define UV4H_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_SHFT    49
-#define UV4H_LB_BAU_SB_DESCRIPTOR_BASE_PAGE_ADDRESS_MASK 0x00003ffffffff000UL
-#define UV4H_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_MASK    0x7ffe000000000000UL
-
-#define UV4AH_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_SHFT   53
-#define UV4AH_LB_BAU_SB_DESCRIPTOR_BASE_PAGE_ADDRESS_MASK 0x000ffffffffff000UL
-#define UV4AH_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_MASK   0xffe0000000000000UL
-
-#define UVH_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_SHFT (                   \
-       is_uv2_hub() ? UV2H_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_SHFT :    \
-       is_uv3_hub() ? UV3H_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_SHFT :    \
-       is_uv4a_hub() ? UV4AH_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_SHFT :  \
-       /*is_uv4_hub*/ UV4H_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_SHFT)
-
-#define UVH_LB_BAU_SB_DESCRIPTOR_PAGE_ADDRESS_MASK (                   \
-       is_uv2_hub() ? UV2H_LB_BAU_SB_DESCRIPTOR_PAGE_ADDRESS_MASK :    \
-       is_uv3_hub() ? UV3H_LB_BAU_SB_DESCRIPTOR_PAGE_ADDRESS_MASK :    \
-       is_uv4a_hub() ? UV4AH_LB_BAU_SB_DESCRIPTOR_PAGE_ADDRESS_MASK :  \
-       /*is_uv4_hub*/ UV4H_LB_BAU_SB_DESCRIPTOR_PAGE_ADDRESS_MASK)
-
-#define UVH_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_MASK (                   \
-       is_uv2_hub() ? UV2H_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_MASK :    \
-       is_uv3_hub() ? UV3H_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_MASK :    \
-       is_uv4a_hub() ? UV4AH_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_MASK :  \
-       /*is_uv4_hub*/ UV4H_LB_BAU_SB_DESCRIPTOR_BASE_NODE_ID_MASK)
+       /* UV5 unique struct */
+       struct uv5h_ipi_int_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   delivery_mode:3;                /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   rsvd_12_15:4;
+               unsigned long   apic_id:32;                     /* RW */
+               unsigned long   rsvd_48_62:15;
+               unsigned long   send:1;                         /* WP */
+       } s5;
+
+       /* UV4 unique struct */
+       struct uv4h_ipi_int_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   delivery_mode:3;                /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   rsvd_12_15:4;
+               unsigned long   apic_id:32;                     /* RW */
+               unsigned long   rsvd_48_62:15;
+               unsigned long   send:1;                         /* WP */
+       } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_ipi_int_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   delivery_mode:3;                /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   rsvd_12_15:4;
+               unsigned long   apic_id:32;                     /* RW */
+               unsigned long   rsvd_48_62:15;
+               unsigned long   send:1;                         /* WP */
+       } s3;
+
+       /* UV2 unique struct */
+       struct uv2h_ipi_int_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   delivery_mode:3;                /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   rsvd_12_15:4;
+               unsigned long   apic_id:32;                     /* RW */
+               unsigned long   rsvd_48_62:15;
+               unsigned long   send:1;                         /* WP */
+       } s2;
+};
 
 /* ========================================================================= */
 /*                               UVH_NODE_ID                                 */
 /* ========================================================================= */
 #define UVH_NODE_ID 0x0UL
-#define UV2H_NODE_ID 0x0UL
-#define UV3H_NODE_ID 0x0UL
-#define UV4H_NODE_ID 0x0UL
 
+/* UVH common defines*/
 #define UVH_NODE_ID_FORCE1_SHFT                                0
-#define UVH_NODE_ID_MANUFACTURER_SHFT                  1
-#define UVH_NODE_ID_PART_NUMBER_SHFT                   12
-#define UVH_NODE_ID_REVISION_SHFT                      28
-#define UVH_NODE_ID_NODE_ID_SHFT                       32
 #define UVH_NODE_ID_FORCE1_MASK                                0x0000000000000001UL
+#define UVH_NODE_ID_MANUFACTURER_SHFT                  1
 #define UVH_NODE_ID_MANUFACTURER_MASK                  0x0000000000000ffeUL
+#define UVH_NODE_ID_PART_NUMBER_SHFT                   12
 #define UVH_NODE_ID_PART_NUMBER_MASK                   0x000000000ffff000UL
+#define UVH_NODE_ID_REVISION_SHFT                      28
 #define UVH_NODE_ID_REVISION_MASK                      0x00000000f0000000UL
-#define UVH_NODE_ID_NODE_ID_MASK                       0x00007fff00000000UL
+#define UVH_NODE_ID_NODE_ID_SHFT                       32
+#define UVH_NODE_ID_NI_PORT_SHFT                       57
 
-#define UVXH_NODE_ID_FORCE1_SHFT                       0
-#define UVXH_NODE_ID_MANUFACTURER_SHFT                 1
-#define UVXH_NODE_ID_PART_NUMBER_SHFT                  12
-#define UVXH_NODE_ID_REVISION_SHFT                     28
-#define UVXH_NODE_ID_NODE_ID_SHFT                      32
-#define UVXH_NODE_ID_NODES_PER_BIT_SHFT                        50
-#define UVXH_NODE_ID_NI_PORT_SHFT                      57
-#define UVXH_NODE_ID_FORCE1_MASK                       0x0000000000000001UL
-#define UVXH_NODE_ID_MANUFACTURER_MASK                 0x0000000000000ffeUL
-#define UVXH_NODE_ID_PART_NUMBER_MASK                  0x000000000ffff000UL
-#define UVXH_NODE_ID_REVISION_MASK                     0x00000000f0000000UL
+/* UVXH common defines */
 #define UVXH_NODE_ID_NODE_ID_MASK                      0x00007fff00000000UL
+#define UVXH_NODE_ID_NODES_PER_BIT_SHFT                        50
 #define UVXH_NODE_ID_NODES_PER_BIT_MASK                        0x01fc000000000000UL
 #define UVXH_NODE_ID_NI_PORT_MASK                      0x3e00000000000000UL
 
-#define UV2H_NODE_ID_FORCE1_SHFT                       0
-#define UV2H_NODE_ID_MANUFACTURER_SHFT                 1
-#define UV2H_NODE_ID_PART_NUMBER_SHFT                  12
-#define UV2H_NODE_ID_REVISION_SHFT                     28
-#define UV2H_NODE_ID_NODE_ID_SHFT                      32
-#define UV2H_NODE_ID_NODES_PER_BIT_SHFT                        50
-#define UV2H_NODE_ID_NI_PORT_SHFT                      57
-#define UV2H_NODE_ID_FORCE1_MASK                       0x0000000000000001UL
-#define UV2H_NODE_ID_MANUFACTURER_MASK                 0x0000000000000ffeUL
-#define UV2H_NODE_ID_PART_NUMBER_MASK                  0x000000000ffff000UL
-#define UV2H_NODE_ID_REVISION_MASK                     0x00000000f0000000UL
-#define UV2H_NODE_ID_NODE_ID_MASK                      0x00007fff00000000UL
-#define UV2H_NODE_ID_NODES_PER_BIT_MASK                        0x01fc000000000000UL
-#define UV2H_NODE_ID_NI_PORT_MASK                      0x3e00000000000000UL
-
-#define UV3H_NODE_ID_FORCE1_SHFT                       0
-#define UV3H_NODE_ID_MANUFACTURER_SHFT                 1
-#define UV3H_NODE_ID_PART_NUMBER_SHFT                  12
-#define UV3H_NODE_ID_REVISION_SHFT                     28
-#define UV3H_NODE_ID_NODE_ID_SHFT                      32
-#define UV3H_NODE_ID_ROUTER_SELECT_SHFT                        48
-#define UV3H_NODE_ID_RESERVED_2_SHFT                   49
-#define UV3H_NODE_ID_NODES_PER_BIT_SHFT                        50
-#define UV3H_NODE_ID_NI_PORT_SHFT                      57
-#define UV3H_NODE_ID_FORCE1_MASK                       0x0000000000000001UL
-#define UV3H_NODE_ID_MANUFACTURER_MASK                 0x0000000000000ffeUL
-#define UV3H_NODE_ID_PART_NUMBER_MASK                  0x000000000ffff000UL
-#define UV3H_NODE_ID_REVISION_MASK                     0x00000000f0000000UL
-#define UV3H_NODE_ID_NODE_ID_MASK                      0x00007fff00000000UL
-#define UV3H_NODE_ID_ROUTER_SELECT_MASK                        0x0001000000000000UL
-#define UV3H_NODE_ID_RESERVED_2_MASK                   0x0002000000000000UL
-#define UV3H_NODE_ID_NODES_PER_BIT_MASK                        0x01fc000000000000UL
-#define UV3H_NODE_ID_NI_PORT_MASK                      0x3e00000000000000UL
-
-#define UV4H_NODE_ID_FORCE1_SHFT                       0
-#define UV4H_NODE_ID_MANUFACTURER_SHFT                 1
-#define UV4H_NODE_ID_PART_NUMBER_SHFT                  12
-#define UV4H_NODE_ID_REVISION_SHFT                     28
-#define UV4H_NODE_ID_NODE_ID_SHFT                      32
+/* UVYH common defines */
+#define UVYH_NODE_ID_NODE_ID_MASK                      0x0000007f00000000UL
+#define UVYH_NODE_ID_NI_PORT_MASK                      0x7e00000000000000UL
+
+/* UV4 unique defines */
 #define UV4H_NODE_ID_ROUTER_SELECT_SHFT                        48
-#define UV4H_NODE_ID_RESERVED_2_SHFT                   49
-#define UV4H_NODE_ID_NODES_PER_BIT_SHFT                        50
-#define UV4H_NODE_ID_NI_PORT_SHFT                      57
-#define UV4H_NODE_ID_FORCE1_MASK                       0x0000000000000001UL
-#define UV4H_NODE_ID_MANUFACTURER_MASK                 0x0000000000000ffeUL
-#define UV4H_NODE_ID_PART_NUMBER_MASK                  0x000000000ffff000UL
-#define UV4H_NODE_ID_REVISION_MASK                     0x00000000f0000000UL
-#define UV4H_NODE_ID_NODE_ID_MASK                      0x00007fff00000000UL
 #define UV4H_NODE_ID_ROUTER_SELECT_MASK                        0x0001000000000000UL
+#define UV4H_NODE_ID_RESERVED_2_SHFT                   49
 #define UV4H_NODE_ID_RESERVED_2_MASK                   0x0002000000000000UL
-#define UV4H_NODE_ID_NODES_PER_BIT_MASK                        0x01fc000000000000UL
-#define UV4H_NODE_ID_NI_PORT_MASK                      0x3e00000000000000UL
+
+/* UV3 unique defines */
+#define UV3H_NODE_ID_ROUTER_SELECT_SHFT                        48
+#define UV3H_NODE_ID_ROUTER_SELECT_MASK                        0x0001000000000000UL
+#define UV3H_NODE_ID_RESERVED_2_SHFT                   49
+#define UV3H_NODE_ID_RESERVED_2_MASK                   0x0002000000000000UL
 
 
 union uvh_node_id_u {
        unsigned long   v;
+
+       /* UVH common struct */
        struct uvh_node_id_s {
                unsigned long   force1:1;                       /* RO */
                unsigned long   manufacturer:11;                /* RO */
                unsigned long   part_number:16;                 /* RO */
                unsigned long   revision:4;                     /* RO */
-               unsigned long   node_id:15;                     /* RW */
-               unsigned long   rsvd_47_63:17;
+               unsigned long   rsvd_32_63:32;
        } s;
+
+       /* UVXH common struct */
        struct uvxh_node_id_s {
                unsigned long   force1:1;                       /* RO */
                unsigned long   manufacturer:11;                /* RO */
@@ -2444,17 +2840,47 @@ union uvh_node_id_u {
                unsigned long   ni_port:5;                      /* RO */
                unsigned long   rsvd_62_63:2;
        } sx;
-       struct uv2h_node_id_s {
+
+       /* UVYH common struct */
+       struct uvyh_node_id_s {
+               unsigned long   force1:1;                       /* RO */
+               unsigned long   manufacturer:11;                /* RO */
+               unsigned long   part_number:16;                 /* RO */
+               unsigned long   revision:4;                     /* RO */
+               unsigned long   node_id:7;                      /* RW */
+               unsigned long   rsvd_39_56:18;
+               unsigned long   ni_port:6;                      /* RO */
+               unsigned long   rsvd_63:1;
+       } sy;
+
+       /* UV5 unique struct */
+       struct uv5h_node_id_s {
+               unsigned long   force1:1;                       /* RO */
+               unsigned long   manufacturer:11;                /* RO */
+               unsigned long   part_number:16;                 /* RO */
+               unsigned long   revision:4;                     /* RO */
+               unsigned long   node_id:7;                      /* RW */
+               unsigned long   rsvd_39_56:18;
+               unsigned long   ni_port:6;                      /* RO */
+               unsigned long   rsvd_63:1;
+       } s5;
+
+       /* UV4 unique struct */
+       struct uv4h_node_id_s {
                unsigned long   force1:1;                       /* RO */
                unsigned long   manufacturer:11;                /* RO */
                unsigned long   part_number:16;                 /* RO */
                unsigned long   revision:4;                     /* RO */
                unsigned long   node_id:15;                     /* RW */
-               unsigned long   rsvd_47_49:3;
+               unsigned long   rsvd_47:1;
+               unsigned long   router_select:1;                /* RO */
+               unsigned long   rsvd_49:1;
                unsigned long   nodes_per_bit:7;                /* RO */
                unsigned long   ni_port:5;                      /* RO */
                unsigned long   rsvd_62_63:2;
-       } s2;
+       } s4;
+
+       /* UV3 unique struct */
        struct uv3h_node_id_s {
                unsigned long   force1:1;                       /* RO */
                unsigned long   manufacturer:11;                /* RO */
@@ -2468,1642 +2894,1743 @@ union uvh_node_id_u {
                unsigned long   ni_port:5;                      /* RO */
                unsigned long   rsvd_62_63:2;
        } s3;
-       struct uv4h_node_id_s {
+
+       /* UV2 unique struct */
+       struct uv2h_node_id_s {
                unsigned long   force1:1;                       /* RO */
                unsigned long   manufacturer:11;                /* RO */
                unsigned long   part_number:16;                 /* RO */
                unsigned long   revision:4;                     /* RO */
                unsigned long   node_id:15;                     /* RW */
-               unsigned long   rsvd_47:1;
-               unsigned long   router_select:1;                /* RO */
-               unsigned long   rsvd_49:1;
+               unsigned long   rsvd_47_49:3;
                unsigned long   nodes_per_bit:7;                /* RO */
                unsigned long   ni_port:5;                      /* RO */
                unsigned long   rsvd_62_63:2;
-       } s4;
+       } s2;
+};
+
+/* ========================================================================= */
+/*                            UVH_NODE_PRESENT_0                             */
+/* ========================================================================= */
+#define UVH_NODE_PRESENT_0 (                                           \
+       is_uv(UV5) ? 0x1400UL :                                         \
+       0)
+
+
+/* UVYH common defines */
+#define UVYH_NODE_PRESENT_0_NODES_SHFT                 0
+#define UVYH_NODE_PRESENT_0_NODES_MASK                 0xffffffffffffffffUL
+
+
+union uvh_node_present_0_u {
+       unsigned long   v;
+
+       /* UVH common struct */
+       struct uvh_node_present_0_s {
+               unsigned long   nodes:64;                       /* RW */
+       } s;
+
+       /* UVYH common struct */
+       struct uvyh_node_present_0_s {
+               unsigned long   nodes:64;                       /* RW */
+       } sy;
+
+       /* UV5 unique struct */
+       struct uv5h_node_present_0_s {
+               unsigned long   nodes:64;                       /* RW */
+       } s5;
+};
+
+/* ========================================================================= */
+/*                            UVH_NODE_PRESENT_1                             */
+/* ========================================================================= */
+#define UVH_NODE_PRESENT_1 (                                           \
+       is_uv(UV5) ? 0x1408UL :                                         \
+       0)
+
+
+/* UVYH common defines */
+#define UVYH_NODE_PRESENT_1_NODES_SHFT                 0
+#define UVYH_NODE_PRESENT_1_NODES_MASK                 0xffffffffffffffffUL
+
+
+union uvh_node_present_1_u {
+       unsigned long   v;
+
+       /* UVH common struct */
+       struct uvh_node_present_1_s {
+               unsigned long   nodes:64;                       /* RW */
+       } s;
+
+       /* UVYH common struct */
+       struct uvyh_node_present_1_s {
+               unsigned long   nodes:64;                       /* RW */
+       } sy;
+
+       /* UV5 unique struct */
+       struct uv5h_node_present_1_s {
+               unsigned long   nodes:64;                       /* RW */
+       } s5;
 };
 
 /* ========================================================================= */
 /*                          UVH_NODE_PRESENT_TABLE                           */
 /* ========================================================================= */
-#define UVH_NODE_PRESENT_TABLE 0x1400UL
+#define UVH_NODE_PRESENT_TABLE (                                       \
+       is_uv(UV4) ? 0x1400UL :                                         \
+       is_uv(UV3) ? 0x1400UL :                                         \
+       is_uv(UV2) ? 0x1400UL :                                         \
+       0)
 
-#define UV2H_NODE_PRESENT_TABLE_DEPTH 16
-#define UV3H_NODE_PRESENT_TABLE_DEPTH 16
-#define UV4H_NODE_PRESENT_TABLE_DEPTH 4
 #define UVH_NODE_PRESENT_TABLE_DEPTH (                                 \
-       is_uv2_hub() ? UV2H_NODE_PRESENT_TABLE_DEPTH :                  \
-       is_uv3_hub() ? UV3H_NODE_PRESENT_TABLE_DEPTH :                  \
-       /*is_uv4_hub*/ UV4H_NODE_PRESENT_TABLE_DEPTH)
+       is_uv(UV4) ? 4 :                                                \
+       is_uv(UV3) ? 16 :                                               \
+       is_uv(UV2) ? 16 :                                               \
+       0)
+
 
-#define UVH_NODE_PRESENT_TABLE_NODES_SHFT              0
-#define UVH_NODE_PRESENT_TABLE_NODES_MASK              0xffffffffffffffffUL
+/* UVXH common defines */
+#define UVXH_NODE_PRESENT_TABLE_NODES_SHFT             0
+#define UVXH_NODE_PRESENT_TABLE_NODES_MASK             0xffffffffffffffffUL
 
 
 union uvh_node_present_table_u {
        unsigned long   v;
+
+       /* UVH common struct */
        struct uvh_node_present_table_s {
                unsigned long   nodes:64;                       /* RW */
        } s;
+
+       /* UVXH common struct */
+       struct uvxh_node_present_table_s {
+               unsigned long   nodes:64;                       /* RW */
+       } sx;
+
+       /* UV4 unique struct */
+       struct uv4h_node_present_table_s {
+               unsigned long   nodes:64;                       /* RW */
+       } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_node_present_table_s {
+               unsigned long   nodes:64;                       /* RW */
+       } s3;
+
+       /* UV2 unique struct */
+       struct uv2h_node_present_table_s {
+               unsigned long   nodes:64;                       /* RW */
+       } s2;
 };
 
 /* ========================================================================= */
-/*                 UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR                  */
+/*                       UVH_RH10_GAM_ADDR_MAP_CONFIG                        */
 /* ========================================================================= */
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR 0x16000c8UL
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR 0x16000c8UL
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR 0x4800c8UL
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR (                     \
-       is_uv2_hub() ? UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR :      \
-       is_uv3_hub() ? UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR :      \
-       /*is_uv4_hub*/ UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR)
-
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_BASE_SHFT 24
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_M_ALIAS_SHFT 48
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_ENABLE_SHFT 63
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_BASE_MASK 0x00000000ff000000UL
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_M_ALIAS_MASK 0x001f000000000000UL
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_BASE_SHFT 24
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_M_ALIAS_SHFT 48
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_ENABLE_SHFT 63
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_BASE_MASK 0x00000000ff000000UL
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_M_ALIAS_MASK 0x001f000000000000UL
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_BASE_SHFT 24
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_M_ALIAS_SHFT 48
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_ENABLE_SHFT 63
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_BASE_MASK 0x00000000ff000000UL
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_M_ALIAS_MASK 0x001f000000000000UL
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_BASE_SHFT 24
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_M_ALIAS_SHFT 48
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_ENABLE_SHFT 63
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_BASE_MASK 0x00000000ff000000UL
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_M_ALIAS_MASK 0x001f000000000000UL
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_BASE_SHFT 24
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_M_ALIAS_SHFT 48
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_ENABLE_SHFT 63
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_BASE_MASK 0x00000000ff000000UL
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_M_ALIAS_MASK 0x001f000000000000UL
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR_ENABLE_MASK 0x8000000000000000UL
-
-
-union uvh_rh_gam_alias210_overlay_config_0_mmr_u {
+#define UVH_RH10_GAM_ADDR_MAP_CONFIG (                                 \
+       is_uv(UV5) ? 0x470000UL :                                       \
+       0)
+
+
+/* UVYH common defines */
+#define UVYH_RH10_GAM_ADDR_MAP_CONFIG_N_SKT_SHFT       6
+#define UVYH_RH10_GAM_ADDR_MAP_CONFIG_N_SKT_MASK       0x00000000000001c0UL
+#define UVYH_RH10_GAM_ADDR_MAP_CONFIG_LS_ENABLE_SHFT   12
+#define UVYH_RH10_GAM_ADDR_MAP_CONFIG_LS_ENABLE_MASK   0x0000000000001000UL
+#define UVYH_RH10_GAM_ADDR_MAP_CONFIG_MK_TME_KEYID_BITS_SHFT 16
+#define UVYH_RH10_GAM_ADDR_MAP_CONFIG_MK_TME_KEYID_BITS_MASK 0x00000000000f0000UL
+
+
+union uvh_rh10_gam_addr_map_config_u {
        unsigned long   v;
-       struct uvh_rh_gam_alias210_overlay_config_0_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   base:8;                         /* RW */
-               unsigned long   rsvd_32_47:16;
-               unsigned long   m_alias:5;                      /* RW */
-               unsigned long   rsvd_53_62:10;
-               unsigned long   enable:1;                       /* RW */
+
+       /* UVH common struct */
+       struct uvh_rh10_gam_addr_map_config_s {
+               unsigned long   undef_0_5:6;                    /* Undefined */
+               unsigned long   n_skt:3;                        /* RW */
+               unsigned long   undef_9_11:3;                   /* Undefined */
+               unsigned long   ls_enable:1;                    /* RW */
+               unsigned long   undef_13_15:3;                  /* Undefined */
+               unsigned long   mk_tme_keyid_bits:4;            /* RW */
+               unsigned long   rsvd_20_63:44;
        } s;
-       struct uvxh_rh_gam_alias210_overlay_config_0_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   base:8;                         /* RW */
-               unsigned long   rsvd_32_47:16;
-               unsigned long   m_alias:5;                      /* RW */
-               unsigned long   rsvd_53_62:10;
-               unsigned long   enable:1;                       /* RW */
-       } sx;
-       struct uv2h_rh_gam_alias210_overlay_config_0_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   base:8;                         /* RW */
-               unsigned long   rsvd_32_47:16;
-               unsigned long   m_alias:5;                      /* RW */
-               unsigned long   rsvd_53_62:10;
-               unsigned long   enable:1;                       /* RW */
-       } s2;
-       struct uv3h_rh_gam_alias210_overlay_config_0_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   base:8;                         /* RW */
-               unsigned long   rsvd_32_47:16;
-               unsigned long   m_alias:5;                      /* RW */
-               unsigned long   rsvd_53_62:10;
-               unsigned long   enable:1;                       /* RW */
-       } s3;
-       struct uv4h_rh_gam_alias210_overlay_config_0_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   base:8;                         /* RW */
-               unsigned long   rsvd_32_47:16;
-               unsigned long   m_alias:5;                      /* RW */
-               unsigned long   rsvd_53_62:10;
-               unsigned long   enable:1;                       /* RW */
-       } s4;
+
+       /* UVYH common struct */
+       struct uvyh_rh10_gam_addr_map_config_s {
+               unsigned long   undef_0_5:6;                    /* Undefined */
+               unsigned long   n_skt:3;                        /* RW */
+               unsigned long   undef_9_11:3;                   /* Undefined */
+               unsigned long   ls_enable:1;                    /* RW */
+               unsigned long   undef_13_15:3;                  /* Undefined */
+               unsigned long   mk_tme_keyid_bits:4;            /* RW */
+               unsigned long   rsvd_20_63:44;
+       } sy;
+
+       /* UV5 unique struct */
+       struct uv5h_rh10_gam_addr_map_config_s {
+               unsigned long   undef_0_5:6;                    /* Undefined */
+               unsigned long   n_skt:3;                        /* RW */
+               unsigned long   undef_9_11:3;                   /* Undefined */
+               unsigned long   ls_enable:1;                    /* RW */
+               unsigned long   undef_13_15:3;                  /* Undefined */
+               unsigned long   mk_tme_keyid_bits:4;            /* RW */
+       } s5;
 };
 
 /* ========================================================================= */
-/*                 UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR                  */
+/*                     UVH_RH10_GAM_GRU_OVERLAY_CONFIG                       */
 /* ========================================================================= */
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR 0x16000d8UL
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR 0x16000d8UL
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR 0x4800d8UL
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR (                     \
-       is_uv2_hub() ? UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR :      \
-       is_uv3_hub() ? UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR :      \
-       /*is_uv4_hub*/ UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR)
-
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_BASE_SHFT 24
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_M_ALIAS_SHFT 48
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_ENABLE_SHFT 63
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_BASE_MASK 0x00000000ff000000UL
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_M_ALIAS_MASK 0x001f000000000000UL
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_BASE_SHFT 24
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_M_ALIAS_SHFT 48
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_ENABLE_SHFT 63
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_BASE_MASK 0x00000000ff000000UL
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_M_ALIAS_MASK 0x001f000000000000UL
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_BASE_SHFT 24
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_M_ALIAS_SHFT 48
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_ENABLE_SHFT 63
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_BASE_MASK 0x00000000ff000000UL
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_M_ALIAS_MASK 0x001f000000000000UL
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_BASE_SHFT 24
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_M_ALIAS_SHFT 48
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_ENABLE_SHFT 63
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_BASE_MASK 0x00000000ff000000UL
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_M_ALIAS_MASK 0x001f000000000000UL
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_BASE_SHFT 24
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_M_ALIAS_SHFT 48
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_ENABLE_SHFT 63
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_BASE_MASK 0x00000000ff000000UL
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_M_ALIAS_MASK 0x001f000000000000UL
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR_ENABLE_MASK 0x8000000000000000UL
-
-
-union uvh_rh_gam_alias210_overlay_config_1_mmr_u {
+#define UVH_RH10_GAM_GRU_OVERLAY_CONFIG (                              \
+       is_uv(UV5) ? 0x4700b0UL :                                       \
+       0)
+
+
+/* UVYH common defines */
+#define UVYH_RH10_GAM_GRU_OVERLAY_CONFIG_BASE_SHFT     25
+#define UVYH_RH10_GAM_GRU_OVERLAY_CONFIG_BASE_MASK     0x000ffffffe000000UL
+#define UVYH_RH10_GAM_GRU_OVERLAY_CONFIG_N_GRU_SHFT    52
+#define UVYH_RH10_GAM_GRU_OVERLAY_CONFIG_N_GRU_MASK    0x0070000000000000UL
+#define UVYH_RH10_GAM_GRU_OVERLAY_CONFIG_ENABLE_SHFT   63
+#define UVYH_RH10_GAM_GRU_OVERLAY_CONFIG_ENABLE_MASK   0x8000000000000000UL
+
+#define UVH_RH10_GAM_GRU_OVERLAY_CONFIG_BASE_MASK (                    \
+       is_uv(UV5) ? 0x000ffffffe000000UL :                             \
+       0)
+#define UVH_RH10_GAM_GRU_OVERLAY_CONFIG_BASE_SHFT (                    \
+       is_uv(UV5) ? 25 :                                               \
+       -1)
+
+union uvh_rh10_gam_gru_overlay_config_u {
        unsigned long   v;
-       struct uvh_rh_gam_alias210_overlay_config_1_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   base:8;                         /* RW */
-               unsigned long   rsvd_32_47:16;
-               unsigned long   m_alias:5;                      /* RW */
-               unsigned long   rsvd_53_62:10;
-               unsigned long   enable:1;                       /* RW */
-       } s;
-       struct uvxh_rh_gam_alias210_overlay_config_1_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   base:8;                         /* RW */
-               unsigned long   rsvd_32_47:16;
-               unsigned long   m_alias:5;                      /* RW */
-               unsigned long   rsvd_53_62:10;
-               unsigned long   enable:1;                       /* RW */
-       } sx;
-       struct uv2h_rh_gam_alias210_overlay_config_1_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   base:8;                         /* RW */
-               unsigned long   rsvd_32_47:16;
-               unsigned long   m_alias:5;                      /* RW */
-               unsigned long   rsvd_53_62:10;
-               unsigned long   enable:1;                       /* RW */
-       } s2;
-       struct uv3h_rh_gam_alias210_overlay_config_1_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   base:8;                         /* RW */
-               unsigned long   rsvd_32_47:16;
-               unsigned long   m_alias:5;                      /* RW */
-               unsigned long   rsvd_53_62:10;
-               unsigned long   enable:1;                       /* RW */
-       } s3;
-       struct uv4h_rh_gam_alias210_overlay_config_1_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   base:8;                         /* RW */
-               unsigned long   rsvd_32_47:16;
-               unsigned long   m_alias:5;                      /* RW */
-               unsigned long   rsvd_53_62:10;
+
+       /* UVH common struct */
+       struct uvh_rh10_gam_gru_overlay_config_s {
+               unsigned long   undef_0_24:25;                  /* Undefined */
+               unsigned long   base:27;                        /* RW */
+               unsigned long   n_gru:3;                        /* RW */
+               unsigned long   undef_55_62:8;                  /* Undefined */
                unsigned long   enable:1;                       /* RW */
-       } s4;
+       } s;
+
+       /* UVYH common struct */
+       struct uvyh_rh10_gam_gru_overlay_config_s {
+               unsigned long   undef_0_24:25;                  /* Undefined */
+               unsigned long   base:27;                        /* RW */
+               unsigned long   n_gru:3;                        /* RW */
+               unsigned long   undef_55_62:8;                  /* Undefined */
+               unsigned long   enable:1;                       /* RW */
+       } sy;
+
+       /* UV5 unique struct */
+       struct uv5h_rh10_gam_gru_overlay_config_s {
+               unsigned long   undef_0_24:25;                  /* Undefined */
+               unsigned long   base:27;                        /* RW */
+               unsigned long   n_gru:3;                        /* RW */
+               unsigned long   undef_55_62:8;                  /* Undefined */
+               unsigned long   enable:1;                       /* RW */
+       } s5;
 };
 
 /* ========================================================================= */
-/*                 UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR                  */
+/*                    UVH_RH10_GAM_MMIOH_OVERLAY_CONFIG0                     */
 /* ========================================================================= */
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR 0x16000e8UL
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR 0x16000e8UL
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR 0x4800e8UL
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR (                     \
-       is_uv2_hub() ? UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR :      \
-       is_uv3_hub() ? UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR :      \
-       /*is_uv4_hub*/ UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR)
-
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_BASE_SHFT 24
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_M_ALIAS_SHFT 48
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_ENABLE_SHFT 63
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_BASE_MASK 0x00000000ff000000UL
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_M_ALIAS_MASK 0x001f000000000000UL
-#define UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_BASE_SHFT 24
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_M_ALIAS_SHFT 48
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_ENABLE_SHFT 63
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_BASE_MASK 0x00000000ff000000UL
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_M_ALIAS_MASK 0x001f000000000000UL
-#define UVXH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_BASE_SHFT 24
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_M_ALIAS_SHFT 48
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_ENABLE_SHFT 63
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_BASE_MASK 0x00000000ff000000UL
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_M_ALIAS_MASK 0x001f000000000000UL
-#define UV2H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_BASE_SHFT 24
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_M_ALIAS_SHFT 48
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_ENABLE_SHFT 63
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_BASE_MASK 0x00000000ff000000UL
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_M_ALIAS_MASK 0x001f000000000000UL
-#define UV3H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_BASE_SHFT 24
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_M_ALIAS_SHFT 48
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_ENABLE_SHFT 63
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_BASE_MASK 0x00000000ff000000UL
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_M_ALIAS_MASK 0x001f000000000000UL
-#define UV4H_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR_ENABLE_MASK 0x8000000000000000UL
-
-
-union uvh_rh_gam_alias210_overlay_config_2_mmr_u {
+#define UVH_RH10_GAM_MMIOH_OVERLAY_CONFIG0 (                           \
+       is_uv(UV5) ? 0x473000UL :                                       \
+       0)
+
+
+/* UVYH common defines */
+#define UVYH_RH10_GAM_MMIOH_OVERLAY_CONFIG0_BASE_SHFT  26
+#define UVYH_RH10_GAM_MMIOH_OVERLAY_CONFIG0_BASE_MASK  0x000ffffffc000000UL
+#define UVYH_RH10_GAM_MMIOH_OVERLAY_CONFIG0_M_IO_SHFT  52
+#define UVYH_RH10_GAM_MMIOH_OVERLAY_CONFIG0_M_IO_MASK  0x03f0000000000000UL
+#define UVYH_RH10_GAM_MMIOH_OVERLAY_CONFIG0_ENABLE_SHFT        63
+#define UVYH_RH10_GAM_MMIOH_OVERLAY_CONFIG0_ENABLE_MASK        0x8000000000000000UL
+
+#define UVH_RH10_GAM_MMIOH_OVERLAY_CONFIG0_BASE_MASK (                 \
+       is_uv(UV5) ? 0x000ffffffc000000UL :                             \
+       0)
+#define UVH_RH10_GAM_MMIOH_OVERLAY_CONFIG0_BASE_SHFT (                 \
+       is_uv(UV5) ? 26 :                                               \
+       -1)
+
+union uvh_rh10_gam_mmioh_overlay_config0_u {
        unsigned long   v;
-       struct uvh_rh_gam_alias210_overlay_config_2_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   base:8;                         /* RW */
-               unsigned long   rsvd_32_47:16;
-               unsigned long   m_alias:5;                      /* RW */
-               unsigned long   rsvd_53_62:10;
+
+       /* UVH common struct */
+       struct uvh_rh10_gam_mmioh_overlay_config0_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:26;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;
+               unsigned long   undef_62:1;                     /* Undefined */
                unsigned long   enable:1;                       /* RW */
        } s;
-       struct uvxh_rh_gam_alias210_overlay_config_2_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   base:8;                         /* RW */
-               unsigned long   rsvd_32_47:16;
-               unsigned long   m_alias:5;                      /* RW */
-               unsigned long   rsvd_53_62:10;
-               unsigned long   enable:1;                       /* RW */
-       } sx;
-       struct uv2h_rh_gam_alias210_overlay_config_2_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   base:8;                         /* RW */
-               unsigned long   rsvd_32_47:16;
-               unsigned long   m_alias:5;                      /* RW */
-               unsigned long   rsvd_53_62:10;
-               unsigned long   enable:1;                       /* RW */
-       } s2;
-       struct uv3h_rh_gam_alias210_overlay_config_2_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   base:8;                         /* RW */
-               unsigned long   rsvd_32_47:16;
-               unsigned long   m_alias:5;                      /* RW */
-               unsigned long   rsvd_53_62:10;
+
+       /* UVYH common struct */
+       struct uvyh_rh10_gam_mmioh_overlay_config0_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:26;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;
+               unsigned long   undef_62:1;                     /* Undefined */
                unsigned long   enable:1;                       /* RW */
-       } s3;
-       struct uv4h_rh_gam_alias210_overlay_config_2_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   base:8;                         /* RW */
-               unsigned long   rsvd_32_47:16;
-               unsigned long   m_alias:5;                      /* RW */
-               unsigned long   rsvd_53_62:10;
+       } sy;
+
+       /* UV5 unique struct */
+       struct uv5h_rh10_gam_mmioh_overlay_config0_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:26;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;
+               unsigned long   undef_62:1;                     /* Undefined */
                unsigned long   enable:1;                       /* RW */
-       } s4;
+       } s5;
 };
 
 /* ========================================================================= */
-/*                UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR                  */
+/*                    UVH_RH10_GAM_MMIOH_OVERLAY_CONFIG1                     */
 /* ========================================================================= */
-#define UV2H_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR 0x16000d0UL
-#define UV3H_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR 0x16000d0UL
-#define UV4H_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR 0x4800d0UL
-#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR (                    \
-       is_uv2_hub() ? UV2H_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR :     \
-       is_uv3_hub() ? UV3H_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR :     \
-       /*is_uv4_hub*/ UV4H_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR)
+#define UVH_RH10_GAM_MMIOH_OVERLAY_CONFIG1 (                           \
+       is_uv(UV5) ? 0x474000UL :                                       \
+       0)
+
+
+/* UVYH common defines */
+#define UVYH_RH10_GAM_MMIOH_OVERLAY_CONFIG1_BASE_SHFT  26
+#define UVYH_RH10_GAM_MMIOH_OVERLAY_CONFIG1_BASE_MASK  0x000ffffffc000000UL
+#define UVYH_RH10_GAM_MMIOH_OVERLAY_CONFIG1_M_IO_SHFT  52
+#define UVYH_RH10_GAM_MMIOH_OVERLAY_CONFIG1_M_IO_MASK  0x03f0000000000000UL
+#define UVYH_RH10_GAM_MMIOH_OVERLAY_CONFIG1_ENABLE_SHFT        63
+#define UVYH_RH10_GAM_MMIOH_OVERLAY_CONFIG1_ENABLE_MASK        0x8000000000000000UL
+
+#define UVH_RH10_GAM_MMIOH_OVERLAY_CONFIG1_BASE_MASK (                 \
+       is_uv(UV5) ? 0x000ffffffc000000UL :                             \
+       0)
+#define UVH_RH10_GAM_MMIOH_OVERLAY_CONFIG1_BASE_SHFT (                 \
+       is_uv(UV5) ? 26 :                                               \
+       -1)
+
+union uvh_rh10_gam_mmioh_overlay_config1_u {
+       unsigned long   v;
+
+       /* UVH common struct */
+       struct uvh_rh10_gam_mmioh_overlay_config1_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:26;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;
+               unsigned long   undef_62:1;                     /* Undefined */
+               unsigned long   enable:1;                       /* RW */
+       } s;
+
+       /* UVYH common struct */
+       struct uvyh_rh10_gam_mmioh_overlay_config1_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:26;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;
+               unsigned long   undef_62:1;                     /* Undefined */
+               unsigned long   enable:1;                       /* RW */
+       } sy;
 
-#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR_DEST_BASE_SHFT 24
-#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR_DEST_BASE_MASK 0x00003fffff000000UL
+       /* UV5 unique struct */
+       struct uv5h_rh10_gam_mmioh_overlay_config1_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:26;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;
+               unsigned long   undef_62:1;                     /* Undefined */
+               unsigned long   enable:1;                       /* RW */
+       } s5;
+};
 
-#define UVXH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR_DEST_BASE_SHFT 24
-#define UVXH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR_DEST_BASE_MASK 0x00003fffff000000UL
+/* ========================================================================= */
+/*                   UVH_RH10_GAM_MMIOH_REDIRECT_CONFIG0                     */
+/* ========================================================================= */
+#define UVH_RH10_GAM_MMIOH_REDIRECT_CONFIG0 (                          \
+       is_uv(UV5) ? 0x473800UL :                                       \
+       0)
 
-#define UV2H_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR_DEST_BASE_SHFT 24
-#define UV2H_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR_DEST_BASE_MASK 0x00003fffff000000UL
+#define UVH_RH10_GAM_MMIOH_REDIRECT_CONFIG0_DEPTH (                    \
+       is_uv(UV5) ? 128 :                                              \
+       0)
 
-#define UV3H_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR_DEST_BASE_SHFT 24
-#define UV3H_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR_DEST_BASE_MASK 0x00003fffff000000UL
 
-#define UV4H_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR_DEST_BASE_SHFT 24
-#define UV4H_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR_DEST_BASE_MASK 0x00003fffff000000UL
+/* UVYH common defines */
+#define UVYH_RH10_GAM_MMIOH_REDIRECT_CONFIG0_NASID_SHFT        0
+#define UVYH_RH10_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK        0x000000000000007fUL
 
 
-union uvh_rh_gam_alias210_redirect_config_0_mmr_u {
+union uvh_rh10_gam_mmioh_redirect_config0_u {
        unsigned long   v;
-       struct uvh_rh_gam_alias210_redirect_config_0_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   dest_base:22;                   /* RW */
-               unsigned long   rsvd_46_63:18;
+
+       /* UVH common struct */
+       struct uvh_rh10_gam_mmioh_redirect_config0_s {
+               unsigned long   nasid:7;                        /* RW */
+               unsigned long   rsvd_7_63:57;
        } s;
-       struct uvxh_rh_gam_alias210_redirect_config_0_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   dest_base:22;                   /* RW */
-               unsigned long   rsvd_46_63:18;
-       } sx;
-       struct uv2h_rh_gam_alias210_redirect_config_0_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   dest_base:22;                   /* RW */
-               unsigned long   rsvd_46_63:18;
-       } s2;
-       struct uv3h_rh_gam_alias210_redirect_config_0_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   dest_base:22;                   /* RW */
-               unsigned long   rsvd_46_63:18;
-       } s3;
-       struct uv4h_rh_gam_alias210_redirect_config_0_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   dest_base:22;                   /* RW */
-               unsigned long   rsvd_46_63:18;
-       } s4;
+
+       /* UVYH common struct */
+       struct uvyh_rh10_gam_mmioh_redirect_config0_s {
+               unsigned long   nasid:7;                        /* RW */
+               unsigned long   rsvd_7_63:57;
+       } sy;
+
+       /* UV5 unique struct */
+       struct uv5h_rh10_gam_mmioh_redirect_config0_s {
+               unsigned long   nasid:7;                        /* RW */
+               unsigned long   rsvd_7_63:57;
+       } s5;
 };
 
 /* ========================================================================= */
-/*                UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR                  */
+/*                   UVH_RH10_GAM_MMIOH_REDIRECT_CONFIG1                     */
 /* ========================================================================= */
-#define UV2H_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR 0x16000e0UL
-#define UV3H_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR 0x16000e0UL
-#define UV4H_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR 0x4800e0UL
-#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR (                    \
-       is_uv2_hub() ? UV2H_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR :     \
-       is_uv3_hub() ? UV3H_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR :     \
-       /*is_uv4_hub*/ UV4H_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR)
+#define UVH_RH10_GAM_MMIOH_REDIRECT_CONFIG1 (                          \
+       is_uv(UV5) ? 0x474800UL :                                       \
+       0)
 
-#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR_DEST_BASE_SHFT 24
-#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR_DEST_BASE_MASK 0x00003fffff000000UL
+#define UVH_RH10_GAM_MMIOH_REDIRECT_CONFIG1_DEPTH (                    \
+       is_uv(UV5) ? 128 :                                              \
+       0)
 
-#define UVXH_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR_DEST_BASE_SHFT 24
-#define UVXH_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR_DEST_BASE_MASK 0x00003fffff000000UL
 
-#define UV2H_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR_DEST_BASE_SHFT 24
-#define UV2H_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR_DEST_BASE_MASK 0x00003fffff000000UL
+/* UVYH common defines */
+#define UVYH_RH10_GAM_MMIOH_REDIRECT_CONFIG1_NASID_SHFT        0
+#define UVYH_RH10_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK        0x000000000000007fUL
 
-#define UV3H_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR_DEST_BASE_SHFT 24
-#define UV3H_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR_DEST_BASE_MASK 0x00003fffff000000UL
 
-#define UV4H_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR_DEST_BASE_SHFT 24
-#define UV4H_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR_DEST_BASE_MASK 0x00003fffff000000UL
-
-
-union uvh_rh_gam_alias210_redirect_config_1_mmr_u {
+union uvh_rh10_gam_mmioh_redirect_config1_u {
        unsigned long   v;
-       struct uvh_rh_gam_alias210_redirect_config_1_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   dest_base:22;                   /* RW */
-               unsigned long   rsvd_46_63:18;
+
+       /* UVH common struct */
+       struct uvh_rh10_gam_mmioh_redirect_config1_s {
+               unsigned long   nasid:7;                        /* RW */
+               unsigned long   rsvd_7_63:57;
        } s;
-       struct uvxh_rh_gam_alias210_redirect_config_1_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   dest_base:22;                   /* RW */
-               unsigned long   rsvd_46_63:18;
-       } sx;
-       struct uv2h_rh_gam_alias210_redirect_config_1_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   dest_base:22;                   /* RW */
-               unsigned long   rsvd_46_63:18;
-       } s2;
-       struct uv3h_rh_gam_alias210_redirect_config_1_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   dest_base:22;                   /* RW */
-               unsigned long   rsvd_46_63:18;
-       } s3;
-       struct uv4h_rh_gam_alias210_redirect_config_1_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   dest_base:22;                   /* RW */
-               unsigned long   rsvd_46_63:18;
-       } s4;
+
+       /* UVYH common struct */
+       struct uvyh_rh10_gam_mmioh_redirect_config1_s {
+               unsigned long   nasid:7;                        /* RW */
+               unsigned long   rsvd_7_63:57;
+       } sy;
+
+       /* UV5 unique struct */
+       struct uv5h_rh10_gam_mmioh_redirect_config1_s {
+               unsigned long   nasid:7;                        /* RW */
+               unsigned long   rsvd_7_63:57;
+       } s5;
 };
 
 /* ========================================================================= */
-/*                UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR                  */
+/*                     UVH_RH10_GAM_MMR_OVERLAY_CONFIG                       */
 /* ========================================================================= */
-#define UV2H_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR 0x16000f0UL
-#define UV3H_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR 0x16000f0UL
-#define UV4H_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR 0x4800f0UL
-#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR (                    \
-       is_uv2_hub() ? UV2H_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR :     \
-       is_uv3_hub() ? UV3H_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR :     \
-       /*is_uv4_hub*/ UV4H_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR)
+#define UVH_RH10_GAM_MMR_OVERLAY_CONFIG (                              \
+       is_uv(UV5) ? 0x470090UL :                                       \
+       0)
 
-#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR_DEST_BASE_SHFT 24
-#define UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR_DEST_BASE_MASK 0x00003fffff000000UL
 
-#define UVXH_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR_DEST_BASE_SHFT 24
-#define UVXH_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR_DEST_BASE_MASK 0x00003fffff000000UL
+/* UVYH common defines */
+#define UVYH_RH10_GAM_MMR_OVERLAY_CONFIG_BASE_SHFT     25
+#define UVYH_RH10_GAM_MMR_OVERLAY_CONFIG_BASE_MASK     0x000ffffffe000000UL
+#define UVYH_RH10_GAM_MMR_OVERLAY_CONFIG_ENABLE_SHFT   63
+#define UVYH_RH10_GAM_MMR_OVERLAY_CONFIG_ENABLE_MASK   0x8000000000000000UL
 
-#define UV2H_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR_DEST_BASE_SHFT 24
-#define UV2H_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR_DEST_BASE_MASK 0x00003fffff000000UL
+#define UVH_RH10_GAM_MMR_OVERLAY_CONFIG_BASE_MASK (                    \
+       is_uv(UV5) ? 0x000ffffffe000000UL :                             \
+       0)
+#define UVH_RH10_GAM_MMR_OVERLAY_CONFIG_BASE_SHFT (                    \
+       is_uv(UV5) ? 25 :                                               \
+       -1)
 
-#define UV3H_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR_DEST_BASE_SHFT 24
-#define UV3H_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR_DEST_BASE_MASK 0x00003fffff000000UL
+union uvh_rh10_gam_mmr_overlay_config_u {
+       unsigned long   v;
 
-#define UV4H_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR_DEST_BASE_SHFT 24
-#define UV4H_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR_DEST_BASE_MASK 0x00003fffff000000UL
+       /* UVH common struct */
+       struct uvh_rh10_gam_mmr_overlay_config_s {
+               unsigned long   undef_0_24:25;                  /* Undefined */
+               unsigned long   base:27;                        /* RW */
+               unsigned long   undef_52_62:11;                 /* Undefined */
+               unsigned long   enable:1;                       /* RW */
+       } s;
 
+       /* UVYH common struct */
+       struct uvyh_rh10_gam_mmr_overlay_config_s {
+               unsigned long   undef_0_24:25;                  /* Undefined */
+               unsigned long   base:27;                        /* RW */
+               unsigned long   undef_52_62:11;                 /* Undefined */
+               unsigned long   enable:1;                       /* RW */
+       } sy;
 
-union uvh_rh_gam_alias210_redirect_config_2_mmr_u {
-       unsigned long   v;
-       struct uvh_rh_gam_alias210_redirect_config_2_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   dest_base:22;                   /* RW */
-               unsigned long   rsvd_46_63:18;
-       } s;
-       struct uvxh_rh_gam_alias210_redirect_config_2_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   dest_base:22;                   /* RW */
-               unsigned long   rsvd_46_63:18;
-       } sx;
-       struct uv2h_rh_gam_alias210_redirect_config_2_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   dest_base:22;                   /* RW */
-               unsigned long   rsvd_46_63:18;
-       } s2;
-       struct uv3h_rh_gam_alias210_redirect_config_2_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   dest_base:22;                   /* RW */
-               unsigned long   rsvd_46_63:18;
-       } s3;
-       struct uv4h_rh_gam_alias210_redirect_config_2_mmr_s {
-               unsigned long   rsvd_0_23:24;
-               unsigned long   dest_base:22;                   /* RW */
-               unsigned long   rsvd_46_63:18;
-       } s4;
+       /* UV5 unique struct */
+       struct uv5h_rh10_gam_mmr_overlay_config_s {
+               unsigned long   undef_0_24:25;                  /* Undefined */
+               unsigned long   base:27;                        /* RW */
+               unsigned long   undef_52_62:11;                 /* Undefined */
+               unsigned long   enable:1;                       /* RW */
+       } s5;
 };
 
 /* ========================================================================= */
-/*                          UVH_RH_GAM_CONFIG_MMR                            */
+/*                        UVH_RH_GAM_ADDR_MAP_CONFIG                         */
 /* ========================================================================= */
-#define UV2H_RH_GAM_CONFIG_MMR 0x1600000UL
-#define UV3H_RH_GAM_CONFIG_MMR 0x1600000UL
-#define UV4H_RH_GAM_CONFIG_MMR 0x480000UL
-#define UVH_RH_GAM_CONFIG_MMR (                                                \
-       is_uv2_hub() ? UV2H_RH_GAM_CONFIG_MMR :                         \
-       is_uv3_hub() ? UV3H_RH_GAM_CONFIG_MMR :                         \
-       /*is_uv4_hub*/ UV4H_RH_GAM_CONFIG_MMR)
-
-#define UVH_RH_GAM_CONFIG_MMR_N_SKT_SHFT               6
-#define UVH_RH_GAM_CONFIG_MMR_N_SKT_MASK               0x00000000000003c0UL
+#define UVH_RH_GAM_ADDR_MAP_CONFIG (                                   \
+       is_uv(UV4) ? 0x480000UL :                                       \
+       is_uv(UV3) ? 0x1600000UL :                                      \
+       is_uv(UV2) ? 0x1600000UL :                                      \
+       0)
 
-#define UVXH_RH_GAM_CONFIG_MMR_N_SKT_SHFT              6
-#define UVXH_RH_GAM_CONFIG_MMR_N_SKT_MASK              0x00000000000003c0UL
 
-#define UV2H_RH_GAM_CONFIG_MMR_M_SKT_SHFT              0
-#define UV2H_RH_GAM_CONFIG_MMR_N_SKT_SHFT              6
-#define UV2H_RH_GAM_CONFIG_MMR_M_SKT_MASK              0x000000000000003fUL
-#define UV2H_RH_GAM_CONFIG_MMR_N_SKT_MASK              0x00000000000003c0UL
+/* UVXH common defines */
+#define UVXH_RH_GAM_ADDR_MAP_CONFIG_N_SKT_SHFT         6
+#define UVXH_RH_GAM_ADDR_MAP_CONFIG_N_SKT_MASK         0x00000000000003c0UL
 
-#define UV3H_RH_GAM_CONFIG_MMR_M_SKT_SHFT              0
-#define UV3H_RH_GAM_CONFIG_MMR_N_SKT_SHFT              6
-#define UV3H_RH_GAM_CONFIG_MMR_M_SKT_MASK              0x000000000000003fUL
-#define UV3H_RH_GAM_CONFIG_MMR_N_SKT_MASK              0x00000000000003c0UL
+/* UV3 unique defines */
+#define UV3H_RH_GAM_ADDR_MAP_CONFIG_M_SKT_SHFT         0
+#define UV3H_RH_GAM_ADDR_MAP_CONFIG_M_SKT_MASK         0x000000000000003fUL
 
-#define UV4H_RH_GAM_CONFIG_MMR_N_SKT_SHFT              6
-#define UV4H_RH_GAM_CONFIG_MMR_N_SKT_MASK              0x00000000000003c0UL
+/* UV2 unique defines */
+#define UV2H_RH_GAM_ADDR_MAP_CONFIG_M_SKT_SHFT         0
+#define UV2H_RH_GAM_ADDR_MAP_CONFIG_M_SKT_MASK         0x000000000000003fUL
 
 
-union uvh_rh_gam_config_mmr_u {
+union uvh_rh_gam_addr_map_config_u {
        unsigned long   v;
-       struct uvh_rh_gam_config_mmr_s {
+
+       /* UVH common struct */
+       struct uvh_rh_gam_addr_map_config_s {
                unsigned long   rsvd_0_5:6;
                unsigned long   n_skt:4;                        /* RW */
                unsigned long   rsvd_10_63:54;
        } s;
-       struct uvxh_rh_gam_config_mmr_s {
+
+       /* UVXH common struct */
+       struct uvxh_rh_gam_addr_map_config_s {
                unsigned long   rsvd_0_5:6;
                unsigned long   n_skt:4;                        /* RW */
                unsigned long   rsvd_10_63:54;
        } sx;
-       struct uv2h_rh_gam_config_mmr_s {
-               unsigned long   m_skt:6;                        /* RW */
+
+       /* UV4 unique struct */
+       struct uv4h_rh_gam_addr_map_config_s {
+               unsigned long   rsvd_0_5:6;
                unsigned long   n_skt:4;                        /* RW */
                unsigned long   rsvd_10_63:54;
-       } s2;
-       struct uv3h_rh_gam_config_mmr_s {
+       } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_rh_gam_addr_map_config_s {
                unsigned long   m_skt:6;                        /* RW */
                unsigned long   n_skt:4;                        /* RW */
                unsigned long   rsvd_10_63:54;
        } s3;
-       struct uv4h_rh_gam_config_mmr_s {
-               unsigned long   rsvd_0_5:6;
+
+       /* UV2 unique struct */
+       struct uv2h_rh_gam_addr_map_config_s {
+               unsigned long   m_skt:6;                        /* RW */
                unsigned long   n_skt:4;                        /* RW */
                unsigned long   rsvd_10_63:54;
-       } s4;
+       } s2;
 };
 
 /* ========================================================================= */
-/*                    UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR                      */
+/*                    UVH_RH_GAM_ALIAS_0_OVERLAY_CONFIG                      */
 /* ========================================================================= */
-#define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR 0x1600010UL
-#define UV3H_RH_GAM_GRU_OVERLAY_CONFIG_MMR 0x1600010UL
-#define UV4H_RH_GAM_GRU_OVERLAY_CONFIG_MMR 0x480010UL
-#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR (                            \
-       is_uv2_hub() ? UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR :             \
-       is_uv3_hub() ? UV3H_RH_GAM_GRU_OVERLAY_CONFIG_MMR :             \
-       /*is_uv4_hub*/ UV4H_RH_GAM_GRU_OVERLAY_CONFIG_MMR)
-
-#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_SHFT   52
-#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_SHFT  63
-#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_MASK   0x00f0000000000000UL
-#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_MASK  0x8000000000000000UL
-
-#define UVXH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_SHFT  52
-#define UVXH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
-#define UVXH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_MASK  0x00f0000000000000UL
-#define UVXH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT   28
-#define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_SHFT  52
-#define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
-#define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_MASK   0x00003ffff0000000UL
-#define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_MASK  0x00f0000000000000UL
-#define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV3H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT   28
-#define UV3H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_SHFT  52
-#define UV3H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_MODE_SHFT   62
-#define UV3H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
-#define UV3H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_MASK   0x00003ffff0000000UL
-#define UV3H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_MASK  0x00f0000000000000UL
-#define UV3H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_MODE_MASK   0x4000000000000000UL
-#define UV3H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV4H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT   26
-#define UV4H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_SHFT  52
-#define UV4H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
-#define UV4H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_MASK   0x00003ffffc000000UL
-#define UV4H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_MASK  0x00f0000000000000UL
-#define UV4H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_MASK (                  \
-       is_uv2_hub() ? UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_MASK :   \
-       is_uv3_hub() ? UV3H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_MASK :   \
-       /*is_uv4_hub*/ UV4H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_MASK)
-#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT (                  \
-       is_uv2_hub() ? UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT :   \
-       is_uv3_hub() ? UV3H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT :   \
-       /*is_uv4_hub*/ UV4H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT)
-
-union uvh_rh_gam_gru_overlay_config_mmr_u {
+#define UVH_RH_GAM_ALIAS_0_OVERLAY_CONFIG (                            \
+       is_uv(UV4) ? 0x4800c8UL :                                       \
+       is_uv(UV3) ? 0x16000c8UL :                                      \
+       is_uv(UV2) ? 0x16000c8UL :                                      \
+       0)
+
+
+/* UVXH common defines */
+#define UVXH_RH_GAM_ALIAS_0_OVERLAY_CONFIG_BASE_SHFT   24
+#define UVXH_RH_GAM_ALIAS_0_OVERLAY_CONFIG_BASE_MASK   0x00000000ff000000UL
+#define UVXH_RH_GAM_ALIAS_0_OVERLAY_CONFIG_M_ALIAS_SHFT        48
+#define UVXH_RH_GAM_ALIAS_0_OVERLAY_CONFIG_M_ALIAS_MASK        0x001f000000000000UL
+#define UVXH_RH_GAM_ALIAS_0_OVERLAY_CONFIG_ENABLE_SHFT 63
+#define UVXH_RH_GAM_ALIAS_0_OVERLAY_CONFIG_ENABLE_MASK 0x8000000000000000UL
+
+
+union uvh_rh_gam_alias_0_overlay_config_u {
        unsigned long   v;
-       struct uvh_rh_gam_gru_overlay_config_mmr_s {
-               unsigned long   rsvd_0_51:52;
-               unsigned long   n_gru:4;                        /* RW */
-               unsigned long   rsvd_56_62:7;
+
+       /* UVH common struct */
+       struct uvh_rh_gam_alias_0_overlay_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   base:8;                         /* RW */
+               unsigned long   rsvd_32_47:16;
+               unsigned long   m_alias:5;                      /* RW */
+               unsigned long   rsvd_53_62:10;
                unsigned long   enable:1;                       /* RW */
        } s;
-       struct uvxh_rh_gam_gru_overlay_config_mmr_s {
-               unsigned long   rsvd_0_45:46;
-               unsigned long   rsvd_46_51:6;
-               unsigned long   n_gru:4;                        /* RW */
-               unsigned long   rsvd_56_62:7;
-               unsigned long   enable:1;                       /* RW */
-       } sx;
-       struct uv2h_rh_gam_gru_overlay_config_mmr_s {
-               unsigned long   rsvd_0_27:28;
-               unsigned long   base:18;                        /* RW */
-               unsigned long   rsvd_46_51:6;
-               unsigned long   n_gru:4;                        /* RW */
-               unsigned long   rsvd_56_62:7;
-               unsigned long   enable:1;                       /* RW */
-       } s2;
-       struct uv3h_rh_gam_gru_overlay_config_mmr_s {
-               unsigned long   rsvd_0_27:28;
-               unsigned long   base:18;                        /* RW */
-               unsigned long   rsvd_46_51:6;
-               unsigned long   n_gru:4;                        /* RW */
-               unsigned long   rsvd_56_61:6;
-               unsigned long   mode:1;                         /* RW */
-               unsigned long   enable:1;                       /* RW */
-       } s3;
-       struct uv4h_rh_gam_gru_overlay_config_mmr_s {
-               unsigned long   rsvd_0_24:25;
-               unsigned long   undef_25:1;                     /* Undefined */
-               unsigned long   base:20;                        /* RW */
-               unsigned long   rsvd_46_51:6;
-               unsigned long   n_gru:4;                        /* RW */
-               unsigned long   rsvd_56_62:7;
-               unsigned long   enable:1;                       /* RW */
-       } s4;
-};
 
-/* ========================================================================= */
-/*                   UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR                    */
-/* ========================================================================= */
-#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR uv_undefined("UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR")
-#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR 0x1603000UL
-#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR 0x483000UL
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR (                         \
-       is_uv2_hub() ? UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR :          \
-       is_uv3_hub() ? UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR :          \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR)
-
-
-#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_BASE_SHFT        26
-#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_SHFT        46
-#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_ENABLE_SHFT 63
-#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_BASE_MASK        0x00003ffffc000000UL
-#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_MASK        0x000fc00000000000UL
-#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_BASE_SHFT        26
-#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_SHFT        46
-#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_ENABLE_SHFT 63
-#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_BASE_MASK        0x00003ffffc000000UL
-#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_MASK        0x000fc00000000000UL
-#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_SHFT 52
-#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_BASE_MASK 0x000ffffffc000000UL
-#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_MASK 0x03f0000000000000UL
-#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_SHFT (               \
-       is_uv3_hub() ? UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_SHFT : \
-       is_uv4a_hub() ? UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_SHFT : \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_SHFT)
-
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_BASE_MASK (               \
-       is_uv3_hub() ? UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_BASE_MASK : \
-       is_uv4a_hub() ? UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_BASE_MASK : \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_BASE_MASK)
-
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_MASK (               \
-       is_uv3_hub() ? UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_MASK : \
-       is_uv4a_hub() ? UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_MASK : \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_MASK)
-
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_ENABLE_MASK (             \
-       is_uv3_hub() ? UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_ENABLE_MASK : \
-       is_uv4a_hub() ? UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_ENABLE_MASK : \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_ENABLE_MASK)
-
-union uvh_rh_gam_mmioh_overlay_config0_mmr_u {
-       unsigned long   v;
-       struct uv3h_rh_gam_mmioh_overlay_config0_mmr_s {
-               unsigned long   rsvd_0_25:26;
-               unsigned long   base:20;                        /* RW */
-               unsigned long   m_io:6;                         /* RW */
-               unsigned long   n_io:4;
-               unsigned long   rsvd_56_62:7;
-               unsigned long   enable:1;                       /* RW */
-       } s3;
-       struct uv4h_rh_gam_mmioh_overlay_config0_mmr_s {
-               unsigned long   rsvd_0_25:26;
-               unsigned long   base:20;                        /* RW */
-               unsigned long   m_io:6;                         /* RW */
-               unsigned long   n_io:4;
-               unsigned long   rsvd_56_62:7;
-               unsigned long   enable:1;                       /* RW */
-       } s4;
-       struct uv4ah_rh_gam_mmioh_overlay_config0_mmr_s {
-               unsigned long   rsvd_0_25:26;
-               unsigned long   base:26;                        /* RW */
-               unsigned long   m_io:6;                         /* RW */
-               unsigned long   n_io:4;
-               unsigned long   undef_62:1;                     /* Undefined */
+       /* UVXH common struct */
+       struct uvxh_rh_gam_alias_0_overlay_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   base:8;                         /* RW */
+               unsigned long   rsvd_32_47:16;
+               unsigned long   m_alias:5;                      /* RW */
+               unsigned long   rsvd_53_62:10;
                unsigned long   enable:1;                       /* RW */
-       } s4a;
-};
+       } sx;
 
-/* ========================================================================= */
-/*                   UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR                    */
-/* ========================================================================= */
-#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR uv_undefined("UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR")
-#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR 0x1603000UL
-#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR 0x484000UL
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR (                         \
-       is_uv2_hub() ? UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR :          \
-       is_uv3_hub() ? UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR :          \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR)
-
-
-#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_BASE_SHFT        26
-#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_SHFT        46
-#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_ENABLE_SHFT 63
-#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_BASE_MASK        0x00003ffffc000000UL
-#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_MASK        0x000fc00000000000UL
-#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_BASE_SHFT        26
-#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_SHFT        46
-#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_ENABLE_SHFT 63
-#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_BASE_MASK        0x00003ffffc000000UL
-#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_MASK        0x000fc00000000000UL
-#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_SHFT 52
-#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_BASE_MASK 0x000ffffffc000000UL
-#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_MASK 0x03f0000000000000UL
-
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_SHFT (               \
-       is_uv3_hub() ? UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_SHFT : \
-       is_uv4a_hub() ? UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_SHFT : \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_SHFT)
-
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_BASE_MASK (               \
-       is_uv3_hub() ? UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_BASE_MASK : \
-       is_uv4a_hub() ? UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_BASE_MASK : \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_BASE_MASK)
-
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_MASK (               \
-       is_uv3_hub() ? UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_MASK : \
-       is_uv4a_hub() ? UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_MASK : \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_MASK)
-
-union uvh_rh_gam_mmioh_overlay_config1_mmr_u {
-       unsigned long   v;
-       struct uv3h_rh_gam_mmioh_overlay_config1_mmr_s {
-               unsigned long   rsvd_0_25:26;
-               unsigned long   base:20;                        /* RW */
-               unsigned long   m_io:6;                         /* RW */
-               unsigned long   n_io:4;
-               unsigned long   rsvd_56_62:7;
-               unsigned long   enable:1;                       /* RW */
-       } s3;
-       struct uv4h_rh_gam_mmioh_overlay_config1_mmr_s {
-               unsigned long   rsvd_0_25:26;
-               unsigned long   base:20;                        /* RW */
-               unsigned long   m_io:6;                         /* RW */
-               unsigned long   n_io:4;
-               unsigned long   rsvd_56_62:7;
+       /* UV4 unique struct */
+       struct uv4h_rh_gam_alias_0_overlay_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   base:8;                         /* RW */
+               unsigned long   rsvd_32_47:16;
+               unsigned long   m_alias:5;                      /* RW */
+               unsigned long   rsvd_53_62:10;
                unsigned long   enable:1;                       /* RW */
        } s4;
-       struct uv4ah_rh_gam_mmioh_overlay_config1_mmr_s {
-               unsigned long   rsvd_0_25:26;
-               unsigned long   base:26;                        /* RW */
-               unsigned long   m_io:6;                         /* RW */
-               unsigned long   n_io:4;
-               unsigned long   undef_62:1;                     /* Undefined */
+
+       /* UV3 unique struct */
+       struct uv3h_rh_gam_alias_0_overlay_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   base:8;                         /* RW */
+               unsigned long   rsvd_32_47:16;
+               unsigned long   m_alias:5;                      /* RW */
+               unsigned long   rsvd_53_62:10;
                unsigned long   enable:1;                       /* RW */
-       } s4a;
-};
+       } s3;
 
-/* ========================================================================= */
-/*                   UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR                     */
-/* ========================================================================= */
-#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR 0x1600030UL
-#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR uv_undefined("UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR")
-#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR uv_undefined("UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR")
-#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR (                          \
-       is_uv2_hub() ? UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR :           \
-       is_uv3_hub() ? UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR :           \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR)
-
-
-#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_SHFT 27
-#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_M_IO_SHFT 46
-#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_N_IO_SHFT 52
-#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
-#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffff8000000UL
-#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_M_IO_MASK 0x000fc00000000000UL
-#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_N_IO_MASK 0x00f0000000000000UL
-#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
-
-
-union uvh_rh_gam_mmioh_overlay_config_mmr_u {
-       unsigned long   v;
-       struct uv2h_rh_gam_mmioh_overlay_config_mmr_s {
-               unsigned long   rsvd_0_26:27;
-               unsigned long   base:19;                        /* RW */
-               unsigned long   m_io:6;                         /* RW */
-               unsigned long   n_io:4;                         /* RW */
-               unsigned long   rsvd_56_62:7;
+       /* UV2 unique struct */
+       struct uv2h_rh_gam_alias_0_overlay_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   base:8;                         /* RW */
+               unsigned long   rsvd_32_47:16;
+               unsigned long   m_alias:5;                      /* RW */
+               unsigned long   rsvd_53_62:10;
                unsigned long   enable:1;                       /* RW */
        } s2;
 };
 
 /* ========================================================================= */
-/*                  UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR                    */
+/*                    UVH_RH_GAM_ALIAS_0_REDIRECT_CONFIG                     */
 /* ========================================================================= */
-#define UV2H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR uv_undefined("UV2H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR")
-#define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR 0x1603800UL
-#define UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR 0x483800UL
-#define UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR (                                \
-       is_uv2_hub() ? UV2H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR :         \
-       is_uv3_hub() ? UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR :         \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR)
+#define UVH_RH_GAM_ALIAS_0_REDIRECT_CONFIG (                           \
+       is_uv(UV4) ? 0x4800d0UL :                                       \
+       is_uv(UV3) ? 0x16000d0UL :                                      \
+       is_uv(UV2) ? 0x16000d0UL :                                      \
+       0)
 
-#define UV2H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_DEPTH uv_undefined("UV2H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_DEPTH")
-#define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_DEPTH 128
-#define UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_DEPTH 128
-#define UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_DEPTH (                  \
-       is_uv2_hub() ? UV2H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_DEPTH :   \
-       is_uv3_hub() ? UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_DEPTH :   \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_DEPTH)
 
+/* UVXH common defines */
+#define UVXH_RH_GAM_ALIAS_0_REDIRECT_CONFIG_DEST_BASE_SHFT 24
+#define UVXH_RH_GAM_ALIAS_0_REDIRECT_CONFIG_DEST_BASE_MASK 0x00003fffff000000UL
 
-#define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_NASID_SHFT 0
-#define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_NASID_MASK 0x0000000000007fffUL
 
-#define UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_NASID_SHFT 0
-#define UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_NASID_MASK 0x0000000000007fffUL
+union uvh_rh_gam_alias_0_redirect_config_u {
+       unsigned long   v;
+
+       /* UVH common struct */
+       struct uvh_rh_gam_alias_0_redirect_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   dest_base:22;                   /* RW */
+               unsigned long   rsvd_46_63:18;
+       } s;
 
-#define UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_NASID_MASK 0x0000000000000fffUL
+       /* UVXH common struct */
+       struct uvxh_rh_gam_alias_0_redirect_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   dest_base:22;                   /* RW */
+               unsigned long   rsvd_46_63:18;
+       } sx;
 
-#define UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_NASID_MASK (             \
-       is_uv3_hub() ? UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_NASID_MASK : \
-       is_uv4a_hub() ? UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_NASID_MASK : \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_NASID_MASK)
+       /* UV4 unique struct */
+       struct uv4h_rh_gam_alias_0_redirect_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   dest_base:22;                   /* RW */
+               unsigned long   rsvd_46_63:18;
+       } s4;
 
-union uvh_rh_gam_mmioh_redirect_config0_mmr_u {
-       unsigned long   v;
-       struct uv3h_rh_gam_mmioh_redirect_config0_mmr_s {
-               unsigned long   nasid:15;                       /* RW */
-               unsigned long   rsvd_15_63:49;
+       /* UV3 unique struct */
+       struct uv3h_rh_gam_alias_0_redirect_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   dest_base:22;                   /* RW */
+               unsigned long   rsvd_46_63:18;
        } s3;
-       struct uv4h_rh_gam_mmioh_redirect_config0_mmr_s {
-               unsigned long   nasid:15;                       /* RW */
-               unsigned long   rsvd_15_63:49;
-       } s4;
-       struct uv4ah_rh_gam_mmioh_redirect_config0_mmr_s {
-               unsigned long   nasid:12;                       /* RW */
-               unsigned long   rsvd_12_63:52;
-       } s4a;
+
+       /* UV2 unique struct */
+       struct uv2h_rh_gam_alias_0_redirect_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   dest_base:22;                   /* RW */
+               unsigned long   rsvd_46_63:18;
+       } s2;
 };
 
 /* ========================================================================= */
-/*                  UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR                    */
+/*                    UVH_RH_GAM_ALIAS_1_OVERLAY_CONFIG                      */
 /* ========================================================================= */
-#define UV2H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR uv_undefined("UV2H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR")
-#define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR 0x1604800UL
-#define UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR 0x484800UL
-#define UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR (                                \
-       is_uv2_hub() ? UV2H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR :         \
-       is_uv3_hub() ? UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR :         \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR)
-
-#define UV2H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_DEPTH uv_undefined("UV2H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_DEPTH")
-#define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_DEPTH 128
-#define UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_DEPTH 128
-#define UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_DEPTH (                  \
-       is_uv2_hub() ? UV2H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_DEPTH :   \
-       is_uv3_hub() ? UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_DEPTH :   \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_DEPTH)
+#define UVH_RH_GAM_ALIAS_1_OVERLAY_CONFIG (                            \
+       is_uv(UV4) ? 0x4800d8UL :                                       \
+       is_uv(UV3) ? 0x16000d8UL :                                      \
+       is_uv(UV2) ? 0x16000d8UL :                                      \
+       0)
 
 
-#define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_NASID_SHFT 0
-#define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_NASID_MASK 0x0000000000007fffUL
+/* UVXH common defines */
+#define UVXH_RH_GAM_ALIAS_1_OVERLAY_CONFIG_BASE_SHFT   24
+#define UVXH_RH_GAM_ALIAS_1_OVERLAY_CONFIG_BASE_MASK   0x00000000ff000000UL
+#define UVXH_RH_GAM_ALIAS_1_OVERLAY_CONFIG_M_ALIAS_SHFT        48
+#define UVXH_RH_GAM_ALIAS_1_OVERLAY_CONFIG_M_ALIAS_MASK        0x001f000000000000UL
+#define UVXH_RH_GAM_ALIAS_1_OVERLAY_CONFIG_ENABLE_SHFT 63
+#define UVXH_RH_GAM_ALIAS_1_OVERLAY_CONFIG_ENABLE_MASK 0x8000000000000000UL
 
-#define UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_NASID_SHFT 0
-#define UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_NASID_MASK 0x0000000000007fffUL
 
-#define UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_NASID_MASK 0x0000000000000fffUL
-
-#define UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_NASID_MASK (             \
-       is_uv3_hub() ? UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_NASID_MASK : \
-       is_uv4a_hub() ? UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_NASID_MASK : \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_NASID_MASK)
-
-union uvh_rh_gam_mmioh_redirect_config1_mmr_u {
+union uvh_rh_gam_alias_1_overlay_config_u {
        unsigned long   v;
-       struct uv3h_rh_gam_mmioh_redirect_config1_mmr_s {
-               unsigned long   nasid:15;                       /* RW */
-               unsigned long   rsvd_15_63:49;
-       } s3;
-       struct uv4h_rh_gam_mmioh_redirect_config1_mmr_s {
-               unsigned long   nasid:15;                       /* RW */
-               unsigned long   rsvd_15_63:49;
-       } s4;
-       struct uv4ah_rh_gam_mmioh_redirect_config1_mmr_s {
-               unsigned long   nasid:12;                       /* RW */
-               unsigned long   rsvd_12_63:52;
-       } s4a;
-};
 
-/* ========================================================================= */
-/*                    UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR                      */
-/* ========================================================================= */
-#define UV2H_RH_GAM_MMR_OVERLAY_CONFIG_MMR 0x1600028UL
-#define UV3H_RH_GAM_MMR_OVERLAY_CONFIG_MMR 0x1600028UL
-#define UV4H_RH_GAM_MMR_OVERLAY_CONFIG_MMR 0x480028UL
-#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR (                            \
-       is_uv2_hub() ? UV2H_RH_GAM_MMR_OVERLAY_CONFIG_MMR :             \
-       is_uv3_hub() ? UV3H_RH_GAM_MMR_OVERLAY_CONFIG_MMR :             \
-       /*is_uv4_hub*/ UV4H_RH_GAM_MMR_OVERLAY_CONFIG_MMR)
-
-#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT    26
-#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_SHFT  63
-#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_MASK    0x00003ffffc000000UL
-#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_MASK  0x8000000000000000UL
-
-#define UVXH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT   26
-#define UVXH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
-#define UVXH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_MASK   0x00003ffffc000000UL
-#define UVXH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV2H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT   26
-#define UV2H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
-#define UV2H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_MASK   0x00003ffffc000000UL
-#define UV2H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV3H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT   26
-#define UV3H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
-#define UV3H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_MASK   0x00003ffffc000000UL
-#define UV3H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
-
-#define UV4H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT   26
-#define UV4H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63
-#define UV4H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_MASK   0x00003ffffc000000UL
-#define UV4H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL
-
-
-union uvh_rh_gam_mmr_overlay_config_mmr_u {
-       unsigned long   v;
-       struct uvh_rh_gam_mmr_overlay_config_mmr_s {
-               unsigned long   rsvd_0_25:26;
-               unsigned long   base:20;                        /* RW */
-               unsigned long   rsvd_46_62:17;
+       /* UVH common struct */
+       struct uvh_rh_gam_alias_1_overlay_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   base:8;                         /* RW */
+               unsigned long   rsvd_32_47:16;
+               unsigned long   m_alias:5;                      /* RW */
+               unsigned long   rsvd_53_62:10;
                unsigned long   enable:1;                       /* RW */
        } s;
-       struct uvxh_rh_gam_mmr_overlay_config_mmr_s {
-               unsigned long   rsvd_0_25:26;
-               unsigned long   base:20;                        /* RW */
-               unsigned long   rsvd_46_62:17;
+
+       /* UVXH common struct */
+       struct uvxh_rh_gam_alias_1_overlay_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   base:8;                         /* RW */
+               unsigned long   rsvd_32_47:16;
+               unsigned long   m_alias:5;                      /* RW */
+               unsigned long   rsvd_53_62:10;
                unsigned long   enable:1;                       /* RW */
        } sx;
-       struct uv2h_rh_gam_mmr_overlay_config_mmr_s {
-               unsigned long   rsvd_0_25:26;
-               unsigned long   base:20;                        /* RW */
-               unsigned long   rsvd_46_62:17;
+
+       /* UV4 unique struct */
+       struct uv4h_rh_gam_alias_1_overlay_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   base:8;                         /* RW */
+               unsigned long   rsvd_32_47:16;
+               unsigned long   m_alias:5;                      /* RW */
+               unsigned long   rsvd_53_62:10;
                unsigned long   enable:1;                       /* RW */
-       } s2;
-       struct uv3h_rh_gam_mmr_overlay_config_mmr_s {
-               unsigned long   rsvd_0_25:26;
-               unsigned long   base:20;                        /* RW */
-               unsigned long   rsvd_46_62:17;
+       } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_rh_gam_alias_1_overlay_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   base:8;                         /* RW */
+               unsigned long   rsvd_32_47:16;
+               unsigned long   m_alias:5;                      /* RW */
+               unsigned long   rsvd_53_62:10;
                unsigned long   enable:1;                       /* RW */
        } s3;
-       struct uv4h_rh_gam_mmr_overlay_config_mmr_s {
-               unsigned long   rsvd_0_25:26;
-               unsigned long   base:20;                        /* RW */
-               unsigned long   rsvd_46_62:17;
+
+       /* UV2 unique struct */
+       struct uv2h_rh_gam_alias_1_overlay_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   base:8;                         /* RW */
+               unsigned long   rsvd_32_47:16;
+               unsigned long   m_alias:5;                      /* RW */
+               unsigned long   rsvd_53_62:10;
                unsigned long   enable:1;                       /* RW */
-       } s4;
+       } s2;
 };
 
 /* ========================================================================= */
-/*                                 UVH_RTC                                   */
+/*                    UVH_RH_GAM_ALIAS_1_REDIRECT_CONFIG                     */
 /* ========================================================================= */
-#define UV2H_RTC 0x340000UL
-#define UV3H_RTC 0x340000UL
-#define UV4H_RTC 0xe0000UL
-#define UVH_RTC (                                                      \
-       is_uv2_hub() ? UV2H_RTC :                                       \
-       is_uv3_hub() ? UV3H_RTC :                                       \
-       /*is_uv4_hub*/ UV4H_RTC)
+#define UVH_RH_GAM_ALIAS_1_REDIRECT_CONFIG (                           \
+       is_uv(UV4) ? 0x4800e0UL :                                       \
+       is_uv(UV3) ? 0x16000e0UL :                                      \
+       is_uv(UV2) ? 0x16000e0UL :                                      \
+       0)
 
-#define UVH_RTC_REAL_TIME_CLOCK_SHFT                   0
-#define UVH_RTC_REAL_TIME_CLOCK_MASK                   0x00ffffffffffffffUL
 
+/* UVXH common defines */
+#define UVXH_RH_GAM_ALIAS_1_REDIRECT_CONFIG_DEST_BASE_SHFT 24
+#define UVXH_RH_GAM_ALIAS_1_REDIRECT_CONFIG_DEST_BASE_MASK 0x00003fffff000000UL
 
-union uvh_rtc_u {
+
+union uvh_rh_gam_alias_1_redirect_config_u {
        unsigned long   v;
-       struct uvh_rtc_s {
-               unsigned long   real_time_clock:56;             /* RW */
-               unsigned long   rsvd_56_63:8;
+
+       /* UVH common struct */
+       struct uvh_rh_gam_alias_1_redirect_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   dest_base:22;                   /* RW */
+               unsigned long   rsvd_46_63:18;
        } s;
+
+       /* UVXH common struct */
+       struct uvxh_rh_gam_alias_1_redirect_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   dest_base:22;                   /* RW */
+               unsigned long   rsvd_46_63:18;
+       } sx;
+
+       /* UV4 unique struct */
+       struct uv4h_rh_gam_alias_1_redirect_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   dest_base:22;                   /* RW */
+               unsigned long   rsvd_46_63:18;
+       } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_rh_gam_alias_1_redirect_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   dest_base:22;                   /* RW */
+               unsigned long   rsvd_46_63:18;
+       } s3;
+
+       /* UV2 unique struct */
+       struct uv2h_rh_gam_alias_1_redirect_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   dest_base:22;                   /* RW */
+               unsigned long   rsvd_46_63:18;
+       } s2;
 };
 
 /* ========================================================================= */
-/*                           UVH_RTC1_INT_CONFIG                             */
+/*                    UVH_RH_GAM_ALIAS_2_OVERLAY_CONFIG                      */
 /* ========================================================================= */
-#define UVH_RTC1_INT_CONFIG 0x615c0UL
+#define UVH_RH_GAM_ALIAS_2_OVERLAY_CONFIG (                            \
+       is_uv(UV4) ? 0x4800e8UL :                                       \
+       is_uv(UV3) ? 0x16000e8UL :                                      \
+       is_uv(UV2) ? 0x16000e8UL :                                      \
+       0)
 
-#define UVH_RTC1_INT_CONFIG_VECTOR_SHFT                        0
-#define UVH_RTC1_INT_CONFIG_DM_SHFT                    8
-#define UVH_RTC1_INT_CONFIG_DESTMODE_SHFT              11
-#define UVH_RTC1_INT_CONFIG_STATUS_SHFT                        12
-#define UVH_RTC1_INT_CONFIG_P_SHFT                     13
-#define UVH_RTC1_INT_CONFIG_T_SHFT                     15
-#define UVH_RTC1_INT_CONFIG_M_SHFT                     16
-#define UVH_RTC1_INT_CONFIG_APIC_ID_SHFT               32
-#define UVH_RTC1_INT_CONFIG_VECTOR_MASK                        0x00000000000000ffUL
-#define UVH_RTC1_INT_CONFIG_DM_MASK                    0x0000000000000700UL
-#define UVH_RTC1_INT_CONFIG_DESTMODE_MASK              0x0000000000000800UL
-#define UVH_RTC1_INT_CONFIG_STATUS_MASK                        0x0000000000001000UL
-#define UVH_RTC1_INT_CONFIG_P_MASK                     0x0000000000002000UL
-#define UVH_RTC1_INT_CONFIG_T_MASK                     0x0000000000008000UL
-#define UVH_RTC1_INT_CONFIG_M_MASK                     0x0000000000010000UL
-#define UVH_RTC1_INT_CONFIG_APIC_ID_MASK               0xffffffff00000000UL
 
+/* UVXH common defines */
+#define UVXH_RH_GAM_ALIAS_2_OVERLAY_CONFIG_BASE_SHFT   24
+#define UVXH_RH_GAM_ALIAS_2_OVERLAY_CONFIG_BASE_MASK   0x00000000ff000000UL
+#define UVXH_RH_GAM_ALIAS_2_OVERLAY_CONFIG_M_ALIAS_SHFT        48
+#define UVXH_RH_GAM_ALIAS_2_OVERLAY_CONFIG_M_ALIAS_MASK        0x001f000000000000UL
+#define UVXH_RH_GAM_ALIAS_2_OVERLAY_CONFIG_ENABLE_SHFT 63
+#define UVXH_RH_GAM_ALIAS_2_OVERLAY_CONFIG_ENABLE_MASK 0x8000000000000000UL
 
-union uvh_rtc1_int_config_u {
+
+union uvh_rh_gam_alias_2_overlay_config_u {
        unsigned long   v;
-       struct uvh_rtc1_int_config_s {
-               unsigned long   vector_:8;                      /* RW */
-               unsigned long   dm:3;                           /* RW */
-               unsigned long   destmode:1;                     /* RW */
-               unsigned long   status:1;                       /* RO */
-               unsigned long   p:1;                            /* RO */
-               unsigned long   rsvd_14:1;
-               unsigned long   t:1;                            /* RO */
-               unsigned long   m:1;                            /* RW */
-               unsigned long   rsvd_17_31:15;
-               unsigned long   apic_id:32;                     /* RW */
+
+       /* UVH common struct */
+       struct uvh_rh_gam_alias_2_overlay_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   base:8;                         /* RW */
+               unsigned long   rsvd_32_47:16;
+               unsigned long   m_alias:5;                      /* RW */
+               unsigned long   rsvd_53_62:10;
+               unsigned long   enable:1;                       /* RW */
        } s;
+
+       /* UVXH common struct */
+       struct uvxh_rh_gam_alias_2_overlay_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   base:8;                         /* RW */
+               unsigned long   rsvd_32_47:16;
+               unsigned long   m_alias:5;                      /* RW */
+               unsigned long   rsvd_53_62:10;
+               unsigned long   enable:1;                       /* RW */
+       } sx;
+
+       /* UV4 unique struct */
+       struct uv4h_rh_gam_alias_2_overlay_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   base:8;                         /* RW */
+               unsigned long   rsvd_32_47:16;
+               unsigned long   m_alias:5;                      /* RW */
+               unsigned long   rsvd_53_62:10;
+               unsigned long   enable:1;                       /* RW */
+       } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_rh_gam_alias_2_overlay_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   base:8;                         /* RW */
+               unsigned long   rsvd_32_47:16;
+               unsigned long   m_alias:5;                      /* RW */
+               unsigned long   rsvd_53_62:10;
+               unsigned long   enable:1;                       /* RW */
+       } s3;
+
+       /* UV2 unique struct */
+       struct uv2h_rh_gam_alias_2_overlay_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   base:8;                         /* RW */
+               unsigned long   rsvd_32_47:16;
+               unsigned long   m_alias:5;                      /* RW */
+               unsigned long   rsvd_53_62:10;
+               unsigned long   enable:1;                       /* RW */
+       } s2;
 };
 
 /* ========================================================================= */
-/*                               UVH_SCRATCH5                                */
+/*                    UVH_RH_GAM_ALIAS_2_REDIRECT_CONFIG                     */
 /* ========================================================================= */
-#define UV2H_SCRATCH5 0x2d0200UL
-#define UV3H_SCRATCH5 0x2d0200UL
-#define UV4H_SCRATCH5 0xb0200UL
-#define UVH_SCRATCH5 (                                                 \
-       is_uv2_hub() ? UV2H_SCRATCH5 :                                  \
-       is_uv3_hub() ? UV3H_SCRATCH5 :                                  \
-       /*is_uv4_hub*/ UV4H_SCRATCH5)
-
-#define UV2H_SCRATCH5_32 0x778
-#define UV3H_SCRATCH5_32 0x778
-#define UV4H_SCRATCH5_32 0x798
-#define UVH_SCRATCH5_32 (                                              \
-       is_uv2_hub() ? UV2H_SCRATCH5_32 :                               \
-       is_uv3_hub() ? UV3H_SCRATCH5_32 :                               \
-       /*is_uv4_hub*/ UV4H_SCRATCH5_32)
+#define UVH_RH_GAM_ALIAS_2_REDIRECT_CONFIG (                           \
+       is_uv(UV4) ? 0x4800f0UL :                                       \
+       is_uv(UV3) ? 0x16000f0UL :                                      \
+       is_uv(UV2) ? 0x16000f0UL :                                      \
+       0)
 
-#define UVH_SCRATCH5_SCRATCH5_SHFT                     0
-#define UVH_SCRATCH5_SCRATCH5_MASK                     0xffffffffffffffffUL
 
+/* UVXH common defines */
+#define UVXH_RH_GAM_ALIAS_2_REDIRECT_CONFIG_DEST_BASE_SHFT 24
+#define UVXH_RH_GAM_ALIAS_2_REDIRECT_CONFIG_DEST_BASE_MASK 0x00003fffff000000UL
 
-union uvh_scratch5_u {
+
+union uvh_rh_gam_alias_2_redirect_config_u {
        unsigned long   v;
-       struct uvh_scratch5_s {
-               unsigned long   scratch5:64;                    /* RW, W1CS */
-       } s;
-};
 
-/* ========================================================================= */
-/*                            UVH_SCRATCH5_ALIAS                             */
-/* ========================================================================= */
-#define UV2H_SCRATCH5_ALIAS 0x2d0208UL
-#define UV3H_SCRATCH5_ALIAS 0x2d0208UL
-#define UV4H_SCRATCH5_ALIAS 0xb0208UL
-#define UVH_SCRATCH5_ALIAS (                                           \
-       is_uv2_hub() ? UV2H_SCRATCH5_ALIAS :                            \
-       is_uv3_hub() ? UV3H_SCRATCH5_ALIAS :                            \
-       /*is_uv4_hub*/ UV4H_SCRATCH5_ALIAS)
+       /* UVH common struct */
+       struct uvh_rh_gam_alias_2_redirect_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   dest_base:22;                   /* RW */
+               unsigned long   rsvd_46_63:18;
+       } s;
 
-#define UV2H_SCRATCH5_ALIAS_32 0x780
-#define UV3H_SCRATCH5_ALIAS_32 0x780
-#define UV4H_SCRATCH5_ALIAS_32 0x7a0
-#define UVH_SCRATCH5_ALIAS_32 (                                                \
-       is_uv2_hub() ? UV2H_SCRATCH5_ALIAS_32 :                         \
-       is_uv3_hub() ? UV3H_SCRATCH5_ALIAS_32 :                         \
-       /*is_uv4_hub*/ UV4H_SCRATCH5_ALIAS_32)
+       /* UVXH common struct */
+       struct uvxh_rh_gam_alias_2_redirect_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   dest_base:22;                   /* RW */
+               unsigned long   rsvd_46_63:18;
+       } sx;
 
+       /* UV4 unique struct */
+       struct uv4h_rh_gam_alias_2_redirect_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   dest_base:22;                   /* RW */
+               unsigned long   rsvd_46_63:18;
+       } s4;
 
-/* ========================================================================= */
-/*                           UVH_SCRATCH5_ALIAS_2                            */
-/* ========================================================================= */
-#define UV2H_SCRATCH5_ALIAS_2 0x2d0210UL
-#define UV3H_SCRATCH5_ALIAS_2 0x2d0210UL
-#define UV4H_SCRATCH5_ALIAS_2 0xb0210UL
-#define UVH_SCRATCH5_ALIAS_2 (                                         \
-       is_uv2_hub() ? UV2H_SCRATCH5_ALIAS_2 :                          \
-       is_uv3_hub() ? UV3H_SCRATCH5_ALIAS_2 :                          \
-       /*is_uv4_hub*/ UV4H_SCRATCH5_ALIAS_2)
-#define UVH_SCRATCH5_ALIAS_2_32 0x788
+       /* UV3 unique struct */
+       struct uv3h_rh_gam_alias_2_redirect_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   dest_base:22;                   /* RW */
+               unsigned long   rsvd_46_63:18;
+       } s3;
 
+       /* UV2 unique struct */
+       struct uv2h_rh_gam_alias_2_redirect_config_s {
+               unsigned long   rsvd_0_23:24;
+               unsigned long   dest_base:22;                   /* RW */
+               unsigned long   rsvd_46_63:18;
+       } s2;
+};
 
 /* ========================================================================= */
-/*                          UVXH_EVENT_OCCURRED2                             */
+/*                      UVH_RH_GAM_GRU_OVERLAY_CONFIG                        */
 /* ========================================================================= */
-#define UVXH_EVENT_OCCURRED2 0x70100UL
-
-#define UV2H_EVENT_OCCURRED2_32 0xb68
-#define UV3H_EVENT_OCCURRED2_32 0xb68
-#define UV4H_EVENT_OCCURRED2_32 0x608
-#define UVH_EVENT_OCCURRED2_32 (                                       \
-       is_uv2_hub() ? UV2H_EVENT_OCCURRED2_32 :                        \
-       is_uv3_hub() ? UV3H_EVENT_OCCURRED2_32 :                        \
-       /*is_uv4_hub*/ UV4H_EVENT_OCCURRED2_32)
-
-
-#define UV2H_EVENT_OCCURRED2_RTC_0_SHFT                        0
-#define UV2H_EVENT_OCCURRED2_RTC_1_SHFT                        1
-#define UV2H_EVENT_OCCURRED2_RTC_2_SHFT                        2
-#define UV2H_EVENT_OCCURRED2_RTC_3_SHFT                        3
-#define UV2H_EVENT_OCCURRED2_RTC_4_SHFT                        4
-#define UV2H_EVENT_OCCURRED2_RTC_5_SHFT                        5
-#define UV2H_EVENT_OCCURRED2_RTC_6_SHFT                        6
-#define UV2H_EVENT_OCCURRED2_RTC_7_SHFT                        7
-#define UV2H_EVENT_OCCURRED2_RTC_8_SHFT                        8
-#define UV2H_EVENT_OCCURRED2_RTC_9_SHFT                        9
-#define UV2H_EVENT_OCCURRED2_RTC_10_SHFT               10
-#define UV2H_EVENT_OCCURRED2_RTC_11_SHFT               11
-#define UV2H_EVENT_OCCURRED2_RTC_12_SHFT               12
-#define UV2H_EVENT_OCCURRED2_RTC_13_SHFT               13
-#define UV2H_EVENT_OCCURRED2_RTC_14_SHFT               14
-#define UV2H_EVENT_OCCURRED2_RTC_15_SHFT               15
-#define UV2H_EVENT_OCCURRED2_RTC_16_SHFT               16
-#define UV2H_EVENT_OCCURRED2_RTC_17_SHFT               17
-#define UV2H_EVENT_OCCURRED2_RTC_18_SHFT               18
-#define UV2H_EVENT_OCCURRED2_RTC_19_SHFT               19
-#define UV2H_EVENT_OCCURRED2_RTC_20_SHFT               20
-#define UV2H_EVENT_OCCURRED2_RTC_21_SHFT               21
-#define UV2H_EVENT_OCCURRED2_RTC_22_SHFT               22
-#define UV2H_EVENT_OCCURRED2_RTC_23_SHFT               23
-#define UV2H_EVENT_OCCURRED2_RTC_24_SHFT               24
-#define UV2H_EVENT_OCCURRED2_RTC_25_SHFT               25
-#define UV2H_EVENT_OCCURRED2_RTC_26_SHFT               26
-#define UV2H_EVENT_OCCURRED2_RTC_27_SHFT               27
-#define UV2H_EVENT_OCCURRED2_RTC_28_SHFT               28
-#define UV2H_EVENT_OCCURRED2_RTC_29_SHFT               29
-#define UV2H_EVENT_OCCURRED2_RTC_30_SHFT               30
-#define UV2H_EVENT_OCCURRED2_RTC_31_SHFT               31
-#define UV2H_EVENT_OCCURRED2_RTC_0_MASK                        0x0000000000000001UL
-#define UV2H_EVENT_OCCURRED2_RTC_1_MASK                        0x0000000000000002UL
-#define UV2H_EVENT_OCCURRED2_RTC_2_MASK                        0x0000000000000004UL
-#define UV2H_EVENT_OCCURRED2_RTC_3_MASK                        0x0000000000000008UL
-#define UV2H_EVENT_OCCURRED2_RTC_4_MASK                        0x0000000000000010UL
-#define UV2H_EVENT_OCCURRED2_RTC_5_MASK                        0x0000000000000020UL
-#define UV2H_EVENT_OCCURRED2_RTC_6_MASK                        0x0000000000000040UL
-#define UV2H_EVENT_OCCURRED2_RTC_7_MASK                        0x0000000000000080UL
-#define UV2H_EVENT_OCCURRED2_RTC_8_MASK                        0x0000000000000100UL
-#define UV2H_EVENT_OCCURRED2_RTC_9_MASK                        0x0000000000000200UL
-#define UV2H_EVENT_OCCURRED2_RTC_10_MASK               0x0000000000000400UL
-#define UV2H_EVENT_OCCURRED2_RTC_11_MASK               0x0000000000000800UL
-#define UV2H_EVENT_OCCURRED2_RTC_12_MASK               0x0000000000001000UL
-#define UV2H_EVENT_OCCURRED2_RTC_13_MASK               0x0000000000002000UL
-#define UV2H_EVENT_OCCURRED2_RTC_14_MASK               0x0000000000004000UL
-#define UV2H_EVENT_OCCURRED2_RTC_15_MASK               0x0000000000008000UL
-#define UV2H_EVENT_OCCURRED2_RTC_16_MASK               0x0000000000010000UL
-#define UV2H_EVENT_OCCURRED2_RTC_17_MASK               0x0000000000020000UL
-#define UV2H_EVENT_OCCURRED2_RTC_18_MASK               0x0000000000040000UL
-#define UV2H_EVENT_OCCURRED2_RTC_19_MASK               0x0000000000080000UL
-#define UV2H_EVENT_OCCURRED2_RTC_20_MASK               0x0000000000100000UL
-#define UV2H_EVENT_OCCURRED2_RTC_21_MASK               0x0000000000200000UL
-#define UV2H_EVENT_OCCURRED2_RTC_22_MASK               0x0000000000400000UL
-#define UV2H_EVENT_OCCURRED2_RTC_23_MASK               0x0000000000800000UL
-#define UV2H_EVENT_OCCURRED2_RTC_24_MASK               0x0000000001000000UL
-#define UV2H_EVENT_OCCURRED2_RTC_25_MASK               0x0000000002000000UL
-#define UV2H_EVENT_OCCURRED2_RTC_26_MASK               0x0000000004000000UL
-#define UV2H_EVENT_OCCURRED2_RTC_27_MASK               0x0000000008000000UL
-#define UV2H_EVENT_OCCURRED2_RTC_28_MASK               0x0000000010000000UL
-#define UV2H_EVENT_OCCURRED2_RTC_29_MASK               0x0000000020000000UL
-#define UV2H_EVENT_OCCURRED2_RTC_30_MASK               0x0000000040000000UL
-#define UV2H_EVENT_OCCURRED2_RTC_31_MASK               0x0000000080000000UL
+#define UVH_RH_GAM_GRU_OVERLAY_CONFIG (                                        \
+       is_uv(UV4) ? 0x480010UL :                                       \
+       is_uv(UV3) ? 0x1600010UL :                                      \
+       is_uv(UV2) ? 0x1600010UL :                                      \
+       0)
+
+
+/* UVXH common defines */
+#define UVXH_RH_GAM_GRU_OVERLAY_CONFIG_N_GRU_SHFT      52
+#define UVXH_RH_GAM_GRU_OVERLAY_CONFIG_N_GRU_MASK      0x00f0000000000000UL
+#define UVXH_RH_GAM_GRU_OVERLAY_CONFIG_ENABLE_SHFT     63
+#define UVXH_RH_GAM_GRU_OVERLAY_CONFIG_ENABLE_MASK     0x8000000000000000UL
+
+/* UV4A unique defines */
+#define UV4AH_RH_GAM_GRU_OVERLAY_CONFIG_BASE_SHFT      26
+#define UV4AH_RH_GAM_GRU_OVERLAY_CONFIG_BASE_MASK      0x000ffffffc000000UL
+
+/* UV4 unique defines */
+#define UV4H_RH_GAM_GRU_OVERLAY_CONFIG_BASE_SHFT       26
+#define UV4H_RH_GAM_GRU_OVERLAY_CONFIG_BASE_MASK       0x00003ffffc000000UL
+
+/* UV3 unique defines */
+#define UV3H_RH_GAM_GRU_OVERLAY_CONFIG_BASE_SHFT       28
+#define UV3H_RH_GAM_GRU_OVERLAY_CONFIG_BASE_MASK       0x00003ffff0000000UL
+#define UV3H_RH_GAM_GRU_OVERLAY_CONFIG_MODE_SHFT       62
+#define UV3H_RH_GAM_GRU_OVERLAY_CONFIG_MODE_MASK       0x4000000000000000UL
+
+/* UV2 unique defines */
+#define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_BASE_SHFT       28
+#define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_BASE_MASK       0x00003ffff0000000UL
+
+#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_BASE_MASK (                      \
+       is_uv(UV4A) ? 0x000ffffffc000000UL :                            \
+       is_uv(UV4) ? 0x00003ffffc000000UL :                             \
+       is_uv(UV3) ? 0x00003ffff0000000UL :                             \
+       is_uv(UV2) ? 0x00003ffff0000000UL :                             \
+       0)
+#define UVH_RH_GAM_GRU_OVERLAY_CONFIG_BASE_SHFT (                      \
+       is_uv(UV4) ? 26 :                                               \
+       is_uv(UV3) ? 28 :                                               \
+       is_uv(UV2) ? 28 :                                               \
+       -1)
+
+union uvh_rh_gam_gru_overlay_config_u {
+       unsigned long   v;
 
-#define UV3H_EVENT_OCCURRED2_RTC_0_SHFT                        0
-#define UV3H_EVENT_OCCURRED2_RTC_1_SHFT                        1
-#define UV3H_EVENT_OCCURRED2_RTC_2_SHFT                        2
-#define UV3H_EVENT_OCCURRED2_RTC_3_SHFT                        3
-#define UV3H_EVENT_OCCURRED2_RTC_4_SHFT                        4
-#define UV3H_EVENT_OCCURRED2_RTC_5_SHFT                        5
-#define UV3H_EVENT_OCCURRED2_RTC_6_SHFT                        6
-#define UV3H_EVENT_OCCURRED2_RTC_7_SHFT                        7
-#define UV3H_EVENT_OCCURRED2_RTC_8_SHFT                        8
-#define UV3H_EVENT_OCCURRED2_RTC_9_SHFT                        9
-#define UV3H_EVENT_OCCURRED2_RTC_10_SHFT               10
-#define UV3H_EVENT_OCCURRED2_RTC_11_SHFT               11
-#define UV3H_EVENT_OCCURRED2_RTC_12_SHFT               12
-#define UV3H_EVENT_OCCURRED2_RTC_13_SHFT               13
-#define UV3H_EVENT_OCCURRED2_RTC_14_SHFT               14
-#define UV3H_EVENT_OCCURRED2_RTC_15_SHFT               15
-#define UV3H_EVENT_OCCURRED2_RTC_16_SHFT               16
-#define UV3H_EVENT_OCCURRED2_RTC_17_SHFT               17
-#define UV3H_EVENT_OCCURRED2_RTC_18_SHFT               18
-#define UV3H_EVENT_OCCURRED2_RTC_19_SHFT               19
-#define UV3H_EVENT_OCCURRED2_RTC_20_SHFT               20
-#define UV3H_EVENT_OCCURRED2_RTC_21_SHFT               21
-#define UV3H_EVENT_OCCURRED2_RTC_22_SHFT               22
-#define UV3H_EVENT_OCCURRED2_RTC_23_SHFT               23
-#define UV3H_EVENT_OCCURRED2_RTC_24_SHFT               24
-#define UV3H_EVENT_OCCURRED2_RTC_25_SHFT               25
-#define UV3H_EVENT_OCCURRED2_RTC_26_SHFT               26
-#define UV3H_EVENT_OCCURRED2_RTC_27_SHFT               27
-#define UV3H_EVENT_OCCURRED2_RTC_28_SHFT               28
-#define UV3H_EVENT_OCCURRED2_RTC_29_SHFT               29
-#define UV3H_EVENT_OCCURRED2_RTC_30_SHFT               30
-#define UV3H_EVENT_OCCURRED2_RTC_31_SHFT               31
-#define UV3H_EVENT_OCCURRED2_RTC_0_MASK                        0x0000000000000001UL
-#define UV3H_EVENT_OCCURRED2_RTC_1_MASK                        0x0000000000000002UL
-#define UV3H_EVENT_OCCURRED2_RTC_2_MASK                        0x0000000000000004UL
-#define UV3H_EVENT_OCCURRED2_RTC_3_MASK                        0x0000000000000008UL
-#define UV3H_EVENT_OCCURRED2_RTC_4_MASK                        0x0000000000000010UL
-#define UV3H_EVENT_OCCURRED2_RTC_5_MASK                        0x0000000000000020UL
-#define UV3H_EVENT_OCCURRED2_RTC_6_MASK                        0x0000000000000040UL
-#define UV3H_EVENT_OCCURRED2_RTC_7_MASK                        0x0000000000000080UL
-#define UV3H_EVENT_OCCURRED2_RTC_8_MASK                        0x0000000000000100UL
-#define UV3H_EVENT_OCCURRED2_RTC_9_MASK                        0x0000000000000200UL
-#define UV3H_EVENT_OCCURRED2_RTC_10_MASK               0x0000000000000400UL
-#define UV3H_EVENT_OCCURRED2_RTC_11_MASK               0x0000000000000800UL
-#define UV3H_EVENT_OCCURRED2_RTC_12_MASK               0x0000000000001000UL
-#define UV3H_EVENT_OCCURRED2_RTC_13_MASK               0x0000000000002000UL
-#define UV3H_EVENT_OCCURRED2_RTC_14_MASK               0x0000000000004000UL
-#define UV3H_EVENT_OCCURRED2_RTC_15_MASK               0x0000000000008000UL
-#define UV3H_EVENT_OCCURRED2_RTC_16_MASK               0x0000000000010000UL
-#define UV3H_EVENT_OCCURRED2_RTC_17_MASK               0x0000000000020000UL
-#define UV3H_EVENT_OCCURRED2_RTC_18_MASK               0x0000000000040000UL
-#define UV3H_EVENT_OCCURRED2_RTC_19_MASK               0x0000000000080000UL
-#define UV3H_EVENT_OCCURRED2_RTC_20_MASK               0x0000000000100000UL
-#define UV3H_EVENT_OCCURRED2_RTC_21_MASK               0x0000000000200000UL
-#define UV3H_EVENT_OCCURRED2_RTC_22_MASK               0x0000000000400000UL
-#define UV3H_EVENT_OCCURRED2_RTC_23_MASK               0x0000000000800000UL
-#define UV3H_EVENT_OCCURRED2_RTC_24_MASK               0x0000000001000000UL
-#define UV3H_EVENT_OCCURRED2_RTC_25_MASK               0x0000000002000000UL
-#define UV3H_EVENT_OCCURRED2_RTC_26_MASK               0x0000000004000000UL
-#define UV3H_EVENT_OCCURRED2_RTC_27_MASK               0x0000000008000000UL
-#define UV3H_EVENT_OCCURRED2_RTC_28_MASK               0x0000000010000000UL
-#define UV3H_EVENT_OCCURRED2_RTC_29_MASK               0x0000000020000000UL
-#define UV3H_EVENT_OCCURRED2_RTC_30_MASK               0x0000000040000000UL
-#define UV3H_EVENT_OCCURRED2_RTC_31_MASK               0x0000000080000000UL
+       /* UVH common struct */
+       struct uvh_rh_gam_gru_overlay_config_s {
+               unsigned long   rsvd_0_45:46;
+               unsigned long   rsvd_46_51:6;
+               unsigned long   n_gru:4;                        /* RW */
+               unsigned long   rsvd_56_62:7;
+               unsigned long   enable:1;                       /* RW */
+       } s;
+
+       /* UVXH common struct */
+       struct uvxh_rh_gam_gru_overlay_config_s {
+               unsigned long   rsvd_0_45:46;
+               unsigned long   rsvd_46_51:6;
+               unsigned long   n_gru:4;                        /* RW */
+               unsigned long   rsvd_56_62:7;
+               unsigned long   enable:1;                       /* RW */
+       } sx;
+
+       /* UV4A unique struct */
+       struct uv4ah_rh_gam_gru_overlay_config_s {
+               unsigned long   rsvd_0_24:25;
+               unsigned long   undef_25:1;                     /* Undefined */
+               unsigned long   base:26;                        /* RW */
+               unsigned long   n_gru:4;                        /* RW */
+               unsigned long   rsvd_56_62:7;
+               unsigned long   enable:1;                       /* RW */
+       } s4a;
+
+       /* UV4 unique struct */
+       struct uv4h_rh_gam_gru_overlay_config_s {
+               unsigned long   rsvd_0_24:25;
+               unsigned long   undef_25:1;                     /* Undefined */
+               unsigned long   base:20;                        /* RW */
+               unsigned long   rsvd_46_51:6;
+               unsigned long   n_gru:4;                        /* RW */
+               unsigned long   rsvd_56_62:7;
+               unsigned long   enable:1;                       /* RW */
+       } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_rh_gam_gru_overlay_config_s {
+               unsigned long   rsvd_0_27:28;
+               unsigned long   base:18;                        /* RW */
+               unsigned long   rsvd_46_51:6;
+               unsigned long   n_gru:4;                        /* RW */
+               unsigned long   rsvd_56_61:6;
+               unsigned long   mode:1;                         /* RW */
+               unsigned long   enable:1;                       /* RW */
+       } s3;
+
+       /* UV2 unique struct */
+       struct uv2h_rh_gam_gru_overlay_config_s {
+               unsigned long   rsvd_0_27:28;
+               unsigned long   base:18;                        /* RW */
+               unsigned long   rsvd_46_51:6;
+               unsigned long   n_gru:4;                        /* RW */
+               unsigned long   rsvd_56_62:7;
+               unsigned long   enable:1;                       /* RW */
+       } s2;
+};
+
+/* ========================================================================= */
+/*                     UVH_RH_GAM_MMIOH_OVERLAY_CONFIG                       */
+/* ========================================================================= */
+#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG (                              \
+       is_uv(UV2) ? 0x1600030UL :                                      \
+       0)
 
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT0_SHFT 0
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT1_SHFT 1
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT2_SHFT 2
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT3_SHFT 3
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT4_SHFT 4
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT5_SHFT 5
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT6_SHFT 6
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT7_SHFT 7
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT8_SHFT 8
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT9_SHFT 9
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT10_SHFT 10
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT11_SHFT 11
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT12_SHFT 12
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT13_SHFT 13
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT14_SHFT 14
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT15_SHFT 15
-#define UV4H_EVENT_OCCURRED2_RTC_INTERVAL_INT_SHFT     16
-#define UV4H_EVENT_OCCURRED2_BAU_DASHBOARD_INT_SHFT    17
-#define UV4H_EVENT_OCCURRED2_RTC_0_SHFT                        18
-#define UV4H_EVENT_OCCURRED2_RTC_1_SHFT                        19
-#define UV4H_EVENT_OCCURRED2_RTC_2_SHFT                        20
-#define UV4H_EVENT_OCCURRED2_RTC_3_SHFT                        21
-#define UV4H_EVENT_OCCURRED2_RTC_4_SHFT                        22
-#define UV4H_EVENT_OCCURRED2_RTC_5_SHFT                        23
-#define UV4H_EVENT_OCCURRED2_RTC_6_SHFT                        24
-#define UV4H_EVENT_OCCURRED2_RTC_7_SHFT                        25
-#define UV4H_EVENT_OCCURRED2_RTC_8_SHFT                        26
-#define UV4H_EVENT_OCCURRED2_RTC_9_SHFT                        27
-#define UV4H_EVENT_OCCURRED2_RTC_10_SHFT               28
-#define UV4H_EVENT_OCCURRED2_RTC_11_SHFT               29
-#define UV4H_EVENT_OCCURRED2_RTC_12_SHFT               30
-#define UV4H_EVENT_OCCURRED2_RTC_13_SHFT               31
-#define UV4H_EVENT_OCCURRED2_RTC_14_SHFT               32
-#define UV4H_EVENT_OCCURRED2_RTC_15_SHFT               33
-#define UV4H_EVENT_OCCURRED2_RTC_16_SHFT               34
-#define UV4H_EVENT_OCCURRED2_RTC_17_SHFT               35
-#define UV4H_EVENT_OCCURRED2_RTC_18_SHFT               36
-#define UV4H_EVENT_OCCURRED2_RTC_19_SHFT               37
-#define UV4H_EVENT_OCCURRED2_RTC_20_SHFT               38
-#define UV4H_EVENT_OCCURRED2_RTC_21_SHFT               39
-#define UV4H_EVENT_OCCURRED2_RTC_22_SHFT               40
-#define UV4H_EVENT_OCCURRED2_RTC_23_SHFT               41
-#define UV4H_EVENT_OCCURRED2_RTC_24_SHFT               42
-#define UV4H_EVENT_OCCURRED2_RTC_25_SHFT               43
-#define UV4H_EVENT_OCCURRED2_RTC_26_SHFT               44
-#define UV4H_EVENT_OCCURRED2_RTC_27_SHFT               45
-#define UV4H_EVENT_OCCURRED2_RTC_28_SHFT               46
-#define UV4H_EVENT_OCCURRED2_RTC_29_SHFT               47
-#define UV4H_EVENT_OCCURRED2_RTC_30_SHFT               48
-#define UV4H_EVENT_OCCURRED2_RTC_31_SHFT               49
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT0_MASK 0x0000000000000001UL
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT1_MASK 0x0000000000000002UL
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT2_MASK 0x0000000000000004UL
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT3_MASK 0x0000000000000008UL
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT4_MASK 0x0000000000000010UL
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT5_MASK 0x0000000000000020UL
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT6_MASK 0x0000000000000040UL
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT7_MASK 0x0000000000000080UL
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT8_MASK 0x0000000000000100UL
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT9_MASK 0x0000000000000200UL
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT10_MASK 0x0000000000000400UL
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT11_MASK 0x0000000000000800UL
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT12_MASK 0x0000000000001000UL
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT13_MASK 0x0000000000002000UL
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT14_MASK 0x0000000000004000UL
-#define UV4H_EVENT_OCCURRED2_MESSAGE_ACCELERATOR_INT15_MASK 0x0000000000008000UL
-#define UV4H_EVENT_OCCURRED2_RTC_INTERVAL_INT_MASK     0x0000000000010000UL
-#define UV4H_EVENT_OCCURRED2_BAU_DASHBOARD_INT_MASK    0x0000000000020000UL
-#define UV4H_EVENT_OCCURRED2_RTC_0_MASK                        0x0000000000040000UL
-#define UV4H_EVENT_OCCURRED2_RTC_1_MASK                        0x0000000000080000UL
-#define UV4H_EVENT_OCCURRED2_RTC_2_MASK                        0x0000000000100000UL
-#define UV4H_EVENT_OCCURRED2_RTC_3_MASK                        0x0000000000200000UL
-#define UV4H_EVENT_OCCURRED2_RTC_4_MASK                        0x0000000000400000UL
-#define UV4H_EVENT_OCCURRED2_RTC_5_MASK                        0x0000000000800000UL
-#define UV4H_EVENT_OCCURRED2_RTC_6_MASK                        0x0000000001000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_7_MASK                        0x0000000002000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_8_MASK                        0x0000000004000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_9_MASK                        0x0000000008000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_10_MASK               0x0000000010000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_11_MASK               0x0000000020000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_12_MASK               0x0000000040000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_13_MASK               0x0000000080000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_14_MASK               0x0000000100000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_15_MASK               0x0000000200000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_16_MASK               0x0000000400000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_17_MASK               0x0000000800000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_18_MASK               0x0000001000000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_19_MASK               0x0000002000000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_20_MASK               0x0000004000000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_21_MASK               0x0000008000000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_22_MASK               0x0000010000000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_23_MASK               0x0000020000000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_24_MASK               0x0000040000000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_25_MASK               0x0000080000000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_26_MASK               0x0000100000000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_27_MASK               0x0000200000000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_28_MASK               0x0000400000000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_29_MASK               0x0000800000000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_30_MASK               0x0001000000000000UL
-#define UV4H_EVENT_OCCURRED2_RTC_31_MASK               0x0002000000000000UL
 
-#define UVXH_EVENT_OCCURRED2_RTC_1_MASK (                              \
-       is_uv2_hub() ? UV2H_EVENT_OCCURRED2_RTC_1_MASK :                \
-       is_uv3_hub() ? UV3H_EVENT_OCCURRED2_RTC_1_MASK :                \
-       /*is_uv4_hub*/ UV4H_EVENT_OCCURRED2_RTC_1_MASK)
 
-union uvh_event_occurred2_u {
+/* UV2 unique defines */
+#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_BASE_SHFT     27
+#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_BASE_MASK     0x00003ffff8000000UL
+#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_M_IO_SHFT     46
+#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_M_IO_MASK     0x000fc00000000000UL
+#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_N_IO_SHFT     52
+#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_N_IO_MASK     0x00f0000000000000UL
+#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_ENABLE_SHFT   63
+#define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_ENABLE_MASK   0x8000000000000000UL
+
+#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_BASE_SHFT (                    \
+       is_uv(UV2) ? 27 :                                               \
+       uv_undefined("UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_BASE_SHFT"))
+
+union uvh_rh_gam_mmioh_overlay_config_u {
        unsigned long   v;
-       struct uv2h_event_occurred2_s {
-               unsigned long   rtc_0:1;                        /* RW */
-               unsigned long   rtc_1:1;                        /* RW */
-               unsigned long   rtc_2:1;                        /* RW */
-               unsigned long   rtc_3:1;                        /* RW */
-               unsigned long   rtc_4:1;                        /* RW */
-               unsigned long   rtc_5:1;                        /* RW */
-               unsigned long   rtc_6:1;                        /* RW */
-               unsigned long   rtc_7:1;                        /* RW */
-               unsigned long   rtc_8:1;                        /* RW */
-               unsigned long   rtc_9:1;                        /* RW */
-               unsigned long   rtc_10:1;                       /* RW */
-               unsigned long   rtc_11:1;                       /* RW */
-               unsigned long   rtc_12:1;                       /* RW */
-               unsigned long   rtc_13:1;                       /* RW */
-               unsigned long   rtc_14:1;                       /* RW */
-               unsigned long   rtc_15:1;                       /* RW */
-               unsigned long   rtc_16:1;                       /* RW */
-               unsigned long   rtc_17:1;                       /* RW */
-               unsigned long   rtc_18:1;                       /* RW */
-               unsigned long   rtc_19:1;                       /* RW */
-               unsigned long   rtc_20:1;                       /* RW */
-               unsigned long   rtc_21:1;                       /* RW */
-               unsigned long   rtc_22:1;                       /* RW */
-               unsigned long   rtc_23:1;                       /* RW */
-               unsigned long   rtc_24:1;                       /* RW */
-               unsigned long   rtc_25:1;                       /* RW */
-               unsigned long   rtc_26:1;                       /* RW */
-               unsigned long   rtc_27:1;                       /* RW */
-               unsigned long   rtc_28:1;                       /* RW */
-               unsigned long   rtc_29:1;                       /* RW */
-               unsigned long   rtc_30:1;                       /* RW */
-               unsigned long   rtc_31:1;                       /* RW */
-               unsigned long   rsvd_32_63:32;
+
+       /* UVH common struct */
+       struct uvh_rh_gam_mmioh_overlay_config_s {
+               unsigned long   rsvd_0_26:27;
+               unsigned long   base:19;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;                         /* RW */
+               unsigned long   rsvd_56_62:7;
+               unsigned long   enable:1;                       /* RW */
+       } s;
+
+       /* UVXH common struct */
+       struct uvxh_rh_gam_mmioh_overlay_config_s {
+               unsigned long   rsvd_0_26:27;
+               unsigned long   base:19;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;                         /* RW */
+               unsigned long   rsvd_56_62:7;
+               unsigned long   enable:1;                       /* RW */
+       } sx;
+
+       /* UV2 unique struct */
+       struct uv2h_rh_gam_mmioh_overlay_config_s {
+               unsigned long   rsvd_0_26:27;
+               unsigned long   base:19;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;                         /* RW */
+               unsigned long   rsvd_56_62:7;
+               unsigned long   enable:1;                       /* RW */
        } s2;
-       struct uv3h_event_occurred2_s {
-               unsigned long   rtc_0:1;                        /* RW */
-               unsigned long   rtc_1:1;                        /* RW */
-               unsigned long   rtc_2:1;                        /* RW */
-               unsigned long   rtc_3:1;                        /* RW */
-               unsigned long   rtc_4:1;                        /* RW */
-               unsigned long   rtc_5:1;                        /* RW */
-               unsigned long   rtc_6:1;                        /* RW */
-               unsigned long   rtc_7:1;                        /* RW */
-               unsigned long   rtc_8:1;                        /* RW */
-               unsigned long   rtc_9:1;                        /* RW */
-               unsigned long   rtc_10:1;                       /* RW */
-               unsigned long   rtc_11:1;                       /* RW */
-               unsigned long   rtc_12:1;                       /* RW */
-               unsigned long   rtc_13:1;                       /* RW */
-               unsigned long   rtc_14:1;                       /* RW */
-               unsigned long   rtc_15:1;                       /* RW */
-               unsigned long   rtc_16:1;                       /* RW */
-               unsigned long   rtc_17:1;                       /* RW */
-               unsigned long   rtc_18:1;                       /* RW */
-               unsigned long   rtc_19:1;                       /* RW */
-               unsigned long   rtc_20:1;                       /* RW */
-               unsigned long   rtc_21:1;                       /* RW */
-               unsigned long   rtc_22:1;                       /* RW */
-               unsigned long   rtc_23:1;                       /* RW */
-               unsigned long   rtc_24:1;                       /* RW */
-               unsigned long   rtc_25:1;                       /* RW */
-               unsigned long   rtc_26:1;                       /* RW */
-               unsigned long   rtc_27:1;                       /* RW */
-               unsigned long   rtc_28:1;                       /* RW */
-               unsigned long   rtc_29:1;                       /* RW */
-               unsigned long   rtc_30:1;                       /* RW */
-               unsigned long   rtc_31:1;                       /* RW */
-               unsigned long   rsvd_32_63:32;
+};
+
+/* ========================================================================= */
+/*                     UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0                      */
+/* ========================================================================= */
+#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0 (                             \
+       is_uv(UV4) ? 0x483000UL :                                       \
+       is_uv(UV3) ? 0x1603000UL :                                      \
+       0)
+
+/* UV4A unique defines */
+#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG0_BASE_SHFT   26
+#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG0_BASE_MASK   0x000ffffffc000000UL
+#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG0_M_IO_SHFT   52
+#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG0_M_IO_MASK   0x03f0000000000000UL
+#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG0_ENABLE_SHFT 63
+#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG0_ENABLE_MASK 0x8000000000000000UL
+
+/* UV4 unique defines */
+#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_BASE_SHFT    26
+#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_BASE_MASK    0x00003ffffc000000UL
+#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_M_IO_SHFT    46
+#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_M_IO_MASK    0x000fc00000000000UL
+#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_ENABLE_SHFT  63
+#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG0_ENABLE_MASK  0x8000000000000000UL
+
+/* UV3 unique defines */
+#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_BASE_SHFT    26
+#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_BASE_MASK    0x00003ffffc000000UL
+#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_M_IO_SHFT    46
+#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_M_IO_MASK    0x000fc00000000000UL
+#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_ENABLE_SHFT  63
+#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_ENABLE_MASK  0x8000000000000000UL
+
+#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0_BASE_MASK (                   \
+       is_uv(UV4A) ? 0x000ffffffc000000UL :                            \
+       is_uv(UV4) ? 0x00003ffffc000000UL :                             \
+       is_uv(UV3) ? 0x00003ffffc000000UL :                             \
+       0)
+#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0_BASE_SHFT (                   \
+       is_uv(UV4) ? 26 :                                               \
+       is_uv(UV3) ? 26 :                                               \
+       -1)
+
+union uvh_rh_gam_mmioh_overlay_config0_u {
+       unsigned long   v;
+
+       /* UVH common struct */
+       struct uvh_rh_gam_mmioh_overlay_config0_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:20;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;
+               unsigned long   rsvd_56_62:7;
+               unsigned long   enable:1;                       /* RW */
+       } s;
+
+       /* UVXH common struct */
+       struct uvxh_rh_gam_mmioh_overlay_config0_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:20;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;
+               unsigned long   rsvd_56_62:7;
+               unsigned long   enable:1;                       /* RW */
+       } sx;
+
+       /* UV4A unique struct */
+       struct uv4ah_rh_gam_mmioh_overlay_config0_mmr_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:26;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;
+               unsigned long   undef_62:1;                     /* Undefined */
+               unsigned long   enable:1;                       /* RW */
+       } s4a;
+
+       /* UV4 unique struct */
+       struct uv4h_rh_gam_mmioh_overlay_config0_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:20;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;
+               unsigned long   rsvd_56_62:7;
+               unsigned long   enable:1;                       /* RW */
+       } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_rh_gam_mmioh_overlay_config0_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:20;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;
+               unsigned long   rsvd_56_62:7;
+               unsigned long   enable:1;                       /* RW */
        } s3;
-       struct uv4h_event_occurred2_s {
-               unsigned long   message_accelerator_int0:1;     /* RW */
-               unsigned long   message_accelerator_int1:1;     /* RW */
-               unsigned long   message_accelerator_int2:1;     /* RW */
-               unsigned long   message_accelerator_int3:1;     /* RW */
-               unsigned long   message_accelerator_int4:1;     /* RW */
-               unsigned long   message_accelerator_int5:1;     /* RW */
-               unsigned long   message_accelerator_int6:1;     /* RW */
-               unsigned long   message_accelerator_int7:1;     /* RW */
-               unsigned long   message_accelerator_int8:1;     /* RW */
-               unsigned long   message_accelerator_int9:1;     /* RW */
-               unsigned long   message_accelerator_int10:1;    /* RW */
-               unsigned long   message_accelerator_int11:1;    /* RW */
-               unsigned long   message_accelerator_int12:1;    /* RW */
-               unsigned long   message_accelerator_int13:1;    /* RW */
-               unsigned long   message_accelerator_int14:1;    /* RW */
-               unsigned long   message_accelerator_int15:1;    /* RW */
-               unsigned long   rtc_interval_int:1;             /* RW */
-               unsigned long   bau_dashboard_int:1;            /* RW */
-               unsigned long   rtc_0:1;                        /* RW */
-               unsigned long   rtc_1:1;                        /* RW */
-               unsigned long   rtc_2:1;                        /* RW */
-               unsigned long   rtc_3:1;                        /* RW */
-               unsigned long   rtc_4:1;                        /* RW */
-               unsigned long   rtc_5:1;                        /* RW */
-               unsigned long   rtc_6:1;                        /* RW */
-               unsigned long   rtc_7:1;                        /* RW */
-               unsigned long   rtc_8:1;                        /* RW */
-               unsigned long   rtc_9:1;                        /* RW */
-               unsigned long   rtc_10:1;                       /* RW */
-               unsigned long   rtc_11:1;                       /* RW */
-               unsigned long   rtc_12:1;                       /* RW */
-               unsigned long   rtc_13:1;                       /* RW */
-               unsigned long   rtc_14:1;                       /* RW */
-               unsigned long   rtc_15:1;                       /* RW */
-               unsigned long   rtc_16:1;                       /* RW */
-               unsigned long   rtc_17:1;                       /* RW */
-               unsigned long   rtc_18:1;                       /* RW */
-               unsigned long   rtc_19:1;                       /* RW */
-               unsigned long   rtc_20:1;                       /* RW */
-               unsigned long   rtc_21:1;                       /* RW */
-               unsigned long   rtc_22:1;                       /* RW */
-               unsigned long   rtc_23:1;                       /* RW */
-               unsigned long   rtc_24:1;                       /* RW */
-               unsigned long   rtc_25:1;                       /* RW */
-               unsigned long   rtc_26:1;                       /* RW */
-               unsigned long   rtc_27:1;                       /* RW */
-               unsigned long   rtc_28:1;                       /* RW */
-               unsigned long   rtc_29:1;                       /* RW */
-               unsigned long   rtc_30:1;                       /* RW */
-               unsigned long   rtc_31:1;                       /* RW */
-               unsigned long   rsvd_50_63:14;
+};
+
+/* ========================================================================= */
+/*                     UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1                      */
+/* ========================================================================= */
+#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1 (                             \
+       is_uv(UV4) ? 0x484000UL :                                       \
+       is_uv(UV3) ? 0x1604000UL :                                      \
+       0)
+
+/* UV4A unique defines */
+#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG1_BASE_SHFT   26
+#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG1_BASE_MASK   0x000ffffffc000000UL
+#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG1_M_IO_SHFT   52
+#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG1_M_IO_MASK   0x03f0000000000000UL
+#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG1_ENABLE_SHFT 63
+#define UV4AH_RH_GAM_MMIOH_OVERLAY_CONFIG1_ENABLE_MASK 0x8000000000000000UL
+
+/* UV4 unique defines */
+#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_BASE_SHFT    26
+#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_BASE_MASK    0x00003ffffc000000UL
+#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_M_IO_SHFT    46
+#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_M_IO_MASK    0x000fc00000000000UL
+#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_ENABLE_SHFT  63
+#define UV4H_RH_GAM_MMIOH_OVERLAY_CONFIG1_ENABLE_MASK  0x8000000000000000UL
+
+/* UV3 unique defines */
+#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_BASE_SHFT    26
+#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_BASE_MASK    0x00003ffffc000000UL
+#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_M_IO_SHFT    46
+#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_M_IO_MASK    0x000fc00000000000UL
+#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_ENABLE_SHFT  63
+#define UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_ENABLE_MASK  0x8000000000000000UL
+
+#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1_BASE_MASK (                   \
+       is_uv(UV4A) ? 0x000ffffffc000000UL : \
+       is_uv(UV4) ? 0x00003ffffc000000UL :                             \
+       is_uv(UV3) ? 0x00003ffffc000000UL :                             \
+       0)
+#define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1_BASE_SHFT (                   \
+       is_uv(UV4) ? 26 :                                               \
+       is_uv(UV3) ? 26 :                                               \
+       -1)
+
+union uvh_rh_gam_mmioh_overlay_config1_u {
+       unsigned long   v;
+
+       /* UVH common struct */
+       struct uvh_rh_gam_mmioh_overlay_config1_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:20;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;
+               unsigned long   rsvd_56_62:7;
+               unsigned long   enable:1;                       /* RW */
+       } s;
+
+       /* UVXH common struct */
+       struct uvxh_rh_gam_mmioh_overlay_config1_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:20;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;
+               unsigned long   rsvd_56_62:7;
+               unsigned long   enable:1;                       /* RW */
+       } sx;
+
+       /* UV4A unique struct */
+       struct uv4ah_rh_gam_mmioh_overlay_config1_mmr_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:26;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;
+               unsigned long   undef_62:1;                     /* Undefined */
+               unsigned long   enable:1;                       /* RW */
+       } s4a;
+
+       /* UV4 unique struct */
+       struct uv4h_rh_gam_mmioh_overlay_config1_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:20;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;
+               unsigned long   rsvd_56_62:7;
+               unsigned long   enable:1;                       /* RW */
        } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_rh_gam_mmioh_overlay_config1_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:20;                        /* RW */
+               unsigned long   m_io:6;                         /* RW */
+               unsigned long   n_io:4;
+               unsigned long   rsvd_56_62:7;
+               unsigned long   enable:1;                       /* RW */
+       } s3;
 };
 
 /* ========================================================================= */
-/*                       UVXH_EVENT_OCCURRED2_ALIAS                          */
+/*                    UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0                      */
 /* ========================================================================= */
-#define UVXH_EVENT_OCCURRED2_ALIAS 0x70108UL
+#define UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0 (                            \
+       is_uv(UV4) ? 0x483800UL :                                       \
+       is_uv(UV3) ? 0x1603800UL :                                      \
+       0)
 
-#define UV2H_EVENT_OCCURRED2_ALIAS_32 0xb70
-#define UV3H_EVENT_OCCURRED2_ALIAS_32 0xb70
-#define UV4H_EVENT_OCCURRED2_ALIAS_32 0x610
-#define UVH_EVENT_OCCURRED2_ALIAS_32 (                                 \
-       is_uv2_hub() ? UV2H_EVENT_OCCURRED2_ALIAS_32 :                  \
-       is_uv3_hub() ? UV3H_EVENT_OCCURRED2_ALIAS_32 :                  \
-       /*is_uv4_hub*/ UV4H_EVENT_OCCURRED2_ALIAS_32)
+#define UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_DEPTH (                      \
+       is_uv(UV4) ? 128 :                                              \
+       is_uv(UV3) ? 128 :                                              \
+       0)
 
+/* UV4A unique defines */
+#define UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_SHFT 0
+#define UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK 0x0000000000000fffUL
 
-/* ========================================================================= */
-/*                   UVXH_LB_BAU_SB_ACTIVATION_STATUS_2                      */
-/* ========================================================================= */
-#define UV2H_LB_BAU_SB_ACTIVATION_STATUS_2 0x320130UL
-#define UV3H_LB_BAU_SB_ACTIVATION_STATUS_2 0x320130UL
-#define UV4H_LB_BAU_SB_ACTIVATION_STATUS_2 0xc8130UL
-#define UVH_LB_BAU_SB_ACTIVATION_STATUS_2 (                            \
-       is_uv2_hub() ? UV2H_LB_BAU_SB_ACTIVATION_STATUS_2 :             \
-       is_uv3_hub() ? UV3H_LB_BAU_SB_ACTIVATION_STATUS_2 :             \
-       /*is_uv4_hub*/ UV4H_LB_BAU_SB_ACTIVATION_STATUS_2)
+/* UV4 unique defines */
+#define UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_SHFT  0
+#define UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK  0x0000000000007fffUL
+
+/* UV3 unique defines */
+#define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_SHFT  0
+#define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK  0x0000000000007fffUL
 
-#define UV2H_LB_BAU_SB_ACTIVATION_STATUS_2_32 0x9f0
-#define UV3H_LB_BAU_SB_ACTIVATION_STATUS_2_32 0x9f0
-#define UV4H_LB_BAU_SB_ACTIVATION_STATUS_2_32 0xa10
-#define UVH_LB_BAU_SB_ACTIVATION_STATUS_2_32 (                         \
-       is_uv2_hub() ? UV2H_LB_BAU_SB_ACTIVATION_STATUS_2_32 :          \
-       is_uv3_hub() ? UV3H_LB_BAU_SB_ACTIVATION_STATUS_2_32 :          \
-       /*is_uv4_hub*/ UV4H_LB_BAU_SB_ACTIVATION_STATUS_2_32)
 
-#define UVXH_LB_BAU_SB_ACTIVATION_STATUS_2_AUX_ERROR_SHFT 0
-#define UVXH_LB_BAU_SB_ACTIVATION_STATUS_2_AUX_ERROR_MASK 0xffffffffffffffffUL
+union uvh_rh_gam_mmioh_redirect_config0_u {
+       unsigned long   v;
 
-#define UV2H_LB_BAU_SB_ACTIVATION_STATUS_2_AUX_ERROR_SHFT 0
-#define UV2H_LB_BAU_SB_ACTIVATION_STATUS_2_AUX_ERROR_MASK 0xffffffffffffffffUL
+       /* UVH common struct */
+       struct uvh_rh_gam_mmioh_redirect_config0_s {
+               unsigned long   nasid:15;                       /* RW */
+               unsigned long   rsvd_15_63:49;
+       } s;
 
-#define UV3H_LB_BAU_SB_ACTIVATION_STATUS_2_AUX_ERROR_SHFT 0
-#define UV3H_LB_BAU_SB_ACTIVATION_STATUS_2_AUX_ERROR_MASK 0xffffffffffffffffUL
+       /* UVXH common struct */
+       struct uvxh_rh_gam_mmioh_redirect_config0_s {
+               unsigned long   nasid:15;                       /* RW */
+               unsigned long   rsvd_15_63:49;
+       } sx;
 
-#define UV4H_LB_BAU_SB_ACTIVATION_STATUS_2_AUX_ERROR_SHFT 0
-#define UV4H_LB_BAU_SB_ACTIVATION_STATUS_2_AUX_ERROR_MASK 0xffffffffffffffffUL
+       struct uv4ah_rh_gam_mmioh_redirect_config0_s {
+               unsigned long   nasid:12;                       /* RW */
+               unsigned long   rsvd_12_63:52;
+       } s4a;
 
+       /* UV4 unique struct */
+       struct uv4h_rh_gam_mmioh_redirect_config0_s {
+               unsigned long   nasid:15;                       /* RW */
+               unsigned long   rsvd_15_63:49;
+       } s4;
 
-union uvxh_lb_bau_sb_activation_status_2_u {
-       unsigned long   v;
-       struct uvxh_lb_bau_sb_activation_status_2_s {
-               unsigned long   aux_error:64;                   /* RW */
-       } sx;
-       struct uv2h_lb_bau_sb_activation_status_2_s {
-               unsigned long   aux_error:64;                   /* RW */
-       } s2;
-       struct uv3h_lb_bau_sb_activation_status_2_s {
-               unsigned long   aux_error:64;                   /* RW */
+       /* UV3 unique struct */
+       struct uv3h_rh_gam_mmioh_redirect_config0_s {
+               unsigned long   nasid:15;                       /* RW */
+               unsigned long   rsvd_15_63:49;
        } s3;
-       struct uv4h_lb_bau_sb_activation_status_2_s {
-               unsigned long   aux_error:64;                   /* RW */
-       } s4;
 };
 
 /* ========================================================================= */
-/*                          UV3H_GR0_GAM_GR_CONFIG                           */
+/*                    UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1                      */
 /* ========================================================================= */
-#define UV3H_GR0_GAM_GR_CONFIG                         0xc00028UL
+#define UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1 (                            \
+       is_uv(UV4) ? 0x484800UL :                                       \
+       is_uv(UV3) ? 0x1604800UL :                                      \
+       0)
 
-#define UV3H_GR0_GAM_GR_CONFIG_M_SKT_SHFT              0
-#define UV3H_GR0_GAM_GR_CONFIG_SUBSPACE_SHFT           10
-#define UV3H_GR0_GAM_GR_CONFIG_M_SKT_MASK              0x000000000000003fUL
-#define UV3H_GR0_GAM_GR_CONFIG_SUBSPACE_MASK           0x0000000000000400UL
+#define UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_DEPTH (                      \
+       is_uv(UV4) ? 128 :                                              \
+       is_uv(UV3) ? 128 :                                              \
+       0)
+
+/* UV4A unique defines */
+#define UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_SHFT 0
+#define UV4AH_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK 0x0000000000000fffUL
+
+/* UV4 unique defines */
+#define UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_SHFT  0
+#define UV4H_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK  0x0000000000007fffUL
+
+/* UV3 unique defines */
+#define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_SHFT  0
+#define UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK  0x0000000000007fffUL
 
-union uv3h_gr0_gam_gr_config_u {
+
+union uvh_rh_gam_mmioh_redirect_config1_u {
        unsigned long   v;
-       struct uv3h_gr0_gam_gr_config_s {
-               unsigned long   m_skt:6;                        /* RW */
-               unsigned long   undef_6_9:4;                    /* Undefined */
-               unsigned long   subspace:1;                     /* RW */
-               unsigned long   reserved:53;
+
+       /* UVH common struct */
+       struct uvh_rh_gam_mmioh_redirect_config1_s {
+               unsigned long   nasid:15;                       /* RW */
+               unsigned long   rsvd_15_63:49;
+       } s;
+
+       /* UVXH common struct */
+       struct uvxh_rh_gam_mmioh_redirect_config1_s {
+               unsigned long   nasid:15;                       /* RW */
+               unsigned long   rsvd_15_63:49;
+       } sx;
+
+       struct uv4ah_rh_gam_mmioh_redirect_config1_s {
+               unsigned long   nasid:12;                       /* RW */
+               unsigned long   rsvd_12_63:52;
+       } s4a;
+
+       /* UV4 unique struct */
+       struct uv4h_rh_gam_mmioh_redirect_config1_s {
+               unsigned long   nasid:15;                       /* RW */
+               unsigned long   rsvd_15_63:49;
+       } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_rh_gam_mmioh_redirect_config1_s {
+               unsigned long   nasid:15;                       /* RW */
+               unsigned long   rsvd_15_63:49;
        } s3;
 };
 
 /* ========================================================================= */
-/*                       UV4H_LB_PROC_INTD_QUEUE_FIRST                       */
+/*                      UVH_RH_GAM_MMR_OVERLAY_CONFIG                        */
 /* ========================================================================= */
-#define UV4H_LB_PROC_INTD_QUEUE_FIRST                  0xa4100UL
+#define UVH_RH_GAM_MMR_OVERLAY_CONFIG (                                        \
+       is_uv(UV4) ? 0x480028UL :                                       \
+       is_uv(UV3) ? 0x1600028UL :                                      \
+       is_uv(UV2) ? 0x1600028UL :                                      \
+       0)
+
+
+/* UVXH common defines */
+#define UVXH_RH_GAM_MMR_OVERLAY_CONFIG_BASE_SHFT       26
+#define UVXH_RH_GAM_MMR_OVERLAY_CONFIG_BASE_MASK (                     \
+       is_uv(UV4A) ? 0x000ffffffc000000UL :                            \
+       is_uv(UV4) ? 0x00003ffffc000000UL :                             \
+       is_uv(UV3) ? 0x00003ffffc000000UL :                             \
+       is_uv(UV2) ? 0x00003ffffc000000UL :                             \
+       0)
+#define UVXH_RH_GAM_MMR_OVERLAY_CONFIG_ENABLE_SHFT     63
+#define UVXH_RH_GAM_MMR_OVERLAY_CONFIG_ENABLE_MASK     0x8000000000000000UL
+
+/* UV4A unique defines */
+#define UV4AH_RH_GAM_GRU_OVERLAY_CONFIG_BASE_SHFT      26
+#define UV4AH_RH_GAM_GRU_OVERLAY_CONFIG_BASE_MASK      0x000ffffffc000000UL
+
+#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_BASE_MASK (                      \
+       is_uv(UV4A) ? 0x000ffffffc000000UL :                            \
+       is_uv(UV4) ? 0x00003ffffc000000UL :                             \
+       is_uv(UV3) ? 0x00003ffffc000000UL :                             \
+       is_uv(UV2) ? 0x00003ffffc000000UL :                             \
+       0)
+
+#define UVH_RH_GAM_MMR_OVERLAY_CONFIG_BASE_SHFT (                      \
+       is_uv(UV4) ? 26 :                                               \
+       is_uv(UV3) ? 26 :                                               \
+       is_uv(UV2) ? 26 :                                               \
+       -1)
+
+union uvh_rh_gam_mmr_overlay_config_u {
+       unsigned long   v;
+
+       /* UVH common struct */
+       struct uvh_rh_gam_mmr_overlay_config_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:20;                        /* RW */
+               unsigned long   rsvd_46_62:17;
+               unsigned long   enable:1;                       /* RW */
+       } s;
 
-#define UV4H_LB_PROC_INTD_QUEUE_FIRST_FIRST_PAYLOAD_ADDRESS_SHFT 6
-#define UV4H_LB_PROC_INTD_QUEUE_FIRST_FIRST_PAYLOAD_ADDRESS_MASK 0x00003fffffffffc0UL
+       /* UVXH common struct */
+       struct uvxh_rh_gam_mmr_overlay_config_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:20;                        /* RW */
+               unsigned long   rsvd_46_62:17;
+               unsigned long   enable:1;                       /* RW */
+       } sx;
 
-union uv4h_lb_proc_intd_queue_first_u {
-       unsigned long   v;
-       struct uv4h_lb_proc_intd_queue_first_s {
-               unsigned long   undef_0_5:6;                    /* Undefined */
-               unsigned long   first_payload_address:40;       /* RW */
+       /* UV4 unique struct */
+       struct uv4h_rh_gam_mmr_overlay_config_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:20;                        /* RW */
+               unsigned long   rsvd_46_62:17;
+               unsigned long   enable:1;                       /* RW */
        } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_rh_gam_mmr_overlay_config_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:20;                        /* RW */
+               unsigned long   rsvd_46_62:17;
+               unsigned long   enable:1;                       /* RW */
+       } s3;
+
+       /* UV2 unique struct */
+       struct uv2h_rh_gam_mmr_overlay_config_s {
+               unsigned long   rsvd_0_25:26;
+               unsigned long   base:20;                        /* RW */
+               unsigned long   rsvd_46_62:17;
+               unsigned long   enable:1;                       /* RW */
+       } s2;
 };
 
 /* ========================================================================= */
-/*                       UV4H_LB_PROC_INTD_QUEUE_LAST                        */
+/*                                 UVH_RTC                                   */
 /* ========================================================================= */
-#define UV4H_LB_PROC_INTD_QUEUE_LAST                   0xa4108UL
+#define UVH_RTC (                                                      \
+       is_uv(UV5) ? 0xe0000UL :                                        \
+       is_uv(UV4) ? 0xe0000UL :                                        \
+       is_uv(UV3) ? 0x340000UL :                                       \
+       is_uv(UV2) ? 0x340000UL :                                       \
+       0)
+
+/* UVH common defines*/
+#define UVH_RTC_REAL_TIME_CLOCK_SHFT                   0
+#define UVH_RTC_REAL_TIME_CLOCK_MASK                   0x00ffffffffffffffUL
 
-#define UV4H_LB_PROC_INTD_QUEUE_LAST_LAST_PAYLOAD_ADDRESS_SHFT 5
-#define UV4H_LB_PROC_INTD_QUEUE_LAST_LAST_PAYLOAD_ADDRESS_MASK 0x00003fffffffffe0UL
 
-union uv4h_lb_proc_intd_queue_last_u {
+union uvh_rtc_u {
        unsigned long   v;
-       struct uv4h_lb_proc_intd_queue_last_s {
-               unsigned long   undef_0_4:5;                    /* Undefined */
-               unsigned long   last_payload_address:41;        /* RW */
+
+       /* UVH common struct */
+       struct uvh_rtc_s {
+               unsigned long   real_time_clock:56;             /* RW */
+               unsigned long   rsvd_56_63:8;
+       } s;
+
+       /* UV5 unique struct */
+       struct uv5h_rtc_s {
+               unsigned long   real_time_clock:56;             /* RW */
+               unsigned long   rsvd_56_63:8;
+       } s5;
+
+       /* UV4 unique struct */
+       struct uv4h_rtc_s {
+               unsigned long   real_time_clock:56;             /* RW */
+               unsigned long   rsvd_56_63:8;
        } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_rtc_s {
+               unsigned long   real_time_clock:56;             /* RW */
+               unsigned long   rsvd_56_63:8;
+       } s3;
+
+       /* UV2 unique struct */
+       struct uv2h_rtc_s {
+               unsigned long   real_time_clock:56;             /* RW */
+               unsigned long   rsvd_56_63:8;
+       } s2;
 };
 
 /* ========================================================================= */
-/*                     UV4H_LB_PROC_INTD_SOFT_ACK_CLEAR                      */
+/*                           UVH_RTC1_INT_CONFIG                             */
 /* ========================================================================= */
-#define UV4H_LB_PROC_INTD_SOFT_ACK_CLEAR               0xa4118UL
+#define UVH_RTC1_INT_CONFIG 0x615c0UL
+
+/* UVH common defines*/
+#define UVH_RTC1_INT_CONFIG_VECTOR_SHFT                        0
+#define UVH_RTC1_INT_CONFIG_VECTOR_MASK                        0x00000000000000ffUL
+#define UVH_RTC1_INT_CONFIG_DM_SHFT                    8
+#define UVH_RTC1_INT_CONFIG_DM_MASK                    0x0000000000000700UL
+#define UVH_RTC1_INT_CONFIG_DESTMODE_SHFT              11
+#define UVH_RTC1_INT_CONFIG_DESTMODE_MASK              0x0000000000000800UL
+#define UVH_RTC1_INT_CONFIG_STATUS_SHFT                        12
+#define UVH_RTC1_INT_CONFIG_STATUS_MASK                        0x0000000000001000UL
+#define UVH_RTC1_INT_CONFIG_P_SHFT                     13
+#define UVH_RTC1_INT_CONFIG_P_MASK                     0x0000000000002000UL
+#define UVH_RTC1_INT_CONFIG_T_SHFT                     15
+#define UVH_RTC1_INT_CONFIG_T_MASK                     0x0000000000008000UL
+#define UVH_RTC1_INT_CONFIG_M_SHFT                     16
+#define UVH_RTC1_INT_CONFIG_M_MASK                     0x0000000000010000UL
+#define UVH_RTC1_INT_CONFIG_APIC_ID_SHFT               32
+#define UVH_RTC1_INT_CONFIG_APIC_ID_MASK               0xffffffff00000000UL
 
-#define UV4H_LB_PROC_INTD_SOFT_ACK_CLEAR_SOFT_ACK_PENDING_FLAGS_SHFT 0
-#define UV4H_LB_PROC_INTD_SOFT_ACK_CLEAR_SOFT_ACK_PENDING_FLAGS_MASK 0x00000000000000ffUL
 
-union uv4h_lb_proc_intd_soft_ack_clear_u {
+union uvh_rtc1_int_config_u {
        unsigned long   v;
-       struct uv4h_lb_proc_intd_soft_ack_clear_s {
-               unsigned long   soft_ack_pending_flags:8;       /* WP */
+
+       /* UVH common struct */
+       struct uvh_rtc1_int_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } s;
+
+       /* UV5 unique struct */
+       struct uv5h_rtc1_int_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } s5;
+
+       /* UV4 unique struct */
+       struct uv4h_rtc1_int_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
        } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_rtc1_int_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } s3;
+
+       /* UV2 unique struct */
+       struct uv2h_rtc1_int_config_s {
+               unsigned long   vector_:8;                      /* RW */
+               unsigned long   dm:3;                           /* RW */
+               unsigned long   destmode:1;                     /* RW */
+               unsigned long   status:1;                       /* RO */
+               unsigned long   p:1;                            /* RO */
+               unsigned long   rsvd_14:1;
+               unsigned long   t:1;                            /* RO */
+               unsigned long   m:1;                            /* RW */
+               unsigned long   rsvd_17_31:15;
+               unsigned long   apic_id:32;                     /* RW */
+       } s2;
 };
 
 /* ========================================================================= */
-/*                    UV4H_LB_PROC_INTD_SOFT_ACK_PENDING                     */
+/*                               UVH_SCRATCH5                                */
 /* ========================================================================= */
-#define UV4H_LB_PROC_INTD_SOFT_ACK_PENDING             0xa4110UL
+#define UVH_SCRATCH5 (                                                 \
+       is_uv(UV5) ? 0xb0200UL :                                        \
+       is_uv(UV4) ? 0xb0200UL :                                        \
+       is_uv(UV3) ? 0x2d0200UL :                                       \
+       is_uv(UV2) ? 0x2d0200UL :                                       \
+       0)
+#define UV5H_SCRATCH5 0xb0200UL
+#define UV4H_SCRATCH5 0xb0200UL
+#define UV3H_SCRATCH5 0x2d0200UL
+#define UV2H_SCRATCH5 0x2d0200UL
+
+/* UVH common defines*/
+#define UVH_SCRATCH5_SCRATCH5_SHFT                     0
+#define UVH_SCRATCH5_SCRATCH5_MASK                     0xffffffffffffffffUL
+
+/* UVXH common defines */
+#define UVXH_SCRATCH5_SCRATCH5_SHFT                    0
+#define UVXH_SCRATCH5_SCRATCH5_MASK                    0xffffffffffffffffUL
+
+/* UVYH common defines */
+#define UVYH_SCRATCH5_SCRATCH5_SHFT                    0
+#define UVYH_SCRATCH5_SCRATCH5_MASK                    0xffffffffffffffffUL
+
+/* UV5 unique defines */
+#define UV5H_SCRATCH5_SCRATCH5_SHFT                    0
+#define UV5H_SCRATCH5_SCRATCH5_MASK                    0xffffffffffffffffUL
+
+/* UV4 unique defines */
+#define UV4H_SCRATCH5_SCRATCH5_SHFT                    0
+#define UV4H_SCRATCH5_SCRATCH5_MASK                    0xffffffffffffffffUL
+
+/* UV3 unique defines */
+#define UV3H_SCRATCH5_SCRATCH5_SHFT                    0
+#define UV3H_SCRATCH5_SCRATCH5_MASK                    0xffffffffffffffffUL
 
-#define UV4H_LB_PROC_INTD_SOFT_ACK_PENDING_SOFT_ACK_FLAGS_SHFT 0
-#define UV4H_LB_PROC_INTD_SOFT_ACK_PENDING_SOFT_ACK_FLAGS_MASK 0x00000000000000ffUL
+/* UV2 unique defines */
+#define UV2H_SCRATCH5_SCRATCH5_SHFT                    0
+#define UV2H_SCRATCH5_SCRATCH5_MASK                    0xffffffffffffffffUL
 
-union uv4h_lb_proc_intd_soft_ack_pending_u {
+
+union uvh_scratch5_u {
        unsigned long   v;
-       struct uv4h_lb_proc_intd_soft_ack_pending_s {
-               unsigned long   soft_ack_flags:8;               /* RW */
+
+       /* UVH common struct */
+       struct uvh_scratch5_s {
+               unsigned long   scratch5:64;                    /* RW */
+       } s;
+
+       /* UVXH common struct */
+       struct uvxh_scratch5_s {
+               unsigned long   scratch5:64;                    /* RW */
+       } sx;
+
+       /* UVYH common struct */
+       struct uvyh_scratch5_s {
+               unsigned long   scratch5:64;                    /* RW */
+       } sy;
+
+       /* UV5 unique struct */
+       struct uv5h_scratch5_s {
+               unsigned long   scratch5:64;                    /* RW */
+       } s5;
+
+       /* UV4 unique struct */
+       struct uv4h_scratch5_s {
+               unsigned long   scratch5:64;                    /* RW */
        } s4;
+
+       /* UV3 unique struct */
+       struct uv3h_scratch5_s {
+               unsigned long   scratch5:64;                    /* RW */
+       } s3;
+
+       /* UV2 unique struct */
+       struct uv2h_scratch5_s {
+               unsigned long   scratch5:64;                    /* RW */
+       } s2;
 };
 
+/* ========================================================================= */
+/*                            UVH_SCRATCH5_ALIAS                             */
+/* ========================================================================= */
+#define UVH_SCRATCH5_ALIAS (                                           \
+       is_uv(UV5) ? 0xb0208UL :                                        \
+       is_uv(UV4) ? 0xb0208UL :                                        \
+       is_uv(UV3) ? 0x2d0208UL :                                       \
+       is_uv(UV2) ? 0x2d0208UL :                                       \
+       0)
+#define UV5H_SCRATCH5_ALIAS 0xb0208UL
+#define UV4H_SCRATCH5_ALIAS 0xb0208UL
+#define UV3H_SCRATCH5_ALIAS 0x2d0208UL
+#define UV2H_SCRATCH5_ALIAS 0x2d0208UL
+
+
+/* ========================================================================= */
+/*                           UVH_SCRATCH5_ALIAS_2                            */
+/* ========================================================================= */
+#define UVH_SCRATCH5_ALIAS_2 (                                         \
+       is_uv(UV5) ? 0xb0210UL :                                        \
+       is_uv(UV4) ? 0xb0210UL :                                        \
+       is_uv(UV3) ? 0x2d0210UL :                                       \
+       is_uv(UV2) ? 0x2d0210UL :                                       \
+       0)
+#define UV5H_SCRATCH5_ALIAS_2 0xb0210UL
+#define UV4H_SCRATCH5_ALIAS_2 0xb0210UL
+#define UV3H_SCRATCH5_ALIAS_2 0x2d0210UL
+#define UV2H_SCRATCH5_ALIAS_2 0x2d0210UL
+
+
 
 #endif /* _ASM_X86_UV_UV_MMRS_H */
index f51fabf..d357711 100644 (file)
@@ -29,6 +29,7 @@ static int                    uv_hubbed_system;
 static int                     uv_hubless_system;
 static u64                     gru_start_paddr, gru_end_paddr;
 static union uvh_apicid                uvh_apicid;
+static int                     uv_node_id;
 
 /* Unpack OEM/TABLE ID's to be NULL terminated strings */
 static u8 oem_id[ACPI_OEM_ID_SIZE + 1];
@@ -85,43 +86,73 @@ static bool uv_is_untracked_pat_range(u64 start, u64 end)
        return is_ISA_range(start, end) || is_GRU_range(start, end);
 }
 
-static int __init early_get_pnodeid(void)
+static void __init early_get_pnodeid(void)
 {
-       union uvh_node_id_u node_id;
-       union uvh_rh_gam_config_mmr_u  m_n_config;
+       union uvh_rh_gam_addr_map_config_u  m_n_config;
        int pnode;
 
-       /* Currently, all blades have same revision number */
+       m_n_config.v = uv_early_read_mmr(UVH_RH_GAM_ADDR_MAP_CONFIG);
+
+       if (is_uv4_hub())
+               uv_cpuid.gnode_shift = 2; /* min partition is 4 sockets */
+
+       uv_cpuid.pnode_mask = (1 << m_n_config.s.n_skt) - 1;
+       pnode = (uv_node_id >> 1) & uv_cpuid.pnode_mask;
+       uv_cpuid.gpa_shift = 46;        /* Default unless changed */
+
+       pr_info("UV: n_skt:%d pnmsk:%x pn:%x\n",
+               m_n_config.s.n_skt, uv_cpuid.pnode_mask, pnode);
+}
+
+/* Running on a UV Hubbed system, determine which UV Hub Type it is */
+static int __init early_set_hub_type(void)
+{
+       union uvh_node_id_u node_id;
+
+       /*
+        * The NODE_ID MMR is always at offset 0.
+        * Contains the chip part # + revision.
+        * Node_id field started with 15 bits,
+        * ... now 7 but upper 8 are masked to 0.
+        * All blades/nodes have the same part # and hub revision.
+        */
        node_id.v = uv_early_read_mmr(UVH_NODE_ID);
-       m_n_config.v = uv_early_read_mmr(UVH_RH_GAM_CONFIG_MMR);
-       uv_min_hub_revision_id = node_id.s.revision;
+       uv_node_id = node_id.sx.node_id;
 
        switch (node_id.s.part_number) {
-       case UV2_HUB_PART_NUMBER:
-       case UV2_HUB_PART_NUMBER_X:
-               uv_min_hub_revision_id += UV2_HUB_REVISION_BASE - 1;
+
+       /* UV4/4A only have a revision difference */
+       case UV4_HUB_PART_NUMBER:
+               uv_min_hub_revision_id = node_id.s.revision
+                                        + UV4_HUB_REVISION_BASE;
+               uv_hub_type_set(UV4);
+               if (uv_min_hub_revision_id == UV4A_HUB_REVISION_BASE)
+                       uv_hub_type_set(UV4|UV4A);
                break;
+
        case UV3_HUB_PART_NUMBER:
        case UV3_HUB_PART_NUMBER_X:
-               uv_min_hub_revision_id += UV3_HUB_REVISION_BASE;
+               uv_min_hub_revision_id = node_id.s.revision
+                                        + UV3_HUB_REVISION_BASE;
+               uv_hub_type_set(UV3);
                break;
 
-       /* Update: UV4A has only a modified revision to indicate HUB fixes */
-       case UV4_HUB_PART_NUMBER:
-               uv_min_hub_revision_id += UV4_HUB_REVISION_BASE - 1;
-               uv_cpuid.gnode_shift = 2; /* min partition is 4 sockets */
+       case UV2_HUB_PART_NUMBER:
+       case UV2_HUB_PART_NUMBER_X:
+               uv_min_hub_revision_id = node_id.s.revision
+                                        + UV2_HUB_REVISION_BASE - 1;
+               uv_hub_type_set(UV2);
                break;
+
+       default:
+               return 0;
        }
 
-       uv_hub_info->hub_revision = uv_min_hub_revision_id;
-       uv_cpuid.pnode_mask = (1 << m_n_config.s.n_skt) - 1;
-       pnode = (node_id.s.node_id >> 1) & uv_cpuid.pnode_mask;
-       uv_cpuid.gpa_shift = 46;        /* Default unless changed */
+       pr_info("UV: part#:%x rev:%d rev_id:%d UVtype:0x%x\n",
+               node_id.s.part_number, node_id.s.revision,
+               uv_min_hub_revision_id, is_uv(~0));
 
-       pr_info("UV: rev:%d part#:%x nodeid:%04x n_skt:%d pnmsk:%x pn:%x\n",
-               node_id.s.revision, node_id.s.part_number, node_id.s.node_id,
-               m_n_config.s.n_skt, uv_cpuid.pnode_mask, pnode);
-       return pnode;
+       return 1;
 }
 
 static void __init uv_tsc_check_sync(void)
@@ -221,29 +252,26 @@ static void __init uv_stringify(int len, char *to, char *from)
        strncpy(to, from, len-1);
 }
 
-static int __init uv_acpi_madt_oem_check(char *_oem_id, char *_oem_table_id)
+static int __init uv_set_system_type(char *_oem_id)
 {
-       int pnodeid;
-       int uv_apic;
-
+       /* Save OEM ID */
        uv_stringify(sizeof(oem_id), oem_id, _oem_id);
-       uv_stringify(sizeof(oem_table_id), oem_table_id, _oem_table_id);
 
+       /* Set hubless type if true */
        if (strncmp(oem_id, "SGI", 3) != 0) {
                if (strncmp(oem_id, "NSGI", 4) != 0)
                        return 0;
 
-               /* UV4 Hubless, CH, (0x11:UV4+Any) */
+               /* UV4 Hubless: CH */
                if (strncmp(oem_id, "NSGI4", 5) == 0)
                        uv_hubless_system = 0x11;
 
-               /* UV3 Hubless, UV300/MC990X w/o hub (0x9:UV3+Any) */
+               /* UV3 Hubless: UV300/MC990X w/o hub */
                else
                        uv_hubless_system = 0x9;
 
-               pr_info("UV: OEM IDs %s/%s, HUBLESS(0x%x)\n",
-                       oem_id, oem_table_id, uv_hubless_system);
-
+               pr_info("UV: OEM IDs %s/%s, SystemType %d, HUBLESS ID %x\n",
+                       oem_id, oem_table_id, uv_system_type, uv_hubless_system);
                return 0;
        }
 
@@ -252,60 +280,78 @@ static int __init uv_acpi_madt_oem_check(char *_oem_id, char *_oem_table_id)
                return 0;
        }
 
-       /* Set up early hub type field in uv_hub_info for Node 0 */
-       uv_cpu_info->p_uv_hub_info = &uv_hub_info_node0;
+       /* Set hubbed type if true */
+       uv_hub_info->hub_revision =
+               !strncmp(oem_id, "SGI4", 4) ? UV4_HUB_REVISION_BASE :
+               !strncmp(oem_id, "SGI3", 4) ? UV3_HUB_REVISION_BASE :
+               !strcmp(oem_id, "SGI2") ? UV2_HUB_REVISION_BASE : 0;
 
-       /*
-        * Determine UV arch type.
-        *   SGI2: UV2000/3000
-        *   SGI3: UV300 (truncated to 4 chars because of different varieties)
-        *   SGI4: UV400 (truncated to 4 chars because of different varieties)
-        */
-       if (!strncmp(oem_id, "SGI4", 4)) {
-               uv_hub_info->hub_revision = UV4_HUB_REVISION_BASE;
+       switch (uv_hub_info->hub_revision) {
+       case UV4_HUB_REVISION_BASE:
                uv_hubbed_system = 0x11;
+               uv_hub_type_set(UV4);
+               break;
 
-       } else if (!strncmp(oem_id, "SGI3", 4)) {
-               uv_hub_info->hub_revision = UV3_HUB_REVISION_BASE;
+       case UV3_HUB_REVISION_BASE:
                uv_hubbed_system = 0x9;
+               uv_hub_type_set(UV3);
+               break;
 
-       } else if (!strcmp(oem_id, "SGI2")) {
-               uv_hub_info->hub_revision = UV2_HUB_REVISION_BASE;
+       case UV2_HUB_REVISION_BASE:
                uv_hubbed_system = 0x5;
+               uv_hub_type_set(UV2);
+               break;
 
-       } else {
-               uv_hub_info->hub_revision = 0;
-               goto badbios;
+       default:
+               return 0;
        }
 
-       pnodeid = early_get_pnodeid();
-       early_get_apic_socketid_shift();
+       /* Get UV hub chip part number & revision */
+       early_set_hub_type();
 
+       /* Other UV setup functions */
+       early_get_pnodeid();
+       early_get_apic_socketid_shift();
        x86_platform.is_untracked_pat_range = uv_is_untracked_pat_range;
        x86_platform.nmi_init = uv_nmi_init;
+       uv_tsc_check_sync();
+
+       return 1;
+}
 
-       if (!strcmp(oem_table_id, "UVX")) {
-               /* This is the most common hardware variant: */
+/* Called early to probe for the correct APIC driver */
+static int __init uv_acpi_madt_oem_check(char *_oem_id, char *_oem_table_id)
+{
+       /* Set up early hub info fields for Node 0 */
+       uv_cpu_info->p_uv_hub_info = &uv_hub_info_node0;
+
+       /* If not UV, return. */
+       if (likely(uv_set_system_type(_oem_id) == 0))
+               return 0;
+
+       /* Save and Decode OEM Table ID */
+       uv_stringify(sizeof(oem_table_id), oem_table_id, _oem_table_id);
+
+       /* This is the most common hardware variant, x2apic mode */
+       if (!strcmp(oem_table_id, "UVX"))
                uv_system_type = UV_X2APIC;
-               uv_apic = 0;
 
-       } else if (!strcmp(oem_table_id, "UVL")) {
-               /* Only used for very small systems:  */
+       /* Only used for very small systems, usually 1 chassis, legacy mode  */
+       else if (!strcmp(oem_table_id, "UVL"))
                uv_system_type = UV_LEGACY_APIC;
-               uv_apic = 0;
 
-       } else {
+       else
                goto badbios;
-       }
 
-       pr_info("UV: OEM IDs %s/%s, System/HUB Types %d/%d, uv_apic %d\n", oem_id, oem_table_id, uv_system_type, uv_min_hub_revision_id, uv_apic);
-       uv_tsc_check_sync();
+       pr_info("UV: OEM IDs %s/%s, System/UVType %d/0x%x, HUB RevID %d\n",
+               oem_id, oem_table_id, uv_system_type, is_uv(UV_ANY),
+               uv_min_hub_revision_id);
 
-       return uv_apic;
+       return 0;
 
 badbios:
        pr_err("UV: OEM_ID:%s OEM_TABLE_ID:%s\n", oem_id, oem_table_id);
-       pr_err("Current UV Type or BIOS not supported\n");
+       pr_err("UV: Current UV Type or BIOS not supported\n");
        BUG();
 }
 
@@ -673,12 +719,12 @@ static struct apic apic_x2apic_uv_x __ro_after_init = {
 };
 
 #define        UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_LENGTH      3
-#define DEST_SHIFT UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR_DEST_BASE_SHFT
+#define DEST_SHIFT UVXH_RH_GAM_ALIAS_0_REDIRECT_CONFIG_DEST_BASE_SHFT
 
 static __init void get_lowmem_redirect(unsigned long *base, unsigned long *size)
 {
-       union uvh_rh_gam_alias210_overlay_config_2_mmr_u alias;
-       union uvh_rh_gam_alias210_redirect_config_2_mmr_u redirect;
+       union uvh_rh_gam_alias_2_overlay_config_u alias;
+       union uvh_rh_gam_alias_2_redirect_config_u redirect;
        unsigned long m_redirect;
        unsigned long m_overlay;
        int i;
@@ -686,16 +732,16 @@ static __init void get_lowmem_redirect(unsigned long *base, unsigned long *size)
        for (i = 0; i < UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_LENGTH; i++) {
                switch (i) {
                case 0:
-                       m_redirect = UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_0_MMR;
-                       m_overlay  = UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_0_MMR;
+                       m_redirect = UVH_RH_GAM_ALIAS_0_REDIRECT_CONFIG;
+                       m_overlay  = UVH_RH_GAM_ALIAS_0_OVERLAY_CONFIG;
                        break;
                case 1:
-                       m_redirect = UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_1_MMR;
-                       m_overlay  = UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_1_MMR;
+                       m_redirect = UVH_RH_GAM_ALIAS_1_REDIRECT_CONFIG;
+                       m_overlay  = UVH_RH_GAM_ALIAS_1_OVERLAY_CONFIG;
                        break;
                case 2:
-                       m_redirect = UVH_RH_GAM_ALIAS210_REDIRECT_CONFIG_2_MMR;
-                       m_overlay  = UVH_RH_GAM_ALIAS210_OVERLAY_CONFIG_2_MMR;
+                       m_redirect = UVH_RH_GAM_ALIAS_2_REDIRECT_CONFIG;
+                       m_overlay  = UVH_RH_GAM_ALIAS_2_OVERLAY_CONFIG;
                        break;
                }
                alias.v = uv_read_local_mmr(m_overlay);
@@ -730,12 +776,12 @@ static __init void map_high(char *id, unsigned long base, int pshift, int bshift
 
 static __init void map_gru_high(int max_pnode)
 {
-       union uvh_rh_gam_gru_overlay_config_mmr_u gru;
-       int shift = UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT;
-       unsigned long mask = UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_MASK;
+       union uvh_rh_gam_gru_overlay_config_u gru;
+       int shift = UVH_RH_GAM_GRU_OVERLAY_CONFIG_BASE_SHFT;
+       unsigned long mask = UVH_RH_GAM_GRU_OVERLAY_CONFIG_BASE_MASK;
        unsigned long base;
 
-       gru.v = uv_read_local_mmr(UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR);
+       gru.v = uv_read_local_mmr(UVH_RH_GAM_GRU_OVERLAY_CONFIG);
        if (!gru.s.enable) {
                pr_info("UV: GRU disabled\n");
                return;
@@ -749,10 +795,10 @@ static __init void map_gru_high(int max_pnode)
 
 static __init void map_mmr_high(int max_pnode)
 {
-       union uvh_rh_gam_mmr_overlay_config_mmr_u mmr;
-       int shift = UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT;
+       union uvh_rh_gam_mmr_overlay_config_u mmr;
+       int shift = UVH_RH_GAM_MMR_OVERLAY_CONFIG_BASE_SHFT;
 
-       mmr.v = uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR);
+       mmr.v = uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG);
        if (mmr.s.enable)
                map_high("MMR", mmr.s.base, shift, shift, max_pnode, map_uc);
        else
@@ -773,29 +819,29 @@ static __init void map_mmioh_high_uv34(int index, int min_pnode, int max_pnode)
 
        if (index == 0) {
                id = "MMIOH0";
-               m_overlay = UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR;
+               m_overlay = UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0;
                overlay = uv_read_local_mmr(m_overlay);
-               base = overlay & UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_BASE_MASK;
-               mmr = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR;
-               m_io = (overlay & UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_MASK)
-                       >> UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_SHFT;
-               shift = UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_M_IO_SHFT;
-               n = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_DEPTH;
-               nasid_mask = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_MMR_NASID_MASK;
+               base = overlay & UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_BASE_MASK;
+               mmr = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0;
+               m_io = (overlay & UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_M_IO_MASK)
+                       >> UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_M_IO_SHFT;
+               shift = UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_M_IO_SHFT;
+               n = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG0_DEPTH;
+               nasid_mask = UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG0_NASID_MASK;
        } else {
                id = "MMIOH1";
-               m_overlay = UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR;
+               m_overlay = UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1;
                overlay = uv_read_local_mmr(m_overlay);
-               base = overlay & UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_BASE_MASK;
-               mmr = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR;
-               m_io = (overlay & UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_MASK)
-                       >> UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_SHFT;
-               shift = UVH_RH_GAM_MMIOH_OVERLAY_CONFIG1_MMR_M_IO_SHFT;
-               n = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_DEPTH;
-               nasid_mask = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_MMR_NASID_MASK;
+               base = overlay & UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_BASE_MASK;
+               mmr = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1;
+               m_io = (overlay & UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_M_IO_MASK)
+                       >> UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_M_IO_SHFT;
+               shift = UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG1_M_IO_SHFT;
+               n = UVH_RH_GAM_MMIOH_REDIRECT_CONFIG1_DEPTH;
+               nasid_mask = UV3H_RH_GAM_MMIOH_REDIRECT_CONFIG1_NASID_MASK;
        }
        pr_info("UV: %s overlay 0x%lx base:0x%lx m_io:%d\n", id, overlay, base, m_io);
-       if (!(overlay & UVH_RH_GAM_MMIOH_OVERLAY_CONFIG0_MMR_ENABLE_MASK)) {
+       if (!(overlay & UV3H_RH_GAM_MMIOH_OVERLAY_CONFIG0_ENABLE_MASK)) {
                pr_info("UV: %s disabled\n", id);
                return;
        }
@@ -855,7 +901,7 @@ static __init void map_mmioh_high_uv34(int index, int min_pnode, int max_pnode)
 
 static __init void map_mmioh_high(int min_pnode, int max_pnode)
 {
-       union uvh_rh_gam_mmioh_overlay_config_mmr_u mmioh;
+       union uvh_rh_gam_mmioh_overlay_config_u mmioh;
        unsigned long mmr, base;
        int shift, enable, m_io, n_io;
 
@@ -867,8 +913,8 @@ static __init void map_mmioh_high(int min_pnode, int max_pnode)
        }
 
        if (is_uv2_hub()) {
-               mmr     = UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR;
-               shift   = UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_SHFT;
+               mmr     = UVH_RH_GAM_MMIOH_OVERLAY_CONFIG;
+               shift   = UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_BASE_SHFT;
                mmioh.v = uv_read_local_mmr(mmr);
                enable  = !!mmioh.s2.enable;
                base    = mmioh.s2.base;
@@ -950,13 +996,13 @@ struct mn {
 
 static void get_mn(struct mn *mnp)
 {
-       union uvh_rh_gam_config_mmr_u m_n_config;
-       union uv3h_gr0_gam_gr_config_u m_gr_config;
+       union uvh_rh_gam_addr_map_config_u m_n_config;
+       union uvyh_gr0_gam_gr_config_u m_gr_config;
 
        /* Make sure the whole structure is well initialized: */
        memset(mnp, 0, sizeof(*mnp));
 
-       m_n_config.v    = uv_read_local_mmr(UVH_RH_GAM_CONFIG_MMR);
+       m_n_config.v    = uv_read_local_mmr(UVH_RH_GAM_ADDR_MAP_CONFIG);
        mnp->n_val      = m_n_config.s.n_skt;
 
        if (is_uv4_hub()) {
@@ -964,7 +1010,7 @@ static void get_mn(struct mn *mnp)
                mnp->n_lshift   = 0;
        } else if (is_uv3_hub()) {
                mnp->m_val      = m_n_config.s3.m_skt;
-               m_gr_config.v   = uv_read_local_mmr(UV3H_GR0_GAM_GR_CONFIG);
+               m_gr_config.v   = uv_read_local_mmr(UVH_GR0_GAM_GR_CONFIG);
                mnp->n_lshift   = m_gr_config.s3.m_skt;
        } else if (is_uv2_hub()) {
                mnp->m_val      = m_n_config.s2.m_skt;
@@ -975,7 +1021,6 @@ static void get_mn(struct mn *mnp)
 
 static void __init uv_init_hub_info(struct uv_hub_info_s *hi)
 {
-       union uvh_node_id_u node_id;
        struct mn mn;
 
        get_mn(&mn);
@@ -988,6 +1033,7 @@ static void __init uv_init_hub_info(struct uv_hub_info_s *hi)
        hi->m_shift             = mn.m_shift;
        hi->n_lshift            = mn.n_lshift ? mn.n_lshift : 0;
        hi->hub_revision        = uv_hub_info->hub_revision;
+       hi->hub_type            = uv_hub_info->hub_type;
        hi->pnode_mask          = uv_cpuid.pnode_mask;
        hi->min_pnode           = _min_pnode;
        hi->min_socket          = _min_socket;
@@ -997,9 +1043,8 @@ static void __init uv_init_hub_info(struct uv_hub_info_s *hi)
        hi->gr_table_len        = _gr_table_len;
        hi->gr_table            = _gr_table;
 
-       node_id.v               = uv_read_local_mmr(UVH_NODE_ID);
        uv_cpuid.gnode_shift    = max_t(unsigned int, uv_cpuid.gnode_shift, mn.n_val);
-       hi->gnode_extra         = (node_id.s.node_id & ~((1 << uv_cpuid.gnode_shift) - 1)) >> 1;
+       hi->gnode_extra         = (uv_node_id & ~((1 << uv_cpuid.gnode_shift) - 1)) >> 1;
        if (mn.m_val)
                hi->gnode_upper = (u64)hi->gnode_extra << mn.m_val;
 
@@ -1011,7 +1056,9 @@ static void __init uv_init_hub_info(struct uv_hub_info_s *hi)
                hi->gpa_shift           = uv_gp_table->gpa_shift;
                hi->gpa_mask            = (1UL << hi->gpa_shift) - 1;
        } else {
-               hi->global_mmr_base     = uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR) & ~UV_MMR_ENABLE;
+               hi->global_mmr_base     =
+                       uv_read_local_mmr(UVH_RH_GAM_MMR_OVERLAY_CONFIG) &
+                       ~UV_MMR_ENABLE;
                hi->global_mmr_shift    = _UV_GLOBAL_MMR64_PNODE_SHIFT;
        }
 
@@ -1135,11 +1182,7 @@ static int __init decode_uv_systab(void)
        return 0;
 }
 
-/*
- * Set up physical blade translations from UVH_NODE_PRESENT_TABLE
- * .. NB: UVH_NODE_PRESENT_TABLE is going away,
- * .. being replaced by GAM Range Table
- */
+/* Set up physical blade translations from UVH_NODE_PRESENT_TABLE */
 static __init void boot_init_possible_blades(struct uv_hub_info_s *hub_info)
 {
        int i, uv_pb = 0;
index 6c348c2..d996735 100644 (file)
@@ -84,10 +84,8 @@ static void uv_rtc_send_IPI(int cpu)
 /* Check for an RTC interrupt pending */
 static int uv_intr_pending(int pnode)
 {
-       if (is_uvx_hub())
-               return uv_read_global_mmr64(pnode, UVXH_EVENT_OCCURRED2) &
-                       UVXH_EVENT_OCCURRED2_RTC_1_MASK;
-       return 0;
+       return uv_read_global_mmr64(pnode, UVH_EVENT_OCCURRED2) &
+               UVH_EVENT_OCCURRED2_RTC_1_MASK;
 }
 
 /* Setup interrupt and return non-zero if early expiration occurred. */
@@ -101,8 +99,8 @@ static int uv_setup_intr(int cpu, u64 expires)
                UVH_RTC1_INT_CONFIG_M_MASK);
        uv_write_global_mmr64(pnode, UVH_INT_CMPB, -1L);
 
-       uv_write_global_mmr64(pnode, UVXH_EVENT_OCCURRED2_ALIAS,
-                             UVXH_EVENT_OCCURRED2_RTC_1_MASK);
+       uv_write_global_mmr64(pnode, UVH_EVENT_OCCURRED2_ALIAS,
+                             UVH_EVENT_OCCURRED2_RTC_1_MASK);
 
        val = (X86_PLATFORM_IPI_VECTOR << UVH_RTC1_INT_CONFIG_VECTOR_SHFT) |
                ((u64)apicid << UVH_RTC1_INT_CONFIG_APIC_ID_SHFT);
index 93bb49d..18aa8c8 100644 (file)
@@ -516,7 +516,7 @@ static int __init gru_init(void)
 #if defined CONFIG_IA64
        gru_start_paddr = 0xd000000000UL; /* ZZZZZZZZZZZZZZZZZZZ fixme */
 #else
-       gru_start_paddr = uv_read_local_mmr(UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR) &
+       gru_start_paddr = uv_read_local_mmr(UVH_RH_GAM_GRU_OVERLAY_CONFIG) &
                                0x7fffffffffffUL;
 #endif
        gru_start_vaddr = __va(gru_start_paddr);