From nobody Mon Feb 9 19:30:44 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail(p=none dis=none) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org [198.145.21.10]) by mx.zohomail.com with SMTPS id 153241657368292.68116477108344; Tue, 24 Jul 2018 00:16:13 -0700 (PDT) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 758FB210C1246; Tue, 24 Jul 2018 00:16:13 -0700 (PDT) Received: from mail-pl0-x230.google.com (mail-pl0-x230.google.com [IPv6:2607:f8b0:400e:c01::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 3E110210C1240 for ; Tue, 24 Jul 2018 00:16:12 -0700 (PDT) Received: by mail-pl0-x230.google.com with SMTP id z7-v6so1347088plo.9 for ; Tue, 24 Jul 2018 00:16:12 -0700 (PDT) Received: from localhost.localdomain ([120.31.149.194]) by smtp.gmail.com with ESMTPSA id t14-v6sm11449788pgu.0.2018.07.24.00.15.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Jul 2018 00:16:11 -0700 (PDT) X-Original-To: edk2-devel@lists.01.org Received-SPF: none (zoho.com: 198.145.21.10 is neither permitted nor denied by domain of lists.01.org) client-ip=198.145.21.10; envelope-from=edk2-devel-bounces@lists.01.org; helo=ml01.01.org; Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:400e:c01::230; helo=mail-pl0-x230.google.com; envelope-from=ming.huang@linaro.org; receiver=edk2-devel@lists.01.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=nwdIwIa89WC8fnNV80FElCEtuIxJh1jXUJ3KIsz4oHc=; b=YML0Wtb9EqMaEw6vCC/3aqbcfe8WFCmW8GiHwTkyAoqv0h/1X9Nw5UnrnNcfYWUjs6 C2XRRLi1qpKw1GLRC7KGkqfw24PWKu07aWM6qjGMT4Szh72y7R1MwZIwGG9J2QmW0lnN TKLGc0M+TwX6Pb3TkJ8oYjCOHQea12YopNc2M= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=nwdIwIa89WC8fnNV80FElCEtuIxJh1jXUJ3KIsz4oHc=; b=qDoJQWD4JrjAHZpPOsOat2W4ivixm3zBHHuSwDqdRIb3mxwDPduk0YEheRJ5kQXOoC ythCpQEuxQblNz//UEvTDlwPdlthvVosP7vbKCJqnklyMc44ZREnqOgsstdsHTP9oEJ8 9PncwbxuIB42WIXI7VqPzEZzQj/jDxn8FBYwQXT+PLoVOjbo+u9Bhjw2zfHKbTTvkZTe vK5yeWm4fS7pI5jTO0Nl83fynYI0FUBXtppf6oI1K9f8e6ftCbITuOJDQn3WxHd9Zrkh RI8utGEoGvqpTpBiL3EeJOJSPeDDgn3l8hyNYwrQxY50pynFY2/sL9GawpExETCYnEZT wf+A== X-Gm-Message-State: AOUpUlGKnbSS5sDEI99pJ2CXEp+zR4MOW16Xsj1l4fALRRQOJQjOxfg9 YhfdMIZju8ac1GUWk57CjT8IiA== X-Google-Smtp-Source: AAOMgpfKxgNSq7LPC4oh3puwBIVJlAVHYvJDIO4IxP9ICagL8kUCD08Hu5HErqfy2wse1+GdmtL74A== X-Received: by 2002:a17:902:9042:: with SMTP id w2-v6mr7575471plz.61.1532416571816; Tue, 24 Jul 2018 00:16:11 -0700 (PDT) From: Ming Huang To: leif.lindholm@linaro.org, linaro-uefi@lists.linaro.org, edk2-devel@lists.01.org, graeme.gregory@linaro.org Date: Tue, 24 Jul 2018 15:08:59 +0800 Message-Id: <20180724070922.63362-16-ming.huang@linaro.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180724070922.63362-1-ming.huang@linaro.org> References: <20180724070922.63362-1-ming.huang@linaro.org> Subject: [edk2] [PATCH edk2-platforms v1 15/38] Silicon/Hisilicon/I2C: Optimize I2C library X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: huangming23@huawei.com, xinliang.liu@linaro.org, john.garry@huawei.com, zhangjinsong2@huawei.com, huangdaode@hisilicon.com, guoheyi@huawei.com, wanghuiqiang@huawei.com MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_4 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" The hunt of waiting TX/TX finish is used by ten times, so move there hunts to a function CheckI2CTimeOut. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang Signed-off-by: Heyi Guo --- Silicon/Hisilicon/Library/I2CLib/I2CHw.h | 4 + Silicon/Hisilicon/Library/I2CLib/I2CLib.c | 176 +++++++------------- 2 files changed, 65 insertions(+), 115 deletions(-) diff --git a/Silicon/Hisilicon/Library/I2CLib/I2CHw.h b/Silicon/Hisilicon/L= ibrary/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; =20 +typedef enum { + I2CTx, + I2CRx +} I2CTransfer; =20 #endif diff --git a/Silicon/Hisilicon/Library/I2CLib/I2CLib.c b/Silicon/Hisilicon/= Library/I2CLib/I2CLib.c index ecd2f07c4d..16636987a6 100644 --- a/Silicon/Hisilicon/Library/I2CLib/I2CLib.c +++ b/Silicon/Hisilicon/Library/I2CLib/I2CLib.c @@ -234,6 +234,42 @@ I2C_GetRxStatus(UINT32 Socket,UINT8 Port) return ulFifo.bits.rxflr; } =20 +EFI_STATUS +EFIAPI +CheckI2CTimeOut ( + UINT32 Socket, + UINT8 Port, + I2CTransfer Transfer +) +{ + UINT32 ulTimes =3D 0; + UINT32 ulFifo; + + if (Transfer =3D=3D I2CTx) { + ulFifo =3D I2C_GetTxStatus (Socket,Port); + while (ulFifo !=3D 0) { + I2C_Delay(2); + if (++ulTimes > I2C_READ_TIMEOUT) { + (VOID)I2C_Disable (Socket, Port); + return EFI_TIMEOUT; + } + ulFifo =3D I2C_GetTxStatus (Socket,Port); + } + } + else { + ulFifo =3D I2C_GetRxStatus (Socket,Port); + while (ulFifo =3D=3D 0) { + I2C_Delay(2); + if (++ulTimes > I2C_READ_TIMEOUT) { + (VOID)I2C_Disable (Socket, Port); + return EFI_TIMEOUT; + } + ulFifo =3D I2C_GetRxStatus (Socket,Port); + } + } + return EFI_SUCCESS; +} + EFI_STATUS EFIAPI WriteBeforeRead(I2C_DEVICE *I2cInfo, UINT32 ulLength, UINT8 *pBuf) @@ -247,17 +283,11 @@ WriteBeforeRead(I2C_DEVICE *I2cInfo, UINT32 ulLength,= UINT8 *pBuf) =20 I2C_SetTarget(I2cInfo->Socket,I2cInfo->Port,I2cInfo->SlaveDeviceAddres= s); =20 - ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); - while(0 !=3D ulFifo) - { - I2C_Delay(2); - if(++ulTimes > I2C_READ_TIMEOUT) - { - return EFI_TIMEOUT; - } - ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); + if (CheckI2CTimeOut (I2cInfo->Socket,I2cInfo->Port,I2CTx) =3D=3D EFI_T= IMEOUT) { + return EFI_TIMEOUT; } =20 + ulFifo =3D 0; for(ulCnt =3D 0; ulCnt < ulLength; ulCnt++) { ulTimes =3D 0; @@ -275,17 +305,8 @@ WriteBeforeRead(I2C_DEVICE *I2cInfo, UINT32 ulLength, = UINT8 *pBuf) ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); } =20 - ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); - ulTimes =3D 0; - while(0 !=3D ulFifo) - { - I2C_Delay(2); - - if(++ulTimes > I2C_READ_TIMEOUT) - { - return EFI_TIMEOUT; - } - ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); + if (CheckI2CTimeOut (I2cInfo->Socket,I2cInfo->Port,I2CTx) =3D=3D EFI_T= IMEOUT) { + return EFI_TIMEOUT; } =20 return EFI_SUCCESS; @@ -313,16 +334,8 @@ I2CWrite(I2C_DEVICE *I2cInfo, UINT16 InfoOffset, UINT3= 2 ulLength, UINT8 *pBuf) =20 I2C_SetTarget(I2cInfo->Socket,I2cInfo->Port,I2cInfo->SlaveDeviceAddres= s); =20 - ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); - while(0 !=3D ulFifo) - { - I2C_Delay(2); - if(++ulTimes > I2C_READ_TIMEOUT) - { - (VOID)I2C_Disable(I2cInfo->Socket, I2cInfo->Port); - return EFI_TIMEOUT; - } - ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); + if (CheckI2CTimeOut (I2cInfo->Socket,I2cInfo->Port,I2CTx) =3D=3D EFI_T= IMEOUT) { + return EFI_TIMEOUT; } =20 =20 @@ -336,17 +349,8 @@ I2CWrite(I2C_DEVICE *I2cInfo, UINT16 InfoOffset, UINT3= 2 ulLength, UINT8 *pBuf) I2C_REG_WRITE(Base + I2C_DATA_CMD_OFFSET, InfoOffset & 0xff); } =20 - ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); - ulTimes =3D 0; - while(0 !=3D ulFifo) - { - I2C_Delay(2); - if(++ulTimes > I2C_READ_TIMEOUT) - { - (VOID)I2C_Disable(I2cInfo->Socket, I2cInfo->Port); - return EFI_TIMEOUT; - } - ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); + if (CheckI2CTimeOut (I2cInfo->Socket,I2cInfo->Port,I2CTx) =3D=3D EFI_T= IMEOUT) { + return EFI_TIMEOUT; } =20 for(Idx =3D 0; Idx < ulLength; Idx++) @@ -372,20 +376,10 @@ I2CWrite(I2C_DEVICE *I2cInfo, UINT16 InfoOffset, UINT= 32 ulLength, UINT8 *pBuf) } } =20 - ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); - ulTimes =3D 0; - while(0 !=3D ulFifo) - { - I2C_Delay(2); - - if(++ulTimes > I2C_READ_TIMEOUT) - { - DEBUG ((EFI_D_ERROR, "I2C Write try to finished,time out!\n")); - (VOID)I2C_Disable(I2cInfo->Socket, I2cInfo->Port); - return EFI_TIMEOUT; - } - ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); + if (CheckI2CTimeOut (I2cInfo->Socket,I2cInfo->Port,I2CTx) =3D=3D EFI_T= IMEOUT) { + return EFI_TIMEOUT; } + (VOID)I2C_Disable(I2cInfo->Socket, I2cInfo->Port); =20 return EFI_SUCCESS; @@ -395,8 +389,6 @@ EFI_STATUS EFIAPI I2CRead(I2C_DEVICE *I2cInfo, UINT16 InfoOffset,UINT32 ulRxLen,UINT8 *pBuf) { - UINT32 ulFifo; - UINT32 ulTimes =3D 0; UINT8 I2CWAddr[2]; EFI_STATUS Status; UINT32 Idx =3D 0; @@ -434,17 +426,8 @@ I2CRead(I2C_DEVICE *I2cInfo, UINT16 InfoOffset,UINT32 = ulRxLen,UINT8 *pBuf) =20 I2C_SetTarget(I2cInfo->Socket,I2cInfo->Port,I2cInfo->SlaveDeviceAddres= s); =20 - ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); - while(0 !=3D ulFifo) - { - I2C_Delay(2); - - while(++ulTimes > I2C_READ_TIMEOUT) - { - (VOID)I2C_Disable(I2cInfo->Socket, I2cInfo->Port); - return EFI_TIMEOUT; - } - ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); + if (CheckI2CTimeOut (I2cInfo->Socket,I2cInfo->Port,I2CTx) =3D=3D EFI_T= IMEOUT) { + return EFI_TIMEOUT; } =20 while (ulRxLen > 0) { @@ -455,16 +438,9 @@ I2CRead(I2C_DEVICE *I2cInfo, UINT16 InfoOffset,UINT32 = ulRxLen,UINT8 *pBuf) I2C_REG_WRITE(Base + I2C_DATA_CMD_OFFSET, I2C_READ_SIGNAL | I2= C_CMD_STOP_BIT); } =20 - ulTimes =3D 0; - do { - I2C_Delay(2); - - while(++ulTimes > I2C_READ_TIMEOUT) { - (VOID)I2C_Disable(I2cInfo->Socket, I2cInfo->Port); - return EFI_TIMEOUT; - } - ulFifo =3D I2C_GetRxStatus(I2cInfo->Socket,I2cInfo->Port); - }while(0 =3D=3D ulFifo); + if (CheckI2CTimeOut (I2cInfo->Socket,I2cInfo->Port,I2CRx) =3D=3D E= FI_TIMEOUT) { + return EFI_TIMEOUT; + } =20 I2C_REG_READ(Base + I2C_DATA_CMD_OFFSET, pBuf[Idx++]); =20 @@ -481,8 +457,6 @@ I2CReadMultiByte(I2C_DEVICE *I2cInfo, UINT32 InfoOffset= ,UINT32 ulRxLen,UINT8 *pB { UINT32 ulCnt; UINT16 usTotalLen =3D 0; - UINT32 ulFifo; - UINT32 ulTimes =3D 0; UINT8 I2CWAddr[4]; EFI_STATUS Status; UINT32 BytesLeft; @@ -558,16 +532,9 @@ I2CReadMultiByte(I2C_DEVICE *I2cInfo, UINT32 InfoOffse= t,UINT32 ulRxLen,UINT8 *pB =20 =20 for(ulCnt =3D 0; ulCnt < BytesLeft; ulCnt++) { - ulTimes =3D 0; - do { - I2C_Delay(2); - - while(++ulTimes > I2C_READ_TIMEOUT) { - (VOID)I2C_Disable(I2cInfo->Socket, I2cInfo->Port); - return EFI_TIMEOUT; - } - ulFifo =3D I2C_GetRxStatus(I2cInfo->Socket,I2cInfo->Port); - }while(0 =3D=3D ulFifo); + if (CheckI2CTimeOut (I2cInfo->Socket,I2cInfo->Port,I2CRx) =3D=3D EFI= _TIMEOUT) { + return EFI_TIMEOUT; + } =20 I2C_REG_READ(Base + I2C_DATA_CMD_OFFSET, pBuf[Idx++]); } @@ -580,8 +547,6 @@ EFI_STATUS EFIAPI I2CWriteMultiByte(I2C_DEVICE *I2cInfo, UINT32 InfoOffset, UINT32 ulLength,= UINT8 *pBuf) { - UINT32 ulFifo; - UINT32 ulTimes =3D 0; UINT32 Idx; UINTN Base; =20 @@ -597,16 +562,8 @@ I2CWriteMultiByte(I2C_DEVICE *I2cInfo, UINT32 InfoOffs= et, UINT32 ulLength, UINT8 =20 I2C_SetTarget(I2cInfo->Socket,I2cInfo->Port,I2cInfo->SlaveDeviceAddres= s); =20 - ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); - while(0 !=3D ulFifo) - { - I2C_Delay(2); - if(++ulTimes > I2C_READ_TIMEOUT) - { - (VOID)I2C_Disable(I2cInfo->Socket, I2cInfo->Port); - return EFI_TIMEOUT; - } - ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); + if (CheckI2CTimeOut (I2cInfo->Socket,I2cInfo->Port,I2CTx) =3D=3D EFI_T= IMEOUT) { + return EFI_TIMEOUT; } =20 =20 @@ -630,7 +587,6 @@ I2CWriteMultiByte(I2C_DEVICE *I2cInfo, UINT32 InfoOffse= t, UINT32 ulLength, UINT8 =20 } =20 - ulTimes =3D 0; for(Idx =3D 0; Idx < ulLength; Idx++) { =20 @@ -638,20 +594,10 @@ I2CWriteMultiByte(I2C_DEVICE *I2cInfo, UINT32 InfoOff= set, UINT32 ulLength, UINT8 =20 } =20 - ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); - ulTimes =3D 0; - while(0 !=3D ulFifo) - { - I2C_Delay(2); - - if(++ulTimes > I2C_READ_TIMEOUT) - { - DEBUG ((EFI_D_ERROR, "I2C Write try to finished,time out!\n")); - (VOID)I2C_Disable(I2cInfo->Socket, I2cInfo->Port); - return EFI_TIMEOUT; - } - ulFifo =3D I2C_GetTxStatus(I2cInfo->Socket,I2cInfo->Port); + if (CheckI2CTimeOut (I2cInfo->Socket,I2cInfo->Port,I2CTx) =3D=3D EFI_T= IMEOUT) { + return EFI_TIMEOUT; } + (VOID)I2C_Disable(I2cInfo->Socket, I2cInfo->Port); =20 return EFI_SUCCESS; --=20 2.17.0 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel