From nobody Tue May 21 01:26:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) client-ip=209.85.221.46; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f46.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612106059; cv=none; d=zohomail.com; s=zohoarc; b=i4GlHX086ZgOuiqhTZtCUEuVsELSB1JRrF/z9HwDpAGeqsb4f0vAXRX8tkBCSf8T/d9x0tE7pdi04ldNvMQdG71Uuz5zgc6XlZ+wRF0Zpoi+faunMEWR7nTZJGbV0Cqp6NXLFdmSrBQDCy2Hx1o2N+9i77LW8EcnmXvsQdKfdEc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612106059; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=ldhPTzxA4UPWiOW+LZ2h6Ki08VC7Oo3bcq6ZAuAin0w=; b=lK464pUBEA5wVD5wxPcBjafof8TvIf1bB8diu4gNou8JLlThlpg+XefGn1hrwJKn+mP3N3Rlf8YV9iVkx7YNPokwGrjS0iJtfd+2QvWYcMtFswB4FUL4bcsj81vQsZ02yrbut4yMC1dPy9n7P5TjU2m/F5YaHKN9vFycFI+EYsk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.46 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.46]) by mx.zohomail.com with SMTPS id 1612106059425648.9166850507918; Sun, 31 Jan 2021 07:14:19 -0800 (PST) Received: by mail-wr1-f46.google.com with SMTP id 6so13843319wri.3 for ; Sun, 31 Jan 2021 07:14:18 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id d17sm13763448wma.2.2021.01.31.07.14.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 07:14:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ldhPTzxA4UPWiOW+LZ2h6Ki08VC7Oo3bcq6ZAuAin0w=; b=SrJXQmjd7iWFGHl3EDknBIdB0mMy5DNuZNVkW+dhCAOwwwaT6d3vqof3LR6THZz5XS CRKNKxQ4vvef235fsMX0jEpaw0ZeJxod+44Cakg7oc4inzeuh7hfthIv2lbW5uLJt994 j04cN+hlE8/b+DKikyYT6ZrKoi4uJHXyg67vYeuNgpDPknjE04ThO8H+rbTCaMoWs1wO RmukcZvwCO8XMxHVH7spkWvpvSG8QQdVFyOSkOETvKulaWTeK4YHrGgWfTBybWh9dZbK kiAhvPmNflrqwnF5JtTTCGyPLqWTgSsXqtg8tFo+5zW/nxTcHSuU1wpexpraeKKcCTSx n6bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ldhPTzxA4UPWiOW+LZ2h6Ki08VC7Oo3bcq6ZAuAin0w=; b=cxM/dWVRrW80RTZlxmkd9P6iyA06VrlRiAkDUGMIvlDvniICOvWNnqVYuJvoYP72/A VEfv1Y7JaX/cWUuer4G6KC3/UDxNT/eNdbmfFnezmIuybSfn7tZQfMs0HPEo+RKFOCLB WTK9TooOozPTXXYCwYYZS6g0QMsMFKVQQewRDPkJ+XUGdrkbF5vcFpKqHE4fYuEZlcZH MkWYwH1fY0pC3udrM4uxdNtBVJ/VVS4yyTaRPT1tLMg43aTZ8jRoEoHhwp6r4skfpiV8 HI141mzLyHB4vU7dPJt7B2SfqQ9maW5/wahdYi5HpSqLO/lhfd6LsKFA071Fev4cu69G U+Vw== X-Gm-Message-State: AOAM530Eg6OXFTPCq7bKjdF2b1LeIhk2rjIAw6gR1x7tlc2vLk1eNsXS FT4YMMIBv+8DuF5A23jgJWc= X-Google-Smtp-Source: ABdhPJyNAI0PM+G/fGs4RplR8Pdh0f69b5dnX+34byLVepNCbGPIe90MKxk2XngzOfMp92h/ba199A== X-Received: by 2002:a5d:690b:: with SMTP id t11mr13995267wru.12.1612106057720; Sun, 31 Jan 2021 07:14:17 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Luc Michel , Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Tokarev , Andrew Baumann , Laurent Vivier Subject: [RFC PATCH 1/2] hw/arm/raspi: Trivial code movement Date: Sun, 31 Jan 2021 16:14:09 +0100 Message-Id: <20210131151410.318649-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131151410.318649-1-f4bug@amsat.org> References: <20210131151410.318649-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Move the abstract TYPE_BCM283X and TYPE_RASPI_MACHINE declarations earlier to make the next commit easier to review. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Luc Michel --- hw/arm/bcm2836.c | 32 +++++++++++++++++--------------- hw/arm/raspi.c | 18 ++++++++++-------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index de7ade2878e..fd16ed87c40 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -219,20 +219,6 @@ static void bcm2837_class_init(ObjectClass *oc, void *= data) =20 static const TypeInfo bcm283x_types[] =3D { { - .name =3D TYPE_BCM2835, - .parent =3D TYPE_BCM283X, - .class_init =3D bcm2835_class_init, - }, { - .name =3D TYPE_BCM2836, - .parent =3D TYPE_BCM283X, - .class_init =3D bcm2836_class_init, -#ifdef TARGET_AARCH64 - }, { - .name =3D TYPE_BCM2837, - .parent =3D TYPE_BCM283X, - .class_init =3D bcm2837_class_init, -#endif - }, { .name =3D TYPE_BCM283X, .parent =3D TYPE_DEVICE, .instance_size =3D sizeof(BCM283XState), @@ -240,7 +226,23 @@ static const TypeInfo bcm283x_types[] =3D { .class_size =3D sizeof(BCM283XClass), .class_init =3D bcm283x_class_init, .abstract =3D true, - } + }, + { + .name =3D TYPE_BCM2835, + .parent =3D TYPE_BCM283X, + .class_init =3D bcm2835_class_init, + }, { + .name =3D TYPE_BCM2836, + .parent =3D TYPE_BCM283X, + .class_init =3D bcm2836_class_init, + }, +#ifdef TARGET_AARCH64 + { + .name =3D TYPE_BCM2837, + .parent =3D TYPE_BCM283X, + .class_init =3D bcm2837_class_init, + }, +#endif }; =20 DEFINE_TYPES(bcm283x_types) diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index 990509d3852..dce966a4dd8 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -369,6 +369,13 @@ static void raspi3b_machine_class_init(ObjectClass *oc= , void *data) #endif /* TARGET_AARCH64 */ =20 static const TypeInfo raspi_machine_types[] =3D { + { + .name =3D TYPE_RASPI_MACHINE, + .parent =3D TYPE_MACHINE, + .instance_size =3D sizeof(RaspiMachineState), + .class_size =3D sizeof(RaspiMachineClass), + .abstract =3D true, + }, { .name =3D MACHINE_TYPE_NAME("raspi0"), .parent =3D TYPE_RASPI_MACHINE, @@ -381,8 +388,9 @@ static const TypeInfo raspi_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("raspi2b"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi2b_machine_class_init, + }, #ifdef TARGET_AARCH64 - }, { + { .name =3D MACHINE_TYPE_NAME("raspi3ap"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3ap_machine_class_init, @@ -390,14 +398,8 @@ static const TypeInfo raspi_machine_types[] =3D { .name =3D MACHINE_TYPE_NAME("raspi3b"), .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi3b_machine_class_init, + }, #endif - }, { - .name =3D TYPE_RASPI_MACHINE, - .parent =3D TYPE_MACHINE, - .instance_size =3D sizeof(RaspiMachineState), - .class_size =3D sizeof(RaspiMachineClass), - .abstract =3D true, - } }; =20 DEFINE_TYPES(raspi_machine_types) --=20 2.26.2 From nobody Tue May 21 01:26:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1612106064; cv=none; d=zohomail.com; s=zohoarc; b=hnkEgpCcFLQnN6bagXbQj+WgeHOXhbzoDS74A3tEgbVByqdNM7WZnkaeojS8S90xR6TfLlxLx9bQL9REfaBQFeOCQdvUVgstpwG/lmp+jWehtx3D9/6sXaf6IKknplRfd6n2YgsuNjmRAbmPTUNhzZSMz1EKqi9YFOADrQQEbww= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612106064; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=r+g1tP1DkDesVdYhAnUOBWvR86/+XyTKbQQZsxh+ijo=; b=NLMo90uOMxPmyQYsOVq20exETSkwG0gXInzODKfq28fsAdDYXFqODuLJvfHm70/XotC9XJ3+nb01Qc7pMLMUTEopiNCBs/RK5e5zdrJwwKVG2vo5S0tBLsBuU6+jk2roEKgNmT4DhlebX1fZno9vTe3wFis0dHEsEQoNe4ZRLWs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 161210606456570.98974552382401; Sun, 31 Jan 2021 07:14:24 -0800 (PST) Received: by mail-wm1-f47.google.com with SMTP id m1so7760958wml.2 for ; Sun, 31 Jan 2021 07:14:24 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (7.red-83-57-171.dynamicip.rima-tde.net. [83.57.171.7]) by smtp.gmail.com with ESMTPSA id s4sm18304850wme.38.2021.01.31.07.14.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Jan 2021 07:14:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=r+g1tP1DkDesVdYhAnUOBWvR86/+XyTKbQQZsxh+ijo=; b=hSIFqsW4F8vJBfeIY+WbylKHqyBILO/QWN+oHD5gx2tRowQtjti8gFbzGRtW2PQzKu mHCciR6q/vLXCBJXLPTrg+JYVpTT8H5PRUXZp8S0hRmhRjztg6u2ohFMhv1uyQQmgxZn 7Ek+MdiIv/p3yf2VYrTzBWk38OKpGo5mHwvTMvcOnthRdZzodkHWp+7PtS3fO8vNQkEh eUzGHNUh5ddXDvUq3I+vzabRFbPyeeNWPhhqLOmQfdNAxZxZaocC8U7TjTHalL6ZaCn+ xV1YNZ6QujS4GoCxx5h8GTHWhllqLFlrYKVn835J0+vY/sOfc4MsScjA9EotivNG9NlN xAeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=r+g1tP1DkDesVdYhAnUOBWvR86/+XyTKbQQZsxh+ijo=; b=O27eH9jMUpXla7zE4lAkw45YipmU4XsNzNi3uJIId2TI7u4dSn50Vc0CeqlOKg6D2t 8rCiaMH37/OYPNcOXHD8AoJy37XxBL28+UfQYZZEJvZS8149NxZZ9cTkKUwfb8FbM/5v VrRV1taqL7b/IcIu4LNKxqSQQrgLKqsDP8hT1DgauhVc52xFqJZxgee5+ioxywQivDWy KHNHxRhAG/oZO74WiO04HkIuEldv80V7A56X+bQSfBqjjigDyDegxs+ZiSwykDImFiif 4HgNPDYyo4OSd7co2/Gsjb+WEombqtIN/IiE0dut1qRxwV5ThTEYUXkVQWdgk2OTcnf0 dKCA== X-Gm-Message-State: AOAM5330KYcDyyYUyb3XyKJSjIkRXC0rkoHsHXwiP+0FLsCJoZSNxir3 1oyS8Xm0yMzJuUXpb4ia1p4= X-Google-Smtp-Source: ABdhPJxidqpTr3QzQlIyLmEZ1bbwOq7P/2eRvmnG+JeWWBFUdRv1yZstRnQY9MvACPPC5SLu2g+j9w== X-Received: by 2002:a05:600c:210b:: with SMTP id u11mr11676843wml.16.1612106062785; Sun, 31 Jan 2021 07:14:22 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-trivial@nongnu.org, Luc Michel , Peter Maydell , qemu-arm@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Tokarev , Andrew Baumann , Laurent Vivier Subject: [RFC PATCH 2/2] hw/arm/raspi: Restrict BCM2835 / BCM2836 SoC to TCG Date: Sun, 31 Jan 2021 16:14:10 +0100 Message-Id: <20210131151410.318649-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210131151410.318649-1-f4bug@amsat.org> References: <20210131151410.318649-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) KVM requires the target cpu to be at least ARMv8 architecture (support on ARMv7 has been dropped in commit 82bf7ae84ce: "target/arm: Remove KVM support for 32-bit Arm hosts"). From the various SoC used by the Raspberry Pi machines, only the BCM2837 is an ARMv8 (Cortex-A53). Restrict the BCM2835 (ARM1176) and BCM2836 (Cortex-A7) to TCG. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/bcm2836.c | 6 ++++++ hw/arm/raspi.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c index fd16ed87c40..3051764f2dc 100644 --- a/hw/arm/bcm2836.c +++ b/hw/arm/bcm2836.c @@ -89,6 +89,7 @@ static bool bcm283x_common_realize(DeviceState *dev, Erro= r **errp) return true; } =20 +#ifdef CONFIG_TCG static void bcm2835_realize(DeviceState *dev, Error **errp) { BCM283XState *s =3D BCM283X(dev); @@ -107,6 +108,7 @@ static void bcm2835_realize(DeviceState *dev, Error **e= rrp) sysbus_connect_irq(SYS_BUS_DEVICE(&s->peripherals), 1, qdev_get_gpio_in(DEVICE(&s->cpu[0].core), ARM_CPU_FIQ)); } +#endif /* CONFIG_TCG */ =20 static void bcm2836_realize(DeviceState *dev, Error **errp) { @@ -178,6 +180,7 @@ static void bcm283x_class_init(ObjectClass *oc, void *d= ata) dc->user_creatable =3D false; } =20 +#ifdef CONFIG_TCG static void bcm2835_class_init(ObjectClass *oc, void *data) { DeviceClass *dc =3D DEVICE_CLASS(oc); @@ -201,6 +204,7 @@ static void bcm2836_class_init(ObjectClass *oc, void *d= ata) bc->clusterid =3D 0xf; dc->realize =3D bcm2836_realize; }; +#endif /* CONFIG_TCG */ =20 #ifdef TARGET_AARCH64 static void bcm2837_class_init(ObjectClass *oc, void *data) @@ -227,6 +231,7 @@ static const TypeInfo bcm283x_types[] =3D { .class_init =3D bcm283x_class_init, .abstract =3D true, }, +#ifdef CONFIG_TCG { .name =3D TYPE_BCM2835, .parent =3D TYPE_BCM283X, @@ -236,6 +241,7 @@ static const TypeInfo bcm283x_types[] =3D { .parent =3D TYPE_BCM283X, .class_init =3D bcm2836_class_init, }, +#endif /* CONFIG_TCG */ #ifdef TARGET_AARCH64 { .name =3D TYPE_BCM2837, diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c index dce966a4dd8..cfa15504d9c 100644 --- a/hw/arm/raspi.c +++ b/hw/arm/raspi.c @@ -319,6 +319,7 @@ static void raspi_machine_class_common_init(MachineClas= s *mc, mc->default_ram_id =3D "ram"; }; =20 +#ifdef CONFIG_TCG static void raspi0_machine_class_init(ObjectClass *oc, void *data) { MachineClass *mc =3D MACHINE_CLASS(oc); @@ -346,6 +347,7 @@ static void raspi2b_machine_class_init(ObjectClass *oc,= void *data) rmc->board_rev =3D 0xa21041; raspi_machine_class_common_init(mc, rmc->board_rev); }; +#endif /* CONFIG_TCG */ =20 #ifdef TARGET_AARCH64 static void raspi3ap_machine_class_init(ObjectClass *oc, void *data) @@ -376,6 +378,7 @@ static const TypeInfo raspi_machine_types[] =3D { .class_size =3D sizeof(RaspiMachineClass), .abstract =3D true, }, +#ifdef CONFIG_TCG { .name =3D MACHINE_TYPE_NAME("raspi0"), .parent =3D TYPE_RASPI_MACHINE, @@ -389,6 +392,7 @@ static const TypeInfo raspi_machine_types[] =3D { .parent =3D TYPE_RASPI_MACHINE, .class_init =3D raspi2b_machine_class_init, }, +#endif /* CONFIG_TCG */ #ifdef TARGET_AARCH64 { .name =3D MACHINE_TYPE_NAME("raspi3ap"), --=20 2.26.2