From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B7A56CD4F48 for ; Fri, 15 May 2026 14:14:54 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wNtGz-0007IB-I2; Fri, 15 May 2026 10:12:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wNtGw-00072I-Dh for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:14 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wNtGu-0004Em-Ij for qemu-devel@nongnu.org; Fri, 15 May 2026 10:12:14 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-488ab2db91aso98641895e9.3 for ; Fri, 15 May 2026 07:12:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1778854331; x=1779459131; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hZ8fiEyIcsczQEDgRlwFz4p9FVMl4Ln4nKLkoMyRd58=; b=hRjz0wlF7AaLk8Eu42GKYOysnjTFWqg3yYf/SB3AoP/CkMjr87BMM80jeIqM9JmAuY ed5v9pDEv3jAMJMXG/JKN2WhHvao4JXH1boUN/v8p2t802ACFI+ksldZcEBcq0ZWKwIc rcN7gV8Rmlwue5gzHALSrsGigtTRQ/0gW4Ql7lV34TBnLU/O2V7css9Y5Cd1Ku6AdME/ Xh6aEaRaXB5IPGsE/5xfi+9JczECmc/2Q2ITMTVvat5r3d+jM2XM+4ihKvXjS8CB1qJF oHIJJsmjGEx287HFJfl5ZaSavHEZXKi2D/eLzbsCRDE7NQt+YXLMX5qtZqVWTbjUWacz b5VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1778854331; x=1779459131; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=hZ8fiEyIcsczQEDgRlwFz4p9FVMl4Ln4nKLkoMyRd58=; b=p0/10PlC6JjKVc9uDxlt/Q/eZI+HMJXsNpRgbioplCIImVMtYk/PZig7tlDxKyWdK/ J1w+TYCid5fMro4kFOGa2OO5cwBmCPemMk9UhbQxQ6OsnV0LaAgv8ogFunMZQwN6x4lJ xFKjbvypW2qCCapAD3aQdbE6m+T/YfsJmpK/8oe3tzCg9c5LG1EjYGJWXbUeZnlf/gYD AwIQgKBUjFlOTAwgC35U7kyKWrIJDFvuwVXfUSQCsYXgnUEnrNYa1h3r1OL82JChOczd ETTVAsPX2BE8LqdKnFqYMmYYqu5RydaXv12RrH8/PXUxwW6CZtGOkuZETbFrNYTZ+XR8 7ENQ== X-Gm-Message-State: AOJu0YwvJ1Rvv/o/c+5JbCxVEvYgTOofRtkYXsS8S92v8pw/tQoc5hsI pwmQYhjDGy4Zgx3i+bILP4zEbRmJVAtGBbyWlaM9R1HhxOrb+I7QhInzxJohtxgOU4eKD8UIOB9 SQTddYtc= X-Gm-Gg: Acq92OFJneKGFP0eejn6f4Q6/QOFlK91y/IKFSPJ6pG3iSuPtEFtCV9lwvP8bZwyBn1 xzzrcg2RUDA2NJk7hLjW0TrNjVRB7gQI7PY6vEHLcXEqqNxlXHBbXq/0kcOS13onz3Fw7k0O5Sk 6lfzdSy/eE9/LwSkWTz99GM3KuvuKs6etno5Lz6OWYiSyO8SDd2zEsuv+EfDnL3kHLKvhsXDuhq yp7DUsxK6bC2T9D/n9ga8R7qINMpgelkYTOcjjC1+zrHN3jWdSH7HpFPoTWwLkB0M3OeVjcwdbC 24XfNWEibEKxpr2MLUuYoFbQ1SfUQ/Jj8lzBc7JDbxIuuYR++ci4Ayl04QNRRR9wtecft7jKbdb ReyZrrEYqggQNI7p74UI6wam5D5kb+krl2+hFysxjzfONIx0R/qCsOEg0DVGLP/4O+kUdbm3TR+ eAhY2N0yIkrH6AwWDq5dD/2Y2bXkQHHuosHcFcVqB5lbKSFG+tYb0IyXy9y1X4N8oDX1Xc+P1CA /abEXN3yl8= X-Received: by 2002:a05:600c:48a8:b0:48f:e230:d5ab with SMTP id 5b1f17b1804b1-48fe651e11cmr35164875e9.31.1778854330979; Fri, 15 May 2026 07:12:10 -0700 (PDT) Received: from localhost.localdomain (88-187-86-199.subs.proxad.net. [88.187.86.199]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48fe5376812sm67877445e9.11.2026.05.15.07.12.09 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Fri, 15 May 2026 07:12:10 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Peter Maydell , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Richard Henderson , qemu-arm@nongnu.org, Joel Stanley , Kane Chen , Troy Lee , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Pierrick Bouvier , Jamin Lin , Steven Lee , Andrew Jeffery , Manos Pitsidianakis Subject: [PATCH v6 13/20] target/arm: Use make_ccsidr(LEGACY) in 32 bit 'max' CPU type Date: Fri, 15 May 2026 16:10:24 +0200 Message-ID: <20260515141032.3271-14-philmd@linaro.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260515141032.3271-1-philmd@linaro.org> References: <20260515141032.3271-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=philmd@linaro.org; helo=mail-wm1-x32b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Commit 676624d757a ("target/arm/tcg: refine cache descriptions with a wrapper") added the make_ccsidr() helper. Use it. Besides being simpler to review, it also makes arm_max_initfn() more in line which aarch64_a57_initfn(), which it almost duplicates. Signed-off-by: Philippe Mathieu-Daudé --- target/arm/tcg/cpu32.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/target/arm/tcg/cpu32.c b/target/arm/tcg/cpu32.c index 919ed8a6cf8..cf643ce43b1 100644 --- a/target/arm/tcg/cpu32.c +++ b/target/arm/tcg/cpu32.c @@ -9,6 +9,7 @@ */ #include "qemu/osdep.h" +#include "qemu/units.h" #include "cpu.h" #include "accel/tcg/cpu-ops.h" #include "internals.h" @@ -756,9 +757,12 @@ static void arm_max_initfn(Object *obj) SET_IDREG(isar, ID_ISAR6, 0); cpu->isar.reset_pmcr_el0 = 0x41013000; SET_IDREG(isar, CLIDR, 0x0a200023); - cpu->ccsidr[0] = 0x701fe00a; /* 32KB L1 dcache */ - cpu->ccsidr[1] = 0x201fe012; /* 48KB L1 icache */ - cpu->ccsidr[2] = 0x70ffe07a; /* 2048KB L2 cache */ + /* 32KB L1 dcache */ + cpu->ccsidr[0] = make_ccsidr(CCSIDR_FORMAT_LEGACY, 4, 64, 32 * KiB, 7); + /* 48KB L1 icache */ + cpu->ccsidr[1] = make_ccsidr(CCSIDR_FORMAT_LEGACY, 3, 64, 48 * KiB, 2); + /* 2048KB L2 cache */ + cpu->ccsidr[2] = make_ccsidr(CCSIDR_FORMAT_LEGACY, 16, 64, 2 * MiB, 7); define_cortex_a72_a57_a53_cp_reginfo(cpu); aa32_max_features(cpu); -- 2.53.0