From patchwork Tue Dec 8 12:23:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leif Lindholm X-Patchwork-Id: 11958339 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B53EC4361B for ; Tue, 8 Dec 2020 12:25:03 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D5CC523A9B for ; Tue, 8 Dec 2020 12:25:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D5CC523A9B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=nuviainc.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kmc3B-0000GB-Pg for qemu-devel@archiver.kernel.org; Tue, 08 Dec 2020 07:25:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:54786) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kmc1Y-0007PY-7U for qemu-devel@nongnu.org; Tue, 08 Dec 2020 07:23:20 -0500 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]:39123) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kmc1V-0005lc-05 for qemu-devel@nongnu.org; Tue, 08 Dec 2020 07:23:20 -0500 Received: by mail-pf1-x443.google.com with SMTP id i3so10174608pfd.6 for ; Tue, 08 Dec 2020 04:23:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nuviainc-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=JLaYiZYZl/bsjZLj55CynwbZmKbACJyAYHuZsdIDi6U=; b=kVqegPZSG0au64NAwjFIGhpXDLutg2GHL0E0vy1Za4Mgy2ePVIEUoH3rpvqLGiKaMg Y323UrfxrGZWBj9EiRMABb42NmGtO9uU15v6BdMXffb9TgRCkn4tRYkj7HhK/lnnLT9s lL6dOKKDNrHpGQXHIwXf5VnmVBlsLyr42WAug/Y9FnSyP6nUEHQFXhwLH/EOfKoNEK7z nO5zV9rRbL7fJNWu+C26Ypw51jAL433VRp2tB0dPFxgvH2G2KtRPjwjw3DyQ6J/zp8tm QYfw4o6f2BUUuHViwvpMvDAH/2/hfo0IzyRlYWlTM7fvx33a6mwkpSZxHu+lCBusgPOh U0qw== 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:mime-version:content-transfer-encoding; bh=JLaYiZYZl/bsjZLj55CynwbZmKbACJyAYHuZsdIDi6U=; b=mrl+m/B3eA5+gC1RxpPB58VuPp2Hkhymj41cjtJ32xkFCV7CsAzvguYhcyTCtjowoH phHaWT2IffQoglYHPjes9vX0tn/Rvv/X1bGYnAB2f9CRR+Nd7lIu87rL5EKQhVfhIATi azae7W0PmCw5VNbmjTJmaLfYXg+CHmosOy+A3OM50SeuV50XtMZTf9bneZTHdoMDbdDZ oLZZ9uADec63nUgjFx8sBWv22OPyg2eGEBdpb+4o9RZNZ0V6MDJFCpgthNgoNo8sx7p8 WAT5F5rWCXw1R9duYYAjAXap+c2A+LT7xWddHjT7pMvzIySjnUak3lScgaQVnvmS3ZSp tRow== X-Gm-Message-State: AOAM530DyXxCqLFVJZtpBXBFbiZHcWJOcZkP5Ffoyo4DIG5Rw86XUDTh LuTmExwOkeubRAzBGZJuaqfQeQ== X-Google-Smtp-Source: ABdhPJzHLt18x3LoGUdE9xOg+rXkMAp1Dq1X6wNwKyToBIkQ75aMr9J495zDuviXMOC3F8ZT+n8ZlQ== X-Received: by 2002:a63:da58:: with SMTP id l24mr22486632pgj.178.1607430195871; Tue, 08 Dec 2020 04:23:15 -0800 (PST) Received: from leonardo.ba.nuviainc.com (cpc1-cmbg19-2-0-cust915.5-4.cable.virginm.net. [82.27.183.148]) by smtp.gmail.com with ESMTPSA id b2sm3472377pff.79.2020.12.08.04.23.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Dec 2020 04:23:15 -0800 (PST) From: Leif Lindholm To: qemu-arm@nongnu.org Subject: [PATCH 2/5] target/arm: make ARMCPU.clidr 64-bit Date: Tue, 8 Dec 2020 12:23:03 +0000 Message-Id: <20201208122306.8933-3-leif@nuviainc.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201208122306.8933-1-leif@nuviainc.com> References: <20201208122306.8933-1-leif@nuviainc.com> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::443; envelope-from=leif@nuviainc.com; helo=mail-pf1-x443.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Cc: Peter Maydell , Rebecca Cran , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" The AArch64 view of CLIDR_EL1 extends the ICB field to include also bit 32, as well as adding a Ttype field when FEAT_MTE is implemented. Extend the clidr field to be able to hold this context. Signed-off-by: Leif Lindholm Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Peter Maydell --- target/arm/cpu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 6962ef05d6..b54d1dc092 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -938,7 +938,7 @@ struct ARMCPU { uint32_t id_afr0; uint64_t id_aa64afr0; uint64_t id_aa64afr1; - uint32_t clidr; + uint64_t clidr; uint64_t mp_affinity; /* MP ID without feature bits */ /* The elements of this array are the CCSIDR values for each cache, * in the order L1DCache, L1ICache, L2DCache, L2ICache, etc.