From: Shannon Zhao <zhaoshenglong@huawei.com>
To: xen-devel@lists.xen.org
Cc: sstabellini@kernel.org, peter.huangpeng@huawei.com,
julien.grall@arm.com, stefano.stabellini@citrix.com,
shannon.zhao@linaro.org, zhaoshenglong@huawei.com
Subject: [PATCH v8 04/21] arm/gic: Add a new callback for creating MADT table for Dom0
Date: Wed, 30 Mar 2016 18:07:57 +0800 [thread overview]
Message-ID: <1459332494-18964-5-git-send-email-zhaoshenglong@huawei.com> (raw)
In-Reply-To: <1459332494-18964-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 create MADT table
for Dom0.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Julien Grall <julien.grall@arm.com>
---
xen/arch/arm/gic-v2.c | 42 +++++++++++++++++++++++++++++++++++
xen/arch/arm/gic-v3.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++
xen/arch/arm/gic.c | 5 +++++
xen/include/asm-arm/gic.h | 3 +++
4 files changed, 106 insertions(+)
diff --git a/xen/arch/arm/gic-v2.c b/xen/arch/arm/gic-v2.c
index 0fcb894..38e3216 100644
--- a/xen/arch/arm/gic-v2.c
+++ b/xen/arch/arm/gic-v2.c
@@ -685,6 +685,43 @@ static void __init gicv2_dt_init(void)
}
#ifdef CONFIG_ACPI
+static int 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 )
+ {
+ printk("Can't get GICC entry");
+ return -EINVAL;
+ }
+
+ 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);
+ gicc->parking_version = 0;
+ gicc->performance_interrupt = 0;
+ gicc->gicv_base_address = 0;
+ gicc->gich_base_address = 0;
+ gicc->vgic_interrupt = 0;
+ 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 +813,10 @@ static void __init gicv2_acpi_init(void)
}
#else
static void __init gicv2_acpi_init(void) { }
+static int gicv2_make_hwdom_madt(const struct domain *d, u32 offset)
+{
+ return 0;
+}
#endif
static int __init gicv2_init(void)
@@ -868,6 +909,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..52ee23c 100644
--- a/xen/arch/arm/gic-v3.c
+++ b/xen/arch/arm/gic-v3.c
@@ -1236,6 +1236,57 @@ static void __init gicv3_dt_init(void)
}
#ifdef CONFIG_ACPI
+static int 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 )
+ {
+ printk("Can't get GICC entry");
+ return -EINVAL;
+ }
+
+ 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);
+ gicc->parking_version = 0;
+ gicc->performance_interrupt = 0;
+ gicc->gicv_base_address = 0;
+ gicc->gich_base_address = 0;
+ gicc->gicr_base_address = 0;
+ gicc->vgic_interrupt = 0;
+ 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 +1431,10 @@ static void __init gicv3_acpi_init(void)
}
#else
static void __init gicv3_acpi_init(void) { }
+static int gicv3_make_hwdom_madt(const struct domain *d, u32 offset)
+{
+ return 0;
+}
#endif
/* Set up the GIC */
@@ -1474,6 +1529,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..b3c1eb3 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);
}
+int 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..8130136 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 */
+ int (*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);
+int 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-30 10:07 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-30 10:07 [PATCH v8 00/21] Prepare UEFI and ACPI tables for Dom0 on ARM64 Shannon Zhao
2016-03-30 10:07 ` [PATCH v8 01/21] arm/acpi: Estimate memory required for acpi/efi tables Shannon Zhao
2016-03-30 10:07 ` [PATCH v8 02/21] arm/acpi: Add a helper function to get the acpi table offset Shannon Zhao
2016-03-30 10:07 ` [PATCH v8 03/21] arm/acpi: Prepare FADT table for Dom0 Shannon Zhao
2016-03-30 10:07 ` Shannon Zhao [this message]
2016-03-30 10:07 ` [PATCH v8 05/21] arm/acpi: Prepare MADT " Shannon Zhao
2016-03-30 10:07 ` [PATCH v8 06/21] arm/acpi: Prepare STAO " Shannon Zhao
2016-03-30 10:08 ` [PATCH v8 07/21] arm/acpi: Prepare XSDT " Shannon Zhao
2016-03-30 10:08 ` [PATCH v8 08/21] arm/acpi: Prepare RSDP " Shannon Zhao
2016-03-30 10:08 ` [PATCH v8 09/21] arm/p2m: Add helper functions to map memory regions Shannon Zhao
2016-03-30 10:08 ` [PATCH v8 10/21] arm/acpi: Map all other tables for Dom0 Shannon Zhao
2016-03-30 10:08 ` [PATCH v8 11/21] arm/acpi: Prepare EFI system table " Shannon Zhao
2016-03-30 10:08 ` [PATCH v8 12/21] arm/acpi: Prepare EFI memory descriptor " Shannon Zhao
2016-03-30 10:08 ` [PATCH v8 13/21] arm/acpi: Map the new created EFI and ACPI tables to Dom0 Shannon Zhao
2016-03-30 10:08 ` [PATCH v8 14/21] arm/acpi: Create min DT stub for Dom0 Shannon Zhao
2016-03-30 10:08 ` [PATCH v8 15/21] arm/acpi: Permit access all Xen unused SPIs " Shannon Zhao
2016-03-30 10:08 ` [PATCH v8 16/21] arm/acpi: Configure SPI interrupt type and route to Dom0 dynamically Shannon Zhao
2016-03-30 10:08 ` [PATCH v8 17/21] arm/gic: Add a new callback to deny Dom0 access to GIC regions Shannon Zhao
2016-03-30 10:08 ` [PATCH v8 18/21] arm/acpi: Permit MMIO access of Xen unused devices for Dom0 Shannon Zhao
2016-03-30 10:08 ` [PATCH v8 19/21] xen/acpi: Fix event-channel interrupt when booting with ACPI Shannon Zhao
2016-03-30 10:08 ` [PATCH v8 20/21] xen/arm: Add a hypercall for device mmio mapping Shannon Zhao
2016-03-30 11:33 ` Jan Beulich
2016-03-30 16:11 ` Konrad Rzeszutek Wilk
2016-03-30 16:47 ` Julien Grall
2016-03-31 8:39 ` Shannon Zhao
2016-03-30 10:08 ` [PATCH v8 21/21] xen/arm64: Add ACPI support Shannon Zhao
2016-03-30 11:58 ` [PATCH v8 00/21] Prepare UEFI and ACPI tables for Dom0 on ARM64 Julien Grall
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=1459332494-18964-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=sstabellini@kernel.org \
--cc=stefano.stabellini@citrix.com \
--cc=xen-devel@lists.xen.org \
/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).