From: Evgeny Voevodin <e.voevodin@samsung.com>
Date: Wed, 20 Jun 2012 05:53:21 +0000 (+0400)
Subject: tizen/src/hw/maru_arm_pmu.c: Drop timer-based decision for reset or shutdown.
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~1405^2~102
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5f54e6b8239f13b592feccc9dfc8fe8d9ea9b29f;p=sdk%2Femulator%2Fqemu.git

tizen/src/hw/maru_arm_pmu.c: Drop timer-based decision for reset or shutdown.

Kernel's mach-tizen got simple and correct code to handle shutdown and reset.

Signed-off-by: Evgeny Voevodin <e.voevodin@samsung.com>
---

diff --git a/tizen/src/hw/maru_arm_pmu.c b/tizen/src/hw/maru_arm_pmu.c
index 4647d4e35a..7ba15e7357 100644
--- a/tizen/src/hw/maru_arm_pmu.c
+++ b/tizen/src/hw/maru_arm_pmu.c
@@ -437,7 +437,7 @@ static void exynos4210_pmu_write(void *opaque, target_phys_addr_t offset,
     switch (offset) {
     case SYSTEM_POWER_DOWN_CTRL:
         if (!(val & (1 << 16))) {
-            qemu_system_powerdown_request();
+            qemu_system_shutdown_request();
             return;
         }
     case SWRESET:
@@ -471,54 +471,15 @@ static void exynos4210_pmu_reset(DeviceState *dev)
     }
 }
 
-static void maru_arm_powerdown_tick(void *opaque)
-{
-    Exynos4210PmuState *s = opaque;
-    const Exynos4210PmuReg *reg_p = exynos4210_pmu_regs;
-    unsigned i;
-
-    for (i = 0; i < PMU_NUM_OF_REGISTERS; i++) {
-        if (reg_p->offset == SYSTEM_POWER_DOWN_CTRL) {
-            if (s->reg[i] & 0x00010000) {
-                /* Reset value arrived in register. Do not powerdown, we are in
-                 * the process of resetting. */
-                return;
-            }
-        }
-        reg_p++;
-    }
-    qemu_system_shutdown_request();
-}
-
-static void maru_arm_powerdown(void *opaque, int irq, int power_failing)
-{
-    Exynos4210PmuState *s = opaque;
-
-    assert(s != NULL);
-    /* Wait 100 ms */
-    ptimer_set_count(s->ptimer, POWER_OFF_TIMER_FREQ / 100);
-    ptimer_run(s->ptimer, 1);
-}
-
 static int exynos4210_pmu_init(SysBusDevice *dev)
 {
     Exynos4210PmuState *s = FROM_SYSBUS(Exynos4210PmuState, dev);
-    QEMUBH *bh;
 
     /* memory mapping */
     memory_region_init_io(&s->iomem, &exynos4210_pmu_ops, s, "maru_arm.pmu",
                           EXYNOS4210_PMU_REGS_MEM_SIZE);
     sysbus_init_mmio(dev, &s->iomem);
 
-    /* We register powerdown handler here for the purpose to find out
-     * if reset was requested after powerdown. If so, then do reset.
-     * Here we hope that reset request will be set to the moment when
-     * timer allocated in maru_arm_powerdown shoots. */
-    bh = qemu_bh_new(maru_arm_powerdown_tick, s);
-    s->ptimer = ptimer_init(bh);
-    ptimer_set_freq(s->ptimer, POWER_OFF_TIMER_FREQ);
-    qemu_system_powerdown = *qemu_allocate_irqs(maru_arm_powerdown, s, 1);
-
     return 0;
 }