From nobody Sat Nov 30 03:53:23 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1618224809; cv=none; d=zohomail.com; s=zohoarc; b=LnnqxVeNqXKHHt9rWhl8GRNw7EWTLg7n4PMs6rmsZJmElF9QASPRYaPJtfhpLS00hT6jF3QKogbV7m/DyFgHBmUhNA/InX1HG8gNZRvT3gd0MCOpRooC+LgyPjhXZab8Jcn2nPyZjwShaoqF4qLeXdWigeObl2UcIh7mnyC+IWg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1618224809; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To; bh=uq9l6yytKyjitM1CpErXQrKry0Gv1088Wor1QpcNSbE=; b=KHmuWYdl40ufBi1IPgiYPT+PYSelMq4HG8Gp8LTWzsG0W7n6LgRiHddIRJ8Mz3vhfbkOI0ZQaC/WyjOsfn9LGI4Zxj03Vr+wr06EWCiRg6XDZ5DXSD0QU8osoBMy8cAdQzIrdwCMiVHbGUeREtpmkmMua8mlKcm5qRNSyIW4CGA= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1618224809313416.35129504226563; Mon, 12 Apr 2021 03:53:29 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.108961.207963 (Exim 4.92) (envelope-from ) id 1lVuBp-0000mL-Kz; Mon, 12 Apr 2021 10:53:09 +0000 Received: by outflank-mailman (output) from mailman id 108961.207963; Mon, 12 Apr 2021 10:53:09 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lVuBp-0000mC-Gw; Mon, 12 Apr 2021 10:53:09 +0000 Received: by outflank-mailman (input) for mailman id 108961; Mon, 12 Apr 2021 10:53:08 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1lVuBo-0000hn-0H for xen-devel@lists.xenproject.org; Mon, 12 Apr 2021 10:53:08 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id 0dfdfd44-22ae-4134-b6e0-b309473b5af6; Mon, 12 Apr 2021 10:53:02 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 3AA52D6E; Mon, 12 Apr 2021 03:53:02 -0700 (PDT) Received: from e125770.cambridge.arm.com (e125770.cambridge.arm.com [10.1.197.16]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 52AEC3F694; Mon, 12 Apr 2021 03:53:01 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 0dfdfd44-22ae-4134-b6e0-b309473b5af6 From: Luca Fancellu To: xen-devel@lists.xenproject.org Cc: bertrand.marquis@arm.com, wei.chen@arm.com, Stefano Stabellini , Julien Grall , Volodymyr Babchuk Subject: [PATCH v3 1/4] xen/arm: Move dom0 creation in domain_build.c Date: Mon, 12 Apr 2021 11:52:40 +0100 Message-Id: <20210412105243.23354-2-luca.fancellu@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210412105243.23354-1-luca.fancellu@arm.com> References: <20210412105243.23354-1-luca.fancellu@arm.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Move dom0 creation and start from setup.c to domain_build.c on a dedicate function. Signed-off-by: Luca Fancellu Reviewed-by: Julien Grall --- v3 changes: - move create_dom0 function after construct_dom0 and make construct_dom0 static --- xen/arch/arm/domain_build.c | 38 ++++++++++++++++++++++++++++++++++++- xen/arch/arm/setup.c | 29 +--------------------------- xen/include/asm-arm/setup.h | 2 +- 3 files changed, 39 insertions(+), 30 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 374bf655ee..359957dc1b 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -2520,7 +2521,7 @@ void __init create_domUs(void) } } =20 -int __init construct_dom0(struct domain *d) +static int __init construct_dom0(struct domain *d) { struct kernel_info kinfo =3D {}; int rc; @@ -2578,6 +2579,41 @@ int __init construct_dom0(struct domain *d) return construct_domain(d, &kinfo); } =20 +struct domain* __init create_dom0(void) +{ + struct domain *dom0; + struct xen_domctl_createdomain dom0_cfg =3D { + .flags =3D XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap, + .max_evtchn_port =3D -1, + .max_grant_frames =3D gnttab_dom0_frames(), + .max_maptrack_frames =3D -1, + }; + + /* The vGIC for DOM0 is exactly emulating the hardware GIC */ + dom0_cfg.arch.gic_version =3D XEN_DOMCTL_CONFIG_GIC_NATIVE; + /* + * Xen vGIC supports a maximum of 992 interrupt lines. + * 32 are substracted to cover local IRQs. + */ + dom0_cfg.arch.nr_spis =3D min(gic_number_lines(), (unsigned int) 992) = - 32; + if ( gic_number_lines() > 992 ) + printk(XENLOG_WARNING "Maximum number of vGIC IRQs exceeded.\n"); + dom0_cfg.arch.tee_type =3D tee_get_type(); + dom0_cfg.max_vcpus =3D dom0_max_vcpus(); + + if ( iommu_enabled ) + dom0_cfg.flags |=3D XEN_DOMCTL_CDF_iommu; + + dom0 =3D domain_create(0, &dom0_cfg, true); + if ( IS_ERR(dom0) || (alloc_dom0_vcpu0(dom0) =3D=3D NULL) ) + panic("Error creating domain 0\n"); + + if ( construct_dom0(dom0) !=3D 0) + panic("Could not set up DOM0 guest OS\n"); + + return dom0; +} + /* * Local variables: * mode: C diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c index 2532ec9739..b405f58996 100644 --- a/xen/arch/arm/setup.c +++ b/xen/arch/arm/setup.c @@ -51,7 +51,6 @@ #include #include #include -#include #include #include =20 @@ -805,12 +804,6 @@ void __init start_xen(unsigned long boot_phys_offset, const char *cmdline; struct bootmodule *xen_bootmodule; struct domain *dom0; - struct xen_domctl_createdomain dom0_cfg =3D { - .flags =3D XEN_DOMCTL_CDF_hvm | XEN_DOMCTL_CDF_hap, - .max_evtchn_port =3D -1, - .max_grant_frames =3D gnttab_dom0_frames(), - .max_maptrack_frames =3D -1, - }; int rc; =20 dcache_line_bytes =3D read_dcache_line_bytes(); @@ -965,27 +958,7 @@ void __init start_xen(unsigned long boot_phys_offset, enable_errata_workarounds(); =20 /* Create initial domain 0. */ - /* The vGIC for DOM0 is exactly emulating the hardware GIC */ - dom0_cfg.arch.gic_version =3D XEN_DOMCTL_CONFIG_GIC_NATIVE; - /* - * Xen vGIC supports a maximum of 992 interrupt lines. - * 32 are substracted to cover local IRQs. - */ - dom0_cfg.arch.nr_spis =3D min(gic_number_lines(), (unsigned int) 992) = - 32; - if ( gic_number_lines() > 992 ) - printk(XENLOG_WARNING "Maximum number of vGIC IRQs exceeded.\n"); - dom0_cfg.arch.tee_type =3D tee_get_type(); - dom0_cfg.max_vcpus =3D dom0_max_vcpus(); - - if ( iommu_enabled ) - dom0_cfg.flags |=3D XEN_DOMCTL_CDF_iommu; - - dom0 =3D domain_create(0, &dom0_cfg, true); - if ( IS_ERR(dom0) || (alloc_dom0_vcpu0(dom0) =3D=3D NULL) ) - panic("Error creating domain 0\n"); - - if ( construct_dom0(dom0) !=3D 0) - panic("Could not set up DOM0 guest OS\n"); + dom0 =3D create_dom0(); =20 heap_init_late(); =20 diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h index 28bf622aa1..5283244015 100644 --- a/xen/include/asm-arm/setup.h +++ b/xen/include/asm-arm/setup.h @@ -93,8 +93,8 @@ void acpi_create_efi_mmap_table(struct domain *d, =20 int acpi_make_efi_nodes(void *fdt, struct membank tbl_add[]); =20 -int construct_dom0(struct domain *d); void create_domUs(void); +struct domain* create_dom0(void); =20 void discard_initial_modules(void); void fw_unreserved_regions(paddr_t s, paddr_t e, --=20 2.17.1