From patchwork Mon Jul 9 13:04:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Varun Sethi X-Patchwork-Id: 169818 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 8BA522C0370 for ; Mon, 9 Jul 2012 23:05:57 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753482Ab2GINFs (ORCPT ); Mon, 9 Jul 2012 09:05:48 -0400 Received: from co1ehsobe003.messaging.microsoft.com ([216.32.180.186]:19427 "EHLO co1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753155Ab2GINFp (ORCPT ); Mon, 9 Jul 2012 09:05:45 -0400 Received: from mail209-co1-R.bigfish.com (10.243.78.240) by CO1EHSOBE008.bigfish.com (10.243.66.71) with Microsoft SMTP Server id 14.1.225.23; Mon, 9 Jul 2012 13:03:29 +0000 Received: from mail209-co1 (localhost [127.0.0.1]) by mail209-co1-R.bigfish.com (Postfix) with ESMTP id EED981C02D5 for ; Mon, 9 Jul 2012 13:03:28 +0000 (UTC) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839he5bhf0ah) Received: from mail209-co1 (localhost.localdomain [127.0.0.1]) by mail209-co1 (MessageSwitch) id 1341839006731309_32256; Mon, 9 Jul 2012 13:03:26 +0000 (UTC) Received: from CO1EHSMHS010.bigfish.com (unknown [10.243.78.230]) by mail209-co1.bigfish.com (Postfix) with ESMTP id B0E3B980048 for ; Mon, 9 Jul 2012 13:03:26 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CO1EHSMHS010.bigfish.com (10.243.66.20) with Microsoft SMTP Server (TLS) id 14.1.225.23; Mon, 9 Jul 2012 13:03:26 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-002.039d.mgd.msft.net (10.84.1.15) with Microsoft SMTP Server (TLS) id 14.2.298.5; Mon, 9 Jul 2012 08:05:41 -0500 Received: from nmglablinux27.zin33.ap.freescale.net ([10.213.130.145]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id q69D5df2011721 for ; Mon, 9 Jul 2012 06:05:40 -0700 Received: from nmglablinux27.zin33.ap.freescale.net (localhost [127.0.0.1]) by nmglablinux27.zin33.ap.freescale.net (8.14.4/8.14.4/Debian-2ubuntu1) with ESMTP id q69D4SFI017264; Mon, 9 Jul 2012 18:34:28 +0530 Received: (from varuns@localhost) by nmglablinux27.zin33.ap.freescale.net (8.14.4/8.14.4/Submit) id q69D4SWd017262; Mon, 9 Jul 2012 18:34:28 +0530 From: Varun Sethi To: , , , , CC: Varun Sethi , Mihai Caraman Subject: [PATCH 4/4] powerpc/booke: Add CPU_FTR_EMB_HV check for e5500. Date: Mon, 9 Jul 2012 18:34:01 +0530 Message-ID: <1341839041-17223-1-git-send-email-Varun.Sethi@freescale.com> X-Mailer: git-send-email 1.7.4.1 MIME-Version: 1.0 X-OriginatorOrg: freescale.net Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Added CPU_FTR_EMB_HV feature check for e550. Signed-off-by: Varun Sethi Signed-off-by: Mihai Caraman --- arch/powerpc/kernel/cpu_setup_fsl_booke.S | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S index 1345e1b..dcd8819 100644 --- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S +++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S @@ -143,7 +143,13 @@ _GLOBAL(__setup_cpu_e5500) rlwinm. r10,r10,0,MMUCFG_LPIDSIZE beq 1f bl .setup_ehv_ivors + b 2f 1: + ld r10,CPU_SPEC_FEATURES(r4) + LOAD_REG_IMMEDIATE(r9,CPU_FTR_EMB_HV) + andc r10,r10,r9 + std r10,CPU_SPEC_FEATURES(r4) +2: mtlr r5 blr #endif