From: Ming Huang <ming.huang@linaro.org>
To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org,
edk2-devel@lists.01.org, graeme.gregory@linaro.org
Cc: ard.biesheuvel@linaro.org, michael.d.kinney@intel.com,
lersek@redhat.com, guoheyi@huawei.com, wanghuiqiang@huawei.com,
huangming23@huawei.com, zhangjinsong2@huawei.com,
huangdaode@hisilicon.com, john.garry@huawei.com,
xinliang.liu@linaro.org, Ming Huang <ming.huang@linaro.org>
Subject: [PATCH edk2-platforms v3 14/36] Silicon/Hisilicon/I2C: Refactor I2C library
Date: Thu, 16 Aug 2018 20:12:17 +0800 [thread overview]
Message-ID: <20180816121239.44129-15-ming.huang@linaro.org> (raw)
In-Reply-To: <20180816121239.44129-1-ming.huang@linaro.org>
The hunk of waiting TX/TX finish is used by ten times,
so move there hunks to a function CheckI2CTimeOut().
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ming Huang <ming.huang@linaro.org>
---
Silicon/Hisilicon/Library/I2CLib/I2CHw.h | 4 +
Silicon/Hisilicon/Library/I2CLib/I2CLib.c | 161 ++++++++------------
2 files changed, 66 insertions(+), 99 deletions(-)
diff --git a/Silicon/Hisilicon/Library/I2CLib/I2CHw.h b/Silicon/Hisilicon/Library/I2CLib/I2CHw.h
index aa561e929c..fa954c7937 100644
--- a/Silicon/Hisilicon/Library/I2CLib/I2CHw.h
+++ b/Silicon/Hisilicon/Library/I2CLib/I2CHw.h
@@ -265,5 +265,9 @@
UINT32 Val32;
} I2C0_ENABLE_STATUS_U;
+typedef enum {
+ I2CTx,
+ I2CRx
+} I2CTransfer;
#endif
diff --git a/Silicon/Hisilicon/Library/I2CLib/I2CLib.c b/Silicon/Hisilicon/Library/I2CLib/I2CLib.c
index f03d55d6b2..9174e50dd4 100644
--- a/Silicon/Hisilicon/Library/I2CLib/I2CLib.c
+++ b/Silicon/Hisilicon/Library/I2CLib/I2CLib.c
@@ -238,6 +238,45 @@ I2C_GetRxStatus (
return Fifo.bits.rxflr;
}
+EFI_STATUS
+EFIAPI
+CheckI2CTimeOut (
+ UINT32 Socket,
+ UINT8 Port,
+ I2CTransfer Transfer
+ )
+{
+ UINT32 Times = 0;
+ UINT32 Fifo;
+
+ if (Transfer == I2CTx) {
+ Fifo = I2C_GetTxStatus (Socket, Port);
+ while (Fifo != 0) {
+ // This is a empirical value for I2C delay. MemoryFance is no need here.
+ I2C_Delay (2);
+ if (++Times > I2C_READ_TIMEOUT) {
+ (VOID)I2C_Disable (Socket, Port);
+ return EFI_TIMEOUT;
+ }
+ Fifo = I2C_GetTxStatus (Socket, Port);
+ }
+ } else {
+ Fifo = I2C_GetRxStatus (Socket, Port);
+ while (Fifo == 0) {
+ // This is a empirical value for I2C delay. MemoryFance is no need here.
+ I2C_Delay (2);
+ if (++Times > I2C_READ_TIMEOUT) {
+ (VOID)I2C_Disable (Socket, Port);
+ return EFI_TIMEOUT;
+ }
+ Fifo = I2C_GetRxStatus (Socket, Port);
+ }
+ }
+
+ return EFI_SUCCESS;
+}
+
+
EFI_STATUS
EFIAPI
WriteBeforeRead (
@@ -254,15 +293,11 @@ WriteBeforeRead (
I2C_SetTarget (I2cInfo->Socket, I2cInfo->Port, I2cInfo->SlaveDeviceAddress);
- Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
- while (Fifo != 0) {
- I2C_Delay (2);
- if (++Times > I2C_READ_TIMEOUT) {
- return EFI_TIMEOUT;
- }
- Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
+ if (CheckI2CTimeOut (I2cInfo->Socket, I2cInfo->Port, I2CTx) == EFI_TIMEOUT) {
+ return EFI_TIMEOUT;
}
+ Fifo = 0;
for (Count = 0; Count < Length; Count++) {
Times = 0;
while (Fifo > I2C_TXRX_THRESHOLD) {
@@ -277,15 +312,8 @@ WriteBeforeRead (
Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
}
- Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
- Times = 0;
- while (Fifo != 0) {
- I2C_Delay (2);
-
- if (++Times > I2C_READ_TIMEOUT) {
- return EFI_TIMEOUT;
- }
- Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
+ if (CheckI2CTimeOut (I2cInfo->Socket, I2cInfo->Port, I2CTx) == EFI_TIMEOUT) {
+ return EFI_TIMEOUT;
}
return EFI_SUCCESS;
@@ -316,14 +344,8 @@ I2CWrite(
I2C_SetTarget(I2cInfo->Socket, I2cInfo->Port, I2cInfo->SlaveDeviceAddress);
- Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
- while (Fifo != 0) {
- I2C_Delay (2);
- if (++Times > I2C_READ_TIMEOUT) {
- (VOID)I2C_Disable (I2cInfo->Socket, I2cInfo->Port);
- return EFI_TIMEOUT;
- }
- Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
+ if (CheckI2CTimeOut (I2cInfo->Socket, I2cInfo->Port, I2CTx) == EFI_TIMEOUT) {
+ return EFI_TIMEOUT;
}
if (I2cInfo->DeviceType) {
@@ -333,15 +355,8 @@ I2CWrite(
I2C_REG_WRITE (Base + I2C_DATA_CMD_OFFSET, InfoOffset & 0xff);
}
- Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
- Times = 0;
- while (Fifo != 0) {
- I2C_Delay (2);
- if (++Times > I2C_READ_TIMEOUT) {
- (VOID)I2C_Disable (I2cInfo->Socket, I2cInfo->Port);
- return EFI_TIMEOUT;
- }
- Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
+ if (CheckI2CTimeOut (I2cInfo->Socket, I2cInfo->Port, I2CTx) == EFI_TIMEOUT) {
+ return EFI_TIMEOUT;
}
for (Idx = 0; Idx < Length; Idx++) {
@@ -364,17 +379,8 @@ I2CWrite(
}
}
- Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
- Times = 0;
- while (Fifo != 0) {
- I2C_Delay (2);
-
- if (++Times > I2C_READ_TIMEOUT) {
- DEBUG ((DEBUG_ERROR, "I2C Write try to finished,time out!\n"));
- (VOID)I2C_Disable (I2cInfo->Socket, I2cInfo->Port);
- return EFI_TIMEOUT;
- }
- Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
+ if (CheckI2CTimeOut (I2cInfo->Socket, I2cInfo->Port, I2CTx) == EFI_TIMEOUT) {
+ return EFI_TIMEOUT;
}
(VOID)I2C_Disable (I2cInfo->Socket, I2cInfo->Port);
@@ -390,8 +396,6 @@ I2CRead(
UINT8 *pBuf
)
{
- UINT32 Fifo;
- UINT32 Times = 0;
UINT8 I2CWAddr[2];
EFI_STATUS Status;
UINT32 Idx = 0;
@@ -422,15 +426,8 @@ I2CRead(
I2C_SetTarget (I2cInfo->Socket, I2cInfo->Port, I2cInfo->SlaveDeviceAddress);
- Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
- while (Fifo != 0) {
- I2C_Delay (2);
-
- while (++Times > I2C_READ_TIMEOUT) {
- (VOID)I2C_Disable (I2cInfo->Socket, I2cInfo->Port);
- return EFI_TIMEOUT;
- }
- Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
+ if (CheckI2CTimeOut (I2cInfo->Socket, I2cInfo->Port, I2CTx) == EFI_TIMEOUT) {
+ return EFI_TIMEOUT;
}
while (RxLen > 0) {
@@ -441,16 +438,9 @@ I2CRead(
I2C_REG_WRITE (Base + I2C_DATA_CMD_OFFSET, I2C_READ_SIGNAL | I2C_CMD_STOP_BIT);
}
- Times = 0;
- do {
- I2C_Delay (2);
-
- while (++Times > I2C_READ_TIMEOUT) {
- (VOID)I2C_Disable (I2cInfo->Socket, I2cInfo->Port);
- return EFI_TIMEOUT;
- }
- Fifo = I2C_GetRxStatus (I2cInfo->Socket, I2cInfo->Port);
- } while (Fifo == 0);
+ if (CheckI2CTimeOut (I2cInfo->Socket, I2cInfo->Port, I2CRx) == EFI_TIMEOUT) {
+ return EFI_TIMEOUT;
+ }
I2C_REG_READ (Base + I2C_DATA_CMD_OFFSET, pBuf[Idx++]);
@@ -472,8 +462,6 @@ I2CReadMultiByte (
{
UINT32 Count;
UINT16 TotalLen = 0;
- UINT32 Fifo;
- UINT32 Times = 0;
UINT8 I2CWAddr[4];
EFI_STATUS Status;
UINT32 BytesLeft;
@@ -531,16 +519,9 @@ I2CReadMultiByte (
}
for (Count = 0; Count < BytesLeft; Count++) {
- Times = 0;
- do {
- I2C_Delay (2);
-
- while (++Times > I2C_READ_TIMEOUT) {
- (VOID)I2C_Disable (I2cInfo->Socket, I2cInfo->Port);
- return EFI_TIMEOUT;
- }
- Fifo = I2C_GetRxStatus (I2cInfo->Socket, I2cInfo->Port);
- } while (Fifo == 0);
+ if (CheckI2CTimeOut (I2cInfo->Socket, I2cInfo->Port, I2CRx) == EFI_TIMEOUT) {
+ return EFI_TIMEOUT;
+ }
I2C_REG_READ (Base + I2C_DATA_CMD_OFFSET, pBuf[Idx++]);
}
@@ -558,8 +539,6 @@ I2CWriteMultiByte(
UINT8 *pBuf
)
{
- UINT32 Fifo;
- UINT32 Times = 0;
UINT32 Idx;
UINTN Base;
@@ -573,14 +552,8 @@ I2CWriteMultiByte(
I2C_SetTarget(I2cInfo->Socket, I2cInfo->Port, I2cInfo->SlaveDeviceAddress);
- Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
- while (0 != Fifo) {
- I2C_Delay (2);
- if (++Times > I2C_READ_TIMEOUT) {
- (VOID)I2C_Disable (I2cInfo->Socket, I2cInfo->Port);
- return EFI_TIMEOUT;
- }
- Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
+ if (CheckI2CTimeOut (I2cInfo->Socket, I2cInfo->Port, I2CTx) == EFI_TIMEOUT) {
+ return EFI_TIMEOUT;
}
if (I2cInfo->DeviceType == DEVICE_TYPE_CPLD_3BYTE_OPERANDS) {
@@ -595,22 +568,12 @@ I2CWriteMultiByte(
} else {
}
- Times = 0;
for (Idx = 0; Idx < Length; Idx++) {
I2C_REG_WRITE (Base + I2C_DATA_CMD_OFFSET, *pBuf++);
}
- Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
- Times = 0;
- while (Fifo != 0) {
- I2C_Delay (2);
-
- if (++Times > I2C_READ_TIMEOUT) {
- DEBUG ((DEBUG_ERROR, "I2C Write try to finished,time out!\n"));
- (VOID)I2C_Disable (I2cInfo->Socket, I2cInfo->Port);
- return EFI_TIMEOUT;
- }
- Fifo = I2C_GetTxStatus (I2cInfo->Socket, I2cInfo->Port);
+ if (CheckI2CTimeOut (I2cInfo->Socket, I2cInfo->Port, I2CTx) == EFI_TIMEOUT) {
+ return EFI_TIMEOUT;
}
(VOID)I2C_Disable (I2cInfo->Socket, I2cInfo->Port);
--
2.17.0
next prev parent reply other threads:[~2018-08-16 12:13 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-16 12:12 [PATCH edk2-platforms v3 00/36] Upload for D06 platform Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 01/36] Hisilicon/D0x: Unify FlashFvbDxe driver Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 02/36] Hisilicon/D0X: Rename the global variable gDS3231RtcDevice Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 03/36] Hisilicon/D06: Add several base file for D06 Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 04/36] Platform/Hisilicon/D06: Add M41T83RealTimeClockLib Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 05/36] Platform/Hisilicon/D06: Add edk2-non-osi components for D06 Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 06/36] Hisilicon/D06: Add OemMiscLibD06 Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 07/36] Silicon/Hisilicon/D06: Wait for all disk ready Ming Huang
2018-08-22 10:25 ` Leif Lindholm
2018-08-22 15:00 ` Ming
2018-08-16 12:12 ` [PATCH edk2-platforms v3 08/36] Silicon/Hisilicon/Acpi: Unify HisiAcipPlatformDxe Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 09/36] Hisilicon/D06: Add Debug Serial Port Init Driver Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 10/36] Hisilicon/D06: Add ACPI Tables for D06 Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 11/36] Hisilicon/D06: Add Hi1620OemConfigUiLib Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 12/36] Silicon/Hisilicon/D06: Stop watchdog Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 13/36] Hisilicon/I2C: Modify I2CLib.c for coding style Ming Huang
2018-08-16 12:12 ` Ming Huang [this message]
2018-08-16 12:12 ` [PATCH edk2-platforms v3 15/36] Silicon/Hisilicon/D06: Fix I2C enable fail issue for D06 Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 16/36] Silicon/Hisilicon/D06: Add I2C delay for HNS auto config Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 17/36] Hisilicon/I2C: Fix a typo issue Ming Huang
2018-08-21 21:45 ` Leif Lindholm
2018-08-21 21:48 ` Leif Lindholm
2018-08-16 12:12 ` [PATCH edk2-platforms v3 18/36] Silicon/Hisilicon/D06: Optimize HNS config CDR post time Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 19/36] Silicon/Hisilicon/Setup: Add Setup Item "EnableGOP" Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 20/36] Hisilicon/Hi1620: Add ACPI PPTT table Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 21/36] Platform/Hisilicon/D06: Enable ACPI PPTT Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 22/36] Platform/Hisilicon/D06: Add OemNicLib Ming Huang
2018-08-22 14:55 ` Leif Lindholm
2018-08-16 12:12 ` [PATCH edk2-platforms v3 23/36] Platform/Hisilicon/D06: Add OemNicConfig2P Driver Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 24/36] Hisilicon/D0x: Update SMBIOS type9 info Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 25/36] Platform/Hisilicon/D06: Add EarlyConfigPeim peim Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 26/36] Platform/Hisilicon/D06: Add PciHostBridgeLib Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 27/36] Hisilicon/D06: add apei driver Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 28/36] Silicon/Hisilicon/D06: Add some Lpc macro to LpcLib.h Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 29/36] Platform/Hisilicon/D06: Add capsule upgrade support Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 30/36] Silicon/Hisilicon/D06: Modify for close slave core clock Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 31/36] Silicon/Hisilicon/D06: Add I2C Bus Exception handle function Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 32/36] Silicon/Hisilicon/Setup: Support SPCR table switch Ming Huang
2018-08-21 21:11 ` Leif Lindholm
[not found] ` <6cf5a20d-b648-1ae8-043d-75f241fc4123@linaro.org>
2018-08-23 10:50 ` Ming
2018-08-23 11:12 ` Leif Lindholm
2018-08-23 11:58 ` Ming
2018-08-16 12:12 ` [PATCH edk2-platforms v3 33/36] Silicon/Hisilicon/setup: Support SMMU switch Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 34/36] Hisilicon/D06: Add PciPlatformLib Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 35/36] Hisilicon/D06: Add edk2-non-osi Shell components Ming Huang
2018-08-16 12:12 ` [PATCH edk2-platforms v3 36/36] Platform/Hisilicon/D0x: Update version string to 18.08 Ming Huang
2018-08-17 12:23 ` [PATCH edk2-platforms v3 00/36] Upload for D06 platform Leif Lindholm
2018-08-18 6:20 ` Ming
2018-08-22 16:40 ` Leif Lindholm
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180816121239.44129-15-ming.huang@linaro.org \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox