Signed-off-by: Roman Cardenas Rodriguez <rcardenas....@gmail.com> --- hw/arm/Kconfig | 1 + hw/arm/stm32f405_soc.c | 40 ++++++++++++++++++++++++++-------- hw/misc/stm32f4xx_syscfg.c | 24 ++++++++++++-------- include/hw/arm/stm32f405_soc.h | 3 +++ 4 files changed, 50 insertions(+), 18 deletions(-)
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig index 0629f47cb3..031fbe0934 100644 --- a/hw/arm/Kconfig +++ b/hw/arm/Kconfig @@ -467,6 +467,7 @@ config STM32F405_SOC select ARM_V7M select OR_IRQ select STM32_RCC + select STM32_GPIO select STM32F4XX_SYSCFG select STM32F4XX_EXTI diff --git a/hw/arm/stm32f405_soc.c b/hw/arm/stm32f405_soc.c index 72ae62156f..1ea5c8314d 100644 --- a/hw/arm/stm32f405_soc.c +++ b/hw/arm/stm32f405_soc.c @@ -26,6 +26,7 @@ #include "qapi/error.h" #include "exec/address-spaces.h" #include "sysemu/sysemu.h" +#include "hw/arm/stm32.h" #include "hw/arm/stm32f405_soc.h" #include "hw/qdev-clock.h" #include "hw/misc/unimp.h" @@ -43,6 +44,7 @@ static const uint32_t adc_addr[] = { 0x40012000, 0x40012100, 0x40012200, static const uint32_t spi_addr[] = { 0x40013000, 0x40003800, 0x40003C00, 0x40013400, 0x40015000, 0x40015400 }; #define EXTI_ADDR 0x40013C00 +#define GPIO_ADDR 0x40020000 #define SYSCFG_IRQ 71 static const int usart_irq[] = { 37, 38, 39, 52, 53, 71, 82, 83 }; @@ -82,6 +84,10 @@ static void stm32f405_soc_initfn(Object *obj) object_initialize_child(obj, "spi[*]", &s->spi[i], TYPE_STM32F2XX_SPI); } + for (i = STM32_GPIO_PORT_A; i <= STM32_GPIO_PORT_I; i++) { + object_initialize_child(obj, "gpio[*]", &s->gpio[i], TYPE_STM32_GPIO); + } + object_initialize_child(obj, "exti", &s->exti, TYPE_STM32F4XX_EXTI); s->sysclk = qdev_init_clock_in(DEVICE(s), "sysclk", NULL, NULL, 0); @@ -240,6 +246,31 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp) sysbus_connect_irq(busdev, 0, qdev_get_gpio_in(armv7m, spi_irq[i])); } + /* GPIO devices */ + for (i = STM32_GPIO_PORT_A; i <= STM32_GPIO_PORT_I; i++) { + dev = DEVICE(&(s->gpio[i])); + qdev_prop_set_uint32(dev, "family", STM32_F4); + qdev_prop_set_uint32(dev, "port", i); + qdev_prop_set_uint32(dev, "ngpio", STM32_GPIO_NPINS); + if (!sysbus_realize(SYS_BUS_DEVICE(&s->gpio[i]), errp)) { + return; + } + busdev = SYS_BUS_DEVICE(dev); + sysbus_mmio_map(busdev, 0, + GPIO_ADDR + (i * STM32_GPIO_PERIPHERAL_SIZE)); + + qdev_connect_gpio_out(DEVICE(&s->rcc), STM32_RCC_GPIO_IRQ_OFFSET + i, + qdev_get_gpio_in_named(dev, "reset-in", 0)); + qdev_connect_gpio_out(DEVICE(&s->rcc), + STM32_RCC_GPIO_IRQ_OFFSET + i + STM32_RCC_NIRQS, + qdev_get_gpio_in_named(dev, "enable-in", 0)); + for (int j = 0; j < STM32_GPIO_NPINS; j++) { + qdev_connect_gpio_out_named(dev, "input-out", j, + qdev_get_gpio_in(DEVICE(&s->syscfg), + i * STM32_GPIO_NPINS + j)); + } + } + /* EXTI device */ dev = DEVICE(&s->exti); if (!sysbus_realize(SYS_BUS_DEVICE(&s->exti), errp)) { @@ -277,15 +308,6 @@ static void stm32f405_soc_realize(DeviceState *dev_soc, Error **errp) create_unimplemented_device("timer[9]", 0x40014000, 0x400); create_unimplemented_device("timer[10]", 0x40014400, 0x400); create_unimplemented_device("timer[11]", 0x40014800, 0x400); - create_unimplemented_device("GPIOA", 0x40020000, 0x400); - create_unimplemented_device("GPIOB", 0x40020400, 0x400); - create_unimplemented_device("GPIOC", 0x40020800, 0x400); - create_unimplemented_device("GPIOD", 0x40020C00, 0x400); - create_unimplemented_device("GPIOE", 0x40021000, 0x400); - create_unimplemented_device("GPIOF", 0x40021400, 0x400); - create_unimplemented_device("GPIOG", 0x40021800, 0x400); - create_unimplemented_device("GPIOH", 0x40021C00, 0x400); - create_unimplemented_device("GPIOI", 0x40022000, 0x400); create_unimplemented_device("CRC", 0x40023000, 0x400); create_unimplemented_device("Flash Int", 0x40023C00, 0x400); create_unimplemented_device("BKPSRAM", 0x40024000, 0x400); diff --git a/hw/misc/stm32f4xx_syscfg.c b/hw/misc/stm32f4xx_syscfg.c index 7d0f3eb5f5..d42e6821db 100644 --- a/hw/misc/stm32f4xx_syscfg.c +++ b/hw/misc/stm32f4xx_syscfg.c @@ -27,6 +27,7 @@ #include "trace.h" #include "hw/irq.h" #include "migration/vmstate.h" +#include "hw/gpio/stm32_gpio.h" #include "hw/misc/stm32f4xx_syscfg.h" static void stm32f4xx_syscfg_reset(DeviceState *dev) @@ -45,17 +46,21 @@ static void stm32f4xx_syscfg_reset(DeviceState *dev) static void stm32f4xx_syscfg_set_irq(void *opaque, int irq, int level) { STM32F4xxSyscfgState *s = opaque; - int icrreg = irq / 4; - int startbit = (irq & 3) * 4; - uint8_t config = irq / 16; + uint8_t pin = irq & 0xF; /* first 4 bits encode the pin number */ + uint8_t port = irq >> 4; /* the rest encode the port number */ - trace_stm32f4xx_syscfg_set_irq(irq / 16, irq % 16, level); + g_assert(port <= STM32_GPIO_PORT_I); /* stm32f4 only has ports A-I */ + + int icrreg = pin / 4; + int startbit = (pin % 4) * 4; + + trace_stm32f4xx_syscfg_set_irq(port, pin, level); g_assert(icrreg < SYSCFG_NUM_EXTICR); - if (extract32(s->syscfg_exticr[icrreg], startbit, 4) == config) { - qemu_set_irq(s->gpio_out[irq], level); - trace_stm32f4xx_pulse_exti(irq); + if (extract32(s->syscfg_exticr[icrreg], startbit, 4) == port) { + qemu_set_irq(s->gpio_out[pin], level); + trace_stm32f4xx_pulse_exti(pin); } } @@ -129,8 +134,9 @@ static void stm32f4xx_syscfg_init(Object *obj) TYPE_STM32F4XX_SYSCFG, 0x400); sysbus_init_mmio(SYS_BUS_DEVICE(obj), &s->mmio); - qdev_init_gpio_in(DEVICE(obj), stm32f4xx_syscfg_set_irq, 16 * 9); - qdev_init_gpio_out(DEVICE(obj), s->gpio_out, 16); + qdev_init_gpio_in(DEVICE(obj), stm32f4xx_syscfg_set_irq, + STM32_GPIO_NPINS * (STM32_GPIO_PORT_I + 1)); + qdev_init_gpio_out(DEVICE(obj), s->gpio_out, STM32_GPIO_NPINS); } static const VMStateDescription vmstate_stm32f4xx_syscfg = { diff --git a/include/hw/arm/stm32f405_soc.h b/include/hw/arm/stm32f405_soc.h index 2eeada64de..62072815a7 100644 --- a/include/hw/arm/stm32f405_soc.h +++ b/include/hw/arm/stm32f405_soc.h @@ -26,6 +26,7 @@ #define HW_ARM_STM32F405_SOC_H #include "hw/misc/stm32_rcc.h" +#include "hw/gpio/stm32_gpio.h" #include "hw/misc/stm32f4xx_syscfg.h" #include "hw/timer/stm32f2xx_timer.h" #include "hw/char/stm32f2xx_usart.h" @@ -43,6 +44,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(STM32F405State, STM32F405_SOC) #define STM_NUM_TIMERS 4 #define STM_NUM_ADCS 6 #define STM_NUM_SPIS 6 +#define STM_NUM_GPIOS (STM32_GPIO_PORT_I - STM32_GPIO_PORT_A + 1) #define FLASH_BASE_ADDRESS 0x08000000 #define FLASH_SIZE (1024 * 1024) @@ -64,6 +66,7 @@ struct STM32F405State { OrIRQState adc_irqs; STM32F2XXADCState adc[STM_NUM_ADCS]; STM32F2XXSPIState spi[STM_NUM_SPIS]; + STM32GPIOState gpio[STM_NUM_GPIOS]; MemoryRegion ccm; MemoryRegion sram; -- 2.39.3 (Apple Git-146)