From patchwork Fri Aug 11 16:39:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 800642 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=kvm-ppc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="XlgSSkBL"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xTW273nYXz9t3w for ; Sat, 12 Aug 2017 02:39:59 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753238AbdHKQj7 (ORCPT ); Fri, 11 Aug 2017 12:39:59 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:37126 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752959AbdHKQj6 (ORCPT ); Fri, 11 Aug 2017 12:39:58 -0400 Received: by mail-pf0-f195.google.com with SMTP id p13so3885769pfd.4 for ; Fri, 11 Aug 2017 09:39:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=69wLFFzaD8tvzj/W/ZMn4UVH3O6rki6mSZMk/wjBC5E=; b=XlgSSkBLqNhOTY2Ics0ERVH5GIrrc+YR+h5uZlX+lWkurOs/23O4YdPb4vef9GgG/U eAGWYMswHo+B6+E5FDGUBdGxIhyX0ugJCl2AKRZaa+w0Zxv0SbkgCZ7aun6AjngB+aIM Tz5afN47KClRQpvzl2GEiy+3yKuZxKuXvRNqF8BHUw/CpkvvozM/W/UY4aC5aJyxk/h5 r1Ikd31QpHQ760xp1aZljLiGm8rD0E3/uZiZtgl8U/eC1S2EVd9h88ohox0aGOHnFdjg 0Ldvu6wvd1YFos6mEjixu7wu2z7j4rBazCw1IPvCLSEL6/vdfTFt9hWn07HXwZfj9pgq leCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=69wLFFzaD8tvzj/W/ZMn4UVH3O6rki6mSZMk/wjBC5E=; b=YDWF5eV0CKb1dcjW7NRoWRtvKrmRfNJl0SSNYR2DwROAbrRaD02b1/swPaHf696tCA tFQ7hdkxeH7h3g6EuBk6AWP3Ug0ZKT6mh4ashYGK1bZU+46Rx842w1UIzZt+jTDEyw6x fJ3f69E0Ohv2OgpxYUl3FUjqnNVq5Fuf4TYAHxr0MNBK7UxTrM11ed2G+0ZagbSMO7an MlsgxU/qMCNP9ZVBI/DoZgxY/hOFMCJhhPAL1ejrE/7PoVPqeaJ8T6rJ+zQs6ojbP1J3 m+MfU1b5natYsayUYMmJ4tDJLwkdejFBzCzk0c9Rw2CVQP9jJmqTRX6oGXM8WkOtYAW0 JU2w== X-Gm-Message-State: AHYfb5jG6PG1nyulHT+qBgEV3I333tGqv3WB4mdfthx5SPYyv0XrUyeM 4r4/coj1apQgI05V X-Received: by 10.84.233.132 with SMTP id l4mr18165968plk.298.1502469597577; Fri, 11 Aug 2017 09:39:57 -0700 (PDT) Received: from roar.au.ibm.com (203-219-56-202.tpgi.com.au. [203.219.56.202]) by smtp.gmail.com with ESMTPSA id s67sm2665375pgb.13.2017.08.11.09.39.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 11 Aug 2017 09:39:56 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Cc: Nicholas Piggin , kvm-ppc@vger.kernel.org, Paul Mackerras Subject: [PATCH v2 11/14] powerpc/64s: idle POWER9 can execute stop without a sync sequence Date: Sat, 12 Aug 2017 02:39:09 +1000 Message-Id: <20170811163912.28783-12-npiggin@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170811163912.28783-1-npiggin@gmail.com> References: <20170811163912.28783-1-npiggin@gmail.com> Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org Reviewed-by: Gautham R. Shenoy Signed-off-by: Nicholas Piggin --- arch/powerpc/include/asm/cpuidle.h | 16 ---------------- arch/powerpc/kernel/idle_book3s.S | 26 ++++++++++++++++++++------ 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/arch/powerpc/include/asm/cpuidle.h b/arch/powerpc/include/asm/cpuidle.h index 52586f9956bb..6853a3741338 100644 --- a/arch/powerpc/include/asm/cpuidle.h +++ b/arch/powerpc/include/asm/cpuidle.h @@ -90,20 +90,4 @@ static inline void report_invalid_psscr_val(u64 psscr_val, int err) #endif -/* Idle state entry routines */ -#ifdef CONFIG_PPC_P7_NAP -#define IDLE_STATE_ENTER_SEQ(IDLE_INST) \ - /* Magic NAP/SLEEP/WINKLE mode enter sequence */ \ - std r0,0(r1); \ - ptesync; \ - ld r0,0(r1); \ -236: cmpd cr0,r0,r0; \ - bne 236b; \ - IDLE_INST; \ - -#define IDLE_STATE_ENTER_SEQ_NORET(IDLE_INST) \ - IDLE_STATE_ENTER_SEQ(IDLE_INST) \ - b . -#endif /* CONFIG_PPC_P7_NAP */ - #endif diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S index 9a9a28f0758d..3b701b1a5e87 100644 --- a/arch/powerpc/kernel/idle_book3s.S +++ b/arch/powerpc/kernel/idle_book3s.S @@ -151,6 +151,19 @@ pnv_powersave_common: mtmsrd r7,0 bctr +/* + * This is the sequence required to execute idle instructions, as + * specified in ISA v2.07. MSR[IR] and MSR[DR] must be 0. + */ +#define ARCH207_IDLE_STATE_ENTER_SEQ_NORET(IDLE_INST) \ + /* Magic NAP/SLEEP/WINKLE mode enter sequence */ \ + std r0,0(r1); \ + ptesync; \ + ld r0,0(r1); \ +236: cmpd cr0,r0,r0; \ + bne 236b; \ + IDLE_INST; + .globl pnv_enter_arch207_idle_mode pnv_enter_arch207_idle_mode: #ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE @@ -176,7 +189,7 @@ pnv_enter_arch207_idle_mode: stb r3,PACA_THREAD_IDLE_STATE(r13) cmpwi cr3,r3,PNV_THREAD_SLEEP bge cr3,2f - IDLE_STATE_ENTER_SEQ_NORET(PPC_NAP) + ARCH207_IDLE_STATE_ENTER_SEQ_NORET(PPC_NAP) /* No return */ 2: /* Sleep or winkle */ @@ -215,7 +228,7 @@ pnv_fastsleep_workaround_at_entry: common_enter: /* common code for all the threads entering sleep or winkle */ bgt cr3,enter_winkle - IDLE_STATE_ENTER_SEQ_NORET(PPC_SLEEP) + ARCH207_IDLE_STATE_ENTER_SEQ_NORET(PPC_SLEEP) fastsleep_workaround_at_entry: oris r15,r15,PNV_CORE_IDLE_LOCK_BIT@h @@ -237,7 +250,7 @@ fastsleep_workaround_at_entry: enter_winkle: bl save_sprs_to_stack - IDLE_STATE_ENTER_SEQ_NORET(PPC_WINKLE) + ARCH207_IDLE_STATE_ENTER_SEQ_NORET(PPC_WINKLE) /* * r3 - PSSCR value corresponding to the requested stop state. @@ -249,7 +262,7 @@ power_enter_stop: andis. r4,r3,PSSCR_EC_ESL_MASK_SHIFTED clrldi r3,r3,60 /* r3 = Bits[60:63] = Requested Level (RL) */ bne .Lhandle_esl_ec_set - IDLE_STATE_ENTER_SEQ(PPC_STOP) + PPC_STOP li r3,0 /* Since we didn't lose state, return 0 */ /* @@ -282,7 +295,8 @@ power_enter_stop: ld r4,ADDROFF(pnv_first_deep_stop_state)(r5) cmpd r3,r4 bge .Lhandle_deep_stop - IDLE_STATE_ENTER_SEQ_NORET(PPC_STOP) + PPC_STOP /* Does not return (system reset interrupt) */ + .Lhandle_deep_stop: /* * Entering deep idle state. @@ -304,7 +318,7 @@ lwarx_loop_stop: bl save_sprs_to_stack - IDLE_STATE_ENTER_SEQ_NORET(PPC_STOP) + PPC_STOP /* Does not return (system reset interrupt) */ /* * Entered with MSR[EE]=0 and no soft-masked interrupts pending.