[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 01/17] PPC: Mac: Fix guest exported tbfreq values
From: |
Alexander Graf |
Subject: |
[Qemu-ppc] [PATCH 01/17] PPC: Mac: Fix guest exported tbfreq values |
Date: |
Mon, 1 Jul 2013 02:13:26 +0200 |
We can tell the guest the frequency of its time base through fwcfg.
However, we tell it a different value from the speed tb actually runs
at. Let's fix it and make the tbfreq initialization and the fwcfg exposure
use the same values.
Signed-off-by: Alexander Graf <address@hidden>
---
hw/ppc/mac_newworld.c | 5 +++--
hw/ppc/mac_oldworld.c | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index 3badfa3..253089a 100644
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -71,6 +71,7 @@
#define MAX_IDE_BUS 2
#define CFG_ADDR 0xf0000510
+#define TBFREQ (100UL * 1000UL * 1000UL)
/* debug UniNorth */
//#define DEBUG_UNIN
@@ -191,7 +192,7 @@ static void ppc_core99_init(QEMUMachineInitArgs *args)
env = &cpu->env;
/* Set time-base frequency to 100 Mhz */
- cpu_ppc_tb_init(env, 100UL * 1000UL * 1000UL);
+ cpu_ppc_tb_init(env, TBFREQ);
qemu_register_reset(ppc_core99_reset, cpu);
}
@@ -460,7 +461,7 @@ static void ppc_core99_init(QEMUMachineInitArgs *args)
fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_KVM_PID, getpid());
#endif
} else {
- fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_TBFREQ, get_ticks_per_sec());
+ fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_TBFREQ, TBFREQ);
}
/* Mac OS X requires a "known good" clock-frequency value; pass it one. */
fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_CLOCKFREQ, 266000000);
diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index 8faff30..2aab54c 100644
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -45,6 +45,7 @@
#define MAX_IDE_BUS 2
#define CFG_ADDR 0xf0000510
+#define TBFREQ 16600000UL
static int fw_cfg_boot_set(void *opaque, const char *boot_device)
{
@@ -114,7 +115,7 @@ static void ppc_heathrow_init(QEMUMachineInitArgs *args)
env = &cpu->env;
/* Set time-base frequency to 16.6 Mhz */
- cpu_ppc_tb_init(env, 16600000UL);
+ cpu_ppc_tb_init(env, TBFREQ);
qemu_register_reset(ppc_heathrow_reset, cpu);
}
@@ -331,7 +332,7 @@ static void ppc_heathrow_init(QEMUMachineInitArgs *args)
fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_KVM_PID, getpid());
#endif
} else {
- fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_TBFREQ, get_ticks_per_sec());
+ fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_TBFREQ, TBFREQ);
}
/* Mac OS X requires a "known good" clock-frequency value; pass it one. */
fw_cfg_add_i32(fw_cfg, FW_CFG_PPC_CLOCKFREQ, 266000000);
--
1.8.1.4
- [Qemu-ppc] [PATCH 00/17] PPC: Mac OS X guest bringup v2, Alexander Graf, 2013/06/30
- [Qemu-ppc] [PATCH 06/17] PPC: dbdma: Fix debug print, Alexander Graf, 2013/06/30
- [Qemu-ppc] [PATCH 03/17] PPC: Macio: Replace tabs with spaces, Alexander Graf, 2013/06/30
- [Qemu-ppc] [PATCH 01/17] PPC: Mac: Fix guest exported tbfreq values,
Alexander Graf <=
- [Qemu-ppc] [PATCH 07/17] PPC: dbdma: Allow new commands in RUN state, Alexander Graf, 2013/06/30
- [Qemu-ppc] [PATCH 15/17] PPC: Add timer handler for newworld mac-io, Alexander Graf, 2013/06/30
- [Qemu-ppc] [PATCH 09/17] PPC: dbdma: Introduce kick function, Alexander Graf, 2013/06/30
- [Qemu-ppc] [PATCH 12/17] PPC: dbdma: Move processing to io, Alexander Graf, 2013/06/30
- [Qemu-ppc] [PATCH 11/17] PPC: dbdma: macio: Add DMA callback, Alexander Graf, 2013/06/30
- [Qemu-ppc] [PATCH 10/17] PPC: dbdma: Move static bh variable to device struct, Alexander Graf, 2013/06/30
- [Qemu-ppc] [PATCH 04/17] PPC: dbdma: Replace tabs with spaces, Alexander Graf, 2013/06/30
- [Qemu-ppc] [PATCH 05/17] PPC: Mac: Add debug prints in macio and dbdma code, Alexander Graf, 2013/06/30
- [Qemu-ppc] [PATCH 02/17] PPC: g3beige: Move secondary IDE bus to mac-io, Alexander Graf, 2013/06/30
- [Qemu-ppc] [PATCH 13/17] PPC: dbdma: Wait for DMA until we have data, Alexander Graf, 2013/06/30