Patchwork hw/integratorcp: Fix bugs in writes to CM_CTRL system register

login
register
mail settings
Submitter Peter Maydell
Date Aug. 24, 2011, 6:04 p.m.
Message ID <1314209049-18554-1-git-send-email-peter.maydell@linaro.org>
Download mbox | patch
Permalink /patch/111389/
State New
Headers show

Comments

Peter Maydell - Aug. 24, 2011, 6:04 p.m.
Fix a number of bugs in the implementation of writes to the CM_CTRL
system register:
 * write to cm_ctrl, not cm_init !
 * an '&' vs '^' typo meant we would write the inverse of the bits
 * handling the LED via printf() meant we spew lots of output
   to stdout when Linux uses the LED as a heartbeat indicator
 * we would hw_error() if a reset was requested rather than
   actually resetting

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
Avi -- I don't think this will conflict with your memory API conversion patch.

 hw/integratorcp.c |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

Patch

diff --git a/hw/integratorcp.c b/hw/integratorcp.c
index 2814108..cb0adfc 100644
--- a/hw/integratorcp.c
+++ b/hw/integratorcp.c
@@ -13,6 +13,7 @@ 
 #include "boards.h"
 #include "arm-misc.h"
 #include "net.h"
+#include "sysemu.h"
 
 typedef struct {
     SysBusDevice busdev;
@@ -118,15 +119,20 @@  static void integratorcm_do_remap(integratorcm_state *s, int flash)
 static void integratorcm_set_ctrl(integratorcm_state *s, uint32_t value)
 {
     if (value & 8) {
-        hw_error("Board reset\n");
+        qemu_system_reset_request();
     }
-    if ((s->cm_init ^ value) & 4) {
+    if ((s->cm_ctrl ^ value) & 4) {
         integratorcm_do_remap(s, (value & 4) == 0);
     }
-    if ((s->cm_init ^ value) & 1) {
-        printf("Green LED %s\n", (value & 1) ? "on" : "off");
+    if ((s->cm_ctrl ^ value) & 1) {
+        /* (value & 1) != 0 means the green "MISC LED" is lit.
+         * We don't have any nice place to display LEDs. printf is a bad
+         * idea because Linux uses the LED as a heartbeat and the output
+         * will swamp anything else on the terminal.
+         */
     }
-    s->cm_init = (s->cm_init & ~ 5) | (value ^ 5);
+    /* Note that the RESET bit [3] always reads as zero */
+    s->cm_ctrl = (s->cm_ctrl & ~5) | (value & 5);
 }
 
 static void integratorcm_update(integratorcm_state *s)