motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 18:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

ppc440_sdram: Get rid of the init RAM hack

Browse source 
Remove the do_init parameter of ppc440_sdram_init and enable SDRAM
controller from the board. Firmware does this so it may only be needed
when booting with -kernel without firmware but we enable SDRAM
unconditionally to preserve previous behaviour.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Message-Id: <c2eda8f83c82f655aa7821a5a8c9310484bd6a1d.1664021647.git.balaton@eik.bme.hu>
Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
This commit is contained in:
BALATON Zoltan 2022-09-24 14:28:00 +02:00 • committed by Daniel Henrique Barboza
parent ea74acee98
commit 03f7041bfd
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
hw/ppc/ppc440.h
View file

@ -17,8 +17,7 @@ void ppc4xx_l2sram_init(CPUPPCState *env);
void ppc4xx_cpr_init(CPUPPCState *env); void ppc4xx_cpr_init(CPUPPCState *env);
void ppc4xx_sdr_init(CPUPPCState *env); void ppc4xx_sdr_init(CPUPPCState *env);
void ppc440_sdram_init(CPUPPCState *env, int nbanks, void ppc440_sdram_init(CPUPPCState *env, int nbanks,
Ppc4xxSdramBank *ram_banks, Ppc4xxSdramBank *ram_banks);
int do_init);
void ppc4xx_ahb_init(CPUPPCState *env); void ppc4xx_ahb_init(CPUPPCState *env);
void ppc4xx_dma_init(CPUPPCState *env, int dcr_base); void ppc4xx_dma_init(CPUPPCState *env, int dcr_base);
void ppc460ex_pcie_init(CPUPPCState *env); void ppc460ex_pcie_init(CPUPPCState *env);

15
hw/ppc/ppc440_uc.c
View file

@ -16,6 +16,7 @@
#include "qemu/module.h" #include "qemu/module.h"
#include "hw/irq.h" #include "hw/irq.h"
#include "exec/memory.h" #include "exec/memory.h"
#include "cpu.h"
#include "hw/ppc/ppc4xx.h" #include "hw/ppc/ppc4xx.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "hw/pci/pci.h" #include "hw/pci/pci.h"
@ -727,12 +728,11 @@ static void sdram_reset(void *opaque)
ppc440_sdram_t *sdram = opaque; ppc440_sdram_t *sdram = opaque;
sdram->addr = 0; sdram->addr = 0;
sdram->mcopt2 = SDRAM_DDR2_MCOPT2_DCEN; sdram->mcopt2 = 0;
} }
void ppc440_sdram_init(CPUPPCState *env, int nbanks, void ppc440_sdram_init(CPUPPCState *env, int nbanks,
Ppc4xxSdramBank *ram_banks, Ppc4xxSdramBank *ram_banks)
int do_init)
{ {
ppc440_sdram_t *sdram; ppc440_sdram_t *sdram;
int i; int i;
@ -749,9 +749,6 @@ void ppc440_sdram_init(CPUPPCState *env, int nbanks,
sdram, &dcr_read_sdram, &dcr_write_sdram); sdram, &dcr_read_sdram, &dcr_write_sdram);
ppc_dcr_register(env, SDRAM0_CFGDATA, ppc_dcr_register(env, SDRAM0_CFGDATA,
sdram, &dcr_read_sdram, &dcr_write_sdram); sdram, &dcr_read_sdram, &dcr_write_sdram);
if (do_init) {
sdram_map_bcr(sdram);
}
ppc_dcr_register(env, SDRAM_R0BAS, ppc_dcr_register(env, SDRAM_R0BAS,
sdram, &dcr_read_sdram, &dcr_write_sdram); sdram, &dcr_read_sdram, &dcr_write_sdram);
@ -773,6 +770,12 @@ void ppc440_sdram_init(CPUPPCState *env, int nbanks,
sdram, &dcr_read_sdram, &dcr_write_sdram); sdram, &dcr_read_sdram, &dcr_write_sdram);
} }
void ppc440_sdram_enable(CPUPPCState *env)
{
ppc_dcr_write(env->dcr_env, SDRAM0_CFGADDR, 0x21);
ppc_dcr_write(env->dcr_env, SDRAM0_CFGDATA, 0x08000000);
}
/*****************************************************************************/ /*****************************************************************************/
/* PLB to AHB bridge */ /* PLB to AHB bridge */
enum { enum {

4
hw/ppc/sam460ex.c
View file

@ -345,7 +345,9 @@ static void sam460ex_init(MachineState *machine)
ppc4xx_sdram_banks(machine->ram, 1, ram_banks, ppc460ex_sdram_bank_sizes); ppc4xx_sdram_banks(machine->ram, 1, ram_banks, ppc460ex_sdram_bank_sizes);
/* FIXME: does 460EX have ECC interrupts? */ /* FIXME: does 460EX have ECC interrupts? */
ppc440_sdram_init(env, 1, ram_banks, 1); ppc440_sdram_init(env, 1, ram_banks);
/* Enable SDRAM memory regions as we may boot without firmware */
ppc440_sdram_enable(env);
/* IIC controllers and devices */ /* IIC controllers and devices */
dev = sysbus_create_simple(TYPE_PPC4xx_I2C, 0x4ef600700, dev = sysbus_create_simple(TYPE_PPC4xx_I2C, 0x4ef600700,

2
include/hw/ppc/ppc4xx.h
View file

@ -37,6 +37,8 @@ typedef struct {
uint32_t bcr; uint32_t bcr;
} Ppc4xxSdramBank; } Ppc4xxSdramBank;
void ppc440_sdram_enable(CPUPPCState *env);
void ppc4xx_sdram_banks(MemoryRegion *ram, int nr_banks, void ppc4xx_sdram_banks(MemoryRegion *ram, int nr_banks,
Ppc4xxSdramBank ram_banks[], Ppc4xxSdramBank ram_banks[],
const ram_addr_t sdram_bank_sizes[]); const ram_addr_t sdram_bank_sizes[]);