2011-05-26 23:22:53 +07:00
|
|
|
#include <linux/export.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
#include <linux/init.h>
|
|
|
|
#include <linux/bitops.h>
|
2011-08-10 08:49:56 +07:00
|
|
|
#include <linux/elf.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
#include <linux/mm.h>
|
2008-09-08 07:58:53 +07:00
|
|
|
|
2009-07-04 06:35:45 +07:00
|
|
|
#include <linux/io.h>
|
2012-02-07 19:08:52 +07:00
|
|
|
#include <linux/sched.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
#include <asm/processor.h>
|
2007-08-11 03:31:07 +07:00
|
|
|
#include <asm/apic.h>
|
2009-03-08 14:46:26 +07:00
|
|
|
#include <asm/cpu.h>
|
2009-06-08 20:55:09 +07:00
|
|
|
#include <asm/pci-direct.h>
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2008-09-08 07:58:53 +07:00
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
# include <asm/mmconfig.h>
|
|
|
|
# include <asm/cacheflush.h>
|
|
|
|
#endif
|
|
|
|
|
2005-04-17 05:20:36 +07:00
|
|
|
#include "cpu.h"
|
|
|
|
|
2012-06-01 21:52:38 +07:00
|
|
|
static inline int rdmsrl_amd_safe(unsigned msr, unsigned long long *p)
|
|
|
|
{
|
|
|
|
u32 gprs[8] = { 0 };
|
|
|
|
int err;
|
|
|
|
|
2013-04-08 22:57:45 +07:00
|
|
|
WARN_ONCE((boot_cpu_data.x86 != 0xf),
|
|
|
|
"%s should only be used on K8!\n", __func__);
|
2012-06-01 21:52:38 +07:00
|
|
|
|
|
|
|
gprs[1] = msr;
|
|
|
|
gprs[7] = 0x9c5a203a;
|
|
|
|
|
|
|
|
err = rdmsr_safe_regs(gprs);
|
|
|
|
|
|
|
|
*p = gprs[0] | ((u64)gprs[2] << 32);
|
|
|
|
|
|
|
|
return err;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int wrmsrl_amd_safe(unsigned msr, unsigned long long val)
|
|
|
|
{
|
|
|
|
u32 gprs[8] = { 0 };
|
|
|
|
|
2013-04-08 22:57:45 +07:00
|
|
|
WARN_ONCE((boot_cpu_data.x86 != 0xf),
|
|
|
|
"%s should only be used on K8!\n", __func__);
|
2012-06-01 21:52:38 +07:00
|
|
|
|
|
|
|
gprs[0] = (u32)val;
|
|
|
|
gprs[1] = msr;
|
|
|
|
gprs[2] = val >> 32;
|
|
|
|
gprs[7] = 0x9c5a203a;
|
|
|
|
|
|
|
|
return wrmsr_safe_regs(gprs);
|
|
|
|
}
|
|
|
|
|
2008-09-08 07:58:54 +07:00
|
|
|
#ifdef CONFIG_X86_32
|
2005-04-17 05:20:36 +07:00
|
|
|
/*
|
|
|
|
* B step AMD K6 before B 9730xxxx have hardware bugs that can cause
|
|
|
|
* misexecution of code under Linux. Owners of such processors should
|
|
|
|
* contact AMD for precise details and a CPU swap.
|
|
|
|
*
|
|
|
|
* See http://www.multimania.com/poulot/k6bug.html
|
2012-04-11 22:12:38 +07:00
|
|
|
* and section 2.6.2 of "AMD-K6 Processor Revision Guide - Model 6"
|
|
|
|
* (Publication # 21266 Issue Date: August 1998)
|
2005-04-17 05:20:36 +07:00
|
|
|
*
|
|
|
|
* The following test is erm.. interesting. AMD neglected to up
|
|
|
|
* the chip setting when fixing the bug but they also tweaked some
|
|
|
|
* performance at the same time..
|
|
|
|
*/
|
2008-02-23 05:10:33 +07:00
|
|
|
|
2013-08-06 05:02:43 +07:00
|
|
|
extern __visible void vide(void);
|
|
|
|
__asm__(".globl vide\n\t.align 4\nvide: ret");
|
2005-04-17 05:20:36 +07:00
|
|
|
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 05:23:59 +07:00
|
|
|
static void init_amd_k5(struct cpuinfo_x86 *c)
|
2008-09-08 07:58:50 +07:00
|
|
|
{
|
|
|
|
/*
|
|
|
|
* General Systems BIOSen alias the cpu frequency registers
|
|
|
|
* of the Elan at 0x000df000. Unfortuantly, one of the Linux
|
|
|
|
* drivers subsequently pokes it, and changes the CPU speed.
|
|
|
|
* Workaround : Remove the unneeded alias.
|
|
|
|
*/
|
|
|
|
#define CBAR (0xfffc) /* Configuration Base Address (32-bit) */
|
|
|
|
#define CBAR_ENB (0x80000000)
|
|
|
|
#define CBAR_KEY (0X000000CB)
|
|
|
|
if (c->x86_model == 9 || c->x86_model == 10) {
|
2009-07-04 06:35:45 +07:00
|
|
|
if (inl(CBAR) & CBAR_ENB)
|
|
|
|
outl(0 | CBAR_KEY, CBAR);
|
2008-09-08 07:58:50 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 05:23:59 +07:00
|
|
|
static void init_amd_k6(struct cpuinfo_x86 *c)
|
2008-09-08 07:58:50 +07:00
|
|
|
{
|
|
|
|
u32 l, h;
|
2013-07-04 05:04:19 +07:00
|
|
|
int mbytes = get_num_physpages() >> (20-PAGE_SHIFT);
|
2008-09-08 07:58:50 +07:00
|
|
|
|
|
|
|
if (c->x86_model < 6) {
|
|
|
|
/* Based on AMD doc 20734R - June 2000 */
|
|
|
|
if (c->x86_model == 0) {
|
|
|
|
clear_cpu_cap(c, X86_FEATURE_APIC);
|
|
|
|
set_cpu_cap(c, X86_FEATURE_PGE);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (c->x86_model == 6 && c->x86_mask == 1) {
|
|
|
|
const int K6_BUG_LOOP = 1000000;
|
|
|
|
int n;
|
|
|
|
void (*f_vide)(void);
|
|
|
|
unsigned long d, d2;
|
|
|
|
|
|
|
|
printk(KERN_INFO "AMD K6 stepping B detected - ");
|
|
|
|
|
|
|
|
/*
|
|
|
|
* It looks like AMD fixed the 2.6.2 bug and improved indirect
|
|
|
|
* calls at the same time.
|
|
|
|
*/
|
|
|
|
|
|
|
|
n = K6_BUG_LOOP;
|
|
|
|
f_vide = vide;
|
|
|
|
rdtscl(d);
|
|
|
|
while (n--)
|
|
|
|
f_vide();
|
|
|
|
rdtscl(d2);
|
|
|
|
d = d2-d;
|
|
|
|
|
|
|
|
if (d > 20*K6_BUG_LOOP)
|
2009-07-04 06:35:45 +07:00
|
|
|
printk(KERN_CONT
|
|
|
|
"system stability may be impaired when more than 32 MB are used.\n");
|
2008-09-08 07:58:50 +07:00
|
|
|
else
|
2009-07-04 06:35:45 +07:00
|
|
|
printk(KERN_CONT "probably OK (after B9730xxxx).\n");
|
2008-09-08 07:58:50 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* K6 with old style WHCR */
|
|
|
|
if (c->x86_model < 8 ||
|
|
|
|
(c->x86_model == 8 && c->x86_mask < 8)) {
|
|
|
|
/* We can only write allocate on the low 508Mb */
|
|
|
|
if (mbytes > 508)
|
|
|
|
mbytes = 508;
|
|
|
|
|
|
|
|
rdmsr(MSR_K6_WHCR, l, h);
|
|
|
|
if ((l&0x0000FFFF) == 0) {
|
|
|
|
unsigned long flags;
|
|
|
|
l = (1<<0)|((mbytes/4)<<1);
|
|
|
|
local_irq_save(flags);
|
|
|
|
wbinvd();
|
|
|
|
wrmsr(MSR_K6_WHCR, l, h);
|
|
|
|
local_irq_restore(flags);
|
|
|
|
printk(KERN_INFO "Enabling old style K6 write allocation for %d Mb\n",
|
|
|
|
mbytes);
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ((c->x86_model == 8 && c->x86_mask > 7) ||
|
|
|
|
c->x86_model == 9 || c->x86_model == 13) {
|
|
|
|
/* The more serious chips .. */
|
|
|
|
|
|
|
|
if (mbytes > 4092)
|
|
|
|
mbytes = 4092;
|
|
|
|
|
|
|
|
rdmsr(MSR_K6_WHCR, l, h);
|
|
|
|
if ((l&0xFFFF0000) == 0) {
|
|
|
|
unsigned long flags;
|
|
|
|
l = ((mbytes>>2)<<22)|(1<<16);
|
|
|
|
local_irq_save(flags);
|
|
|
|
wbinvd();
|
|
|
|
wrmsr(MSR_K6_WHCR, l, h);
|
|
|
|
local_irq_restore(flags);
|
|
|
|
printk(KERN_INFO "Enabling new style K6 write allocation for %d Mb\n",
|
|
|
|
mbytes);
|
|
|
|
}
|
|
|
|
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (c->x86_model == 10) {
|
|
|
|
/* AMD Geode LX is model 10 */
|
|
|
|
/* placeholder for any needed mods */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 05:23:59 +07:00
|
|
|
static void amd_k7_smp_check(struct cpuinfo_x86 *c)
|
2009-03-08 14:46:26 +07:00
|
|
|
{
|
|
|
|
/* calling is from identify_secondary_cpu() ? */
|
2010-07-22 00:03:58 +07:00
|
|
|
if (!c->cpu_index)
|
2009-03-08 14:46:26 +07:00
|
|
|
return;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Certain Athlons might work (for various values of 'work') in SMP
|
|
|
|
* but they are not certified as MP capable.
|
|
|
|
*/
|
|
|
|
/* Athlon 660/661 is valid. */
|
|
|
|
if ((c->x86_model == 6) && ((c->x86_mask == 0) ||
|
|
|
|
(c->x86_mask == 1)))
|
2013-04-08 22:57:46 +07:00
|
|
|
return;
|
2009-03-08 14:46:26 +07:00
|
|
|
|
|
|
|
/* Duron 670 is valid */
|
|
|
|
if ((c->x86_model == 7) && (c->x86_mask == 0))
|
2013-04-08 22:57:46 +07:00
|
|
|
return;
|
2009-03-08 14:46:26 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Athlon 662, Duron 671, and Athlon >model 7 have capability
|
|
|
|
* bit. It's worth noting that the A5 stepping (662) of some
|
|
|
|
* Athlon XP's have the MP bit set.
|
|
|
|
* See http://www.heise.de/newsticker/data/jow-18.10.01-000 for
|
|
|
|
* more.
|
|
|
|
*/
|
|
|
|
if (((c->x86_model == 6) && (c->x86_mask >= 2)) ||
|
|
|
|
((c->x86_model == 7) && (c->x86_mask >= 1)) ||
|
|
|
|
(c->x86_model > 7))
|
|
|
|
if (cpu_has_mp)
|
2013-04-08 22:57:46 +07:00
|
|
|
return;
|
2009-03-08 14:46:26 +07:00
|
|
|
|
|
|
|
/* If we get here, not a certified SMP capable AMD system. */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Don't taint if we are running SMP kernel on a single non-MP
|
|
|
|
* approved Athlon
|
|
|
|
*/
|
|
|
|
WARN_ONCE(1, "WARNING: This combination of AMD"
|
2009-07-22 20:50:23 +07:00
|
|
|
" processors is not suitable for SMP.\n");
|
2013-01-21 13:47:39 +07:00
|
|
|
add_taint(TAINT_UNSAFE_SMP, LOCKDEP_NOW_UNRELIABLE);
|
2009-03-08 14:46:26 +07:00
|
|
|
}
|
|
|
|
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 05:23:59 +07:00
|
|
|
static void init_amd_k7(struct cpuinfo_x86 *c)
|
2008-09-08 07:58:50 +07:00
|
|
|
{
|
|
|
|
u32 l, h;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Bit 15 of Athlon specific MSR 15, needs to be 0
|
|
|
|
* to enable SSE on Palomino/Morgan/Barton CPU's.
|
|
|
|
* If the BIOS didn't enable it already, enable it here.
|
|
|
|
*/
|
|
|
|
if (c->x86_model >= 6 && c->x86_model <= 10) {
|
|
|
|
if (!cpu_has(c, X86_FEATURE_XMM)) {
|
|
|
|
printk(KERN_INFO "Enabling disabled K7/SSE Support.\n");
|
|
|
|
rdmsr(MSR_K7_HWCR, l, h);
|
|
|
|
l &= ~0x00008000;
|
|
|
|
wrmsr(MSR_K7_HWCR, l, h);
|
|
|
|
set_cpu_cap(c, X86_FEATURE_XMM);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* It's been determined by AMD that Athlons since model 8 stepping 1
|
|
|
|
* are more robust with CLK_CTL set to 200xxxxx instead of 600xxxxx
|
|
|
|
* As per AMD technical note 27212 0.2
|
|
|
|
*/
|
|
|
|
if ((c->x86_model == 8 && c->x86_mask >= 1) || (c->x86_model > 8)) {
|
|
|
|
rdmsr(MSR_K7_CLK_CTL, l, h);
|
|
|
|
if ((l & 0xfff00000) != 0x20000000) {
|
2009-07-04 06:35:45 +07:00
|
|
|
printk(KERN_INFO
|
|
|
|
"CPU: CLK_CTL MSR was %x. Reprogramming to %x\n",
|
|
|
|
l, ((l & 0x000fffff)|0x20000000));
|
2008-09-08 07:58:50 +07:00
|
|
|
wrmsr(MSR_K7_CLK_CTL, (l & 0x000fffff)|0x20000000, h);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
set_cpu_cap(c, X86_FEATURE_K7);
|
2009-03-08 14:46:26 +07:00
|
|
|
|
|
|
|
amd_k7_smp_check(c);
|
2008-09-08 07:58:50 +07:00
|
|
|
}
|
2008-09-08 07:58:54 +07:00
|
|
|
#endif
|
|
|
|
|
2011-01-23 20:37:40 +07:00
|
|
|
#ifdef CONFIG_NUMA
|
2011-01-23 20:37:39 +07:00
|
|
|
/*
|
|
|
|
* To workaround broken NUMA config. Read the comment in
|
|
|
|
* srat_detect_node().
|
|
|
|
*/
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 05:23:59 +07:00
|
|
|
static int nearby_node(int apicid)
|
2008-09-08 07:58:54 +07:00
|
|
|
{
|
|
|
|
int i, node;
|
|
|
|
|
|
|
|
for (i = apicid - 1; i >= 0; i--) {
|
2011-01-23 20:37:39 +07:00
|
|
|
node = __apicid_to_node[i];
|
2008-09-08 07:58:54 +07:00
|
|
|
if (node != NUMA_NO_NODE && node_online(node))
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
for (i = apicid + 1; i < MAX_LOCAL_APIC; i++) {
|
2011-01-23 20:37:39 +07:00
|
|
|
node = __apicid_to_node[i];
|
2008-09-08 07:58:54 +07:00
|
|
|
if (node != NUMA_NO_NODE && node_online(node))
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
return first_node(node_online_map); /* Shouldn't happen */
|
|
|
|
}
|
|
|
|
#endif
|
2008-09-08 07:58:50 +07:00
|
|
|
|
2009-09-03 14:40:21 +07:00
|
|
|
/*
|
2010-09-30 19:36:28 +07:00
|
|
|
* Fixup core topology information for
|
|
|
|
* (1) AMD multi-node processors
|
|
|
|
* Assumption: Number of cores in each internal node is the same.
|
2010-09-30 19:38:57 +07:00
|
|
|
* (2) AMD processors supporting compute units
|
2009-09-03 14:40:21 +07:00
|
|
|
*/
|
|
|
|
#ifdef CONFIG_X86_HT
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 05:23:59 +07:00
|
|
|
static void amd_get_topology(struct cpuinfo_x86 *c)
|
2009-09-03 14:40:21 +07:00
|
|
|
{
|
2011-02-15 00:14:51 +07:00
|
|
|
u32 nodes, cores_per_cu = 1;
|
2010-09-30 19:36:28 +07:00
|
|
|
u8 node_id;
|
2009-09-03 14:40:21 +07:00
|
|
|
int cpu = smp_processor_id();
|
|
|
|
|
2010-09-30 19:36:28 +07:00
|
|
|
/* get information required for multi-node processors */
|
2012-10-19 15:58:13 +07:00
|
|
|
if (cpu_has_topoext) {
|
2010-09-30 19:38:57 +07:00
|
|
|
u32 eax, ebx, ecx, edx;
|
|
|
|
|
|
|
|
cpuid(0x8000001e, &eax, &ebx, &ecx, &edx);
|
|
|
|
nodes = ((ecx >> 8) & 7) + 1;
|
|
|
|
node_id = ecx & 7;
|
|
|
|
|
|
|
|
/* get compute unit information */
|
|
|
|
smp_num_siblings = ((ebx >> 8) & 3) + 1;
|
|
|
|
c->compute_unit_id = ebx & 0xff;
|
2011-02-15 00:14:51 +07:00
|
|
|
cores_per_cu += ((ebx >> 8) & 3);
|
2010-09-30 19:36:28 +07:00
|
|
|
} else if (cpu_has(c, X86_FEATURE_NODEID_MSR)) {
|
2010-09-30 19:38:57 +07:00
|
|
|
u64 value;
|
|
|
|
|
2010-09-30 19:36:28 +07:00
|
|
|
rdmsrl(MSR_FAM10H_NODE_ID, value);
|
|
|
|
nodes = ((value >> 3) & 7) + 1;
|
|
|
|
node_id = value & 7;
|
|
|
|
} else
|
2009-09-03 14:40:21 +07:00
|
|
|
return;
|
|
|
|
|
2010-09-30 19:36:28 +07:00
|
|
|
/* fixup multi-node processor information */
|
|
|
|
if (nodes > 1) {
|
2010-09-30 19:38:57 +07:00
|
|
|
u32 cores_per_node;
|
2011-01-24 22:05:40 +07:00
|
|
|
u32 cus_per_node;
|
2010-09-30 19:38:57 +07:00
|
|
|
|
2010-09-30 19:36:28 +07:00
|
|
|
set_cpu_cap(c, X86_FEATURE_AMD_DCM);
|
|
|
|
cores_per_node = c->x86_max_cores / nodes;
|
2011-01-24 22:05:40 +07:00
|
|
|
cus_per_node = cores_per_node / cores_per_cu;
|
2009-12-16 21:43:55 +07:00
|
|
|
|
2010-09-30 19:36:28 +07:00
|
|
|
/* store NodeID, use llc_shared_map to store sibling info */
|
|
|
|
per_cpu(cpu_llc_id, cpu) = node_id;
|
2009-09-03 14:40:21 +07:00
|
|
|
|
2011-02-15 00:14:51 +07:00
|
|
|
/* core id has to be in the [0 .. cores_per_node - 1] range */
|
2011-01-24 22:05:40 +07:00
|
|
|
c->cpu_core_id %= cores_per_node;
|
|
|
|
c->compute_unit_id %= cus_per_node;
|
2010-09-30 19:36:28 +07:00
|
|
|
}
|
2009-09-03 14:40:21 +07:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-09-08 07:58:50 +07:00
|
|
|
/*
|
2013-09-18 11:00:43 +07:00
|
|
|
* On a AMD dual core setup the lower bits of the APIC id distinguish the cores.
|
2008-09-08 07:58:50 +07:00
|
|
|
* Assumes number of cores is a power of two.
|
|
|
|
*/
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 05:23:59 +07:00
|
|
|
static void amd_detect_cmp(struct cpuinfo_x86 *c)
|
2008-09-08 07:58:50 +07:00
|
|
|
{
|
|
|
|
#ifdef CONFIG_X86_HT
|
|
|
|
unsigned bits;
|
2009-06-19 15:59:09 +07:00
|
|
|
int cpu = smp_processor_id();
|
2008-09-08 07:58:50 +07:00
|
|
|
|
|
|
|
bits = c->x86_coreid_bits;
|
|
|
|
/* Low order bits define the core id (index of core in socket) */
|
|
|
|
c->cpu_core_id = c->initial_apicid & ((1 << bits)-1);
|
|
|
|
/* Convert the initial APIC ID into the socket ID */
|
|
|
|
c->phys_proc_id = c->initial_apicid >> bits;
|
2009-06-19 15:59:09 +07:00
|
|
|
/* use socket ID also for last level cache */
|
|
|
|
per_cpu(cpu_llc_id, cpu) = c->phys_proc_id;
|
2010-09-30 19:36:28 +07:00
|
|
|
amd_get_topology(c);
|
2008-09-08 07:58:50 +07:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2012-11-27 13:32:10 +07:00
|
|
|
u16 amd_get_nb_id(int cpu)
|
2009-09-16 16:33:40 +07:00
|
|
|
{
|
2012-11-27 13:32:10 +07:00
|
|
|
u16 id = 0;
|
2009-09-16 16:33:40 +07:00
|
|
|
#ifdef CONFIG_SMP
|
|
|
|
id = per_cpu(cpu_llc_id, cpu);
|
|
|
|
#endif
|
|
|
|
return id;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL_GPL(amd_get_nb_id);
|
|
|
|
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 05:23:59 +07:00
|
|
|
static void srat_detect_node(struct cpuinfo_x86 *c)
|
2008-09-08 07:58:54 +07:00
|
|
|
{
|
2011-01-23 20:37:40 +07:00
|
|
|
#ifdef CONFIG_NUMA
|
2008-09-08 07:58:54 +07:00
|
|
|
int cpu = smp_processor_id();
|
|
|
|
int node;
|
2009-08-30 03:17:14 +07:00
|
|
|
unsigned apicid = c->apicid;
|
2008-09-08 07:58:54 +07:00
|
|
|
|
2011-01-23 20:37:39 +07:00
|
|
|
node = numa_cpu_node(cpu);
|
|
|
|
if (node == NUMA_NO_NODE)
|
|
|
|
node = per_cpu(cpu_llc_id, cpu);
|
2008-09-08 07:58:54 +07:00
|
|
|
|
2011-12-05 15:20:37 +07:00
|
|
|
/*
|
2012-04-02 23:06:48 +07:00
|
|
|
* On multi-fabric platform (e.g. Numascale NumaChip) a
|
|
|
|
* platform-specific handler needs to be called to fixup some
|
|
|
|
* IDs of the CPU.
|
2011-12-05 15:20:37 +07:00
|
|
|
*/
|
2012-04-02 23:06:48 +07:00
|
|
|
if (x86_cpuinit.fixup_cpu_id)
|
2011-12-05 15:20:37 +07:00
|
|
|
x86_cpuinit.fixup_cpu_id(c, node);
|
|
|
|
|
2008-09-08 07:58:54 +07:00
|
|
|
if (!node_online(node)) {
|
2011-01-23 20:37:39 +07:00
|
|
|
/*
|
|
|
|
* Two possibilities here:
|
|
|
|
*
|
|
|
|
* - The CPU is missing memory and no node was created. In
|
|
|
|
* that case try picking one from a nearby CPU.
|
|
|
|
*
|
|
|
|
* - The APIC IDs differ from the HyperTransport node IDs
|
|
|
|
* which the K8 northbridge parsing fills in. Assume
|
|
|
|
* they are all increased by a constant offset, but in
|
|
|
|
* the same order as the HT nodeids. If that doesn't
|
|
|
|
* result in a usable node fall back to the path for the
|
|
|
|
* previous case.
|
|
|
|
*
|
|
|
|
* This workaround operates directly on the mapping between
|
|
|
|
* APIC ID and NUMA node, assuming certain relationship
|
|
|
|
* between APIC ID, HT node ID and NUMA topology. As going
|
|
|
|
* through CPU mapping may alter the outcome, directly
|
|
|
|
* access __apicid_to_node[].
|
|
|
|
*/
|
2008-09-08 07:58:54 +07:00
|
|
|
int ht_nodeid = c->initial_apicid;
|
|
|
|
|
|
|
|
if (ht_nodeid >= 0 &&
|
2011-01-23 20:37:39 +07:00
|
|
|
__apicid_to_node[ht_nodeid] != NUMA_NO_NODE)
|
|
|
|
node = __apicid_to_node[ht_nodeid];
|
2008-09-08 07:58:54 +07:00
|
|
|
/* Pick a nearby node */
|
|
|
|
if (!node_online(node))
|
|
|
|
node = nearby_node(apicid);
|
|
|
|
}
|
|
|
|
numa_set_node(cpu, node);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 05:23:59 +07:00
|
|
|
static void early_init_amd_mc(struct cpuinfo_x86 *c)
|
2008-09-08 07:58:50 +07:00
|
|
|
{
|
|
|
|
#ifdef CONFIG_X86_HT
|
|
|
|
unsigned bits, ecx;
|
|
|
|
|
|
|
|
/* Multi core CPU? */
|
|
|
|
if (c->extended_cpuid_level < 0x80000008)
|
|
|
|
return;
|
|
|
|
|
|
|
|
ecx = cpuid_ecx(0x80000008);
|
|
|
|
|
|
|
|
c->x86_max_cores = (ecx & 0xff) + 1;
|
|
|
|
|
|
|
|
/* CPU telling us the core id bits shift? */
|
|
|
|
bits = (ecx >> 12) & 0xF;
|
|
|
|
|
|
|
|
/* Otherwise recompute */
|
|
|
|
if (bits == 0) {
|
|
|
|
while ((1 << bits) < c->x86_max_cores)
|
|
|
|
bits++;
|
|
|
|
}
|
|
|
|
|
|
|
|
c->x86_coreid_bits = bits;
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 05:23:59 +07:00
|
|
|
static void bsp_init_amd(struct cpuinfo_x86 *c)
|
2011-08-06 01:04:09 +07:00
|
|
|
{
|
|
|
|
if (cpu_has(c, X86_FEATURE_CONSTANT_TSC)) {
|
|
|
|
|
|
|
|
if (c->x86 > 0x10 ||
|
|
|
|
(c->x86 == 0x10 && c->x86_model >= 0x2)) {
|
|
|
|
u64 val;
|
|
|
|
|
|
|
|
rdmsrl(MSR_K7_HWCR, val);
|
|
|
|
if (!(val & BIT(24)))
|
|
|
|
printk(KERN_WARNING FW_BUG "TSC doesn't count "
|
|
|
|
"with P0 frequency!\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (c->x86 == 0x15) {
|
|
|
|
unsigned long upperbit;
|
|
|
|
u32 cpuid, assoc;
|
|
|
|
|
|
|
|
cpuid = cpuid_edx(0x80000005);
|
|
|
|
assoc = cpuid >> 16 & 0xff;
|
|
|
|
upperbit = ((cpuid >> 24) << 10) / assoc;
|
|
|
|
|
|
|
|
va_align.mask = (upperbit - 1) & PAGE_MASK;
|
|
|
|
va_align.flags = ALIGN_VA_32 | ALIGN_VA_64;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 05:23:59 +07:00
|
|
|
static void early_init_amd(struct cpuinfo_x86 *c)
|
2008-01-30 19:32:40 +07:00
|
|
|
{
|
2008-09-08 07:58:50 +07:00
|
|
|
early_init_amd_mc(c);
|
|
|
|
|
2008-11-18 07:11:37 +07:00
|
|
|
/*
|
|
|
|
* c->x86_power is 8000_0007 edx. Bit 8 is TSC runs at constant rate
|
|
|
|
* with P/T states and does not stop in deep C-states
|
|
|
|
*/
|
|
|
|
if (c->x86_power & (1 << 8)) {
|
2008-09-06 15:52:28 +07:00
|
|
|
set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
|
2008-11-18 07:11:37 +07:00
|
|
|
set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC);
|
2012-02-07 19:08:52 +07:00
|
|
|
if (!check_tsc_unstable())
|
|
|
|
sched_clock_stable = 1;
|
2008-11-18 07:11:37 +07:00
|
|
|
}
|
2008-09-05 02:09:43 +07:00
|
|
|
|
2008-09-08 07:58:54 +07:00
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
set_cpu_cap(c, X86_FEATURE_SYSCALL32);
|
|
|
|
#else
|
2008-09-05 02:09:43 +07:00
|
|
|
/* Set MTRR capability flag if appropriate */
|
2008-09-08 07:58:54 +07:00
|
|
|
if (c->x86 == 5)
|
|
|
|
if (c->x86_model == 13 || c->x86_model == 9 ||
|
|
|
|
(c->x86_model == 8 && c->x86_mask >= 8))
|
|
|
|
set_cpu_cap(c, X86_FEATURE_K6_MTRR);
|
|
|
|
#endif
|
2009-06-08 20:55:09 +07:00
|
|
|
#if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_PCI)
|
|
|
|
/* check CPU config space for extended APIC ID */
|
2009-07-22 23:59:35 +07:00
|
|
|
if (cpu_has_apic && c->x86 >= 0xf) {
|
2009-06-08 20:55:09 +07:00
|
|
|
unsigned int val;
|
|
|
|
val = read_pci_config(0, 24, 0, 0x68);
|
|
|
|
if ((val & ((1 << 17) | (1 << 18))) == ((1 << 17) | (1 << 18)))
|
|
|
|
set_cpu_cap(c, X86_FEATURE_EXTD_APICID);
|
|
|
|
}
|
|
|
|
#endif
|
2008-01-30 19:32:40 +07:00
|
|
|
}
|
|
|
|
|
2013-03-20 21:07:27 +07:00
|
|
|
static const int amd_erratum_383[];
|
2013-03-20 21:07:28 +07:00
|
|
|
static const int amd_erratum_400[];
|
2013-07-24 00:40:49 +07:00
|
|
|
static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum);
|
2013-03-20 21:07:27 +07:00
|
|
|
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 05:23:59 +07:00
|
|
|
static void init_amd(struct cpuinfo_x86 *c)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
x86: Fix boot failures on older AMD CPU's
People with old AMD chips are getting hung boots, because commit
bcb80e53877c ("x86, microcode, AMD: Add microcode revision to
/proc/cpuinfo") moved the microcode detection too early into
"early_init_amd()".
At that point we are *so* early in the booth that the exception tables
haven't even been set up yet, so the whole
rdmsr_safe(MSR_AMD64_PATCH_LEVEL, &c->microcode, &dummy);
doesn't actually work: if the rdmsr does a GP fault (due to non-existant
MSR register on older CPU's), we can't fix it up yet, and the boot fails.
Fix it by simply moving the code to a slightly later point in the boot
(init_amd() instead of early_init_amd()), since the kernel itself
doesn't even really care about the microcode patchlevel at this point
(or really ever: it's made available to user space in /proc/cpuinfo, and
updated if you do a microcode load).
Reported-tested-and-bisected-by: Larry Finger <Larry.Finger@lwfinger.net>
Tested-by: Bob Tracy <rct@gherkin.frus.com>
Acked-by: Borislav Petkov <borislav.petkov@amd.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-05 02:57:09 +07:00
|
|
|
u32 dummy;
|
2005-10-11 06:28:33 +07:00
|
|
|
unsigned long long value;
|
2005-09-30 03:05:55 +07:00
|
|
|
|
2013-01-30 04:32:16 +07:00
|
|
|
#ifdef CONFIG_SMP
|
2008-02-23 05:10:33 +07:00
|
|
|
/*
|
|
|
|
* Disable TLB flush filter by setting HWCR.FFDIS on K8
|
2005-09-30 03:05:55 +07:00
|
|
|
* bit 6 of msr C001_0015
|
|
|
|
*
|
|
|
|
* Errata 63 for SH-B3 steppings
|
|
|
|
* Errata 122 for all steppings (F+ have it disabled by default)
|
|
|
|
*/
|
2008-09-08 07:58:50 +07:00
|
|
|
if (c->x86 == 0xf) {
|
2005-09-30 03:05:55 +07:00
|
|
|
rdmsrl(MSR_K7_HWCR, value);
|
|
|
|
value |= 1 << 6;
|
|
|
|
wrmsrl(MSR_K7_HWCR, value);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-01-30 19:32:40 +07:00
|
|
|
early_init_amd(c);
|
|
|
|
|
2008-02-23 05:10:33 +07:00
|
|
|
/*
|
|
|
|
* Bit 31 in normal CPUID used for nonstandard 3DNow ID;
|
2008-02-26 14:49:57 +07:00
|
|
|
* 3DNow is IDd by bit 31 in extended CPUID (1*32+31) anyway
|
2008-02-23 05:10:33 +07:00
|
|
|
*/
|
2008-02-26 14:49:57 +07:00
|
|
|
clear_cpu_cap(c, 0*32+31);
|
2008-02-23 05:10:33 +07:00
|
|
|
|
2008-09-08 07:58:54 +07:00
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
/* On C+ stepping K8 rep microcode works well for copy/memset */
|
|
|
|
if (c->x86 == 0xf) {
|
|
|
|
u32 level;
|
|
|
|
|
|
|
|
level = cpuid_eax(1);
|
2009-07-04 06:35:45 +07:00
|
|
|
if ((level >= 0x0f48 && level < 0x0f50) || level >= 0x0f58)
|
2008-09-08 07:58:54 +07:00
|
|
|
set_cpu_cap(c, X86_FEATURE_REP_GOOD);
|
2009-08-11 05:56:45 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Some BIOSes incorrectly force this feature, but only K8
|
|
|
|
* revision D (model = 0x14) and later actually support it.
|
2009-08-31 14:50:11 +07:00
|
|
|
* (AMD Erratum #110, docId: 25759).
|
2009-08-11 05:56:45 +07:00
|
|
|
*/
|
2009-08-31 14:50:11 +07:00
|
|
|
if (c->x86_model < 0x14 && cpu_has(c, X86_FEATURE_LAHF_LM)) {
|
2009-08-11 05:56:45 +07:00
|
|
|
clear_cpu_cap(c, X86_FEATURE_LAHF_LM);
|
2013-01-30 04:32:16 +07:00
|
|
|
if (!rdmsrl_amd_safe(0xc001100d, &value)) {
|
|
|
|
value &= ~(1ULL << 32);
|
|
|
|
wrmsrl_amd_safe(0xc001100d, value);
|
2009-08-31 14:50:11 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-09-08 07:58:54 +07:00
|
|
|
}
|
2010-06-03 01:29:21 +07:00
|
|
|
if (c->x86 >= 0x10)
|
2008-09-08 07:58:54 +07:00
|
|
|
set_cpu_cap(c, X86_FEATURE_REP_GOOD);
|
2009-08-30 03:17:14 +07:00
|
|
|
|
|
|
|
/* get apicid instead of initial apic id from cpuid */
|
|
|
|
c->apicid = hard_smp_processor_id();
|
2008-09-08 07:58:54 +07:00
|
|
|
#else
|
|
|
|
|
|
|
|
/*
|
|
|
|
* FIXME: We should handle the K5 here. Set up the write
|
|
|
|
* range and also turn on MSR 83 bits 4 and 31 (write alloc,
|
|
|
|
* no bus pipeline)
|
|
|
|
*/
|
|
|
|
|
2008-02-23 05:10:33 +07:00
|
|
|
switch (c->x86) {
|
|
|
|
case 4:
|
2008-09-08 07:58:50 +07:00
|
|
|
init_amd_k5(c);
|
|
|
|
break;
|
2008-02-23 05:10:33 +07:00
|
|
|
case 5:
|
2008-09-08 07:58:50 +07:00
|
|
|
init_amd_k6(c);
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
2008-09-08 07:58:50 +07:00
|
|
|
case 6: /* An Athlon/Duron */
|
|
|
|
init_amd_k7(c);
|
2005-04-17 05:20:36 +07:00
|
|
|
break;
|
|
|
|
}
|
2008-09-08 07:58:50 +07:00
|
|
|
|
|
|
|
/* K6s reports MCEs but don't actually have all the MSRs */
|
|
|
|
if (c->x86 < 6)
|
|
|
|
clear_cpu_cap(c, X86_FEATURE_MCE);
|
2008-09-08 07:58:54 +07:00
|
|
|
#endif
|
2008-09-08 07:58:50 +07:00
|
|
|
|
2008-09-08 07:58:54 +07:00
|
|
|
/* Enable workaround for FXSAVE leak */
|
2006-04-20 07:36:45 +07:00
|
|
|
if (c->x86 >= 6)
|
2008-02-26 14:49:57 +07:00
|
|
|
set_cpu_cap(c, X86_FEATURE_FXSAVE_LEAK);
|
2005-04-17 05:20:36 +07:00
|
|
|
|
2008-09-08 07:58:50 +07:00
|
|
|
if (!c->x86_model_id[0]) {
|
|
|
|
switch (c->x86) {
|
|
|
|
case 0xf:
|
|
|
|
/* Should distinguish Models here, but this is only
|
|
|
|
a fallback anyways. */
|
|
|
|
strcpy(c->x86_model_id, "Hammer");
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2005-04-17 05:25:15 +07:00
|
|
|
|
2012-04-03 17:13:07 +07:00
|
|
|
/* re-enable TopologyExtensions if switched off by BIOS */
|
|
|
|
if ((c->x86 == 0x15) &&
|
|
|
|
(c->x86_model >= 0x10) && (c->x86_model <= 0x1f) &&
|
|
|
|
!cpu_has(c, X86_FEATURE_TOPOEXT)) {
|
|
|
|
|
2013-01-30 04:32:16 +07:00
|
|
|
if (!rdmsrl_safe(0xc0011005, &value)) {
|
|
|
|
value |= 1ULL << 54;
|
|
|
|
wrmsrl_safe(0xc0011005, value);
|
|
|
|
rdmsrl(0xc0011005, value);
|
|
|
|
if (value & (1ULL << 54)) {
|
2012-04-03 17:13:07 +07:00
|
|
|
set_cpu_cap(c, X86_FEATURE_TOPOEXT);
|
|
|
|
printk(KERN_INFO FW_INFO "CPU: Re-enabling "
|
|
|
|
"disabled Topology Extensions Support\n");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-10-31 23:20:50 +07:00
|
|
|
/*
|
|
|
|
* The way access filter has a performance penalty on some workloads.
|
|
|
|
* Disable it on the affected CPUs.
|
|
|
|
*/
|
|
|
|
if ((c->x86 == 0x15) &&
|
|
|
|
(c->x86_model >= 0x02) && (c->x86_model < 0x20)) {
|
|
|
|
|
2013-01-30 04:32:16 +07:00
|
|
|
if (!rdmsrl_safe(0xc0011021, &value) && !(value & 0x1E)) {
|
|
|
|
value |= 0x1E;
|
|
|
|
wrmsrl_safe(0xc0011021, value);
|
2012-10-31 23:20:50 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-11-21 20:01:45 +07:00
|
|
|
cpu_detect_cache_sizes(c);
|
2005-04-17 05:25:15 +07:00
|
|
|
|
2008-09-08 07:58:50 +07:00
|
|
|
/* Multi core CPU? */
|
2008-09-08 07:58:54 +07:00
|
|
|
if (c->extended_cpuid_level >= 0x80000008) {
|
2008-09-08 07:58:50 +07:00
|
|
|
amd_detect_cmp(c);
|
2008-09-08 07:58:54 +07:00
|
|
|
srat_detect_node(c);
|
|
|
|
}
|
2006-06-26 18:56:10 +07:00
|
|
|
|
2008-09-08 07:58:54 +07:00
|
|
|
#ifdef CONFIG_X86_32
|
2008-09-08 07:58:50 +07:00
|
|
|
detect_ht(c);
|
2008-09-08 07:58:54 +07:00
|
|
|
#endif
|
2006-01-12 04:42:45 +07:00
|
|
|
|
2012-10-19 15:59:33 +07:00
|
|
|
init_amd_cacheinfo(c);
|
2007-04-02 17:14:12 +07:00
|
|
|
|
2010-06-03 01:29:21 +07:00
|
|
|
if (c->x86 >= 0xf)
|
2008-09-08 07:58:50 +07:00
|
|
|
set_cpu_cap(c, X86_FEATURE_K8);
|
2008-01-30 19:32:37 +07:00
|
|
|
|
2008-09-08 07:58:50 +07:00
|
|
|
if (cpu_has_xmm2) {
|
|
|
|
/* MFENCE stops RDTSC speculation */
|
2008-02-26 14:49:57 +07:00
|
|
|
set_cpu_cap(c, X86_FEATURE_MFENCE_RDTSC);
|
2008-09-08 07:58:50 +07:00
|
|
|
}
|
2008-09-08 07:58:54 +07:00
|
|
|
|
|
|
|
#ifdef CONFIG_X86_64
|
|
|
|
if (c->x86 == 0x10) {
|
|
|
|
/* do this for boot cpu */
|
|
|
|
if (c == &boot_cpu_data)
|
|
|
|
check_enable_amd_mmconf_dmi();
|
|
|
|
|
|
|
|
fam10h_check_enable_mmcfg();
|
|
|
|
}
|
|
|
|
|
2010-06-03 01:29:21 +07:00
|
|
|
if (c == &boot_cpu_data && c->x86 >= 0xf) {
|
2008-09-08 07:58:54 +07:00
|
|
|
unsigned long long tseg;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Split up direct mapping around the TSEG SMM area.
|
|
|
|
* Don't do it for gbpages because there seems very little
|
|
|
|
* benefit in doing so.
|
|
|
|
*/
|
|
|
|
if (!rdmsrl_safe(MSR_K8_TSEG_ADDR, &tseg)) {
|
2012-11-17 10:38:48 +07:00
|
|
|
unsigned long pfn = tseg >> PAGE_SHIFT;
|
|
|
|
|
2009-07-04 06:35:45 +07:00
|
|
|
printk(KERN_DEBUG "tseg: %010llx\n", tseg);
|
2012-11-17 10:38:48 +07:00
|
|
|
if (pfn_range_is_mapped(pfn, pfn + 1))
|
2009-07-04 06:35:45 +07:00
|
|
|
set_memory_4k((unsigned long)__va(tseg), 1);
|
2008-09-08 07:58:54 +07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
2011-03-15 23:13:44 +07:00
|
|
|
|
2011-05-26 22:19:52 +07:00
|
|
|
/*
|
|
|
|
* Family 0x12 and above processors have APIC timer
|
|
|
|
* running in deep C states.
|
|
|
|
*/
|
|
|
|
if (c->x86 > 0x11)
|
2011-03-15 23:13:44 +07:00
|
|
|
set_cpu_cap(c, X86_FEATURE_ARAT);
|
2011-04-15 19:47:40 +07:00
|
|
|
|
|
|
|
if (c->x86 == 0x10) {
|
|
|
|
/*
|
2013-01-30 04:32:49 +07:00
|
|
|
* Disable GART TLB Walk Errors on Fam10h. We do this here
|
|
|
|
* because this is always needed when GART is enabled, even in a
|
|
|
|
* kernel which has no MCE support built in.
|
2011-04-15 19:47:40 +07:00
|
|
|
* BIOS should disable GartTlbWlk Errors themself. If
|
|
|
|
* it doesn't do it here as suggested by the BKDG.
|
|
|
|
*
|
|
|
|
* Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=33012
|
|
|
|
*/
|
|
|
|
u64 mask;
|
2011-05-19 16:13:39 +07:00
|
|
|
int err;
|
2011-04-15 19:47:40 +07:00
|
|
|
|
2011-05-19 16:13:39 +07:00
|
|
|
err = rdmsrl_safe(MSR_AMD64_MCx_MASK(4), &mask);
|
|
|
|
if (err == 0) {
|
|
|
|
mask |= (1 << 10);
|
2012-06-08 03:32:04 +07:00
|
|
|
wrmsrl_safe(MSR_AMD64_MCx_MASK(4), mask);
|
2011-05-19 16:13:39 +07:00
|
|
|
}
|
2013-01-30 04:32:49 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* On family 10h BIOS may not have properly enabled WC+ support,
|
|
|
|
* causing it to be converted to CD memtype. This may result in
|
|
|
|
* performance degradation for certain nested-paging guests.
|
|
|
|
* Prevent this conversion by clearing bit 24 in
|
|
|
|
* MSR_AMD64_BU_CFG2.
|
2013-02-20 01:33:12 +07:00
|
|
|
*
|
|
|
|
* NOTE: we want to use the _safe accessors so as not to #GP kvm
|
|
|
|
* guests on older kvm hosts.
|
2013-01-30 04:32:49 +07:00
|
|
|
*/
|
2013-02-20 01:33:12 +07:00
|
|
|
|
|
|
|
rdmsrl_safe(MSR_AMD64_BU_CFG2, &value);
|
|
|
|
value &= ~(1ULL << 24);
|
|
|
|
wrmsrl_safe(MSR_AMD64_BU_CFG2, value);
|
2013-03-20 21:07:27 +07:00
|
|
|
|
2013-07-24 00:40:49 +07:00
|
|
|
if (cpu_has_amd_erratum(c, amd_erratum_383))
|
2013-03-20 21:07:27 +07:00
|
|
|
set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH);
|
2011-04-15 19:47:40 +07:00
|
|
|
}
|
x86: Fix boot failures on older AMD CPU's
People with old AMD chips are getting hung boots, because commit
bcb80e53877c ("x86, microcode, AMD: Add microcode revision to
/proc/cpuinfo") moved the microcode detection too early into
"early_init_amd()".
At that point we are *so* early in the booth that the exception tables
haven't even been set up yet, so the whole
rdmsr_safe(MSR_AMD64_PATCH_LEVEL, &c->microcode, &dummy);
doesn't actually work: if the rdmsr does a GP fault (due to non-existant
MSR register on older CPU's), we can't fix it up yet, and the boot fails.
Fix it by simply moving the code to a slightly later point in the boot
(init_amd() instead of early_init_amd()), since the kernel itself
doesn't even really care about the microcode patchlevel at this point
(or really ever: it's made available to user space in /proc/cpuinfo, and
updated if you do a microcode load).
Reported-tested-and-bisected-by: Larry Finger <Larry.Finger@lwfinger.net>
Tested-by: Bob Tracy <rct@gherkin.frus.com>
Acked-by: Borislav Petkov <borislav.petkov@amd.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-05 02:57:09 +07:00
|
|
|
|
2013-07-24 00:40:49 +07:00
|
|
|
if (cpu_has_amd_erratum(c, amd_erratum_400))
|
2013-03-20 21:07:28 +07:00
|
|
|
set_cpu_bug(c, X86_BUG_AMD_APIC_C1E);
|
|
|
|
|
x86: Fix boot failures on older AMD CPU's
People with old AMD chips are getting hung boots, because commit
bcb80e53877c ("x86, microcode, AMD: Add microcode revision to
/proc/cpuinfo") moved the microcode detection too early into
"early_init_amd()".
At that point we are *so* early in the booth that the exception tables
haven't even been set up yet, so the whole
rdmsr_safe(MSR_AMD64_PATCH_LEVEL, &c->microcode, &dummy);
doesn't actually work: if the rdmsr does a GP fault (due to non-existant
MSR register on older CPU's), we can't fix it up yet, and the boot fails.
Fix it by simply moving the code to a slightly later point in the boot
(init_amd() instead of early_init_amd()), since the kernel itself
doesn't even really care about the microcode patchlevel at this point
(or really ever: it's made available to user space in /proc/cpuinfo, and
updated if you do a microcode load).
Reported-tested-and-bisected-by: Larry Finger <Larry.Finger@lwfinger.net>
Tested-by: Bob Tracy <rct@gherkin.frus.com>
Acked-by: Borislav Petkov <borislav.petkov@amd.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2011-12-05 02:57:09 +07:00
|
|
|
rdmsr_safe(MSR_AMD64_PATCH_LEVEL, &c->microcode, &dummy);
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
|
2008-09-08 07:58:54 +07:00
|
|
|
#ifdef CONFIG_X86_32
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 05:23:59 +07:00
|
|
|
static unsigned int amd_size_cache(struct cpuinfo_x86 *c, unsigned int size)
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
/* AMD errata T13 (order #21922) */
|
|
|
|
if ((c->x86 == 6)) {
|
2009-07-04 06:35:45 +07:00
|
|
|
/* Duron Rev A0 */
|
|
|
|
if (c->x86_model == 3 && c->x86_mask == 0)
|
2005-04-17 05:20:36 +07:00
|
|
|
size = 64;
|
2009-07-04 06:35:45 +07:00
|
|
|
/* Tbird rev A1/A2 */
|
2005-04-17 05:20:36 +07:00
|
|
|
if (c->x86_model == 4 &&
|
2009-07-04 06:35:45 +07:00
|
|
|
(c->x86_mask == 0 || c->x86_mask == 1))
|
2005-04-17 05:20:36 +07:00
|
|
|
size = 256;
|
|
|
|
}
|
|
|
|
return size;
|
|
|
|
}
|
2008-09-08 07:58:54 +07:00
|
|
|
#endif
|
2005-04-17 05:20:36 +07:00
|
|
|
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 05:23:59 +07:00
|
|
|
static void cpu_set_tlb_flushall_shift(struct cpuinfo_x86 *c)
|
2012-08-07 00:00:39 +07:00
|
|
|
{
|
|
|
|
tlb_flushall_shift = 5;
|
|
|
|
|
|
|
|
if (c->x86 <= 0x11)
|
|
|
|
tlb_flushall_shift = 4;
|
|
|
|
}
|
|
|
|
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 05:23:59 +07:00
|
|
|
static void cpu_detect_tlb_amd(struct cpuinfo_x86 *c)
|
2012-08-07 00:00:38 +07:00
|
|
|
{
|
|
|
|
u32 ebx, eax, ecx, edx;
|
|
|
|
u16 mask = 0xfff;
|
|
|
|
|
|
|
|
if (c->x86 < 0xf)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (c->extended_cpuid_level < 0x80000006)
|
|
|
|
return;
|
|
|
|
|
|
|
|
cpuid(0x80000006, &eax, &ebx, &ecx, &edx);
|
|
|
|
|
|
|
|
tlb_lld_4k[ENTRIES] = (ebx >> 16) & mask;
|
|
|
|
tlb_lli_4k[ENTRIES] = ebx & mask;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* K8 doesn't have 2M/4M entries in the L2 TLB so read out the L1 TLB
|
|
|
|
* characteristics from the CPUID function 0x80000005 instead.
|
|
|
|
*/
|
|
|
|
if (c->x86 == 0xf) {
|
|
|
|
cpuid(0x80000005, &eax, &ebx, &ecx, &edx);
|
|
|
|
mask = 0xff;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Handle DTLB 2M and 4M sizes, fall back to L1 if L2 is disabled */
|
|
|
|
if (!((eax >> 16) & mask)) {
|
|
|
|
u32 a, b, c, d;
|
|
|
|
|
|
|
|
cpuid(0x80000005, &a, &b, &c, &d);
|
|
|
|
tlb_lld_2m[ENTRIES] = (a >> 16) & 0xff;
|
|
|
|
} else {
|
|
|
|
tlb_lld_2m[ENTRIES] = (eax >> 16) & mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* a 4M entry uses two 2M entries */
|
|
|
|
tlb_lld_4m[ENTRIES] = tlb_lld_2m[ENTRIES] >> 1;
|
|
|
|
|
|
|
|
/* Handle ITLB 2M and 4M sizes, fall back to L1 if L2 is disabled */
|
|
|
|
if (!(eax & mask)) {
|
|
|
|
/* Erratum 658 */
|
|
|
|
if (c->x86 == 0x15 && c->x86_model <= 0x1f) {
|
|
|
|
tlb_lli_2m[ENTRIES] = 1024;
|
|
|
|
} else {
|
|
|
|
cpuid(0x80000005, &eax, &ebx, &ecx, &edx);
|
|
|
|
tlb_lli_2m[ENTRIES] = eax & 0xff;
|
|
|
|
}
|
|
|
|
} else
|
|
|
|
tlb_lli_2m[ENTRIES] = eax & mask;
|
|
|
|
|
|
|
|
tlb_lli_4m[ENTRIES] = tlb_lli_2m[ENTRIES] >> 1;
|
2012-08-07 00:00:39 +07:00
|
|
|
|
|
|
|
cpu_set_tlb_flushall_shift(c);
|
2012-08-07 00:00:38 +07:00
|
|
|
}
|
|
|
|
|
x86: delete __cpuinit usage from all x86 files
The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications. For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.
After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out. Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.
Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings. In any case, they are temporary and harmless.
This removes all the arch/x86 uses of the __cpuinit macros from
all C files. x86 only had the one __CPUINIT used in assembly files,
and it wasn't paired off with a .previous or a __FINIT, so we can
delete it directly w/o any corresponding additional change there.
[1] https://lkml.org/lkml/2013/5/20/589
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Acked-by: Ingo Molnar <mingo@kernel.org>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: H. Peter Anvin <hpa@linux.intel.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
2013-06-19 05:23:59 +07:00
|
|
|
static const struct cpu_dev amd_cpu_dev = {
|
2005-04-17 05:20:36 +07:00
|
|
|
.c_vendor = "AMD",
|
2008-02-23 05:10:33 +07:00
|
|
|
.c_ident = { "AuthenticAMD" },
|
2008-09-08 07:58:54 +07:00
|
|
|
#ifdef CONFIG_X86_32
|
2013-10-21 15:35:20 +07:00
|
|
|
.legacy_models = {
|
|
|
|
{ .family = 4, .model_names =
|
2005-04-17 05:20:36 +07:00
|
|
|
{
|
|
|
|
[3] = "486 DX/2",
|
|
|
|
[7] = "486 DX/2-WB",
|
2008-02-23 05:10:33 +07:00
|
|
|
[8] = "486 DX/4",
|
|
|
|
[9] = "486 DX/4-WB",
|
2005-04-17 05:20:36 +07:00
|
|
|
[14] = "Am5x86-WT",
|
2008-02-23 05:10:33 +07:00
|
|
|
[15] = "Am5x86-WB"
|
2005-04-17 05:20:36 +07:00
|
|
|
}
|
|
|
|
},
|
|
|
|
},
|
2013-10-21 15:35:20 +07:00
|
|
|
.legacy_cache_size = amd_size_cache,
|
2008-09-08 07:58:54 +07:00
|
|
|
#endif
|
x86: use ELF section to list CPU vendor specific code
Replace the hardcoded list of initialization functions for each CPU
vendor by a list in an ELF section, which is read at initialization in
arch/x86/kernel/cpu/cpu.c to fill the cpu_devs[] array. The ELF
section, named .x86cpuvendor.init, is reclaimed after boot, and
contains entries of type "struct cpu_vendor_dev" which associates a
vendor number with a pointer to a "struct cpu_dev" structure.
This first modification allows to remove all the VENDOR_init_cpu()
functions.
This patch also removes the hardcoded calls to early_init_amd() and
early_init_intel(). Instead, we add a "c_early_init" member to the
cpu_dev structure, which is then called if not NULL by the generic CPU
initialization code. Unfortunately, in early_cpu_detect(), this_cpu is
not yet set, so we have to use the cpu_devs[] array directly.
This patch is part of the Linux Tiny project, and is needed for
further patch that will allow to disable compilation of unused CPU
support code.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
2008-02-15 18:00:23 +07:00
|
|
|
.c_early_init = early_init_amd,
|
2012-08-07 00:00:38 +07:00
|
|
|
.c_detect_tlb = cpu_detect_tlb_amd,
|
2011-08-06 01:04:09 +07:00
|
|
|
.c_bsp_init = bsp_init_amd,
|
2005-04-17 05:20:36 +07:00
|
|
|
.c_init = init_amd,
|
2008-09-05 02:09:45 +07:00
|
|
|
.c_x86_vendor = X86_VENDOR_AMD,
|
2005-04-17 05:20:36 +07:00
|
|
|
};
|
|
|
|
|
2008-09-05 02:09:45 +07:00
|
|
|
cpu_dev_register(amd_cpu_dev);
|
2010-07-29 00:09:30 +07:00
|
|
|
|
|
|
|
/*
|
|
|
|
* AMD errata checking
|
|
|
|
*
|
|
|
|
* Errata are defined as arrays of ints using the AMD_LEGACY_ERRATUM() or
|
|
|
|
* AMD_OSVW_ERRATUM() macros. The latter is intended for newer errata that
|
|
|
|
* have an OSVW id assigned, which it takes as first argument. Both take a
|
|
|
|
* variable number of family-specific model-stepping ranges created by
|
2013-03-20 21:07:28 +07:00
|
|
|
* AMD_MODEL_RANGE().
|
2010-07-29 00:09:30 +07:00
|
|
|
*
|
|
|
|
* Example:
|
|
|
|
*
|
|
|
|
* const int amd_erratum_319[] =
|
|
|
|
* AMD_LEGACY_ERRATUM(AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0x4, 0x2),
|
|
|
|
* AMD_MODEL_RANGE(0x10, 0x8, 0x0, 0x8, 0x0),
|
|
|
|
* AMD_MODEL_RANGE(0x10, 0x9, 0x0, 0x9, 0x0));
|
|
|
|
*/
|
|
|
|
|
2013-03-20 21:07:28 +07:00
|
|
|
#define AMD_LEGACY_ERRATUM(...) { -1, __VA_ARGS__, 0 }
|
|
|
|
#define AMD_OSVW_ERRATUM(osvw_id, ...) { osvw_id, __VA_ARGS__, 0 }
|
|
|
|
#define AMD_MODEL_RANGE(f, m_start, s_start, m_end, s_end) \
|
|
|
|
((f << 24) | (m_start << 16) | (s_start << 12) | (m_end << 4) | (s_end))
|
|
|
|
#define AMD_MODEL_RANGE_FAMILY(range) (((range) >> 24) & 0xff)
|
|
|
|
#define AMD_MODEL_RANGE_START(range) (((range) >> 12) & 0xfff)
|
|
|
|
#define AMD_MODEL_RANGE_END(range) ((range) & 0xfff)
|
|
|
|
|
|
|
|
static const int amd_erratum_400[] =
|
2011-05-17 19:55:18 +07:00
|
|
|
AMD_OSVW_ERRATUM(1, AMD_MODEL_RANGE(0xf, 0x41, 0x2, 0xff, 0xf),
|
2010-07-29 00:09:31 +07:00
|
|
|
AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0xff, 0xf));
|
|
|
|
|
2013-03-20 21:07:27 +07:00
|
|
|
static const int amd_erratum_383[] =
|
2010-07-29 00:09:32 +07:00
|
|
|
AMD_OSVW_ERRATUM(3, AMD_MODEL_RANGE(0x10, 0, 0, 0xff, 0xf));
|
2010-07-29 00:09:31 +07:00
|
|
|
|
2013-07-24 00:40:49 +07:00
|
|
|
|
|
|
|
static bool cpu_has_amd_erratum(struct cpuinfo_x86 *cpu, const int *erratum)
|
2010-07-29 00:09:30 +07:00
|
|
|
{
|
|
|
|
int osvw_id = *erratum++;
|
|
|
|
u32 range;
|
|
|
|
u32 ms;
|
|
|
|
|
|
|
|
if (osvw_id >= 0 && osvw_id < 65536 &&
|
|
|
|
cpu_has(cpu, X86_FEATURE_OSVW)) {
|
|
|
|
u64 osvw_len;
|
|
|
|
|
|
|
|
rdmsrl(MSR_AMD64_OSVW_ID_LENGTH, osvw_len);
|
|
|
|
if (osvw_id < osvw_len) {
|
|
|
|
u64 osvw_bits;
|
|
|
|
|
|
|
|
rdmsrl(MSR_AMD64_OSVW_STATUS + (osvw_id >> 6),
|
|
|
|
osvw_bits);
|
|
|
|
return osvw_bits & (1ULL << (osvw_id & 0x3f));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* OSVW unavailable or ID unknown, match family-model-stepping range */
|
2010-08-18 21:19:50 +07:00
|
|
|
ms = (cpu->x86_model << 4) | cpu->x86_mask;
|
2010-07-29 00:09:30 +07:00
|
|
|
while ((range = *erratum++))
|
|
|
|
if ((cpu->x86 == AMD_MODEL_RANGE_FAMILY(range)) &&
|
|
|
|
(ms >= AMD_MODEL_RANGE_START(range)) &&
|
|
|
|
(ms <= AMD_MODEL_RANGE_END(range)))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|