From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.93; helo=mga11.intel.com; envelope-from=jiewen.yao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 123A7210C644A for ; Tue, 31 Jul 2018 04:06:43 -0700 (PDT) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 31 Jul 2018 04:06:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,427,1526367600"; d="scan'208";a="58534709" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by fmsmga007.fm.intel.com with ESMTP; 31 Jul 2018 04:06:33 -0700 Received: from FMSMSX109.amr.corp.intel.com (10.18.116.9) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 31 Jul 2018 04:06:32 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by fmsmsx109.amr.corp.intel.com (10.18.116.9) with Microsoft SMTP Server (TLS) id 14.3.319.2; Tue, 31 Jul 2018 04:06:32 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.124]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.173]) with mapi id 14.03.0319.002; Tue, 31 Jul 2018 19:06:30 +0800 From: "Yao, Jiewen" To: "Zeng, Star" , "edk2-devel@lists.01.org" CC: "Kinney, Michael D" , "Zeng, Star" Thread-Topic: [edk2] [PATCH] SignedCapsulePkg SystemFirmwareReportDxe: Try LocateProtocol Thread-Index: AQHUKGmLtazyEXr/w0GSN8pPGYl75aSpLC6g Date: Tue, 31 Jul 2018 11:06:29 +0000 Message-ID: <74D8A39837DF1E4DA445A8C0B3885C503ACD9BE8@shsmsx102.ccr.corp.intel.com> References: <1532998659-31120-1-git-send-email-star.zeng@intel.com> In-Reply-To: <1532998659-31120-1-git-send-email-star.zeng@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMzViMTk1MjYtZjE2Yy00MGUxLTgzYjgtZjI2YjkzMzE3ZjVkIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiQ3l4RkFLc1Fpek9qc2xjM1hvR3FRRlI2M2xqbXV1YlU2bmJlTzNFcHhcL095VlNuTnFPaGxQSDNRT0cwd1ZXQXkifQ== x-ctpclassification: CTP_NT dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH] SignedCapsulePkg SystemFirmwareReportDxe: Try LocateProtocol X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jul 2018 11:06:44 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jiewen.yao@intel.com > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of St= ar > Zeng > Sent: Tuesday, July 31, 2018 8:58 AM > To: edk2-devel@lists.01.org > Cc: Kinney, Michael D ; Yao, Jiewen > ; Zeng, Star > Subject: [edk2] [PATCH] SignedCapsulePkg SystemFirmwareReportDxe: Try > LocateProtocol >=20 > Try LocateProtocol after HandleProtocol fails to be compatible > with old SystemFirmwareUpdateDxe. >=20 > Cc: Michael D Kinney > Cc: Jiewen Yao > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Star Zeng > --- > .../SystemFirmwareUpdate/SystemFirmwareReportDxe.c | 29 > ++++++++++++++-------- > 1 file changed, 18 insertions(+), 11 deletions(-) >=20 > diff --git > a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareRepo > rtDxe.c > b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareRepo > rtDxe.c > index fb7b63be9d13..8802404c9a6b 100644 > --- > a/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareRepo > rtDxe.c > +++ > b/SignedCapsulePkg/Universal/SystemFirmwareUpdate/SystemFirmwareRepo > rtDxe.c > @@ -202,17 +202,24 @@ FmpSetImage ( > (VOID **)&SystemFmp > ); > if (EFI_ERROR(Status)) { > - DEBUG((DEBUG_INFO, "(Agent)SetImage - SystemFmpProtocol - %r\n", > Status)); > - SystemFmpPrivate->LastAttempt.LastAttemptStatus =3D > LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT; > - VarStatus =3D gRT->SetVariable( > - SYSTEM_FMP_LAST_ATTEMPT_VARIABLE_NAME, > - &gSystemFmpLastAttemptVariableGuid, > - EFI_VARIABLE_NON_VOLATILE | > EFI_VARIABLE_BOOTSERVICE_ACCESS, > - sizeof(SystemFmpPrivate->LastAttempt), > - &SystemFmpPrivate->LastAttempt > - ); > - DEBUG((DEBUG_INFO, "(Agent)SetLastAttemp - %r\n", VarStatus)); > - return Status; > + Status =3D gBS->LocateProtocol ( > + &gSystemFmpProtocolGuid, > + NULL, > + (VOID **)&SystemFmp > + ); > + if (EFI_ERROR(Status)) { > + DEBUG((DEBUG_INFO, "(Agent)SetImage - SystemFmpProtocol - %r\n", > Status)); > + SystemFmpPrivate->LastAttempt.LastAttemptStatus =3D > LAST_ATTEMPT_STATUS_ERROR_INVALID_FORMAT; > + VarStatus =3D gRT->SetVariable( > + > SYSTEM_FMP_LAST_ATTEMPT_VARIABLE_NAME, > + &gSystemFmpLastAttemptVariableGuid, > + EFI_VARIABLE_NON_VOLATILE | > EFI_VARIABLE_BOOTSERVICE_ACCESS, > + sizeof(SystemFmpPrivate->LastAttempt), > + &SystemFmpPrivate->LastAttempt > + ); > + DEBUG((DEBUG_INFO, "(Agent)SetLastAttemp - %r\n", VarStatus)); > + return Status; > + } > } >=20 > return SystemFmp->SetImage(SystemFmp, ImageIndex, Image, ImageSize, > VendorCode, Progress, AbortReason); > -- > 2.7.0.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel