Message ID | 1440514816-16562-9-git-send-email-peter.maydell@linaro.org |
---|---|
State | Accepted |
Commit | d0a2cbceb2aa20d64d53e1c20c7d26a78ade8382 |
Headers | show
Return-Path: <patchwork-forward+bncBC6Z756YVMIBBVUM6KXAKGQEJOQKTUQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by patches.linaro.org (Postfix) with ESMTPS id 09B5E22E8F for <linaro@patches.linaro.org>; Tue, 25 Aug 2015 15:14:32 +0000 (UTC) Received: by lbbpd10 with SMTP id pd10sf52492464lbb.3 for <linaro@patches.linaro.org>; Tue, 25 Aug 2015 08:14:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:date :message-id:in-reply-to:references:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :errors-to:sender:x-original-sender :x-original-authentication-results:mailing-list; bh=7n2y8pb49Lg3nNdSsx6+sxo44GQ8KrsOhlmnItUXb4U=; b=Pprf0HIbJl8cPNT2FsoZfR+baEbCgJvwfWbg90XSIHvKvhkSTxgKYjj8E25gUtSO0x VznxhxXEFE9pU1Pkk8YzXL3sx7f9bt2lIEAv1+NF3mZJgkWHNHE6c6M8pn//PViN8wE3 JXkAw9xFpfWbX7skNoe3Xt1qAOEY8idOOcuEuEfIFh3XUt0bbQ/wmxG6QZHXN/KpYewc hmnAl3gyh7sCgDD9odjUqL7YANua3bUT0qgF5POiBMqPcc0Jy+8nSBdIMJ49tH3wMiCI 9WpYg5Rql+Yo1cchTNffn4rhaLXN9GDXHfFvvIPaIVNnX5vKltIIM5gUQYjcPY2Mfash HsUQ== X-Gm-Message-State: ALoCoQmjH55KBluxNDhR6juUtPe3uwl/PEG8MQsaKwats/j51OEBLSHjrL9SMrJV92yzvmd/CXMu X-Received: by 10.194.80.69 with SMTP id p5mr8611331wjx.2.1440515671016; Tue, 25 Aug 2015 08:14:31 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.20.72 with SMTP id l8ls719499lae.9.gmail; Tue, 25 Aug 2015 08:14:30 -0700 (PDT) X-Received: by 10.112.46.130 with SMTP id v2mr25976284lbm.119.1440515670825; Tue, 25 Aug 2015 08:14:30 -0700 (PDT) Received: from mail-la0-f50.google.com (mail-la0-f50.google.com. [209.85.215.50]) by mx.google.com with ESMTPS id jh9si5816591lbc.54.2015.08.25.08.14.30 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 25 Aug 2015 08:14:30 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) client-ip=209.85.215.50; Received: by labgv11 with SMTP id gv11so32654636lab.2 for <patchwork-forward@linaro.org>; Tue, 25 Aug 2015 08:14:30 -0700 (PDT) X-Received: by 10.152.21.196 with SMTP id x4mr25663872lae.117.1440515670680; Tue, 25 Aug 2015 08:14:30 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.162.200 with SMTP id yc8csp3247453lbb; Tue, 25 Aug 2015 08:14:29 -0700 (PDT) X-Received: by 10.182.158.164 with SMTP id wv4mr28237295obb.78.1440515668266; Tue, 25 Aug 2015 08:14:28 -0700 (PDT) Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id c66si33933106qgf.109.2015.08.25.08.14.27 for <patch@linaro.org> (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 25 Aug 2015 08:14:28 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Received: from localhost ([::1]:60803 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1ZUFvf-0007Oi-Ft for patch@linaro.org; Tue, 25 Aug 2015 11:14:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1ZUFiF-0001p1-6f for qemu-devel@nongnu.org; Tue, 25 Aug 2015 11:00:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1ZUFi9-0001Yf-De for qemu-devel@nongnu.org; Tue, 25 Aug 2015 11:00:35 -0400 Received: from mnementh.archaic.org.uk ([2001:8b0:1d0::1]:34989) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <pm215@archaic.org.uk>) id 1ZUFi9-0001NR-7b for qemu-devel@nongnu.org; Tue, 25 Aug 2015 11:00:29 -0400 Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from <pm215@archaic.org.uk>) id 1ZUFhx-0004KE-69 for qemu-devel@nongnu.org; Tue, 25 Aug 2015 16:00:17 +0100 From: Peter Maydell <peter.maydell@linaro.org> To: qemu-devel@nongnu.org Date: Tue, 25 Aug 2015 16:00:04 +0100 Message-Id: <1440514816-16562-9-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1440514816-16562-1-git-send-email-peter.maydell@linaro.org> References: <1440514816-16562-1-git-send-email-peter.maydell@linaro.org> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2001:8b0:1d0::1 Subject: [Qemu-devel] [PULL 08/20] target-arm: there is no TTBR1 for 32-bit EL2 stage 1 translations X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.50 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 |
diff --git a/target-arm/helper.c b/target-arm/helper.c index 97ca86a..86d0baf 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -5999,6 +5999,11 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address, if (el > 1) { ttbr1_valid = false; } + } else { + /* There is no TTBR1 for EL2 */ + if (el == 2) { + ttbr1_valid = false; + } } /* Determine whether this address is in the region controlled by