* [PATCH 0/3] Import a few items from OpenPlatformPkg
@ 2017-05-03 21:38 Leif Lindholm
2017-05-03 21:38 ` [PATCH 1/3] EmbeddedPkg: import DesignWare EMMC driver Leif Lindholm
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Leif Lindholm @ 2017-05-03 21:38 UTC (permalink / raw)
To: edk2-devel; +Cc: Ard Biesheuvel, Laszlo Ersek
In preparation for moving OpenPlatformPkg into edk2-platforms:
- move across the DesignWare EMMC driver
- import EfiTimeBaseLib
EfiTimeBaseLib started out as some generically useful functions pulled
out of PL031RealTimeClockLib and used also for other RTC devices.
We re-align it with the original version before importing it to
EmbeddedPkg, followed by one patch that atomically strips these functions
from PL031RealTimeClockLib, turns PL031RealTimeClockLib into a consumer
of EfiTimeBaseLib, and inserts this library resolution in ArmVirtPkg,
which is the only user of PL031RealTimeClockLib in the main edk2
repository.
Any out of tree users will need to add the same resolution.
Cc: Laszlo Ersek <lersek@redhat.com>
Leif Lindholm (3):
EmbeddedPkg: import DesignWare EMMC driver
EmbeddedPkg: import EfiTimeBaseLib
ArmPlatformPkg,ArmVirtPkg: delete redundant PL031 functions
.../Include/Drivers/PL031RealTimeClock.h | 11 -
.../PL031RealTimeClockLib/PL031RealTimeClockLib.c | 127 +---
.../PL031RealTimeClockLib.inf | 1 +
ArmVirtPkg/ArmVirt.dsc.inc | 1 +
EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmc.h | 127 ++++
EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c | 648 +++++++++++++++++++++
EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf | 53 ++
EmbeddedPkg/EmbeddedPkg.dec | 4 +
EmbeddedPkg/Include/Library/EfiTimeBaseLib.h | 68 +++
.../Library/EfiTimeBaseLib/EfiTimeBaseLib.c | 171 ++++++
.../Library/EfiTimeBaseLib/EfiTimeBaseLib.inf | 34 ++
11 files changed, 1110 insertions(+), 135 deletions(-)
create mode 100644 EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmc.h
create mode 100644 EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c
create mode 100644 EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf
create mode 100644 EmbeddedPkg/Include/Library/EfiTimeBaseLib.h
create mode 100644 EmbeddedPkg/Library/EfiTimeBaseLib/EfiTimeBaseLib.c
create mode 100644 EmbeddedPkg/Library/EfiTimeBaseLib/EfiTimeBaseLib.inf
--
2.11.0
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/3] EmbeddedPkg: import DesignWare EMMC driver
2017-05-03 21:38 [PATCH 0/3] Import a few items from OpenPlatformPkg Leif Lindholm
@ 2017-05-03 21:38 ` Leif Lindholm
2017-05-03 21:38 ` [PATCH 2/3] EmbeddedPkg: import EfiTimeBaseLib Leif Lindholm
2017-05-03 21:38 ` [PATCH 3/3] ArmPlatformPkg, ArmVirtPkg: delete redundant PL031 functions Leif Lindholm
2 siblings, 0 replies; 6+ messages in thread
From: Leif Lindholm @ 2017-05-03 21:38 UTC (permalink / raw)
To: edk2-devel; +Cc: Ard Biesheuvel
Imported from OpenPlatformPkg 0434ff62e3eb896e6c561dea84cfb8b80391603e.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmc.h | 127 ++++++
EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c | 648 ++++++++++++++++++++++++++++
EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf | 53 +++
EmbeddedPkg/EmbeddedPkg.dec | 4 +
4 files changed, 832 insertions(+)
create mode 100644 EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmc.h
create mode 100644 EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c
create mode 100644 EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf
diff --git a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmc.h b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmc.h
new file mode 100644
index 0000000000..055f1e05d1
--- /dev/null
+++ b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmc.h
@@ -0,0 +1,127 @@
+/** @file
+*
+* Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
+*
+* This program and the accompanying materials
+* are licensed and made available under the terms and conditions of the BSD License
+* which accompanies this distribution. The full text of the license may be found at
+* http://opensource.org/licenses/bsd-license.php
+*
+* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+*
+**/
+
+
+#ifndef __DWEMMC_H__
+#define __DWEMMC_H__
+
+#include <Protocol/EmbeddedGpio.h>
+
+// DW MMC Registers
+#define DWEMMC_CTRL ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x000)
+#define DWEMMC_PWREN ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x004)
+#define DWEMMC_CLKDIV ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x008)
+#define DWEMMC_CLKSRC ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x00c)
+#define DWEMMC_CLKENA ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x010)
+#define DWEMMC_TMOUT ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x014)
+#define DWEMMC_CTYPE ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x018)
+#define DWEMMC_BLKSIZ ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x01c)
+#define DWEMMC_BYTCNT ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x020)
+#define DWEMMC_INTMASK ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x024)
+#define DWEMMC_CMDARG ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x028)
+#define DWEMMC_CMD ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x02c)
+#define DWEMMC_RESP0 ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x030)
+#define DWEMMC_RESP1 ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x034)
+#define DWEMMC_RESP2 ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x038)
+#define DWEMMC_RESP3 ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x03c)
+#define DWEMMC_RINTSTS ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x044)
+#define DWEMMC_STATUS ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x048)
+#define DWEMMC_FIFOTH ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x04c)
+#define DWEMMC_DEBNCE ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x064)
+#define DWEMMC_UHSREG ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x074)
+#define DWEMMC_BMOD ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x080)
+#define DWEMMC_DBADDR ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x088)
+#define DWEMMC_IDSTS ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x08c)
+#define DWEMMC_IDINTEN ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x090)
+#define DWEMMC_DSCADDR ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x094)
+#define DWEMMC_BUFADDR ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0x098)
+#define DWEMMC_CARDTHRCTL ((UINT32)PcdGet32 (PcdDwEmmcDxeBaseAddress) + 0X100)
+
+#define CMD_UPDATE_CLK 0x80202000
+#define CMD_START_BIT (1 << 31)
+
+#define MMC_8BIT_MODE (1 << 16)
+
+#define BIT_CMD_RESPONSE_EXPECT (1 << 6)
+#define BIT_CMD_LONG_RESPONSE (1 << 7)
+#define BIT_CMD_CHECK_RESPONSE_CRC (1 << 8)
+#define BIT_CMD_DATA_EXPECTED (1 << 9)
+#define BIT_CMD_READ (0 << 10)
+#define BIT_CMD_WRITE (1 << 10)
+#define BIT_CMD_BLOCK_TRANSFER (0 << 11)
+#define BIT_CMD_STREAM_TRANSFER (1 << 11)
+#define BIT_CMD_SEND_AUTO_STOP (1 << 12)
+#define BIT_CMD_WAIT_PRVDATA_COMPLETE (1 << 13)
+#define BIT_CMD_STOP_ABORT_CMD (1 << 14)
+#define BIT_CMD_SEND_INIT (1 << 15)
+#define BIT_CMD_UPDATE_CLOCK_ONLY (1 << 21)
+#define BIT_CMD_READ_CEATA_DEVICE (1 << 22)
+#define BIT_CMD_CCS_EXPECTED (1 << 23)
+#define BIT_CMD_ENABLE_BOOT (1 << 24)
+#define BIT_CMD_EXPECT_BOOT_ACK (1 << 25)
+#define BIT_CMD_DISABLE_BOOT (1 << 26)
+#define BIT_CMD_MANDATORY_BOOT (0 << 27)
+#define BIT_CMD_ALTERNATE_BOOT (1 << 27)
+#define BIT_CMD_VOLT_SWITCH (1 << 28)
+#define BIT_CMD_USE_HOLD_REG (1 << 29)
+#define BIT_CMD_START (1 << 31)
+
+#define DWEMMC_INT_EBE (1 << 15) /* End-bit Err */
+#define DWEMMC_INT_SBE (1 << 13) /* Start-bit Err */
+#define DWEMMC_INT_HLE (1 << 12) /* Hardware-lock Err */
+#define DWEMMC_INT_FRUN (1 << 11) /* FIFO UN/OV RUN */
+#define DWEMMC_INT_DRT (1 << 9) /* Data timeout */
+#define DWEMMC_INT_RTO (1 << 8) /* Response timeout */
+#define DWEMMC_INT_DCRC (1 << 7) /* Data CRC err */
+#define DWEMMC_INT_RCRC (1 << 6) /* Response CRC err */
+#define DWEMMC_INT_RXDR (1 << 5)
+#define DWEMMC_INT_TXDR (1 << 4)
+#define DWEMMC_INT_DTO (1 << 3) /* Data trans over */
+#define DWEMMC_INT_CMD_DONE (1 << 2)
+#define DWEMMC_INT_RE (1 << 1)
+
+#define DWEMMC_IDMAC_DES0_DIC (1 << 1)
+#define DWEMMC_IDMAC_DES0_LD (1 << 2)
+#define DWEMMC_IDMAC_DES0_FS (1 << 3)
+#define DWEMMC_IDMAC_DES0_CH (1 << 4)
+#define DWEMMC_IDMAC_DES0_ER (1 << 5)
+#define DWEMMC_IDMAC_DES0_CES (1 << 30)
+#define DWEMMC_IDMAC_DES0_OWN (1 << 31)
+#define DWEMMC_IDMAC_DES1_BS1(x) ((x) & 0x1fff)
+#define DWEMMC_IDMAC_DES2_BS2(x) (((x) & 0x1fff) << 13)
+#define DWEMMC_IDMAC_SWRESET (1 << 0)
+#define DWEMMC_IDMAC_FB (1 << 1)
+#define DWEMMC_IDMAC_ENABLE (1 << 7)
+
+#define EMMC_FIX_RCA 6
+
+/* bits in MMC0_CTRL */
+#define DWEMMC_CTRL_RESET (1 << 0)
+#define DWEMMC_CTRL_FIFO_RESET (1 << 1)
+#define DWEMMC_CTRL_DMA_RESET (1 << 2)
+#define DWEMMC_CTRL_INT_EN (1 << 4)
+#define DWEMMC_CTRL_DMA_EN (1 << 5)
+#define DWEMMC_CTRL_IDMAC_EN (1 << 25)
+#define DWEMMC_CTRL_RESET_ALL (DWEMMC_CTRL_RESET | DWEMMC_CTRL_FIFO_RESET | DWEMMC_CTRL_DMA_RESET)
+
+#define DWEMMC_STS_DATA_BUSY (1 << 9)
+
+#define DWEMMC_FIFO_TWMARK(x) (x & 0xfff)
+#define DWEMMC_FIFO_RWMARK(x) ((x & 0x1ff) << 16)
+#define DWEMMC_DMA_BURST_SIZE(x) ((x & 0x7) << 28)
+
+#define DWEMMC_CARD_RD_THR(x) ((x & 0xfff) << 16)
+#define DWEMMC_CARD_RD_THR_EN (1 << 0)
+
+#endif // __DWEMMC_H__
diff --git a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c
new file mode 100644
index 0000000000..fe23d113ee
--- /dev/null
+++ b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.c
@@ -0,0 +1,648 @@
+/** @file
+ This file implement the MMC Host Protocol for the DesignWare eMMC.
+
+ Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
+
+ This program and the accompanying materials
+ are licensed and made available under the terms and conditions of the BSD License
+ which accompanies this distribution. The full text of the license may be found at
+ http://opensource.org/licenses/bsd-license.php
+
+ THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+
+**/
+
+#include <Library/BaseMemoryLib.h>
+#include <Library/CacheMaintenanceLib.h>
+#include <Library/DebugLib.h>
+#include <Library/DevicePathLib.h>
+#include <Library/IoLib.h>
+#include <Library/MemoryAllocationLib.h>
+#include <Library/PcdLib.h>
+#include <Library/TimerLib.h>
+#include <Library/UefiBootServicesTableLib.h>
+#include <Library/UefiLib.h>
+
+#include <Protocol/MmcHost.h>
+
+#include "DwEmmc.h"
+
+#define DWEMMC_DESC_PAGE 1
+#define DWEMMC_BLOCK_SIZE 512
+#define DWEMMC_DMA_BUF_SIZE (512 * 8)
+#define DWEMMC_MAX_DESC_PAGES 512
+
+typedef struct {
+ UINT32 Des0;
+ UINT32 Des1;
+ UINT32 Des2;
+ UINT32 Des3;
+} DWEMMC_IDMAC_DESCRIPTOR;
+
+EFI_MMC_HOST_PROTOCOL *gpMmcHost;
+DWEMMC_IDMAC_DESCRIPTOR *gpIdmacDesc;
+EFI_GUID mDwEmmcDevicePathGuid = EFI_CALLER_ID_GUID;
+STATIC UINT32 mDwEmmcCommand;
+STATIC UINT32 mDwEmmcArgument;
+
+EFI_STATUS
+DwEmmcReadBlockData (
+ IN EFI_MMC_HOST_PROTOCOL *This,
+ IN EFI_LBA Lba,
+ IN UINTN Length,
+ IN UINT32* Buffer
+ );
+
+BOOLEAN
+DwEmmcIsPowerOn (
+ VOID
+ )
+{
+ return TRUE;
+}
+
+EFI_STATUS
+DwEmmcInitialize (
+ VOID
+ )
+{
+ DEBUG ((DEBUG_BLKIO, "DwEmmcInitialize()"));
+ return EFI_SUCCESS;
+}
+
+BOOLEAN
+DwEmmcIsCardPresent (
+ IN EFI_MMC_HOST_PROTOCOL *This
+ )
+{
+ return TRUE;
+}
+
+BOOLEAN
+DwEmmcIsReadOnly (
+ IN EFI_MMC_HOST_PROTOCOL *This
+ )
+{
+ return FALSE;
+}
+
+BOOLEAN
+DwEmmcIsDmaSupported (
+ IN EFI_MMC_HOST_PROTOCOL *This
+ )
+{
+ return TRUE;
+}
+
+EFI_STATUS
+DwEmmcBuildDevicePath (
+ IN EFI_MMC_HOST_PROTOCOL *This,
+ IN EFI_DEVICE_PATH_PROTOCOL **DevicePath
+ )
+{
+ EFI_DEVICE_PATH_PROTOCOL *NewDevicePathNode;
+
+ NewDevicePathNode = CreateDeviceNode (HARDWARE_DEVICE_PATH, HW_VENDOR_DP, sizeof (VENDOR_DEVICE_PATH));
+ CopyGuid (& ((VENDOR_DEVICE_PATH*)NewDevicePathNode)->Guid, &mDwEmmcDevicePathGuid);
+
+ *DevicePath = NewDevicePathNode;
+ return EFI_SUCCESS;
+}
+
+EFI_STATUS
+DwEmmcUpdateClock (
+ VOID
+ )
+{
+ UINT32 Data;
+
+ /* CMD_UPDATE_CLK */
+ Data = BIT_CMD_WAIT_PRVDATA_COMPLETE | BIT_CMD_UPDATE_CLOCK_ONLY |
+ BIT_CMD_START;
+ MmioWrite32 (DWEMMC_CMD, Data);
+ while (1) {
+ Data = MmioRead32 (DWEMMC_CMD);
+ if (!(Data & CMD_START_BIT)) {
+ break;
+ }
+ Data = MmioRead32 (DWEMMC_RINTSTS);
+ if (Data & DWEMMC_INT_HLE) {
+ Print (L"failed to update mmc clock frequency\n");
+ return EFI_DEVICE_ERROR;
+ }
+ }
+ return EFI_SUCCESS;
+}
+
+EFI_STATUS
+DwEmmcSetClock (
+ IN UINTN ClockFreq
+ )
+{
+ UINT32 Divider, Rate, Data;
+ EFI_STATUS Status;
+ BOOLEAN Found = FALSE;
+
+ for (Divider = 1; Divider < 256; Divider++) {
+ Rate = PcdGet32 (PcdDwEmmcDxeClockFrequencyInHz);
+ if ((Rate / (2 * Divider)) <= ClockFreq) {
+ Found = TRUE;
+ break;
+ }
+ }
+ if (Found == FALSE) {
+ return EFI_NOT_FOUND;
+ }
+
+ // Wait until MMC is idle
+ do {
+ Data = MmioRead32 (DWEMMC_STATUS);
+ } while (Data & DWEMMC_STS_DATA_BUSY);
+
+ // Disable MMC clock first
+ MmioWrite32 (DWEMMC_CLKENA, 0);
+ Status = DwEmmcUpdateClock ();
+ ASSERT (!EFI_ERROR (Status));
+
+ MmioWrite32 (DWEMMC_CLKDIV, Divider);
+ Status = DwEmmcUpdateClock ();
+ ASSERT (!EFI_ERROR (Status));
+
+ // Enable MMC clock
+ MmioWrite32 (DWEMMC_CLKENA, 1);
+ MmioWrite32 (DWEMMC_CLKSRC, 0);
+ Status = DwEmmcUpdateClock ();
+ ASSERT (!EFI_ERROR (Status));
+ return EFI_SUCCESS;
+}
+
+EFI_STATUS
+DwEmmcNotifyState (
+ IN EFI_MMC_HOST_PROTOCOL *This,
+ IN MMC_STATE State
+ )
+{
+ UINT32 Data;
+ EFI_STATUS Status;
+
+ switch (State) {
+ case MmcInvalidState:
+ return EFI_INVALID_PARAMETER;
+ case MmcHwInitializationState:
+ MmioWrite32 (DWEMMC_PWREN, 1);
+
+ // If device already turn on then restart it
+ Data = DWEMMC_CTRL_RESET_ALL;
+ MmioWrite32 (DWEMMC_CTRL, Data);
+ do {
+ // Wait until reset operation finished
+ Data = MmioRead32 (DWEMMC_CTRL);
+ } while (Data & DWEMMC_CTRL_RESET_ALL);
+
+ // Setup clock that could not be higher than 400KHz.
+ Status = DwEmmcSetClock (400000);
+ ASSERT (!EFI_ERROR (Status));
+ // Wait clock stable
+ MicroSecondDelay (100);
+
+ MmioWrite32 (DWEMMC_RINTSTS, ~0);
+ MmioWrite32 (DWEMMC_INTMASK, 0);
+ MmioWrite32 (DWEMMC_TMOUT, ~0);
+ MmioWrite32 (DWEMMC_IDINTEN, 0);
+ MmioWrite32 (DWEMMC_BMOD, DWEMMC_IDMAC_SWRESET);
+
+ MmioWrite32 (DWEMMC_BLKSIZ, DWEMMC_BLOCK_SIZE);
+ do {
+ Data = MmioRead32 (DWEMMC_BMOD);
+ } while (Data & DWEMMC_IDMAC_SWRESET);
+ break;
+ case MmcIdleState:
+ break;
+ case MmcReadyState:
+ break;
+ case MmcIdentificationState:
+ break;
+ case MmcStandByState:
+ break;
+ case MmcTransferState:
+ break;
+ case MmcSendingDataState:
+ break;
+ case MmcReceiveDataState:
+ break;
+ case MmcProgrammingState:
+ break;
+ case MmcDisconnectState:
+ break;
+ default:
+ return EFI_INVALID_PARAMETER;
+ }
+ return EFI_SUCCESS;
+}
+
+// Need to prepare DMA buffer first before sending commands to MMC card
+BOOLEAN
+IsPendingReadCommand (
+ IN MMC_CMD MmcCmd
+ )
+{
+ UINTN Mask;
+
+ Mask = BIT_CMD_DATA_EXPECTED | BIT_CMD_READ;
+ if ((MmcCmd & Mask) == Mask) {
+ return TRUE;
+ }
+ return FALSE;
+}
+
+BOOLEAN
+IsPendingWriteCommand (
+ IN MMC_CMD MmcCmd
+ )
+{
+ UINTN Mask;
+
+ Mask = BIT_CMD_DATA_EXPECTED | BIT_CMD_WRITE;
+ if ((MmcCmd & Mask) == Mask) {
+ return TRUE;
+ }
+ return FALSE;
+}
+
+EFI_STATUS
+SendCommand (
+ IN MMC_CMD MmcCmd,
+ IN UINT32 Argument
+ )
+{
+ UINT32 Data, ErrMask;
+
+ // Wait until MMC is idle
+ do {
+ Data = MmioRead32 (DWEMMC_STATUS);
+ } while (Data & DWEMMC_STS_DATA_BUSY);
+
+ MmioWrite32 (DWEMMC_RINTSTS, ~0);
+ MmioWrite32 (DWEMMC_CMDARG, Argument);
+ MmioWrite32 (DWEMMC_CMD, MmcCmd);
+
+ ErrMask = DWEMMC_INT_EBE | DWEMMC_INT_HLE | DWEMMC_INT_RTO |
+ DWEMMC_INT_RCRC | DWEMMC_INT_RE;
+ ErrMask |= DWEMMC_INT_DCRC | DWEMMC_INT_DRT | DWEMMC_INT_SBE;
+ do {
+ MicroSecondDelay(500);
+ Data = MmioRead32 (DWEMMC_RINTSTS);
+
+ if (Data & ErrMask) {
+ return EFI_DEVICE_ERROR;
+ }
+ if (Data & DWEMMC_INT_DTO) { // Transfer Done
+ break;
+ }
+ } while (!(Data & DWEMMC_INT_CMD_DONE));
+ return EFI_SUCCESS;
+}
+
+EFI_STATUS
+DwEmmcSendCommand (
+ IN EFI_MMC_HOST_PROTOCOL *This,
+ IN MMC_CMD MmcCmd,
+ IN UINT32 Argument
+ )
+{
+ UINT32 Cmd = 0;
+ EFI_STATUS Status = EFI_SUCCESS;
+
+ switch (MMC_GET_INDX(MmcCmd)) {
+ case MMC_INDX(0):
+ Cmd = BIT_CMD_SEND_INIT;
+ break;
+ case MMC_INDX(1):
+ Cmd = BIT_CMD_RESPONSE_EXPECT;
+ break;
+ case MMC_INDX(2):
+ Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_LONG_RESPONSE |
+ BIT_CMD_CHECK_RESPONSE_CRC | BIT_CMD_SEND_INIT;
+ break;
+ case MMC_INDX(3):
+ Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_CHECK_RESPONSE_CRC |
+ BIT_CMD_SEND_INIT;
+ break;
+ case MMC_INDX(7):
+ if (Argument)
+ Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_CHECK_RESPONSE_CRC;
+ else
+ Cmd = 0;
+ break;
+ case MMC_INDX(8):
+ Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_CHECK_RESPONSE_CRC |
+ BIT_CMD_DATA_EXPECTED | BIT_CMD_READ |
+ BIT_CMD_WAIT_PRVDATA_COMPLETE;
+ break;
+ case MMC_INDX(9):
+ Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_CHECK_RESPONSE_CRC |
+ BIT_CMD_LONG_RESPONSE;
+ break;
+ case MMC_INDX(12):
+ Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_CHECK_RESPONSE_CRC |
+ BIT_CMD_STOP_ABORT_CMD;
+ break;
+ case MMC_INDX(13):
+ Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_CHECK_RESPONSE_CRC |
+ BIT_CMD_WAIT_PRVDATA_COMPLETE;
+ break;
+ case MMC_INDX(16):
+ Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_CHECK_RESPONSE_CRC |
+ BIT_CMD_DATA_EXPECTED | BIT_CMD_READ |
+ BIT_CMD_WAIT_PRVDATA_COMPLETE;
+ break;
+ case MMC_INDX(17):
+ case MMC_INDX(18):
+ Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_CHECK_RESPONSE_CRC |
+ BIT_CMD_DATA_EXPECTED | BIT_CMD_READ |
+ BIT_CMD_WAIT_PRVDATA_COMPLETE;
+ break;
+ case MMC_INDX(24):
+ case MMC_INDX(25):
+ Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_CHECK_RESPONSE_CRC |
+ BIT_CMD_DATA_EXPECTED | BIT_CMD_WRITE |
+ BIT_CMD_WAIT_PRVDATA_COMPLETE;
+ break;
+ case MMC_INDX(30):
+ Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_CHECK_RESPONSE_CRC |
+ BIT_CMD_DATA_EXPECTED;
+ break;
+ default:
+ Cmd = BIT_CMD_RESPONSE_EXPECT | BIT_CMD_CHECK_RESPONSE_CRC;
+ break;
+ }
+
+ Cmd |= MMC_GET_INDX(MmcCmd) | BIT_CMD_USE_HOLD_REG | BIT_CMD_START;
+ if (IsPendingReadCommand (Cmd) || IsPendingWriteCommand (Cmd)) {
+ mDwEmmcCommand = Cmd;
+ mDwEmmcArgument = Argument;
+ } else {
+ Status = SendCommand (Cmd, Argument);
+ }
+ return Status;
+}
+
+EFI_STATUS
+DwEmmcReceiveResponse (
+ IN EFI_MMC_HOST_PROTOCOL *This,
+ IN MMC_RESPONSE_TYPE Type,
+ IN UINT32* Buffer
+ )
+{
+ if (Buffer == NULL) {
+ return EFI_INVALID_PARAMETER;
+ }
+
+ if ( (Type == MMC_RESPONSE_TYPE_R1)
+ || (Type == MMC_RESPONSE_TYPE_R1b)
+ || (Type == MMC_RESPONSE_TYPE_R3)
+ || (Type == MMC_RESPONSE_TYPE_R6)
+ || (Type == MMC_RESPONSE_TYPE_R7))
+ {
+ Buffer[0] = MmioRead32 (DWEMMC_RESP0);
+ } else if (Type == MMC_RESPONSE_TYPE_R2) {
+ Buffer[0] = MmioRead32 (DWEMMC_RESP0);
+ Buffer[1] = MmioRead32 (DWEMMC_RESP1);
+ Buffer[2] = MmioRead32 (DWEMMC_RESP2);
+ Buffer[3] = MmioRead32 (DWEMMC_RESP3);
+ }
+ return EFI_SUCCESS;
+}
+
+EFI_STATUS
+PrepareDmaData (
+ IN DWEMMC_IDMAC_DESCRIPTOR* IdmacDesc,
+ IN UINTN Length,
+ IN UINT32* Buffer
+ )
+{
+ UINTN Cnt, Blks, Idx, LastIdx;
+
+ Cnt = (Length + DWEMMC_DMA_BUF_SIZE - 1) / DWEMMC_DMA_BUF_SIZE;
+ Blks = (Length + DWEMMC_BLOCK_SIZE - 1) / DWEMMC_BLOCK_SIZE;
+ Length = DWEMMC_BLOCK_SIZE * Blks;
+
+ for (Idx = 0; Idx < Cnt; Idx++) {
+ (IdmacDesc + Idx)->Des0 = DWEMMC_IDMAC_DES0_OWN | DWEMMC_IDMAC_DES0_CH |
+ DWEMMC_IDMAC_DES0_DIC;
+ (IdmacDesc + Idx)->Des1 = DWEMMC_IDMAC_DES1_BS1(DWEMMC_DMA_BUF_SIZE);
+ /* Buffer Address */
+ (IdmacDesc + Idx)->Des2 = (UINT32)((UINTN)Buffer + DWEMMC_DMA_BUF_SIZE * Idx);
+ /* Next Descriptor Address */
+ (IdmacDesc + Idx)->Des3 = (UINT32)((UINTN)IdmacDesc +
+ (sizeof(DWEMMC_IDMAC_DESCRIPTOR) * (Idx + 1)));
+ }
+ /* First Descriptor */
+ IdmacDesc->Des0 |= DWEMMC_IDMAC_DES0_FS;
+ /* Last Descriptor */
+ LastIdx = Cnt - 1;
+ (IdmacDesc + LastIdx)->Des0 |= DWEMMC_IDMAC_DES0_LD;
+ (IdmacDesc + LastIdx)->Des0 &= ~(DWEMMC_IDMAC_DES0_DIC | DWEMMC_IDMAC_DES0_CH);
+ (IdmacDesc + LastIdx)->Des1 = DWEMMC_IDMAC_DES1_BS1(Length -
+ (LastIdx * DWEMMC_DMA_BUF_SIZE));
+ /* Set the Next field of Last Descriptor */
+ (IdmacDesc + LastIdx)->Des3 = 0;
+ MmioWrite32 (DWEMMC_DBADDR, (UINT32)((UINTN)IdmacDesc));
+
+ return EFI_SUCCESS;
+}
+
+VOID
+StartDma (
+ UINTN Length
+ )
+{
+ UINT32 Data;
+
+ Data = MmioRead32 (DWEMMC_CTRL);
+ Data |= DWEMMC_CTRL_INT_EN | DWEMMC_CTRL_DMA_EN | DWEMMC_CTRL_IDMAC_EN;
+ MmioWrite32 (DWEMMC_CTRL, Data);
+ Data = MmioRead32 (DWEMMC_BMOD);
+ Data |= DWEMMC_IDMAC_ENABLE | DWEMMC_IDMAC_FB;
+ MmioWrite32 (DWEMMC_BMOD, Data);
+
+ MmioWrite32 (DWEMMC_BLKSIZ, DWEMMC_BLOCK_SIZE);
+ MmioWrite32 (DWEMMC_BYTCNT, Length);
+}
+
+EFI_STATUS
+DwEmmcReadBlockData (
+ IN EFI_MMC_HOST_PROTOCOL *This,
+ IN EFI_LBA Lba,
+ IN UINTN Length,
+ IN UINT32* Buffer
+ )
+{
+ EFI_STATUS Status;
+ UINT32 DescPages, CountPerPage, Count;
+ EFI_TPL Tpl;
+
+ Tpl = gBS->RaiseTPL (TPL_NOTIFY);
+
+ CountPerPage = EFI_PAGE_SIZE / 16;
+ Count = (Length + DWEMMC_DMA_BUF_SIZE - 1) / DWEMMC_DMA_BUF_SIZE;
+ DescPages = (Count + CountPerPage - 1) / CountPerPage;
+
+ InvalidateDataCacheRange (Buffer, Length);
+
+ Status = PrepareDmaData (gpIdmacDesc, Length, Buffer);
+ if (EFI_ERROR (Status)) {
+ goto out;
+ }
+
+ WriteBackDataCacheRange (gpIdmacDesc, DescPages * EFI_PAGE_SIZE);
+ StartDma (Length);
+
+ Status = SendCommand (mDwEmmcCommand, mDwEmmcArgument);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "Failed to read data, mDwEmmcCommand:%x, mDwEmmcArgument:%x, Status:%r\n", mDwEmmcCommand, mDwEmmcArgument, Status));
+ goto out;
+ }
+out:
+ // Restore Tpl
+ gBS->RestoreTPL (Tpl);
+ return Status;
+}
+
+EFI_STATUS
+DwEmmcWriteBlockData (
+ IN EFI_MMC_HOST_PROTOCOL *This,
+ IN EFI_LBA Lba,
+ IN UINTN Length,
+ IN UINT32* Buffer
+ )
+{
+ EFI_STATUS Status;
+ UINT32 DescPages, CountPerPage, Count;
+ EFI_TPL Tpl;
+
+ Tpl = gBS->RaiseTPL (TPL_NOTIFY);
+
+ CountPerPage = EFI_PAGE_SIZE / 16;
+ Count = (Length + DWEMMC_DMA_BUF_SIZE - 1) / DWEMMC_DMA_BUF_SIZE;
+ DescPages = (Count + CountPerPage - 1) / CountPerPage;
+
+ WriteBackDataCacheRange (Buffer, Length);
+
+ Status = PrepareDmaData (gpIdmacDesc, Length, Buffer);
+ if (EFI_ERROR (Status)) {
+ goto out;
+ }
+
+ WriteBackDataCacheRange (gpIdmacDesc, DescPages * EFI_PAGE_SIZE);
+ StartDma (Length);
+
+ Status = SendCommand (mDwEmmcCommand, mDwEmmcArgument);
+ if (EFI_ERROR (Status)) {
+ DEBUG ((DEBUG_ERROR, "Failed to write data, mDwEmmcCommand:%x, mDwEmmcArgument:%x, Status:%r\n", mDwEmmcCommand, mDwEmmcArgument, Status));
+ goto out;
+ }
+out:
+ // Restore Tpl
+ gBS->RestoreTPL (Tpl);
+ return Status;
+}
+
+EFI_STATUS
+DwEmmcSetIos (
+ IN EFI_MMC_HOST_PROTOCOL *This,
+ IN UINT32 BusClockFreq,
+ IN UINT32 BusWidth,
+ IN UINT32 TimingMode
+ )
+{
+ EFI_STATUS Status = EFI_SUCCESS;
+ UINT32 Data;
+
+ if (TimingMode != EMMCBACKWARD) {
+ Data = MmioRead32 (DWEMMC_UHSREG);
+ switch (TimingMode) {
+ case EMMCHS52DDR1V2:
+ case EMMCHS52DDR1V8:
+ Data |= 1 << 16;
+ break;
+ case EMMCHS52:
+ case EMMCHS26:
+ Data &= ~(1 << 16);
+ break;
+ default:
+ return EFI_UNSUPPORTED;
+ }
+ MmioWrite32 (DWEMMC_UHSREG, Data);
+ }
+
+ switch (BusWidth) {
+ case 1:
+ MmioWrite32 (DWEMMC_CTYPE, 0);
+ break;
+ case 4:
+ MmioWrite32 (DWEMMC_CTYPE, 1);
+ break;
+ case 8:
+ MmioWrite32 (DWEMMC_CTYPE, 1 << 16);
+ break;
+ default:
+ return EFI_UNSUPPORTED;
+ }
+ if (BusClockFreq) {
+ Status = DwEmmcSetClock (BusClockFreq);
+ }
+ return Status;
+}
+
+BOOLEAN
+DwEmmcIsMultiBlock (
+ IN EFI_MMC_HOST_PROTOCOL *This
+ )
+{
+ return TRUE;
+}
+
+EFI_MMC_HOST_PROTOCOL gMciHost = {
+ MMC_HOST_PROTOCOL_REVISION,
+ DwEmmcIsCardPresent,
+ DwEmmcIsReadOnly,
+ DwEmmcBuildDevicePath,
+ DwEmmcNotifyState,
+ DwEmmcSendCommand,
+ DwEmmcReceiveResponse,
+ DwEmmcReadBlockData,
+ DwEmmcWriteBlockData,
+ DwEmmcSetIos,
+ DwEmmcIsMultiBlock
+};
+
+EFI_STATUS
+DwEmmcDxeInitialize (
+ IN EFI_HANDLE ImageHandle,
+ IN EFI_SYSTEM_TABLE *SystemTable
+ )
+{
+ EFI_STATUS Status;
+ EFI_HANDLE Handle;
+
+ Handle = NULL;
+
+ gpIdmacDesc = (DWEMMC_IDMAC_DESCRIPTOR *)AllocatePages (DWEMMC_MAX_DESC_PAGES);
+ if (gpIdmacDesc == NULL) {
+ return EFI_BUFFER_TOO_SMALL;
+ }
+
+ DEBUG ((DEBUG_BLKIO, "DwEmmcDxeInitialize()\n"));
+
+ //Publish Component Name, BlockIO protocol interfaces
+ Status = gBS->InstallMultipleProtocolInterfaces (
+ &Handle,
+ &gEfiMmcHostProtocolGuid, &gMciHost,
+ NULL
+ );
+ ASSERT_EFI_ERROR (Status);
+
+ return EFI_SUCCESS;
+}
diff --git a/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf
new file mode 100644
index 0000000000..e3c8313bc5
--- /dev/null
+++ b/EmbeddedPkg/Drivers/DwEmmcDxe/DwEmmcDxe.inf
@@ -0,0 +1,53 @@
+#/** @file
+# INF file for the eMMC Host Protocol implementation for the DesignWare MMC.
+#
+# Copyright (c) 2014-2017, Linaro Limited. All rights reserved.
+#
+# This program and the accompanying materials
+# are licensed and made available under the terms and conditions of the BSD License
+# which accompanies this distribution. The full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+#**/
+
+[Defines]
+ INF_VERSION = 0x00010019
+ BASE_NAME = DwEmmcDxe
+ FILE_GUID = b549f005-4bd4-4020-a0cb-06f42bda68c3
+ MODULE_TYPE = DXE_DRIVER
+ VERSION_STRING = 1.0
+
+ ENTRY_POINT = DwEmmcDxeInitialize
+
+[Sources.common]
+ DwEmmcDxe.c
+
+[Packages]
+ EmbeddedPkg/EmbeddedPkg.dec
+ MdePkg/MdePkg.dec
+
+[LibraryClasses]
+ ArmLib
+ BaseLib
+ BaseMemoryLib
+ CacheMaintenanceLib
+ IoLib
+ MemoryAllocationLib
+ TimerLib
+ UefiDriverEntryPoint
+ UefiLib
+
+[Protocols]
+ gEfiCpuArchProtocolGuid
+ gEfiDevicePathProtocolGuid
+ gEfiMmcHostProtocolGuid
+
+[Pcd]
+ gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeBaseAddress
+ gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeClockFrequencyInHz
+
+[Depex]
+ TRUE
diff --git a/EmbeddedPkg/EmbeddedPkg.dec b/EmbeddedPkg/EmbeddedPkg.dec
index e90f039c28..0d4a0625a3 100644
--- a/EmbeddedPkg/EmbeddedPkg.dec
+++ b/EmbeddedPkg/EmbeddedPkg.dec
@@ -164,6 +164,10 @@
# LAN91x Ethernet Driver PCDs
gEmbeddedTokenSpaceGuid.PcdLan91xDxeBaseAddress|0x0|UINT32|0x00000029
+ # DwEmmc Driver PCDs
+ gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeBaseAddress|0x0|UINT32|0x00000035
+ gEmbeddedTokenSpaceGuid.PcdDwEmmcDxeClockFrequencyInHz|0x0|UINT32|0x00000036
+
#
# Android FastBoot
#
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/3] EmbeddedPkg: import EfiTimeBaseLib
2017-05-03 21:38 [PATCH 0/3] Import a few items from OpenPlatformPkg Leif Lindholm
2017-05-03 21:38 ` [PATCH 1/3] EmbeddedPkg: import DesignWare EMMC driver Leif Lindholm
@ 2017-05-03 21:38 ` Leif Lindholm
2017-05-03 21:38 ` [PATCH 3/3] ArmPlatformPkg, ArmVirtPkg: delete redundant PL031 functions Leif Lindholm
2 siblings, 0 replies; 6+ messages in thread
From: Leif Lindholm @ 2017-05-03 21:38 UTC (permalink / raw)
To: edk2-devel; +Cc: Ard Biesheuvel
Some generic RTC helper functions were broken out from the PL031
library for use with other RTCs in OpenPlatformPkg. Import the code back
here, realigning it with the current state of PL031RealTimeClockLib to
simplify comparisons.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
EmbeddedPkg/Include/Library/EfiTimeBaseLib.h | 68 ++++++++
.../Library/EfiTimeBaseLib/EfiTimeBaseLib.c | 171 +++++++++++++++++++++
.../Library/EfiTimeBaseLib/EfiTimeBaseLib.inf | 34 ++++
3 files changed, 273 insertions(+)
create mode 100644 EmbeddedPkg/Include/Library/EfiTimeBaseLib.h
create mode 100644 EmbeddedPkg/Library/EfiTimeBaseLib/EfiTimeBaseLib.c
create mode 100644 EmbeddedPkg/Library/EfiTimeBaseLib/EfiTimeBaseLib.inf
diff --git a/EmbeddedPkg/Include/Library/EfiTimeBaseLib.h b/EmbeddedPkg/Include/Library/EfiTimeBaseLib.h
new file mode 100644
index 0000000000..63db6c6eb8
--- /dev/null
+++ b/EmbeddedPkg/Include/Library/EfiTimeBaseLib.h
@@ -0,0 +1,68 @@
+/** @file
+*
+* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
+* Copyright (c) 2016, Linaro Limited. All rights reserved.
+*
+* This program and the accompanying materials
+* are licensed and made available under the terms and conditions of the BSD License
+* which accompanies this distribution. The full text of the license may be found at
+* http://opensource.org/licenses/bsd-license.php
+*
+* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+*
+**/
+
+#ifndef _EFI_TIME_BASE_LIB_H_
+#define _EFI_TIME_BASE_LIB_H_
+
+#include <Uefi/UefiBaseType.h>
+
+// Define EPOCH (1970-JANUARY-01) in the Julian Date representation
+#define EPOCH_JULIAN_DATE 2440588
+
+// Seconds per unit
+#define SEC_PER_MIN ((UINTN) 60)
+#define SEC_PER_HOUR ((UINTN) 3600)
+#define SEC_PER_DAY ((UINTN) 86400)
+#define SEC_PER_MONTH ((UINTN) 2,592,000)
+#define SEC_PER_YEAR ((UINTN) 31,536,000)
+
+BOOLEAN
+EFIAPI
+IsLeapYear (
+ IN EFI_TIME *Time
+ );
+
+BOOLEAN
+EFIAPI
+IsDayValid (
+ IN EFI_TIME *Time
+ );
+
+BOOLEAN
+EFIAPI
+IsTimeValid (
+ IN EFI_TIME *Time
+ );
+
+/**
+ Converts Epoch seconds (elapsed since 1970 JANUARY 01, 00:00:00 UTC) to EFI_TIME
+ **/
+VOID
+EFIAPI
+EpochToEfiTime (
+ IN UINTN EpochSeconds,
+ OUT EFI_TIME *Time
+ );
+
+/**
+ Converts EFI_TIME to Epoch seconds (elapsed since 1970 JANUARY 01, 00:00:00 UTC)
+ **/
+UINTN
+EFIAPI
+EfiTimeToEpoch (
+ IN EFI_TIME *Time
+ );
+
+#endif
diff --git a/EmbeddedPkg/Library/EfiTimeBaseLib/EfiTimeBaseLib.c b/EmbeddedPkg/Library/EfiTimeBaseLib/EfiTimeBaseLib.c
new file mode 100644
index 0000000000..5a6dee6cdd
--- /dev/null
+++ b/EmbeddedPkg/Library/EfiTimeBaseLib/EfiTimeBaseLib.c
@@ -0,0 +1,171 @@
+/** @file
+*
+* Copyright (c) 2016, Hisilicon Limited. All rights reserved.
+* Copyright (c) 2016, Linaro Limited. All rights reserved.
+*
+* This program and the accompanying materials
+* are licensed and made available under the terms and conditions of the BSD License
+* which accompanies this distribution. The full text of the license may be found at
+* http://opensource.org/licenses/bsd-license.php
+*
+* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+*
+**/
+
+#include <Uefi/UefiBaseType.h>
+#include <Uefi/UefiSpec.h>
+#include <Library/DebugLib.h>
+#include <Library/EfiTimeBaseLib.h>
+
+/**
+ Converts Epoch seconds (elapsed since 1970 JANUARY 01, 00:00:00 UTC) to EFI_TIME
+ **/
+VOID
+EFIAPI
+EpochToEfiTime (
+ IN UINTN EpochSeconds,
+ OUT EFI_TIME *Time
+ )
+{
+ UINTN a;
+ UINTN b;
+ UINTN c;
+ UINTN d;
+ UINTN g;
+ UINTN j;
+ UINTN m;
+ UINTN y;
+ UINTN da;
+ UINTN db;
+ UINTN dc;
+ UINTN dg;
+ UINTN hh;
+ UINTN mm;
+ UINTN ss;
+ UINTN J;
+
+ J = (EpochSeconds / 86400) + 2440588;
+ j = J + 32044;
+ g = j / 146097;
+ dg = j % 146097;
+ c = (((dg / 36524) + 1) * 3) / 4;
+ dc = dg - (c * 36524);
+ b = dc / 1461;
+ db = dc % 1461;
+ a = (((db / 365) + 1) * 3) / 4;
+ da = db - (a * 365);
+ y = (g * 400) + (c * 100) + (b * 4) + a;
+ m = (((da * 5) + 308) / 153) - 2;
+ d = da - (((m + 4) * 153) / 5) + 122;
+
+ Time->Year = y - 4800 + ((m + 2) / 12);
+ Time->Month = ((m + 2) % 12) + 1;
+ Time->Day = d + 1;
+
+ ss = EpochSeconds % 60;
+ a = (EpochSeconds - ss) / 60;
+ mm = a % 60;
+ b = (a - mm) / 60;
+ hh = b % 24;
+
+ Time->Hour = hh;
+ Time->Minute = mm;
+ Time->Second = ss;
+ Time->Nanosecond = 0;
+
+}
+
+/**
+ Converts EFI_TIME to Epoch seconds (elapsed since 1970 JANUARY 01, 00:00:00 UTC)
+ **/
+UINTN
+EFIAPI
+EfiTimeToEpoch (
+ IN EFI_TIME *Time
+ )
+{
+ UINTN a;
+ UINTN y;
+ UINTN m;
+ UINTN JulianDate; // Absolute Julian Date representation of the supplied Time
+ UINTN EpochDays; // Number of days elapsed since EPOCH_JULIAN_DAY
+ UINTN EpochSeconds;
+
+ a = (14 - Time->Month) / 12 ;
+ y = Time->Year + 4800 - a;
+ m = Time->Month + (12*a) - 3;
+
+ JulianDate = Time->Day + ((153*m + 2)/5) + (365*y) + (y/4) - (y/100) + (y/400) - 32045;
+
+ ASSERT (JulianDate >= EPOCH_JULIAN_DATE);
+ EpochDays = JulianDate - EPOCH_JULIAN_DATE;
+
+ EpochSeconds = (EpochDays * SEC_PER_DAY) + ((UINTN)Time->Hour * SEC_PER_HOUR) + (Time->Minute * SEC_PER_MIN) + Time->Second;
+
+ return EpochSeconds;
+}
+
+BOOLEAN
+EFIAPI
+IsLeapYear (
+ IN EFI_TIME *Time
+ )
+{
+ if (Time->Year % 4 == 0) {
+ if (Time->Year % 100 == 0) {
+ if (Time->Year % 400 == 0) {
+ return TRUE;
+ } else {
+ return FALSE;
+ }
+ } else {
+ return TRUE;
+ }
+ } else {
+ return FALSE;
+ }
+}
+
+BOOLEAN
+EFIAPI
+IsDayValid (
+ IN EFI_TIME *Time
+ )
+{
+ STATIC CONST INTN DayOfMonth[12] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+
+ if (Time->Day < 1 ||
+ Time->Day > DayOfMonth[Time->Month - 1] ||
+ (Time->Month == 2 && (!IsLeapYear (Time) && Time->Day > 28))
+ ) {
+ return FALSE;
+ }
+
+ return TRUE;
+}
+
+BOOLEAN
+EFIAPI
+IsTimeValid(
+ IN EFI_TIME *Time
+ )
+{
+ // Check the input parameters are within the range specified by UEFI
+ if ((Time->Year < 2000) ||
+ (Time->Year > 2099) ||
+ (Time->Month < 1 ) ||
+ (Time->Month > 12 ) ||
+ (!IsDayValid (Time) ) ||
+ (Time->Hour > 23 ) ||
+ (Time->Minute > 59 ) ||
+ (Time->Second > 59 ) ||
+ (Time->Nanosecond > 999999999) ||
+ (!((Time->TimeZone == EFI_UNSPECIFIED_TIMEZONE) || ((Time->TimeZone >= -1440) && (Time->TimeZone <= 1440)))) ||
+ (Time->Daylight & (~(EFI_TIME_ADJUST_DAYLIGHT | EFI_TIME_IN_DAYLIGHT)))
+ ) {
+ return FALSE;
+ }
+
+ return TRUE;
+}
diff --git a/EmbeddedPkg/Library/EfiTimeBaseLib/EfiTimeBaseLib.inf b/EmbeddedPkg/Library/EfiTimeBaseLib/EfiTimeBaseLib.inf
new file mode 100644
index 0000000000..bd962ae7d2
--- /dev/null
+++ b/EmbeddedPkg/Library/EfiTimeBaseLib/EfiTimeBaseLib.inf
@@ -0,0 +1,34 @@
+#/** @file
+#
+# Copyright (c) 2016, Hisilicon Limited. All rights reserved.
+# Copyright (c) 2016, Linaro Limited. All rights reserved.
+#
+# This program and the accompanying materials
+# are licensed and made available under the terms and conditions of the BSD License
+# which accompanies this distribution. The full text of the license may be found at
+# http://opensource.org/licenses/bsd-license.php
+#
+# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#
+#**/
+
+[Defines]
+ INF_VERSION = 0x00010005
+ BASE_NAME = EfiTimeBaseLib
+ FILE_GUID = B1B07E01-6896-448C-8E75-F0E119ABDF49
+ MODULE_TYPE = BASE
+ VERSION_STRING = 1.0
+ LIBRARY_CLASS = EfiTimeBaseLib
+
+[Sources.common]
+ EfiTimeBaseLib.c
+
+[Packages]
+ EmbeddedPkg/EmbeddedPkg.dec
+ MdePkg/MdePkg.dec
+
+[LibraryClasses]
+ DebugLib
+
+[Pcd]
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] ArmPlatformPkg, ArmVirtPkg: delete redundant PL031 functions
2017-05-03 21:38 [PATCH 0/3] Import a few items from OpenPlatformPkg Leif Lindholm
2017-05-03 21:38 ` [PATCH 1/3] EmbeddedPkg: import DesignWare EMMC driver Leif Lindholm
2017-05-03 21:38 ` [PATCH 2/3] EmbeddedPkg: import EfiTimeBaseLib Leif Lindholm
@ 2017-05-03 21:38 ` Leif Lindholm
2017-05-04 18:10 ` Ard Biesheuvel
2 siblings, 1 reply; 6+ messages in thread
From: Leif Lindholm @ 2017-05-03 21:38 UTC (permalink / raw)
To: edk2-devel; +Cc: Ard Biesheuvel, Laszlo Ersek
Remove the functions now provided by EfiTimeBaseLib from
PL031RealTimeClockLib. Add EfiTimeBaseLib resolution to ArmVirtPkg
in same commit to prevent breakage.
Cc: Laszlo Ersek <lersek@redhat.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
.../Include/Drivers/PL031RealTimeClock.h | 11 --
.../PL031RealTimeClockLib/PL031RealTimeClockLib.c | 127 +--------------------
.../PL031RealTimeClockLib.inf | 1 +
ArmVirtPkg/ArmVirt.dsc.inc | 1 +
4 files changed, 5 insertions(+), 135 deletions(-)
diff --git a/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h b/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h
index 76fbd0eb82..812cd9b397 100644
--- a/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h
+++ b/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h
@@ -42,15 +42,4 @@
#define PL031_COUNTS_PER_SECOND 1
-// Define EPOCH (1970-JANUARY-01) in the Julian Date representation
-#define EPOCH_JULIAN_DATE 2440588
-
-// Seconds per unit
-#define SEC_PER_MIN ((UINTN) 60)
-#define SEC_PER_HOUR ((UINTN) 3600)
-#define SEC_PER_DAY ((UINTN) 86400)
-
-#define SEC_PER_MONTH ((UINTN) 2,592,000)
-#define SEC_PER_YEAR ((UINTN) 31,536,000)
-
#endif
diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
index 4aa448b528..9f115d383c 100644
--- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
+++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
@@ -36,6 +36,8 @@
#include <Drivers/PL031RealTimeClock.h>
+#include <Library/EfiTimeBaseLib.h>
+
#include <ArmPlatform.h>
STATIC CONST CHAR16 mTimeZoneVariableName[] = L"PL031RtcTimeZone";
@@ -110,129 +112,6 @@ InitializePL031 (
}
/**
- Converts Epoch seconds (elapsed since 1970 JANUARY 01, 00:00:00 UTC) to EFI_TIME
- **/
-VOID
-EpochToEfiTime (
- IN UINTN EpochSeconds,
- OUT EFI_TIME *Time
- )
-{
- UINTN a;
- UINTN b;
- UINTN c;
- UINTN d;
- UINTN g;
- UINTN j;
- UINTN m;
- UINTN y;
- UINTN da;
- UINTN db;
- UINTN dc;
- UINTN dg;
- UINTN hh;
- UINTN mm;
- UINTN ss;
- UINTN J;
-
- J = (EpochSeconds / 86400) + 2440588;
- j = J + 32044;
- g = j / 146097;
- dg = j % 146097;
- c = (((dg / 36524) + 1) * 3) / 4;
- dc = dg - (c * 36524);
- b = dc / 1461;
- db = dc % 1461;
- a = (((db / 365) + 1) * 3) / 4;
- da = db - (a * 365);
- y = (g * 400) + (c * 100) + (b * 4) + a;
- m = (((da * 5) + 308) / 153) - 2;
- d = da - (((m + 4) * 153) / 5) + 122;
-
- Time->Year = y - 4800 + ((m + 2) / 12);
- Time->Month = ((m + 2) % 12) + 1;
- Time->Day = d + 1;
-
- ss = EpochSeconds % 60;
- a = (EpochSeconds - ss) / 60;
- mm = a % 60;
- b = (a - mm) / 60;
- hh = b % 24;
-
- Time->Hour = hh;
- Time->Minute = mm;
- Time->Second = ss;
- Time->Nanosecond = 0;
-
-}
-
-/**
- Converts EFI_TIME to Epoch seconds (elapsed since 1970 JANUARY 01, 00:00:00 UTC)
- **/
-UINTN
-EfiTimeToEpoch (
- IN EFI_TIME *Time
- )
-{
- UINTN a;
- UINTN y;
- UINTN m;
- UINTN JulianDate; // Absolute Julian Date representation of the supplied Time
- UINTN EpochDays; // Number of days elapsed since EPOCH_JULIAN_DAY
- UINTN EpochSeconds;
-
- a = (14 - Time->Month) / 12 ;
- y = Time->Year + 4800 - a;
- m = Time->Month + (12*a) - 3;
-
- JulianDate = Time->Day + ((153*m + 2)/5) + (365*y) + (y/4) - (y/100) + (y/400) - 32045;
-
- ASSERT (JulianDate >= EPOCH_JULIAN_DATE);
- EpochDays = JulianDate - EPOCH_JULIAN_DATE;
-
- EpochSeconds = (EpochDays * SEC_PER_DAY) + ((UINTN)Time->Hour * SEC_PER_HOUR) + (Time->Minute * SEC_PER_MIN) + Time->Second;
-
- return EpochSeconds;
-}
-
-BOOLEAN
-IsLeapYear (
- IN EFI_TIME *Time
- )
-{
- if (Time->Year % 4 == 0) {
- if (Time->Year % 100 == 0) {
- if (Time->Year % 400 == 0) {
- return TRUE;
- } else {
- return FALSE;
- }
- } else {
- return TRUE;
- }
- } else {
- return FALSE;
- }
-}
-
-BOOLEAN
-DayValid (
- IN EFI_TIME *Time
- )
-{
- STATIC CONST INTN DayOfMonth[12] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
-
- if (Time->Day < 1 ||
- Time->Day > DayOfMonth[Time->Month - 1] ||
- (Time->Month == 2 && (!IsLeapYear (Time) && Time->Day > 28))
- ) {
- return FALSE;
- }
-
- return TRUE;
-}
-
-/**
Returns the current time and date information, and the time-keeping capabilities
of the hardware platform.
@@ -431,7 +310,7 @@ LibSetTime (
(Time->Year > 9999) ||
(Time->Month < 1 ) ||
(Time->Month > 12 ) ||
- (!DayValid (Time) ) ||
+ (!IsDayValid (Time) ) ||
(Time->Hour > 23 ) ||
(Time->Minute > 59 ) ||
(Time->Second > 59 ) ||
diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
index 3a98fc757e..41a4e6d6bd 100644
--- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
+++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
@@ -36,6 +36,7 @@
PcdLib
ArmPlatformSysConfigLib
DxeServicesTableLib
+ EfiTimeBaseLib
UefiRuntimeLib
[Guids]
diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
index e74eaf16e7..bc96709d8a 100644
--- a/ArmVirtPkg/ArmVirt.dsc.inc
+++ b/ArmVirtPkg/ArmVirt.dsc.inc
@@ -105,6 +105,7 @@
# ARM PL031 RTC Driver
RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
+ EfiTimeBaseLib|EmbeddedPkg/Library/EfiTimeBaseLib/EfiTimeBaseLib.inf
# ARM PL011 UART Driver
PL011UartLib|ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf
SerialPortLib|ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf
--
2.11.0
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] ArmPlatformPkg, ArmVirtPkg: delete redundant PL031 functions
2017-05-03 21:38 ` [PATCH 3/3] ArmPlatformPkg, ArmVirtPkg: delete redundant PL031 functions Leif Lindholm
@ 2017-05-04 18:10 ` Ard Biesheuvel
2017-05-10 16:02 ` Leif Lindholm
0 siblings, 1 reply; 6+ messages in thread
From: Ard Biesheuvel @ 2017-05-04 18:10 UTC (permalink / raw)
To: Leif Lindholm; +Cc: edk2-devel@lists.01.org, Laszlo Ersek
On 3 May 2017 at 22:38, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> Remove the functions now provided by EfiTimeBaseLib from
> PL031RealTimeClockLib. Add EfiTimeBaseLib resolution to ArmVirtPkg
> in same commit to prevent breakage.
>
> Cc: Laszlo Ersek <lersek@redhat.com>
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
I'd rather you'd call it something that doesn't start with 'Efi' given
that we usually reserve that for protocols and other prototypes that
are defined by the UEFI spec.
Other than that, this series looks fine to me
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
> .../Include/Drivers/PL031RealTimeClock.h | 11 --
> .../PL031RealTimeClockLib/PL031RealTimeClockLib.c | 127 +--------------------
> .../PL031RealTimeClockLib.inf | 1 +
> ArmVirtPkg/ArmVirt.dsc.inc | 1 +
> 4 files changed, 5 insertions(+), 135 deletions(-)
>
> diff --git a/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h b/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h
> index 76fbd0eb82..812cd9b397 100644
> --- a/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h
> +++ b/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h
> @@ -42,15 +42,4 @@
>
> #define PL031_COUNTS_PER_SECOND 1
>
> -// Define EPOCH (1970-JANUARY-01) in the Julian Date representation
> -#define EPOCH_JULIAN_DATE 2440588
> -
> -// Seconds per unit
> -#define SEC_PER_MIN ((UINTN) 60)
> -#define SEC_PER_HOUR ((UINTN) 3600)
> -#define SEC_PER_DAY ((UINTN) 86400)
> -
> -#define SEC_PER_MONTH ((UINTN) 2,592,000)
> -#define SEC_PER_YEAR ((UINTN) 31,536,000)
> -
> #endif
> diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
> index 4aa448b528..9f115d383c 100644
> --- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
> +++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
> @@ -36,6 +36,8 @@
>
> #include <Drivers/PL031RealTimeClock.h>
>
> +#include <Library/EfiTimeBaseLib.h>
> +
> #include <ArmPlatform.h>
>
> STATIC CONST CHAR16 mTimeZoneVariableName[] = L"PL031RtcTimeZone";
> @@ -110,129 +112,6 @@ InitializePL031 (
> }
>
> /**
> - Converts Epoch seconds (elapsed since 1970 JANUARY 01, 00:00:00 UTC) to EFI_TIME
> - **/
> -VOID
> -EpochToEfiTime (
> - IN UINTN EpochSeconds,
> - OUT EFI_TIME *Time
> - )
> -{
> - UINTN a;
> - UINTN b;
> - UINTN c;
> - UINTN d;
> - UINTN g;
> - UINTN j;
> - UINTN m;
> - UINTN y;
> - UINTN da;
> - UINTN db;
> - UINTN dc;
> - UINTN dg;
> - UINTN hh;
> - UINTN mm;
> - UINTN ss;
> - UINTN J;
> -
> - J = (EpochSeconds / 86400) + 2440588;
> - j = J + 32044;
> - g = j / 146097;
> - dg = j % 146097;
> - c = (((dg / 36524) + 1) * 3) / 4;
> - dc = dg - (c * 36524);
> - b = dc / 1461;
> - db = dc % 1461;
> - a = (((db / 365) + 1) * 3) / 4;
> - da = db - (a * 365);
> - y = (g * 400) + (c * 100) + (b * 4) + a;
> - m = (((da * 5) + 308) / 153) - 2;
> - d = da - (((m + 4) * 153) / 5) + 122;
> -
> - Time->Year = y - 4800 + ((m + 2) / 12);
> - Time->Month = ((m + 2) % 12) + 1;
> - Time->Day = d + 1;
> -
> - ss = EpochSeconds % 60;
> - a = (EpochSeconds - ss) / 60;
> - mm = a % 60;
> - b = (a - mm) / 60;
> - hh = b % 24;
> -
> - Time->Hour = hh;
> - Time->Minute = mm;
> - Time->Second = ss;
> - Time->Nanosecond = 0;
> -
> -}
> -
> -/**
> - Converts EFI_TIME to Epoch seconds (elapsed since 1970 JANUARY 01, 00:00:00 UTC)
> - **/
> -UINTN
> -EfiTimeToEpoch (
> - IN EFI_TIME *Time
> - )
> -{
> - UINTN a;
> - UINTN y;
> - UINTN m;
> - UINTN JulianDate; // Absolute Julian Date representation of the supplied Time
> - UINTN EpochDays; // Number of days elapsed since EPOCH_JULIAN_DAY
> - UINTN EpochSeconds;
> -
> - a = (14 - Time->Month) / 12 ;
> - y = Time->Year + 4800 - a;
> - m = Time->Month + (12*a) - 3;
> -
> - JulianDate = Time->Day + ((153*m + 2)/5) + (365*y) + (y/4) - (y/100) + (y/400) - 32045;
> -
> - ASSERT (JulianDate >= EPOCH_JULIAN_DATE);
> - EpochDays = JulianDate - EPOCH_JULIAN_DATE;
> -
> - EpochSeconds = (EpochDays * SEC_PER_DAY) + ((UINTN)Time->Hour * SEC_PER_HOUR) + (Time->Minute * SEC_PER_MIN) + Time->Second;
> -
> - return EpochSeconds;
> -}
> -
> -BOOLEAN
> -IsLeapYear (
> - IN EFI_TIME *Time
> - )
> -{
> - if (Time->Year % 4 == 0) {
> - if (Time->Year % 100 == 0) {
> - if (Time->Year % 400 == 0) {
> - return TRUE;
> - } else {
> - return FALSE;
> - }
> - } else {
> - return TRUE;
> - }
> - } else {
> - return FALSE;
> - }
> -}
> -
> -BOOLEAN
> -DayValid (
> - IN EFI_TIME *Time
> - )
> -{
> - STATIC CONST INTN DayOfMonth[12] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
> -
> - if (Time->Day < 1 ||
> - Time->Day > DayOfMonth[Time->Month - 1] ||
> - (Time->Month == 2 && (!IsLeapYear (Time) && Time->Day > 28))
> - ) {
> - return FALSE;
> - }
> -
> - return TRUE;
> -}
> -
> -/**
> Returns the current time and date information, and the time-keeping capabilities
> of the hardware platform.
>
> @@ -431,7 +310,7 @@ LibSetTime (
> (Time->Year > 9999) ||
> (Time->Month < 1 ) ||
> (Time->Month > 12 ) ||
> - (!DayValid (Time) ) ||
> + (!IsDayValid (Time) ) ||
> (Time->Hour > 23 ) ||
> (Time->Minute > 59 ) ||
> (Time->Second > 59 ) ||
> diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
> index 3a98fc757e..41a4e6d6bd 100644
> --- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
> +++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
> @@ -36,6 +36,7 @@
> PcdLib
> ArmPlatformSysConfigLib
> DxeServicesTableLib
> + EfiTimeBaseLib
> UefiRuntimeLib
>
> [Guids]
> diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
> index e74eaf16e7..bc96709d8a 100644
> --- a/ArmVirtPkg/ArmVirt.dsc.inc
> +++ b/ArmVirtPkg/ArmVirt.dsc.inc
> @@ -105,6 +105,7 @@
>
> # ARM PL031 RTC Driver
> RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
> + EfiTimeBaseLib|EmbeddedPkg/Library/EfiTimeBaseLib/EfiTimeBaseLib.inf
> # ARM PL011 UART Driver
> PL011UartLib|ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf
> SerialPortLib|ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] ArmPlatformPkg, ArmVirtPkg: delete redundant PL031 functions
2017-05-04 18:10 ` Ard Biesheuvel
@ 2017-05-10 16:02 ` Leif Lindholm
0 siblings, 0 replies; 6+ messages in thread
From: Leif Lindholm @ 2017-05-10 16:02 UTC (permalink / raw)
To: Ard Biesheuvel; +Cc: edk2-devel@lists.01.org, Laszlo Ersek
On Thu, May 04, 2017 at 07:10:40PM +0100, Ard Biesheuvel wrote:
> On 3 May 2017 at 22:38, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> > Remove the functions now provided by EfiTimeBaseLib from
> > PL031RealTimeClockLib. Add EfiTimeBaseLib resolution to ArmVirtPkg
> > in same commit to prevent breakage.
> >
> > Cc: Laszlo Ersek <lersek@redhat.com>
> >
> > Contributed-under: TianoCore Contribution Agreement 1.0
> > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
>
> I'd rather you'd call it something that doesn't start with 'Efi' given
> that we usually reserve that for protocols and other prototypes that
> are defined by the UEFI spec.
Yes, good call.
> Other than that, this series looks fine to me
>
> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Thanks!
Pushed as d547b32..af5fed9
Required resulting updates for edk2-platforms/devel-OpenPlatformPkg
pushed as 43540a5.
/
Leif
> > ---
> > .../Include/Drivers/PL031RealTimeClock.h | 11 --
> > .../PL031RealTimeClockLib/PL031RealTimeClockLib.c | 127 +--------------------
> > .../PL031RealTimeClockLib.inf | 1 +
> > ArmVirtPkg/ArmVirt.dsc.inc | 1 +
> > 4 files changed, 5 insertions(+), 135 deletions(-)
> >
> > diff --git a/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h b/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h
> > index 76fbd0eb82..812cd9b397 100644
> > --- a/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h
> > +++ b/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h
> > @@ -42,15 +42,4 @@
> >
> > #define PL031_COUNTS_PER_SECOND 1
> >
> > -// Define EPOCH (1970-JANUARY-01) in the Julian Date representation
> > -#define EPOCH_JULIAN_DATE 2440588
> > -
> > -// Seconds per unit
> > -#define SEC_PER_MIN ((UINTN) 60)
> > -#define SEC_PER_HOUR ((UINTN) 3600)
> > -#define SEC_PER_DAY ((UINTN) 86400)
> > -
> > -#define SEC_PER_MONTH ((UINTN) 2,592,000)
> > -#define SEC_PER_YEAR ((UINTN) 31,536,000)
> > -
> > #endif
> > diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
> > index 4aa448b528..9f115d383c 100644
> > --- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
> > +++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c
> > @@ -36,6 +36,8 @@
> >
> > #include <Drivers/PL031RealTimeClock.h>
> >
> > +#include <Library/EfiTimeBaseLib.h>
> > +
> > #include <ArmPlatform.h>
> >
> > STATIC CONST CHAR16 mTimeZoneVariableName[] = L"PL031RtcTimeZone";
> > @@ -110,129 +112,6 @@ InitializePL031 (
> > }
> >
> > /**
> > - Converts Epoch seconds (elapsed since 1970 JANUARY 01, 00:00:00 UTC) to EFI_TIME
> > - **/
> > -VOID
> > -EpochToEfiTime (
> > - IN UINTN EpochSeconds,
> > - OUT EFI_TIME *Time
> > - )
> > -{
> > - UINTN a;
> > - UINTN b;
> > - UINTN c;
> > - UINTN d;
> > - UINTN g;
> > - UINTN j;
> > - UINTN m;
> > - UINTN y;
> > - UINTN da;
> > - UINTN db;
> > - UINTN dc;
> > - UINTN dg;
> > - UINTN hh;
> > - UINTN mm;
> > - UINTN ss;
> > - UINTN J;
> > -
> > - J = (EpochSeconds / 86400) + 2440588;
> > - j = J + 32044;
> > - g = j / 146097;
> > - dg = j % 146097;
> > - c = (((dg / 36524) + 1) * 3) / 4;
> > - dc = dg - (c * 36524);
> > - b = dc / 1461;
> > - db = dc % 1461;
> > - a = (((db / 365) + 1) * 3) / 4;
> > - da = db - (a * 365);
> > - y = (g * 400) + (c * 100) + (b * 4) + a;
> > - m = (((da * 5) + 308) / 153) - 2;
> > - d = da - (((m + 4) * 153) / 5) + 122;
> > -
> > - Time->Year = y - 4800 + ((m + 2) / 12);
> > - Time->Month = ((m + 2) % 12) + 1;
> > - Time->Day = d + 1;
> > -
> > - ss = EpochSeconds % 60;
> > - a = (EpochSeconds - ss) / 60;
> > - mm = a % 60;
> > - b = (a - mm) / 60;
> > - hh = b % 24;
> > -
> > - Time->Hour = hh;
> > - Time->Minute = mm;
> > - Time->Second = ss;
> > - Time->Nanosecond = 0;
> > -
> > -}
> > -
> > -/**
> > - Converts EFI_TIME to Epoch seconds (elapsed since 1970 JANUARY 01, 00:00:00 UTC)
> > - **/
> > -UINTN
> > -EfiTimeToEpoch (
> > - IN EFI_TIME *Time
> > - )
> > -{
> > - UINTN a;
> > - UINTN y;
> > - UINTN m;
> > - UINTN JulianDate; // Absolute Julian Date representation of the supplied Time
> > - UINTN EpochDays; // Number of days elapsed since EPOCH_JULIAN_DAY
> > - UINTN EpochSeconds;
> > -
> > - a = (14 - Time->Month) / 12 ;
> > - y = Time->Year + 4800 - a;
> > - m = Time->Month + (12*a) - 3;
> > -
> > - JulianDate = Time->Day + ((153*m + 2)/5) + (365*y) + (y/4) - (y/100) + (y/400) - 32045;
> > -
> > - ASSERT (JulianDate >= EPOCH_JULIAN_DATE);
> > - EpochDays = JulianDate - EPOCH_JULIAN_DATE;
> > -
> > - EpochSeconds = (EpochDays * SEC_PER_DAY) + ((UINTN)Time->Hour * SEC_PER_HOUR) + (Time->Minute * SEC_PER_MIN) + Time->Second;
> > -
> > - return EpochSeconds;
> > -}
> > -
> > -BOOLEAN
> > -IsLeapYear (
> > - IN EFI_TIME *Time
> > - )
> > -{
> > - if (Time->Year % 4 == 0) {
> > - if (Time->Year % 100 == 0) {
> > - if (Time->Year % 400 == 0) {
> > - return TRUE;
> > - } else {
> > - return FALSE;
> > - }
> > - } else {
> > - return TRUE;
> > - }
> > - } else {
> > - return FALSE;
> > - }
> > -}
> > -
> > -BOOLEAN
> > -DayValid (
> > - IN EFI_TIME *Time
> > - )
> > -{
> > - STATIC CONST INTN DayOfMonth[12] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
> > -
> > - if (Time->Day < 1 ||
> > - Time->Day > DayOfMonth[Time->Month - 1] ||
> > - (Time->Month == 2 && (!IsLeapYear (Time) && Time->Day > 28))
> > - ) {
> > - return FALSE;
> > - }
> > -
> > - return TRUE;
> > -}
> > -
> > -/**
> > Returns the current time and date information, and the time-keeping capabilities
> > of the hardware platform.
> >
> > @@ -431,7 +310,7 @@ LibSetTime (
> > (Time->Year > 9999) ||
> > (Time->Month < 1 ) ||
> > (Time->Month > 12 ) ||
> > - (!DayValid (Time) ) ||
> > + (!IsDayValid (Time) ) ||
> > (Time->Hour > 23 ) ||
> > (Time->Minute > 59 ) ||
> > (Time->Second > 59 ) ||
> > diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
> > index 3a98fc757e..41a4e6d6bd 100644
> > --- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
> > +++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
> > @@ -36,6 +36,7 @@
> > PcdLib
> > ArmPlatformSysConfigLib
> > DxeServicesTableLib
> > + EfiTimeBaseLib
> > UefiRuntimeLib
> >
> > [Guids]
> > diff --git a/ArmVirtPkg/ArmVirt.dsc.inc b/ArmVirtPkg/ArmVirt.dsc.inc
> > index e74eaf16e7..bc96709d8a 100644
> > --- a/ArmVirtPkg/ArmVirt.dsc.inc
> > +++ b/ArmVirtPkg/ArmVirt.dsc.inc
> > @@ -105,6 +105,7 @@
> >
> > # ARM PL031 RTC Driver
> > RealTimeClockLib|ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf
> > + EfiTimeBaseLib|EmbeddedPkg/Library/EfiTimeBaseLib/EfiTimeBaseLib.inf
> > # ARM PL011 UART Driver
> > PL011UartLib|ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf
> > SerialPortLib|ArmVirtPkg/Library/FdtPL011SerialPortLib/FdtPL011SerialPortLib.inf
> > --
> > 2.11.0
> >
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-05-10 16:02 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-03 21:38 [PATCH 0/3] Import a few items from OpenPlatformPkg Leif Lindholm
2017-05-03 21:38 ` [PATCH 1/3] EmbeddedPkg: import DesignWare EMMC driver Leif Lindholm
2017-05-03 21:38 ` [PATCH 2/3] EmbeddedPkg: import EfiTimeBaseLib Leif Lindholm
2017-05-03 21:38 ` [PATCH 3/3] ArmPlatformPkg, ArmVirtPkg: delete redundant PL031 functions Leif Lindholm
2017-05-04 18:10 ` Ard Biesheuvel
2017-05-10 16:02 ` Leif Lindholm
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox