Now that build_rsdp() supports building both legacy and current RSDP
tables, we can move it to a generic folder (hw/acpi) and have the i386
ACPI code reuse it in order to reduce code duplication.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Andrew Jones <drjones@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
include/hw/acpi/aml-build.h | 2 ++
hw/acpi/aml-build.c | 68 +++++++++++++++++++++++++++++++++++++
hw/arm/virt-acpi-build.c | 65 -----------------------------------
hw/i386/acpi-build.c | 49 +++++++++++---------------
4 files changed, 89 insertions(+), 95 deletions(-)
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index 6c36903c0a..1a563ad756 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -388,6 +388,8 @@ void acpi_add_table(GArray *table_offsets, GArray *table_data);
void acpi_build_tables_init(AcpiBuildTables *tables);
void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre);
void
+build_rsdp(GArray *tbl, BIOSLinker *linker, AcpiRsdpData *rsdp_data);
+void
build_rsdt(GArray *table_data, BIOSLinker *linker, GArray *table_offsets,
const char *oem_id, const char *oem_table_id);
void
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 1e43cd736d..555c24f21d 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1589,6 +1589,74 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre)
g_array_free(tables->vmgenid, mfre);
}
+/*
+ * ACPI spec 5.2.5.3 Root System Description Pointer (RSDP).
+ * (Revision 1.0 or later)
+ */
+void
+build_rsdp(GArray *tbl, BIOSLinker *linker, AcpiRsdpData *rsdp_data)
+{
+ int tbl_off = tbl->len; /* Table offset in the RSDP file */
+
+ switch (rsdp_data->revision) {
+ case 0:
+ /* With ACPI 1.0, we must have an RSDT pointer */
+ g_assert(rsdp_data->rsdt_tbl_offset);
+ break;
+ case 2:
+ /* With ACPI 2.0+, we must have an XSDT pointer */
+ g_assert(rsdp_data->xsdt_tbl_offset);
+ break;
+ default:
+ /* Only revisions 0 (ACPI 1.0) and 2 (ACPI 2.0+) are valid for RSDP */
+ g_assert_not_reached();
+ }
+
+ bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, tbl, 16,
+ true /* fseg memory */);
+
+ g_array_append_vals(tbl, "RSD PTR ", 8); /* Signature */
+ build_append_int_noprefix(tbl, 0, 1); /* Checksum */
+ g_array_append_vals(tbl, rsdp_data->oem_id, 6); /* OEMID */
+ build_append_int_noprefix(tbl, rsdp_data->revision, 1); /* Revision */
+ build_append_int_noprefix(tbl, 0, 4); /* RsdtAddress */
+ if (rsdp_data->rsdt_tbl_offset) {
+ /* RSDT address to be filled by guest linker */
+ bios_linker_loader_add_pointer(linker, ACPI_BUILD_RSDP_FILE,
+ tbl_off + 16, 4,
+ ACPI_BUILD_TABLE_FILE,
+ *rsdp_data->rsdt_tbl_offset);
+ }
+
+ /* Checksum to be filled by guest linker */
+ bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
+ tbl_off, 20, /* ACPI rev 1.0 RSDP size */
+ 8);
+
+ if (rsdp_data->revision == 0) {
+ /* ACPI 1.0 RSDP, we're done */
+ return;
+ }
+
+ build_append_int_noprefix(tbl, 36, 4); /* Length */
+
+ /* XSDT address to be filled by guest linker */
+ build_append_int_noprefix(tbl, 0, 8); /* XsdtAddress */
+ /* We already validated our xsdt pointer */
+ bios_linker_loader_add_pointer(linker, ACPI_BUILD_RSDP_FILE,
+ tbl_off + 24, 8,
+ ACPI_BUILD_TABLE_FILE,
+ *rsdp_data->xsdt_tbl_offset);
+
+ build_append_int_noprefix(tbl, 0, 1); /* Extended Checksum */
+ build_append_int_noprefix(tbl, 0, 3); /* Reserved */
+
+ /* Extended checksum to be filled by Guest linker */
+ bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
+ tbl_off, 36, /* ACPI rev 2.0 RSDP size */
+ 32);
+}
+
/* Build rsdt table */
void
build_rsdt(GArray *table_data, BIOSLinker *linker, GArray *table_offsets,
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 05f6654371..95fad6f0ce 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -366,71 +366,6 @@ static void acpi_dsdt_add_power_button(Aml *scope)
aml_append(scope, dev);
}
-/* RSDP */
-static void
-build_rsdp(GArray *tbl, BIOSLinker *linker, AcpiRsdpData *rsdp_data)
-{
- int tbl_off = tbl->len; /* Table offset in the RSDP file */
-
- switch (rsdp_data->revision) {
- case 0:
- /* With ACPI 1.0, we must have an RSDT pointer */
- g_assert(rsdp_data->rsdt_tbl_offset);
- break;
- case 2:
- /* With ACPI 2.0+, we must have an XSDT pointer */
- g_assert(rsdp_data->xsdt_tbl_offset);
- break;
- default:
- /* Only revisions 0 (ACPI 1.0) and 2 (ACPI 2.0+) are valid for RSDP */
- g_assert_not_reached();
- }
-
- bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, tbl, 16,
- true /* fseg memory */);
-
- g_array_append_vals(tbl, "RSD PTR ", 8); /* Signature */
- build_append_int_noprefix(tbl, 0, 1); /* Checksum */
- g_array_append_vals(tbl, rsdp_data->oem_id, 6); /* OEMID */
- build_append_int_noprefix(tbl, rsdp_data->revision, 1); /* Revision */
- build_append_int_noprefix(tbl, 0, 4); /* RsdtAddress */
- if (rsdp_data->rsdt_tbl_offset) {
- /* RSDT address to be filled by guest linker */
- bios_linker_loader_add_pointer(linker, ACPI_BUILD_RSDP_FILE,
- tbl_off + 16, 4,
- ACPI_BUILD_TABLE_FILE,
- *rsdp_data->rsdt_tbl_offset);
- }
-
- /* Checksum to be filled by guest linker */
- bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
- tbl_off, 20, /* ACPI rev 1.0 RSDP size */
- 8);
-
- if (rsdp_data->revision == 0) {
- /* ACPI 1.0 RSDP, we're done */
- return;
- }
-
- build_append_int_noprefix(tbl, 36, 4); /* Length */
-
- /* XSDT address to be filled by guest linker */
- build_append_int_noprefix(tbl, 0, 8); /* XsdtAddress */
- /* We already validated our xsdt pointer */
- bios_linker_loader_add_pointer(linker, ACPI_BUILD_RSDP_FILE,
- tbl_off + 24, 8,
- ACPI_BUILD_TABLE_FILE,
- *rsdp_data->xsdt_tbl_offset);
-
- build_append_int_noprefix(tbl, 0, 1); /* Extended Checksum */
- build_append_int_noprefix(tbl, 0, 3); /* Reserved */
-
- /* Extended checksum to be filled by Guest linker */
- bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
- tbl_off, 36, /* ACPI rev 2.0 RSDP size */
- 32);
-}
-
static void
build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
{
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index fb877648ac..846cb6d755 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2547,35 +2547,6 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker)
"IVRS", table_data->len - iommu_start, 1, NULL, NULL);
}
-static void
-build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset)
-{
- /* AcpiRsdpDescriptor describes revision 2 RSDP table and as result we
- * allocate extra 16 bytes for pc/q35 RSDP rev1 as well. Keep extra 16 bytes
- * wasted to make sure we won't breake migration for machine types older
- * than 2.3 due to size mismatch.
- */
- AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp);
- unsigned rsdt_pa_size = sizeof(rsdp->rsdt_physical_address);
- unsigned rsdt_pa_offset =
- (char *)&rsdp->rsdt_physical_address - rsdp_table->data;
-
- bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, rsdp_table, 16,
- true /* fseg memory */);
-
- memcpy(&rsdp->signature, "RSD PTR ", 8);
- memcpy(rsdp->oem_id, ACPI_BUILD_APPNAME6, 6);
- /* Address to be filled by Guest linker */
- bios_linker_loader_add_pointer(linker,
- ACPI_BUILD_RSDP_FILE, rsdt_pa_offset, rsdt_pa_size,
- ACPI_BUILD_TABLE_FILE, rsdt_tbl_offset);
-
- /* Checksum to be filled by Guest linker */
- bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
- (char *)rsdp - rsdp_table->data, 20 /* ACPI rev 1.0 RSDP size */,
- (char *)&rsdp->checksum - rsdp_table->data);
-}
-
typedef
struct AcpiBuildState {
/* Copy of table in RAM (for patching). */
@@ -2732,7 +2703,25 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
slic_oem.id, slic_oem.table_id);
/* RSDP is in FSEG memory, so allocate it separately */
- build_rsdp(tables->rsdp, tables->linker, rsdt);
+ {
+ AcpiRsdpData rsdp_data = {
+ .revision = 0,
+ .oem_id = ACPI_BUILD_APPNAME6,
+ .xsdt_tbl_offset = NULL,
+ .rsdt_tbl_offset = &rsdt,
+ };
+ build_rsdp(tables->rsdp, tables->linker, &rsdp_data);
+ if (!pcmc->rsdp_in_ram) {
+ /*
+ * Legacy machine types (2.2 and older) expect to get a complete
+ * revision 2 RSDP table, even though they only look at the
+ * revision 0 fields (xsdt pointer is not set). So in order to
+ * not break migration to those machine types we waste 16 bytes
+ * that we amend to the RSDP revision 0 structure.
+ */
+ build_append_int_noprefix(tables->rsdp, 0, 16);
+ }
+ }
/* We'll expose it all to Guest so we want to reduce
* chance of size changes.
--
2.19.2
On Mon, 17 Dec 2018 11:48:37 +0100
Samuel Ortiz <sameo@linux.intel.com> wrote:
> Now that build_rsdp() supports building both legacy and current RSDP
> tables, we can move it to a generic folder (hw/acpi) and have the i386
> ACPI code reuse it in order to reduce code duplication.
>
> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Reviewed-by: Andrew Jones <drjones@redhat.com>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
for future reference, if one changes patch in a significant way,
one is supposed to drop Tested/Reviewed-by tags so that reviewers
would look at it again and we by mistake won't merge not actually
reviewed changes.
[...]
> diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> index fb877648ac..846cb6d755 100644
> --- a/hw/i386/acpi-build.c
> +++ b/hw/i386/acpi-build.c
> @@ -2547,35 +2547,6 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker)
> "IVRS", table_data->len - iommu_start, 1, NULL, NULL);
> }
>
> -static void
> -build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset)
> -{
> - /* AcpiRsdpDescriptor describes revision 2 RSDP table and as result we
> - * allocate extra 16 bytes for pc/q35 RSDP rev1 as well. Keep extra 16 bytes
> - * wasted to make sure we won't breake migration for machine types older
> - * than 2.3 due to size mismatch.
> - */
> - AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp);
> - unsigned rsdt_pa_size = sizeof(rsdp->rsdt_physical_address);
> - unsigned rsdt_pa_offset =
> - (char *)&rsdp->rsdt_physical_address - rsdp_table->data;
> -
> - bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, rsdp_table, 16,
> - true /* fseg memory */);
> -
> - memcpy(&rsdp->signature, "RSD PTR ", 8);
> - memcpy(rsdp->oem_id, ACPI_BUILD_APPNAME6, 6);
> - /* Address to be filled by Guest linker */
> - bios_linker_loader_add_pointer(linker,
> - ACPI_BUILD_RSDP_FILE, rsdt_pa_offset, rsdt_pa_size,
> - ACPI_BUILD_TABLE_FILE, rsdt_tbl_offset);
> -
> - /* Checksum to be filled by Guest linker */
> - bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
> - (char *)rsdp - rsdp_table->data, 20 /* ACPI rev 1.0 RSDP size */,
> - (char *)&rsdp->checksum - rsdp_table->data);
> -}
> -
> typedef
> struct AcpiBuildState {
> /* Copy of table in RAM (for patching). */
> @@ -2732,7 +2703,25 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
> slic_oem.id, slic_oem.table_id);
>
> /* RSDP is in FSEG memory, so allocate it separately */
> - build_rsdp(tables->rsdp, tables->linker, rsdt);
> + {
> + AcpiRsdpData rsdp_data = {
> + .revision = 0,
> + .oem_id = ACPI_BUILD_APPNAME6,
> + .xsdt_tbl_offset = NULL,
> + .rsdt_tbl_offset = &rsdt,
> + };
> + build_rsdp(tables->rsdp, tables->linker, &rsdp_data);
> + if (!pcmc->rsdp_in_ram) {
> + /*
> + * Legacy machine types (2.2 and older) expect to get a complete
> + * revision 2 RSDP table, even though they only look at the
not true, rev is set to 0 for pc machines, the point of the original comment was
that we allocate extra 16 bytes but not actually using them and why it's bad
to drop it suddenly.
> + * revision 0 fields (xsdt pointer is not set). So in order to
> + * not break migration to those machine types we waste 16 bytes
> + * that we amend to the RSDP revision 0 structure.
^^^ added
> + */
Perhaps amended original comment would be clearer:
/* We used to allocate extra space for RSDP rev 2 but used only space for
* legacy RSDP and extra bytes were zeroed out. Keep wasting extra 16 bytes
* to make sure we won't breake migration for machine types 2.2 and older
* due to RSDP blob size mismatch.
*/
> + build_append_int_noprefix(tables->rsdp, 0, 16);
> + }
> + }
>
> /* We'll expose it all to Guest so we want to reduce
> * chance of size changes.
With comment fixed:
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
since it's minor fixup and doesn't affect applying remaining patches you can post
v5 7/8 as reply to v4 7/8
On Mon, Dec 17, 2018 at 01:20:28PM +0100, Igor Mammedov wrote:
> On Mon, 17 Dec 2018 11:48:37 +0100
> Samuel Ortiz <sameo@linux.intel.com> wrote:
>
> > Now that build_rsdp() supports building both legacy and current RSDP
> > tables, we can move it to a generic folder (hw/acpi) and have the i386
> > ACPI code reuse it in order to reduce code duplication.
> >
> > Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
> > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > Reviewed-by: Andrew Jones <drjones@redhat.com>
> > Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> for future reference, if one changes patch in a significant way,
> one is supposed to drop Tested/Reviewed-by tags so that reviewers
> would look at it again and we by mistake won't merge not actually
> reviewed changes.
>
> [...]
>
> > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > index fb877648ac..846cb6d755 100644
> > --- a/hw/i386/acpi-build.c
> > +++ b/hw/i386/acpi-build.c
> > @@ -2547,35 +2547,6 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker)
> > "IVRS", table_data->len - iommu_start, 1, NULL, NULL);
> > }
> >
> > -static void
> > -build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset)
> > -{
> > - /* AcpiRsdpDescriptor describes revision 2 RSDP table and as result we
> > - * allocate extra 16 bytes for pc/q35 RSDP rev1 as well. Keep extra 16 bytes
> > - * wasted to make sure we won't breake migration for machine types older
> > - * than 2.3 due to size mismatch.
> > - */
> > - AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp);
> > - unsigned rsdt_pa_size = sizeof(rsdp->rsdt_physical_address);
> > - unsigned rsdt_pa_offset =
> > - (char *)&rsdp->rsdt_physical_address - rsdp_table->data;
> > -
> > - bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, rsdp_table, 16,
> > - true /* fseg memory */);
> > -
> > - memcpy(&rsdp->signature, "RSD PTR ", 8);
> > - memcpy(rsdp->oem_id, ACPI_BUILD_APPNAME6, 6);
> > - /* Address to be filled by Guest linker */
> > - bios_linker_loader_add_pointer(linker,
> > - ACPI_BUILD_RSDP_FILE, rsdt_pa_offset, rsdt_pa_size,
> > - ACPI_BUILD_TABLE_FILE, rsdt_tbl_offset);
> > -
> > - /* Checksum to be filled by Guest linker */
> > - bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
> > - (char *)rsdp - rsdp_table->data, 20 /* ACPI rev 1.0 RSDP size */,
> > - (char *)&rsdp->checksum - rsdp_table->data);
> > -}
> > -
> > typedef
> > struct AcpiBuildState {
> > /* Copy of table in RAM (for patching). */
> > @@ -2732,7 +2703,25 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
> > slic_oem.id, slic_oem.table_id);
> >
> > /* RSDP is in FSEG memory, so allocate it separately */
> > - build_rsdp(tables->rsdp, tables->linker, rsdt);
> > + {
> > + AcpiRsdpData rsdp_data = {
> > + .revision = 0,
> > + .oem_id = ACPI_BUILD_APPNAME6,
> > + .xsdt_tbl_offset = NULL,
> > + .rsdt_tbl_offset = &rsdt,
> > + };
> > + build_rsdp(tables->rsdp, tables->linker, &rsdp_data);
> > + if (!pcmc->rsdp_in_ram) {
> > + /*
> > + * Legacy machine types (2.2 and older) expect to get a complete
> > + * revision 2 RSDP table, even though they only look at the
> not true, rev is set to 0 for pc machines,
Rev is set to 0 but they effectively expect to get a structure which
size is the rev 2 one. That's what I meant.
> the point of the original comment was
> that we allocate extra 16 bytes but not actually using them and why it's bad
> to drop it suddenly.
>
> > + * revision 0 fields (xsdt pointer is not set). So in order to
> > + * not break migration to those machine types we waste 16 bytes
> > + * that we amend to the RSDP revision 0 structure.
> ^^^ added
> > + */
> Perhaps amended original comment would be clearer:
>
> /* We used to allocate extra space for RSDP rev 2 but used only space for
> * legacy RSDP and extra bytes were zeroed out. Keep wasting extra 16 bytes
> * to make sure we won't breake migration for machine types 2.2 and older
> * due to RSDP blob size mismatch.
> */
>
> > + build_append_int_noprefix(tables->rsdp, 0, 16);
> > + }
> > + }
> >
> > /* We'll expose it all to Guest so we want to reduce
> > * chance of size changes.
>
> With comment fixed:
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
>
> since it's minor fixup and doesn't affect applying remaining patches you can post
> v5 7/8 as reply to v4 7/8
I'll do that.
Since I assume the 16 bytes addition is a significant change, I'll also remove all
reviewed-by/tested-by tags from this patch, except yours.
Cheers,
Samuel.
On Mon, 17 Dec 2018 14:49:59 +0100
Samuel Ortiz <sameo@linux.intel.com> wrote:
> On Mon, Dec 17, 2018 at 01:20:28PM +0100, Igor Mammedov wrote:
> > On Mon, 17 Dec 2018 11:48:37 +0100
> > Samuel Ortiz <sameo@linux.intel.com> wrote:
> >
> > > Now that build_rsdp() supports building both legacy and current RSDP
> > > tables, we can move it to a generic folder (hw/acpi) and have the i386
> > > ACPI code reuse it in order to reduce code duplication.
> > >
> > > Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
> > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > > Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > > Reviewed-by: Andrew Jones <drjones@redhat.com>
> > > Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> > for future reference, if one changes patch in a significant way,
> > one is supposed to drop Tested/Reviewed-by tags so that reviewers
> > would look at it again and we by mistake won't merge not actually
> > reviewed changes.
> >
> > [...]
> >
> > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > > index fb877648ac..846cb6d755 100644
> > > --- a/hw/i386/acpi-build.c
> > > +++ b/hw/i386/acpi-build.c
> > > @@ -2547,35 +2547,6 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker)
> > > "IVRS", table_data->len - iommu_start, 1, NULL, NULL);
> > > }
> > >
> > > -static void
> > > -build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset)
> > > -{
> > > - /* AcpiRsdpDescriptor describes revision 2 RSDP table and as result we
> > > - * allocate extra 16 bytes for pc/q35 RSDP rev1 as well. Keep extra 16 bytes
> > > - * wasted to make sure we won't breake migration for machine types older
> > > - * than 2.3 due to size mismatch.
> > > - */
> > > - AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp);
> > > - unsigned rsdt_pa_size = sizeof(rsdp->rsdt_physical_address);
> > > - unsigned rsdt_pa_offset =
> > > - (char *)&rsdp->rsdt_physical_address - rsdp_table->data;
> > > -
> > > - bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, rsdp_table, 16,
> > > - true /* fseg memory */);
> > > -
> > > - memcpy(&rsdp->signature, "RSD PTR ", 8);
> > > - memcpy(rsdp->oem_id, ACPI_BUILD_APPNAME6, 6);
> > > - /* Address to be filled by Guest linker */
> > > - bios_linker_loader_add_pointer(linker,
> > > - ACPI_BUILD_RSDP_FILE, rsdt_pa_offset, rsdt_pa_size,
> > > - ACPI_BUILD_TABLE_FILE, rsdt_tbl_offset);
> > > -
> > > - /* Checksum to be filled by Guest linker */
> > > - bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
> > > - (char *)rsdp - rsdp_table->data, 20 /* ACPI rev 1.0 RSDP size */,
> > > - (char *)&rsdp->checksum - rsdp_table->data);
> > > -}
> > > -
> > > typedef
> > > struct AcpiBuildState {
> > > /* Copy of table in RAM (for patching). */
> > > @@ -2732,7 +2703,25 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
> > > slic_oem.id, slic_oem.table_id);
> > >
> > > /* RSDP is in FSEG memory, so allocate it separately */
> > > - build_rsdp(tables->rsdp, tables->linker, rsdt);
> > > + {
> > > + AcpiRsdpData rsdp_data = {
> > > + .revision = 0,
> > > + .oem_id = ACPI_BUILD_APPNAME6,
> > > + .xsdt_tbl_offset = NULL,
> > > + .rsdt_tbl_offset = &rsdt,
> > > + };
> > > + build_rsdp(tables->rsdp, tables->linker, &rsdp_data);
> > > + if (!pcmc->rsdp_in_ram) {
> > > + /*
> > > + * Legacy machine types (2.2 and older) expect to get a complete
> > > + * revision 2 RSDP table, even though they only look at the
> > not true, rev is set to 0 for pc machines,
> Rev is set to 0 but they effectively expect to get a structure which
> size is the rev 2 one. That's what I meant.
>
> > the point of the original comment was
> > that we allocate extra 16 bytes but not actually using them and why it's bad
> > to drop it suddenly.
> >
> > > + * revision 0 fields (xsdt pointer is not set). So in order to
> > > + * not break migration to those machine types we waste 16 bytes
> > > + * that we amend to the RSDP revision 0 structure.
> > ^^^ added
> > > + */
> > Perhaps amended original comment would be clearer:
> >
> > /* We used to allocate extra space for RSDP rev 2 but used only space for
> > * legacy RSDP and extra bytes were zeroed out. Keep wasting extra 16 bytes
> > * to make sure we won't breake migration for machine types 2.2 and older
> > * due to RSDP blob size mismatch.
> > */
> >
> > > + build_append_int_noprefix(tables->rsdp, 0, 16);
Looks like I've haven't noticed, it might work but are you sure?
0 here is uint64_t and then it's shifted 16 times which is sort of gray area (undefined behavior)
using g_array_append_val[s]() here might be better
> > > + }
> > > + }
> > >
> > > /* We'll expose it all to Guest so we want to reduce
> > > * chance of size changes.
> >
> > With comment fixed:
> > Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> >
> > since it's minor fixup and doesn't affect applying remaining patches you can post
> > v5 7/8 as reply to v4 7/8
> I'll do that.
> Since I assume the 16 bytes addition is a significant change, I'll also remove all
> reviewed-by/tested-by tags from this patch, except yours.
>
> Cheers,
> Samuel.
>
On Mon, Dec 17, 2018 at 04:35:36PM +0100, Igor Mammedov wrote:
> On Mon, 17 Dec 2018 14:49:59 +0100
> Samuel Ortiz <sameo@linux.intel.com> wrote:
>
> > On Mon, Dec 17, 2018 at 01:20:28PM +0100, Igor Mammedov wrote:
> > > On Mon, 17 Dec 2018 11:48:37 +0100
> > > Samuel Ortiz <sameo@linux.intel.com> wrote:
> > >
> > > > Now that build_rsdp() supports building both legacy and current RSDP
> > > > tables, we can move it to a generic folder (hw/acpi) and have the i386
> > > > ACPI code reuse it in order to reduce code duplication.
> > > >
> > > > Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
> > > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > > > Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > > > Reviewed-by: Andrew Jones <drjones@redhat.com>
> > > > Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> > > for future reference, if one changes patch in a significant way,
> > > one is supposed to drop Tested/Reviewed-by tags so that reviewers
> > > would look at it again and we by mistake won't merge not actually
> > > reviewed changes.
> > >
> > > [...]
> > >
> > > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > > > index fb877648ac..846cb6d755 100644
> > > > --- a/hw/i386/acpi-build.c
> > > > +++ b/hw/i386/acpi-build.c
> > > > @@ -2547,35 +2547,6 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker)
> > > > "IVRS", table_data->len - iommu_start, 1, NULL, NULL);
> > > > }
> > > >
> > > > -static void
> > > > -build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset)
> > > > -{
> > > > - /* AcpiRsdpDescriptor describes revision 2 RSDP table and as result we
> > > > - * allocate extra 16 bytes for pc/q35 RSDP rev1 as well. Keep extra 16 bytes
> > > > - * wasted to make sure we won't breake migration for machine types older
> > > > - * than 2.3 due to size mismatch.
> > > > - */
> > > > - AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp);
> > > > - unsigned rsdt_pa_size = sizeof(rsdp->rsdt_physical_address);
> > > > - unsigned rsdt_pa_offset =
> > > > - (char *)&rsdp->rsdt_physical_address - rsdp_table->data;
> > > > -
> > > > - bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, rsdp_table, 16,
> > > > - true /* fseg memory */);
> > > > -
> > > > - memcpy(&rsdp->signature, "RSD PTR ", 8);
> > > > - memcpy(rsdp->oem_id, ACPI_BUILD_APPNAME6, 6);
> > > > - /* Address to be filled by Guest linker */
> > > > - bios_linker_loader_add_pointer(linker,
> > > > - ACPI_BUILD_RSDP_FILE, rsdt_pa_offset, rsdt_pa_size,
> > > > - ACPI_BUILD_TABLE_FILE, rsdt_tbl_offset);
> > > > -
> > > > - /* Checksum to be filled by Guest linker */
> > > > - bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
> > > > - (char *)rsdp - rsdp_table->data, 20 /* ACPI rev 1.0 RSDP size */,
> > > > - (char *)&rsdp->checksum - rsdp_table->data);
> > > > -}
> > > > -
> > > > typedef
> > > > struct AcpiBuildState {
> > > > /* Copy of table in RAM (for patching). */
> > > > @@ -2732,7 +2703,25 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
> > > > slic_oem.id, slic_oem.table_id);
> > > >
> > > > /* RSDP is in FSEG memory, so allocate it separately */
> > > > - build_rsdp(tables->rsdp, tables->linker, rsdt);
> > > > + {
> > > > + AcpiRsdpData rsdp_data = {
> > > > + .revision = 0,
> > > > + .oem_id = ACPI_BUILD_APPNAME6,
> > > > + .xsdt_tbl_offset = NULL,
> > > > + .rsdt_tbl_offset = &rsdt,
> > > > + };
> > > > + build_rsdp(tables->rsdp, tables->linker, &rsdp_data);
> > > > + if (!pcmc->rsdp_in_ram) {
> > > > + /*
> > > > + * Legacy machine types (2.2 and older) expect to get a complete
> > > > + * revision 2 RSDP table, even though they only look at the
> > > not true, rev is set to 0 for pc machines,
> > Rev is set to 0 but they effectively expect to get a structure which
> > size is the rev 2 one. That's what I meant.
> >
> > > the point of the original comment was
> > > that we allocate extra 16 bytes but not actually using them and why it's bad
> > > to drop it suddenly.
> > >
> > > > + * revision 0 fields (xsdt pointer is not set). So in order to
> > > > + * not break migration to those machine types we waste 16 bytes
> > > > + * that we amend to the RSDP revision 0 structure.
> > > ^^^ added
> > > > + */
> > > Perhaps amended original comment would be clearer:
> > >
> > > /* We used to allocate extra space for RSDP rev 2 but used only space for
> > > * legacy RSDP and extra bytes were zeroed out. Keep wasting extra 16 bytes
> > > * to make sure we won't breake migration for machine types 2.2 and older
> > > * due to RSDP blob size mismatch.
> > > */
> > >
> > > > + build_append_int_noprefix(tables->rsdp, 0, 16);
> Looks like I've haven't noticed, it might work but are you sure?
> 0 here is uint64_t and then it's shifted 16 times which is sort of gray area (undefined behavior)
AFAIK shifting by N bits when N > width(left operand) is undefined but
that's not the case here. build_append_int_noprefix(foo, 0, 16) shift a 64 bits
wide unsigned int by 8 bits, for each iterations of a 16 iterations
loop. So we're doing 16 iterations of properly defined behaviour.
Cheers,
Samuel.
On Mon, Dec 17, 2018 at 05:46:48PM +0100, Samuel Ortiz wrote:
> On Mon, Dec 17, 2018 at 04:35:36PM +0100, Igor Mammedov wrote:
> > On Mon, 17 Dec 2018 14:49:59 +0100
> > Samuel Ortiz <sameo@linux.intel.com> wrote:
> >
> > > On Mon, Dec 17, 2018 at 01:20:28PM +0100, Igor Mammedov wrote:
> > > > On Mon, 17 Dec 2018 11:48:37 +0100
> > > > Samuel Ortiz <sameo@linux.intel.com> wrote:
> > > >
> > > > > Now that build_rsdp() supports building both legacy and current RSDP
> > > > > tables, we can move it to a generic folder (hw/acpi) and have the i386
> > > > > ACPI code reuse it in order to reduce code duplication.
> > > > >
> > > > > Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
> > > > > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > > > > Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> > > > > Reviewed-by: Andrew Jones <drjones@redhat.com>
> > > > > Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> > > > for future reference, if one changes patch in a significant way,
> > > > one is supposed to drop Tested/Reviewed-by tags so that reviewers
> > > > would look at it again and we by mistake won't merge not actually
> > > > reviewed changes.
> > > >
> > > > [...]
> > > >
> > > > > diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
> > > > > index fb877648ac..846cb6d755 100644
> > > > > --- a/hw/i386/acpi-build.c
> > > > > +++ b/hw/i386/acpi-build.c
> > > > > @@ -2547,35 +2547,6 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker)
> > > > > "IVRS", table_data->len - iommu_start, 1, NULL, NULL);
> > > > > }
> > > > >
> > > > > -static void
> > > > > -build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset)
> > > > > -{
> > > > > - /* AcpiRsdpDescriptor describes revision 2 RSDP table and as result we
> > > > > - * allocate extra 16 bytes for pc/q35 RSDP rev1 as well. Keep extra 16 bytes
> > > > > - * wasted to make sure we won't breake migration for machine types older
> > > > > - * than 2.3 due to size mismatch.
> > > > > - */
> > > > > - AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp);
> > > > > - unsigned rsdt_pa_size = sizeof(rsdp->rsdt_physical_address);
> > > > > - unsigned rsdt_pa_offset =
> > > > > - (char *)&rsdp->rsdt_physical_address - rsdp_table->data;
> > > > > -
> > > > > - bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, rsdp_table, 16,
> > > > > - true /* fseg memory */);
> > > > > -
> > > > > - memcpy(&rsdp->signature, "RSD PTR ", 8);
> > > > > - memcpy(rsdp->oem_id, ACPI_BUILD_APPNAME6, 6);
> > > > > - /* Address to be filled by Guest linker */
> > > > > - bios_linker_loader_add_pointer(linker,
> > > > > - ACPI_BUILD_RSDP_FILE, rsdt_pa_offset, rsdt_pa_size,
> > > > > - ACPI_BUILD_TABLE_FILE, rsdt_tbl_offset);
> > > > > -
> > > > > - /* Checksum to be filled by Guest linker */
> > > > > - bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
> > > > > - (char *)rsdp - rsdp_table->data, 20 /* ACPI rev 1.0 RSDP size */,
> > > > > - (char *)&rsdp->checksum - rsdp_table->data);
> > > > > -}
> > > > > -
> > > > > typedef
> > > > > struct AcpiBuildState {
> > > > > /* Copy of table in RAM (for patching). */
> > > > > @@ -2732,7 +2703,25 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
> > > > > slic_oem.id, slic_oem.table_id);
> > > > >
> > > > > /* RSDP is in FSEG memory, so allocate it separately */
> > > > > - build_rsdp(tables->rsdp, tables->linker, rsdt);
> > > > > + {
> > > > > + AcpiRsdpData rsdp_data = {
> > > > > + .revision = 0,
> > > > > + .oem_id = ACPI_BUILD_APPNAME6,
> > > > > + .xsdt_tbl_offset = NULL,
> > > > > + .rsdt_tbl_offset = &rsdt,
> > > > > + };
> > > > > + build_rsdp(tables->rsdp, tables->linker, &rsdp_data);
> > > > > + if (!pcmc->rsdp_in_ram) {
> > > > > + /*
> > > > > + * Legacy machine types (2.2 and older) expect to get a complete
> > > > > + * revision 2 RSDP table, even though they only look at the
> > > > not true, rev is set to 0 for pc machines,
> > > Rev is set to 0 but they effectively expect to get a structure which
> > > size is the rev 2 one. That's what I meant.
> > >
> > > > the point of the original comment was
> > > > that we allocate extra 16 bytes but not actually using them and why it's bad
> > > > to drop it suddenly.
> > > >
> > > > > + * revision 0 fields (xsdt pointer is not set). So in order to
> > > > > + * not break migration to those machine types we waste 16 bytes
> > > > > + * that we amend to the RSDP revision 0 structure.
> > > > ^^^ added
> > > > > + */
> > > > Perhaps amended original comment would be clearer:
> > > >
> > > > /* We used to allocate extra space for RSDP rev 2 but used only space for
> > > > * legacy RSDP and extra bytes were zeroed out. Keep wasting extra 16 bytes
> > > > * to make sure we won't breake migration for machine types 2.2 and older
> > > > * due to RSDP blob size mismatch.
> > > > */
> > > >
> > > > > + build_append_int_noprefix(tables->rsdp, 0, 16);
> > Looks like I've haven't noticed, it might work but are you sure?
> > 0 here is uint64_t and then it's shifted 16 times which is sort of gray area (undefined behavior)
> AFAIK shifting by N bits when N > width(left operand) is undefined but
> that's not the case here. build_append_int_noprefix(foo, 0, 16) shift a 64 bits
> wide unsigned int by 8 bits, for each iterations of a 16 iterations
> loop. So we're doing 16 iterations of properly defined behaviour.
>
> Cheers,
> Samuel.
It works fine but is IMHO unnecessarily tricky. Simple
for (i = 0; i < 16; ++i)
build_append_byte(tables->rsdp, 0)
is imho clearer.
From: Samuel Ortiz <sameo@linux.intel.com>
Now that build_rsdp() supports building both legacy and current RSDP
tables, we can move it to a generic folder (hw/acpi) and have the i386
ACPI code reuse it in order to reduce code duplication.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
V4 -> V5:
* Fixed the 16 bytes padding comment.
---
include/hw/acpi/aml-build.h | 2 ++
hw/acpi/aml-build.c | 68 +++++++++++++++++++++++++++++++++++++
hw/arm/virt-acpi-build.c | 65 -----------------------------------
hw/i386/acpi-build.c | 49 +++++++++++---------------
4 files changed, 89 insertions(+), 95 deletions(-)
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index 6c36903c0a..1a563ad756 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -388,6 +388,8 @@ void acpi_add_table(GArray *table_offsets, GArray *table_data);
void acpi_build_tables_init(AcpiBuildTables *tables);
void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre);
void
+build_rsdp(GArray *tbl, BIOSLinker *linker, AcpiRsdpData *rsdp_data);
+void
build_rsdt(GArray *table_data, BIOSLinker *linker, GArray *table_offsets,
const char *oem_id, const char *oem_table_id);
void
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 1e43cd736d..555c24f21d 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1589,6 +1589,74 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre)
g_array_free(tables->vmgenid, mfre);
}
+/*
+ * ACPI spec 5.2.5.3 Root System Description Pointer (RSDP).
+ * (Revision 1.0 or later)
+ */
+void
+build_rsdp(GArray *tbl, BIOSLinker *linker, AcpiRsdpData *rsdp_data)
+{
+ int tbl_off = tbl->len; /* Table offset in the RSDP file */
+
+ switch (rsdp_data->revision) {
+ case 0:
+ /* With ACPI 1.0, we must have an RSDT pointer */
+ g_assert(rsdp_data->rsdt_tbl_offset);
+ break;
+ case 2:
+ /* With ACPI 2.0+, we must have an XSDT pointer */
+ g_assert(rsdp_data->xsdt_tbl_offset);
+ break;
+ default:
+ /* Only revisions 0 (ACPI 1.0) and 2 (ACPI 2.0+) are valid for RSDP */
+ g_assert_not_reached();
+ }
+
+ bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, tbl, 16,
+ true /* fseg memory */);
+
+ g_array_append_vals(tbl, "RSD PTR ", 8); /* Signature */
+ build_append_int_noprefix(tbl, 0, 1); /* Checksum */
+ g_array_append_vals(tbl, rsdp_data->oem_id, 6); /* OEMID */
+ build_append_int_noprefix(tbl, rsdp_data->revision, 1); /* Revision */
+ build_append_int_noprefix(tbl, 0, 4); /* RsdtAddress */
+ if (rsdp_data->rsdt_tbl_offset) {
+ /* RSDT address to be filled by guest linker */
+ bios_linker_loader_add_pointer(linker, ACPI_BUILD_RSDP_FILE,
+ tbl_off + 16, 4,
+ ACPI_BUILD_TABLE_FILE,
+ *rsdp_data->rsdt_tbl_offset);
+ }
+
+ /* Checksum to be filled by guest linker */
+ bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
+ tbl_off, 20, /* ACPI rev 1.0 RSDP size */
+ 8);
+
+ if (rsdp_data->revision == 0) {
+ /* ACPI 1.0 RSDP, we're done */
+ return;
+ }
+
+ build_append_int_noprefix(tbl, 36, 4); /* Length */
+
+ /* XSDT address to be filled by guest linker */
+ build_append_int_noprefix(tbl, 0, 8); /* XsdtAddress */
+ /* We already validated our xsdt pointer */
+ bios_linker_loader_add_pointer(linker, ACPI_BUILD_RSDP_FILE,
+ tbl_off + 24, 8,
+ ACPI_BUILD_TABLE_FILE,
+ *rsdp_data->xsdt_tbl_offset);
+
+ build_append_int_noprefix(tbl, 0, 1); /* Extended Checksum */
+ build_append_int_noprefix(tbl, 0, 3); /* Reserved */
+
+ /* Extended checksum to be filled by Guest linker */
+ bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
+ tbl_off, 36, /* ACPI rev 2.0 RSDP size */
+ 32);
+}
+
/* Build rsdt table */
void
build_rsdt(GArray *table_data, BIOSLinker *linker, GArray *table_offsets,
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 05f6654371..95fad6f0ce 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -366,71 +366,6 @@ static void acpi_dsdt_add_power_button(Aml *scope)
aml_append(scope, dev);
}
-/* RSDP */
-static void
-build_rsdp(GArray *tbl, BIOSLinker *linker, AcpiRsdpData *rsdp_data)
-{
- int tbl_off = tbl->len; /* Table offset in the RSDP file */
-
- switch (rsdp_data->revision) {
- case 0:
- /* With ACPI 1.0, we must have an RSDT pointer */
- g_assert(rsdp_data->rsdt_tbl_offset);
- break;
- case 2:
- /* With ACPI 2.0+, we must have an XSDT pointer */
- g_assert(rsdp_data->xsdt_tbl_offset);
- break;
- default:
- /* Only revisions 0 (ACPI 1.0) and 2 (ACPI 2.0+) are valid for RSDP */
- g_assert_not_reached();
- }
-
- bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, tbl, 16,
- true /* fseg memory */);
-
- g_array_append_vals(tbl, "RSD PTR ", 8); /* Signature */
- build_append_int_noprefix(tbl, 0, 1); /* Checksum */
- g_array_append_vals(tbl, rsdp_data->oem_id, 6); /* OEMID */
- build_append_int_noprefix(tbl, rsdp_data->revision, 1); /* Revision */
- build_append_int_noprefix(tbl, 0, 4); /* RsdtAddress */
- if (rsdp_data->rsdt_tbl_offset) {
- /* RSDT address to be filled by guest linker */
- bios_linker_loader_add_pointer(linker, ACPI_BUILD_RSDP_FILE,
- tbl_off + 16, 4,
- ACPI_BUILD_TABLE_FILE,
- *rsdp_data->rsdt_tbl_offset);
- }
-
- /* Checksum to be filled by guest linker */
- bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
- tbl_off, 20, /* ACPI rev 1.0 RSDP size */
- 8);
-
- if (rsdp_data->revision == 0) {
- /* ACPI 1.0 RSDP, we're done */
- return;
- }
-
- build_append_int_noprefix(tbl, 36, 4); /* Length */
-
- /* XSDT address to be filled by guest linker */
- build_append_int_noprefix(tbl, 0, 8); /* XsdtAddress */
- /* We already validated our xsdt pointer */
- bios_linker_loader_add_pointer(linker, ACPI_BUILD_RSDP_FILE,
- tbl_off + 24, 8,
- ACPI_BUILD_TABLE_FILE,
- *rsdp_data->xsdt_tbl_offset);
-
- build_append_int_noprefix(tbl, 0, 1); /* Extended Checksum */
- build_append_int_noprefix(tbl, 0, 3); /* Reserved */
-
- /* Extended checksum to be filled by Guest linker */
- bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
- tbl_off, 36, /* ACPI rev 2.0 RSDP size */
- 32);
-}
-
static void
build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
{
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index fb877648ac..9891b6913b 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2547,35 +2547,6 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker)
"IVRS", table_data->len - iommu_start, 1, NULL, NULL);
}
-static void
-build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset)
-{
- /* AcpiRsdpDescriptor describes revision 2 RSDP table and as result we
- * allocate extra 16 bytes for pc/q35 RSDP rev1 as well. Keep extra 16 bytes
- * wasted to make sure we won't breake migration for machine types older
- * than 2.3 due to size mismatch.
- */
- AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp);
- unsigned rsdt_pa_size = sizeof(rsdp->rsdt_physical_address);
- unsigned rsdt_pa_offset =
- (char *)&rsdp->rsdt_physical_address - rsdp_table->data;
-
- bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, rsdp_table, 16,
- true /* fseg memory */);
-
- memcpy(&rsdp->signature, "RSD PTR ", 8);
- memcpy(rsdp->oem_id, ACPI_BUILD_APPNAME6, 6);
- /* Address to be filled by Guest linker */
- bios_linker_loader_add_pointer(linker,
- ACPI_BUILD_RSDP_FILE, rsdt_pa_offset, rsdt_pa_size,
- ACPI_BUILD_TABLE_FILE, rsdt_tbl_offset);
-
- /* Checksum to be filled by Guest linker */
- bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
- (char *)rsdp - rsdp_table->data, 20 /* ACPI rev 1.0 RSDP size */,
- (char *)&rsdp->checksum - rsdp_table->data);
-}
-
typedef
struct AcpiBuildState {
/* Copy of table in RAM (for patching). */
@@ -2732,7 +2703,25 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
slic_oem.id, slic_oem.table_id);
/* RSDP is in FSEG memory, so allocate it separately */
- build_rsdp(tables->rsdp, tables->linker, rsdt);
+ {
+ AcpiRsdpData rsdp_data = {
+ .revision = 0,
+ .oem_id = ACPI_BUILD_APPNAME6,
+ .xsdt_tbl_offset = NULL,
+ .rsdt_tbl_offset = &rsdt,
+ };
+ build_rsdp(tables->rsdp, tables->linker, &rsdp_data);
+ if (!pcmc->rsdp_in_ram) {
+ /* We used to allocate some extra space for RSDP revision 2 but
+ * only used the RSDP revision 0 space. The extra bytes were
+ * zeroed out and not used.
+ * Here we continue wasting those extra 16 bytes to make sure we
+ * don't break migration for machine types 2.2 and older due to
+ * RSDP blob size mismatch.
+ */
+ build_append_int_noprefix(tables->rsdp, 0, 16);
+ }
+ }
/* We'll expose it all to Guest so we want to reduce
* chance of size changes.
--
2.19.2
On Mon, 17 Dec 2018 15:06:11 +0100
Samuel Ortiz <sameo@linux.intel.com> wrote:
>
> From: Samuel Ortiz <sameo@linux.intel.com>
Subject should be
[Qemu-devel] [PATCH v5 7/8] hw: acpi: Export and share the ARM RSDP build
^^^
and without "Re: "
>
> Now that build_rsdp() supports building both legacy and current RSDP
> tables, we can move it to a generic folder (hw/acpi) and have the i386
> ACPI code reuse it in order to reduce code duplication.
>
> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
> Reviewed-by: Igor Mammedov <imammedo@redhat.com>
> ---
>
> V4 -> V5:
> * Fixed the 16 bytes padding comment.
>
> ---
[...]
On Mon, Dec 17, 2018 at 04:25:47PM +0100, Igor Mammedov wrote: > On Mon, 17 Dec 2018 15:06:11 +0100 > Samuel Ortiz <sameo@linux.intel.com> wrote: > > > > > From: Samuel Ortiz <sameo@linux.intel.com> > > Subject should be > [Qemu-devel] [PATCH v5 7/8] hw: acpi: Export and share the ARM RSDP build > ^^^ > and without "Re: " > I did not realize it's ok to break a thread's topic/subject. Will resend. > > > > Now that build_rsdp() supports building both legacy and current RSDP > > tables, we can move it to a generic folder (hw/acpi) and have the i386 > > ACPI code reuse it in order to reduce code duplication. > > > > Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> > > Reviewed-by: Igor Mammedov <imammedo@redhat.com> > > --- > > > > V4 -> V5: > > * Fixed the 16 bytes padding comment. > > > > --- > [...] >
From: Samuel Ortiz <sameo@linux.intel.com>
Now that build_rsdp() supports building both legacy and current RSDP
tables, we can move it to a generic folder (hw/acpi) and have the i386
ACPI code reuse it in order to reduce code duplication.
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
---
include/hw/acpi/aml-build.h | 2 ++
hw/acpi/aml-build.c | 68 +++++++++++++++++++++++++++++++++++++
hw/arm/virt-acpi-build.c | 65 -----------------------------------
hw/i386/acpi-build.c | 49 +++++++++++---------------
4 files changed, 89 insertions(+), 95 deletions(-)
diff --git a/include/hw/acpi/aml-build.h b/include/hw/acpi/aml-build.h
index 6c36903c0a..1a563ad756 100644
--- a/include/hw/acpi/aml-build.h
+++ b/include/hw/acpi/aml-build.h
@@ -388,6 +388,8 @@ void acpi_add_table(GArray *table_offsets, GArray *table_data);
void acpi_build_tables_init(AcpiBuildTables *tables);
void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre);
void
+build_rsdp(GArray *tbl, BIOSLinker *linker, AcpiRsdpData *rsdp_data);
+void
build_rsdt(GArray *table_data, BIOSLinker *linker, GArray *table_offsets,
const char *oem_id, const char *oem_table_id);
void
diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c
index 1e43cd736d..555c24f21d 100644
--- a/hw/acpi/aml-build.c
+++ b/hw/acpi/aml-build.c
@@ -1589,6 +1589,74 @@ void acpi_build_tables_cleanup(AcpiBuildTables *tables, bool mfre)
g_array_free(tables->vmgenid, mfre);
}
+/*
+ * ACPI spec 5.2.5.3 Root System Description Pointer (RSDP).
+ * (Revision 1.0 or later)
+ */
+void
+build_rsdp(GArray *tbl, BIOSLinker *linker, AcpiRsdpData *rsdp_data)
+{
+ int tbl_off = tbl->len; /* Table offset in the RSDP file */
+
+ switch (rsdp_data->revision) {
+ case 0:
+ /* With ACPI 1.0, we must have an RSDT pointer */
+ g_assert(rsdp_data->rsdt_tbl_offset);
+ break;
+ case 2:
+ /* With ACPI 2.0+, we must have an XSDT pointer */
+ g_assert(rsdp_data->xsdt_tbl_offset);
+ break;
+ default:
+ /* Only revisions 0 (ACPI 1.0) and 2 (ACPI 2.0+) are valid for RSDP */
+ g_assert_not_reached();
+ }
+
+ bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, tbl, 16,
+ true /* fseg memory */);
+
+ g_array_append_vals(tbl, "RSD PTR ", 8); /* Signature */
+ build_append_int_noprefix(tbl, 0, 1); /* Checksum */
+ g_array_append_vals(tbl, rsdp_data->oem_id, 6); /* OEMID */
+ build_append_int_noprefix(tbl, rsdp_data->revision, 1); /* Revision */
+ build_append_int_noprefix(tbl, 0, 4); /* RsdtAddress */
+ if (rsdp_data->rsdt_tbl_offset) {
+ /* RSDT address to be filled by guest linker */
+ bios_linker_loader_add_pointer(linker, ACPI_BUILD_RSDP_FILE,
+ tbl_off + 16, 4,
+ ACPI_BUILD_TABLE_FILE,
+ *rsdp_data->rsdt_tbl_offset);
+ }
+
+ /* Checksum to be filled by guest linker */
+ bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
+ tbl_off, 20, /* ACPI rev 1.0 RSDP size */
+ 8);
+
+ if (rsdp_data->revision == 0) {
+ /* ACPI 1.0 RSDP, we're done */
+ return;
+ }
+
+ build_append_int_noprefix(tbl, 36, 4); /* Length */
+
+ /* XSDT address to be filled by guest linker */
+ build_append_int_noprefix(tbl, 0, 8); /* XsdtAddress */
+ /* We already validated our xsdt pointer */
+ bios_linker_loader_add_pointer(linker, ACPI_BUILD_RSDP_FILE,
+ tbl_off + 24, 8,
+ ACPI_BUILD_TABLE_FILE,
+ *rsdp_data->xsdt_tbl_offset);
+
+ build_append_int_noprefix(tbl, 0, 1); /* Extended Checksum */
+ build_append_int_noprefix(tbl, 0, 3); /* Reserved */
+
+ /* Extended checksum to be filled by Guest linker */
+ bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
+ tbl_off, 36, /* ACPI rev 2.0 RSDP size */
+ 32);
+}
+
/* Build rsdt table */
void
build_rsdt(GArray *table_data, BIOSLinker *linker, GArray *table_offsets,
diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 05f6654371..95fad6f0ce 100644
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -366,71 +366,6 @@ static void acpi_dsdt_add_power_button(Aml *scope)
aml_append(scope, dev);
}
-/* RSDP */
-static void
-build_rsdp(GArray *tbl, BIOSLinker *linker, AcpiRsdpData *rsdp_data)
-{
- int tbl_off = tbl->len; /* Table offset in the RSDP file */
-
- switch (rsdp_data->revision) {
- case 0:
- /* With ACPI 1.0, we must have an RSDT pointer */
- g_assert(rsdp_data->rsdt_tbl_offset);
- break;
- case 2:
- /* With ACPI 2.0+, we must have an XSDT pointer */
- g_assert(rsdp_data->xsdt_tbl_offset);
- break;
- default:
- /* Only revisions 0 (ACPI 1.0) and 2 (ACPI 2.0+) are valid for RSDP */
- g_assert_not_reached();
- }
-
- bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, tbl, 16,
- true /* fseg memory */);
-
- g_array_append_vals(tbl, "RSD PTR ", 8); /* Signature */
- build_append_int_noprefix(tbl, 0, 1); /* Checksum */
- g_array_append_vals(tbl, rsdp_data->oem_id, 6); /* OEMID */
- build_append_int_noprefix(tbl, rsdp_data->revision, 1); /* Revision */
- build_append_int_noprefix(tbl, 0, 4); /* RsdtAddress */
- if (rsdp_data->rsdt_tbl_offset) {
- /* RSDT address to be filled by guest linker */
- bios_linker_loader_add_pointer(linker, ACPI_BUILD_RSDP_FILE,
- tbl_off + 16, 4,
- ACPI_BUILD_TABLE_FILE,
- *rsdp_data->rsdt_tbl_offset);
- }
-
- /* Checksum to be filled by guest linker */
- bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
- tbl_off, 20, /* ACPI rev 1.0 RSDP size */
- 8);
-
- if (rsdp_data->revision == 0) {
- /* ACPI 1.0 RSDP, we're done */
- return;
- }
-
- build_append_int_noprefix(tbl, 36, 4); /* Length */
-
- /* XSDT address to be filled by guest linker */
- build_append_int_noprefix(tbl, 0, 8); /* XsdtAddress */
- /* We already validated our xsdt pointer */
- bios_linker_loader_add_pointer(linker, ACPI_BUILD_RSDP_FILE,
- tbl_off + 24, 8,
- ACPI_BUILD_TABLE_FILE,
- *rsdp_data->xsdt_tbl_offset);
-
- build_append_int_noprefix(tbl, 0, 1); /* Extended Checksum */
- build_append_int_noprefix(tbl, 0, 3); /* Reserved */
-
- /* Extended checksum to be filled by Guest linker */
- bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
- tbl_off, 36, /* ACPI rev 2.0 RSDP size */
- 32);
-}
-
static void
build_iort(GArray *table_data, BIOSLinker *linker, VirtMachineState *vms)
{
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index fb877648ac..9891b6913b 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2547,35 +2547,6 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker)
"IVRS", table_data->len - iommu_start, 1, NULL, NULL);
}
-static void
-build_rsdp(GArray *rsdp_table, BIOSLinker *linker, unsigned rsdt_tbl_offset)
-{
- /* AcpiRsdpDescriptor describes revision 2 RSDP table and as result we
- * allocate extra 16 bytes for pc/q35 RSDP rev1 as well. Keep extra 16 bytes
- * wasted to make sure we won't breake migration for machine types older
- * than 2.3 due to size mismatch.
- */
- AcpiRsdpDescriptor *rsdp = acpi_data_push(rsdp_table, sizeof *rsdp);
- unsigned rsdt_pa_size = sizeof(rsdp->rsdt_physical_address);
- unsigned rsdt_pa_offset =
- (char *)&rsdp->rsdt_physical_address - rsdp_table->data;
-
- bios_linker_loader_alloc(linker, ACPI_BUILD_RSDP_FILE, rsdp_table, 16,
- true /* fseg memory */);
-
- memcpy(&rsdp->signature, "RSD PTR ", 8);
- memcpy(rsdp->oem_id, ACPI_BUILD_APPNAME6, 6);
- /* Address to be filled by Guest linker */
- bios_linker_loader_add_pointer(linker,
- ACPI_BUILD_RSDP_FILE, rsdt_pa_offset, rsdt_pa_size,
- ACPI_BUILD_TABLE_FILE, rsdt_tbl_offset);
-
- /* Checksum to be filled by Guest linker */
- bios_linker_loader_add_checksum(linker, ACPI_BUILD_RSDP_FILE,
- (char *)rsdp - rsdp_table->data, 20 /* ACPI rev 1.0 RSDP size */,
- (char *)&rsdp->checksum - rsdp_table->data);
-}
-
typedef
struct AcpiBuildState {
/* Copy of table in RAM (for patching). */
@@ -2732,7 +2703,25 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
slic_oem.id, slic_oem.table_id);
/* RSDP is in FSEG memory, so allocate it separately */
- build_rsdp(tables->rsdp, tables->linker, rsdt);
+ {
+ AcpiRsdpData rsdp_data = {
+ .revision = 0,
+ .oem_id = ACPI_BUILD_APPNAME6,
+ .xsdt_tbl_offset = NULL,
+ .rsdt_tbl_offset = &rsdt,
+ };
+ build_rsdp(tables->rsdp, tables->linker, &rsdp_data);
+ if (!pcmc->rsdp_in_ram) {
+ /* We used to allocate some extra space for RSDP revision 2 but
+ * only used the RSDP revision 0 space. The extra bytes were
+ * zeroed out and not used.
+ * Here we continue wasting those extra 16 bytes to make sure we
+ * don't break migration for machine types 2.2 and older due to
+ * RSDP blob size mismatch.
+ */
+ build_append_int_noprefix(tables->rsdp, 0, 16);
+ }
+ }
/* We'll expose it all to Guest so we want to reduce
* chance of size changes.
--
2.19.2
On Mon, Dec 17, 2018 at 04:34:48PM +0100, Samuel Ortiz wrote: > > From: Samuel Ortiz <sameo@linux.intel.com> > > Now that build_rsdp() supports building both legacy and current RSDP > tables, we can move it to a generic folder (hw/acpi) and have the i386 > ACPI code reuse it in order to reduce code duplication. > > Signed-off-by: Samuel Ortiz <sameo@linux.intel.com> > Reviewed-by: Igor Mammedov <imammedo@redhat.com> > --- > include/hw/acpi/aml-build.h | 2 ++ > hw/acpi/aml-build.c | 68 +++++++++++++++++++++++++++++++++++++ > hw/arm/virt-acpi-build.c | 65 ----------------------------------- > hw/i386/acpi-build.c | 49 +++++++++++--------------- > 4 files changed, 89 insertions(+), 95 deletions(-) > Reviewed-by: Andrew Jones <drjones@redhat.com>
© 2016 - 2026 Red Hat, Inc.