When all we do with an Error we receive into a local variable is propagating to somewhere else, we can just as well receive it there right away. Convert if (!foo(..., &err)) { ... error_propagate(errp, err); ... return ... } to if (!foo(..., errp)) { ... ... return ... } where nothing else needs @err. Coccinelle script: @rule1 forall@ identifier fun, err, errp, lbl; expression list args, args2; binary operator op; constant c1, c2; symbol false; @@ if ( ( - fun(args, &err, args2) + fun(args, errp, args2) | - !fun(args, &err, args2) + !fun(args, errp, args2) | - fun(args, &err, args2) op c1 + fun(args, errp, args2) op c1 ) ) { ... when != err when != lbl: when strict - error_propagate(errp, err); ... when != err ( return; | return c2; | return false; ) } @rule2 forall@ identifier fun, err, errp, lbl; expression list args, args2; expression var; binary operator op; constant c1, c2; symbol false; @@ - var = fun(args, &err, args2); + var = fun(args, errp, args2); ... when != err if ( ( var | !var | var op c1 ) ) { ... when != err when != lbl: when strict - error_propagate(errp, err); ... when != err ( return; | return c2; | return false; | return var; ) } @depends on rule1 || rule2@ identifier err; @@ - Error *err = NULL; ... when != err Not exactly elegant, I'm afraid. The "when != lbl:" is necessary to avoid transforming if (fun(args, &err)) { goto out } ... out: error_propagate(errp, err); even though other paths to label out still need the error_propagate(). For an actual example, see sclp_realize(). Without the "when strict", Coccinelle transforms vfio_msix_setup(), incorrectly. I don't know what exactly "when strict" does, only that it helps here. The match of return is narrower than what I want, but I can't figure out how to express "return where the operand doesn't use @err". For an example where it's too narrow, see vfio_intx_enable(). Silently fails to convert hw/arm/armsse.c, because Coccinelle gets confused by ARMSSE being used both as typedef and function-like macro there. Converted manually. Line breaks tidied up manually. One nested declaration of @local_err deleted manually. Preexisting unwanted blank line dropped in hw/riscv/sifive_e.c. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20200707160613.848843-35-armbru@redhat.com>
206 lines
8 KiB
C
206 lines
8 KiB
C
/*
|
|
* QEMU RISC-V Board Compatible with OpenTitan FPGA platform
|
|
*
|
|
* Copyright (c) 2020 Western Digital
|
|
*
|
|
* Provides a board compatible with the OpenTitan FPGA platform:
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms and conditions of the GNU General Public License,
|
|
* version 2 or later, as published by the Free Software Foundation.
|
|
*
|
|
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
* more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along with
|
|
* this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "hw/riscv/opentitan.h"
|
|
#include "qapi/error.h"
|
|
#include "hw/boards.h"
|
|
#include "hw/misc/unimp.h"
|
|
#include "hw/riscv/boot.h"
|
|
#include "exec/address-spaces.h"
|
|
#include "qemu/units.h"
|
|
#include "sysemu/sysemu.h"
|
|
|
|
static const struct MemmapEntry {
|
|
hwaddr base;
|
|
hwaddr size;
|
|
} ibex_memmap[] = {
|
|
[IBEX_ROM] = { 0x00008000, 16 * KiB },
|
|
[IBEX_RAM] = { 0x10000000, 0x10000 },
|
|
[IBEX_FLASH] = { 0x20000000, 0x80000 },
|
|
[IBEX_UART] = { 0x40000000, 0x10000 },
|
|
[IBEX_GPIO] = { 0x40010000, 0x10000 },
|
|
[IBEX_SPI] = { 0x40020000, 0x10000 },
|
|
[IBEX_FLASH_CTRL] = { 0x40030000, 0x10000 },
|
|
[IBEX_PINMUX] = { 0x40070000, 0x10000 },
|
|
[IBEX_RV_TIMER] = { 0x40080000, 0x10000 },
|
|
[IBEX_PLIC] = { 0x40090000, 0x10000 },
|
|
[IBEX_PWRMGR] = { 0x400A0000, 0x10000 },
|
|
[IBEX_RSTMGR] = { 0x400B0000, 0x10000 },
|
|
[IBEX_CLKMGR] = { 0x400C0000, 0x10000 },
|
|
[IBEX_AES] = { 0x40110000, 0x10000 },
|
|
[IBEX_HMAC] = { 0x40120000, 0x10000 },
|
|
[IBEX_ALERT_HANDLER] = { 0x40130000, 0x10000 },
|
|
[IBEX_NMI_GEN] = { 0x40140000, 0x10000 },
|
|
[IBEX_USBDEV] = { 0x40150000, 0x10000 },
|
|
[IBEX_PADCTRL] = { 0x40160000, 0x10000 }
|
|
};
|
|
|
|
static void opentitan_board_init(MachineState *machine)
|
|
{
|
|
const struct MemmapEntry *memmap = ibex_memmap;
|
|
OpenTitanState *s = g_new0(OpenTitanState, 1);
|
|
MemoryRegion *sys_mem = get_system_memory();
|
|
MemoryRegion *main_mem = g_new(MemoryRegion, 1);
|
|
|
|
/* Initialize SoC */
|
|
object_initialize_child(OBJECT(machine), "soc", &s->soc,
|
|
TYPE_RISCV_IBEX_SOC);
|
|
qdev_realize(DEVICE(&s->soc), NULL, &error_abort);
|
|
|
|
memory_region_init_ram(main_mem, NULL, "riscv.lowrisc.ibex.ram",
|
|
memmap[IBEX_RAM].size, &error_fatal);
|
|
memory_region_add_subregion(sys_mem,
|
|
memmap[IBEX_RAM].base, main_mem);
|
|
|
|
if (machine->firmware) {
|
|
riscv_load_firmware(machine->firmware, memmap[IBEX_RAM].base, NULL);
|
|
}
|
|
|
|
if (machine->kernel_filename) {
|
|
riscv_load_kernel(machine->kernel_filename, NULL);
|
|
}
|
|
}
|
|
|
|
static void opentitan_machine_init(MachineClass *mc)
|
|
{
|
|
mc->desc = "RISC-V Board compatible with OpenTitan";
|
|
mc->init = opentitan_board_init;
|
|
mc->max_cpus = 1;
|
|
mc->default_cpu_type = TYPE_RISCV_CPU_IBEX;
|
|
}
|
|
|
|
DEFINE_MACHINE("opentitan", opentitan_machine_init)
|
|
|
|
static void lowrisc_ibex_soc_init(Object *obj)
|
|
{
|
|
LowRISCIbexSoCState *s = RISCV_IBEX_SOC(obj);
|
|
|
|
object_initialize_child(obj, "cpus", &s->cpus, TYPE_RISCV_HART_ARRAY);
|
|
|
|
object_initialize_child(obj, "plic", &s->plic, TYPE_IBEX_PLIC);
|
|
|
|
object_initialize_child(obj, "uart", &s->uart, TYPE_IBEX_UART);
|
|
}
|
|
|
|
static void lowrisc_ibex_soc_realize(DeviceState *dev_soc, Error **errp)
|
|
{
|
|
const struct MemmapEntry *memmap = ibex_memmap;
|
|
MachineState *ms = MACHINE(qdev_get_machine());
|
|
LowRISCIbexSoCState *s = RISCV_IBEX_SOC(dev_soc);
|
|
MemoryRegion *sys_mem = get_system_memory();
|
|
|
|
object_property_set_str(OBJECT(&s->cpus), "cpu-type", ms->cpu_type,
|
|
&error_abort);
|
|
object_property_set_int(OBJECT(&s->cpus), "num-harts", ms->smp.cpus,
|
|
&error_abort);
|
|
sysbus_realize(SYS_BUS_DEVICE(&s->cpus), &error_abort);
|
|
|
|
/* Boot ROM */
|
|
memory_region_init_rom(&s->rom, OBJECT(dev_soc), "riscv.lowrisc.ibex.rom",
|
|
memmap[IBEX_ROM].size, &error_fatal);
|
|
memory_region_add_subregion(sys_mem,
|
|
memmap[IBEX_ROM].base, &s->rom);
|
|
|
|
/* Flash memory */
|
|
memory_region_init_rom(&s->flash_mem, OBJECT(dev_soc), "riscv.lowrisc.ibex.flash",
|
|
memmap[IBEX_FLASH].size, &error_fatal);
|
|
memory_region_add_subregion(sys_mem, memmap[IBEX_FLASH].base,
|
|
&s->flash_mem);
|
|
|
|
/* PLIC */
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->plic), errp)) {
|
|
return;
|
|
}
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->plic), 0, memmap[IBEX_PLIC].base);
|
|
|
|
/* UART */
|
|
qdev_prop_set_chr(DEVICE(&(s->uart)), "chardev", serial_hd(0));
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->uart), errp)) {
|
|
return;
|
|
}
|
|
sysbus_mmio_map(SYS_BUS_DEVICE(&s->uart), 0, memmap[IBEX_UART].base);
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart),
|
|
0, qdev_get_gpio_in(DEVICE(&s->plic),
|
|
IBEX_UART_TX_WATERMARK_IRQ));
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart),
|
|
1, qdev_get_gpio_in(DEVICE(&s->plic),
|
|
IBEX_UART_RX_WATERMARK_IRQ));
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart),
|
|
2, qdev_get_gpio_in(DEVICE(&s->plic),
|
|
IBEX_UART_TX_EMPTY_IRQ));
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->uart),
|
|
3, qdev_get_gpio_in(DEVICE(&s->plic),
|
|
IBEX_UART_RX_OVERFLOW_IRQ));
|
|
|
|
create_unimplemented_device("riscv.lowrisc.ibex.gpio",
|
|
memmap[IBEX_GPIO].base, memmap[IBEX_GPIO].size);
|
|
create_unimplemented_device("riscv.lowrisc.ibex.spi",
|
|
memmap[IBEX_SPI].base, memmap[IBEX_SPI].size);
|
|
create_unimplemented_device("riscv.lowrisc.ibex.flash_ctrl",
|
|
memmap[IBEX_FLASH_CTRL].base, memmap[IBEX_FLASH_CTRL].size);
|
|
create_unimplemented_device("riscv.lowrisc.ibex.rv_timer",
|
|
memmap[IBEX_RV_TIMER].base, memmap[IBEX_RV_TIMER].size);
|
|
create_unimplemented_device("riscv.lowrisc.ibex.pwrmgr",
|
|
memmap[IBEX_PWRMGR].base, memmap[IBEX_PWRMGR].size);
|
|
create_unimplemented_device("riscv.lowrisc.ibex.rstmgr",
|
|
memmap[IBEX_RSTMGR].base, memmap[IBEX_RSTMGR].size);
|
|
create_unimplemented_device("riscv.lowrisc.ibex.clkmgr",
|
|
memmap[IBEX_CLKMGR].base, memmap[IBEX_CLKMGR].size);
|
|
create_unimplemented_device("riscv.lowrisc.ibex.aes",
|
|
memmap[IBEX_AES].base, memmap[IBEX_AES].size);
|
|
create_unimplemented_device("riscv.lowrisc.ibex.hmac",
|
|
memmap[IBEX_HMAC].base, memmap[IBEX_HMAC].size);
|
|
create_unimplemented_device("riscv.lowrisc.ibex.pinmux",
|
|
memmap[IBEX_PINMUX].base, memmap[IBEX_PINMUX].size);
|
|
create_unimplemented_device("riscv.lowrisc.ibex.alert_handler",
|
|
memmap[IBEX_ALERT_HANDLER].base, memmap[IBEX_ALERT_HANDLER].size);
|
|
create_unimplemented_device("riscv.lowrisc.ibex.nmi_gen",
|
|
memmap[IBEX_NMI_GEN].base, memmap[IBEX_NMI_GEN].size);
|
|
create_unimplemented_device("riscv.lowrisc.ibex.usbdev",
|
|
memmap[IBEX_USBDEV].base, memmap[IBEX_USBDEV].size);
|
|
create_unimplemented_device("riscv.lowrisc.ibex.padctrl",
|
|
memmap[IBEX_PADCTRL].base, memmap[IBEX_PADCTRL].size);
|
|
}
|
|
|
|
static void lowrisc_ibex_soc_class_init(ObjectClass *oc, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
|
|
|
dc->realize = lowrisc_ibex_soc_realize;
|
|
/* Reason: Uses serial_hds in realize function, thus can't be used twice */
|
|
dc->user_creatable = false;
|
|
}
|
|
|
|
static const TypeInfo lowrisc_ibex_soc_type_info = {
|
|
.name = TYPE_RISCV_IBEX_SOC,
|
|
.parent = TYPE_DEVICE,
|
|
.instance_size = sizeof(LowRISCIbexSoCState),
|
|
.instance_init = lowrisc_ibex_soc_init,
|
|
.class_init = lowrisc_ibex_soc_class_init,
|
|
};
|
|
|
|
static void lowrisc_ibex_soc_register_types(void)
|
|
{
|
|
type_register_static(&lowrisc_ibex_soc_type_info);
|
|
}
|
|
|
|
type_init(lowrisc_ibex_soc_register_types)
|