From patchwork Thu Feb 16 09:26:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Yu-B13201 X-Patchwork-Id: 141539 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 D1F4110136C for ; Thu, 16 Feb 2012 20:31:10 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751501Ab2BPJbH (ORCPT ); Thu, 16 Feb 2012 04:31:07 -0500 Received: from ch1ehsobe001.messaging.microsoft.com ([216.32.181.181]:52633 "EHLO ch1outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751019Ab2BPJbE (ORCPT ); Thu, 16 Feb 2012 04:31:04 -0500 Received: from mail70-ch1-R.bigfish.com (10.43.68.251) by CH1EHSOBE013.bigfish.com (10.43.70.63) with Microsoft SMTP Server id 14.1.225.23; Thu, 16 Feb 2012 09:31:02 +0000 Received: from mail70-ch1 (localhost [127.0.0.1]) by mail70-ch1-R.bigfish.com (Postfix) with ESMTP id D869A1A00A5; Thu, 16 Feb 2012 09:31:01 +0000 (UTC) X-SpamScore: 0 X-BigFish: VS0(zzzz1202hzz8275bhz2dh2a8h668h839h) X-Forefront-Antispam-Report: CIP:70.37.183.190; KIP:(null); UIP:(null); IPV:NLI; H:mail.freescale.net; RD:none; EFVD:NLI Received: from mail70-ch1 (localhost.localdomain [127.0.0.1]) by mail70-ch1 (MessageSwitch) id 1329384660328024_26152; Thu, 16 Feb 2012 09:31:00 +0000 (UTC) Received: from CH1EHSMHS017.bigfish.com (snatpool2.int.messaging.microsoft.com [10.43.68.230]) by mail70-ch1.bigfish.com (Postfix) with ESMTP id 403FD2004C; Thu, 16 Feb 2012 09:31:00 +0000 (UTC) Received: from mail.freescale.net (70.37.183.190) by CH1EHSMHS017.bigfish.com (10.43.70.17) with Microsoft SMTP Server (TLS) id 14.1.225.23; Thu, 16 Feb 2012 09:30:58 +0000 Received: from az84smr01.freescale.net (10.64.34.197) by 039-SN1MMR1-001.039d.mgd.msft.net (10.84.1.13) with Microsoft SMTP Server (TLS) id 14.1.355.3; Thu, 16 Feb 2012 03:30:11 -0600 Received: from localhost (rock.ap.freescale.net [10.193.20.106]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id q1G9U8In020192; Thu, 16 Feb 2012 02:30:09 -0700 From: Liu Yu To: , , CC: , , Liu Yu Subject: [PATCH v4 3/3] KVM: PPC: epapr: install ev_idle hcall for e500 guest Date: Thu, 16 Feb 2012 17:26:02 +0800 Message-ID: <1329384365-4028-3-git-send-email-yu.liu@freescale.com> X-Mailer: git-send-email 1.6.4 In-Reply-To: <1329384365-4028-2-git-send-email-yu.liu@freescale.com> References: <1329384365-4028-1-git-send-email-yu.liu@freescale.com> <1329384365-4028-2-git-send-email-yu.liu@freescale.com> MIME-Version: 1.0 X-OriginatorOrg: freescale.com Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org If the guest hypervisor node contains "has-idle" property. Signed-off-by: Liu Yu --- v4: 1. discard the CONFIG_E500 to make code for all powerpc platform 2. code cleanup arch/powerpc/kernel/epapr.S | 29 +++++++++++++++++++++++++++++ arch/powerpc/kernel/epapr_para.c | 13 ++++++++++++- 2 files changed, 41 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/kernel/epapr.S b/arch/powerpc/kernel/epapr.S index 697b390..f06d636 100644 --- a/arch/powerpc/kernel/epapr.S +++ b/arch/powerpc/kernel/epapr.S @@ -15,6 +15,35 @@ #include #include +#define HC_VENDOR_EPAPR (1 << 16) +#define HC_EV_IDLE 16 + +_GLOBAL(epapr_ev_idle) +epapr_ev_idle: + rlwinm r3,r1,0,0,31-THREAD_SHIFT /* current thread_info */ + lwz r4,TI_LOCAL_FLAGS(r3) /* set napping bit */ + ori r4,r4,_TLF_NAPPING /* so when we take an exception */ + stw r4,TI_LOCAL_FLAGS(r3) /* it will return to our caller */ + + wrteei 1 + +idle_loop: + LOAD_REG_IMMEDIATE(r11, HC_VENDOR_EPAPR | HC_EV_IDLE) + +.global epapr_ev_idle_start +epapr_ev_idle_start: + li r3, -1 + nop + nop + nop + + /* + * Guard against spurious wakeups (e.g. from a hypervisor) -- + * any real interrupt will cause us to return to LR due to + * _TLF_NAPPING. + */ + b idle_loop + /* Hypercall entry point. Will be patched with device tree instructions. */ .global epapr_hypercall_start epapr_hypercall_start: diff --git a/arch/powerpc/kernel/epapr_para.c b/arch/powerpc/kernel/epapr_para.c index ea13cac..adee4f1 100644 --- a/arch/powerpc/kernel/epapr_para.c +++ b/arch/powerpc/kernel/epapr_para.c @@ -20,6 +20,10 @@ #include #include #include +#include + +extern void epapr_ev_idle(void); +extern u32 epapr_ev_idle_start[]; bool epapr_para_enabled = false; @@ -35,10 +39,17 @@ static int __init epapr_para_init(void) insts = of_get_property(hyper_node, "hcall-instructions", &len); if (!(len % 4) && (len >= (4 * 4))) { - for (i = 0; i < (len / 4); i++) + for (i = 0; i < (len / 4); i++) { epapr_hypercall_start[i] = insts[i]; + epapr_ev_idle_start[i] = insts[i]; + } flush_icache_range((ulong)epapr_hypercall_start, (ulong)epapr_hypercall_start + len); + flush_icache_range((ulong)epapr_ev_idle_start, + (ulong)epapr_ev_idle_start + len); + + if (of_get_property(hyper_node, "has-idle", NULL)) + ppc_md.power_save = epapr_ev_idle; epapr_para_enabled = true; }