From nobody Mon Feb 9 16:19:43 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+98187+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+98187+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1673272807; cv=none; d=zohomail.com; s=zohoarc; b=UryuuebRflu2UjBQN31TB+PLYBhHv+NrVtZGoMlUMtiHkKRBYKObbb7MBVzdcOjYr9EnBsYjkO2Dr7X8L7Z0fPusaxjCP7Gf8ahxO9hdl/4b8rfgMjtMKwmFg/3V7MVCB/mfiNg0/d84cr40HYcicLFUn/pyzVzMYOhzzOhl2Ew= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1673272807; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=drgVLYzSGtFv9vjkwcPncGUMK6gj84KuhyQjvkJkrMA=; b=L3uPcVEL3tjNdGygmu7dENJ5nb2uYFT/lmPQH08+qRlLu1rz8iu92mEm8xJ9VJtFdT6iMgcF/D6OlG8xk89o0oTX4ch7qxn1vkZYyDr4OvZsJ5tzYO9/dA6F7g8vS1UyuAJNcwoT3h0qJmMwsFOinwG5bL9NHSUetMeSFy44EQA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+98187+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 16732728072191018.5211700372497; Mon, 9 Jan 2023 06:00:07 -0800 (PST) Return-Path: X-Received: by 127.0.0.2 with SMTP id oxnEYY1788612xHrlskFZHKG; Mon, 09 Jan 2023 06:00:06 -0800 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.72183.1673272804664614480 for ; Mon, 09 Jan 2023 06:00:06 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="306394437" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="306394437" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 05:59:44 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10585"; a="634217702" X-IronPort-AV: E=Sophos;i="5.96,311,1665471600"; d="scan'208";a="634217702" X-Received: from mxu9-mobl1.ccr.corp.intel.com ([10.255.30.4]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 09 Jan 2023 05:59:42 -0800 From: "Min Xu" To: devel@edk2.groups.io Cc: Min M Xu , Laszlo Ersek , Erdem Aktas , James Bottomley , Jiewen Yao , Gerd Hoffmann , Tom Lendacky Subject: [edk2-devel] [PATCH V2 5/6] OvmfPkg/AcpiPlatformDxe: Refactor QemuAcpiTableNotifyProtocol Date: Mon, 9 Jan 2023 21:59:16 +0800 Message-Id: <20230109135917.1752-6-min.m.xu@intel.com> In-Reply-To: <20230109135917.1752-1-min.m.xu@intel.com> References: <20230109135917.1752-1-min.m.xu@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,min.m.xu@intel.com X-Gm-Message-State: K5EsrX89tT570cOiQiwedWxSx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1673272806; bh=/Vvpioap8kD7pF4admWNZJAJPZjLSLvhCzSjjUpN9iY=; h=Cc:Date:From:Reply-To:Subject:To; b=nfebf24ZF3GVQGp1PIbCr8PnBejZH1nQGydUDYbP8HbyLVgKi6yB/EOV/LxI8idN3CP 2qfVY1RXd4lGlnefgp5atep68dyy6xrD3vAVKYufQN6onePZ8RMQOyrngWoibuqikdsoy TexwXb6JZ2UjR5NUE2MMJAD+NBkPenBQUYg= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1673272809292100014 Content-Type: text/plain; charset="utf-8" From: Min M Xu BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D4237 Commit 9fdc70af6ba8 install the QemuAcpiTableNotifyProtocol at a wrong positioin. It should be called before TransferS3ContextToBootScript because TransferS3ContextToBootScript is the last operation in InstallQemuFwCfgTables(). Another error is that we should check the returned value after installing the QemuAcpiTableNotifyProtocol. This patch refactors the installation and error handling of QemuAcpiTableNotifyProtocol in InstallQemuFwCfgTables (). Cc: Laszlo Ersek Cc: Erdem Aktas Cc: James Bottomley Cc: Jiewen Yao Cc: Gerd Hoffmann Cc: Tom Lendacky Reported-by: Laszlo Ersek Signed-off-by: Min Xu --- OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c | 36 ++++++++++++++++--------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatform= Dxe/QemuFwCfgAcpi.c index f27a95957f47..14ae13055a30 100644 --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c @@ -1249,6 +1249,20 @@ InstallQemuFwCfgTables ( } } =20 + // + // Install a protocol to notify that the ACPI table provided by Qemu is + // ready. + // + Status =3D gBS->InstallProtocolInterface ( + &QemuAcpiHandle, + &gQemuAcpiTableNotifyProtocolGuid, + EFI_NATIVE_INTERFACE, + NULL + ); + if (EFI_ERROR (Status)) { + goto UninstallAcpiTables; + } + // // Translating the condensed QEMU_LOADER_WRITE_POINTER commands to ACPI = S3 // Boot Script opcodes has to be the last operation in this function, be= cause @@ -1257,7 +1271,7 @@ InstallQemuFwCfgTables ( if (S3Context !=3D NULL) { Status =3D TransferS3ContextToBootScript (S3Context); if (EFI_ERROR (Status)) { - goto UninstallAcpiTables; + goto UninstallQemuAcpiTableNotifyProtocol; } =20 // @@ -1268,6 +1282,15 @@ InstallQemuFwCfgTables ( =20 DEBUG ((DEBUG_INFO, "%a: installed %d tables\n", __FUNCTION__, Installed= )); =20 +UninstallQemuAcpiTableNotifyProtocol: + if (EFI_ERROR (Status)) { + gBS->UninstallProtocolInterface ( + QemuAcpiHandle, + &gQemuAcpiTableNotifyProtocolGuid, + NULL + ); + } + UninstallAcpiTables: if (EFI_ERROR (Status)) { // @@ -1277,17 +1300,6 @@ UninstallAcpiTables: --Installed; AcpiProtocol->UninstallAcpiTable (AcpiProtocol, InstalledKey[Install= ed]); } - } else { - // - // Install a protocol to notify that the ACPI table provided by Qemu is - // ready. - // - gBS->InstallProtocolInterface ( - &QemuAcpiHandle, - &gQemuAcpiTableNotifyProtocolGuid, - EFI_NATIVE_INTERFACE, - NULL - ); } =20 for (SeenPointerEntry =3D OrderedCollectionMin (SeenPointers); --=20 2.29.2.windows.2 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#98187): https://edk2.groups.io/g/devel/message/98187 Mute This Topic: https://groups.io/mt/96152533/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-