From patchwork Wed Nov 22 18:30:36 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: 746026 Delivered-To: patch@linaro.org Received: by 2002:a5d:6706:0:b0:32d:baff:b0ca with SMTP id o6csp475056wru; Wed, 22 Nov 2023 10:32:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IEWvUqNquNC9oLoqVYy+80f4Be1YLU9DeS+F5EN0EAQ3OyjC5UCMRABTYiUvJCFNDVGP6hJ X-Received: by 2002:ac8:7f91:0:b0:41c:d8b6:27ef with SMTP id z17-20020ac87f91000000b0041cd8b627efmr3987780qtj.65.1700677921577; Wed, 22 Nov 2023 10:32:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700677921; cv=none; d=google.com; s=arc-20160816; b=aCIvQSVc/odNfd+powVqWNS3Hi2FKXnOXiJKvtsR5DJ/Y3ZdytTCcVYA5OLyDOVHuC TuDhCOD1fprpdcqglQF0V4MHQhLL2yaHBQw/012o2yGK5KT5VkQ6zkGs859lA4H+nU4m M5KXanO1F4ZRK/zKI9son7E7WrdBkXjlHBF9g0DZXxy7gya863pD7jDpgWlBQ5w6rQ1i ce2uYpKL5y3s7g6sQLS5aiKTRxS4yViRmHKsA5CdaLfJxgMHZxfJ978ggcjyW8sJVVbP dpynfYgR1RHRsfg6zuxKiJxZwN+Z9T0R1HwrsfyZ2clBWej87mxhQBcRGjnczZ1+fEGv wV/g== 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:message-id:date:subject:cc:to:from:dkim-signature; bh=7Rm3lhCAuFgUPCtL+Xe9ZOLLkN1sAT39F40LXUTGNo4=; fh=aTzmneatFEDiKMS1saCdxZb39+p//OutFupiUjvLGTw=; b=ss8fIbiHbwxhy/R4vDKkghb01XQbXkDiyrC6Uzgr6+HD718Bgz6xT0xv9VCSd/AwQ/ PZl4YrZTi+zoVYZcXxdeUPHlhjpjA4uCpYmArFzFbKrf1CJvJnfODuRY1ye4dztfyo7L ae5N0Iput9GSx3r0MIGxHw25E5PMb1EqvA8tlGUv1HKY+VwACY3gO7irjnEjykhxPnbT o3cEENvzl27sxsOe696rxgZmswJN48cxVtRTFQfy70obxzvdf1aAwLYhfrlymX0gRrvp bLxUOPxpzNCULli/Pw2jZfMprwG0gYNssdSBk3H5v1cEjRxhncdNlcAZd/aoLN2keMgq 018w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=yRjzGXJg; 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=fail (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 n12-20020ac85a0c000000b00423703b71c0si25043qta.295.2023.11.22.10.32.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 22 Nov 2023 10:32:01 -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=fail header.i=@linaro.org header.s=google header.b=yRjzGXJg; 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=fail (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 1r5s0G-00049N-0N; Wed, 22 Nov 2023 13:31:12 -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 1r5s07-000494-F2 for qemu-devel@nongnu.org; Wed, 22 Nov 2023 13:31:07 -0500 Received: from mail-wr1-x42f.google.com ([2a00:1450:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1r5rzx-0004YC-Lg for qemu-devel@nongnu.org; Wed, 22 Nov 2023 13:30:57 -0500 Received: by mail-wr1-x42f.google.com with SMTP id ffacd0b85a97d-3316d09c645so21674f8f.0 for ; Wed, 22 Nov 2023 10:30:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1700677851; x=1701282651; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=7Rm3lhCAuFgUPCtL+Xe9ZOLLkN1sAT39F40LXUTGNo4=; b=yRjzGXJgQrPpAwx3tcXdfVt5Dm3pBPxKZTMsPn4vhlYlLQ1MrgUGA/G+ZtJ4j3AlGP YNg6Om+f5yvibc/Mnpcw6tBdhO1ccmLRHoVAXu5ZqHkSijnF3Zkeh7I4KfdEDmZWW55N NPz2+P3S8xwP07yOUsRTqzSba4FQ4Jv1eGour8xRasSMNCSlGn3a5aj06C8CJHi8Aqo+ b/xa/M71dQYsqjrFSWNjiPfxZrBH8op6gN541vSCsNt3aNZDWRqPVfRmWdEf1NJjEmGw 6vGyC1Bv3Frk5F1w8EXG5NBTT6kjj/hWgMFWZooQsrAQYrPeNGGX+zdDucL8VJhtPqmE quEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700677851; x=1701282651; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=7Rm3lhCAuFgUPCtL+Xe9ZOLLkN1sAT39F40LXUTGNo4=; b=Py9FHaqnmpw11iXxmH2BETRzLgEAVB+ODmwnAWi4uJ5FOonKyh9GEuqqzZC09tdFx+ CL2DHTnb7ofgBdIXE18oUgXJEC+tbkaEcrb3tBYscsYDZoOc9btG2RQ6Mv3d/LN3I0aQ sDBOME8GqepQKAxLMJvl+JW0JiJnr1AfVJyZWR5oiXugim7bxe7VZ3FhjucIB9WIMdop fFs4ZrUj20PcFwSCHXDt12Kbnu5aQvcWL+/Hvkb+uPauEdvjsdFClCqR0DfQwg/Mw7SX /JOI8CXGF23P1QS8+2/p6dbjYgYhDAq5LlLMdDreHmOteDU5cochrGawGCu5H8GUj+EL RhhQ== X-Gm-Message-State: AOJu0YxuF7si06N138D31eFFmVOVjcxUDMGWgMESwFSmDG7W99z8shL/ Rvf6b8h1ll7lpqFX9R70sa9Lb8YTmtd7lwEDkug= X-Received: by 2002:a5d:510c:0:b0:32f:a48f:3658 with SMTP id s12-20020a5d510c000000b0032fa48f3658mr1676083wrt.69.1700677850865; Wed, 22 Nov 2023 10:30:50 -0800 (PST) Received: from m1x-phil.lan (pas38-h02-176-184-5-64.dsl.sta.abo.bbox.fr. [176.184.5.64]) by smtp.gmail.com with ESMTPSA id f5-20020a5d64c5000000b00332ce0d7300sm41010wri.92.2023.11.22.10.30.49 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 22 Nov 2023 10:30:50 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , Richard Henderson , Eduardo Habkost , Peter Maydell , Thomas Huth , Mark Cave-Ayland , =?utf-8?q?Daniel_P=2E_Ber?= =?utf-8?q?rang=C3=A9?= , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH-for-9.0 00/11] hw/arm: Step toward building qemu-system-{arm, aarch64} altogether Date: Wed, 22 Nov 2023 19:30:36 +0100 Message-ID: <20231122183048.17150-1-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42f; envelope-from=philmd@linaro.org; helo=mail-wr1-x42f.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, T_SCC_BODY_TEXT_LINE=-0.01 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 Hi, This series is a step toward having a single qemu-system-aarch64 binary for both ARM and Aarch64 variants. First we add the TypeInfo::can_register() handler to QOM, to be able to decide at runtime if a type can be registered. We'll later use the target_aarch64_available() method to restrict some QOM types to the aarch64 build. Then few cleanups allow us to build the Raspi machines and its components as target-agnostic. To do that, instead of embedding a CPUState in its SoC container, we use a pointer to it. Since the type is forward-declared by "cpu-qom.h", we can use that in our hw/ headers. Then the correct CPU is instanciated by calling object_new() instead of object_initialize_child(). Finally objects are moved to meson system_ss[] source set to be built once. Does that look reasonable to keep merging TARGET_ARM/AARCH64? Thanks, Phil. Philippe Mathieu-Daudé (11): qom: Introduce the TypeInfo::can_register() handler target/arm: Add target_aarch64_available() helper target/arm: Declare ARM_CPU_TYPE_NAME/SUFFIX in 'cpu-qom.h' target/arm: Move ARM_CPU_IRQ/FIQ definitions to 'cpu-qom.h' target/arm: Move GTIMER definitions to 'cpu-defs.h' hw/arm/bcm2836: Simplify use of 'reset-cbar' property hw/arm/bcm2836: Simplify access to 'start-powered-off' property hw/arm/bcm2836: Use ARM_CPU 'mp-affinity' property hw/arm/bcm2836: Allocate ARM CPU state with object_new() hw/arm/raspi: Build bcm2836.o and raspi.o objects once hw/intc/meson: Simplify how arm_gicv3_kvm.o objects are built include/hw/arm/bcm2836.h | 4 ++-- include/qom/object.h | 4 ++++ target/arm/cpu-defs.h | 19 ++++++++++++++++ target/arm/cpu-qom.h | 11 ++++++++++ target/arm/cpu.h | 16 +------------- hw/arm/bcm2836.c | 43 ++++++++++++++++--------------------- hw/arm/raspi.c | 8 +++---- hw/intc/arm_gicv3_its_kvm.c | 1 + hw/intc/arm_gicv3_kvm.c | 1 + qom/object.c | 3 +++ target/arm/cpu.c | 9 ++++++++ hw/arm/meson.build | 6 ++++-- hw/intc/meson.build | 6 ++++-- 13 files changed, 80 insertions(+), 51 deletions(-) create mode 100644 target/arm/cpu-defs.h