2018-02-19 11:34:25 +01:00
|
|
|
/*
|
|
|
|
* QEMU aCube Sam460ex board emulation
|
|
|
|
*
|
|
|
|
* Copyright (c) 2012 François Revol
|
2019-01-03 17:27:24 +01:00
|
|
|
* Copyright (c) 2016-2019 BALATON Zoltan
|
2018-02-19 11:34:25 +01:00
|
|
|
*
|
|
|
|
* This file is derived from hw/ppc440_bamboo.c,
|
|
|
|
* the copyright for that material belongs to the original owners.
|
|
|
|
*
|
|
|
|
* This work is licensed under the GNU GPL license version 2 or later.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "qemu/osdep.h"
|
2018-06-25 14:42:24 +02:00
|
|
|
#include "qemu/units.h"
|
2020-10-28 12:36:57 +01:00
|
|
|
#include "qemu/datadir.h"
|
2018-02-19 11:34:25 +01:00
|
|
|
#include "qemu/error-report.h"
|
|
|
|
#include "qapi/error.h"
|
|
|
|
#include "hw/boards.h"
|
|
|
|
#include "sysemu/kvm.h"
|
|
|
|
#include "kvm_ppc.h"
|
|
|
|
#include "sysemu/device_tree.h"
|
|
|
|
#include "sysemu/block-backend.h"
|
|
|
|
#include "hw/loader.h"
|
|
|
|
#include "elf.h"
|
|
|
|
#include "exec/memory.h"
|
2018-05-03 21:50:35 +02:00
|
|
|
#include "ppc440.h"
|
|
|
|
#include "ppc405.h"
|
2018-02-19 11:34:25 +01:00
|
|
|
#include "hw/block/flash.h"
|
|
|
|
#include "sysemu/sysemu.h"
|
2019-08-12 07:23:38 +02:00
|
|
|
#include "sysemu/reset.h"
|
2018-02-19 11:34:25 +01:00
|
|
|
#include "hw/sysbus.h"
|
|
|
|
#include "hw/char/serial.h"
|
|
|
|
#include "hw/i2c/ppc4xx_i2c.h"
|
2018-11-14 01:31:27 +01:00
|
|
|
#include "hw/i2c/smbus_eeprom.h"
|
2018-02-19 11:34:25 +01:00
|
|
|
#include "hw/usb/hcd-ehci.h"
|
2018-07-09 06:23:05 +02:00
|
|
|
#include "hw/ppc/fdt.h"
|
2019-08-12 07:23:51 +02:00
|
|
|
#include "hw/qdev-properties.h"
|
2021-01-08 18:12:09 +01:00
|
|
|
#include "hw/intc/ppc-uic.h"
|
2018-02-19 11:34:25 +01:00
|
|
|
|
2018-06-23 23:18:05 +02:00
|
|
|
#include <libfdt.h>
|
|
|
|
|
2018-02-19 11:34:25 +01:00
|
|
|
#define BINARY_DEVICE_TREE_FILE "canyonlands.dtb"
|
|
|
|
#define UBOOT_FILENAME "u-boot-sam460-20100605.bin"
|
|
|
|
/* to extract the official U-Boot bin from the updater: */
|
|
|
|
/* dd bs=1 skip=$(($(stat -c '%s' updater/updater-460) - 0x80000)) \
|
|
|
|
if=updater/updater-460 of=u-boot-sam460-20100605.bin */
|
|
|
|
|
|
|
|
/* from Sam460 U-Boot include/configs/Sam460ex.h */
|
|
|
|
#define FLASH_BASE 0xfff00000
|
|
|
|
#define FLASH_BASE_H 0x4
|
2018-06-25 14:42:24 +02:00
|
|
|
#define FLASH_SIZE (1 * MiB)
|
2018-02-19 11:34:25 +01:00
|
|
|
#define UBOOT_LOAD_BASE 0xfff80000
|
|
|
|
#define UBOOT_SIZE 0x00080000
|
|
|
|
#define UBOOT_ENTRY 0xfffffffc
|
|
|
|
|
|
|
|
/* from U-Boot */
|
|
|
|
#define EPAPR_MAGIC (0x45504150)
|
|
|
|
#define KERNEL_ADDR 0x1000000
|
|
|
|
#define FDT_ADDR 0x1800000
|
|
|
|
#define RAMDISK_ADDR 0x1900000
|
|
|
|
|
|
|
|
/* Sam460ex IRQ MAP:
|
|
|
|
IRQ0 = ETH_INT
|
|
|
|
IRQ1 = FPGA_INT
|
|
|
|
IRQ2 = PCI_INT (PCIA, PCIB, PCIC, PCIB)
|
|
|
|
IRQ3 = FPGA_INT2
|
|
|
|
IRQ11 = RTC_INT
|
|
|
|
IRQ12 = SM502_INT
|
|
|
|
*/
|
|
|
|
|
2018-04-06 00:42:48 +02:00
|
|
|
#define CPU_FREQ 1150000000
|
2018-06-23 23:18:05 +02:00
|
|
|
#define PLB_FREQ 230000000
|
|
|
|
#define OPB_FREQ 115000000
|
|
|
|
#define EBC_FREQ 115000000
|
|
|
|
#define UART_FREQ 11059200
|
2018-02-19 11:34:25 +01:00
|
|
|
#define SDRAM_NR_BANKS 4
|
|
|
|
|
2019-01-03 17:27:24 +01:00
|
|
|
/* The SoC could also handle 4 GiB but firmware does not work with that. */
|
|
|
|
/* Maybe it overflows a signed 32 bit number somewhere? */
|
2019-01-03 17:27:24 +01:00
|
|
|
static const ram_addr_t ppc460ex_sdram_bank_sizes[] = {
|
2019-01-03 17:27:24 +01:00
|
|
|
2 * GiB, 1 * GiB, 512 * MiB, 256 * MiB, 128 * MiB, 64 * MiB,
|
|
|
|
32 * MiB, 0
|
2018-02-19 11:34:25 +01:00
|
|
|
};
|
|
|
|
|
|
|
|
struct boot_info {
|
|
|
|
uint32_t dt_base;
|
|
|
|
uint32_t dt_size;
|
|
|
|
uint32_t entry;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int sam460ex_load_uboot(void)
|
|
|
|
{
|
2019-03-08 10:46:01 +01:00
|
|
|
/*
|
|
|
|
* This first creates 1MiB of flash memory mapped at the end of
|
|
|
|
* the 32-bit address space (0xFFF00000..0xFFFFFFFF).
|
|
|
|
*
|
|
|
|
* If_PFLASH unit 0 is defined, the flash memory is initialized
|
|
|
|
* from that block backend.
|
|
|
|
*
|
|
|
|
* Else, it's initialized to zero. And then 512KiB of ROM get
|
|
|
|
* mapped on top of its second half (0xFFF80000..0xFFFFFFFF),
|
|
|
|
* initialized from u-boot-sam460-20100605.bin.
|
|
|
|
*
|
|
|
|
* This doesn't smell right.
|
|
|
|
*
|
|
|
|
* The physical hardware appears to have 512KiB flash memory.
|
|
|
|
*
|
|
|
|
* TODO Figure out what we really need here, and clean this up.
|
|
|
|
*/
|
|
|
|
|
2018-02-19 11:34:25 +01:00
|
|
|
DriveInfo *dinfo;
|
|
|
|
|
|
|
|
dinfo = drive_get(IF_PFLASH, 0, 0);
|
2019-03-08 10:46:01 +01:00
|
|
|
if (!pflash_cfi01_register(FLASH_BASE | ((hwaddr)FLASH_BASE_H << 32),
|
2019-03-08 10:46:09 +01:00
|
|
|
"sam460ex.flash", FLASH_SIZE,
|
2019-03-08 10:46:01 +01:00
|
|
|
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
|
2019-03-08 10:46:10 +01:00
|
|
|
64 * KiB, 1, 0x89, 0x18, 0x0000, 0x0, 1)) {
|
2018-09-21 04:05:30 +02:00
|
|
|
error_report("Error registering flash memory");
|
2018-02-19 11:34:25 +01:00
|
|
|
/* XXX: return an error instead? */
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2019-03-08 10:46:01 +01:00
|
|
|
if (!dinfo) {
|
2018-02-19 11:34:25 +01:00
|
|
|
/*error_report("No flash image given with the 'pflash' parameter,"
|
|
|
|
" using default u-boot image");*/
|
2019-03-08 10:46:01 +01:00
|
|
|
rom_add_file_fixed(UBOOT_FILENAME,
|
|
|
|
UBOOT_LOAD_BASE | ((hwaddr)FLASH_BASE_H << 32),
|
|
|
|
-1);
|
2018-02-19 11:34:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int sam460ex_load_device_tree(hwaddr addr,
|
|
|
|
uint32_t ramsize,
|
|
|
|
hwaddr initrd_base,
|
|
|
|
hwaddr initrd_size,
|
|
|
|
const char *kernel_cmdline)
|
|
|
|
{
|
|
|
|
uint32_t mem_reg_property[] = { 0, 0, cpu_to_be32(ramsize) };
|
|
|
|
char *filename;
|
|
|
|
int fdt_size;
|
|
|
|
void *fdt;
|
2018-04-06 00:42:48 +02:00
|
|
|
uint32_t tb_freq = CPU_FREQ;
|
|
|
|
uint32_t clock_freq = CPU_FREQ;
|
2018-06-23 23:18:05 +02:00
|
|
|
int offset;
|
2018-02-19 11:34:25 +01:00
|
|
|
|
|
|
|
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE);
|
|
|
|
if (!filename) {
|
2018-07-09 06:27:43 +02:00
|
|
|
error_report("Couldn't find dtb file `%s'", BINARY_DEVICE_TREE_FILE);
|
|
|
|
exit(1);
|
2018-02-19 11:34:25 +01:00
|
|
|
}
|
|
|
|
fdt = load_device_tree(filename, &fdt_size);
|
2018-07-09 06:27:43 +02:00
|
|
|
if (!fdt) {
|
|
|
|
error_report("Couldn't load dtb file `%s'", filename);
|
2018-07-15 22:47:26 +02:00
|
|
|
g_free(filename);
|
2018-07-09 06:27:43 +02:00
|
|
|
exit(1);
|
2018-02-19 11:34:25 +01:00
|
|
|
}
|
2018-07-15 22:47:26 +02:00
|
|
|
g_free(filename);
|
2018-02-19 11:34:25 +01:00
|
|
|
|
|
|
|
/* Manipulate device tree in memory. */
|
|
|
|
|
2018-07-09 06:27:36 +02:00
|
|
|
qemu_fdt_setprop(fdt, "/memory", "reg", mem_reg_property,
|
|
|
|
sizeof(mem_reg_property));
|
2018-02-19 11:34:25 +01:00
|
|
|
|
|
|
|
/* default FDT doesn't have a /chosen node... */
|
|
|
|
qemu_fdt_add_subnode(fdt, "/chosen");
|
|
|
|
|
2018-07-09 06:27:36 +02:00
|
|
|
qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-start", initrd_base);
|
2018-02-19 11:34:25 +01:00
|
|
|
|
2018-07-09 06:27:36 +02:00
|
|
|
qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end",
|
|
|
|
(initrd_base + initrd_size));
|
2018-02-19 11:34:25 +01:00
|
|
|
|
2018-07-09 06:27:36 +02:00
|
|
|
qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", kernel_cmdline);
|
2018-02-19 11:34:25 +01:00
|
|
|
|
|
|
|
/* Copy data from the host device tree into the guest. Since the guest can
|
|
|
|
* directly access the timebase without host involvement, we must expose
|
|
|
|
* the correct frequencies. */
|
|
|
|
if (kvm_enabled()) {
|
|
|
|
tb_freq = kvmppc_get_tbfreq();
|
|
|
|
clock_freq = kvmppc_get_clockfreq();
|
|
|
|
}
|
|
|
|
|
|
|
|
qemu_fdt_setprop_cell(fdt, "/cpus/cpu@0", "clock-frequency",
|
|
|
|
clock_freq);
|
|
|
|
qemu_fdt_setprop_cell(fdt, "/cpus/cpu@0", "timebase-frequency",
|
|
|
|
tb_freq);
|
|
|
|
|
2018-06-23 23:18:05 +02:00
|
|
|
/* Remove cpm node if it exists (it is not emulated) */
|
|
|
|
offset = fdt_path_offset(fdt, "/cpm");
|
|
|
|
if (offset >= 0) {
|
2018-07-09 06:23:05 +02:00
|
|
|
_FDT(fdt_nop_node(fdt, offset));
|
2018-06-23 23:18:05 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* set serial port clocks */
|
|
|
|
offset = fdt_node_offset_by_compatible(fdt, -1, "ns16550");
|
|
|
|
while (offset >= 0) {
|
2018-07-09 06:23:05 +02:00
|
|
|
_FDT(fdt_setprop_cell(fdt, offset, "clock-frequency", UART_FREQ));
|
2018-06-23 23:18:05 +02:00
|
|
|
offset = fdt_node_offset_by_compatible(fdt, offset, "ns16550");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* some more clocks */
|
|
|
|
qemu_fdt_setprop_cell(fdt, "/plb", "clock-frequency",
|
|
|
|
PLB_FREQ);
|
|
|
|
qemu_fdt_setprop_cell(fdt, "/plb/opb", "clock-frequency",
|
|
|
|
OPB_FREQ);
|
|
|
|
qemu_fdt_setprop_cell(fdt, "/plb/opb/ebc", "clock-frequency",
|
|
|
|
EBC_FREQ);
|
|
|
|
|
2018-02-19 11:34:25 +01:00
|
|
|
rom_add_blob_fixed(BINARY_DEVICE_TREE_FILE, fdt, fdt_size, addr);
|
|
|
|
g_free(fdt);
|
|
|
|
|
2018-07-09 06:27:43 +02:00
|
|
|
return fdt_size;
|
2018-02-19 11:34:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Create reset TLB entries for BookE, mapping only the flash memory. */
|
|
|
|
static void mmubooke_create_initial_mapping_uboot(CPUPPCState *env)
|
|
|
|
{
|
|
|
|
ppcemb_tlb_t *tlb = &env->tlb.tlbe[0];
|
|
|
|
|
|
|
|
/* on reset the flash is mapped by a shadow TLB,
|
|
|
|
* but since we don't implement them we need to use
|
|
|
|
* the same values U-Boot will use to avoid a fault.
|
|
|
|
*/
|
|
|
|
tlb->attr = 0;
|
|
|
|
tlb->prot = PAGE_VALID | ((PAGE_READ | PAGE_WRITE | PAGE_EXEC) << 4);
|
|
|
|
tlb->size = 0x10000000; /* up to 0xffffffff */
|
|
|
|
tlb->EPN = 0xf0000000 & TARGET_PAGE_MASK;
|
|
|
|
tlb->RPN = (0xf0000000 & TARGET_PAGE_MASK) | 0x4;
|
|
|
|
tlb->PID = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Create reset TLB entries for BookE, spanning the 32bit addr space. */
|
|
|
|
static void mmubooke_create_initial_mapping(CPUPPCState *env,
|
|
|
|
target_ulong va,
|
|
|
|
hwaddr pa)
|
|
|
|
{
|
|
|
|
ppcemb_tlb_t *tlb = &env->tlb.tlbe[0];
|
|
|
|
|
|
|
|
tlb->attr = 0;
|
|
|
|
tlb->prot = PAGE_VALID | ((PAGE_READ | PAGE_WRITE | PAGE_EXEC) << 4);
|
|
|
|
tlb->size = 1 << 31; /* up to 0x80000000 */
|
|
|
|
tlb->EPN = va & TARGET_PAGE_MASK;
|
|
|
|
tlb->RPN = pa & TARGET_PAGE_MASK;
|
|
|
|
tlb->PID = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void main_cpu_reset(void *opaque)
|
|
|
|
{
|
|
|
|
PowerPCCPU *cpu = opaque;
|
|
|
|
CPUPPCState *env = &cpu->env;
|
|
|
|
struct boot_info *bi = env->load_info;
|
|
|
|
|
|
|
|
cpu_reset(CPU(cpu));
|
|
|
|
|
|
|
|
/* either we have a kernel to boot or we jump to U-Boot */
|
|
|
|
if (bi->entry != UBOOT_ENTRY) {
|
2018-06-25 14:42:24 +02:00
|
|
|
env->gpr[1] = (16 * MiB) - 8;
|
2018-02-19 11:34:25 +01:00
|
|
|
env->gpr[3] = FDT_ADDR;
|
|
|
|
env->nip = bi->entry;
|
|
|
|
|
|
|
|
/* Create a mapping for the kernel. */
|
|
|
|
mmubooke_create_initial_mapping(env, 0, 0);
|
|
|
|
env->gpr[6] = tswap32(EPAPR_MAGIC);
|
2018-06-25 14:42:24 +02:00
|
|
|
env->gpr[7] = (16 * MiB) - 8; /* bi->ima_size; */
|
2018-02-19 11:34:25 +01:00
|
|
|
|
|
|
|
} else {
|
|
|
|
env->nip = UBOOT_ENTRY;
|
|
|
|
mmubooke_create_initial_mapping_uboot(env);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sam460ex_init(MachineState *machine)
|
|
|
|
{
|
|
|
|
MemoryRegion *address_space_mem = get_system_memory();
|
|
|
|
MemoryRegion *isa = g_new(MemoryRegion, 1);
|
|
|
|
MemoryRegion *ram_memories = g_new(MemoryRegion, SDRAM_NR_BANKS);
|
2019-01-03 17:27:24 +01:00
|
|
|
hwaddr ram_bases[SDRAM_NR_BANKS] = {0};
|
|
|
|
hwaddr ram_sizes[SDRAM_NR_BANKS] = {0};
|
2018-02-19 11:34:25 +01:00
|
|
|
MemoryRegion *l2cache_ram = g_new(MemoryRegion, 1);
|
2021-01-08 18:12:09 +01:00
|
|
|
DeviceState *uic[4];
|
|
|
|
qemu_irq mal_irqs[4];
|
|
|
|
int i;
|
2018-02-19 11:34:25 +01:00
|
|
|
PCIBus *pci_bus;
|
|
|
|
PowerPCCPU *cpu;
|
|
|
|
CPUPPCState *env;
|
2019-01-03 17:27:24 +01:00
|
|
|
I2CBus *i2c;
|
2018-02-19 11:34:25 +01:00
|
|
|
hwaddr entry = UBOOT_ENTRY;
|
|
|
|
target_long initrd_size = 0;
|
|
|
|
DeviceState *dev;
|
|
|
|
SysBusDevice *sbdev;
|
|
|
|
struct boot_info *boot_info;
|
2019-01-03 17:27:24 +01:00
|
|
|
uint8_t *spd_data;
|
|
|
|
int success;
|
2018-02-19 11:34:25 +01:00
|
|
|
|
|
|
|
cpu = POWERPC_CPU(cpu_create(machine->cpu_type));
|
|
|
|
env = &cpu->env;
|
|
|
|
if (env->mmu_model != POWERPC_MMU_BOOKE) {
|
|
|
|
error_report("Only MMU model BookE is supported by this machine.");
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
qemu_register_reset(main_cpu_reset, cpu);
|
|
|
|
boot_info = g_malloc0(sizeof(*boot_info));
|
|
|
|
env->load_info = boot_info;
|
|
|
|
|
2018-04-06 00:42:48 +02:00
|
|
|
ppc_booke_timers_init(cpu, CPU_FREQ, 0);
|
2018-02-19 11:34:25 +01:00
|
|
|
ppc_dcr_init(env, NULL, NULL);
|
|
|
|
|
|
|
|
/* PLB arbitrer */
|
|
|
|
ppc4xx_plb_init(env);
|
|
|
|
|
|
|
|
/* interrupt controllers */
|
2021-01-08 18:12:09 +01:00
|
|
|
for (i = 0; i < ARRAY_SIZE(uic); i++) {
|
|
|
|
SysBusDevice *sbd;
|
|
|
|
/*
|
|
|
|
* UICs 1, 2 and 3 are cascaded through UIC 0.
|
|
|
|
* input_ints[n] is the interrupt number on UIC 0 which
|
|
|
|
* the INT output of UIC n is connected to. The CINT output
|
|
|
|
* of UIC n connects to input_ints[n] + 1.
|
|
|
|
* The entry in input_ints[] for UIC 0 is ignored, because UIC 0's
|
|
|
|
* INT and CINT outputs are connected to the CPU.
|
|
|
|
*/
|
|
|
|
const int input_ints[] = { -1, 30, 10, 16 };
|
|
|
|
|
|
|
|
uic[i] = qdev_new(TYPE_PPC_UIC);
|
|
|
|
sbd = SYS_BUS_DEVICE(uic[i]);
|
|
|
|
|
|
|
|
qdev_prop_set_uint32(uic[i], "dcr-base", 0xc0 + i * 0x10);
|
|
|
|
object_property_set_link(OBJECT(uic[i]), "cpu", OBJECT(cpu),
|
|
|
|
&error_fatal);
|
|
|
|
sysbus_realize_and_unref(sbd, &error_fatal);
|
|
|
|
|
|
|
|
if (i == 0) {
|
|
|
|
sysbus_connect_irq(sbd, PPCUIC_OUTPUT_INT,
|
|
|
|
((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_INT]);
|
|
|
|
sysbus_connect_irq(sbd, PPCUIC_OUTPUT_CINT,
|
|
|
|
((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_CINT]);
|
|
|
|
} else {
|
|
|
|
sysbus_connect_irq(sbd, PPCUIC_OUTPUT_INT,
|
|
|
|
qdev_get_gpio_in(uic[0], input_ints[i]));
|
|
|
|
sysbus_connect_irq(sbd, PPCUIC_OUTPUT_CINT,
|
|
|
|
qdev_get_gpio_in(uic[0], input_ints[i] + 1));
|
|
|
|
}
|
|
|
|
}
|
2018-02-19 11:34:25 +01:00
|
|
|
|
|
|
|
/* SDRAM controller */
|
|
|
|
/* put all RAM on first bank because board has one slot
|
|
|
|
* and firmware only checks that */
|
2020-02-19 17:09:40 +01:00
|
|
|
ppc4xx_sdram_banks(machine->ram, 1, ram_memories, ram_bases, ram_sizes,
|
2020-02-19 17:09:39 +01:00
|
|
|
ppc460ex_sdram_bank_sizes);
|
2018-02-19 11:34:25 +01:00
|
|
|
|
|
|
|
/* FIXME: does 460EX have ECC interrupts? */
|
|
|
|
ppc440_sdram_init(env, SDRAM_NR_BANKS, ram_memories,
|
|
|
|
ram_bases, ram_sizes, 1);
|
|
|
|
|
2019-01-03 17:27:24 +01:00
|
|
|
/* IIC controllers and devices */
|
2021-01-08 18:12:09 +01:00
|
|
|
dev = sysbus_create_simple(TYPE_PPC4xx_I2C, 0x4ef600700,
|
|
|
|
qdev_get_gpio_in(uic[0], 2));
|
2019-01-03 17:27:24 +01:00
|
|
|
i2c = PPC4xx_I2C(dev)->bus;
|
|
|
|
/* SPD EEPROM on RAM module */
|
2020-04-22 15:48:12 +02:00
|
|
|
spd_data = spd_data_generate(ram_sizes[0] < 128 * MiB ? DDR : DDR2,
|
smbus: Fix spd_data_generate() error API violation
The Error ** argument must be NULL, &error_abort, &error_fatal, or a
pointer to a variable containing NULL. Passing an argument of the
latter kind twice without clearing it in between is wrong: if the
first call sets an error, it no longer points to NULL for the second
call.
spd_data_generate() can pass @errp to error_setg() more than once when
it adjusts both memory size and type. Harmless, because no caller
passes anything that needs adjusting. Until the previous commit,
sam460ex passed types that needed adjusting, but not sizes.
spd_data_generate()'s contract is rather awkward:
If everything's fine, return non-null and don't set an error.
Else, if memory size or type need adjusting, return non-null and
set an error describing the adjustment.
Else, return null and set an error reporting why no data can be
generated.
Its callers treat the error as a warning even when null is returned.
They don't create the "smbus-eeprom" device then. Suspicious.
Since the previous commit, only "everything's fine" can actually
happen. Drop the unused code and simplify the callers. This gets rid
of the error API violation.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20200422134815.1584-3-armbru@redhat.com>
2020-04-22 15:48:13 +02:00
|
|
|
ram_sizes[0]);
|
|
|
|
spd_data[20] = 4; /* SO-DIMM module */
|
|
|
|
smbus_eeprom_init_one(i2c, 0x50, spd_data);
|
2019-01-03 17:27:24 +01:00
|
|
|
/* RTC */
|
2020-07-06 00:41:53 +02:00
|
|
|
i2c_slave_create_simple(i2c, "m41t80", 0x68);
|
2018-02-19 11:34:25 +01:00
|
|
|
|
2021-01-08 18:12:09 +01:00
|
|
|
dev = sysbus_create_simple(TYPE_PPC4xx_I2C, 0x4ef600800,
|
|
|
|
qdev_get_gpio_in(uic[0], 3));
|
2018-02-19 11:34:25 +01:00
|
|
|
|
|
|
|
/* External bus controller */
|
|
|
|
ppc405_ebc_init(env);
|
|
|
|
|
|
|
|
/* CPR */
|
|
|
|
ppc4xx_cpr_init(env);
|
|
|
|
|
|
|
|
/* PLB to AHB bridge */
|
|
|
|
ppc4xx_ahb_init(env);
|
|
|
|
|
|
|
|
/* System DCRs */
|
|
|
|
ppc4xx_sdr_init(env);
|
|
|
|
|
|
|
|
/* MAL */
|
2021-01-08 18:12:09 +01:00
|
|
|
for (i = 0; i < ARRAY_SIZE(mal_irqs); i++) {
|
|
|
|
mal_irqs[0] = qdev_get_gpio_in(uic[2], 3 + i);
|
|
|
|
}
|
|
|
|
ppc4xx_mal_init(env, 4, 16, mal_irqs);
|
2018-02-19 11:34:25 +01:00
|
|
|
|
2018-06-29 14:04:33 +02:00
|
|
|
/* DMA */
|
|
|
|
ppc4xx_dma_init(env, 0x200);
|
|
|
|
|
2018-02-19 11:34:25 +01:00
|
|
|
/* 256K of L2 cache as memory */
|
|
|
|
ppc4xx_l2sram_init(env);
|
|
|
|
/* FIXME: remove this after fixing l2sram mapping in ppc440_uc.c? */
|
2018-06-25 14:42:24 +02:00
|
|
|
memory_region_init_ram(l2cache_ram, NULL, "ppc440.l2cache_ram", 256 * KiB,
|
2018-02-19 11:34:25 +01:00
|
|
|
&error_abort);
|
|
|
|
memory_region_add_subregion(address_space_mem, 0x400000000LL, l2cache_ram);
|
|
|
|
|
|
|
|
/* USB */
|
2021-01-08 18:12:09 +01:00
|
|
|
sysbus_create_simple(TYPE_PPC4xx_EHCI, 0x4bffd0400,
|
|
|
|
qdev_get_gpio_in(uic[2], 29));
|
qdev: Convert uses of qdev_create() with Coccinelle
This is the transformation explained in the commit before previous.
Takes care of just one pattern that needs conversion. More to come in
this series.
Coccinelle script:
@ depends on !(file in "hw/arm/highbank.c")@
expression bus, type_name, dev, expr;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr;
identifier DOWN;
@@
- dev = DOWN(qdev_create(bus, type_name));
+ dev = DOWN(qdev_new(type_name));
... when != dev = expr
- qdev_init_nofail(DEVICE(dev));
+ qdev_realize_and_unref(DEVICE(dev), bus, &error_fatal);
@@
expression bus, type_name, expr;
identifier dev;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- qdev_init_nofail(dev);
+ qdev_realize_and_unref(dev, bus, &error_fatal);
@@
expression bus, type_name, dev, expr, errp;
symbol true;
@@
- dev = qdev_create(bus, type_name);
+ dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
@@
expression bus, type_name, expr, errp;
identifier dev;
symbol true;
@@
- DeviceState *dev = qdev_create(bus, type_name);
+ DeviceState *dev = qdev_new(type_name);
... when != dev = expr
- object_property_set_bool(OBJECT(dev), true, "realized", errp);
+ qdev_realize_and_unref(dev, bus, errp);
The first rule exempts hw/arm/highbank.c, because it matches along two
control flow paths there, with different @type_name. Covered by the
next commit's manual conversions.
Missing #include "qapi/error.h" added manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-10-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:31:58 +02:00
|
|
|
dev = qdev_new("sysbus-ohci");
|
2018-02-19 11:34:25 +01:00
|
|
|
qdev_prop_set_string(dev, "masterbus", "usb-bus.0");
|
|
|
|
qdev_prop_set_uint32(dev, "num-ports", 6);
|
|
|
|
sbdev = SYS_BUS_DEVICE(dev);
|
sysbus: Convert to sysbus_realize() etc. with Coccinelle
Convert from qdev_realize(), qdev_realize_and_unref() with null @bus
argument to sysbus_realize(), sysbus_realize_and_unref().
Coccinelle script:
@@
expression dev, errp;
@@
- qdev_realize(DEVICE(dev), NULL, errp);
+ sysbus_realize(SYS_BUS_DEVICE(dev), errp);
@@
expression sysbus_dev, dev, errp;
@@
+ sysbus_dev = SYS_BUS_DEVICE(dev);
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
- sysbus_dev = SYS_BUS_DEVICE(dev);
@@
expression sysbus_dev, dev, errp;
expression expr;
@@
sysbus_dev = SYS_BUS_DEVICE(dev);
... when != dev = expr;
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(sysbus_dev, errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(DEVICE(dev), NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
@@
expression dev, errp;
@@
- qdev_realize_and_unref(dev, NULL, errp);
+ sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), errp);
Whitespace changes minimized manually.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20200610053247.1583243-46-armbru@redhat.com>
[Conflicts in hw/misc/empty_slot.c and hw/sparc/leon3.c resolved]
2020-06-10 07:32:34 +02:00
|
|
|
sysbus_realize_and_unref(sbdev, &error_fatal);
|
2018-02-19 11:34:25 +01:00
|
|
|
sysbus_mmio_map(sbdev, 0, 0x4bffd0000);
|
2021-01-08 18:12:09 +01:00
|
|
|
sysbus_connect_irq(sbdev, 0, qdev_get_gpio_in(uic[2], 30));
|
2018-02-19 11:34:25 +01:00
|
|
|
usb_create_simple(usb_bus_find(-1), "usb-kbd");
|
|
|
|
usb_create_simple(usb_bus_find(-1), "usb-mouse");
|
|
|
|
|
|
|
|
/* PCI bus */
|
|
|
|
ppc460ex_pcie_init(env);
|
2018-07-31 13:08:00 +02:00
|
|
|
/* All PCI irqs are connected to the same UIC pin (cf. UBoot source) */
|
2021-01-08 18:12:09 +01:00
|
|
|
dev = sysbus_create_simple("ppc440-pcix-host", 0xc0ec00000,
|
|
|
|
qdev_get_gpio_in(uic[1], 0));
|
2021-01-08 23:07:38 +01:00
|
|
|
pci_bus = PCI_BUS(qdev_get_child_bus(dev, "pci.0"));
|
|
|
|
|
2018-02-19 11:34:25 +01:00
|
|
|
memory_region_init_alias(isa, NULL, "isa_mmio", get_system_io(),
|
|
|
|
0, 0x10000);
|
|
|
|
memory_region_add_subregion(get_system_memory(), 0xc08000000, isa);
|
|
|
|
|
|
|
|
/* PCI devices */
|
|
|
|
pci_create_simple(pci_bus, PCI_DEVFN(6, 0), "sm501");
|
|
|
|
/* SoC has a single SATA port but we don't emulate that yet
|
|
|
|
* However, firmware and usual clients have driver for SiI311x
|
|
|
|
* so add one for convenience by default */
|
|
|
|
if (defaults_enabled()) {
|
|
|
|
pci_create_simple(pci_bus, -1, "sii3112");
|
|
|
|
}
|
|
|
|
|
|
|
|
/* SoC has 4 UARTs
|
|
|
|
* but board has only one wired and two are present in fdt */
|
2018-04-20 16:52:43 +02:00
|
|
|
if (serial_hd(0) != NULL) {
|
2021-01-08 18:12:09 +01:00
|
|
|
serial_mm_init(address_space_mem, 0x4ef600300, 0,
|
|
|
|
qdev_get_gpio_in(uic[1], 1),
|
2018-04-20 16:52:43 +02:00
|
|
|
PPC_SERIAL_MM_BAUDBASE, serial_hd(0),
|
2018-02-19 11:34:25 +01:00
|
|
|
DEVICE_BIG_ENDIAN);
|
|
|
|
}
|
2018-04-20 16:52:43 +02:00
|
|
|
if (serial_hd(1) != NULL) {
|
2021-01-08 18:12:09 +01:00
|
|
|
serial_mm_init(address_space_mem, 0x4ef600400, 0,
|
|
|
|
qdev_get_gpio_in(uic[0], 1),
|
2018-04-20 16:52:43 +02:00
|
|
|
PPC_SERIAL_MM_BAUDBASE, serial_hd(1),
|
2018-02-19 11:34:25 +01:00
|
|
|
DEVICE_BIG_ENDIAN);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Load U-Boot image. */
|
|
|
|
if (!machine->kernel_filename) {
|
|
|
|
success = sam460ex_load_uboot();
|
|
|
|
if (success < 0) {
|
2018-09-21 04:05:30 +02:00
|
|
|
error_report("could not load firmware");
|
2018-02-19 11:34:25 +01:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Load kernel. */
|
|
|
|
if (machine->kernel_filename) {
|
2020-07-05 19:22:11 +02:00
|
|
|
hwaddr loadaddr = LOAD_UIMAGE_LOADADDR_INVALID;
|
2018-02-19 11:34:25 +01:00
|
|
|
success = load_uimage(machine->kernel_filename, &entry, &loadaddr,
|
|
|
|
NULL, NULL, NULL);
|
|
|
|
if (success < 0) {
|
2020-07-05 19:22:11 +02:00
|
|
|
uint64_t elf_entry;
|
2018-02-19 11:34:25 +01:00
|
|
|
|
2020-07-05 19:22:11 +02:00
|
|
|
success = load_elf(machine->kernel_filename, NULL, NULL, NULL,
|
|
|
|
&elf_entry, NULL, NULL, NULL,
|
|
|
|
1, PPC_ELF_MACHINE, 0, 0);
|
2018-02-19 11:34:25 +01:00
|
|
|
entry = elf_entry;
|
|
|
|
}
|
|
|
|
/* XXX try again as binary */
|
|
|
|
if (success < 0) {
|
2018-09-21 04:05:30 +02:00
|
|
|
error_report("could not load kernel '%s'",
|
2018-02-19 11:34:25 +01:00
|
|
|
machine->kernel_filename);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Load initrd. */
|
|
|
|
if (machine->initrd_filename) {
|
|
|
|
initrd_size = load_image_targphys(machine->initrd_filename,
|
|
|
|
RAMDISK_ADDR,
|
|
|
|
machine->ram_size - RAMDISK_ADDR);
|
|
|
|
if (initrd_size < 0) {
|
2018-09-21 04:05:30 +02:00
|
|
|
error_report("could not load ram disk '%s' at %x",
|
2018-02-19 11:34:25 +01:00
|
|
|
machine->initrd_filename, RAMDISK_ADDR);
|
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If we're loading a kernel directly, we must load the device tree too. */
|
|
|
|
if (machine->kernel_filename) {
|
|
|
|
int dt_size;
|
|
|
|
|
|
|
|
dt_size = sam460ex_load_device_tree(FDT_ADDR, machine->ram_size,
|
|
|
|
RAMDISK_ADDR, initrd_size,
|
|
|
|
machine->kernel_cmdline);
|
|
|
|
|
|
|
|
boot_info->dt_base = FDT_ADDR;
|
|
|
|
boot_info->dt_size = dt_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
boot_info->entry = entry;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sam460ex_machine_init(MachineClass *mc)
|
|
|
|
{
|
|
|
|
mc->desc = "aCube Sam460ex";
|
|
|
|
mc->init = sam460ex_init;
|
|
|
|
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("460exb");
|
2018-06-25 14:41:57 +02:00
|
|
|
mc->default_ram_size = 512 * MiB;
|
2020-02-19 17:09:40 +01:00
|
|
|
mc->default_ram_id = "ppc4xx.sdram";
|
2018-02-19 11:34:25 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
DEFINE_MACHINE("sam460ex", sam460ex_machine_init)
|