From patchwork Fri Apr 7 01:27:44 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 748013 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 3vzhsL6Jtpz9s7C for ; Fri, 7 Apr 2017 11:32:38 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SQlQY7IO"; 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 3vzhsL5FKWzDqJ2 for ; Fri, 7 Apr 2017 11:32:38 +1000 (AEST) 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="SQlQY7IO"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pg0-x244.google.com (mail-pg0-x244.google.com [IPv6:2607:f8b0:400e:c05::244]) (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 3vzhmB2sdLzDqJ9 for ; Fri, 7 Apr 2017 11:28:10 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SQlQY7IO"; dkim-atps=neutral Received: by mail-pg0-x244.google.com with SMTP id 79so11674413pgf.0 for ; Thu, 06 Apr 2017 18:28:10 -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=lpOcvVZlG9MVb3ZgGGERkUY50Yc99eRc17xPnug9rLQ=; b=SQlQY7IOEgZFlA6q/dAMjRcy2xZ8PvG5Q7kBA/VW/Yvz0V7f9TUwzVN2XBMllpndwa Yd5nU+47feXDxj6V12QAlpg2KDdv4/xhUHGpXLaPIs4incoNvWHyJnJ7Y4J9T4Zbluhk PN0PaWco0EkgiV4ebyhO72W4iq+xnZzVve994OkIzUahEp5ydYw+q6VQo2vODNUsDnQM Og6a26zCWT+kvxA04Qri16phYapxCDXIbIK8B1Unl6xk8LdNvJpoXa6LBb5v6iblGWy8 WTmsz2PlaX7D53w0u7GNb6wpfkiVoCJULj7/PTJ4SIdADSKHkNrmK1Sx0vXms44i01rq Ub5w== 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=lpOcvVZlG9MVb3ZgGGERkUY50Yc99eRc17xPnug9rLQ=; b=Pfp6nxSdatw0J9o1vG/n/c+zw6qp/+nMEK3RG9b8aq9Q+c/eXm13Idn00jHms9rovd Ow0XXYRXYU5HkB14xm5xEP/40F2r7r77Gz++MWfVLyqbz5L7pLxQm8jTVL+sshD70ITp FLI34+x4vh5668o96nIY4xGSoDzC8bd88qlruKOh8v1Dx0I30RGVyfChAwgCjhzDCoMI fO3JTCbBotIetQd82swSMSHonvjVOJFVL6VczHJlCAzOsPuMBr6F2YkmzqNyUlaLecM9 c4mexT6SAN5DiHVc5rHy8PJspaPipQfOKVKzgLsLVAwLZs+wokrzCsq3IdhUZyebuznO x2KA== X-Gm-Message-State: AFeK/H1sevJoDEEeQxx6j1P8Ms444EkvnBYUafJDaZXkRGVGLikC8kn6y9LD7rNYJNCWkA== X-Received: by 10.99.102.3 with SMTP id a3mr16615379pgc.129.1491528488562; Thu, 06 Apr 2017 18:28:08 -0700 (PDT) Received: from roar.au.ibm.com ([203.221.48.234]) by smtp.gmail.com with ESMTPSA id p9sm5830261pfe.22.2017.04.06.18.28.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Apr 2017 18:28:07 -0700 (PDT) From: Nicholas Piggin To: Michael Ellerman Subject: [PATCH 2/2] powerpc/64s: Add SCV FSCR bit for ISA v3.0 Date: Fri, 7 Apr 2017 11:27:44 +1000 Message-Id: <20170407012744.21800-3-npiggin@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170407012744.21800-1-npiggin@gmail.com> References: <20170407012744.21800-1-npiggin@gmail.com> X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linuxppc-dev@lists.ozlabs.org, Nicholas Piggin Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Signed-off-by: Nicholas Piggin --- arch/powerpc/include/asm/reg.h | 2 ++ arch/powerpc/kernel/traps.c | 19 ++++++++++--------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h index fc879fd6bdae..d9e52a1336a6 100644 --- a/arch/powerpc/include/asm/reg.h +++ b/arch/powerpc/include/asm/reg.h @@ -310,6 +310,7 @@ #define SPRN_PMCR 0x374 /* Power Management Control Register */ /* HFSCR and FSCR bit numbers are the same */ +#define FSCR_SCV_LG 12 /* Enable System Call Vectored */ #define FSCR_MSGP_LG 10 /* Enable MSGP */ #define FSCR_TAR_LG 8 /* Enable Target Address Register */ #define FSCR_EBB_LG 7 /* Enable Event Based Branching */ @@ -320,6 +321,7 @@ #define FSCR_VECVSX_LG 1 /* Enable VMX/VSX */ #define FSCR_FP_LG 0 /* Enable Floating Point */ #define SPRN_FSCR 0x099 /* Facility Status & Control Register */ +#define FSCR_SCV __MASK(FSCR_SCV_LG) #define FSCR_TAR __MASK(FSCR_TAR_LG) #define FSCR_EBB __MASK(FSCR_EBB_LG) #define FSCR_DSCR __MASK(FSCR_DSCR_LG) diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index a34d8bf3dbe4..5b307efed870 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c @@ -1432,15 +1432,16 @@ static void tm_unavailable(struct pt_regs *regs) void facility_unavailable_exception(struct pt_regs *regs) { static char *facility_strings[] = { - [FSCR_FP_LG] = "FPU", - [FSCR_VECVSX_LG] = "VMX/VSX", - [FSCR_DSCR_LG] = "DSCR", - [FSCR_PM_LG] = "PMU SPRs", - [FSCR_BHRB_LG] = "BHRB", - [FSCR_TM_LG] = "TM", - [FSCR_EBB_LG] = "EBB", - [FSCR_TAR_LG] = "TAR", - [FSCR_MSGP_LG] = "MSGP", + [FSCR_FP_LG] = "FPU", + [FSCR_VECVSX_LG] = "VMX/VSX", + [FSCR_DSCR_LG] = "DSCR", + [FSCR_PM_LG] = "PMU SPRs", + [FSCR_BHRB_LG] = "BHRB", + [FSCR_TM_LG] = "TM", + [FSCR_EBB_LG] = "EBB", + [FSCR_TAR_LG] = "TAR", + [FSCR_MSGP_LG] = "MSGP", + [FSCR_SCV_LG] = "SCV", }; char *facility = "unknown"; u64 value;