sam460ex: Fix timer frequency and clock multipliers
We only emulate timer running at CPU frequency which is what most guests expect so set the frequency to match real hardware. This also allows setting clock multipliers which caused slowdown previously due to wrong timer frequency. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
99b336cdd9
commit
f8815532dc
|
@ -392,8 +392,7 @@ static uint32_t dcr_read_sdr(void *opaque, int dcrn)
|
||||||
case SDR0_CFGDATA:
|
case SDR0_CFGDATA:
|
||||||
switch (sdr->addr) {
|
switch (sdr->addr) {
|
||||||
case SDR0_STRP0:
|
case SDR0_STRP0:
|
||||||
/* FIXME: Is this correct? This breaks timing in U-Boot */
|
ret = (0xb5 << 8) | (1 << 4) | 9;
|
||||||
ret = 0; /*(0xb5 << 8) | (1 << 4) | 9 */
|
|
||||||
break;
|
break;
|
||||||
case SDR0_STRP1:
|
case SDR0_STRP1:
|
||||||
ret = (5 << 29) | (2 << 26) | (1 << 24);
|
ret = (5 << 29) | (2 << 26) | (1 << 24);
|
||||||
|
|
|
@ -67,6 +67,7 @@
|
||||||
IRQ12 = SM502_INT
|
IRQ12 = SM502_INT
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#define CPU_FREQ 1150000000
|
||||||
#define SDRAM_NR_BANKS 4
|
#define SDRAM_NR_BANKS 4
|
||||||
|
|
||||||
/* FIXME: See u-boot.git 8ac41e, also fix in ppc440_uc.c */
|
/* FIXME: See u-boot.git 8ac41e, also fix in ppc440_uc.c */
|
||||||
|
@ -253,8 +254,8 @@ static int sam460ex_load_device_tree(hwaddr addr,
|
||||||
char *filename;
|
char *filename;
|
||||||
int fdt_size;
|
int fdt_size;
|
||||||
void *fdt;
|
void *fdt;
|
||||||
uint32_t tb_freq = 50000000;
|
uint32_t tb_freq = CPU_FREQ;
|
||||||
uint32_t clock_freq = 50000000;
|
uint32_t clock_freq = CPU_FREQ;
|
||||||
|
|
||||||
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE);
|
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE);
|
||||||
if (!filename) {
|
if (!filename) {
|
||||||
|
@ -416,7 +417,7 @@ static void sam460ex_init(MachineState *machine)
|
||||||
boot_info = g_malloc0(sizeof(*boot_info));
|
boot_info = g_malloc0(sizeof(*boot_info));
|
||||||
env->load_info = boot_info;
|
env->load_info = boot_info;
|
||||||
|
|
||||||
ppc_booke_timers_init(cpu, 50000000, 0);
|
ppc_booke_timers_init(cpu, CPU_FREQ, 0);
|
||||||
ppc_dcr_init(env, NULL, NULL);
|
ppc_dcr_init(env, NULL, NULL);
|
||||||
|
|
||||||
/* PLB arbitrer */
|
/* PLB arbitrer */
|
||||||
|
|
Loading…
Reference in a new issue