From 5cc45b70c310f853f28b2351f3d93109ff858dcf Mon Sep 17 00:00:00 2001 From: oliviermartin Date: Fri, 1 Jul 2011 15:30:01 +0000 Subject: [PATCH] ArmPkg: Move ARM Platform drivers from ArmPkg/Drivers/ to ArmPlatformPkg/Drivers/ The idea is to keep ArmPkg responsible for the ARM architectural modules and ArmPlatformPkg the ARM development platform packages (with their respective drivers). ArmPlatformPkg: Reduce driver dependency on ArmPlatform.h - Move some driver definitions from C-Macro to PCD values - Unify PCD driver namespace git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11956 6f19259b-4bc3-4df7-8a09-765794883524 --- ArmPkg/ArmPkg.dec | 6 - ArmPkg/ArmPkg.dsc | 13 - ArmPkg/Drivers/PL180MciDxe/PL180Mci.c | 537 ------------------ ArmPkg/Drivers/PL180MciDxe/PL180Mci.h | 119 ---- ArmPkg/Drivers/PL180MciDxe/PL180MciDxe.inf | 52 -- ArmPkg/Drivers/PL301Axi/PL301Axi.c | 108 ---- ArmPkg/Drivers/PL301Axi/PL301Axi.inf | 29 - ArmPkg/Drivers/PL310L2Cache/PL310L2Cache.c | 126 ---- .../Drivers/PL310L2Cache/PL310L2CacheSec.inf | 30 - ArmPkg/Drivers/PL34xDmc/PL341Dmc.c | 221 ------- ArmPkg/Drivers/PL34xDmc/PL341Dmc.inf | 29 - ArmPkg/Drivers/PL35xSmc/InitializeSMC.S | 197 ------- ArmPkg/Drivers/PL35xSmc/InitializeSMC.asm | 153 ----- ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf | 30 - ArmPkg/Library/L2X0CacheLibNull/L2X0Cache.c | 30 - .../L2X0CacheLibNull/L2X0CacheLibNull.inf | 27 - ArmPlatformPkg/ArmPlatformPkg.dec | 32 +- .../ArmRealViewEb-RTSM-A8.dsc | 26 +- .../ArmRealViewEb-RTSM-A9x2.dsc | 23 +- .../Include/Platform/ArmPlatform.h | 4 - .../ArmRealViewEbLibRTSM/ArmRealViewEb.c | 4 +- .../ArmRealViewEbLibRTSM/ArmRealViewEbMem.c | 2 + .../ArmVExpressPkg/ArmVExpress-CTA9x4.dsc | 50 +- .../ArmVExpressPkg/ArmVExpress-CTA9x4.fdf | 2 +- .../ArmVExpressPkg/ArmVExpressPkg.dec | 3 +- .../Include/Platform/CTA9x4/ArmPlatform.h | 28 +- .../ArmVExpressLibCTA9x4/ArmVExpressLib.inf | 3 + .../Library/ArmVExpressLibCTA9x4/CTA9x4.c | 4 +- .../Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c | 2 + .../Library/ArmVExpressLibCTA9x4/CTA9x4Sec.c | 2 + .../ArmVExpressSysConfigLib.inf | 1 + .../PL111LcdArmVExpress.c | 4 +- .../PL111LcdArmVExpressLib.inf | 15 +- .../LcdGraphicsOutputBlt.c | 1 - .../LcdGraphicsOutputDxe.c | 2 - .../PL111LcdGraphicsOutputDxe.inf | 8 +- .../Drivers/NorFlashDxe/NorFlashDxe.h | 2 - .../Drivers/PL061GpioDxe/PL061Gpio.c | 75 ++- .../Drivers/PL061GpioDxe/PL061GpioDxe.inf | 15 +- .../Drivers/SP804TimerDxe/SP804Timer.c | 62 +- .../Drivers/SP804TimerDxe/SP804TimerDxe.inf | 7 +- .../Drivers/SP805WatchdogDxe/SP805Watchdog.c | 22 +- .../SP805WatchdogDxe/SP805WatchdogDxe.inf | 16 +- .../Include/Drivers/PL031RealTimeClock.h | 35 +- ArmPlatformPkg/Include/Drivers/PL061Gpio.h | 38 +- ArmPlatformPkg/Include/Drivers/PL111Lcd.h | 46 +- .../Include/Drivers/PL301Axi.h | 0 .../Include/Drivers/PL310L2Cache.h | 0 .../Include/Drivers/PL341Dmc.h | 0 .../Include/Drivers/PL35xSmc.h | 0 .../Include/Drivers/SP805Watchdog.h | 33 +- .../Include/Library/ArmPlatformLib.h | 3 +- .../PL011SerialPortLib/PL011SerialPortLib.c | 1 - .../PL031RealTimeClockLib.c | 120 ++-- .../PL031RealTimeClockLib.inf | 5 + .../Library/SP804TimerLib/SP804TimerLib.c | 32 +- .../Library/SP804TimerLib/SP804TimerLib.inf | 4 +- ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c | 4 - ArmPlatformPkg/PrePeiCore/MainMPCore.c | 2 - ArmPlatformPkg/PrePeiCore/MainUniCore.c | 2 - ArmPlatformPkg/PrePeiCore/PrePeiCore.c | 2 - ArmPlatformPkg/PrePeiCore/PrePeiCore.h | 3 + .../PrePeiCore/PrePeiCoreUniCore.inf | 3 + ArmPlatformPkg/PrePi/Exception.S | 1 - 64 files changed, 389 insertions(+), 2067 deletions(-) delete mode 100644 ArmPkg/Drivers/PL180MciDxe/PL180Mci.c delete mode 100644 ArmPkg/Drivers/PL180MciDxe/PL180Mci.h delete mode 100644 ArmPkg/Drivers/PL180MciDxe/PL180MciDxe.inf delete mode 100644 ArmPkg/Drivers/PL301Axi/PL301Axi.c delete mode 100644 ArmPkg/Drivers/PL301Axi/PL301Axi.inf delete mode 100644 ArmPkg/Drivers/PL310L2Cache/PL310L2Cache.c delete mode 100644 ArmPkg/Drivers/PL310L2Cache/PL310L2CacheSec.inf delete mode 100644 ArmPkg/Drivers/PL34xDmc/PL341Dmc.c delete mode 100644 ArmPkg/Drivers/PL34xDmc/PL341Dmc.inf delete mode 100644 ArmPkg/Drivers/PL35xSmc/InitializeSMC.S delete mode 100644 ArmPkg/Drivers/PL35xSmc/InitializeSMC.asm delete mode 100644 ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf delete mode 100644 ArmPkg/Library/L2X0CacheLibNull/L2X0Cache.c delete mode 100644 ArmPkg/Library/L2X0CacheLibNull/L2X0CacheLibNull.inf rename {ArmPkg => ArmPlatformPkg}/Include/Drivers/PL301Axi.h (100%) rename {ArmPkg => ArmPlatformPkg}/Include/Drivers/PL310L2Cache.h (100%) rename {ArmPkg => ArmPlatformPkg}/Include/Drivers/PL341Dmc.h (100%) rename ArmPkg/Include/Drivers/PL354Smc.h => ArmPlatformPkg/Include/Drivers/PL35xSmc.h (100%) diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec index 9f4673c3ba..170786364a 100644 --- a/ArmPkg/ArmPkg.dec +++ b/ArmPkg/ArmPkg.dec @@ -69,12 +69,6 @@ gArmTokenSpaceGuid.PcdCpuVectorBaseAddress|0xffff0000|UINT32|0x00000004 gArmTokenSpaceGuid.PcdCpuResetAddress|0x00000000|UINT32|0x00000005 - # - # ARM PL180 MCI - # - gArmTokenSpaceGuid.PcdPL180SysMciRegAddress|0x00000000|UINT32|0x00000006 - gArmTokenSpaceGuid.PcdPL180MciBaseAddress|0x00000000|UINT32|0x00000007 - # # ARM PL390 General Interrupt Controller # diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc index cf68f5d689..56fdeec750 100644 --- a/ArmPkg/ArmPkg.dsc +++ b/ArmPkg/ArmPkg.dsc @@ -71,11 +71,6 @@ ArmTrustZoneLib|ArmPkg/Library/ArmTrustZoneLib/ArmTrustZoneLib.inf ArmMPCoreMailBoxLib|ArmPkg/Library/ArmMPCoreMailBoxLib/ArmMPCoreMailBoxLib.inf - PL354SmcLib|ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf - PL341DmcLib|ArmPkg/Drivers/PL34xDmc/PL341Dmc.inf - PL301AxiLib|ArmPkg/Drivers/PL301Axi/PL301Axi.inf - PL310L2CacheSecLib|ArmPkg/Drivers/PL310L2Cache/PL310L2CacheSec.inf - BdsLib|ArmPkg/Library/BdsLib/BdsLib.inf IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf @@ -116,7 +111,6 @@ ArmPkg/Library/DebugPeCoffExtraActionLib/DebugPeCoffExtraActionLib.inf ArmPkg/Library/DebugUncachedMemoryAllocationLib/DebugUncachedMemoryAllocationLib.inf ArmPkg/Library/DefaultExceptionHandlerLib/DefaultExceptionHandlerLib.inf - ArmPkg/Library/L2X0CacheLibNull/L2X0CacheLibNull.inf ArmPkg/Library/RvdPeCoffExtraActionLib/RvdPeCoffExtraActionLib.inf ArmPkg/Library/SemiHostingDebugLib/SemiHostingDebugLib.inf ArmPkg/Library/SemiHostingSerialPortLib/SemiHostingSerialPortLib.inf @@ -125,14 +119,7 @@ ArmPkg/Drivers/CpuDxe/CpuDxe.inf ArmPkg/Drivers/CpuPei/CpuPei.inf - ArmPkg/Drivers/PL180MciDxe/PL180MciDxe.inf - ArmPkg/Drivers/PL301Axi/PL301Axi.inf - ArmPkg/Drivers/PL310L2Cache/PL310L2CacheSec.inf - ArmPkg/Drivers/PL34xDmc/PL341Dmc.inf - ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf ArmPkg/Drivers/PL390Gic/PL390GicDxe.inf ArmPkg/Drivers/PL390Gic/PL390GicNonSec.inf ArmPkg/Drivers/PL390Gic/PL390GicSec.inf ArmPkg/Filesystem/SemihostFs/SemihostFs.inf - - diff --git a/ArmPkg/Drivers/PL180MciDxe/PL180Mci.c b/ArmPkg/Drivers/PL180MciDxe/PL180Mci.c deleted file mode 100644 index 697e33f0d0..0000000000 --- a/ArmPkg/Drivers/PL180MciDxe/PL180Mci.c +++ /dev/null @@ -1,537 +0,0 @@ -/** @file - This file implement the MMC Host Protocol for the ARM PrimeCell PL180. - - Copyright (c) 2011, ARM 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 "PL180Mci.h" - -#include -#include - -EFI_MMC_HOST_PROTOCOL *gpMmcHost; - -// Untested ... -//#define USE_STREAM - -#define MMCI0_BLOCKLEN 512 -#define MMCI0_POW2_BLOCKLEN 9 -#define MMCI0_TIMEOUT 1000 - -BOOLEAN -MciIsPowerOn ( - VOID - ) -{ - return ((MmioRead32(MCI_POWER_CONTROL_REG) & 0x3) == MCI_POWER_ON); -} - -EFI_STATUS -MciInitialize ( - VOID - ) -{ - MCI_TRACE("MciInitialize()"); - return EFI_SUCCESS; -} - -BOOLEAN -MciIsCardPresent ( - VOID - ) -{ - return (MmioRead32(FixedPcdGet32(PcdPL180SysMciRegAddress)) & 1); -} - -BOOLEAN -MciIsReadOnly ( - VOID - ) -{ - return (MmioRead32(FixedPcdGet32(PcdPL180SysMciRegAddress)) & 2); -} - -#if 0 -//Note: This function has been commented out because it is not used yet. -// This function could be used to remove the hardcoded BlockLen used -// in MciPrepareDataPath - -// Convert block size to 2^n -STATIC -UINT32 -GetPow2BlockLen ( - IN UINT32 BlockLen - ) -{ - UINTN Loop; - UINTN Pow2BlockLen; - - Loop = 0x8000; - Pow2BlockLen = 15; - do { - Loop = (Loop >> 1) & 0xFFFF; - Pow2BlockLen--; - } while (Pow2BlockLen && (!(Loop & BlockLen))); - - return Pow2BlockLen; -} -#endif - -VOID -MciPrepareDataPath ( - IN UINTN TransferDirection - ) -{ - // Set Data Length & Data Timer - MmioWrite32(MCI_DATA_TIMER_REG,0xFFFFFFF); - MmioWrite32(MCI_DATA_LENGTH_REG,MMCI0_BLOCKLEN); - -#ifndef USE_STREAM - //Note: we are using a hardcoded BlockLen (=512). If we decide to use a variable size, we could - // compute the pow2 of BlockLen with the above function GetPow2BlockLen() - MmioWrite32(MCI_DATA_CTL_REG, MCI_DATACTL_ENABLE | MCI_DATACTL_DMA_ENABLE | TransferDirection | (MMCI0_POW2_BLOCKLEN << 4)); -#else - MmioWrite32(MCI_DATA_CTL_REG, MCI_DATACTL_ENABLE | MCI_DATACTL_DMA_ENABLE | TransferDirection | MCI_DATACTL_STREAM_TRANS); -#endif -} - -EFI_STATUS -MciSendCommand ( - IN MMC_CMD MmcCmd, - IN UINT32 Argument - ) -{ - UINT32 Status; - UINT32 Cmd; - UINTN RetVal; - UINTN CmdCtrlReg; - - RetVal = EFI_SUCCESS; - - if ((MmcCmd == MMC_CMD17) || (MmcCmd == MMC_CMD11)) { - MciPrepareDataPath(MCI_DATACTL_CARD_TO_CONT); - } else if ((MmcCmd == MMC_CMD24) || (MmcCmd == MMC_CMD20)) { - MciPrepareDataPath(MCI_DATACTL_CONT_TO_CARD); - } - - // Create Command for PL180 - Cmd = (MMC_GET_INDX(MmcCmd) & INDX_MASK) | MCI_CPSM_ENABLED; - if (MmcCmd & MMC_CMD_WAIT_RESPONSE) { - Cmd |= MCI_CPSM_WAIT_RESPONSE; - } - - if (MmcCmd & MMC_CMD_LONG_RESPONSE) { - Cmd |= MCI_CPSM_LONG_RESPONSE; - } - - // Clear Status register static flags - MmioWrite32(MCI_CLEAR_STATUS_REG,0x7FF); - - //Write to command argument register - MmioWrite32(MCI_ARGUMENT_REG,Argument); - - //Write to command register - MmioWrite32(MCI_COMMAND_REG,Cmd); - - if (Cmd & MCI_CPSM_WAIT_RESPONSE) { - Status = MmioRead32(MCI_STATUS_REG); - while (!(Status & (MCI_STATUS_CMD_RESPEND | MCI_STATUS_CMD_CMDCRCFAIL | MCI_STATUS_CMD_CMDTIMEOUT | MCI_STATUS_CMD_START_BIT_ERROR))) { - Status = MmioRead32(MCI_STATUS_REG); - } - - if ((Status & MCI_STATUS_CMD_START_BIT_ERROR)) { - DEBUG ((EFI_D_ERROR, "MciSendCommand(CmdIndex:%d) Start bit Error! Response:0x%X Status:0x%x\n",(Cmd & 0x3F),MmioRead32(MCI_RESPONSE0_REG),Status)); - RetVal = EFI_NO_RESPONSE; - goto Exit; - } else if ((Status & MCI_STATUS_CMD_CMDTIMEOUT)) { - //DEBUG ((EFI_D_ERROR, "MciSendCommand(CmdIndex:%d) TIMEOUT! Response:0x%X Status:0x%x\n",(Cmd & 0x3F),MmioRead32(MCI_RESPONSE0_REG),Status)); - RetVal = EFI_TIMEOUT; - goto Exit; - } else if ((!(MmcCmd & MMC_CMD_NO_CRC_RESPONSE)) && (Status & MCI_STATUS_CMD_CMDCRCFAIL)) { - // The CMD1 and response type R3 do not contain CRC. We should ignore the CRC failed Status. - RetVal = EFI_CRC_ERROR; - goto Exit; - } else { - RetVal = EFI_SUCCESS; - goto Exit; - } - } else { - Status = MmioRead32(MCI_STATUS_REG); - while (!(Status & (MCI_STATUS_CMD_SENT | MCI_STATUS_CMD_CMDCRCFAIL | MCI_STATUS_CMD_CMDTIMEOUT| MCI_STATUS_CMD_START_BIT_ERROR))) { - Status = MmioRead32(MCI_STATUS_REG); - } - - if ((Status & MCI_STATUS_CMD_START_BIT_ERROR)) { - DEBUG ((EFI_D_ERROR, "MciSendCommand(CmdIndex:%d) Start bit Error! Response:0x%X Status:0x%x\n",(Cmd & 0x3F),MmioRead32(MCI_RESPONSE0_REG),Status)); - RetVal = EFI_NO_RESPONSE; - goto Exit; - } else if ((Status & MCI_STATUS_CMD_CMDTIMEOUT)) { - //DEBUG ((EFI_D_ERROR, "MciSendCommand(CmdIndex:%d) TIMEOUT! Response:0x%X Status:0x%x\n",(Cmd & 0x3F),MmioRead32(MCI_RESPONSE0_REG),Status)); - RetVal = EFI_TIMEOUT; - goto Exit; - } else - if ((!(MmcCmd & MMC_CMD_NO_CRC_RESPONSE)) && (Status & MCI_STATUS_CMD_CMDCRCFAIL)) { - // The CMD1 does not contain CRC. We should ignore the CRC failed Status. - RetVal = EFI_CRC_ERROR; - goto Exit; - } else { - RetVal = EFI_SUCCESS; - goto Exit; - } - } - -Exit: - //Disable Command Path - CmdCtrlReg = MmioRead32(MCI_COMMAND_REG); - MmioWrite32(MCI_COMMAND_REG, (CmdCtrlReg & ~MCI_CPSM_ENABLED)); - return RetVal; -} - -EFI_STATUS -MciReceiveResponse ( - 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(MCI_RESPONSE0_REG); - Buffer[1] = MmioRead32(MCI_RESPONSE1_REG); - } else if (Type == MMC_RESPONSE_TYPE_R2) { - Buffer[0] = MmioRead32(MCI_RESPONSE0_REG); - Buffer[1] = MmioRead32(MCI_RESPONSE1_REG); - Buffer[2] = MmioRead32(MCI_RESPONSE2_REG); - Buffer[3] = MmioRead32(MCI_RESPONSE3_REG); - } - - return EFI_SUCCESS; -} - -EFI_STATUS -MciReadBlockData ( - IN EFI_LBA Lba, - IN UINTN Length, - IN UINT32* Buffer - ) -{ - UINTN Loop; - UINTN Finish; - UINTN Status; - EFI_STATUS RetVal; - UINTN DataCtrlReg; - - RetVal = EFI_SUCCESS; - - // Read data from the RX FIFO - Loop = 0; - Finish = MMCI0_BLOCKLEN / 4; - do { - // Read the Status flags - Status = MmioRead32(MCI_STATUS_REG); - - // Do eight reads if possible else a single read - if (Status & MCI_STATUS_CMD_RXFIFOHALFFULL) { - Buffer[Loop] = MmioRead32(MCI_FIFO_REG); - Loop++; - Buffer[Loop] = MmioRead32(MCI_FIFO_REG); - Loop++; - Buffer[Loop] = MmioRead32(MCI_FIFO_REG); - Loop++; - Buffer[Loop] = MmioRead32(MCI_FIFO_REG); - Loop++; - Buffer[Loop] = MmioRead32(MCI_FIFO_REG); - Loop++; - Buffer[Loop] = MmioRead32(MCI_FIFO_REG); - Loop++; - Buffer[Loop] = MmioRead32(MCI_FIFO_REG); - Loop++; - Buffer[Loop] = MmioRead32(MCI_FIFO_REG); - Loop++; - } else if (Status & MCI_STATUS_CMD_RXDATAAVAILBL) { - Buffer[Loop] = MmioRead32(MCI_FIFO_REG); - Loop++; - } else { - //Check for error conditions and timeouts - if(Status & MCI_STATUS_CMD_DATATIMEOUT) { - DEBUG ((EFI_D_ERROR, "MciReadBlockData(): TIMEOUT! Response:0x%X Status:0x%x\n",MmioRead32(MCI_RESPONSE0_REG),Status)); - RetVal = EFI_TIMEOUT; - break; - } else if(Status & MCI_STATUS_CMD_DATACRCFAIL) { - DEBUG ((EFI_D_ERROR, "MciReadBlockData(): CRC Error! Response:0x%X Status:0x%x\n",MmioRead32(MCI_RESPONSE0_REG),Status)); - RetVal = EFI_CRC_ERROR; - break; - } else if(Status & MCI_STATUS_CMD_START_BIT_ERROR) { - DEBUG ((EFI_D_ERROR, "MciReadBlockData(): Start-bit Error! Response:0x%X Status:0x%x\n",MmioRead32(MCI_RESPONSE0_REG),Status)); - RetVal = EFI_NO_RESPONSE; - break; - } - } - //clear RX over run flag - if(Status & MCI_STATUS_CMD_RXOVERRUN) { - MmioWrite32(MCI_CLEAR_STATUS_REG, MCI_STATUS_CMD_RXOVERRUN); - } - } while ((Loop < Finish)); - - //Clear Status flags - MmioWrite32(MCI_CLEAR_STATUS_REG, 0x7FF); - - //Disable Data path - DataCtrlReg = MmioRead32(MCI_DATA_CTL_REG); - MmioWrite32(MCI_DATA_CTL_REG, (DataCtrlReg & 0xFE)); - - return RetVal; -} - -EFI_STATUS -MciWriteBlockData ( - IN EFI_LBA Lba, - IN UINTN Length, - IN UINT32* Buffer - ) -{ - UINTN Loop; - UINTN Finish; - UINTN Timer; - UINTN Status; - EFI_STATUS RetVal; - UINTN DataCtrlReg; - - RetVal = EFI_SUCCESS; - - // Write the data to the TX FIFO - Loop = 0; - Finish = MMCI0_BLOCKLEN / 4; - Timer = MMCI0_TIMEOUT * 100; - do { - // Read the Status flags - Status = MmioRead32(MCI_STATUS_REG); - - // Do eight writes if possible else a single write - if (Status & MCI_STATUS_CMD_TXFIFOHALFEMPTY) { - MmioWrite32(MCI_FIFO_REG, Buffer[Loop]); - Loop++; - MmioWrite32(MCI_FIFO_REG, Buffer[Loop]); - Loop++; - MmioWrite32(MCI_FIFO_REG, Buffer[Loop]); - Loop++; - MmioWrite32(MCI_FIFO_REG, Buffer[Loop]); - Loop++; - MmioWrite32(MCI_FIFO_REG, Buffer[Loop]); - Loop++; - MmioWrite32(MCI_FIFO_REG, Buffer[Loop]); - Loop++; - MmioWrite32(MCI_FIFO_REG, Buffer[Loop]); - Loop++; - MmioWrite32(MCI_FIFO_REG, Buffer[Loop]); - Loop++; - } else if ((Status & MCI_STATUS_CMD_TXFIFOEMPTY)) { - MmioWrite32(MCI_FIFO_REG, Buffer[Loop]); - Loop++; - } else { - //Check for error conditions and timeouts - if(Status & MCI_STATUS_CMD_DATATIMEOUT) { - DEBUG ((EFI_D_ERROR, "MciWriteBlockData(): TIMEOUT! Response:0x%X Status:0x%x\n",MmioRead32(MCI_RESPONSE0_REG),Status)); - RetVal = EFI_TIMEOUT; - goto Exit; - } else if(Status & MCI_STATUS_CMD_DATACRCFAIL) { - DEBUG ((EFI_D_ERROR, "MciWriteBlockData(): CRC Error! Response:0x%X Status:0x%x\n",MmioRead32(MCI_RESPONSE0_REG),Status)); - RetVal = EFI_CRC_ERROR; - goto Exit; - } else if(Status & MCI_STATUS_CMD_TX_UNDERRUN) { - DEBUG ((EFI_D_ERROR, "MciWriteBlockData(): TX buffer Underrun! Response:0x%X Status:0x%x, Number of bytes written 0x%x\n",MmioRead32(MCI_RESPONSE0_REG),Status, Loop)); - RetVal = EFI_BUFFER_TOO_SMALL; - ASSERT(0); - goto Exit; - } - } - } while (Loop < Finish); - - // Wait for FIFO to drain - Timer = MMCI0_TIMEOUT * 60; - Status = MmioRead32(MCI_STATUS_REG); -#ifndef USE_STREAM - // Single block - while (((Status & MCI_STATUS_CMD_TXDONE) != MCI_STATUS_CMD_TXDONE) && Timer) { -#else - // Stream - while (((Status & MCI_STATUS_CMD_DATAEND) != MCI_STATUS_CMD_DATAEND) && Timer) { -#endif - NanoSecondDelay(10); - Status = MmioRead32(MCI_STATUS_REG); - Timer--; - } - - if(Timer == 0) { - DEBUG ((EFI_D_ERROR, "MciWriteBlockData(): Data End timeout Number of bytes written 0x%x\n",Loop)); - ASSERT(Timer > 0); - return EFI_TIMEOUT; - } - - //Clear Status flags - MmioWrite32(MCI_CLEAR_STATUS_REG, 0x7FF); - if (Timer == 0) { - RetVal = EFI_TIMEOUT; - } - -Exit: - //Disable Data path - DataCtrlReg = MmioRead32(MCI_DATA_CTL_REG); - MmioWrite32(MCI_DATA_CTL_REG, (DataCtrlReg & 0xFE)); - return RetVal; -} - -EFI_STATUS -MciNotifyState ( - IN MMC_STATE State - ) -{ - UINT32 Data32; - - switch(State) { - case MmcInvalidState: - ASSERT(0); - break; - case MmcHwInitializationState: - // If device already turn on then restart it - Data32 = MmioRead32(MCI_POWER_CONTROL_REG); - if ((Data32 & 0x2) == MCI_POWER_UP) { - MCI_TRACE("MciNotifyState(MmcHwInitializationState): TurnOff MCI"); - - // Turn off - MmioWrite32(MCI_CLOCK_CONTROL_REG, 0); - MmioWrite32(MCI_POWER_CONTROL_REG, 0); - MicroSecondDelay(100); - } - - MCI_TRACE("MciNotifyState(MmcHwInitializationState): TurnOn MCI"); - // Setup clock - // - 0x1D = 29 => should be the clock divider to be less than 400kHz at MCLK = 24Mhz - MmioWrite32(MCI_CLOCK_CONTROL_REG,0x1D | MCI_CLOCK_ENABLE | MCI_CLOCK_POWERSAVE); - //MmioWrite32(MCI_CLOCK_CONTROL_REG,0x1D | MCI_CLOCK_ENABLE); - - // Set the voltage - MmioWrite32(MCI_POWER_CONTROL_REG,MCI_POWER_OPENDRAIN | (15<<2)); - MmioWrite32(MCI_POWER_CONTROL_REG,MCI_POWER_ROD | MCI_POWER_OPENDRAIN | (15<<2) | MCI_POWER_UP); - MicroSecondDelay(10); - MmioWrite32(MCI_POWER_CONTROL_REG,MCI_POWER_ROD | MCI_POWER_OPENDRAIN | (15<<2) | MCI_POWER_ON); - MicroSecondDelay(100); - - // Set Data Length & Data Timer - MmioWrite32(MCI_DATA_TIMER_REG,0xFFFFF); - MmioWrite32(MCI_DATA_LENGTH_REG,8); - - ASSERT((MmioRead32(MCI_POWER_CONTROL_REG) & 0x3) == MCI_POWER_ON); - break; - case MmcIdleState: - MCI_TRACE("MciNotifyState(MmcIdleState)"); - break; - case MmcReadyState: - MCI_TRACE("MciNotifyState(MmcReadyState)"); - break; - case MmcIdentificationState: - MCI_TRACE("MciNotifyState(MmcIdentificationState)"); - break; - case MmcStandByState:{ - volatile UINT32 PwrCtrlReg; - MCI_TRACE("MciNotifyState(MmcStandByState)"); - - // Enable MCICMD push-pull drive - PwrCtrlReg = MmioRead32(MCI_POWER_CONTROL_REG); - //Disable Open Drain output - PwrCtrlReg &=~(MCI_POWER_OPENDRAIN); - MmioWrite32(MCI_POWER_CONTROL_REG,PwrCtrlReg); - - // Set MMCI0 clock to 4MHz (24MHz may be possible with cache enabled) - // - // Note: Increasing clock speed causes TX FIFO under-run errors. - // So careful when optimising this driver for higher performance. - // - MmioWrite32(MCI_CLOCK_CONTROL_REG,0x02 | MCI_CLOCK_ENABLE | MCI_CLOCK_POWERSAVE); - // Set MMCI0 clock to 24MHz (by bypassing the divider) - //MmioWrite32(MCI_CLOCK_CONTROL_REG,MCI_CLOCK_BYPASS | MCI_CLOCK_ENABLE); - break; - } - case MmcTransferState: - //MCI_TRACE("MciNotifyState(MmcTransferState)"); - break; - case MmcSendingDataState: - MCI_TRACE("MciNotifyState(MmcSendingDataState)"); - break; - case MmcReceiveDataState: - MCI_TRACE("MciNotifyState(MmcReceiveDataState)"); - break; - case MmcProgrammingState: - MCI_TRACE("MciNotifyState(MmcProgrammingState)"); - break; - case MmcDisconnectState: - MCI_TRACE("MciNotifyState(MmcDisconnectState)"); - break; - default: - ASSERT(0); - } - return EFI_SUCCESS; -} - -EFI_GUID mPL180MciDevicePathGuid = EFI_CALLER_ID_GUID; - -EFI_STATUS -MciBuildDevicePath ( - 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,&mPL180MciDevicePathGuid); - - *DevicePath = NewDevicePathNode; - return EFI_SUCCESS; -} - -EFI_MMC_HOST_PROTOCOL gMciHost = { - MciIsCardPresent, - MciIsReadOnly, - MciBuildDevicePath, - MciNotifyState, - MciSendCommand, - MciReceiveResponse, - MciReadBlockData, - MciWriteBlockData -}; - -EFI_STATUS -PL180MciDxeInitialize ( - IN EFI_HANDLE ImageHandle, - IN EFI_SYSTEM_TABLE *SystemTable - ) -{ - EFI_STATUS Status; - EFI_HANDLE Handle = NULL; - - MCI_TRACE("PL180MciDxeInitialize()"); - - //Publish Component Name, BlockIO protocol interfaces - Status = gBS->InstallMultipleProtocolInterfaces ( - &Handle, - &gEfiMmcHostProtocolGuid, &gMciHost, - NULL - ); - ASSERT_EFI_ERROR (Status); - - return EFI_SUCCESS; -} diff --git a/ArmPkg/Drivers/PL180MciDxe/PL180Mci.h b/ArmPkg/Drivers/PL180MciDxe/PL180Mci.h deleted file mode 100644 index 53a0b1c5af..0000000000 --- a/ArmPkg/Drivers/PL180MciDxe/PL180Mci.h +++ /dev/null @@ -1,119 +0,0 @@ -/** @file - Header for the MMC Host Protocol implementation for the ARM PrimeCell PL180. - - Copyright (c) 2011, ARM 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 __PL180_MCI_H -#define __PL180_MCI_H - -#include - -#include - -#include -#include -#include -#include -#include -#include - -#define PL180_MCI_DXE_VERSION 0x10 - -#define MCI_SYSCTL FixedPcdGet32(PcdPL180MciBaseAddress) - -#define MCI_POWER_CONTROL_REG (MCI_SYSCTL+0x000) -#define MCI_CLOCK_CONTROL_REG (MCI_SYSCTL+0x004) -#define MCI_ARGUMENT_REG (MCI_SYSCTL+0x008) -#define MCI_COMMAND_REG (MCI_SYSCTL+0x00C) -#define MCI_RESPCMD_REG (MCI_SYSCTL+0x010) -#define MCI_RESPONSE0_REG (MCI_SYSCTL+0x014) -#define MCI_RESPONSE1_REG (MCI_SYSCTL+0x018) -#define MCI_RESPONSE2_REG (MCI_SYSCTL+0x01C) -#define MCI_RESPONSE3_REG (MCI_SYSCTL+0x020) -#define MCI_DATA_TIMER_REG (MCI_SYSCTL+0x024) -#define MCI_DATA_LENGTH_REG (MCI_SYSCTL+0x028) -#define MCI_DATA_CTL_REG (MCI_SYSCTL+0x02C) -#define MCI_DATA_COUNTER (MCI_SYSCTL+0x030) -#define MCI_STATUS_REG (MCI_SYSCTL+0x034) -#define MCI_CLEAR_STATUS_REG (MCI_SYSCTL+0x038) -#define MCI_INT0_MASK_REG (MCI_SYSCTL+0x03C) -#define MCI_INT1_MASK_REG (MCI_SYSCTL+0x040) -#define MCI_FIFOCOUNT_REG (MCI_SYSCTL+0x048) -#define MCI_FIFO_REG (MCI_SYSCTL+0x080) - -#define MCI_POWER_UP 0x2 -#define MCI_POWER_ON 0x3 -#define MCI_POWER_OPENDRAIN (1 << 6) -#define MCI_POWER_ROD (1 << 7) - -#define MCI_CLOCK_ENABLE 0x100 -#define MCI_CLOCK_POWERSAVE 0x200 -#define MCI_CLOCK_BYPASS 0x400 - -#define MCI_STATUS_CMD_CMDCRCFAIL 0x1 -#define MCI_STATUS_CMD_DATACRCFAIL 0x2 -#define MCI_STATUS_CMD_CMDTIMEOUT 0x4 -#define MCI_STATUS_CMD_DATATIMEOUT 0x8 -#define MCI_STATUS_CMD_TX_UNDERRUN 0x10 -#define MCI_STATUS_CMD_RXOVERRUN 0x20 -#define MCI_STATUS_CMD_RESPEND 0x40 -#define MCI_STATUS_CMD_SENT 0x80 -#define MCI_STATUS_CMD_TXDONE (MCI_STATUS_CMD_DATAEND | MCI_STATUS_CMD_DATABLOCKEND) -#define MCI_STATUS_CMD_DATAEND 0x000100 // Command Status - Data end -#define MCI_STATUS_CMD_START_BIT_ERROR 0x000200 -#define MCI_STATUS_CMD_DATABLOCKEND 0x000400 // Command Status - Data end -#define MCI_STATUS_CMD_ACTIVE 0x800 -#define MCI_STATUS_CMD_RXACTIVE (1 << 13) -#define MCI_STATUS_CMD_RXFIFOHALFFULL 0x008000 -#define MCI_STATUS_CMD_RXFIFOEMPTY 0x080000 -#define MCI_STATUS_CMD_RXDATAAVAILBL (1 << 21) -#define MCI_STATUS_CMD_TXACTIVE (1 << 12) -#define MCI_STATUS_CMD_TXFIFOFULL (1 << 16) -#define MCI_STATUS_CMD_TXFIFOHALFEMPTY (1 << 14) -#define MCI_STATUS_CMD_TXFIFOEMPTY (1 << 18) -#define MCI_STATUS_CMD_TXDATAAVAILBL (1 << 20) - -#define MCI_DATACTL_ENABLE 1 -#define MCI_DATACTL_CONT_TO_CARD 0 -#define MCI_DATACTL_CARD_TO_CONT 2 -#define MCI_DATACTL_BLOCK_TRANS 0 -#define MCI_DATACTL_STREAM_TRANS 4 -#define MCI_DATACTL_DMA_ENABLE (1 << 3) - -#define INDX_MASK 0x3F - -#define MCI_CPSM_ENABLED (1 << 10) -#define MCI_CPSM_WAIT_RESPONSE (1 << 6) -#define MCI_CPSM_LONG_RESPONSE (1 << 7) - -#define MCI_TRACE(txt) DEBUG((EFI_D_BLKIO, "ARM_MCI: " txt "\n")) - -EFI_STATUS -EFIAPI -MciGetDriverName ( - IN EFI_COMPONENT_NAME_PROTOCOL *This, - IN CHAR8 *Language, - OUT CHAR16 **DriverName - ); - -EFI_STATUS -EFIAPI -MciGetControllerName ( - IN EFI_COMPONENT_NAME_PROTOCOL *This, - IN EFI_HANDLE ControllerHandle, - IN EFI_HANDLE ChildHandle OPTIONAL, - IN CHAR8 *Language, - OUT CHAR16 **ControllerName - ); - -#endif diff --git a/ArmPkg/Drivers/PL180MciDxe/PL180MciDxe.inf b/ArmPkg/Drivers/PL180MciDxe/PL180MciDxe.inf deleted file mode 100644 index 74a89fe4b0..0000000000 --- a/ArmPkg/Drivers/PL180MciDxe/PL180MciDxe.inf +++ /dev/null @@ -1,52 +0,0 @@ -#/** @file -# INF file for the MMC Host Protocol implementation for the ARM PrimeCell PL180. -# -# Copyright (c) 2011, ARM 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 = PL180MciDxe - FILE_GUID = 09831032-6fa3-4484-af4f-0a000a8d3a82 - MODULE_TYPE = DXE_DRIVER - VERSION_STRING = 1.0 - - ENTRY_POINT = PL180MciDxeInitialize - -[Sources.common] - PL180Mci.c - -[Packages] - ArmPkg/ArmPkg.dec - EmbeddedPkg/EmbeddedPkg.dec - MdePkg/MdePkg.dec - -[LibraryClasses] - BaseLib - UefiLib - UefiDriverEntryPoint - BaseMemoryLib - ArmLib - IoLib - TimerLib - -[Protocols] - gEfiCpuArchProtocolGuid - gEfiDevicePathProtocolGuid - gEfiMmcHostProtocolGuid - -[Pcd] - gArmTokenSpaceGuid.PcdPL180SysMciRegAddress - gArmTokenSpaceGuid.PcdPL180MciBaseAddress - -[Depex] - TRUE diff --git a/ArmPkg/Drivers/PL301Axi/PL301Axi.c b/ArmPkg/Drivers/PL301Axi/PL301Axi.c deleted file mode 100644 index 7241f5cef2..0000000000 --- a/ArmPkg/Drivers/PL301Axi/PL301Axi.c +++ /dev/null @@ -1,108 +0,0 @@ -/** @file -* -* Copyright (c) 2011, ARM 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 -#include - -#define PL301_QOS_TIDEMARK_MI_0 0x400 -#define PL301_QOS_ACCESSCONTROL_MI_0 0x404 - -#define PL301_QOS_TIDEMARK_MI_1 0x420 -#define PL301_QOS_ACCESSCONTROL_MI_1 0x424 - -#define PL301_QOS_TIDEMARK_MI_2 0x440 -#define PL301_QOS_ACCESSCONTROL_MI_2 0x444 - -#define PL301_AR_ARB_MI_0 0x408 -#define PL301_AW_ARB_MI_0 0x40C - -#define PL301_AR_ARB_MI_1 0x428 -#define PL301_AW_ARB_MI_1 0x42C - -#define PL301_AR_ARB_MI_2 0x448 -#define PL301_AW_ARB_MI_2 0x44C - -#define PL301_MI_1_OFFSET 0x20 -#define PL301_MI_2_OFFSET 0x40 -#define PL301_MI_3_OFFSET 0x60 -#define PL301_MI_4_OFFSET 0x80 -#define PL301_MI_5_OFFSET 0xa0 - -#define V2P_CA9_FAXI_MI0_TIDEMARK_VAL 0x6 -#define V2P_CA9_FAXI_MI0_ACCESSCNTRL_VAL 0x1 - -#define V2P_CA9_FAXI_MI1_TIDEMARK_VAL 0x6 -#define V2P_CA9_FAXI_MI1_ACCESSCNTRL_VAL 0x1 - -#define V2P_CA9_FAXI_MI2_TIDEMARK_VAL 0x6 -#define V2P_CA9_FAXI_MI2_ACCESSCNTRL_VAL 0x1 - - -#define FAxiWriteReg(reg,val) MmioWrite32(FAxiBase + reg, val) -#define FAxiReadReg(reg) MmioRead32(FAxiBase + reg) - -// IN FAxiBase -// Initialize PL301 Dynamic Memory Controller -VOID PL301AxiInit(UINTN FAxiBase) { - // Configure Tidemark Register for Master Port 0 (MI 0) - FAxiWriteReg(PL301_QOS_TIDEMARK_MI_0, V2P_CA9_FAXI_MI0_TIDEMARK_VAL); - - // Configure the Access Control Register (MI 0) - FAxiWriteReg(PL301_QOS_ACCESSCONTROL_MI_0, V2P_CA9_FAXI_MI0_ACCESSCNTRL_VAL); - - // MP0 - // Set priority for Read - FAxiWriteReg(PL301_AR_ARB_MI_0, 0x00000100); - FAxiWriteReg(PL301_AR_ARB_MI_0, 0x01000200); - FAxiWriteReg(PL301_AR_ARB_MI_0, 0x02000200); - FAxiWriteReg(PL301_AR_ARB_MI_0, 0x03000200); - FAxiWriteReg(PL301_AR_ARB_MI_0, 0x04000200); - - // Set priority for Write - FAxiWriteReg(PL301_AW_ARB_MI_0, 0x00000100); - FAxiWriteReg(PL301_AW_ARB_MI_0, 0x01000200); - FAxiWriteReg(PL301_AW_ARB_MI_0, 0x02000200); - FAxiWriteReg(PL301_AW_ARB_MI_0, 0x03000200); - FAxiWriteReg(PL301_AW_ARB_MI_0, 0x04000200); - - // MP1 - // Set priority for Read - FAxiWriteReg(PL301_AR_ARB_MI_1, 0x00000100); - FAxiWriteReg(PL301_AR_ARB_MI_1, 0x01000200); - FAxiWriteReg(PL301_AR_ARB_MI_1, 0x02000200); - FAxiWriteReg(PL301_AR_ARB_MI_1, 0x03000200); - FAxiWriteReg(PL301_AR_ARB_MI_1, 0x04000200); - - // Set priority for Write - FAxiWriteReg(PL301_AW_ARB_MI_1, 0x00000100); - FAxiWriteReg(PL301_AW_ARB_MI_1, 0x01000200); - FAxiWriteReg(PL301_AW_ARB_MI_1, 0x02000200); - FAxiWriteReg(PL301_AW_ARB_MI_1, 0x03000200); - FAxiWriteReg(PL301_AW_ARB_MI_1, 0x04000200); - - // MP2 - // Set priority for Read - FAxiWriteReg(PL301_AR_ARB_MI_2, 0x00000100); - FAxiWriteReg(PL301_AR_ARB_MI_2, 0x01000100); - FAxiWriteReg(PL301_AR_ARB_MI_2, 0x02000100); - FAxiWriteReg(PL301_AR_ARB_MI_2, 0x03000100); - FAxiWriteReg(PL301_AR_ARB_MI_2, 0x04000100); - - // Set priority for Write - FAxiWriteReg(PL301_AW_ARB_MI_2, 0x00000100); - FAxiWriteReg(PL301_AW_ARB_MI_2, 0x01000200); - FAxiWriteReg(PL301_AW_ARB_MI_2, 0x02000200); - FAxiWriteReg(PL301_AW_ARB_MI_2, 0x03000200); - FAxiWriteReg(PL301_AW_ARB_MI_2, 0x04000200); -} diff --git a/ArmPkg/Drivers/PL301Axi/PL301Axi.inf b/ArmPkg/Drivers/PL301Axi/PL301Axi.inf deleted file mode 100644 index 2358124887..0000000000 --- a/ArmPkg/Drivers/PL301Axi/PL301Axi.inf +++ /dev/null @@ -1,29 +0,0 @@ -#/* @file -# Copyright (c) 2011, ARM 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 = PL301AxiSec - FILE_GUID = 2ea84160-aba0-11df-9896-0002a5d5c51b - MODULE_TYPE = BASE - VERSION_STRING = 1.0 - LIBRARY_CLASS = PL301AxiLib - -[Sources] - PL301Axi.c - -[Packages] - ArmPkg/ArmPkg.dec - MdePkg/MdePkg.dec - -[FixedPcd] diff --git a/ArmPkg/Drivers/PL310L2Cache/PL310L2Cache.c b/ArmPkg/Drivers/PL310L2Cache/PL310L2Cache.c deleted file mode 100644 index b701978da5..0000000000 --- a/ArmPkg/Drivers/PL310L2Cache/PL310L2Cache.c +++ /dev/null @@ -1,126 +0,0 @@ -/** @file -* -* Copyright (c) 2011, ARM 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 -#include -#include -#include -#include - -#define L2x0WriteReg(reg,val) MmioWrite32(PcdGet32(PcdL2x0ControllerBase) + reg, val) -#define L2x0ReadReg(reg) MmioRead32(PcdGet32(PcdL2x0ControllerBase) + reg) - -// Initialize PL320 L2 Cache Controller -VOID -L2x0CacheInit ( - IN UINTN L2x0Base, - IN UINT32 L2x0TagLatencies, - IN UINT32 L2x0DataLatencies, - IN UINT32 L2x0AuxValue, - IN UINT32 L2x0AuxMask, - IN BOOLEAN CacheEnabled - ) -{ - UINT32 Data; - UINT32 Revision; - UINT32 Aux; - UINT32 PfCtl; - UINT32 PwrCtl; - - // Check if L2x0 is present and is an ARM implementation - Data = L2x0ReadReg(L2X0_CACHEID); - if ((Data >> 24) != L2X0_CACHEID_IMPLEMENTER_ARM) { - ASSERT(0); - return; - } - - // Check if L2x0 is PL310 - if (((Data >> 6) & 0xF) != L2X0_CACHEID_PARTNUM_PL310) { - ASSERT(0); - return; - } - - // RTL release - Revision = Data & 0x3F; - - // Check if L2x0 is already enabled then we disable it - Data = L2x0ReadReg(L2X0_CTRL); - if (Data & L2X0_CTRL_ENABLED) { - L2x0WriteReg(L2X0_CTRL, L2X0_CTRL_DISABLED); - } - - // - // Set up global configurations - // - - // Auxiliary register: Non-secure interrupt access Control + Event monitor bus enable + SBO - Aux = L2X0_AUXCTRL_NSAC | L2X0_AUXCTRL_EM | L2X0_AUXCTRL_SBO; - // Use AWCACHE attributes for WA - Aux |= L2x0_AUXCTRL_AW_AWCACHE; - // Use default Size - Data = L2x0ReadReg(L2X0_AUXCTRL); - Aux |= Data & L2X0_AUXCTRL_WAYSIZE_MASK; - // Use default associativity - Aux |= Data & L2X0_AUXCTRL_ASSOCIATIVITY; - // Enabled I & D Prefetch - Aux |= L2x0_AUXCTRL_IPREFETCH | L2x0_AUXCTRL_DPREFETCH; - - if (Revision >= 5) { - // Prefetch Offset Register - PfCtl = L2x0ReadReg(L2X0_PFCTRL); - // - Prefetch increment set to 0 - // - Prefetch dropping off - // - Double linefills off - L2x0WriteReg(L2X0_PFCTRL, PfCtl); - - // Power Control Register - L2X0_PWRCTRL - PwrCtl = L2x0ReadReg(L2X0_PWRCTRL); - // - Standby when idle off - // - Dynamic clock gating off - // - Nc,NC-shared dropping off - L2x0WriteReg(L2X0_PWRCTRL, PwrCtl); - } - - if (Revision >= 2) { - L2x0WriteReg(L230_TAG_LATENCY, L2x0TagLatencies); - L2x0WriteReg(L230_DATA_LATENCY, L2x0DataLatencies); - } else { - // PL310 old style latency is not supported yet - ASSERT(0); - } - - // Set the platform specific values - Aux = (Aux & L2x0AuxMask) | L2x0AuxValue; - - // Write Auxiliary value - L2x0WriteReg(L2X0_AUXCTRL, Aux); - - // - // Invalidate all entries in cache - // - L2x0WriteReg(L2X0_INVWAY, 0xffff); - // Poll cache maintenance register until invalidate operation is complete - while(L2x0ReadReg(L2X0_INVWAY) & 0xffff); - - // Write to the Lockdown D and Lockdown I Register 9 if required - // - Not required - - // Clear any residual raw interrupts - L2x0WriteReg(L2X0_INTCLEAR, 0x1FF); - - // Enable the cache - if (CacheEnabled) { - L2x0WriteReg(L2X0_CTRL, L2X0_CTRL_ENABLED); - } -} diff --git a/ArmPkg/Drivers/PL310L2Cache/PL310L2CacheSec.inf b/ArmPkg/Drivers/PL310L2Cache/PL310L2CacheSec.inf deleted file mode 100644 index 73c9689ee5..0000000000 --- a/ArmPkg/Drivers/PL310L2Cache/PL310L2CacheSec.inf +++ /dev/null @@ -1,30 +0,0 @@ -#/* @file -# Copyright (c) 2011, ARM 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 = PL310L2Cache - FILE_GUID = 16ad4fe0-b5b1-11df-8cbf-0002a5d5c51b - MODULE_TYPE = SEC - VERSION_STRING = 1.0 - LIBRARY_CLASS = L2X0CacheLib - -[Sources] - PL310L2Cache.c - -[Packages] - ArmPkg/ArmPkg.dec - MdePkg/MdePkg.dec - -[FixedPcd] - gArmTokenSpaceGuid.PcdL2x0ControllerBase diff --git a/ArmPkg/Drivers/PL34xDmc/PL341Dmc.c b/ArmPkg/Drivers/PL34xDmc/PL341Dmc.c deleted file mode 100644 index ae94def765..0000000000 --- a/ArmPkg/Drivers/PL34xDmc/PL341Dmc.c +++ /dev/null @@ -1,221 +0,0 @@ -/** @file -* -* Copyright (c) 2011, ARM 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 -#include -#include - -// Macros for writing to DDR2 controller. -#define DmcWriteReg(reg,val) MmioWrite32(DmcBase + reg, val) -#define DmcReadReg(reg) MmioRead32(DmcBase + reg) - -// Macros for writing/reading to DDR2 PHY controller -#define DmcPhyWriteReg(reg,val) MmioWrite32(DmcPhyBase + reg, val) -#define DmcPhyReadReg(reg) MmioRead32(DmcPhyBase + reg) - -// Initialise PL341 Dynamic Memory Controller -VOID -PL341DmcInit ( - IN PL341_DMC_CONFIG *DmcConfig - ) -{ - UINTN DmcBase; - UINTN Index; - UINT32 Chip; - - DmcBase = DmcConfig->base; - - // Set config mode - DmcWriteReg(DMC_COMMAND_REG, DMC_COMMAND_CONFIGURE); - - // - // Setup the QoS AXI ID bits - // - if (DmcConfig->HasQos) { - // CLCD AXIID = 000 - DmcWriteReg(DMC_ID_0_CFG_REG, DMC_ID_CFG_QOS_ENABLE | DMC_ID_CFG_QOS_MIN); - - // Default disable QoS - DmcWriteReg(DMC_ID_1_CFG_REG, DMC_ID_CFG_QOS_DISABLE); - DmcWriteReg(DMC_ID_2_CFG_REG, DMC_ID_CFG_QOS_DISABLE); - DmcWriteReg(DMC_ID_3_CFG_REG, DMC_ID_CFG_QOS_DISABLE); - DmcWriteReg(DMC_ID_4_CFG_REG, DMC_ID_CFG_QOS_DISABLE); - DmcWriteReg(DMC_ID_5_CFG_REG, DMC_ID_CFG_QOS_DISABLE); - DmcWriteReg(DMC_ID_6_CFG_REG, DMC_ID_CFG_QOS_DISABLE); - DmcWriteReg(DMC_ID_7_CFG_REG, DMC_ID_CFG_QOS_DISABLE); - DmcWriteReg(DMC_ID_8_CFG_REG, DMC_ID_CFG_QOS_DISABLE); - DmcWriteReg(DMC_ID_9_CFG_REG, DMC_ID_CFG_QOS_DISABLE); - DmcWriteReg(DMC_ID_10_CFG_REG, DMC_ID_CFG_QOS_DISABLE); - DmcWriteReg(DMC_ID_11_CFG_REG, DMC_ID_CFG_QOS_DISABLE); - DmcWriteReg(DMC_ID_12_CFG_REG, DMC_ID_CFG_QOS_DISABLE); - DmcWriteReg(DMC_ID_13_CFG_REG, DMC_ID_CFG_QOS_DISABLE); - DmcWriteReg(DMC_ID_14_CFG_REG, DMC_ID_CFG_QOS_DISABLE); - DmcWriteReg(DMC_ID_15_CFG_REG, DMC_ID_CFG_QOS_DISABLE); - } - - // - // Initialise memory controlller - // - DmcWriteReg(DMC_REFRESH_PRD_REG, DmcConfig->refresh_prd); - DmcWriteReg(DMC_CAS_LATENCY_REG, DmcConfig->cas_latency); - DmcWriteReg(DMC_WRITE_LATENCY_REG, DmcConfig->write_latency); - DmcWriteReg(DMC_T_MRD_REG, DmcConfig->t_mrd); - DmcWriteReg(DMC_T_RAS_REG, DmcConfig->t_ras); - DmcWriteReg(DMC_T_RC_REG, DmcConfig->t_rc); - DmcWriteReg(DMC_T_RCD_REG, DmcConfig->t_rcd); - DmcWriteReg(DMC_T_RFC_REG, DmcConfig->t_rfc); - DmcWriteReg(DMC_T_RP_REG, DmcConfig->t_rp); - DmcWriteReg(DMC_T_RRD_REG, DmcConfig->t_rrd); - DmcWriteReg(DMC_T_WR_REG, DmcConfig->t_wr); - DmcWriteReg(DMC_T_WTR_REG, DmcConfig->t_wtr); - DmcWriteReg(DMC_T_XP_REG, DmcConfig->t_xp); - DmcWriteReg(DMC_T_XSR_REG, DmcConfig->t_xsr); - DmcWriteReg(DMC_T_ESR_REG, DmcConfig->t_esr); - DmcWriteReg(DMC_T_FAW_REG, DmcConfig->t_faw); - DmcWriteReg(DMC_T_WRLAT_DIFF, DmcConfig->t_wdata_en); - DmcWriteReg(DMC_T_RDATA_EN, DmcConfig->t_data_en); - - // - // Initialise PL341 Mem Config Registers - // - - // Set PL341 Memory Config - DmcWriteReg(DMC_MEMORY_CONFIG_REG, DmcConfig->MemoryCfg); - - // Set PL341 Memory Config 2 - DmcWriteReg(DMC_MEMORY_CFG2_REG, DmcConfig->MemoryCfg2); - - // Set PL341 Chip Select - DmcWriteReg(DMC_CHIP_0_CFG_REG, DmcConfig->ChipCfg0); - DmcWriteReg(DMC_CHIP_1_CFG_REG, DmcConfig->ChipCfg1); - DmcWriteReg(DMC_CHIP_2_CFG_REG, DmcConfig->ChipCfg2); - DmcWriteReg(DMC_CHIP_3_CFG_REG, DmcConfig->ChipCfg3); - - // Delay - for (Index = 0; Index < 10; Index++) { - DmcReadReg(DMC_STATUS_REG); - } - - // Set PL341 Memory Config 3 - DmcWriteReg(DMC_MEMORY_CFG3_REG, DmcConfig->MemoryCfg3); - - if (DmcConfig->IsUserCfg) { - // - // Set Test Chip PHY Registers via PL341 User Config Reg - // Note that user_cfgX registers are Write Only - // - // DLL Freq set = 250MHz - 266MHz - // - DmcWriteReg(DMC_USER_0_CFG_REG, DmcConfig->User0Cfg); - - // user_config2 - // ------------ - // Set defaults before calibrating the DDR2 buffer impendence - // - Disable ODT - // - Default drive strengths - DmcWriteReg(DMC_USER_2_CFG_REG, 0x40000198); - - // - // Auto calibrate the DDR2 buffers impendence - // - while (!(DmcReadReg(DMC_USER_STATUS_REG) & 0x100)); - - // Set the output driven strength - DmcWriteReg(DMC_USER_2_CFG_REG, 0x40800000 | DmcConfig->User2Cfg); - - // - // Set PL341 Feature Control Register - // - // Disable early BRESP - use to optimise CLCD performance - DmcWriteReg(DMC_FEATURE_CRTL_REG, 0x00000001); - } - - // - // Config memories - // - for (Chip = 0; Chip < DmcConfig->MaxChip; Chip++) { - // Send nop - DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(Chip) | DMC_DIRECT_CMD_MEMCMD_NOP); - - // Pre-charge all - DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(Chip) | DMC_DIRECT_CMD_MEMCMD_PRECHARGEALL); - - // Delay - for (Index = 0; Index < 10; Index++) { - DmcReadReg(DMC_STATUS_REG); - } - - // Set (EMR2) extended mode register 2 - DmcWriteReg(DMC_DIRECT_CMD_REG, - DMC_DIRECT_CMD_CHIP_ADDR(Chip) | - DMC_DIRECT_CMD_BANKADDR(2) | - DMC_DIRECT_CMD_MEMCMD_EXTMODEREG); - - // Set (EMR3) extended mode register 3 - DmcWriteReg(DMC_DIRECT_CMD_REG, - DMC_DIRECT_CMD_CHIP_ADDR(Chip) | - DMC_DIRECT_CMD_BANKADDR(3) | - DMC_DIRECT_CMD_MEMCMD_EXTMODEREG); - - // - // Set (EMR) Extended Mode Register - // - // Put into OCD default state - DmcWriteReg(DMC_DIRECT_CMD_REG,DMC_DIRECT_CMD_CHIP_ADDR(Chip) | DMC_DIRECT_CMD_BANKADDR(1) | DMC_DIRECT_CMD_MEMCMD_EXTMODEREG); - - // - // Set (MR) mode register - With DLL reset - // - DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(Chip) | DMC_DIRECT_CMD_MEMCMD_EXTMODEREG | DmcConfig->ModeReg | DDR2_MR_DLL_RESET); - - // Pre-charge all - DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(Chip) | DMC_DIRECT_CMD_MEMCMD_PRECHARGEALL); - // Auto-refresh - DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(Chip) | DMC_DIRECT_CMD_MEMCMD_AUTOREFRESH); - // Auto-refresh - DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(Chip) | DMC_DIRECT_CMD_MEMCMD_AUTOREFRESH); - - // - // Set (MR) mode register - Without DLL reset - // - DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(Chip) | DMC_DIRECT_CMD_MEMCMD_EXTMODEREG | DmcConfig->ModeReg); - - // Delay - for (Index = 0; Index < 10; Index++) { - DmcReadReg(DMC_STATUS_REG); - } - - // - // Set (EMR) extended mode register - Enable OCD defaults - // - DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(Chip) | (0x00090000) | - (1 << DDR_MODESET_SHFT) | (DDR_EMR_OCD_DEFAULT << DDR_EMR_OCD_SHIFT) | DmcConfig->ExtModeReg); - - // Delay - for (Index = 0; Index < 10; Index++) { - DmcReadReg(DMC_STATUS_REG); - } - - // Set (EMR) extended mode register - OCD Exit - DmcWriteReg(DMC_DIRECT_CMD_REG, DMC_DIRECT_CMD_CHIP_ADDR(Chip) | (0x00090000) | - (1 << DDR_MODESET_SHFT) | (DDR_EMR_OCD_NS << DDR_EMR_OCD_SHIFT) | DmcConfig->ExtModeReg); - } - - // Move DDR2 Controller to Ready state by issueing GO command - DmcWriteReg(DMC_COMMAND_REG, DMC_COMMAND_GO); - - // wait for ready - while (!(DmcReadReg(DMC_STATUS_REG) & DMC_STATUS_READY)); - -} diff --git a/ArmPkg/Drivers/PL34xDmc/PL341Dmc.inf b/ArmPkg/Drivers/PL34xDmc/PL341Dmc.inf deleted file mode 100644 index 1000058713..0000000000 --- a/ArmPkg/Drivers/PL34xDmc/PL341Dmc.inf +++ /dev/null @@ -1,29 +0,0 @@ -#/* @file -# Copyright (c) 2011, ARM 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 = PL341Dmc - FILE_GUID = edf8da40-aad1-11df-a1f4-0002a5d5c51b - MODULE_TYPE = BASE - VERSION_STRING = 1.0 - LIBRARY_CLASS = PL341DmcLib - -[Sources] - PL341Dmc.c - -[Packages] - ArmPkg/ArmPkg.dec - MdePkg/MdePkg.dec - -[FixedPcd] diff --git a/ArmPkg/Drivers/PL35xSmc/InitializeSMC.S b/ArmPkg/Drivers/PL35xSmc/InitializeSMC.S deleted file mode 100644 index 108cd6ae65..0000000000 --- a/ArmPkg/Drivers/PL35xSmc/InitializeSMC.S +++ /dev/null @@ -1,197 +0,0 @@ -# -# Copyright (c) 2011, ARM 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 -#include -#include -#include - -#Start of the code section -.text - -#Maintain 8 byte alignment -.align 3 - - -GCC_ASM_EXPORT(SMCInitializeNOR) -GCC_ASM_EXPORT(SMCInitializeSRAM) -GCC_ASM_EXPORT(SMCInitializePeripherals) -GCC_ASM_EXPORT(SMCInitializeVRAM) - - -# CS0 CS0-Interf0 NOR1 flash on the motherboard -# CS1 CS1-Interf0 Reserved for the motherboard -# CS2 CS2-Interf0 SRAM on the motherboard -# CS3 CS3-Interf0 memory-mapped Ethernet and USB controllers on the motherboard -# CS4 CS0-Interf1 NOR2 flash on the motherboard -# CS5 CS1-Interf1 memory-mapped peripherals -# CS6 CS2-Interf1 memory-mapped peripherals -# CS7 CS3-Interf1 system memory-mapped peripherals on the motherboard. - -// IN r1 SmcBase -// IN r2 ChipSelect -// NOTE: This code is been called before any stack has been setup. It means some registers -// could be overwritten (case of 'r0') -ASM_PFX(SMCInitializeNOR): -# -# Setup NOR1 (CS0-Interface0) -# - - # Write to set_cycle register(holding register for NOR 1 cycle register or NAND cycle register) - #Read cycle timeout = 0xA (0:3) - #Write cycle timeout = 0x3(7:4) - #OE Assertion Delay = 0x9(11:8) - #WE Assertion delay = 0x3(15:12) - #Page cycle timeout = 0x2(19:16) - LoadConstantToReg (0x0002393A,r0) @ldr r0, = 0x0002393A - str r0, [r1, #PL354_SMC_SET_CYCLES_OFFSET] - - # Write to set_opmode register(holding register for NOR 1 opomode register or NAND opmode register) - # 0x00000002 = MemoryWidth: 32bit - # 0x00000028 = ReadMemoryBurstLength:continuous - # 0x00000280 = WriteMemoryBurstLength:continuous - # 0x00000800 = Set Address Valid - LoadConstantToReg (0x00000AAA,r0) @ldr r0, = 0x00000AAA - str r0, [r1, #PL354_SMC_SET_OPMODE_OFFSET] - - # Write to direct_cmd register so that the NOR 1 registers(set-cycles and opmode) are updated with holding registers - # 0x00000000 = ChipSelect0-Interface 0 - # 0x00400000 = CmdTypes: UpdateRegs - LoadConstantToReg (0x00400000,r0) @ldr r0, = 0x00400000 - str r0, [r1, #PL354_SMC_DIRECT_CMD_OFFSET] - - bx lr - -ASM_PFX(SMCInitializeSRAM): -# -# Setup SRAM (CS2-Interface0) -# - LoadConstantToReg (0x00027158,r0) @ldr r0, = 0x00027158 - str r0, [r1, #PL354_SMC_SET_CYCLES_OFFSET] - - # 0x00000002 = MemoryWidth: 32bit - # 0x00000800 = Set Address Valid - LoadConstantToReg (0x00000802,r0) @ldr r0, = 0x00000802 - str r0, [r1, #PL354_SMC_SET_OPMODE_OFFSET] - - # 0x01000000 = ChipSelect2-Interface 0 - # 0x00400000 = CmdTypes: UpdateRegs - LoadConstantToReg (0x01400000,r0) @ldr r0, = 0x01400000 - str r0, [r1, #PL354_SMC_DIRECT_CMD_OFFSET] - - bx lr - -ASM_PFX(SMCInitializePeripherals): -# -# USB/Eth/VRAM (CS3-Interface0) -# - LoadConstantToReg (0x000CD2AA,r0) @ldr r0, = 0x000CD2AA - str r0, [r1, #PL354_SMC_SET_CYCLES_OFFSET] - - # 0x00000002 = MemoryWidth: 32bit - # 0x00000004 = Memory reads are synchronous - # 0x00000040 = Memory writes are synchronous - LoadConstantToReg (0x00000046,r0) @ldr r0, = 0x00000046 - str r0, [r1, #PL354_SMC_SET_OPMODE_OFFSET] - - # 0x01800000 = ChipSelect3-Interface 0 - # 0x00400000 = CmdTypes: UpdateRegs - LoadConstantToReg (0x01C00000,r0) @ldr r0, = 0x01C00000 - str r0, [r1, #PL354_SMC_DIRECT_CMD_OFFSET] - -# -# Setup NOR3 (CS0-Interface1) -# - LoadConstantToReg (0x0002393A,r0) @ldr r0, = 0x0002393A - str r0, [r1, #PL354_SMC_SET_CYCLES_OFFSET] - - # 0x00000002 = MemoryWidth: 32bit - # 0x00000028 = ReadMemoryBurstLength:continuous - # 0x00000280 = WriteMemoryBurstLength:continuous - # 0x00000800 = Set Address Valid - LoadConstantToReg (0x00000AAA,r0) @ldr r0, = 0x00000AAA - str r0, [r1, #PL354_SMC_SET_OPMODE_OFFSET] - - # 0x02000000 = ChipSelect0-Interface 1 - # 0x00400000 = CmdTypes: UpdateRegs - LoadConstantToReg (0x02400000,r0) @ldr r0, = 0x02400000 - str r0, [r1, #PL354_SMC_DIRECT_CMD_OFFSET] - -# -# Setup Peripherals (CS3-Interface1) -# - LoadConstantToReg (0x00025156,r0) @ldr r0, = 0x00025156 - str r0, [r1, #PL354_SMC_SET_CYCLES_OFFSET] - - # 0x00000002 = MemoryWidth: 32bit - # 0x00000004 = Memory reads are synchronous - # 0x00000040 = Memory writes are synchronous - LoadConstantToReg (0x00000046,r0) @ldr r0, = 0x00000046 - str r0, [r1, #PL354_SMC_SET_OPMODE_OFFSET] - - # 0x03800000 = ChipSelect3-Interface 1 - # 0x00400000 = CmdTypes: UpdateRegs - LoadConstantToReg (0x03C00000,r0) @ldr r0, = 0x03C00000 - str r0, [r1, #PL354_SMC_DIRECT_CMD_OFFSET] - bx lr - -// IN r1 SmcBase -// IN r2 VideoSRamBase -// NOTE: This code is been called before any stack has been setup. It means some registers -// could be overwritten (case of 'r0') -ASM_PFX(SMCInitializeVRAM): -# -# Setup VRAM (CS1-Interface0) -# - LoadConstantToReg (0x00049249,r0) @ldr r0, = 0x00049249 - str r0, [r1, #PL354_SMC_SET_CYCLES_OFFSET] - - # 0x00000002 = MemoryWidth: 32bit - # 0x00000004 = Memory reads are synchronous - # 0x00000040 = Memory writes are synchronous - LoadConstantToReg (0x00000046,r0) @ldr r0, = 0x00000046 - str r0, [r1, #PL354_SMC_SET_OPMODE_OFFSET] - - # 0x00800000 = ChipSelect1-Interface 0 - # 0x00400000 = CmdTypes: UpdateRegs - LoadConstantToReg (0x00C00000,r0) @ldr r0, = 0x00C00000 - str r0, [r1, #PL354_SMC_DIRECT_CMD_OFFSET] - -# -# Page mode setup for VRAM -# - #read current state - ldr r0, [r2, #0] - ldr r0, [r2, #0] - LoadConstantToReg (0x00000000,r0) @ldr r0, = 0x00000000 - str r0, [r2, #0] - ldr r0, [r2, #0] - - #enable page mode - ldr r0, [r2, #0] - ldr r0, [r2, #0] - LoadConstantToReg (0x00000000,r0) @ldr r0, = 0x00000000 - str r0, [r2, #0] - LoadConstantToReg (0x00900090,r0) @ldr r0, = 0x00900090 - str r0, [r2, #0] - - #confirm page mode enabled - ldr r0, [r2, #0] - ldr r0, [r2, #0] - LoadConstantToReg (0x00000000,r0) @ldr r0, = 0x00000000 - str r0, [r2, #0] - ldr r0, [r2, #0] - - bx lr - -ASM_FUNCTION_REMOVE_IF_UNREFERENCED \ No newline at end of file diff --git a/ArmPkg/Drivers/PL35xSmc/InitializeSMC.asm b/ArmPkg/Drivers/PL35xSmc/InitializeSMC.asm deleted file mode 100644 index f868660336..0000000000 --- a/ArmPkg/Drivers/PL35xSmc/InitializeSMC.asm +++ /dev/null @@ -1,153 +0,0 @@ -// -// Copyright (c) 2011, ARM 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 -#include -#include -#include - - INCLUDE AsmMacroIoLib.inc - - EXPORT SMCInitializeNOR - EXPORT SMCInitializeSRAM - EXPORT SMCInitializePeripherals - EXPORT SMCInitializeVRAM - - PRESERVE8 - AREA ModuleInitializeSMC, CODE, READONLY - -// CS0 CS0-Interf0 NOR1 flash on the motherboard -// CS1 CS1-Interf0 Reserved for the motherboard -// CS2 CS2-Interf0 SRAM on the motherboard -// CS3 CS3-Interf0 memory-mapped Ethernet and USB controllers on the motherboard -// CS4 CS0-Interf1 NOR2 flash on the motherboard -// CS5 CS1-Interf1 memory-mapped peripherals -// CS6 CS2-Interf1 memory-mapped peripherals -// CS7 CS3-Interf1 system memory-mapped peripherals on the motherboard. - -// IN r1 SmcBase -// IN r2 ChipSelect -// NOTE: This code is been called before any stack has been setup. It means some registers -// could be overwritten (case of 'r0') -SMCInitializeNOR - // Write to set_cycle register(holding register for NOR 1 cycle register or NAND cycle register) - // - Read cycle timeout = 0xA (0:3) - // - Write cycle timeout = 0x3(7:4) - // - OE Assertion Delay = 0x9(11:8) - // - WE Assertion delay = 0x3(15:12) - // - Page cycle timeout = 0x2(19:16) - ldr r0, = 0x0002393A - str r0, [r1, #PL354_SMC_SET_CYCLES_OFFSET] - - // Write to set_opmode register(holding register for NOR 1 opomode register or NAND opmode register) - ldr r0, = (PL354_SMC_SET_OPMODE_MEM_WIDTH_32 :OR: PL354_SMC_SET_OPMODE_SET_RD_BURST_LENGTH_CONT :OR: PL354_SMC_SET_OPMODE_SET_WR_BURST_LENGTH_CONT :OR: PL354_SMC_SET_OPMODE_SET_ADV) - str r0, [r1, #PL354_SMC_SET_OPMODE_OFFSET] - - // Write to direct_cmd register so that the NOR 1 registers(set-cycles and opmode) are updated with holding registers - ldr r0, =PL354_SMC_DIRECT_CMD_ADDR_CMD_UPDATE - orr r0, r0, r2 - str r0, [r1, #PL354_SMC_DIRECT_CMD_OFFSET] - - bx lr - - -// -// Setup SRAM (CS2-Interface0) -// -SMCInitializeSRAM - ldr r0, = 0x00027158 - str r0, [r1, #PL354_SMC_SET_CYCLES_OFFSET] - - ldr r0, =(PL354_SMC_SET_OPMODE_MEM_WIDTH_32 :OR: PL354_SMC_SET_OPMODE_SET_ADV) - str r0, [r1, #PL354_SMC_SET_OPMODE_OFFSET] - - ldr r0, =(PL354_SMC_DIRECT_CMD_ADDR_CMD_UPDATE :OR: PL354_SMC_DIRECT_CMD_ADDR_CS(0,2)) - str r0, [r1, #PL354_SMC_DIRECT_CMD_OFFSET] - - bx lr - -SMCInitializePeripherals -// -// USB/Eth/VRAM (CS3-Interface0) -// - ldr r0, = 0x000CD2AA - str r0, [r1, #PL354_SMC_SET_CYCLES_OFFSET] - - ldr r0, =(PL354_SMC_SET_OPMODE_MEM_WIDTH_32 :OR: PL354_SMC_SET_OPMODE_SET_RD_SYNC :OR: PL354_SMC_SET_OPMODE_SET_WR_SYNC) - str r0, [r1, #PL354_SMC_SET_OPMODE_OFFSET] - - ldr r0, =(PL354_SMC_DIRECT_CMD_ADDR_CMD_UPDATE :OR: PL354_SMC_DIRECT_CMD_ADDR_CS(0,3)) - str r0, [r1, #PL354_SMC_DIRECT_CMD_OFFSET] - - -// -// Setup Peripherals (CS3-Interface1) -// - ldr r0, = 0x00025156 - str r0, [r1, #PL354_SMC_SET_CYCLES_OFFSET] - - ldr r0, =(PL354_SMC_SET_OPMODE_MEM_WIDTH_32 :OR: PL354_SMC_SET_OPMODE_SET_RD_SYNC :OR: PL354_SMC_SET_OPMODE_SET_WR_SYNC) - str r0, [r1, #PL354_SMC_SET_OPMODE_OFFSET] - - ldr r0, =(PL354_SMC_DIRECT_CMD_ADDR_CMD_UPDATE :OR: PL354_SMC_DIRECT_CMD_ADDR_CS(1,3)) - str r0, [r1, #PL354_SMC_DIRECT_CMD_OFFSET] - - bx lr - - -// IN r1 SmcBase -// IN r2 VideoSRamBase -// NOTE: This code is been called before any stack has been setup. It means some registers -// could be overwritten (case of 'r0') -SMCInitializeVRAM - // - // Setup VRAM (CS1-Interface0) - // - ldr r0, = 0x00049249 - str r0, [r1, #PL354_SMC_SET_CYCLES_OFFSET] - - ldr r0, = (PL354_SMC_SET_OPMODE_MEM_WIDTH_32 :OR: PL354_SMC_SET_OPMODE_SET_RD_SYNC :OR: PL354_SMC_SET_OPMODE_SET_WR_SYNC) - str r0, [r1, #PL354_SMC_SET_OPMODE_OFFSET] - - ldr r0, = (PL354_SMC_DIRECT_CMD_ADDR_CMD_UPDATE :OR: PL354_SMC_DIRECT_CMD_ADDR_CS(0,1)) - str r0, [r1, #PL354_SMC_DIRECT_CMD_OFFSET] - - // - // Page mode setup for VRAM - // - - // Read current state - ldr r0, [r2, #0] - ldr r0, [r2, #0] - ldr r0, = 0x00000000 - str r0, [r2, #0] - ldr r0, [r2, #0] - - // Enable page mode - ldr r0, [r2, #0] - ldr r0, [r2, #0] - ldr r0, = 0x00000000 - str r0, [r2, #0] - ldr r0, = 0x00900090 - str r0, [r2, #0] - - // Confirm page mode enabled - ldr r0, [r2, #0] - ldr r0, [r2, #0] - ldr r0, = 0x00000000 - str r0, [r2, #0] - ldr r0, [r2, #0] - - bx lr - - END diff --git a/ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf b/ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf deleted file mode 100644 index 18618eff71..0000000000 --- a/ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf +++ /dev/null @@ -1,30 +0,0 @@ -#/* @file -# Copyright (c) 2011, ARM 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 = PL354SmcSec - FILE_GUID = 10952220-aa32-11df-a438-0002a5d5c51b - MODULE_TYPE = SEC - VERSION_STRING = 1.0 - LIBRARY_CLASS = PL354SmcLib - -[Sources.common] - InitializeSMC.asm | RVCT - InitializeSMC.S | GCC - -[Packages] - ArmPkg/ArmPkg.dec - MdePkg/MdePkg.dec - -[FixedPcd] diff --git a/ArmPkg/Library/L2X0CacheLibNull/L2X0Cache.c b/ArmPkg/Library/L2X0CacheLibNull/L2X0Cache.c deleted file mode 100644 index ec0a0dd464..0000000000 --- a/ArmPkg/Library/L2X0CacheLibNull/L2X0Cache.c +++ /dev/null @@ -1,30 +0,0 @@ -/** @file -* -* Copyright (c) 2011, ARM 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 -#include - -// Initialize L2X0 Cache Controller -VOID -L2x0CacheInit ( - IN UINTN L2x0Base, - IN UINT32 L2x0TagLatencies, - IN UINT32 L2x0DataLatencies, - IN UINT32 L2x0AuxValue, - IN UINT32 L2x0AuxMask, - IN BOOLEAN CacheEnabled - ) -{ - //No implementation -} diff --git a/ArmPkg/Library/L2X0CacheLibNull/L2X0CacheLibNull.inf b/ArmPkg/Library/L2X0CacheLibNull/L2X0CacheLibNull.inf deleted file mode 100644 index f6ff894531..0000000000 --- a/ArmPkg/Library/L2X0CacheLibNull/L2X0CacheLibNull.inf +++ /dev/null @@ -1,27 +0,0 @@ -#/* @file -# Copyright (c) 2011, ARM 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 = L2X0CacheLibNull - FILE_GUID = 9c76c900-1e8c-11e0-8766-0002a5d5c51b - MODULE_TYPE = SEC - VERSION_STRING = 1.0 - LIBRARY_CLASS = L2X0CacheLib - -[Sources] - L2X0Cache.c - -[Packages] - MdePkg/MdePkg.dec - ArmPkg/ArmPkg.dec diff --git a/ArmPlatformPkg/ArmPlatformPkg.dec b/ArmPlatformPkg/ArmPlatformPkg.dec index 2a5c15e4b5..a332f2cca3 100644 --- a/ArmPlatformPkg/ArmPlatformPkg.dec +++ b/ArmPlatformPkg/ArmPlatformPkg.dec @@ -77,8 +77,36 @@ # # ARM Primecells # - gArmPlatformTokenSpaceGuid.PcdSP804FrequencyInMHz|1|UINT32|0x0000001D - gArmPlatformTokenSpaceGuid.PcdSP804Timer0InterruptNum|0|UINT32|0x0000001E + + ## SP804 DualTimer + gArmPlatformTokenSpaceGuid.PcdSP804TimerFrequencyInMHz|1|UINT32|0x0000001D + gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicInterruptNum|0|UINT32|0x0000001E + gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicBase|0|UINT32|0x0000002A + gArmPlatformTokenSpaceGuid.PcdSP804TimerPerformanceBase|0|UINT32|0x0000002B + gArmPlatformTokenSpaceGuid.PcdSP804TimerMetronomeBase|0|UINT32|0x0000002C + + ## SP805 Watchdog + gArmPlatformTokenSpaceGuid.PcdSP805WatchdogBase|0x0|UINT32|0x00000023 + gArmPlatformTokenSpaceGuid.PcdSP805WatchdogClockFrequencyInHz|32000|UINT32|0x00000021 + + ## PL011 UART + gArmPlatformTokenSpaceGuid.PcdUartDefaultReceiveFifoDepth|0x00000000|UINT32|0x0000001F + gArmPlatformTokenSpaceGuid.PcdUartDefaultTimeout|0x00000000|UINT32|0x00000020 + + ## PL031 RealTimeClock + gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x0|UINT32|0x00000024 + gArmPlatformTokenSpaceGuid.PcdPL031RtcPpmAccuracy|300000000|UINT32|0x00000022 + + ## PL061 GPIO + gArmPlatformTokenSpaceGuid.PcdPL061GpioBase|0x0|UINT32|0x00000025 + + ## PL111 Lcd + gArmPlatformTokenSpaceGuid.PcdPL111LcdBase|0x0|UINT32|0x00000026 + gArmPlatformTokenSpaceGuid.PcdArmHdLcdBase|0x0|UINT32|0x00000027 + + ## PL180 MCI + gArmPlatformTokenSpaceGuid.PcdPL180SysMciRegAddress|0x00000000|UINT32|0x00000028 + gArmPlatformTokenSpaceGuid.PcdPL180MciBaseAddress|0x00000000|UINT32|0x00000029 # # BDS - Boot Manager diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc index f86730cbb9..4883e511f5 100644 --- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc +++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A8.dsc @@ -132,7 +132,7 @@ #DebugAgentLib|EmbeddedPkg/Library/GdbDebugAgent/GdbDebugAgent.inf # L2 Cache Driver - L2X0CacheLib|ArmPkg/Library/L2X0CacheLibNull/L2X0CacheLibNull.inf + L2X0CacheLib|ArmPlatformPkg/Library/L2X0CacheLibNull/L2X0CacheLibNull.inf # ARM PL390 General Interrupt Driver in Secure and Non-secure PL390GicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSec.inf @@ -357,11 +357,7 @@ # Size of the region used by UEFI in permanent memory (Reserved 64MB) gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000 - - gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz|1000000 - gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000 # expressed in 100ns units, 100,000 x 100 ns = 10,000,000 ns = 10 ms - gArmPlatformTokenSpaceGuid.PcdSP804Timer0InterruptNum|36 - + # # ARM Pcds # @@ -372,6 +368,24 @@ # gArmRealViewEbPkgTokenSpaceGuid.PcdGdbUartBase|0x1000a000 + # + # ARM PrimeCells + # + + ## SP804 Timer + gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz|1000000 + gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000 # expressed in 100ns units, 100,000 x 100 ns = 10,000,000 ns = 10 ms + gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicInterruptNum|36 + gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicBase|0x10011000 + gArmPlatformTokenSpaceGuid.PcdSP804TimerPerformanceBase|0x10012020 + gArmPlatformTokenSpaceGuid.PcdSP804TimerMetronomeBase|0x10012000 + + ## PL031 RealTimeClock + gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x10017000 + + ## PL111 Lcd + gArmPlatformTokenSpaceGuid.PcdPL111LcdBase|0x10020000 + # # ARM PL011 - Serial Terminal # diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc index 64f5b552cd..7ae4ccd2fa 100644 --- a/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc +++ b/ArmPlatformPkg/ArmRealViewEbPkg/ArmRealViewEb-RTSM-A9x2.dsc @@ -133,7 +133,7 @@ #DebugAgentLib|EmbeddedPkg/Library/GdbDebugAgent/GdbDebugAgent.inf # L2 Cache Driver - L2X0CacheLib|ArmPkg/Library/L2X0CacheLibNull/L2X0CacheLibNull.inf + L2X0CacheLib|ArmPlatformPkg/Library/L2X0CacheLibNull/L2X0CacheLibNull.inf # ARM PL390 General Interrupt Driver in Secure and Non-secure PL390GicSecLib|ArmPkg/Drivers/PL390Gic/PL390GicSec.inf PL390GicNonSecLib|ArmPkg/Drivers/PL390Gic/PL390GicNonSec.inf @@ -360,11 +360,7 @@ # Size of the region used by UEFI in permanent memory (Reserved 64MB) gArmPlatformTokenSpaceGuid.PcdSystemMemoryUefiRegionSize|0x04000000 - - gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz|1000000 - gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000 # expressed in 100ns units, 100,000 x 100 ns = 10,000,000 ns = 10 ms - gArmPlatformTokenSpaceGuid.PcdSP804Timer0InterruptNum|33 - + # # ARM Pcds # @@ -375,6 +371,21 @@ # gArmRealViewEbPkgTokenSpaceGuid.PcdGdbUartBase|0x1000a000 + # + # ARM PrimeCells + # + + ## SP804 Timer + gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz|1000000 + gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000 # expressed in 100ns units, 100,000 x 100 ns = 10,000,000 ns = 10 ms + gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicInterruptNum|33 + gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicBase|0x10011000 + gArmPlatformTokenSpaceGuid.PcdSP804TimerPerformanceBase|0x10012020 + gArmPlatformTokenSpaceGuid.PcdSP804TimerMetronomeBase|0x10012000 + + ## PL031 RealTimeClock + gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x10017000 + # # ARM PL011 - Serial Terminal # diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform/ArmPlatform.h b/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform/ArmPlatform.h index 04e1ce86d4..cc76bb20de 100644 --- a/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform/ArmPlatform.h +++ b/ArmPlatformPkg/ArmRealViewEbPkg/Include/Platform/ArmPlatform.h @@ -120,10 +120,6 @@ //#define ARM_EB_L2x0_CTLR_BASE 0x1E00A000*/ -// PL031 RTC - Other settings -#define PL031_PPM_ACCURACY 300000000 - - /******************************************* // EFI Memory Map in Permanent Memory (DRAM) *******************************************/ diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEb.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEb.c index 8a1446a81d..5709ca6c01 100644 --- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEb.c +++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEb.c @@ -20,6 +20,8 @@ #include #include +#include + /** Return if Trustzone is supported by your platform @@ -102,7 +104,7 @@ ArmPlatformSecInitialize ( /** Initialize controllers that must setup in the normal world - This function is called by the ArmPlatformPkg/Pei or ArmPlatformPkg/Pei/PlatformPeim + This function is called by the ArmPlatformPkg/PrePi or ArmPlatformPkg/PlatformPei in the PEI phase. **/ diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c index 616fa0ef8c..a5489d06a8 100644 --- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c +++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbMem.c @@ -18,6 +18,8 @@ #include #include +#include + #define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS 6 // DDR attributes diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc index 48c64b1cba..303c0183af 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.dsc @@ -95,13 +95,13 @@ UefiApplicationEntryPoint|MdePkg/Library/UefiApplicationEntryPoint/UefiApplicationEntryPoint.inf # ARM PL310 L2 Cache Driver - L2X0CacheLib|ArmPkg/Drivers/PL310L2Cache/PL310L2CacheSec.inf + L2X0CacheLib|ArmPlatformPkg/Drivers/PL310L2Cache/PL310L2CacheSec.inf # ARM PL354 SMC Driver - PL354SmcLib|ArmPkg/Drivers/PL35xSmc/PL354SmcSec.inf + PL35xSmcLib|ArmPlatformPkg/Drivers/PL35xSmc/PL35xSmc.inf # ARM PL341 DMC Driver - PL341DmcLib|ArmPkg/Drivers/PL34xDmc/PL341Dmc.inf + PL341DmcLib|ArmPlatformPkg/Drivers/PL34xDmc/PL341Dmc.inf # ARM PL301 Axi Driver - PL301AxiLib|ArmPkg/Drivers/PL301Axi/PL301Axi.inf + PL301AxiLib|ArmPlatformPkg/Drivers/PL301Axi/PL301Axi.inf # ARM PL011 UART Driver PL011UartLib|ArmPlatformPkg/Drivers/PL011Uart/PL011Uart.inf @@ -392,27 +392,45 @@ # System Memory (1GB) gArmTokenSpaceGuid.PcdSystemMemoryBase|0x60000000 gArmTokenSpaceGuid.PcdSystemMemorySize|0x40000000 - - gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz|1000000 - gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000 # expressed in 100ns units, 100,000 x 100 ns = 10,000,000 ns = 10 ms - gArmPlatformTokenSpaceGuid.PcdSP804Timer0InterruptNum|34 - + # # ARM Pcds # gArmTokenSpaceGuid.PcdArmUncachedMemoryMask|0x0000000040000000 - + # # ARM PrimeCell # - gArmTokenSpaceGuid.PcdPL180SysMciRegAddress|0x10000048 - gArmTokenSpaceGuid.PcdPL180MciBaseAddress|0x10005000 - # - # ARM PL011 - Serial Terminal - # + ## SP804 Timer + gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz|1000000 + gEmbeddedTokenSpaceGuid.PcdTimerPeriod|100000 # expressed in 100ns units, 100,000 x 100 ns = 10,000,000 ns = 10 ms + gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicInterruptNum|34 + gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicBase|0x10011000 + gArmPlatformTokenSpaceGuid.PcdSP804TimerPerformanceBase|0x10012020 + gArmPlatformTokenSpaceGuid.PcdSP804TimerMetronomeBase|0x10012000 + + ## SP805 Watchdog - Motherboard Watchdog + gArmPlatformTokenSpaceGuid.PcdSP805WatchdogBase|0x1000F000 + ## SP805 Watchdog - CoreTile Watchdog + #gArmPlatformTokenSpaceGuid.PcdSP805WatchdogBase|0x100E5000 + + ## PL011 - Serial Terminal gEfiMdeModulePkgTokenSpaceGuid.PcdSerialRegisterBase|0x10009000 gEfiMdePkgTokenSpaceGuid.PcdUartDefaultBaudRate|38400 + + ## PL031 RealTimeClock + gArmPlatformTokenSpaceGuid.PcdPL031RtcBase|0x10017000 + + ## PL111 Lcd + # PL111 CoreTile or Tuscan Standalone controller + gArmPlatformTokenSpaceGuid.PcdPL111LcdBase|0x10020000 + # PL111 Versatile Express Motherboard controller + #gArmPlatformTokenSpaceGuid.PcdPL111LcdBase|0x1001F000 + + ## PL180 MMC/SD card controller + gArmPlatformTokenSpaceGuid.PcdPL180SysMciRegAddress|0x10000048 + gArmPlatformTokenSpaceGuid.PcdPL180MciBaseAddress|0x10005000 # # ARM PL390 General Interrupt Controller @@ -532,7 +550,7 @@ # Multimedia Card Interface # EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf - ArmPkg/Drivers/PL180MciDxe/PL180MciDxe.inf + ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf # # FAT filesystem + GPT/MBR partitioning diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf index 6781f5e974..3cdf9d5ef7 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-CTA9x4.fdf @@ -187,7 +187,7 @@ READ_LOCK_STATUS = TRUE # Multimedia Card Interface # INF EmbeddedPkg/Universal/MmcDxe/MmcDxe.inf - INF ArmPkg/Drivers/PL180MciDxe/PL180MciDxe.inf + INF ArmPlatformPkg/Drivers/PL180MciDxe/PL180MciDxe.inf # # UEFI application (Shell Embedded Boot Loader) diff --git a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressPkg.dec b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressPkg.dec index 307e672cd0..12c57101b1 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressPkg.dec +++ b/ArmPlatformPkg/ArmVExpressPkg/ArmVExpressPkg.dec @@ -47,4 +47,5 @@ # # For a list of mode numbers look in LcdArmVExpress.c # - gArmVExpressTokenSpaceGuid.PcdPL111MaxMode|3|UINT32|0x00000003 + gArmVExpressTokenSpaceGuid.PcdPL111LcdMaxMode|3|UINT32|0x00000003 + gArmVExpressTokenSpaceGuid.PcdPL111LcdVideoModeOscId|1|UINT32|0x00000004 diff --git a/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4/ArmPlatform.h b/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4/ArmPlatform.h index 171b0420d5..e11e9c7d19 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4/ArmPlatform.h +++ b/ArmPlatformPkg/ArmVExpressPkg/Include/Platform/CTA9x4/ArmPlatform.h @@ -52,10 +52,10 @@ #define ARM_VE_SMB_PERIPH_SZ SIZE_64MB // DRAM -#define ARM_VE_DRAM_BASE 0x60000000 -#define ARM_VE_DRAM_SZ 0x40000000 +#define ARM_VE_DRAM_BASE PcdGet32 (PcdSystemMemoryBase) +#define ARM_VE_DRAM_SZ PcdGet32 (PcdSystemMemorySize) // Inside the DRAM we allocate a section for the VRAM (Video RAM) -#define LCD_VRAM_CORE_TILE_BASE 0x64000000 +#define LCD_VRAM_CORE_TILE_BASE 0x64000000 // External AXI between daughterboards (Logic Tile) #define ARM_VE_EXT_AXI_BASE 0xE0000000 @@ -98,18 +98,6 @@ // PL310 L2x0 Cache Controller Base Address //#define ARM_VE_L2x0_CTLR_BASE 0x1E00A000 -/*********************************************************************************** - Select between Motherboard and Core Tile peripherals -************************************************************************************/ - -// Specify which PL111 to use -//#define PL111_CLCD_BASE PL111_CLCD_MOTHERBOARD_BASE -#define PL111_CLCD_BASE PL111_CLCD_CORE_TILE_BASE - -// Specify which Watchdog to use -#define SP805_WDOG_BASE SP805_WDOG_MOTHERBOARD_BASE -//#define SP805_WDOG_BASE SP805_WDOG_CORE_TILE_BASE - /*********************************************************************************** Peripherals' misc settings ************************************************************************************/ @@ -130,16 +118,6 @@ #define ARM_VE_DECPROT_BIT_NMC_TZASC_LOCK (1 << 4) #define ARM_VE_DECPROT_BIT_SMC_TZASC_LOCK (1 << 5) -// PL031 RTC - Other settings -#define PL031_PPM_ACCURACY 300000000 - -// SP805 Watchdog - Other settings -#define SP805_CLOCK_FREQUENCY 32000 -#define SP805_MAX_TICKS 0xFFFFFFFF - -// PL111 Lcd -#define PL111_CLCD_CORE_TILE_VIDEO_MODE_OSC_ID 1 - /*********************************************************************************** // EFI Memory Map in Permanent Memory (DRAM) ************************************************************************************/ diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf index d78f631829..5670fab7c4 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf +++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/ArmVExpressLib.inf @@ -50,4 +50,7 @@ [FixedPcd] gArmPlatformTokenSpaceGuid.PcdStandalone + gArmTokenSpaceGuid.PcdSystemMemoryBase + gArmTokenSpaceGuid.PcdSystemMemorySize + gArmTokenSpaceGuid.PcdL2x0ControllerBase diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4.c index c72a5a4cba..17d09a605a 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4.c +++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4.c @@ -23,6 +23,8 @@ #include #include +#include + #define SerialPrint(txt) SerialPortWrite ((UINT8*)(txt), AsciiStrLen(txt)+1); // DDR2 timings @@ -121,7 +123,7 @@ ArmPlatformBootRemapping ( /** Initialize controllers that must setup in the normal world - This function is called by the ArmPlatformPkg/Pei or ArmPlatformPkg/Pei/PlatformPeim + This function is called by the ArmPlatformPkg/PrePi or ArmPlatformPkg/PlatformPei in the PEI phase. **/ diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c index eed01ed7ef..7bfd679411 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c +++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Mem.c @@ -18,6 +18,8 @@ #include #include +#include + // Number of Virtual Memory Map Descriptors without a Logic Tile #define MAX_VIRTUAL_MEMORY_MAP_DESCRIPTORS 6 diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Sec.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Sec.c index 2ac64a0160..46ca8eaac4 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Sec.c +++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressLibCTA9x4/CTA9x4Sec.c @@ -21,6 +21,8 @@ #include +#include + /** Initialize the Secure peripherals and memory regions diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf index 01027cc271..5e06063185 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf +++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSysConfigLib/ArmVExpressSysConfigLib.inf @@ -31,6 +31,7 @@ [LibraryClasses] BaseLib + IoLib [Guids] diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c b/ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c index 6ae5da9997..8198dfd5cd 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c +++ b/ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpress.c @@ -195,7 +195,7 @@ LcdPlatformGetMaxMode ( // This could be because the specific implementation of PL111 has certain limitations. // Set the maximum mode allowed - return (PcdGet32(PcdPL111MaxMode)); + return (PcdGet32(PcdPL111LcdMaxMode)); } EFI_STATUS @@ -221,7 +221,7 @@ LcdPlatformSetMode ( break; case ARM_VE_DAUGHTERBOARD_1_SITE: Function = SYS_CFG_OSC_SITE1; - OscillatorId = PL111_CLCD_CORE_TILE_VIDEO_MODE_OSC_ID; + OscillatorId = (UINT32)PcdGet32(PcdPL111LcdVideoModeOscId); break; default: return EFI_UNSUPPORTED; diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf index 6edca3ba09..eca42752b5 100644 --- a/ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf +++ b/ArmPlatformPkg/ArmVExpressPkg/Library/PL111LcdArmVExpressLib/PL111LcdArmVExpressLib.inf @@ -33,15 +33,6 @@ BaseLib ArmPlatformSysConfigLib -[Guids] - -[Protocols] - -[FeaturePcd] - -[FixedPcd.common] - gArmVExpressTokenSpaceGuid.PcdPL111MaxMode - -[Pcd.common] - -[Depex] +[Pcd] + gArmVExpressTokenSpaceGuid.PcdPL111LcdMaxMode + gArmVExpressTokenSpaceGuid.PcdPL111LcdVideoModeOscId diff --git a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c index 679ccc8256..b341c5e7b9 100644 --- a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c +++ b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputBlt.c @@ -22,7 +22,6 @@ #include -#include #include "LcdGraphicsOutputDxe.h" extern BOOLEAN mDisplayInitialized; diff --git a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c index a4ab6a68f5..8c9165e730 100644 --- a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c +++ b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/LcdGraphicsOutputDxe.c @@ -13,7 +13,6 @@ #include #include -#include #include #include #include @@ -22,7 +21,6 @@ #include -#include #include "LcdGraphicsOutputDxe.h" /********************************************************************** diff --git a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf index ae571d8d83..668c24472f 100644 --- a/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf +++ b/ArmPlatformPkg/Drivers/LcdGraphicsOutputDxe/PL111LcdGraphicsOutputDxe.inf @@ -45,16 +45,12 @@ BaseMemoryLib LcdPlatformLib -[Guids] - [Protocols] gEfiDevicePathProtocolGuid gEfiGraphicsOutputProtocolGuid -[FixedPcd.common] - -[Pcd.common] - +[FixedPcd] + gArmPlatformTokenSpaceGuid.PcdPL111LcdBase [Depex] gEfiCpuArchProtocolGuid diff --git a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h index 60cdbd5a43..5abf8fccf6 100644 --- a/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h +++ b/ArmPlatformPkg/Drivers/NorFlashDxe/NorFlashDxe.h @@ -26,8 +26,6 @@ #include #include -#include - #define HIGH_16_BITS 0xFFFF0000 #define LOW_16_BITS 0x0000FFFF #define LOW_8_BITS 0x000000FF diff --git a/ArmPlatformPkg/Drivers/PL061GpioDxe/PL061Gpio.c b/ArmPlatformPkg/Drivers/PL061GpioDxe/PL061Gpio.c index 0e263c03a7..cb811d89d6 100644 --- a/ArmPlatformPkg/Drivers/PL061GpioDxe/PL061Gpio.c +++ b/ArmPlatformPkg/Drivers/PL061GpioDxe/PL061Gpio.c @@ -13,23 +13,20 @@ **/ -#include #include #include -#include #include -#include -#include -#include +#include #include +#include +#include +#include +#include #include -#include #include -#define LOW_4_BITS 0x0000000F - BOOLEAN mPL061Initialized = FALSE; /** @@ -42,18 +39,18 @@ PL061Identify ( ) { // Check if this is a PrimeCell Peripheral - if( ( MmioRead8( PL061_GPIO_PCELL_ID0 ) != 0x0D ) - || ( MmioRead8( PL061_GPIO_PCELL_ID1 ) != 0xF0 ) - || ( MmioRead8( PL061_GPIO_PCELL_ID2 ) != 0x05 ) - || ( MmioRead8( PL061_GPIO_PCELL_ID3 ) != 0xB1 ) ) { + if ( (MmioRead8 (PL061_GPIO_PCELL_ID0) != 0x0D) + || (MmioRead8 (PL061_GPIO_PCELL_ID1) != 0xF0) + || (MmioRead8 (PL061_GPIO_PCELL_ID2) != 0x05) + || (MmioRead8 (PL061_GPIO_PCELL_ID3) != 0xB1)) { return EFI_NOT_FOUND; } // Check if this PrimeCell Peripheral is the PL061 GPIO - if( ( MmioRead8( PL061_GPIO_PERIPH_ID0 ) != 0x61 ) - || ( MmioRead8( PL061_GPIO_PERIPH_ID1 ) != 0x10 ) - || ( ( MmioRead8( PL061_GPIO_PERIPH_ID2 ) & LOW_4_BITS ) != 0x04 ) - || ( MmioRead8( PL061_GPIO_PERIPH_ID3 ) != 0x00 ) ) { + if ( (MmioRead8 (PL061_GPIO_PERIPH_ID0) != 0x61) + || (MmioRead8 (PL061_GPIO_PERIPH_ID1) != 0x10) + || ((MmioRead8 (PL061_GPIO_PERIPH_ID2) & 0xF) != 0x04) + || (MmioRead8 (PL061_GPIO_PERIPH_ID3) != 0x00)) { return EFI_NOT_FOUND; } @@ -62,14 +59,14 @@ PL061Identify ( EFI_STATUS PL061Initialize ( -VOID + VOID ) { EFI_STATUS Status; // Check if the PL061 GPIO module exists on board Status = PL061Identify(); - if (EFI_ERROR( Status )) { + if (EFI_ERROR (Status)) { Status = EFI_DEVICE_ERROR; goto EXIT; } @@ -77,7 +74,7 @@ VOID // Do other hardware initialisation things here as required // Disable Interrupts - //if( MmioRead8( PL061_GPIO_IE_REG ) != 0 ) { + //if (MmioRead8 (PL061_GPIO_IE_REG) != 0) { // // Ensure interrupts are disabled //} @@ -114,21 +111,21 @@ Get ( { EFI_STATUS Status = EFI_SUCCESS; - if( ( Value == NULL ) - || ( Gpio > LAST_GPIO_PIN ) ) + if ( (Value == NULL) + || (Gpio > LAST_GPIO_PIN)) { return EFI_INVALID_PARAMETER; } // Initialize the hardware if not already done - if( !mPL061Initialized ) { + if (!mPL061Initialized) { Status = PL061Initialize(); - if( EFI_ERROR(Status) ) { + if (EFI_ERROR(Status)) { goto EXIT; } } - if( MmioRead8( PL061_GPIO_DATA_REG ) & GPIO_PIN_MASK_HIGH_8BIT(Gpio) ) { + if (MmioRead8 (PL061_GPIO_DATA_REG) & GPIO_PIN_MASK_HIGH_8BIT(Gpio)) { *Value = 1; } else { *Value = 0; @@ -167,15 +164,15 @@ Set ( EFI_STATUS Status = EFI_SUCCESS; // Check for errors - if( Gpio > LAST_GPIO_PIN ) { + if (Gpio > LAST_GPIO_PIN) { Status = EFI_INVALID_PARAMETER; goto EXIT; } // Initialize the hardware if not already done - if( !mPL061Initialized ) { + if (!mPL061Initialized) { Status = PL061Initialize(); - if( EFI_ERROR(Status) ) { + if (EFI_ERROR(Status)) { goto EXIT; } } @@ -184,21 +181,21 @@ Set ( { case GPIO_MODE_INPUT: // Set the corresponding direction bit to LOW for input - MmioAnd8( PL061_GPIO_DIR_REG, GPIO_PIN_MASK_LOW_8BIT(Gpio) ); + MmioAnd8 (PL061_GPIO_DIR_REG, GPIO_PIN_MASK_LOW_8BIT(Gpio)); break; case GPIO_MODE_OUTPUT_0: // Set the corresponding data bit to LOW for 0 - MmioAnd8( PL061_GPIO_DATA_REG, GPIO_PIN_MASK_LOW_8BIT(Gpio) ); + MmioAnd8 (PL061_GPIO_DATA_REG, GPIO_PIN_MASK_LOW_8BIT(Gpio)); // Set the corresponding direction bit to HIGH for output - MmioOr8( PL061_GPIO_DIR_REG, GPIO_PIN_MASK_HIGH_8BIT(Gpio) ); + MmioOr8 (PL061_GPIO_DIR_REG, GPIO_PIN_MASK_HIGH_8BIT(Gpio)); break; case GPIO_MODE_OUTPUT_1: // Set the corresponding data bit to HIGH for 1 - MmioOr8( PL061_GPIO_DATA_REG, GPIO_PIN_MASK_HIGH_8BIT(Gpio) ); + MmioOr8 (PL061_GPIO_DATA_REG, GPIO_PIN_MASK_HIGH_8BIT(Gpio)); // Set the corresponding direction bit to HIGH for output - MmioOr8( PL061_GPIO_DIR_REG, GPIO_PIN_MASK_HIGH_8BIT(Gpio) ); + MmioOr8 (PL061_GPIO_DIR_REG, GPIO_PIN_MASK_HIGH_8BIT(Gpio)); break; default: @@ -239,23 +236,23 @@ GetMode ( EFI_STATUS Status; // Check for errors - if( ( Mode == NULL ) - || ( Gpio > LAST_GPIO_PIN ) ) { + if ( (Mode == NULL) + || (Gpio > LAST_GPIO_PIN)) { return EFI_INVALID_PARAMETER; } // Initialize the hardware if not already done - if( !mPL061Initialized ) { + if (!mPL061Initialized) { Status = PL061Initialize(); - if( EFI_ERROR(Status) ) { + if (EFI_ERROR(Status)) { return Status; } } // Check if it is input or output - if( MmioRead8( PL061_GPIO_DIR_REG ) & GPIO_PIN_MASK_HIGH_8BIT(Gpio) ) { + if (MmioRead8 (PL061_GPIO_DIR_REG) & GPIO_PIN_MASK_HIGH_8BIT(Gpio)) { // Pin set to output - if( MmioRead8( PL061_GPIO_DATA_REG ) & GPIO_PIN_MASK_HIGH_8BIT(Gpio) ) { + if (MmioRead8 (PL061_GPIO_DATA_REG) & GPIO_PIN_MASK_HIGH_8BIT(Gpio)) { *Mode = GPIO_MODE_OUTPUT_1; } else { *Mode = GPIO_MODE_OUTPUT_0; @@ -338,7 +335,7 @@ PL061InstallProtocol ( &Handle, &gEmbeddedGpioProtocolGuid, &gGpio, NULL - ); + ); if (EFI_ERROR(Status)) { Status = EFI_OUT_OF_RESOURCES; } diff --git a/ArmPlatformPkg/Drivers/PL061GpioDxe/PL061GpioDxe.inf b/ArmPlatformPkg/Drivers/PL061GpioDxe/PL061GpioDxe.inf index 53eebdaec9..b5adda3a89 100644 --- a/ArmPlatformPkg/Drivers/PL061GpioDxe/PL061GpioDxe.inf +++ b/ArmPlatformPkg/Drivers/PL061GpioDxe/PL061GpioDxe.inf @@ -31,19 +31,20 @@ [LibraryClasses] BaseLib - UefiRuntimeServicesTableLib - UefiLib - UefiBootServicesTableLib BaseMemoryLib DebugLib - UefiDriverEntryPoint IoLib + PcdLib + UefiBootServicesTableLib + UefiDriverEntryPoint + UefiLib + UefiRuntimeServicesTableLib -[Guids] +[Pcd] + gArmPlatformTokenSpaceGuid.PcdPL061GpioBase [Protocols] gEmbeddedGpioProtocolGuid - [Depex] -TRUE + TRUE diff --git a/ArmPlatformPkg/Drivers/SP804TimerDxe/SP804Timer.c b/ArmPlatformPkg/Drivers/SP804TimerDxe/SP804Timer.c index e74b7e1382..159e9256a1 100644 --- a/ArmPlatformPkg/Drivers/SP804TimerDxe/SP804Timer.c +++ b/ArmPlatformPkg/Drivers/SP804TimerDxe/SP804Timer.c @@ -28,7 +28,10 @@ #include #include -#include + +#define SP804_TIMER_PERIODIC_BASE (UINTN)PcdGet32 (PcdSP804TimerPeriodicBase) +#define SP804_TIMER_METRONOME_BASE (UINTN)PcdGet32 (PcdSP804TimerMetronomeBase) +#define SP804_TIMER_PERFORMANCE_BASE (UINTN)PcdGet32 (PcdSP804TimerPerformanceBase) // The notification function to call on every timer interrupt. volatile EFI_TIMER_NOTIFY mTimerNotifyFunction = (EFI_TIMER_NOTIFY)NULL; @@ -43,7 +46,6 @@ EFI_HARDWARE_INTERRUPT_PROTOCOL *gInterrupt = NULL; // Cached interrupt vector UINTN gVector; -UINT32 mLastTickCount; /** @@ -75,9 +77,9 @@ TimerInterruptHandler ( OriginalTPL = gBS->RaiseTPL (TPL_HIGH_LEVEL); // If the interrupt is shared then we must check if this interrupt source is the one associated to this Timer - if (MmioRead32 (SP804_TIMER0_BASE + SP804_TIMER_MSK_INT_STS_REG) != 0) { + if (MmioRead32 (SP804_TIMER_PERIODIC_BASE + SP804_TIMER_MSK_INT_STS_REG) != 0) { // clear the periodic interrupt - MmioWrite32 (SP804_TIMER0_BASE + SP804_TIMER_INT_CLR_REG, 0); + MmioWrite32 (SP804_TIMER_PERIODIC_BASE + SP804_TIMER_INT_CLR_REG, 0); // signal end of interrupt early to help avoid losing subsequent ticks from long duration handlers gInterrupt->EndOfInterrupt (gInterrupt, Source); @@ -139,7 +141,7 @@ TimerDriverRegisterHandler ( } /** - Make sure all ArrmVe Timers are disabled + Make sure all Dual Timers are disabled **/ VOID EFIAPI @@ -148,25 +150,20 @@ ExitBootServicesEvent ( IN VOID *Context ) { - // Disable timer 0 if enabled - if (MmioRead32(SP804_TIMER0_BASE + SP804_TIMER_CONTROL_REG) & SP804_TIMER_CTRL_ENABLE) { - MmioAnd32 (SP804_TIMER0_BASE + SP804_TIMER_CONTROL_REG, 0); - } + // Disable 'Periodic Operation' timer if enabled + if (MmioRead32(SP804_TIMER_PERIODIC_BASE + SP804_TIMER_CONTROL_REG) & SP804_TIMER_CTRL_ENABLE) { + MmioAnd32 (SP804_TIMER_PERIODIC_BASE + SP804_TIMER_CONTROL_REG, 0); + } - // Disable timer 1 if enabled - if (MmioRead32(SP804_TIMER1_BASE + SP804_TIMER_CONTROL_REG) & SP804_TIMER_CTRL_ENABLE) { - MmioAnd32 (SP804_TIMER1_BASE + SP804_TIMER_CONTROL_REG, 0); - } + // Disable 'Metronome/Delay' timer if enabled + if (MmioRead32(SP804_TIMER_METRONOME_BASE + SP804_TIMER_CONTROL_REG) & SP804_TIMER_CTRL_ENABLE) { + MmioAnd32 (SP804_TIMER_METRONOME_BASE + SP804_TIMER_CONTROL_REG, 0); + } - // Disable timer 2 if enabled - if (MmioRead32(SP804_TIMER2_BASE + SP804_TIMER_CONTROL_REG) & SP804_TIMER_CTRL_ENABLE) { - MmioAnd32 (SP804_TIMER2_BASE + SP804_TIMER_CONTROL_REG, 0); - } - - // Disable timer 3 if enabled - if (MmioRead32(SP804_TIMER3_BASE + SP804_TIMER_CONTROL_REG) & SP804_TIMER_CTRL_ENABLE) { - MmioAnd32 (SP804_TIMER3_BASE + SP804_TIMER_CONTROL_REG, 0); - } + // Disable 'Performance' timer if enabled + if (MmioRead32(SP804_TIMER_PERFORMANCE_BASE + SP804_TIMER_CONTROL_REG) & SP804_TIMER_CTRL_ENABLE) { + MmioAnd32 (SP804_TIMER_PERFORMANCE_BASE + SP804_TIMER_CONTROL_REG, 0); + } } /** @@ -208,7 +205,7 @@ TimerDriverSetTimerPeriod ( UINT64 TimerTicks; // always disable the timer - MmioAnd32 (SP804_TIMER0_BASE + SP804_TIMER_CONTROL_REG, ~SP804_TIMER_CTRL_ENABLE); + MmioAnd32 (SP804_TIMER_PERIODIC_BASE + SP804_TIMER_CONTROL_REG, ~SP804_TIMER_CTRL_ENABLE); if (TimerPeriod == 0) { // Leave timer disabled from above, and... @@ -218,7 +215,7 @@ TimerDriverSetTimerPeriod ( } else { // Convert TimerPeriod into 1MHz clock counts (us units = 100ns units / 10) TimerTicks = DivU64x32 (TimerPeriod, 10); - TimerTicks = MultU64x32 (TimerTicks, PcdGet32(PcdSP804FrequencyInMHz)); + TimerTicks = MultU64x32 (TimerTicks, PcdGet32(PcdSP804TimerFrequencyInMHz)); // if it's larger than 32-bits, pin to highest value if (TimerTicks > 0xffffffff) { @@ -228,10 +225,10 @@ TimerDriverSetTimerPeriod ( } // Program the SP804 timer with the new count value - MmioWrite32 (SP804_TIMER0_BASE + SP804_TIMER_LOAD_REG, TimerTicks); + MmioWrite32 (SP804_TIMER_PERIODIC_BASE + SP804_TIMER_LOAD_REG, TimerTicks); // enable the timer - MmioOr32 (SP804_TIMER0_BASE + SP804_TIMER_CONTROL_REG, SP804_TIMER_CTRL_ENABLE); + MmioOr32 (SP804_TIMER_PERIODIC_BASE + SP804_TIMER_CONTROL_REG, SP804_TIMER_CTRL_ENABLE); // enable timer 0/1 interrupts Status = gInterrupt->EnableInterruptSource (gInterrupt, gVector); @@ -365,26 +362,17 @@ TimerInitialize ( Status = gBS->LocateProtocol (&gHardwareInterruptProtocolGuid, NULL, (VOID **)&gInterrupt); ASSERT_EFI_ERROR (Status); - // Configure timer 1 for free running operation, 32 bits, no prescaler, interrupt disabled - MmioWrite32 (SP804_TIMER1_BASE + SP804_TIMER_CONTROL_REG, SP804_TIMER_CTRL_32BIT | SP804_PRESCALE_DIV_1); - - // Enable the free running timer - MmioOr32 (SP804_TIMER1_BASE + SP804_TIMER_CONTROL_REG, SP804_TIMER_CTRL_ENABLE); - - // Record free running tick value (should be close to 0xffffffff) - mLastTickCount = MmioRead32 (SP804_TIMER1_BASE + SP804_TIMER_CURRENT_REG); - // Disable the timer Status = TimerDriverSetTimerPeriod (&gTimer, 0); ASSERT_EFI_ERROR (Status); // Install interrupt handler - gVector = PcdGet32(PcdSP804Timer0InterruptNum); + gVector = PcdGet32(PcdSP804TimerPeriodicInterruptNum); Status = gInterrupt->RegisterInterruptSource (gInterrupt, gVector, TimerInterruptHandler); ASSERT_EFI_ERROR (Status); // configure timer 0 for periodic operation, 32 bits, no prescaler, and interrupt enabled - MmioWrite32 (SP804_TIMER0_BASE + SP804_TIMER_CONTROL_REG, SP804_TIMER_CTRL_PERIODIC | SP804_TIMER_CTRL_32BIT | SP804_PRESCALE_DIV_1 | SP804_TIMER_CTRL_INT_ENABLE); + MmioWrite32 (SP804_TIMER_PERIODIC_BASE + SP804_TIMER_CONTROL_REG, SP804_TIMER_CTRL_PERIODIC | SP804_TIMER_CTRL_32BIT | SP804_PRESCALE_DIV_1 | SP804_TIMER_CTRL_INT_ENABLE); // Set up default timer Status = TimerDriverSetTimerPeriod (&gTimer, FixedPcdGet32(PcdTimerPeriod)); // TIMER_DEFAULT_PERIOD diff --git a/ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf b/ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf index 017277ad71..f314fb1a0b 100644 --- a/ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf +++ b/ArmPlatformPkg/Drivers/SP804TimerDxe/SP804TimerDxe.inf @@ -48,8 +48,11 @@ gHardwareInterruptProtocolGuid [Pcd.common] - gArmPlatformTokenSpaceGuid.PcdSP804FrequencyInMHz - gArmPlatformTokenSpaceGuid.PcdSP804Timer0InterruptNum + gArmPlatformTokenSpaceGuid.PcdSP804TimerFrequencyInMHz + gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicInterruptNum + gArmPlatformTokenSpaceGuid.PcdSP804TimerPeriodicBase + gArmPlatformTokenSpaceGuid.PcdSP804TimerPerformanceBase + gArmPlatformTokenSpaceGuid.PcdSP804TimerMetronomeBase gEmbeddedTokenSpaceGuid.PcdTimerPeriod [Depex] diff --git a/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.c b/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.c index 0eb459303f..840f8ede1f 100644 --- a/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.c +++ b/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805Watchdog.c @@ -16,15 +16,15 @@ #include #include -#include #include +#include +#include +#include #include #include #include -#include #include -#include #include /** @@ -75,18 +75,18 @@ SP805Identify ( ) { // Check if this is a PrimeCell Peripheral - if( ( MmioRead8( SP805_WDOG_PCELL_ID0 ) != 0x0D ) - || ( MmioRead8( SP805_WDOG_PCELL_ID1 ) != 0xF0 ) - || ( MmioRead8( SP805_WDOG_PCELL_ID2 ) != 0x05 ) - || ( MmioRead8( SP805_WDOG_PCELL_ID3 ) != 0xB1 ) ) { + if ( (MmioRead8 (SP805_WDOG_PCELL_ID0) != 0x0D) + || (MmioRead8 (SP805_WDOG_PCELL_ID1) != 0xF0) + || (MmioRead8 (SP805_WDOG_PCELL_ID2) != 0x05) + || (MmioRead8 (SP805_WDOG_PCELL_ID3) != 0xB1)) { return EFI_NOT_FOUND; } // Check if this PrimeCell Peripheral is the SP805 Watchdog Timer - if( ( MmioRead8( SP805_WDOG_PERIPH_ID0 ) != 0x05 ) - || ( MmioRead8( SP805_WDOG_PERIPH_ID1 ) != 0x18 ) - || (( MmioRead8( SP805_WDOG_PERIPH_ID2 ) & 0x0000000F) != 0x04 ) - || ( MmioRead8( SP805_WDOG_PERIPH_ID3 ) != 0x00 ) ) { + if ( (MmioRead8 (SP805_WDOG_PERIPH_ID0) != 0x05) + || (MmioRead8 (SP805_WDOG_PERIPH_ID1) != 0x18) + || ((MmioRead8 (SP805_WDOG_PERIPH_ID2) & 0x0000000F) != 0x04) + || (MmioRead8 (SP805_WDOG_PERIPH_ID3) != 0x00)) { return EFI_NOT_FOUND; } diff --git a/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf b/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf index b77320120c..7cacf69f4f 100644 --- a/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf +++ b/ArmPlatformPkg/Drivers/SP805WatchdogDxe/SP805WatchdogDxe.inf @@ -32,19 +32,21 @@ [LibraryClasses] BaseLib - UefiRuntimeServicesTableLib - UefiLib - UefiBootServicesTableLib BaseMemoryLib DebugLib - UefiDriverEntryPoint IoLib + PcdLib + UefiLib + UefiBootServicesTableLib + UefiDriverEntryPoint + UefiRuntimeServicesTableLib -[Guids] +[Pcd] + gArmPlatformTokenSpaceGuid.PcdSP805WatchdogBase + gArmPlatformTokenSpaceGuid.PcdSP805WatchdogClockFrequencyInHz [Protocols] gEfiWatchdogTimerArchProtocolGuid - [Depex] -TRUE + TRUE diff --git a/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h b/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h index 8c26d66053..4c559c0c95 100644 --- a/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h +++ b/ArmPlatformPkg/Include/Drivers/PL031RealTimeClock.h @@ -16,26 +16,23 @@ #ifndef __PL031_REAL_TIME_CLOCK_H__ #define __PL031_REAL_TIME_CLOCK_H__ -#include -#include - // PL031 Registers -#define PL031_RTC_DR_DATA_REGISTER (PL031_RTC_BASE + 0x000) -#define PL031_RTC_MR_MATCH_REGISTER (PL031_RTC_BASE + 0x004) -#define PL031_RTC_LR_LOAD_REGISTER (PL031_RTC_BASE + 0x008) -#define PL031_RTC_CR_CONTROL_REGISTER (PL031_RTC_BASE + 0x00C) -#define PL031_RTC_IMSC_IRQ_MASK_SET_CLEAR_REGISTER (PL031_RTC_BASE + 0x010) -#define PL031_RTC_RIS_RAW_IRQ_STATUS_REGISTER (PL031_RTC_BASE + 0x014) -#define PL031_RTC_MIS_MASKED_IRQ_STATUS_REGISTER (PL031_RTC_BASE + 0x018) -#define PL031_RTC_ICR_IRQ_CLEAR_REGISTER (PL031_RTC_BASE + 0x01C) -#define PL031_RTC_PERIPH_ID0 (PL031_RTC_BASE + 0xFE0) -#define PL031_RTC_PERIPH_ID1 (PL031_RTC_BASE + 0xFE4) -#define PL031_RTC_PERIPH_ID2 (PL031_RTC_BASE + 0xFE8) -#define PL031_RTC_PERIPH_ID3 (PL031_RTC_BASE + 0xFEC) -#define PL031_RTC_PCELL_ID0 (PL031_RTC_BASE + 0xFF0) -#define PL031_RTC_PCELL_ID1 (PL031_RTC_BASE + 0xFF4) -#define PL031_RTC_PCELL_ID2 (PL031_RTC_BASE + 0xFF8) -#define PL031_RTC_PCELL_ID3 (PL031_RTC_BASE + 0xFFC) +#define PL031_RTC_DR_DATA_REGISTER ((UINT32)PcdGet32(PcdPL031RtcBase) + 0x000) +#define PL031_RTC_MR_MATCH_REGISTER ((UINT32)PcdGet32(PcdPL031RtcBase) + 0x004) +#define PL031_RTC_LR_LOAD_REGISTER ((UINT32)PcdGet32(PcdPL031RtcBase) + 0x008) +#define PL031_RTC_CR_CONTROL_REGISTER ((UINT32)PcdGet32(PcdPL031RtcBase) + 0x00C) +#define PL031_RTC_IMSC_IRQ_MASK_SET_CLEAR_REGISTER ((UINT32)PcdGet32(PcdPL031RtcBase) + 0x010) +#define PL031_RTC_RIS_RAW_IRQ_STATUS_REGISTER ((UINT32)PcdGet32(PcdPL031RtcBase) + 0x014) +#define PL031_RTC_MIS_MASKED_IRQ_STATUS_REGISTER ((UINT32)PcdGet32(PcdPL031RtcBase) + 0x018) +#define PL031_RTC_ICR_IRQ_CLEAR_REGISTER ((UINT32)PcdGet32(PcdPL031RtcBase) + 0x01C) +#define PL031_RTC_PERIPH_ID0 ((UINT32)PcdGet32(PcdPL031RtcBase) + 0xFE0) +#define PL031_RTC_PERIPH_ID1 ((UINT32)PcdGet32(PcdPL031RtcBase) + 0xFE4) +#define PL031_RTC_PERIPH_ID2 ((UINT32)PcdGet32(PcdPL031RtcBase) + 0xFE8) +#define PL031_RTC_PERIPH_ID3 ((UINT32)PcdGet32(PcdPL031RtcBase) + 0xFEC) +#define PL031_RTC_PCELL_ID0 ((UINT32)PcdGet32(PcdPL031RtcBase) + 0xFF0) +#define PL031_RTC_PCELL_ID1 ((UINT32)PcdGet32(PcdPL031RtcBase) + 0xFF4) +#define PL031_RTC_PCELL_ID2 ((UINT32)PcdGet32(PcdPL031RtcBase) + 0xFF8) +#define PL031_RTC_PCELL_ID3 ((UINT32)PcdGet32(PcdPL031RtcBase) + 0xFFC) // PL031 Values #define PL031_RTC_ENABLED 0x00000001 diff --git a/ArmPlatformPkg/Include/Drivers/PL061Gpio.h b/ArmPlatformPkg/Include/Drivers/PL061Gpio.h index 4daabff768..739caaf2a1 100644 --- a/ArmPlatformPkg/Include/Drivers/PL061Gpio.h +++ b/ArmPlatformPkg/Include/Drivers/PL061Gpio.h @@ -16,31 +16,29 @@ #ifndef __PL061_GPIO_H__ #define __PL061_GPIO_H__ -#include #include -#include // SP805 Watchdog Registers -#define PL061_GPIO_DATA_REG (PL061_GPIO_BASE + 0x000) -#define PL061_GPIO_DIR_REG (PL061_GPIO_BASE + 0x400) -#define PL061_GPIO_IS_REG (PL061_GPIO_BASE + 0x404) -#define PL061_GPIO_IBE_REG (PL061_GPIO_BASE + 0x408) -#define PL061_GPIO_IEV_REG (PL061_GPIO_BASE + 0x40C) -#define PL061_GPIO_IE_REG (PL061_GPIO_BASE + 0x410) -#define PL061_GPIO_RIS_REG (PL061_GPIO_BASE + 0x414) -#define PL061_GPIO_MIS_REG (PL061_GPIO_BASE + 0x410) -#define PL061_GPIO_IC_REG (PL061_GPIO_BASE + 0x41C) -#define PL061_GPIO_AFSEL_REG (PL061_GPIO_BASE + 0x420) +#define PL061_GPIO_DATA_REG ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0x000) +#define PL061_GPIO_DIR_REG ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0x400) +#define PL061_GPIO_IS_REG ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0x404) +#define PL061_GPIO_IBE_REG ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0x408) +#define PL061_GPIO_IEV_REG ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0x40C) +#define PL061_GPIO_IE_REG ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0x410) +#define PL061_GPIO_RIS_REG ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0x414) +#define PL061_GPIO_MIS_REG ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0x410) +#define PL061_GPIO_IC_REG ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0x41C) +#define PL061_GPIO_AFSEL_REG ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0x420) -#define PL061_GPIO_PERIPH_ID0 (PL061_GPIO_BASE + 0xFE0) -#define PL061_GPIO_PERIPH_ID1 (PL061_GPIO_BASE + 0xFE4) -#define PL061_GPIO_PERIPH_ID2 (PL061_GPIO_BASE + 0xFE8) -#define PL061_GPIO_PERIPH_ID3 (PL061_GPIO_BASE + 0xFEC) +#define PL061_GPIO_PERIPH_ID0 ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0xFE0) +#define PL061_GPIO_PERIPH_ID1 ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0xFE4) +#define PL061_GPIO_PERIPH_ID2 ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0xFE8) +#define PL061_GPIO_PERIPH_ID3 ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0xFEC) -#define PL061_GPIO_PCELL_ID0 (PL061_GPIO_BASE + 0xFF0) -#define PL061_GPIO_PCELL_ID1 (PL061_GPIO_BASE + 0xFF4) -#define PL061_GPIO_PCELL_ID2 (PL061_GPIO_BASE + 0xFF8) -#define PL061_GPIO_PCELL_ID3 (PL061_GPIO_BASE + 0xFFC) +#define PL061_GPIO_PCELL_ID0 ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0xFF0) +#define PL061_GPIO_PCELL_ID1 ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0xFF4) +#define PL061_GPIO_PCELL_ID2 ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0xFF8) +#define PL061_GPIO_PCELL_ID3 ((UINT32)PcdGet32 (PcdPL061GpioBase) + 0xFFC) // GPIO pins are numbered 0..7 diff --git a/ArmPlatformPkg/Include/Drivers/PL111Lcd.h b/ArmPlatformPkg/Include/Drivers/PL111Lcd.h index 80d563976d..d68acd83b3 100644 --- a/ArmPlatformPkg/Include/Drivers/PL111Lcd.h +++ b/ArmPlatformPkg/Include/Drivers/PL111Lcd.h @@ -14,8 +14,6 @@ #ifndef _PL111LCD_H__ #define _PL111LCD_H__ -#include - /********************************************************************** * * This header file contains all the bits of the PL111 that are @@ -24,30 +22,30 @@ **********************************************************************/ // Controller Register Offsets -#define PL111_REG_LCD_TIMING_0 (PL111_CLCD_BASE + 0x000) -#define PL111_REG_LCD_TIMING_1 (PL111_CLCD_BASE + 0x004) -#define PL111_REG_LCD_TIMING_2 (PL111_CLCD_BASE + 0x008) -#define PL111_REG_LCD_TIMING_3 (PL111_CLCD_BASE + 0x00C) -#define PL111_REG_LCD_UP_BASE (PL111_CLCD_BASE + 0x010) -#define PL111_REG_LCD_LP_BASE (PL111_CLCD_BASE + 0x014) -#define PL111_REG_LCD_CONTROL (PL111_CLCD_BASE + 0x018) -#define PL111_REG_LCD_IMSC (PL111_CLCD_BASE + 0x01C) -#define PL111_REG_LCD_RIS (PL111_CLCD_BASE + 0x020) -#define PL111_REG_LCD_MIS (PL111_CLCD_BASE + 0x024) -#define PL111_REG_LCD_ICR (PL111_CLCD_BASE + 0x028) -#define PL111_REG_LCD_UP_CURR (PL111_CLCD_BASE + 0x02C) -#define PL111_REG_LCD_LP_CURR (PL111_CLCD_BASE + 0x030) -#define PL111_REG_LCD_PALETTE (PL111_CLCD_BASE + 0x200) +#define PL111_REG_LCD_TIMING_0 ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0x000) +#define PL111_REG_LCD_TIMING_1 ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0x004) +#define PL111_REG_LCD_TIMING_2 ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0x008) +#define PL111_REG_LCD_TIMING_3 ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0x00C) +#define PL111_REG_LCD_UP_BASE ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0x010) +#define PL111_REG_LCD_LP_BASE ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0x014) +#define PL111_REG_LCD_CONTROL ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0x018) +#define PL111_REG_LCD_IMSC ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0x01C) +#define PL111_REG_LCD_RIS ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0x020) +#define PL111_REG_LCD_MIS ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0x024) +#define PL111_REG_LCD_ICR ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0x028) +#define PL111_REG_LCD_UP_CURR ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0x02C) +#define PL111_REG_LCD_LP_CURR ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0x030) +#define PL111_REG_LCD_PALETTE ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0x200) // Identification Register Offsets -#define PL111_REG_CLCD_PERIPH_ID_0 (PL111_CLCD_BASE + 0xFE0) -#define PL111_REG_CLCD_PERIPH_ID_1 (PL111_CLCD_BASE + 0xFE4) -#define PL111_REG_CLCD_PERIPH_ID_2 (PL111_CLCD_BASE + 0xFE8) -#define PL111_REG_CLCD_PERIPH_ID_3 (PL111_CLCD_BASE + 0xFEC) -#define PL111_REG_CLCD_P_CELL_ID_0 (PL111_CLCD_BASE + 0xFF0) -#define PL111_REG_CLCD_P_CELL_ID_1 (PL111_CLCD_BASE + 0xFF4) -#define PL111_REG_CLCD_P_CELL_ID_2 (PL111_CLCD_BASE + 0xFF8) -#define PL111_REG_CLCD_P_CELL_ID_3 (PL111_CLCD_BASE + 0xFFC) +#define PL111_REG_CLCD_PERIPH_ID_0 ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0xFE0) +#define PL111_REG_CLCD_PERIPH_ID_1 ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0xFE4) +#define PL111_REG_CLCD_PERIPH_ID_2 ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0xFE8) +#define PL111_REG_CLCD_PERIPH_ID_3 ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0xFEC) +#define PL111_REG_CLCD_P_CELL_ID_0 ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0xFF0) +#define PL111_REG_CLCD_P_CELL_ID_1 ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0xFF4) +#define PL111_REG_CLCD_P_CELL_ID_2 ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0xFF8) +#define PL111_REG_CLCD_P_CELL_ID_3 ((UINTN)PcdGet32 (PcdPL111LcdBase) + 0xFFC) /**********************************************************************/ diff --git a/ArmPkg/Include/Drivers/PL301Axi.h b/ArmPlatformPkg/Include/Drivers/PL301Axi.h similarity index 100% rename from ArmPkg/Include/Drivers/PL301Axi.h rename to ArmPlatformPkg/Include/Drivers/PL301Axi.h diff --git a/ArmPkg/Include/Drivers/PL310L2Cache.h b/ArmPlatformPkg/Include/Drivers/PL310L2Cache.h similarity index 100% rename from ArmPkg/Include/Drivers/PL310L2Cache.h rename to ArmPlatformPkg/Include/Drivers/PL310L2Cache.h diff --git a/ArmPkg/Include/Drivers/PL341Dmc.h b/ArmPlatformPkg/Include/Drivers/PL341Dmc.h similarity index 100% rename from ArmPkg/Include/Drivers/PL341Dmc.h rename to ArmPlatformPkg/Include/Drivers/PL341Dmc.h diff --git a/ArmPkg/Include/Drivers/PL354Smc.h b/ArmPlatformPkg/Include/Drivers/PL35xSmc.h similarity index 100% rename from ArmPkg/Include/Drivers/PL354Smc.h rename to ArmPlatformPkg/Include/Drivers/PL35xSmc.h diff --git a/ArmPlatformPkg/Include/Drivers/SP805Watchdog.h b/ArmPlatformPkg/Include/Drivers/SP805Watchdog.h index 10600a1553..60c02be139 100644 --- a/ArmPlatformPkg/Include/Drivers/SP805Watchdog.h +++ b/ArmPlatformPkg/Include/Drivers/SP805Watchdog.h @@ -16,27 +16,24 @@ #ifndef __SP805_WATCHDOG_H__ #define __SP805_WATCHDOG_H__ -#include -#include - // SP805 Watchdog Registers -#define SP805_WDOG_LOAD_REG (SP805_WDOG_BASE + 0x000) -#define SP805_WDOG_CURRENT_REG (SP805_WDOG_BASE + 0x004) -#define SP805_WDOG_CONTROL_REG (SP805_WDOG_BASE + 0x008) -#define SP805_WDOG_INT_CLR_REG (SP805_WDOG_BASE + 0x00C) -#define SP805_WDOG_RAW_INT_STS_REG (SP805_WDOG_BASE + 0x010) -#define SP805_WDOG_MSK_INT_STS_REG (SP805_WDOG_BASE + 0x014) -#define SP805_WDOG_LOCK_REG (SP805_WDOG_BASE + 0xC00) +#define SP805_WDOG_LOAD_REG ((UINT32)PcdGet32 (PcdSP805WatchdogBase) + 0x000) +#define SP805_WDOG_CURRENT_REG ((UINT32)PcdGet32 (PcdSP805WatchdogBase) + 0x004) +#define SP805_WDOG_CONTROL_REG ((UINT32)PcdGet32 (PcdSP805WatchdogBase) + 0x008) +#define SP805_WDOG_INT_CLR_REG ((UINT32)PcdGet32 (PcdSP805WatchdogBase) + 0x00C) +#define SP805_WDOG_RAW_INT_STS_REG ((UINT32)PcdGet32 (PcdSP805WatchdogBase) + 0x010) +#define SP805_WDOG_MSK_INT_STS_REG ((UINT32)PcdGet32 (PcdSP805WatchdogBase) + 0x014) +#define SP805_WDOG_LOCK_REG ((UINT32)PcdGet32 (PcdSP805WatchdogBase) + 0xC00) -#define SP805_WDOG_PERIPH_ID0 (SP805_WDOG_BASE + 0xFE0) -#define SP805_WDOG_PERIPH_ID1 (SP805_WDOG_BASE + 0xFE4) -#define SP805_WDOG_PERIPH_ID2 (SP805_WDOG_BASE + 0xFE8) -#define SP805_WDOG_PERIPH_ID3 (SP805_WDOG_BASE + 0xFEC) +#define SP805_WDOG_PERIPH_ID0 ((UINT32)PcdGet32 (PcdSP805WatchdogBase) + 0xFE0) +#define SP805_WDOG_PERIPH_ID1 ((UINT32)PcdGet32 (PcdSP805WatchdogBase) + 0xFE4) +#define SP805_WDOG_PERIPH_ID2 ((UINT32)PcdGet32 (PcdSP805WatchdogBase) + 0xFE8) +#define SP805_WDOG_PERIPH_ID3 ((UINT32)PcdGet32 (PcdSP805WatchdogBase) + 0xFEC) -#define SP805_WDOG_PCELL_ID0 (SP805_WDOG_BASE + 0xFF0) -#define SP805_WDOG_PCELL_ID1 (SP805_WDOG_BASE + 0xFF4) -#define SP805_WDOG_PCELL_ID2 (SP805_WDOG_BASE + 0xFF8) -#define SP805_WDOG_PCELL_ID3 (SP805_WDOG_BASE + 0xFFC) +#define SP805_WDOG_PCELL_ID0 ((UINT32)PcdGet32 (PcdSP805WatchdogBase) + 0xFF0) +#define SP805_WDOG_PCELL_ID1 ((UINT32)PcdGet32 (PcdSP805WatchdogBase) + 0xFF4) +#define SP805_WDOG_PCELL_ID2 ((UINT32)PcdGet32 (PcdSP805WatchdogBase) + 0xFF8) +#define SP805_WDOG_PCELL_ID3 ((UINT32)PcdGet32 (PcdSP805WatchdogBase) + 0xFFC) // Timer control register bit definitions #define SP805_WDOG_CTRL_INTEN BIT0 diff --git a/ArmPlatformPkg/Include/Library/ArmPlatformLib.h b/ArmPlatformPkg/Include/Library/ArmPlatformLib.h index 26e79923d3..ba0f8520b7 100644 --- a/ArmPlatformPkg/Include/Library/ArmPlatformLib.h +++ b/ArmPlatformPkg/Include/Library/ArmPlatformLib.h @@ -27,7 +27,6 @@ #include #include -#include /** This structure is used by ArmVExpressGetEfiMemoryMap to describes a region of the EFI memory map @@ -98,7 +97,7 @@ ArmPlatformSecInitialize ( /** Initialize controllers that must setup in the normal world - This function is called by the ArmPlatformPkg/Pei or ArmPlatformPkg/Pei/PlatformPeim + This function is called by the ArmPlatformPkg/PrePi or ArmPlatformPkg/PlatformPei in the PEI phase. **/ diff --git a/ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.c b/ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.c index 842bbe005b..b8b06f1ea7 100644 --- a/ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.c +++ b/ArmPlatformPkg/Library/PL011SerialPortLib/PL011SerialPortLib.c @@ -22,7 +22,6 @@ #include -#include /* diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c index 9bccd2f14f..03361cd73a 100644 --- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c +++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.c @@ -15,7 +15,6 @@ **/ -#include #include #include #include @@ -24,14 +23,16 @@ #include #include #include +#include #include #include #include #include #include -#include #include +#include + CHAR16 mTimeZoneVariableName[] = L"PL031_TimeZone"; CHAR16 mDaylightVariableName[] = L"PL031_Daylight"; BOOLEAN mPL031Initialized = FALSE; @@ -44,19 +45,19 @@ IdentifyPL031 ( EFI_STATUS Status; // Check if this is a PrimeCell Peripheral - if( ( MmioRead8( PL031_RTC_PCELL_ID0 ) != 0x0D ) - || ( MmioRead8( PL031_RTC_PCELL_ID1 ) != 0xF0 ) - || ( MmioRead8( PL031_RTC_PCELL_ID2 ) != 0x05 ) - || ( MmioRead8( PL031_RTC_PCELL_ID3 ) != 0xB1 ) ) { + if ( (MmioRead8 (PL031_RTC_PCELL_ID0) != 0x0D) + || (MmioRead8 (PL031_RTC_PCELL_ID1) != 0xF0) + || (MmioRead8 (PL031_RTC_PCELL_ID2) != 0x05) + || (MmioRead8 (PL031_RTC_PCELL_ID3) != 0xB1)) { Status = EFI_NOT_FOUND; goto EXIT; } // Check if this PrimeCell Peripheral is the SP805 Watchdog Timer - if( ( MmioRead8( PL031_RTC_PERIPH_ID0 ) != 0x31 ) - || ( MmioRead8( PL031_RTC_PERIPH_ID1 ) != 0x10 ) - || (( MmioRead8( PL031_RTC_PERIPH_ID2 ) & 0xF) != 0x04 ) - || ( MmioRead8( PL031_RTC_PERIPH_ID3 ) != 0x00 ) ) { + if ( (MmioRead8 (PL031_RTC_PERIPH_ID0) != 0x31) + || (MmioRead8 (PL031_RTC_PERIPH_ID1) != 0x10) + || ((MmioRead8 (PL031_RTC_PERIPH_ID2) & 0xF) != 0x04) + || (MmioRead8 (PL031_RTC_PERIPH_ID3) != 0x00)) { Status = EFI_NOT_FOUND; goto EXIT; } @@ -81,18 +82,18 @@ InitializePL031 ( } // Ensure interrupts are masked. We do not want RTC interrupts in UEFI - if ( (MmioRead32( PL031_RTC_IMSC_IRQ_MASK_SET_CLEAR_REGISTER ) & PL031_SET_IRQ_MASK) != PL031_SET_IRQ_MASK ) { - MmioOr32( PL031_RTC_IMSC_IRQ_MASK_SET_CLEAR_REGISTER, PL031_SET_IRQ_MASK); + if ((MmioRead32 (PL031_RTC_IMSC_IRQ_MASK_SET_CLEAR_REGISTER) & PL031_SET_IRQ_MASK) != PL031_SET_IRQ_MASK) { + MmioOr32 (PL031_RTC_IMSC_IRQ_MASK_SET_CLEAR_REGISTER, PL031_SET_IRQ_MASK); } // Clear any existing interrupts - if ( (MmioRead32( PL031_RTC_RIS_RAW_IRQ_STATUS_REGISTER ) & PL031_IRQ_TRIGGERED) == PL031_IRQ_TRIGGERED ) { - MmioOr32( PL031_RTC_ICR_IRQ_CLEAR_REGISTER, PL031_CLEAR_IRQ); + if ((MmioRead32 (PL031_RTC_RIS_RAW_IRQ_STATUS_REGISTER) & PL031_IRQ_TRIGGERED) == PL031_IRQ_TRIGGERED) { + MmioOr32 (PL031_RTC_ICR_IRQ_CLEAR_REGISTER, PL031_CLEAR_IRQ); } // Start the clock counter - if ( (MmioRead32( PL031_RTC_CR_CONTROL_REGISTER ) & PL031_RTC_ENABLED) != PL031_RTC_ENABLED ) { - MmioOr32( PL031_RTC_CR_CONTROL_REGISTER, PL031_RTC_ENABLED); + if ((MmioRead32 (PL031_RTC_CR_CONTROL_REGISTER) & PL031_RTC_ENABLED) != PL031_RTC_ENABLED) { + MmioOr32 (PL031_RTC_CR_CONTROL_REGISTER, PL031_RTC_ENABLED); } mPL031Initialized = TRUE; @@ -127,7 +128,7 @@ EpochToEfiTime ( UINTN ss; UINTN J; - if( Time->Daylight == TRUE) { + if (Time->Daylight == TRUE) { } @@ -183,7 +184,7 @@ EfiTimeToEpoch ( JulianDate = Time->Day + ((153*m + 2)/5) + (365*y) + (y/4) - (y/100) + (y/400) - 32045; - ASSERT( JulianDate > EPOCH_JULIAN_DATE ); + 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; @@ -221,7 +222,7 @@ DayValid ( if (Time->Day < 1 || Time->Day > DayOfMonth[Time->Month - 1] || (Time->Month == 2 && (!IsLeapYear (Time) && Time->Day > 28)) - ) { + ) { return FALSE; } @@ -254,8 +255,8 @@ LibGetTime ( UINTN *Daylight = 0; // Initialize the hardware if not already done - if( !mPL031Initialized ) { - Status = InitializePL031(); + if (!mPL031Initialized) { + Status = InitializePL031 (); if (EFI_ERROR (Status)) { goto EXIT; } @@ -267,7 +268,7 @@ LibGetTime ( Status = ArmPlatformSysConfigGet (SYS_CFG_RTC, &EpochSeconds); if (Status == EFI_UNSUPPORTED) { // Battery backed up hardware RTC does not exist, revert to PL031 - EpochSeconds = MmioRead32( PL031_RTC_DR_DATA_REGISTER ); + EpochSeconds = MmioRead32 (PL031_RTC_DR_DATA_REGISTER); Status = EFI_SUCCESS; } else if (EFI_ERROR (Status)) { // Battery backed up hardware RTC exists but could not be read due to error. Abort. @@ -275,11 +276,11 @@ LibGetTime ( } else { // Battery backed up hardware RTC exists and we read the time correctly from it. // Now sync the PL031 to the new time. - MmioWrite32( PL031_RTC_LR_LOAD_REGISTER, EpochSeconds); + MmioWrite32 (PL031_RTC_LR_LOAD_REGISTER, EpochSeconds); } // Ensure Time is a valid pointer - if( Time == NULL ) { + if (Time == NULL) { Status = EFI_INVALID_PARAMETER; goto EXIT; } @@ -287,7 +288,7 @@ LibGetTime ( // Get the current time zone information from non-volatile storage TimeZone = (INT16 *)GetVariable(mTimeZoneVariableName, &gEfiGlobalVariableGuid); - if( TimeZone == NULL ) { + if (TimeZone == NULL) { // The time zone variable does not exist in non-volatile storage, so create it. Time->TimeZone = EFI_UNSPECIFIED_TIMEZONE; // Store it @@ -297,7 +298,7 @@ LibGetTime ( EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, sizeof(Time->TimeZone), &(Time->TimeZone) - ); + ); if (EFI_ERROR (Status)) { DEBUG((EFI_D_ERROR,"LibGetTime: ERROR: TimeZone\n")); goto EXIT; @@ -308,13 +309,13 @@ LibGetTime ( FreePool(TimeZone); // Check TimeZone bounds: -1440 to 1440 or 2047 - if( (( Time->TimeZone < -1440 ) || ( Time->TimeZone > 1440 )) - && ( Time->TimeZone != EFI_UNSPECIFIED_TIMEZONE) ) { + if (((Time->TimeZone < -1440) || (Time->TimeZone > 1440)) + && (Time->TimeZone != EFI_UNSPECIFIED_TIMEZONE)) { Time->TimeZone = EFI_UNSPECIFIED_TIMEZONE; } // Adjust for the correct time zone - if( Time->TimeZone != EFI_UNSPECIFIED_TIMEZONE ) { + if (Time->TimeZone != EFI_UNSPECIFIED_TIMEZONE) { EpochSeconds += Time->TimeZone * SEC_PER_MIN; } } @@ -322,7 +323,7 @@ LibGetTime ( // Get the current daylight information from non-volatile storage Daylight = (UINTN *)GetVariable(mDaylightVariableName, &gEfiGlobalVariableGuid); - if( Daylight == NULL ) { + if (Daylight == NULL) { // The daylight variable does not exist in non-volatile storage, so create it. Time->Daylight = 0; // Store it @@ -332,7 +333,7 @@ LibGetTime ( EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, sizeof(Time->Daylight), &(Time->Daylight) - ); + ); if (EFI_ERROR (Status)) { DEBUG((EFI_D_ERROR,"LibGetTime: ERROR: Daylight\n")); goto EXIT; @@ -343,20 +344,23 @@ LibGetTime ( FreePool(Daylight); // Adjust for the correct period - if( (Time->Daylight & EFI_TIME_IN_DAYLIGHT) == EFI_TIME_IN_DAYLIGHT ) { + if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) == EFI_TIME_IN_DAYLIGHT) { // Convert to adjusted time, i.e. spring forwards one hour EpochSeconds += SEC_PER_HOUR; } } // Convert from internal 32-bit time to UEFI time - EpochToEfiTime( EpochSeconds, Time ); + EpochToEfiTime (EpochSeconds, Time); // Update the Capabilities info - if( Capabilities != NULL ) { - Capabilities->Resolution = PL031_COUNTS_PER_SECOND; /* PL031 runs at frequency 1Hz */ - Capabilities->Accuracy = PL031_PPM_ACCURACY; /* Accuracy in ppm multiplied by 1,000,000, e.g. for 50ppm set 50,000,000 */ - Capabilities->SetsToZero = FALSE; /* FALSE: Setting the time does not clear the values below the resolution level */ + if (Capabilities != NULL) { + // PL031 runs at frequency 1Hz + Capabilities->Resolution = PL031_COUNTS_PER_SECOND; + // Accuracy in ppm multiplied by 1,000,000, e.g. for 50ppm set 50,000,000 + Capabilities->Accuracy = (UINT32)PcdGet32 (PcdPL031RtcPpmAccuracy); + // FALSE: Setting the time does not clear the values below the resolution level + Capabilities->SetsToZero = FALSE; } EXIT: @@ -391,41 +395,41 @@ LibSetTime ( // to the range 1998 .. 2011 // Check the input parameters' range. - if ( ( Time->Year < 1998 ) || - ( Time->Year > 2099 ) || - ( Time->Month < 1 ) || - ( Time->Month > 12 ) || - (!DayValid (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)) ) - ) { + if ((Time->Year < 1998) || + (Time->Year > 2099) || + (Time->Month < 1 ) || + (Time->Month > 12 ) || + (!DayValid (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))) + ) { Status = EFI_INVALID_PARAMETER; goto EXIT; } // Initialize the hardware if not already done - if( !mPL031Initialized ) { - Status = InitializePL031(); + if (!mPL031Initialized) { + Status = InitializePL031 (); if (EFI_ERROR (Status)) { goto EXIT; } } - EpochSeconds = EfiTimeToEpoch( Time ); + EpochSeconds = EfiTimeToEpoch (Time); // Adjust for the correct time zone, i.e. convert to UTC time zone - if( Time->TimeZone != EFI_UNSPECIFIED_TIMEZONE ) { + if (Time->TimeZone != EFI_UNSPECIFIED_TIMEZONE) { EpochSeconds -= Time->TimeZone * SEC_PER_MIN; } // TODO: Automatic Daylight activation // Adjust for the correct period - if( (Time->Daylight & EFI_TIME_IN_DAYLIGHT) == EFI_TIME_IN_DAYLIGHT ) { + if ((Time->Daylight & EFI_TIME_IN_DAYLIGHT) == EFI_TIME_IN_DAYLIGHT) { // Convert to un-adjusted time, i.e. fall back one hour EpochSeconds -= SEC_PER_HOUR; } @@ -445,7 +449,7 @@ LibSetTime ( // Set the PL031 - MmioWrite32( PL031_RTC_LR_LOAD_REGISTER, EpochSeconds); + MmioWrite32 (PL031_RTC_LR_LOAD_REGISTER, EpochSeconds); // The accesses to Variable Services can be very slow, because we may be writing to Flash. // Do this after having set the RTC. @@ -457,7 +461,7 @@ LibSetTime ( EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, sizeof(Time->TimeZone), &(Time->TimeZone) - ); + ); if (EFI_ERROR (Status)) { DEBUG((EFI_D_ERROR,"LibSetTime: ERROR: TimeZone\n")); goto EXIT; @@ -470,7 +474,7 @@ LibSetTime ( EFI_VARIABLE_NON_VOLATILE | EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS, sizeof(Time->Daylight), &(Time->Daylight) - ); + ); if (EFI_ERROR (Status)) { DEBUG((EFI_D_ERROR,"LibSetTime: ERROR: Daylight\n")); goto EXIT; @@ -564,7 +568,7 @@ LibRtcInitialize ( &Handle, &gEfiRealTimeClockArchProtocolGuid, NULL, NULL - ); + ); return Status; } diff --git a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf index 8a249ec889..24c74d2d11 100644 --- a/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf +++ b/ArmPlatformPkg/Library/PL031RealTimeClockLib/PL031RealTimeClockLib.inf @@ -35,4 +35,9 @@ IoLib UefiLib DebugLib + PcdLib ArmPlatformSysConfigLib + +[Pcd] + gArmPlatformTokenSpaceGuid.PcdPL031RtcBase + gArmPlatformTokenSpaceGuid.PcdPL031RtcPpmAccuracy diff --git a/ArmPlatformPkg/Library/SP804TimerLib/SP804TimerLib.c b/ArmPlatformPkg/Library/SP804TimerLib/SP804TimerLib.c index 2508897391..6dc79f8e5a 100644 --- a/ArmPlatformPkg/Library/SP804TimerLib/SP804TimerLib.c +++ b/ArmPlatformPkg/Library/SP804TimerLib/SP804TimerLib.c @@ -20,7 +20,9 @@ #include #include #include -#include + +#define SP804_TIMER_METRONOME_BASE (UINTN)PcdGet32 (PcdSP804TimerPerformanceBase) +#define SP804_TIMER_PERFORMANCE_BASE (UINTN)PcdGet32 (PcdSP804TimerMetronomeBase) // Setup SP810's Timer2 for managing delay functions. And Timer3 for Performance counter // Note: ArmVE's Timer0 and Timer1 are used by TimerDxe. @@ -31,28 +33,28 @@ TimerConstructor ( ) { // Check if Timer 2 is already initialized - if (MmioRead32(SP804_TIMER2_BASE + SP804_TIMER_CONTROL_REG) & SP804_TIMER_CTRL_ENABLE) { + if (MmioRead32(SP804_TIMER_METRONOME_BASE + SP804_TIMER_CONTROL_REG) & SP804_TIMER_CTRL_ENABLE) { return RETURN_SUCCESS; } else { // Configure timer 2 for one shot operation, 32 bits, no prescaler, and interrupt disabled - MmioOr32 (SP804_TIMER2_BASE + SP804_TIMER_CONTROL_REG, SP804_TIMER_CTRL_ONESHOT | SP804_TIMER_CTRL_32BIT | SP804_PRESCALE_DIV_1); + MmioOr32 (SP804_TIMER_METRONOME_BASE + SP804_TIMER_CONTROL_REG, SP804_TIMER_CTRL_ONESHOT | SP804_TIMER_CTRL_32BIT | SP804_PRESCALE_DIV_1); // Preload the timer count register - MmioWrite32 (SP804_TIMER2_BASE + SP804_TIMER_LOAD_REG, 1); + MmioWrite32 (SP804_TIMER_METRONOME_BASE + SP804_TIMER_LOAD_REG, 1); // Enable the timer - MmioOr32 (SP804_TIMER2_BASE + SP804_TIMER_CONTROL_REG, SP804_TIMER_CTRL_ENABLE); + MmioOr32 (SP804_TIMER_METRONOME_BASE + SP804_TIMER_CONTROL_REG, SP804_TIMER_CTRL_ENABLE); } // Check if Timer 3 is already initialized - if (MmioRead32(SP804_TIMER3_BASE + SP804_TIMER_CONTROL_REG) & SP804_TIMER_CTRL_ENABLE) { + if (MmioRead32(SP804_TIMER_PERFORMANCE_BASE + SP804_TIMER_CONTROL_REG) & SP804_TIMER_CTRL_ENABLE) { return RETURN_SUCCESS; } else { // Configure timer 3 for free running operation, 32 bits, no prescaler, interrupt disabled - MmioOr32 (SP804_TIMER3_BASE + SP804_TIMER_CONTROL_REG, SP804_TIMER_CTRL_32BIT | SP804_PRESCALE_DIV_1); + MmioOr32 (SP804_TIMER_PERFORMANCE_BASE + SP804_TIMER_CONTROL_REG, SP804_TIMER_CTRL_32BIT | SP804_PRESCALE_DIV_1); // Enable the timer - MmioOr32 (SP804_TIMER3_BASE + SP804_TIMER_CONTROL_REG, SP804_TIMER_CTRL_ENABLE); + MmioOr32 (SP804_TIMER_PERFORMANCE_BASE + SP804_TIMER_CONTROL_REG, SP804_TIMER_CTRL_ENABLE); } return RETURN_SUCCESS; @@ -77,11 +79,11 @@ MicroSecondDelay ( UINTN Index; // Reload the counter for each 1Mhz to avoid an overflow in the load value - for (Index = 0; Index < (UINTN)PcdGet32(PcdSP804FrequencyInMHz); Index++) { + for (Index = 0; Index < (UINTN)PcdGet32(PcdSP804TimerFrequencyInMHz); Index++) { // load the timer count register - MmioWrite32 (SP804_TIMER2_BASE + SP804_TIMER_LOAD_REG, MicroSeconds); + MmioWrite32 (SP804_TIMER_METRONOME_BASE + SP804_TIMER_LOAD_REG, MicroSeconds); - while (MmioRead32 (SP804_TIMER2_BASE + SP804_TIMER_CURRENT_REG) > 0) { + while (MmioRead32 (SP804_TIMER_METRONOME_BASE + SP804_TIMER_CURRENT_REG) > 0) { ; } } @@ -113,11 +115,11 @@ NanoSecondDelay ( MicroSeconds += ((UINT32)NanoSeconds % 1000) == 0 ? 0 : 1; // Reload the counter for each 1Mhz to avoid an overflow in the load value - for (Index = 0; Index < (UINTN)PcdGet32(PcdSP804FrequencyInMHz); Index++) { + for (Index = 0; Index < (UINTN)PcdGet32(PcdSP804TimerFrequencyInMHz); Index++) { // load the timer count register - MmioWrite32 (SP804_TIMER2_BASE + SP804_TIMER_LOAD_REG, MicroSeconds); + MmioWrite32 (SP804_TIMER_METRONOME_BASE + SP804_TIMER_LOAD_REG, MicroSeconds); - while (MmioRead32 (SP804_TIMER2_BASE + SP804_TIMER_CURRENT_REG) > 0) { + while (MmioRead32 (SP804_TIMER_METRONOME_BASE + SP804_TIMER_CURRENT_REG) > 0) { ; } } @@ -145,7 +147,7 @@ GetPerformanceCounter ( // Free running 64-bit/32-bit counter is needed here. // Don't think we need this to boot, just to do performance profile UINT64 Value; - Value = MmioRead32 (SP804_TIMER3_BASE + SP804_TIMER_CURRENT_REG); + Value = MmioRead32 (SP804_TIMER_PERFORMANCE_BASE + SP804_TIMER_CURRENT_REG); ASSERT(Value > 0); return Value; } diff --git a/ArmPlatformPkg/Library/SP804TimerLib/SP804TimerLib.inf b/ArmPlatformPkg/Library/SP804TimerLib/SP804TimerLib.inf index 1cbb32ecb6..0928cae53b 100644 --- a/ArmPlatformPkg/Library/SP804TimerLib/SP804TimerLib.inf +++ b/ArmPlatformPkg/Library/SP804TimerLib/SP804TimerLib.inf @@ -38,5 +38,7 @@ BaseLib [Pcd] - gArmPlatformTokenSpaceGuid.PcdSP804FrequencyInMHz + gArmPlatformTokenSpaceGuid.PcdSP804TimerFrequencyInMHz + gArmPlatformTokenSpaceGuid.PcdSP804TimerPerformanceBase + gArmPlatformTokenSpaceGuid.PcdSP804TimerMetronomeBase gEmbeddedTokenSpaceGuid.PcdEmbeddedPerformanceCounterFrequencyInHz diff --git a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c index d745357164..f4c27c5750 100755 --- a/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c +++ b/ArmPlatformPkg/MemoryInitPei/MemoryInitPeim.c @@ -95,12 +95,8 @@ InitializeMemory ( ) { EFI_STATUS Status; - EFI_RESOURCE_ATTRIBUTE_TYPE Attributes; - ARM_SYSTEM_MEMORY_REGION_DESCRIPTOR* EfiMemoryMap; - UINTN Index; UINTN SystemMemoryTop; UINTN UefiMemoryBase; - UINTN UefiMemorySize; DEBUG ((EFI_D_ERROR, "Memory Init PEIM Loaded\n")); diff --git a/ArmPlatformPkg/PrePeiCore/MainMPCore.c b/ArmPlatformPkg/PrePeiCore/MainMPCore.c index 19683cbca8..17a0002dee 100644 --- a/ArmPlatformPkg/PrePeiCore/MainMPCore.c +++ b/ArmPlatformPkg/PrePeiCore/MainMPCore.c @@ -12,8 +12,6 @@ * **/ -#include -#include #include #include #include diff --git a/ArmPlatformPkg/PrePeiCore/MainUniCore.c b/ArmPlatformPkg/PrePeiCore/MainUniCore.c index c09494557b..4d8331219a 100644 --- a/ArmPlatformPkg/PrePeiCore/MainUniCore.c +++ b/ArmPlatformPkg/PrePeiCore/MainUniCore.c @@ -12,8 +12,6 @@ * **/ -#include -#include #include #include "PrePeiCore.h" diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c index 56186471fa..ccf0e7d3d4 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.c +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.c @@ -13,8 +13,6 @@ * **/ -#include -#include #include #include #include diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h index 0f8778c154..7a369b4f6f 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCore.h +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCore.h @@ -15,6 +15,9 @@ #ifndef __PREPEICORE_H_ #define __PREPEICORE_H_ +#include +#include + #include #include diff --git a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf index 52e6d959c7..b696190acc 100644 --- a/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf +++ b/ArmPlatformPkg/PrePeiCore/PrePeiCoreUniCore.inf @@ -59,3 +59,6 @@ gArmTokenSpaceGuid.PcdGicDistributorBase gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase + + gArmTokenSpaceGuid.PcdNormalFvBaseAddress + gArmTokenSpaceGuid.PcdNormalFvSize diff --git a/ArmPlatformPkg/PrePi/Exception.S b/ArmPlatformPkg/PrePi/Exception.S index 628793e031..b07f0e8d00 100755 --- a/ArmPlatformPkg/PrePi/Exception.S +++ b/ArmPlatformPkg/PrePi/Exception.S @@ -29,7 +29,6 @@ GCC_ASM_EXPORT(PrePiVectorTable) //Default Exception Handlers //============================================================ - ASM_PFX(PrePiVectorTable): b _DefaultResetHandler b _DefaultUndefined