From: Igor Mammedov <imammedo@redhat.com>
To: Eric Auger <eauger@redhat.com>
Cc: mst@redhat.com, qemu-devel@nongnu.org, xiaoguangrong.eric@gmail.com
Subject: Re: [PATCH v3 11/35] acpi: nvdimm_build_ssdt: use acpi_table_begin()/acpi_table_end() instead of build_header()
Date: Wed, 22 Sep 2021 16:38:06 +0200 [thread overview]
Message-ID: <20210922163806.70ff365c@redhat.com> (raw)
In-Reply-To: <9ae86080-3833-9620-5132-ad04b77ef14f@redhat.com>
On Mon, 20 Sep 2021 18:41:30 +0200
Eric Auger <eauger@redhat.com> wrote:
> Hi Igor,
>
> On 9/7/21 4:47 PM, Igor Mammedov wrote:
> > it replaces error-prone pointer arithmetic for build_header() API,
> > with 2 calls to start and finish table creation,
> > which hides offsets magic from API user.
> >
> > Signed-off-by: Igor Mammedov <imammedo@redhat.com>
> > ---
> > v3:
> > * s/acpi_init_table|acpi_table_composed/acpi_table_begin|acpi_table_end/
> >
> > CC: xiaoguangrong.eric@gmail.com
> > ---
> > hw/acpi/nvdimm.c | 18 ++++++++++--------
> > 1 file changed, 10 insertions(+), 8 deletions(-)
> >
> > diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
> > index 15f6ca82ca..e050b47c2b 100644
> > --- a/hw/acpi/nvdimm.c
> > +++ b/hw/acpi/nvdimm.c
> > @@ -1274,14 +1274,15 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,
> > NVDIMMState *nvdimm_state,
> > uint32_t ram_slots, const char *oem_id)
> > {
> > + int mem_addr_offset;
> > Aml *ssdt, *sb_scope, *dev;
> > - int mem_addr_offset, nvdimm_ssdt;
> > + AcpiTable table = { .sig = "SSDT", .rev = 1,
> > + .oem_id = oem_id, .oem_table_id = "NVDIMM" };
> >
> > acpi_add_table(table_offsets, table_data);
> >
> > + acpi_table_begin(&table, table_data);
> > ssdt = init_aml_allocator();
> > - acpi_data_push(ssdt->buf, sizeof(AcpiTableHeader));
> > -
> > sb_scope = aml_scope("\\_SB");
> >
> > dev = aml_device("NVDR");
> > @@ -1310,8 +1311,6 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,
> > aml_append(sb_scope, dev);
> > aml_append(ssdt, sb_scope);
> >
> > - nvdimm_ssdt = table_data->len;
> > -
> > /* copy AML table into ACPI tables blob and patch header there */
> > g_array_append_vals(table_data, ssdt->buf->data, ssdt->buf->len);
> > mem_addr_offset = build_append_named_dword(table_data,
> > @@ -1323,10 +1322,13 @@ static void nvdimm_build_ssdt(GArray *table_offsets, GArray *table_data,
> > bios_linker_loader_add_pointer(linker,
> > ACPI_BUILD_TABLE_FILE, mem_addr_offset, sizeof(uint32_t),
> > NVDIMM_DSM_MEM_FILE, 0);
> > - build_header(linker, table_data,
> > - (void *)(table_data->data + nvdimm_ssdt),
> > - "SSDT", table_data->len - nvdimm_ssdt, 1, oem_id, "NVDIMM");
> > free_aml_allocator();
> > + /*
> > + * must be executed as the last so that pointer patching command above
> > + * would be executed by guest before it recalculates checksum which were
> > + * scheduled by acpi_table_composed()
> s/acpi_table_composed/acpi_table_end.
fixed it up:
/*
* must be executed as the last so that pointer patching command above
* would be executed by guest before it recalculated checksum which were
* scheduled by acpi_table_end()
*/
> also the sentence may need some rewording.
>
> Wonder if that kind of comment still is useful. Maybe this should be put
> once in the doc comment of acpi_table_end() in [PATCH v3 01/35] acpi:
> add helper routines to initialize ACPI tables, for future users to pay
> attention that it shall be called at the very end.
I'll keep comment for now, and add patch to add something similar to
acpi_table_end() later or drop it if I come up with a way to actually
enforce expected linker order.
> Besides
>
> Reviewed-by: Eric Auger <eric.auger@redhat.com>
>
> Eric
>
>
> > + */
> > + acpi_table_end(linker, &table);
> > }
> >
> > void nvdimm_build_srat(GArray *table_data)
> >
>
next prev parent reply other threads:[~2021-09-22 14:39 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-07 14:47 [PATCH v3 00/35] acpi: refactor error prone build_header() and packed structures usage in ACPI tables Igor Mammedov
2021-09-07 14:47 ` [PATCH v3 01/35] acpi: add helper routines to initialize " Igor Mammedov
2021-09-20 16:21 ` Eric Auger
2021-09-07 14:47 ` [PATCH v3 02/35] acpi: build_rsdt: use acpi_table_begin()/acpi_table_end() instead of build_header() Igor Mammedov
2021-09-20 16:21 ` Eric Auger
2021-09-21 9:13 ` Igor Mammedov
2021-09-07 14:47 ` [PATCH v3 03/35] acpi: build_xsdt: " Igor Mammedov
2021-09-20 16:21 ` Eric Auger
2021-09-07 14:47 ` [PATCH v3 04/35] acpi: build_slit: " Igor Mammedov
2021-09-20 16:24 ` Eric Auger
2021-09-07 14:47 ` [PATCH v3 05/35] acpi: build_fadt: " Igor Mammedov
2021-09-20 16:25 ` Eric Auger
2021-09-07 14:47 ` [PATCH v3 06/35] acpi: build_tpm2: " Igor Mammedov
2021-09-07 14:47 ` [PATCH v3 07/35] acpi: acpi_build_hest: " Igor Mammedov
2021-09-20 16:27 ` Eric Auger
2021-09-07 14:47 ` [PATCH v3 08/35] acpi: build_mcfg: " Igor Mammedov
2021-09-20 16:28 ` Eric Auger
2021-09-07 14:47 ` [PATCH v3 09/35] acpi: build_hmat: " Igor Mammedov
2021-09-20 16:33 ` Eric Auger
2021-09-07 14:47 ` [PATCH v3 10/35] acpi: nvdimm_build_nfit: " Igor Mammedov
2021-09-20 16:36 ` Eric Auger
2021-09-07 14:47 ` [PATCH v3 11/35] acpi: nvdimm_build_ssdt: " Igor Mammedov
2021-09-20 16:41 ` Eric Auger
2021-09-22 14:38 ` Igor Mammedov [this message]
2021-09-07 14:47 ` [PATCH v3 12/35] acpi: vmgenid_build_acpi: " Igor Mammedov
2021-09-22 7:23 ` Eric Auger
2021-09-22 14:46 ` Igor Mammedov
2021-09-07 14:47 ` [PATCH v3 13/35] acpi: x86: build_dsdt: " Igor Mammedov
2021-09-07 14:47 ` [PATCH v3 14/35] acpi: build_hpet: " Igor Mammedov
2021-09-07 14:47 ` [PATCH v3 15/35] acpi: build_tpm_tcpa: " Igor Mammedov
2021-09-22 7:23 ` Eric Auger
2021-09-07 14:47 ` [PATCH v3 16/35] acpi: arm/x86: build_srat: " Igor Mammedov
2021-09-22 7:38 ` Eric Auger
2021-09-22 15:02 ` Igor Mammedov
2021-09-07 14:47 ` [PATCH v3 17/35] acpi: use build_append_int_noprefix() API to compose SRAT table Igor Mammedov
2021-09-22 8:55 ` Eric Auger
2021-09-22 10:02 ` Igor Mammedov
2021-09-22 15:32 ` Eric Auger
2021-09-07 14:47 ` [PATCH v3 18/35] acpi: build_dmar_q35: use acpi_table_begin()/acpi_table_end() instead of build_header() Igor Mammedov
2021-09-22 9:19 ` Eric Auger
2021-09-22 10:06 ` Igor Mammedov
2021-09-07 14:47 ` [PATCH v3 19/35] acpi: build_waet: " Igor Mammedov
2021-09-22 9:20 ` Eric Auger
2021-09-07 14:47 ` [PATCH v3 20/35] acpi: build_amd_iommu: " Igor Mammedov
2021-09-22 9:22 ` Eric Auger
2021-09-07 14:48 ` [PATCH v3 21/35] acpi: madt: arm/x86: " Igor Mammedov
2021-09-22 9:36 ` Eric Auger
2021-09-07 14:48 ` [PATCH v3 22/35] acpi: x86: remove dead code Igor Mammedov
2021-09-22 9:38 ` Eric Auger
2021-09-07 14:48 ` [PATCH v3 23/35] acpi: x86: set enabled when composing _MAT entries Igor Mammedov
2021-09-22 9:50 ` Eric Auger
2021-09-07 14:48 ` [PATCH v3 24/35] acpi: x86: madt: use build_append_int_noprefix() API to compose MADT table Igor Mammedov
2021-09-22 10:20 ` Eric Auger
2021-09-22 15:30 ` Igor Mammedov
2021-09-22 15:37 ` Eric Auger
2021-09-23 6:34 ` Igor Mammedov
2021-09-07 14:48 ` [PATCH v3 25/35] acpi: arm/virt: " Igor Mammedov
2021-09-07 14:48 ` [PATCH v3 26/35] acpi: build_dsdt_microvm: use acpi_table_begin()/acpi_table_end() instead of build_header() Igor Mammedov
2021-09-22 10:01 ` Eric Auger
2021-09-07 14:48 ` [PATCH v3 27/35] acpi: arm: virt: build_dsdt: " Igor Mammedov
2021-09-07 14:48 ` [PATCH v3 28/35] acpi: arm: virt: build_iort: " Igor Mammedov
2021-09-22 12:31 ` Eric Auger
2021-09-22 12:32 ` Eric Auger
2021-09-07 14:48 ` [PATCH v3 29/35] acpi: arm/virt: convert build_iort() to endian agnostic build_append_FOO() API Igor Mammedov
2021-09-22 13:26 ` Eric Auger
2021-09-22 13:54 ` Igor Mammedov
2021-09-22 15:31 ` Eric Auger
2021-09-23 7:47 ` [PATCH v4 " Igor Mammedov
2021-09-07 14:48 ` [PATCH v3 30/35] acpi: arm/virt: build_spcr: fix invalid cast Igor Mammedov
2021-09-07 14:48 ` [PATCH v3 31/35] acpi: arm/virt: build_spcr: use acpi_table_begin()/acpi_table_end() instead of build_header() Igor Mammedov
2021-09-07 14:48 ` [PATCH v3 32/35] acpi: arm/virt: build_gtdt: " Igor Mammedov
2021-09-07 14:48 ` [PATCH v3 33/35] acpi: build_facs: use build_append_int_noprefix() API to compose table Igor Mammedov
2021-09-22 13:33 ` Eric Auger
2021-09-22 13:58 ` Igor Mammedov
2021-09-07 14:48 ` [PATCH v3 34/35] acpi: remove no longer used build_header() Igor Mammedov
2021-09-22 13:34 ` Eric Auger
2021-09-07 14:48 ` [PATCH v3 35/35] acpi: AcpiGenericAddress no longer used to map/access fields of MMIO, drop packed attribute Igor Mammedov
2021-09-22 13:34 ` Eric Auger
2021-09-22 14:03 ` [PATCH v3 00/35] acpi: refactor error prone build_header() and packed structures usage in ACPI tables Igor Mammedov
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=20210922163806.70ff365c@redhat.com \
--to=imammedo@redhat.com \
--cc=eauger@redhat.com \
--cc=mst@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=xiaoguangrong.eric@gmail.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).