mirror of
https://github.com/acidanthera/audk.git
synced 2025-07-31 01:24:12 +02:00
1. BaseSmbusLib: Make SmbusReadDataByte() & SmbusWriteBlock() function well by re-arranging register settings.
2. BaseMemoryLibMmx for X64: Make CopyMem() be reentrant by saving Mm0 to r10. 3. DxeCorePerformanceLib: Fix some typo to save build error of that library instance. 4. Remove the orphanage definition of gEfiPerformanceProtocolGuid git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@859 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
parent
9c091616cd
commit
5b1b9d8bf4
@ -427,11 +427,6 @@
|
|||||||
<GuidValue>125F2DE1-FB85-440C-A54C-4D99358A8D38</GuidValue>
|
<GuidValue>125F2DE1-FB85-440C-A54C-4D99358A8D38</GuidValue>
|
||||||
<HelpText/>
|
<HelpText/>
|
||||||
</Entry>
|
</Entry>
|
||||||
<Entry Name="Performance">
|
|
||||||
<C_Name>gEfiPerformanceProtocolGuid</C_Name>
|
|
||||||
<GuidValue>FFECFFFF-923C-14D2-9E3F-22A0C969563B</GuidValue>
|
|
||||||
<HelpText/>
|
|
||||||
</Entry>
|
|
||||||
<Entry Name="PxeDhcp4">
|
<Entry Name="PxeDhcp4">
|
||||||
<C_Name>gEfiPxeDhcp4ProtocolGuid</C_Name>
|
<C_Name>gEfiPxeDhcp4ProtocolGuid</C_Name>
|
||||||
<GuidValue>03C4E624-AC28-11D3-9A2D-0090293FC14D</GuidValue>
|
<GuidValue>03C4E624-AC28-11D3-9A2D-0090293FC14D</GuidValue>
|
||||||
|
@ -214,7 +214,6 @@ StartGauge (
|
|||||||
UINTN GaugeDataSize;
|
UINTN GaugeDataSize;
|
||||||
UINTN OldGaugeDataSize;
|
UINTN OldGaugeDataSize;
|
||||||
GAUGE_DATA_HEADER *OldGaugeData;
|
GAUGE_DATA_HEADER *OldGaugeData;
|
||||||
EFI_STATUS Status;
|
|
||||||
UINT32 Index;
|
UINT32 Index;
|
||||||
|
|
||||||
Index = mGaugeData->NumberOfEntries;
|
Index = mGaugeData->NumberOfEntries;
|
||||||
@ -230,7 +229,7 @@ StartGauge (
|
|||||||
|
|
||||||
mGaugeData = AllocateZeroPool (GaugeDataSize);
|
mGaugeData = AllocateZeroPool (GaugeDataSize);
|
||||||
if (mGaugeData == NULL) {
|
if (mGaugeData == NULL) {
|
||||||
return EFI_OUT_OF_MEMORY;
|
return EFI_OUT_OF_RESOURCES;
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
// Initialize new data arry and migrate old data one.
|
// Initialize new data arry and migrate old data one.
|
||||||
@ -425,7 +424,6 @@ DxeCorePerformanceLibConstructor (
|
|||||||
//
|
//
|
||||||
// Install the protocol interfaces.
|
// Install the protocol interfaces.
|
||||||
//
|
//
|
||||||
Handle = NULL;
|
|
||||||
Status = gBS->InstallProtocolInterface (
|
Status = gBS->InstallProtocolInterface (
|
||||||
&mHandle,
|
&mHandle,
|
||||||
&gPerformanceProtocolGuid,
|
&gPerformanceProtocolGuid,
|
||||||
|
@ -46,6 +46,9 @@
|
|||||||
<LibraryClass Usage="ALWAYS_CONSUMED">
|
<LibraryClass Usage="ALWAYS_CONSUMED">
|
||||||
<Keyword>UefiBootServicesTableLib</Keyword>
|
<Keyword>UefiBootServicesTableLib</Keyword>
|
||||||
</LibraryClass>
|
</LibraryClass>
|
||||||
|
<LibraryClass Usage="ALWAYS_CONSUMED">
|
||||||
|
<Keyword>MemoryAllocationLib</Keyword>
|
||||||
|
</LibraryClass>
|
||||||
</LibraryClassDefinitions>
|
</LibraryClassDefinitions>
|
||||||
<SourceFiles>
|
<SourceFiles>
|
||||||
<Filename>DxeCorePerformanceLib.c</Filename>
|
<Filename>DxeCorePerformanceLib.c</Filename>
|
||||||
|
@ -46,6 +46,7 @@ InternalMemCopyMem PROC USES rsi rdi
|
|||||||
and r8, 7
|
and r8, 7
|
||||||
shr rcx, 3 ; rcx <- # of Qwords to copy
|
shr rcx, 3 ; rcx <- # of Qwords to copy
|
||||||
jz @CopyBytes
|
jz @CopyBytes
|
||||||
|
DB 49h, 0fh, 7eh, 0c2h ; movq r10, mm0 ; save mm0
|
||||||
@@:
|
@@:
|
||||||
DB 48h, 0fh, 6fh, 06h ; movq mm0, [rsi]
|
DB 48h, 0fh, 6fh, 06h ; movq mm0, [rsi]
|
||||||
DB 48h, 0fh, 0e7h, 07h ; movntq [rdi], mm0
|
DB 48h, 0fh, 0e7h, 07h ; movntq [rdi], mm0
|
||||||
@ -53,6 +54,7 @@ InternalMemCopyMem PROC USES rsi rdi
|
|||||||
add rdi, 8
|
add rdi, 8
|
||||||
loop @B
|
loop @B
|
||||||
mfence
|
mfence
|
||||||
|
DB 49h, 0fh, 6eh, 0c2h ; movq mm0, r10 ; restore mm0
|
||||||
jmp @CopyBytes
|
jmp @CopyBytes
|
||||||
@CopyBackward:
|
@CopyBackward:
|
||||||
mov rdi, r9 ; rdi <- End of Destination
|
mov rdi, r9 ; rdi <- End of Destination
|
||||||
|
@ -25,10 +25,10 @@
|
|||||||
//
|
//
|
||||||
// Replaced by PCD
|
// Replaced by PCD
|
||||||
//
|
//
|
||||||
#define ICH_SMBUS_BASE_ADDRESS 0xEFA0
|
#define ICH_SMBUS_IO_BASE_ADDRESS 0xEFA0
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Reads an 8-bit SMBUS register on ICH.
|
Reads an 8-bit register on ICH SMBUS controller.
|
||||||
|
|
||||||
This internal function reads an SMBUS register specified by Offset.
|
This internal function reads an SMBUS register specified by Offset.
|
||||||
|
|
||||||
@ -42,11 +42,11 @@ InternalSmBusIoRead8 (
|
|||||||
IN UINTN Offset
|
IN UINTN Offset
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
return IoRead8 (ICH_SMBUS_BASE_ADDRESS + Offset);
|
return IoRead8 (ICH_SMBUS_IO_BASE_ADDRESS + Offset);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Writes an 8-bit SMBUS register on ICH.
|
Writes an 8-bit register on ICH SMBUS controller.
|
||||||
|
|
||||||
This internal function writes an SMBUS register specified by Offset.
|
This internal function writes an SMBUS register specified by Offset.
|
||||||
|
|
||||||
@ -62,7 +62,7 @@ InternalSmBusIoWrite8 (
|
|||||||
IN UINT8 Value
|
IN UINT8 Value
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
return IoWrite8 (ICH_SMBUS_BASE_ADDRESS + Offset, Value);
|
return IoWrite8 (ICH_SMBUS_IO_BASE_ADDRESS + Offset, Value);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -89,32 +89,30 @@ InternalSmBusAcquire (
|
|||||||
return RETURN_TIMEOUT;
|
return RETURN_TIMEOUT;
|
||||||
} else if ((HostStatus & SMBUS_B_HOST_BUSY) != 0) {
|
} else if ((HostStatus & SMBUS_B_HOST_BUSY) != 0) {
|
||||||
//
|
//
|
||||||
// Clear Status Register and exit
|
// Clear host status register and exit.
|
||||||
//
|
//
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_HST_STS, SMBUS_B_HSTS_ALL);
|
InternalSmBusIoWrite8 (SMBUS_R_HST_STS, SMBUS_B_HSTS_ALL);
|
||||||
return RETURN_TIMEOUT;
|
return RETURN_TIMEOUT;
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
// Clear byte pointer of 32-byte buffer.
|
// Clear out any odd status information (Will Not Clear In Use).
|
||||||
//
|
//
|
||||||
InternalSmBusIoRead8 (SMBUS_R_HST_CTL);
|
InternalSmBusIoWrite8 (SMBUS_R_HST_STS, HostStatus);
|
||||||
//
|
|
||||||
// Clear BYTE_DONE status
|
|
||||||
//
|
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_HST_STS, SMBUS_B_BYTE_DONE_STS);
|
|
||||||
|
|
||||||
return RETURN_SUCCESS;
|
return RETURN_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Waits until the completion of SMBUS transaction.
|
Starts the SMBUS transaction and waits until the end.
|
||||||
|
|
||||||
This internal function waits until the transaction of SMBUS is over
|
This internal function start the SMBUS transaction and waits until the transaction
|
||||||
by polling the INTR bit of Host status register.
|
of SMBUS is over by polling the INTR bit of Host status register.
|
||||||
If the SMBUS is not available, RETURN_TIMEOUT is returned;
|
If the SMBUS is not available, RETURN_TIMEOUT is returned;
|
||||||
Otherwise, it performs some basic initializations and returns
|
Otherwise, it performs some basic initializations and returns
|
||||||
RETURN_SUCCESS.
|
RETURN_SUCCESS.
|
||||||
|
|
||||||
|
@param HostControl The Host control command to start SMBUS transaction.
|
||||||
|
|
||||||
@retval RETURN_SUCCESS The SMBUS command was executed successfully.
|
@retval RETURN_SUCCESS The SMBUS command was executed successfully.
|
||||||
@retval RETURN_CRC_ERROR The checksum is not correct (PEC is incorrect).
|
@retval RETURN_CRC_ERROR The checksum is not correct (PEC is incorrect).
|
||||||
@retval RETURN_DEVICE_ERROR The request was not completed because a failure reflected
|
@retval RETURN_DEVICE_ERROR The request was not completed because a failure reflected
|
||||||
@ -124,18 +122,21 @@ InternalSmBusAcquire (
|
|||||||
|
|
||||||
**/
|
**/
|
||||||
RETURN_STATUS
|
RETURN_STATUS
|
||||||
InternalSmBusWait (
|
InternalSmBusStart (
|
||||||
VOID
|
IN UINT8 HostControl
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
UINT8 HostStatus;
|
UINT8 HostStatus;
|
||||||
UINT8 AuxiliaryStatus;
|
UINT8 AuxiliaryStatus;
|
||||||
BOOLEAN First;
|
|
||||||
First = TRUE;
|
//
|
||||||
|
// Set Host Control Register (Initiate Operation, Interrupt disabled).
|
||||||
|
//
|
||||||
|
InternalSmBusIoWrite8 (SMBUS_R_HST_CTL, HostControl + SMBUS_B_START);
|
||||||
|
|
||||||
do {
|
do {
|
||||||
//
|
//
|
||||||
// Poll INTR bit of host status register.
|
// Poll INTR bit of Host Status Register.
|
||||||
//
|
//
|
||||||
HostStatus = InternalSmBusIoRead8 (SMBUS_R_HST_STS);
|
HostStatus = InternalSmBusIoRead8 (SMBUS_R_HST_STS);
|
||||||
} while ((HostStatus & (SMBUS_B_INTR | SMBUS_B_ERROR | SMBUS_B_BYTE_DONE_STS)) == 0);
|
} while ((HostStatus & (SMBUS_B_INTR | SMBUS_B_ERROR | SMBUS_B_BYTE_DONE_STS)) == 0);
|
||||||
@ -144,11 +145,11 @@ InternalSmBusWait (
|
|||||||
return RETURN_SUCCESS;
|
return RETURN_SUCCESS;
|
||||||
}
|
}
|
||||||
//
|
//
|
||||||
// Clear error bits of host status register
|
// Clear error bits of Host Status Register.
|
||||||
//
|
//
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_HST_STS, SMBUS_B_ERROR);
|
InternalSmBusIoWrite8 (SMBUS_R_HST_STS, SMBUS_B_ERROR);
|
||||||
//
|
//
|
||||||
// Read auxiliary status register to judge CRC error.
|
// Read Auxiliary Status Register to judge CRC error.
|
||||||
//
|
//
|
||||||
AuxiliaryStatus = InternalSmBusIoRead8 (SMBUS_R_AUX_STS);
|
AuxiliaryStatus = InternalSmBusIoRead8 (SMBUS_R_AUX_STS);
|
||||||
if ((AuxiliaryStatus & SMBUS_B_CRCE) != 0) {
|
if ((AuxiliaryStatus & SMBUS_B_CRCE) != 0) {
|
||||||
@ -159,64 +160,85 @@ InternalSmBusWait (
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Executes an SMBUS quick read/write command.
|
Executes an SMBUS quick, byte or word command.
|
||||||
|
|
||||||
This internal function executes an SMBUS quick read/write command
|
This internal function executes an SMBUS quick, byte or word commond.
|
||||||
on the SMBUS device specified by SmBusAddress.
|
|
||||||
Only the SMBUS slave address field of SmBusAddress is required.
|
|
||||||
If Status is not NULL, then the status of the executed command is returned in Status.
|
If Status is not NULL, then the status of the executed command is returned in Status.
|
||||||
|
|
||||||
|
@param HostControl The value of Host Control Register to set.
|
||||||
@param SmBusAddress Address that encodes the SMBUS Slave Address,
|
@param SmBusAddress Address that encodes the SMBUS Slave Address,
|
||||||
SMBUS Command, SMBUS Data Length, and PEC.
|
SMBUS Command, SMBUS Data Length, and PEC.
|
||||||
|
@param Value The byte/word write to the SMBUS.
|
||||||
@param Status Return status for the executed command.
|
@param Status Return status for the executed command.
|
||||||
This is an optional parameter and may be NULL.
|
This is an optional parameter and may be NULL.
|
||||||
|
|
||||||
|
@return The byte/word read from the SMBUS.
|
||||||
|
|
||||||
**/
|
**/
|
||||||
VOID
|
UINT16
|
||||||
EFIAPI
|
InternalSmBusNonBlock (
|
||||||
InternalSmBusQuick (
|
IN UINT8 HostControl,
|
||||||
IN UINTN SmBusAddress,
|
IN UINTN SmBusAddress,
|
||||||
OUT RETURN_STATUS *Status OPTIONAL
|
IN UINT16 Value,
|
||||||
|
OUT RETURN_STATUS *Status
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
RETURN_STATUS ReturnStatus;
|
RETURN_STATUS ReturnStatus;
|
||||||
|
UINT8 AuxiliaryControl;
|
||||||
|
|
||||||
|
//
|
||||||
|
// Try to acquire the ownership of ICH SMBUS.
|
||||||
|
//
|
||||||
ReturnStatus = InternalSmBusAcquire ();
|
ReturnStatus = InternalSmBusAcquire ();
|
||||||
if (RETURN_ERROR (ReturnStatus)) {
|
if (RETURN_ERROR (ReturnStatus)) {
|
||||||
goto Done;
|
goto Done;
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// Set Command register
|
// Set the appropriate Host Control Register and auxiliary Control Register.
|
||||||
//
|
//
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_HST_CMD, 0);
|
AuxiliaryControl = 0;
|
||||||
|
if (SMBUS_LIB_PEC (SmBusAddress)) {
|
||||||
|
AuxiliaryControl |= SMBUS_B_AAC;
|
||||||
|
HostControl |= SMBUS_B_PEC_EN;
|
||||||
|
}
|
||||||
//
|
//
|
||||||
// Set Auxiliary Control register
|
// Set Host Commond Register.
|
||||||
//
|
//
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_AUX_CTL, 0);
|
InternalSmBusIoWrite8 (SMBUS_R_HST_CMD, (UINT8) SMBUS_LIB_COMMAND (SmBusAddress));
|
||||||
//
|
//
|
||||||
// Set SMBus slave address for the device to send/receive from
|
// Write value to Host Data 0 and Host Data 1 Registers.
|
||||||
|
//
|
||||||
|
InternalSmBusIoWrite8 (SMBUS_R_HST_D0, (UINT8) Value);
|
||||||
|
InternalSmBusIoWrite8 (SMBUS_R_HST_D1, (UINT8) (Value >> 8));
|
||||||
|
//
|
||||||
|
// Set Auxiliary Control Regiester.
|
||||||
|
//
|
||||||
|
InternalSmBusIoWrite8 (SMBUS_R_AUX_CTL, AuxiliaryControl);
|
||||||
|
//
|
||||||
|
// Set SMBUS slave address for the device to send/receive from.
|
||||||
//
|
//
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_XMIT_SLVA, (UINT8) SmBusAddress);
|
InternalSmBusIoWrite8 (SMBUS_R_XMIT_SLVA, (UINT8) SmBusAddress);
|
||||||
//
|
//
|
||||||
// Set Control Register (Initiate Operation, Interrupt disabled)
|
// Start the SMBUS transaction and wait for the end.
|
||||||
//
|
//
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_HST_CTL, SMBUS_V_SMB_CMD_QUICK + SMBUS_B_START);
|
ReturnStatus = InternalSmBusStart (HostControl);
|
||||||
|
|
||||||
//
|
//
|
||||||
// Wait for the end
|
// Read value from Host Data 0 and Host Data 1 Registers.
|
||||||
//
|
//
|
||||||
ReturnStatus = InternalSmBusWait ();
|
Value = InternalSmBusIoRead8 (SMBUS_R_HST_D1) << 8;
|
||||||
|
Value |= InternalSmBusIoRead8 (SMBUS_R_HST_D0);
|
||||||
//
|
//
|
||||||
// Clear status register and exit
|
// Clear Host Status Register and Auxiliary Status Register.
|
||||||
//
|
//
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_HST_STS, SMBUS_B_HSTS_ALL);;
|
InternalSmBusIoWrite8 (SMBUS_R_HST_STS, SMBUS_B_HSTS_ALL);
|
||||||
|
InternalSmBusIoWrite8 (SMBUS_R_AUX_STS, SMBUS_B_CRCE);
|
||||||
|
|
||||||
Done:
|
Done:
|
||||||
if (Status != NULL) {
|
if (Status != NULL) {
|
||||||
*Status = ReturnStatus;
|
*Status = ReturnStatus;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return Value;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -248,7 +270,12 @@ SmBusQuickRead (
|
|||||||
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
||||||
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
||||||
|
|
||||||
InternalSmBusQuick (SmBusAddress | SMBUS_B_READ, Status);
|
InternalSmBusNonBlock (
|
||||||
|
SMBUS_V_SMB_CMD_QUICK,
|
||||||
|
SmBusAddress | SMBUS_B_READ,
|
||||||
|
0,
|
||||||
|
Status
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -280,88 +307,12 @@ SmBusQuickWrite (
|
|||||||
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
||||||
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
||||||
|
|
||||||
InternalSmBusQuick (SmBusAddress | SMBUS_B_WRITE, Status);
|
InternalSmBusNonBlock (
|
||||||
}
|
SMBUS_V_SMB_CMD_QUICK,
|
||||||
|
SmBusAddress | SMBUS_B_WRITE,
|
||||||
/**
|
0,
|
||||||
Executes an SMBUS byte or word command.
|
Status
|
||||||
|
);
|
||||||
This internal function executes an .
|
|
||||||
Only the SMBUS slave address field of SmBusAddress is required.
|
|
||||||
If Status is not NULL, then the status of the executed command is returned in Status.
|
|
||||||
|
|
||||||
@param HostControl The value of Host Control Register to set.
|
|
||||||
@param SmBusAddress Address that encodes the SMBUS Slave Address,
|
|
||||||
SMBUS Command, SMBUS Data Length, and PEC.
|
|
||||||
@param Value The byte/word write to the SMBUS.
|
|
||||||
@param Status Return status for the executed command.
|
|
||||||
This is an optional parameter and may be NULL.
|
|
||||||
|
|
||||||
@return The byte/word read from the SMBUS.
|
|
||||||
|
|
||||||
**/
|
|
||||||
UINT16
|
|
||||||
InternalSmBusByteWord (
|
|
||||||
IN UINT8 HostControl,
|
|
||||||
IN UINTN SmBusAddress,
|
|
||||||
IN UINT16 Value,
|
|
||||||
OUT RETURN_STATUS *Status
|
|
||||||
)
|
|
||||||
{
|
|
||||||
RETURN_STATUS ReturnStatus;
|
|
||||||
UINT8 AuxiliaryControl;
|
|
||||||
|
|
||||||
ReturnStatus = InternalSmBusAcquire ();
|
|
||||||
if (RETURN_ERROR (ReturnStatus)) {
|
|
||||||
goto Done;
|
|
||||||
}
|
|
||||||
|
|
||||||
AuxiliaryControl = 0;
|
|
||||||
if (SMBUS_LIB_PEC (SmBusAddress)) {
|
|
||||||
AuxiliaryControl |= SMBUS_B_AAC;
|
|
||||||
HostControl |= SMBUS_B_PEC_EN;
|
|
||||||
}
|
|
||||||
|
|
||||||
//
|
|
||||||
// Set commond register
|
|
||||||
//
|
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_HST_CMD, (UINT8) SMBUS_LIB_COMMAND (SmBusAddress));
|
|
||||||
|
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_HST_D0, (UINT8) Value);
|
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_HST_D1, (UINT8) (Value >> 8));
|
|
||||||
|
|
||||||
//
|
|
||||||
// Set Auxiliary Control Regiester.
|
|
||||||
//
|
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_AUX_CTL, AuxiliaryControl);
|
|
||||||
//
|
|
||||||
// Set SMBus slave address for the device to send/receive from.
|
|
||||||
//
|
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_XMIT_SLVA, (UINT8) SmBusAddress);
|
|
||||||
//
|
|
||||||
// Set Control Register (Initiate Operation, Interrupt disabled)
|
|
||||||
//
|
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_HST_CTL, HostControl + SMBUS_B_START);
|
|
||||||
|
|
||||||
//
|
|
||||||
// Wait for the end
|
|
||||||
//
|
|
||||||
ReturnStatus = InternalSmBusWait ();
|
|
||||||
|
|
||||||
Value = InternalSmBusIoRead8 (SMBUS_R_HST_D1) << 8;
|
|
||||||
Value |= InternalSmBusIoRead8 (SMBUS_R_HST_D0);
|
|
||||||
|
|
||||||
//
|
|
||||||
// Clear status register and exit
|
|
||||||
//
|
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_HST_STS, SMBUS_B_HSTS_ALL);;
|
|
||||||
|
|
||||||
Done:
|
|
||||||
if (Status != NULL) {
|
|
||||||
*Status = ReturnStatus;
|
|
||||||
}
|
|
||||||
|
|
||||||
return Value;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -394,7 +345,7 @@ SmBusReceiveByte (
|
|||||||
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
||||||
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
||||||
|
|
||||||
return (UINT8) InternalSmBusByteWord (
|
return (UINT8) InternalSmBusNonBlock (
|
||||||
SMBUS_V_SMB_CMD_BYTE,
|
SMBUS_V_SMB_CMD_BYTE,
|
||||||
SmBusAddress | SMBUS_B_READ,
|
SmBusAddress | SMBUS_B_READ,
|
||||||
0,
|
0,
|
||||||
@ -434,7 +385,7 @@ SmBusSendByte (
|
|||||||
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
||||||
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
||||||
|
|
||||||
return (UINT8) InternalSmBusByteWord (
|
return (UINT8) InternalSmBusNonBlock (
|
||||||
SMBUS_V_SMB_CMD_BYTE,
|
SMBUS_V_SMB_CMD_BYTE,
|
||||||
SmBusAddress | SMBUS_B_WRITE,
|
SmBusAddress | SMBUS_B_WRITE,
|
||||||
Value,
|
Value,
|
||||||
@ -470,7 +421,7 @@ SmBusReadDataByte (
|
|||||||
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
||||||
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
||||||
|
|
||||||
return (UINT8) InternalSmBusByteWord (
|
return (UINT8) InternalSmBusNonBlock (
|
||||||
SMBUS_V_SMB_CMD_BYTE_DATA,
|
SMBUS_V_SMB_CMD_BYTE_DATA,
|
||||||
SmBusAddress | SMBUS_B_READ,
|
SmBusAddress | SMBUS_B_READ,
|
||||||
0,
|
0,
|
||||||
@ -509,7 +460,7 @@ SmBusWriteDataByte (
|
|||||||
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
||||||
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
||||||
|
|
||||||
return (UINT8) InternalSmBusByteWord (
|
return (UINT8) InternalSmBusNonBlock (
|
||||||
SMBUS_V_SMB_CMD_BYTE_DATA,
|
SMBUS_V_SMB_CMD_BYTE_DATA,
|
||||||
SmBusAddress | SMBUS_B_WRITE,
|
SmBusAddress | SMBUS_B_WRITE,
|
||||||
Value,
|
Value,
|
||||||
@ -545,7 +496,7 @@ SmBusReadDataWord (
|
|||||||
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
||||||
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
||||||
|
|
||||||
return InternalSmBusByteWord (
|
return InternalSmBusNonBlock (
|
||||||
SMBUS_V_SMB_CMD_WORD_DATA,
|
SMBUS_V_SMB_CMD_WORD_DATA,
|
||||||
SmBusAddress | SMBUS_B_READ,
|
SmBusAddress | SMBUS_B_READ,
|
||||||
0,
|
0,
|
||||||
@ -584,7 +535,7 @@ SmBusWriteDataWord (
|
|||||||
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
||||||
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
||||||
|
|
||||||
return InternalSmBusByteWord (
|
return InternalSmBusNonBlock (
|
||||||
SMBUS_V_SMB_CMD_WORD_DATA,
|
SMBUS_V_SMB_CMD_WORD_DATA,
|
||||||
SmBusAddress | SMBUS_B_WRITE,
|
SmBusAddress | SMBUS_B_WRITE,
|
||||||
Value,
|
Value,
|
||||||
@ -623,7 +574,7 @@ SmBusProcessCall (
|
|||||||
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_LENGTH (SmBusAddress) == 0);
|
||||||
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
ASSERT (SMBUS_LIB_RESEARVED (SmBusAddress) == 0);
|
||||||
|
|
||||||
return InternalSmBusByteWord (
|
return InternalSmBusNonBlock (
|
||||||
SMBUS_V_SMB_CMD_PROCESS_CALL,
|
SMBUS_V_SMB_CMD_PROCESS_CALL,
|
||||||
SmBusAddress | SMBUS_B_WRITE,
|
SmBusAddress | SMBUS_B_WRITE,
|
||||||
Value,
|
Value,
|
||||||
@ -668,59 +619,75 @@ InternalSmBusBlock (
|
|||||||
UINT8 AuxiliaryControl;
|
UINT8 AuxiliaryControl;
|
||||||
|
|
||||||
BytesCount = SMBUS_LIB_LENGTH (SmBusAddress);
|
BytesCount = SMBUS_LIB_LENGTH (SmBusAddress);
|
||||||
|
//
|
||||||
|
// Try to acquire the ownership of ICH SMBUS.
|
||||||
|
//
|
||||||
ReturnStatus = InternalSmBusAcquire ();
|
ReturnStatus = InternalSmBusAcquire ();
|
||||||
if (RETURN_ERROR (ReturnStatus)) {
|
if (RETURN_ERROR (ReturnStatus)) {
|
||||||
goto Done;
|
goto Done;
|
||||||
}
|
}
|
||||||
|
//
|
||||||
|
// Set the appropriate Host Control Register and auxiliary Control Register.
|
||||||
|
//
|
||||||
AuxiliaryControl = SMBUS_B_E32B;
|
AuxiliaryControl = SMBUS_B_E32B;
|
||||||
if (SMBUS_LIB_PEC (SmBusAddress)) {
|
if (SMBUS_LIB_PEC (SmBusAddress)) {
|
||||||
AuxiliaryControl |= SMBUS_B_AAC;
|
AuxiliaryControl |= SMBUS_B_AAC;
|
||||||
HostControl |= SMBUS_B_PEC_EN;
|
HostControl |= SMBUS_B_PEC_EN;
|
||||||
}
|
}
|
||||||
|
//
|
||||||
|
// Set Host Command Register.
|
||||||
|
//
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_HST_CMD, (UINT8) SMBUS_LIB_COMMAND (SmBusAddress));
|
InternalSmBusIoWrite8 (SMBUS_R_HST_CMD, (UINT8) SMBUS_LIB_COMMAND (SmBusAddress));
|
||||||
|
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_HST_D0, (UINT8) BytesCount);
|
|
||||||
|
|
||||||
if (WriteBuffer != NULL) {
|
|
||||||
for (Index = 0; Index < BytesCount; Index++) {
|
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_HOST_BLOCK_DB, WriteBuffer[Index]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
//
|
//
|
||||||
// Set Auxiliary Control Regiester.
|
// Set Auxiliary Control Regiester.
|
||||||
//
|
//
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_AUX_CTL, AuxiliaryControl);
|
InternalSmBusIoWrite8 (SMBUS_R_AUX_CTL, AuxiliaryControl);
|
||||||
//
|
//
|
||||||
// Set SMBus slave address for the device to send/receive from
|
// Clear byte pointer of 32-byte buffer.
|
||||||
|
//
|
||||||
|
InternalSmBusIoRead8 (SMBUS_R_HST_CTL);
|
||||||
|
|
||||||
|
if (WriteBuffer != NULL) {
|
||||||
|
//
|
||||||
|
// Write the number of block to Host Block Data Byte Register.
|
||||||
|
//
|
||||||
|
InternalSmBusIoWrite8 (SMBUS_R_HST_D0, (UINT8) BytesCount);
|
||||||
|
//
|
||||||
|
// Write data block to Host Block Data Register.
|
||||||
|
//
|
||||||
|
for (Index = 0; Index < BytesCount; Index++) {
|
||||||
|
InternalSmBusIoWrite8 (SMBUS_R_HOST_BLOCK_DB, WriteBuffer[Index]);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
//
|
||||||
|
// Set SMBUS slave address for the device to send/receive from.
|
||||||
//
|
//
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_XMIT_SLVA, (UINT8) SmBusAddress);
|
InternalSmBusIoWrite8 (SMBUS_R_XMIT_SLVA, (UINT8) SmBusAddress);
|
||||||
//
|
//
|
||||||
// Set Control Register (Initiate Operation, Interrupt disabled)
|
// Start the SMBUS transaction and wait for the end.
|
||||||
//
|
//
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_HST_CTL, HostControl + SMBUS_B_START);
|
ReturnStatus = InternalSmBusStart (HostControl);
|
||||||
|
|
||||||
//
|
|
||||||
// Wait for the end
|
|
||||||
//
|
|
||||||
ReturnStatus = InternalSmBusWait ();
|
|
||||||
if (RETURN_ERROR (ReturnStatus)) {
|
if (RETURN_ERROR (ReturnStatus)) {
|
||||||
goto Done;
|
goto Done;
|
||||||
}
|
}
|
||||||
|
|
||||||
BytesCount = InternalSmBusIoRead8 (SMBUS_R_HST_D0);
|
|
||||||
if (ReadBuffer != NULL) {
|
if (ReadBuffer != NULL) {
|
||||||
|
//
|
||||||
|
// Read the number of block from host block data byte register.
|
||||||
|
//
|
||||||
|
BytesCount = InternalSmBusIoRead8 (SMBUS_R_HST_D0);
|
||||||
|
//
|
||||||
|
// Write data block from Host Block Data Register.
|
||||||
|
//
|
||||||
for (Index = 0; Index < BytesCount; Index++) {
|
for (Index = 0; Index < BytesCount; Index++) {
|
||||||
ReadBuffer[Index] = InternalSmBusIoRead8 (SMBUS_R_HOST_BLOCK_DB);
|
ReadBuffer[Index] = InternalSmBusIoRead8 (SMBUS_R_HOST_BLOCK_DB);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
//
|
//
|
||||||
// Clear status register and exit
|
// Clear Host Status Register and Auxiliary Status Register.
|
||||||
//
|
//
|
||||||
InternalSmBusIoWrite8 (SMBUS_R_HST_STS, SMBUS_B_HSTS_ALL);
|
InternalSmBusIoWrite8 (SMBUS_R_HST_STS, SMBUS_B_HSTS_ALL);
|
||||||
|
InternalSmBusIoWrite8 (SMBUS_R_AUX_STS, SMBUS_B_CRCE);
|
||||||
|
|
||||||
Done:
|
Done:
|
||||||
if (Status != NULL) {
|
if (Status != NULL) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user