From: Shannon Zhao <zhaoshenglong@huawei.com> To: xen-devel@lists.xen.org Cc: julien.grall@arm.com, zhaoshenglong@huawei.com, stefano.stabellini@citrix.com, shannon.zhao@linaro.org, peter.huangpeng@huawei.com Subject: [PATCH v6 04/22] arm/gic: Add a new callback for creating MADT table for Dom0 Date: Thu, 17 Mar 2016 17:40:50 +0800 [thread overview] Message-ID: <1458207668-12012-5-git-send-email-zhaoshenglong@huawei.com> (raw) In-Reply-To: <1458207668-12012-1-git-send-email-zhaoshenglong@huawei.com> From: Shannon Zhao <shannon.zhao@linaro.org> Add a new member in gic_hw_operations which is used to creat MADT table for Dom0. Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org> Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> --- xen/arch/arm/gic-v2.c | 34 ++++++++++++++++++++++++++++++++++ xen/arch/arm/gic-v3.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ xen/arch/arm/gic.c | 5 +++++ xen/include/asm-arm/gic.h | 3 +++ 4 files changed, 89 insertions(+) diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c index 0fcb894..02db5f2 100644 --- a/xen/arch/arm/gic-v2.c +++ b/xen/arch/arm/gic-v2.c @@ -685,6 +685,35 @@ static void __init gicv2_dt_init(void) } #ifdef CONFIG_ACPI +static u32 gicv2_make_hwdom_madt(const struct domain *d, u32 offset) +{ + struct acpi_subtable_header *header; + struct acpi_madt_generic_interrupt *host_gicc, *gicc; + u32 i, size, table_len = 0; + u8 *base_ptr = d->arch.efi_acpi_table + offset; + + header = acpi_table_get_entry_madt(ACPI_MADT_TYPE_GENERIC_INTERRUPT, 0); + if ( !header ) + panic("Can't get GICC entry"); + host_gicc = container_of(header, struct acpi_madt_generic_interrupt, + header); + + size = sizeof(struct acpi_madt_generic_interrupt); + /* Add Generic Interrupt */ + for ( i = 0; i < d->max_vcpus; i++ ) + { + gicc = (struct acpi_madt_generic_interrupt *)(base_ptr + table_len); + ACPI_MEMCPY(gicc, host_gicc, size); + gicc->cpu_interface_number = i; + gicc->uid = i; + gicc->flags = ACPI_MADT_ENABLED; + gicc->arm_mpidr = vcpuid_to_vaffinity(i); + table_len += size; + } + + return table_len; +} + static int __init gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header, const unsigned long end) @@ -776,6 +805,10 @@ static void __init gicv2_acpi_init(void) } #else static void __init gicv2_acpi_init(void) { } +static u32 gicv2_make_hwdom_madt(const struct domain *d, u32 offset) +{ + return 0; +} #endif static int __init gicv2_init(void) @@ -868,6 +901,7 @@ const static struct gic_hw_operations gicv2_ops = { .read_vmcr_priority = gicv2_read_vmcr_priority, .read_apr = gicv2_read_apr, .make_hwdom_dt_node = gicv2_make_hwdom_dt_node, + .make_hwdom_madt = gicv2_make_hwdom_madt, }; /* Set up the GIC */ diff --git a/xen/arch/arm/gic-v3.c b/xen/arch/arm/gic-v3.c index f83fd88..d9fce4b 100644 --- a/xen/arch/arm/gic-v3.c +++ b/xen/arch/arm/gic-v3.c @@ -1236,6 +1236,48 @@ static void __init gicv3_dt_init(void) } #ifdef CONFIG_ACPI +static u32 gicv3_make_hwdom_madt(const struct domain *d, u32 offset) +{ + struct acpi_subtable_header *header; + struct acpi_madt_generic_interrupt *host_gicc, *gicc; + struct acpi_madt_generic_redistributor *gicr; + u8 *base_ptr = d->arch.efi_acpi_table + offset; + u32 i, table_len = 0, size; + + /* Add Generic Interrupt */ + header = acpi_table_get_entry_madt(ACPI_MADT_TYPE_GENERIC_INTERRUPT, 0); + if ( !header ) + panic("Can't get GICC entry"); + host_gicc = container_of(header, struct acpi_madt_generic_interrupt, + header); + + size = sizeof(struct acpi_madt_generic_interrupt); + for ( i = 0; i < d->max_vcpus; i++ ) + { + gicc = (struct acpi_madt_generic_interrupt *)(base_ptr + table_len); + ACPI_MEMCPY(gicc, host_gicc, size); + gicc->cpu_interface_number = i; + gicc->uid = i; + gicc->flags = ACPI_MADT_ENABLED; + gicc->arm_mpidr = vcpuid_to_vaffinity(i); + table_len += size; + } + + /* Add Generic Redistributor */ + size = sizeof(struct acpi_madt_generic_redistributor); + for ( i = 0; i < d->arch.vgic.nr_regions; i++ ) + { + gicr = (struct acpi_madt_generic_redistributor *)(base_ptr + table_len); + gicr->header.type = ACPI_MADT_TYPE_GENERIC_REDISTRIBUTOR; + gicr->header.length = size; + gicr->base_address = d->arch.vgic.rdist_regions[i].base; + gicr->length = d->arch.vgic.rdist_regions[i].size; + table_len += size; + } + + return table_len; +} + static int __init gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header, const unsigned long end) @@ -1380,6 +1422,10 @@ static void __init gicv3_acpi_init(void) } #else static void __init gicv3_acpi_init(void) { } +static u32 gicv3_make_hwdom_madt(const struct domain *d, u32 offset) +{ + return 0; +} #endif /* Set up the GIC */ @@ -1474,6 +1520,7 @@ static const struct gic_hw_operations gicv3_ops = { .read_apr = gicv3_read_apr, .secondary_init = gicv3_secondary_cpu_init, .make_hwdom_dt_node = gicv3_make_hwdom_dt_node, + .make_hwdom_madt = gicv3_make_hwdom_madt, }; static int __init gicv3_dt_preinit(struct dt_device_node *node, const void *data) diff --git a/xen/arch/arm/gic.c b/xen/arch/arm/gic.c index fbbe37f..6d32432 100644 --- a/xen/arch/arm/gic.c +++ b/xen/arch/arm/gic.c @@ -739,6 +739,11 @@ int gic_make_hwdom_dt_node(const struct domain *d, return gic_hw_ops->make_hwdom_dt_node(d, gic, fdt); } +u32 gic_make_hwdom_madt(const struct domain *d, u32 offset) +{ + return gic_hw_ops->make_hwdom_madt(d, offset); +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-arm/gic.h b/xen/include/asm-arm/gic.h index 7bd06e1..4cf003d 100644 --- a/xen/include/asm-arm/gic.h +++ b/xen/include/asm-arm/gic.h @@ -358,12 +358,15 @@ struct gic_hw_operations { /* Create GIC node for the hardware domain */ int (*make_hwdom_dt_node)(const struct domain *d, const struct dt_device_node *gic, void *fdt); + /* Create MADT table for the hardware domain */ + u32 (*make_hwdom_madt)(const struct domain *d, u32 offset); }; void register_gic_ops(const struct gic_hw_operations *ops); int gic_make_hwdom_dt_node(const struct domain *d, const struct dt_device_node *gic, void *fdt); +u32 gic_make_hwdom_madt(const struct domain *d, u32 offset); #endif /* __ASSEMBLY__ */ #endif -- 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-17 9:40 UTC|newest] Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-03-17 9:40 [PATCH v6 00/22] Prepare UEFI and ACPI tables for Dom0 on ARM64 Shannon Zhao 2016-03-17 9:40 ` [PATCH v6 01/22] arm/acpi: Estimate memory required for acpi/efi tables Shannon Zhao 2016-03-18 18:44 ` Julien Grall 2016-03-21 13:01 ` Jan Beulich 2016-03-22 13:01 ` Shannon Zhao 2016-03-22 0:28 ` Julien Grall 2016-03-24 12:36 ` Stefano Stabellini 2016-03-17 9:40 ` [PATCH v6 02/22] arm/acpi: Add a helper function to get the acpi table offset Shannon Zhao 2016-03-21 12:16 ` Julien Grall 2016-03-24 12:32 ` Stefano Stabellini 2016-03-17 9:40 ` [PATCH v6 03/22] arm/acpi: Prepare FADT table for Dom0 Shannon Zhao 2016-03-21 12:25 ` Julien Grall 2016-03-17 9:40 ` Shannon Zhao [this message] 2016-03-21 15:18 ` [PATCH v6 04/22] arm/gic: Add a new callback for creating MADT " Julien Grall 2016-03-17 9:40 ` [PATCH v6 05/22] arm/acpi: Prepare " Shannon Zhao 2016-03-21 15:26 ` Julien Grall 2016-03-21 15:51 ` Jan Beulich 2016-03-17 9:40 ` [PATCH v6 06/22] arm/acpi: Prepare STAO " Shannon Zhao 2016-03-21 15:31 ` Julien Grall 2016-03-17 9:40 ` [PATCH v6 07/22] arm/acpi: Prepare XSDT " Shannon Zhao 2016-03-21 15:43 ` Julien Grall 2016-03-17 9:40 ` [PATCH v6 08/22] arm/acpi: Prepare RSDP " Shannon Zhao 2016-03-21 15:47 ` Julien Grall 2016-03-17 9:40 ` [PATCH v6 09/22] arm/p2m: Add helper functions to map memory regions Shannon Zhao 2016-03-21 15:52 ` Julien Grall 2016-03-22 13:05 ` Shannon Zhao 2016-03-22 15:59 ` Julien Grall 2016-03-17 9:40 ` [PATCH v6 10/22] arm/acpi: Map all other tables for Dom0 Shannon Zhao 2016-03-21 15:57 ` Julien Grall 2016-03-17 9:40 ` [PATCH v6 11/22] arm/acpi: Prepare EFI system table " Shannon Zhao 2016-03-21 16:10 ` Julien Grall 2016-03-22 13:06 ` Shannon Zhao 2016-03-22 13:24 ` Jan Beulich 2016-03-17 9:40 ` [PATCH v6 12/22] arm/acpi: Prepare EFI memory descriptor " Shannon Zhao 2016-03-21 16:51 ` Julien Grall 2016-03-22 13:16 ` Shannon Zhao 2016-03-22 16:04 ` Julien Grall 2016-03-24 15:06 ` Shannon Zhao 2016-03-24 15:23 ` Julien Grall 2016-03-24 12:39 ` Stefano Stabellini 2016-03-17 9:40 ` [PATCH v6 13/22] arm/acpi: Map the new created EFI and ACPI tables to Dom0 Shannon Zhao 2016-03-22 0:42 ` Julien Grall 2016-03-22 13:18 ` Shannon Zhao 2016-03-22 16:16 ` Julien Grall 2016-03-24 14:59 ` Shannon Zhao 2016-03-24 15:35 ` Julien Grall 2016-03-17 9:41 ` [PATCH v6 14/22] arm/acpi: Create min DT stub for Dom0 Shannon Zhao 2016-03-22 1:07 ` Julien Grall 2016-03-22 13:23 ` Shannon Zhao 2016-03-17 9:41 ` [PATCH v6 15/22] arm/acpi: Permit access all Xen unused SPIs " Shannon Zhao 2016-03-22 18:18 ` Julien Grall 2016-03-24 15:01 ` Shannon Zhao 2016-03-24 15:37 ` Julien Grall 2016-03-25 7:13 ` Shannon Zhao 2016-03-17 9:41 ` [PATCH v6 16/22] arm/acpi: Configure SPI interrupt type and route to Dom0 dynamically Shannon Zhao 2016-03-22 19:17 ` Julien Grall 2016-03-24 12:41 ` Stefano Stabellini 2016-03-17 9:41 ` [PATCH v6 17/22] arm/gic: Add a new callback to deny Dom0 access to GIC regions Shannon Zhao 2016-03-22 19:33 ` Julien Grall 2016-03-24 12:45 ` Stefano Stabellini 2016-03-24 15:03 ` Shannon Zhao 2016-03-24 15:39 ` Julien Grall 2016-03-17 9:41 ` [PATCH v6 18/22] arm/acpi: Permit MMIO access of Xen unused devices for Dom0 Shannon Zhao 2016-03-23 11:50 ` Julien Grall 2016-03-17 9:41 ` [PATCH v6 19/22] hvm/params: Add a new delivery type for event-channel in HVM_PARAM_CALLBACK_IRQ Shannon Zhao 2016-03-17 10:42 ` Jan Beulich 2016-03-17 11:04 ` Shannon Zhao 2016-03-17 11:29 ` Jan Beulich 2016-03-17 11:56 ` Shannon Zhao 2016-03-17 12:42 ` Jan Beulich 2016-03-17 9:41 ` [PATCH v6 20/22] xen/acpi: Fix event-channel interrupt when booting with ACPI Shannon Zhao 2016-03-23 12:15 ` Julien Grall 2016-03-17 9:41 ` [PATCH v6 21/22] xen/arm: Add a hypercall for device mmio mapping Shannon Zhao 2016-03-17 9:41 ` [PATCH v6 22/22] xen/arm64: Add ACPI support Shannon Zhao 2016-03-17 10:52 ` Jan Beulich 2016-03-17 11:03 ` Shannon Zhao 2016-03-17 11:31 ` Jan Beulich 2016-03-17 13:10 ` Shannon Zhao 2016-03-17 13:24 ` Jan Beulich
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=1458207668-12012-5-git-send-email-zhaoshenglong@huawei.com \ --to=zhaoshenglong@huawei.com \ --cc=julien.grall@arm.com \ --cc=peter.huangpeng@huawei.com \ --cc=shannon.zhao@linaro.org \ --cc=stefano.stabellini@citrix.com \ --cc=xen-devel@lists.xen.org \ --subject='Re: [PATCH v6 04/22] arm/gic: Add a new callback for creating MADT table for Dom0' \ /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
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).