From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: zailiang.sun@intel.com) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by groups.io with SMTP; Mon, 22 Jul 2019 18:32:03 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 22 Jul 2019 18:31:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,297,1559545200"; d="scan'208";a="180581573" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga002.jf.intel.com with ESMTP; 22 Jul 2019 18:31:56 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Mon, 22 Jul 2019 18:31:56 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.110]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.55]) with mapi id 14.03.0439.000; Tue, 23 Jul 2019 09:31:54 +0800 From: "Sun, Zailiang" To: "Kinney, Michael D" , "devel@edk2.groups.io" CC: "Qian, Yi" , Gary Lin Subject: Re: [edk2-platforms Patch V3 12/12] Vlv2TbltDevicePkg/PlatformDxe: Use S3BootScriptWidth enums Thread-Topic: [edk2-platforms Patch V3 12/12] Vlv2TbltDevicePkg/PlatformDxe: Use S3BootScriptWidth enums Thread-Index: AQHVQOEc6OrYTt8icUGmFC+1gKpQvabXawtA Date: Tue, 23 Jul 2019 01:31:54 +0000 Message-ID: <7CB7EF03E15B5D48981329A508747A9850C990EE@SHSMSX104.ccr.corp.intel.com> References: <20190722225859.24724-1-michael.d.kinney@intel.com> <20190722225859.24724-13-michael.d.kinney@intel.com> In-Reply-To: <20190722225859.24724-13-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zailiang.sun@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Zailiang Sun > -----Original Message----- > From: Kinney, Michael D > Sent: Tuesday, July 23, 2019 6:59 AM > To: devel@edk2.groups.io > Cc: Sun, Zailiang ; Qian, Yi ; > Gary Lin > Subject: [edk2-platforms Patch V3 12/12] Vlv2TbltDevicePkg/PlatformDxe: > Use S3BootScriptWidth enums >=20 > Update to use S3BootScriptWidth enum values instead of EfiBootScriptWidth > enum values when calling S3BootScriptLib services. This fixes an XCODE5 > build failure. >=20 > Cc: Zailiang Sun > Cc: Yi Qian > Cc: Gary Lin > Signed-off-by: Michael D Kinney > --- > .../Intel/Vlv2TbltDevicePkg/PlatformDxe/Platform.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) >=20 > diff --git a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/Platform.c > b/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/Platform.c > index 0bc3f44c49..d9782aafba 100644 > --- a/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/Platform.c > +++ b/Platform/Intel/Vlv2TbltDevicePkg/PlatformDxe/Platform.c > @@ -968,25 +968,25 @@ PchInitBeforeBoot() > // Saved SPI Opcode menu to fix EFI variable unable to write after S3 > resume. > // > S3BootScriptSaveMemWrite ( > - EfiBootScriptWidthUint32, > + S3BootScriptWidthUint32, > (UINTN)(SPI_BASE_ADDRESS + (R_PCH_SPI_OPMENU0))= , > 1, > (VOID *)(UINTN)(SPI_BASE_ADDRESS + > (R_PCH_SPI_OPMENU0))); >=20 > S3BootScriptSaveMemWrite ( > - EfiBootScriptWidthUint32, > + S3BootScriptWidthUint32, > (UINTN)(SPI_BASE_ADDRESS + (R_PCH_SPI_OPMENU1))= , > 1, > (VOID *)(UINTN)(SPI_BASE_ADDRESS + > (R_PCH_SPI_OPMENU1))); >=20 > S3BootScriptSaveMemWrite ( > - EfiBootScriptWidthUint16, > + S3BootScriptWidthUint16, > (UINTN)(SPI_BASE_ADDRESS + R_PCH_SPI_OPTYPE), > 1, > (VOID *)(UINTN)(SPI_BASE_ADDRESS + R_PCH_SPI_OP= TYPE)); >=20 > S3BootScriptSaveMemWrite ( > - EfiBootScriptWidthUint16, > + S3BootScriptWidthUint16, > (UINTN)(SPI_BASE_ADDRESS + R_PCH_SPI_PREOP), > 1, > (VOID *)(UINTN)(SPI_BASE_ADDRESS + R_PCH_SPI_PR= EOP)); > @@ -995,7 +995,7 @@ PchInitBeforeBoot() > // Saved MTPMC_1 for S3 resume. > // > S3BootScriptSaveMemWrite ( > - EfiBootScriptWidthUint32, > + S3BootScriptWidthUint32, > (UINTN)(PMC_BASE_ADDRESS + R_PCH_PMC_MTPMC1), > 1, > (VOID *)(UINTN)(PMC_BASE_ADDRESS + > R_PCH_PMC_MTPMC1)); > -- > 2.21.0.windows.1