2011-01-24 14:56:55 +03:00
|
|
|
/*
|
|
|
|
* QEMU Leon3 System Emulator
|
|
|
|
*
|
2019-05-15 15:31:27 +03:00
|
|
|
* Copyright (c) 2010-2019 AdaCore
|
2011-01-24 14:56:55 +03:00
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*/
|
2019-08-12 08:23:38 +03:00
|
|
|
|
2016-01-26 21:16:59 +03:00
|
|
|
#include "qemu/osdep.h"
|
2018-06-25 15:42:10 +03:00
|
|
|
#include "qemu/units.h"
|
hw/sparc*: 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 where then manually tweaked to pass checkpatch.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Fabien Chouteau <chouteau@adacore.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-12-armbru@redhat.com>
2018-02-03 11:43:12 +03:00
|
|
|
#include "qemu/error-report.h"
|
include/qemu/osdep.h: Don't include qapi/error.h
Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef. Since then, we've moved to include qemu/osdep.h
everywhere. Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h. That's in excess of
100KiB of crap most .c files don't actually need.
Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h. Include qapi/error.h in .c files that need it and don't
get it now. Include qapi-types.h in qom/object.h for uint16List.
Update scripts/clean-includes accordingly. Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h. Update the list of includes in the qemu/osdep.h
comment quoted above similarly.
This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third. Unfortunately, the number depending on
qapi-types.h shrinks only a little. More work is needed for that one.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
2016-03-14 11:01:28 +03:00
|
|
|
#include "qapi/error.h"
|
2016-01-19 23:51:44 +03:00
|
|
|
#include "qemu-common.h"
|
|
|
|
#include "cpu.h"
|
2019-08-12 08:23:42 +03:00
|
|
|
#include "hw/irq.h"
|
2012-12-17 21:20:00 +04:00
|
|
|
#include "qemu/timer.h"
|
2013-02-04 18:40:22 +04:00
|
|
|
#include "hw/ptimer.h"
|
2019-08-12 08:23:51 +03:00
|
|
|
#include "hw/qdev-properties.h"
|
2012-12-17 21:20:04 +04:00
|
|
|
#include "sysemu/sysemu.h"
|
2013-08-04 19:58:58 +04:00
|
|
|
#include "sysemu/qtest.h"
|
2019-08-12 08:23:38 +03:00
|
|
|
#include "sysemu/reset.h"
|
2013-02-04 18:40:22 +04:00
|
|
|
#include "hw/boards.h"
|
|
|
|
#include "hw/loader.h"
|
2011-01-24 14:56:55 +03:00
|
|
|
#include "elf.h"
|
|
|
|
#include "trace.h"
|
2012-12-17 21:19:49 +04:00
|
|
|
#include "exec/address-spaces.h"
|
2011-01-24 14:56:55 +03:00
|
|
|
|
2013-02-05 20:06:20 +04:00
|
|
|
#include "hw/sparc/grlib.h"
|
2019-05-15 15:31:32 +03:00
|
|
|
#include "hw/misc/grlib_ahb_apb_pnp.h"
|
2011-01-24 14:56:55 +03:00
|
|
|
|
|
|
|
/* Default system clock. */
|
|
|
|
#define CPU_CLK (40 * 1000 * 1000)
|
|
|
|
|
2019-05-15 15:31:27 +03:00
|
|
|
#define LEON3_PROM_FILENAME "u-boot.bin"
|
2019-05-15 15:31:31 +03:00
|
|
|
#define LEON3_PROM_OFFSET (0x00000000)
|
|
|
|
#define LEON3_RAM_OFFSET (0x40000000)
|
2011-01-24 14:56:55 +03:00
|
|
|
|
|
|
|
#define MAX_PILS 16
|
|
|
|
|
2019-05-15 15:31:30 +03:00
|
|
|
#define LEON3_UART_OFFSET (0x80000100)
|
|
|
|
#define LEON3_UART_IRQ (3)
|
|
|
|
|
2019-05-15 15:31:28 +03:00
|
|
|
#define LEON3_IRQMP_OFFSET (0x80000200)
|
|
|
|
|
2019-05-15 15:31:29 +03:00
|
|
|
#define LEON3_TIMER_OFFSET (0x80000300)
|
|
|
|
#define LEON3_TIMER_IRQ (6)
|
|
|
|
#define LEON3_TIMER_COUNT (2)
|
|
|
|
|
2019-05-15 15:31:32 +03:00
|
|
|
#define LEON3_APB_PNP_OFFSET (0x800FF000)
|
|
|
|
#define LEON3_AHB_PNP_OFFSET (0xFFFFF000)
|
|
|
|
|
2011-01-24 14:56:55 +03:00
|
|
|
typedef struct ResetData {
|
2012-05-04 04:36:04 +04:00
|
|
|
SPARCCPU *cpu;
|
2011-01-24 14:56:55 +03:00
|
|
|
uint32_t entry; /* save kernel entry in case of reset */
|
2014-02-03 13:18:11 +04:00
|
|
|
target_ulong sp; /* initial stack pointer */
|
2011-01-24 14:56:55 +03:00
|
|
|
} ResetData;
|
|
|
|
|
2019-05-15 15:31:31 +03:00
|
|
|
static uint32_t *gen_store_u32(uint32_t *code, hwaddr addr, uint32_t val)
|
|
|
|
{
|
|
|
|
stl_p(code++, 0x82100000); /* mov %g0, %g1 */
|
|
|
|
stl_p(code++, 0x84100000); /* mov %g0, %g2 */
|
|
|
|
stl_p(code++, 0x03000000 +
|
|
|
|
extract32(addr, 10, 22));
|
|
|
|
/* sethi %hi(addr), %g1 */
|
|
|
|
stl_p(code++, 0x82106000 +
|
|
|
|
extract32(addr, 0, 10));
|
|
|
|
/* or %g1, addr, %g1 */
|
|
|
|
stl_p(code++, 0x05000000 +
|
|
|
|
extract32(val, 10, 22));
|
|
|
|
/* sethi %hi(val), %g2 */
|
|
|
|
stl_p(code++, 0x8410a000 +
|
|
|
|
extract32(val, 0, 10));
|
|
|
|
/* or %g2, val, %g2 */
|
|
|
|
stl_p(code++, 0xc4204000); /* st %g2, [ %g1 ] */
|
|
|
|
|
|
|
|
return code;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* When loading a kernel in RAM the machine is expected to be in a different
|
|
|
|
* state (eg: initialized by the bootloader). This little code reproduces
|
|
|
|
* this behavior.
|
|
|
|
*/
|
|
|
|
static void write_bootloader(CPUSPARCState *env, uint8_t *base,
|
|
|
|
hwaddr kernel_addr)
|
|
|
|
{
|
|
|
|
uint32_t *p = (uint32_t *) base;
|
|
|
|
|
|
|
|
/* Initialize the UARTs */
|
|
|
|
/* *UART_CONTROL = UART_RECEIVE_ENABLE | UART_TRANSMIT_ENABLE; */
|
|
|
|
p = gen_store_u32(p, 0x80000108, 3);
|
|
|
|
|
|
|
|
/* Initialize the TIMER 0 */
|
|
|
|
/* *GPTIMER_SCALER_RELOAD = 40 - 1; */
|
|
|
|
p = gen_store_u32(p, 0x80000304, 39);
|
|
|
|
/* *GPTIMER0_COUNTER_RELOAD = 0xFFFE; */
|
|
|
|
p = gen_store_u32(p, 0x80000314, 0xFFFFFFFE);
|
|
|
|
/* *GPTIMER0_CONFIG = GPTIMER_ENABLE | GPTIMER_RESTART; */
|
|
|
|
p = gen_store_u32(p, 0x80000318, 3);
|
|
|
|
|
|
|
|
/* JUMP to the entry point */
|
|
|
|
stl_p(p++, 0x82100000); /* mov %g0, %g1 */
|
|
|
|
stl_p(p++, 0x03000000 + extract32(kernel_addr, 10, 22));
|
|
|
|
/* sethi %hi(kernel_addr), %g1 */
|
|
|
|
stl_p(p++, 0x82106000 + extract32(kernel_addr, 0, 10));
|
|
|
|
/* or kernel_addr, %g1 */
|
|
|
|
stl_p(p++, 0x81c04000); /* jmp %g1 */
|
|
|
|
stl_p(p++, 0x01000000); /* nop */
|
|
|
|
}
|
|
|
|
|
2011-01-24 14:56:55 +03:00
|
|
|
static void main_cpu_reset(void *opaque)
|
|
|
|
{
|
|
|
|
ResetData *s = (ResetData *)opaque;
|
2013-01-17 21:51:17 +04:00
|
|
|
CPUState *cpu = CPU(s->cpu);
|
2012-05-04 04:36:04 +04:00
|
|
|
CPUSPARCState *env = &s->cpu->env;
|
2011-01-24 14:56:55 +03:00
|
|
|
|
2013-01-17 21:51:17 +04:00
|
|
|
cpu_reset(cpu);
|
2011-01-24 14:56:55 +03:00
|
|
|
|
2013-01-17 21:51:17 +04:00
|
|
|
cpu->halted = 0;
|
2011-01-24 14:56:55 +03:00
|
|
|
env->pc = s->entry;
|
|
|
|
env->npc = s->entry + 4;
|
2014-02-03 13:18:11 +04:00
|
|
|
env->regbase[6] = s->sp;
|
2011-01-24 14:56:55 +03:00
|
|
|
}
|
|
|
|
|
2011-01-31 13:36:54 +03:00
|
|
|
void leon3_irq_ack(void *irq_manager, int intno)
|
2011-01-24 14:56:55 +03:00
|
|
|
{
|
|
|
|
grlib_irqmp_ack((DeviceState *)irq_manager, intno);
|
|
|
|
}
|
|
|
|
|
2019-10-17 19:42:35 +03:00
|
|
|
/*
|
|
|
|
* This device assumes that the incoming 'level' value on the
|
|
|
|
* qemu_irq is the interrupt number, not just a simple 0/1 level.
|
|
|
|
*/
|
|
|
|
static void leon3_set_pil_in(void *opaque, int n, int level)
|
2011-01-24 14:56:55 +03:00
|
|
|
{
|
2019-10-17 19:42:35 +03:00
|
|
|
CPUSPARCState *env = opaque;
|
|
|
|
uint32_t pil_in = level;
|
2013-01-18 01:30:20 +04:00
|
|
|
CPUState *cs;
|
2011-01-24 14:56:55 +03:00
|
|
|
|
|
|
|
assert(env != NULL);
|
|
|
|
|
|
|
|
env->pil_in = pil_in;
|
|
|
|
|
|
|
|
if (env->pil_in && (env->interrupt_index == 0 ||
|
|
|
|
(env->interrupt_index & ~15) == TT_EXTINT)) {
|
|
|
|
unsigned int i;
|
|
|
|
|
|
|
|
for (i = 15; i > 0; i--) {
|
|
|
|
if (env->pil_in & (1 << i)) {
|
|
|
|
int old_interrupt = env->interrupt_index;
|
|
|
|
|
|
|
|
env->interrupt_index = TT_EXTINT | i;
|
|
|
|
if (old_interrupt != env->interrupt_index) {
|
2019-03-23 05:36:20 +03:00
|
|
|
cs = env_cpu(env);
|
2011-01-24 14:56:55 +03:00
|
|
|
trace_leon3_set_irq(i);
|
2013-01-18 18:03:43 +04:00
|
|
|
cpu_interrupt(cs, CPU_INTERRUPT_HARD);
|
2011-01-24 14:56:55 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if (!env->pil_in && (env->interrupt_index & ~15) == TT_EXTINT) {
|
2019-03-23 05:36:20 +03:00
|
|
|
cs = env_cpu(env);
|
2011-01-24 14:56:55 +03:00
|
|
|
trace_leon3_reset_irq(env->interrupt_index & 15);
|
|
|
|
env->interrupt_index = 0;
|
2013-01-18 01:30:20 +04:00
|
|
|
cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD);
|
2011-01-24 14:56:55 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-07 18:42:57 +04:00
|
|
|
static void leon3_generic_hw_init(MachineState *machine)
|
2011-01-24 14:56:55 +03:00
|
|
|
{
|
2014-05-07 18:42:57 +04:00
|
|
|
ram_addr_t ram_size = machine->ram_size;
|
|
|
|
const char *kernel_filename = machine->kernel_filename;
|
2012-05-04 04:33:34 +04:00
|
|
|
SPARCCPU *cpu;
|
2012-03-14 04:38:24 +04:00
|
|
|
CPUSPARCState *env;
|
2011-07-25 16:07:22 +04:00
|
|
|
MemoryRegion *address_space_mem = get_system_memory();
|
|
|
|
MemoryRegion *prom = g_new(MemoryRegion, 1);
|
2011-01-24 14:56:55 +03:00
|
|
|
int ret;
|
|
|
|
char *filename;
|
|
|
|
qemu_irq *cpu_irqs = NULL;
|
|
|
|
int bios_size;
|
|
|
|
int prom_size;
|
|
|
|
ResetData *reset_info;
|
2019-05-15 15:31:28 +03:00
|
|
|
DeviceState *dev;
|
2019-05-15 15:31:29 +03:00
|
|
|
int i;
|
2019-05-15 15:31:32 +03:00
|
|
|
AHBPnp *ahb_pnp;
|
|
|
|
APBPnp *apb_pnp;
|
2011-01-24 14:56:55 +03:00
|
|
|
|
|
|
|
/* Init CPU */
|
2017-10-05 16:51:08 +03:00
|
|
|
cpu = SPARC_CPU(cpu_create(machine->cpu_type));
|
2012-05-04 04:33:34 +04:00
|
|
|
env = &cpu->env;
|
2011-01-24 14:56:55 +03:00
|
|
|
|
|
|
|
cpu_sparc_set_id(env, 0);
|
|
|
|
|
|
|
|
/* Reset data */
|
2011-08-21 07:09:37 +04:00
|
|
|
reset_info = g_malloc0(sizeof(ResetData));
|
2012-05-04 04:36:04 +04:00
|
|
|
reset_info->cpu = cpu;
|
2019-05-15 15:31:31 +03:00
|
|
|
reset_info->sp = LEON3_RAM_OFFSET + ram_size;
|
2011-01-24 14:56:55 +03:00
|
|
|
qemu_register_reset(main_cpu_reset, reset_info);
|
|
|
|
|
2020-06-10 08:31:59 +03:00
|
|
|
ahb_pnp = GRLIB_AHB_PNP(qdev_new(TYPE_GRLIB_AHB_PNP));
|
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 08:32:34 +03:00
|
|
|
sysbus_realize_and_unref(SYS_BUS_DEVICE(ahb_pnp), &error_fatal);
|
2019-05-15 15:31:32 +03:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(ahb_pnp), 0, LEON3_AHB_PNP_OFFSET);
|
|
|
|
grlib_ahb_pnp_add_entry(ahb_pnp, 0, 0, GRLIB_VENDOR_GAISLER,
|
|
|
|
GRLIB_LEON3_DEV, GRLIB_AHB_MASTER,
|
|
|
|
GRLIB_CPU_AREA);
|
|
|
|
|
2020-06-10 08:31:59 +03:00
|
|
|
apb_pnp = GRLIB_APB_PNP(qdev_new(TYPE_GRLIB_APB_PNP));
|
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 08:32:34 +03:00
|
|
|
sysbus_realize_and_unref(SYS_BUS_DEVICE(apb_pnp), &error_fatal);
|
2019-05-15 15:31:32 +03:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(apb_pnp), 0, LEON3_APB_PNP_OFFSET);
|
|
|
|
grlib_ahb_pnp_add_entry(ahb_pnp, LEON3_APB_PNP_OFFSET, 0xFFF,
|
|
|
|
GRLIB_VENDOR_GAISLER, GRLIB_APBMST_DEV,
|
|
|
|
GRLIB_AHB_SLAVE, GRLIB_AHBMEM_AREA);
|
|
|
|
|
2011-01-24 14:56:55 +03:00
|
|
|
/* Allocate IRQ manager */
|
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 08:31:58 +03:00
|
|
|
dev = qdev_new(TYPE_GRLIB_IRQMP);
|
2019-11-20 16:38:51 +03:00
|
|
|
qdev_init_gpio_in_named_with_opaque(DEVICE(cpu), leon3_set_pil_in,
|
|
|
|
env, "pil", 1);
|
|
|
|
qdev_connect_gpio_out_named(dev, "grlib-irq", 0,
|
|
|
|
qdev_get_gpio_in_named(DEVICE(cpu), "pil", 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 08:32:34 +03:00
|
|
|
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
|
2019-05-15 15:31:28 +03:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, LEON3_IRQMP_OFFSET);
|
|
|
|
env->irq_manager = dev;
|
2011-01-31 13:36:54 +03:00
|
|
|
env->qemu_irq_ack = leon3_irq_manager;
|
2019-05-15 15:31:28 +03:00
|
|
|
cpu_irqs = qemu_allocate_irqs(grlib_irqmp_set_irq, dev, MAX_PILS);
|
2019-05-15 15:31:32 +03:00
|
|
|
grlib_apb_pnp_add_entry(apb_pnp, LEON3_IRQMP_OFFSET, 0xFFF,
|
|
|
|
GRLIB_VENDOR_GAISLER, GRLIB_IRQMP_DEV,
|
|
|
|
2, 0, GRLIB_APBIO_AREA);
|
2011-01-24 14:56:55 +03:00
|
|
|
|
|
|
|
/* Allocate RAM */
|
2018-06-25 15:42:10 +03:00
|
|
|
if (ram_size > 1 * GiB) {
|
|
|
|
error_report("Too much memory for this machine: %" PRId64 "MB,"
|
|
|
|
" maximum 1G",
|
|
|
|
ram_size / MiB);
|
2011-01-24 14:56:55 +03:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
2020-02-19 19:09:43 +03:00
|
|
|
memory_region_add_subregion(address_space_mem, LEON3_RAM_OFFSET,
|
|
|
|
machine->ram);
|
2011-01-24 14:56:55 +03:00
|
|
|
|
|
|
|
/* Allocate BIOS */
|
2018-06-25 15:42:10 +03:00
|
|
|
prom_size = 8 * MiB;
|
2020-02-24 21:51:24 +03:00
|
|
|
memory_region_init_rom(prom, NULL, "Leon3.bios", prom_size, &error_fatal);
|
2019-05-15 15:31:31 +03:00
|
|
|
memory_region_add_subregion(address_space_mem, LEON3_PROM_OFFSET, prom);
|
2011-01-24 14:56:55 +03:00
|
|
|
|
|
|
|
/* Load boot prom */
|
|
|
|
if (bios_name == NULL) {
|
2019-05-15 15:31:27 +03:00
|
|
|
bios_name = LEON3_PROM_FILENAME;
|
2011-01-24 14:56:55 +03:00
|
|
|
}
|
|
|
|
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
|
|
|
|
|
2016-08-05 13:03:59 +03:00
|
|
|
if (filename) {
|
|
|
|
bios_size = get_image_size(filename);
|
|
|
|
} else {
|
|
|
|
bios_size = -1;
|
|
|
|
}
|
2011-01-24 14:56:55 +03:00
|
|
|
|
|
|
|
if (bios_size > prom_size) {
|
hw/sparc*: 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 where then manually tweaked to pass checkpatch.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Fabien Chouteau <chouteau@adacore.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-12-armbru@redhat.com>
2018-02-03 11:43:12 +03:00
|
|
|
error_report("could not load prom '%s': file too big", filename);
|
2011-01-24 14:56:55 +03:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (bios_size > 0) {
|
2019-05-15 15:31:31 +03:00
|
|
|
ret = load_image_targphys(filename, LEON3_PROM_OFFSET, bios_size);
|
2011-01-24 14:56:55 +03:00
|
|
|
if (ret < 0 || ret > prom_size) {
|
hw/sparc*: 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 where then manually tweaked to pass checkpatch.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Fabien Chouteau <chouteau@adacore.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-12-armbru@redhat.com>
2018-02-03 11:43:12 +03:00
|
|
|
error_report("could not load prom '%s'", filename);
|
2011-01-24 14:56:55 +03:00
|
|
|
exit(1);
|
|
|
|
}
|
2013-08-04 19:58:58 +04:00
|
|
|
} else if (kernel_filename == NULL && !qtest_enabled()) {
|
2019-05-15 15:31:27 +03:00
|
|
|
error_report("Can't read bios image '%s'", filename
|
|
|
|
? filename
|
|
|
|
: LEON3_PROM_FILENAME);
|
2011-01-24 14:56:55 +03:00
|
|
|
exit(1);
|
|
|
|
}
|
2015-02-27 10:50:13 +03:00
|
|
|
g_free(filename);
|
2011-01-24 14:56:55 +03:00
|
|
|
|
|
|
|
/* Can directly load an application. */
|
|
|
|
if (kernel_filename != NULL) {
|
|
|
|
long kernel_size;
|
|
|
|
uint64_t entry;
|
|
|
|
|
2019-01-15 15:18:03 +03:00
|
|
|
kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
|
2020-01-27 01:55:04 +03:00
|
|
|
&entry, NULL, NULL, NULL,
|
2016-03-04 14:30:21 +03:00
|
|
|
1 /* big endian */, EM_SPARC, 0, 0);
|
hw/sparc/leon3: Allow load of uImage firmwares
Currently the Leon3 machine doesn't allow to load legacy u-boot images:
$ qemu-system-sparc -M leon3_generic -d in_asm \
-kernel HelenOS-0.6.0-sparc32-leon3.bin
qemu-system-sparc: could not load kernel 'HelenOS-0.6.0-sparc32-leon3.bin'
$ file HelenOS-0.6.0-sparc32-leon3.bin
HelenOS-0.6.0-sparc32-leon3.bin: u-boot legacy uImage, HelenOS-0.6.0,\
Linux/ARM, OS Kernel Image (Not compressed), 2424229 bytes,\
Sun Dec 21 19:18:09 2014,\
Load Address: 0x40000000, Entry Point: 0x40000000,\
Header CRC: 0x8BCFA236, Data CRC: 0x37AD87DF
Since QEMU can load uImages, add the necessary code,
so the Leon3 machine can load these images:
$ qemu-system-sparc -M leon3_generic -d in_asm \
-kernel HelenOS-0.6.0-sparc32-leon3.bin
----------------
IN:
0x40000000: b 0x400007a8
0x40000004: nop
----------------
IN:
0x400007a8: save %sp, -136, %sp
0x400007ac: call 0x40000020
0x400007b0: sethi %hi(0x4000b800), %i1
...
Tested with the following firmware:
http://www.helenos.org/releases/HelenOS-0.6.0-sparc32-leon3.bin
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: KONRAD Frederic <frederic.konrad@adacore.com>
Tested-by: KONRAD Frederic <frederic.konrad@adacore.com>
Message-Id: <20190427162922.4207-1-f4bug@amsat.org>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
2019-04-27 19:29:21 +03:00
|
|
|
if (kernel_size < 0) {
|
|
|
|
kernel_size = load_uimage(kernel_filename, NULL, &entry,
|
|
|
|
NULL, NULL, NULL);
|
|
|
|
}
|
2011-01-24 14:56:55 +03:00
|
|
|
if (kernel_size < 0) {
|
hw/sparc*: 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 where then manually tweaked to pass checkpatch.
Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Fabien Chouteau <chouteau@adacore.com>
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Cc: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Acked-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-12-armbru@redhat.com>
2018-02-03 11:43:12 +03:00
|
|
|
error_report("could not load kernel '%s'", kernel_filename);
|
2011-01-24 14:56:55 +03:00
|
|
|
exit(1);
|
|
|
|
}
|
|
|
|
if (bios_size <= 0) {
|
2019-05-15 15:31:31 +03:00
|
|
|
/*
|
|
|
|
* If there is no bios/monitor just start the application but put
|
|
|
|
* the machine in an initialized state through a little
|
|
|
|
* bootloader.
|
|
|
|
*/
|
|
|
|
uint8_t *bootloader_entry;
|
|
|
|
|
|
|
|
bootloader_entry = memory_region_get_ram_ptr(prom);
|
|
|
|
write_bootloader(env, bootloader_entry, entry);
|
|
|
|
env->pc = LEON3_PROM_OFFSET;
|
|
|
|
env->npc = LEON3_PROM_OFFSET + 4;
|
|
|
|
reset_info->entry = LEON3_PROM_OFFSET;
|
2011-01-24 14:56:55 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Allocate timers */
|
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 08:31:58 +03:00
|
|
|
dev = qdev_new(TYPE_GRLIB_GPTIMER);
|
2019-05-15 15:31:29 +03:00
|
|
|
qdev_prop_set_uint32(dev, "nr-timers", LEON3_TIMER_COUNT);
|
|
|
|
qdev_prop_set_uint32(dev, "frequency", CPU_CLK);
|
|
|
|
qdev_prop_set_uint32(dev, "irq-line", LEON3_TIMER_IRQ);
|
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 08:32:34 +03:00
|
|
|
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
|
2019-05-15 15:31:29 +03:00
|
|
|
|
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, LEON3_TIMER_OFFSET);
|
|
|
|
for (i = 0; i < LEON3_TIMER_COUNT; i++) {
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(dev), i,
|
|
|
|
cpu_irqs[LEON3_TIMER_IRQ + i]);
|
|
|
|
}
|
2011-01-24 14:56:55 +03:00
|
|
|
|
2019-05-15 15:31:32 +03:00
|
|
|
grlib_apb_pnp_add_entry(apb_pnp, LEON3_TIMER_OFFSET, 0xFFF,
|
|
|
|
GRLIB_VENDOR_GAISLER, GRLIB_GPTIMER_DEV,
|
|
|
|
0, LEON3_TIMER_IRQ, GRLIB_APBIO_AREA);
|
|
|
|
|
2011-01-24 14:56:55 +03:00
|
|
|
/* Allocate uart */
|
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 08:31:58 +03:00
|
|
|
dev = qdev_new(TYPE_GRLIB_APB_UART);
|
2019-12-01 23:35:24 +03:00
|
|
|
qdev_prop_set_chr(dev, "chrdev", serial_hd(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 08:32:34 +03:00
|
|
|
sysbus_realize_and_unref(SYS_BUS_DEVICE(dev), &error_fatal);
|
2019-12-01 23:35:24 +03:00
|
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, LEON3_UART_OFFSET);
|
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, cpu_irqs[LEON3_UART_IRQ]);
|
|
|
|
grlib_apb_pnp_add_entry(apb_pnp, LEON3_UART_OFFSET, 0xFFF,
|
|
|
|
GRLIB_VENDOR_GAISLER, GRLIB_APBUART_DEV, 1,
|
|
|
|
LEON3_UART_IRQ, GRLIB_APBIO_AREA);
|
2011-01-24 14:56:55 +03:00
|
|
|
}
|
|
|
|
|
2015-09-04 21:37:08 +03:00
|
|
|
static void leon3_generic_machine_init(MachineClass *mc)
|
2011-01-24 14:56:55 +03:00
|
|
|
{
|
2015-09-04 21:37:08 +03:00
|
|
|
mc->desc = "Leon-3 generic";
|
|
|
|
mc->init = leon3_generic_hw_init;
|
2017-10-05 16:51:08 +03:00
|
|
|
mc->default_cpu_type = SPARC_CPU_TYPE_NAME("LEON3");
|
2020-02-19 19:09:43 +03:00
|
|
|
mc->default_ram_id = "leon3.ram";
|
2011-01-24 14:56:55 +03:00
|
|
|
}
|
|
|
|
|
2015-09-04 21:37:08 +03:00
|
|
|
DEFINE_MACHINE("leon3_generic", leon3_generic_machine_init)
|