Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

include: Drop MMIO from SBI_PLATFORM_HAS_MMIO_TIMER_VALUE

Browse Source 
It is not necessary that platform has MMIO-based timer value
register. It can also have some custom (implementation specific)
CSR for timer value.

This patch renames SBI_PLATFORM_HAS_MMIO_TIMER_VALUE to
SBI_PLATFORM_HAS_TIMER_VALUE to imply "platform timer value"
instead of "mmio timer value".

Signed-off-by: Anup Patel <anup.patel@wdc.com>
This commit is contained in:
Anup Patel
2019-01-23 08:03:20 +05:30
committed by Anup Patel
parent d25774ff96
commit 36394d2f24
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/sbi/sbi_platform.h
View File

@@ -25,8 +25,8 @@
/** Possible feature flags of a platform */ /** Possible feature flags of a platform */
enum sbi_platform_features { enum sbi_platform_features {
/** Platform has MMIO timer value */ /** Platform has timer value */
SBI_PLATFORM_HAS_MMIO_TIMER_VALUE = (1 << 0), SBI_PLATFORM_HAS_TIMER_VALUE = (1 << 0),
/** Platform has HART hotplug support */ /** Platform has HART hotplug support */
SBI_PLATFORM_HAS_HART_HOTPLUG = (1 << 1), SBI_PLATFORM_HAS_HART_HOTPLUG = (1 << 1),
/** Platform has PMP support */ /** Platform has PMP support */
@@ -41,7 +41,7 @@ enum sbi_platform_features {
/** Default feature set for a platform */ /** Default feature set for a platform */
#define SBI_PLATFORM_DEFAULT_FEATURES \ #define SBI_PLATFORM_DEFAULT_FEATURES \
(SBI_PLATFORM_HAS_MMIO_TIMER_VALUE | \ (SBI_PLATFORM_HAS_TIMER_VALUE | \
SBI_PLATFORM_HAS_PMP | \ SBI_PLATFORM_HAS_PMP | \
SBI_PLATFORM_HAS_SCOUNTEREN | \ SBI_PLATFORM_HAS_SCOUNTEREN | \
SBI_PLATFORM_HAS_MCOUNTEREN | \ SBI_PLATFORM_HAS_MCOUNTEREN | \
@@ -114,9 +114,9 @@ struct sbi_platform {
/** Get pointer to sbi_platform for current HART */ /** Get pointer to sbi_platform for current HART */
#define sbi_platform_thishart_ptr() \ #define sbi_platform_thishart_ptr() \
((struct sbi_platform *)(sbi_scratch_thishart_ptr()->platform_addr)) ((struct sbi_platform *)(sbi_scratch_thishart_ptr()->platform_addr))
/** Check whether the platform supports MMIO timer value */ /** Check whether the platform supports timer value */
#define sbi_platform_has_mmio_timer_value(__p) \ #define sbi_platform_has_timer_value(__p) \
((__p)->features & SBI_PLATFORM_HAS_MMIO_TIMER_VALUE) ((__p)->features & SBI_PLATFORM_HAS_TIMER_VALUE)
/** Check whether the platform supports HART hotplug */ /** Check whether the platform supports HART hotplug */
#define sbi_platform_has_hart_hotplug(__p) \ #define sbi_platform_has_hart_hotplug(__p) \
((__p)->features & SBI_PLATFORM_HAS_HART_HOTPLUG) ((__p)->features & SBI_PLATFORM_HAS_HART_HOTPLUG)

2
lib/sbi_timer.c
View File

@@ -41,7 +41,7 @@ u64 sbi_timer_value(struct sbi_scratch *scratch)
{ {
struct sbi_platform *plat = sbi_platform_ptr(scratch); struct sbi_platform *plat = sbi_platform_ptr(scratch);
if (sbi_platform_has_mmio_timer_value(plat)) if (sbi_platform_has_timer_value(plat))
return sbi_platform_timer_value(plat); return sbi_platform_timer_value(plat);
else else
return get_ticks(); return get_ticks();

2
platform/kendryte/k210/platform.c
View File

@@ -101,7 +101,7 @@ static int k210_system_shutdown(u32 type)
struct sbi_platform platform = { struct sbi_platform platform = {
.name = "Kendryte K210", .name = "Kendryte K210",
.features = SBI_PLATFORM_HAS_MMIO_TIMER_VALUE, .features = SBI_PLATFORM_HAS_TIMER_VALUE,
.hart_count = K210_HART_COUNT, .hart_count = K210_HART_COUNT,
.hart_stack_size = K210_HART_STACK_SIZE, .hart_stack_size = K210_HART_STACK_SIZE,