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 AA4DFC76196 for ; Tue, 11 Apr 2023 16:02:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pmGQa-0000oz-Jc; Tue, 11 Apr 2023 12:01:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pmGQY-0000mV-LW for qemu-devel@nongnu.org; Tue, 11 Apr 2023 12:01:02 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pmGQU-0004uz-VF for qemu-devel@nongnu.org; Tue, 11 Apr 2023 12:01:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1681228857; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=bbhcXnWWlqKfPAmVQjOqv9xVU+0Me94T+BmmPmOhkek=; b=K+/rftUfEX6fYMrv8HJmnvAKRqVuTUJghrBDe2JyksOgE5f3Bk45zqtQhqmLm1eQP8PcU9 fRApEP1nrTyOBltBYxHBpKANA5P5iiLid1i87Oky2q6LBHtGJLn/vKfQVgYGSYsZ6HS4S4 gTsdq6kihaG8d2E12BWqS2Qor2r+pjE= Received: from mail-ed1-f71.google.com (mail-ed1-f71.google.com [209.85.208.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-412-uSDYro-OOW6TJjeSY6oOcg-1; Tue, 11 Apr 2023 12:00:56 -0400 X-MC-Unique: uSDYro-OOW6TJjeSY6oOcg-1 Received: by mail-ed1-f71.google.com with SMTP id 4fb4d7f45d1cf-50489dce38aso1184075a12.2 for ; Tue, 11 Apr 2023 09:00:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681228852; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bbhcXnWWlqKfPAmVQjOqv9xVU+0Me94T+BmmPmOhkek=; b=CpQFdCAay+SqOKKUGYEWhJjYL40zvC4VWXwhNsnnrAYh8HW59L57dkcBcPCYhTiCjL Tw69z++ecUJ7L3JkiKxKi2rQ27usoiSdei1MzFYM0mvMo+abaXIPJEliCujaRfTqGTxg edYR6eaZVD/RozlIoytF1t8wq+p3Pm3fLz8N0WqzWoUz+E4va4TOua8I2Aw87T3Mtuq0 iVe+IltL+gf6UzykOa1yu11huN3Mljc+8LS0zjCUkqdJ0mAMJ+kQyBqUFkGKeBNCzPuy AbwoQHYxMlz8rsSTLzSQMqmx5tmcx6nxsKq3pN8sw0xgKZb03iLaxC7tK2wodqoTv/XA WS4g== X-Gm-Message-State: AAQBX9cTdQDvyghHY1VnERdVPVWfR1IlJFyspspApH2IYEwU+61Q6hhh jO7krPPHSoNW/TW5wWxJj09/H3RKFw8OVTgDaptmT7++Pu/ZQmi5P98/1+hUZNOxDl70tPuEAgI 6srzPmcZREsTs3lY= X-Received: by 2002:a05:6402:142:b0:4fd:29e4:ccfe with SMTP id s2-20020a056402014200b004fd29e4ccfemr11672433edu.18.1681228851914; Tue, 11 Apr 2023 09:00:51 -0700 (PDT) X-Google-Smtp-Source: AKy350b5k+wbOlujr9tH08E1zNH9NhznCxVhRpZZaMnQg9i2Al9DXg7FIMTEF0lUzvBx7iAyqzzz/g== X-Received: by 2002:a05:6402:142:b0:4fd:29e4:ccfe with SMTP id s2-20020a056402014200b004fd29e4ccfemr11672401edu.18.1681228851499; Tue, 11 Apr 2023 09:00:51 -0700 (PDT) Received: from imammedo.users.ipa.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id 15-20020a508e0f000000b00504ae3a5adfsm1849355edw.2.2023.04.11.09.00.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Apr 2023 09:00:50 -0700 (PDT) Date: Tue, 11 Apr 2023 18:00:49 +0200 From: Igor Mammedov To: Eric DeVolder Cc: shannon.zhaosl@gmail.com, mst@redhat.com, ani@anisinha.ca, peter.maydell@linaro.org, qemu-arm@nongnu.org, qemu-devel@nongnu.org, marcel.apfelbaum@gmail.com, pbonzini@redhat.com, richard.henderson@linaro.org, eduardo@habkost.net, boris.ostrovsky@oracle.com Subject: Re: [PATCH 2/2] hw/acpi: i386: bump MADT to revision 5 Message-ID: <20230411180049.7566b9aa@imammedo.users.ipa.redhat.com> In-Reply-To: <20230328155926.2277-3-eric.devolder@oracle.com> References: <20230328155926.2277-1-eric.devolder@oracle.com> <20230328155926.2277-3-eric.devolder@oracle.com> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.37; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=170.10.133.124; envelope-from=imammedo@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Tue, 28 Mar 2023 11:59:26 -0400 Eric DeVolder wrote: > Currently i386 QEMU generates MADT revision 3, and reports > MADT revision 1. ACPI 6.3 introduces MADT revision 5. >=20 > For MADT revision 4, that introduces ARM GIC structures, which do > not apply to i386. >=20 > For MADT revision 5, the Local APIC flags introduces the Online > Capable bitfield. >=20 > Making MADT generate and report revision 5 will solve problems with > CPU hotplug (the Online Capable flag indicates hotpluggable CPUs). So spec mandates 3 possible states 00t - not present and not can't be added later ever 01t - present 10t - not present but might be added later and outlawed 11t combination 00t - doesn't make much sense (i.e. why put such entry in MADT in the 1st p= lace) but looking at kernel commit aa06e20f1be, it looks like ACPI_MADT_ONLINE_CAPABLE was introduced to accommodate firmware/hw folks who would stuff MADT with LAPIC entries for all possible CPU models, and then patch it depending on actually used CPU model instead of dynamically creating LAPIC entries. (insane) =20 > Signed-off-by: Eric DeVolder > --- > hw/i386/acpi-common.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) >=20 > diff --git a/hw/i386/acpi-common.c b/hw/i386/acpi-common.c > index 52e5c1439a..1e3a13a36c 100644 > --- a/hw/i386/acpi-common.c > +++ b/hw/i386/acpi-common.c > @@ -38,8 +38,15 @@ void pc_madt_cpu_entry(int uid, const CPUArchIdList *a= pic_ids, > { > uint32_t apic_id =3D apic_ids->cpus[uid].arch_id; > /* Flags =E2=80=93 Local APIC Flags */ > - uint32_t flags =3D apic_ids->cpus[uid].cpu !=3D NULL || force_enable= d ? > - 1 /* Enabled */ : 0; > + bool enabled =3D apic_ids->cpus[uid].cpu !=3D NULL || force_enabled ? > + true /* Enabled */ : false; > + /* > + * ACPI 6.3 5.2.12.2 Local APIC Flags: OnlineCapable must be 0 > + * if Enabled is set. > + */ > + bool onlinecapable =3D enabled ? false : true; /* Online Capable */ > + uint32_t flags =3D onlinecapable ? 0x2 : 0x0 | > + enabled ? 0x1 : 0x0; align the last line with onlinecapable ....' move /* Enabled */ and /* Online Capable */ comments right to magic values i.e. onlinecapable ? 0x2 : 0x0 | /* Online Capable */ ... > =20 > /* ACPI spec says that LAPIC entry for non present > * CPU may be omitted from MADT or it must be marked > @@ -102,7 +109,7 @@ void acpi_build_madt(GArray *table_data, BIOSLinker *= linker, > MachineClass *mc =3D MACHINE_GET_CLASS(x86ms); > const CPUArchIdList *apic_ids =3D mc->possible_cpu_arch_ids(MACHINE(= x86ms)); > AcpiDeviceIfClass *adevc =3D ACPI_DEVICE_IF_GET_CLASS(adev); > - AcpiTable table =3D { .sig =3D "APIC", .rev =3D 1, .oem_id =3D oem_i= d, > + AcpiTable table =3D { .sig =3D "APIC", .rev =3D 5, .oem_id =3D oem_i= d, > .oem_table_id =3D oem_table_id }; > =20 > acpi_table_begin(&table, table_data);