[tip:x86/cpu] x86, cpu: Use AMD errata checking framework for erratum 383
in [Kernel]
|
Prev: [GIT PULL] hopefully final SCSI fixes for 2.6.35-rc6
Next: [tip:x86/cpu] x86, cpu: Export AMD errata definitions
From: tip-bot for Hans Rosenfeld on 28 Jul 2010 19:30 Commit-ID: 1be85a6d93f4207d8c2c6238c4a96895e28cefba Gitweb: http://git.kernel.org/tip/1be85a6d93f4207d8c2c6238c4a96895e28cefba Author: Hans Rosenfeld <hans.rosenfeld(a)amd.com> AuthorDate: Wed, 28 Jul 2010 19:09:32 +0200 Committer: H. Peter Anvin <hpa(a)linux.intel.com> CommitDate: Wed, 28 Jul 2010 13:12:31 -0700 x86, cpu: Use AMD errata checking framework for erratum 383 Use the AMD errata checking framework instead of open-coding the test. Signed-off-by: Hans Rosenfeld <hans.rosenfeld(a)amd.com> LKML-Reference: <1280336972-865982-3-git-send-email-hans.rosenfeld(a)amd.com> Signed-off-by: H. Peter Anvin <hpa(a)linux.intel.com> --- arch/x86/include/asm/processor.h | 1 + arch/x86/kernel/cpu/amd.c | 2 ++ arch/x86/kvm/svm.c | 3 +-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index eebdc1f..d85637b 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -1029,6 +1029,7 @@ unsigned long calc_aperfmperf_ratio(struct aperfmperf *old, * AMD errata checking */ #ifdef CONFIG_CPU_SUP_AMD +extern const int amd_erratum_383[]; extern const int amd_erratum_400[]; extern bool cpu_has_amd_erratum(const int *); diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index a62a4ae..30f30dc 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c @@ -632,6 +632,8 @@ const int amd_erratum_400[] = AMD_OSVW_ERRATUM(1, AMD_MODEL_RANGE(0xf, 0x41, 0x2, 0xff, 0xf), AMD_MODEL_RANGE(0x10, 0x2, 0x1, 0xff, 0xf)); +const int amd_erratum_383[] = + AMD_OSVW_ERRATUM(3, AMD_MODEL_RANGE(0x10, 0, 0, 0xff, 0xf)); bool cpu_has_amd_erratum(const int *erratum) { diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index ce438e0..03b534b 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -383,8 +383,7 @@ static void svm_init_erratum_383(void) int err; u64 val; - /* Only Fam10h is affected */ - if (boot_cpu_data.x86 != 0x10) + if (!cpu_has_amd_erratum(amd_erratum_383)) return; /* Use _safe variants to not break nested virtualization */ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |