Return-Path: Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3vPQ163VBDzDqGd for ; Fri, 17 Feb 2017 05:39:22 +1100 (AEDT) Received: by mail-pf0-x243.google.com with SMTP id 68so2167989pfx.2 for ; Thu, 16 Feb 2017 10:39:22 -0800 (PST) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Cc: Nicholas Piggin Subject: [PATCH 3/5] powerpc/64s: use alternative feature patching Date: Fri, 17 Feb 2017 04:38:59 +1000 Message-Id: <20170216183901.28611-4-npiggin@gmail.com> In-Reply-To: <20170216183901.28611-1-npiggin@gmail.com> References: <20170216183901.28611-1-npiggin@gmail.com> List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , This reduces the number of nops for POWER8 Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/idle_book3s.S | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S index 1271344e5523..ab15dee371c9 100644 --- a/arch/powerpc/kernel/idle_book3s.S +++ b/arch/powerpc/kernel/idle_book3s.S @@ -417,13 +417,8 @@ BEGIN_FTR_SECTION rldicl r5,r5,4,60 cmpd cr4,r5,r4 bge cr4,pnv_wakeup_tb_loss - /* - * Waking up without hypervisor state loss. Return to - * reset vector - */ - blr -END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) +FTR_SECTION_ELSE /* * POWER ISA 2.07 or less. @@ -440,9 +435,13 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) * indicates we are waking with hypervisor state loss from nap. */ bgt cr3,. +ALT_FTR_SECTION_END_IFSET(CPU_FTR_ARCH_300) - blr /* Return back to System Reset vector from where - pnv_restore_hyp_resource was invoked */ + /* + * Waking up without hypervisor state loss. Return to + * reset vector + */ + blr /* * Called if waking up from idle state which can cause either partial or -- 2.11.0