From patchwork Thu Dec 15 12:49:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 634192 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp130784pvb; Thu, 15 Dec 2022 04:58:42 -0800 (PST) X-Google-Smtp-Source: AA0mqf6xcRCVBkYDlWDlBh0TRMMZrtfIHAELThGJC5fePgi0jDmz2Wdq6hMxxmrH1/OkgODgwT71 X-Received: by 2002:a05:622a:1b89:b0:39c:da21:6c13 with SMTP id bp9-20020a05622a1b8900b0039cda216c13mr48576399qtb.21.1671109121997; Thu, 15 Dec 2022 04:58:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671109121; cv=none; d=google.com; s=arc-20160816; b=nz0mOU9ULpb7GjBD0XcmbixfjG4LDsuv9NgtKVpDw0O++piPpVOaF46Fw7IljJ+ii3 myylajO/5Ssdsej6MEGuhBDjQBxtOZ4Dsc+NMGf7XKqRBjnzxJdq+I+HoZtgku1ZEVbK BWK8RiByYyto4yzrw5+vUB14LYx+8Ngj8M5Bu2tS97iHnL/dUEmdxC7OEFJDchP6iRuO 92l9fthzAVGK0wg1aAOj5IzO5amC7hYaSLi5qlqa83IIidhKmAB04tGT6Q7o5Yap5jMi yymC0j0BnOKlEmcbspRq6MYdJ+mPd6jMHv4qm8wEMHDdsUfygf4E3rNTaM47I+8iM4H1 En9g== 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=HwbRvl+35CTPIyxpkdvHciwwdNBHg4iIhCv/TONaLwM=; b=nzuJrG65UkyJvk6ue5W35a3z+jsmZlNY4qURNztS/k7OT2mNCLyW/HZnspWcK2IIql 7tjdg6ThfClEcFMCitKdB6yR8SFl1UzihPk4BFK1gXQem8q9DnhRmykvVtxGs5DA3Ij+ P3OkKb6bqcuOZ8CAXZI3gjRAubw+A7iPsbSKj2xamuv1Tu3h81gNjBAdwOZFTOMW/zr3 f23QLBuI1hTUwonKDiPhriGtt/t0h3xJtc78ZxJKm9fDx7x0vuqCqyuuUvFnsOVzeCHo nr1De0CPx67rKJCXyfYNs7bvk0r7QzArbZgkoaJiqXu84p+dhikxfpXz+ATfRxliQEh5 hY1A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jzQUC7Gi; 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 c21-20020ac853d5000000b003a8114f107fsi3918838qtq.207.2022.12.15.04.58.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Dec 2022 04:58: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=jzQUC7Gi; 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 1p5ngs-0006gp-EM; Thu, 15 Dec 2022 07:50:22 -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 1p5ngp-0006dK-5Z for qemu-devel@nongnu.org; Thu, 15 Dec 2022 07:50:19 -0500 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p5ngn-00045v-3x for qemu-devel@nongnu.org; Thu, 15 Dec 2022 07:50:18 -0500 Received: by mail-wm1-x32a.google.com with SMTP id ay14-20020a05600c1e0e00b003cf6ab34b61so1624646wmb.2 for ; Thu, 15 Dec 2022 04:50:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=HwbRvl+35CTPIyxpkdvHciwwdNBHg4iIhCv/TONaLwM=; b=jzQUC7Giq0QmU4apJzKiqXNSM1DzjTyi/wUgHpCQ9zbm12r8MEJSUtkBfLarRaxF8n 5pgFnAkSpm37NyLsFvp5UpECi+mYfUYOy/98hqbKRupoNfHrgSom2je5Xavoy2pIR35G EYQphkdSDJaHS0vjGpYsBx/kas35tTfTtRCnwXF75frZQdk7CAZhH8MXmxpdJ4EkbQ/x 2d8V2IsEZ0+jxJEDUwMVthyhTTKz5kxtdRUF+3+mDEt/ypYsIfZeCpjawBCmI8ndISdp MQNHij12ufGfXlVPR1xBAvgRvOHRg0CtNOrd9ibfoCyDDJFMlvBvNreT9haNjtBVfGPr yRoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HwbRvl+35CTPIyxpkdvHciwwdNBHg4iIhCv/TONaLwM=; b=UJs/LIRIdQFO9gRrnfxrbVT7uihdc/thzW0nRpK0K4HIUYx8LyC3IEiagdZEVd/k6f /vL4D1iGRiDZjcF1snilZpu7Ilw7wIIBKHOmoSOzNH+D7snF8RObiIW9Ovb0G30TL31R 7R/dWxDPRKZCZtFWPz7+Ej8ayjOmbqQBrnSmW7Ij60MAsYTbPXzNtsUD8boKvQNtCn/z 3/0IbIgzQxWZN5Cc4HqAEl7zNKnlLFtrLCEH4mV9kK9vj6sE8l9tnjZt0aM3ZRp8HYwH TOzRmfICoa9a9PlZd42OzGI0cx1jB+Jus9Mp7SFBU8r+229z8uc1XfvHvM6xJK1GrLTp b2pg== X-Gm-Message-State: ANoB5pmta7KyhOWf4wjEcYzgNOWlX3UegkssZR+WHZLdsmekOoLz0v5g VLR2FXgA92CG9yP2tPBGtA3aXK9gp2atC3G8 X-Received: by 2002:a05:600c:4f93:b0:3cf:6e85:eda7 with SMTP id n19-20020a05600c4f9300b003cf6e85eda7mr22601868wmq.14.1671108615872; Thu, 15 Dec 2022 04:50:15 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id i12-20020a05600c354c00b003cfd64b6be1sm8388787wmq.27.2022.12.15.04.50.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Dec 2022 04:50:15 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 04/29] hw/arm/virt: Introduce virt_get_high_memmap_enabled() helper Date: Thu, 15 Dec 2022 12:49:44 +0000 Message-Id: <20221215125009.980128-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221215125009.980128-1-peter.maydell@linaro.org> References: <20221215125009.980128-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32a; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32a.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: Gavin Shan This introduces virt_get_high_memmap_enabled() helper, which returns the pointer to vms->highmem_{redists, ecam, mmio}. The pointer will be used in the subsequent patches. No functional change intended. Signed-off-by: Gavin Shan Reviewed-by: Eric Auger Reviewed-by: Cornelia Huck Reviewed-by: Marc Zyngier Tested-by: Zhenyu Zhang Message-id: 20221029224307.138822-5-gshan@redhat.com Signed-off-by: Peter Maydell --- hw/arm/virt.c | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 3bb1bf079ff..7689337470a 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -1690,14 +1690,31 @@ static uint64_t virt_cpu_mp_affinity(VirtMachineState *vms, int idx) return arm_cpu_mp_affinity(idx, clustersz); } +static inline bool *virt_get_high_memmap_enabled(VirtMachineState *vms, + int index) +{ + bool *enabled_array[] = { + &vms->highmem_redists, + &vms->highmem_ecam, + &vms->highmem_mmio, + }; + + assert(ARRAY_SIZE(extended_memmap) - VIRT_LOWMEMMAP_LAST == + ARRAY_SIZE(enabled_array)); + assert(index - VIRT_LOWMEMMAP_LAST < ARRAY_SIZE(enabled_array)); + + return enabled_array[index - VIRT_LOWMEMMAP_LAST]; +} + static void virt_set_high_memmap(VirtMachineState *vms, hwaddr base, int pa_bits) { hwaddr region_base, region_size; - bool fits; + bool *region_enabled, fits; int i; for (i = VIRT_LOWMEMMAP_LAST; i < ARRAY_SIZE(extended_memmap); i++) { + region_enabled = virt_get_high_memmap_enabled(vms, i); region_base = ROUND_UP(base, extended_memmap[i].size); region_size = extended_memmap[i].size; @@ -1715,18 +1732,7 @@ static void virt_set_high_memmap(VirtMachineState *vms, vms->highest_gpa = region_base + region_size - 1; } - switch (i) { - case VIRT_HIGH_GIC_REDIST2: - vms->highmem_redists &= fits; - break; - case VIRT_HIGH_PCIE_ECAM: - vms->highmem_ecam &= fits; - break; - case VIRT_HIGH_PCIE_MMIO: - vms->highmem_mmio &= fits; - break; - } - + *region_enabled &= fits; base = region_base + region_size; } }