diff options
| -rw-r--r-- | arch/sparc/include/asm/cpudata_64.h | 197 | ||||
| -rw-r--r-- | arch/sparc/include/asm/trap_block.h | 207 |
2 files changed, 208 insertions, 196 deletions
diff --git a/arch/sparc/include/asm/cpudata_64.h b/arch/sparc/include/asm/cpudata_64.h index c58d87b3314f..926397d345ff 100644 --- a/arch/sparc/include/asm/cpudata_64.h +++ b/arch/sparc/include/asm/cpudata_64.h | |||
| @@ -6,9 +6,6 @@ | |||
| 6 | #ifndef _SPARC64_CPUDATA_H | 6 | #ifndef _SPARC64_CPUDATA_H |
| 7 | #define _SPARC64_CPUDATA_H | 7 | #define _SPARC64_CPUDATA_H |
| 8 | 8 | ||
| 9 | #include <asm/hypervisor.h> | ||
| 10 | #include <asm/asi.h> | ||
| 11 | |||
| 12 | #ifndef __ASSEMBLY__ | 9 | #ifndef __ASSEMBLY__ |
| 13 | 10 | ||
| 14 | #include <linux/percpu.h> | 11 | #include <linux/percpu.h> |
| @@ -38,202 +35,10 @@ DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data); | |||
| 38 | #define cpu_data(__cpu) per_cpu(__cpu_data, (__cpu)) | 35 | #define cpu_data(__cpu) per_cpu(__cpu_data, (__cpu)) |
| 39 | #define local_cpu_data() __get_cpu_var(__cpu_data) | 36 | #define local_cpu_data() __get_cpu_var(__cpu_data) |
| 40 | 37 | ||
| 41 | /* Trap handling code needs to get at a few critical values upon | ||
| 42 | * trap entry and to process TSB misses. These cannot be in the | ||
| 43 | * per_cpu() area as we really need to lock them into the TLB and | ||
| 44 | * thus make them part of the main kernel image. As a result we | ||
| 45 | * try to make this as small as possible. | ||
| 46 | * | ||
| 47 | * This is padded out and aligned to 64-bytes to avoid false sharing | ||
| 48 | * on SMP. | ||
| 49 | */ | ||
| 50 | |||
| 51 | /* If you modify the size of this structure, please update | ||
| 52 | * TRAP_BLOCK_SZ_SHIFT below. | ||
| 53 | */ | ||
| 54 | struct thread_info; | ||
| 55 | struct trap_per_cpu { | ||
| 56 | /* D-cache line 1: Basic thread information, cpu and device mondo queues */ | ||
| 57 | struct thread_info *thread; | ||
| 58 | unsigned long pgd_paddr; | ||
| 59 | unsigned long cpu_mondo_pa; | ||
| 60 | unsigned long dev_mondo_pa; | ||
| 61 | |||
| 62 | /* D-cache line 2: Error Mondo Queue and kernel buffer pointers */ | ||
| 63 | unsigned long resum_mondo_pa; | ||
| 64 | unsigned long resum_kernel_buf_pa; | ||
| 65 | unsigned long nonresum_mondo_pa; | ||
| 66 | unsigned long nonresum_kernel_buf_pa; | ||
| 67 | |||
| 68 | /* Dcache lines 3, 4, 5, and 6: Hypervisor Fault Status */ | ||
| 69 | struct hv_fault_status fault_info; | ||
| 70 | |||
| 71 | /* Dcache line 7: Physical addresses of CPU send mondo block and CPU list. */ | ||
| 72 | unsigned long cpu_mondo_block_pa; | ||
| 73 | unsigned long cpu_list_pa; | ||
| 74 | unsigned long tsb_huge; | ||
| 75 | unsigned long tsb_huge_temp; | ||
| 76 | |||
| 77 | /* Dcache line 8: IRQ work list, and keep trap_block a power-of-2 in size. */ | ||
| 78 | unsigned long irq_worklist_pa; | ||
| 79 | unsigned int cpu_mondo_qmask; | ||
| 80 | unsigned int dev_mondo_qmask; | ||
| 81 | unsigned int resum_qmask; | ||
| 82 | unsigned int nonresum_qmask; | ||
| 83 | unsigned long __unused; | ||
| 84 | } __attribute__((aligned(64))); | ||
| 85 | extern struct trap_per_cpu trap_block[NR_CPUS]; | ||
| 86 | extern void init_cur_cpu_trap(struct thread_info *); | ||
| 87 | extern void setup_tba(void); | ||
| 88 | extern int ncpus_probed; | ||
| 89 | extern const struct seq_operations cpuinfo_op; | 38 | extern const struct seq_operations cpuinfo_op; |
| 90 | 39 | ||
| 91 | extern unsigned long real_hard_smp_processor_id(void); | ||
| 92 | |||
| 93 | struct cpuid_patch_entry { | ||
| 94 | unsigned int addr; | ||
| 95 | unsigned int cheetah_safari[4]; | ||
| 96 | unsigned int cheetah_jbus[4]; | ||
| 97 | unsigned int starfire[4]; | ||
| 98 | unsigned int sun4v[4]; | ||
| 99 | }; | ||
| 100 | extern struct cpuid_patch_entry __cpuid_patch, __cpuid_patch_end; | ||
| 101 | |||
| 102 | struct sun4v_1insn_patch_entry { | ||
| 103 | unsigned int addr; | ||
| 104 | unsigned int insn; | ||
| 105 | }; | ||
| 106 | extern struct sun4v_1insn_patch_entry __sun4v_1insn_patch, | ||
| 107 | __sun4v_1insn_patch_end; | ||
| 108 | |||
| 109 | struct sun4v_2insn_patch_entry { | ||
| 110 | unsigned int addr; | ||
| 111 | unsigned int insns[2]; | ||
| 112 | }; | ||
| 113 | extern struct sun4v_2insn_patch_entry __sun4v_2insn_patch, | ||
| 114 | __sun4v_2insn_patch_end; | ||
| 115 | |||
| 116 | #endif /* !(__ASSEMBLY__) */ | 40 | #endif /* !(__ASSEMBLY__) */ |
| 117 | 41 | ||
| 118 | #define TRAP_PER_CPU_THREAD 0x00 | 42 | #include <asm/trap_block.h> |
| 119 | #define TRAP_PER_CPU_PGD_PADDR 0x08 | ||
| 120 | #define TRAP_PER_CPU_CPU_MONDO_PA 0x10 | ||
| 121 | #define TRAP_PER_CPU_DEV_MONDO_PA 0x18 | ||
| 122 | #define TRAP_PER_CPU_RESUM_MONDO_PA 0x20 | ||
| 123 | #define TRAP_PER_CPU_RESUM_KBUF_PA 0x28 | ||
| 124 | #define TRAP_PER_CPU_NONRESUM_MONDO_PA 0x30 | ||
| 125 | #define TRAP_PER_CPU_NONRESUM_KBUF_PA 0x38 | ||
| 126 | #define TRAP_PER_CPU_FAULT_INFO 0x40 | ||
| 127 | #define TRAP_PER_CPU_CPU_MONDO_BLOCK_PA 0xc0 | ||
| 128 | #define TRAP_PER_CPU_CPU_LIST_PA 0xc8 | ||
| 129 | #define TRAP_PER_CPU_TSB_HUGE 0xd0 | ||
| 130 | #define TRAP_PER_CPU_TSB_HUGE_TEMP 0xd8 | ||
| 131 | #define TRAP_PER_CPU_IRQ_WORKLIST_PA 0xe0 | ||
| 132 | #define TRAP_PER_CPU_CPU_MONDO_QMASK 0xe8 | ||
| 133 | #define TRAP_PER_CPU_DEV_MONDO_QMASK 0xec | ||
| 134 | #define TRAP_PER_CPU_RESUM_QMASK 0xf0 | ||
| 135 | #define TRAP_PER_CPU_NONRESUM_QMASK 0xf4 | ||
| 136 | |||
| 137 | #define TRAP_BLOCK_SZ_SHIFT 8 | ||
| 138 | |||
| 139 | #include <asm/scratchpad.h> | ||
| 140 | |||
| 141 | #define __GET_CPUID(REG) \ | ||
| 142 | /* Spitfire implementation (default). */ \ | ||
| 143 | 661: ldxa [%g0] ASI_UPA_CONFIG, REG; \ | ||
| 144 | srlx REG, 17, REG; \ | ||
| 145 | and REG, 0x1f, REG; \ | ||
| 146 | nop; \ | ||
| 147 | .section .cpuid_patch, "ax"; \ | ||
| 148 | /* Instruction location. */ \ | ||
| 149 | .word 661b; \ | ||
| 150 | /* Cheetah Safari implementation. */ \ | ||
| 151 | ldxa [%g0] ASI_SAFARI_CONFIG, REG; \ | ||
| 152 | srlx REG, 17, REG; \ | ||
| 153 | and REG, 0x3ff, REG; \ | ||
| 154 | nop; \ | ||
| 155 | /* Cheetah JBUS implementation. */ \ | ||
| 156 | ldxa [%g0] ASI_JBUS_CONFIG, REG; \ | ||
| 157 | srlx REG, 17, REG; \ | ||
| 158 | and REG, 0x1f, REG; \ | ||
| 159 | nop; \ | ||
| 160 | /* Starfire implementation. */ \ | ||
| 161 | sethi %hi(0x1fff40000d0 >> 9), REG; \ | ||
| 162 | sllx REG, 9, REG; \ | ||
| 163 | or REG, 0xd0, REG; \ | ||
| 164 | lduwa [REG] ASI_PHYS_BYPASS_EC_E, REG;\ | ||
| 165 | /* sun4v implementation. */ \ | ||
| 166 | mov SCRATCHPAD_CPUID, REG; \ | ||
| 167 | ldxa [REG] ASI_SCRATCHPAD, REG; \ | ||
| 168 | nop; \ | ||
| 169 | nop; \ | ||
| 170 | .previous; | ||
| 171 | |||
| 172 | #ifdef CONFIG_SMP | ||
| 173 | |||
| 174 | #define TRAP_LOAD_TRAP_BLOCK(DEST, TMP) \ | ||
| 175 | __GET_CPUID(TMP) \ | ||
| 176 | sethi %hi(trap_block), DEST; \ | ||
| 177 | sllx TMP, TRAP_BLOCK_SZ_SHIFT, TMP; \ | ||
| 178 | or DEST, %lo(trap_block), DEST; \ | ||
| 179 | add DEST, TMP, DEST; \ | ||
| 180 | |||
| 181 | /* Clobbers TMP, current address space PGD phys address into DEST. */ | ||
| 182 | #define TRAP_LOAD_PGD_PHYS(DEST, TMP) \ | ||
| 183 | TRAP_LOAD_TRAP_BLOCK(DEST, TMP) \ | ||
| 184 | ldx [DEST + TRAP_PER_CPU_PGD_PADDR], DEST; | ||
| 185 | |||
| 186 | /* Clobbers TMP, loads local processor's IRQ work area into DEST. */ | ||
| 187 | #define TRAP_LOAD_IRQ_WORK_PA(DEST, TMP) \ | ||
| 188 | TRAP_LOAD_TRAP_BLOCK(DEST, TMP) \ | ||
| 189 | add DEST, TRAP_PER_CPU_IRQ_WORKLIST_PA, DEST; | ||
| 190 | |||
| 191 | /* Clobbers TMP, loads DEST with current thread info pointer. */ | ||
| 192 | #define TRAP_LOAD_THREAD_REG(DEST, TMP) \ | ||
| 193 | TRAP_LOAD_TRAP_BLOCK(DEST, TMP) \ | ||
| 194 | ldx [DEST + TRAP_PER_CPU_THREAD], DEST; | ||
| 195 | |||
| 196 | /* Given the current thread info pointer in THR, load the per-cpu | ||
| 197 | * area base of the current processor into DEST. REG1, REG2, and REG3 are | ||
| 198 | * clobbered. | ||
| 199 | * | ||
| 200 | * You absolutely cannot use DEST as a temporary in this code. The | ||
| 201 | * reason is that traps can happen during execution, and return from | ||
| 202 | * trap will load the fully resolved DEST per-cpu base. This can corrupt | ||
| 203 | * the calculations done by the macro mid-stream. | ||
| 204 | */ | ||
| 205 | #define LOAD_PER_CPU_BASE(DEST, THR, REG1, REG2, REG3) \ | ||
| 206 | lduh [THR + TI_CPU], REG1; \ | ||
| 207 | sethi %hi(__per_cpu_shift), REG3; \ | ||
| 208 | sethi %hi(__per_cpu_base), REG2; \ | ||
