Update Changelog with new Xscale platforms and vmsvga.
[qemu] / hw / slavio_timer.c
index 1b17a3d..c0d849a 100644 (file)
@@ -21,7 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
-#include "vl.h"
+#include "hw.h"
+#include "sun4m.h"
+#include "qemu-timer.h"
 
 //#define DEBUG_TIMER
 
@@ -59,6 +61,7 @@ typedef struct SLAVIO_TIMERState {
     struct SLAVIO_TIMERState *master;
     int slave_index;
     // system only
+    unsigned int num_slaves;
     struct SLAVIO_TIMERState *slave[MAX_CPUS];
     uint32_t slave_mode;
 } SLAVIO_TIMERState;
@@ -67,6 +70,24 @@ typedef struct SLAVIO_TIMERState {
 #define SYS_TIMER_SIZE 0x14
 #define CPU_TIMER_SIZE 0x10
 
+#define SYS_TIMER_OFFSET      0x10000ULL
+#define CPU_TIMER_OFFSET(cpu) (0x1000ULL * cpu)
+
+#define TIMER_LIMIT         0
+#define TIMER_COUNTER       1
+#define TIMER_COUNTER_NORST 2
+#define TIMER_STATUS        3
+#define TIMER_MODE          4
+
+#define TIMER_COUNT_MASK32 0xfffffe00
+#define TIMER_LIMIT_MASK32 0x7fffffff
+#define TIMER_MAX_COUNT64  0x7ffffffffffffe00ULL
+#define TIMER_MAX_COUNT32  0x7ffffe00ULL
+#define TIMER_REACHED      0x80000000
+#define TIMER_PERIOD       500ULL // 500ns
+#define LIMIT_TO_PERIODS(l) ((l) >> 9)
+#define PERIODS_TO_LIMIT(l) ((l) << 9)
+
 static int slavio_timer_is_user(SLAVIO_TIMERState *s)
 {
     return s->master && (s->master->slave_mode & (1 << s->slave_index));
@@ -76,12 +97,21 @@ static int slavio_timer_is_user(SLAVIO_TIMERState *s)
 // Convert from ptimer countdown units
 static void slavio_timer_get_out(SLAVIO_TIMERState *s)
 {
-    uint64_t count;
+    uint64_t count, limit;
+
+    if (s->limit == 0) /* free-run processor or system counter */
+        limit = TIMER_MAX_COUNT32;
+    else
+        limit = s->limit;
 
-    count = s->limit - (ptimer_get_count(s->timer) << 9);
-    DPRINTF("get_out: limit %" PRIx64 " count %x%08x\n", s->limit, s->counthigh,
-            s->count);
-    s->count = count & 0xfffffe00;
+    if (s->timer)
+        count = limit - PERIODS_TO_LIMIT(ptimer_get_count(s->timer));
+    else
+        count = 0;
+
+    DPRINTF("get_out: limit %" PRIx64 " count %x%08x\n", s->limit,
+            s->counthigh, s->count);
+    s->count = count & TIMER_COUNT_MASK32;
     s->counthigh = count >> 32;
 }
 
@@ -93,7 +123,7 @@ static void slavio_timer_irq(void *opaque)
     slavio_timer_get_out(s);
     DPRINTF("callback: count %x%08x\n", s->counthigh, s->count);
     if (!slavio_timer_is_user(s)) {
-        s->reached = 0x80000000;
+        s->reached = TIMER_REACHED;
         qemu_irq_raise(s->irq);
     }
 }
@@ -105,7 +135,7 @@ static uint32_t slavio_timer_mem_readl(void *opaque, target_phys_addr_t addr)
 
     saddr = (addr & TIMER_MAXADDR) >> 2;
     switch (saddr) {
-    case 0:
+    case TIMER_LIMIT:
         // read limit (system counter mode) or read most signifying
         // part of counter (user mode)
         if (slavio_timer_is_user(s)) {
@@ -117,24 +147,24 @@ static uint32_t slavio_timer_mem_readl(void *opaque, target_phys_addr_t addr)
             // clear irq
             qemu_irq_lower(s->irq);
             s->reached = 0;
-            ret = s->limit & 0x7fffffff;
+            ret = s->limit & TIMER_LIMIT_MASK32;
         }
         break;
-    case 1:
+    case TIMER_COUNTER:
         // read counter and reached bit (system mode) or read lsbits
         // of counter (user mode)
         slavio_timer_get_out(s);
         if (slavio_timer_is_user(s)) // read user timer LSW
-            ret = s->count & 0xffffffe00;
+            ret = s->count & TIMER_COUNT_MASK32;
         else // read limit
-            ret = (s->count & 0x7ffffe00) | s->reached;
+            ret = (s->count & TIMER_MAX_COUNT32) | s->reached;
         break;
-    case 3:
+    case TIMER_STATUS:
         // only available in processor counter/timer
         // read start/stop status
         ret = s->running;
         break;
-    case 4:
+    case TIMER_MODE:
         // only available in system counter
         // read user/system mode
         ret = s->slave_mode;
@@ -149,79 +179,93 @@ static uint32_t slavio_timer_mem_readl(void *opaque, target_phys_addr_t addr)
     return ret;
 }
 
-static void slavio_timer_mem_writel(void *opaque, target_phys_addr_t addr, uint32_t val)
+static void slavio_timer_mem_writel(void *opaque, target_phys_addr_t addr,
+                                    uint32_t val)
 {
     SLAVIO_TIMERState *s = opaque;
     uint32_t saddr;
-    int reload = 0;
 
     DPRINTF("write " TARGET_FMT_plx " %08x\n", addr, val);
     saddr = (addr & TIMER_MAXADDR) >> 2;
     switch (saddr) {
-    case 0:
+    case TIMER_LIMIT:
         if (slavio_timer_is_user(s)) {
             // set user counter MSW, reset counter
             qemu_irq_lower(s->irq);
-            s->limit = 0x7ffffffffffffe00ULL;
+            s->limit = TIMER_MAX_COUNT64;
             DPRINTF("processor %d user timer reset\n", s->slave_index);
-            ptimer_set_limit(s->timer, s->limit >> 9, 1);
+            if (s->timer)
+                ptimer_set_limit(s->timer, LIMIT_TO_PERIODS(s->limit), 1);
         } else {
             // set limit, reset counter
             qemu_irq_lower(s->irq);
-            s->limit = val & 0x7ffffe00ULL;
-            if (!s->limit)
-                s->limit = 0x7ffffe00ULL;
-            ptimer_set_limit(s->timer, s->limit >> 9, 1);
+            s->limit = val & TIMER_MAX_COUNT32;
+            if (s->timer) {
+                if (s->limit == 0) /* free-run */
+                    ptimer_set_limit(s->timer, LIMIT_TO_PERIODS(TIMER_MAX_COUNT32), 1);
+                else
+                    ptimer_set_limit(s->timer, LIMIT_TO_PERIODS(s->limit), 1);
+            }
         }
         break;
-    case 1:
+    case TIMER_COUNTER:
         if (slavio_timer_is_user(s)) {
             // set user counter LSW, reset counter
             qemu_irq_lower(s->irq);
-            s->limit = 0x7ffffffffffffe00ULL;
+            s->limit = TIMER_MAX_COUNT64;
             DPRINTF("processor %d user timer reset\n", s->slave_index);
-            ptimer_set_limit(s->timer, s->limit >> 9, 1);
+            if (s->timer)
+                ptimer_set_limit(s->timer, LIMIT_TO_PERIODS(s->limit), 1);
         } else
             DPRINTF("not user timer\n");
         break;
-    case 2:
+    case TIMER_COUNTER_NORST:
         // set limit without resetting counter
-        s->limit = val & 0x7ffffe00ULL;
-        if (!s->limit)
-            s->limit = 0x7ffffe00ULL;
-        ptimer_set_limit(s->timer, s->limit >> 9, reload);
+        s->limit = val & TIMER_MAX_COUNT32;
+        if (s->timer) {
+            if (s->limit == 0) /* free-run */
+                ptimer_set_limit(s->timer, LIMIT_TO_PERIODS(TIMER_MAX_COUNT32), 0);
+            else
+                ptimer_set_limit(s->timer, LIMIT_TO_PERIODS(s->limit), 0);
+        }
         break;
-    case 3:
+    case TIMER_STATUS:
         if (slavio_timer_is_user(s)) {
             // start/stop user counter
             if ((val & 1) && !s->running) {
                 DPRINTF("processor %d user timer started\n", s->slave_index);
-                ptimer_run(s->timer, 0);
+                if (s->timer)
+                    ptimer_run(s->timer, 0);
                 s->running = 1;
             } else if (!(val & 1) && s->running) {
                 DPRINTF("processor %d user timer stopped\n", s->slave_index);
-                ptimer_stop(s->timer);
+                if (s->timer)
+                    ptimer_stop(s->timer);
                 s->running = 0;
             }
         }
         break;
-    case 4:
+    case TIMER_MODE:
         if (s->master == NULL) {
             unsigned int i;
 
-            for (i = 0; i < MAX_CPUS; i++) {
+            for (i = 0; i < s->num_slaves; i++) {
                 if (val & (1 << i)) {
                     qemu_irq_lower(s->slave[i]->irq);
                     s->slave[i]->limit = -1ULL;
+                } else {
+                    ptimer_stop(s->slave[i]->timer);
                 }
                 if ((val & (1 << i)) != (s->slave_mode & (1 << i))) {
                     ptimer_stop(s->slave[i]->timer);
-                    ptimer_set_limit(s->slave[i]->timer, s->slave[i]->limit >> 9, 1);
-                    DPRINTF("processor %d timer changed\n", s->slave[i]->slave_index);
+                    ptimer_set_limit(s->slave[i]->timer,
+                                     LIMIT_TO_PERIODS(s->slave[i]->limit), 1);
+                    DPRINTF("processor %d timer changed\n",
+                            s->slave[i]->slave_index);
                     ptimer_run(s->slave[i]->timer, 0);
                 }
             }
-            s->slave_mode = val & ((1 << MAX_CPUS) - 1);
+            s->slave_mode = val & ((1 << s->num_slaves) - 1);
         } else
             DPRINTF("not system timer\n");
         break;
@@ -232,14 +276,14 @@ static void slavio_timer_mem_writel(void *opaque, target_phys_addr_t addr, uint3
 }
 
 static CPUReadMemoryFunc *slavio_timer_mem_read[3] = {
-    slavio_timer_mem_readl,
-    slavio_timer_mem_readl,
+    NULL,
+    NULL,
     slavio_timer_mem_readl,
 };
 
 static CPUWriteMemoryFunc *slavio_timer_mem_write[3] = {
-    slavio_timer_mem_writel,
-    slavio_timer_mem_writel,
+    NULL,
+    NULL,
     slavio_timer_mem_writel,
 };
 
@@ -250,29 +294,26 @@ static void slavio_timer_save(QEMUFile *f, void *opaque)
     qemu_put_be64s(f, &s->limit);
     qemu_put_be32s(f, &s->count);
     qemu_put_be32s(f, &s->counthigh);
-    qemu_put_be32(f, 0); // Was irq
     qemu_put_be32s(f, &s->reached);
     qemu_put_be32s(f, &s->running);
-    qemu_put_be32s(f, 0); // Was mode
-    qemu_put_ptimer(f, s->timer);
+    if (s->timer)
+        qemu_put_ptimer(f, s->timer);
 }
 
 static int slavio_timer_load(QEMUFile *f, void *opaque, int version_id)
 {
     SLAVIO_TIMERState *s = opaque;
-    uint32_t tmp;
 
-    if (version_id != 2)
+    if (version_id != 3)
         return -EINVAL;
 
     qemu_get_be64s(f, &s->limit);
     qemu_get_be32s(f, &s->count);
     qemu_get_be32s(f, &s->counthigh);
-    qemu_get_be32s(f, &tmp); // Was irq
     qemu_get_be32s(f, &s->reached);
     qemu_get_be32s(f, &s->running);
-    qemu_get_be32s(f, &tmp); // Was mode
-    qemu_get_ptimer(f, s->timer);
+    if (s->timer)
+        qemu_get_ptimer(f, s->timer);
 
     return 0;
 }
@@ -281,14 +322,14 @@ static void slavio_timer_reset(void *opaque)
 {
     SLAVIO_TIMERState *s = opaque;
 
-    if (slavio_timer_is_user(s))
-        s->limit = 0x7ffffffffffffe00ULL;
-    else
-        s->limit = 0x7ffffe00ULL;
+    s->limit = 0;
     s->count = 0;
     s->reached = 0;
-    ptimer_set_limit(s->timer, s->limit >> 9, 1);
-    ptimer_run(s->timer, 0);
+    s->slave_mode = 0;
+    if (!s->master || s->slave_index < s->master->num_slaves) {
+        ptimer_set_limit(s->timer, LIMIT_TO_PERIODS(TIMER_MAX_COUNT32), 1);
+        ptimer_run(s->timer, 0);
+    }
     s->running = 1;
     qemu_irq_lower(s->irq);
 }
@@ -308,17 +349,22 @@ static SLAVIO_TIMERState *slavio_timer_init(target_phys_addr_t addr,
     s->irq = irq;
     s->master = master;
     s->slave_index = slave_index;
-    bh = qemu_bh_new(slavio_timer_irq, s);
-    s->timer = ptimer_init(bh);
-    ptimer_set_period(s->timer, 500ULL);
+    if (!master || slave_index < master->num_slaves) {
+        bh = qemu_bh_new(slavio_timer_irq, s);
+        s->timer = ptimer_init(bh);
+        ptimer_set_period(s->timer, TIMER_PERIOD);
+    }
 
     slavio_timer_io_memory = cpu_register_io_memory(0, slavio_timer_mem_read,
                                                     slavio_timer_mem_write, s);
     if (master)
-        cpu_register_physical_memory(addr, CPU_TIMER_SIZE, slavio_timer_io_memory);
+        cpu_register_physical_memory(addr, CPU_TIMER_SIZE,
+                                     slavio_timer_io_memory);
     else
-        cpu_register_physical_memory(addr, SYS_TIMER_SIZE, slavio_timer_io_memory);
-    register_savevm("slavio_timer", addr, 2, slavio_timer_save, slavio_timer_load, s);
+        cpu_register_physical_memory(addr, SYS_TIMER_SIZE,
+                                     slavio_timer_io_memory);
+    register_savevm("slavio_timer", addr, 3, slavio_timer_save,
+                    slavio_timer_load, s);
     qemu_register_reset(slavio_timer_reset, s);
     slavio_timer_reset(s);
 
@@ -326,16 +372,18 @@ static SLAVIO_TIMERState *slavio_timer_init(target_phys_addr_t addr,
 }
 
 void slavio_timer_init_all(target_phys_addr_t base, qemu_irq master_irq,
-                           qemu_irq *cpu_irqs)
+                           qemu_irq *cpu_irqs, unsigned int num_cpus)
 {
     SLAVIO_TIMERState *master;
     unsigned int i;
 
-    master = slavio_timer_init(base + 0x10000ULL, master_irq, NULL, 0);
+    master = slavio_timer_init(base + SYS_TIMER_OFFSET, master_irq, NULL, 0);
+
+    master->num_slaves = num_cpus;
 
     for (i = 0; i < MAX_CPUS; i++) {
         master->slave[i] = slavio_timer_init(base + (target_phys_addr_t)
-                                             (i * TARGET_PAGE_SIZE),
+                                             CPU_TIMER_OFFSET(i),
                                              cpu_irqs[i], master, i);
     }
 }