Patch pushed: d549e39ca1a9da14d86ff841358f990a0ace71f5
Thanks, Chasel > -----Original Message----- > From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Chiu, > Chasel > Sent: Thursday, July 15, 2021 10:38 PM > To: devel@edk2.groups.io > Cc: Chiu, Chasel <chasel.c...@intel.com>; Desimone, Nathaniel L > <nathaniel.l.desim...@intel.com>; Chaganty, Rangasai V > <rangasai.v.chaga...@intel.com>; Liming Gao <gaolim...@byosoft.com.cn>; > Oram, Isaac W <isaac.w.o...@intel.com> > Subject: [edk2-devel] [edk2-platforms: PATCH] > Features/Intel/IpmiFeaturePkg: Use MdePkg macros instead of redefining. > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3494 > > Renamed below macros and structure to use MdePkg ones. > IPMI_MSG_GET_BMC_EXEC_RSP > IPMI_GET_BMC_EXECUTION_CONTEXT > IPMI_BMC_IN_FORCED_UPDATE_MODE > > Cc: Nate DeSimone <nathaniel.l.desim...@intel.com> > Cc: Sai Chaganty <rangasai.v.chaga...@intel.com> > Cc: Liming Gao <gaolim...@byosoft.com.cn> > Cc: Isaac Oram <isaac.w.o...@intel.com> > Signed-off-by: Chasel Chiu <chasel.c...@intel.com> > --- > > Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dxe/I > pmiInit.c | 8 ++++---- > Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/ServerMa > nagement.h | 17 ----------------- > 2 files changed, 4 insertions(+), 21 deletions(-) > > diff --git > a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dx > e/IpmiInit.c > b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dx > e/IpmiInit.c > index 1e0c132508..d788b48867 100644 > --- > a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dx > e/IpmiInit.c > +++ > b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/GenericIpmi/Dx > e/ > +++ IpmiInit.c > @@ -242,7 +242,7 @@ Returns: > EFI_STATUS Status; UINT32 > DataSize; > SM_CTRL_INFO *pBmcInfo;- EFI_IPMI_MSG_GET_BMC_EXEC_RSP > *pBmcExecContext;+ IPMI_MSG_GET_BMC_EXEC_RSP > *pBmcExecContext; UINT32 Retries; #ifdef > FAST_VIDEO_SUPPORT EFI_VIDEOPRINT_PROTOCOL > *VideoPrintProtocol;@@ -301,14 +301,14 @@ Returns: > Status = IpmiSendCommand ( &IpmiInstance->IpmiTransport, > IPMI_NETFN_FIRMWARE, 0,- > EFI_FIRMWARE_GET_BMC_EXECUTION_CONTEXT,+ > IPMI_GET_BMC_EXECUTION_CONTEXT, NULL, 0, > IpmiInstance->TempData, &DataSize ); - pBmcExecContext = > (EFI_IPMI_MSG_GET_BMC_EXEC_RSP*)&IpmiInstance->TempData[0];+ > pBmcExecContext = (IPMI_MSG_GET_BMC_EXEC_RSP*)&IpmiInstance- > >TempData[0]; DEBUG ((DEBUG_INFO, "[IPMI] Operational status of BMC: > 0x%x\n", pBmcExecContext->CurrentExecutionContext));- if > ((pBmcExecContext->CurrentExecutionContext == > EFI_FIRMWARE_BMC_IN_FORCED_UPDATE_MODE) &&+ if > ((pBmcExecContext->CurrentExecutionContext == > IPMI_BMC_IN_FORCED_UPDATE_MODE) && !EFI_ERROR (Status)) > { DEBUG ((DEBUG_ERROR, "[IPMI] BMC in Forced Update mode, skip > waiting for BMC_READY.\n")); IpmiInstance->BmcStatus = > BMC_UPDATE_IN_PROGRESS;diff --git > a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/Server > Management.h > b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/Server > Management.h > index 7591f33aba..244b86e91a 100644 > --- > a/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/Server > Management.h > +++ > b/Features/Intel/OutOfBandManagement/IpmiFeaturePkg/Include/Server > Ma > +++ nagement.h > @@ -149,15 +149,6 @@ typedef enum { > #define UPPER_NON_RECOVER_GOING_LOW 0x400 #define > UPPER_NON_RECOVER_GOING_HI 0x800 -//-// Definitions for Get BMC > Execution Context-//-#define > EFI_FIRMWARE_GET_BMC_EXECUTION_CONTEXT 0x23-//-// Current > Execution Context responses-//-#define > EFI_FIRMWARE_BMC_IN_FORCED_UPDATE_MODE 0x11- // // Server > Management COM Addressing types //@@ -327,14 +318,6 @@ typedef > struct { > UINT16 IoBasePort; } IPMI_HOB_DATA; -//-// Constants and Structure > definitions for "Get Device ID" command to follow here-//-typedef struct {- > UINT8 CurrentExecutionContext;- UINT8 PartitionPointer;-} > EFI_IPMI_MSG_GET_BMC_EXEC_RSP;- // // COM Layer Callback //-- > 2.28.0.windows.1 > > > > -=-=-=-=-=-= > Groups.io Links: You receive all messages sent to this group. > View/Reply Online (#77811): https://edk2.groups.io/g/devel/message/77811 > Mute This Topic: https://groups.io/mt/84226659/1777047 > Group Owner: devel+ow...@edk2.groups.io > Unsubscribe: https://edk2.groups.io/g/devel/unsub [chasel.c...@intel.com] > -=-=-=-=-=-= > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#78052): https://edk2.groups.io/g/devel/message/78052 Mute This Topic: https://groups.io/mt/84226659/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
