From: Eric DeVolder <eric.devolder@oracle.com>
To: Ani Sinha <ani@anisinha.ca>
Cc: berrange@redhat.com, ehabkost@redhat.com, mst@redhat.com,
konrad.wilk@oracle.com, qemu-devel@nongnu.org,
pbonzini@redhat.com, imammedo@redhat.com,
boris.ostrovsky@oracle.com, rth@twiddle.net
Subject: Re: [PATCH v9 06/10] ACPI ERST: build the ACPI ERST table
Date: Mon, 6 Dec 2021 10:22:22 -0600 [thread overview]
Message-ID: <0ef0a6c4-291c-acfc-502e-a9b97fe844cc@oracle.com> (raw)
In-Reply-To: <CAARzgwyKyk+J71esb_U5m8gDsU9PZ3FKps9fEtyomuJB_GJwdg@mail.gmail.com>
Hi Ani, response below. eric
On 12/6/21 04:30, Ani Sinha wrote:
> On Fri, Dec 3, 2021 at 12:40 AM Eric DeVolder <eric.devolder@oracle.com> wrote:
>>
>> This builds the ACPI ERST table to inform OSPM how to communicate
>> with the acpi-erst device.
>>
>> Signed-off-by: Eric DeVolder <eric.devolder@oracle.com>
>> ---
>> hw/acpi/erst.c | 241 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>> 1 file changed, 241 insertions(+)
>>
>> diff --git a/hw/acpi/erst.c b/hw/acpi/erst.c
>> index 4304f55..06a87af 100644
>> --- a/hw/acpi/erst.c
>> +++ b/hw/acpi/erst.c
>> @@ -701,6 +701,247 @@ static const MemoryRegionOps erst_reg_ops = {
>> .endianness = DEVICE_NATIVE_ENDIAN,
>> };
>>
>> +
>> +/*******************************************************************/
>> +/*******************************************************************/
>> +
>> +/* ACPI 4.0: Table 17-19 Serialization Instructions */
>> +#define INST_READ_REGISTER 0x00
>> +#define INST_READ_REGISTER_VALUE 0x01
>> +#define INST_WRITE_REGISTER 0x02
>> +#define INST_WRITE_REGISTER_VALUE 0x03
>> +#define INST_NOOP 0x04
>> +#define INST_LOAD_VAR1 0x05
>> +#define INST_LOAD_VAR2 0x06
>> +#define INST_STORE_VAR1 0x07
>> +#define INST_ADD 0x08
>> +#define INST_SUBTRACT 0x09
>> +#define INST_ADD_VALUE 0x0A
>> +#define INST_SUBTRACT_VALUE 0x0B
>> +#define INST_STALL 0x0C
>> +#define INST_STALL_WHILE_TRUE 0x0D
>> +#define INST_SKIP_NEXT_INSTRUCTION_IF_TRUE 0x0E
>> +#define INST_GOTO 0x0F
>> +#define INST_SET_SRC_ADDRESS_BASE 0x10
>> +#define INST_SET_DST_ADDRESS_BASE 0x11
>> +#define INST_MOVE_DATA 0x12
>> +
>> +/* ACPI 4.0: 17.4.1.2 Serialization Instruction Entries */
>> +static void build_serialization_instruction_entry(GArray *table_data,
>> + uint8_t serialization_action,
>> + uint8_t instruction,
>> + uint8_t flags,
>> + uint8_t register_bit_width,
>> + uint64_t register_address,
>> + uint64_t value,
>> + uint64_t mask)
>> +{
>> + /* ACPI 4.0: Table 17-18 Serialization Instruction Entry */
>> + struct AcpiGenericAddress gas;
>> +
>> + /* Serialization Action */
>> + build_append_int_noprefix(table_data, serialization_action, 1);
>> + /* Instruction */
>> + build_append_int_noprefix(table_data, instruction , 1);
>> + /* Flags */
>> + build_append_int_noprefix(table_data, flags , 1);
>> + /* Reserved */
>> + build_append_int_noprefix(table_data, 0 , 1);
>> + /* Register Region */
>> + gas.space_id = AML_SYSTEM_MEMORY;
>> + gas.bit_width = register_bit_width;
>> + gas.bit_offset = 0;
>> + switch (register_bit_width) {
>> + case 8:
>> + gas.access_width = 1;
>> + break;
>> + case 16:
>> + gas.access_width = 2;
>> + break;
>> + case 32:
>> + gas.access_width = 3;
>> + break;
>> + case 64:
>> + gas.access_width = 4;
>> + break;
>> + default:
>> + gas.access_width = 0;
>> + break;
>> + }
>> + gas.address = register_address;
>> + build_append_gas_from_struct(table_data, &gas);
>> + /* Value */
>> + build_append_int_noprefix(table_data, value , 8);
>> + /* Mask */
>> + build_append_int_noprefix(table_data, mask , 8);
>> +}
>> +
>> +/* ACPI 4.0: 17.4.1 Serialization Action Table */
>> +void build_erst(GArray *table_data, BIOSLinker *linker, Object *erst_dev,
>> + const char *oem_id, const char *oem_table_id)
>> +{
>> + GArray *table_instruction_data;
>> + unsigned action;
>> + hwaddr bar0, bar1;
>
> I would rather have pcibus_t here as opposed to hwaddr although
> currently they are both unint64_t. Just in case they diverge in
> future.
ok, I will change to pcibus_t.
>
>> + AcpiTable table = { .sig = "ERST", .rev = 1, .oem_id = oem_id,
>> + .oem_table_id = oem_table_id };
>> +
>> + bar0 = (hwaddr)pci_get_bar_addr(PCI_DEVICE(erst_dev), 0);
>> + trace_acpi_erst_pci_bar_0(bar0);
>> + bar1 = (hwaddr)pci_get_bar_addr(PCI_DEVICE(erst_dev), 1);
>> + trace_acpi_erst_pci_bar_1(bar1);
>> +
>> +#define MASK8 0x00000000000000FFUL
>> +#define MASK16 0x000000000000FFFFUL
>> +#define MASK32 0x00000000FFFFFFFFUL
>> +#define MASK64 0xFFFFFFFFFFFFFFFFUL
>> +
>> + /*
>> + * Serialization Action Table
>> + * The serialization action table must be generated first
>> + * so that its size can be known in order to populate the
>> + * Instruction Entry Count field.
>> + */
>> + table_instruction_data = g_array_new(FALSE, FALSE, sizeof(char));
>> +
>> + /* Serialization Instruction Entries */
>> + action = ACTION_BEGIN_WRITE_OPERATION;
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_ACTION_OFFSET, action, MASK8);
>> +
>> + action = ACTION_BEGIN_READ_OPERATION;
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_ACTION_OFFSET, action, MASK8);
>> +
>> + action = ACTION_BEGIN_CLEAR_OPERATION;
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_ACTION_OFFSET, action, MASK8);
>> +
>> + action = ACTION_END_OPERATION;
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_ACTION_OFFSET, action, MASK8);
>> +
>> + action = ACTION_SET_RECORD_OFFSET;
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER , 0, 32,
>> + bar0 + ERST_VALUE_OFFSET , 0, MASK32);
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_ACTION_OFFSET, action, MASK8);
>> +
>> + action = ACTION_EXECUTE_OPERATION;
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_VALUE_OFFSET , ERST_EXECUTE_OPERATION_MAGIC, MASK8);
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_ACTION_OFFSET, action, MASK8);
>> +
>> + action = ACTION_CHECK_BUSY_STATUS;
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_ACTION_OFFSET, action, MASK8);
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_READ_REGISTER_VALUE , 0, 32,
>> + bar0 + ERST_VALUE_OFFSET, 0x01, MASK8);
>> +
>> + action = ACTION_GET_COMMAND_STATUS;
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_ACTION_OFFSET, action, MASK8);
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_READ_REGISTER , 0, 32,
>> + bar0 + ERST_VALUE_OFFSET, 0, MASK8);
>> +
>> + action = ACTION_GET_RECORD_IDENTIFIER;
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_ACTION_OFFSET, action, MASK8);
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_READ_REGISTER , 0, 64,
>> + bar0 + ERST_VALUE_OFFSET, 0, MASK64);
>> +
>> + action = ACTION_SET_RECORD_IDENTIFIER;
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER , 0, 64,
>> + bar0 + ERST_VALUE_OFFSET , 0, MASK64);
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_ACTION_OFFSET, action, MASK8);
>> +
>> + action = ACTION_GET_RECORD_COUNT;
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_ACTION_OFFSET, action, MASK8);
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_READ_REGISTER , 0, 32,
>> + bar0 + ERST_VALUE_OFFSET, 0, MASK32);
>> +
>> + action = ACTION_BEGIN_DUMMY_WRITE_OPERATION;
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_ACTION_OFFSET, action, MASK8);
>> +
>> + action = ACTION_GET_ERROR_LOG_ADDRESS_RANGE;
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_ACTION_OFFSET, action, MASK8);
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_READ_REGISTER , 0, 64,
>> + bar0 + ERST_VALUE_OFFSET, 0, MASK64);
>> +
>> + action = ACTION_GET_ERROR_LOG_ADDRESS_LENGTH;
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_ACTION_OFFSET, action, MASK8);
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_READ_REGISTER , 0, 64,
>> + bar0 + ERST_VALUE_OFFSET, 0, MASK32);
>> +
>> + action = ACTION_GET_ERROR_LOG_ADDRESS_RANGE_ATTRIBUTES;
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_ACTION_OFFSET, action, MASK8);
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_READ_REGISTER , 0, 32,
>> + bar0 + ERST_VALUE_OFFSET, 0, MASK32);
>> +
>> + action = ACTION_GET_EXECUTE_OPERATION_TIMINGS;
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_WRITE_REGISTER_VALUE, 0, 32,
>> + bar0 + ERST_ACTION_OFFSET, action, MASK8);
>> + build_serialization_instruction_entry(table_instruction_data,
>> + action, INST_READ_REGISTER , 0, 64,
>> + bar0 + ERST_VALUE_OFFSET, 0, MASK64);
>> +
>> + /* Serialization Header */
>> + acpi_table_begin(&table, table_data);
>> +
>> + /* Serialization Header Size */
>> + build_append_int_noprefix(table_data, 48, 4);
>> +
>> + /* Reserved */
>> + build_append_int_noprefix(table_data, 0, 4);
>> +
>> + /*
>> + * Instruction Entry Count
>> + * Each instruction entry is 32 bytes
>> + */
>> + build_append_int_noprefix(table_data,
>> + (table_instruction_data->len / 32), 4);
>> +
>> + /* Serialization Instruction Entries */
>> + g_array_append_vals(table_data, table_instruction_data->data,
>> + table_instruction_data->len);
>> + g_array_free(table_instruction_data, TRUE);
>> +
>> + acpi_table_end(linker, &table);
>> +}
>> +
>> /*******************************************************************/
>> /*******************************************************************/
>> static int erst_post_load(void *opaque, int version_id)
>> --
>> 1.8.3.1
>>
next prev parent reply other threads:[~2021-12-06 16:25 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-02 19:08 [PATCH v9 00/10] acpi: Error Record Serialization Table, ERST, support for QEMU Eric DeVolder
2021-12-02 19:08 ` [PATCH v9 01/10] ACPI ERST: bios-tables-test.c steps 1 and 2 Eric DeVolder
2021-12-02 19:08 ` [PATCH v9 02/10] ACPI ERST: specification for ERST support Eric DeVolder
2021-12-02 19:08 ` [PATCH v9 03/10] ACPI ERST: PCI device_id for ERST Eric DeVolder
2021-12-02 19:08 ` [PATCH v9 04/10] ACPI ERST: header file " Eric DeVolder
2021-12-02 19:08 ` [PATCH v9 05/10] ACPI ERST: support for ACPI ERST feature Eric DeVolder
2021-12-06 8:14 ` Ani Sinha
2021-12-06 16:21 ` Eric DeVolder
2021-12-07 5:23 ` Ani Sinha
2021-12-07 5:25 ` Ani Sinha
2021-12-08 16:38 ` Eric DeVolder
2021-12-09 6:31 ` Ani Sinha
2021-12-09 17:57 ` Eric DeVolder
2021-12-09 6:29 ` Ani Sinha
2021-12-09 17:54 ` Eric DeVolder
2021-12-10 14:09 ` Ani Sinha
2021-12-13 21:02 ` Eric DeVolder
2021-12-14 3:14 ` Ani Sinha
2022-01-11 8:35 ` Ani Sinha
2022-01-11 14:49 ` Eric DeVolder
2021-12-02 19:08 ` [PATCH v9 06/10] ACPI ERST: build the ACPI ERST table Eric DeVolder
2021-12-06 10:30 ` Ani Sinha
2021-12-06 16:22 ` Eric DeVolder [this message]
2021-12-02 19:08 ` [PATCH v9 07/10] ACPI ERST: create ACPI ERST table for pc/x86 machines Eric DeVolder
2021-12-06 8:54 ` Ani Sinha
2021-12-02 19:09 ` [PATCH v9 08/10] ACPI ERST: qtest for ERST Eric DeVolder
2021-12-02 19:09 ` [PATCH v9 09/10] ACPI ERST: bios-tables-test testcase Eric DeVolder
2021-12-06 8:47 ` Ani Sinha
2021-12-02 19:09 ` [PATCH v9 10/10] ACPI ERST: step 6 of bios-tables-test.c Eric DeVolder
2021-12-09 9:29 ` Ani Sinha
2021-12-09 17:55 ` Eric DeVolder
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=0ef0a6c4-291c-acfc-502e-a9b97fe844cc@oracle.com \
--to=eric.devolder@oracle.com \
--cc=ani@anisinha.ca \
--cc=berrange@redhat.com \
--cc=boris.ostrovsky@oracle.com \
--cc=ehabkost@redhat.com \
--cc=imammedo@redhat.com \
--cc=konrad.wilk@oracle.com \
--cc=mst@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rth@twiddle.net \
/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).