From patchwork Tue Mar 7 17:57:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 659788 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp2524679wrb; Tue, 7 Mar 2023 10:03:26 -0800 (PST) X-Google-Smtp-Source: AK7set9S0LD9azHgZCfHKNAOT6/x+3e4aBOLrTJY0CinIp1aF0QnqndHE1KO0iRClBpqchyTFLK9 X-Received: by 2002:a05:622a:38d:b0:3b9:c889:ec24 with SMTP id j13-20020a05622a038d00b003b9c889ec24mr27388856qtx.12.1678212206738; Tue, 07 Mar 2023 10:03:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678212206; cv=none; d=google.com; s=arc-20160816; b=fOqMTQ512VX6JBbMocAnk43NUolgHGuXkhQHzPvT49gIaH6RnwTXGo47+OaHq3kM8W BaGuWOjsx9nD+NfR9OTggzgcritfKyIXM8NrkHuNjx7+16asky7XMRK9MHhaIbHc/hCp 4c6zJhWhf2eK9LmIGh1qq/eNEOToPO1b3I/aK8x2d89iN1RlzG10WaItHvZAvmtyp8Tu nzEZ/505tZ3pJ04MetnS/jgfQhh2NJRuiJYwSnpZxOYqNiWIVTYd5gUwh3k447aBlZoK zPP/Ui5QGMVvOXNZmZm3A5X5h5xsO6qPnJT0O4mvYOWVC3cAwWmGhbThItO4DEC3wNaW vF6A== 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:cc:to :from:dkim-signature; bh=5SX2cu33hUFWgIxYnukGTkyjFV2BhrFDS5A9sGmc8Ns=; b=zuhnOeIFeM31viirwOddd/3GV+ctRZHjlls16Jraxf7tx4gpy5BltEplh13X45ukS8 gCPmPfpTax2jioVVzagVVvSctA2GOl45yBF/3N9A3ghfmVYANUcOeJpBsJOl3OJiletM fCWY9KlY9idLNii8bq1b0KrhgyYQCTwknxs0YVT8EONI5J97sook5Jj6C3ca4rd2Jg7F Ctyj7VhWCd2tLf66q0GS0XJbNJqPQQCRwiA9AHJSJFyt9O7+Diu/VbVQnc/AKuVzYCNT Punfvv0MViaYE3KG2e/8mF3N2+ayobyPxBUSGJss5PqmHeLFhSvQKm4/uyPJ2vLmcxi1 IesQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="v+pub/9y"; 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 r7-20020ae9d607000000b0073baa9c86c7si9932335qkk.745.2023.03.07.10.03.26 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Mar 2023 10:03:26 -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="v+pub/9y"; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZbah-0006Nr-4O; Tue, 07 Mar 2023 12:59:11 -0500 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 1pZbad-0006EI-VK for qemu-devel@nongnu.org; Tue, 07 Mar 2023 12:59:08 -0500 Received: from mail-pj1-x1032.google.com ([2607:f8b0:4864:20::1032]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZbac-0000Fs-CM for qemu-devel@nongnu.org; Tue, 07 Mar 2023 12:59:07 -0500 Received: by mail-pj1-x1032.google.com with SMTP id m20-20020a17090ab79400b00239d8e182efso17321917pjr.5 for ; Tue, 07 Mar 2023 09:59:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678211942; 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=5SX2cu33hUFWgIxYnukGTkyjFV2BhrFDS5A9sGmc8Ns=; b=v+pub/9y7dkCQTPdTFxAdq3ARuS3H0jFhPqb/GY8NjN7TKKrM5Z89ZuR+F9KASFRsM tZVbzZetEXqjvecPD6fC9yoF+CfVFouF806sornl69A/NxsH91yOwoQ//QRcQoZFE79W 1JD2MZMlE1IZBNro087uYf4cJOUGIRrcVjendkZe1UiODlzw9Yx0UeBpk2xzlx0tHsmd uDGC/NklMwfKqA6wTCEqLKWfgQef1wxk92Wtd0EwYRxZW5Uoeudw91euTcXon5brBOwk 5yTHRC8g8cr58Ub9H54AdEA2xLFSMcggbx4z50/spFowhEaEVHoBjLyTTQWvkB38uuR3 705A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678211942; 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=5SX2cu33hUFWgIxYnukGTkyjFV2BhrFDS5A9sGmc8Ns=; b=ZuDY1VJzLp88iSvyGJaWvE3yQOxngsSABnqAvQ+nHnbL57Uc3uBo9hPvgdSnIud8fk ZYfTmR+rxHnVpsUjCri5iOLWqHP3FjNgDBrMyO2DgBnNIZ6Op5If+AsXemfuqsEQEaOw dpi5othb5VIL4qE7+Ubvq02hdh1848i0EWtEvkmIPMB6trYMaxd4bhrcDZDnxs5o5YRK KkorP0JdNUswFmxEzy25Abik0h8pi0L4baqk/msXnzBBWYrvRSma4S0u+uvWEC4NUyZJ HyPfXzwfVpK8+XV4y1ILQ97lrhPgXybfxv0deYPEacAjm/VWMvAHoPqw1MZdCmNwKJLe cMfw== X-Gm-Message-State: AO0yUKVYuC0OkAfssW6la5LQ9fHltu5BGH9tXo1fWGQcCYd1G7Sc5AOF GlX5XID25I961L5DOH6OUP+oe4IxQhMCjA235aw= X-Received: by 2002:a17:90b:1b08:b0:234:148:4b27 with SMTP id nu8-20020a17090b1b0800b0023401484b27mr16236282pjb.17.1678211942441; Tue, 07 Mar 2023 09:59:02 -0800 (PST) Received: from stoup.. ([2602:ae:154a:9f01:b1e0:bfd9:8b1a:efeb]) by smtp.gmail.com with ESMTPSA id bd6-20020a170902830600b00198e397994bsm8661802plb.136.2023.03.07.09.59.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 09:59:02 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, Anton Johansson , =?utf-8?q?Phili?= =?utf-8?q?ppe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= Subject: [PULL 16/67] include/exec: Set default `NB_MMU_MODES` to 16 Date: Tue, 7 Mar 2023 09:57:57 -0800 Message-Id: <20230307175848.2508955-17-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230307175848.2508955-1-richard.henderson@linaro.org> References: <20230307175848.2508955-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1032; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1032.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=ham 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Anton Johansson via Signed-off-by: Anton Johansson Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Alex Bennée Reviewed-by: Richard Henderson Message-Id: <20230306175230.7110-2-anjo@rev.ng> Signed-off-by: Richard Henderson --- include/exec/cpu-defs.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/include/exec/cpu-defs.h b/include/exec/cpu-defs.h index be920d4208..7d9e1f50d8 100644 --- a/include/exec/cpu-defs.h +++ b/include/exec/cpu-defs.h @@ -36,9 +36,6 @@ #ifndef TARGET_LONG_BITS # error TARGET_LONG_BITS must be defined in cpu-param.h #endif -#ifndef NB_MMU_MODES -# error NB_MMU_MODES must be defined in cpu-param.h -#endif #ifndef TARGET_PHYS_ADDR_SPACE_BITS # error TARGET_PHYS_ADDR_SPACE_BITS must be defined in cpu-param.h #endif @@ -55,6 +52,14 @@ # endif #endif +/* + * Fix the number of mmu modes to 16, which is also the maximum + * supported by the softmmu tlb api. + */ +#ifndef NB_MMU_MODES +#define NB_MMU_MODES 16 +#endif + #define TARGET_LONG_SIZE (TARGET_LONG_BITS / 8) /* target_ulong is the type of a virtual address */