Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755410AbdIGLpc (ORCPT ); Thu, 7 Sep 2017 07:45:32 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:17249 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755222AbdIGLn7 (ORCPT ); Thu, 7 Sep 2017 07:43:59 -0400 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v87BgcP0021413 X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: Marc Zyngier , Thomas Gleixner , Linus Walleij , linux-gpio@vger.kernel.org, Rob Herring Cc: Jassi Brar , devicetree@vger.kernel.org, Jason Cooper , Masami Hiramatsu , David Daney , Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH v4 2/6] irqdomain: clear trigger type in irq_domain_push_irq() Date: Thu, 7 Sep 2017 20:41:58 +0900 Message-Id: <1504784522-26841-3-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504784522-26841-1-git-send-email-yamada.masahiro@socionext.com> References: <1504784522-26841-1-git-send-email-yamada.masahiro@socionext.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1387 Lines: 41 Prior to the addition of irq_domain_push_irq(), the hierarchy IRQ domain always allocates IRQs from the outer-most domain. Each irqchip usually calls irq_domain_alloc_irqs_parent(), ascending the topology up to the root irqchip. The brand-new function irq_domain_push_irq() allows us to allocate IRQs for parent domain first, then add a child irq_data to the tail of the chain. For the new use-case, if the parent sets a temporary trigger type, it may differ from the type requested to the outer-most irqchip, then irq_create_fwspec_mapping() warns "type mismatch, failed to map..." Clear the trigger type when a new irq_data is connected to the chain. Signed-off-by: Masahiro Yamada --- Changes in v4: - Newly added kernel/irq/irqdomain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index da3e0b6..18d11b9 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -1532,6 +1532,9 @@ int irq_domain_push_irq(struct irq_domain *domain, int virq, void *arg) tail_irq_data->chip = NULL; tail_irq_data->chip_data = NULL; + /* clear the trigger type to avoid "type mismatch" error */ + irqd_set_trigger_type(tail_irq_data, IRQ_TYPE_NONE); + /* May (probably does) set hwirq, chip, etc. */ rv = irq_domain_alloc_irqs_hierarchy(domain, virq, 1, arg); if (rv) { -- 2.7.4