Merge branch 'master' into pr-mstateen0-60

Signed-off-by: Andrew Waterman <andrew@sifive.com>

encoding.h

@@ -172,12 +172,14 @@
 #define MSTATEEN0_JVT      0x00000004
 #define MSTATEEN0_PRIV114  0x0080000000000000
 #define MSTATEEN0_HCONTEXT 0x0200000000000000
+#define MSTATEEN0_AIA      0x0800000000000000
 #define MSTATEEN0_CSRIND   0x1000000000000000
 #define MSTATEEN0_HENVCFG  0x4000000000000000
 #define MSTATEEN_HSTATEEN  0x8000000000000000
 
 #define MSTATEEN0H_PRIV114  0x00800000
 #define MSTATEEN0H_HCONTEXT 0x02000000
+#define MSTATEEN0H_AIA      0x08000000
 #define MSTATEEN0H_CSRIND   0x10000000
 #define MSTATEEN0H_HENVCFG  0x40000000
 #define MSTATEENH_HSTATEEN  0x80000000
@@ -226,11 +228,13 @@
 #define HSTATEEN0_FCSR     0x00000002
 #define HSTATEEN0_JVT      0x00000004
 #define HSTATEEN0_SCONTEXT 0x0200000000000000
+#define HSTATEEN0_AIA      0x0800000000000000
 #define HSTATEEN0_CSRIND   0x1000000000000000
 #define HSTATEEN0_SENVCFG  0x4000000000000000
 #define HSTATEEN_SSTATEEN  0x8000000000000000
 
 #define HSTATEEN0H_SCONTEXT 0x02000000
+#define HSTATEEN0H_AIA      0x08000000
 #define HSTATEEN0H_CSRIND   0x10000000
 #define HSTATEEN0H_SENVCFG  0x40000000
 #define HSTATEENH_SSTATEEN  0x80000000