From patchwork Thu Feb 16 14:23:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 654039 Delivered-To: patch@linaro.org Received: by 2002:adf:f90f:0:0:0:0:0 with SMTP id b15csp381646wrr; Thu, 16 Feb 2023 06:25:52 -0800 (PST) X-Google-Smtp-Source: AK7set+zljSw0iBtQ7eD+0MeNQALTI+kmSBUXC7XsohVu8xM1i4OKs1VzBCxp45cZzhUHCiTLs3p X-Received: by 2002:ac8:5c54:0:b0:3bb:8dfd:c867 with SMTP id j20-20020ac85c54000000b003bb8dfdc867mr10232193qtj.24.1676557552297; Thu, 16 Feb 2023 06:25:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676557552; cv=none; d=google.com; s=arc-20160816; b=kT2GFpNYaixeCiZb+BYFYMoQKQef8r8SFZoYZn0PjUXEwqLokiiPTdGKMaJnfS2dtp SfqVR/nJdTpNOBkYDdU8BERq1s71KBvsD8A0nVrdnnT2zadjsga4Pz6PcwbTC3Kpa3Lw ktjch75vBkd4kEDPv7gqxYsInsbl9Tp0bFx6icX+vuAAQmTOIiBkRhzZCGqg7Tmt7SZy 12/hLd366dLG9Udfuq/9cW7KU07jSsTuE72dbMURfea5P9Ct2VPN1thToGZOsE1E/zKo +FuTKielfxHx3hwscDrxbkdPICkaJdL5n6XVP/I/E3DhAysonVrnN+cv0trgRSxr6GYK Woew== 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=pkUuoVsPO7rj7crjxhqsXkiJdIbOheCDQODQm6zJmAM=; b=W5rhaT+ui44PqAtz9HHPljqPino0wFow68GkD6ztc5a9AaYVOCNVrKHYeTvl2CWJSo t7CDIa5vF/QMy/sgMbnHQCmuxdJJd7nfnG2acU8scg2sjqz6Yy+OCNr0wlEY6A6gORVg uSmm1crIoj2nCu+xtolKZDnruPk+/6FCUP+db38Z7diuV7sBSerlBb/saVeZkqvdWYf5 WbE2VjGeQDTI64ldvr8TJ43mEIL7/RMCPMYBzJpsVro3uuVJqv353pW79b9CEXfTq2Bu noGiX2MZ+eCspZ+i+gbM6aR8m/o+eYd32LAvha2KYHMboKdmE6CCXUg7Iwd/JYTb+mLR XGqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ZqFCD2Vt; 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 t21-20020a05622a01d500b003aff7f4f8e2si1656059qtw.235.2023.02.16.06.25.52 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 16 Feb 2023 06:25:52 -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=ZqFCD2Vt; 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 1pSfBM-0005sr-FR; Thu, 16 Feb 2023 09:24:20 -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 1pSfBA-0005hI-RY for qemu-devel@nongnu.org; Thu, 16 Feb 2023 09:24:10 -0500 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pSfB7-0007HY-5q for qemu-devel@nongnu.org; Thu, 16 Feb 2023 09:24:07 -0500 Received: by mail-wr1-x433.google.com with SMTP id v30so830637wrv.3 for ; Thu, 16 Feb 2023 06:24:04 -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:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=pkUuoVsPO7rj7crjxhqsXkiJdIbOheCDQODQm6zJmAM=; b=ZqFCD2Vt7XIixCiEhyyMNWbzBgC8/HWEe+DOP06G+8TrOcJBda7INaA/bVB6RhrgCd LrtcEBayKQv8INfLZFqbWJhM6Xx8RXiG1wNaTEjGOXFmM8YNp3iDjJptWWIQC5n45VFH GWiC711mj3mCdWj0Q1rgdhgxxhgm5Sc7otLmossU+z1o/QjFEwcEUCOtgbjLndYG/zzp XB3k7+uahOIsOip9ktuHl6WxtYugfwoB5yY7Jdo1o2dSZMF0WTau3Ubh9aKGXMFE7nlY 0nQUbmGPLVfa8olOB3oMdu9NqgjruurtmHIa3OzUD0IKp+5RZ77yStwI69xQ3hI6QJT7 XpMg== 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:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=pkUuoVsPO7rj7crjxhqsXkiJdIbOheCDQODQm6zJmAM=; b=NTg17hyOwGupNbOXZBxgemmJ5BBnFuTocrsFS05HnY/+dVkIwQwPUaEPm7FiuKXV8M inMzD96y3pRQL+8/xoXj/taS6N8npF1ZOk9bqfy0KDkobn6VyPeK0697P/ZXj+WLOXkn HjtFUCLpwoFcXJwcn1G1e7Gz39Wa8SwMAemmoz/VGSE4Y76OUj4bPZRgCxvmeNq7Ubps 6WuUKz4mBLmW3t1X+hqULqPHterkCDK5/4XOdMv/hSM5h8vPKAEjZxU9RWQW+wwG0FBj 4po3kQLR0FzRO40OSMJCXpUSnVPcHxB1VVRRrzKbFnyLkLDN5GdXHB5wT+LajzOnTEOj R0Kg== X-Gm-Message-State: AO0yUKXLbIwzPunuHfYcikw4Ouy+Il6AYlisD3uQZBez+07FQgjzmhVa sOIuKBUN6M1hGOSQmrxrrfRMSn/Vm6CDYJ8k X-Received: by 2002:a5d:414f:0:b0:2c5:5048:8a6a with SMTP id c15-20020a5d414f000000b002c550488a6amr4395007wrq.60.1676557443658; Thu, 16 Feb 2023 06:24:03 -0800 (PST) Received: from localhost.localdomain ([81.0.6.76]) by smtp.gmail.com with ESMTPSA id r8-20020a5d4e48000000b002bfd524255esm1545552wrt.43.2023.02.16.06.24.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 16 Feb 2023 06:24:03 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Richard Henderson , Dapeng Mi , Sean Christopherson , Bin Meng , Zhuocheng Ding , =?utf-8?q?Alex_Benn=C3=A9e?= , Zhenyu Wang , qemu-riscv@nongnu.org, Alistair Francis , Zhao Liu , "Edgar E. Iglesias" , Paolo Bonzini , Marcel Apfelbaum , Robert Hoo , Yanan Wang , qemu-arm@nongnu.org, Peter Maydell , =?utf-8?q?Ph?= =?utf-8?q?ilippe_Mathieu-Daud=C3=A9?= , Palmer Dabbelt , Like Xu , Alistair Francis , Zhao Liu , Eduardo Habkost Subject: [PATCH 4/5] hw/arm: Restrict CPU clusters to the expected type Date: Thu, 16 Feb 2023 15:23:37 +0100 Message-Id: <20230216142338.82982-5-philmd@linaro.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230216142338.82982-1-philmd@linaro.org> References: <20230216142338.82982-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::433; envelope-from=philmd@linaro.org; helo=mail-wr1-x433.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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org ARM SSE expects v7-M cores; the ZynqMP SoC expects Cortex-A53/R5F. Do not allow any other CPU type by setting the cluster 'cpu-type' property. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/armsse.c | 1 + hw/arm/xlnx-zynqmp.c | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c index 0202bad787..1132fdcbe2 100644 --- a/hw/arm/armsse.c +++ b/hw/arm/armsse.c @@ -715,6 +715,7 @@ static void armsse_init(Object *obj) name = g_strdup_printf("cluster%d", i); object_initialize_child(obj, name, &s->cluster[i], TYPE_CPU_CLUSTER); qdev_prop_set_uint32(DEVICE(&s->cluster[i]), "cluster-id", i); + qdev_prop_set_string(DEVICE(&s->cluster[i]), "cpu-type", TYPE_ARMV7M); g_free(name); name = g_strdup_printf("armv7m%d", i); diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c index 335cfc417d..e45cf88625 100644 --- a/hw/arm/xlnx-zynqmp.c +++ b/hw/arm/xlnx-zynqmp.c @@ -224,6 +224,8 @@ static void xlnx_zynqmp_create_rpu(MachineState *ms, XlnxZynqMPState *s, object_initialize_child(OBJECT(s), "rpu-cluster", &s->rpu_cluster, TYPE_CPU_CLUSTER); qdev_prop_set_uint32(DEVICE(&s->rpu_cluster), "cluster-id", 1); + qdev_prop_set_string(DEVICE(&s->rpu_cluster), "cpu-type", + ARM_CPU_TYPE_NAME("cortex-r5f")); for (i = 0; i < num_rpus; i++) { const char *name; @@ -381,6 +383,8 @@ static void xlnx_zynqmp_init(Object *obj) object_initialize_child(obj, "apu-cluster", &s->apu_cluster, TYPE_CPU_CLUSTER); qdev_prop_set_uint32(DEVICE(&s->apu_cluster), "cluster-id", 0); + qdev_prop_set_string(DEVICE(&s->apu_cluster), "cpu-type", + ARM_CPU_TYPE_NAME("cortex-a53")); for (i = 0; i < num_apus; i++) { object_initialize_child(OBJECT(&s->apu_cluster), "apu-cpu[*]",