From patchwork Fri May 21 23:17:39 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 53218 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 2D38FB7D30 for ; Sat, 22 May 2010 09:18:06 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OFbTe-0004pS-1M; Sat, 22 May 2010 00:18:02 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OFbTc-0004om-0t for kernel-team@lists.ubuntu.com; Sat, 22 May 2010 00:18:00 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OFbTb-0008Rk-VF for ; Sat, 22 May 2010 00:17:59 +0100 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OFbTb-0006hf-Hw for kernel-team@lists.ubuntu.com; Sat, 22 May 2010 00:17:59 +0100 Subject: [PATCH 03/13] Revert "UBUNTU: Disable 4MB page tables for Atom, work around errata AAE44" From: Leann Ogasawara To: kernel-team In-Reply-To: <1274483333.19284.3264.camel@emiko> References: <1274483333.19284.3264.camel@emiko> Date: Fri, 21 May 2010 16:17:39 -0700 Message-ID: <1274483859.19284.3320.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com >From 24c239d1bfe52777913b79975286b8a12f9809cd Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Fri, 21 May 2010 14:26:53 -0700 Subject: [PATCH 03/13] Revert "UBUNTU: Disable 4MB page tables for Atom, work around errata AAE44" This reverts commit e9c6db30796c6c2cd4e31308e44cbe9ae934814a. Drop this patch in favor of the upstream incantation. commit 7a0fc404ae663776e96db43879a0fa24fec1fa3a Author: H. Peter Anvin Date: Tue Apr 13 14:40:54 2010 -0700 x86: Disable large pages on CPUs with Atom erratum AAE44 Signed-off-by: Leann Ogasawara --- arch/x86/kernel/cpu/bugs.c | 15 --------------- 1 files changed, 0 insertions(+), 15 deletions(-) diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 661c610..01a2652 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -151,20 +151,6 @@ static void __init check_config(void) #endif } -static void __init check_atom(void) -{ - - /* - * Disable 4MB page tables to work around Intel errata AAE44 for - * Atom. We cannot guarantee stopping undefined processor behaviour - * when two pageing structure translations differ with respect to - * page frame sizes. Hence, for Atoms we disable the PSE. - */ - if (boot_cpu_data.x86_model == 0x1c) { - clear_bit(X86_FEATURE_PSE, boot_cpu_data.x86_capability); - printk(KERN_INFO "Disabling 4MB page tables to avoid TLB bug\n"); - } -} void __init check_bugs(void) { @@ -177,7 +163,6 @@ void __init check_bugs(void) check_fpu(); check_hlt(); check_popad(); - check_atom(); init_utsname()->machine[1] = '0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86); alternative_instructions();