From nobody Mon Feb 9 13:09:40 2026 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; dkim=pass; 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=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1736334839; cv=none; d=zohomail.com; s=zohoarc; b=lv73rMcK0HKksw34xPgYPnAbKT7Sa8RI8idZlyOFHhqxGFMlxAA1V9jAQUILyA+ykeIDNxyH/m0HTTQtr5gwTj9CTY8WpMK2ijsqs1StPEBx6sSrQwSh+EDUuvBbAFtzYG9F8fyA17wzgL2L+DM/4cDeZ336bUv803OWO5tGeF8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1736334839; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=GR2a/0jnuvbrYQt6CCllwzwGe4JakRFRLxGKEovkNEQ=; b=SiuyOlZOdUYitAgqe8cbe0rklvJP2OqbytDBZr3qBVtsdCS9+2/apb6r10Fi5YyEzoYVXeDXDWiqr6e1qcPIO4KoMweIXqm4Cw6SEIbz5HFbTb2Mmrt7ommRSMIKoTILVeVsBD2Hbj/wgibvQHTeClBX+UcZhu5o+k1mro4AogI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1736334839485450.6900754471651; Wed, 8 Jan 2025 03:13:59 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.867134.1278568 (Exim 4.92) (envelope-from ) id 1tVTzz-0001OT-2q; Wed, 08 Jan 2025 11:13:19 +0000 Received: by outflank-mailman (output) from mailman id 867134.1278568; Wed, 08 Jan 2025 11:13:19 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tVTzy-0001Mv-Sa; Wed, 08 Jan 2025 11:13:18 +0000 Received: by outflank-mailman (input) for mailman id 867134; Wed, 08 Jan 2025 11:13:18 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tVTzx-0001BZ-SM for xen-devel@lists.xenproject.org; Wed, 08 Jan 2025 11:13:17 +0000 Received: from mail-lj1-x22a.google.com (mail-lj1-x22a.google.com [2a00:1450:4864:20::22a]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 8ee60536-cdb1-11ef-a0df-8be0dac302b0; Wed, 08 Jan 2025 12:13:16 +0100 (CET) Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-304d760f0dfso50250541fa.2 for ; Wed, 08 Jan 2025 03:13:16 -0800 (PST) Received: from fedora.. ([94.75.70.14]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-3045ad99d11sm67292171fa.33.2025.01.08.03.13.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Jan 2025 03:13:14 -0800 (PST) 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: 8ee60536-cdb1-11ef-a0df-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1736334796; x=1736939596; darn=lists.xenproject.org; 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=GR2a/0jnuvbrYQt6CCllwzwGe4JakRFRLxGKEovkNEQ=; b=a9OS8uP9V30NUmR7MKpmh3whzHv36zAtbxa5q/6yCD2Ow+3XrfHvchNBkjHRjobKI9 f8GJmwGs9cvZurgFFnDggsprXpW/9mdONBGLI8NZCHdBpmyNZBuS5EUvP/EjdyQZaI00 sFMKyezmcdkZtxqsWI+to3N43EJTPB95MqnHuYFpPimtK2sY4zxmDWWrNUsZItJcudNY BeKFSYZegI/yrcKG+7LKqslejlzdqjSCG9SPX3uftvFB0fifCBKgUZHN85lAIxt9gtyJ gHjKYBxVx/OOvX8GS5QjzhRDE3GygVw4KdKZeD1083mO8Yk1h8h5BFhWNzE5LJs81foG hmmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736334796; x=1736939596; 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=GR2a/0jnuvbrYQt6CCllwzwGe4JakRFRLxGKEovkNEQ=; b=Uv00/BseS/srHlaVLT5v72Uut+MLmFWBteFks0Agn9k823OEILjsRM78OuNZOLiwoj 6m+HGiBeSHHLYanwb1PD7yhjoKgieE2PzYvj2hU5Ihri42LGtwtDqEkxYECtOX+by3OE UOx7SNv/m1U4RZguPQx5kAUDAFc9xfHb/6R7vX3GU3pG2ypvxXg7+WEfDkOU+CL5PgUi UDR3dsH1JxMicRg5EqsrwfkWohM+01nebA3+SC4sO1vkSv7yAkUyRhNncpNC1O1z+2XU i9AGE1Ipj5XCnpAz39yLtaTLE8Okp+8UJ41sK1fTYnHbrzwg6sh+8hf4dV/ypYvh9Wiw tNlw== X-Gm-Message-State: AOJu0Yxx+nTTKTPLmPQ9Q4z1aWf+JEHAZied5jkq1YmhW6fiA65LPXa0 fu8N+sV4odw0F31iZR85vCNLRqxrz2gZ7vlDtgssJb34oqX3eTnqxwx0jh/x X-Gm-Gg: ASbGncsvxliWtIMOPCMtQUKFhCt/ZcEaEQw8+/eMM2v7TV7vy5qdQc0ilxoUAZg8OWq b0Nl+f6+BEOCiGOyK6kg3QscNWG7bTe38vYdDRnH9oqfHhxpdQHJEMXxOeSFdLomGwM1onW4Rej SDCkHOFlOsYAFwMgyrOM/Nx8Dk73ccIDYZ1MRf4ChQIqKRxzNrWSIAIAyMcRq8l2yaKytUCC/Sb rEQ4GhWUaiq/Ox5UHoX2rtBsXiR5Vr9WeR3FxNOfjsd/L6zcVJSQB2WJQ== X-Google-Smtp-Source: AGHT+IFsh3iV6x24r1z6bgjQYA4fIvXoEcEueWsf8uvmzjQHvcik8vtonyJEo3Zs4ajaJbZhPgKwEA== X-Received: by 2002:a2e:b887:0:b0:302:1c90:58d9 with SMTP id 38308e7fff4ca-305f458a829mr6956111fa.16.1736334795263; Wed, 08 Jan 2025 03:13:15 -0800 (PST) From: Oleksii Kurochko To: xen-devel@lists.xenproject.org Cc: Oleksii Kurochko , Stefano Stabellini , Julien Grall , Bertrand Marquis , Michal Orzel , Volodymyr Babchuk , Andrew Cooper , Anthony PERARD , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH v1 2/9] asm-generic: move parts of Arm's asm/kernel.h to asm-generic Date: Wed, 8 Jan 2025 12:13:04 +0100 Message-ID: <6404cb5ae077909cbfdf3860d38c701c65547b56.1736334615.git.oleksii.kurochko@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1736334841435116600 Content-Type: text/plain; charset="utf-8" Move the following parts to asm-generic with the following changes: - struct kernel_info: - Create arch_kernel_info for arch specific kernel information. At the moment, it contains domain_type for Arm. - Rename vpl011 to vuart to have more generic name suitable for other arc= hs. - s/phandle_gic/phandle_intc to have more generic name suitable for other archs. - Make text_offset of zimage structure available for RISCV_64. - Wrap by `#ifdef KERNEL_INFO_SHM_MEM_INIT` definition of KERNEL_SHM_MEM_IN= IT and wrap by `#ifndef KERNEL_INFO_INIT` definition of KERNEL_INFO_INIT to = have ability to override KERNEL_INFO_SHM_MEM_INIT for arch in case it doesn't want to use generic one. - All other parts are left as is from Arm's asm/kernel.h Because of the changes in struct kernel_info the correspondent parts of Arm= 's code are updated. As part of this patch the following clean up happens: - Drop asm/setup.h from asm/kernel.h as nothing depends from it. Add inclusion of asm/setup.h for a code which uses device_tree_get_reg() = to avoid compilation issues for CONFIG_STATIC_MEMORY and CONFIG_STATIC_SHM. Signed-off-by: Oleksii Kurochko --- xen/arch/arm/dom0less-build.c | 28 +++--- xen/arch/arm/domain_build.c | 10 +- xen/arch/arm/include/asm/kernel.h | 115 +---------------------- xen/arch/arm/kernel.c | 10 +- xen/arch/arm/static-memory.c | 1 + xen/arch/arm/static-shmem.c | 1 + xen/include/asm-generic/kernel.h | 146 ++++++++++++++++++++++++++++++ 7 files changed, 175 insertions(+), 136 deletions(-) create mode 100644 xen/include/asm-generic/kernel.h diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index b27747c05c..c4badb4ade 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -57,11 +57,11 @@ static int __init make_gicv2_domU_node(struct kernel_in= fo *kinfo) if (res) return res; =20 - res =3D fdt_property_cell(fdt, "linux,phandle", kinfo->phandle_gic); + res =3D fdt_property_cell(fdt, "linux,phandle", kinfo->phandle_intc); if (res) return res; =20 - res =3D fdt_property_cell(fdt, "phandle", kinfo->phandle_gic); + res =3D fdt_property_cell(fdt, "phandle", kinfo->phandle_intc); if (res) return res; =20 @@ -128,11 +128,11 @@ static int __init make_gicv3_domU_node(struct kernel_= info *kinfo) if (res) return res; =20 - res =3D fdt_property_cell(fdt, "linux,phandle", kinfo->phandle_gic); + res =3D fdt_property_cell(fdt, "linux,phandle", kinfo->phandle_intc); if (res) return res; =20 - res =3D fdt_property_cell(fdt, "phandle", kinfo->phandle_gic); + res =3D fdt_property_cell(fdt, "phandle", kinfo->phandle_intc); if (res) return res; =20 @@ -193,7 +193,7 @@ static int __init make_vpl011_uart_node(struct kernel_i= nfo *kinfo) return res; =20 res =3D fdt_property_cell(fdt, "interrupt-parent", - kinfo->phandle_gic); + kinfo->phandle_intc); if ( res ) return res; =20 @@ -479,10 +479,10 @@ static int __init domain_handle_dtb_bootmodule(struct= domain *d, */ if ( dt_node_cmp(name, "gic") =3D=3D 0 ) { - uint32_t phandle_gic =3D fdt_get_phandle(pfdt, node_next); + uint32_t phandle_intc =3D fdt_get_phandle(pfdt, node_next); =20 - if ( phandle_gic !=3D 0 ) - kinfo->phandle_gic =3D phandle_gic; + if ( phandle_intc !=3D 0 ) + kinfo->phandle_intc =3D phandle_intc; continue; } =20 @@ -525,7 +525,7 @@ static int __init prepare_dtb_domU(struct domain *d, st= ruct kernel_info *kinfo) int addrcells, sizecells; int ret, fdt_size =3D DOMU_DTB_SIZE; =20 - kinfo->phandle_gic =3D GUEST_PHANDLE_GIC; + kinfo->phandle_intc =3D GUEST_PHANDLE_GIC; kinfo->gnttab_start =3D GUEST_GNTTAB_BASE; kinfo->gnttab_size =3D GUEST_GNTTAB_SIZE; =20 @@ -587,7 +587,7 @@ static int __init prepare_dtb_domU(struct domain *d, st= ruct kernel_info *kinfo) /* * domain_handle_dtb_bootmodule has to be called before the rest of * the device tree is generated because it depends on the value of - * the field phandle_gic. + * the field phandle_intc. */ if ( kinfo->dtb_bootmodule ) { @@ -604,7 +604,7 @@ static int __init prepare_dtb_domU(struct domain *d, st= ruct kernel_info *kinfo) if ( ret ) goto err; =20 - if ( kinfo->vpl011 ) + if ( kinfo->vuart ) { ret =3D -EINVAL; #ifdef CONFIG_SBSA_VUART_CONSOLE @@ -705,7 +705,7 @@ int __init construct_domU(struct domain *d, printk("*** LOADING DOMU cpus=3D%u memory=3D%#"PRIx64"KB ***\n", d->max_vcpus, mem); =20 - kinfo.vpl011 =3D dt_property_read_bool(node, "vpl011"); + kinfo.vuart =3D dt_property_read_bool(node, "vpl011"); =20 rc =3D dt_property_read_string(node, "xen,enhanced", &dom0less_enhance= d); if ( rc =3D=3D -EILSEQ || @@ -733,7 +733,7 @@ int __init construct_domU(struct domain *d, =20 #ifdef CONFIG_ARM_64 /* type must be set before allocate memory */ - d->arch.type =3D kinfo.type; + d->arch.type =3D kinfo.arch.type; #endif if ( !dt_find_property(node, "xen,static-mem", NULL) ) allocate_memory(d, &kinfo); @@ -751,7 +751,7 @@ int __init construct_domU(struct domain *d, * tree node in prepare_dtb_domU, so initialization on related variabl= es * shall be done first. */ - if ( kinfo.vpl011 ) + if ( kinfo.vuart ) { rc =3D domain_vpl011_init(d, NULL); if ( rc < 0 ) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index b072a16249..976b03a5df 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -747,7 +747,7 @@ static int __init fdt_property_interrupts(const struct = kernel_info *kinfo, return res; =20 res =3D fdt_property_cell(kinfo->fdt, "interrupt-parent", - kinfo->phandle_gic); + kinfo->phandle_intc); =20 return res; } @@ -2026,7 +2026,7 @@ static int __init prepare_dtb_hwdom(struct domain *d,= struct kernel_info *kinfo) =20 ASSERT(dt_host && (dt_host->sibling =3D=3D NULL)); =20 - kinfo->phandle_gic =3D dt_interrupt_controller->phandle; + kinfo->phandle_intc =3D dt_interrupt_controller->phandle; fdt =3D device_tree_flattened; =20 new_size =3D fdt_totalsize(fdt) + DOM0_FDT_EXTRA_SIZE; @@ -2194,13 +2194,13 @@ int __init construct_domain(struct domain *d, struc= t kernel_info *kinfo) =20 #ifdef CONFIG_ARM_64 /* if aarch32 mode is not supported at EL1 do not allow 32-bit domain = */ - if ( !(cpu_has_el1_32) && kinfo->type =3D=3D DOMAIN_32BIT ) + if ( !(cpu_has_el1_32) && kinfo->arch.type =3D=3D DOMAIN_32BIT ) { printk("Platform does not support 32-bit domain\n"); return -EINVAL; } =20 - if ( is_sve_domain(d) && (kinfo->type =3D=3D DOMAIN_32BIT) ) + if ( is_sve_domain(d) && (kinfo->arch.type =3D=3D DOMAIN_32BIT) ) { printk("SVE is not available for 32-bit domain\n"); return -EINVAL; @@ -2307,7 +2307,7 @@ static int __init construct_dom0(struct domain *d) =20 #ifdef CONFIG_ARM_64 /* type must be set before allocate_memory */ - d->arch.type =3D kinfo.type; + d->arch.type =3D kinfo.arch.type; #endif find_gnttab_region(d, &kinfo); if ( is_domain_direct_mapped(d) ) diff --git a/xen/arch/arm/include/asm/kernel.h b/xen/arch/arm/include/asm/k= ernel.h index 7e6e3c82a4..4d74f0bcb2 100644 --- a/xen/arch/arm/include/asm/kernel.h +++ b/xen/arch/arm/include/asm/kernel.h @@ -6,125 +6,16 @@ #ifndef __ARCH_ARM_KERNEL_H__ #define __ARCH_ARM_KERNEL_H__ =20 -#include #include -#include =20 -/* - * List of possible features for dom0less domUs - * - * DOM0LESS_ENHANCED_NO_XS: Notify the OS it is running on top of Xen. All= the - * default features (excluding Xenstore) will be - * available. Note that an OS *must* not rely on = the - * availability of Xen features if this is not se= t. - * DOM0LESS_XENSTORE: Xenstore will be enabled for the VM. This feat= ure - * can't be enabled without the - * DOM0LESS_ENHANCED_NO_XS. - * DOM0LESS_ENHANCED: Notify the OS it is running on top of Xen. All= the - * default features (including Xenstore) will be - * available. Note that an OS *must* not rely on = the - * availability of Xen features if this is not se= t. - */ -#define DOM0LESS_ENHANCED_NO_XS BIT(0, U) -#define DOM0LESS_XENSTORE BIT(1, U) -#define DOM0LESS_ENHANCED (DOM0LESS_ENHANCED_NO_XS | DOM0LESS_XENST= ORE) - -struct kernel_info { +struct arch_kernel_info +{ #ifdef CONFIG_ARM_64 enum domain_type type; #endif - - struct domain *d; - - void *fdt; /* flat device tree */ - paddr_t unassigned_mem; /* RAM not (yet) assigned to a bank */ - struct meminfo mem; -#ifdef CONFIG_STATIC_SHM - struct shared_meminfo shm_mem; -#endif - - /* kernel entry point */ - paddr_t entry; - - /* grant table region */ - paddr_t gnttab_start; - paddr_t gnttab_size; - - /* boot blob load addresses */ - const struct bootmodule *kernel_bootmodule, *initrd_bootmodule, *dtb_b= ootmodule; - const char* cmdline; - paddr_t dtb_paddr; - paddr_t initrd_paddr; - - /* Enable pl011 emulation */ - bool vpl011; - - /* Enable/Disable PV drivers interfaces */ - uint16_t dom0less_feature; - - /* GIC phandle */ - uint32_t phandle_gic; - - /* loader to use for this kernel */ - void (*load)(struct kernel_info *info); - /* loader specific state */ - union { - struct { - paddr_t kernel_addr; - paddr_t len; -#ifdef CONFIG_ARM_64 - paddr_t text_offset; /* 64-bit Image only */ -#endif - paddr_t start; /* Must be 0 for 64-bit Image */ - } zimage; - }; }; =20 -static inline struct membanks *kernel_info_get_mem(struct kernel_info *kin= fo) -{ - return container_of(&kinfo->mem.common, struct membanks, common); -} - -static inline const struct membanks * -kernel_info_get_mem_const(const struct kernel_info *kinfo) -{ - return container_of(&kinfo->mem.common, const struct membanks, common); -} - -#ifdef CONFIG_STATIC_SHM -#define KERNEL_INFO_SHM_MEM_INIT .shm_mem.common.max_banks =3D NR_SHMEM_BA= NKS, -#else -#define KERNEL_INFO_SHM_MEM_INIT -#endif - -#define KERNEL_INFO_INIT \ -{ \ - .mem.common.max_banks =3D NR_MEM_BANKS, \ - KERNEL_INFO_SHM_MEM_INIT \ -} - -/* - * Probe the kernel to detemine its type and select a loader. - * - * Sets in info: - * ->type - * ->load hook, and sets loader specific variables ->zimage - */ -int kernel_probe(struct kernel_info *info, const struct dt_device_node *do= main); - -/* - * Loads the kernel into guest RAM. - * - * Expects to be set in info when called: - * ->mem - * ->fdt - * - * Sets in info: - * ->entry - * ->dtb_paddr - * ->initrd_paddr - */ -void kernel_load(struct kernel_info *info); +#include =20 #endif /* #ifdef __ARCH_ARM_KERNEL_H__ */ =20 diff --git a/xen/arch/arm/kernel.c b/xen/arch/arm/kernel.c index 80fad8b336..b75bd6a887 100644 --- a/xen/arch/arm/kernel.c +++ b/xen/arch/arm/kernel.c @@ -101,7 +101,7 @@ static paddr_t __init kernel_zimage_place(struct kernel= _info *info) paddr_t load_addr; =20 #ifdef CONFIG_ARM_64 - if ( (info->type =3D=3D DOMAIN_64BIT) && (info->zimage.start =3D=3D 0)= ) + if ( (info->arch.type =3D=3D DOMAIN_64BIT) && (info->zimage.start =3D= =3D 0) ) return mem->bank[0].start + info->zimage.text_offset; #endif =20 @@ -371,10 +371,10 @@ static int __init kernel_uimage_probe(struct kernel_i= nfo *info, switch ( uimage.arch ) { case IH_ARCH_ARM: - info->type =3D DOMAIN_32BIT; + info->arch.type =3D DOMAIN_32BIT; break; case IH_ARCH_ARM64: - info->type =3D DOMAIN_64BIT; + info->arch.type =3D DOMAIN_64BIT; break; default: printk(XENLOG_ERR "Unsupported uImage arch type %d\n", uimage.arch= ); @@ -444,7 +444,7 @@ static int __init kernel_zimage64_probe(struct kernel_i= nfo *info, =20 info->load =3D kernel_zimage_load; =20 - info->type =3D DOMAIN_64BIT; + info->arch.type =3D DOMAIN_64BIT; =20 return 0; } @@ -496,7 +496,7 @@ static int __init kernel_zimage32_probe(struct kernel_i= nfo *info, info->load =3D kernel_zimage_load; =20 #ifdef CONFIG_ARM_64 - info->type =3D DOMAIN_32BIT; + info->arch.type =3D DOMAIN_32BIT; #endif =20 return 0; diff --git a/xen/arch/arm/static-memory.c b/xen/arch/arm/static-memory.c index d4585c5a06..e0f76afcd8 100644 --- a/xen/arch/arm/static-memory.c +++ b/xen/arch/arm/static-memory.c @@ -2,6 +2,7 @@ =20 #include =20 +#include #include =20 static bool __init append_static_memory_to_bank(struct domain *d, diff --git a/xen/arch/arm/static-shmem.c b/xen/arch/arm/static-shmem.c index 66088a4267..aff05d24d1 100644 --- a/xen/arch/arm/static-shmem.c +++ b/xen/arch/arm/static-shmem.c @@ -6,6 +6,7 @@ #include =20 #include +#include #include #include =20 diff --git a/xen/include/asm-generic/kernel.h b/xen/include/asm-generic/ker= nel.h new file mode 100644 index 0000000000..b2bd04a185 --- /dev/null +++ b/xen/include/asm-generic/kernel.h @@ -0,0 +1,146 @@ +/* + * Kernel image loading. + * + * Copyright (C) 2011 Citrix Systems, Inc. + */ +#ifndef __ASM_GENERIC_KERNEL_H__ +#define __ASM_GENERIC_KERNEL_H__ + +#include +#include +#include +#include + +/* + * List of possible features for dom0less domUs + * + * DOM0LESS_ENHANCED_NO_XS: Notify the OS it is running on top of Xen. All= the + * default features (excluding Xenstore) will be + * available. Note that an OS *must* not rely on = the + * availability of Xen features if this is not se= t. + * DOM0LESS_XENSTORE: Xenstore will be enabled for the VM. This feat= ure + * can't be enabled without the + * DOM0LESS_ENHANCED_NO_XS. + * DOM0LESS_ENHANCED: Notify the OS it is running on top of Xen. All= the + * default features (including Xenstore) will be + * available. Note that an OS *must* not rely on = the + * availability of Xen features if this is not se= t. + */ +#define DOM0LESS_ENHANCED_NO_XS BIT(0, U) +#define DOM0LESS_XENSTORE BIT(1, U) +#define DOM0LESS_ENHANCED (DOM0LESS_ENHANCED_NO_XS | DOM0LESS_XENST= ORE) + +struct kernel_info { + struct domain *d; + + void *fdt; /* flat device tree */ + paddr_t unassigned_mem; /* RAM not (yet) assigned to a bank */ + struct meminfo mem; +#ifdef CONFIG_STATIC_SHM + struct shared_meminfo shm_mem; +#endif + + /* kernel entry point */ + paddr_t entry; + + /* grant table region */ + paddr_t gnttab_start; + paddr_t gnttab_size; + + /* boot blob load addresses */ + const struct bootmodule *kernel_bootmodule, *initrd_bootmodule, *dtb_b= ootmodule; + const char* cmdline; + paddr_t dtb_paddr; + paddr_t initrd_paddr; + + /* Enable uart emulation */ + bool vuart; + + /* Enable/Disable PV drivers interfaces */ + uint16_t dom0less_feature; + + /* Interrupt controller phandle */ + uint32_t phandle_intc; + + /* loader to use for this kernel */ + void (*load)(struct kernel_info *info); + + /* loader specific state */ + union { + struct { + paddr_t kernel_addr; + paddr_t len; +#if defined(CONFIG_ARM_64) || defined(CONFIG_RISCV_64) + paddr_t text_offset; /* 64-bit Image only */ +#endif + paddr_t start; /* Must be 0 for 64-bit Image */ + } zimage; + }; + + struct arch_kernel_info arch; +}; + +static inline struct membanks *kernel_info_get_mem(struct kernel_info *kin= fo) +{ + return container_of(&kinfo->mem.common, struct membanks, common); +} + +static inline const struct membanks * +kernel_info_get_mem_const(const struct kernel_info *kinfo) +{ + return container_of(&kinfo->mem.common, const struct membanks, common); +} + +#ifndef KERNEL_INFO_SHM_MEM_INIT + +#ifdef CONFIG_STATIC_SHM +#define KERNEL_INFO_SHM_MEM_INIT .shm_mem.common.max_banks =3D NR_SHMEM_BA= NKS, +#else +#define KERNEL_INFO_SHM_MEM_INIT +#endif + +#endif /* KERNEL_INFO_SHM_MEM_INIT */ + +#ifndef KERNEL_INFO_INIT + +#define KERNEL_INFO_INIT \ +{ \ + .mem.common.max_banks =3D NR_MEM_BANKS, \ + KERNEL_INFO_SHM_MEM_INIT \ +} + +#endif /* KERNEL_INFO_INIT */ + +/* + * Probe the kernel to detemine its type and select a loader. + * + * Sets in info: + * ->type + * ->load hook, and sets loader specific variables ->zimage + */ +int kernel_probe(struct kernel_info *info, const struct dt_device_node *do= main); + +/* + * Loads the kernel into guest RAM. + * + * Expects to be set in info when called: + * ->mem + * ->fdt + * + * Sets in info: + * ->entry + * ->dtb_paddr + * ->initrd_paddr + */ +void kernel_load(struct kernel_info *info); + +#endif /*__ASM_GENERIC_KERNEL_H__ */ + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ --=20 2.47.1