On 02/01/21 18:40, Laszlo Ersek wrote: > On 02/01/21 18:37, Laszlo Ersek wrote: >> On 01/29/21 01:59, Ankur Arora wrote: >>> As part of the negotiation treat ICH9_LPC_SMI_F_CPU_HOT_UNPLUG as a >>> subfeature of feature flag ICH9_LPC_SMI_F_CPU_HOTPLUG, so enable it >>> only if the other is also being negotiated. >>> >>> Cc: Laszlo Ersek <ler...@redhat.com> >>> Cc: Jordan Justen <jordan.l.jus...@intel.com> >>> Cc: Ard Biesheuvel <ard.biesheu...@arm.com> >>> Cc: Igor Mammedov <imamm...@redhat.com> >>> Cc: Boris Ostrovsky <boris.ostrov...@oracle.com> >>> Cc: Aaron Young <aaron.yo...@oracle.com> >>> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=3132 >>> Signed-off-by: Ankur Arora <ankur.a.ar...@oracle.com> >>> --- >>> OvmfPkg/SmmControl2Dxe/SmiFeatures.c | 25 ++++++++++++++++++++++--- >>> 1 file changed, 22 insertions(+), 3 deletions(-)
[...] >>> @@ -120,8 +128,18 @@ NegotiateSmiFeatures ( >>> // For now, we only support hotplug with SEV disabled. >>> // >>> RequestedFeaturesMask |= ICH9_LPC_SMI_F_CPU_HOTPLUG; >>> + RequestedFeaturesMask |= ICH9_LPC_SMI_F_CPU_HOT_UNPLUG; >>> } >>> mSmiFeatures &= RequestedFeaturesMask; >>> + >>> + if (!(mSmiFeatures & ICH9_LPC_SMI_F_CPU_HOTPLUG) && >>> + (mSmiFeatures & ICH9_LPC_SMI_F_CPU_HOT_UNPLUG)) { >>> + DEBUG ((DEBUG_WARN, "%a CPU host-features %Lx, requested mask %Lx\n", >>> + __FUNCTION__, mSmiFeatures, RequestedFeaturesMask)); >>> + >>> + mSmiFeatures &= ~ICH9_LPC_SMI_F_CPU_HOT_UNPLUG; >>> + } >>> + >>> QemuFwCfgSelectItem (mRequestedFeaturesItem); >>> QemuFwCfgWriteBytes (sizeof mSmiFeatures, &mSmiFeatures); >>> >> >> (6) Please drop this hunk. We don't try to be smarter than QEMU, in >> general, whenever we perform feature negotiation. (8) ... Please refresh the commit message accordingly. > ... obviously: don't drop the part where you set the new bit! :) Sorry, > "hunk" was not the correct term. Thanks! Laszlo -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#71027): https://edk2.groups.io/g/devel/message/71027 Mute This Topic: https://groups.io/mt/80199973/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-