From patchwork Thu Sep 3 20:14:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 514243 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 2403414032F for ; Fri, 4 Sep 2015 06:18:09 +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=Rwn7mLO3; dkim-atps=neutral Received: from localhost ([::1]:51626 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXaxT-0005tw-9t for incoming@patchwork.ozlabs.org; Thu, 03 Sep 2015 16:18:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXaui-0001Rq-6t for qemu-devel@nongnu.org; Thu, 03 Sep 2015 16:15:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZXauh-0007If-Gx for qemu-devel@nongnu.org; Thu, 03 Sep 2015 16:15:16 -0400 Received: from mail-pa0-x22c.google.com ([2607:f8b0:400e:c03::22c]:35512) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZXauh-0007IM-85 for qemu-devel@nongnu.org; Thu, 03 Sep 2015 16:15:15 -0400 Received: by pacfv12 with SMTP id fv12so592923pac.2 for ; Thu, 03 Sep 2015 13:15:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QJTQ1e0fx+B83DCw72ey2za2Orr511JoYjvBjVRDoS4=; b=Rwn7mLO3epOKX6fpRbQg2N3SyeNmr2heSrblrRKCFngGjDCCpyDUlP3NfMX+jaPyPw eZKDO9TLkJeVz03Hm/O+xO33Rht49Vh0uBy/5siycRJv4U3otaYvMonrnSY92egWm1oI eECGmWvzXn9N2HfQayXEopEuAwtl9EtxildKsl5CQ9VnCvqeOBfC3BnpdMqu3khXUQ+T zs9CiIebw2Wx3poJks1pxbf+cWI5W6UehgQKVYMeJY369W0G9jpMhclVNixLXz5KjX2u w3mU16Glezoc4qsCaNgNCMiUiWieZ65z1dQ6vwj5kldDdNtn2PwxYw0R23Jd/kARgi3S n7SQ== X-Received: by 10.66.222.103 with SMTP id ql7mr70352743pac.144.1441311314519; Thu, 03 Sep 2015 13:15:14 -0700 (PDT) Received: from localhost (ec2-52-8-89-49.us-west-1.compute.amazonaws.com. [52.8.89.49]) by smtp.gmail.com with ESMTPSA id vv2sm26365808pab.21.2015.09.03.13.15.12 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 03 Sep 2015 13:15:13 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Thu, 3 Sep 2015 22:14:22 +0200 Message-Id: <1441311266-8644-7-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1441311266-8644-1-git-send-email-edgar.iglesias@gmail.com> References: <1441311266-8644-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22c Cc: edgar.iglesias@xilinx.com, serge.fdrv@gmail.com, alex.bennee@linaro.org, agraf@suse.de Subject: [Qemu-devel] [PATCH v1 06/10] target-arm: Supress TBI for S2 translations X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: "Edgar E. Iglesias" Stage-2 MMU translations do not have configurable TBI as the top byte is always 0 (48-bit IPAs). Signed-off-by: Edgar E. Iglesias --- target-arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index ec19e68..9ea9719 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -6350,7 +6350,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address, va_size = 64; if (el > 1) { tbi = extract64(tcr->raw_tcr, 20, 1); - } else { + } else if (mmu_idx != ARMMMUIdx_S2NS) { if (extract64(address, 55, 1)) { tbi = extract64(tcr->raw_tcr, 38, 1); } else {