From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 28578AC0BFD for ; Wed, 13 Mar 2024 07:02:55 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=jmUmK/dhMwB3fFf5KYnUdNFoSuzBKWzOg0f2A6t/9SQ=; c=relaxed/simple; d=groups.io; h=From:To:CC:Subject:Thread-Topic:Thread-Index:Date:Message-ID:References:In-Reply-To:Accept-Language:msip_labels:MIME-Version:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Resent-Date:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20240206; t=1710313374; v=1; b=xg73H66BJxpk6EqlDi/tzBJ9Tk/ENteuSoQ8nU4nHIb1tjB2X/Ile6tdyTfy44+gm+mxg+AQ 1IT1pwIIjnd+5wtqEO56EbZ8LnxMTGsTSwbvweNMvhqCv6Tl9+0/VZAiFt4U0IDdMitAnWqCTm3 Xe4RwzZALqiWCDoBRqXNyj8eT/2sPD0NHOGw5+VYvIyKzuWPa2jbPW6tkAyiwyAhmyEUtbNaInh WhYlJEKZzvHaehzi25jFK+IMmRX/B4hcxxv4wIHFpG+dFZkqpfTuZdc9/2cN5ZUQiaXXdE21Vrh aS1DtPqsWg8WS/EtETPO0UcRJ1mldFfnt3hrchdYH07Ew== X-Received: by 127.0.0.2 with SMTP id QxegYY7687511xEHNau5CPQT; Wed, 13 Mar 2024 00:02:54 -0700 X-Received: from NAM12-DM6-obe.outbound.protection.outlook.com (NAM12-DM6-obe.outbound.protection.outlook.com [40.107.243.50]) by mx.groups.io with SMTP id smtpd.web10.10584.1710313373878687032 for ; Wed, 13 Mar 2024 00:02:54 -0700 X-Received: from PH0PR12MB5631.namprd12.prod.outlook.com (2603:10b6:510:144::7) by DS0PR12MB7779.namprd12.prod.outlook.com (2603:10b6:8:150::5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7362.36; Wed, 13 Mar 2024 07:02:51 +0000 X-Received: from PH0PR12MB5631.namprd12.prod.outlook.com ([fe80::ba59:b972:d8d8:b419]) by PH0PR12MB5631.namprd12.prod.outlook.com ([fe80::ba59:b972:d8d8:b419%5]) with mapi id 15.20.7362.035; Wed, 13 Mar 2024 07:02:51 +0000 From: "Xing, Eric via groups.io" To: "Zhai, MingXin (Duke)" , "devel@edk2.groups.io" CC: "Yao, Ken" , "Fu, Igniculus" , "Chang, Abner" Subject: Re: [edk2-devel] [PATCH] AMD/AmdPlatformPkg: Update AMD Vangogh platform reference code Thread-Topic: [PATCH] AMD/AmdPlatformPkg: Update AMD Vangogh platform reference code Thread-Index: AQHadCo2ZyLFQ6X/lUGm//8cqfvLULE1Pt6g Date: Wed, 13 Mar 2024 07:02:51 +0000 Message-ID: References: <20240312030533.477-1-duke.zhai@amd.com> In-Reply-To: <20240312030533.477-1-duke.zhai@amd.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_ActionId=f8319244-6d51-444c-bae9-3ae38f62f79c;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_ContentBits=0;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_Enabled=true;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_Method=Standard;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_Name=General;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_SetDate=2024-03-13T06:56:39Z;MSIP_Label_4342314e-0df4-4b58-84bf-38bed6170a0f_SiteId=3dd8961f-e488-4e60-8e11-a82d994e183d; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PH0PR12MB5631:EE_|DS0PR12MB7779:EE_ x-ms-office365-filtering-correlation-id: bde835b7-e281-407d-f7f2-08dc432b9926 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam-message-info: V5RTJv0FGnROmEYlzC7JtBr7lxtJTrICQZbpqu1KQ1yKKw9ZQPEL7Av/ramp8bDT67jYp9zognUAvh31c7qjUkw4BAe0uyVeqj2OHYSElLeyV2NBL8xF3fUpHkDGjYQKJXwTH4BYOz4YgrNuC/EK+4Aj7p4OB3264fi3GWkcur2pVw9Jvojk9vean3SasWsvbWYhZ9ccUE2A/H8coVwz0MnBzymVjM4uAJu98j+FOuWwbi7BNcN9QHid1C8z1gW/mocDHZpKD/VVdVrDWW1+zIiSw6ai/lLBRjc0/xbEX5cqPJKAYeOTd77XVPSKA8mSyop++67zakH4JTYLRKyCTtOWP59X3d6QXe6CQAUJlYFSWAUkbzRZZJhD55ZRK0bODSNo7eBehncb+2+v12TgZ0y8OZOoXw9D0cEQIRkPVn5kYH4FFPbqdE6AEGCi2lBWBYLBJUf8wSNuv2BJ2KI4DgdPPWvHrYSZ+ixyWskd+4HjTMLWc2571uyVAE3XuiSu8P5O13c55HyHIkom6TB6YqTApAF7Zt9h6UZhMi8vsgKCC6ha4tB4a+mMiCmjhTYY+hoWXzNqJ93eO+7DnL52M/BF9DpAn6XvhUyDbFcZNbtFmAOaKkAwyCDZ4zBQwqqBvkr2G7NvsA84+pIBOXMU/Ox8Hat+0xuBbPXVH2Uno+okGVh2GgUfiUtKxj4RVH+Onmo5rk5ryBRUiEoMuiwZZTngYsbQ43nvaBMJaWv8EqA= x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?0YqikwUC9cMhxGDVBuJYj0cTKufQcvhm+lOPlEdaga2noNlFCQ9dPZ1sfLa2?= =?us-ascii?Q?uI2S+EvnQQIAZt2uX+Lbu9/rQ525r2FPysD3O9hXn7GMRRhEwT/einj2X6//?= =?us-ascii?Q?OgFFg6etDod/JcsqER3p+H3eg8RdqG+OJMSIU8MSK6txFrEcjPSDNcmcG1fG?= =?us-ascii?Q?GKJsykVNZS5sHvRIg6//m1feT+wulSycLmYw3xXcBpKpxyzZWXx6//1Aujdl?= =?us-ascii?Q?4CC2QVgM320CXKUPA4IfxK/lmrh0b0A0IvdFmP9n0O2s1O92sHu8x1c3RJ0K?= =?us-ascii?Q?xiSO781QK7XJQ2e3jViuKhWTLQTwcwcTeVUGxI623GfmDxsCS3DiIjLjN6Aq?= =?us-ascii?Q?rOT9dfSca8hIx3zxM0kK35Glmyowm7pRn44Exbl+mSVSwldHDSbc8e1DAlKL?= =?us-ascii?Q?65QEX0Ice11Mtz1KYxNdpUm4zwFoxhvMBBAyYqgeiBOr0eJzoqd0wJl65bKa?= =?us-ascii?Q?8TVTf+ERLOY3GS/uvf//KUNWZXifd7vewaZxhG6d9pHnt8xUfF3XxoZ/jw7k?= =?us-ascii?Q?TPdp24UTwKLz2jVJbsfkIUhHpFgl/KswqOBi6w/SFs05H1AulMW43aRAx8gH?= =?us-ascii?Q?OZCDKdEG7wfu7F3C7Uu5fuxxPbXZ5ga6I9W/ATeUBZo/+vDEYiI5qcQkHxOZ?= =?us-ascii?Q?TBdhkYzVD4leoLfcCbkIgz8GwsLuWh+jwKxjNzzkq/Lp38OEkgxE/eTkjqon?= =?us-ascii?Q?BE3CVyP4QnDhNLTa14g3kuFTHfxgRZeLK7Q4LlRceR7v5SmxRZMNuOE2pCFL?= =?us-ascii?Q?PKuJdkNoZoFZpqB2pnB6XMRggnLUpw85TG7Kt9NxnN7Vb4hd8HhIhQVwEosD?= =?us-ascii?Q?fr5/GoTnVIZrvGeQu/yh6VCdCmC2aJPokB5+4jSTZ8KngxNZ+iT7nHkVeRSi?= =?us-ascii?Q?psV0a5eDeRRi4owVaV0cKhkcBmJHnf4PR0fqEB/vFAFPqsWhuSNAlO7Q3DiQ?= =?us-ascii?Q?o7aM+xaglKgv+Wb0UlcQHaiGNhhok1Ce+7WpLjpThFj4pSuZWtj0q4TLoiB7?= =?us-ascii?Q?WTl9n79ZUJvmIg3150bXTlYTyrGq5yWDjexpLrGjv+MpyvIO4pF0f++ap1v2?= =?us-ascii?Q?3/BhyGIF5jmK07vPxGVi8WsUazT2RQUJObC9yHK4UvSmVXpA8EH691gyhY4b?= =?us-ascii?Q?CZoit5kFovDSPMPDI2JOK4oITU1GUKhRcFM1++EcgVzqlD+2xIiRQ4ZFRFoO?= =?us-ascii?Q?ebvXyIS+PypJsB0ZOMZc2yiOWpKlp4fM5+Ad5dotBRvEZcO4Air+lJbnfo9h?= =?us-ascii?Q?OUpX5nYszQDUuO66Ve//3RZHGXK0iiSYu5vBLZJ+4h7iYBRtM4wULfjX6iPv?= =?us-ascii?Q?y/dmgdvk1DIgtVegqJauEIuumcHia3MYxxG74t7EPEgoMf66kBm3dBW5t0y6?= =?us-ascii?Q?xLffG1dGKmVJSb8yVf44aD3RwUNLIZzMcE+j1b8gD5dwQ0qA+6MZ/28PCqEa?= =?us-ascii?Q?C8DaA4+5qWN+uS8L7tWYQ9Mfm2sWaUxo2GzS7Ci1AbLUPgFkTP/VvUFzjpNX?= =?us-ascii?Q?A9F/bwleq6y9AwF6DSMbaPM3tVNk5zHJhh0+Rmx0ptVrytO6SZxCQhAVGfJW?= =?us-ascii?Q?Jcy+yia9+boLNVKZuVE=3D?= MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR12MB5631.namprd12.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bde835b7-e281-407d-f7f2-08dc432b9926 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Mar 2024 07:02:51.1477 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: lmG50VEwufSVNZ+PiPQTNhteqZWqb2EFIOKIT0gCrcXYriaGt4OJGha4laP+/VQk X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS0PR12MB7779 Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Resent-Date: Wed, 13 Mar 2024 00:02:54 -0700 Reply-To: devel@edk2.groups.io,eric.xing@amd.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: tEK4AzHTxCTUO5nInbSUk3Bax7686176AA= Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20240206 header.b=xg73H66B; dmarc=pass (policy=none) header.from=groups.io; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io [AMD Official Use Only - General] Below changes are reviewed and verified. Reviewed-by: Eric Xing > -----Original Message----- > From: Zhai, MingXin (Duke) > Sent: Tuesday, March 12, 2024 11:06 AM > To: devel@edk2.groups.io > Cc: Yao, Ken ; Fu, Igniculus ; > Chang, Abner ; Xing, Eric > Subject: [PATCH] AMD/AmdPlatformPkg: Update AMD Vangogh platform > reference code > > From: Duke Zhai > > BZ #:4728 > > 1.Use HPET timer to replace 8254 timer > 2.Fix Bug Microcode version cannot show correctly at BIOS setup 3.Enable > capsule at linux build 4.Update FspWrapper UPD table for BIOS setup optio= ns > > Cc: Ken Yao > Cc: Igniculus Fu > Reviewed-by: Abner Chang > Reviewed-by: Eric Xing > Signed-off-by: Duke Zhai > --- > .../BIOSImageDirectory32M.xml | 2 +- > .../ChachaniBoardPkg/GenCapsule.bat | 2 +- > .../VanGoghBoard/ChachaniBoardPkg/Project.dsc | 2 - > .../VanGoghBoard/ChachaniBoardPkg/Project.fdf | 3 +- > .../VanGoghBoard/ChachaniBoardPkg/build.sh | 22 +++++- > .../edk2/Fsp2WrapperPkg/Include/FspmUpd.h | 71 ++++++++++--------- > .../FspWrapperPlatformLibSample.c | 29 -------- > 7 files changed, 59 insertions(+), 72 deletions(-) > > diff --git > a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/BIOSImageDirectory32 > M.xml > b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/BIOSImageDirectory32 > M.xml > index 22af6623e2..585e12d487 100644 > --- > a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/BIOSImageDirectory32 > M.xml > +++ > b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/BIOSImageDirectory32 > M.x > +++ ml > @@ -57,7 +57,7 @@ > File=3D"TypeId0x65D0.csbin" /> > File=3D"TypeId0x64L1.csbin" /> > File=3D"TypeId0x65D1.csbin" /> > - > + > > > > diff --git > a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/GenCapsule.bat > b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/GenCapsule.bat > index 7dca22a4e3..c55f561772 100644 > --- a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/GenCapsule.bat > +++ b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/GenCapsule.bat > @@ -36,7 +36,7 @@ if not exist %WORKSPACE%\%BIOS_FILE_NAME% ( > goto ERROR > ) > > - Setup OpenSSL Command Line Environment > +echo Setup OpenSSL Command Line Environment > if not "%OPENSSL_PATH%" =3D=3D "" ( > set OPENSSL_PATH_TEMP=3D%OPENSSL_PATH% > ) > diff --git a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Project.dsc > b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Project.dsc > index 510ce10c0c..20f06dd851 100644 > --- a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Project.dsc > +++ b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Project.dsc > @@ -745,8 +745,6 @@ > MdeModulePkg/Universal/Disk/PartitionDxe/PartitionDxe.inf > FatPkg/EnhancedFatDxe/Fat.inf > PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf > - OvmfPkg/8259InterruptControllerDxe/8259.inf > - OvmfPkg/8254TimerDxe/8254Timer.inf > > MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableDxe/Firmwa > rePerformanceDxe.inf > > MdeModulePkg/Universal/Acpi/FirmwarePerformanceDataTableSmm/Firmw > arePerformanceSmm.inf > > diff --git a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Project.fdf > b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Project.fdf > index 5194a8c10d..0d844689b3 100644 > --- a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Project.fdf > +++ b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/Project.fdf > @@ -416,8 +416,7 @@ NumBlocks =3D 0x100 > # Platform > # > INF MdeModulePkg/Universal/BdsDxe/BdsDxe.inf > - INF OvmfPkg/8259InterruptControllerDxe/8259.inf > - INF OvmfPkg/8254TimerDxe/8254Timer.inf > + INF PcAtChipsetPkg/HpetTimerDxe/HpetTimerDxe.inf > > # > # ACPI > diff --git a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/build.sh > b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/build.sh > index f4652e91c6..0984876ef2 100644 > --- a/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/build.sh > +++ b/Platform/AMD/VanGoghBoard/ChachaniBoardPkg/build.sh > @@ -1,3 +1,4 @@ > +#!/bin/bash > ## @file > # Linux build script file to launch Chachani Board BIOS build # @@ -22,= 6 > +23,7 @@ export OemBoard=3DChachani export PLATFORM_PATH=3Dedk2- > platforms/Platform/AMD/VanGoghBoard > export BUILD_TYPE=3DRELEASE > export TOOLCHAIN_TAG=3DCLANGPDB > +export OTA_CAPSULE_NAME=3DOTACAPSULE # You need to keep this name > sync > +with PlatformCapsule.fdf > #TRUE / FALSE > export COMPRESS_FSP_REGION=3DTRUE > export KEY_MODE=3DTK > @@ -35,16 +37,25 @@ export NASM_PREFIX=3D > export GCC5_BIN=3D > #CLANG_BIN shall end with a slash. > export CLANG_BIN=3D > +#OPENSSL_PATH shall end with a slash. > +export OPENSSL_PATH=3D > > echo "Building for ${OemBoard} board, ${BUILD_TYPE} mode with > ${TOOLCHAIN_TAG}." > -echo "IASL: ${IASL_PREFIX}iasl, NASM: ${NASM_PREFIX}nasm, GCC: > ${GCC5_BIN}gcc, CLANG:${CLANG_BIN}clang." > +echo "IASL: ${IASL_PREFIX}iasl, NASM: ${NASM_PREFIX}nasm, GCC: > ${GCC5_BIN}gcc, CLANG:${CLANG_BIN}clang, > OPENSSL:${OPENSSL_PATH}openssl." > [[ ${COMPRESS_FSP_REGION} =3D=3D "TRUE" ]] && echo "FSP will be built wi= th > compress support." > # Env check > echo_section "Checking compilation environment" > [[ "${IASL_PREFIX}" =3D=3D "" ]] && export IASL_PREFIX=3D$(dirname $(whi= ch iasl))/ > [[ "${NASM_PREFIX}" =3D=3D "" ]] && export NASM_PREFIX=3D$(dirname $(whic= h > nasm))/ > +[[ "${OPENSSL_PATH}" =3D=3D "" ]] && export OPENSSL_PATH=3D$(dirname > $(which > +openssl))/ > [[ -f ${IASL_PREFIX}iasl ]] || (echo "IASL not found! Please specify > IASL_PREFIX!";exit -1) -[[ -f ${IASL_PREFIX}nasm ]] || (echo "NASM not fo= und! > Please specify NASM_PREFIX!";exit -1) > +[[ -f ${NASM_PREFIX}nasm ]] || (echo "NASM not found! Please specify > +NASM_PREFIX!";exit -1) [[ -f ${OPENSSL_PATH}openssl ]] || (echo > +"OpenSSL not found! Please specify OPENSSL_PATH!";exit -1) > + > +echo "IASL version $(LC_ALL=3DC ${IASL_PREFIX}iasl -v | sed -n '3,3p' | = cut -d' ' > -f5) detected." > +echo "NASM version $(LC_ALL=3DC ${NASM_PREFIX}nasm --version | head -n1 > | cut -d' ' -f3) detected." > +echo "OpenSSL version $(LC_ALL=3DC ${OPENSSL_PATH}openssl version | > head -n1 | cut -d' ' -f2) detected." > + > if [ ${TOOLCHAIN_TAG} !=3D "CLANGPDB" ] > then > [[ "${GCC5_BIN}" =3D=3D "" ]] && export GCC5_BIN=3D$(dirname $(whi= ch gcc))/ > @@ -174,4 +185,11 @@ python3 FlashABImage32M.py ${F1_ECSIG} ${F2_EC} > ${F3_EFS} ${F4_PSP_L1_DIRECTORY} > ${F6_SLOT_HEADER_1} ${F7_SLOT_HEADER_2} ${F8_SLOT_A} ${F9_SLOT_B} > ${F10_OUT_IMAGE} popd > > +echo_section "Generating Capsule image" > +rm -r > +${WORKSPACE}/Build/ChachaniBoardPkg/${BUILD_TYPE}_${TOOLCHAIN_TA > G}/FV/S > +YSTEMFIRMWAREUPDATECARGO* touch > +${WORKSPACE}/Build/ChachaniBoardPkg/${BUILD_TYPE}_${TOOLCHAIN_TA > G}/FV/S > +YSTEMFIRMWAREUPDATECARGO.Fv build -p > ${PROJECT_PKG}/PlatformCapsule.dsc > +-t ${TOOLCHAIN_TAG} -b ${BUILD_TYPE} -D BIOS_FILE=3D${BIOSNAME}UDK.FD > [[ > +$? -ne 0 ]] && exit -1 cp > +${WORKSPACE}/Build/ChachaniBoardPkg/${BUILD_TYPE}_${TOOLCHAIN_TA > G}/FV/${OTA_CAPSULE_NAME}.Cap . > + > echo_section "Build success @ $(date)" > diff --git > a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F > spmUpd.h > b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F > spmUpd.h > index 8cadbe430a..875461a58a 100644 > --- > a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F > spmUpd.h > +++ > b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Include/F > sp > +++ mUpd.h > @@ -16,41 +16,42 @@ > /** Fsp M Configuration > **/ > typedef struct { > - /** Offset 0x0040**/ UINT32 bert_size; > - /** Offset 0x0044**/ UINT32 tseg_size; > - /** Offset 0x0048**/ UINT32 dxio_descriptor_table_pointer; > - /** Offset 0x004C**/ UINT32 pcie_reset_function_pointer; > - /** Offset 0x0050**/ UINT32 ddi_descriptor_table_pointer; > - /** Offset 0x0054**/ UINT32 temp_memory_base_addr; > - /** Offset 0x0058**/ UINT32 temp_memory_size; > - /** Offset 0x005C**/ UINT32 fsp_o_pei_volume_address; > - /** Offset 0x0060**/ UINT32 fsp_o_pei_upd_address; > - /** Offset 0x0064**/ UINT32 pei_reset_ppi_addr; > - /** Offset 0x0068**/ UINT32 resource_size_for_each_rb_ptr; > - /** Offset 0x006C**/ UINT32 resource_size_for_each_rb_size; > - /** Offset 0x0070**/ UINT32 total_number_of_root_bridges_ptr; > - /** Offset 0x0074**/ UINT32 total_number_of_root_bridges_size; > - /** Offset 0x0078**/ UINT32 amd_pbs_setup_ptr; > - /** Offset 0x007C**/ UINT32 amd_pbs_setup_size; > - /** Offset 0x0080**/ UINT32 ap_sync_flag_nv_ptr; > - /** Offset 0x0084**/ UINT32 ap_sync_flag_nv_size; > - /** Offset 0x0088**/ UINT8 DbgFchUsbUsb0DrdMode; > - /** Offset 0x0089**/ UINT8 DbgFchUsbUsb2DrdMode; > - /** Offset 0x008A**/ UINT32 CmnGnbGfxUmaFrameBufferSize; > - /** Offset 0x008E**/ UINT8 CmnGnbNbIOMMU; > - /** Offset 0x008F**/ UINT32 DbgFastPPTLimit; > - /** Offset 0x0093**/ UINT32 DbgSlowPPTLimit; > - /** Offset 0x0097**/ UINT32 CmnCpuVoltageOffset; > - /** Offset 0x009B**/ UINT32 CmnGpuVoltageOffset; > - /** Offset 0x009F**/ UINT32 CmnSocVoltageOffset; > - /** Offset 0x00A3**/ UINT8 CmnGnbGfxUmaMode; > - /** Offset 0x00A4**/ UINT8 CmnFchI2C0Config; > - /** Offset 0x00A5**/ UINT8 CmnFchI2C1Config; > - /** Offset 0x00A6**/ UINT8 CmnFchI2C2Config; > - /** Offset 0x00A7**/ UINT8 CmnFchI2C3Config; > - /** Offset 0x00A8**/ UINT32 ids_nv_table_address; > - /** Offset 0x00AC**/ UINT32 ids_nv_table_size; > - /** Offset 0x00B0**/ UINT16 UpdTerminator; > + /** Offset 0x0040**/ UINT32 bert_size; > + /** Offset 0x0044**/ UINT32 tseg_size; > + /** Offset 0x0048**/ UINT32 > dxio_descriptor_table_pointer; > + /** Offset 0x004C**/ UINT32 > pcie_reset_function_pointer; > + /** Offset 0x0050**/ UINT32 > ddi_descriptor_table_pointer; > + /** Offset 0x0054**/ UINT32 > temp_memory_base_addr; > + /** Offset 0x0058**/ UINT32 temp_memory_siz= e; > + /** Offset 0x005C**/ UINT32 > fsp_o_pei_volume_address; > + /** Offset 0x0060**/ UINT32 fsp_o_pei_upd_a= ddress; > + /** Offset 0x0064**/ UINT32 pei_reset_ppi_a= ddr; > + /** Offset 0x0068**/ UINT32 > resource_size_for_each_rb_ptr; > + /** Offset 0x006C**/ UINT32 > resource_size_for_each_rb_size; > + /** Offset 0x0070**/ UINT32 > total_number_of_root_bridges_ptr; > + /** Offset 0x0074**/ UINT32 > total_number_of_root_bridges_size; > + /** Offset 0x0078**/ UINT32 amd_pbs_setup_p= tr; > + /** Offset 0x007C**/ UINT32 amd_pbs_setup_s= ize; > + /** Offset 0x0080**/ UINT32 ap_sync_flag_nv= _ptr; > + /** Offset 0x0084**/ UINT32 ap_sync_flag_nv= _size; > + /** Offset 0x0088**/ UINT8 FchUsbUsb0DrdMo= de; > + /** Offset 0x0089**/ UINT8 FchUsbUsb2DrdMo= de; > + /** Offset 0x008A**/ UINT8 CmnGnbGfxUmaMod= e; > + /** Offset 0x008B**/ UINT32 > CmnGnbGfxUmaFrameBufferSize; > + /** Offset 0x008F**/ UINT8 CmnGnbNbIOMMU; > + /** Offset 0x0090**/ UINT8 PPTCtl; > + /** Offset 0x0091**/ UINT32 FastPPTLimit; > + /** Offset 0x0095**/ UINT32 SlowPPTLimit; > + /** Offset 0x0099**/ UINT8 CmnCpuVolOffset= Ctl; > + /** Offset 0x009A**/ UINT32 CmnCpuVoltageOf= fset; > + /** Offset 0x009E**/ UINT8 CmnGpuVolOffset= Ctl; > + /** Offset 0x009F**/ UINT32 CmnGpuVoltageOf= fset; > + /** Offset 0x00A3**/ UINT8 CmnSocVolOffset= Ctl; > + /** Offset 0x00A4**/ UINT32 CmnSocVoltageOf= fset; > + /** Offset 0x00A8**/ UINT16 CclkFmaxOverrid= e; > + /** Offset 0x00AA**/ UINT16 GfxclkFmaxOverr= ide; > + /** Offset 0x00AC**/ UINT8 padding1[8]; > + /** Offset 0x00B4**/ UINT16 UpdTerminator; > } FSP_M_CONFIG; > > /** Fsp M UPD Configuration > diff --git > a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B > aseFspWrapperPlatformLibSample/FspWrapperPlatformLibSample.c > b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B > aseFspWrapperPlatformLibSample/FspWrapperPlatformLibSample.c > index 1afcf68f85..2a616482e3 100644 > --- > a/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B > aseFspWrapperPlatformLibSample/FspWrapperPlatformLibSample.c > +++ > b/Platform/AMD/VanGoghBoard/Override/edk2/Fsp2WrapperPkg/Library/B > as > +++ eFspWrapperPlatformLibSample/FspWrapperPlatformLibSample.c > @@ -61,35 +61,6 @@ GetIdsNvData ( > FSPM_UPD *volatile FspmUpd > ) > { > - VOID *IdsNvTableData; > - UINT32 IdsNvDataSize =3D 0; > - IDS_HOOK_STATUS Status =3D GetIdsNvTable (NULL, &IdsNvDataSize= ); > - > - if ((Status =3D=3D IDS_HOOK_BUFFER_TOO_SMALL) || (Status =3D=3D > IDS_HOOK_SUCCESS)) { > - // The CBS code doesn't follow its header! > - IdsNvTableData =3D AllocatePool (IdsNvDataSize+100); > - if (IdsNvTableData !=3D NULL) { > - Status =3D GetIdsNvTable (IdsNvTableData, &IdsNvDataSize); > - if (Status =3D=3D IDS_HOOK_SUCCESS) { > - FspmUpd->FspmConfig.ids_nv_table_address =3D > (UINT32)(UINTN)IdsNvTableData; > - FspmUpd->FspmConfig.ids_nv_table_size =3D IdsNvDataSize; > - DEBUG (( > - DEBUG_INFO, > - "IDS NV Table address:%x, size:%x\n", \ > - FspmUpd->FspmConfig.ids_nv_table_address, > - FspmUpd->FspmConfig.ids_nv_table_size > - )); > - return EFI_SUCCESS; > - } else { > - DEBUG ((DEBUG_ERROR, "Get NV Table #3:%d\n", Status)); > - } > - } else { > - DEBUG ((DEBUG_ERROR, "Get NV Table #2:%d\n", Status)); > - } > - } else { > - DEBUG ((DEBUG_ERROR, "Get NV Table #1:%d\n", Status)); > - } > - > return EFI_UNSUPPORTED; > } > > -- > 2.31.1 -=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 (#116708): https://edk2.groups.io/g/devel/message/116708 Mute This Topic: https://groups.io/mt/104878510/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-