From patchwork Fri Nov 3 04:13:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 833650 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ySpfd0rhzz9sBW for ; Fri, 3 Nov 2017 15:20:57 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TS8E+Q8O"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3ySpfc6tMbzDr5S for ; Fri, 3 Nov 2017 15:20:56 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TS8E+Q8O"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400e:c00::242; helo=mail-pf0-x242.google.com; envelope-from=npiggin@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="TS8E+Q8O"; dkim-atps=neutral Received: from mail-pf0-x242.google.com (mail-pf0-x242.google.com [IPv6:2607:f8b0:400e:c00::242]) (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 3ySpVG1ckwzDrD3 for ; Fri, 3 Nov 2017 15:13:42 +1100 (AEDT) Received: by mail-pf0-x242.google.com with SMTP id a8so1324071pfc.0 for ; Thu, 02 Nov 2017 21:13:42 -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=sbGTc2ysBPwvkA6jZPQ4dZuHtNojRS6SNOpZ3fDqIZo=; b=TS8E+Q8O95HiiwnEPdE4XUtn8FZYZSkASEEUSRa7HTkLXEZbSHyFiXjkVl4XhgHCqL tSqJi7wODxtJuSF2Ou3OLdQiPLj5Fke8o3drA2iVMfsynOlaxuDounFYJc8s6ccG9Xhb MA40hrbhzI5hBR6m+vkzPIOuB61icV8vbyjLJ6tarPHfWyR7/eRHJdI7BZ5rKUKVDMmG RNGvhdtvPBU6sj3y2QHd1i/CmRwMAVVCXarew/PkALiXc2L74dvQBM5gJCTiXDWEaO58 1b/S4G5JfmBmWeNSqS4HLJQYEne0oPEk7UCeC7bhUV/2HU6pOh68ZDxS6esDcAjTt/3J gRSA== 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=sbGTc2ysBPwvkA6jZPQ4dZuHtNojRS6SNOpZ3fDqIZo=; b=ei5KcBmtzKMM/WA/a41+9drQCt2pszIWOqMiTXXQ96QMP1uwKMPgWA28kTd3sqJNqq xOM9rPy+1v8FxY4AujNdZZxt7LEg3ml2JLbQYaaX1keAXESttSsJkEIgFr95GV/p/t+1 DFU0uKrA8lnz0jEF2k7TVTddAj9xdT1b+lh1iPiBLOjp1CXNXfQyvMviUvLuv6ikioB2 8PbmcRNPRi0U+lCBdWazcyWaUO3MQqi9Th0rogih2/9pDwgB+6qzMB9FHIXXdWpVm1Hv JNeQl6nTdhFw2ERGLd3IFrunVXz8uuYZ+8epuxf90xGMYN2U8t1A2c8rj7yhdkxlqRTb 12KQ== X-Gm-Message-State: AMCzsaURi4drUFZ/UksaYuD7UVGQ9/bdpfr6UPLUBrxj3peeDhwajudS dA2Ar/Ru0V2IsV4dj8Ar1zJOrw== X-Google-Smtp-Source: ABhQp+QeeOZs20veO5M88DX5zy35CDw81Gvr2fuD4wKCIN+v3GsP1RCNzEpIN20ujev6Pvamj7H5wA== X-Received: by 10.99.178.77 with SMTP id t13mr5904701pgo.219.1509682419934; Thu, 02 Nov 2017 21:13:39 -0700 (PDT) Received: from roar.ozlabs.ibm.com. ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id f24sm9731242pfk.183.2017.11.02.21.13.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Nov 2017 21:13:39 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v3 3/3] powerpc/64s/idle: avoid POWER9 DD1 and DD2.0 PMU workaround on DD2.1 Date: Fri, 3 Nov 2017 15:13:21 +1100 Message-Id: <20171103041321.5113-4-npiggin@gmail.com> X-Mailer: git-send-email 2.15.0 In-Reply-To: <20171103041321.5113-1-npiggin@gmail.com> References: <20171103041321.5113-1-npiggin@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Neuling , Nicholas Piggin Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" DD2.1 does not have to save MMCR0 for all state-loss idle states, only after deep idle states (like other PMU registers). Reviewed-by: Vaidyanathan Srinivasan Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/idle_book3s.S | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S index d77766814090..59657783d1d5 100644 --- a/arch/powerpc/kernel/idle_book3s.S +++ b/arch/powerpc/kernel/idle_book3s.S @@ -112,12 +112,14 @@ power9_save_additional_sprs: std r4, STOP_HFSCR(r13) mfspr r3, SPRN_MMCRA - mfspr r4, SPRN_MMCR1 + mfspr r4, SPRN_MMCR0 std r3, STOP_MMCRA(r13) - std r4, STOP_MMCR1(r13) + std r4, _MMCR0(r1) - mfspr r3, SPRN_MMCR2 - std r3, STOP_MMCR2(r13) + mfspr r3, SPRN_MMCR1 + mfspr r4, SPRN_MMCR2 + std r3, STOP_MMCR1(r13) + std r4, STOP_MMCR2(r13) blr power9_restore_additional_sprs: @@ -135,11 +137,14 @@ power9_restore_additional_sprs: ld r4, STOP_MMCRA(r13) mtspr SPRN_HFSCR, r3 mtspr SPRN_MMCRA, r4 - /* We have already restored PACA_MMCR0 */ - ld r3, STOP_MMCR1(r13) - ld r4, STOP_MMCR2(r13) - mtspr SPRN_MMCR1, r3 - mtspr SPRN_MMCR2, r4 + + ld r3, _MMCR0(r1) + ld r4, STOP_MMCR1(r13) + mtspr SPRN_MMCR0, r3 + mtspr SPRN_MMCR1, r4 + + ld r3, STOP_MMCR2(r13) + mtspr SPRN_MMCR2, r3 blr /* @@ -350,6 +355,7 @@ power_enter_stop: b pnv_wakeup_noloss .Lhandle_esl_ec_set: +BEGIN_FTR_SECTION /* * POWER9 DD2 can incorrectly set PMAO when waking up after a * state-loss idle. Saving and restoring MMCR0 over idle is a @@ -357,6 +363,7 @@ power_enter_stop: */ mfspr r4,SPRN_MMCR0 std r4,_MMCR0(r1) +END_FTR_SECTION_IFSET(CPU_FTR_POWER9_DD1 | CPU_FTR_POWER9_DD20) /* * Check if the requested state is a deep idle state. @@ -544,15 +551,15 @@ pnv_restore_hyp_resource_arch300: blt cr3,1f BEGIN_FTR_SECTION PPC_INVALIDATE_ERAT -END_FTR_SECTION_IFSET(CPU_FTR_POWER9_DD1 | CPU_FTR_POWER9_DD20) ld r1,PACAR1(r13) + ld r4,_MMCR0(r1) + mtspr SPRN_MMCR0,r4 +END_FTR_SECTION_IFSET(CPU_FTR_POWER9_DD1 | CPU_FTR_POWER9_DD20) mfspr r4,SPRN_MMCRA ori r4,r4,(1 << (63-60)) mtspr SPRN_MMCRA,r4 xori r4,r4,(1 << (63-60)) mtspr SPRN_MMCRA,r4 - ld r4,_MMCR0(r1) - mtspr SPRN_MMCR0,r4 1: /* * POWER ISA 3. Use PSSCR to determine if we