ArmPkg/ArmLib: remove indirection layer from timer register accessors

The generic timer support libraries call the actual system register
accessor function via a single pair of functions ArmArchTimerReadReg()
and ArmArchTimerWriteReg(), which take an enum argument to identify
the register, and return output values by pointer reference.

Since these functions are never called with a non-immediate argument,
we can simply replace each invocation with the underlying system register
accessor instead. This is mostly functionally equivalent, with the
exception of the bounds check for the enum (which is pointless given the
fact that we never pass a variable), the check for the presence of the
architected timer (which only makes sense for ARMv7, but is highly unlikely
to vary between platforms that are similar enough to run the same firmware
image), and a check for enum values that refer to the HYP view of the timer,
which we never referred to anywhere in the code in the first place.

So get rid of the middle man, and update the ArmGenericTimerPhyCounterLib
and ArmGenericTimerVirtCounterLib implementations to call the system
register accessors directly.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Tested-by: Ryan Harkin <ryan.harkin@linaro.org>

1 files changed, 0 insertions, 167 deletions

diff --git a/ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimer.c b/ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimer.c
deleted file mode 100644
index c0b3a9ed5d..0000000000
--- a/ArmPkg/Library/ArmLib/Arm/ArmV7ArchTimer.c
+++ /dev/null
@@ -1,167 +0,0 @@
-/** @file

-*

-*  Copyright (c) 2011 - 2014, 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 <Uefi.h>

-#include <Chipset/ArmV7.h>

-#include <Library/BaseMemoryLib.h>

-#include <Library/ArmLib.h>

-#include <Library/BaseLib.h>

-#include <Library/DebugLib.h>

-#include "ArmV7Lib.h"

-#include "ArmLibPrivate.h"

-#include <Library/ArmArchTimer.h>

-

-VOID

-EFIAPI

-ArmArchTimerReadReg (

-    IN   ARM_ARCH_TIMER_REGS   Reg,

-    OUT  VOID                  *DstBuf

-    )

-{

-  // Check if the Generic/Architecture timer is implemented

-  if (ArmIsArchTimerImplemented ()) {

-    switch (Reg) {

-    case CntFrq:

-      *((UINTN *)DstBuf) = ArmReadCntFrq ();

-      return;

-

-    case CntPct:

-      *((UINT64 *)DstBuf) = ArmReadCntPct ();

-      return;

-

-    case CntkCtl:

-      *((UINTN *)DstBuf) = ArmReadCntkCtl();

-      return;

-

-    case CntpTval:

-      *((UINTN *)DstBuf) = ArmReadCntpTval ();

-      return;

-

-    case CntpCtl:

-      *((UINTN *)DstBuf) = ArmReadCntpCtl ();

-      return;

-

-    case CntvTval:

-      *((UINTN *)DstBuf) = ArmReadCntvTval ();

-      return;

-

-    case CntvCtl:

-      *((UINTN *)DstBuf) = ArmReadCntvCtl ();

-      return;

-

-    case CntvCt:

-      *((UINT64 *)DstBuf) = ArmReadCntvCt ();

-      return;

-

-    case CntpCval:

-      *((UINT64 *)DstBuf) = ArmReadCntpCval ();

-      return;

-

-    case CntvCval:

-      *((UINT64 *)DstBuf) = ArmReadCntvCval ();

-      return;

-

-    case CntvOff:

-      *((UINT64 *)DstBuf) = ArmReadCntvOff ();

-      return;

-

-    case CnthCtl:

-    case CnthpTval:

-    case CnthpCtl:

-    case CnthpCval:

-      DEBUG ((EFI_D_ERROR, "The register is related to Hypervisor Mode. Can't perform requested operation\n "));

-      break;

-

-    default:

-      DEBUG ((EFI_D_ERROR, "Unknown ARM Generic Timer register %x. \n ", Reg));

-    }

-  } else {

-    DEBUG ((EFI_D_ERROR, "Attempt to read ARM Generic Timer registers. But ARM Generic Timer extension is not implemented \n "));

-    ASSERT (0);

-  }

-

-  *((UINT64 *)DstBuf) = 0;

-}

-

-VOID

-EFIAPI

-ArmArchTimerWriteReg (

-    IN   ARM_ARCH_TIMER_REGS   Reg,

-    IN   VOID                  *SrcBuf

-    )

-{

-  // Check if the Generic/Architecture timer is implemented

-  if (ArmIsArchTimerImplemented ()) {

-

-    switch (Reg) {

-

-    case CntFrq:

-      ArmWriteCntFrq (*((UINTN *)SrcBuf));

-      break;

-

-    case CntPct:

-      DEBUG ((EFI_D_ERROR, "Can't write to Read Only Register: CNTPCT \n"));

-      break;

-

-    case CntkCtl:

-      ArmWriteCntkCtl (*((UINTN *)SrcBuf));

-      break;

-

-    case CntpTval:

-      ArmWriteCntpTval (*((UINTN *)SrcBuf));

-      break;

-

-    case CntpCtl:

-      ArmWriteCntpCtl (*((UINTN *)SrcBuf));

-      break;

-

-    case CntvTval:

-      ArmWriteCntvTval (*((UINTN *)SrcBuf));

-      break;

-

-    case CntvCtl:

-      ArmWriteCntvCtl (*((UINTN *)SrcBuf));

-      break;

-

-    case CntvCt:

-      DEBUG ((EFI_D_ERROR, "Can't write to Read Only Register: CNTVCT \n"));

-      break;

-

-    case CntpCval:

-      ArmWriteCntpCval (*((UINT64 *)SrcBuf) );

-      break;

-

-    case CntvCval:

-      ArmWriteCntvCval (*((UINT64 *)SrcBuf) );

-      break;

-

-    case CntvOff:

-      ArmWriteCntvOff (*((UINT64 *)SrcBuf));

-      break;

-

-    case CnthCtl:

-    case CnthpTval:

-    case CnthpCtl:

-    case CnthpCval:

-      DEBUG ((EFI_D_ERROR, "The register is related to Hypervisor Mode. Can't perform requested operation\n "));

-      break;

-

-    default:

-      DEBUG ((EFI_D_ERROR, "Unknown ARM Generic Timer register %x. \n ", Reg));

-    }

-  } else {

-    DEBUG ((EFI_D_ERROR, "Attempt to write to ARM Generic Timer registers. But ARM Generic Timer extension is not implemented \n "));

-    ASSERT (0);

-  }

-}