[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH for-3.0 3/4] hw/timer/cmsdk-apb-timer: Correctly ident
From: |
Peter Maydell |
Subject: |
[Qemu-arm] [PATCH for-3.0 3/4] hw/timer/cmsdk-apb-timer: Correctly identify and set one-shot mode |
Date: |
Tue, 3 Jul 2018 18:10:43 +0100 |
From: Guenter Roeck <address@hidden>
The CMSDK APB timer is currently always configured as periodic timer.
This results in the following messages when trying to boot Linux.
Timer with delta zero, disabling
If the timer limit set with the RELOAD command is 0, the timer
needs to be enabled as one-shot timer.
Signed-off-by: Guenter Roeck <address@hidden>
Message-id: address@hidden
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Peter Maydell <address@hidden>
---
hw/timer/cmsdk-apb-timer.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/timer/cmsdk-apb-timer.c b/hw/timer/cmsdk-apb-timer.c
index 1f99081db1a..3ebdc7be408 100644
--- a/hw/timer/cmsdk-apb-timer.c
+++ b/hw/timer/cmsdk-apb-timer.c
@@ -119,7 +119,7 @@ static void cmsdk_apb_timer_write(void *opaque, hwaddr
offset, uint64_t value,
}
s->ctrl = value & 0xf;
if (s->ctrl & R_CTRL_EN_MASK) {
- ptimer_run(s->timer, 0);
+ ptimer_run(s->timer, ptimer_get_limit(s->timer) == 0);
} else {
ptimer_stop(s->timer);
}
--
2.17.1
- [Qemu-arm] [PATCH for-3.0 0/4] cmsdk-apb-timer: various bugfixes, Peter Maydell, 2018/07/03
- [Qemu-arm] [PATCH for-3.0 4/4] hw/timer/cmsdk-apb-timer: run or stop timer on writes to RELOAD and VALUE, Peter Maydell, 2018/07/03
- [Qemu-arm] [PATCH for-3.0 3/4] hw/timer/cmsdk-apb-timer: Correctly identify and set one-shot mode,
Peter Maydell <=
- [Qemu-arm] [PATCH for-3.0 2/4] hw/timer/cmsdk-apb-timer: Correct ptimer policy settings, Peter Maydell, 2018/07/03
- [Qemu-arm] [PATCH for-3.0 1/4] ptimer: Add TRIGGER_ONLY_ON_DECREMENT policy option, Peter Maydell, 2018/07/03
- Re: [Qemu-arm] [Qemu-devel] [PATCH for-3.0 0/4] cmsdk-apb-timer: various bugfixes, Richard Henderson, 2018/07/03
- Re: [Qemu-arm] [PATCH for-3.0 0/4] cmsdk-apb-timer: various bugfixes, Guenter Roeck, 2018/07/03