From patchwork Fri Nov 3 04:13:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 833648 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 3ySpZM2Cnqz9s7F for ; Fri, 3 Nov 2017 15:17:15 +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="q7fHhHiM"; 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 3ySpZM0wMKzDrFD for ; Fri, 3 Nov 2017 15:17:15 +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="q7fHhHiM"; 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:c05::243; helo=mail-pg0-x243.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="q7fHhHiM"; dkim-atps=neutral Received: from mail-pg0-x243.google.com (mail-pg0-x243.google.com [IPv6:2607:f8b0:400e:c05::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 3ySpV85hnPzDr8p for ; Fri, 3 Nov 2017 15:13:36 +1100 (AEDT) Received: by mail-pg0-x243.google.com with SMTP id p9so1448086pgc.8 for ; Thu, 02 Nov 2017 21:13:35 -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=p4jq6H5gdcrGgbsNLAUpE5DDcpPJpxk4pXKZcO1bsSY=; b=q7fHhHiMb9ZOFMBtVLUGuu5vNgbI6R9b1jNoVed24nDUtnS4JA0SboKVrHnH2xb6pG PVE5u5SZ0sNZm6v0wYu+2lcT7Pdznvrb9INf68M2Xk+KRwpnmr9LZowkFGcxkFWTPLkB HhRWmaJUlux2kCno5/McDqpKO9vPYT0BDkcNXaaab4aKsrYHAt8fNjbCrOU85myHxcND lIF1oE5aCjDQARKqDk02bX0uCXca9rc1sQk/l/26JX7pKi4JX0zxi8ClQVlCbd4Bmsrj 3Cz4Od17F/hSYbIK7VeL6AgrKO3lKTLy4Ra1Z1aArXCWXmLfyb2hJapimI5O039ZDQwG e0JQ== 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=p4jq6H5gdcrGgbsNLAUpE5DDcpPJpxk4pXKZcO1bsSY=; b=DJwlYiPBTcJWWypcjVZHiqX+UShs1CyekkAKYHk9RHQD/W83eEMrVqgNV5Sp8kib8f hnynpiDRS33/E8JBJFsSLDB2JvvatyZabu2zv/nINNV/keTZ7PIW0Rz6gebCDIPIqHan d9zRh6Pxad3JExaFS06c/qT4U8su94hafgijN6T6xRsHKjnrKVtBVvQryxcpTRuWZx3Y 1CRW+0W0xLvew9jruRftIASuk1uImXJzPaXdpdzJ0VBMNYf4l5zkcn0gA92sPh3grFly PmkQh17HJxRRbbEFqJrj4IMFikrGOgoAr14A3vkIofSKm3XocKTKu6a7WzMi1Djcisxk /9AQ== X-Gm-Message-State: AMCzsaXhNu2443OkO4jc7uWhESOn98LhkBLKOPkBIctBPp0wP7ZBUQOY nmBQUKcQl4csnwVIXRj6vS3JbQ== X-Google-Smtp-Source: ABhQp+Q8P3dfnH+asn/zjIgjWORRkvkInUu7hquDyp1OodHUfiKjuk7gOxvmjUA+a/rEO8W53Opljg== X-Received: by 10.101.97.197 with SMTP id j5mr5824754pgv.205.1509682413681; Thu, 02 Nov 2017 21:13:33 -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.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Nov 2017 21:13:32 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v3 1/3] powerpc: add POWER9_DD20 feature Date: Fri, 3 Nov 2017 15:13:19 +1100 Message-Id: <20171103041321.5113-2-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" Cc: Michael Neuling Signed-off-by: Nicholas Piggin --- arch/powerpc/include/asm/cputable.h | 5 ++++- arch/powerpc/kernel/cputable.c | 20 ++++++++++++++++++++ arch/powerpc/kernel/dt_cpu_ftrs.c | 2 ++ 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h index a9bf921f4efc..194dc3006446 100644 --- a/arch/powerpc/include/asm/cputable.h +++ b/arch/powerpc/include/asm/cputable.h @@ -215,6 +215,7 @@ enum { #define CPU_FTR_DABRX LONG_ASM_CONST(0x0800000000000000) #define CPU_FTR_PMAO_BUG LONG_ASM_CONST(0x1000000000000000) #define CPU_FTR_POWER9_DD1 LONG_ASM_CONST(0x4000000000000000) +#define CPU_FTR_POWER9_DD20 LONG_ASM_CONST(0x8000000000000000) #ifndef __ASSEMBLY__ @@ -477,6 +478,7 @@ enum { CPU_FTR_ARCH_207S | CPU_FTR_TM_COMP | CPU_FTR_ARCH_300) #define CPU_FTRS_POWER9_DD1 ((CPU_FTRS_POWER9 | CPU_FTR_POWER9_DD1) & \ (~CPU_FTR_SAO)) +#define CPU_FTRS_POWER9_DD20 (CPU_FTRS_POWER9 | CPU_FTR_POWER9_DD20) #define CPU_FTRS_CELL (CPU_FTR_USE_TB | CPU_FTR_LWSYNC | \ CPU_FTR_PPCAS_ARCH_V2 | CPU_FTR_CTRL | \ CPU_FTR_ALTIVEC_COMP | CPU_FTR_MMCRA | CPU_FTR_SMT | \ @@ -495,7 +497,8 @@ enum { (CPU_FTRS_POWER4 | CPU_FTRS_PPC970 | CPU_FTRS_POWER5 | \ CPU_FTRS_POWER6 | CPU_FTRS_POWER7 | CPU_FTRS_POWER8E | \ CPU_FTRS_POWER8 | CPU_FTRS_POWER8_DD1 | CPU_FTRS_CELL | \ - CPU_FTRS_PA6T | CPU_FTR_VSX | CPU_FTRS_POWER9 | CPU_FTRS_POWER9_DD1) + CPU_FTRS_PA6T | CPU_FTR_VSX | CPU_FTRS_POWER9 | \ + CPU_FTRS_POWER9_DD1 | CPU_FTRS_POWER9_DD20) #endif #else enum { diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 760872916013..171820190de7 100644 --- a/arch/powerpc/kernel/cputable.c +++ b/arch/powerpc/kernel/cputable.c @@ -547,6 +547,26 @@ static struct cpu_spec __initdata cpu_specs[] = { .machine_check_early = __machine_check_early_realmode_p9, .platform = "power9", }, + { /* Power9 DD2.0 */ + .pvr_mask = 0xffffefff, + .pvr_value = 0x004e0200, + .cpu_name = "POWER9 (raw)", + .cpu_features = CPU_FTRS_POWER9_DD20, + .cpu_user_features = COMMON_USER_POWER9, + .cpu_user_features2 = COMMON_USER2_POWER9, + .mmu_features = MMU_FTRS_POWER9, + .icache_bsize = 128, + .dcache_bsize = 128, + .num_pmcs = 6, + .pmc_type = PPC_PMC_IBM, + .oprofile_cpu_type = "ppc64/power9", + .oprofile_type = PPC_OPROFILE_INVALID, + .cpu_setup = __setup_cpu_power9, + .cpu_restore = __restore_cpu_power9, + .flush_tlb = __flush_tlb_power9, + .machine_check_early = __machine_check_early_realmode_p9, + .platform = "power9", + }, { /* Power9 */ .pvr_mask = 0xffff0000, .pvr_value = 0x004e0000, diff --git a/arch/powerpc/kernel/dt_cpu_ftrs.c b/arch/powerpc/kernel/dt_cpu_ftrs.c index 7275fed271af..63b9d7edd63f 100644 --- a/arch/powerpc/kernel/dt_cpu_ftrs.c +++ b/arch/powerpc/kernel/dt_cpu_ftrs.c @@ -735,6 +735,8 @@ static __init void cpufeatures_cpu_quirks(void) */ if ((version & 0xffffff00) == 0x004e0100) cur_cpu_spec->cpu_features |= CPU_FTR_POWER9_DD1; + else if ((version & 0xffffefff) == 0x004e0200) + cur_cpu_spec->cpu_features |= CPU_FTR_POWER9_DD20; } static void __init cpufeatures_setup_finished(void) From patchwork Fri Nov 3 04:13:20 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 833649 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ySpcY0BMVz9s7F for ; Fri, 3 Nov 2017 15:19:09 +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="VGxAGv3o"; 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 3ySpcX69B6zDr9L for ; Fri, 3 Nov 2017 15:19:08 +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="VGxAGv3o"; 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:c05::242; helo=mail-pg0-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="VGxAGv3o"; dkim-atps=neutral Received: from mail-pg0-x242.google.com (mail-pg0-x242.google.com [IPv6:2607:f8b0:400e:c05::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 3ySpVC2BsKzDr8p for ; Fri, 3 Nov 2017 15:13:39 +1100 (AEDT) Received: by mail-pg0-x242.google.com with SMTP id s2so1445850pge.10 for ; Thu, 02 Nov 2017 21:13:38 -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=9MsRC0dU356TKVMrDxEhVxIz4Wd8JztDnbhkMP7j9l8=; b=VGxAGv3oHnqcxxB3gC2bM48Tj5gEBC6LajEvQ+wD4xuJa+L13hHAv0pWRMGNfKvIW4 YDOcdKWQsjkAEVfa8yj8nekGj/51to8KYPm3qduOgkLe7/bMDCxNrfos5BDZUyaviJ+T rlN3jDubQnMDlImk6n6jlGxyv2oxe4F1m0Duf59amhvugCEkRtDU9bJGJSu8QE1L2euN FRSFdKd+9PxC2rISlUKcNx4LWHXDiyv8i6zzMY0ZaqUPC0Yk6xwE3hV1m8Odb8vdeWAn uQ53pecsBDVp/aCHsYefQRyeTN6rJEbNzypm+J/dbhjO0YSYaNPxhfLZ1uFQTv2mOnCq Aixw== 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=9MsRC0dU356TKVMrDxEhVxIz4Wd8JztDnbhkMP7j9l8=; b=JA+Vt4Js5SE1ehiIPBzzi0JzjCFYEN6o25L6OKasS29wHQb/AqusDTir8HXO/dFK3u xElVGg7HirM4VSPQpQzhE3EsgT6bTGJ5WECIgzFpbBQbtZ3ZNp7eEjWnzi3dryIFWUmR PsbmAtMvtli9cjF8lRLYKynpODvx1s4XCNmNyXG94iy96G9WFEsB4v/e+3FaYuLzIJXD 4ig2AbBRItOj+oXBDj/ra+eU2Yx82fFuMN/IMfC+Lgdcn8vUv02S71C42jQJhH8XXyUc SfESyV/Is/fWhFfac4G3aZMc69tzPT88cJxrHr46sDYbXa7UxncPq/GmCRikvUKN9pmZ CQjw== X-Gm-Message-State: AMCzsaUBJWzB3wOe12M7qsGCkiT6xtVTqmITDw9zwz8ZQ4+jdGzIUgM+ pbbAr4wgX0YfjKSA+f6iPlHIBw== X-Google-Smtp-Source: ABhQp+RkVndBvFVx1JFsr4NpW9in/WuwacOX8NInCfvXQNHG/QSYA15lCf49MM5gzcQe8Fp/oeg5Ew== X-Received: by 10.98.158.202 with SMTP id f71mr6213417pfk.175.1509682416856; Thu, 02 Nov 2017 21:13:36 -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.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Nov 2017 21:13:35 -0700 (PDT) From: Nicholas Piggin To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v3 2/3] powerpc/64s/idle: avoid POWER9 DD1 and DD2.0 ERAT workaround on DD2.1 Date: Fri, 3 Nov 2017 15:13:20 +1100 Message-Id: <20171103041321.5113-3-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 flush the ERAT after a state-loss idle. Performance testing was done on a DD2.1 using only the stop0 idle state (the shallowest state which supports state loss), using context_switch selftest configured to ping-poing between two threads on the same core and two different cores. Performance improvement for same core is 7.0%, different cores is 14.8%. Reviewed-by: Vaidyanathan Srinivasan Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/idle_book3s.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/powerpc/kernel/idle_book3s.S b/arch/powerpc/kernel/idle_book3s.S index 175d49f468af..d77766814090 100644 --- a/arch/powerpc/kernel/idle_book3s.S +++ b/arch/powerpc/kernel/idle_book3s.S @@ -542,7 +542,9 @@ pnv_restore_hyp_resource_arch300: * then clear bit 60 in MMCRA to ensure the PMU starts running. */ 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) mfspr r4,SPRN_MMCRA ori r4,r4,(1 << (63-60)) 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