From patchwork Mon Feb 4 13:12:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 157412 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp3916677jaa; Mon, 4 Feb 2019 05:28:32 -0800 (PST) X-Google-Smtp-Source: ALg8bN5dxgC1KM9hFuWkerlRoSxbr1pN61uVMxcSVCZui33UKrNPgITfCAEitaN+UxQiEarYRuxw X-Received: by 2002:a81:1a52:: with SMTP id a79mr49714534ywa.467.1549286912304; Mon, 04 Feb 2019 05:28:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549286912; cv=none; d=google.com; s=arc-20160816; b=nDBYNsfvIeaAJr1+Mk0oNYAb1DTrhX9vjHzJMkoP95Vn9NZY9YgjHzdQpOiz97gWlL v3dIpgT3x01niPSCyPi6WT8avBf8XbDC/Uh+EtXs3rVjaVV1TIoh//hEvA/XvVpPU6dF wbyosra3qqG2Okrnt9WrGVJfPII0waA0Dvl+y7CFhkA2+C1Ef49BiflNsVsBiNTQoMTJ /qNIDrm36mTLQCnVkuMwwOloD4ENGMLMxrzffGWvlEzxBDWt+iMG6JdiSni+cbgzvziX dhkKI9WJgkEmNRpUuqpNafi+isEN8z2dWUfZL7G5ZyRNe6RVkNsGM584pFzoX83Oj/ui gBlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=0GfXFPH+bA70OWj0aXJdKkY3vjWPFrkkY8GJhmcgmoA=; b=TPmpDH/ejIVMIDBRoKgSdZ22C4PaGx4a1LDVfVW7ftwybIn7KQ2xNu2YRwqevkWDpY +B7Lq2+uFo1dKZsT49QEcpCDd7BeB9G5/W/fK/ZAV/lF8V8/fiAJX2RroleEfJL/ROXt 8N6SSKZMOLKFkckY2ypnDWxsdjqE9S363WyJcqfBDMVYIv3Vww8/mUpW7Oubx0lmeK+Z aWBtlFEEJCIxqXxGVxmFhIv2JxSg7p5VKLyEBjKNxto0AOWXUDxKhv92ktNJKLYBIe0w fLFw8efxjchpZjMEDaLHPSjhEwut2FYSyUCo5GavvhRKbkYGeFEvdFQExWA3kuPR7Tt2 FlWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=S245WnOk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a10si52197ybe.103.2019.02.04.05.28.32 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 04 Feb 2019 05:28:32 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=S245WnOk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:42775 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqeIZ-0005fD-Q3 for patch@linaro.org; Mon, 04 Feb 2019 08:28:31 -0500 Received: from eggs.gnu.org ([209.51.188.92]:51472) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gqeC2-00010y-05 for qemu-devel@nongnu.org; Mon, 04 Feb 2019 08:21:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gqe3P-0002cN-GT for qemu-devel@nongnu.org; Mon, 04 Feb 2019 08:12:52 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:40957) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gqe3P-000244-7Q for qemu-devel@nongnu.org; Mon, 04 Feb 2019 08:12:51 -0500 Received: by mail-wm1-x32a.google.com with SMTP id f188so13378113wmf.5 for ; Mon, 04 Feb 2019 05:12:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0GfXFPH+bA70OWj0aXJdKkY3vjWPFrkkY8GJhmcgmoA=; b=S245WnOkTj7AAzIW97Xnb7E2ElqnCRndsRD6BKoGtykUdsbaZTxm25qoYBpZp2nLs2 T60s1Pdi9Udx/oDPjP2RBSaeHZd4inxjsOgfpJ4cS+Cn9uRnvvxSBguLxFpsDrSGKPwr KsfIJwSmfpXKmle7NsgWD9g6V0bYTcBKfFQhU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0GfXFPH+bA70OWj0aXJdKkY3vjWPFrkkY8GJhmcgmoA=; b=E9y2PfLe2xOPawRsomZKpwY29NwagCXXBJKDBiCskKR7IeKad1GpM6B/V7QZ25aNyT wHqH1ySEJo8NKEc6jA3JbEOsFt2a47xMYXVatZk2uR+HOXj+5D2AdPnG+elDbq3r0gc/ NBvPkSg0K0T2YQARB+aCS2aGnqoSA9WcmNpb/79jkvm/w/O2C9zhMVFtHojuUvrjb+gn fYYFmjPQhyU0snub24Po1JfKVy5zZ7v/g1lF2fO7bErOYTm6b0RN68eR62wm1YDi2vKb DgtH7xAtVrx+gODakxcBHJdyDN7r/7AaKd0lV3HH0u88KOWiPiPjlF4SPPSxAjxXx/f5 EOJw== X-Gm-Message-State: AHQUAuaW+TOxpaywLIBUGW/pdyu3WdPD2qcsz8d6Acykty517LcJpZPD VuF4SlegbKCXCi7SNBbQgGQDdAYpCr4doA== X-Received: by 2002:a1c:6607:: with SMTP id a7mr12976366wmc.129.1549285956279; Mon, 04 Feb 2019 05:12:36 -0800 (PST) Received: from cloudburst.twiddle.net (host81-133-38-158.in-addr.btopenworld.com. [81.133.38.158]) by smtp.gmail.com with ESMTPSA id z9sm22283025wrs.63.2019.02.04.05.12.35 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 04 Feb 2019 05:12:35 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Mon, 4 Feb 2019 13:12:25 +0000 Message-Id: <20190204131228.25949-2-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190204131228.25949-1-richard.henderson@linaro.org> References: <20190204131228.25949-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32a Subject: [Qemu-devel] [PATCH v3 1/4] fixup! target/arm: Cache the GP bit for a page in MemTxAttrs 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: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We talked about changing this, but missed when applying to target-arm.next. --- target/arm/helper.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.2 diff --git a/target/arm/helper.c b/target/arm/helper.c index 2edf84b898..be0ec7de2a 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10757,7 +10757,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, target_ulong address, } /* Merge in attributes from table descriptors */ attrs |= nstable << 3; /* NS */ - guarded |= extract64(descriptor, 50, 1); /* GP */ + guarded = extract64(descriptor, 50, 1); /* GP */ if (param.hpd) { /* HPD disables all the table attributes except NSTable. */ break;