.. | .. |
---|
9 | 9 | #include <asm/sn/addrs.h> |
---|
10 | 10 | #include <asm/sn/nmi.h> |
---|
11 | 11 | #include <asm/sn/arch.h> |
---|
12 | | -#include <asm/sn/sn0/hub.h> |
---|
| 12 | +#include <asm/sn/agent.h> |
---|
13 | 13 | |
---|
14 | 14 | #if 0 |
---|
15 | 15 | #define NODE_NUM_CPUS(n) CNODE_NUM_CPUS(n) |
---|
.. | .. |
---|
17 | 17 | #define NODE_NUM_CPUS(n) CPUS_PER_NODE |
---|
18 | 18 | #endif |
---|
19 | 19 | |
---|
20 | | -#define CNODEID_NONE (cnodeid_t)-1 |
---|
| 20 | +#define SEND_NMI(_nasid, _slice) \ |
---|
| 21 | + REMOTE_HUB_S((_nasid), (PI_NMI_A + ((_slice) * PI_NMI_OFFSET)), 1) |
---|
21 | 22 | |
---|
22 | 23 | typedef unsigned long machreg_t; |
---|
23 | 24 | |
---|
.. | .. |
---|
62 | 63 | (TO_UNCAC(TO_NODE(nasid, IP27_NMI_KREGS_OFFSET)) + |
---|
63 | 64 | slice * IP27_NMI_KREGS_CPU_SIZE); |
---|
64 | 65 | |
---|
65 | | - printk("NMI nasid %d: slice %d\n", nasid, slice); |
---|
| 66 | + pr_emerg("NMI nasid %d: slice %d\n", nasid, slice); |
---|
66 | 67 | |
---|
67 | 68 | /* |
---|
68 | 69 | * Saved main processor registers |
---|
69 | 70 | */ |
---|
70 | 71 | for (i = 0; i < 32; ) { |
---|
71 | 72 | if ((i % 4) == 0) |
---|
72 | | - printk("$%2d :", i); |
---|
73 | | - printk(" %016lx", nr->gpr[i]); |
---|
| 73 | + pr_emerg("$%2d :", i); |
---|
| 74 | + pr_cont(" %016lx", nr->gpr[i]); |
---|
74 | 75 | |
---|
75 | 76 | i++; |
---|
76 | 77 | if ((i % 4) == 0) |
---|
77 | | - printk("\n"); |
---|
| 78 | + pr_cont("\n"); |
---|
78 | 79 | } |
---|
79 | 80 | |
---|
80 | | - printk("Hi : (value lost)\n"); |
---|
81 | | - printk("Lo : (value lost)\n"); |
---|
| 81 | + pr_emerg("Hi : (value lost)\n"); |
---|
| 82 | + pr_emerg("Lo : (value lost)\n"); |
---|
82 | 83 | |
---|
83 | 84 | /* |
---|
84 | 85 | * Saved cp0 registers |
---|
85 | 86 | */ |
---|
86 | | - printk("epc : %016lx %pS\n", nr->epc, (void *) nr->epc); |
---|
87 | | - printk("%s\n", print_tainted()); |
---|
88 | | - printk("ErrEPC: %016lx %pS\n", nr->error_epc, (void *) nr->error_epc); |
---|
89 | | - printk("ra : %016lx %pS\n", nr->gpr[31], (void *) nr->gpr[31]); |
---|
90 | | - printk("Status: %08lx ", nr->sr); |
---|
| 87 | + pr_emerg("epc : %016lx %pS\n", nr->epc, (void *)nr->epc); |
---|
| 88 | + pr_emerg("%s\n", print_tainted()); |
---|
| 89 | + pr_emerg("ErrEPC: %016lx %pS\n", nr->error_epc, (void *)nr->error_epc); |
---|
| 90 | + pr_emerg("ra : %016lx %pS\n", nr->gpr[31], (void *)nr->gpr[31]); |
---|
| 91 | + pr_emerg("Status: %08lx ", nr->sr); |
---|
91 | 92 | |
---|
92 | 93 | if (nr->sr & ST0_KX) |
---|
93 | | - printk("KX "); |
---|
| 94 | + pr_cont("KX "); |
---|
94 | 95 | if (nr->sr & ST0_SX) |
---|
95 | | - printk("SX "); |
---|
| 96 | + pr_cont("SX "); |
---|
96 | 97 | if (nr->sr & ST0_UX) |
---|
97 | | - printk("UX "); |
---|
| 98 | + pr_cont("UX "); |
---|
98 | 99 | |
---|
99 | 100 | switch (nr->sr & ST0_KSU) { |
---|
100 | 101 | case KSU_USER: |
---|
101 | | - printk("USER "); |
---|
| 102 | + pr_cont("USER "); |
---|
102 | 103 | break; |
---|
103 | 104 | case KSU_SUPERVISOR: |
---|
104 | | - printk("SUPERVISOR "); |
---|
| 105 | + pr_cont("SUPERVISOR "); |
---|
105 | 106 | break; |
---|
106 | 107 | case KSU_KERNEL: |
---|
107 | | - printk("KERNEL "); |
---|
| 108 | + pr_cont("KERNEL "); |
---|
108 | 109 | break; |
---|
109 | 110 | default: |
---|
110 | | - printk("BAD_MODE "); |
---|
| 111 | + pr_cont("BAD_MODE "); |
---|
111 | 112 | break; |
---|
112 | 113 | } |
---|
113 | 114 | |
---|
114 | 115 | if (nr->sr & ST0_ERL) |
---|
115 | | - printk("ERL "); |
---|
| 116 | + pr_cont("ERL "); |
---|
116 | 117 | if (nr->sr & ST0_EXL) |
---|
117 | | - printk("EXL "); |
---|
| 118 | + pr_cont("EXL "); |
---|
118 | 119 | if (nr->sr & ST0_IE) |
---|
119 | | - printk("IE "); |
---|
120 | | - printk("\n"); |
---|
| 120 | + pr_cont("IE "); |
---|
| 121 | + pr_cont("\n"); |
---|
121 | 122 | |
---|
122 | | - printk("Cause : %08lx\n", nr->cause); |
---|
123 | | - printk("PrId : %08x\n", read_c0_prid()); |
---|
124 | | - printk("BadVA : %016lx\n", nr->badva); |
---|
125 | | - printk("CErr : %016lx\n", nr->cache_err); |
---|
126 | | - printk("NMI_SR: %016lx\n", nr->nmi_sr); |
---|
| 123 | + pr_emerg("Cause : %08lx\n", nr->cause); |
---|
| 124 | + pr_emerg("PrId : %08x\n", read_c0_prid()); |
---|
| 125 | + pr_emerg("BadVA : %016lx\n", nr->badva); |
---|
| 126 | + pr_emerg("CErr : %016lx\n", nr->cache_err); |
---|
| 127 | + pr_emerg("NMI_SR: %016lx\n", nr->nmi_sr); |
---|
127 | 128 | |
---|
128 | | - printk("\n"); |
---|
| 129 | + pr_emerg("\n"); |
---|
129 | 130 | } |
---|
130 | 131 | |
---|
131 | 132 | void nmi_dump_hub_irq(nasid_t nasid, int slice) |
---|
132 | 133 | { |
---|
133 | | - hubreg_t mask0, mask1, pend0, pend1; |
---|
| 134 | + u64 mask0, mask1, pend0, pend1; |
---|
134 | 135 | |
---|
135 | 136 | if (slice == 0) { /* Slice A */ |
---|
136 | 137 | mask0 = REMOTE_HUB_L(nasid, PI_INT_MASK0_A); |
---|
.. | .. |
---|
143 | 144 | pend0 = REMOTE_HUB_L(nasid, PI_INT_PEND0); |
---|
144 | 145 | pend1 = REMOTE_HUB_L(nasid, PI_INT_PEND1); |
---|
145 | 146 | |
---|
146 | | - printk("PI_INT_MASK0: %16Lx PI_INT_MASK1: %16Lx\n", mask0, mask1); |
---|
147 | | - printk("PI_INT_PEND0: %16Lx PI_INT_PEND1: %16Lx\n", pend0, pend1); |
---|
148 | | - printk("\n\n"); |
---|
| 147 | + pr_emerg("PI_INT_MASK0: %16llx PI_INT_MASK1: %16llx\n", mask0, mask1); |
---|
| 148 | + pr_emerg("PI_INT_PEND0: %16llx PI_INT_PEND1: %16llx\n", pend0, pend1); |
---|
| 149 | + pr_emerg("\n\n"); |
---|
149 | 150 | } |
---|
150 | 151 | |
---|
151 | 152 | /* |
---|
152 | 153 | * Copy the cpu registers which have been saved in the IP27prom format |
---|
153 | 154 | * into the eframe format for the node under consideration. |
---|
154 | 155 | */ |
---|
155 | | -void nmi_node_eframe_save(cnodeid_t cnode) |
---|
| 156 | +void nmi_node_eframe_save(nasid_t nasid) |
---|
156 | 157 | { |
---|
157 | | - nasid_t nasid; |
---|
158 | 158 | int slice; |
---|
159 | 159 | |
---|
160 | | - /* Make sure that we have a valid node */ |
---|
161 | | - if (cnode == CNODEID_NONE) |
---|
162 | | - return; |
---|
163 | | - |
---|
164 | | - nasid = COMPACT_TO_NASID_NODEID(cnode); |
---|
165 | 160 | if (nasid == INVALID_NASID) |
---|
166 | 161 | return; |
---|
167 | 162 | |
---|
.. | .. |
---|
178 | 173 | void |
---|
179 | 174 | nmi_eframes_save(void) |
---|
180 | 175 | { |
---|
181 | | - cnodeid_t cnode; |
---|
| 176 | + nasid_t nasid; |
---|
182 | 177 | |
---|
183 | | - for_each_online_node(cnode) |
---|
184 | | - nmi_node_eframe_save(cnode); |
---|
| 178 | + for_each_online_node(nasid) |
---|
| 179 | + nmi_node_eframe_save(nasid); |
---|
185 | 180 | } |
---|
186 | 181 | |
---|
187 | 182 | void |
---|