From patchwork Tue May 31 00:41:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 627966 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rJZTY5j4lz9t8R for ; Tue, 31 May 2016 10:42:57 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.b=TbpfHbk5; dkim-atps=neutral Received: from localhost ([::1]:33740 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7Xln-0004cS-Dw for incoming@patchwork.ozlabs.org; Mon, 30 May 2016 20:42:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53501) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7XkQ-0003Lu-1o for qemu-devel@nongnu.org; Mon, 30 May 2016 20:41:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b7XkL-0002rF-QD for qemu-devel@nongnu.org; Mon, 30 May 2016 20:41:30 -0400 Received: from ozlabs.org ([2401:3900:2:1::2]:57354) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7XkL-0002q5-FD; Mon, 30 May 2016 20:41:25 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3rJZRh0FRkz9t7n; Tue, 31 May 2016 10:41:19 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1464655280; bh=7tyce9Kut3d6gnXWPPG/5FrxuSkx0jWmQGcIcs3GToc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TbpfHbk5Lkw+Wun0PDFCVYcBH/pWqZl9ark05wSfnYHz7WyRhMdsve25Pa7kf3JCO 2HL0QP22Q74Ojv2WMix5m3rk/JwOp+SirvMepMErjsvejGGkpfssXyZGB3RdhSliO+ GmYKZvN3aYKT5QKZYBVUtMic/pgF1maAbIsCl5cA= From: David Gibson To: peter.maydell@linaro.org Date: Tue, 31 May 2016 10:41:09 +1000 Message-Id: <1464655277-14748-5-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1464655277-14748-1-git-send-email-david@gibson.dropbear.id.au> References: <1464655277-14748-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 Subject: [Qemu-devel] [PULL 04/12] ppc: tlbie, tlbia and tlbisync are HV only 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: qemu-devel@nongnu.org, agraf@suse.de, qemu-ppc@nongnu.org, bharata.rao@gmail.com, pbonzini@redhat.com, David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Benjamin Herrenschmidt Not that anything remotely recent supports tlbia but ... Signed-off-by: Benjamin Herrenschmidt Signed-off-by: David Gibson --- target-ppc/translate.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target-ppc/translate.c b/target-ppc/translate.c index dfd3010..690ffd2 100644 --- a/target-ppc/translate.c +++ b/target-ppc/translate.c @@ -4858,7 +4858,7 @@ static void gen_tlbie(DisasContext *ctx) #if defined(CONFIG_USER_ONLY) gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); #else - if (unlikely(ctx->pr)) { + if (unlikely(ctx->pr || !ctx->hv)) { gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); return; } @@ -4879,7 +4879,7 @@ static void gen_tlbsync(DisasContext *ctx) #if defined(CONFIG_USER_ONLY) gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); #else - if (unlikely(ctx->pr)) { + if (unlikely(ctx->pr || !ctx->hv)) { gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); return; } @@ -4898,7 +4898,7 @@ static void gen_slbia(DisasContext *ctx) #if defined(CONFIG_USER_ONLY) gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); #else - if (unlikely(ctx->pr)) { + if (unlikely(ctx->pr || !ctx->hv)) { gen_inval_exception(ctx, POWERPC_EXCP_PRIV_OPC); return; }