From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0D7A0C433EF for ; Tue, 25 Jan 2022 17:34:49 +0000 (UTC) Received: from localhost ([::1]:51866 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nCPiS-0003sS-OK for qemu-devel@archiver.kernel.org; Tue, 25 Jan 2022 12:34:48 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43828) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCPdB-00085N-Kl for qemu-devel@nongnu.org; Tue, 25 Jan 2022 12:29:21 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:33638) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCPd3-0007lC-Io for qemu-devel@nongnu.org; Tue, 25 Jan 2022 12:29:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1643131752; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=dVt/rcCoZReWs+Q618Sxm77QjN6535brF66Te2gXuwU=; b=DwR1Z0DfXc/+0cLiCoGmLKdasPkm3mqbXqBifVYOTvoqo/U8vLMwCc2+KPJrDe4xMO69WS qVhrVsxP+vKu3lYRTBRRy19y7j4QW9LWltgoF72Z0o0MevA3y9CA4pAVRzcJY7KBcZGGUc zBVGzIG8Gu8fO24cQg61uMuNk0VxF8I= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-232-R91O3wy8OzeUdLyuS-jfDg-1; Tue, 25 Jan 2022 12:29:09 -0500 X-MC-Unique: R91O3wy8OzeUdLyuS-jfDg-1 Received: by mail-wr1-f72.google.com with SMTP id m17-20020adfa3d1000000b001dd66c10c0cso844803wrb.19 for ; Tue, 25 Jan 2022 09:29:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=dVt/rcCoZReWs+Q618Sxm77QjN6535brF66Te2gXuwU=; b=dTL3Fsr2kU3f/aZ3sVPc9/qvwUVGSFU68lHJ81saESzGy+fpj5PUrY7Q/hTIZrnftj A09pcRYSmhlKuI6MY48RoGPrcPzqGoTzqyP/VcLb/wuzwhEN+B0YliYQQmon2nXgF44i GUrQp+4+BD99E3e3BJjhrcDvnYqjQX5K55pFmFppaoy2L8WSdHT5iULCvBsS3ePL281L Z3WE85G3+uwNv//5d9ywzCn2jla2TfaWiiQc8ymw26jlyNgztHHCp6Tr9tOMgsA+AhLm 88wcFctg8nc1aT+0eN3U/6BxXhNp/AUVo5rx4lD4+HCv/Bw5GSp56I2EALyVu3F38+wm pV3w== X-Gm-Message-State: AOAM530TFqTetzRx6VT1fGrkx0zSvHwjgaJCh69gL4JbMQ9BL2Zb4zcF 6SqrVjAFm2aT4RT+GVUv6TdO/rYPoSvlny4Dw5nORsJBOg7v3byJ39CW0nb2yla+zZSYF3eJ9BS YfdRx/Kd+LnmAVbY= X-Received: by 2002:a05:600c:298:: with SMTP id 24mr3820393wmk.100.1643131746817; Tue, 25 Jan 2022 09:29:06 -0800 (PST) X-Google-Smtp-Source: ABdhPJwKpqhh5kQn+m0967/5EOEFLjVnkbDdOZDO9ArrsjDariZM9NCrl7sArQPjfp9e2DiQy8Cd8A== X-Received: by 2002:a05:600c:298:: with SMTP id 24mr3820364wmk.100.1643131746437; Tue, 25 Jan 2022 09:29:06 -0800 (PST) Received: from redhat.com ([2.55.22.56]) by smtp.gmail.com with ESMTPSA id g20sm1291515wmq.9.2022.01.25.09.29.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jan 2022 09:29:05 -0800 (PST) Date: Tue, 25 Jan 2022 12:29:01 -0500 From: "Michael S. Tsirkin" To: Eric DeVolder Subject: Re: [PATCH v13 06/10] ACPI ERST: build the ACPI ERST table Message-ID: <20220125115903-mutt-send-email-mst@kernel.org> References: <1643044621-15892-1-git-send-email-eric.devolder@oracle.com> <1643044621-15892-7-git-send-email-eric.devolder@oracle.com> <20220125070221-mutt-send-email-mst@kernel.org> <1d1fefae-8e00-6e0a-7e07-58863e860214@oracle.com> MIME-Version: 1.0 In-Reply-To: <1d1fefae-8e00-6e0a-7e07-58863e860214@oracle.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mst@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.158, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: berrange@redhat.com, ehabkost@redhat.com, konrad.wilk@oracle.com, qemu-devel@nongnu.org, pbonzini@redhat.com, Ani Sinha , imammedo@redhat.com, boris.ostrovsky@oracle.com, rth@twiddle.net Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, Jan 25, 2022 at 10:32:45AM -0600, Eric DeVolder wrote: > Hi Michael, > Thanks for examining this! Inline response below. > eric > > On 1/25/22 06:05, Michael S. Tsirkin wrote: > > On Tue, Jan 25, 2022 at 04:23:49PM +0530, Ani Sinha wrote: > > > > > > > > > On Mon, 24 Jan 2022, Eric DeVolder wrote: > > > > > > > This builds the ACPI ERST table to inform OSPM how to communicate > > > > with the acpi-erst device. > > > > > > > > Signed-off-by: Eric DeVolder > > > > --- > > > > hw/acpi/erst.c | 188 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > > > > 1 file changed, 188 insertions(+) > > > > > > > > diff --git a/hw/acpi/erst.c b/hw/acpi/erst.c > > > > index fe9ba51..b0c7539 100644 > > > > --- a/hw/acpi/erst.c > > > > +++ b/hw/acpi/erst.c > > > > @@ -59,6 +59,27 @@ > > > > #define STATUS_RECORD_STORE_EMPTY 0x04 > > > > #define STATUS_RECORD_NOT_FOUND 0x05 > > > > > > > > +/* 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 > > > > + > > > > /* UEFI 2.1: Appendix N Common Platform Error Record */ > > > > #define UEFI_CPER_RECORD_MIN_SIZE 128U > > > > #define UEFI_CPER_RECORD_LENGTH_OFFSET 20U > > > > @@ -172,6 +193,173 @@ typedef struct { > > > > > > > > /*******************************************************************/ > > > > /*******************************************************************/ > > > > + > > > > +/* 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) > > > > +{ > > > > + /* ACPI 4.0: Table 17-18 Serialization Instruction Entry */ > > > > + struct AcpiGenericAddress gas; > > > > + uint64_t mask; > > > > + > > > > + /* 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; > > > > + gas.access_width = ctz32(register_bit_width) - 2; > > > > + gas.address = register_address; > > > > + build_append_gas_from_struct(table_data, &gas); > > > > + /* Value */ > > > > + build_append_int_noprefix(table_data, value , 8); > > > > + /* Mask */ > > > > + mask = (1ULL << (register_bit_width - 1) << 1) - 1; > > > > + 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; > > > > + pcibus_t bar0 = pci_get_bar_addr(PCI_DEVICE(erst_dev), 0); > > > > + AcpiTable table = { .sig = "ERST", .rev = 1, .oem_id = oem_id, > > > > + .oem_table_id = oem_table_id }; > > > > + > > > > + trace_acpi_erst_pci_bar_0(bar0); > > > > + > > > > + /* > > > > + * 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)); > > > > + > > > > + /* > > > > + * Macros for use with construction of the action instructions > > > > + */ > > > > +#define BUILD_READ_REGISTER(width_in_bits, reg) \ > > > > + build_serialization_instruction_entry(table_instruction_data, \ > > > > + action, INST_READ_REGISTER, 0, width_in_bits, \ > > > > + bar0 + reg, 0) > > > > + > > > > +#define BUILD_READ_REGISTER_VALUE(width_in_bits, reg, value) \ > > > > + build_serialization_instruction_entry(table_instruction_data, \ > > > > + action, INST_READ_REGISTER_VALUE, 0, width_in_bits, \ > > > > + bar0 + reg, value) > > > > + > > > > +#define BUILD_WRITE_REGISTER(width_in_bits, reg, value) \ > > > > + build_serialization_instruction_entry(table_instruction_data, \ > > > > + action, INST_WRITE_REGISTER, 0, width_in_bits, \ > > > > + bar0 + reg, value) > > > > + > > > > +#define BUILD_WRITE_REGISTER_VALUE(width_in_bits, reg, value) \ > > > > + build_serialization_instruction_entry(table_instruction_data, \ > > > > + action, INST_WRITE_REGISTER_VALUE, 0, width_in_bits, \ > > > > + bar0 + reg, value) > > > > > > I think these macros which in a hidden way use the bar0 variable really > > should be replaced with inline functions, improving type safety. > > I had not stated this previously, but my choice for using macros over functions > was the use three local variables: table_instruction_data, bar0, and action. Oh, didn't notice the others too. > Any function would then automatically require these three as parameters, or I'm > stuffing these temporary items into local globals (to avoid passing as parameters). Please, no globals. > As for the type safety of bar0, I don't quite understand what I should do differently > (regardless of macro vs function). Ultimately these call build_serialization_instruction_entry() > with the 'uint64_t register address' accepting the bar0+offset value. Bar0 is pcibar_t > and the compiler happily implicitly typecasts to uint64_t. The other way could warn though - maybe we should build with -Wconversion. That's going to require quite a bit of work though. > What would an acceptable function prototype look like? Well, that's a limitation of C. We can pass a structure if you really need to save some code lines but that's really all we can do. > > > > > > > > > > > > > + > > > > + /* Serialization Instruction Entries */ > > > > + action = ACTION_BEGIN_WRITE_OPERATION; > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > + > > > > + action = ACTION_BEGIN_READ_OPERATION; > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > + > > > > + action = ACTION_BEGIN_CLEAR_OPERATION; > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > + > > > > + action = ACTION_END_OPERATION; > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > + > > > > + action = ACTION_SET_RECORD_OFFSET; > > > > + BUILD_WRITE_REGISTER(32, ERST_VALUE_OFFSET, 0); > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > + > > > > + action = ACTION_EXECUTE_OPERATION; > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_VALUE_OFFSET, > > > > + ERST_EXECUTE_OPERATION_MAGIC); > > > > > > except here, on all cases we have > > > BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > > > We should treat the above as special case and simplify the rest of the > > > calls (eliminate repeated common arguments). > > > > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > + > > > > + action = ACTION_CHECK_BUSY_STATUS; > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > + BUILD_READ_REGISTER_VALUE(32, ERST_VALUE_OFFSET, 0x01); > > > > + > > > > + action = ACTION_GET_COMMAND_STATUS; > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > + BUILD_READ_REGISTER(32, ERST_VALUE_OFFSET); > > > > + > > > > + action = ACTION_GET_RECORD_IDENTIFIER; > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > + BUILD_READ_REGISTER(64, ERST_VALUE_OFFSET); > > > > + > > > > + action = ACTION_SET_RECORD_IDENTIFIER; > > > > + BUILD_WRITE_REGISTER(64, ERST_VALUE_OFFSET, 0); > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > > > This one seems reverted. Should this be > > > BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > BUILD_WRITE_REGISTER(64, ERST_VALUE_OFFSET, 0); > > > > > > like others? > > > > > > > + > > > > + action = ACTION_GET_RECORD_COUNT; > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > + BUILD_READ_REGISTER(32, ERST_VALUE_OFFSET); > > > > + > > > > + action = ACTION_BEGIN_DUMMY_WRITE_OPERATION; > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > + > > > > + action = ACTION_GET_ERROR_LOG_ADDRESS_RANGE; > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > + BUILD_READ_REGISTER(64, ERST_VALUE_OFFSET); > > > > + > > > > + action = ACTION_GET_ERROR_LOG_ADDRESS_LENGTH; > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > + BUILD_READ_REGISTER(64, ERST_VALUE_OFFSET); > > > > + > > > > + action = ACTION_GET_ERROR_LOG_ADDRESS_RANGE_ATTRIBUTES; > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > + BUILD_READ_REGISTER(32, ERST_VALUE_OFFSET); > > > > + > > > > + action = ACTION_GET_EXECUTE_OPERATION_TIMINGS; > > > > + BUILD_WRITE_REGISTER_VALUE(32, ERST_ACTION_OFFSET, action); > > > > + BUILD_READ_REGISTER(64, ERST_VALUE_OFFSET); > > > > + > > > > > > BUILD_READ_REGISTER() is always called with ERST_VALUE_OFFSET as second > > > argument. WE should eliminate this repeated passing of same argument. > > > > > > > > > > + /* 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 > > > > + */ > > > > + g_assert((table_instruction_data->len) % 32 == 0); > > > > + 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 uint8_t *get_nvram_ptr_by_index(ERSTDeviceState *s, unsigned index) > > > > { > > > > uint8_t *rc = NULL; > > > > -- > > > > 1.8.3.1 > > > > > > > > > >