Re: [Qemu-devel] [PATCH v5 6/7] stm32f205: Add the stm32f205 SoC

[Alistair Francis]

On Mon, Oct 20, 2014 at 5:47 PM, Peter Crosthwaite
<address@hidden> wrote:
> On Thu, Oct 16, 2014 at 10:54 PM, Alistair Francis <address@hidden> wrote:
>> This patch adds the stm32f205 SoC. This will be used by the
>> Netduino 2 to create a machine.
>>
>> Signed-off-by: Alistair Francis <address@hidden>
>> ---
>>  default-configs/arm-softmmu.mak |   1 +
>>  hw/arm/Makefile.objs            |   1 +
>>  hw/arm/stm32f205_soc.c          | 157 
>> ++++++++++++++++++++++++++++++++++++++++
>>  include/hw/arm/stm32f205_soc.h  |  69 ++++++++++++++++++
>>  4 files changed, 228 insertions(+)
>>  create mode 100644 hw/arm/stm32f205_soc.c
>>  create mode 100644 include/hw/arm/stm32f205_soc.h
>>
>> diff --git a/default-configs/arm-softmmu.mak 
>> b/default-configs/arm-softmmu.mak
>> index a2ea8f7..8068100 100644
>> --- a/default-configs/arm-softmmu.mak
>> +++ b/default-configs/arm-softmmu.mak
>> @@ -81,6 +81,7 @@ CONFIG_ZYNQ=y
>>  CONFIG_STM32F205_TIMER=y
>>  CONFIG_STM32F205_USART=y
>>  CONFIG_STM32F205_SYSCFG=y
>> +CONFIG_STM32F205_SOC=y
>>
>>  CONFIG_VERSATILE_PCI=y
>>  CONFIG_VERSATILE_I2C=y
>> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs
>> index 6088e53..9769317 100644
>> --- a/hw/arm/Makefile.objs
>> +++ b/hw/arm/Makefile.objs
>> @@ -8,3 +8,4 @@ obj-y += armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o 
>> pxa2xx_pic.o
>>  obj-$(CONFIG_DIGIC) += digic.o
>>  obj-y += omap1.o omap2.o strongarm.o
>>  obj-$(CONFIG_ALLWINNER_A10) += allwinner-a10.o cubieboard.o
>> +obj-$(CONFIG_STM32F205_SOC) += stm32f205_soc.o
>> diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c
>> new file mode 100644
>> index 0000000..bd9514e
>> --- /dev/null
>> +++ b/hw/arm/stm32f205_soc.c
>> @@ -0,0 +1,157 @@
>> +/*
>> + * STM32F205 SoC
>> + *
>> + * Copyright (c) 2014 Alistair Francis <address@hidden>
>> + *
>> + * 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.
>> + */
>> +
>> +#include "hw/arm/stm32f205_soc.h"
>> +
>> +/* At the moment only Timer 2 to 5 are modelled */
>> +static const uint32_t timer_addr[] = { 0x40000000, 0x40000400,
>> +    0x40000800, 0x40000C00 };
>> +static const uint32_t usart_addr[] = { 0x40011000, 0x40004400,
>> +    0x40004800, 0x40004C00, 0x40005000, 0x40011400 };
>> +
>
> You have 6 addresses for USART ...
>
>> +static const int timer_irq[] = {28, 29, 30, 50};
>> +static const int usart_irq[] = {37, 38, 39, 52, 53, 71, 82, 83};
>> +
>
> ... but 8 IRQS and the loop below uses only 5 values. What's the system 
> exactly?

These must be left over from the Netduino Plus 2. I think it's just
the first five, but I'll
double check and fix in a respin

>
>> +static void stm32f205_soc_initfn(Object *obj)
>> +{
>> +    STM32F205State *s = STM32F205_SOC(obj);
>> +    int i;
>> +
>> +    object_initialize(&s->syscfg, sizeof(s->syscfg), TYPE_STM32F205_SYSCFG);
>> +    qdev_set_parent_bus(DEVICE(&s->syscfg), sysbus_get_default());
>> +
>> +    for (i = 0; i < 5; i++) {
>> +        object_initialize(&s->usart[i], sizeof(s->usart[i]),
>> +                          TYPE_STM32F205_USART);
>> +        qdev_set_parent_bus(DEVICE(&s->usart[i]), sysbus_get_default());
>> +    }
>> +
>> +    for (i = 0; i < 4; i++) {
>> +        object_initialize(&s->timer[i], sizeof(s->timer[i]),
>> +                          TYPE_STM32F205_TIMER);
>> +        qdev_set_parent_bus(DEVICE(&s->timer[i]), sysbus_get_default());
>> +    }
>> +}
>> +
>> +static void stm32f205_soc_realize(DeviceState *dev_soc, Error **errp)
>> +{
>> +    STM32F205State *s = STM32F205_SOC(dev_soc);
>> +    DeviceState *syscfgdev, *usartdev, *timerdev;
>> +    SysBusDevice *syscfgbusdev, *usartbusdev, *timerbusdev;
>> +    qemu_irq *pic;;
>
> stray ;

Will fix

>
>> +    Error *err = NULL;
>> +    int i;
>> +
>> +    MemoryRegion *system_memory = get_system_memory();
>> +    MemoryRegion *sram = g_new(MemoryRegion, 1);
>> +    MemoryRegion *flash = g_new(MemoryRegion, 1);
>> +    MemoryRegion *flash_alias = g_new(MemoryRegion, 1);
>> +
>> +    memory_region_init_ram(flash, NULL, "netduino.flash", FLASH_SIZE,
>> +                           &error_abort);
>> +    memory_region_init_alias(flash_alias, NULL, "netduino.flash.alias",
>> +                             flash, 0, FLASH_SIZE);
>> +
>> +    vmstate_register_ram_global(flash);
>> +
>> +    memory_region_set_readonly(flash, true);
>> +    memory_region_set_readonly(flash_alias, true);
>> +
>> +    memory_region_add_subregion(system_memory, FLASH_BASE_ADDRESS, flash);
>> +    memory_region_add_subregion(system_memory, 0, flash_alias);
>> +
>> +    memory_region_init_ram(sram, NULL, "netduino.sram", SRAM_SIZE,
>> +                           &error_abort);
>
> There shouldn't be any refs to "netduino" like this.

Ok, I will remove

Thanks,

Alistair

>
> Regards,
> Peter
>
>> +    vmstate_register_ram_global(sram);
>> +    memory_region_add_subregion(system_memory, SRAM_BASE_ADDRESS, sram);
>> +
>> +    pic = armv7m_init(get_system_memory(), FLASH_SIZE, 96,
>> +                      s->kernel_filename, s->cpu_model);
>> +
>> +    /* System configuration controller */
>> +    syscfgdev = DEVICE(&s->syscfg);
>> +    object_property_set_bool(OBJECT(&s->syscfg), true, "realized", &err);
>> +    if (err != NULL) {
>> +        error_propagate(errp, err);
>> +        return;
>> +    }
>> +    syscfgbusdev = SYS_BUS_DEVICE(syscfgdev);
>> +    sysbus_mmio_map(syscfgbusdev, 0, 0x40013800);
>> +    sysbus_connect_irq(syscfgbusdev, 0, pic[71]);
>> +
>> +    /* Attach UART (uses USART registers) and USART controllers */
>> +    for (i = 0; i < 5; i++) {
>> +        usartdev = DEVICE(&(s->usart[i]));
>> +        object_property_set_bool(OBJECT(&s->usart[i]), true, "realized", 
>> &err);
>> +        if (err != NULL) {
>> +            error_propagate(errp, err);
>> +            return;
>> +        }
>> +        usartbusdev = SYS_BUS_DEVICE(usartdev);
>> +        sysbus_mmio_map(usartbusdev, 0, usart_addr[i]);
>> +        sysbus_connect_irq(usartbusdev, 0, pic[usart_irq[i]]);
>> +    }
>> +
>> +    /* Timer 2 to 5 */
>> +    for (i = 0; i < 4; i++) {
>> +        timerdev = DEVICE(&(s->timer[i]));
>> +        qdev_prop_set_uint64(timerdev, "clock-frequency", 1000000000);
>> +        object_property_set_bool(OBJECT(&s->timer[i]), true, "realized", 
>> &err);
>> +        if (err != NULL) {
>> +            error_propagate(errp, err);
>> +            return;
>> +        }
>> +        timerbusdev = SYS_BUS_DEVICE(timerdev);
>> +        sysbus_mmio_map(timerbusdev, 0, timer_addr[i]);
>> +        sysbus_connect_irq(timerbusdev, 0, pic[timer_irq[i]]);
>> +    }
>> +}
>> +
>> +static Property stm32f205_soc_properties[] = {
>> +    DEFINE_PROP_STRING("kernel-filename", STM32F205State, kernel_filename),
>> +    DEFINE_PROP_END_OF_LIST(),
>> +};
>> +
>> +static void stm32f205_soc_class_init(ObjectClass *klass, void *data)
>> +{
>> +    DeviceClass *dc = DEVICE_CLASS(klass);
>> +
>> +    dc->realize = stm32f205_soc_realize;
>> +    dc->props = stm32f205_soc_properties;
>> +}
>> +
>> +static const TypeInfo stm32f205_soc_info = {
>> +    .name          = TYPE_STM32F205_SOC,
>> +    .parent        = TYPE_SYS_BUS_DEVICE,
>> +    .instance_size = sizeof(STM32F205State),
>> +    .instance_init = stm32f205_soc_initfn,
>> +    .class_init    = stm32f205_soc_class_init,
>> +};
>> +
>> +static void stm32f205_soc_types(void)
>> +{
>> +    type_register_static(&stm32f205_soc_info);
>> +}
>> +
>> +type_init(stm32f205_soc_types)
>> diff --git a/include/hw/arm/stm32f205_soc.h b/include/hw/arm/stm32f205_soc.h
>> new file mode 100644
>> index 0000000..addc555
>> --- /dev/null
>> +++ b/include/hw/arm/stm32f205_soc.h
>> @@ -0,0 +1,69 @@
>> +/*
>> + * STM32F205 SoC
>> + *
>> + * Copyright (c) 2014 Alistair Francis <address@hidden>
>> + *
>> + * 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.
>> + */
>> +
>> +#ifndef HW_ARM_STM32F205SOC_H
>> +#define HW_ARM_STM32F205SOC_H
>> +
>> +#include "hw/sysbus.h"
>> +#include "hw/arm/arm.h"
>> +#include "hw/ssi.h"
>> +#include "hw/devices.h"
>> +#include "qemu/timer.h"
>> +#include "net/net.h"
>> +#include "elf.h"
>> +#include "hw/loader.h"
>> +#include "hw/boards.h"
>> +#include "exec/address-spaces.h"
>> +#include "qemu/error-report.h"
>> +#include "sysemu/qtest.h"
>> +#include "hw/misc/stm32f205_syscfg.h"
>> +#include "hw/timer/stm32f205_timer.h"
>> +#include "hw/char/stm32f205_usart.h"
>> +
>> +#define TYPE_STM32F205_SOC "stm32f205_soc"
>> +#define STM32F205_SOC(obj) \
>> +    OBJECT_CHECK(STM32F205State, (obj), TYPE_STM32F205_SOC)
>> +
>> +#define STM_NUM_USARTS 5
>> +#define STM_NUM_TIMERS 5
>> +
>> +#define FLASH_BASE_ADDRESS 0x08000000
>> +#define FLASH_SIZE (1024 * 1024)
>> +#define SRAM_BASE_ADDRESS 0x20000000
>> +#define SRAM_SIZE (128 * 1024)
>> +
>> +typedef struct STM32F205State {
>> +    /*< private >*/
>> +    SysBusDevice parent_obj;
>> +    /*< public >*/
>> +
>> +    char *kernel_filename;
>> +    char *cpu_model;
>> +
>> +    STM32f205SyscfgState syscfg;
>> +    STM32f205UsartState usart[STM_NUM_USARTS];
>> +    STM32f205TimerState timer[STM_NUM_TIMERS];
>> +} STM32F205State;
>> +
>> +#endif
>> --
>> 1.9.1
>>
>>