From patchwork Fri Mar 2 06:03:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 10253499 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 DFDE86037D for ; Fri, 2 Mar 2018 06:12:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BF47D285C9 for ; Fri, 2 Mar 2018 06:12:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B41D72876B; Fri, 2 Mar 2018 06:12:12 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, 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 6B041285C9 for ; Fri, 2 Mar 2018 06:12:12 +0000 (UTC) Received: from localhost ([::1]:32789 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erdvP-0007Fp-M6 for patchwork-qemu-devel@patchwork.kernel.org; Fri, 02 Mar 2018 01:12:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38568) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1erdnb-0000iX-9e for qemu-devel@nongnu.org; Fri, 02 Mar 2018 01:04:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1erdnZ-000445-Jy for qemu-devel@nongnu.org; Fri, 02 Mar 2018 01:04:07 -0500 Received: from ozlabs.org ([103.22.144.67]:51855) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1erdnY-000403-Su; Fri, 02 Mar 2018 01:04:05 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3zszJY4GQBz9sWv; Fri, 2 Mar 2018 17:03:57 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1519970637; bh=hrdGCW/JU3xUsRs5DFlPRO33VDN1wJ5FAIjj8z9KTr8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ku1lhBqoBmPwiKPRVlGA7fe8wlLDaL0cATHGQ0OuB1RJX7Oi/xEp+uWWewYvr17GK SEqcPBOIBGcZQT95gjqmdBdn1qvpl71fhB6Mii4ecG3TkVTF72pSqV7zh6JfEkGGxp CbKttrWelqf8g9l9xhx9UZVSNKp/XYHTXN/BnN2w= From: David Gibson To: peter.maydell@linaro.org Date: Fri, 2 Mar 2018 17:03:44 +1100 Message-Id: <20180302060350.24330-19-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180302060350.24330-1-david@gibson.dropbear.id.au> References: <20180302060350.24330-1-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 18/24] target/ppc: Check mask when setting cap_ppc_safe_indirect_branch 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: surajjs@au1.ibm.com, mark.cave-ayland@ilande.co.uk, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, Suraj Jitindar Singh , David Gibson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Suraj Jitindar Singh Check the character and character_mask field when setting cap_ppc_safe_indirect_branch based on the hypervisor response to KVM_PPC_GET_CPU_CHAR. Previously the mask field wasn't checked which was incorrect. Fixes: 8acc2ae5 (target/ppc/kvm: Add cap_ppc_safe_[cache/bounds_check/indirect_branch]) Signed-off-by: Suraj Jitindar Singh Signed-off-by: David Gibson --- target/ppc/kvm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c index 9842b3bb12..2c183f61e2 100644 --- a/target/ppc/kvm.c +++ b/target/ppc/kvm.c @@ -2494,7 +2494,7 @@ static void kvmppc_get_cpu_characteristics(KVMState *s) cap_ppc_safe_bounds_check = 1; } /* Parse and set cap_ppc_safe_indirect_branch */ - if (c.character & H_CPU_CHAR_BCCTRL_SERIALISED) { + if (c.character & c.character_mask & H_CPU_CHAR_BCCTRL_SERIALISED) { cap_ppc_safe_indirect_branch = 2; } }