diff options
Diffstat (limited to 'arch/powerpc/kernel/cputable.c')
-rw-r--r-- | arch/powerpc/kernel/cputable.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index b742013bb9da..dd17dffbf058 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c | |||
@@ -43,6 +43,8 @@ extern void __setup_cpu_745x(unsigned long offset, struct cpu_spec* spec); | |||
43 | #ifdef CONFIG_PPC64 | 43 | #ifdef CONFIG_PPC64 |
44 | extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec); | 44 | extern void __setup_cpu_ppc970(unsigned long offset, struct cpu_spec* spec); |
45 | extern void __setup_cpu_ppc970MP(unsigned long offset, struct cpu_spec* spec); | 45 | extern void __setup_cpu_ppc970MP(unsigned long offset, struct cpu_spec* spec); |
46 | extern void __setup_cpu_pa6t(unsigned long offset, struct cpu_spec* spec); | ||
47 | extern void __restore_cpu_pa6t(unsigned long offset, struct cpu_spec* spec); | ||
46 | extern void __restore_cpu_ppc970(void); | 48 | extern void __restore_cpu_ppc970(void); |
47 | #endif /* CONFIG_PPC64 */ | 49 | #endif /* CONFIG_PPC64 */ |
48 | 50 | ||
@@ -86,6 +88,7 @@ static struct cpu_spec cpu_specs[] = { | |||
86 | .icache_bsize = 128, | 88 | .icache_bsize = 128, |
87 | .dcache_bsize = 128, | 89 | .dcache_bsize = 128, |
88 | .num_pmcs = 8, | 90 | .num_pmcs = 8, |
91 | .pmc_type = PPC_PMC_IBM, | ||
89 | .oprofile_cpu_type = "ppc64/power3", | 92 | .oprofile_cpu_type = "ppc64/power3", |
90 | .oprofile_type = PPC_OPROFILE_RS64, | 93 | .oprofile_type = PPC_OPROFILE_RS64, |
91 | .platform = "power3", | 94 | .platform = "power3", |
@@ -99,6 +102,7 @@ static struct cpu_spec cpu_specs[] = { | |||
99 | .icache_bsize = 128, | 102 | .icache_bsize = 128, |
100 | .dcache_bsize = 128, | 103 | .dcache_bsize = 128, |
101 | .num_pmcs = 8, | 104 | .num_pmcs = 8, |
105 | .pmc_type = PPC_PMC_IBM, | ||
102 | .oprofile_cpu_type = "ppc64/power3", | 106 | .oprofile_cpu_type = "ppc64/power3", |
103 | .oprofile_type = PPC_OPROFILE_RS64, | 107 | .oprofile_type = PPC_OPROFILE_RS64, |
104 | .platform = "power3", | 108 | .platform = "power3", |
@@ -112,6 +116,7 @@ static struct cpu_spec cpu_specs[] = { | |||
112 | .icache_bsize = 128, | 116 | .icache_bsize = 128, |
113 | .dcache_bsize = 128, | 117 | .dcache_bsize = 128, |
114 | .num_pmcs = 8, | 118 | .num_pmcs = 8, |
119 | .pmc_type = PPC_PMC_IBM, | ||
115 | .oprofile_cpu_type = "ppc64/rs64", | 120 | .oprofile_cpu_type = "ppc64/rs64", |
116 | .oprofile_type = PPC_OPROFILE_RS64, | 121 | .oprofile_type = PPC_OPROFILE_RS64, |
117 | .platform = "rs64", | 122 | .platform = "rs64", |
@@ -125,6 +130,7 @@ static struct cpu_spec cpu_specs[] = { | |||
125 | .icache_bsize = 128, | 130 | .icache_bsize = 128, |
126 | .dcache_bsize = 128, | 131 | .dcache_bsize = 128, |
127 | .num_pmcs = 8, | 132 | .num_pmcs = 8, |
133 | .pmc_type = PPC_PMC_IBM, | ||
128 | .oprofile_cpu_type = "ppc64/rs64", | 134 | .oprofile_cpu_type = "ppc64/rs64", |
129 | .oprofile_type = PPC_OPROFILE_RS64, | 135 | .oprofile_type = PPC_OPROFILE_RS64, |
130 | .platform = "rs64", | 136 | .platform = "rs64", |
@@ -138,6 +144,7 @@ static struct cpu_spec cpu_specs[] = { | |||
138 | .icache_bsize = 128, | 144 | .icache_bsize = 128, |
139 | .dcache_bsize = 128, | 145 | .dcache_bsize = 128, |
140 | .num_pmcs = 8, | 146 | .num_pmcs = 8, |
147 | .pmc_type = PPC_PMC_IBM, | ||
141 | .oprofile_cpu_type = "ppc64/rs64", | 148 | .oprofile_cpu_type = "ppc64/rs64", |
142 | .oprofile_type = PPC_OPROFILE_RS64, | 149 | .oprofile_type = PPC_OPROFILE_RS64, |
143 | .platform = "rs64", | 150 | .platform = "rs64", |
@@ -151,6 +158,7 @@ static struct cpu_spec cpu_specs[] = { | |||
151 | .icache_bsize = 128, | 158 | .icache_bsize = 128, |
152 | .dcache_bsize = 128, | 159 | .dcache_bsize = 128, |
153 | .num_pmcs = 8, | 160 | .num_pmcs = 8, |
161 | .pmc_type = PPC_PMC_IBM, | ||
154 | .oprofile_cpu_type = "ppc64/rs64", | 162 | .oprofile_cpu_type = "ppc64/rs64", |
155 | .oprofile_type = PPC_OPROFILE_RS64, | 163 | .oprofile_type = PPC_OPROFILE_RS64, |
156 | .platform = "rs64", | 164 | .platform = "rs64", |
@@ -164,6 +172,7 @@ static struct cpu_spec cpu_specs[] = { | |||
164 | .icache_bsize = 128, | 172 | .icache_bsize = 128, |
165 | .dcache_bsize = 128, | 173 | .dcache_bsize = 128, |
166 | .num_pmcs = 8, | 174 | .num_pmcs = 8, |
175 | .pmc_type = PPC_PMC_IBM, | ||
167 | .oprofile_cpu_type = "ppc64/power4", | 176 | .oprofile_cpu_type = "ppc64/power4", |
168 | .oprofile_type = PPC_OPROFILE_POWER4, | 177 | .oprofile_type = PPC_OPROFILE_POWER4, |
169 | .platform = "power4", | 178 | .platform = "power4", |
@@ -177,6 +186,7 @@ static struct cpu_spec cpu_specs[] = { | |||
177 | .icache_bsize = 128, | 186 | .icache_bsize = 128, |
178 | .dcache_bsize = 128, | 187 | .dcache_bsize = 128, |
179 | .num_pmcs = 8, | 188 | .num_pmcs = 8, |
189 | .pmc_type = PPC_PMC_IBM, | ||
180 | .oprofile_cpu_type = "ppc64/power4", | 190 | .oprofile_cpu_type = "ppc64/power4", |
181 | .oprofile_type = PPC_OPROFILE_POWER4, | 191 | .oprofile_type = PPC_OPROFILE_POWER4, |
182 | .platform = "power4", | 192 | .platform = "power4", |
@@ -191,6 +201,7 @@ static struct cpu_spec cpu_specs[] = { | |||
191 | .icache_bsize = 128, | 201 | .icache_bsize = 128, |
192 | .dcache_bsize = 128, | 202 | .dcache_bsize = 128, |
193 | .num_pmcs = 8, | 203 | .num_pmcs = 8, |
204 | .pmc_type = PPC_PMC_IBM, | ||
194 | .cpu_setup = __setup_cpu_ppc970, | 205 | .cpu_setup = __setup_cpu_ppc970, |
195 | .cpu_restore = __restore_cpu_ppc970, | 206 | .cpu_restore = __restore_cpu_ppc970, |
196 | .oprofile_cpu_type = "ppc64/970", | 207 | .oprofile_cpu_type = "ppc64/970", |
@@ -207,6 +218,7 @@ static struct cpu_spec cpu_specs[] = { | |||
207 | .icache_bsize = 128, | 218 | .icache_bsize = 128, |
208 | .dcache_bsize = 128, | 219 | .dcache_bsize = 128, |
209 | .num_pmcs = 8, | 220 | .num_pmcs = 8, |
221 | .pmc_type = PPC_PMC_IBM, | ||
210 | .cpu_setup = __setup_cpu_ppc970, | 222 | .cpu_setup = __setup_cpu_ppc970, |
211 | .cpu_restore = __restore_cpu_ppc970, | 223 | .cpu_restore = __restore_cpu_ppc970, |
212 | .oprofile_cpu_type = "ppc64/970", | 224 | .oprofile_cpu_type = "ppc64/970", |
@@ -239,6 +251,7 @@ static struct cpu_spec cpu_specs[] = { | |||
239 | .icache_bsize = 128, | 251 | .icache_bsize = 128, |
240 | .dcache_bsize = 128, | 252 | .dcache_bsize = 128, |
241 | .num_pmcs = 8, | 253 | .num_pmcs = 8, |
254 | .pmc_type = PPC_PMC_IBM, | ||
242 | .cpu_setup = __setup_cpu_ppc970, | 255 | .cpu_setup = __setup_cpu_ppc970, |
243 | .oprofile_cpu_type = "ppc64/970", | 256 | .oprofile_cpu_type = "ppc64/970", |
244 | .oprofile_type = PPC_OPROFILE_POWER4, | 257 | .oprofile_type = PPC_OPROFILE_POWER4, |
@@ -253,6 +266,7 @@ static struct cpu_spec cpu_specs[] = { | |||
253 | .icache_bsize = 128, | 266 | .icache_bsize = 128, |
254 | .dcache_bsize = 128, | 267 | .dcache_bsize = 128, |
255 | .num_pmcs = 6, | 268 | .num_pmcs = 6, |
269 | .pmc_type = PPC_PMC_IBM, | ||
256 | .oprofile_cpu_type = "ppc64/power5", | 270 | .oprofile_cpu_type = "ppc64/power5", |
257 | .oprofile_type = PPC_OPROFILE_POWER4, | 271 | .oprofile_type = PPC_OPROFILE_POWER4, |
258 | /* SIHV / SIPR bits are implemented on POWER4+ (GQ) | 272 | /* SIHV / SIPR bits are implemented on POWER4+ (GQ) |
@@ -271,6 +285,7 @@ static struct cpu_spec cpu_specs[] = { | |||
271 | .icache_bsize = 128, | 285 | .icache_bsize = 128, |
272 | .dcache_bsize = 128, | 286 | .dcache_bsize = 128, |
273 | .num_pmcs = 6, | 287 | .num_pmcs = 6, |
288 | .pmc_type = PPC_PMC_IBM, | ||
274 | .oprofile_cpu_type = "ppc64/power5+", | 289 | .oprofile_cpu_type = "ppc64/power5+", |
275 | .oprofile_type = PPC_OPROFILE_POWER4, | 290 | .oprofile_type = PPC_OPROFILE_POWER4, |
276 | .oprofile_mmcra_sihv = MMCRA_SIHV, | 291 | .oprofile_mmcra_sihv = MMCRA_SIHV, |
@@ -321,6 +336,7 @@ static struct cpu_spec cpu_specs[] = { | |||
321 | .icache_bsize = 128, | 336 | .icache_bsize = 128, |
322 | .dcache_bsize = 128, | 337 | .dcache_bsize = 128, |
323 | .num_pmcs = 6, | 338 | .num_pmcs = 6, |
339 | .pmc_type = PPC_PMC_IBM, | ||
324 | .oprofile_cpu_type = "ppc64/power6", | 340 | .oprofile_cpu_type = "ppc64/power6", |
325 | .oprofile_type = PPC_OPROFILE_POWER4, | 341 | .oprofile_type = PPC_OPROFILE_POWER4, |
326 | .oprofile_mmcra_sihv = POWER6_MMCRA_SIHV, | 342 | .oprofile_mmcra_sihv = POWER6_MMCRA_SIHV, |
@@ -340,6 +356,7 @@ static struct cpu_spec cpu_specs[] = { | |||
340 | .icache_bsize = 128, | 356 | .icache_bsize = 128, |
341 | .dcache_bsize = 128, | 357 | .dcache_bsize = 128, |
342 | .num_pmcs = 4, | 358 | .num_pmcs = 4, |
359 | .pmc_type = PPC_PMC_IBM, | ||
343 | .oprofile_cpu_type = "ppc64/cell-be", | 360 | .oprofile_cpu_type = "ppc64/cell-be", |
344 | .oprofile_type = PPC_OPROFILE_CELL, | 361 | .oprofile_type = PPC_OPROFILE_CELL, |
345 | .platform = "ppc-cell-be", | 362 | .platform = "ppc-cell-be", |
@@ -353,6 +370,9 @@ static struct cpu_spec cpu_specs[] = { | |||
353 | .icache_bsize = 64, | 370 | .icache_bsize = 64, |
354 | .dcache_bsize = 64, | 371 | .dcache_bsize = 64, |
355 | .num_pmcs = 6, | 372 | .num_pmcs = 6, |
373 | .pmc_type = PPC_PMC_PA6T, | ||
374 | .cpu_setup = __setup_cpu_pa6t, | ||
375 | .cpu_restore = __restore_cpu_pa6t, | ||
356 | .platform = "pa6t", | 376 | .platform = "pa6t", |
357 | }, | 377 | }, |
358 | { /* default match */ | 378 | { /* default match */ |
@@ -364,6 +384,7 @@ static struct cpu_spec cpu_specs[] = { | |||
364 | .icache_bsize = 128, | 384 | .icache_bsize = 128, |
365 | .dcache_bsize = 128, | 385 | .dcache_bsize = 128, |
366 | .num_pmcs = 6, | 386 | .num_pmcs = 6, |
387 | .pmc_type = PPC_PMC_IBM, | ||
367 | .platform = "power4", | 388 | .platform = "power4", |
368 | } | 389 | } |
369 | #endif /* CONFIG_PPC64 */ | 390 | #endif /* CONFIG_PPC64 */ |