[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/45] hw/arm: Use TYPE_OR_IRQ when connecting STM32L4x5 EXTI fan-
From: |
Peter Maydell |
Subject: |
[PULL 07/45] hw/arm: Use TYPE_OR_IRQ when connecting STM32L4x5 EXTI fan-in IRQs |
Date: |
Tue, 27 Feb 2024 13:32:36 +0000 |
From: Inès Varhol <ines.varhol@telecom-paris.fr>
Fixes: 52671f69f7a4 ("[PATCH v8 0/3] Add device STM32L4x5 EXTI")
Signed-off-by: Inès Varhol <ines.varhol@telecom-paris.fr>
Message-id: 20240220184145.106107-2-ines.varhol@telecom-paris.fr
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
include/hw/arm/stm32l4x5_soc.h | 4 ++
hw/arm/stm32l4x5_soc.c | 80 +++++++++++++++++++++++++++++-----
2 files changed, 74 insertions(+), 10 deletions(-)
diff --git a/include/hw/arm/stm32l4x5_soc.h b/include/hw/arm/stm32l4x5_soc.h
index baf70410b5f..4f314b7a933 100644
--- a/include/hw/arm/stm32l4x5_soc.h
+++ b/include/hw/arm/stm32l4x5_soc.h
@@ -26,6 +26,7 @@
#include "exec/memory.h"
#include "hw/arm/armv7m.h"
+#include "hw/or-irq.h"
#include "hw/misc/stm32l4x5_syscfg.h"
#include "hw/misc/stm32l4x5_exti.h"
#include "qom/object.h"
@@ -36,12 +37,15 @@
#define TYPE_STM32L4X5XG_SOC "stm32l4x5xg-soc"
OBJECT_DECLARE_TYPE(Stm32l4x5SocState, Stm32l4x5SocClass, STM32L4X5_SOC)
+#define NUM_EXTI_OR_GATES 4
+
struct Stm32l4x5SocState {
SysBusDevice parent_obj;
ARMv7MState armv7m;
Stm32l4x5ExtiState exti;
+ OrIRQState exti_or_gates[NUM_EXTI_OR_GATES];
Stm32l4x5SyscfgState syscfg;
MemoryRegion sram1;
diff --git a/hw/arm/stm32l4x5_soc.c b/hw/arm/stm32l4x5_soc.c
index f470ff74ec7..d1786e0da1c 100644
--- a/hw/arm/stm32l4x5_soc.c
+++ b/hw/arm/stm32l4x5_soc.c
@@ -26,6 +26,7 @@
#include "qapi/error.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
+#include "hw/or-irq.h"
#include "hw/arm/stm32l4x5_soc.h"
#include "hw/qdev-clock.h"
#include "hw/misc/unimp.h"
@@ -42,21 +43,24 @@
#define NUM_EXTI_IRQ 40
/* Match exti line connections with their CPU IRQ number */
/* See Vector Table (Reference Manual p.396) */
+/*
+ * Some IRQs are connected to the same CPU IRQ (denoted by -1)
+ * and require an intermediary OR gate to function correctly.
+ */
static const int exti_irq[NUM_EXTI_IRQ] = {
6, /* GPIO[0] */
7, /* GPIO[1] */
8, /* GPIO[2] */
9, /* GPIO[3] */
10, /* GPIO[4] */
- 23, 23, 23, 23, 23, /* GPIO[5..9] */
- 40, 40, 40, 40, 40, 40, /* GPIO[10..15] */
- 1, /* PVD */
+ -1, -1, -1, -1, -1, /* GPIO[5..9] OR gate 23 */
+ -1, -1, -1, -1, -1, -1, /* GPIO[10..15] OR gate 40 */
+ -1, /* PVD OR gate 1 */
67, /* OTG_FS_WKUP, Direct */
41, /* RTC_ALARM */
2, /* RTC_TAMP_STAMP2/CSS_LSE */
3, /* RTC wakeup timer */
- 63, /* COMP1 */
- 63, /* COMP2 */
+ -1, -1, /* COMP[1..2] OR gate 63 */
31, /* I2C1 wakeup, Direct */
33, /* I2C2 wakeup, Direct */
72, /* I2C3 wakeup, Direct */
@@ -69,18 +73,39 @@ static const int exti_irq[NUM_EXTI_IRQ] = {
65, /* LPTIM1, Direct */
66, /* LPTIM2, Direct */
76, /* SWPMI1 wakeup, Direct */
- 1, /* PVM1 wakeup */
- 1, /* PVM2 wakeup */
- 1, /* PVM3 wakeup */
- 1, /* PVM4 wakeup */
+ -1, -1, -1, -1, /* PVM[1..4] OR gate 1 */
78 /* LCD wakeup, Direct */
};
+static const int exti_or_gates_out[NUM_EXTI_OR_GATES] = {
+ 23, 40, 63, 1,
+};
+
+static const int exti_or_gates_num_lines_in[NUM_EXTI_OR_GATES] = {
+ 5, 6, 2, 5,
+};
+
+/* 3 OR gates with consecutive inputs */
+#define NUM_EXTI_SIMPLE_OR_GATES 3
+static const int exti_or_gates_first_line_in[NUM_EXTI_SIMPLE_OR_GATES] = {
+ 5, 10, 21,
+};
+
+/* 1 OR gate with non-consecutive inputs */
+#define EXTI_OR_GATE1_NUM_LINES_IN 5
+static const int exti_or_gate1_lines_in[EXTI_OR_GATE1_NUM_LINES_IN] = {
+ 16, 35, 36, 37, 38,
+};
+
static void stm32l4x5_soc_initfn(Object *obj)
{
Stm32l4x5SocState *s = STM32L4X5_SOC(obj);
object_initialize_child(obj, "exti", &s->exti, TYPE_STM32L4X5_EXTI);
+ for (unsigned i = 0; i < NUM_EXTI_OR_GATES; i++) {
+ object_initialize_child(obj, "exti_or_gates[*]", &s->exti_or_gates[i],
+ TYPE_OR_IRQ);
+ }
object_initialize_child(obj, "syscfg", &s->syscfg, TYPE_STM32L4X5_SYSCFG);
s->sysclk = qdev_init_clock_in(DEVICE(s), "sysclk", NULL, NULL, 0);
@@ -175,8 +200,43 @@ static void stm32l4x5_soc_realize(DeviceState *dev_soc,
Error **errp)
return;
}
sysbus_mmio_map(busdev, 0, EXTI_ADDR);
+
+ /* IRQs with fan-in that require an OR gate */
+ for (unsigned i = 0; i < NUM_EXTI_OR_GATES; i++) {
+ if (!object_property_set_int(OBJECT(&s->exti_or_gates[i]), "num-lines",
+ exti_or_gates_num_lines_in[i], errp)) {
+ return;
+ }
+ if (!qdev_realize(DEVICE(&s->exti_or_gates[i]), NULL, errp)) {
+ return;
+ }
+
+ qdev_connect_gpio_out(DEVICE(&s->exti_or_gates[i]), 0,
+ qdev_get_gpio_in(armv7m, exti_or_gates_out[i]));
+
+ if (i < NUM_EXTI_SIMPLE_OR_GATES) {
+ /* consecutive inputs for OR gates 23, 40, 63 */
+ for (unsigned j = 0; j < exti_or_gates_num_lines_in[i]; j++) {
+ sysbus_connect_irq(SYS_BUS_DEVICE(&s->exti),
+ exti_or_gates_first_line_in[i] + j,
+ qdev_get_gpio_in(DEVICE(&s->exti_or_gates[i]), j));
+ }
+ } else {
+ /* non-consecutive inputs for OR gate 1 */
+ for (unsigned j = 0; j < EXTI_OR_GATE1_NUM_LINES_IN; j++) {
+ sysbus_connect_irq(SYS_BUS_DEVICE(&s->exti),
+ exti_or_gate1_lines_in[j],
+ qdev_get_gpio_in(DEVICE(&s->exti_or_gates[i]), j));
+ }
+ }
+ }
+
+ /* IRQs that don't require fan-in */
for (unsigned i = 0; i < NUM_EXTI_IRQ; i++) {
- sysbus_connect_irq(busdev, i, qdev_get_gpio_in(armv7m, exti_irq[i]));
+ if (exti_irq[i] != -1) {
+ sysbus_connect_irq(busdev, i,
+ qdev_get_gpio_in(armv7m, exti_irq[i]));
+ }
}
for (unsigned i = 0; i < 16; i++) {
--
2.34.1
- [PULL 02/45] target/arm: Advertise Cortex-A53 erratum #843419 fix via REVIDR, (continued)
- [PULL 02/45] target/arm: Advertise Cortex-A53 erratum #843419 fix via REVIDR, Peter Maydell, 2024/02/27
- [PULL 03/45] MAINTAINERS: Cover hw/ide/ahci-allwinner.c with AllWinner A10 machine, Peter Maydell, 2024/02/27
- [PULL 08/45] tests/qtest: Check that EXTI fan-in irqs are correctly connected, Peter Maydell, 2024/02/27
- [PULL 10/45] block: m25p80: Add support of mt35xu02gbba, Peter Maydell, 2024/02/27
- [PULL 04/45] misc: m48t59: replace qemu_system_reset_request() call with watchdog_perform_action(), Peter Maydell, 2024/02/27
- [PULL 06/45] xlnx-versal-ospi: disable reentrancy detection for iomem_dac, Peter Maydell, 2024/02/27
- [PULL 18/45] hw/core/reset: Implement qemu_register_reset via qemu_register_resettable, Peter Maydell, 2024/02/27
- [PULL 17/45] hw/core/reset: Add qemu_{register, unregister}_resettable(), Peter Maydell, 2024/02/27
- [PULL 12/45] arm/ptw: Handle atomic updates of page tables entries in MMIO during PTW., Peter Maydell, 2024/02/27
- [PULL 15/45] hw/core: Add documentation and license comments to reset.h, Peter Maydell, 2024/02/27
- [PULL 07/45] hw/arm: Use TYPE_OR_IRQ when connecting STM32L4x5 EXTI fan-in IRQs,
Peter Maydell <=
- [PULL 11/45] arm: xlnx-versal-virt: Add machine property ospi-flash, Peter Maydell, 2024/02/27
- [PULL 13/45] system/bootdevice: Don't unregister reset handler in restore_boot_order(), Peter Maydell, 2024/02/27
- [PULL 21/45] hw/arm/bcm2836: Split out common part of BCM283X classes, Peter Maydell, 2024/02/27
- [PULL 25/45] hw/arm/bcm2838: Add GIC-400 to BCM2838 SoC, Peter Maydell, 2024/02/27
- [PULL 24/45] hw/arm: Introduce BCM2838 SoC, Peter Maydell, 2024/02/27
- [PULL 20/45] docs/devel/reset: Update to discuss system reset, Peter Maydell, 2024/02/27
- [PULL 30/45] hw/arm: Introduce Raspberry PI 4 machine, Peter Maydell, 2024/02/27
- [PULL 35/45] tests/qtest: Add bcm2838 mailbox test stub, Peter Maydell, 2024/02/27
- [PULL 22/45] hw/arm/bcm2853_peripherals: Split out common part of peripherals, Peter Maydell, 2024/02/27
- [PULL 39/45] tests/qtest/bcm2828-mailbox: Add mailbox tests tags. Part 3, Peter Maydell, 2024/02/27