From patchwork Thu Feb 13 14:41:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 183363 Delivered-To: patch@linaro.org Received: by 2002:a92:1f12:0:0:0:0:0 with SMTP id i18csp621155ile; Thu, 13 Feb 2020 06:54:42 -0800 (PST) X-Google-Smtp-Source: APXvYqxKO5+uJ6kRW9iyeQ+Wd8yRnIjFYFYU6kLbM20EVSOSAdJ1SzL8zAh6624UE7bGDNzaTElw X-Received: by 2002:a0c:8605:: with SMTP id p5mr11886123qva.109.1581605681978; Thu, 13 Feb 2020 06:54:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581605681; cv=none; d=google.com; s=arc-20160816; b=vhWXU3jWGSq9nQ62vlrh/aKPZSgAoQdWUyg6g/CrQeiw7xKTAetfPd/9Mtgri0MxI4 myLLg0zYCvXE6MXtAYsGyPsE+KVadKe7SkMY9kqDDN4VA3QqlagmuR8rw6QszVUdeQES Y9inZL8Sd8TPjSePcLNmelaw6NzczoZakgWAxEw82bd2RqUmYRK5huZRFEJ9gj7NpRf7 staU5a7OZ7dV2Ifxwz2/GaUXeb1hIBVpaMTI7+Kfo0XnTX/esi+ihjyFAFBsNBfUjNiq iwm5cf96bOezrnczWVT99cSaUTnmI2G9ZIvHYYWjVXJKYPeFSS1otELOC7WNfNMWwRQ9 Wgrw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=lZumiqpfQ/6unRtDCeBn/aqRrn/borXiuGtgBm5/gN4=; b=ydv3wLiuoeNZbpChoPD5gsju6mAP6p4MZv6pu+bCGR1Yfeh46tGphlrNf8arAYru8Q byd07i2sr5/osXV8ip3UzYrXABPOG06PFOGYF6CLKv99FpQYqeMmTMoU3zBH6JK9kjJE pExD0DDpMxCIGyREX9JC54kvzWK4sYJQW2L/EAW4tg5DtU8VVLussmUz7j/95TQ1fIag N1HrAkKBuIf65SDfbqoufIJJod+kfM2dv6Sv6FxGbMNxq9hBZ6CQcJvSK5qHw7mxkHI1 ShhIeKEKHCvfh3MbLDRaPuCj3TBYvsblvymGunXJMWijoaWo7aE23dOBSuwKfcFsmoKn C47A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RD6BpbR9; 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=pass (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 r2si1324759qtu.167.2020.02.13.06.54.41 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 13 Feb 2020 06:54:41 -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=pass header.i=@linaro.org header.s=google header.b=RD6BpbR9; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Ft2-0003Kt-Gy for patch@linaro.org; Thu, 13 Feb 2020 09:54:41 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:60383) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j2Fh6-0004Zp-Vd for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j2Fh4-00026B-TF for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:19 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:34337) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1j2Fh4-000243-M0 for qemu-devel@nongnu.org; Thu, 13 Feb 2020 09:42:18 -0500 Received: by mail-wr1-x441.google.com with SMTP id n10so5044148wrm.1 for ; Thu, 13 Feb 2020 06:42:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=lZumiqpfQ/6unRtDCeBn/aqRrn/borXiuGtgBm5/gN4=; b=RD6BpbR95xY5cf3mlw/dpC4fXTm783NH1DIl3KLBQ/rFzstVt+DsogWxfp8jsPASCS kB+YnB/uR42eNsiJm1uj3/IeAZ5/d0rTAcPdjlG9/ASQEZg7RG2Ob6qxRiW6PGQ8FEqO FPtf0hhBKumvK0NoKycSNGVScQfZmQGni1Pl4SCoEyie2/JEl2PQUXv+ZDo3ik1bzsxX KrDt67tWHVRujiTvw4gus7qICOiATZ3GGvXbnueDKC9d7r4A9Ya3tWgJKHuyd1CysGvd 8vD1g1RgWlfaAwcHXLSdyczkpqwwe0I4tTMwI3TRxBTS3mX6GOVO5eZcyc6bOFUs0e69 PGlQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lZumiqpfQ/6unRtDCeBn/aqRrn/borXiuGtgBm5/gN4=; b=DvGGYZ2qVcFY0aWG4VGohZkq6b15qTEQO95syqbyxeBdcjLmN564bNf4ABzFhThcVV EM2+entrXFao3pTb8AEJJUOGbmFCtKTB7cwBUyWsRJzkCUkhGVRQxk3ZgPJEAXC1ufsH Ae1In+ptgTCABiHjUwyCg/naTCOAHo9EetHrCqBzFArPPIAnEu9/J0ITtLBJYwQGGaOS wKr5v/GATTADgOuD2ftz+2XKFeMV1J4ov2lMCimu5ixGNmK6WhJvX6FrYRZ9lZJmJaQb kLrIc71ZGNRFXOFerE4ODvw97gYWj0VK/+uD4XQrqclZ1rx3KWGDrD3CRwCY7Cb47eQb ljWw== X-Gm-Message-State: APjAAAUGyetutK2KIs0MyhkdTeneFxGlcSImtva6zvMjF46/S4vbxXb7 c0J7EUi1MYk4pPS9tmIK9RogYJYYpo4= X-Received: by 2002:adf:f986:: with SMTP id f6mr23126883wrr.182.1581604936955; Thu, 13 Feb 2020 06:42:16 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id e22sm3362454wme.45.2020.02.13.06.42.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 13 Feb 2020 06:42:16 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 25/46] target/arm: Enable ARMv8.2-ATS1E1 in -cpu max Date: Thu, 13 Feb 2020 14:41:24 +0000 Message-Id: <20200213144145.818-26-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200213144145.818-1-peter.maydell@linaro.org> References: <20200213144145.818-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Richard Henderson This includes enablement of ARMv8.1-PAN. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20200208125816.14954-17-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/cpu.c | 4 ++++ target/arm/cpu64.c | 5 +++++ 2 files changed, 9 insertions(+) -- 2.20.1 diff --git a/target/arm/cpu.c b/target/arm/cpu.c index b0762a76c4b..de733aceeb8 100644 --- a/target/arm/cpu.c +++ b/target/arm/cpu.c @@ -2709,6 +2709,10 @@ static void arm_max_initfn(Object *obj) t = FIELD_DP32(t, MVFR2, FPMISC, 4); /* FP MaxNum */ cpu->isar.mvfr2 = t; + t = cpu->id_mmfr3; + t = FIELD_DP32(t, ID_MMFR3, PAN, 2); /* ATS1E1 */ + cpu->id_mmfr3 = t; + t = cpu->id_mmfr4; t = FIELD_DP32(t, ID_MMFR4, HPDS, 1); /* AA32HPD */ cpu->id_mmfr4 = t; diff --git a/target/arm/cpu64.c b/target/arm/cpu64.c index c80fb5fd438..57fbc5eade7 100644 --- a/target/arm/cpu64.c +++ b/target/arm/cpu64.c @@ -673,6 +673,7 @@ static void aarch64_max_initfn(Object *obj) t = FIELD_DP64(t, ID_AA64MMFR1, HPDS, 1); /* HPD */ t = FIELD_DP64(t, ID_AA64MMFR1, LO, 1); t = FIELD_DP64(t, ID_AA64MMFR1, VH, 1); + t = FIELD_DP64(t, ID_AA64MMFR1, PAN, 2); /* ATS1E1 */ cpu->isar.id_aa64mmfr1 = t; /* Replicate the same data to the 32-bit id registers. */ @@ -693,6 +694,10 @@ static void aarch64_max_initfn(Object *obj) u = FIELD_DP32(u, ID_ISAR6, SPECRES, 1); cpu->isar.id_isar6 = u; + u = cpu->id_mmfr3; + u = FIELD_DP32(u, ID_MMFR3, PAN, 2); /* ATS1E1 */ + cpu->id_mmfr3 = u; + /* * FIXME: We do not yet support ARMv8.2-fp16 for AArch32 yet, * so do not set MVFR1.FPHP. Strictly speaking this is not legal,