From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: Shannon Zhao <zhaoshenglong@huawei.com>
Cc: hangaohuai@huawei.com, stefano.stabellini@citrix.com,
shannon.zhao@linaro.org, xen-devel@lists.xen.org
Subject: Re: [PATCH v5 12/22] arm/acpi: Prepare EFI memory descriptor for Dom0
Date: Fri, 4 Mar 2016 11:13:39 +0000 [thread overview]
Message-ID: <alpine.DEB.2.02.1603041112280.17938@kaball.uk.xensource.com> (raw)
In-Reply-To: <1457072152-16128-13-git-send-email-zhaoshenglong@huawei.com>
On Fri, 4 Mar 2016, Shannon Zhao wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> Create a few EFI memory descriptors to tell Dom0 the RAM region
> information, ACPI table regions and EFI tables reserved resions.
>
> Signed-off-by: Parth Dixit <parth.dixit@linaro.org>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> ---
> v5: move to efi-dom0.c
> ---
> xen/arch/arm/domain_build.c | 2 ++
> xen/arch/arm/efi/efi-dom0.c | 47 +++++++++++++++++++++++++++++++++++++++++++++
> xen/include/asm-arm/setup.h | 5 +++++
> 3 files changed, 54 insertions(+)
>
> diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
> index 613551c..008fc76 100644
> --- a/xen/arch/arm/domain_build.c
> +++ b/xen/arch/arm/domain_build.c
> @@ -1688,6 +1688,8 @@ static int prepare_acpi(struct domain *d, struct kernel_info *kinfo)
> acpi_map_other_tables(d);
> acpi_create_efi_system_table(d->arch.efi_acpi_gpa, d->arch.efi_acpi_table,
> tbl_add);
> + acpi_create_efi_mmap_table(d->arch.efi_acpi_gpa, d->arch.efi_acpi_len,
> + d->arch.efi_acpi_table, &kinfo->mem, tbl_add);
>
> return 0;
> }
> diff --git a/xen/arch/arm/efi/efi-dom0.c b/xen/arch/arm/efi/efi-dom0.c
> index 36a1283..0ff6309 100644
> --- a/xen/arch/arm/efi/efi-dom0.c
> +++ b/xen/arch/arm/efi/efi-dom0.c
> @@ -22,6 +22,7 @@
> */
>
> #include "efi.h"
> +#include <xen/pfn.h>
> #include <asm/setup.h>
> #include <asm/acpi.h>
>
> @@ -90,3 +91,49 @@ void __init acpi_create_efi_system_table(paddr_t paddr, void *efi_acpi_table,
> tbl_add[TBL_EFIT].start = table_addr;
> tbl_add[TBL_EFIT].size = table_size;
> }
> +
> +void __init acpi_create_efi_mmap_table(paddr_t paddr, paddr_t size,
> + void *efi_acpi_table,
> + const struct meminfo *mem,
> + struct membank tbl_add[])
> +{
> + EFI_MEMORY_DESCRIPTOR *memory_map;
> + struct meminfo *acpi_mem;
> + int acpi_mem_nr_banks = 0;
> + unsigned int i, offset;
> + u8 *base_ptr;
> +
> + base_ptr = efi_acpi_table + acpi_get_table_offset(tbl_add, TBL_MMAP);
> + memory_map = (EFI_MEMORY_DESCRIPTOR *)(base_ptr);
> +
> + offset = 0;
> + for( i = 0; i < mem->nr_banks; i++, offset++ )
> + {
> + memory_map[offset].Type = EfiConventionalMemory;
> + memory_map[offset].PhysicalStart = mem->bank[i].start;
> + memory_map[offset].NumberOfPages = PFN_UP(mem->bank[i].size);
> + memory_map[offset].Attribute = EFI_MEMORY_WB;
> + }
> +
> + if ( !acpi_disabled )
> + {
Isn't this check redundant, givem that the function is name is
acpi_create_efi_mmap_table and is called by prepare_acpi?
> + acpi_mem = get_acpi_meminfo();
Would it be possible to call get_acpi_meminfo from prepare_acpi and pass
acpi_mem to this function?
> + acpi_mem_nr_banks = acpi_mem->nr_banks;
> + for( i = 0; i < acpi_mem_nr_banks; i++, offset++ )
> + {
> + memory_map[offset].Type = EfiACPIReclaimMemory;
> + memory_map[offset].PhysicalStart = acpi_mem->bank[i].start;
> + memory_map[offset].NumberOfPages = PFN_UP(acpi_mem->bank[i].size);
> + memory_map[offset].Attribute = EFI_MEMORY_WB;
> + }
> + }
> +
> + memory_map[offset].Type = EfiACPIReclaimMemory;
> + memory_map[offset].PhysicalStart = paddr;
> + memory_map[offset].NumberOfPages = PFN_UP(size);
> + memory_map[offset].Attribute = EFI_MEMORY_WB;
> +
> + tbl_add[TBL_MMAP].start = paddr + acpi_get_table_offset(tbl_add, TBL_MMAP);
> + tbl_add[TBL_MMAP].size = sizeof(EFI_MEMORY_DESCRIPTOR)
> + * (mem->nr_banks + acpi_mem_nr_banks + 1);
> +}
> diff --git a/xen/include/asm-arm/setup.h b/xen/include/asm-arm/setup.h
> index e423b15..b2899f2 100644
> --- a/xen/include/asm-arm/setup.h
> +++ b/xen/include/asm-arm/setup.h
> @@ -56,6 +56,11 @@ size_t estimate_efi_size(int mem_nr_banks);
> void acpi_create_efi_system_table(paddr_t paddr, void *efi_acpi_table,
> struct membank tbl_add[]);
>
> +void acpi_create_efi_mmap_table(paddr_t paddr, paddr_t size,
> + void *efi_acpi_table,
> + const struct meminfo *mem,
> + struct membank tbl_add[]);
> +
> int construct_dom0(struct domain *d);
>
> void discard_initial_modules(void);
> --
> 2.0.4
>
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-03-04 11:13 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-04 6:15 [PATCH v5 00/22] Prepare UEFI and ACPI tables for Dom0 on ARM64 Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 01/22] arm/acpi: Estimate memory required for acpi/efi tables Shannon Zhao
2016-03-04 10:09 ` Jan Beulich
2016-03-04 10:55 ` Stefano Stabellini
2016-03-04 15:03 ` Shannon Zhao
2016-03-04 15:23 ` Stefano Stabellini
2016-03-04 15:52 ` Shannon Zhao
2016-03-04 15:59 ` Stefano Stabellini
2016-03-04 15:39 ` Jan Beulich
2016-03-04 6:15 ` [PATCH v5 02/22] arm/acpi: Add a helper function to get the acpi table offset Shannon Zhao
2016-03-04 10:59 ` Stefano Stabellini
2016-03-04 15:12 ` Shannon Zhao
2016-03-04 15:31 ` Stefano Stabellini
2016-03-04 15:53 ` Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 03/22] arm/acpi: Prepare FADT table for Dom0 Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 04/22] arm/gic: Add a new callback for creating MADT " Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 05/22] arm/acpi: Prepare " Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 06/22] arm/acpi: Prepare STAO " Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 07/22] arm/acpi: Prepare XSDT " Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 08/22] arm/acpi: Prepare RSDP " Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 09/22] arm/p2m: Add helper functions to map memory regions Shannon Zhao
2016-03-04 10:51 ` Stefano Stabellini
2016-03-04 6:15 ` [PATCH v5 10/22] arm/acpi: Map all other tables for Dom0 Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 11/22] arm/acpi: Prepare EFI system table " Shannon Zhao
2016-03-04 11:02 ` Stefano Stabellini
2016-03-04 6:15 ` [PATCH v5 12/22] arm/acpi: Prepare EFI memory descriptor " Shannon Zhao
2016-03-04 11:13 ` Stefano Stabellini [this message]
2016-03-16 8:59 ` Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 13/22] arm/acpi: Map the new created EFI and ACPI tables to Dom0 Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 14/22] arm/acpi: Create min DT stub for Dom0 Shannon Zhao
2016-03-04 11:17 ` Stefano Stabellini
2016-03-04 6:15 ` [PATCH v5 15/22] arm/acpi: Permit access all Xen unused SPIs " Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 16/22] arm/acpi: Configure SPI interrupt type and route to Dom0 dynamically Shannon Zhao
2016-03-04 11:26 ` Stefano Stabellini
2016-03-04 15:16 ` Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 17/22] arm/gic: Add a new callback to deny Dom0 access to GIC regions Shannon Zhao
2016-03-04 11:59 ` Stefano Stabellini
2016-03-04 6:15 ` [PATCH v5 18/22] arm/acpi: Permit MMIO access of Xen unused devices for Dom0 Shannon Zhao
2016-03-04 12:01 ` Stefano Stabellini
2016-03-04 6:15 ` [PATCH v5 19/22] hvm/params: Add a new delivery type for event-channel in HVM_PARAM_CALLBACK_IRQ Shannon Zhao
2016-03-04 10:16 ` Jan Beulich
2016-03-04 12:09 ` Stefano Stabellini
2016-03-04 12:20 ` Jan Beulich
2016-03-04 12:26 ` Stefano Stabellini
2016-03-16 15:03 ` Julien Grall
2016-03-16 15:10 ` Jan Beulich
2016-03-04 21:19 ` Konrad Rzeszutek Wilk
2016-03-16 16:34 ` Julien Grall
2016-03-16 17:49 ` Konrad Rzeszutek Wilk
2016-03-24 12:24 ` Stefano Stabellini
2016-03-04 6:15 ` [PATCH v5 20/22] xen/acpi: Fix event-channel interrupt when booting with ACPI Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 21/22] xen/arm: Add a hypercall for device mmio mapping Shannon Zhao
2016-03-04 10:29 ` Jan Beulich
2016-03-04 11:00 ` Roger Pau Monné
2016-03-04 11:11 ` Jan Beulich
2016-03-04 11:37 ` Stefano Stabellini
2016-03-16 9:48 ` Shannon Zhao
2016-03-16 10:04 ` Jan Beulich
2016-03-16 11:22 ` Shannon Zhao
2016-03-04 6:15 ` [PATCH v5 22/22] xen/arm64: Add ACPI support Shannon Zhao
2016-03-04 10:33 ` Jan Beulich
2016-03-04 11:45 ` Stefano Stabellini
2016-03-04 11:45 ` Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.02.1603041112280.17938@kaball.uk.xensource.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=hangaohuai@huawei.com \
--cc=shannon.zhao@linaro.org \
--cc=stefano.stabellini@citrix.com \
--cc=xen-devel@lists.xen.org \
--cc=zhaoshenglong@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).