2010-09-29 15:31:44 +02:00
|
|
|
/*
|
|
|
|
* Model of Xilinx Virtex5 ML507 PPC-440 refdesign.
|
|
|
|
*
|
|
|
|
* Copyright (c) 2010 Edgar E. Iglesias.
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
2016-01-26 19:16:58 +01:00
|
|
|
#include "qemu/osdep.h"
|
2019-05-23 16:35:08 +02:00
|
|
|
#include "qemu-common.h"
|
2020-10-28 12:36:57 +01:00
|
|
|
#include "qemu/datadir.h"
|
2018-06-25 14:42:24 +02:00
|
|
|
#include "qemu/units.h"
|
2016-03-15 16:58:45 +01:00
|
|
|
#include "cpu.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/sysbus.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/char/serial.h"
|
|
|
|
#include "hw/block/flash.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/sysemu.h"
|
2019-08-12 07:23:38 +02:00
|
|
|
#include "sysemu/reset.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/boards.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/device_tree.h"
|
2013-02-04 15:40:22 +01:00
|
|
|
#include "hw/loader.h"
|
2010-09-29 15:31:44 +02:00
|
|
|
#include "elf.h"
|
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
|
|
|
#include "qapi/error.h"
|
2015-03-17 18:29:20 +01:00
|
|
|
#include "qemu/error-report.h"
|
2018-02-01 12:18:46 +01:00
|
|
|
#include "qemu/option.h"
|
2010-09-29 15:31:44 +02:00
|
|
|
|
2020-12-12 01:15:32 +01:00
|
|
|
#include "hw/intc/ppc-uic.h"
|
2013-02-05 17:06:20 +01:00
|
|
|
#include "hw/ppc/ppc.h"
|
|
|
|
#include "hw/ppc/ppc4xx.h"
|
2019-08-12 07:23:51 +02:00
|
|
|
#include "hw/qdev-properties.h"
|
2013-03-18 17:36:02 +01:00
|
|
|
#include "ppc405.h"
|
2010-09-29 15:31:44 +02:00
|
|
|
|
|
|
|
#define EPAPR_MAGIC (0x45504150)
|
2018-06-25 14:42:24 +02:00
|
|
|
#define FLASH_SIZE (16 * MiB)
|
2010-09-29 15:31:44 +02:00
|
|
|
|
2014-02-26 01:38:54 +01:00
|
|
|
#define INTC_BASEADDR 0x81800000
|
|
|
|
#define UART16550_BASEADDR 0x83e01003
|
|
|
|
#define TIMER_BASEADDR 0x83c00000
|
|
|
|
#define PFLASH_BASEADDR 0xfc000000
|
|
|
|
|
|
|
|
#define TIMER_IRQ 3
|
|
|
|
#define UART16550_IRQ 9
|
|
|
|
|
2010-09-29 15:31:44 +02:00
|
|
|
static struct boot_info
|
|
|
|
{
|
|
|
|
uint32_t bootstrap_pc;
|
|
|
|
uint32_t cmdline;
|
|
|
|
uint32_t fdt;
|
|
|
|
uint32_t ima_size;
|
|
|
|
void *vfdt;
|
|
|
|
} boot_info;
|
|
|
|
|
|
|
|
/* Create reset TLB entries for BookE, spanning the 32bit addr space. */
|
2012-03-14 01:38:23 +01:00
|
|
|
static void mmubooke_create_initial_mapping(CPUPPCState *env,
|
2010-09-29 15:31:44 +02:00
|
|
|
target_ulong va,
|
2012-10-23 12:30:10 +02:00
|
|
|
hwaddr pa)
|
2010-09-29 15:31:44 +02:00
|
|
|
{
|
2011-06-17 01:00:28 +02:00
|
|
|
ppcemb_tlb_t *tlb = &env->tlb.tlbe[0];
|
2010-09-29 15:31:44 +02:00
|
|
|
|
|
|
|
tlb->attr = 0;
|
|
|
|
tlb->prot = PAGE_VALID | ((PAGE_READ | PAGE_WRITE | PAGE_EXEC) << 4);
|
2014-03-17 17:00:37 +01:00
|
|
|
tlb->size = 1U << 31; /* up to 0x80000000 */
|
2010-09-29 15:31:44 +02:00
|
|
|
tlb->EPN = va & TARGET_PAGE_MASK;
|
|
|
|
tlb->RPN = pa & TARGET_PAGE_MASK;
|
|
|
|
tlb->PID = 0;
|
|
|
|
|
2011-06-17 01:00:28 +02:00
|
|
|
tlb = &env->tlb.tlbe[1];
|
2010-09-29 15:31:44 +02:00
|
|
|
tlb->attr = 0;
|
|
|
|
tlb->prot = PAGE_VALID | ((PAGE_READ | PAGE_WRITE | PAGE_EXEC) << 4);
|
2014-03-17 17:00:37 +01:00
|
|
|
tlb->size = 1U << 31; /* up to 0xffffffff */
|
2010-09-29 15:31:44 +02:00
|
|
|
tlb->EPN = 0x80000000 & TARGET_PAGE_MASK;
|
|
|
|
tlb->RPN = 0x80000000 & TARGET_PAGE_MASK;
|
|
|
|
tlb->PID = 0;
|
|
|
|
}
|
|
|
|
|
2020-01-15 16:07:25 +01:00
|
|
|
static PowerPCCPU *ppc440_init_xilinx(const char *cpu_type, uint32_t sysclk)
|
2010-09-29 15:31:44 +02:00
|
|
|
{
|
2012-05-04 17:57:13 +02:00
|
|
|
PowerPCCPU *cpu;
|
2012-03-14 01:38:23 +01:00
|
|
|
CPUPPCState *env;
|
2020-12-12 01:15:32 +01:00
|
|
|
DeviceState *uicdev;
|
|
|
|
SysBusDevice *uicsbd;
|
2010-09-29 15:31:44 +02:00
|
|
|
|
2017-10-09 21:50:56 +02:00
|
|
|
cpu = POWERPC_CPU(cpu_create(cpu_type));
|
2012-05-04 17:57:13 +02:00
|
|
|
env = &cpu->env;
|
2010-09-29 15:31:44 +02:00
|
|
|
|
2012-12-01 04:43:18 +01:00
|
|
|
ppc_booke_timers_init(cpu, sysclk, 0/* no flags */);
|
2010-09-29 15:31:44 +02:00
|
|
|
|
|
|
|
ppc_dcr_init(env, NULL, NULL);
|
|
|
|
|
|
|
|
/* interrupt controller */
|
2020-12-12 01:15:32 +01:00
|
|
|
uicdev = qdev_new(TYPE_PPC_UIC);
|
|
|
|
uicsbd = SYS_BUS_DEVICE(uicdev);
|
|
|
|
|
|
|
|
object_property_set_link(OBJECT(uicdev), "cpu", OBJECT(cpu),
|
|
|
|
&error_fatal);
|
|
|
|
sysbus_realize_and_unref(uicsbd, &error_fatal);
|
|
|
|
|
|
|
|
sysbus_connect_irq(uicsbd, PPCUIC_OUTPUT_INT,
|
|
|
|
((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_INT]);
|
|
|
|
sysbus_connect_irq(uicsbd, PPCUIC_OUTPUT_CINT,
|
|
|
|
((qemu_irq *)env->irq_inputs)[PPC40x_INPUT_CINT]);
|
|
|
|
|
|
|
|
/* This board doesn't wire anything up to the inputs of the UIC. */
|
2012-05-04 17:59:06 +02:00
|
|
|
return cpu;
|
2010-09-29 15:31:44 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
static void main_cpu_reset(void *opaque)
|
|
|
|
{
|
2012-05-04 18:20:07 +02:00
|
|
|
PowerPCCPU *cpu = opaque;
|
|
|
|
CPUPPCState *env = &cpu->env;
|
2010-09-29 15:31:44 +02:00
|
|
|
struct boot_info *bi = env->load_info;
|
|
|
|
|
2012-05-04 18:20:07 +02:00
|
|
|
cpu_reset(CPU(cpu));
|
2010-09-29 15:31:44 +02:00
|
|
|
/* Linux Kernel Parameters (passing device tree):
|
|
|
|
* r3: pointer to the fdt
|
|
|
|
* r4: 0
|
|
|
|
* r5: 0
|
|
|
|
* r6: epapr magic
|
|
|
|
* r7: size of IMA in bytes
|
|
|
|
* r8: 0
|
|
|
|
* r9: 0
|
|
|
|
*/
|
2018-06-25 14:42:24 +02:00
|
|
|
env->gpr[1] = (16 * MiB) - 8;
|
2010-09-29 15:31:44 +02:00
|
|
|
/* Provide a device-tree. */
|
|
|
|
env->gpr[3] = bi->fdt;
|
|
|
|
env->nip = bi->bootstrap_pc;
|
|
|
|
|
|
|
|
/* Create a mapping for the kernel. */
|
|
|
|
mmubooke_create_initial_mapping(env, 0, 0);
|
|
|
|
env->gpr[6] = tswap32(EPAPR_MAGIC);
|
|
|
|
env->gpr[7] = bi->ima_size;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define BINARY_DEVICE_TREE_FILE "virtex-ml507.dtb"
|
2012-10-23 12:30:10 +02:00
|
|
|
static int xilinx_load_device_tree(hwaddr addr,
|
2010-09-29 15:31:44 +02:00
|
|
|
uint32_t ramsize,
|
2012-10-23 12:30:10 +02:00
|
|
|
hwaddr initrd_base,
|
|
|
|
hwaddr initrd_size,
|
2010-09-29 15:31:44 +02:00
|
|
|
const char *kernel_cmdline)
|
|
|
|
{
|
|
|
|
char *path;
|
|
|
|
int fdt_size;
|
2013-08-14 15:26:08 +02:00
|
|
|
void *fdt = NULL;
|
2010-09-29 15:31:44 +02:00
|
|
|
int r;
|
2013-08-14 15:26:08 +02:00
|
|
|
const char *dtb_filename;
|
2010-09-29 15:31:44 +02:00
|
|
|
|
2020-11-02 15:44:36 +01:00
|
|
|
dtb_filename = current_machine->dtb;
|
2013-08-14 15:26:08 +02:00
|
|
|
if (dtb_filename) {
|
|
|
|
fdt = load_device_tree(dtb_filename, &fdt_size);
|
|
|
|
if (!fdt) {
|
|
|
|
error_report("Error while loading device tree file '%s'",
|
|
|
|
dtb_filename);
|
2010-09-29 15:31:44 +02:00
|
|
|
}
|
2013-08-14 15:26:08 +02:00
|
|
|
} else {
|
|
|
|
/* Try the local "ppc.dtb" override. */
|
|
|
|
fdt = load_device_tree("ppc.dtb", &fdt_size);
|
2010-10-02 13:04:49 +02:00
|
|
|
if (!fdt) {
|
2013-08-14 15:26:08 +02:00
|
|
|
path = qemu_find_file(QEMU_FILE_TYPE_BIOS, BINARY_DEVICE_TREE_FILE);
|
|
|
|
if (path) {
|
|
|
|
fdt = load_device_tree(path, &fdt_size);
|
|
|
|
g_free(path);
|
|
|
|
}
|
2010-10-02 13:04:49 +02:00
|
|
|
}
|
2010-09-29 15:31:44 +02:00
|
|
|
}
|
2013-08-14 15:26:08 +02:00
|
|
|
if (!fdt) {
|
|
|
|
return 0;
|
|
|
|
}
|
2014-02-03 16:20:20 +01:00
|
|
|
|
|
|
|
r = qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-start",
|
|
|
|
initrd_base);
|
|
|
|
if (r < 0) {
|
|
|
|
error_report("couldn't set /chosen/linux,initrd-start");
|
|
|
|
}
|
|
|
|
|
|
|
|
r = qemu_fdt_setprop_cell(fdt, "/chosen", "linux,initrd-end",
|
|
|
|
(initrd_base + initrd_size));
|
|
|
|
if (r < 0) {
|
|
|
|
error_report("couldn't set /chosen/linux,initrd-end");
|
|
|
|
}
|
|
|
|
|
2013-11-11 09:14:41 +01:00
|
|
|
r = qemu_fdt_setprop_string(fdt, "/chosen", "bootargs", kernel_cmdline);
|
2010-09-29 15:31:44 +02:00
|
|
|
if (r < 0)
|
|
|
|
fprintf(stderr, "couldn't set /chosen/bootargs\n");
|
2013-04-12 20:53:58 +02:00
|
|
|
cpu_physical_memory_write(addr, fdt, fdt_size);
|
2020-02-18 10:11:53 +01:00
|
|
|
g_free(fdt);
|
2010-09-29 15:31:44 +02:00
|
|
|
return fdt_size;
|
|
|
|
}
|
|
|
|
|
2014-05-07 16:42:57 +02:00
|
|
|
static void virtex_init(MachineState *machine)
|
2010-09-29 15:31:44 +02:00
|
|
|
{
|
2014-05-07 16:42:57 +02:00
|
|
|
const char *kernel_filename = machine->kernel_filename;
|
|
|
|
const char *kernel_cmdline = machine->kernel_cmdline;
|
2014-02-03 16:20:20 +01:00
|
|
|
hwaddr initrd_base = 0;
|
|
|
|
int initrd_size = 0;
|
2011-08-12 01:07:16 +02:00
|
|
|
MemoryRegion *address_space_mem = get_system_memory();
|
2010-09-29 15:31:44 +02:00
|
|
|
DeviceState *dev;
|
2012-05-04 17:59:06 +02:00
|
|
|
PowerPCCPU *cpu;
|
2012-03-14 01:38:23 +01:00
|
|
|
CPUPPCState *env;
|
2012-10-23 12:30:10 +02:00
|
|
|
hwaddr ram_base = 0;
|
2010-09-29 15:31:44 +02:00
|
|
|
DriveInfo *dinfo;
|
|
|
|
qemu_irq irq[32], *cpu_irq;
|
|
|
|
int kernel_size;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
/* init CPUs */
|
2020-01-15 16:07:25 +01:00
|
|
|
cpu = ppc440_init_xilinx(machine->cpu_type, 400000000);
|
2012-05-04 17:59:06 +02:00
|
|
|
env = &cpu->env;
|
2017-01-26 11:15:59 +01:00
|
|
|
|
|
|
|
if (env->mmu_model != POWERPC_MMU_BOOKE) {
|
hw/ppc: Replace fprintf(stderr, "*\n" with error_report()
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
find ./* -type f -exec sed -i \
'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
{} +
Some lines were then manually tweaked to pass checkpatch and some curly
braces were added to match QEMU style.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: qemu-ppc@nongnu.org
Conversions that aren't followed by exit() dropped, because they might
be inappropriate.
Also trim trailing punctuation from error messages.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-10-armbru@redhat.com>
2018-02-03 09:43:10 +01:00
|
|
|
error_report("MMU model %i not supported by this machine",
|
|
|
|
env->mmu_model);
|
2017-01-26 11:15:59 +01:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2012-05-04 18:20:07 +02:00
|
|
|
qemu_register_reset(main_cpu_reset, cpu);
|
2010-09-29 15:31:44 +02:00
|
|
|
|
2020-02-19 17:09:42 +01:00
|
|
|
memory_region_add_subregion(address_space_mem, ram_base, machine->ram);
|
2010-09-29 15:31:44 +02:00
|
|
|
|
|
|
|
dinfo = drive_get(IF_PFLASH, 0, 0);
|
2019-03-08 10:46:09 +01:00
|
|
|
pflash_cfi01_register(PFLASH_BASEADDR, "virtex.flash", FLASH_SIZE,
|
2014-10-07 13:59:18 +02:00
|
|
|
dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
|
2019-03-08 10:46:10 +01:00
|
|
|
64 * KiB, 1, 0x89, 0x18, 0x0000, 0x0, 1);
|
2010-09-29 15:31:44 +02:00
|
|
|
|
|
|
|
cpu_irq = (qemu_irq *) &env->irq_inputs[PPC40x_INPUT_INT];
|
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("xlnx.xps-intc");
|
2014-02-26 01:40:04 +01:00
|
|
|
qdev_prop_set_uint32(dev, "kind-of-intr", 0);
|
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(SYS_BUS_DEVICE(dev), &error_fatal);
|
2014-02-26 01:40:04 +01:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, INTC_BASEADDR);
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, cpu_irq[0]);
|
2010-09-29 15:31:44 +02:00
|
|
|
for (i = 0; i < 32; i++) {
|
|
|
|
irq[i] = qdev_get_gpio_in(dev, i);
|
|
|
|
}
|
|
|
|
|
2014-02-26 01:38:54 +01:00
|
|
|
serial_mm_init(address_space_mem, UART16550_BASEADDR, 2, irq[UART16550_IRQ],
|
2018-04-20 16:52:43 +02:00
|
|
|
115200, serial_hd(0), DEVICE_LITTLE_ENDIAN);
|
2010-09-29 15:31:44 +02:00
|
|
|
|
|
|
|
/* 2 timers at irq 2 @ 62 Mhz. */
|
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("xlnx.xps-timer");
|
2014-02-26 01:40:39 +01:00
|
|
|
qdev_prop_set_uint32(dev, "one-timer-only", 0);
|
|
|
|
qdev_prop_set_uint32(dev, "clock-frequency", 62 * 1000000);
|
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(SYS_BUS_DEVICE(dev), &error_fatal);
|
2014-02-26 01:40:39 +01:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, TIMER_BASEADDR);
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, irq[TIMER_IRQ]);
|
2010-09-29 15:31:44 +02:00
|
|
|
|
|
|
|
if (kernel_filename) {
|
2020-07-05 19:22:11 +02:00
|
|
|
uint64_t entry, high;
|
2012-10-23 12:30:10 +02:00
|
|
|
hwaddr boot_offset;
|
2010-09-29 15:31:44 +02:00
|
|
|
|
|
|
|
/* Boots a kernel elf binary. */
|
2019-01-15 13:18:03 +01:00
|
|
|
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
|
2020-07-05 19:22:11 +02:00
|
|
|
&entry, NULL, &high, NULL, 1, PPC_ELF_MACHINE,
|
2016-03-04 12:30:21 +01:00
|
|
|
0, 0);
|
2010-09-29 15:31:44 +02:00
|
|
|
boot_info.bootstrap_pc = entry & 0x00ffffff;
|
|
|
|
|
|
|
|
if (kernel_size < 0) {
|
|
|
|
boot_offset = 0x1200000;
|
|
|
|
/* If we failed loading ELF's try a raw image. */
|
|
|
|
kernel_size = load_image_targphys(kernel_filename,
|
|
|
|
boot_offset,
|
2020-02-19 17:09:42 +01:00
|
|
|
machine->ram_size);
|
2010-09-29 15:31:44 +02:00
|
|
|
boot_info.bootstrap_pc = boot_offset;
|
|
|
|
high = boot_info.bootstrap_pc + kernel_size + 8192;
|
|
|
|
}
|
|
|
|
|
|
|
|
boot_info.ima_size = kernel_size;
|
|
|
|
|
2014-02-03 16:20:20 +01:00
|
|
|
/* Load initrd. */
|
2014-05-07 16:42:57 +02:00
|
|
|
if (machine->initrd_filename) {
|
2014-02-03 16:20:20 +01:00
|
|
|
initrd_base = high = ROUND_UP(high, 4);
|
2014-05-07 16:42:57 +02:00
|
|
|
initrd_size = load_image_targphys(machine->initrd_filename,
|
2020-02-19 17:09:42 +01:00
|
|
|
high, machine->ram_size - high);
|
2014-02-03 16:20:20 +01:00
|
|
|
|
|
|
|
if (initrd_size < 0) {
|
|
|
|
error_report("couldn't load ram disk '%s'",
|
2014-05-07 16:42:57 +02:00
|
|
|
machine->initrd_filename);
|
2014-02-03 16:20:20 +01:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
high = ROUND_UP(high + initrd_size, 4);
|
|
|
|
}
|
|
|
|
|
2010-09-29 15:31:44 +02:00
|
|
|
/* Provide a device-tree. */
|
|
|
|
boot_info.fdt = high + (8192 * 2);
|
|
|
|
boot_info.fdt &= ~8191;
|
2014-02-03 16:20:20 +01:00
|
|
|
|
2020-02-19 17:09:42 +01:00
|
|
|
xilinx_load_device_tree(boot_info.fdt, machine->ram_size,
|
2014-02-03 16:20:20 +01:00
|
|
|
initrd_base, initrd_size,
|
|
|
|
kernel_cmdline);
|
2010-09-29 15:31:44 +02:00
|
|
|
}
|
|
|
|
env->load_info = &boot_info;
|
|
|
|
}
|
|
|
|
|
2015-09-04 20:37:08 +02:00
|
|
|
static void virtex_machine_init(MachineClass *mc)
|
2010-09-29 15:31:44 +02:00
|
|
|
{
|
2015-09-04 20:37:08 +02:00
|
|
|
mc->desc = "Xilinx Virtex ML507 reference design";
|
|
|
|
mc->init = virtex_init;
|
2017-10-09 21:50:56 +02:00
|
|
|
mc->default_cpu_type = POWERPC_CPU_TYPE_NAME("440-xilinx");
|
2020-02-19 17:09:42 +01:00
|
|
|
mc->default_ram_id = "ram";
|
2010-09-29 15:31:44 +02:00
|
|
|
}
|
|
|
|
|
2015-09-04 20:37:08 +02:00
|
|
|
DEFINE_MACHINE("virtex-ml507", virtex_machine_init)
|