| Message ID | 1503938283-12404-6-git-send-email-sundeep.lkml@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add support for Smartfusion2 SoC | expand |
Hi Subbaraya, On 08/28/2017 01:38 PM, Subbaraya Sundeep wrote: > Emulated Emcraft's Smartfusion2 System On Module starter > kit. > > Signed-off-by: Subbaraya Sundeep <sundeep.lkml@gmail.com> > --- > hw/arm/Makefile.objs | 2 +- > hw/arm/msf2-som.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 95 insertions(+), 1 deletion(-) > create mode 100644 hw/arm/msf2-som.c > > diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs > index df36a03..e81a7dc 100644 > --- a/hw/arm/Makefile.objs > +++ b/hw/arm/Makefile.objs > @@ -19,4 +19,4 @@ obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o > obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o > obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o > obj-$(CONFIG_MPS2) += mps2.o > -obj-$(CONFIG_MSF2) += msf2-soc.o > +obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.o > diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c > new file mode 100644 > index 0000000..fd89ba9 > --- /dev/null > +++ b/hw/arm/msf2-som.c > @@ -0,0 +1,94 @@ > +/* > + * SmartFusion2 SOM starter kit(from Emcraft) emulation. > + * > + * Copyright (c) 2017 Subbaraya Sundeep <sundeep.lkml@gmail.com> > + * > + * 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 "qemu/osdep.h" > +#include "qapi/error.h" > +#include "hw/boards.h" > +#include "hw/arm/arm.h" > +#include "exec/address-spaces.h" > +#include "qemu/cutils.h" > +#include "hw/arm/msf2-soc.h" > + > +#define DDR_BASE_ADDRESS 0xA0000000 > +#define DDR_SIZE (64 * M_BYTE) > + > +#define M2S010_ENVM_SIZE (256 * K_BYTE) > +#define M2S010_ESRAM_SIZE (64 * K_BYTE) > + > +static void emcraft_sf2_init(MachineState *machine) Since Emcraft can produce an upgraded SF2 SoC based on a different MCU, I prefer you rename it: static void emcraft_sf2_s2s010_init(MachineState *machine) > +{ > + DeviceState *dev; > + DeviceState *spi_flash; > + MSF2State *soc; > + DriveInfo *dinfo = drive_get_next(IF_MTD); > + qemu_irq cs_line; > + SSIBus *spi_bus; > + MemoryRegion *sysmem = get_system_memory(); > + MemoryRegion *ddr = g_new(MemoryRegion, 1); > + > + memory_region_init_ram(ddr, NULL, "ddr-ram", DDR_SIZE, > + &error_fatal); > + memory_region_add_subregion(sysmem, DDR_BASE_ADDRESS, ddr); > + > + dev = qdev_create(NULL, TYPE_MSF2_SOC); > + qdev_prop_set_string(dev, "part-name", "M2S010"); > + qdev_prop_set_uint64(dev, "eNVM-size", M2S010_ENVM_SIZE); > + qdev_prop_set_uint64(dev, "eSRAM-size", M2S010_ESRAM_SIZE); > + > + /* > + * CPU clock and peripheral clocks(APB0, APB1)are configurable > + * in Libero. CPU clock is divided by APB0 and APB1 divisors for > + * peripherals. Emcraft's SoM kit comes with these settings by default. > + */ > + qdev_prop_set_uint32(dev, "m3clk", 142 * 1000000); > + qdev_prop_set_uint32(dev, "apb0div", 2); > + qdev_prop_set_uint32(dev, "apb1div", 2); > + > + object_property_set_bool(OBJECT(dev), true, "realized", &error_fatal); > + > + soc = MSF2_SOC(dev); > + > + /* Attach SPI flash to SPI0 controller */ > + spi_bus = (SSIBus *)qdev_get_child_bus(dev, "spi0"); > + spi_flash = ssi_create_slave_no_init(spi_bus, "s25sl12801"); > + qdev_prop_set_uint8(spi_flash, "spansion-cr2nv", 1); > + if (dinfo) { > + qdev_prop_set_drive(spi_flash, "drive", blk_by_legacy_dinfo(dinfo), > + &error_fatal); > + } > + qdev_init_nofail(spi_flash); > + cs_line = qdev_get_gpio_in_named(spi_flash, SSI_GPIO_CS, 0); > + sysbus_connect_irq(SYS_BUS_DEVICE(&soc->spi[0]), 1, cs_line); > + > + armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, > + soc->envm_size); > +} > + > +static void emcraft_sf2_machine_init(MachineClass *mc) > +{ > + mc->desc = "SmartFusion2 SOM kit from Emcraft"; mc->desc = "SmartFusion2 SOM kit from Emcraft (M2S010)"; > + mc->init = emcraft_sf2_init; mc->init = emcraft_sf2_s2s010_init; > +} > + > +DEFINE_MACHINE("emcraft-sf2", emcraft_sf2_machine_init) Good work :) With the changes: Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Hi Philippe, On Wed, Aug 30, 2017 at 7:18 AM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > Hi Subbaraya, > > > On 08/28/2017 01:38 PM, Subbaraya Sundeep wrote: > >> Emulated Emcraft's Smartfusion2 System On Module starter >> kit. >> >> Signed-off-by: Subbaraya Sundeep <sundeep.lkml@gmail.com> >> --- >> hw/arm/Makefile.objs | 2 +- >> hw/arm/msf2-som.c | 94 ++++++++++++++++++++++++++++++ >> ++++++++++++++++++++++ >> 2 files changed, 95 insertions(+), 1 deletion(-) >> create mode 100644 hw/arm/msf2-som.c >> >> diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs >> index df36a03..e81a7dc 100644 >> --- a/hw/arm/Makefile.objs >> +++ b/hw/arm/Makefile.objs >> @@ -19,4 +19,4 @@ obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o >> obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o >> obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o >> obj-$(CONFIG_MPS2) += mps2.o >> -obj-$(CONFIG_MSF2) += msf2-soc.o >> +obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.o >> diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c >> new file mode 100644 >> index 0000000..fd89ba9 >> --- /dev/null >> +++ b/hw/arm/msf2-som.c >> @@ -0,0 +1,94 @@ >> +/* >> + * SmartFusion2 SOM starter kit(from Emcraft) emulation. >> + * >> + * Copyright (c) 2017 Subbaraya Sundeep <sundeep.lkml@gmail.com> >> + * >> + * 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 "qemu/osdep.h" >> +#include "qapi/error.h" >> +#include "hw/boards.h" >> +#include "hw/arm/arm.h" >> +#include "exec/address-spaces.h" >> +#include "qemu/cutils.h" >> +#include "hw/arm/msf2-soc.h" >> + >> +#define DDR_BASE_ADDRESS 0xA0000000 >> +#define DDR_SIZE (64 * M_BYTE) >> + >> +#define M2S010_ENVM_SIZE (256 * K_BYTE) >> +#define M2S010_ESRAM_SIZE (64 * K_BYTE) >> + >> +static void emcraft_sf2_init(MachineState *machine) >> > > Since Emcraft can produce an upgraded SF2 SoC based on a different MCU, I > prefer you rename it: > > static void emcraft_sf2_s2s010_init(MachineState *machine) Ok will change. > > > +{ >> + DeviceState *dev; >> + DeviceState *spi_flash; >> + MSF2State *soc; >> + DriveInfo *dinfo = drive_get_next(IF_MTD); >> + qemu_irq cs_line; >> + SSIBus *spi_bus; >> + MemoryRegion *sysmem = get_system_memory(); >> + MemoryRegion *ddr = g_new(MemoryRegion, 1); >> + >> + memory_region_init_ram(ddr, NULL, "ddr-ram", DDR_SIZE, >> + &error_fatal); >> + memory_region_add_subregion(sysmem, DDR_BASE_ADDRESS, ddr); >> + >> + dev = qdev_create(NULL, TYPE_MSF2_SOC); >> + qdev_prop_set_string(dev, "part-name", "M2S010"); >> + qdev_prop_set_uint64(dev, "eNVM-size", M2S010_ENVM_SIZE); >> + qdev_prop_set_uint64(dev, "eSRAM-size", M2S010_ESRAM_SIZE); >> + >> + /* >> + * CPU clock and peripheral clocks(APB0, APB1)are configurable >> + * in Libero. CPU clock is divided by APB0 and APB1 divisors for >> + * peripherals. Emcraft's SoM kit comes with these settings by >> default. >> + */ >> + qdev_prop_set_uint32(dev, "m3clk", 142 * 1000000); >> + qdev_prop_set_uint32(dev, "apb0div", 2); >> + qdev_prop_set_uint32(dev, "apb1div", 2); >> + >> + object_property_set_bool(OBJECT(dev), true, "realized", >> &error_fatal); >> + >> + soc = MSF2_SOC(dev); >> + >> + /* Attach SPI flash to SPI0 controller */ >> + spi_bus = (SSIBus *)qdev_get_child_bus(dev, "spi0"); >> + spi_flash = ssi_create_slave_no_init(spi_bus, "s25sl12801"); >> + qdev_prop_set_uint8(spi_flash, "spansion-cr2nv", 1); >> + if (dinfo) { >> + qdev_prop_set_drive(spi_flash, "drive", >> blk_by_legacy_dinfo(dinfo), >> + &error_fatal); >> + } >> + qdev_init_nofail(spi_flash); >> + cs_line = qdev_get_gpio_in_named(spi_flash, SSI_GPIO_CS, 0); >> + sysbus_connect_irq(SYS_BUS_DEVICE(&soc->spi[0]), 1, cs_line); >> + >> + armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, >> + soc->envm_size); >> +} >> + >> +static void emcraft_sf2_machine_init(MachineClass *mc) >> +{ >> + mc->desc = "SmartFusion2 SOM kit from Emcraft"; >> > > mc->desc = "SmartFusion2 SOM kit from Emcraft (M2S010)"; > > + mc->init = emcraft_sf2_init; >> > > mc->init = emcraft_sf2_s2s010_init; > > +} >> + >> +DEFINE_MACHINE("emcraft-sf2", emcraft_sf2_machine_init) >> > > Good work :) > With the changes: > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Thank you :) Sundeep
diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index df36a03..e81a7dc 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -19,4 +19,4 @@ obj-$(CONFIG_FSL_IMX31) += fsl-imx31.o kzm.o obj-$(CONFIG_FSL_IMX6) += fsl-imx6.o sabrelite.o obj-$(CONFIG_ASPEED_SOC) += aspeed_soc.o aspeed.o obj-$(CONFIG_MPS2) += mps2.o -obj-$(CONFIG_MSF2) += msf2-soc.o +obj-$(CONFIG_MSF2) += msf2-soc.o msf2-som.o diff --git a/hw/arm/msf2-som.c b/hw/arm/msf2-som.c new file mode 100644 index 0000000..fd89ba9 --- /dev/null +++ b/hw/arm/msf2-som.c @@ -0,0 +1,94 @@ +/* + * SmartFusion2 SOM starter kit(from Emcraft) emulation. + * + * Copyright (c) 2017 Subbaraya Sundeep <sundeep.lkml@gmail.com> + * + * 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 "qemu/osdep.h" +#include "qapi/error.h" +#include "hw/boards.h" +#include "hw/arm/arm.h" +#include "exec/address-spaces.h" +#include "qemu/cutils.h" +#include "hw/arm/msf2-soc.h" + +#define DDR_BASE_ADDRESS 0xA0000000 +#define DDR_SIZE (64 * M_BYTE) + +#define M2S010_ENVM_SIZE (256 * K_BYTE) +#define M2S010_ESRAM_SIZE (64 * K_BYTE) + +static void emcraft_sf2_init(MachineState *machine) +{ + DeviceState *dev; + DeviceState *spi_flash; + MSF2State *soc; + DriveInfo *dinfo = drive_get_next(IF_MTD); + qemu_irq cs_line; + SSIBus *spi_bus; + MemoryRegion *sysmem = get_system_memory(); + MemoryRegion *ddr = g_new(MemoryRegion, 1); + + memory_region_init_ram(ddr, NULL, "ddr-ram", DDR_SIZE, + &error_fatal); + memory_region_add_subregion(sysmem, DDR_BASE_ADDRESS, ddr); + + dev = qdev_create(NULL, TYPE_MSF2_SOC); + qdev_prop_set_string(dev, "part-name", "M2S010"); + qdev_prop_set_uint64(dev, "eNVM-size", M2S010_ENVM_SIZE); + qdev_prop_set_uint64(dev, "eSRAM-size", M2S010_ESRAM_SIZE); + + /* + * CPU clock and peripheral clocks(APB0, APB1)are configurable + * in Libero. CPU clock is divided by APB0 and APB1 divisors for + * peripherals. Emcraft's SoM kit comes with these settings by default. + */ + qdev_prop_set_uint32(dev, "m3clk", 142 * 1000000); + qdev_prop_set_uint32(dev, "apb0div", 2); + qdev_prop_set_uint32(dev, "apb1div", 2); + + object_property_set_bool(OBJECT(dev), true, "realized", &error_fatal); + + soc = MSF2_SOC(dev); + + /* Attach SPI flash to SPI0 controller */ + spi_bus = (SSIBus *)qdev_get_child_bus(dev, "spi0"); + spi_flash = ssi_create_slave_no_init(spi_bus, "s25sl12801"); + qdev_prop_set_uint8(spi_flash, "spansion-cr2nv", 1); + if (dinfo) { + qdev_prop_set_drive(spi_flash, "drive", blk_by_legacy_dinfo(dinfo), + &error_fatal); + } + qdev_init_nofail(spi_flash); + cs_line = qdev_get_gpio_in_named(spi_flash, SSI_GPIO_CS, 0); + sysbus_connect_irq(SYS_BUS_DEVICE(&soc->spi[0]), 1, cs_line); + + armv7m_load_kernel(ARM_CPU(first_cpu), machine->kernel_filename, + soc->envm_size); +} + +static void emcraft_sf2_machine_init(MachineClass *mc) +{ + mc->desc = "SmartFusion2 SOM kit from Emcraft"; + mc->init = emcraft_sf2_init; +} + +DEFINE_MACHINE("emcraft-sf2", emcraft_sf2_machine_init)
Emulated Emcraft's Smartfusion2 System On Module starter kit. Signed-off-by: Subbaraya Sundeep <sundeep.lkml@gmail.com> --- hw/arm/Makefile.objs | 2 +- hw/arm/msf2-som.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 hw/arm/msf2-som.c