diff --git a/Silicon/Ampere/AmpereSiliconPkg/Drivers/IpmiSsif/IpmiSsifDxe.c b/Silicon/Ampere/AmpereSiliconPkg/Drivers/IpmiSsif/IpmiSsifDxe.c index a4ea13ba9db..505eed17b7b 100644 --- a/Silicon/Ampere/AmpereSiliconPkg/Drivers/IpmiSsif/IpmiSsifDxe.c +++ b/Silicon/Ampere/AmpereSiliconPkg/Drivers/IpmiSsif/IpmiSsifDxe.c @@ -10,7 +10,6 @@ #include #include -#include #include #include #include diff --git a/Silicon/Ampere/AmpereSiliconPkg/Drivers/IpmiSsif/IpmiSsifPeim.c b/Silicon/Ampere/AmpereSiliconPkg/Drivers/IpmiSsif/IpmiSsifPeim.c index 1ba5e69d01d..8db44c54e81 100644 --- a/Silicon/Ampere/AmpereSiliconPkg/Drivers/IpmiSsif/IpmiSsifPeim.c +++ b/Silicon/Ampere/AmpereSiliconPkg/Drivers/IpmiSsif/IpmiSsifPeim.c @@ -10,7 +10,6 @@ #include #include -#include #include #include #include diff --git a/Silicon/Ampere/AmpereSiliconPkg/Include/IndustryStandard/IpmiNetFnAppExt.h b/Silicon/Ampere/AmpereSiliconPkg/Include/IndustryStandard/IpmiNetFnAppExt.h deleted file mode 100644 index d2f2459d5f2..00000000000 --- a/Silicon/Ampere/AmpereSiliconPkg/Include/IndustryStandard/IpmiNetFnAppExt.h +++ /dev/null @@ -1,61 +0,0 @@ -/** @file - - Copyright (c) 2021, Ampere Computing LLC. All rights reserved.
- - SPDX-License-Identifier: BSD-2-Clause-Patent - -**/ - -#ifndef IPMI_NETFN_APP_EXT_H_ -#define IPMI_NETFN_APP_EXT_H_ - -#pragma pack (1) - -// -// Definitions for system interface type -// -#define IPMI_GET_SYSTEM_INTERFACE_CAPABILITIES_INTERFACE_TYPE_SSIF 0x0 -#define IPMI_GET_SYSTEM_INTERFACE_CAPABILITIES_INTERFACE_TYPE_KCS 0x1 -#define IPMI_GET_SYSTEM_INTERFACE_CAPABILITIES_INTERFACE_TYPE_SMIC 0x2 - -typedef union { - struct { - UINT8 InterfaceType : 4; - UINT8 Reserved : 4; - } Bits; - UINT8 Uint8; -} IPMI_GET_SYSTEM_INTERFACE_CAPABILITIES_REQUEST; - -typedef union { - struct { - UINT8 Version : 3; - UINT8 PecSupport : 1; - UINT8 Reserved : 2; - UINT8 TransactionSupport : 2; - } Bits; - UINT8 Uint8; -} IPMI_SYSTEM_INTERFACE_SSIF_CAPABILITIES; - -typedef struct { - UINT8 CompletionCode; - UINT8 Reserved; - IPMI_SYSTEM_INTERFACE_SSIF_CAPABILITIES InterfaceCap; - UINT8 InputMsgSize; - UINT8 OutputMsgSize; -} IPMI_GET_SYSTEM_INTERFACE_SSIF_CAPABILITIES_RESPONSE; - -// -// Constants and Structure definitions for "Get Channel Info" command to follow here -// -#define BMC_CHANNEL_MEDIUM_TYPE_ETHERNET 0x04 - -typedef union { - struct { - UINT8 ChannelNumber : 4; - UINT8 Reserved : 4; - } Bits; - UINT8 Uint8; -} IPMI_GET_CHANNEL_INFO_REQUEST; - -#pragma pack() -#endif diff --git a/Silicon/Ampere/AmpereSiliconPkg/Include/Library/IpmiCommandLibExt.h b/Silicon/Ampere/AmpereSiliconPkg/Include/Library/IpmiCommandLibExt.h index 8f3ee549547..da91f6af3e3 100644 --- a/Silicon/Ampere/AmpereSiliconPkg/Include/Library/IpmiCommandLibExt.h +++ b/Silicon/Ampere/AmpereSiliconPkg/Include/Library/IpmiCommandLibExt.h @@ -88,7 +88,7 @@ IpmiGetBmcLanInfo ( **/ EFI_STATUS EFIAPI -IpmiSetSystemBootOptions ( +IpmiSetSystemBootOptionsExt ( IN IPMI_SET_BOOT_OPTIONS_REQUEST *SetBootOptionsRequest, IN UINT32 SetBootOptionsRequestSize, OUT UINT8 *CompletionCode @@ -107,7 +107,7 @@ IpmiSetSystemBootOptions ( **/ EFI_STATUS EFIAPI -IpmiGetSystemBootOptions ( +IpmiGetSystemBootOptionsExt ( IN UINT8 ParameterSelector, OUT IPMI_GET_BOOT_OPTIONS_RESPONSE *GetBootOptionsResponse, IN OUT UINT32 *GetBootOptionsResponseSize diff --git a/Silicon/Ampere/AmpereSiliconPkg/Library/IpmiBlobsTransferLib/IpmiBlobsTransferLib.c b/Silicon/Ampere/AmpereSiliconPkg/Library/IpmiBlobsTransferLib/IpmiBlobsTransferLib.c index 0b1e13d7ef8..ddb82df7e63 100644 --- a/Silicon/Ampere/AmpereSiliconPkg/Library/IpmiBlobsTransferLib/IpmiBlobsTransferLib.c +++ b/Silicon/Ampere/AmpereSiliconPkg/Library/IpmiBlobsTransferLib/IpmiBlobsTransferLib.c @@ -8,7 +8,6 @@ #include -#include #include #include #include diff --git a/Silicon/Ampere/AmpereSiliconPkg/Library/IpmiCommandLibExt/IpmiCommandLibExt.c b/Silicon/Ampere/AmpereSiliconPkg/Library/IpmiCommandLibExt/IpmiCommandLibExt.c index 2cfbeb0d2d4..cfb2db39c2a 100644 --- a/Silicon/Ampere/AmpereSiliconPkg/Library/IpmiCommandLibExt/IpmiCommandLibExt.c +++ b/Silicon/Ampere/AmpereSiliconPkg/Library/IpmiCommandLibExt/IpmiCommandLibExt.c @@ -9,7 +9,6 @@ #include #include -#include #include #include #include @@ -48,7 +47,7 @@ IpmiGetBmcLanInfo ( // Get Channel Information // ZeroMem (&GetChannelInfoRequest, sizeof (GetChannelInfoRequest)); - GetChannelInfoRequest.Bits.ChannelNumber = BmcChannel; + GetChannelInfoRequest.ChannelNumber.Bits.ChannelNo = BmcChannel; ResponseSize = sizeof (GetChannelInfoResponse); Status = IpmiSubmitCommand ( @@ -69,7 +68,7 @@ IpmiGetBmcLanInfo ( // if (EFI_ERROR (Status) || GetChannelInfoResponse.CompletionCode != IPMI_COMP_CODE_NORMAL - || GetChannelInfoResponse.MediumType.Bits.ChannelMediumType != BMC_CHANNEL_MEDIUM_TYPE_ETHERNET) + || GetChannelInfoResponse.MediumType.Bits.ChannelMediumType != IPMI_CHANNEL_MEDIA_TYPE_802_3_LAN) { return EFI_NOT_FOUND; } @@ -170,7 +169,7 @@ IpmiGetBmcLanInfo ( **/ EFI_STATUS EFIAPI -IpmiSetSystemBootOptions ( +IpmiSetSystemBootOptionsExt ( IN IPMI_SET_BOOT_OPTIONS_REQUEST *SetBootOptionsRequest, IN UINT32 SetBootOptionsRequestSize, OUT UINT8 *CompletionCode @@ -232,7 +231,7 @@ IpmiSetSystemBootOptions ( **/ EFI_STATUS EFIAPI -IpmiGetSystemBootOptions ( +IpmiGetSystemBootOptionsExt ( IN UINT8 ParameterSelector, OUT IPMI_GET_BOOT_OPTIONS_RESPONSE *GetBootOptionsResponse, IN OUT UINT32 *GetBootOptionsResponseSize @@ -308,7 +307,7 @@ IpmiSetBootInfoAck ( ParameterData->WriteMask = BIT0; ParameterData->BootInitiatorAcknowledgeData = 0x0; - Status = IpmiSetSystemBootOptions ( + Status = IpmiSetSystemBootOptionsExt ( SetBootOptionsRequest, SetBootOptionsRequestSize, &CompletionCode @@ -350,7 +349,7 @@ IpmiGetBootInfoAck ( ParameterData = (IPMI_BOOT_OPTIONS_RESPONSE_PARAMETER_4 *)&GetBootOptionsResponse->ParameterData; - Status = IpmiGetSystemBootOptions ( + Status = IpmiGetSystemBootOptionsExt ( IPMI_BOOT_OPTIONS_PARAMETER_BOOT_INFO_ACK, GetBootOptionsResponse, &GetBootOptionsResponseSize @@ -389,7 +388,7 @@ IpmiClearBootFlags ( SetBootOptionsRequest->ParameterValid.Bits.ParameterSelector = IPMI_BOOT_OPTIONS_PARAMETER_BOOT_FLAGS; - Status = IpmiSetSystemBootOptions ( + Status = IpmiSetSystemBootOptionsExt ( SetBootOptionsRequest, SetBootOptionsRequestSize, &CompletionCode @@ -431,7 +430,7 @@ IpmiGetBootFlags ( ParameterData = (IPMI_BOOT_OPTIONS_RESPONSE_PARAMETER_5 *)&GetBootOptionsResponse->ParameterData; - Status = IpmiGetSystemBootOptions ( + Status = IpmiGetSystemBootOptionsExt ( IPMI_BOOT_OPTIONS_PARAMETER_BOOT_FLAGS, GetBootOptionsResponse, &GetBootOptionsResponseSize @@ -481,7 +480,7 @@ IpmiClearCmosBootFlags ( ParameterData = (IPMI_BOOT_OPTIONS_RESPONSE_PARAMETER_5 *)&GetBootOptionsResponse->ParameterData; - Status = IpmiGetSystemBootOptions ( + Status = IpmiGetSystemBootOptionsExt ( IPMI_BOOT_OPTIONS_PARAMETER_BOOT_FLAGS, GetBootOptionsResponse, &GetBootOptionsResponseSize @@ -506,7 +505,7 @@ IpmiClearCmosBootFlags ( ParameterData->Data2.Bits.CmosClear = IPMI_BOOT_FLAG_CLEAR_CMOS_NO; CopyMem (&SetBootOptionsRequest->ParameterData, ParameterData, sizeof (IPMI_BOOT_OPTIONS_RESPONSE_PARAMETER_5)); - Status = IpmiSetSystemBootOptions ( + Status = IpmiSetSystemBootOptionsExt ( SetBootOptionsRequest, SetBootOptionsRequestSize, &CompletionCode