sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UefiCpuPkg: CpuTimerDxeRiscV64: Fix incorrect value sent to SbiSetTimer

Browse Source 
SbiSetTimer expects core tick value.

Cc: Andrei Warkentin <andrei.warkentin@intel.com>
Signed-off-by: Tuan Phan <tphan@ventanamicro.com>
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
This commit is contained in:
Tuan Phan
2023-06-07 10:30:20 -07:00
committed by mergify[bot]
parent aad98d915a
commit 4dba2a9d08
3 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
UefiCpuPkg/CpuTimerDxeRiscV64/CpuTimerDxeRiscV64.inf
View File

@ -40,6 +40,9 @@
Timer.h Timer.h
Timer.c Timer.c
[Pcd]
gUefiCpuPkgTokenSpaceGuid.PcdCpuCoreCrystalClockFrequency ## CONSUMES
[Protocols] [Protocols]
gEfiCpuArchProtocolGuid ## CONSUMES gEfiCpuArchProtocolGuid ## CONSUMES
gEfiTimerArchProtocolGuid ## PRODUCES gEfiTimerArchProtocolGuid ## PRODUCES

22
UefiCpuPkg/CpuTimerDxeRiscV64/Timer.c
View File

@ -81,7 +81,14 @@ TimerInterruptHandler (
} }
mLastPeriodStart = PeriodStart; mLastPeriodStart = PeriodStart;
SbiSetTimer (PeriodStart += mTimerPeriod); PeriodStart += DivU64x32 (
MultU64x32 (
mTimerPeriod,
PcdGet64 (PcdCpuCoreCrystalClockFrequency)
),
1000000u
); // convert to tick
SbiSetTimer (PeriodStart);
RiscVEnableTimerInterrupt (); // enable SMode timer int RiscVEnableTimerInterrupt (); // enable SMode timer int
gBS->RestoreTPL (OriginalTPL); gBS->RestoreTPL (OriginalTPL);
} }
@ -163,6 +170,8 @@ TimerDriverSetTimerPeriod (
IN UINT64 TimerPeriod IN UINT64 TimerPeriod
) )
{ {
UINT64 PeriodStart;
DEBUG ((DEBUG_INFO, "TimerDriverSetTimerPeriod(0x%lx)\n", TimerPeriod)); DEBUG ((DEBUG_INFO, "TimerDriverSetTimerPeriod(0x%lx)\n", TimerPeriod));
if (TimerPeriod == 0) { if (TimerPeriod == 0) {
@ -172,8 +181,17 @@ TimerDriverSetTimerPeriod (
} }
mTimerPeriod = TimerPeriod / 10; // convert unit from 100ns to 1us mTimerPeriod = TimerPeriod / 10; // convert unit from 100ns to 1us
mLastPeriodStart = RiscVReadTimer (); mLastPeriodStart = RiscVReadTimer ();
SbiSetTimer (mLastPeriodStart + mTimerPeriod); PeriodStart = mLastPeriodStart;
PeriodStart += DivU64x32 (
MultU64x32 (
mTimerPeriod,
PcdGet64 (PcdCpuCoreCrystalClockFrequency)
),
1000000u
); // convert to tick
SbiSetTimer (PeriodStart);
mCpu->EnableInterrupt (mCpu); mCpu->EnableInterrupt (mCpu);
RiscVEnableTimerInterrupt (); // enable SMode timer int RiscVEnableTimerInterrupt (); // enable SMode timer int

2
UefiCpuPkg/CpuTimerDxeRiscV64/Timer.h
View File

@ -21,7 +21,7 @@
#include <Library/IoLib.h> #include <Library/IoLib.h>
// //
// RISC-V use 100us timer. // RISC-V use 100ns timer.
// The default timer tick duration is set to 10 ms = 10 * 1000 * 10 100 ns units // The default timer tick duration is set to 10 ms = 10 * 1000 * 10 100 ns units
// //
#define DEFAULT_TIMER_TICK_DURATION 100000 #define DEFAULT_TIMER_TICK_DURATION 100000