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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 261FFCA100F for ; Mon, 22 Sep 2025 18:59:02 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1v0lbw-0004wP-LR; Mon, 22 Sep 2025 14:50:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1v0lbr-0004qu-CS for qemu-devel@nongnu.org; Mon, 22 Sep 2025 14:49:59 -0400 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1v0lbm-0004AK-91 for qemu-devel@nongnu.org; Mon, 22 Sep 2025 14:49:59 -0400 Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-77e6495c999so3282777b3a.3 for ; Mon, 22 Sep 2025 11:49:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1758566992; x=1759171792; 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=dwXNsvpsI+ev3l1X0Dinc/JnjQKCdGo0MRhCsyBFRqA=; b=dKecoTV8MjKPczlOi194es4WtbUA3l1UF4WW1OlGjPmaXLlH62Uf/4LlpizkeZogmb PYv3RERNSgpxxdryjgf6L19NEjBgQqwkYLmgu3BupvnmmRDS3T/rQTZce1t7fa9WqPj8 VTDhFUYz85luGpWcZCnYCG2K7m/ylSCg6Kp8FwpvhGAkdFOz9gqyOkkyuAdrvshpDJUs mcwkoPSDGqrijKCFfpeyKMlvCSJZkEMFIex4hUQS69PX4Ktvn+4vEmlnFz9i3fO9hEcp P1F0vftvpOtKoJX8xZ1GX9X7iOFal8GWH7+fkH1ReNOEjpj1G4XOP6EJ7hah+de9GRxu WiXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758566992; x=1759171792; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dwXNsvpsI+ev3l1X0Dinc/JnjQKCdGo0MRhCsyBFRqA=; b=nLK0TbBhtBDLMXNYqG/8mWh8iYOIrBbvnYCPIfg9Fe9ayIrzGL7g7VK4l+ra6utfi0 TB7FxyPJn1vLN9VdyLpwWK4ZEHkwmIrB3wmB6rksdlnYj2NR71bBJ1p7eRUs14lTjwxL 6ZY4FB/UG+rp4VOKPHwwG/5VC2RJWwM/CO56jJ0tyaaEVeur3oZ4w0+P6WjR0Fr2e2em RTa4a7flPE7dwj6ftJlhCeLF1ybA9YejU9BrfqwpaEo2mCfnHMvVozp+jy5nIVYFiPRp 48+CgM5JMv/VSWF9oUyfooc+LXh2/ez6F6bDkClUQPwGrZjSxVBRmmGXSDrrwaXY0gy7 z4dg== X-Gm-Message-State: AOJu0Yy5smTDQcNAGNmtZ7+Rb1R8licHItUvbN32dWv7/vALAH/Lj98p aJCKGvOhictIN39gmCNzKDyZlUsjYYMNUP11pM2oAdk9SdTFmfvy0iSCS162ns2KFqMhDycsGVs 3xRg5 X-Gm-Gg: ASbGncs2DG/ES5XAOefRM3Z2mlIb1FpyWOUhY0cwL+UFzMmKxlQsHbu6i7or/ZMbi7Z ID1IODnKB8BzX61uZLSAwd4dTpGngOoNyyg7E+ymq/QFpkj21htT0KkFQqDCJDyo1/y9E4S41BR zmJ7trz7xlpg6ww+cR8ZovY7ed9CM7aUqFGEP7AlLoXcqJkfjQSpe2kJQSkyWyWdkd99usu3/Ln 7t/t5shGTefpBZHz1IhmMWlr/cZE3zFh7QrGV9kyoer56FRWaDtIUdZnIUeOzRp5PPm6RoD4ri4 G+8DtTwIBFv4a22HtenHm69C+PptGfmBboRMrfEuDFBEEeQVEc8et2M8otLmuJPEv4STSPz9KjY LYfuS548RfkH6h53JnOVbQQi1RWKj X-Google-Smtp-Source: AGHT+IEPL0u1ll3ZFjgOMl2zDHZVPngTrnSqaXnTj4EuWS0ZeHoSKlrPdKDGDxgPAf6XLeyVIzYQcA== X-Received: by 2002:a05:6a00:3cd6:b0:77f:50df:df30 with SMTP id d2e1a72fcca58-77f50dfe612mr904881b3a.17.1758566991740; Mon, 22 Sep 2025 11:49:51 -0700 (PDT) Received: from stoup.. ([71.212.157.132]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-77e5fe6de75sm10583861b3a.19.2025.09.22.11.49.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Sep 2025 11:49:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, Pierrick Bouvier Subject: [PATCH v5 18/76] include/hw/core/cpu: Widen MMUIdxMap Date: Mon, 22 Sep 2025 11:48:26 -0700 Message-ID: <20250922184924.2754205-19-richard.henderson@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250922184924.2754205-1-richard.henderson@linaro.org> References: <20250922184924.2754205-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::42b; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42b.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: 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 Widen MMUIdxMap to 32 bits. Do not yet expand NB_MMU_MODES, but widen the map type in preparation. Reviewed-by: Pierrick Bouvier Signed-off-by: Richard Henderson --- include/hw/core/cpu.h | 2 +- accel/tcg/cputlb.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/hw/core/cpu.h b/include/hw/core/cpu.h index 89fe937a6f..83d6e9c24e 100644 --- a/include/hw/core/cpu.h +++ b/include/hw/core/cpu.h @@ -201,7 +201,7 @@ struct CPUClass { * Fix the number of mmu modes to 16. */ #define NB_MMU_MODES 16 -typedef uint16_t MMUIdxMap; +typedef uint32_t MMUIdxMap; /* Use a fully associative victim tlb of 8 entries. */ #define CPU_VTLB_SIZE 8 diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 2a6aa01c57..416aaa1040 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -89,9 +89,6 @@ */ QEMU_BUILD_BUG_ON(sizeof(vaddr) > sizeof(run_on_cpu_data)); -/* We currently can't handle more than 16 bits in the MMUIDX bitmask. - */ -QEMU_BUILD_BUG_ON(NB_MMU_MODES > 16); #define ALL_MMUIDX_BITS ((1 << NB_MMU_MODES) - 1) static inline size_t tlb_n_entries(CPUTLBDescFast *fast) -- 2.43.0