diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 15:57:01 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-28 15:57:01 -0400 |
commit | a947e23a8ec04bccbfe98c5a2d64cd1f88b612d5 (patch) | |
tree | d64bfae3af141014e93b32036ee8cb3202655ecc /arch/x86/include/asm | |
parent | 08a8b79600101fd6e13dcf05409b330e7f5b0478 (diff) | |
parent | 9a3865b185e77d1a4ca2d8356e37c19b78168961 (diff) |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86, asm: Clean up desc.h a bit
x86, amd: Do not enable ARAT feature on AMD processors below family 0x12
x86: Move do_page_fault()'s error path under unlikely()
x86, efi: Retain boot service code until after switching to virtual mode
x86: Remove unnecessary check in detect_ht()
x86: Reorder mm_context_t to remove x86_64 alignment padding and thus shrink mm_struct
x86, UV: Clean up uv_tlb.c
x86, UV: Add support for SGI UV2 hub chip
x86, cpufeature: Update CPU feature RDRND to RDRAND
Diffstat (limited to 'arch/x86/include/asm')
-rw-r--r-- | arch/x86/include/asm/cpufeature.h | 2 | ||||
-rw-r--r-- | arch/x86/include/asm/desc.h | 152 | ||||
-rw-r--r-- | arch/x86/include/asm/mmu.h | 4 | ||||
-rw-r--r-- | arch/x86/include/asm/uv/uv_bau.h | 590 | ||||
-rw-r--r-- | arch/x86/include/asm/uv/uv_hub.h | 71 | ||||
-rw-r--r-- | arch/x86/include/asm/uv/uv_mmrs.h | 1012 |
6 files changed, 1345 insertions, 486 deletions
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 5dc6acc98dbd..71cc3800712c 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h | |||
@@ -125,7 +125,7 @@ | |||
125 | #define X86_FEATURE_OSXSAVE (4*32+27) /* "" XSAVE enabled in the OS */ | 125 | #define X86_FEATURE_OSXSAVE (4*32+27) /* "" XSAVE enabled in the OS */ |
126 | #define X86_FEATURE_AVX (4*32+28) /* Advanced Vector Extensions */ | 126 | #define X86_FEATURE_AVX (4*32+28) /* Advanced Vector Extensions */ |
127 | #define X86_FEATURE_F16C (4*32+29) /* 16-bit fp conversions */ | 127 | #define X86_FEATURE_F16C (4*32+29) /* 16-bit fp conversions */ |
128 | #define X86_FEATURE_RDRND (4*32+30) /* The RDRAND instruction */ | 128 | #define X86_FEATURE_RDRAND (4*32+30) /* The RDRAND instruction */ |
129 | #define X86_FEATURE_HYPERVISOR (4*32+31) /* Running on a hypervisor */ | 129 | #define X86_FEATURE_HYPERVISOR (4*32+31) /* Running on a hypervisor */ |
130 | 130 | ||
131 | /* VIA/Cyrix/Centaur-defined CPU features, CPUID level 0xC0000001, word 5 */ | 131 | /* VIA/Cyrix/Centaur-defined CPU features, CPUID level 0xC0000001, word 5 */ |
diff --git a/arch/x86/include/asm/desc.h b/arch/x86/include/asm/desc.h index 617bd56b3070..7b439d9aea2a 100644 --- a/arch/x86/include/asm/desc.h +++ b/arch/x86/include/asm/desc.h | |||
@@ -4,30 +4,33 @@ | |||
4 | #include <asm/desc_defs.h> | 4 | #include <asm/desc_defs.h> |
5 | #include <asm/ldt.h> | 5 | #include <asm/ldt.h> |
6 | #include <asm/mmu.h> | 6 | #include <asm/mmu.h> |
7 | |||
7 | #include <linux/smp.h> | 8 | #include <linux/smp.h> |
8 | 9 | ||
9 | static inline void fill_ldt(struct desc_struct *desc, | 10 | static inline void fill_ldt(struct desc_struct *desc, const struct user_desc *info) |
10 | const struct user_desc *info) | 11 | { |
11 | { | 12 | desc->limit0 = info->limit & 0x0ffff; |
12 | desc->limit0 = info->limit & 0x0ffff; | 13 | |
13 | desc->base0 = info->base_addr & 0x0000ffff; | 14 | desc->base0 = (info->base_addr & 0x0000ffff); |
14 | 15 | desc->base1 = (info->base_addr & 0x00ff0000) >> 16; | |
15 | desc->base1 = (info->base_addr & 0x00ff0000) >> 16; | 16 | |
16 | desc->type = (info->read_exec_only ^ 1) << 1; | 17 | desc->type = (info->read_exec_only ^ 1) << 1; |
17 | desc->type |= info->contents << 2; | 18 | desc->type |= info->contents << 2; |
18 | desc->s = 1; | 19 | |
19 | desc->dpl = 0x3; | 20 | desc->s = 1; |
20 | desc->p = info->seg_not_present ^ 1; | 21 | desc->dpl = 0x3; |
21 | desc->limit = (info->limit & 0xf0000) >> 16; | 22 | desc->p = info->seg_not_present ^ 1; |
22 | desc->avl = info->useable; | 23 | desc->limit = (info->limit & 0xf0000) >> 16; |
23 | desc->d = info->seg_32bit; | 24 | desc->avl = info->useable; |
24 | desc->g = info->limit_in_pages; | 25 | desc->d = info->seg_32bit; |
25 | desc->base2 = (info->base_addr & 0xff000000) >> 24; | 26 | desc->g = info->limit_in_pages; |
27 | |||
28 | desc->base2 = (info->base_addr & 0xff000000) >> 24; | ||
26 | /* | 29 | /* |
27 | * Don't allow setting of the lm bit. It is useless anyway | 30 | * Don't allow setting of the lm bit. It is useless anyway |
28 | * because 64bit system calls require __USER_CS: | 31 | * because 64bit system calls require __USER_CS: |
29 | */ | 32 | */ |
30 | desc->l = 0; | 33 | desc->l = 0; |
31 | } | 34 | } |
32 | 35 | ||
33 | extern struct desc_ptr idt_descr; | 36 | extern struct desc_ptr idt_descr; |
@@ -36,6 +39,7 @@ extern gate_desc idt_table[]; | |||
36 | struct gdt_page { | 39 | struct gdt_page { |
37 | struct desc_struct gdt[GDT_ENTRIES]; | 40 | struct desc_struct gdt[GDT_ENTRIES]; |
38 | } __attribute__((aligned(PAGE_SIZE))); | 41 | } __attribute__((aligned(PAGE_SIZE))); |
42 | |||
39 | DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page); | 43 | DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page); |
40 | 44 | ||
41 | static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu) | 45 | static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu) |
@@ -48,16 +52,16 @@ static inline struct desc_struct *get_cpu_gdt_table(unsigned int cpu) | |||
48 | static inline void pack_gate(gate_desc *gate, unsigned type, unsigned long func, | 52 | static inline void pack_gate(gate_desc *gate, unsigned type, unsigned long func, |
49 | unsigned dpl, unsigned ist, unsigned seg) | 53 | unsigned dpl, unsigned ist, unsigned seg) |
50 | { | 54 | { |
51 | gate->offset_low = PTR_LOW(func); | 55 | gate->offset_low = PTR_LOW(func); |
52 | gate->segment = __KERNEL_CS; | 56 | gate->segment = __KERNEL_CS; |
53 | gate->ist = ist; | 57 | gate->ist = ist; |
54 | gate->p = 1; | 58 | gate->p = 1; |
55 | gate->dpl = dpl; | 59 | gate->dpl = dpl; |
56 | gate->zero0 = 0; | 60 | gate->zero0 = 0; |
57 | gate->zero1 = 0; | 61 | gate->zero1 = 0; |
58 | gate->type = type; | 62 | gate->type = type; |
59 | gate->offset_middle = PTR_MIDDLE(func); | 63 | gate->offset_middle = PTR_MIDDLE(func); |
60 | gate->offset_high = PTR_HIGH(func); | 64 | gate->offset_high = PTR_HIGH(func); |
61 | } | 65 | } |
62 | 66 | ||
63 | #else | 67 | #else |
@@ -66,8 +70,7 @@ static inline void pack_gate(gate_desc *gate, unsigned char type, | |||
66 | unsigned short seg) | 70 | unsigned short seg) |
67 | { | 71 | { |
68 | gate->a = (seg << 16) | (base & 0xffff); | 72 | gate->a = (seg << 16) | (base & 0xffff); |
69 | gate->b = (base & 0xffff0000) | | 73 | gate->b = (base & 0xffff0000) | (((0x80 | type | (dpl << 5)) & 0xff) << 8); |
70 | (((0x80 | type | (dpl << 5)) & 0xff) << 8); | ||
71 | } | 74 | } |
72 | 75 | ||
73 | #endif | 76 | #endif |
@@ -75,31 +78,29 @@ static inline void pack_gate(gate_desc *gate, unsigned char type, | |||
75 | static inline int desc_empty(const void *ptr) | 78 | static inline int desc_empty(const void *ptr) |
76 | { | 79 | { |
77 | const u32 *desc = ptr; | 80 | const u32 *desc = ptr; |
81 | |||
78 | return !(desc[0] | desc[1]); | 82 | return !(desc[0] | desc[1]); |
79 | } | 83 | } |
80 | 84 | ||
81 | #ifdef CONFIG_PARAVIRT | 85 | #ifdef CONFIG_PARAVIRT |
82 | #include <asm/paravirt.h> | 86 | #include <asm/paravirt.h> |
83 | #else | 87 | #else |
84 | #define load_TR_desc() native_load_tr_desc() | 88 | #define load_TR_desc() native_load_tr_desc() |
85 | #define load_gdt(dtr) native_load_gdt(dtr) | 89 | #define load_gdt(dtr) native_load_gdt(dtr) |
86 | #define load_idt(dtr) native_load_idt(dtr) | 90 | #define load_idt(dtr) native_load_idt(dtr) |
87 | #define load_tr(tr) asm volatile("ltr %0"::"m" (tr)) | 91 | #define load_tr(tr) asm volatile("ltr %0"::"m" (tr)) |
88 | #define load_ldt(ldt) asm volatile("lldt %0"::"m" (ldt)) | 92 | #define load_ldt(ldt) asm volatile("lldt %0"::"m" (ldt)) |
89 | 93 | ||
90 | #define store_gdt(dtr) native_store_gdt(dtr) | 94 | #define store_gdt(dtr) native_store_gdt(dtr) |
91 | #define store_idt(dtr) native_store_idt(dtr) | 95 | #define store_idt(dtr) native_store_idt(dtr) |
92 | #define store_tr(tr) (tr = native_store_tr()) | 96 | #define store_tr(tr) (tr = native_store_tr()) |
93 | 97 | ||
94 | #define load_TLS(t, cpu) native_load_tls(t, cpu) | 98 | #define load_TLS(t, cpu) native_load_tls(t, cpu) |
95 | #define set_ldt native_set_ldt | 99 | #define set_ldt native_set_ldt |
96 | 100 | ||
97 | #define write_ldt_entry(dt, entry, desc) \ | 101 | #define write_ldt_entry(dt, entry, desc) native_write_ldt_entry(dt, entry, desc) |
98 | native_write_ldt_entry(dt, entry, desc) | 102 | #define write_gdt_entry(dt, entry, desc, type) native_write_gdt_entry(dt, entry, desc, type) |
99 | #define write_gdt_entry(dt, entry, desc, type) \ | 103 | #define write_idt_entry(dt, entry, g) native_write_idt_entry(dt, entry, g) |
100 | native_write_gdt_entry(dt, entry, desc, type) | ||
101 | #define write_idt_entry(dt, entry, g) \ | ||
102 | native_write_idt_entry(dt, entry, g) | ||
103 | 104 | ||
104 | static inline void paravirt_alloc_ldt(struct desc_struct *ldt, unsigned entries) | 105 | static inline void paravirt_alloc_ldt(struct desc_struct *ldt, unsigned entries) |
105 | { | 106 | { |
@@ -112,33 +113,27 @@ static inline void paravirt_free_ldt(struct desc_struct *ldt, unsigned entries) | |||
112 | 113 | ||
113 | #define store_ldt(ldt) asm("sldt %0" : "=m"(ldt)) | 114 | #define store_ldt(ldt) asm("sldt %0" : "=m"(ldt)) |
114 | 115 | ||
115 | static inline void native_write_idt_entry(gate_desc *idt, int entry, | 116 | static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate) |
116 | const gate_desc *gate) | ||
117 | { | 117 | { |
118 | memcpy(&idt[entry], gate, sizeof(*gate)); | 118 | memcpy(&idt[entry], gate, sizeof(*gate)); |
119 | } | 119 | } |
120 | 120 | ||
121 | static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, | 121 | static inline void native_write_ldt_entry(struct desc_struct *ldt, int entry, const void *desc) |
122 | const void *desc) | ||
123 | { | 122 | { |
124 | memcpy(&ldt[entry], desc, 8); | 123 | memcpy(&ldt[entry], desc, 8); |
125 | } | 124 | } |
126 | 125 | ||
127 | static inline void native_write_gdt_entry(struct desc_struct *gdt, int entry, | 126 | static inline void |
128 | const void *desc, int type) | 127 | native_write_gdt_entry(struct desc_struct *gdt, int entry, const void *desc, int type) |
129 | { | 128 | { |
130 | unsigned int size; | 129 | unsigned int size; |
130 | |||
131 | switch (type) { | 131 | switch (type) { |
132 | case DESC_TSS: | 132 | case DESC_TSS: size = sizeof(tss_desc); break; |
133 | size = sizeof(tss_desc); | 133 | case DESC_LDT: size = sizeof(ldt_desc); break; |
134 | break; | 134 | default: size = sizeof(*gdt); break; |
135 | case DESC_LDT: | ||
136 | size = sizeof(ldt_desc); | ||
137 | break; | ||
138 | default: | ||
139 | size = sizeof(struct desc_struct); | ||
140 | break; | ||
141 | } | 135 | } |
136 | |||
142 | memcpy(&gdt[entry], desc, size); | 137 | memcpy(&gdt[entry], desc, size); |
143 | } | 138 | } |
144 | 139 | ||
@@ -154,20 +149,21 @@ static inline void pack_descriptor(struct desc_struct *desc, unsigned long base, | |||
154 | } | 149 | } |
155 | 150 | ||
156 | 151 | ||
157 | static inline void set_tssldt_descriptor(void *d, unsigned long addr, | 152 | static inline void set_tssldt_descriptor(void *d, unsigned long addr, unsigned type, unsigned size) |
158 | unsigned type, unsigned size) | ||
159 | { | 153 | { |
160 | #ifdef CONFIG_X86_64 | 154 | #ifdef CONFIG_X86_64 |
161 | struct ldttss_desc64 *desc = d; | 155 | struct ldttss_desc64 *desc = d; |
156 | |||
162 | memset(desc, 0, sizeof(*desc)); | 157 | memset(desc, 0, sizeof(*desc)); |
163 | desc->limit0 = size & 0xFFFF; | 158 | |
164 | desc->base0 = PTR_LOW(addr); | 159 | desc->limit0 = size & 0xFFFF; |
165 | desc->base1 = PTR_MIDDLE(addr) & 0xFF; | 160 | desc->base0 = PTR_LOW(addr); |
166 | desc->type = type; | 161 | desc->base1 = PTR_MIDDLE(addr) & 0xFF; |
167 | desc->p = 1; | 162 | desc->type = type; |
168 | desc->limit1 = (size >> 16) & 0xF; | 163 | desc->p = 1; |
169 | desc->base2 = (PTR_MIDDLE(addr) >> 8) & 0xFF; | 164 | desc->limit1 = (size >> 16) & 0xF; |
170 | desc->base3 = PTR_HIGH(addr); | 165 | desc->base2 = (PTR_MIDDLE(addr) >> 8) & 0xFF; |
166 | desc->base3 = PTR_HIGH(addr); | ||
171 | #else | 167 | #else |
172 | pack_descriptor((struct desc_struct *)d, addr, size, 0x80 | type, 0); | 168 | pack_descriptor((struct desc_struct *)d, addr, size, 0x80 | type, 0); |
173 | #endif | 169 | #endif |
@@ -237,14 +233,16 @@ static inline void native_store_idt(struct desc_ptr *dtr) | |||
237 | static inline unsigned long native_store_tr(void) | 233 | static inline unsigned long native_store_tr(void) |
238 | { | 234 | { |
239 | unsigned long tr; | 235 | unsigned long tr; |
236 | |||
240 | asm volatile("str %0":"=r" (tr)); | 237 | asm volatile("str %0":"=r" (tr)); |
238 | |||
241 | return tr; | 239 | return tr; |
242 | } | 240 | } |
243 | 241 | ||
244 | static inline void native_load_tls(struct thread_struct *t, unsigned int cpu) | 242 | static inline void native_load_tls(struct thread_struct *t, unsigned int cpu) |
245 | { | 243 | { |
246 | unsigned int i; | ||
247 | struct desc_struct *gdt = get_cpu_gdt_table(cpu); | 244 | struct desc_struct *gdt = get_cpu_gdt_table(cpu); |
245 | unsigned int i; | ||
248 | 246 | ||
249 | for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++) | 247 | for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++) |
250 | gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i]; | 248 | gdt[GDT_ENTRY_TLS_MIN + i] = t->tls_array[i]; |
@@ -313,6 +311,7 @@ static inline void _set_gate(int gate, unsigned type, void *addr, | |||
313 | unsigned dpl, unsigned ist, unsigned seg) | 311 | unsigned dpl, unsigned ist, unsigned seg) |
314 | { | 312 | { |
315 | gate_desc s; | 313 | gate_desc s; |
314 | |||
316 | pack_gate(&s, type, (unsigned long)addr, dpl, ist, seg); | 315 | pack_gate(&s, type, (unsigned long)addr, dpl, ist, seg); |
317 | /* | 316 | /* |
318 | * does not need to be atomic because it is only done once at | 317 | * does not need to be atomic because it is only done once at |
@@ -343,8 +342,9 @@ static inline void alloc_system_vector(int vector) | |||
343 | set_bit(vector, used_vectors); | 342 | set_bit(vector, used_vectors); |
344 | if (first_system_vector > vector) | 343 | if (first_system_vector > vector) |
345 | first_system_vector = vector; | 344 | first_system_vector = vector; |
346 | } else | 345 | } else { |
347 | BUG(); | 346 | BUG(); |
347 | } | ||
348 | } | 348 | } |
349 | 349 | ||
350 | static inline void alloc_intr_gate(unsigned int n, void *addr) | 350 | static inline void alloc_intr_gate(unsigned int n, void *addr) |
diff --git a/arch/x86/include/asm/mmu.h b/arch/x86/include/asm/mmu.h index aeff3e89b222..5f55e6962769 100644 --- a/arch/x86/include/asm/mmu.h +++ b/arch/x86/include/asm/mmu.h | |||
@@ -11,14 +11,14 @@ | |||
11 | typedef struct { | 11 | typedef struct { |
12 | void *ldt; | 12 | void *ldt; |
13 | int size; | 13 | int size; |
14 | struct mutex lock; | ||
15 | void *vdso; | ||
16 | 14 | ||
17 | #ifdef CONFIG_X86_64 | 15 | #ifdef CONFIG_X86_64 |
18 | /* True if mm supports a task running in 32 bit compatibility mode. */ | 16 | /* True if mm supports a task running in 32 bit compatibility mode. */ |
19 | unsigned short ia32_compat; | 17 | unsigned short ia32_compat; |
20 | #endif | 18 | #endif |
21 | 19 | ||
20 | struct mutex lock; | ||
21 | void *vdso; | ||
22 | } mm_context_t; | 22 | } mm_context_t; |
23 | 23 | ||
24 | #ifdef CONFIG_SMP | 24 | #ifdef CONFIG_SMP |
diff --git a/arch/x86/include/asm/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h index 130f1eeee5fe..a291c40efd43 100644 --- a/arch/x86/include/asm/uv/uv_bau.h +++ b/arch/x86/include/asm/uv/uv_bau.h | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * SGI UV Broadcast Assist Unit definitions | 6 | * SGI UV Broadcast Assist Unit definitions |
7 | * | 7 | * |
8 | * Copyright (C) 2008 Silicon Graphics, Inc. All rights reserved. | 8 | * Copyright (C) 2008-2011 Silicon Graphics, Inc. All rights reserved. |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #ifndef _ASM_X86_UV_UV_BAU_H | 11 | #ifndef _ASM_X86_UV_UV_BAU_H |
@@ -35,17 +35,20 @@ | |||
35 | 35 | ||
36 | #define MAX_CPUS_PER_UVHUB 64 | 36 | #define MAX_CPUS_PER_UVHUB 64 |
37 | #define MAX_CPUS_PER_SOCKET 32 | 37 | #define MAX_CPUS_PER_SOCKET 32 |
38 | #define UV_ADP_SIZE 64 /* hardware-provided max. */ | 38 | #define ADP_SZ 64 /* hardware-provided max. */ |
39 | #define UV_CPUS_PER_ACT_STATUS 32 /* hardware-provided max. */ | 39 | #define UV_CPUS_PER_AS 32 /* hardware-provided max. */ |
40 | #define UV_ITEMS_PER_DESCRIPTOR 8 | 40 | #define ITEMS_PER_DESC 8 |
41 | /* the 'throttle' to prevent the hardware stay-busy bug */ | 41 | /* the 'throttle' to prevent the hardware stay-busy bug */ |
42 | #define MAX_BAU_CONCURRENT 3 | 42 | #define MAX_BAU_CONCURRENT 3 |
43 | #define UV_ACT_STATUS_MASK 0x3 | 43 | #define UV_ACT_STATUS_MASK 0x3 |
44 | #define UV_ACT_STATUS_SIZE 2 | 44 | #define UV_ACT_STATUS_SIZE 2 |
45 | #define UV_DISTRIBUTION_SIZE 256 | 45 | #define UV_DISTRIBUTION_SIZE 256 |
46 | #define UV_SW_ACK_NPENDING 8 | 46 | #define UV_SW_ACK_NPENDING 8 |
47 | #define UV_NET_ENDPOINT_INTD 0x38 | 47 | #define UV1_NET_ENDPOINT_INTD 0x38 |
48 | #define UV_DESC_BASE_PNODE_SHIFT 49 | 48 | #define UV2_NET_ENDPOINT_INTD 0x28 |
49 | #define UV_NET_ENDPOINT_INTD (is_uv1_hub() ? \ | ||
50 | UV1_NET_ENDPOINT_INTD : UV2_NET_ENDPOINT_INTD) | ||
51 | #define UV_DESC_PSHIFT 49 | ||
49 | #define UV_PAYLOADQ_PNODE_SHIFT 49 | 52 | #define UV_PAYLOADQ_PNODE_SHIFT 49 |
50 | #define UV_PTC_BASENAME "sgi_uv/ptc_statistics" | 53 | #define UV_PTC_BASENAME "sgi_uv/ptc_statistics" |
51 | #define UV_BAU_BASENAME "sgi_uv/bau_tunables" | 54 | #define UV_BAU_BASENAME "sgi_uv/bau_tunables" |
@@ -53,29 +56,64 @@ | |||
53 | #define UV_BAU_TUNABLES_FILE "bau_tunables" | 56 | #define UV_BAU_TUNABLES_FILE "bau_tunables" |
54 | #define WHITESPACE " \t\n" | 57 | #define WHITESPACE " \t\n" |
55 | #define uv_physnodeaddr(x) ((__pa((unsigned long)(x)) & uv_mmask)) | 58 | #define uv_physnodeaddr(x) ((__pa((unsigned long)(x)) & uv_mmask)) |
56 | #define UV_ENABLE_INTD_SOFT_ACK_MODE_SHIFT 15 | 59 | #define cpubit_isset(cpu, bau_local_cpumask) \ |
57 | #define UV_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHIFT 16 | 60 | test_bit((cpu), (bau_local_cpumask).bits) |
58 | #define UV_INTD_SOFT_ACK_TIMEOUT_PERIOD 0x0000000009UL | 61 | |
59 | /* [19:16] SOFT_ACK timeout period 19: 1 is urgency 7 17:16 1 is multiplier */ | 62 | /* [19:16] SOFT_ACK timeout period 19: 1 is urgency 7 17:16 1 is multiplier */ |
60 | #define BAU_MISC_CONTROL_MULT_MASK 3 | 63 | /* |
64 | * UV2: Bit 19 selects between | ||
65 | * (0): 10 microsecond timebase and | ||
66 | * (1): 80 microseconds | ||
67 | * we're using 655us, similar to UV1: 65 units of 10us | ||
68 | */ | ||
69 | #define UV1_INTD_SOFT_ACK_TIMEOUT_PERIOD (9UL) | ||
70 | #define UV2_INTD_SOFT_ACK_TIMEOUT_PERIOD (65*10UL) | ||
71 | |||
72 | #define UV_INTD_SOFT_ACK_TIMEOUT_PERIOD (is_uv1_hub() ? \ | ||
73 | UV1_INTD_SOFT_ACK_TIMEOUT_PERIOD : \ | ||
74 | UV2_INTD_SOFT_ACK_TIMEOUT_PERIOD) | ||
61 | 75 | ||
62 | #define UVH_AGING_PRESCALE_SEL 0x000000b000UL | 76 | #define BAU_MISC_CONTROL_MULT_MASK 3 |
77 | |||
78 | #define UVH_AGING_PRESCALE_SEL 0x000000b000UL | ||
63 | /* [30:28] URGENCY_7 an index into a table of times */ | 79 | /* [30:28] URGENCY_7 an index into a table of times */ |
64 | #define BAU_URGENCY_7_SHIFT 28 | 80 | #define BAU_URGENCY_7_SHIFT 28 |
65 | #define BAU_URGENCY_7_MASK 7 | 81 | #define BAU_URGENCY_7_MASK 7 |
66 | 82 | ||
67 | #define UVH_TRANSACTION_TIMEOUT 0x000000b200UL | 83 | #define UVH_TRANSACTION_TIMEOUT 0x000000b200UL |
68 | /* [45:40] BAU - BAU transaction timeout select - a multiplier */ | 84 | /* [45:40] BAU - BAU transaction timeout select - a multiplier */ |
69 | #define BAU_TRANS_SHIFT 40 | 85 | #define BAU_TRANS_SHIFT 40 |
70 | #define BAU_TRANS_MASK 0x3f | 86 | #define BAU_TRANS_MASK 0x3f |
87 | |||
88 | /* | ||
89 | * shorten some awkward names | ||
90 | */ | ||
91 | #define AS_PUSH_SHIFT UVH_LB_BAU_SB_ACTIVATION_CONTROL_PUSH_SHFT | ||
92 | #define SOFTACK_MSHIFT UVH_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT | ||
93 | #define SOFTACK_PSHIFT UVH_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT | ||
94 | #define SOFTACK_TIMEOUT_PERIOD UV_INTD_SOFT_ACK_TIMEOUT_PERIOD | ||
95 | #define write_gmmr uv_write_global_mmr64 | ||
96 | #define write_lmmr uv_write_local_mmr | ||
97 | #define read_lmmr uv_read_local_mmr | ||
98 | #define read_gmmr uv_read_global_mmr64 | ||
71 | 99 | ||
72 | /* | 100 | /* |
73 | * bits in UVH_LB_BAU_SB_ACTIVATION_STATUS_0/1 | 101 | * bits in UVH_LB_BAU_SB_ACTIVATION_STATUS_0/1 |
74 | */ | 102 | */ |
75 | #define DESC_STATUS_IDLE 0 | 103 | #define DS_IDLE 0 |
76 | #define DESC_STATUS_ACTIVE 1 | 104 | #define DS_ACTIVE 1 |
77 | #define DESC_STATUS_DESTINATION_TIMEOUT 2 | 105 | #define DS_DESTINATION_TIMEOUT 2 |
78 | #define DESC_STATUS_SOURCE_TIMEOUT 3 | 106 | #define DS_SOURCE_TIMEOUT 3 |
107 | /* | ||
108 | * bits put together from HRP_LB_BAU_SB_ACTIVATION_STATUS_0/1/2 | ||
109 | * values 1 and 5 will not occur | ||
110 | */ | ||
111 | #define UV2H_DESC_IDLE 0 | ||
112 | #define UV2H_DESC_DEST_TIMEOUT 2 | ||
113 | #define UV2H_DESC_DEST_STRONG_NACK 3 | ||
114 | #define UV2H_DESC_BUSY 4 | ||
115 | #define UV2H_DESC_SOURCE_TIMEOUT 6 | ||
116 | #define UV2H_DESC_DEST_PUT_ERR 7 | ||
79 | 117 | ||
80 | /* | 118 | /* |
81 | * delay for 'plugged' timeout retries, in microseconds | 119 | * delay for 'plugged' timeout retries, in microseconds |
@@ -86,15 +124,24 @@ | |||
86 | * threshholds at which to use IPI to free resources | 124 | * threshholds at which to use IPI to free resources |
87 | */ | 125 | */ |
88 | /* after this # consecutive 'plugged' timeouts, use IPI to release resources */ | 126 | /* after this # consecutive 'plugged' timeouts, use IPI to release resources */ |
89 | #define PLUGSB4RESET 100 | 127 | #define PLUGSB4RESET 100 |
90 | /* after this many consecutive timeouts, use IPI to release resources */ | 128 | /* after this many consecutive timeouts, use IPI to release resources */ |
91 | #define TIMEOUTSB4RESET 1 | 129 | #define TIMEOUTSB4RESET 1 |
92 | /* at this number uses of IPI to release resources, giveup the request */ | 130 | /* at this number uses of IPI to release resources, giveup the request */ |
93 | #define IPI_RESET_LIMIT 1 | 131 | #define IPI_RESET_LIMIT 1 |
94 | /* after this # consecutive successes, bump up the throttle if it was lowered */ | 132 | /* after this # consecutive successes, bump up the throttle if it was lowered */ |
95 | #define COMPLETE_THRESHOLD 5 | 133 | #define COMPLETE_THRESHOLD 5 |
134 | |||
135 | #define UV_LB_SUBNODEID 0x10 | ||
96 | 136 | ||
97 | #define UV_LB_SUBNODEID 0x10 | 137 | /* these two are the same for UV1 and UV2: */ |
138 | #define UV_SA_SHFT UVH_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT | ||
139 | #define UV_SA_MASK UVH_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_MASK | ||
140 | /* 4 bits of software ack period */ | ||
141 | #define UV2_ACK_MASK 0x7UL | ||
142 | #define UV2_ACK_UNITS_SHFT 3 | ||
143 | #define UV2_LEG_SHFT UV2H_LB_BAU_MISC_CONTROL_USE_LEGACY_DESCRIPTOR_FORMATS_SHFT | ||
144 | #define UV2_EXT_SHFT UV2H_LB_BAU_MISC_CONTROL_ENABLE_EXTENDED_SB_STATUS_SHFT | ||
98 | 145 | ||
99 | /* | 146 | /* |
100 | * number of entries in the destination side payload queue | 147 | * number of entries in the destination side payload queue |
@@ -115,9 +162,16 @@ | |||
115 | /* | 162 | /* |
116 | * tuning the action when the numalink network is extremely delayed | 163 | * tuning the action when the numalink network is extremely delayed |
117 | */ | 164 | */ |
118 | #define CONGESTED_RESPONSE_US 1000 /* 'long' response time, in microseconds */ | 165 | #define CONGESTED_RESPONSE_US 1000 /* 'long' response time, in |
119 | #define CONGESTED_REPS 10 /* long delays averaged over this many broadcasts */ | 166 | microseconds */ |
120 | #define CONGESTED_PERIOD 30 /* time for the bau to be disabled, in seconds */ | 167 | #define CONGESTED_REPS 10 /* long delays averaged over |
168 | this many broadcasts */ | ||
169 | #define CONGESTED_PERIOD 30 /* time for the bau to be | ||
170 | disabled, in seconds */ | ||
171 | /* see msg_type: */ | ||
172 | #define MSG_NOOP 0 | ||
173 | #define MSG_REGULAR 1 | ||
174 | #define MSG_RETRY 2 | ||
121 | 175 | ||
122 | /* | 176 | /* |
123 | * Distribution: 32 bytes (256 bits) (bytes 0-0x1f of descriptor) | 177 | * Distribution: 32 bytes (256 bits) (bytes 0-0x1f of descriptor) |
@@ -129,8 +183,8 @@ | |||
129 | * 'base_dest_nasid' field of the header corresponds to the | 183 | * 'base_dest_nasid' field of the header corresponds to the |
130 | * destination nodeID associated with that specified bit. | 184 | * destination nodeID associated with that specified bit. |
131 | */ | 185 | */ |
132 | struct bau_target_uvhubmask { | 186 | struct bau_targ_hubmask { |
133 | unsigned long bits[BITS_TO_LONGS(UV_DISTRIBUTION_SIZE)]; | 187 | unsigned long bits[BITS_TO_LONGS(UV_DISTRIBUTION_SIZE)]; |
134 | }; | 188 | }; |
135 | 189 | ||
136 | /* | 190 | /* |
@@ -139,7 +193,7 @@ struct bau_target_uvhubmask { | |||
139 | * enough bits for max. cpu's per uvhub) | 193 | * enough bits for max. cpu's per uvhub) |
140 | */ | 194 | */ |
141 | struct bau_local_cpumask { | 195 | struct bau_local_cpumask { |
142 | unsigned long bits; | 196 | unsigned long bits; |
143 | }; | 197 | }; |
144 | 198 | ||
145 | /* | 199 | /* |
@@ -160,14 +214,14 @@ struct bau_local_cpumask { | |||
160 | * The payload is software-defined for INTD transactions | 214 | * The payload is software-defined for INTD transactions |
161 | */ | 215 | */ |
162 | struct bau_msg_payload { | 216 | struct bau_msg_payload { |
163 | unsigned long address; /* signifies a page or all TLB's | 217 | unsigned long address; /* signifies a page or all |
164 | of the cpu */ | 218 | TLB's of the cpu */ |
165 | /* 64 bits */ | 219 | /* 64 bits */ |
166 | unsigned short sending_cpu; /* filled in by sender */ | 220 | unsigned short sending_cpu; /* filled in by sender */ |
167 | /* 16 bits */ | 221 | /* 16 bits */ |
168 | unsigned short acknowledge_count;/* filled in by destination */ | 222 | unsigned short acknowledge_count; /* filled in by destination */ |
169 | /* 16 bits */ | 223 | /* 16 bits */ |
170 | unsigned int reserved1:32; /* not usable */ | 224 | unsigned int reserved1:32; /* not usable */ |
171 | }; | 225 | }; |
172 | 226 | ||
173 | 227 | ||
@@ -176,93 +230,96 @@ struct bau_msg_payload { | |||
176 | * see table 4.2.3.0.1 in broacast_assist spec. | 230 | * see table 4.2.3.0.1 in broacast_assist spec. |
177 | */ | 231 | */ |
178 | struct bau_msg_header { | 232 | struct bau_msg_header { |
179 | unsigned int dest_subnodeid:6; /* must be 0x10, for the LB */ | 233 | unsigned int dest_subnodeid:6; /* must be 0x10, for the LB */ |
180 | /* bits 5:0 */ | 234 | /* bits 5:0 */ |
181 | unsigned int base_dest_nasid:15; /* nasid of the */ | 235 | unsigned int base_dest_nasid:15; /* nasid of the first bit */ |
182 | /* bits 20:6 */ /* first bit in uvhub map */ | 236 | /* bits 20:6 */ /* in uvhub map */ |
183 | unsigned int command:8; /* message type */ | 237 | unsigned int command:8; /* message type */ |
184 | /* bits 28:21 */ | 238 | /* bits 28:21 */ |
185 | /* 0x38: SN3net EndPoint Message */ | 239 | /* 0x38: SN3net EndPoint Message */ |
186 | unsigned int rsvd_1:3; /* must be zero */ | 240 | unsigned int rsvd_1:3; /* must be zero */ |
187 | /* bits 31:29 */ | 241 | /* bits 31:29 */ |
188 | /* int will align on 32 bits */ | 242 | /* int will align on 32 bits */ |
189 | unsigned int rsvd_2:9; /* must be zero */ | 243 | unsigned int rsvd_2:9; /* must be zero */ |
190 | /* bits 40:32 */ | 244 | /* bits 40:32 */ |
191 | /* Suppl_A is 56-41 */ | 245 | /* Suppl_A is 56-41 */ |
192 | unsigned int sequence:16;/* message sequence number */ | 246 | unsigned int sequence:16; /* message sequence number */ |
193 | /* bits 56:41 */ /* becomes bytes 16-17 of msg */ | 247 | /* bits 56:41 */ /* becomes bytes 16-17 of msg */ |
194 | /* Address field (96:57) is never used as an | 248 | /* Address field (96:57) is |
195 | address (these are address bits 42:3) */ | 249 | never used as an address |
196 | 250 | (these are address bits | |
197 | unsigned int rsvd_3:1; /* must be zero */ | 251 | 42:3) */ |
252 | |||
253 | unsigned int rsvd_3:1; /* must be zero */ | ||
198 | /* bit 57 */ | 254 | /* bit 57 */ |
199 | /* address bits 27:4 are payload */ | 255 | /* address bits 27:4 are payload */ |
200 | /* these next 24 (58-81) bits become bytes 12-14 of msg */ | 256 | /* these next 24 (58-81) bits become bytes 12-14 of msg */ |
201 | |||
202 | /* bits 65:58 land in byte 12 */ | 257 | /* bits 65:58 land in byte 12 */ |
203 | unsigned int replied_to:1;/* sent as 0 by the source to byte 12 */ | 258 | unsigned int replied_to:1; /* sent as 0 by the source to |
259 | byte 12 */ | ||
204 | /* bit 58 */ | 260 | /* bit 58 */ |
205 | unsigned int msg_type:3; /* software type of the message*/ | 261 | unsigned int msg_type:3; /* software type of the |
262 | message */ | ||
206 | /* bits 61:59 */ | 263 | /* bits 61:59 */ |
207 | unsigned int canceled:1; /* message canceled, resource to be freed*/ | 264 | unsigned int canceled:1; /* message canceled, resource |
265 | is to be freed*/ | ||
208 | /* bit 62 */ | 266 | /* bit 62 */ |
209 | unsigned int payload_1a:1;/* not currently used */ | 267 | unsigned int payload_1a:1; /* not currently used */ |
210 | /* bit 63 */ | 268 | /* bit 63 */ |
211 | unsigned int payload_1b:2;/* not currently used */ | 269 | unsigned int payload_1b:2; /* not currently used */ |
212 | /* bits 65:64 */ | 270 | /* bits 65:64 */ |
213 | 271 | ||
214 | /* bits 73:66 land in byte 13 */ | 272 | /* bits 73:66 land in byte 13 */ |
215 | unsigned int payload_1ca:6;/* not currently used */ | 273 | unsigned int payload_1ca:6; /* not currently used */ |
216 | /* bits 71:66 */ | 274 | /* bits 71:66 */ |
217 | unsigned int payload_1c:2;/* not currently used */ | 275 | unsigned int payload_1c:2; /* not currently used */ |
218 | /* bits 73:72 */ | 276 | /* bits 73:72 */ |
219 | 277 | ||
220 | /* bits 81:74 land in byte 14 */ | 278 | /* bits 81:74 land in byte 14 */ |
221 | unsigned int payload_1d:6;/* not currently used */ | 279 | unsigned int payload_1d:6; /* not currently used */ |
222 | /* bits 79:74 */ | 280 | /* bits 79:74 */ |
223 | unsigned int payload_1e:2;/* not currently used */ | 281 | unsigned int payload_1e:2; /* not currently used */ |
224 | /* bits 81:80 */ | 282 | /* bits 81:80 */ |
225 | 283 | ||
226 | unsigned int rsvd_4:7; /* must be zero */ | 284 | unsigned int rsvd_4:7; /* must be zero */ |
227 | /* bits 88:82 */ | 285 | /* bits 88:82 */ |
228 | unsigned int sw_ack_flag:1;/* software acknowledge flag */ | 286 | unsigned int swack_flag:1; /* software acknowledge flag */ |
229 | /* bit 89 */ | 287 | /* bit 89 */ |
230 | /* INTD trasactions at destination are to | 288 | /* INTD trasactions at |
231 | wait for software acknowledge */ | 289 | destination are to wait for |
232 | unsigned int rsvd_5:6; /* must be zero */ | 290 | software acknowledge */ |
291 | unsigned int rsvd_5:6; /* must be zero */ | ||
233 | /* bits 95:90 */ | 292 | /* bits 95:90 */ |
234 | unsigned int rsvd_6:5; /* must be zero */ | 293 | unsigned int rsvd_6:5; /* must be zero */ |
235 | /* bits 100:96 */ | 294 | /* bits 100:96 */ |
236 | unsigned int int_both:1;/* if 1, interrupt both sockets on the uvhub */ | 295 | unsigned int int_both:1; /* if 1, interrupt both sockets |
296 | on the uvhub */ | ||
237 | /* bit 101*/ | 297 | /* bit 101*/ |
238 | unsigned int fairness:3;/* usually zero */ | 298 | unsigned int fairness:3; /* usually zero */ |
239 | /* bits 104:102 */ | 299 | /* bits 104:102 */ |
240 | unsigned int multilevel:1; /* multi-level multicast format */ | 300 | unsigned int multilevel:1; /* multi-level multicast |
301 | format */ | ||
241 | /* bit 105 */ | 302 | /* bit 105 */ |
242 | /* 0 for TLB: endpoint multi-unicast messages */ | 303 | /* 0 for TLB: endpoint multi-unicast messages */ |
243 | unsigned int chaining:1;/* next descriptor is part of this activation*/ | 304 | unsigned int chaining:1; /* next descriptor is part of |
305 | this activation*/ | ||
244 | /* bit 106 */ | 306 | /* bit 106 */ |
245 | unsigned int rsvd_7:21; /* must be zero */ | 307 | unsigned int rsvd_7:21; /* must be zero */ |
246 | /* bits 127:107 */ | 308 | /* bits 127:107 */ |
247 | }; | 309 | }; |
248 | 310 | ||
249 | /* see msg_type: */ | ||
250 | #define MSG_NOOP 0 | ||
251 | #define MSG_REGULAR 1 | ||
252 | #define MSG_RETRY 2 | ||
253 | |||
254 | /* | 311 | /* |
255 | * The activation descriptor: | 312 | * The activation descriptor: |
256 | * The format of the message to send, plus all accompanying control | 313 | * The format of the message to send, plus all accompanying control |
257 | * Should be 64 bytes | 314 | * Should be 64 bytes |
258 | */ | 315 | */ |
259 | struct bau_desc { | 316 | struct bau_desc { |
260 | struct bau_target_uvhubmask distribution; | 317 | struct bau_targ_hubmask distribution; |
261 | /* | 318 | /* |
262 | * message template, consisting of header and payload: | 319 | * message template, consisting of header and payload: |
263 | */ | 320 | */ |
264 | struct bau_msg_header header; | 321 | struct bau_msg_header header; |
265 | struct bau_msg_payload payload; | 322 | struct bau_msg_payload payload; |
266 | }; | 323 | }; |
267 | /* | 324 | /* |
268 | * -payload-- ---------header------ | 325 | * -payload-- ---------header------ |
@@ -281,59 +338,51 @@ struct bau_desc { | |||
281 | * are 32 bytes (2 micropackets) (256 bits) in length, but contain only 17 | 338 | * are 32 bytes (2 micropackets) (256 bits) in length, but contain only 17 |
282 | * bytes of usable data, including the sw ack vector in byte 15 (bits 127:120) | 339 | * bytes of usable data, including the sw ack vector in byte 15 (bits 127:120) |
283 | * (12 bytes come from bau_msg_payload, 3 from payload_1, 2 from | 340 | * (12 bytes come from bau_msg_payload, 3 from payload_1, 2 from |
284 | * sw_ack_vector and payload_2) | 341 | * swack_vec and payload_2) |
285 | * "Enabling Software Acknowledgment mode (see Section 4.3.3 Software | 342 | * "Enabling Software Acknowledgment mode (see Section 4.3.3 Software |
286 | * Acknowledge Processing) also selects 32 byte (17 bytes usable) payload | 343 | * Acknowledge Processing) also selects 32 byte (17 bytes usable) payload |
287 | * operation." | 344 | * operation." |
288 | */ | 345 | */ |
289 | struct bau_payload_queue_entry { | 346 | struct bau_pq_entry { |
290 | unsigned long address; /* signifies a page or all TLB's | 347 | unsigned long address; /* signifies a page or all TLB's |
291 | of the cpu */ | 348 | of the cpu */ |
292 | /* 64 bits, bytes 0-7 */ | 349 | /* 64 bits, bytes 0-7 */ |
293 | 350 | unsigned short sending_cpu; /* cpu that sent the message */ | |
294 | unsigned short sending_cpu; /* cpu that sent the message */ | ||
295 | /* 16 bits, bytes 8-9 */ | 351 | /* 16 bits, bytes 8-9 */ |
296 | 352 | unsigned short acknowledge_count; /* filled in by destination */ | |
297 | unsigned short acknowledge_count; /* filled in by destination */ | ||
298 | /* 16 bits, bytes 10-11 */ | 353 | /* 16 bits, bytes 10-11 */ |
299 | |||
300 | /* these next 3 bytes come from bits 58-81 of the message header */ | 354 | /* these next 3 bytes come from bits 58-81 of the message header */ |
301 | unsigned short replied_to:1; /* sent as 0 by the source */ | 355 | unsigned short replied_to:1; /* sent as 0 by the source */ |
302 | unsigned short msg_type:3; /* software message type */ | 356 | unsigned short msg_type:3; /* software message type */ |
303 | unsigned short canceled:1; /* sent as 0 by the source */ | 357 | unsigned short canceled:1; /* sent as 0 by the source */ |
304 | unsigned short unused1:3; /* not currently using */ | 358 | unsigned short unused1:3; /* not currently using */ |
305 | /* byte 12 */ | 359 | /* byte 12 */ |
306 | 360 | unsigned char unused2a; /* not currently using */ | |
307 | unsigned char unused2a; /* not currently using */ | ||
308 | /* byte 13 */ | 361 | /* byte 13 */ |
309 | unsigned char unused2; /* not currently using */ | 362 | unsigned char unused2; /* not currently using */ |
310 | /* byte 14 */ | 363 | /* byte 14 */ |
311 | 364 | unsigned char swack_vec; /* filled in by the hardware */ | |
312 | unsigned char sw_ack_vector; /* filled in by the hardware */ | ||
313 | /* byte 15 (bits 127:120) */ | 365 | /* byte 15 (bits 127:120) */ |
314 | 366 | unsigned short sequence; /* message sequence number */ | |
315 | unsigned short sequence; /* message sequence number */ | ||
316 | /* bytes 16-17 */ | 367 | /* bytes 16-17 */ |
317 | unsigned char unused4[2]; /* not currently using bytes 18-19 */ | 368 | unsigned char unused4[2]; /* not currently using bytes 18-19 */ |
318 | /* bytes 18-19 */ | 369 | /* bytes 18-19 */ |
319 | 370 | int number_of_cpus; /* filled in at destination */ | |
320 | int number_of_cpus; /* filled in at destination */ | ||
321 | /* 32 bits, bytes 20-23 (aligned) */ | 371 | /* 32 bits, bytes 20-23 (aligned) */ |
322 | 372 | unsigned char unused5[8]; /* not using */ | |
323 | unsigned char unused5[8]; /* not using */ | ||
324 | /* bytes 24-31 */ | 373 | /* bytes 24-31 */ |
325 | }; | 374 | }; |
326 | 375 | ||
327 | struct msg_desc { | 376 | struct msg_desc { |
328 | struct bau_payload_queue_entry *msg; | 377 | struct bau_pq_entry *msg; |
329 | int msg_slot; | 378 | int msg_slot; |
330 | int sw_ack_slot; | 379 | int swack_slot; |
331 | struct bau_payload_queue_entry *va_queue_first; | 380 | struct bau_pq_entry *queue_first; |
332 | struct bau_payload_queue_entry *va_queue_last; | 381 | struct bau_pq_entry *queue_last; |
333 | }; | 382 | }; |
334 | 383 | ||
335 | struct reset_args { | 384 | struct reset_args { |
336 | int sender; | 385 | int sender; |
337 | }; | 386 | }; |
338 | 387 | ||
339 | /* | 388 | /* |
@@ -341,112 +390,226 @@ struct reset_args { | |||
341 | */ | 390 | */ |
342 | struct ptc_stats { | 391 | struct ptc_stats { |
343 | /* sender statistics */ | 392 | /* sender statistics */ |
344 | unsigned long s_giveup; /* number of fall backs to IPI-style flushes */ | 393 | unsigned long s_giveup; /* number of fall backs to |
345 | unsigned long s_requestor; /* number of shootdown requests */ | 394 | IPI-style flushes */ |
346 | unsigned long s_stimeout; /* source side timeouts */ | 395 | unsigned long s_requestor; /* number of shootdown |
347 | unsigned long s_dtimeout; /* destination side timeouts */ | 396 | requests */ |
348 | unsigned long s_time; /* time spent in sending side */ | 397 | unsigned long s_stimeout; /* source side timeouts */ |
349 | unsigned long s_retriesok; /* successful retries */ | 398 | unsigned long s_dtimeout; /* destination side timeouts */ |
350 | unsigned long s_ntargcpu; /* total number of cpu's targeted */ | 399 | unsigned long s_time; /* time spent in sending side */ |
351 | unsigned long s_ntargself; /* times the sending cpu was targeted */ | 400 | unsigned long s_retriesok; /* successful retries */ |
352 | unsigned long s_ntarglocals; /* targets of cpus on the local blade */ | 401 | unsigned long s_ntargcpu; /* total number of cpu's |
353 | unsigned long s_ntargremotes; /* targets of cpus on remote blades */ | 402 | targeted */ |
354 | unsigned long s_ntarglocaluvhub; /* targets of the local hub */ | 403 | unsigned long s_ntargself; /* times the sending cpu was |
355 | unsigned long s_ntargremoteuvhub; /* remotes hubs targeted */ | 404 | targeted */ |
356 | unsigned long s_ntarguvhub; /* total number of uvhubs targeted */ | 405 | unsigned long s_ntarglocals; /* targets of cpus on the local |
357 | unsigned long s_ntarguvhub16; /* number of times target hubs >= 16*/ | 406 | blade */ |
358 | unsigned long s_ntarguvhub8; /* number of times target hubs >= 8 */ | 407 | unsigned long s_ntargremotes; /* targets of cpus on remote |
359 | unsigned long s_ntarguvhub4; /* number of times target hubs >= 4 */ | 408 | blades */ |
360 | unsigned long s_ntarguvhub2; /* number of times target hubs >= 2 */ | 409 | unsigned long s_ntarglocaluvhub; /* targets of the local hub */ |
361 | unsigned long s_ntarguvhub1; /* number of times target hubs == 1 */ | 410 | unsigned long s_ntargremoteuvhub; /* remotes hubs targeted */ |
362 | unsigned long s_resets_plug; /* ipi-style resets from plug state */ | 411 | unsigned long s_ntarguvhub; /* total number of uvhubs |
363 | unsigned long s_resets_timeout; /* ipi-style resets from timeouts */ | 412 | targeted */ |
364 | unsigned long s_busy; /* status stayed busy past s/w timer */ | 413 | unsigned long s_ntarguvhub16; /* number of times target |
365 | unsigned long s_throttles; /* waits in throttle */ | 414 | hubs >= 16*/ |
366 | unsigned long s_retry_messages; /* retry broadcasts */ | 415 | unsigned long s_ntarguvhub8; /* number of times target |
367 | unsigned long s_bau_reenabled; /* for bau enable/disable */ | 416 | hubs >= 8 */ |
368 | unsigned long s_bau_disabled; /* for bau enable/disable */ | 417 | unsigned long s_ntarguvhub4; /* number of times target |
418 | hubs >= 4 */ | ||
419 | unsigned long s_ntarguvhub2; /* number of times target | ||
420 | hubs >= 2 */ | ||
421 | unsigned long s_ntarguvhub1; /* number of times target | ||
422 | hubs == 1 */ | ||
423 | unsigned long s_resets_plug; /* ipi-style resets from plug | ||
424 | state */ | ||
425 | unsigned long s_resets_timeout; /* ipi-style resets from | ||
426 | timeouts */ | ||
427 | unsigned long s_busy; /* status stayed busy past | ||
428 | s/w timer */ | ||
429 | unsigned long s_throttles; /* waits in throttle */ | ||
430 | unsigned long s_retry_messages; /* retry broadcasts */ | ||
431 | unsigned long s_bau_reenabled; /* for bau enable/disable */ | ||
432 | unsigned long s_bau_disabled; /* for bau enable/disable */ | ||
369 | /* destination statistics */ | 433 | /* destination statistics */ |
370 | unsigned long d_alltlb; /* times all tlb's on this cpu were flushed */ | 434 | unsigned long d_alltlb; /* times all tlb's on this |
371 | unsigned long d_onetlb; /* times just one tlb on this cpu was flushed */ | 435 | cpu were flushed */ |
372 | unsigned long d_multmsg; /* interrupts with multiple messages */ | 436 | unsigned long d_onetlb; /* times just one tlb on this |
373 | unsigned long d_nomsg; /* interrupts with no message */ | 437 | cpu was flushed */ |
374 | unsigned long d_time; /* time spent on destination side */ | 438 | unsigned long d_multmsg; /* interrupts with multiple |
375 | unsigned long d_requestee; /* number of messages processed */ | 439 | messages */ |
376 | unsigned long d_retries; /* number of retry messages processed */ | 440 | unsigned long d_nomsg; /* interrupts with no message */ |
377 | unsigned long d_canceled; /* number of messages canceled by retries */ | 441 | unsigned long d_time; /* time spent on destination |
378 | unsigned long d_nocanceled; /* retries that found nothing to cancel */ | 442 | side */ |
379 | unsigned long d_resets; /* number of ipi-style requests processed */ | 443 | unsigned long d_requestee; /* number of messages |
380 | unsigned long d_rcanceled; /* number of messages canceled by resets */ | 444 | processed */ |
445 | unsigned long d_retries; /* number of retry messages | ||
446 | processed */ | ||
447 | unsigned long d_canceled; /* number of messages canceled | ||
448 | by retries */ | ||
449 | unsigned long d_nocanceled; /* retries that found nothing | ||
450 | to cancel */ | ||
451 | unsigned long d_resets; /* number of ipi-style requests | ||
452 | processed */ | ||
453 | unsigned long d_rcanceled; /* number of messages canceled | ||
454 | by resets */ | ||
455 | }; | ||
456 | |||
457 | struct tunables { | ||
458 | int *tunp; | ||
459 | int deflt; | ||
381 | }; | 460 | }; |
382 | 461 | ||
383 | struct hub_and_pnode { | 462 | struct hub_and_pnode { |
384 | short uvhub; | 463 | short uvhub; |
385 | short pnode; | 464 | short pnode; |
386 | }; | 465 | }; |
466 | |||
467 | struct socket_desc { | ||
468 | short num_cpus; | ||
469 | short cpu_number[MAX_CPUS_PER_SOCKET]; | ||
470 | }; | ||
471 | |||
472 | struct uvhub_desc { | ||
473 | unsigned short socket_mask; | ||
474 | short num_cpus; | ||
475 | short uvhub; | ||
476 | short pnode; | ||
477 | struct socket_desc socket[2]; | ||
478 | }; | ||
479 | |||
387 | /* | 480 | /* |
388 | * one per-cpu; to locate the software tables | 481 | * one per-cpu; to locate the software tables |
389 | */ | 482 | */ |
390 | struct bau_control { | 483 | struct bau_control { |
391 | struct bau_desc *descriptor_base; | 484 | struct bau_desc *descriptor_base; |
392 | struct bau_payload_queue_entry *va_queue_first; | 485 | struct bau_pq_entry *queue_first; |
393 | struct bau_payload_queue_entry *va_queue_last; | 486 | struct bau_pq_entry *queue_last; |
394 | struct bau_payload_queue_entry *bau_msg_head; | 487 | struct bau_pq_entry *bau_msg_head; |
395 | struct bau_control *uvhub_master; | 488 | struct bau_control *uvhub_master; |
396 | struct bau_control *socket_master; | 489 | struct bau_control *socket_master; |
397 | struct ptc_stats *statp; | 490 | struct ptc_stats *statp; |
398 | unsigned long timeout_interval; | 491 | unsigned long timeout_interval; |
399 | unsigned long set_bau_on_time; | 492 | unsigned long set_bau_on_time; |
400 | atomic_t active_descriptor_count; | 493 | atomic_t active_descriptor_count; |
401 | int plugged_tries; | 494 | int plugged_tries; |
402 | int timeout_tries; | 495 | int timeout_tries; |
403 | int ipi_attempts; | 496 | int ipi_attempts; |
404 | int conseccompletes; | 497 | int conseccompletes; |
405 | int baudisabled; | 498 | int baudisabled; |
406 | int set_bau_off; | 499 | int set_bau_off; |
407 | short cpu; | 500 | short cpu; |
408 | short osnode; | 501 | short osnode; |
409 | short uvhub_cpu; | 502 | short uvhub_cpu; |
410 | short uvhub; | 503 | short uvhub; |
411 | short cpus_in_socket; | 504 | short cpus_in_socket; |
412 | short cpus_in_uvhub; | 505 | short cpus_in_uvhub; |
413 | short partition_base_pnode; | 506 | short partition_base_pnode; |
414 | unsigned short message_number; | 507 | unsigned short message_number; |
415 | unsigned short uvhub_quiesce; | 508 | unsigned short uvhub_quiesce; |
416 | short socket_acknowledge_count[DEST_Q_SIZE]; | 509 | short socket_acknowledge_count[DEST_Q_SIZE]; |
417 | cycles_t send_message; | 510 | cycles_t send_message; |
418 | spinlock_t uvhub_lock; | 511 | spinlock_t uvhub_lock; |
419 | spinlock_t queue_lock; | 512 | spinlock_t queue_lock; |
420 | /* tunables */ | 513 | /* tunables */ |
421 | int max_bau_concurrent; | 514 | int max_concurr; |
422 | int max_bau_concurrent_constant; | 515 | int max_concurr_const; |
423 | int plugged_delay; | 516 | int plugged_delay; |
424 | int plugsb4reset; | 517 | int plugsb4reset; |
425 | int timeoutsb4reset; | 518 | int timeoutsb4reset; |
426 | int ipi_reset_limit; | 519 | int ipi_reset_limit; |
427 | int complete_threshold; | 520 | int complete_threshold; |
428 | int congested_response_us; | 521 | int cong_response_us; |
429 | int congested_reps; | 522 | int cong_reps; |
430 | int congested_period; | 523 | int cong_period; |
431 | cycles_t period_time; | 524 | cycles_t period_time; |
432 | long period_requests; | 525 | long period_requests; |
433 | struct hub_and_pnode *target_hub_and_pnode; | 526 | struct hub_and_pnode *thp; |
434 | }; | 527 | }; |
435 | 528 | ||
436 | static inline int bau_uvhub_isset(int uvhub, struct bau_target_uvhubmask *dstp) | 529 | static unsigned long read_mmr_uv2_status(void) |
530 | { | ||
531 | return read_lmmr(UV2H_LB_BAU_SB_ACTIVATION_STATUS_2); | ||
532 | } | ||
533 | |||
534 | static void write_mmr_data_broadcast(int pnode, unsigned long mmr_image) | ||
535 | { | ||
536 | write_gmmr(pnode, UVH_BAU_DATA_BROADCAST, mmr_image); | ||
537 | } | ||
538 | |||
539 | static void write_mmr_descriptor_base(int pnode, unsigned long mmr_image) | ||
540 | { | ||
541 | write_gmmr(pnode, UVH_LB_BAU_SB_DESCRIPTOR_BASE, mmr_image); | ||
542 | } | ||
543 | |||
544 | static void write_mmr_activation(unsigned long index) | ||
545 | { | ||
546 | write_lmmr(UVH_LB_BAU_SB_ACTIVATION_CONTROL, index); | ||
547 | } | ||
548 | |||
549 | static void write_gmmr_activation(int pnode, unsigned long mmr_image) | ||
550 | { | ||
551 | write_gmmr(pnode, UVH_LB_BAU_SB_ACTIVATION_CONTROL, mmr_image); | ||
552 | } | ||
553 | |||
554 | static void write_mmr_payload_first(int pnode, unsigned long mmr_image) | ||
555 | { | ||
556 | write_gmmr(pnode, UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST, mmr_image); | ||
557 | } | ||
558 | |||
559 | static void write_mmr_payload_tail(int pnode, unsigned long mmr_image) | ||
560 | { | ||
561 | write_gmmr(pnode, UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL, mmr_image); | ||
562 | } | ||
563 | |||
564 | static void write_mmr_payload_last(int pnode, unsigned long mmr_image) | ||
565 | { | ||
566 | write_gmmr(pnode, UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST, mmr_image); | ||
567 | } | ||
568 | |||
569 | static void write_mmr_misc_control(int pnode, unsigned long mmr_image) | ||
570 | { | ||
571 | write_gmmr(pnode, UVH_LB_BAU_MISC_CONTROL, mmr_image); | ||
572 | } | ||
573 | |||
574 | static unsigned long read_mmr_misc_control(int pnode) | ||
575 | { | ||
576 | return read_gmmr(pnode, UVH_LB_BAU_MISC_CONTROL); | ||
577 | } | ||
578 | |||
579 | static void write_mmr_sw_ack(unsigned long mr) | ||
580 | { | ||
581 | uv_write_local_mmr(UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS, mr); | ||
582 | } | ||
583 | |||
584 | static unsigned long read_mmr_sw_ack(void) | ||
585 | { | ||
586 | return read_lmmr(UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE); | ||
587 | } | ||
588 | |||
589 | static unsigned long read_gmmr_sw_ack(int pnode) | ||
590 | { | ||
591 | return read_gmmr(pnode, UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE); | ||
592 | } | ||
593 | |||
594 | static void write_mmr_data_config(int pnode, unsigned long mr) | ||
595 | { | ||
596 | uv_write_global_mmr64(pnode, UVH_BAU_DATA_CONFIG, mr); | ||
597 | } | ||
598 | |||
599 | static inline int bau_uvhub_isset(int uvhub, struct bau_targ_hubmask *dstp) | ||
437 | { | 600 | { |
438 | return constant_test_bit(uvhub, &dstp->bits[0]); | 601 | return constant_test_bit(uvhub, &dstp->bits[0]); |
439 | } | 602 | } |
440 | static inline void bau_uvhub_set(int pnode, struct bau_target_uvhubmask *dstp) | 603 | static inline void bau_uvhub_set(int pnode, struct bau_targ_hubmask *dstp) |
441 | { | 604 | { |
442 | __set_bit(pnode, &dstp->bits[0]); | 605 | __set_bit(pnode, &dstp->bits[0]); |
443 | } | 606 | } |
444 | static inline void bau_uvhubs_clear(struct bau_target_uvhubmask *dstp, | 607 | static inline void bau_uvhubs_clear(struct bau_targ_hubmask *dstp, |
445 | int nbits) | 608 | int nbits) |
446 | { | 609 | { |
447 | bitmap_zero(&dstp->bits[0], nbits); | 610 | bitmap_zero(&dstp->bits[0], nbits); |
448 | } | 611 | } |
449 | static inline int bau_uvhub_weight(struct bau_target_uvhubmask *dstp) | 612 | static inline int bau_uvhub_weight(struct bau_targ_hubmask *dstp) |
450 | { | 613 | { |
451 | return bitmap_weight((unsigned long *)&dstp->bits[0], | 614 | return bitmap_weight((unsigned long *)&dstp->bits[0], |
452 | UV_DISTRIBUTION_SIZE); | 615 | UV_DISTRIBUTION_SIZE); |
@@ -457,9 +620,6 @@ static inline void bau_cpubits_clear(struct bau_local_cpumask *dstp, int nbits) | |||
457 | bitmap_zero(&dstp->bits, nbits); | 620 | bitmap_zero(&dstp->bits, nbits); |
458 | } | 621 | } |
459 | 622 | ||
460 | #define cpubit_isset(cpu, bau_local_cpumask) \ | ||
461 | test_bit((cpu), (bau_local_cpumask).bits) | ||
462 | |||
463 | extern void uv_bau_message_intr1(void); | 623 | extern void uv_bau_message_intr1(void); |
464 | extern void uv_bau_timeout_intr1(void); | 624 | extern void uv_bau_timeout_intr1(void); |
465 | 625 | ||
@@ -467,7 +627,7 @@ struct atomic_short { | |||
467 | short counter; | 627 | short counter; |
468 | }; | 628 | }; |
469 | 629 | ||
470 | /** | 630 | /* |
471 | * atomic_read_short - read a short atomic variable | 631 | * atomic_read_short - read a short atomic variable |
472 | * @v: pointer of type atomic_short | 632 | * @v: pointer of type atomic_short |
473 | * | 633 | * |
@@ -478,14 +638,14 @@ static inline int atomic_read_short(const struct atomic_short *v) | |||
478 | return v->counter; | 638 | return v->counter; |
479 | } | 639 | } |
480 | 640 | ||
481 | /** | 641 | /* |
482 | * atomic_add_short_return - add and return a short int | 642 | * atom_asr - add and return a short int |
483 | * @i: short value to add | 643 | * @i: short value to add |
484 | * @v: pointer of type atomic_short | 644 | * @v: pointer of type atomic_short |
485 | * | 645 | * |
486 | * Atomically adds @i to @v and returns @i + @v | 646 | * Atomically adds @i to @v and returns @i + @v |
487 | */ | 647 | */ |
488 | static inline int atomic_add_short_return(short i, struct atomic_short *v) | 648 | static inline int atom_asr(short i, struct atomic_short *v) |
489 | { | 649 | { |
490 | short __i = i; | 650 | short __i = i; |
491 | asm volatile(LOCK_PREFIX "xaddw %0, %1" | 651 | asm volatile(LOCK_PREFIX "xaddw %0, %1" |
@@ -494,4 +654,26 @@ static inline int atomic_add_short_return(short i, struct atomic_short *v) | |||
494 | return i + __i; | 654 | return i + __i; |
495 | } | 655 | } |
496 | 656 | ||
657 | /* | ||
658 | * conditionally add 1 to *v, unless *v is >= u | ||
659 | * return 0 if we cannot add 1 to *v because it is >= u | ||
660 | * return 1 if we can add 1 to *v because it is < u | ||
661 | * the add is atomic | ||
662 | * | ||
663 | * This is close to atomic_add_unless(), but this allows the 'u' value | ||
664 | * to be lowered below the current 'v'. atomic_add_unless can only stop | ||
665 | * on equal. | ||
666 | */ | ||
667 | static inline int atomic_inc_unless_ge(spinlock_t *lock, atomic_t *v, int u) | ||
668 | { | ||
669 | spin_lock(lock); | ||
670 | if (atomic_read(v) >= u) { | ||
671 | spin_unlock(lock); | ||
672 | return 0; | ||
673 | } | ||
674 | atomic_inc(v); | ||
675 | spin_unlock(lock); | ||
676 | return 1; | ||
677 | } | ||
678 | |||
497 | #endif /* _ASM_X86_UV_UV_BAU_H */ | 679 | #endif /* _ASM_X86_UV_UV_BAU_H */ |
diff --git a/arch/x86/include/asm/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h index 4298002d0c83..f26544a15214 100644 --- a/arch/x86/include/asm/uv/uv_hub.h +++ b/arch/x86/include/asm/uv/uv_hub.h | |||
@@ -77,8 +77,9 @@ | |||
77 | * | 77 | * |
78 | * 1111110000000000 | 78 | * 1111110000000000 |
79 | * 5432109876543210 | 79 | * 5432109876543210 |
80 | * pppppppppplc0cch Nehalem-EX | 80 | * pppppppppplc0cch Nehalem-EX (12 bits in hdw reg) |
81 | * ppppppppplcc0cch Westmere-EX | 81 | * ppppppppplcc0cch Westmere-EX (12 bits in hdw reg) |
82 | * pppppppppppcccch SandyBridge (15 bits in hdw reg) | ||
82 | * sssssssssss | 83 | * sssssssssss |
83 | * | 84 | * |
84 | * p = pnode bits | 85 | * p = pnode bits |
@@ -87,7 +88,7 @@ | |||
87 | * h = hyperthread | 88 | * h = hyperthread |
88 | * s = bits that are in the SOCKET_ID CSR | 89 | * s = bits that are in the SOCKET_ID CSR |
89 | * | 90 | * |
90 | * Note: Processor only supports 12 bits in the APICID register. The ACPI | 91 | * Note: Processor may support fewer bits in the APICID register. The ACPI |
91 | * tables hold all 16 bits. Software needs to be aware of this. | 92 | * tables hold all 16 bits. Software needs to be aware of this. |
92 | * | 93 | * |
93 | * Unless otherwise specified, all references to APICID refer to | 94 | * Unless otherwise specified, all references to APICID refer to |
@@ -138,6 +139,8 @@ struct uv_hub_info_s { | |||
138 | unsigned long global_mmr_base; | 139 | unsigned long global_mmr_base; |
139 | unsigned long gpa_mask; | 140 | unsigned long gpa_mask; |
140 | unsigned int gnode_extra; | 141 | unsigned int gnode_extra; |
142 | unsigned char hub_revision; | ||
143 | unsigned char apic_pnode_shift; | ||
141 | unsigned long gnode_upper; | 144 | unsigned long gnode_upper; |
142 | unsigned long lowmem_remap_top; | 145 | unsigned long lowmem_remap_top; |
143 | unsigned long lowmem_remap_base; | 146 | unsigned long lowmem_remap_base; |
@@ -149,13 +152,31 @@ struct uv_hub_info_s { | |||
149 | unsigned char m_val; | 152 | unsigned char m_val; |
150 | unsigned char n_val; | 153 | unsigned char n_val; |
151 | struct uv_scir_s scir; | 154 | struct uv_scir_s scir; |
152 | unsigned char apic_pnode_shift; | ||
153 | }; | 155 | }; |
154 | 156 | ||
155 | DECLARE_PER_CPU(struct uv_hub_info_s, __uv_hub_info); | 157 | DECLARE_PER_CPU(struct uv_hub_info_s, __uv_hub_info); |
156 | #define uv_hub_info (&__get_cpu_var(__uv_hub_info)) | 158 | #define uv_hub_info (&__get_cpu_var(__uv_hub_info)) |
157 | #define uv_cpu_hub_info(cpu) (&per_cpu(__uv_hub_info, cpu)) | 159 | #define uv_cpu_hub_info(cpu) (&per_cpu(__uv_hub_info, cpu)) |
158 | 160 | ||
161 | /* | ||
162 | * Hub revisions less than UV2_HUB_REVISION_BASE are UV1 hubs. All UV2 | ||
163 | * hubs have revision numbers greater than or equal to UV2_HUB_REVISION_BASE. | ||
164 | * This is a software convention - NOT the hardware revision numbers in | ||
165 | * the hub chip. | ||
166 | */ | ||
167 | #define UV1_HUB_REVISION_BASE 1 | ||
168 | #define UV2_HUB_REVISION_BASE 3 | ||
169 | |||
170 | static inline int is_uv1_hub(void) | ||
171 | { | ||
172 | return uv_hub_info->hub_revision < UV2_HUB_REVISION_BASE; | ||
173 | } | ||
174 | |||
175 | static inline int is_uv2_hub(void) | ||
176 | { | ||
177 | return uv_hub_info->hub_revision >= UV2_HUB_REVISION_BASE; | ||
178 | } | ||
179 | |||
159 | union uvh_apicid { | 180 | union uvh_apicid { |
160 | unsigned long v; | 181 | unsigned long v; |
161 | struct uvh_apicid_s { | 182 | struct uvh_apicid_s { |
@@ -180,11 +201,25 @@ union uvh_apicid { | |||
180 | #define UV_PNODE_TO_GNODE(p) ((p) |uv_hub_info->gnode_extra) | 201 | #define UV_PNODE_TO_GNODE(p) ((p) |uv_hub_info->gnode_extra) |
181 | #define UV_PNODE_TO_NASID(p) (UV_PNODE_TO_GNODE(p) << 1) | 202 | #define UV_PNODE_TO_NASID(p) (UV_PNODE_TO_GNODE(p) << 1) |
182 | 203 | ||
183 | #define UV_LOCAL_MMR_BASE 0xf4000000UL | 204 | #define UV1_LOCAL_MMR_BASE 0xf4000000UL |
184 | #define UV_GLOBAL_MMR32_BASE 0xf8000000UL | 205 | #define UV1_GLOBAL_MMR32_BASE 0xf8000000UL |
206 | #define UV1_LOCAL_MMR_SIZE (64UL * 1024 * 1024) | ||
207 | #define UV1_GLOBAL_MMR32_SIZE (64UL * 1024 * 1024) | ||
208 | |||
209 | #define UV2_LOCAL_MMR_BASE 0xfa000000UL | ||
210 | #define UV2_GLOBAL_MMR32_BASE 0xfc000000UL | ||
211 | #define UV2_LOCAL_MMR_SIZE (32UL * 1024 * 1024) | ||
212 | #define UV2_GLOBAL_MMR32_SIZE (32UL * 1024 * 1024) | ||
213 | |||
214 | #define UV_LOCAL_MMR_BASE (is_uv1_hub() ? UV1_LOCAL_MMR_BASE \ | ||
215 | : UV2_LOCAL_MMR_BASE) | ||
216 | #define UV_GLOBAL_MMR32_BASE (is_uv1_hub() ? UV1_GLOBAL_MMR32_BASE \ | ||
217 | : UV2_GLOBAL_MMR32_BASE) | ||
218 | #define UV_LOCAL_MMR_SIZE (is_uv1_hub() ? UV1_LOCAL_MMR_SIZE : \ | ||
219 | UV2_LOCAL_MMR_SIZE) | ||
220 | #define UV_GLOBAL_MMR32_SIZE (is_uv1_hub() ? UV1_GLOBAL_MMR32_SIZE :\ | ||
221 | UV2_GLOBAL_MMR32_SIZE) | ||
185 | #define UV_GLOBAL_MMR64_BASE (uv_hub_info->global_mmr_base) | 222 | #define UV_GLOBAL_MMR64_BASE (uv_hub_info->global_mmr_base) |
186 | #define UV_LOCAL_MMR_SIZE (64UL * 1024 * 1024) | ||
187 | #define UV_GLOBAL_MMR32_SIZE (64UL * 1024 * 1024) | ||
188 | 223 | ||
189 | #define UV_GLOBAL_GRU_MMR_BASE 0x4000000 | 224 | #define UV_GLOBAL_GRU_MMR_BASE 0x4000000 |
190 | 225 | ||
@@ -301,6 +336,17 @@ static inline int uv_apicid_to_pnode(int apicid) | |||
301 | } | 336 | } |
302 | 337 | ||
303 | /* | 338 | /* |
339 | * Convert an apicid to the socket number on the blade | ||
340 | */ | ||
341 | static inline int uv_apicid_to_socket(int apicid) | ||
342 | { | ||
343 | if (is_uv1_hub()) | ||
344 | return (apicid >> (uv_hub_info->apic_pnode_shift - 1)) & 1; | ||
345 | else | ||
346 | return 0; | ||
347 | } | ||
348 | |||
349 | /* | ||
304 | * Access global MMRs using the low memory MMR32 space. This region supports | 350 | * Access global MMRs using the low memory MMR32 space. This region supports |
305 | * faster MMR access but not all MMRs are accessible in this space. | 351 | * faster MMR access but not all MMRs are accessible in this space. |
306 | */ | 352 | */ |
@@ -519,14 +565,13 @@ static inline void uv_hub_send_ipi(int pnode, int apicid, int vector) | |||
519 | 565 | ||
520 | /* | 566 | /* |
521 | * Get the minimum revision number of the hub chips within the partition. | 567 | * Get the minimum revision number of the hub chips within the partition. |
522 | * 1 - initial rev 1.0 silicon | 568 | * 1 - UV1 rev 1.0 initial silicon |
523 | * 2 - rev 2.0 production silicon | 569 | * 2 - UV1 rev 2.0 production silicon |
570 | * 3 - UV2 rev 1.0 initial silicon | ||
524 | */ | 571 | */ |
525 | static inline int uv_get_min_hub_revision_id(void) | 572 | static inline int uv_get_min_hub_revision_id(void) |
526 | { | 573 | { |
527 | extern int uv_min_hub_revision_id; | 574 | return uv_hub_info->hub_revision; |
528 | |||
529 | return uv_min_hub_revision_id; | ||
530 | } | 575 | } |
531 | 576 | ||
532 | #endif /* CONFIG_X86_64 */ | 577 | #endif /* CONFIG_X86_64 */ |
diff --git a/arch/x86/include/asm/uv/uv_mmrs.h b/arch/x86/include/asm/uv/uv_mmrs.h index f5bb64a823d7..4be52c863448 100644 --- a/arch/x86/include/asm/uv/uv_mmrs.h +++ b/arch/x86/include/asm/uv/uv_mmrs.h | |||
@@ -11,13 +11,64 @@ | |||
11 | #ifndef _ASM_X86_UV_UV_MMRS_H | 11 | #ifndef _ASM_X86_UV_UV_MMRS_H |
12 | #define _ASM_X86_UV_UV_MMRS_H | 12 | #define _ASM_X86_UV_UV_MMRS_H |
13 | 13 | ||
14 | /* | ||
15 | * This file contains MMR definitions for both UV1 & UV2 hubs. | ||
16 | * | ||
17 | * In general, MMR addresses and structures are identical on both hubs. | ||
18 | * These MMRs are identified as: | ||
19 | * #define UVH_xxx <address> | ||
20 | * union uvh_xxx { | ||
21 | * unsigned long v; | ||
22 | * struct uvh_int_cmpd_s { | ||
23 | * } s; | ||
24 | * }; | ||
25 | * | ||
26 | * If the MMR exists on both hub type but has different addresses or | ||
27 | * contents, the MMR definition is similar to: | ||
28 | * #define UV1H_xxx <uv1 address> | ||
29 | * #define UV2H_xxx <uv2address> | ||
30 | * #define UVH_xxx (is_uv1_hub() ? UV1H_xxx : UV2H_xxx) | ||
31 | * union uvh_xxx { | ||
32 | * unsigned long v; | ||
33 | * struct uv1h_int_cmpd_s { (Common fields only) | ||
34 | * } s; | ||
35 | * struct uv1h_int_cmpd_s { (Full UV1 definition) | ||
36 | * } s1; | ||
37 | * struct uv2h_int_cmpd_s { (Full UV2 definition) | ||
38 | * } s2; | ||
39 | * }; | ||
40 | * | ||
41 | * Only essential difference are enumerated. For example, if the address is | ||
42 | * the same for both UV1 & UV2, only a single #define is generated. Likewise, | ||
43 | * if the contents is the same for both hubs, only the "s" structure is | ||
44 | * generated. | ||
45 | * | ||
46 | * If the MMR exists on ONLY 1 type of hub, no generic definition is | ||
47 | * generated: | ||
48 | * #define UVnH_xxx <uvn address> | ||
49 | * union uvnh_xxx { | ||
50 | * unsigned long v; | ||
51 | * struct uvh_int_cmpd_s { | ||
52 | * } sn; | ||
53 | * }; | ||
54 | */ | ||
55 | |||
14 | #define UV_MMR_ENABLE (1UL << 63) | 56 | #define UV_MMR_ENABLE (1UL << 63) |
15 | 57 | ||
58 | #define UV1_HUB_PART_NUMBER 0x88a5 | ||
59 | #define UV2_HUB_PART_NUMBER 0x8eb8 | ||
60 | |||
61 | /* Compat: if this #define is present, UV headers support UV2 */ | ||
62 | #define UV2_HUB_IS_SUPPORTED 1 | ||
63 | |||
64 | /* KABI compat: if this #define is present, KABI hacks are present */ | ||
65 | #define UV2_HUB_KABI_HACKS 1 | ||
66 | |||
16 | /* ========================================================================= */ | 67 | /* ========================================================================= */ |
17 | /* UVH_BAU_DATA_BROADCAST */ | 68 | /* UVH_BAU_DATA_BROADCAST */ |
18 | /* ========================================================================= */ | 69 | /* ========================================================================= */ |
19 | #define UVH_BAU_DATA_BROADCAST 0x61688UL | 70 | #define UVH_BAU_DATA_BROADCAST 0x61688UL |
20 | #define UVH_BAU_DATA_BROADCAST_32 0x0440 | 71 | #define UVH_BAU_DATA_BROADCAST_32 0x440 |
21 | 72 | ||
22 | #define UVH_BAU_DATA_BROADCAST_ENABLE_SHFT 0 | 73 | #define UVH_BAU_DATA_BROADCAST_ENABLE_SHFT 0 |
23 | #define UVH_BAU_DATA_BROADCAST_ENABLE_MASK 0x0000000000000001UL | 74 | #define UVH_BAU_DATA_BROADCAST_ENABLE_MASK 0x0000000000000001UL |
@@ -34,7 +85,7 @@ union uvh_bau_data_broadcast_u { | |||
34 | /* UVH_BAU_DATA_CONFIG */ | 85 | /* UVH_BAU_DATA_CONFIG */ |
35 | /* ========================================================================= */ | 86 | /* ========================================================================= */ |
36 | #define UVH_BAU_DATA_CONFIG 0x61680UL | 87 | #define UVH_BAU_DATA_CONFIG 0x61680UL |
37 | #define UVH_BAU_DATA_CONFIG_32 0x0438 | 88 | #define UVH_BAU_DATA_CONFIG_32 0x438 |
38 | 89 | ||
39 | #define UVH_BAU_DATA_CONFIG_VECTOR_SHFT 0 | 90 | #define UVH_BAU_DATA_CONFIG_VECTOR_SHFT 0 |
40 | #define UVH_BAU_DATA_CONFIG_VECTOR_MASK 0x00000000000000ffUL | 91 | #define UVH_BAU_DATA_CONFIG_VECTOR_MASK 0x00000000000000ffUL |
@@ -73,125 +124,245 @@ union uvh_bau_data_config_u { | |||
73 | /* UVH_EVENT_OCCURRED0 */ | 124 | /* UVH_EVENT_OCCURRED0 */ |
74 | /* ========================================================================= */ | 125 | /* ========================================================================= */ |
75 | #define UVH_EVENT_OCCURRED0 0x70000UL | 126 | #define UVH_EVENT_OCCURRED0 0x70000UL |
76 | #define UVH_EVENT_OCCURRED0_32 0x005e8 | 127 | #define UVH_EVENT_OCCURRED0_32 0x5e8 |
77 | 128 | ||
78 | #define UVH_EVENT_OCCURRED0_LB_HCERR_SHFT 0 | 129 | #define UV1H_EVENT_OCCURRED0_LB_HCERR_SHFT 0 |
79 | #define UVH_EVENT_OCCURRED0_LB_HCERR_MASK 0x0000000000000001UL | 130 | #define UV1H_EVENT_OCCURRED0_LB_HCERR_MASK 0x0000000000000001UL |
80 | #define UVH_EVENT_OCCURRED0_GR0_HCERR_SHFT 1 | 131 | #define UV1H_EVENT_OCCURRED0_GR0_HCERR_SHFT 1 |
81 | #define UVH_EVENT_OCCURRED0_GR0_HCERR_MASK 0x0000000000000002UL | 132 | #define UV1H_EVENT_OCCURRED0_GR0_HCERR_MASK 0x0000000000000002UL |
82 | #define UVH_EVENT_OCCURRED0_GR1_HCERR_SHFT 2 | 133 | #define UV1H_EVENT_OCCURRED0_GR1_HCERR_SHFT 2 |
83 | #define UVH_EVENT_OCCURRED0_GR1_HCERR_MASK 0x0000000000000004UL | 134 | #define UV1H_EVENT_OCCURRED0_GR1_HCERR_MASK 0x0000000000000004UL |
84 | #define UVH_EVENT_OCCURRED0_LH_HCERR_SHFT 3 | 135 | #define UV1H_EVENT_OCCURRED0_LH_HCERR_SHFT 3 |
85 | #define UVH_EVENT_OCCURRED0_LH_HCERR_MASK 0x0000000000000008UL | 136 | #define UV1H_EVENT_OCCURRED0_LH_HCERR_MASK 0x0000000000000008UL |
86 | #define UVH_EVENT_OCCURRED0_RH_HCERR_SHFT 4 | 137 | #define UV1H_EVENT_OCCURRED0_RH_HCERR_SHFT 4 |
87 | #define UVH_EVENT_OCCURRED0_RH_HCERR_MASK 0x0000000000000010UL | 138 | #define UV1H_EVENT_OCCURRED0_RH_HCERR_MASK 0x0000000000000010UL |
88 | #define UVH_EVENT_OCCURRED0_XN_HCERR_SHFT 5 | 139 | #define UV1H_EVENT_OCCURRED0_XN_HCERR_SHFT 5 |
89 | #define UVH_EVENT_OCCURRED0_XN_HCERR_MASK 0x0000000000000020UL | 140 | #define UV1H_EVENT_OCCURRED0_XN_HCERR_MASK 0x0000000000000020UL |
90 | #define UVH_EVENT_OCCURRED0_SI_HCERR_SHFT 6 | 141 | #define UV1H_EVENT_OCCURRED0_SI_HCERR_SHFT 6 |
91 | #define UVH_EVENT_OCCURRED0_SI_HCERR_MASK 0x0000000000000040UL | 142 | #define UV1H_EVENT_OCCURRED0_SI_HCERR_MASK 0x0000000000000040UL |
92 | #define UVH_EVENT_OCCURRED0_LB_AOERR0_SHFT 7 | 143 | #define UV1H_EVENT_OCCURRED0_LB_AOERR0_SHFT 7 |
93 | #define UVH_EVENT_OCCURRED0_LB_AOERR0_MASK 0x0000000000000080UL | 144 | #define UV1H_EVENT_OCCURRED0_LB_AOERR0_MASK 0x0000000000000080UL |
94 | #define UVH_EVENT_OCCURRED0_GR0_AOERR0_SHFT 8 | 145 | #define UV1H_EVENT_OCCURRED0_GR0_AOERR0_SHFT 8 |
95 | #define UVH_EVENT_OCCURRED0_GR0_AOERR0_MASK 0x0000000000000100UL | 146 | #define UV1H_EVENT_OCCURRED0_GR0_AOERR0_MASK 0x0000000000000100UL |
96 | #define UVH_EVENT_OCCURRED0_GR1_AOERR0_SHFT 9 | 147 | #define UV1H_EVENT_OCCURRED0_GR1_AOERR0_SHFT 9 |
97 | #define UVH_EVENT_OCCURRED0_GR1_AOERR0_MASK 0x0000000000000200UL | 148 | #define UV1H_EVENT_OCCURRED0_GR1_AOERR0_MASK 0x0000000000000200UL |
98 | #define UVH_EVENT_OCCURRED0_LH_AOERR0_SHFT 10 | 149 | #define UV1H_EVENT_OCCURRED0_LH_AOERR0_SHFT 10 |
99 | #define UVH_EVENT_OCCURRED0_LH_AOERR0_MASK 0x0000000000000400UL | 150 | #define UV1H_EVENT_OCCURRED0_LH_AOERR0_MASK 0x0000000000000400UL |
100 | #define UVH_EVENT_OCCURRED0_RH_AOERR0_SHFT 11 | 151 | #define UV1H_EVENT_OCCURRED0_RH_AOERR0_SHFT 11 |
101 | #define UVH_EVENT_OCCURRED0_RH_AOERR0_MASK 0x0000000000000800UL | 152 | #define UV1H_EVENT_OCCURRED0_RH_AOERR0_MASK 0x0000000000000800UL |
102 | #define UVH_EVENT_OCCURRED0_XN_AOERR0_SHFT 12 | 153 | #define UV1H_EVENT_OCCURRED0_XN_AOERR0_SHFT 12 |
103 | #define UVH_EVENT_OCCURRED0_XN_AOERR0_MASK 0x0000000000001000UL | 154 | #define UV1H_EVENT_OCCURRED0_XN_AOERR0_MASK 0x0000000000001000UL |
104 | #define UVH_EVENT_OCCURRED0_SI_AOERR0_SHFT 13 | 155 | #define UV1H_EVENT_OCCURRED0_SI_AOERR0_SHFT 13 |
105 | #define UVH_EVENT_OCCURRED0_SI_AOERR0_MASK 0x0000000000002000UL | 156 | #define UV1H_EVENT_OCCURRED0_SI_AOERR0_MASK 0x0000000000002000UL |
106 | #define UVH_EVENT_OCCURRED0_LB_AOERR1_SHFT 14 | 157 | #define UV1H_EVENT_OCCURRED0_LB_AOERR1_SHFT 14 |
107 | #define UVH_EVENT_OCCURRED0_LB_AOERR1_MASK 0x0000000000004000UL | 158 | #define UV1H_EVENT_OCCURRED0_LB_AOERR1_MASK 0x0000000000004000UL |
108 | #define UVH_EVENT_OCCURRED0_GR0_AOERR1_SHFT 15 | 159 | #define UV1H_EVENT_OCCURRED0_GR0_AOERR1_SHFT 15 |
109 | #define UVH_EVENT_OCCURRED0_GR0_AOERR1_MASK 0x0000000000008000UL | 160 | #define UV1H_EVENT_OCCURRED0_GR0_AOERR1_MASK 0x0000000000008000UL |
110 | #define UVH_EVENT_OCCURRED0_GR1_AOERR1_SHFT 16 | 161 | #define UV1H_EVENT_OCCURRED0_GR1_AOERR1_SHFT 16 |
111 | #define UVH_EVENT_OCCURRED0_GR1_AOERR1_MASK 0x0000000000010000UL | 162 | #define UV1H_EVENT_OCCURRED0_GR1_AOERR1_MASK 0x0000000000010000UL |
112 | #define UVH_EVENT_OCCURRED0_LH_AOERR1_SHFT 17 | 163 | #define UV1H_EVENT_OCCURRED0_LH_AOERR1_SHFT 17 |
113 | #define UVH_EVENT_OCCURRED0_LH_AOERR1_MASK 0x0000000000020000UL | 164 | #define UV1H_EVENT_OCCURRED0_LH_AOERR1_MASK 0x0000000000020000UL |
114 | #define UVH_EVENT_OCCURRED0_RH_AOERR1_SHFT 18 | 165 | #define UV1H_EVENT_OCCURRED0_RH_AOERR1_SHFT 18 |
115 | #define UVH_EVENT_OCCURRED0_RH_AOERR1_MASK 0x0000000000040000UL | 166 | #define UV1H_EVENT_OCCURRED0_RH_AOERR1_MASK 0x0000000000040000UL |
116 | #define UVH_EVENT_OCCURRED0_XN_AOERR1_SHFT 19 | 167 | #define UV1H_EVENT_OCCURRED0_XN_AOERR1_SHFT 19 |
117 | #define UVH_EVENT_OCCURRED0_XN_AOERR1_MASK 0x0000000000080000UL | 168 | #define UV1H_EVENT_OCCURRED0_XN_AOERR1_MASK 0x0000000000080000UL |
118 | #define UVH_EVENT_OCCURRED0_SI_AOERR1_SHFT 20 | 169 | #define UV1H_EVENT_OCCURRED0_SI_AOERR1_SHFT 20 |
119 | #define UVH_EVENT_OCCURRED0_SI_AOERR1_MASK 0x0000000000100000UL | 170 | #define UV1H_EVENT_OCCURRED0_SI_AOERR1_MASK 0x0000000000100000UL |
120 | #define UVH_EVENT_OCCURRED0_RH_VPI_INT_SHFT 21 | 171 | #define UV1H_EVENT_OCCURRED0_RH_VPI_INT_SHFT 21 |
121 | #define UVH_EVENT_OCCURRED0_RH_VPI_INT_MASK 0x0000000000200000UL | 172 | #define UV1H_EVENT_OCCURRED0_RH_VPI_INT_MASK 0x0000000000200000UL |
122 | #define UVH_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_SHFT 22 | 173 | #define UV1H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_SHFT 22 |
123 | #define UVH_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_MASK 0x0000000000400000UL | 174 | #define UV1H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_MASK 0x0000000000400000UL |
124 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_0_SHFT 23 | 175 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_0_SHFT 23 |
125 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_0_MASK 0x0000000000800000UL | 176 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_0_MASK 0x0000000000800000UL |
126 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_1_SHFT 24 | 177 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_1_SHFT 24 |
127 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_1_MASK 0x0000000001000000UL | 178 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_1_MASK 0x0000000001000000UL |
128 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_2_SHFT 25 | 179 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_2_SHFT 25 |
129 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_2_MASK 0x0000000002000000UL | 180 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_2_MASK 0x0000000002000000UL |
130 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_3_SHFT 26 | 181 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_3_SHFT 26 |
131 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_3_MASK 0x0000000004000000UL | 182 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_3_MASK 0x0000000004000000UL |
132 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_4_SHFT 27 | 183 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_4_SHFT 27 |
133 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_4_MASK 0x0000000008000000UL | 184 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_4_MASK 0x0000000008000000UL |
134 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_5_SHFT 28 | 185 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_5_SHFT 28 |
135 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_5_MASK 0x0000000010000000UL | 186 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_5_MASK 0x0000000010000000UL |
136 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_6_SHFT 29 | 187 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_6_SHFT 29 |
137 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_6_MASK 0x0000000020000000UL | 188 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_6_MASK 0x0000000020000000UL |
138 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_7_SHFT 30 | 189 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_7_SHFT 30 |
139 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_7_MASK 0x0000000040000000UL | 190 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_7_MASK 0x0000000040000000UL |
140 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_8_SHFT 31 | 191 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_8_SHFT 31 |
141 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_8_MASK 0x0000000080000000UL | 192 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_8_MASK 0x0000000080000000UL |
142 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_9_SHFT 32 | 193 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_9_SHFT 32 |
143 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_9_MASK 0x0000000100000000UL | 194 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_9_MASK 0x0000000100000000UL |
144 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_10_SHFT 33 | 195 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_10_SHFT 33 |
145 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_10_MASK 0x0000000200000000UL | 196 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_10_MASK 0x0000000200000000UL |
146 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_11_SHFT 34 | 197 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_11_SHFT 34 |
147 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_11_MASK 0x0000000400000000UL | 198 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_11_MASK 0x0000000400000000UL |
148 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_12_SHFT 35 | 199 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_12_SHFT 35 |
149 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_12_MASK 0x0000000800000000UL | 200 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_12_MASK 0x0000000800000000UL |
150 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_13_SHFT 36 | 201 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_13_SHFT 36 |
151 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_13_MASK 0x0000001000000000UL | 202 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_13_MASK 0x0000001000000000UL |
152 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_14_SHFT 37 | 203 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_14_SHFT 37 |
153 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_14_MASK 0x0000002000000000UL | 204 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_14_MASK 0x0000002000000000UL |
154 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_15_SHFT 38 | 205 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_15_SHFT 38 |
155 | #define UVH_EVENT_OCCURRED0_LB_IRQ_INT_15_MASK 0x0000004000000000UL | 206 | #define UV1H_EVENT_OCCURRED0_LB_IRQ_INT_15_MASK 0x0000004000000000UL |
156 | #define UVH_EVENT_OCCURRED0_L1_NMI_INT_SHFT 39 | 207 | #define UV1H_EVENT_OCCURRED0_L1_NMI_INT_SHFT 39 |
157 | #define UVH_EVENT_OCCURRED0_L1_NMI_INT_MASK 0x0000008000000000UL | 208 | #define UV1H_EVENT_OCCURRED0_L1_NMI_INT_MASK 0x0000008000000000UL |
158 | #define UVH_EVENT_OCCURRED0_STOP_CLOCK_SHFT 40 | 209 | #define UV1H_EVENT_OCCURRED0_STOP_CLOCK_SHFT 40 |
159 | #define UVH_EVENT_OCCURRED0_STOP_CLOCK_MASK 0x0000010000000000UL | 210 | #define UV1H_EVENT_OCCURRED0_STOP_CLOCK_MASK 0x0000010000000000UL |
160 | #define UVH_EVENT_OCCURRED0_ASIC_TO_L1_SHFT 41 | 211 | #define UV1H_EVENT_OCCURRED0_ASIC_TO_L1_SHFT 41 |
161 | #define UVH_EVENT_OCCURRED0_ASIC_TO_L1_MASK 0x0000020000000000UL | 212 | #define UV1H_EVENT_OCCURRED0_ASIC_TO_L1_MASK 0x0000020000000000UL |
162 | #define UVH_EVENT_OCCURRED0_L1_TO_ASIC_SHFT 42 | 213 | #define UV1H_EVENT_OCCURRED0_L1_TO_ASIC_SHFT 42 |
163 | #define UVH_EVENT_OCCURRED0_L1_TO_ASIC_MASK 0x0000040000000000UL | 214 | #define UV1H_EVENT_OCCURRED0_L1_TO_ASIC_MASK 0x0000040000000000UL |
164 | #define UVH_EVENT_OCCURRED0_LTC_INT_SHFT 43 | 215 | #define UV1H_EVENT_OCCURRED0_LTC_INT_SHFT 43 |
165 | #define UVH_EVENT_OCCURRED0_LTC_INT_MASK 0x0000080000000000UL | 216 | #define UV1H_EVENT_OCCURRED0_LTC_INT_MASK 0x0000080000000000UL |
166 | #define UVH_EVENT_OCCURRED0_LA_SEQ_TRIGGER_SHFT 44 | 217 | #define UV1H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_SHFT 44 |
167 | #define UVH_EVENT_OCCURRED0_LA_SEQ_TRIGGER_MASK 0x0000100000000000UL | 218 | #define UV1H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_MASK 0x0000100000000000UL |
168 | #define UVH_EVENT_OCCURRED0_IPI_INT_SHFT 45 | 219 | #define UV1H_EVENT_OCCURRED0_IPI_INT_SHFT 45 |
169 | #define UVH_EVENT_OCCURRED0_IPI_INT_MASK 0x0000200000000000UL | 220 | #define UV1H_EVENT_OCCURRED0_IPI_INT_MASK 0x0000200000000000UL |
170 | #define UVH_EVENT_OCCURRED0_EXTIO_INT0_SHFT 46 | 221 | #define UV1H_EVENT_OCCURRED0_EXTIO_INT0_SHFT 46 |
171 | #define UVH_EVENT_OCCURRED0_EXTIO_INT0_MASK 0x0000400000000000UL | 222 | #define UV1H_EVENT_OCCURRED0_EXTIO_INT0_MASK 0x0000400000000000UL |
172 | #define UVH_EVENT_OCCURRED0_EXTIO_INT1_SHFT 47 | 223 | #define UV1H_EVENT_OCCURRED0_EXTIO_INT1_SHFT 47 |
173 | #define UVH_EVENT_OCCURRED0_EXTIO_INT1_MASK 0x0000800000000000UL | 224 | #define UV1H_EVENT_OCCURRED0_EXTIO_INT1_MASK 0x0000800000000000UL |
174 | #define UVH_EVENT_OCCURRED0_EXTIO_INT2_SHFT 48 | 225 | #define UV1H_EVENT_OCCURRED0_EXTIO_INT2_SHFT 48 |
175 | #define UVH_EVENT_OCCURRED0_EXTIO_INT2_MASK 0x0001000000000000UL | 226 | #define UV1H_EVENT_OCCURRED0_EXTIO_INT2_MASK 0x0001000000000000UL |
176 | #define UVH_EVENT_OCCURRED0_EXTIO_INT3_SHFT 49 | 227 | #define UV1H_EVENT_OCCURRED0_EXTIO_INT3_SHFT 49 |
177 | #define UVH_EVENT_OCCURRED0_EXTIO_INT3_MASK 0x0002000000000000UL | 228 | #define UV1H_EVENT_OCCURRED0_EXTIO_INT3_MASK 0x0002000000000000UL |
178 | #define UVH_EVENT_OCCURRED0_PROFILE_INT_SHFT 50 | 229 | #define UV1H_EVENT_OCCURRED0_PROFILE_INT_SHFT 50 |
179 | #define UVH_EVENT_OCCURRED0_PROFILE_INT_MASK 0x0004000000000000UL | 230 | #define UV1H_EVENT_OCCURRED0_PROFILE_INT_MASK 0x0004000000000000UL |
180 | #define UVH_EVENT_OCCURRED0_RTC0_SHFT 51 | 231 | #define UV1H_EVENT_OCCURRED0_RTC0_SHFT 51 |
181 | #define UVH_EVENT_OCCURRED0_RTC0_MASK 0x0008000000000000UL | 232 | #define UV1H_EVENT_OCCURRED0_RTC0_MASK 0x0008000000000000UL |
182 | #define UVH_EVENT_OCCURRED0_RTC1_SHFT 52 | 233 | #define UV1H_EVENT_OCCURRED0_RTC1_SHFT 52 |
183 | #define UVH_EVENT_OCCURRED0_RTC1_MASK 0x0010000000000000UL | 234 | #define UV1H_EVENT_OCCURRED0_RTC1_MASK 0x0010000000000000UL |
184 | #define UVH_EVENT_OCCURRED0_RTC2_SHFT 53 | 235 | #define UV1H_EVENT_OCCURRED0_RTC2_SHFT 53 |
185 | #define UVH_EVENT_OCCURRED0_RTC2_MASK 0x0020000000000000UL | 236 | #define UV1H_EVENT_OCCURRED0_RTC2_MASK 0x0020000000000000UL |
186 | #define UVH_EVENT_OCCURRED0_RTC3_SHFT 54 | 237 | #define UV1H_EVENT_OCCURRED0_RTC3_SHFT 54 |
187 | #define UVH_EVENT_OCCURRED0_RTC3_MASK 0x0040000000000000UL | 238 | #define UV1H_EVENT_OCCURRED0_RTC3_MASK 0x0040000000000000UL |
188 | #define UVH_EVENT_OCCURRED0_BAU_DATA_SHFT 55 | 239 | #define UV1H_EVENT_OCCURRED0_BAU_DATA_SHFT 55 |
189 | #define UVH_EVENT_OCCURRED0_BAU_DATA_MASK 0x0080000000000000UL | 240 | #define UV1H_EVENT_OCCURRED0_BAU_DATA_MASK 0x0080000000000000UL |
190 | #define UVH_EVENT_OCCURRED0_POWER_MANAGEMENT_REQ_SHFT 56 | 241 | #define UV1H_EVENT_OCCURRED0_POWER_MANAGEMENT_REQ_SHFT 56 |
191 | #define UVH_EVENT_OCCURRED0_POWER_MANAGEMENT_REQ_MASK 0x0100000000000000UL | 242 | #define UV1H_EVENT_OCCURRED0_POWER_MANAGEMENT_REQ_MASK 0x0100000000000000UL |
243 | |||
244 | #define UV2H_EVENT_OCCURRED0_LB_HCERR_SHFT 0 | ||
245 | #define UV2H_EVENT_OCCURRED0_LB_HCERR_MASK 0x0000000000000001UL | ||
246 | #define UV2H_EVENT_OCCURRED0_QP_HCERR_SHFT 1 | ||
247 | #define UV2H_EVENT_OCCURRED0_QP_HCERR_MASK 0x0000000000000002UL | ||
248 | #define UV2H_EVENT_OCCURRED0_RH_HCERR_SHFT 2 | ||
249 | #define UV2H_EVENT_OCCURRED0_RH_HCERR_MASK 0x0000000000000004UL | ||
250 | #define UV2H_EVENT_OCCURRED0_LH0_HCERR_SHFT 3 | ||
251 | #define UV2H_EVENT_OCCURRED0_LH0_HCERR_MASK 0x0000000000000008UL | ||
252 | #define UV2H_EVENT_OCCURRED0_LH1_HCERR_SHFT 4 | ||
253 | #define UV2H_EVENT_OCCURRED0_LH1_HCERR_MASK 0x0000000000000010UL | ||
254 | #define UV2H_EVENT_OCCURRED0_GR0_HCERR_SHFT 5 | ||
255 | #define UV2H_EVENT_OCCURRED0_GR0_HCERR_MASK 0x0000000000000020UL | ||
256 | #define UV2H_EVENT_OCCURRED0_GR1_HCERR_SHFT 6 | ||
257 | #define UV2H_EVENT_OCCURRED0_GR1_HCERR_MASK 0x0000000000000040UL | ||
258 | #define UV2H_EVENT_OCCURRED0_NI0_HCERR_SHFT 7 | ||
259 | #define UV2H_EVENT_OCCURRED0_NI0_HCERR_MASK 0x0000000000000080UL | ||
260 | #define UV2H_EVENT_OCCURRED0_NI1_HCERR_SHFT 8 | ||
261 | #define UV2H_EVENT_OCCURRED0_NI1_HCERR_MASK 0x0000000000000100UL | ||
262 | #define UV2H_EVENT_OCCURRED0_LB_AOERR0_SHFT 9 | ||
263 | #define UV2H_EVENT_OCCURRED0_LB_AOERR0_MASK 0x0000000000000200UL | ||
264 | #define UV2H_EVENT_OCCURRED0_QP_AOERR0_SHFT 10 | ||
265 | #define UV2H_EVENT_OCCURRED0_QP_AOERR0_MASK 0x0000000000000400UL | ||
266 | #define UV2H_EVENT_OCCURRED0_RH_AOERR0_SHFT 11 | ||
267 | #define UV2H_EVENT_OCCURRED0_RH_AOERR0_MASK 0x0000000000000800UL | ||
268 | #define UV2H_EVENT_OCCURRED0_LH0_AOERR0_SHFT 12 | ||
269 | #define UV2H_EVENT_OCCURRED0_LH0_AOERR0_MASK 0x0000000000001000UL | ||
270 | #define UV2H_EVENT_OCCURRED0_LH1_AOERR0_SHFT 13 | ||
271 | #define UV2H_EVENT_OCCURRED0_LH1_AOERR0_MASK 0x0000000000002000UL | ||
272 | #define UV2H_EVENT_OCCURRED0_GR0_AOERR0_SHFT 14 | ||
273 | #define UV2H_EVENT_OCCURRED0_GR0_AOERR0_MASK 0x0000000000004000UL | ||
274 | #define UV2H_EVENT_OCCURRED0_GR1_AOERR0_SHFT 15 | ||
275 | #define UV2H_EVENT_OCCURRED0_GR1_AOERR0_MASK 0x0000000000008000UL | ||
276 | #define UV2H_EVENT_OCCURRED0_XB_AOERR0_SHFT 16 | ||
277 | #define UV2H_EVENT_OCCURRED0_XB_AOERR0_MASK 0x0000000000010000UL | ||
278 | #define UV2H_EVENT_OCCURRED0_RT_AOERR0_SHFT 17 | ||
279 | #define UV2H_EVENT_OCCURRED0_RT_AOERR0_MASK 0x0000000000020000UL | ||
280 | #define UV2H_EVENT_OCCURRED0_NI0_AOERR0_SHFT 18 | ||
281 | #define UV2H_EVENT_OCCURRED0_NI0_AOERR0_MASK 0x0000000000040000UL | ||
282 | #define UV2H_EVENT_OCCURRED0_NI1_AOERR0_SHFT 19 | ||
283 | #define UV2H_EVENT_OCCURRED0_NI1_AOERR0_MASK 0x0000000000080000UL | ||
284 | #define UV2H_EVENT_OCCURRED0_LB_AOERR1_SHFT 20 | ||
285 | #define UV2H_EVENT_OCCURRED0_LB_AOERR1_MASK 0x0000000000100000UL | ||
286 | #define UV2H_EVENT_OCCURRED0_QP_AOERR1_SHFT 21 | ||
287 | #define UV2H_EVENT_OCCURRED0_QP_AOERR1_MASK 0x0000000000200000UL | ||
288 | #define UV2H_EVENT_OCCURRED0_RH_AOERR1_SHFT 22 | ||
289 | #define UV2H_EVENT_OCCURRED0_RH_AOERR1_MASK 0x0000000000400000UL | ||
290 | #define UV2H_EVENT_OCCURRED0_LH0_AOERR1_SHFT 23 | ||
291 | #define UV2H_EVENT_OCCURRED0_LH0_AOERR1_MASK 0x0000000000800000UL | ||
292 | #define UV2H_EVENT_OCCURRED0_LH1_AOERR1_SHFT 24 | ||
293 | #define UV2H_EVENT_OCCURRED0_LH1_AOERR1_MASK 0x0000000001000000UL | ||
294 | #define UV2H_EVENT_OCCURRED0_GR0_AOERR1_SHFT 25 | ||
295 | #define UV2H_EVENT_OCCURRED0_GR0_AOERR1_MASK 0x0000000002000000UL | ||
296 | #define UV2H_EVENT_OCCURRED0_GR1_AOERR1_SHFT 26 | ||
297 | #define UV2H_EVENT_OCCURRED0_GR1_AOERR1_MASK 0x0000000004000000UL | ||
298 | #define UV2H_EVENT_OCCURRED0_XB_AOERR1_SHFT 27 | ||
299 | #define UV2H_EVENT_OCCURRED0_XB_AOERR1_MASK 0x0000000008000000UL | ||
300 | #define UV2H_EVENT_OCCURRED0_RT_AOERR1_SHFT 28 | ||
301 | #define UV2H_EVENT_OCCURRED0_RT_AOERR1_MASK 0x0000000010000000UL | ||
302 | #define UV2H_EVENT_OCCURRED0_NI0_AOERR1_SHFT 29 | ||
303 | #define UV2H_EVENT_OCCURRED0_NI0_AOERR1_MASK 0x0000000020000000UL | ||
304 | #define UV2H_EVENT_OCCURRED0_NI1_AOERR1_SHFT 30 | ||
305 | #define UV2H_EVENT_OCCURRED0_NI1_AOERR1_MASK 0x0000000040000000UL | ||
306 | #define UV2H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_SHFT 31 | ||
307 | #define UV2H_EVENT_OCCURRED0_SYSTEM_SHUTDOWN_INT_MASK 0x0000000080000000UL | ||
308 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_0_SHFT 32 | ||
309 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_0_MASK 0x0000000100000000UL | ||
310 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_1_SHFT 33 | ||
311 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_1_MASK 0x0000000200000000UL | ||
312 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_2_SHFT 34 | ||
313 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_2_MASK 0x0000000400000000UL | ||
314 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_3_SHFT 35 | ||
315 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_3_MASK 0x0000000800000000UL | ||
316 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_4_SHFT 36 | ||
317 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_4_MASK 0x0000001000000000UL | ||
318 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_5_SHFT 37 | ||
319 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_5_MASK 0x0000002000000000UL | ||
320 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_6_SHFT 38 | ||
321 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_6_MASK 0x0000004000000000UL | ||
322 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_7_SHFT 39 | ||
323 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_7_MASK 0x0000008000000000UL | ||
324 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_8_SHFT 40 | ||
325 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_8_MASK 0x0000010000000000UL | ||
326 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_9_SHFT 41 | ||
327 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_9_MASK 0x0000020000000000UL | ||
328 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_10_SHFT 42 | ||
329 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_10_MASK 0x0000040000000000UL | ||
330 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_11_SHFT 43 | ||
331 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_11_MASK 0x0000080000000000UL | ||
332 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_12_SHFT 44 | ||
333 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_12_MASK 0x0000100000000000UL | ||
334 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_13_SHFT 45 | ||
335 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_13_MASK 0x0000200000000000UL | ||
336 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_14_SHFT 46 | ||
337 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_14_MASK 0x0000400000000000UL | ||
338 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_15_SHFT 47 | ||
339 | #define UV2H_EVENT_OCCURRED0_LB_IRQ_INT_15_MASK 0x0000800000000000UL | ||
340 | #define UV2H_EVENT_OCCURRED0_L1_NMI_INT_SHFT 48 | ||
341 | #define UV2H_EVENT_OCCURRED0_L1_NMI_INT_MASK 0x0001000000000000UL | ||
342 | #define UV2H_EVENT_OCCURRED0_STOP_CLOCK_SHFT 49 | ||
343 | #define UV2H_EVENT_OCCURRED0_STOP_CLOCK_MASK 0x0002000000000000UL | ||
344 | #define UV2H_EVENT_OCCURRED0_ASIC_TO_L1_SHFT 50 | ||
345 | #define UV2H_EVENT_OCCURRED0_ASIC_TO_L1_MASK 0x0004000000000000UL | ||
346 | #define UV2H_EVENT_OCCURRED0_L1_TO_ASIC_SHFT 51 | ||
347 | #define UV2H_EVENT_OCCURRED0_L1_TO_ASIC_MASK 0x0008000000000000UL | ||
348 | #define UV2H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_SHFT 52 | ||
349 | #define UV2H_EVENT_OCCURRED0_LA_SEQ_TRIGGER_MASK 0x0010000000000000UL | ||
350 | #define UV2H_EVENT_OCCURRED0_IPI_INT_SHFT 53 | ||
351 | #define UV2H_EVENT_OCCURRED0_IPI_INT_MASK 0x0020000000000000UL | ||
352 | #define UV2H_EVENT_OCCURRED0_EXTIO_INT0_SHFT 54 | ||
353 | #define UV2H_EVENT_OCCURRED0_EXTIO_INT0_MASK 0x0040000000000000UL | ||
354 | #define UV2H_EVENT_OCCURRED0_EXTIO_INT1_SHFT 55 | ||
355 | #define UV2H_EVENT_OCCURRED0_EXTIO_INT1_MASK 0x0080000000000000UL | ||
356 | #define UV2H_EVENT_OCCURRED0_EXTIO_INT2_SHFT 56 | ||
357 | #define UV2H_EVENT_OCCURRED0_EXTIO_INT2_MASK 0x0100000000000000UL | ||
358 | #define UV2H_EVENT_OCCURRED0_EXTIO_INT3_SHFT 57 | ||
359 | #define UV2H_EVENT_OCCURRED0_EXTIO_INT3_MASK 0x0200000000000000UL | ||
360 | #define UV2H_EVENT_OCCURRED0_PROFILE_INT_SHFT 58 | ||
361 | #define UV2H_EVENT_OCCURRED0_PROFILE_INT_MASK 0x0400000000000000UL | ||
362 | |||
192 | union uvh_event_occurred0_u { | 363 | union uvh_event_occurred0_u { |
193 | unsigned long v; | 364 | unsigned long v; |
194 | struct uvh_event_occurred0_s { | 365 | struct uv1h_event_occurred0_s { |
195 | unsigned long lb_hcerr : 1; /* RW, W1C */ | 366 | unsigned long lb_hcerr : 1; /* RW, W1C */ |
196 | unsigned long gr0_hcerr : 1; /* RW, W1C */ | 367 | unsigned long gr0_hcerr : 1; /* RW, W1C */ |
197 | unsigned long gr1_hcerr : 1; /* RW, W1C */ | 368 | unsigned long gr1_hcerr : 1; /* RW, W1C */ |
@@ -250,14 +421,76 @@ union uvh_event_occurred0_u { | |||
250 | unsigned long bau_data : 1; /* RW, W1C */ | 421 | unsigned long bau_data : 1; /* RW, W1C */ |
251 | unsigned long power_management_req : 1; /* RW, W1C */ | 422 | unsigned long power_management_req : 1; /* RW, W1C */ |
252 | unsigned long rsvd_57_63 : 7; /* */ | 423 | unsigned long rsvd_57_63 : 7; /* */ |
253 | } s; | 424 | } s1; |
425 | struct uv2h_event_occurred0_s { | ||
426 | unsigned long lb_hcerr : 1; /* RW */ | ||
427 | unsigned long qp_hcerr : 1; /* RW */ | ||
428 | unsigned long rh_hcerr : 1; /* RW */ | ||
429 | unsigned long lh0_hcerr : 1; /* RW */ | ||
430 | unsigned long lh1_hcerr : 1; /* RW */ | ||
431 | unsigned long gr0_hcerr : 1; /* RW */ | ||
432 | unsigned long gr1_hcerr : 1; /* RW */ | ||
433 | unsigned long ni0_hcerr : 1; /* RW */ | ||
434 | unsigned long ni1_hcerr : 1; /* RW */ | ||
435 | unsigned long lb_aoerr0 : 1; /* RW */ | ||
436 | unsigned long qp_aoerr0 : 1; /* RW */ | ||
437 | unsigned long rh_aoerr0 : 1; /* RW */ | ||
438 | unsigned long lh0_aoerr0 : 1; /* RW */ | ||
439 | unsigned long lh1_aoerr0 : 1; /* RW */ | ||
440 | unsigned long gr0_aoerr0 : 1; /* RW */ | ||
441 | unsigned long gr1_aoerr0 : 1; /* RW */ | ||
442 | unsigned long xb_aoerr0 : 1; /* RW */ | ||
443 | unsigned long rt_aoerr0 : 1; /* RW */ | ||
444 | unsigned long ni0_aoerr0 : 1; /* RW */ | ||
445 | unsigned long ni1_aoerr0 : 1; /* RW */ | ||
446 | unsigned long lb_aoerr1 : 1; /* RW */ | ||
447 | unsigned long qp_aoerr1 : 1; /* RW */ | ||
448 | unsigned long rh_aoerr1 : 1; /* RW */ | ||
449 | unsigned long lh0_aoerr1 : 1; /* RW */ | ||
450 | unsigned long lh1_aoerr1 : 1; /* RW */ | ||
451 | unsigned long gr0_aoerr1 : 1; /* RW */ | ||
452 | unsigned long gr1_aoerr1 : 1; /* RW */ | ||
453 | unsigned long xb_aoerr1 : 1; /* RW */ | ||
454 | unsigned long rt_aoerr1 : 1; /* RW */ | ||
455 | unsigned long ni0_aoerr1 : 1; /* RW */ | ||
456 | unsigned long ni1_aoerr1 : 1; /* RW */ | ||
457 | unsigned long system_shutdown_int : 1; /* RW */ | ||
458 | unsigned long lb_irq_int_0 : 1; /* RW */ | ||
459 | unsigned long lb_irq_int_1 : 1; /* RW */ | ||
460 | unsigned long lb_irq_int_2 : 1; /* RW */ | ||
461 | unsigned long lb_irq_int_3 : 1; /* RW */ | ||
462 | unsigned long lb_irq_int_4 : 1; /* RW */ | ||
463 | unsigned long lb_irq_int_5 : 1; /* RW */ | ||
464 | unsigned long lb_irq_int_6 : 1; /* RW */ | ||
465 | unsigned long lb_irq_int_7 : 1; /* RW */ | ||
466 | unsigned long lb_irq_int_8 : 1; /* RW */ | ||
467 | unsigned long lb_irq_int_9 : 1; /* RW */ | ||
468 | unsigned long lb_irq_int_10 : 1; /* RW */ | ||
469 | unsigned long lb_irq_int_11 : 1; /* RW */ | ||
470 | unsigned long lb_irq_int_12 : 1; /* RW */ | ||
471 | unsigned long lb_irq_int_13 : 1; /* RW */ | ||
472 | unsigned long lb_irq_int_14 : 1; /* RW */ | ||
473 | unsigned long lb_irq_int_15 : 1; /* RW */ | ||
474 | unsigned long l1_nmi_int : 1; /* RW */ | ||
475 | unsigned long stop_clock : 1; /* RW */ | ||
476 | unsigned long asic_to_l1 : 1; /* RW */ | ||
477 | unsigned long l1_to_asic : 1; /* RW */ | ||
478 | unsigned long la_seq_trigger : 1; /* RW */ | ||
479 | unsigned long ipi_int : 1; /* RW */ | ||
480 | unsigned long extio_int0 : 1; /* RW */ | ||
481 | unsigned long extio_int1 : 1; /* RW */ | ||
482 | unsigned long extio_int2 : 1; /* RW */ | ||
483 | unsigned long extio_int3 : 1; /* RW */ | ||
484 | unsigned long profile_int : 1; /* RW */ | ||
485 | unsigned long rsvd_59_63 : 5; /* */ | ||
486 | } s2; | ||
254 | }; | 487 | }; |
255 | 488 | ||
256 | /* ========================================================================= */ | 489 | /* ========================================================================= */ |
257 | /* UVH_EVENT_OCCURRED0_ALIAS */ | 490 | /* UVH_EVENT_OCCURRED0_ALIAS */ |
258 | /* ========================================================================= */ | 491 | /* ========================================================================= */ |
259 | #define UVH_EVENT_OCCURRED0_ALIAS 0x0000000000070008UL | 492 | #define UVH_EVENT_OCCURRED0_ALIAS 0x0000000000070008UL |
260 | #define UVH_EVENT_OCCURRED0_ALIAS_32 0x005f0 | 493 | #define UVH_EVENT_OCCURRED0_ALIAS_32 0x5f0 |
261 | 494 | ||
262 | /* ========================================================================= */ | 495 | /* ========================================================================= */ |
263 | /* UVH_GR0_TLB_INT0_CONFIG */ | 496 | /* UVH_GR0_TLB_INT0_CONFIG */ |
@@ -432,8 +665,16 @@ union uvh_int_cmpb_u { | |||
432 | /* ========================================================================= */ | 665 | /* ========================================================================= */ |
433 | #define UVH_INT_CMPC 0x22100UL | 666 | #define UVH_INT_CMPC 0x22100UL |
434 | 667 | ||
435 | #define UVH_INT_CMPC_REAL_TIME_CMPC_SHFT 0 | 668 | #define UV1H_INT_CMPC_REAL_TIME_CMPC_SHFT 0 |
436 | #define UVH_INT_CMPC_REAL_TIME_CMPC_MASK 0x00ffffffffffffffUL | 669 | #define UV2H_INT_CMPC_REAL_TIME_CMPC_SHFT 0 |
670 | #define UVH_INT_CMPC_REAL_TIME_CMPC_SHFT (is_uv1_hub() ? \ | ||
671 | UV1H_INT_CMPC_REAL_TIME_CMPC_SHFT : \ | ||
672 | UV2H_INT_CMPC_REAL_TIME_CMPC_SHFT) | ||
673 | #define UV1H_INT_CMPC_REAL_TIME_CMPC_MASK 0xffffffffffffffUL | ||
674 | #define UV2H_INT_CMPC_REAL_TIME_CMPC_MASK 0xffffffffffffffUL | ||
675 | #define UVH_INT_CMPC_REAL_TIME_CMPC_MASK (is_uv1_hub() ? \ | ||
676 | UV1H_INT_CMPC_REAL_TIME_CMPC_MASK : \ | ||
677 | UV2H_INT_CMPC_REAL_TIME_CMPC_MASK) | ||
437 | 678 | ||
438 | union uvh_int_cmpc_u { | 679 | union uvh_int_cmpc_u { |
439 | unsigned long v; | 680 | unsigned long v; |
@@ -448,8 +689,16 @@ union uvh_int_cmpc_u { | |||
448 | /* ========================================================================= */ | 689 | /* ========================================================================= */ |
449 | #define UVH_INT_CMPD 0x22180UL | 690 | #define UVH_INT_CMPD 0x22180UL |
450 | 691 | ||
451 | #define UVH_INT_CMPD_REAL_TIME_CMPD_SHFT 0 | 692 | #define UV1H_INT_CMPD_REAL_TIME_CMPD_SHFT 0 |
452 | #define UVH_INT_CMPD_REAL_TIME_CMPD_MASK 0x00ffffffffffffffUL | 693 | #define UV2H_INT_CMPD_REAL_TIME_CMPD_SHFT 0 |
694 | #define UVH_INT_CMPD_REAL_TIME_CMPD_SHFT (is_uv1_hub() ? \ | ||
695 | UV1H_INT_CMPD_REAL_TIME_CMPD_SHFT : \ | ||
696 | UV2H_INT_CMPD_REAL_TIME_CMPD_SHFT) | ||
697 | #define UV1H_INT_CMPD_REAL_TIME_CMPD_MASK 0xffffffffffffffUL | ||
698 | #define UV2H_INT_CMPD_REAL_TIME_CMPD_MASK 0xffffffffffffffUL | ||
699 | #define UVH_INT_CMPD_REAL_TIME_CMPD_MASK (is_uv1_hub() ? \ | ||
700 | UV1H_INT_CMPD_REAL_TIME_CMPD_MASK : \ | ||
701 | UV2H_INT_CMPD_REAL_TIME_CMPD_MASK) | ||
453 | 702 | ||
454 | union uvh_int_cmpd_u { | 703 | union uvh_int_cmpd_u { |
455 | unsigned long v; | 704 | unsigned long v; |
@@ -463,7 +712,7 @@ union uvh_int_cmpd_u { | |||
463 | /* UVH_IPI_INT */ | 712 | /* UVH_IPI_INT */ |
464 | /* ========================================================================= */ | 713 | /* ========================================================================= */ |
465 | #define UVH_IPI_INT 0x60500UL | 714 | #define UVH_IPI_INT 0x60500UL |
466 | #define UVH_IPI_INT_32 0x0348 | 715 | #define UVH_IPI_INT_32 0x348 |
467 | 716 | ||
468 | #define UVH_IPI_INT_VECTOR_SHFT 0 | 717 | #define UVH_IPI_INT_VECTOR_SHFT 0 |
469 | #define UVH_IPI_INT_VECTOR_MASK 0x00000000000000ffUL | 718 | #define UVH_IPI_INT_VECTOR_MASK 0x00000000000000ffUL |
@@ -493,7 +742,7 @@ union uvh_ipi_int_u { | |||
493 | /* UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST */ | 742 | /* UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST */ |
494 | /* ========================================================================= */ | 743 | /* ========================================================================= */ |
495 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST 0x320050UL | 744 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST 0x320050UL |
496 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_32 0x009c0 | 745 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_32 0x9c0 |
497 | 746 | ||
498 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_ADDRESS_SHFT 4 | 747 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_ADDRESS_SHFT 4 |
499 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_ADDRESS_MASK 0x000007fffffffff0UL | 748 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_FIRST_ADDRESS_MASK 0x000007fffffffff0UL |
@@ -515,7 +764,7 @@ union uvh_lb_bau_intd_payload_queue_first_u { | |||
515 | /* UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST */ | 764 | /* UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST */ |
516 | /* ========================================================================= */ | 765 | /* ========================================================================= */ |
517 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST 0x320060UL | 766 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST 0x320060UL |
518 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST_32 0x009c8 | 767 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST_32 0x9c8 |
519 | 768 | ||
520 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST_ADDRESS_SHFT 4 | 769 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST_ADDRESS_SHFT 4 |
521 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST_ADDRESS_MASK 0x000007fffffffff0UL | 770 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_LAST_ADDRESS_MASK 0x000007fffffffff0UL |
@@ -533,7 +782,7 @@ union uvh_lb_bau_intd_payload_queue_last_u { | |||
533 | /* UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL */ | 782 | /* UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL */ |
534 | /* ========================================================================= */ | 783 | /* ========================================================================= */ |
535 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL 0x320070UL | 784 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL 0x320070UL |
536 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL_32 0x009d0 | 785 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL_32 0x9d0 |
537 | 786 | ||
538 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL_ADDRESS_SHFT 4 | 787 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL_ADDRESS_SHFT 4 |
539 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL_ADDRESS_MASK 0x000007fffffffff0UL | 788 | #define UVH_LB_BAU_INTD_PAYLOAD_QUEUE_TAIL_ADDRESS_MASK 0x000007fffffffff0UL |
@@ -551,7 +800,7 @@ union uvh_lb_bau_intd_payload_queue_tail_u { | |||
551 | /* UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE */ | 800 | /* UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE */ |
552 | /* ========================================================================= */ | 801 | /* ========================================================================= */ |
553 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE 0x320080UL | 802 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE 0x320080UL |
554 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_32 0x0a68 | 803 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_32 0xa68 |
555 | 804 | ||
556 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_0_SHFT 0 | 805 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_0_SHFT 0 |
557 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_0_MASK 0x0000000000000001UL | 806 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_PENDING_0_MASK 0x0000000000000001UL |
@@ -585,6 +834,7 @@ union uvh_lb_bau_intd_payload_queue_tail_u { | |||
585 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_6_MASK 0x0000000000004000UL | 834 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_6_MASK 0x0000000000004000UL |
586 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_7_SHFT 15 | 835 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_7_SHFT 15 |
587 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_7_MASK 0x0000000000008000UL | 836 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_TIMEOUT_7_MASK 0x0000000000008000UL |
837 | |||
588 | union uvh_lb_bau_intd_software_acknowledge_u { | 838 | union uvh_lb_bau_intd_software_acknowledge_u { |
589 | unsigned long v; | 839 | unsigned long v; |
590 | struct uvh_lb_bau_intd_software_acknowledge_s { | 840 | struct uvh_lb_bau_intd_software_acknowledge_s { |
@@ -612,13 +862,13 @@ union uvh_lb_bau_intd_software_acknowledge_u { | |||
612 | /* UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS */ | 862 | /* UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS */ |
613 | /* ========================================================================= */ | 863 | /* ========================================================================= */ |
614 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS 0x0000000000320088UL | 864 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS 0x0000000000320088UL |
615 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS_32 0x0a70 | 865 | #define UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS_32 0xa70 |
616 | 866 | ||
617 | /* ========================================================================= */ | 867 | /* ========================================================================= */ |
618 | /* UVH_LB_BAU_MISC_CONTROL */ | 868 | /* UVH_LB_BAU_MISC_CONTROL */ |
619 | /* ========================================================================= */ | 869 | /* ========================================================================= */ |
620 | #define UVH_LB_BAU_MISC_CONTROL 0x320170UL | 870 | #define UVH_LB_BAU_MISC_CONTROL 0x320170UL |
621 | #define UVH_LB_BAU_MISC_CONTROL_32 0x00a10 | 871 | #define UVH_LB_BAU_MISC_CONTROL_32 0xa10 |
622 | 872 | ||
623 | #define UVH_LB_BAU_MISC_CONTROL_REJECTION_DELAY_SHFT 0 | 873 | #define UVH_LB_BAU_MISC_CONTROL_REJECTION_DELAY_SHFT 0 |
624 | #define UVH_LB_BAU_MISC_CONTROL_REJECTION_DELAY_MASK 0x00000000000000ffUL | 874 | #define UVH_LB_BAU_MISC_CONTROL_REJECTION_DELAY_MASK 0x00000000000000ffUL |
@@ -628,8 +878,8 @@ union uvh_lb_bau_intd_software_acknowledge_u { | |||
628 | #define UVH_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_MASK 0x0000000000000200UL | 878 | #define UVH_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_MASK 0x0000000000000200UL |
629 | #define UVH_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_SHFT 10 | 879 | #define UVH_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_SHFT 10 |
630 | #define UVH_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_MASK 0x0000000000000400UL | 880 | #define UVH_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_MASK 0x0000000000000400UL |
631 | #define UVH_LB_BAU_MISC_CONTROL_CSI_AGENT_PRESENCE_VECTOR_SHFT 11 | 881 | #define UVH_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_SHFT 11 |
632 | #define UVH_LB_BAU_MISC_CONTROL_CSI_AGENT_PRESENCE_VECTOR_MASK 0x0000000000003800UL | 882 | #define UVH_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_MASK 0x0000000000003800UL |
633 | #define UVH_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_SHFT 14 | 883 | #define UVH_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_SHFT 14 |
634 | #define UVH_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_MASK 0x0000000000004000UL | 884 | #define UVH_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_MASK 0x0000000000004000UL |
635 | #define UVH_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT 15 | 885 | #define UVH_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT 15 |
@@ -650,8 +900,86 @@ union uvh_lb_bau_intd_software_acknowledge_u { | |||
650 | #define UVH_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_MASK 0x0000000008000000UL | 900 | #define UVH_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_MASK 0x0000000008000000UL |
651 | #define UVH_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_SHFT 28 | 901 | #define UVH_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_SHFT 28 |
652 | #define UVH_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000010000000UL | 902 | #define UVH_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000010000000UL |
653 | #define UVH_LB_BAU_MISC_CONTROL_FUN_SHFT 48 | 903 | |
654 | #define UVH_LB_BAU_MISC_CONTROL_FUN_MASK 0xffff000000000000UL | 904 | #define UV1H_LB_BAU_MISC_CONTROL_REJECTION_DELAY_SHFT 0 |
905 | #define UV1H_LB_BAU_MISC_CONTROL_REJECTION_DELAY_MASK 0x00000000000000ffUL | ||
906 | #define UV1H_LB_BAU_MISC_CONTROL_APIC_MODE_SHFT 8 | ||
907 | #define UV1H_LB_BAU_MISC_CONTROL_APIC_MODE_MASK 0x0000000000000100UL | ||
908 | #define UV1H_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_SHFT 9 | ||
909 | #define UV1H_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_MASK 0x0000000000000200UL | ||
910 | #define UV1H_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_SHFT 10 | ||
911 | #define UV1H_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_MASK 0x0000000000000400UL | ||
912 | #define UV1H_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_SHFT 11 | ||
913 | #define UV1H_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_MASK 0x0000000000003800UL | ||
914 | #define UV1H_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_SHFT 14 | ||
915 | #define UV1H_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_MASK 0x0000000000004000UL | ||
916 | #define UV1H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT 15 | ||
917 | #define UV1H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_MASK 0x0000000000008000UL | ||
918 | #define UV1H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT 16 | ||
919 | #define UV1H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_MASK 0x00000000000f0000UL | ||
920 | #define UV1H_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_SHFT 20 | ||
921 | #define UV1H_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_MASK 0x0000000000100000UL | ||
922 | #define UV1H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_SHFT 21 | ||
923 | #define UV1H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_MASK 0x0000000000200000UL | ||
924 | #define UV1H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_SHFT 22 | ||
925 | #define UV1H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_MASK 0x0000000000400000UL | ||
926 | #define UV1H_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_SHFT 23 | ||
927 | #define UV1H_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_MASK 0x0000000000800000UL | ||
928 | #define UV1H_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_SHFT 24 | ||
929 | #define UV1H_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000007000000UL | ||
930 | #define UV1H_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_SHFT 27 | ||
931 | #define UV1H_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_MASK 0x0000000008000000UL | ||
932 | #define UV1H_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_SHFT 28 | ||
933 | #define UV1H_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000010000000UL | ||
934 | #define UV1H_LB_BAU_MISC_CONTROL_FUN_SHFT 48 | ||
935 | #define UV1H_LB_BAU_MISC_CONTROL_FUN_MASK 0xffff000000000000UL | ||
936 | |||
937 | #define UV2H_LB_BAU_MISC_CONTROL_REJECTION_DELAY_SHFT 0 | ||
938 | #define UV2H_LB_BAU_MISC_CONTROL_REJECTION_DELAY_MASK 0x00000000000000ffUL | ||
939 | #define UV2H_LB_BAU_MISC_CONTROL_APIC_MODE_SHFT 8 | ||
940 | #define UV2H_LB_BAU_MISC_CONTROL_APIC_MODE_MASK 0x0000000000000100UL | ||
941 | #define UV2H_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_SHFT 9 | ||
942 | #define UV2H_LB_BAU_MISC_CONTROL_FORCE_BROADCAST_MASK 0x0000000000000200UL | ||
943 | #define UV2H_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_SHFT 10 | ||
944 | #define UV2H_LB_BAU_MISC_CONTROL_FORCE_LOCK_NOP_MASK 0x0000000000000400UL | ||
945 | #define UV2H_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_SHFT 11 | ||
946 | #define UV2H_LB_BAU_MISC_CONTROL_QPI_AGENT_PRESENCE_VECTOR_MASK 0x0000000000003800UL | ||
947 | #define UV2H_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_SHFT 14 | ||
948 | #define UV2H_LB_BAU_MISC_CONTROL_DESCRIPTOR_FETCH_MODE_MASK 0x0000000000004000UL | ||
949 | #define UV2H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_SHFT 15 | ||
950 | #define UV2H_LB_BAU_MISC_CONTROL_ENABLE_INTD_SOFT_ACK_MODE_MASK 0x0000000000008000UL | ||
951 | #define UV2H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_SHFT 16 | ||
952 | #define UV2H_LB_BAU_MISC_CONTROL_INTD_SOFT_ACK_TIMEOUT_PERIOD_MASK 0x00000000000f0000UL | ||
953 | #define UV2H_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_SHFT 20 | ||
954 | #define UV2H_LB_BAU_MISC_CONTROL_ENABLE_DUAL_MAPPING_MODE_MASK 0x0000000000100000UL | ||
955 | #define UV2H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_SHFT 21 | ||
956 | #define UV2H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_DECODE_ENABLE_MASK 0x0000000000200000UL | ||
957 | #define UV2H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_SHFT 22 | ||
958 | #define UV2H_LB_BAU_MISC_CONTROL_VGA_IO_PORT_16_BIT_DECODE_MASK 0x0000000000400000UL | ||
959 | #define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_SHFT 23 | ||
960 | #define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_DEST_REGISTRATION_MASK 0x0000000000800000UL | ||
961 | #define UV2H_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_SHFT 24 | ||
962 | #define UV2H_LB_BAU_MISC_CONTROL_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000007000000UL | ||
963 | #define UV2H_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_SHFT 27 | ||
964 | #define UV2H_LB_BAU_MISC_CONTROL_USE_INCOMING_PRIORITY_MASK 0x0000000008000000UL | ||
965 | #define UV2H_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_SHFT 28 | ||
966 | #define UV2H_LB_BAU_MISC_CONTROL_ENABLE_PROGRAMMED_INITIAL_PRIORITY_MASK 0x0000000010000000UL | ||
967 | #define UV2H_LB_BAU_MISC_CONTROL_ENABLE_AUTOMATIC_APIC_MODE_SELECTION_SHFT 29 | ||
968 | #define UV2H_LB_BAU_MISC_CONTROL_ENABLE_AUTOMATIC_APIC_MODE_SELECTION_MASK 0x0000000020000000UL | ||
969 | #define UV2H_LB_BAU_MISC_CONTROL_APIC_MODE_STATUS_SHFT 30 | ||
970 | #define UV2H_LB_BAU_MISC_CONTROL_APIC_MODE_STATUS_MASK 0x0000000040000000UL | ||
971 | #define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_INTERRUPTS_TO_SELF_SHFT 31 | ||
972 | #define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_INTERRUPTS_TO_SELF_MASK 0x0000000080000000UL | ||
973 | #define UV2H_LB_BAU_MISC_CONTROL_ENABLE_LOCK_BASED_SYSTEM_FLUSH_SHFT 32 | ||
974 | #define UV2H_LB_BAU_MISC_CONTROL_ENABLE_LOCK_BASED_SYSTEM_FLUSH_MASK 0x0000000100000000UL | ||
975 | #define UV2H_LB_BAU_MISC_CONTROL_ENABLE_EXTENDED_SB_STATUS_SHFT 33 | ||
976 | #define UV2H_LB_BAU_MISC_CONTROL_ENABLE_EXTENDED_SB_STATUS_MASK 0x0000000200000000UL | ||
977 | #define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_INT_PRIO_UDT_TO_SELF_SHFT 34 | ||
978 | #define UV2H_LB_BAU_MISC_CONTROL_SUPPRESS_INT_PRIO_UDT_TO_SELF_MASK 0x0000000400000000UL | ||
979 | #define UV2H_LB_BAU_MISC_CONTROL_USE_LEGACY_DESCRIPTOR_FORMATS_SHFT 35 | ||
980 | #define UV2H_LB_BAU_MISC_CONTROL_USE_LEGACY_DESCRIPTOR_FORMATS_MASK 0x0000000800000000UL | ||
981 | #define UV2H_LB_BAU_MISC_CONTROL_FUN_SHFT 48 | ||
982 | #define UV2H_LB_BAU_MISC_CONTROL_FUN_MASK 0xffff000000000000UL | ||
655 | 983 | ||
656 | union uvh_lb_bau_misc_control_u { | 984 | union uvh_lb_bau_misc_control_u { |
657 | unsigned long v; | 985 | unsigned long v; |
@@ -660,7 +988,25 @@ union uvh_lb_bau_misc_control_u { | |||
660 | unsigned long apic_mode : 1; /* RW */ | 988 | unsigned long apic_mode : 1; /* RW */ |
661 | unsigned long force_broadcast : 1; /* RW */ | 989 | unsigned long force_broadcast : 1; /* RW */ |
662 | unsigned long force_lock_nop : 1; /* RW */ | 990 | unsigned long force_lock_nop : 1; /* RW */ |
663 | unsigned long csi_agent_presence_vector : 3; /* RW */ | 991 | unsigned long qpi_agent_presence_vector : 3; /* RW */ |
992 | unsigned long descriptor_fetch_mode : 1; /* RW */ | ||
993 | unsigned long enable_intd_soft_ack_mode : 1; /* RW */ | ||
994 | unsigned long intd_soft_ack_timeout_period : 4; /* RW */ | ||
995 | unsigned long enable_dual_mapping_mode : 1; /* RW */ | ||
996 | unsigned long vga_io_port_decode_enable : 1; /* RW */ | ||
997 | unsigned long vga_io_port_16_bit_decode : 1; /* RW */ | ||
998 | unsigned long suppress_dest_registration : 1; /* RW */ | ||
999 | unsigned long programmed_initial_priority : 3; /* RW */ | ||
1000 | unsigned long use_incoming_priority : 1; /* RW */ | ||
1001 | unsigned long enable_programmed_initial_priority : 1; /* RW */ | ||
1002 | unsigned long rsvd_29_63 : 35; | ||
1003 | } s; | ||
1004 | struct uv1h_lb_bau_misc_control_s { | ||
1005 | unsigned long rejection_delay : 8; /* RW */ | ||
1006 | unsigned long apic_mode : 1; /* RW */ | ||
1007 | unsigned long force_broadcast : 1; /* RW */ | ||
1008 | unsigned long force_lock_nop : 1; /* RW */ | ||
1009 | unsigned long qpi_agent_presence_vector : 3; /* RW */ | ||
664 | unsigned long descriptor_fetch_mode : 1; /* RW */ | 1010 | unsigned long descriptor_fetch_mode : 1; /* RW */ |
665 | unsigned long enable_intd_soft_ack_mode : 1; /* RW */ | 1011 | unsigned long enable_intd_soft_ack_mode : 1; /* RW */ |
666 | unsigned long intd_soft_ack_timeout_period : 4; /* RW */ | 1012 | unsigned long intd_soft_ack_timeout_period : 4; /* RW */ |
@@ -673,14 +1019,40 @@ union uvh_lb_bau_misc_control_u { | |||
673 | unsigned long enable_programmed_initial_priority : 1; /* RW */ | 1019 | unsigned long enable_programmed_initial_priority : 1; /* RW */ |
674 | unsigned long rsvd_29_47 : 19; /* */ | 1020 | unsigned long rsvd_29_47 : 19; /* */ |
675 | unsigned long fun : 16; /* RW */ | 1021 | unsigned long fun : 16; /* RW */ |
676 | } s; | 1022 | } s1; |
1023 | struct uv2h_lb_bau_misc_control_s { | ||
1024 | unsigned long rejection_delay : 8; /* RW */ | ||
1025 | unsigned long apic_mode : 1; /* RW */ | ||
1026 | unsigned long force_broadcast : 1; /* RW */ | ||
1027 | unsigned long force_lock_nop : 1; /* RW */ | ||
1028 | unsigned long qpi_agent_presence_vector : 3; /* RW */ | ||
1029 | unsigned long descriptor_fetch_mode : 1; /* RW */ | ||
1030 | unsigned long enable_intd_soft_ack_mode : 1; /* RW */ | ||
1031 | unsigned long intd_soft_ack_timeout_period : 4; /* RW */ | ||
1032 | unsigned long enable_dual_mapping_mode : 1; /* RW */ | ||
1033 | unsigned long vga_io_port_decode_enable : 1; /* RW */ | ||
1034 | unsigned long vga_io_port_16_bit_decode : 1; /* RW */ | ||
1035 | unsigned long suppress_dest_registration : 1; /* RW */ | ||
1036 | unsigned long programmed_initial_priority : 3; /* RW */ | ||
1037 | unsigned long use_incoming_priority : 1; /* RW */ | ||
1038 | unsigned long enable_programmed_initial_priority : 1; /* RW */ | ||
1039 | unsigned long enable_automatic_apic_mode_selection : 1; /* RW */ | ||
1040 | unsigned long apic_mode_status : 1; /* RO */ | ||
1041 | unsigned long suppress_interrupts_to_self : 1; /* RW */ | ||
1042 | unsigned long enable_lock_based_system_flush : 1; /* RW */ | ||
1043 | unsigned long enable_extended_sb_status : 1; /* RW */ | ||
1044 | unsigned long suppress_int_prio_udt_to_self : 1; /* RW */ | ||
1045 | unsigned long use_legacy_descriptor_formats : 1; /* RW */ | ||
1046 | unsigned long rsvd_36_47 : 12; /* */ | ||
1047 | unsigned long fun : 16; /* RW */ | ||
1048 | } s2; | ||
677 | }; | 1049 | }; |
678 | 1050 | ||
679 | /* ========================================================================= */ | 1051 | /* ========================================================================= */ |
680 | /* UVH_LB_BAU_SB_ACTIVATION_CONTROL */ | 1052 | /* UVH_LB_BAU_SB_ACTIVATION_CONTROL */ |
681 | /* ========================================================================= */ | 1053 | /* ========================================================================= */ |
682 | #define UVH_LB_BAU_SB_ACTIVATION_CONTROL 0x320020UL | 1054 | #define UVH_LB_BAU_SB_ACTIVATION_CONTROL 0x320020UL |
683 | #define UVH_LB_BAU_SB_ACTIVATION_CONTROL_32 0x009a8 | 1055 | #define UVH_LB_BAU_SB_ACTIVATION_CONTROL_32 0x9a8 |
684 | 1056 | ||
685 | #define UVH_LB_BAU_SB_ACTIVATION_CONTROL_INDEX_SHFT 0 | 1057 | #define UVH_LB_BAU_SB_ACTIVATION_CONTROL_INDEX_SHFT 0 |
686 | #define UVH_LB_BAU_SB_ACTIVATION_CONTROL_INDEX_MASK 0x000000000000003fUL | 1058 | #define UVH_LB_BAU_SB_ACTIVATION_CONTROL_INDEX_MASK 0x000000000000003fUL |
@@ -703,7 +1075,7 @@ union uvh_lb_bau_sb_activation_control_u { | |||
703 | /* UVH_LB_BAU_SB_ACTIVATION_STATUS_0 */ | 1075 | /* UVH_LB_BAU_SB_ACTIVATION_STATUS_0 */ |
704 | /* ========================================================================= */ | 1076 | /* ========================================================================= */ |
705 | #define UVH_LB_BAU_SB_ACTIVATION_STATUS_0 0x320030UL | 1077 | #define UVH_LB_BAU_SB_ACTIVATION_STATUS_0 0x320030UL |
706 | #define UVH_LB_BAU_SB_ACTIVATION_STATUS_0_32 0x009b0 | 1078 | #define UVH_LB_BAU_SB_ACTIVATION_STATUS_0_32 0x9b0 |
707 | 1079 | ||
708 | #define UVH_LB_BAU_SB_ACTIVATION_STATUS_0_STATUS_SHFT 0 | 1080 | #define UVH_LB_BAU_SB_ACTIVATION_STATUS_0_STATUS_SHFT 0 |
709 | #define UVH_LB_BAU_SB_ACTIVATION_STATUS_0_STATUS_MASK 0xffffffffffffffffUL | 1081 | #define UVH_LB_BAU_SB_ACTIVATION_STATUS_0_STATUS_MASK 0xffffffffffffffffUL |
@@ -719,7 +1091,7 @@ union uvh_lb_bau_sb_activation_status_0_u { | |||
719 | /* UVH_LB_BAU_SB_ACTIVATION_STATUS_1 */ | 1091 | /* UVH_LB_BAU_SB_ACTIVATION_STATUS_1 */ |
720 | /* ========================================================================= */ | 1092 | /* ========================================================================= */ |
721 | #define UVH_LB_BAU_SB_ACTIVATION_STATUS_1 0x320040UL | 1093 | #define UVH_LB_BAU_SB_ACTIVATION_STATUS_1 0x320040UL |
722 | #define UVH_LB_BAU_SB_ACTIVATION_STATUS_1_32 0x009b8 | 1094 | #define UVH_LB_BAU_SB_ACTIVATION_STATUS_1_32 0x9b8 |
723 | 1095 | ||
724 | #define UVH_LB_BAU_SB_ACTIVATION_STATUS_1_STATUS_SHFT 0 | 1096 | #define UVH_LB_BAU_SB_ACTIVATION_STATUS_1_STATUS_SHFT 0 |
725 | #define UVH_LB_BAU_SB_ACTIVATION_STATUS_1_STATUS_MASK 0xffffffffffffffffUL | 1097 | #define UVH_LB_BAU_SB_ACTIVATION_STATUS_1_STATUS_MASK 0xffffffffffffffffUL |
@@ -735,7 +1107,7 @@ union uvh_lb_bau_sb_activation_status_1_u { | |||
735 | /* UVH_LB_BAU_SB_DESCRIPTOR_BASE */ | 1107 | /* UVH_LB_BAU_SB_DESCRIPTOR_BASE */ |
736 | /* ========================================================================= */ | 1108 | /* ========================================================================= */ |
737 | #define UVH_LB_BAU_SB_DESCRIPTOR_BASE 0x320010UL | 1109 | #define UVH_LB_BAU_SB_DESCRIPTOR_BASE 0x320010UL |
738 | #define UVH_LB_BAU_SB_DESCRIPTOR_BASE_32 0x009a0 | 1110 | #define UVH_LB_BAU_SB_DESCRIPTOR_BASE_32 0x9a0 |
739 | 1111 | ||
740 | #define UVH_LB_BAU_SB_DESCRIPTOR_BASE_PAGE_ADDRESS_SHFT 12 | 1112 | #define UVH_LB_BAU_SB_DESCRIPTOR_BASE_PAGE_ADDRESS_SHFT 12 |
741 | #define UVH_LB_BAU_SB_DESCRIPTOR_BASE_PAGE_ADDRESS_MASK 0x000007fffffff000UL | 1113 | #define UVH_LB_BAU_SB_DESCRIPTOR_BASE_PAGE_ADDRESS_MASK 0x000007fffffff000UL |
@@ -754,23 +1126,6 @@ union uvh_lb_bau_sb_descriptor_base_u { | |||
754 | }; | 1126 | }; |
755 | 1127 | ||
756 | /* ========================================================================= */ | 1128 | /* ========================================================================= */ |
757 | /* UVH_LB_TARGET_PHYSICAL_APIC_ID_MASK */ | ||
758 | /* ========================================================================= */ | ||
759 | #define UVH_LB_TARGET_PHYSICAL_APIC_ID_MASK 0x320130UL | ||
760 | #define UVH_LB_TARGET_PHYSICAL_APIC_ID_MASK_32 0x009f0 | ||
761 | |||
762 | #define UVH_LB_TARGET_PHYSICAL_APIC_ID_MASK_BIT_ENABLES_SHFT 0 | ||
763 | #define UVH_LB_TARGET_PHYSICAL_APIC_ID_MASK_BIT_ENABLES_MASK 0x00000000ffffffffUL | ||
764 | |||
765 | union uvh_lb_target_physical_apic_id_mask_u { | ||
766 | unsigned long v; | ||
767 | struct uvh_lb_target_physical_apic_id_mask_s { | ||
768 | unsigned long bit_enables : 32; /* RW */ | ||
769 | unsigned long rsvd_32_63 : 32; /* */ | ||
770 | } s; | ||
771 | }; | ||
772 | |||
773 | /* ========================================================================= */ | ||
774 | /* UVH_NODE_ID */ | 1129 | /* UVH_NODE_ID */ |
775 | /* ========================================================================= */ | 1130 | /* ========================================================================= */ |
776 | #define UVH_NODE_ID 0x0UL | 1131 | #define UVH_NODE_ID 0x0UL |
@@ -785,10 +1140,36 @@ union uvh_lb_target_physical_apic_id_mask_u { | |||
785 | #define UVH_NODE_ID_REVISION_MASK 0x00000000f0000000UL | 1140 | #define UVH_NODE_ID_REVISION_MASK 0x00000000f0000000UL |
786 | #define UVH_NODE_ID_NODE_ID_SHFT 32 | 1141 | #define UVH_NODE_ID_NODE_ID_SHFT 32 |
787 | #define UVH_NODE_ID_NODE_ID_MASK 0x00007fff00000000UL | 1142 | #define UVH_NODE_ID_NODE_ID_MASK 0x00007fff00000000UL |
788 | #define UVH_NODE_ID_NODES_PER_BIT_SHFT 48 | 1143 | |
789 | #define UVH_NODE_ID_NODES_PER_BIT_MASK 0x007f000000000000UL | 1144 | #define UV1H_NODE_ID_FORCE1_SHFT 0 |
790 | #define UVH_NODE_ID_NI_PORT_SHFT 56 | 1145 | #define UV1H_NODE_ID_FORCE1_MASK 0x0000000000000001UL |
791 | #define UVH_NODE_ID_NI_PORT_MASK 0x0f00000000000000UL | 1146 | #define UV1H_NODE_ID_MANUFACTURER_SHFT 1 |
1147 | #define UV1H_NODE_ID_MANUFACTURER_MASK 0x0000000000000ffeUL | ||
1148 | #define UV1H_NODE_ID_PART_NUMBER_SHFT 12 | ||
1149 | #define UV1H_NODE_ID_PART_NUMBER_MASK 0x000000000ffff000UL | ||
1150 | #define UV1H_NODE_ID_REVISION_SHFT 28 | ||
1151 | #define UV1H_NODE_ID_REVISION_MASK 0x00000000f0000000UL | ||
1152 | #define UV1H_NODE_ID_NODE_ID_SHFT 32 | ||
1153 | #define UV1H_NODE_ID_NODE_ID_MASK 0x00007fff00000000UL | ||
1154 | #define UV1H_NODE_ID_NODES_PER_BIT_SHFT 48 | ||
1155 | #define UV1H_NODE_ID_NODES_PER_BIT_MASK 0x007f000000000000UL | ||
1156 | #define UV1H_NODE_ID_NI_PORT_SHFT 56 | ||
1157 | #define UV1H_NODE_ID_NI_PORT_MASK 0x0f00000000000000UL | ||
1158 | |||
1159 | #define UV2H_NODE_ID_FORCE1_SHFT 0 | ||
1160 | #define UV2H_NODE_ID_FORCE1_MASK 0x0000000000000001UL | ||
1161 | #define UV2H_NODE_ID_MANUFACTURER_SHFT 1 | ||
1162 | #define UV2H_NODE_ID_MANUFACTURER_MASK 0x0000000000000ffeUL | ||
1163 | #define UV2H_NODE_ID_PART_NUMBER_SHFT 12 | ||
1164 | #define UV2H_NODE_ID_PART_NUMBER_MASK 0x000000000ffff000UL | ||
1165 | #define UV2H_NODE_ID_REVISION_SHFT 28 | ||
1166 | #define UV2H_NODE_ID_REVISION_MASK 0x00000000f0000000UL | ||
1167 | #define UV2H_NODE_ID_NODE_ID_SHFT 32 | ||
1168 | #define UV2H_NODE_ID_NODE_ID_MASK 0x00007fff00000000UL | ||
1169 | #define UV2H_NODE_ID_NODES_PER_BIT_SHFT 50 | ||
1170 | #define UV2H_NODE_ID_NODES_PER_BIT_MASK 0x01fc000000000000UL | ||
1171 | #define UV2H_NODE_ID_NI_PORT_SHFT 57 | ||
1172 | #define UV2H_NODE_ID_NI_PORT_MASK 0x3e00000000000000UL | ||
792 | 1173 | ||
793 | union uvh_node_id_u { | 1174 | union uvh_node_id_u { |
794 | unsigned long v; | 1175 | unsigned long v; |
@@ -798,12 +1179,31 @@ union uvh_node_id_u { | |||
798 | unsigned long part_number : 16; /* RO */ | 1179 | unsigned long part_number : 16; /* RO */ |
799 | unsigned long revision : 4; /* RO */ | 1180 | unsigned long revision : 4; /* RO */ |
800 | unsigned long node_id : 15; /* RW */ | 1181 | unsigned long node_id : 15; /* RW */ |
1182 | unsigned long rsvd_47_63 : 17; | ||
1183 | } s; | ||
1184 | struct uv1h_node_id_s { | ||
1185 | unsigned long force1 : 1; /* RO */ | ||
1186 | unsigned long manufacturer : 11; /* RO */ | ||
1187 | unsigned long part_number : 16; /* RO */ | ||
1188 | unsigned long revision : 4; /* RO */ | ||
1189 | unsigned long node_id : 15; /* RW */ | ||
801 | unsigned long rsvd_47 : 1; /* */ | 1190 | unsigned long rsvd_47 : 1; /* */ |
802 | unsigned long nodes_per_bit : 7; /* RW */ | 1191 | unsigned long nodes_per_bit : 7; /* RW */ |
803 | unsigned long rsvd_55 : 1; /* */ | 1192 | unsigned long rsvd_55 : 1; /* */ |
804 | unsigned long ni_port : 4; /* RO */ | 1193 | unsigned long ni_port : 4; /* RO */ |
805 | unsigned long rsvd_60_63 : 4; /* */ | 1194 | unsigned long rsvd_60_63 : 4; /* */ |
806 | } s; | 1195 | } s1; |
1196 | struct uv2h_node_id_s { | ||
1197 | unsigned long force1 : 1; /* RO */ | ||
1198 | unsigned long manufacturer : 11; /* RO */ | ||
1199 | unsigned long part_number : 16; /* RO */ | ||
1200 | unsigned long revision : 4; /* RO */ | ||
1201 | unsigned long node_id : 15; /* RW */ | ||
1202 | unsigned long rsvd_47_49 : 3; /* */ | ||
1203 | unsigned long nodes_per_bit : 7; /* RO */ | ||
1204 | unsigned long ni_port : 5; /* RO */ | ||
1205 | unsigned long rsvd_62_63 : 2; /* */ | ||
1206 | } s2; | ||
807 | }; | 1207 | }; |
808 | 1208 | ||
809 | /* ========================================================================= */ | 1209 | /* ========================================================================= */ |
@@ -954,18 +1354,38 @@ union uvh_rh_gam_alias210_redirect_config_2_mmr_u { | |||
954 | #define UVH_RH_GAM_CONFIG_MMR_M_SKT_MASK 0x000000000000003fUL | 1354 | #define UVH_RH_GAM_CONFIG_MMR_M_SKT_MASK 0x000000000000003fUL |
955 | #define UVH_RH_GAM_CONFIG_MMR_N_SKT_SHFT 6 | 1355 | #define UVH_RH_GAM_CONFIG_MMR_N_SKT_SHFT 6 |
956 | #define UVH_RH_GAM_CONFIG_MMR_N_SKT_MASK 0x00000000000003c0UL | 1356 | #define UVH_RH_GAM_CONFIG_MMR_N_SKT_MASK 0x00000000000003c0UL |
957 | #define UVH_RH_GAM_CONFIG_MMR_MMIOL_CFG_SHFT 12 | 1357 | |
958 | #define UVH_RH_GAM_CONFIG_MMR_MMIOL_CFG_MASK 0x0000000000001000UL | 1358 | #define UV1H_RH_GAM_CONFIG_MMR_M_SKT_SHFT 0 |
1359 | #define UV1H_RH_GAM_CONFIG_MMR_M_SKT_MASK 0x000000000000003fUL | ||
1360 | #define UV1H_RH_GAM_CONFIG_MMR_N_SKT_SHFT 6 | ||
1361 | #define UV1H_RH_GAM_CONFIG_MMR_N_SKT_MASK 0x00000000000003c0UL | ||
1362 | #define UV1H_RH_GAM_CONFIG_MMR_MMIOL_CFG_SHFT 12 | ||
1363 | #define UV1H_RH_GAM_CONFIG_MMR_MMIOL_CFG_MASK 0x0000000000001000UL | ||
1364 | |||
1365 | #define UV2H_RH_GAM_CONFIG_MMR_M_SKT_SHFT 0 | ||
1366 | #define UV2H_RH_GAM_CONFIG_MMR_M_SKT_MASK 0x000000000000003fUL | ||
1367 | #define UV2H_RH_GAM_CONFIG_MMR_N_SKT_SHFT 6 | ||
1368 | #define UV2H_RH_GAM_CONFIG_MMR_N_SKT_MASK 0x00000000000003c0UL | ||
959 | 1369 | ||
960 | union uvh_rh_gam_config_mmr_u { | 1370 | union uvh_rh_gam_config_mmr_u { |
961 | unsigned long v; | 1371 | unsigned long v; |
962 | struct uvh_rh_gam_config_mmr_s { | 1372 | struct uvh_rh_gam_config_mmr_s { |
963 | unsigned long m_skt : 6; /* RW */ | 1373 | unsigned long m_skt : 6; /* RW */ |
964 | unsigned long n_skt : 4; /* RW */ | 1374 | unsigned long n_skt : 4; /* RW */ |
1375 | unsigned long rsvd_10_63 : 54; | ||
1376 | } s; | ||
1377 | struct uv1h_rh_gam_config_mmr_s { | ||
1378 | unsigned long m_skt : 6; /* RW */ | ||
1379 | unsigned long n_skt : 4; /* RW */ | ||
965 | unsigned long rsvd_10_11: 2; /* */ | 1380 | unsigned long rsvd_10_11: 2; /* */ |
966 | unsigned long mmiol_cfg : 1; /* RW */ | 1381 | unsigned long mmiol_cfg : 1; /* RW */ |
967 | unsigned long rsvd_13_63: 51; /* */ | 1382 | unsigned long rsvd_13_63: 51; /* */ |
968 | } s; | 1383 | } s1; |
1384 | struct uv2h_rh_gam_config_mmr_s { | ||
1385 | unsigned long m_skt : 6; /* RW */ | ||
1386 | unsigned long n_skt : 4; /* RW */ | ||
1387 | unsigned long rsvd_10_63: 54; /* */ | ||
1388 | } s2; | ||
969 | }; | 1389 | }; |
970 | 1390 | ||
971 | /* ========================================================================= */ | 1391 | /* ========================================================================= */ |
@@ -975,25 +1395,49 @@ union uvh_rh_gam_config_mmr_u { | |||
975 | 1395 | ||
976 | #define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT 28 | 1396 | #define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT 28 |
977 | #define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffff0000000UL | 1397 | #define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffff0000000UL |
978 | #define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_GR4_SHFT 48 | 1398 | |
979 | #define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_GR4_MASK 0x0001000000000000UL | 1399 | #define UV1H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT 28 |
980 | #define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_SHFT 52 | 1400 | #define UV1H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffff0000000UL |
981 | #define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_MASK 0x00f0000000000000UL | 1401 | #define UV1H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_GR4_SHFT 48 |
982 | #define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63 | 1402 | #define UV1H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_GR4_MASK 0x0001000000000000UL |
983 | #define UVH_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL | 1403 | #define UV1H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_SHFT 52 |
1404 | #define UV1H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_MASK 0x00f0000000000000UL | ||
1405 | #define UV1H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63 | ||
1406 | #define UV1H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL | ||
1407 | |||
1408 | #define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_SHFT 28 | ||
1409 | #define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffff0000000UL | ||
1410 | #define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_SHFT 52 | ||
1411 | #define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_N_GRU_MASK 0x00f0000000000000UL | ||
1412 | #define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63 | ||
1413 | #define UV2H_RH_GAM_GRU_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL | ||
984 | 1414 | ||
985 | union uvh_rh_gam_gru_overlay_config_mmr_u { | 1415 | union uvh_rh_gam_gru_overlay_config_mmr_u { |
986 | unsigned long v; | 1416 | unsigned long v; |
987 | struct uvh_rh_gam_gru_overlay_config_mmr_s { | 1417 | struct uvh_rh_gam_gru_overlay_config_mmr_s { |
988 | unsigned long rsvd_0_27: 28; /* */ | 1418 | unsigned long rsvd_0_27: 28; /* */ |
989 | unsigned long base : 18; /* RW */ | 1419 | unsigned long base : 18; /* RW */ |
1420 | unsigned long rsvd_46_62 : 17; | ||
1421 | unsigned long enable : 1; /* RW */ | ||
1422 | } s; | ||
1423 | struct uv1h_rh_gam_gru_overlay_config_mmr_s { | ||
1424 | unsigned long rsvd_0_27: 28; /* */ | ||
1425 | unsigned long base : 18; /* RW */ | ||
990 | unsigned long rsvd_46_47: 2; /* */ | 1426 | unsigned long rsvd_46_47: 2; /* */ |
991 | unsigned long gr4 : 1; /* RW */ | 1427 | unsigned long gr4 : 1; /* RW */ |
992 | unsigned long rsvd_49_51: 3; /* */ | 1428 | unsigned long rsvd_49_51: 3; /* */ |
993 | unsigned long n_gru : 4; /* RW */ | 1429 | unsigned long n_gru : 4; /* RW */ |
994 | unsigned long rsvd_56_62: 7; /* */ | 1430 | unsigned long rsvd_56_62: 7; /* */ |
995 | unsigned long enable : 1; /* RW */ | 1431 | unsigned long enable : 1; /* RW */ |
996 | } s; | 1432 | } s1; |
1433 | struct uv2h_rh_gam_gru_overlay_config_mmr_s { | ||
1434 | unsigned long rsvd_0_27: 28; /* */ | ||
1435 | unsigned long base : 18; /* RW */ | ||
1436 | unsigned long rsvd_46_51: 6; /* */ | ||
1437 | unsigned long n_gru : 4; /* RW */ | ||
1438 | unsigned long rsvd_56_62: 7; /* */ | ||
1439 | unsigned long enable : 1; /* RW */ | ||
1440 | } s2; | ||
997 | }; | 1441 | }; |
998 | 1442 | ||
999 | /* ========================================================================= */ | 1443 | /* ========================================================================= */ |
@@ -1001,25 +1445,42 @@ union uvh_rh_gam_gru_overlay_config_mmr_u { | |||
1001 | /* ========================================================================= */ | 1445 | /* ========================================================================= */ |
1002 | #define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR 0x1600030UL | 1446 | #define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR 0x1600030UL |
1003 | 1447 | ||
1004 | #define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_SHFT 30 | 1448 | #define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_SHFT 30 |
1005 | #define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003fffc0000000UL | 1449 | #define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003fffc0000000UL |
1006 | #define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_M_IO_SHFT 46 | 1450 | #define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_M_IO_SHFT 46 |
1007 | #define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_M_IO_MASK 0x000fc00000000000UL | 1451 | #define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_M_IO_MASK 0x000fc00000000000UL |
1008 | #define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_N_IO_SHFT 52 | 1452 | #define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_N_IO_SHFT 52 |
1009 | #define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_N_IO_MASK 0x00f0000000000000UL | 1453 | #define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_N_IO_MASK 0x00f0000000000000UL |
1010 | #define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63 | 1454 | #define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63 |
1011 | #define UVH_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL | 1455 | #define UV1H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL |
1456 | |||
1457 | #define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_SHFT 27 | ||
1458 | #define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffff8000000UL | ||
1459 | #define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_M_IO_SHFT 46 | ||
1460 | #define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_M_IO_MASK 0x000fc00000000000UL | ||
1461 | #define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_N_IO_SHFT 52 | ||
1462 | #define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_N_IO_MASK 0x00f0000000000000UL | ||
1463 | #define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63 | ||
1464 | #define UV2H_RH_GAM_MMIOH_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL | ||
1012 | 1465 | ||
1013 | union uvh_rh_gam_mmioh_overlay_config_mmr_u { | 1466 | union uvh_rh_gam_mmioh_overlay_config_mmr_u { |
1014 | unsigned long v; | 1467 | unsigned long v; |
1015 | struct uvh_rh_gam_mmioh_overlay_config_mmr_s { | 1468 | struct uv1h_rh_gam_mmioh_overlay_config_mmr_s { |
1016 | unsigned long rsvd_0_29: 30; /* */ | 1469 | unsigned long rsvd_0_29: 30; /* */ |
1017 | unsigned long base : 16; /* RW */ | 1470 | unsigned long base : 16; /* RW */ |
1018 | unsigned long m_io : 6; /* RW */ | 1471 | unsigned long m_io : 6; /* RW */ |
1019 | unsigned long n_io : 4; /* RW */ | 1472 | unsigned long n_io : 4; /* RW */ |
1020 | unsigned long rsvd_56_62: 7; /* */ | 1473 | unsigned long rsvd_56_62: 7; /* */ |
1021 | unsigned long enable : 1; /* RW */ | 1474 | unsigned long enable : 1; /* RW */ |
1022 | } s; | 1475 | } s1; |
1476 | struct uv2h_rh_gam_mmioh_overlay_config_mmr_s { | ||
1477 | unsigned long rsvd_0_26: 27; /* */ | ||
1478 | unsigned long base : 19; /* RW */ | ||
1479 | unsigned long m_io : 6; /* RW */ | ||
1480 | unsigned long n_io : 4; /* RW */ | ||
1481 | unsigned long rsvd_56_62: 7; /* */ | ||
1482 | unsigned long enable : 1; /* RW */ | ||
1483 | } s2; | ||
1023 | }; | 1484 | }; |
1024 | 1485 | ||
1025 | /* ========================================================================= */ | 1486 | /* ========================================================================= */ |
@@ -1029,20 +1490,40 @@ union uvh_rh_gam_mmioh_overlay_config_mmr_u { | |||
1029 | 1490 | ||
1030 | #define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT 26 | 1491 | #define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT 26 |
1031 | #define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffffc000000UL | 1492 | #define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffffc000000UL |
1032 | #define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_DUAL_HUB_SHFT 46 | 1493 | |
1033 | #define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_DUAL_HUB_MASK 0x0000400000000000UL | 1494 | #define UV1H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT 26 |
1034 | #define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63 | 1495 | #define UV1H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffffc000000UL |
1035 | #define UVH_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL | 1496 | #define UV1H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_DUAL_HUB_SHFT 46 |
1497 | #define UV1H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_DUAL_HUB_MASK 0x0000400000000000UL | ||
1498 | #define UV1H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63 | ||
1499 | #define UV1H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL | ||
1500 | |||
1501 | #define UV2H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_SHFT 26 | ||
1502 | #define UV2H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_BASE_MASK 0x00003ffffc000000UL | ||
1503 | #define UV2H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_SHFT 63 | ||
1504 | #define UV2H_RH_GAM_MMR_OVERLAY_CONFIG_MMR_ENABLE_MASK 0x8000000000000000UL | ||
1036 | 1505 | ||
1037 | union uvh_rh_gam_mmr_overlay_config_mmr_u { | 1506 | union uvh_rh_gam_mmr_overlay_config_mmr_u { |
1038 | unsigned long v; | 1507 | unsigned long v; |
1039 | struct uvh_rh_gam_mmr_overlay_config_mmr_s { | 1508 | struct uvh_rh_gam_mmr_overlay_config_mmr_s { |
1040 | unsigned long rsvd_0_25: 26; /* */ | 1509 | unsigned long rsvd_0_25: 26; /* */ |
1041 | unsigned long base : 20; /* RW */ | 1510 | unsigned long base : 20; /* RW */ |
1511 | unsigned long rsvd_46_62 : 17; | ||
1512 | unsigned long enable : 1; /* RW */ | ||
1513 | } s; | ||
1514 | struct uv1h_rh_gam_mmr_overlay_config_mmr_s { | ||
1515 | unsigned long rsvd_0_25: 26; /* */ | ||
1516 | unsigned long base : 20; /* RW */ | ||
1042 | unsigned long dual_hub : 1; /* RW */ | 1517 | unsigned long dual_hub : 1; /* RW */ |
1043 | unsigned long rsvd_47_62: 16; /* */ | 1518 | unsigned long rsvd_47_62: 16; /* */ |
1044 | unsigned long enable : 1; /* RW */ | 1519 | unsigned long enable : 1; /* RW */ |
1045 | } s; | 1520 | } s1; |
1521 | struct uv2h_rh_gam_mmr_overlay_config_mmr_s { | ||
1522 | unsigned long rsvd_0_25: 26; /* */ | ||
1523 | unsigned long base : 20; /* RW */ | ||
1524 | unsigned long rsvd_46_62: 17; /* */ | ||
1525 | unsigned long enable : 1; /* RW */ | ||
1526 | } s2; | ||
1046 | }; | 1527 | }; |
1047 | 1528 | ||
1048 | /* ========================================================================= */ | 1529 | /* ========================================================================= */ |
@@ -1103,10 +1584,11 @@ union uvh_rtc1_int_config_u { | |||
1103 | /* UVH_SCRATCH5 */ | 1584 | /* UVH_SCRATCH5 */ |
1104 | /* ========================================================================= */ | 1585 | /* ========================================================================= */ |
1105 | #define UVH_SCRATCH5 0x2d0200UL | 1586 | #define UVH_SCRATCH5 0x2d0200UL |
1106 | #define UVH_SCRATCH5_32 0x00778 | 1587 | #define UVH_SCRATCH5_32 0x778 |
1107 | 1588 | ||
1108 | #define UVH_SCRATCH5_SCRATCH5_SHFT 0 | 1589 | #define UVH_SCRATCH5_SCRATCH5_SHFT 0 |
1109 | #define UVH_SCRATCH5_SCRATCH5_MASK 0xffffffffffffffffUL | 1590 | #define UVH_SCRATCH5_SCRATCH5_MASK 0xffffffffffffffffUL |
1591 | |||
1110 | union uvh_scratch5_u { | 1592 | union uvh_scratch5_u { |
1111 | unsigned long v; | 1593 | unsigned long v; |
1112 | struct uvh_scratch5_s { | 1594 | struct uvh_scratch5_s { |
@@ -1114,4 +1596,154 @@ union uvh_scratch5_u { | |||
1114 | } s; | 1596 | } s; |
1115 | }; | 1597 | }; |
1116 | 1598 | ||
1599 | /* ========================================================================= */ | ||
1600 | /* UV2H_EVENT_OCCURRED2 */ | ||
1601 | /* ========================================================================= */ | ||
1602 | #define UV2H_EVENT_OCCURRED2 0x70100UL | ||
1603 | #define UV2H_EVENT_OCCURRED2_32 0xb68 | ||
1604 | |||
1605 | #define UV2H_EVENT_OCCURRED2_RTC_0_SHFT 0 | ||
1606 | #define UV2H_EVENT_OCCURRED2_RTC_0_MASK 0x0000000000000001UL | ||
1607 | #define UV2H_EVENT_OCCURRED2_RTC_1_SHFT 1 | ||
1608 | #define UV2H_EVENT_OCCURRED2_RTC_1_MASK 0x0000000000000002UL | ||
1609 | #define UV2H_EVENT_OCCURRED2_RTC_2_SHFT 2 | ||
1610 | #define UV2H_EVENT_OCCURRED2_RTC_2_MASK 0x0000000000000004UL | ||
1611 | #define UV2H_EVENT_OCCURRED2_RTC_3_SHFT 3 | ||
1612 | #define UV2H_EVENT_OCCURRED2_RTC_3_MASK 0x0000000000000008UL | ||
1613 | #define UV2H_EVENT_OCCURRED2_RTC_4_SHFT 4 | ||
1614 | #define UV2H_EVENT_OCCURRED2_RTC_4_MASK 0x0000000000000010UL | ||
1615 | #define UV2H_EVENT_OCCURRED2_RTC_5_SHFT 5 | ||
1616 | #define UV2H_EVENT_OCCURRED2_RTC_5_MASK 0x0000000000000020UL | ||
1617 | #define UV2H_EVENT_OCCURRED2_RTC_6_SHFT 6 | ||
1618 | #define UV2H_EVENT_OCCURRED2_RTC_6_MASK 0x0000000000000040UL | ||
1619 | #define UV2H_EVENT_OCCURRED2_RTC_7_SHFT 7 | ||
1620 | #define UV2H_EVENT_OCCURRED2_RTC_7_MASK 0x0000000000000080UL | ||
1621 | #define UV2H_EVENT_OCCURRED2_RTC_8_SHFT 8 | ||
1622 | #define UV2H_EVENT_OCCURRED2_RTC_8_MASK 0x0000000000000100UL | ||
1623 | #define UV2H_EVENT_OCCURRED2_RTC_9_SHFT 9 | ||
1624 | #define UV2H_EVENT_OCCURRED2_RTC_9_MASK 0x0000000000000200UL | ||
1625 | #define UV2H_EVENT_OCCURRED2_RTC_10_SHFT 10 | ||
1626 | #define UV2H_EVENT_OCCURRED2_RTC_10_MASK 0x0000000000000400UL | ||
1627 | #define UV2H_EVENT_OCCURRED2_RTC_11_SHFT 11 | ||
1628 | #define UV2H_EVENT_OCCURRED2_RTC_11_MASK 0x0000000000000800UL | ||
1629 | #define UV2H_EVENT_OCCURRED2_RTC_12_SHFT 12 | ||
1630 | #define UV2H_EVENT_OCCURRED2_RTC_12_MASK 0x0000000000001000UL | ||
1631 | #define UV2H_EVENT_OCCURRED2_RTC_13_SHFT 13 | ||
1632 | #define UV2H_EVENT_OCCURRED2_RTC_13_MASK 0x0000000000002000UL | ||
1633 | #define UV2H_EVENT_OCCURRED2_RTC_14_SHFT 14 | ||
1634 | #define UV2H_EVENT_OCCURRED2_RTC_14_MASK 0x0000000000004000UL | ||
1635 | #define UV2H_EVENT_OCCURRED2_RTC_15_SHFT 15 | ||
1636 | #define UV2H_EVENT_OCCURRED2_RTC_15_MASK 0x0000000000008000UL | ||
1637 | #define UV2H_EVENT_OCCURRED2_RTC_16_SHFT 16 | ||
1638 | #define UV2H_EVENT_OCCURRED2_RTC_16_MASK 0x0000000000010000UL | ||
1639 | #define UV2H_EVENT_OCCURRED2_RTC_17_SHFT 17 | ||
1640 | #define UV2H_EVENT_OCCURRED2_RTC_17_MASK 0x0000000000020000UL | ||
1641 | #define UV2H_EVENT_OCCURRED2_RTC_18_SHFT 18 | ||
1642 | #define UV2H_EVENT_OCCURRED2_RTC_18_MASK 0x0000000000040000UL | ||
1643 | #define UV2H_EVENT_OCCURRED2_RTC_19_SHFT 19 | ||
1644 | #define UV2H_EVENT_OCCURRED2_RTC_19_MASK 0x0000000000080000UL | ||
1645 | #define UV2H_EVENT_OCCURRED2_RTC_20_SHFT 20 | ||
1646 | #define UV2H_EVENT_OCCURRED2_RTC_20_MASK 0x0000000000100000UL | ||
1647 | #define UV2H_EVENT_OCCURRED2_RTC_21_SHFT 21 | ||
1648 | #define UV2H_EVENT_OCCURRED2_RTC_21_MASK 0x0000000000200000UL | ||
1649 | #define UV2H_EVENT_OCCURRED2_RTC_22_SHFT 22 | ||
1650 | #define UV2H_EVENT_OCCURRED2_RTC_22_MASK 0x0000000000400000UL | ||
1651 | #define UV2H_EVENT_OCCURRED2_RTC_23_SHFT 23 | ||
1652 | #define UV2H_EVENT_OCCURRED2_RTC_23_MASK 0x0000000000800000UL | ||
1653 | #define UV2H_EVENT_OCCURRED2_RTC_24_SHFT 24 | ||
1654 | #define UV2H_EVENT_OCCURRED2_RTC_24_MASK 0x0000000001000000UL | ||
1655 | #define UV2H_EVENT_OCCURRED2_RTC_25_SHFT 25 | ||
1656 | #define UV2H_EVENT_OCCURRED2_RTC_25_MASK 0x0000000002000000UL | ||
1657 | #define UV2H_EVENT_OCCURRED2_RTC_26_SHFT 26 | ||
1658 | #define UV2H_EVENT_OCCURRED2_RTC_26_MASK 0x0000000004000000UL | ||
1659 | #define UV2H_EVENT_OCCURRED2_RTC_27_SHFT 27 | ||
1660 | #define UV2H_EVENT_OCCURRED2_RTC_27_MASK 0x0000000008000000UL | ||
1661 | #define UV2H_EVENT_OCCURRED2_RTC_28_SHFT 28 | ||
1662 | #define UV2H_EVENT_OCCURRED2_RTC_28_MASK 0x0000000010000000UL | ||
1663 | #define UV2H_EVENT_OCCURRED2_RTC_29_SHFT 29 | ||
1664 | #define UV2H_EVENT_OCCURRED2_RTC_29_MASK 0x0000000020000000UL | ||
1665 | #define UV2H_EVENT_OCCURRED2_RTC_30_SHFT 30 | ||
1666 | #define UV2H_EVENT_OCCURRED2_RTC_30_MASK 0x0000000040000000UL | ||
1667 | #define UV2H_EVENT_OCCURRED2_RTC_31_SHFT 31 | ||
1668 | #define UV2H_EVENT_OCCURRED2_RTC_31_MASK 0x0000000080000000UL | ||
1669 | |||
1670 | union uv2h_event_occurred2_u { | ||
1671 | unsigned long v; | ||
1672 | struct uv2h_event_occurred2_s { | ||
1673 | unsigned long rtc_0 : 1; /* RW */ | ||
1674 | unsigned long rtc_1 : 1; /* RW */ | ||
1675 | unsigned long rtc_2 : 1; /* RW */ | ||
1676 | unsigned long rtc_3 : 1; /* RW */ | ||
1677 | unsigned long rtc_4 : 1; /* RW */ | ||
1678 | unsigned long rtc_5 : 1; /* RW */ | ||
1679 | unsigned long rtc_6 : 1; /* RW */ | ||
1680 | unsigned long rtc_7 : 1; /* RW */ | ||
1681 | unsigned long rtc_8 : 1; /* RW */ | ||
1682 | unsigned long rtc_9 : 1; /* RW */ | ||
1683 | unsigned long rtc_10 : 1; /* RW */ | ||
1684 | unsigned long rtc_11 : 1; /* RW */ | ||
1685 | unsigned long rtc_12 : 1; /* RW */ | ||
1686 | unsigned long rtc_13 : 1; /* RW */ | ||
1687 | unsigned long rtc_14 : 1; /* RW */ | ||
1688 | unsigned long rtc_15 : 1; /* RW */ | ||
1689 | unsigned long rtc_16 : 1; /* RW */ | ||
1690 | unsigned long rtc_17 : 1; /* RW */ | ||
1691 | unsigned long rtc_18 : 1; /* RW */ | ||
1692 | unsigned long rtc_19 : 1; /* RW */ | ||
1693 | unsigned long rtc_20 : 1; /* RW */ | ||
1694 | unsigned long rtc_21 : 1; /* RW */ | ||
1695 | unsigned long rtc_22 : 1; /* RW */ | ||
1696 | unsigned long rtc_23 : 1; /* RW */ | ||
1697 | unsigned long rtc_24 : 1; /* RW */ | ||
1698 | unsigned long rtc_25 : 1; /* RW */ | ||
1699 | unsigned long rtc_26 : 1; /* RW */ | ||
1700 | unsigned long rtc_27 : 1; /* RW */ | ||
1701 | unsigned long rtc_28 : 1; /* RW */ | ||
1702 | unsigned long rtc_29 : 1; /* RW */ | ||
1703 | unsigned long rtc_30 : 1; /* RW */ | ||
1704 | unsigned long rtc_31 : 1; /* RW */ | ||
1705 | unsigned long rsvd_32_63: 32; /* */ | ||
1706 | } s1; | ||
1707 | }; | ||
1708 | |||
1709 | /* ========================================================================= */ | ||
1710 | /* UV2H_EVENT_OCCURRED2_ALIAS */ | ||
1711 | /* ========================================================================= */ | ||
1712 | #define UV2H_EVENT_OCCURRED2_ALIAS 0x70108UL | ||
1713 | #define UV2H_EVENT_OCCURRED2_ALIAS_32 0xb70 | ||
1714 | |||
1715 | /* ========================================================================= */ | ||
1716 | /* UV2H_LB_BAU_SB_ACTIVATION_STATUS_2 */ | ||
1717 | /* ========================================================================= */ | ||
1718 | #define UV2H_LB_BAU_SB_ACTIVATION_STATUS_2 0x320130UL | ||
1719 | #define UV2H_LB_BAU_SB_ACTIVATION_STATUS_2_32 0x9f0 | ||
1720 | |||
1721 | #define UV2H_LB_BAU_SB_ACTIVATION_STATUS_2_AUX_ERROR_SHFT 0 | ||
1722 | #define UV2H_LB_BAU_SB_ACTIVATION_STATUS_2_AUX_ERROR_MASK 0xffffffffffffffffUL | ||
1723 | |||
1724 | union uv2h_lb_bau_sb_activation_status_2_u { | ||
1725 | unsigned long v; | ||
1726 | struct uv2h_lb_bau_sb_activation_status_2_s { | ||
1727 | unsigned long aux_error : 64; /* RW */ | ||
1728 | } s1; | ||
1729 | }; | ||
1730 | |||
1731 | /* ========================================================================= */ | ||
1732 | /* UV1H_LB_TARGET_PHYSICAL_APIC_ID_MASK */ | ||
1733 | /* ========================================================================= */ | ||
1734 | #define UV1H_LB_TARGET_PHYSICAL_APIC_ID_MASK 0x320130UL | ||
1735 | #define UV1H_LB_TARGET_PHYSICAL_APIC_ID_MASK_32 0x9f0 | ||
1736 | |||
1737 | #define UV1H_LB_TARGET_PHYSICAL_APIC_ID_MASK_BIT_ENABLES_SHFT 0 | ||
1738 | #define UV1H_LB_TARGET_PHYSICAL_APIC_ID_MASK_BIT_ENABLES_MASK 0x00000000ffffffffUL | ||
1739 | |||
1740 | union uv1h_lb_target_physical_apic_id_mask_u { | ||
1741 | unsigned long v; | ||
1742 | struct uv1h_lb_target_physical_apic_id_mask_s { | ||
1743 | unsigned long bit_enables : 32; /* RW */ | ||
1744 | unsigned long rsvd_32_63 : 32; /* */ | ||
1745 | } s1; | ||
1746 | }; | ||
1747 | |||
1748 | |||
1117 | #endif /* __ASM_UV_MMRS_X86_H__ */ | 1749 | #endif /* __ASM_UV_MMRS_X86_H__ */ |