From d84f7a4fd5c5a2095432253339f83b65f044059d Mon Sep 17 00:00:00 2001 From: Shiqing Gao Date: Wed, 12 Sep 2018 14:14:56 +0800 Subject: [PATCH] hv: clean up udelay/mdelay related code - replace the usage of mdelay with udelay - remove lib/mdelay.c - rename udelay.c to misc.c future other small APIs could put in misc.c Tracked-On: #861 Signed-off-by: Shiqing Gao Acked-by: Eddie Dong --- hypervisor/Makefile | 3 +-- hypervisor/arch/x86/lapic.c | 6 ++++-- hypervisor/include/lib/rtl.h | 1 - hypervisor/lib/mdelay.c | 18 ------------------ hypervisor/lib/{udelay.c => misc.c} | 0 5 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 hypervisor/lib/mdelay.c rename hypervisor/lib/{udelay.c => misc.c} (100%) diff --git a/hypervisor/Makefile b/hypervisor/Makefile index ef7213078..f5e4713ff 100644 --- a/hypervisor/Makefile +++ b/hypervisor/Makefile @@ -152,8 +152,7 @@ C_SRCS += arch/x86/guest/instr_emul.c C_SRCS += arch/x86/guest/ucode.c C_SRCS += arch/x86/guest/pm.c C_SRCS += lib/spinlock.c -C_SRCS += lib/udelay.c -C_SRCS += lib/mdelay.c +C_SRCS += lib/misc.c C_SRCS += lib/string.c C_SRCS += lib/memory.c C_SRCS += lib/crypto/hkdf_wrap.c diff --git a/hypervisor/arch/x86/lapic.c b/hypervisor/arch/x86/lapic.c index 645d679bd..c15e7edcf 100644 --- a/hypervisor/arch/x86/lapic.c +++ b/hypervisor/arch/x86/lapic.c @@ -382,8 +382,10 @@ send_startup_ipi(enum intr_cpu_startup_shorthand cpu_startup_shorthand, /* Give 10ms for INIT sequence to complete for old processors. * Modern processors (family == 6) don't need to wait here. */ - if (boot_cpu_data.family != 6U) - mdelay(10U); + if (boot_cpu_data.family != 6U) { + /* delay 10ms */ + udelay(10000U); + } /* De-assert INIT IPI */ write_lapic_reg32(LAPIC_INT_COMMAND_REGISTER_1, icr.value_32.hi_32); diff --git a/hypervisor/include/lib/rtl.h b/hypervisor/include/lib/rtl.h index 4494a1dbe..7e4ecdd4f 100644 --- a/hypervisor/include/lib/rtl.h +++ b/hypervisor/include/lib/rtl.h @@ -27,7 +27,6 @@ int strncmp(const char *s1_arg, const char *s2_arg, size_t n_arg); char *strcpy_s(char *d_arg, size_t dmax, const char *s_arg); char *strncpy_s(char *d_arg, size_t dmax, const char *s_arg, size_t slen_arg); char *strchr(const char *s_arg, int ch); -void mdelay(uint32_t loop_count_arg); size_t strnlen_s(const char *str_arg, size_t maxlen_arg); void *memset(void *base, uint8_t v, size_t n); void *memcpy_s(void *d, size_t dmax, const void *s, size_t slen_arg); diff --git a/hypervisor/lib/mdelay.c b/hypervisor/lib/mdelay.c deleted file mode 100644 index eae5b476e..000000000 --- a/hypervisor/lib/mdelay.c +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) 2018 Intel Corporation. All rights reserved. - * - * SPDX-License-Identifier: BSD-3-Clause - */ - -#include - -void mdelay(uint32_t loop_count_arg) -{ - uint32_t loop_count = loop_count_arg; - /* Loop until done */ - while (loop_count != 0U) { - /* Delay for 1 ms */ - udelay(1000U); - loop_count--; - } -} diff --git a/hypervisor/lib/udelay.c b/hypervisor/lib/misc.c similarity index 100% rename from hypervisor/lib/udelay.c rename to hypervisor/lib/misc.c