From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6A789D6AB10 for ; Thu, 2 Apr 2026 22:01:54 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1w8Q2Z-00006P-Ju; Thu, 02 Apr 2026 17:57:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1w8Q2O-0008RG-PB for qemu-arm@nongnu.org; Thu, 02 Apr 2026 17:57:16 -0400 Received: from mail-ej1-x633.google.com ([2a00:1450:4864:20::633]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1w8Q2M-0007AK-SE for qemu-arm@nongnu.org; Thu, 02 Apr 2026 17:57:16 -0400 Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-b9b1ffbb9f5so154423966b.2 for ; Thu, 02 Apr 2026 14:57:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775167033; x=1775771833; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7wwyEKp+01Czgx6hMOiu7U9RUmG9r7Ino8NfNmLre3Q=; b=hJTx89Rmc1d/z+24efKjQZwMzn994uitYnp5u7C0clajh5Sq8o1Pb4N1rwutCEByHv TgugYBbk+Llj3F/xd/HGAid9Il0MZg4YvXkE1l4gPS7+S7WK7x9eenIRhf/ME4oB2iwM EgdPd5v+VQUJqQI73Ebl6l4NKC8Ks2vB+HEnihMmcZVGWgh2ZUFYmomoXs3Wom4dkRNk H30JDBxadrlIl4+NkniSVgjc/83JxcOfl1m/KbyUsQQeWw44fKCen3SVqQgGU1impB4I kQtvw+bJUxKDvbkCYT3nSvmxum/ghDCdWtrsQ4imMArDRAq5K1GSQZx4aJS4WtC2EnyI ahIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775167033; x=1775771833; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7wwyEKp+01Czgx6hMOiu7U9RUmG9r7Ino8NfNmLre3Q=; b=LAJrENOLmM46+Qng9lYuIFHvh8G452k/Nfv+J2NP6el90Wnem4DFLmFC/bQvyXDH9Y sr3VH0DaAEi2weR5guALrVn+qNT7pYc/Sr07Tim7bvOq9VmQSk7XxRoF6o3eTRivEo2T No4/EAklPnLXyerFrXPBDWcC9/mBeIWtgeYCC7IUQLqlN7QvW32cZMAxq1l3Kcotk/8l cN4xPJa8GWMM/hoJXvyDQACSpBIzm3Ad9NayDZ7bROF4xmKiibxWrKH6RPYD/UsbfqUG xdtd5wc59wJV9FqR+j9lajMmuYhYuu2uipPvjP7c723FZIt49mYT9NDv7nZsesUgYkoi p/vA== X-Gm-Message-State: AOJu0YwBMjKkiByiW7k1h4swNo7NUbuoTDxEwW3MxroCoRvBQ+buCezK PUtYbpY5NA0O4FutVrk8Ecqhw+L4cA6+K4lFEOWBq77DlCEQXBmf8KBM X-Gm-Gg: ATEYQzzXS/+mboXRVuLQOlCv5e/HtylccsYl8I6OeHE1MktC9NKMce6pjn0dhTb9x+R C08Zy7Xz17qc/Y1fgKLUiLfTMXtvXCcxp09LoquRB65xipSFs9NJUKfzkK+VkRmZ+45W7G4N8d5 KtvbvckLi85lCtfkdYVVg6/+i2t4/SLmmcTWPKshK7K7NPpbyvORVwYDD4EF00Oi/sXLR9uVFyp VzjWVHQJfDTz89juXIFSpWoeuG0ZmzCRGjXyrWUzziLzSSJK2vcoFeqExNIhWa1xkumGcBCW5cd l9wyiFiS8rvqc7PjhS52ltlqwQ67zIR6Dxxyy5mIeMEHlvrnZl6DSnhyPWysNEbCbHiT48ct3tY 1CpXIajLSn7LbhA6Z6huinRUqt8kfg2FB7RQHe2dX32xQNxXmBkUtGMBReAtFfqgbMtBF6snHky Ve7pV97o/go42uMr9l0cM15rGxYWK9+NXt8l0/tBkGqnXzGWsYbMdCb+8t8thRWNMcTvz2u/hkD vcOGkBT X-Received: by 2002:a17:907:25c3:b0:b98:8a9c:7059 with SMTP id a640c23a62f3a-b9c6744d8b8mr26019066b.19.1775167033216; Thu, 02 Apr 2026 14:57:13 -0700 (PDT) Received: from thinkpad-t470s.. (93-143-182-244.adsl.net.t-com.hr. [93.143.182.244]) by smtp.googlemail.com with ESMTPSA id a640c23a62f3a-b9c3cac0e1asm134009166b.27.2026.04.02.14.57.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Apr 2026 14:57:12 -0700 (PDT) From: Ruslan Ruslichenko To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, alex.bennee@linaro.org, peter.maydell@linaro.org, artem_mygaiev@epam.com, volodymyr_babchuk@epam.com, takahiro.nakata.wr@renesas.com, "Edgar E . Iglesias" , Ruslan_Ruslichenko@epam.com, balaton@eik.bme.hu Subject: [PATCH v3 17/33] hw/core/fdt_generic_util: Connect device irqs Date: Thu, 2 Apr 2026 23:56:02 +0200 Message-ID: <20260402215629.745866-18-ruslichenko.r@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260402215629.745866-1-ruslichenko.r@gmail.com> References: <20260402215629.745866-1-ruslichenko.r@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2a00:1450:4864:20::633; envelope-from=ruslichenko.r@gmail.com; helo=mail-ej1-x633.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-arm@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org Sender: qemu-arm-bounces+qemu-arm=archiver.kernel.org@nongnu.org From: Ruslan Ruslichenko The patch implements IRQ wiring logic for fdt created devices. The wiring performed in two stages. As devices are created, their IRQs saved in the list. After all devices processed, fdt_init_all_irqs() goes through all IRQs and does actual wiring. For IRQs which have multiple source, shared IRQ handler allocated. For interrupt controllers with auto_parent callback implemented and their fdt node has 'interrupt' and 'interrupts-extended' properties empty, the auto_parent() will be called to connect them to their interrupt-parent, for example to CPUs. Signed-off-by: Ruslan Ruslichenko --- hw/core/fdt_generic_util.c | 143 ++++++++++++++++++++++++++++++++++ include/hw/core/fdt_generic.h | 12 +++ 2 files changed, 155 insertions(+) diff --git a/hw/core/fdt_generic_util.c b/hw/core/fdt_generic_util.c index 0b374b550d..b0e26e11bc 100644 --- a/hw/core/fdt_generic_util.c +++ b/hw/core/fdt_generic_util.c @@ -69,6 +69,88 @@ static void fdt_get_irq_info_from_intc(FDTMachineInfo *fdti, qemu_irq *ret, uint32_t *cells, uint32_t num_cells, uint32_t max, Error **errp); +typedef struct QEMUIRQSharedState { + qemu_irq sink; + int num; + bool (*merge_fn)(bool *, int); +/* FIXME: remove artificial limit */ +#define MAX_IRQ_SHARED_INPUTS 256 + bool inputs[MAX_IRQ_SHARED_INPUTS]; +} QEMUIRQSharedState; + +static bool qemu_irq_shared_or_handler(bool *inputs, int n) +{ + int i; + + assert(n < MAX_IRQ_SHARED_INPUTS); + + for (i = 0; i < n; ++i) { + if (inputs[i]) { + return true; + } + } + return false; +} + +static void qemu_irq_shared_handler(void *opaque, int n, int level) +{ + QEMUIRQSharedState *s = opaque; + + assert(n < MAX_IRQ_SHARED_INPUTS); + s->inputs[n] = level; + qemu_set_irq(s->sink, s->merge_fn(s->inputs, s->num)); +} + +static void fdt_init_all_irqs(FDTMachineInfo *fdti) +{ + while (fdti->irqs) { + FDTIRQConnection *first = fdti->irqs; + qemu_irq sink = first->irq; + bool (*merge_fn)(bool *, int) = first->merge_fn; + int num_sources = 0; + FDTIRQConnection *irq; + + for (irq = first; irq; irq = irq->next) { + if (irq->irq == sink) { /* Same sink */ + num_sources++; + } + } + if (num_sources > 1) { + QEMUIRQSharedState *s = g_malloc0(sizeof *s); + s->sink = sink; + s->merge_fn = merge_fn; + qemu_irq *sources = qemu_allocate_irqs(qemu_irq_shared_handler, s, + num_sources); + for (irq = first; irq; irq = irq->next) { + if (irq->irq == sink) { + char *shared_irq_name = g_strdup_printf("shared-irq-%p", + *sources); + + if (irq->merge_fn != merge_fn) { + fprintf(stderr, "ERROR: inconsistent IRQ merge fns\n"); + exit(1); + } + + object_property_add_child(OBJECT(irq->dev), shared_irq_name, + OBJECT(*sources)); + g_free(shared_irq_name); + irq->irq = *(sources++); + s->num++; + } + } + } + fdt_debug("%s: connected to %s irq line %d (%s)\n", + first->sink_info ? first->sink_info : "", + object_get_canonical_path(OBJECT(first->dev)), + first->i, first->name ? first->name : ""); + + qdev_connect_gpio_out_named(DEVICE(first->dev), first->name, first->i, + first->irq); + fdti->irqs = first->next; + g_free(first); + } +} + FDTMachineInfo *fdt_generic_create_machine(void *fdt, qemu_irq *cpu_irq) { FDTMachineInfo *fdti = fdt_init_new_fdti(fdt); @@ -82,6 +164,7 @@ FDTMachineInfo *fdt_generic_create_machine(void *fdt, qemu_irq *cpu_irq) while (qemu_co_enter_next(fdti->cq, NULL)) { ; } + fdt_init_all_irqs(fdti); memory_region_transaction_commit(); /* FIXME: Populate these from DTS and create CPU clusters. */ @@ -772,6 +855,64 @@ static void fdt_parse_node_reg_prop(FDTMachineInfo *fdti, char *node_path, g_free(reg); } +static void fdt_parse_node_irq_prop(FDTMachineInfo *fdti, char *node_path, + Object *dev) +{ + int is_intc, len; + int i, j; + + if (!object_dynamic_cast(dev, TYPE_SYS_BUS_DEVICE)) { + return; + } + + fdt_get_property(fdti->fdt, fdt_path_offset(fdti->fdt, node_path), + "interrupt-controller", &len); + is_intc = len >= 0; + fdt_debug_np("is interrupt controller: %c\n", + is_intc ? 'y' : 'n'); + + /* connect irq */ + j = 0; + for (i = 0;; i++) { + char irq_info[6 * 1024]; + char *irq_info_p = irq_info; + len = -1; + qemu_irq *irqs = fdt_get_irq_info(fdti, node_path, i, irq_info); + /* INTCs inferr their top level, if no IRQ connection specified */ + fdt_get_property(fdti->fdt, fdt_path_offset(fdti->fdt, node_path), + "interrupts-extended", &len); + if (!irqs && is_intc && i == 0 && len <= 0) { + FDTGenericIntc *id = (FDTGenericIntc *)object_dynamic_cast( + dev, TYPE_FDT_GENERIC_INTC); + FDTGenericIntcClass *idc = FDT_GENERIC_INTC_GET_CLASS(id); + if (id && idc->auto_parent) { + Error *err = NULL; + idc->auto_parent(id, &err); + } else { + irqs = fdti->irq_base; + } + } + if (!irqs) { + break; + } + while (*irqs) { + FDTIRQConnection *irq = g_new0(FDTIRQConnection, 1); + *irq = (FDTIRQConnection) { + .dev = DEVICE(dev), + .name = SYSBUS_DEVICE_GPIO_IRQ, + .merge_fn = qemu_irq_shared_or_handler, + .i = j, + .irq = *irqs, + .sink_info = g_strdup(irq_info_p), + .next = fdti->irqs + }; + j++; + fdti->irqs = irq; + irqs++; + } + } +} + static void fdt_init_parent_node(Object *dev, Object *parent, char *node_path) { if (dev->parent) { @@ -902,6 +1043,8 @@ static int fdt_init_qdev(char *node_path, FDTMachineInfo *fdti, char *compat) fdt_parse_node_reg_prop(fdti, node_path, dev); + fdt_parse_node_irq_prop(fdti, node_path, dev); + g_free(parent_node_path); return 0; diff --git a/include/hw/core/fdt_generic.h b/include/hw/core/fdt_generic.h index 05ab07e08c..3961615a9c 100644 --- a/include/hw/core/fdt_generic.h +++ b/include/hw/core/fdt_generic.h @@ -25,6 +25,16 @@ typedef struct FDTCPUCluster { bool user; } FDTCPUCluster; +typedef struct FDTIRQConnection { + DeviceState *dev; + const char *name; + int i; + bool (*merge_fn)(bool *, int); + qemu_irq irq; + char *sink_info; /* Debug only */ + void *next; +} FDTIRQConnection; + typedef struct FDTMachineInfo { /* the fdt blob */ void *fdt; @@ -34,6 +44,8 @@ typedef struct FDTMachineInfo { FDTDevOpaque *dev_opaques; /* recheck coroutine queue */ CoQueue *cq; + /* list of all IRQ connections */ + FDTIRQConnection *irqs; /* list of all CPU clusters */ FDTCPUCluster *clusters; } FDTMachineInfo; -- 2.43.0