* [Qemu-devel] [PATCH] hw/arm/virt-acpi-build: Fix table revision and some comments
@ 2015-06-09 3:26 Shannon Zhao
2015-06-19 12:39 ` Peter Maydell
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Shannon Zhao @ 2015-06-09 3:26 UTC (permalink / raw)
To: qemu-devel; +Cc: peter.maydell, mst, shannon.zhao, imammedo
From: Shannon Zhao <shannon.zhao@linaro.org>
The table revision is not the ACPI spec version. Fix the wrong revision
and also some comments.
Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
---
hw/arm/virt-acpi-build.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index a9373cc..a036a00 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -349,7 +349,7 @@ build_mcfg(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info)
mcfg->allocation[0].end_bus_number = (memmap[VIRT_PCIE_ECAM].size
/ PCIE_MMCFG_SIZE_MIN) - 1;
- build_header(linker, table_data, (void *)mcfg, "MCFG", len, 5);
+ build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1);
}
/* GTDT */
@@ -375,7 +375,7 @@ build_gtdt(GArray *table_data, GArray *linker)
build_header(linker, table_data,
(void *)(table_data->data + gtdt_start), "GTDT",
- table_data->len - gtdt_start, 5);
+ table_data->len - gtdt_start, 2);
}
/* MADT */
@@ -412,7 +412,7 @@ build_madt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info,
build_header(linker, table_data,
(void *)(table_data->data + madt_start), "APIC",
- table_data->len - madt_start, 5);
+ table_data->len - madt_start, 3);
}
/* FADT */
@@ -469,7 +469,7 @@ build_dsdt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info)
g_array_append_vals(table_data, dsdt->buf->data, dsdt->buf->len);
build_header(linker, table_data,
(void *)(table_data->data + table_data->len - dsdt->buf->len),
- "DSDT", dsdt->buf->len, 5);
+ "DSDT", dsdt->buf->len, 2);
free_aml_allocator();
}
@@ -507,6 +507,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables)
* FADT
* GTDT
* MADT
+ * MCFG
* DSDT
*/
@@ -514,7 +515,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables)
dsdt = tables_blob->len;
build_dsdt(tables_blob, tables->linker, guest_info);
- /* FADT MADT GTDT pointed to by RSDT */
+ /* FADT MADT GTDT MCFG pointed to by RSDT */
acpi_add_table(table_offsets, tables_blob);
build_fadt(tables_blob, tables->linker, dsdt);
--
2.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] hw/arm/virt-acpi-build: Fix table revision and some comments
2015-06-09 3:26 [Qemu-devel] [PATCH] hw/arm/virt-acpi-build: Fix table revision and some comments Shannon Zhao
@ 2015-06-19 12:39 ` Peter Maydell
2015-06-19 18:59 ` Andrew Jones
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2015-06-19 12:39 UTC (permalink / raw)
To: Shannon Zhao
Cc: Igor Mammedov, Shannon Zhao, QEMU Developers, Michael S. Tsirkin
On 9 June 2015 at 04:26, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> The table revision is not the ACPI spec version. Fix the wrong revision
> and also some comments.
>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> ---
> hw/arm/virt-acpi-build.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index a9373cc..a036a00 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -349,7 +349,7 @@ build_mcfg(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info)
> mcfg->allocation[0].end_bus_number = (memmap[VIRT_PCIE_ECAM].size
> / PCIE_MMCFG_SIZE_MIN) - 1;
>
> - build_header(linker, table_data, (void *)mcfg, "MCFG", len, 5);
> + build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1);
> }
>
> /* GTDT */
> @@ -375,7 +375,7 @@ build_gtdt(GArray *table_data, GArray *linker)
>
> build_header(linker, table_data,
> (void *)(table_data->data + gtdt_start), "GTDT",
> - table_data->len - gtdt_start, 5);
> + table_data->len - gtdt_start, 2);
> }
>
> /* MADT */
> @@ -412,7 +412,7 @@ build_madt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info,
>
> build_header(linker, table_data,
> (void *)(table_data->data + madt_start), "APIC",
> - table_data->len - madt_start, 5);
> + table_data->len - madt_start, 3);
> }
>
> /* FADT */
> @@ -469,7 +469,7 @@ build_dsdt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info)
> g_array_append_vals(table_data, dsdt->buf->data, dsdt->buf->len);
> build_header(linker, table_data,
> (void *)(table_data->data + table_data->len - dsdt->buf->len),
> - "DSDT", dsdt->buf->len, 5);
> + "DSDT", dsdt->buf->len, 2);
> free_aml_allocator();
> }
>
> @@ -507,6 +507,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables)
> * FADT
> * GTDT
> * MADT
> + * MCFG
> * DSDT
> */
>
> @@ -514,7 +515,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables)
> dsdt = tables_blob->len;
> build_dsdt(tables_blob, tables->linker, guest_info);
>
> - /* FADT MADT GTDT pointed to by RSDT */
> + /* FADT MADT GTDT MCFG pointed to by RSDT */
> acpi_add_table(table_offsets, tables_blob);
> build_fadt(tables_blob, tables->linker, dsdt);
>
> --
> 2.0.4
I can put this in target-arm.next if somebody will review/ack it.
thanks
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] hw/arm/virt-acpi-build: Fix table revision and some comments
2015-06-09 3:26 [Qemu-devel] [PATCH] hw/arm/virt-acpi-build: Fix table revision and some comments Shannon Zhao
2015-06-19 12:39 ` Peter Maydell
@ 2015-06-19 18:59 ` Andrew Jones
2015-06-19 19:06 ` Andrew Jones
2015-06-21 10:02 ` Michael S. Tsirkin
2015-06-23 16:00 ` Peter Maydell
3 siblings, 1 reply; 6+ messages in thread
From: Andrew Jones @ 2015-06-19 18:59 UTC (permalink / raw)
To: Shannon Zhao; +Cc: peter maydell, shannon zhao, qemu-devel, imammedo, mst
----- Original Message -----
> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> The table revision is not the ACPI spec version. Fix the wrong revision
> and also some comments.
>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> ---
> hw/arm/virt-acpi-build.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index a9373cc..a036a00 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -349,7 +349,7 @@ build_mcfg(GArray *table_data, GArray *linker,
> VirtGuestInfo *guest_info)
> mcfg->allocation[0].end_bus_number = (memmap[VIRT_PCIE_ECAM].size
> / PCIE_MMCFG_SIZE_MIN) - 1;
>
> - build_header(linker, table_data, (void *)mcfg, "MCFG", len, 5);
> + build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1);
> }
>
> /* GTDT */
> @@ -375,7 +375,7 @@ build_gtdt(GArray *table_data, GArray *linker)
>
> build_header(linker, table_data,
> (void *)(table_data->data + gtdt_start), "GTDT",
> - table_data->len - gtdt_start, 5);
> + table_data->len - gtdt_start, 2);
> }
>
> /* MADT */
> @@ -412,7 +412,7 @@ build_madt(GArray *table_data, GArray *linker,
> VirtGuestInfo *guest_info,
>
> build_header(linker, table_data,
> (void *)(table_data->data + madt_start), "APIC",
> - table_data->len - madt_start, 5);
> + table_data->len - madt_start, 3);
> }
>
> /* FADT */
> @@ -469,7 +469,7 @@ build_dsdt(GArray *table_data, GArray *linker,
> VirtGuestInfo *guest_info)
> g_array_append_vals(table_data, dsdt->buf->data, dsdt->buf->len);
> build_header(linker, table_data,
> (void *)(table_data->data + table_data->len - dsdt->buf->len),
> - "DSDT", dsdt->buf->len, 5);
> + "DSDT", dsdt->buf->len, 2);
> free_aml_allocator();
> }
>
> @@ -507,6 +507,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info,
> AcpiBuildTables *tables)
> * FADT
> * GTDT
> * MADT
> + * MCFG
> * DSDT
> */
Do we need this comment with a list of tables? I forgot to add SPCR
there.
>
> @@ -514,7 +515,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info,
> AcpiBuildTables *tables)
> dsdt = tables_blob->len;
> build_dsdt(tables_blob, tables->linker, guest_info);
>
> - /* FADT MADT GTDT pointed to by RSDT */
> + /* FADT MADT GTDT MCFG pointed to by RSDT */
This patch isn't based on the latest version, and this comment will
have a merge conflict due to SPCR being there now.
> acpi_add_table(table_offsets, tables_blob);
> build_fadt(tables_blob, tables->linker, dsdt);
>
> --
> 2.0.4
>
>
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] hw/arm/virt-acpi-build: Fix table revision and some comments
2015-06-19 18:59 ` Andrew Jones
@ 2015-06-19 19:06 ` Andrew Jones
0 siblings, 0 replies; 6+ messages in thread
From: Andrew Jones @ 2015-06-19 19:06 UTC (permalink / raw)
To: Shannon Zhao; +Cc: peter maydell, shannon zhao, qemu-devel, imammedo, mst
On Fri, Jun 19, 2015 at 02:59:32PM -0400, Andrew Jones wrote:
>
>
> ----- Original Message -----
> > From: Shannon Zhao <shannon.zhao@linaro.org>
> >
> > The table revision is not the ACPI spec version. Fix the wrong revision
> > and also some comments.
> >
> > Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> > ---
> > hw/arm/virt-acpi-build.c | 11 ++++++-----
> > 1 file changed, 6 insertions(+), 5 deletions(-)
> >
> > diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> > index a9373cc..a036a00 100644
> > --- a/hw/arm/virt-acpi-build.c
> > +++ b/hw/arm/virt-acpi-build.c
> > @@ -349,7 +349,7 @@ build_mcfg(GArray *table_data, GArray *linker,
> > VirtGuestInfo *guest_info)
> > mcfg->allocation[0].end_bus_number = (memmap[VIRT_PCIE_ECAM].size
> > / PCIE_MMCFG_SIZE_MIN) - 1;
> >
> > - build_header(linker, table_data, (void *)mcfg, "MCFG", len, 5);
> > + build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1);
> > }
> >
> > /* GTDT */
> > @@ -375,7 +375,7 @@ build_gtdt(GArray *table_data, GArray *linker)
> >
> > build_header(linker, table_data,
> > (void *)(table_data->data + gtdt_start), "GTDT",
> > - table_data->len - gtdt_start, 5);
> > + table_data->len - gtdt_start, 2);
> > }
> >
> > /* MADT */
> > @@ -412,7 +412,7 @@ build_madt(GArray *table_data, GArray *linker,
> > VirtGuestInfo *guest_info,
> >
> > build_header(linker, table_data,
> > (void *)(table_data->data + madt_start), "APIC",
> > - table_data->len - madt_start, 5);
> > + table_data->len - madt_start, 3);
> > }
> >
> > /* FADT */
> > @@ -469,7 +469,7 @@ build_dsdt(GArray *table_data, GArray *linker,
> > VirtGuestInfo *guest_info)
> > g_array_append_vals(table_data, dsdt->buf->data, dsdt->buf->len);
> > build_header(linker, table_data,
> > (void *)(table_data->data + table_data->len - dsdt->buf->len),
> > - "DSDT", dsdt->buf->len, 5);
> > + "DSDT", dsdt->buf->len, 2);
> > free_aml_allocator();
> > }
> >
> > @@ -507,6 +507,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info,
> > AcpiBuildTables *tables)
> > * FADT
> > * GTDT
> > * MADT
> > + * MCFG
> > * DSDT
> > */
>
> Do we need this comment with a list of tables? I forgot to add SPCR
> there.
>
> >
> > @@ -514,7 +515,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info,
> > AcpiBuildTables *tables)
> > dsdt = tables_blob->len;
> > build_dsdt(tables_blob, tables->linker, guest_info);
> >
> > - /* FADT MADT GTDT pointed to by RSDT */
> > + /* FADT MADT GTDT MCFG pointed to by RSDT */
>
> This patch isn't based on the latest version, and this comment will
> have a merge conflict due to SPCR being there now.
>
> > acpi_add_table(table_offsets, tables_blob);
> > build_fadt(tables_blob, tables->linker, dsdt);
> >
> > --
> > 2.0.4
> >
Forgot to say that I reviewed the table version number changes, and
they look good.
drew
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] hw/arm/virt-acpi-build: Fix table revision and some comments
2015-06-09 3:26 [Qemu-devel] [PATCH] hw/arm/virt-acpi-build: Fix table revision and some comments Shannon Zhao
2015-06-19 12:39 ` Peter Maydell
2015-06-19 18:59 ` Andrew Jones
@ 2015-06-21 10:02 ` Michael S. Tsirkin
2015-06-23 16:00 ` Peter Maydell
3 siblings, 0 replies; 6+ messages in thread
From: Michael S. Tsirkin @ 2015-06-21 10:02 UTC (permalink / raw)
To: Shannon Zhao; +Cc: peter.maydell, shannon.zhao, qemu-devel, imammedo
On Tue, Jun 09, 2015 at 11:26:18AM +0800, Shannon Zhao wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> The table revision is not the ACPI spec version. Fix the wrong revision
> and also some comments.
>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
> ---
> hw/arm/virt-acpi-build.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
>
> diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
> index a9373cc..a036a00 100644
> --- a/hw/arm/virt-acpi-build.c
> +++ b/hw/arm/virt-acpi-build.c
> @@ -349,7 +349,7 @@ build_mcfg(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info)
> mcfg->allocation[0].end_bus_number = (memmap[VIRT_PCIE_ECAM].size
> / PCIE_MMCFG_SIZE_MIN) - 1;
>
> - build_header(linker, table_data, (void *)mcfg, "MCFG", len, 5);
> + build_header(linker, table_data, (void *)mcfg, "MCFG", len, 1);
> }
>
> /* GTDT */
> @@ -375,7 +375,7 @@ build_gtdt(GArray *table_data, GArray *linker)
>
> build_header(linker, table_data,
> (void *)(table_data->data + gtdt_start), "GTDT",
> - table_data->len - gtdt_start, 5);
> + table_data->len - gtdt_start, 2);
> }
>
> /* MADT */
> @@ -412,7 +412,7 @@ build_madt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info,
>
> build_header(linker, table_data,
> (void *)(table_data->data + madt_start), "APIC",
> - table_data->len - madt_start, 5);
> + table_data->len - madt_start, 3);
> }
>
> /* FADT */
> @@ -469,7 +469,7 @@ build_dsdt(GArray *table_data, GArray *linker, VirtGuestInfo *guest_info)
> g_array_append_vals(table_data, dsdt->buf->data, dsdt->buf->len);
> build_header(linker, table_data,
> (void *)(table_data->data + table_data->len - dsdt->buf->len),
> - "DSDT", dsdt->buf->len, 5);
> + "DSDT", dsdt->buf->len, 2);
> free_aml_allocator();
> }
>
> @@ -507,6 +507,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables)
> * FADT
> * GTDT
> * MADT
> + * MCFG
> * DSDT
> */
>
> @@ -514,7 +515,7 @@ void virt_acpi_build(VirtGuestInfo *guest_info, AcpiBuildTables *tables)
> dsdt = tables_blob->len;
> build_dsdt(tables_blob, tables->linker, guest_info);
>
> - /* FADT MADT GTDT pointed to by RSDT */
> + /* FADT MADT GTDT MCFG pointed to by RSDT */
> acpi_add_table(table_offsets, tables_blob);
> build_fadt(tables_blob, tables->linker, dsdt);
>
> --
> 2.0.4
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [Qemu-devel] [PATCH] hw/arm/virt-acpi-build: Fix table revision and some comments
2015-06-09 3:26 [Qemu-devel] [PATCH] hw/arm/virt-acpi-build: Fix table revision and some comments Shannon Zhao
` (2 preceding siblings ...)
2015-06-21 10:02 ` Michael S. Tsirkin
@ 2015-06-23 16:00 ` Peter Maydell
3 siblings, 0 replies; 6+ messages in thread
From: Peter Maydell @ 2015-06-23 16:00 UTC (permalink / raw)
To: Shannon Zhao
Cc: Igor Mammedov, Shannon Zhao, QEMU Developers, Michael S. Tsirkin
On 9 June 2015 at 04:26, Shannon Zhao <zhaoshenglong@huawei.com> wrote:
> From: Shannon Zhao <shannon.zhao@linaro.org>
>
> The table revision is not the ACPI spec version. Fix the wrong revision
> and also some comments.
>
> Signed-off-by: Shannon Zhao <shannon.zhao@linaro.org>
> ---
> hw/arm/virt-acpi-build.c | 11 ++++++-----
> 1 file changed, 6 insertions(+), 5 deletions(-)
Applied to target-arm.next (with the merge conflict noted by Andrew
fixed up), thanks.
-- PMM
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-06-23 16:00 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-06-09 3:26 [Qemu-devel] [PATCH] hw/arm/virt-acpi-build: Fix table revision and some comments Shannon Zhao
2015-06-19 12:39 ` Peter Maydell
2015-06-19 18:59 ` Andrew Jones
2015-06-19 19:06 ` Andrew Jones
2015-06-21 10:02 ` Michael S. Tsirkin
2015-06-23 16:00 ` Peter Maydell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.