PPC: Mac: Fix guest exported tbfreq values
PATCH 1/1 PPC: Mac: Fix guest exported tbfreq values
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 <[email protected]>
--- hw/ppc/mac_newworld.c | 5 +++-- hw/ppc/mac_oldworld.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-)
hw/ppc/mac_newworld.c +3 -2
@@ -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 );
hw/ppc/mac_oldworld.c +3 -2
@@ -45,6 +45,7 @@#define MAX_IDE_BUS 2#define CFG_ADDR 0xf0000510 +#define TBFREQ 16600000ULstatic 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); }
@@ -330,7 +331,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 );
Signature · 1 line
1.8.1.4