From 1d1c0e5d9a27f01571e7a80542170d581b9f7f25 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 3 Aug 2021 19:50:48 +0200 Subject: bsp/leon3: Add LEON3_PROBE_ASR_22_23_UP_COUNTER --- bsps/sparc/leon3/clock/ckinit.c | 5 +++++ bsps/sparc/leon3/start/cpucounter.c | 5 +++++ spec/build/bsps/sparc/leon3/grp.yml | 2 ++ spec/build/bsps/sparc/leon3/optasrupcntprobe.yml | 21 +++++++++++++++++++++ 4 files changed, 33 insertions(+) create mode 100644 spec/build/bsps/sparc/leon3/optasrupcntprobe.yml diff --git a/bsps/sparc/leon3/clock/ckinit.c b/bsps/sparc/leon3/clock/ckinit.c index bb66ccaa59..b2d8a99e6a 100644 --- a/bsps/sparc/leon3/clock/ckinit.c +++ b/bsps/sparc/leon3/clock/ckinit.c @@ -187,6 +187,8 @@ static void bsp_clock_handler_install(rtems_interrupt_handler isr) #define Clock_driver_support_set_interrupt_affinity(online_processors) \ bsp_interrupt_set_affinity(clkirq, online_processors) +#if defined(LEON3_HAS_ASR_22_23_UP_COUNTER) || \ + defined(LEON3_PROBE_ASR_22_23_UP_COUNTER) static void leon3_clock_use_up_counter(struct timecounter *tc) { tc->tc_get_timecount = _SPARC_Get_timecount_asr23; @@ -202,6 +204,7 @@ static void leon3_clock_use_up_counter(struct timecounter *tc) rtems_timecounter_install(tc); } +#endif #if defined(LEON3_IRQAMP_PROBE_TIMESTAMP) static void leon3_clock_use_irqamp_timestamp( @@ -293,11 +296,13 @@ static void leon3_clock_initialize(void) #if defined(LEON3_HAS_ASR_22_23_UP_COUNTER) leon3_clock_use_up_counter(tc); #else /* LEON3_HAS_ASR_22_23_UP_COUNTER */ +#if defined(LEON3_PROBE_ASR_22_23_UP_COUNTER) if (leon3_up_counter_is_available()) { /* Use the LEON4 up-counter if available */ leon3_clock_use_up_counter(tc); return; } +#endif #if defined(LEON3_IRQAMP_PROBE_TIMESTAMP) irqmp_ts = irqamp_get_timestamp_registers(LEON3_IrqCtrl_Regs); diff --git a/bsps/sparc/leon3/start/cpucounter.c b/bsps/sparc/leon3/start/cpucounter.c index d09dbe651b..46e0b304e5 100644 --- a/bsps/sparc/leon3/start/cpucounter.c +++ b/bsps/sparc/leon3/start/cpucounter.c @@ -39,6 +39,8 @@ uint32_t _CPU_Counter_frequency(void) return leon3_counter_frequency; } +#if defined(LEON3_HAS_ASR_22_23_UP_COUNTER) || \ + defined(LEON3_PROBE_ASR_22_23_UP_COUNTER) static void leon3_counter_use_up_counter(SPARC_Counter *counter) { counter->read_isr_disabled = _SPARC_Counter_read_asr23; @@ -46,6 +48,7 @@ static void leon3_counter_use_up_counter(SPARC_Counter *counter) leon3_counter_frequency = leon3_up_counter_frequency(); } +#endif #if defined(LEON3_IRQAMP_PROBE_TIMESTAMP) static void leon3_counter_use_irqamp_timestamp( @@ -108,11 +111,13 @@ static void leon3_counter_initialize(void) #if defined(LEON3_HAS_ASR_22_23_UP_COUNTER) leon3_counter_use_up_counter(counter); #else /* LEON3_HAS_ASR_22_23_UP_COUNTER */ +#if defined(LEON3_PROBE_ASR_22_23_UP_COUNTER) if (leon3_up_counter_is_available()) { /* Use the LEON4 up-counter if available */ leon3_counter_use_up_counter(counter); return; } +#endif #if defined(LEON3_IRQAMP_PROBE_TIMESTAMP) irqmp_ts = irqamp_get_timestamp_registers(LEON3_IrqCtrl_Regs); diff --git a/spec/build/bsps/sparc/leon3/grp.yml b/spec/build/bsps/sparc/leon3/grp.yml index 6d7a1b75c3..94d11bed55 100644 --- a/spec/build/bsps/sparc/leon3/grp.yml +++ b/spec/build/bsps/sparc/leon3/grp.yml @@ -36,6 +36,8 @@ links: uid: optapbuartbase - role: build-dependency uid: optasrupcnt +- role: build-dependency + uid: optasrupcntprobe - role: build-dependency uid: optgptimerbase - role: build-dependency diff --git a/spec/build/bsps/sparc/leon3/optasrupcntprobe.yml b/spec/build/bsps/sparc/leon3/optasrupcntprobe.yml new file mode 100644 index 0000000000..c32c909f3e --- /dev/null +++ b/spec/build/bsps/sparc/leon3/optasrupcntprobe.yml @@ -0,0 +1,21 @@ +SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause +copyrights: +- Copyright (C) 2021 embedded brains GmbH & Co. KG +actions: +- get-boolean: null +- define-condition: null +build-type: option +default: +- enabled-by: + - sparc/gr712rc + - sparc/gr740 + value: false +- enabled-by: true + value: true +enabled-by: true +links: [] +name: LEON3_PROBE_ASR_22_23_UP_COUNTER +description: | + If this option is set to true, then it will be probed if the %asr22 and + %asr23 up-counter is available. +type: build -- cgit v1.2.3