michaelh/zephyr
1
0
Fork 0
Code Releases Activity

drivers: apic_tsc: Use toolchain cpuid()

Browse source 
We have already code using toolchain provided __get_cpuid(), clean up
apic_tsc and make it consistent with the rest of the code.

Signed-off-by: Andrei Emeltchenko <andrei.emeltchenko@intel.com>
This commit is contained in:
Andrei Emeltchenko 2023-11-16 13:57:55 +02:00 • committed by Carles Cufí
commit adeb19b30c
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
drivers/timer/apic_tsc.c
View file

@ -2,7 +2,11 @@
* Copyright (c) 2021 Intel Corporation * Copyright (c) 2021 Intel Corporation
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
#include <cpuid.h> /* Header provided by the toolchain. */
#include <zephyr/init.h> #include <zephyr/init.h>
#include <zephyr/arch/x86/cpuid.h>
#include <zephyr/drivers/timer/system_timer.h> #include <zephyr/drivers/timer/system_timer.h>
#include <zephyr/sys_clock.h> #include <zephyr/sys_clock.h>
#include <zephyr/spinlock.h> #include <zephyr/spinlock.h>
@ -149,28 +153,21 @@ void smp_timer_init(void)
irq_enable(timer_irq()); irq_enable(timer_irq());
} }
static inline void cpuid(uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx)
{
__asm__ volatile("cpuid"
: "=b"(*ebx), "=c"(*ecx), "=d"(*edx)
: "a"(*eax), "c"(*ecx));
}
static int sys_clock_driver_init(void) static int sys_clock_driver_init(void)
{ {
#ifdef CONFIG_ASSERT #ifdef CONFIG_ASSERT
uint32_t eax, ebx, ecx, edx; uint32_t eax, ebx, ecx, edx;
eax = 1; ecx = 0; ecx = 0; /* prevent compiler warning */
cpuid(&eax, &ebx, &ecx, &edx); __get_cpuid(CPUID_BASIC_INFO_1, &eax, &ebx, &ecx, &edx);
__ASSERT((ecx & BIT(24)) != 0, "No TSC Deadline support"); __ASSERT((ecx & BIT(24)) != 0, "No TSC Deadline support");
eax = 0x80000007; ecx = 0; edx = 0; /* prevent compiler warning */
cpuid(&eax, &ebx, &ecx, &edx); __get_cpuid(0x80000007, &eax, &ebx, &ecx, &edx);
__ASSERT((edx & BIT(8)) != 0, "No Invariant TSC support"); __ASSERT((edx & BIT(8)) != 0, "No Invariant TSC support");
eax = 7; ecx = 0; ebx = 0; /* prevent compiler warning */
cpuid(&eax, &ebx, &ecx, &edx); __get_cpuid_count(CPUID_EXTENDED_FEATURES_LVL, 0, &eax, &ebx, &ecx, &edx);
__ASSERT((ebx & BIT(1)) != 0, "No TSC_ADJUST MSR support"); __ASSERT((ebx & BIT(1)) != 0, "No TSC_ADJUST MSR support");
#endif #endif