From nobody Fri May 17 02:03:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1689988299; cv=none; d=zohomail.com; s=zohoarc; b=Qt69XnSg0tNpNGWpGvG1EAYyHKkazhj/IooRFftqZ7Fc7XGcZwrOngfzF+6jEwKi1g/gfx/191TbhOG8pz0Dp/PV1qb46y8ADd9nlqpv3IADSikrt30bEdOANmJv5ccmrKz/7sxYMi0k4qlPssvuLHJz/G2otkiJ+l+VJ3WvnwQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689988299; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=cy+U6fI/MN0HS5G5L6dbLgpmHxeXy5WvCSthkf2mSx4=; b=FRDZ5AoH319OdFFjE8YFeWlOyzoLlrFK6826ys9TayW5/o2ekzHb/uFAFohvoB6bof4kly12YrlPf2Cq5fJ/Mdrfvevt+OanqeSkJUNAnwciMOEZf+ud67qTCQ+tDrrVa3lakraItOTlA6hBFUYVmt0FSUnEaqhjXaVuir4V230= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1689988299651520.1301121726117; Fri, 21 Jul 2023 18:11:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qN19F-0007eS-8Z; Fri, 21 Jul 2023 21:11:05 -0400 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 1qN196-0007dP-T9 for qemu-devel@nongnu.org; Fri, 21 Jul 2023 21:10:58 -0400 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qN192-0003vK-1T for qemu-devel@nongnu.org; Fri, 21 Jul 2023 21:10:56 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 226BF61DB9; Sat, 22 Jul 2023 01:10:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE4CCC433C7; Sat, 22 Jul 2023 01:10:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689988249; bh=w7f993dnowBsuYE0kBSskPi634zixrScKthFsP1CHqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QIaqAAEebxY7EJeSDIUIU2DMefkWOs1QbQm+AnqhNRgbIg2Y+OROFyuc8KxcVojjh 2qXyrJhBNLtb1CNgi5VeAnxySN8gu790Cn9ciMZP9L/aQ8gu+ZkKNjPrRB/W/+wGOX 6xEZ3YYYh7r0jlidfdwS8AKRuzqXGr9KNyw0thVSOBFwxSTt8OuZly86S6gT87faQa SzW+UHFHpkO7Yl100FOM1TwOxbHs4KuUK3kUtc76LR1u+IgPIYs/tHT4awqNPkj21P UYD/D63ft+Abd4efIx83zt5b4BjORaogsXXSjp4Cmn8kT4mwOcGsgCNRVIVL72vUUs SqoemFUznz24g== From: Stefano Stabellini To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: sstabellini@kernel.org, qemu-devel@nongnu.org, vikram.garhwal@amd.com, Oleksandr Tyshchenko Subject: [PULL 1/2] xen_arm: Create virtio-mmio devices during initialization Date: Fri, 21 Jul 2023 18:10:44 -0700 Message-Id: <20230722011045.3740256-1-sstabellini@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2604:1380:4641:c500::1; envelope-from=sstabellini@kernel.org; helo=dfw.source.kernel.org X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1689988301478100003 Content-Type: text/plain; charset="utf-8" From: Oleksandr Tyshchenko In order to use virtio backends we need to allocate virtio-mmio parameters (irq and base) and register corresponding buses. Use the constants defined in public header arch-arm.h to be aligned with the toolstack. So the number of current supported virtio-mmio devices is 10. For the interrupts triggering use already existing on Arm device-model hypercall. The toolstack should then insert the same amount of device nodes into guest device-tree. Signed-off-by: Oleksandr Tyshchenko Signed-off-by: Vikram Garhwal Reviewed-by: Stefano Stabellini --- hw/arm/xen_arm.c | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c index 044093fec7..e700829654 100644 --- a/hw/arm/xen_arm.c +++ b/hw/arm/xen_arm.c @@ -26,6 +26,7 @@ #include "qapi/qapi-commands-migration.h" #include "qapi/visitor.h" #include "hw/boards.h" +#include "hw/irq.h" #include "hw/sysbus.h" #include "sysemu/block-backend.h" #include "sysemu/tpm_backend.h" @@ -59,6 +60,38 @@ struct XenArmState { } cfg; }; =20 +/* + * VIRTIO_MMIO_DEV_SIZE is imported from tools/libs/light/libxl_arm.c unde= r Xen + * repository. + * + * Origin: git://xenbits.xen.org/xen.git 2128143c114c + */ +#define VIRTIO_MMIO_DEV_SIZE 0x200 + +#define NR_VIRTIO_MMIO_DEVICES \ + (GUEST_VIRTIO_MMIO_SPI_LAST - GUEST_VIRTIO_MMIO_SPI_FIRST) + +static void xen_set_irq(void *opaque, int irq, int level) +{ + xendevicemodel_set_irq_level(xen_dmod, xen_domid, irq, level); +} + +static void xen_create_virtio_mmio_devices(XenArmState *xam) +{ + int i; + + for (i =3D 0; i < NR_VIRTIO_MMIO_DEVICES; i++) { + hwaddr base =3D GUEST_VIRTIO_MMIO_BASE + i * VIRTIO_MMIO_DEV_SIZE; + qemu_irq irq =3D qemu_allocate_irq(xen_set_irq, NULL, + GUEST_VIRTIO_MMIO_SPI_FIRST + i); + + sysbus_create_simple("virtio-mmio", base, irq); + + DPRINTF("Created virtio-mmio device %d: irq %d base 0x%lx\n", + i, GUEST_VIRTIO_MMIO_SPI_FIRST + i, base); + } +} + void arch_handle_ioreq(XenIOState *state, ioreq_t *req) { hw_error("Invalid ioreq type 0x%x\n", req->type); @@ -110,6 +143,8 @@ static void xen_arm_init(MachineState *machine) =20 xen_register_ioreq(xam->state, machine->smp.cpus, xen_memory_listener); =20 + xen_create_virtio_mmio_devices(xam); + #ifdef CONFIG_TPM if (xam->cfg.tpm_base_addr) { xen_enable_tpm(xam); --=20 2.25.1 From nobody Fri May 17 02:03:33 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=kernel.org ARC-Seal: i=1; a=rsa-sha256; t=1689988287; cv=none; d=zohomail.com; s=zohoarc; b=APwtUPqWrXuM+Mvl4FCAp1yAnhSF/KVYfvTExNBSEIHDWLeWU0eldpQfsXnVZgeT5AvIDAn/bKOvIPQZXBRsJaglBF+WWdwgn/+Vk8jAEyNBmjK0pDergpHxO+pwpg9rabL2WYNGlaJvYoO5yeRvCLU4/LLvVhnZWa7F4WJ817A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1689988287; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=psmDYMq4CAaS4APhaACo3olYEB61tXWg8ub3BF6asJA=; b=JM34UNWqpz68jLGeZiPW30Rpnjo1L4cM+duSywbva4dL8sbb9Mj45SYSl6aRNbMXU4rWJV5HiEvTm1p5KgidENcTg8NnXisnxph0j9pyCTJtGTUAM6KJkFVpm2U6UZJhd1EKbRWUgpM5C9VGR7kPBB2qSh2dPggyIJhy88HVLww= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1689988287903911.7997475632361; Fri, 21 Jul 2023 18:11:27 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qN19A-0007e0-Vl; Fri, 21 Jul 2023 21:11:01 -0400 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 1qN196-0007dN-FZ for qemu-devel@nongnu.org; Fri, 21 Jul 2023 21:10:56 -0400 Received: from dfw.source.kernel.org ([2604:1380:4641:c500::1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qN194-0003vV-QA for qemu-devel@nongnu.org; Fri, 21 Jul 2023 21:10:56 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4146461DBB; Sat, 22 Jul 2023 01:10:51 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D90B8C433CA; Sat, 22 Jul 2023 01:10:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689988250; bh=0jy3DhgLsjglKa3CfNfoSJ9ChE2daVAu+4prkRCdmVE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zz9Uzgu1JpyH1cbDaMo8scSTBdrkJjB1YZjvaRJTTmShGvOBY7O9R3KBzFn4xxid6 7H6HMMud6ZV01BKFA+WeBvOaPS7+Ixi+z8cW21avPtA+Z9ioAdyhMFR4Oygmuczt6Q hv3nfVvedWgVEbTchBeKK838OxThp+hj+dvFHC0pzylj9pIZZ+OJerMCeds8VjFtw3 kKwNFNgCirgms26iA0uo1poEMZ4M98WpYA+MeF6z+7CwKXbYTXlQDS8fzWO1mVVQMc Yeaoy5i8TCa+vIGjhUq5CmdU2g0ZoeJw2lb1GWTSvxrSb4vPEpRfXr7jXmYJ7/vBIp qOzaTnkpBcmoQ== From: Stefano Stabellini To: peter.maydell@linaro.org, richard.henderson@linaro.org Cc: sstabellini@kernel.org, qemu-devel@nongnu.org, vikram.garhwal@amd.com, Oleksandr Tyshchenko Subject: [PULL 2/2] xen_arm: Initialize RAM and add hi/low memory regions Date: Fri, 21 Jul 2023 18:10:45 -0700 Message-Id: <20230722011045.3740256-2-sstabellini@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2604:1380:4641:c500::1; envelope-from=sstabellini@kernel.org; helo=dfw.source.kernel.org X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @kernel.org) X-ZM-MESSAGEID: 1689988290118100005 Content-Type: text/plain; charset="utf-8" From: Oleksandr Tyshchenko In order to use virtio backends we need to initialize RAM for the xen-mapcache (which is responsible for mapping guest memory using foreign mapping) to work. Calculate and add hi/low memory regions based on machine->ram_size. Use the constants defined in public header arch-arm.h to be aligned with th= e xen toolstack. While using this machine, the toolstack should then pass real ram_size using "-m" arg. If "-m" is not given, create a QEMU machine without IOREQ and oth= er emulated devices like TPM and VIRTIO. This is done to keep this QEMU machine usable for /etc/init.d/xencommons. Signed-off-by: Oleksandr Tyshchenko Signed-off-by: Vikram Garhwal Reviewed-by: Stefano Stabellini --- hw/arm/xen_arm.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/hw/arm/xen_arm.c b/hw/arm/xen_arm.c index e700829654..ec8de00cf5 100644 --- a/hw/arm/xen_arm.c +++ b/hw/arm/xen_arm.c @@ -60,6 +60,8 @@ struct XenArmState { } cfg; }; =20 +static MemoryRegion ram_lo, ram_hi; + /* * VIRTIO_MMIO_DEV_SIZE is imported from tools/libs/light/libxl_arm.c unde= r Xen * repository. @@ -92,6 +94,39 @@ static void xen_create_virtio_mmio_devices(XenArmState *= xam) } } =20 +static void xen_init_ram(MachineState *machine) +{ + MemoryRegion *sysmem =3D get_system_memory(); + ram_addr_t block_len, ram_size[GUEST_RAM_BANKS]; + + if (machine->ram_size <=3D GUEST_RAM0_SIZE) { + ram_size[0] =3D machine->ram_size; + ram_size[1] =3D 0; + block_len =3D GUEST_RAM0_BASE + ram_size[0]; + } else { + ram_size[0] =3D GUEST_RAM0_SIZE; + ram_size[1] =3D machine->ram_size - GUEST_RAM0_SIZE; + block_len =3D GUEST_RAM1_BASE + ram_size[1]; + } + + memory_region_init_ram(&ram_memory, NULL, "xen.ram", block_len, + &error_fatal); + + memory_region_init_alias(&ram_lo, NULL, "xen.ram.lo", &ram_memory, + GUEST_RAM0_BASE, ram_size[0]); + memory_region_add_subregion(sysmem, GUEST_RAM0_BASE, &ram_lo); + DPRINTF("Initialized region xen.ram.lo: base 0x%llx size 0x%lx\n", + GUEST_RAM0_BASE, ram_size[0]); + + if (ram_size[1] > 0) { + memory_region_init_alias(&ram_hi, NULL, "xen.ram.hi", &ram_memory, + GUEST_RAM1_BASE, ram_size[1]); + memory_region_add_subregion(sysmem, GUEST_RAM1_BASE, &ram_hi); + DPRINTF("Initialized region xen.ram.hi: base 0x%llx size 0x%lx\n", + GUEST_RAM1_BASE, ram_size[1]); + } +} + void arch_handle_ioreq(XenIOState *state, ioreq_t *req) { hw_error("Invalid ioreq type 0x%x\n", req->type); @@ -141,6 +176,14 @@ static void xen_arm_init(MachineState *machine) =20 xam->state =3D g_new0(XenIOState, 1); =20 + if (machine->ram_size =3D=3D 0) { + DPRINTF("ram_size not specified. QEMU machine started without IORE= Q" + "(no emulated devices including Virtio)\n"); + return; + } + + xen_init_ram(machine); + xen_register_ioreq(xam->state, machine->smp.cpus, xen_memory_listener); =20 xen_create_virtio_mmio_devices(xam); @@ -188,6 +231,8 @@ static void xen_arm_machine_class_init(ObjectClass *oc,= void *data) mc->init =3D xen_arm_init; mc->max_cpus =3D 1; mc->default_machine_opts =3D "accel=3Dxen"; + /* Set explicitly here to make sure that real ram_size is passed */ + mc->default_ram_size =3D 0; =20 #ifdef CONFIG_TPM object_class_property_add(oc, "tpm-base-addr", "uint64_t", --=20 2.25.1