From nobody Thu Apr 25 13:11:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+59806+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59806+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1589886981; cv=none; d=zohomail.com; s=zohoarc; b=TWJhCwLoNhOuKVH6zXRFqtiCnwPFQHHYRaLHmXX+FVIVurAScQBD2uoqIS8RKh3Ib0qfHRreSdYWeyQCUynadnXL335U2Fwz4D2z8Qol/L/AkqAWGXQxsHL/jqhJhOZqzs+TXgaXy84XQMfVMsz7wJ9NyLqJbujBbKduC8ec82I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589886981; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=FIv/8LainIyS8+KXC+l1HQmJHQQuaDyEAPhQCw4qG3k=; b=MHc5Y7V43HmsGGpwzeP0sWmaYqas4yDTznz36A/SZZLIzo6kb7YZZbx7PGmo7i5qQ9tH5xYmjg0w7zDT++r0cw6utaW4549ko5AfaERwW3vB/x97uZv9ZOfC6E7n488kR71Hroqj14tc+dRc+0N/hv5L4LGZ342yTDBXRt9SE5Y= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59806+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 158988698131061.81689387714516; Tue, 19 May 2020 04:16:21 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id a9liYY1788612xeZRV5R0kXC; Tue, 19 May 2020 04:16:20 -0700 X-Received: from huawei.com (huawei.com [45.249.212.190]) by mx.groups.io with SMTP id smtpd.web10.9505.1589886650526368564 for ; Tue, 19 May 2020 04:10:50 -0700 X-Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 7A3D968EF454D8AC8AB3; Tue, 19 May 2020 19:10:47 +0800 (CST) X-Received: from HGH1000039998.huawei.com (10.184.68.188) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.487.0; Tue, 19 May 2020 19:10:40 +0800 From: Ming Huang To: , , CC: , , , , Subject: [edk2-devel] [RFC edk2-platforms v2 1/3] Silicon/Hisilicon: Fix a typo issue in M41T83RealTimeClockLib Date: Tue, 19 May 2020 19:08:39 +0800 Message-ID: <1589886521-82250-2-git-send-email-huangming23@huawei.com> In-Reply-To: <1589886521-82250-1-git-send-email-huangming23@huawei.com> References: <1589886521-82250-1-git-send-email-huangming23@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.184.68.188] X-CFilter-Loop: Reflected Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,huangming23@huawei.com X-Gm-Message-State: yuNLxNZdsGZ8D0orYphHS4U0x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589886980; bh=BnSPPXoXCuizG7YzlXarWiAe7BydUkHjhUUjOyZ03eQ=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=P3NzgzjaWPYAaJ3o5t7s2WhqJvPTViv/9wSJZr2/N23LjH5Zrs6l+y8AdBd8rR2MQQA OYF1xrFCR/y2CW6Gaq8yVMtgmOsi2mTXCOYbMvn6n1oCYiJtaGefDqcLsfXQnlEsGj9/V MEXJDoflfKxvLqCsps0pdl1gGZJseWuvGBI= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There is a typo issue in M41T83RealTimeClockLib. The MACROSECOND should be MICROSECOND. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h = | 4 ++-- Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c = | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTim= eClock.h b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeC= lock.h index 67b8657..81ff459 100644 --- a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h +++ b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h @@ -13,9 +13,9 @@ // The delay is need for cpld and I2C. This is a empirical value. MemoryFe= nce is no need. #define RTC_DELAY_30_MS 30000 // The delay is need for cpld and I2C. This is a empirical value. MemoryFe= nce is no need. -#define RTC_DELAY_1000_MACROSECOND 1000 +#define RTC_DELAY_1000_MICROSECOND 1000 // The delay is need for cpld and I2C. This is a empirical value. MemoryFe= nce is no need. -#define RTC_DELAY_2_MACROSECOND 2 +#define RTC_DELAY_2_MICROSECOND 2 =20 #define M41T83_REGADDR_DOTSECONDS 0x00 #define M41T83_REGADDR_SECONDS 0x01 diff --git a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTim= eClockLib.c b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTi= meClockLib.c index 5131ce7..f339bcc 100644 --- a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockL= ib.c +++ b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockL= ib.c @@ -55,7 +55,7 @@ SwitchRtcI2cChannelAndLock ( Temp =3D Temp | CPU_GET_I2C_CONTROL; // CPU occupied RTC I2C State WriteCpldReg (CPLD_I2C_SWITCH_FLAG, Temp); - (VOID) MicroSecondDelay (RTC_DELAY_2_MACROSECOND); + (VOID) MicroSecondDelay (RTC_DELAY_2_MICROSECOND); Temp =3D ReadCpldReg (CPLD_I2C_SWITCH_FLAG); // Is preempt success if(CPU_GET_I2C_CONTROL =3D=3D (Temp & CPU_GET_I2C_CONTROL)) { @@ -109,7 +109,7 @@ RtcRead ( EFI_STATUS Status; =20 Status =3D I2CRead (&gRtcDevice, Address, Size, Data); - MicroSecondDelay (RTC_DELAY_1000_MACROSECOND); + MicroSecondDelay (RTC_DELAY_1000_MICROSECOND); return Status; } =20 @@ -132,7 +132,7 @@ RtcWrite ( EFI_STATUS Status; =20 Status =3D I2CWrite (&gRtcDevice, Address, Size, Data); - MicroSecondDelay (RTC_DELAY_1000_MACROSECOND); + MicroSecondDelay (RTC_DELAY_1000_MICROSECOND); return Status; } =20 @@ -164,7 +164,7 @@ InitializeM41T83 ( } =20 Status =3D I2CInit (gRtcDevice.Socket, gRtcDevice.Port, Normal); - MicroSecondDelay (RTC_DELAY_1000_MACROSECOND); + MicroSecondDelay (RTC_DELAY_1000_MICROSECOND); if (EFI_ERROR (Status)) { if (!EfiAtRuntime ()) { EfiReleaseLock (&mRtcLock); @@ -181,7 +181,7 @@ InitializeM41T83 ( return Status; } =20 - MicroSecondDelay(RTC_DELAY_1000_MACROSECOND); + MicroSecondDelay(RTC_DELAY_1000_MICROSECOND); =20 // Set ST at Power up to clear Oscillator fail detection(OF) Status =3D RtcRead (M41T83_REGADDR_SECONDS, 1, &Second.Uint8); @@ -272,7 +272,7 @@ LibSetTime ( if (EFI_ERROR (Status)) { return Status; } - (VOID)MicroSecondDelay (RTC_DELAY_1000_MACROSECOND); + (VOID)MicroSecondDelay (RTC_DELAY_1000_MICROSECOND); =20 SetMem (&BcdTime, sizeof (RTC_M41T83_TIME), 0); =20 @@ -376,7 +376,7 @@ LibGetTime ( return Status; } =20 - MicroSecondDelay(RTC_DELAY_1000_MACROSECOND); + MicroSecondDelay(RTC_DELAY_1000_MICROSECOND); =20 SetMem (&BcdTime, sizeof (RTC_M41T83_TIME), 0); SetMem (Time , sizeof (EFI_TIME), 0); --=20 2.8.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#59806): https://edk2.groups.io/g/devel/message/59806 Mute This Topic: https://groups.io/mt/74322488/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu Apr 25 13:11:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+59807+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59807+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1589886980; cv=none; d=zohomail.com; s=zohoarc; b=XwobKnzt0OMFvqadoIlEWsHtFxk4dsDtbuQCMGNZ8YfDPPZcZwFHwSQmCJIjiYDgRcfpWL7Y/LPl0DNQC1VTd6jCF6Zdi2il6j9SfrFkfbjLnC4oZank1kAKqUbQHpA2UY9zoLI3V4JXLdAsSRrtYdkPXafa/sG8NtF4Yf+5dZ0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589886980; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=pvdTy5AwN6a6JsSmsWLjEZaYNHo21W6YkEgGTmyL0ds=; b=D9UZmvKKa3KAgkzB9kEI4+xNmQ3StSF8Cl2VO4wkW7yf8KtJftRtifF5LyL/3SCbREvXZO43zWMqem5263uFtPKszI4nMevlK6su31lutze+bB2ErH6s/x4a0/8JFtLvwWYkMPr3xKBLd9nnabr2SawqQ4xkc1s+iAdZFG2hS/c= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59807+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589886980812125.8193381471524; Tue, 19 May 2020 04:16:20 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id YHFdYY1788612xXjE0auMGI5; Tue, 19 May 2020 04:16:20 -0700 X-Received: from huawei.com (huawei.com [45.249.212.190]) by mx.groups.io with SMTP id smtpd.web12.9703.1589886650526540545 for ; Tue, 19 May 2020 04:10:51 -0700 X-Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 7EC1148D09386B2AD310; Tue, 19 May 2020 19:10:47 +0800 (CST) X-Received: from HGH1000039998.huawei.com (10.184.68.188) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.487.0; Tue, 19 May 2020 19:10:41 +0800 From: Ming Huang To: , , CC: , , , , Subject: [edk2-devel] [RFC edk2-platforms v2 2/3] Hisilicon/Library: Move two functions to RtcHelperLib Date: Tue, 19 May 2020 19:08:40 +0800 Message-ID: <1589886521-82250-3-git-send-email-huangming23@huawei.com> In-Reply-To: <1589886521-82250-1-git-send-email-huangming23@huawei.com> References: <1589886521-82250-1-git-send-email-huangming23@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.184.68.188] X-CFilter-Loop: Reflected Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,huangming23@huawei.com X-Gm-Message-State: tNkYiz5tgsmVxpKQszDvK4t1x1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589886980; bh=MpxypRAVX+zyrgwjKW/ivrV4tRv06rG/Q1udMkxgbuA=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=nhjR5kvyaMuMVQ97/vhBfCR4kGAz2DfqymU0K8OwFI3BbdYcpp1sDE9oSEMzjQSPVto 0o0Mk99mjjxv6FEdKFE3+Ce1BrEhpa0e7S22cBEn3rsy+pBsUybxccg51REzJtQ4oBwzM GbITjBLebgCrPMtO4dAT8PbbsqbezlIRvbY= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The functions of acquiring ownership of RTC will be used for other RTC library, so move them to RtcHelperLib. Rename them by add leading Oem for uniform. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Platform/Hisilicon/D06/D06.dsc = | 1 + Silicon/Hisilicon/Include/Library/RtcHelperLib.h = | 29 ++++++ Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h = | 7 -- Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.c = | 92 ++----------------- Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockLib.in= f | 1 + Silicon/Hisilicon/Library/RtcHelperLib/RtcHelperLib.c = | 94 ++++++++++++++++++++ Silicon/Hisilicon/Library/RtcHelperLib/RtcHelperLib.inf = | 32 +++++++ 7 files changed, 164 insertions(+), 92 deletions(-) diff --git a/Platform/Hisilicon/D06/D06.dsc b/Platform/Hisilicon/D06/D06.dsc index 000a4ee..eb20224 100644 --- a/Platform/Hisilicon/D06/D06.dsc +++ b/Platform/Hisilicon/D06/D06.dsc @@ -54,6 +54,7 @@ CpldIoLib|Silicon/Hisilicon/Library/CpldIoLib/CpldIoLib.inf =20 TimeBaseLib|EmbeddedPkg/Library/TimeBaseLib/TimeBaseLib.inf + RtcHelperLib|Silicon/Hisilicon/Library/RtcHelperLib/RtcHelperLib.inf RealTimeClockLib|Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83= RealTimeClockLib.inf OemMiscLib|Platform/Hisilicon/D06/Library/OemMiscLibD06/OemMiscLibD06.inf OemAddressMapLib|Platform/Hisilicon/D06/Library/OemAddressMapD06/OemAddr= essMapD06.inf diff --git a/Silicon/Hisilicon/Include/Library/RtcHelperLib.h b/Silicon/His= ilicon/Include/Library/RtcHelperLib.h new file mode 100644 index 0000000..29ec900 --- /dev/null +++ b/Silicon/Hisilicon/Include/Library/RtcHelperLib.h @@ -0,0 +1,29 @@ +/** @file + + Copyright (c) 2018, Hisilicon Limited. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef RTC_HELPER_LIB_H__ +#define RTC_HELPER_LIB_H__ + +// The delay is need for cpld and I2C. This is a empirical value. MemoryFe= nce is no need. +#define RTC_DELAY_30_MS 30000 +// The delay is need for cpld and I2C. This is a empirical value. MemoryFe= nce is no need. +#define RTC_DELAY_1000_MICROSECOND 1000 +// The delay is need for cpld and I2C. This is a empirical value. MemoryFe= nce is no need. +#define RTC_DELAY_2_MICROSECOND 2 + +EFI_STATUS +OemSwitchRtcI2cChannelAndLock ( + VOID + ); + +VOID +OemReleaseOwnershipOfRtc ( + VOID + ); + +#endif diff --git a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTim= eClock.h b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeC= lock.h index 81ff459..09329c4 100644 --- a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h +++ b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClock.h @@ -10,13 +10,6 @@ #ifndef __M41T83_REAL_TIME_CLOCK_H__ #define __M41T83_REAL_TIME_CLOCK_H__ =20 -// The delay is need for cpld and I2C. This is a empirical value. MemoryFe= nce is no need. -#define RTC_DELAY_30_MS 30000 -// The delay is need for cpld and I2C. This is a empirical value. MemoryFe= nce is no need. -#define RTC_DELAY_1000_MICROSECOND 1000 -// The delay is need for cpld and I2C. This is a empirical value. MemoryFe= nce is no need. -#define RTC_DELAY_2_MICROSECOND 2 - #define M41T83_REGADDR_DOTSECONDS 0x00 #define M41T83_REGADDR_SECONDS 0x01 #define M41T83_REGADDR_MINUTES 0x02 diff --git a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTim= eClockLib.c b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTi= meClockLib.c index f339bcc..db356ca 100644 --- a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockL= ib.c +++ b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockL= ib.c @@ -11,10 +11,9 @@ #include #include #include -#include -#include #include #include +#include #include #include #include @@ -26,70 +25,6 @@ extern I2C_DEVICE gRtcDevice; =20 STATIC EFI_LOCK mRtcLock; =20 -EFI_STATUS -SwitchRtcI2cChannelAndLock ( - VOID - ) -{ - UINT8 Temp; - UINT8 Count; - - for (Count =3D 0; Count < 100; Count++) { - // To get the other side's state is idle first - Temp =3D ReadCpldReg (CPLD_I2C_SWITCH_FLAG); - if ((Temp & BIT3) !=3D 0) { - (VOID) MicroSecondDelay (RTC_DELAY_30_MS); - // Try 100 times, if BMC has not released the bus, return preemption= failed - if (Count =3D=3D 99) { - if (!EfiAtRuntime ()) { - DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Clear cpu_i2c_rtc_state 100 tim= es fail!\n", - __FUNCTION__, __LINE__)); - } - return EFI_DEVICE_ERROR; - } - continue; - } - - // if BMC free the bus, can be set 1 preemption - Temp =3D ReadCpldReg (CPLD_I2C_SWITCH_FLAG); - Temp =3D Temp | CPU_GET_I2C_CONTROL; - // CPU occupied RTC I2C State - WriteCpldReg (CPLD_I2C_SWITCH_FLAG, Temp); - (VOID) MicroSecondDelay (RTC_DELAY_2_MICROSECOND); - Temp =3D ReadCpldReg (CPLD_I2C_SWITCH_FLAG); - // Is preempt success - if(CPU_GET_I2C_CONTROL =3D=3D (Temp & CPU_GET_I2C_CONTROL)) { - break; - } - if (Count =3D=3D 99) { - if (!EfiAtRuntime ()) { - DEBUG((DEBUG_ERROR, "[%a]:[%dL] Clear cpu_i2c_rtc_state fail !!! = \n", - __FUNCTION__, __LINE__)); - } - return EFI_DEVICE_ERROR; - } - (VOID) MicroSecondDelay (RTC_DELAY_30_MS); - } - - //Polling BMC RTC I2C status - for (Count =3D 0; Count < 100; Count++) { - Temp =3D ReadCpldReg (CPLD_I2C_SWITCH_FLAG); - if ((Temp & BIT3) =3D=3D 0) { - return EFI_SUCCESS; - } - (VOID) MicroSecondDelay (RTC_DELAY_30_MS); - } - - //If the BMC occupies the RTC I2C Channel, write back the CPU side is id= le - // or the subsequent BMC will not preempt - Temp =3D ReadCpldReg (CPLD_I2C_SWITCH_FLAG); - Temp =3D Temp & (~CPU_GET_I2C_CONTROL); - WriteCpldReg (CPLD_I2C_SWITCH_FLAG, Temp); - - return EFI_NOT_READY; -} - - /** Read RTC content through its registers. =20 @@ -136,19 +71,6 @@ RtcWrite ( return Status; } =20 -VOID -ReleaseOwnershipOfRtc ( - VOID - ) -{ - UINT8 Temp; - - Temp =3D ReadCpldReg (CPLD_I2C_SWITCH_FLAG); - Temp =3D Temp & ~CPU_GET_I2C_CONTROL; - WriteCpldReg (CPLD_I2C_SWITCH_FLAG, Temp); -} - - EFI_STATUS InitializeM41T83 ( VOID @@ -172,7 +94,7 @@ InitializeM41T83 ( return Status; } =20 - Status =3D SwitchRtcI2cChannelAndLock (); + Status =3D OemSwitchRtcI2cChannelAndLock (); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "Get i2c preemption failed: %r\n", Status)); if (!EfiAtRuntime ()) { @@ -225,7 +147,7 @@ InitializeM41T83 ( =20 Exit: // Release RTC Lock. - ReleaseOwnershipOfRtc (); + OemReleaseOwnershipOfRtc (); if (!EfiAtRuntime ()) { EfiReleaseLock (&mRtcLock); } @@ -268,7 +190,7 @@ LibSetTime ( return EFI_INVALID_PARAMETER; } =20 - Status =3D SwitchRtcI2cChannelAndLock (); + Status =3D OemSwitchRtcI2cChannelAndLock (); if (EFI_ERROR (Status)) { return Status; } @@ -326,7 +248,7 @@ LibSetTime ( } =20 Exit: - ReleaseOwnershipOfRtc (); + OemReleaseOwnershipOfRtc (); // Release RTC Lock. if (!EfiAtRuntime ()) { if (EFI_ERROR (Status)) { @@ -371,7 +293,7 @@ LibGetTime ( return EFI_INVALID_PARAMETER; } =20 - Status =3D SwitchRtcI2cChannelAndLock (); + Status =3D OemSwitchRtcI2cChannelAndLock (); if (EFI_ERROR (Status)) { return Status; } @@ -416,7 +338,7 @@ LibGetTime ( } =20 Exit: - ReleaseOwnershipOfRtc (); + OemReleaseOwnershipOfRtc (); // Release RTC Lock. if (!EfiAtRuntime ()) { if (EFI_ERROR (Status)) { diff --git a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTim= eClockLib.inf b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83Real= TimeClockLib.inf index 9344c6d..5970c0e 100644 --- a/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockL= ib.inf +++ b/Silicon/Hisilicon/Library/M41T83RealTimeClockLib/M41T83RealTimeClockL= ib.inf @@ -31,6 +31,7 @@ I2CLib IoLib PcdLib + RtcHelperLib TimeBaseLib TimerLib UefiLib diff --git a/Silicon/Hisilicon/Library/RtcHelperLib/RtcHelperLib.c b/Silico= n/Hisilicon/Library/RtcHelperLib/RtcHelperLib.c new file mode 100644 index 0000000..af6b8dc --- /dev/null +++ b/Silicon/Hisilicon/Library/RtcHelperLib/RtcHelperLib.c @@ -0,0 +1,94 @@ +/** @file + + Copyright (c) 2020, Hisilicon Limited. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +EFI_STATUS +OemSwitchRtcI2cChannelAndLock ( + VOID + ) +{ + UINT8 Temp; + UINT8 Count; + + for (Count =3D 0; Count < 100; Count++) { + // To get the other side's state is idle first + Temp =3D ReadCpldReg (CPLD_I2C_SWITCH_FLAG); + if ((Temp & BIT3) !=3D 0) { + (VOID) MicroSecondDelay (RTC_DELAY_30_MS); + // Try 100 times, if BMC has not released the bus, return preemption= failed + if (Count =3D=3D 99) { + if (!EfiAtRuntime ()) { + DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Clear cpu_i2c_rtc_state 100 tim= es fail!\n", + __FUNCTION__, __LINE__)); + } + return EFI_DEVICE_ERROR; + } + continue; + } + + // if BMC free the bus, can be set 1 preemption + Temp =3D ReadCpldReg (CPLD_I2C_SWITCH_FLAG); + Temp =3D Temp | CPU_GET_I2C_CONTROL; + // CPU occupied RTC I2C State + WriteCpldReg (CPLD_I2C_SWITCH_FLAG, Temp); + (VOID)MicroSecondDelay (RTC_DELAY_2_MICROSECOND); + Temp =3D ReadCpldReg (CPLD_I2C_SWITCH_FLAG); + // Is preempt success + if (CPU_GET_I2C_CONTROL =3D=3D (Temp & CPU_GET_I2C_CONTROL)) { + break; + } + if (Count =3D=3D 99) { + if (!EfiAtRuntime ()) { + DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Clear cpu_i2c_rtc_state fail !!!= \n", + __FUNCTION__, __LINE__)); + } + return EFI_DEVICE_ERROR; + } + (VOID)MicroSecondDelay (RTC_DELAY_30_MS); + } + + //Polling BMC RTC I2C status + for (Count =3D 0; Count < 100; Count++) { + Temp =3D ReadCpldReg (CPLD_I2C_SWITCH_FLAG); + if ((Temp & BIT3) =3D=3D 0) { + return EFI_SUCCESS; + } + (VOID)MicroSecondDelay (RTC_DELAY_30_MS); + } + + //If the BMC occupies the RTC I2C Channel, write back the CPU side is id= le + // or the subsequent BMC will not preempt + Temp =3D ReadCpldReg (CPLD_I2C_SWITCH_FLAG); + Temp =3D Temp & (~CPU_GET_I2C_CONTROL); + WriteCpldReg (CPLD_I2C_SWITCH_FLAG, Temp); + + return EFI_NOT_READY; +} + +VOID +OemReleaseOwnershipOfRtc ( + VOID + ) +{ + UINT8 Temp; + + Temp =3D ReadCpldReg (CPLD_I2C_SWITCH_FLAG); + Temp =3D Temp & ~CPU_GET_I2C_CONTROL; + WriteCpldReg (CPLD_I2C_SWITCH_FLAG, Temp); + return ; +} diff --git a/Silicon/Hisilicon/Library/RtcHelperLib/RtcHelperLib.inf b/Sili= con/Hisilicon/Library/RtcHelperLib/RtcHelperLib.inf new file mode 100644 index 0000000..1a36e64 --- /dev/null +++ b/Silicon/Hisilicon/Library/RtcHelperLib/RtcHelperLib.inf @@ -0,0 +1,32 @@ +#/** @file +# +# Copyright (c) 2020, Hisilicon Limited. All rights reserved.
+# +# SPDX-License-Identifier: BSD-2-Clause-Patent +# +#**/ + +[Defines] + INF_VERSION =3D 0x0001001A + BASE_NAME =3D RtcHelperLib + FILE_GUID =3D 5cb1a98f-2408-4fef-b68f-d5d04ff6a91f + MODULE_TYPE =3D BASE + VERSION_STRING =3D 1.0 + LIBRARY_CLASS =3D RtcHelperLib + +[Sources.common] + RtcHelperLib.c + +[Packages] + EmbeddedPkg/EmbeddedPkg.dec + MdePkg/MdePkg.dec + Platform/Hisilicon/D06/D06.dec + Silicon/Hisilicon/HisiPkg.dec + +[LibraryClasses] + CpldIoLib + DebugLib + IoLib + +[Depex] + TRUE --=20 2.8.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#59807): https://edk2.groups.io/g/devel/message/59807 Mute This Topic: https://groups.io/mt/74322489/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Thu Apr 25 13:11:27 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+59809+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59809+1787277+3901457@groups.io ARC-Seal: i=1; a=rsa-sha256; t=1589886982; cv=none; d=zohomail.com; s=zohoarc; b=FM1awZdJqD4IXehxD6/41Zpwe4T3qJuBPpHggNMY3bp8PcIaF1QofHNfKnnBFJaxtoIgBV2bmrUWo4l3YOro+MztATz8kXyGxPyJR3PO1OnCFMG7cGiJq8SpRGmHTwyf/rxuxhi+uiXvKvagbqvsx1LJdxXNgxTe1nn8ZdSqbt0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589886982; h=Content-Type:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=5LdWYaf7EXJ40i+ATywclhiDOdJtxAj0Rw+4O9O+Q2c=; b=jwhEExqbMOEWbgAe2xhu61NikUB+VLxjjNwUo5phlI/qWnE4HokAOiizKnDtEPlE1FE09NZOmMytUJ1aNZFSJfRHsAAIVNexd21oybnHj1sxrfjE1boBexa+3wxRL8c0wjNMyx1FcKalI3wAM3YaOU5w6ZnB9MoQzJJxGq3OcjU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+59809+1787277+3901457@groups.io Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1589886982291776.8617209277111; Tue, 19 May 2020 04:16:22 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id oMl7YY1788612xFrDqH9apfm; Tue, 19 May 2020 04:16:21 -0700 X-Received: from huawei.com (huawei.com [45.249.212.190]) by mx.groups.io with SMTP id smtpd.web12.9704.1589886652138845907 for ; Tue, 19 May 2020 04:10:53 -0700 X-Received: from DGGEMS409-HUB.china.huawei.com (unknown [172.30.72.60]) by Forcepoint Email with ESMTP id 843EE274822EEC6D61F7; Tue, 19 May 2020 19:10:47 +0800 (CST) X-Received: from HGH1000039998.huawei.com (10.184.68.188) by DGGEMS409-HUB.china.huawei.com (10.3.19.209) with Microsoft SMTP Server id 14.3.487.0; Tue, 19 May 2020 19:10:41 +0800 From: Ming Huang To: , , CC: , , , , Subject: [edk2-devel] [RFC edk2-platforms v2 3/3] Silicon/Hisilicon: Add RX8900RealTimeClockLib Date: Tue, 19 May 2020 19:08:41 +0800 Message-ID: <1589886521-82250-4-git-send-email-huangming23@huawei.com> In-Reply-To: <1589886521-82250-1-git-send-email-huangming23@huawei.com> References: <1589886521-82250-1-git-send-email-huangming23@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.184.68.188] X-CFilter-Loop: Reflected Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,huangming23@huawei.com X-Gm-Message-State: kDkguMLC7v6y94C9HbI6Qfsrx1787277AA= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1589886981; bh=Pdot1E/etCZQWkiHRd3y2RX0ugCQdJIiPJ08DTnpUtQ=; h=CC:Content-Type:Date:From:Reply-To:Subject:To; b=vLjTwIpK8vLDpGPKCGjtTuo5aJHe7Xe6g3zqA+5uGmJFj0gGPONELVXCdAsWYUZcxly THMUYELBFDxz0QUPE9MOkM8x2YyzcSSA9O9JdNtl7GT+jil++gq9JeDrb7vr19uYORUsI LAS8JU9zGMdL5FWsjWv567o48v66RGbYZiA= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There are some boards base on D06, but use RX8900 RTC, so upstream the RX8900RealTimeClockLib. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ming Huang --- Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900RealTimeClock.h = | 39 ++ Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900RealTimeClockLib.c = | 468 ++++++++++++++++++++ Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900RealTimeClockLib.in= f | 33 ++ 3 files changed, 540 insertions(+) diff --git a/Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900RealTim= eClock.h b/Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900RealTimeC= lock.h new file mode 100644 index 0000000..ac2be7e --- /dev/null +++ b/Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900RealTimeClock.h @@ -0,0 +1,39 @@ +/** @file + + Copyright (c) 2020, Hisilicon Limited. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#ifndef RX8900_REAL_TIME_CLOCK_H__ +#define RX8900_REAL_TIME_CLOCK_H__ + +#define RX8900_REGADDR_SECONDS 0x00 +#define RX8900_REGADDR_MIUTES 0x01 +#define RX8900_REGADDR_HOURS 0x02 +#define RX8900_REGADDR_DAY 0x03 +#define RX8900_REGADDR_DATE 0x04 +#define RX8900_REGADDR_MONTH 0x05 +#define RX8900_REGADDR_YEAR 0x06 +#define RX8900_REGADDR_RAM 0x07 +#define RX8900_REGADDR_ALARMMIN 0x08 +#define RX8900_REGADDR_ALARMHOUR 0x09 +#define RX8900_REGADDR_ALARMDAY 0x0A +#define RX8900_REGADDR_ALARMWEEK 0x0A +#define RX8900_REGADDR_TIMECOUNTER_0 0x0B +#define RX8900_REGADDR_TIMECOUNTER_1 0x0C +#define RX8900_REGADDR_EXTENSIONREG 0x0D +#define RX8900_REGADDR_FLAGREG 0x0E +#define RX8900_REGADDR_CONTRLREG 0xF +#define RX8900_REGADDR_BACKUP_FUN 0x18 + +#define RX8900_VDETOFF_SWOFF 0x0C +#define TEMPERATURE_COMPENSATION_2S 0x40 +#define OUTPUT_FREQUENCY_32768 0x0C +#define FLAG_REG_DEFAULT 0x00 +#define RX8900_RAM_REG_DEFAULT 0x5A + +#define EFI_TIMEOFFSET_TIMEZONE 0x5A0 + +#endif diff --git a/Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900RealTim= eClockLib.c b/Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900RealTi= meClockLib.c new file mode 100644 index 0000000..713bb7f --- /dev/null +++ b/Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900RealTimeClockL= ib.c @@ -0,0 +1,468 @@ +/** @file + + Copyright (c) 2020, Hisilicon Limited. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "RX8900RealTimeClock.h" + +extern I2C_DEVICE gRtcDevice; + +STATIC BOOLEAN mRX8900Initialized =3D FALSE; +STATIC CONST CHAR16 mTimeZoneVariableName[] =3D L"RX8900RtcTimeZone"; +STATIC CONST CHAR16 mDaylightVariableName[] =3D L"RX8900RtcDaylight"; + +EFI_STATUS +InitializeRX8900 ( + VOID + ) +{ + EFI_STATUS Status; + unsigned char writeTemp; + + Status =3D OemSwitchRtcI2cChannelAndLock (); + if (EFI_ERROR (Status)) { + goto EXIT; + } + + Status =3D I2CInit (gRtcDevice.Socket, gRtcDevice.Port, Normal); + if (EFI_ERROR (Status)) { + goto EXIT; + } + + writeTemp =3D RX8900_VDETOFF_SWOFF; + Status =3D I2CWrite (&gRtcDevice, RX8900_REGADDR_BACKUP_FUN, 1, &writeTe= mp); + if (EFI_ERROR (Status)) { + goto EXIT; + } + writeTemp =3D TEMPERATURE_COMPENSATION_2S; + Status =3D I2CWrite (&gRtcDevice, RX8900_REGADDR_CONTRLREG, 1, &writeTem= p); + if (EFI_ERROR (Status)) { + goto EXIT; + } + writeTemp =3D OUTPUT_FREQUENCY_32768; + Status =3D I2CWrite (&gRtcDevice, RX8900_REGADDR_EXTENSIONREG, 1, &write= Temp); + if (EFI_ERROR (Status)) { + goto EXIT; + } + + writeTemp =3D FLAG_REG_DEFAULT; + Status =3D I2CWrite (&gRtcDevice, RX8900_REGADDR_FLAGREG, 1, &writeTemp); + if (EFI_ERROR (Status)) { + goto EXIT; + } + writeTemp =3D RX8900_RAM_REG_DEFAULT; + Status =3D I2CWrite (&gRtcDevice, RX8900_REGADDR_RAM, 1, &writeTemp); + if (EFI_ERROR (Status)) { + goto EXIT; + } + + mRX8900Initialized =3D TRUE; + + EXIT: + + OemReleaseOwnershipOfRtc (); + return Status; +} + +STATIC +INT16 +GetTimeZone ( + VOID + ) +{ + EFI_STATUS Status; + INT16 TimeZone; + UINTN Size; + + TimeZone =3D EFI_UNSPECIFIED_TIMEZONE; + Size =3D sizeof (TimeZone); + Status =3D EfiGetVariable ( + (CHAR16 *)mTimeZoneVariableName, + &gEfiCallerIdGuid, + NULL, + &Size, + (VOID *)&TimeZone + ); + + if (EFI_ERROR (Status)) { + TimeZone =3D EFI_UNSPECIFIED_TIMEZONE; + // The time zone variable does not exist in non-volatile storage, so c= reate it. + Status =3D EfiSetVariable ( + (CHAR16 *)mTimeZoneVariableName, + &gEfiCallerIdGuid, + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS= | EFI_VARIABLE_RUNTIME_ACCESS, + Size, + (VOID *)&TimeZone + ); + + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_INFO, "Failed to save %s variable, Status =3D %r\n", + mTimeZoneVariableName, Status)); + } + } else { + // Check TimeZone bounds: -1440 to 1440 or 2047 + if ((TimeZone < -EFI_TIMEOFFSET_TIMEZONE) || (TimeZone > EFI_TIMEOFFSE= T_TIMEZONE)) { + TimeZone =3D EFI_UNSPECIFIED_TIMEZONE; + } + } + + return TimeZone; +} + +STATIC +UINT8 +GetDayLight ( + VOID + ) +{ + EFI_STATUS Status; + UINT8 DayLight; + UINTN Size; + + DayLight =3D 0; + // Get the current daylight information from non-volatile storage + Size =3D sizeof (DayLight); + Status =3D EfiGetVariable ( + (CHAR16 *)mDaylightVariableName, + &gEfiCallerIdGuid, + NULL, + &Size, + (VOID *)&DayLight + ); + + if (EFI_ERROR (Status)) { + DayLight =3D 0; + // The daylight variable does not exist in non-volatile storage, so cr= eate it. + Status =3D EfiSetVariable ( + (CHAR16 *)mDaylightVariableName, + &gEfiCallerIdGuid, + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS= | EFI_VARIABLE_RUNTIME_ACCESS, + Size, + (VOID *)&DayLight + ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_INFO, "Failed to save %s variable, Status =3D %r\n", + mDaylightVariableName, Status)); + } + } + + return DayLight; +} + +EFI_STATUS +EFIAPI +LibGetTime ( + OUT EFI_TIME *Time, + OUT EFI_TIME_CAPABILITIES *Capabilities + ) +{ + EFI_STATUS Status; + UINT8 Temp[7] =3D {0}; + UINT16 BaseYear =3D 2000; + UINTN EpochSeconds; + UINT8 TryCount =3D 0; + + // Ensure Time is a valid pointer + if (Time =3D=3D NULL) { + return EFI_INVALID_PARAMETER; + } + + // Initialize the hardware if not already done + if (!mRX8900Initialized) { + Status =3D InitializeRX8900 (); + if (EFI_ERROR (Status)) { + return EFI_NOT_READY; + } + } + + Status =3D OemSwitchRtcI2cChannelAndLock (); + if (EFI_ERROR (Status)) { + OemReleaseOwnershipOfRtc (); + return Status; + } + + do { + Status =3D I2CRead (&gRtcDevice, RX8900_REGADDR_SECONDS, 7, Temp); + if (EFI_ERROR (Status)) { + Status =3D EFI_DEVICE_ERROR; + goto Err; + } + + Time->Second =3D BcdToDecimal8 (Temp[0]); + Time->Minute =3D BcdToDecimal8 (Temp[1]); + Time->Hour =3D BcdToDecimal8 (Temp[2]); + Time->Day =3D BcdToDecimal8 (Temp[4]); + Time->Month =3D BcdToDecimal8 (Temp[5]); + Time->Year =3D BaseYear + BcdToDecimal8 (Temp[6]); + Time->Nanosecond =3D 0; + + EpochSeconds =3D EfiTimeToEpoch (Time); + + Time->TimeZone =3D GetTimeZone (); + // Adjust for the correct time zone + if (Time->TimeZone !=3D EFI_UNSPECIFIED_TIMEZONE) { + EpochSeconds +=3D Time->TimeZone * SEC_PER_MIN; + } + + Time->Daylight =3D GetDayLight (); + // Adjust for the correct period + if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) =3D=3D EFI_TIME_IN_DAYLIGH= T) { + // Convert to adjusted time, i.e. spring forwards one hour + EpochSeconds +=3D SEC_PER_HOUR; + } + + // Convert from internal 32-bit time to UEFI time + EpochToEfiTime (EpochSeconds, Time); + if ((!IsTimeValid (Time)) || ((Time->Year - BaseYear) > 99) || (Time->= Year < 2000)) { + DEBUG ((DEBUG_INFO, "LibGetTime: %d-%d-%d %d-%d-%d EpochSeconds:%llx= is invalid time!\n", + Time->Second, Time->Minute, Time->Hour, Time->Day, Time->Month, + Time->Year, EpochSeconds)); + Status =3D EFI_DEVICE_ERROR; + } + +Err: + TryCount++; + } while ((TryCount < 3) && (EFI_ERROR (Status))); + + OemReleaseOwnershipOfRtc (); + return Status; +} + +STATIC +EFI_STATUS +SetTimeToRX8900 ( + IN EFI_TIME *Time + ) +{ + EFI_STATUS Status; + UINT8 Temp; + + (VOID)MicroSecondDelay (RTC_DELAY_1000_MICROSECOND); + Temp =3D DecimalToBcd8 (Time->Second); + Status =3D I2CWrite (&gRtcDevice, RX8900_REGADDR_SECONDS, 1, &Temp); + if(EFI_ERROR (Status)) { + Status =3D EFI_DEVICE_ERROR; + return Status; + } + + Temp =3D DecimalToBcd8 (Time->Minute); + (VOID)MicroSecondDelay (RTC_DELAY_1000_MICROSECOND); + Status =3D I2CWrite (&gRtcDevice, RX8900_REGADDR_MIUTES, 1, &Temp); + if(EFI_ERROR (Status)) { + Status =3D EFI_DEVICE_ERROR; + return Status; + } + + Temp =3D DecimalToBcd8 (Time->Hour); + (VOID)MicroSecondDelay (RTC_DELAY_1000_MICROSECOND); + Status =3D I2CWrite (&gRtcDevice, RX8900_REGADDR_HOURS, 1, &Temp); + if(EFI_ERROR (Status)) { + Status =3D EFI_DEVICE_ERROR; + return Status; + } + + Temp =3D DecimalToBcd8 (Time->Day); + (VOID)MicroSecondDelay (RTC_DELAY_1000_MICROSECOND); + Status =3D I2CWrite (&gRtcDevice, RX8900_REGADDR_DATE, 1, &Temp); + if(EFI_ERROR (Status)) { + Status =3D EFI_DEVICE_ERROR; + return Status; + } + + Temp =3D DecimalToBcd8 (Time->Month); + (VOID)MicroSecondDelay (RTC_DELAY_1000_MICROSECOND); + Status =3D I2CWrite (&gRtcDevice, RX8900_REGADDR_MONTH, 1, &Temp); + if(EFI_ERROR (Status)) { + Status =3D EFI_DEVICE_ERROR; + return Status; + } + + Time->Year=3D Time->Year % 100; + Temp =3D Time->Year; + Temp =3D DecimalToBcd8 (Temp); + (VOID)MicroSecondDelay (RTC_DELAY_1000_MICROSECOND); + Status =3D I2CWrite (&gRtcDevice, RX8900_REGADDR_YEAR, 1, &Temp); + if(EFI_ERROR (Status)) { + Status =3D EFI_DEVICE_ERROR; + return Status; + } + + return Status; +} + +EFI_STATUS +EFIAPI +LibSetTime ( + IN EFI_TIME *Time + ) +{ + EFI_STATUS Status; + UINTN EpochSeconds; + + // Initialize the hardware if not already done + if (!mRX8900Initialized) { + Status =3D InitializeRX8900 (); + if (EFI_ERROR (Status)) { + goto EXIT; + } + } + + Status =3D OemSwitchRtcI2cChannelAndLock (); + if (EFI_ERROR (Status)) { + goto EXIT; + } + + if(!IsTimeValid(Time)){ + return EFI_INVALID_PARAMETER; + } + + EpochSeconds =3D EfiTimeToEpoch (Time); + + // Adjust for the correct time zone, i.e. convert to UTC time zone + if (Time->TimeZone !=3D EFI_UNSPECIFIED_TIMEZONE) { + EpochSeconds -=3D Time->TimeZone * SEC_PER_MIN; + } + + // Adjust for the correct period + if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) =3D=3D EFI_TIME_IN_DAYLIGHT)= { + // Convert to un-adjusted time, i.e. fall back one hour + EpochSeconds -=3D SEC_PER_HOUR; + } + + EpochToEfiTime (EpochSeconds, Time); + Status =3D SetTimeToRX8900 (Time); + if (EFI_ERROR (Status)) { + goto EXIT; + } + + // Save the current time zone information into non-volatile storage + Status =3D EfiSetVariable ( + (CHAR16 *)mTimeZoneVariableName, + &gEfiCallerIdGuid, + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS |= EFI_VARIABLE_RUNTIME_ACCESS, + sizeof (Time->TimeZone), + (VOID *)&(Time->TimeZone) + ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_INFO, "LibSetTime: Failed to save %s variable, Status = =3D %r\n", + mTimeZoneVariableName, Status)); + goto EXIT; + } + + // Save the current daylight information into non-volatile storage + Status =3D EfiSetVariable ( + (CHAR16 *)mDaylightVariableName, + &gEfiCallerIdGuid, + EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS |= EFI_VARIABLE_RUNTIME_ACCESS, + sizeof(Time->Daylight), + (VOID *)&(Time->Daylight) + ); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_INFO, "LibSetTime: Failed to save %s variable, Status = =3D %r\n", + mDaylightVariableName, Status)); + goto EXIT; + } + + EXIT: + OemReleaseOwnershipOfRtc (); + return Status; +} + +EFI_STATUS +EFIAPI +LibGetWakeupTime ( + OUT BOOLEAN *Enabled, + OUT BOOLEAN *Pending, + OUT EFI_TIME *Time + ) +{ + // Not a required feature + return EFI_UNSUPPORTED; +} + +EFI_STATUS +EFIAPI +LibSetWakeupTime ( + IN BOOLEAN Enabled, + OUT EFI_TIME *Time + ) +{ + // Not a required feature + return EFI_UNSUPPORTED; +} + + +EFI_STATUS +EFIAPI +LibRtcInitialize ( + IN EFI_HANDLE ImageHandle, + IN EFI_SYSTEM_TABLE *SystemTable + ) +{ + EFI_STATUS Status; + EFI_HANDLE Handle; + EFI_TIME EfiTime; + + // Setup the setters and getters + gRT->GetTime =3D LibGetTime; + gRT->SetTime =3D LibSetTime; + gRT->GetWakeupTime =3D LibGetWakeupTime; + gRT->SetWakeupTime =3D LibSetWakeupTime; + + Status =3D gRT->GetTime (&EfiTime, NULL); + if (EFI_ERROR (Status) || (EfiTime.Year < 2000) || (EfiTime.Year > 2099)= || + (!IsTimeValid (&EfiTime))) { + EfiTime.Year =3D 2000; + EfiTime.Month =3D 1; + EfiTime.Day =3D 1; + EfiTime.Hour =3D 0; + EfiTime.Minute =3D 0; + EfiTime.Second =3D 0; + EfiTime.Nanosecond =3D 0; + EfiTime.Daylight =3D 0; + EfiTime.TimeZone =3D EFI_UNSPECIFIED_TIMEZONE; + + Status =3D gRT->SetTime (&EfiTime); + if (EFI_ERROR (Status)) { + DEBUG ((DEBUG_ERROR, "SetTime Status : %r\n", Status)); + } + } + + Handle =3D NULL; + Status =3D gBS->InstallMultipleProtocolInterfaces ( + &Handle, + &gEfiRealTimeClockArchProtocolGuid, + NULL, + NULL + ); + + return Status; +} + + +VOID +EFIAPI +LibRtcVirtualNotifyEvent ( + IN EFI_EVENT Event, + IN VOID *Context + ) +{ + return; +} diff --git a/Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900RealTim= eClockLib.inf b/Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900Real= TimeClockLib.inf new file mode 100644 index 0000000..aa07a06 --- /dev/null +++ b/Silicon/Hisilicon/Library/RX8900RealTimeClockLib/RX8900RealTimeClockL= ib.inf @@ -0,0 +1,33 @@ +/** @file + + Copyright (c) 2020, Hisilicon Limited. All rights reserved.
+ + SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +[Defines] + INF_VERSION =3D 0x0001001A + BASE_NAME =3D RX8900RealTimeClockLib + FILE_GUID =3D 55BBD010-EA76-4836-8FEA-99CBAA6664F4 + MODULE_TYPE =3D BASE + VERSION_STRING =3D 1.0 + LIBRARY_CLASS =3D RealTimeClockLib + +[Sources.common] + RX8900RealTimeClockLib.c + +[Packages] + EmbeddedPkg/EmbeddedPkg.dec + MdePkg/MdePkg.dec + Silicon/Hisilicon/HisiPkg.dec + +[LibraryClasses] + DebugLib + I2CLib + IoLib + RtcHelperLib + TimeBaseLib + TimerLib + UefiLib + UefiRuntimeLib --=20 2.8.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#59809): https://edk2.groups.io/g/devel/message/59809 Mute This Topic: https://groups.io/mt/74322491/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-