github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 12:42:54 +00:00
Code Issues Projects Releases Wiki Activity

hv:move 'udelay' to timer.c

Browse Source 
-- move this api from misc.c to timer.c to avoid
   reverse dependency, and remove misc.c

Tracked-On: #1842
Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com>
This commit is contained in:
Mingqiang Chi 2019-03-21 14:06:22 +08:00 committed by wenlingz
parent 370998ba5a
commit 5585084c00
5 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hypervisor/Makefile
View File

@ -189,7 +189,6 @@ C_SRCS += arch/x86/guest/vmexit.c
S_SRCS += arch/x86/guest/vmx_asm.S S_SRCS += arch/x86/guest/vmx_asm.S
C_SRCS += arch/x86/guest/trusty.c C_SRCS += arch/x86/guest/trusty.c
C_SRCS += arch/x86/cat.c C_SRCS += arch/x86/cat.c
C_SRCS += lib/misc.c
C_SRCS += lib/string.c C_SRCS += lib/string.c
C_SRCS += lib/memory.c C_SRCS += lib/memory.c
C_SRCS += lib/crypto/crypto_api.c C_SRCS += lib/crypto/crypto_api.c

13
hypervisor/arch/x86/timer.c
View File

@ -318,3 +318,16 @@ uint64_t ticks_to_ms(uint64_t ticks)
{ {
return ticks / (uint64_t)tsc_khz; return ticks / (uint64_t)tsc_khz;
} }
void udelay(uint32_t us)
{
uint64_t dest_tsc, delta_tsc;
/* Calculate number of ticks to wait */
delta_tsc = us_to_ticks(us);
dest_tsc = rdtsc() + delta_tsc;
/* Loop until time expired */
while (rdtsc() < dest_tsc) {
}
}

2
hypervisor/include/arch/x86/timer.h
View File

@ -49,6 +49,8 @@ struct hv_timer {
#define CYCLES_PER_MS us_to_ticks(1000U) #define CYCLES_PER_MS us_to_ticks(1000U)
void udelay(uint32_t us);
/** /**
* @brief convert us to ticks. * @brief convert us to ticks.
* *

1
hypervisor/include/lib/rtl.h
View File

@ -30,7 +30,6 @@ static inline bool is_space(char c)
} }
/* Function prototypes */ /* Function prototypes */
void udelay(uint32_t us);
int32_t strcmp(const char *s1_arg, const char *s2_arg); int32_t strcmp(const char *s1_arg, const char *s2_arg);
int32_t strncmp(const char *s1_arg, const char *s2_arg, size_t n_arg); int32_t strncmp(const char *s1_arg, const char *s2_arg, size_t n_arg);
char *strncpy_s(char *d_arg, size_t dmax, const char *s_arg, size_t slen_arg); char *strncpy_s(char *d_arg, size_t dmax, const char *s_arg, size_t slen_arg);

20
hypervisor/lib/misc.c
View File

@ -1,20 +0,0 @@
/*
* Copyright (C) 2018 Intel Corporation. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <hypervisor.h>
void udelay(uint32_t us)
{
uint64_t dest_tsc, delta_tsc;
/* Calculate number of ticks to wait */
delta_tsc = us_to_ticks(us);
dest_tsc = rdtsc() + delta_tsc;
/* Loop until time expired */
while (rdtsc() < dest_tsc) {
}
}