CONFIG_EARLY_TIMER: Fix EAGAIN issue and use DM too
cover CONFIG_EARLY_TIMER: Fix EAGAIN issue and use DM too
Hi,
I'm currently working on support for a STMicroelectronics board. I have written a DM driver which implements the timer_early_* functions. But noticed an issue when the configuration switch is set.
common/board_f.c
Here this leads in an EAGAIN issue, becaues the DM sub-system isn't running at this point.
lib/time.c
I modified the routines here, because it's also could fail. An addintionl feature is, that if CONFIG_EARLY_TIMER first it probes if, the DM timer is present, if not it uses the timer_early_* functions.
Have compiled it in both configurations, and it works as accepted.
Kind regards,
Johannes
---
Johannes Krottmayer (2):
common: board_f.c: Fix EAGAIN issue when CONFIG_TIMER_EARLY is
selected
lib: time.c: Try also DM timer, when CONFIG_TIMER_EARLY is selected
common/board_f.c | 6 ------ lib/time.c | 46 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 32 insertions(+), 20 deletions(-)
Signature · 1 line
2.34.1
PATCH 1/2 common: board_f.c: Fix EAGAIN issue when CONFIG_TIMER_EARLY is selected
Description:
When CONFIG_TIMER_EARLY is selected and the timer driver implements timer_early_get_count() and timer_early_get_rate() this leads to an EAGAIN error in initf_dm() one some configurations.
--- common/board_f.c | 6 ------ 1 file changed, 6 deletions(-)
common/board_f.c +0 -6
@@ -785,12 +785,6 @@ static int initf_dm(void)bootstage_accum (BOOTSTAGE_ID_ACCUM_DM_F );if (ret)return ret; - -if (IS_ENABLED (CONFIG_TIMER_EARLY )) { - ret =dm_timer_init (); -if (ret) -return ret; - }#endif return 0 ;
Signature · 1 line
2.34.1
Re: [PATCH 1/2] common: board_f.c: Fix EAGAIN issue when CONFIG_TIMER_EARLY is selected
Hi,
Ignore these patches. Have send them to the wrong maintainers... There are also somm issues.
Thanks!
Quoted 29 lines · Johannes Krottmayer
Description:
When
CONFIG_TIMER_EARLYis selected and the timer driver implementstimer_early_get_count()andtimer_early_get_rate()this leads to an EAGAIN error ininitf_dm()one some configurations.Signed-off-by Johannes Krottmayer <[email protected]>Cc Tom Rini <[email protected]>--- common/board_f.c | 6 ------ 1 file changed, 6 deletions(-)common/board_f.c +0
-6@@ -785,12 +785,6 @@ static int initf_dm(void)bootstage_accum (BOOTSTAGE_ID_ACCUM_DM_F );if (ret)return ret; - -if (IS_ENABLED (CONFIG_TIMER_EARLY )) { - ret =dm_timer_init (); -if (ret) -return ret; - }#endif return 0 ;
PATCH 2/2 lib: time.c: Try also DM timer, when CONFIG_TIMER_EARLY is selected
In reply to Johannes KrottmayerDescription:
When CONFIG_TIMER_EARLY is selected only the timer_early_* functions will be called. With this patch first gd->timer will be checked, if the DM timer is available, it uses the DM timer. When gd->timer is empty, the timer_early_* functions will be called.
--- lib/time.c | 46 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 14 deletions(-)
lib/time.c +32 -14
@@ -5,7 +5,6 @@*/ #include <common.h> -#include <clock_legacy.h> #include <bootstage.h> #include <dm.h> #include <errno.h>
@@ -66,17 +65,22 @@ extern unsigned long __weak timer_read_counter(void);#if CONFIG_IS_ENABLED (TIMER ) ulong notrace get_tbclk(void) { -if (!gd->timer) { +int ret; +#ifdef CONFIG_TIMER_EARLY +if (!gd->timer)return timer_early_get_rate (); + + ret =dm_timer_init (); + +if (ret) +return ret;#else -int ret; + ret =dm_timer_init (); - ret =dm_timer_init (); -if (ret) -return ret; +if (ret) +return ret;#endif - }return timer_get_rate (gd->timer); }
@@ -86,19 +90,32 @@ uint64_t notrace get_ticks(void)u64 count;int ret; -if (!gd->timer) {#ifdef CONFIG_TIMER_EARLY +if (!gd->timer)return timer_early_get_count (); -#else -int ret; - ret =dm_timer_init (); -if (ret) -panic ("Could not initialize timer (err %d)\n" , ret); -#endif + ret =dm_timer_init (); + +if (ret) +panic ("Could not initialize timer (err %d)\n" , ret); + + ret =timer_get_count (gd->timer, &count); + +if (ret) { +if (spl_phase () >PHASE_TPL ) +panic ("Could not read count from timer (err %d)\n" , + ret); +else +panic ("no timer (err %d)\n" , ret); } +#else + ret =dm_timer_init (); + +if (ret) +panic ("Could not initialize timer (err %d)\n" , ret); ret =timer_get_count (gd->timer, &count); +if (ret) {if (spl_phase () >PHASE_TPL ) panic("Could not read count from timer (err %d)\n",
@@ -106,6 +123,7 @@ uint64_t notrace get_ticks(void) else panic("no timer (err %d)\n", ret); } +#endif return count; }
Signature · 1 line
2.34.1
Re: [PATCH 2/2] lib: time.c: Try also DM timer, when CONFIG_TIMER_EARLY is selected
Hi,
Ignore these patches. Have send them to the wrong maintainers... There are also somm issues.
Thanks!
Quoted 102 lines · Johannes Krottmayer
Description:
When
CONFIG_TIMER_EARLYis selected only the timer_early_* functions will be called. With this patch firstgd->timerwill be checked, if the DM timer is available, it uses the DM timer. Whengd->timeris empty, the timer_early_* functions will be called.Signed-off-by Johannes Krottmayer <[email protected]>Cc Tom Rini <[email protected]>--- lib/time.c | 46 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 14 deletions(-)lib/time.c +32
-14@@ -5,7 +5,6 @@*/ #include <common.h> -#include <clock_legacy.h> #include <bootstage.h> #include <dm.h> #include <errno.h> @@ -66,17 +65,22 @@ extern unsigned long __weak timer_read_counter(void);#if CONFIG_IS_ENABLED (TIMER ) ulong notrace get_tbclk(void) { -if (!gd->timer) { +int ret; +#ifdef CONFIG_TIMER_EARLY +if (!gd->timer)return timer_early_get_rate (); + + ret =dm_timer_init (); + +if (ret) +return ret;#else -int ret; + ret =dm_timer_init (); - ret =dm_timer_init (); -if (ret) -return ret; +if (ret) +return ret;#endif - }return timer_get_rate (gd->timer); }@@ -86,19 +90,32 @@ uint64_t notrace get_ticks(void)u64 count;int ret; -if (!gd->timer) {#ifdef CONFIG_TIMER_EARLY +if (!gd->timer)return timer_early_get_count (); -#else -int ret; - ret =dm_timer_init (); -if (ret) -panic ("Could not initialize timer (err %d)\n" , ret); -#endif + ret =dm_timer_init (); + +if (ret) +panic ("Could not initialize timer (err %d)\n" , ret); + + ret =timer_get_count (gd->timer, &count); + +if (ret) { +if (spl_phase () >PHASE_TPL ) +panic ("Could not read count from timer (err %d)\n" , + ret); +else +panic ("no timer (err %d)\n" , ret); } +#else + ret =dm_timer_init (); + +if (ret) +panic ("Could not initialize timer (err %d)\n" , ret); ret =timer_get_count (gd->timer, &count); +if (ret) {if (spl_phase () >PHASE_TPL ) panic("Could not read count from timer (err %d)\n",@@ -106,6 +123,7 @@ uint64_t notrace get_ticks(void) else panic("no timer (err %d)\n", ret); } +#endif return count; }
Hi,
Ignore these patches. Have send them to the wrong maintainers... There are also somm issues.
Thanks!
Quoted 36 lines · Johannes Krottmayer
Hi,
I'm currently working on support for a STMicroelectronics board. I have written a DM driver which implements the timer_early_* functions. But noticed an issue when the configuration switch is set.
common/board_f.c
Here this leads in an EAGAIN issue, becaues the DM sub-system isn't running at this point.
lib/time.c
I modified the routines here, because it's also could fail. An addintionl feature is, that ifCONFIG_EARLY_TIMERfirst it probes if, the DM timer is present, if not it uses the timer_early_* functions.Have compiled it in both configurations, and it works as accepted.
Kind regards,
Johannes
Signed-off-by Johannes Krottmayer <[email protected]>Cc Tom Rini <[email protected]>---
Johannes Krottmayer (2):
common:board_f.c: Fix EAGAIN issue whenCONFIG_TIMER_EARLYis
selected
lib:time.c: Try also DM timer, whenCONFIG_TIMER_EARLYis selectedcommon/board_f.c | 6 ------ lib/time.c | 46 ++++++++++++++++++++++++++++++++-------------- 2 files changed, 32 insertions(+), 20 deletions(-)