From patchwork Mon Jun 4 08:45:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 10446107 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9E1A960284 for ; Mon, 4 Jun 2018 08:46:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8EB6628B5B for ; Mon, 4 Jun 2018 08:46:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8302028B94; Mon, 4 Jun 2018 08:46:43 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id D21D228B5B for ; Mon, 4 Jun 2018 08:46:42 +0000 (UTC) Received: from localhost ([::1]:38353 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPl8T-0006N3-Hn for patchwork-qemu-devel@patchwork.kernel.org; Mon, 04 Jun 2018 04:46:41 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58448) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fPl7O-00060a-8x for qemu-devel@nongnu.org; Mon, 04 Jun 2018 04:45:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fPl7N-0002o7-8y for qemu-devel@nongnu.org; Mon, 04 Jun 2018 04:45:34 -0400 Received: from mail-pg0-x22c.google.com ([2607:f8b0:400e:c05::22c]:34888) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fPl7G-0002WB-Ny; Mon, 04 Jun 2018 04:45:26 -0400 Received: by mail-pg0-x22c.google.com with SMTP id 15-v6so13842209pge.2; Mon, 04 Jun 2018 01:45:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=qoflnn/+CoQHDdLMo5zOqb+MPob670VX6BU+bDGma2Q=; b=tjaxJa/i76zJcctsVYEzvT1M/dwl6UVRNSsDLif6gt7l9nupSUR8FTRWeRJPZ7B5IS LYBxKEilyxyZ+/snBE/3hpLqXPxc3Ypy/3iTi5VbHtV1PNhk8CDwbPc72xYMOT+rw/8I tLS/yNobh1LM/peBS0XnvZ4N46TplcYXgt7+rzCag3v2pX374bxVncLJDN5V029GeI+0 ZDB+Si830IAPVF1mMUTbIDIcq1AqjteAplPFYuyTDjVmPMvahcpdkwNbQEPhJhZ1dDFF 3egCVEzD+hgmtaKnzrh6G5SQuIyLzbOsHyOPYKgkbEebARUv/b468fGOulvRBMBt0B0K EQaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=qoflnn/+CoQHDdLMo5zOqb+MPob670VX6BU+bDGma2Q=; b=qSk+4zVkSkDzomztXrSrizSih41gEvHt+u8OSg8T2FAYoVLPLEih8IdxMGPiL+mlrj 1TOyhwuOAW/VuE9T4nLAHW7XAfXTHfoqhbh0ju3brDXFqE7eMaK4iAkrbokKRn8TSEE0 EYHJym+SwhBiOkLMYly4GV9/ls+0gyWTKAJKKbVMt8nPDXZEv6plcAj5supk71q7kXJh C31ElAGfyyqiaYvNnGmT+zgDHNWSyP+EuKHZLkDeZLme3UlXjO8QX0mZ0PggMTTQ8C+u SXkji+jMCUMflH9kTWwjjfM2d5rOfiAn0J7ak5zh1nzDxNVasNDCBFY2ZSX0tzl0caN4 MXFw== X-Gm-Message-State: ALKqPwc1hCLWwIVWkwPSuGK3SAe3o0jdv8f8xKLGA19s5HtkANxnkJIZ Gj98w7dXcngqkSOZOFpnkn4= X-Google-Smtp-Source: ADUXVKLSib9pIcXak6kI+HYm07wBQGj8f9cmLZsvt1tt1Le96mnw8syL7dgCSDeiqyrgJWTfk99x4g== X-Received: by 2002:a63:6107:: with SMTP id v7-v6mr16888146pgb.264.1528101925313; Mon, 04 Jun 2018 01:45:25 -0700 (PDT) Received: from aurora.jms.id.au ([45.124.203.19]) by smtp.gmail.com with ESMTPSA id 84-v6sm18462953pfl.186.2018.06.04.01.45.19 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Jun 2018 01:45:24 -0700 (PDT) Received: by aurora.jms.id.au (sSMTP sendmail emulation); Mon, 04 Jun 2018 18:15:16 +0930 From: Joel Stanley To: David Gibson , Alexander Graf , qemu-ppc@nongnu.org, qemu-devel@nongnu.org Date: Mon, 4 Jun 2018 18:15:13 +0930 Message-Id: <20180604084513.8298-1-joel@jms.id.au> X-Mailer: git-send-email 2.17.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::22c Subject: [Qemu-devel] [PATCH v3] target/ppc: Allow privileged access to SPR_PCR X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Ellerman , Michael Neuling , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Greg Kurz Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The powerpc Linux kernel[1] and skiboot firmware[2] recently gained changes that cause the Processor Compatibility Register (PCR) SPR to be cleared. These changes cause Linux to fail to boot on the Qemu powernv machine with an error: Trying to write privileged spr 338 (0x152) at 0000000030017f0c With this patch Qemu makes this register available as a hypervisor privileged register. Note that bits set in this register disable features of the processor. Currently the only register state that is supported is when the register is zeroed (enable all features). This is sufficient for guests to once again boot. [1] https://lkml.kernel.org/r/20180518013742.24095-1-mikey@neuling.org [2] https://patchwork.ozlabs.org/patch/915932/ Signed-off-by: Joel Stanley --- v2: - Change error message to say Invalid instead of Unimplemented - Fix compile warning on other powerpc targets, thanks patchew v3: - Mask against pcr_mask before storing - Drop check for non-zero value --- target/ppc/helper.h | 1 + target/ppc/misc_helper.c | 9 +++++++++ target/ppc/translate_init.inc.c | 9 +++++++-- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/target/ppc/helper.h b/target/ppc/helper.h index 19453c68138a..d751f0e21909 100644 --- a/target/ppc/helper.h +++ b/target/ppc/helper.h @@ -17,6 +17,7 @@ DEF_HELPER_2(pminsn, void, env, i32) DEF_HELPER_1(rfid, void, env) DEF_HELPER_1(hrfid, void, env) DEF_HELPER_2(store_lpcr, void, env, tl) +DEF_HELPER_2(store_pcr, void, env, tl) #endif DEF_HELPER_1(check_tlb_flush_local, void, env) DEF_HELPER_1(check_tlb_flush_global, void, env) diff --git a/target/ppc/misc_helper.c b/target/ppc/misc_helper.c index 8c8cba5cc6f1..b88493009609 100644 --- a/target/ppc/misc_helper.c +++ b/target/ppc/misc_helper.c @@ -20,6 +20,7 @@ #include "cpu.h" #include "exec/exec-all.h" #include "exec/helper-proto.h" +#include "qemu/error-report.h" #include "helper_regs.h" @@ -98,6 +99,14 @@ void helper_store_ptcr(CPUPPCState *env, target_ulong val) tlb_flush(CPU(cpu)); } } + +void helper_store_pcr(CPUPPCState *env, target_ulong value) +{ + PowerPCCPU *cpu = ppc_env_get_cpu(env); + PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu); + + env->spr[SPR_PCR] = value & pcc->pcr_mask; +} #endif /* defined(TARGET_PPC64) */ void helper_store_pidr(CPUPPCState *env, target_ulong val) diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c index ab782cb32aaa..1a89017ddea8 100644 --- a/target/ppc/translate_init.inc.c +++ b/target/ppc/translate_init.inc.c @@ -424,6 +424,10 @@ static void spr_write_ptcr(DisasContext *ctx, int sprn, int gprn) gen_helper_store_ptcr(cpu_env, cpu_gpr[gprn]); } +static void spr_write_pcr(DisasContext *ctx, int sprn, int gprn) +{ + gen_helper_store_pcr(cpu_env, cpu_gpr[gprn]); +} #endif #endif @@ -7957,11 +7961,12 @@ static void gen_spr_power6_common(CPUPPCState *env) #endif /* * Register PCR to report POWERPC_EXCP_PRIV_REG instead of - * POWERPC_EXCP_INVAL_SPR. + * POWERPC_EXCP_INVAL_SPR in userspace. Permit hypervisor access. */ - spr_register(env, SPR_PCR, "PCR", + spr_register_hv(env, SPR_PCR, "PCR", SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, SPR_NOACCESS, + &spr_read_generic, &spr_write_pcr, 0x00000000); }