mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/ptimer: Add "no immediate trigger" policy

Browse Source 
Performing trigger on setting (or starting to run with) counter = 0 could
be a wrong behaviour for some of the timers, provide "no immediate trigger"
policy to maintain correct behaviour for such timers.

Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Message-id: 72c0319cf2ec599f22397b7da280c06c34dc40dd.1475421224.git.digetx@gmail.com
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Dmitry Osipenko 2016-10-24 16:26:51 +01:00 committed by Peter Maydell
parent 2e74583b29
commit 22471b8a0f
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hw/core/ptimer.c
View File

@ -13,7 +13,8 @@
#include "sysemu/replay.h" #include "sysemu/replay.h"
#include "sysemu/qtest.h" #include "sysemu/qtest.h"
#define DELTA_ADJUST 1 #define DELTA_ADJUST 1
#define DELTA_NO_ADJUST -1
struct ptimer_state struct ptimer_state
{ {
@ -43,8 +44,11 @@ static void ptimer_reload(ptimer_state *s, int delta_adjust)
uint64_t period = s->period; uint64_t period = s->period;
uint64_t delta = s->delta; uint64_t delta = s->delta;
if (delta == 0) { if (delta == 0 && !(s->policy_mask & PTIMER_POLICY_NO_IMMEDIATE_TRIGGER)) {
ptimer_trigger(s); ptimer_trigger(s);
}
if (delta == 0) {
delta = s->delta = s->limit; delta = s->delta = s->limit;
} }
@ -58,7 +62,9 @@ static void ptimer_reload(ptimer_state *s, int delta_adjust)
} }
if (s->policy_mask & PTIMER_POLICY_WRAP_AFTER_ONE_PERIOD) { if (s->policy_mask & PTIMER_POLICY_WRAP_AFTER_ONE_PERIOD) {
delta += delta_adjust; if (delta_adjust != DELTA_NO_ADJUST) {
delta += delta_adjust;
}
} }
if (delta == 0 && (s->policy_mask & PTIMER_POLICY_CONTINUOUS_TRIGGER)) { if (delta == 0 && (s->policy_mask & PTIMER_POLICY_CONTINUOUS_TRIGGER)) {
@ -67,6 +73,12 @@ static void ptimer_reload(ptimer_state *s, int delta_adjust)
} }
} }
if (delta == 0 && (s->policy_mask & PTIMER_POLICY_NO_IMMEDIATE_TRIGGER)) {
if (delta_adjust != DELTA_NO_ADJUST) {
delta = 1;
}
}
if (delta == 0) { if (delta == 0) {
if (!qtest_enabled()) { if (!qtest_enabled()) {
fprintf(stderr, "Timer with delta zero, disabling\n"); fprintf(stderr, "Timer with delta zero, disabling\n");
@ -111,7 +123,7 @@ static void ptimer_tick(void *opaque)
if (s->limit == 0) { if (s->limit == 0) {
/* If a "continuous trigger" policy is not used and limit == 0, /* If a "continuous trigger" policy is not used and limit == 0,
we should error out. */ we should error out. */
delta_adjust = 0; delta_adjust = DELTA_NO_ADJUST;
} }
ptimer_reload(s, delta_adjust); ptimer_reload(s, delta_adjust);

4
include/hw/ptimer.h
View File

@ -43,6 +43,10 @@
* re-trigger every period. */ * re-trigger every period. */
#define PTIMER_POLICY_CONTINUOUS_TRIGGER (1 << 1) #define PTIMER_POLICY_CONTINUOUS_TRIGGER (1 << 1)
/* Starting to run with/setting counter to "0" won't trigger immediately,
* but after a one period for both oneshot and periodic modes. */
#define PTIMER_POLICY_NO_IMMEDIATE_TRIGGER (1 << 2)
/* ptimer.c */ /* ptimer.c */
typedef struct ptimer_state ptimer_state; typedef struct ptimer_state ptimer_state;
typedef void (*ptimer_cb)(void *opaque); typedef void (*ptimer_cb)(void *opaque);