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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id ADB71C433F5 for ; Fri, 12 Nov 2021 15:28:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 9008661039 for ; Fri, 12 Nov 2021 15:28:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230360AbhKLPbk (ORCPT ); Fri, 12 Nov 2021 10:31:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:36362 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230308AbhKLPbk (ORCPT ); Fri, 12 Nov 2021 10:31:40 -0500 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 76E9160F4F; Fri, 12 Nov 2021 15:28:49 +0000 (UTC) Received: from sofa.misterjones.org ([185.219.108.64] helo=why.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mlYTv-00532B-8i; Fri, 12 Nov 2021 15:28:47 +0000 Date: Fri, 12 Nov 2021 15:28:46 +0000 Message-ID: <87fss18kb5.wl-maz@kernel.org> From: Marc Zyngier To: Bjorn Helgaas Cc: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Christian Zigotzky , Rob Herring , Bjorn Helgaas Subject: Re: [PATCH] of/irq: Don't ignore interrupt-controller when interrupt-map failed In-Reply-To: <20211112150415.GA1401861@bhelgaas> References: <20211112143644.434995-1-maz@kernel.org> <20211112150415.GA1401861@bhelgaas> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: helgaas@kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, chzigotzky@xenosoft.de, robh@kernel.org, bhelgaas@google.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org On Fri, 12 Nov 2021 15:04:15 +0000, Bjorn Helgaas wrote: > > On Fri, Nov 12, 2021 at 02:36:44PM +0000, Marc Zyngier wrote: > > Since 041284181226 ("of/irq: Allow matching of an interrupt-map local > > to an interrupt controller"), the irq code favors using an interrupt-map > > over a interrupt-controller property if both are available, while the > > earlier behaviour was to ignore the interrupt-map altogether. > > > > However, we now end-up with the opposite behaviour, which is to > > ignore the interrupt-controller property even if the interrupt-map > > fails to match its input. This new behaviour breaks the AmigaOne > > X1000 machine, which ships with an extremely "creative" (read: > > broken) device tree. > > > > Fix this by allowing the interrupt-controller property to be selected > > when interrupt-map fails to match anything. > > > > Fixes: 041284181226 ("of/irq: Allow matching of an interrupt-map local to an interrupt controller") > > Reported-by: Christian Zigotzky > > Signed-off-by: Marc Zyngier > > Link: https://lore.kernel.org/r/78308692-02e6-9544-4035-3171a8e1e6d4@xenosoft.de > > Cc: Rob Herring > > Cc: Bjorn Helgaas > > I'm not qualified to review this, but since 041284181226 was merged > via my tree along with the rest of the Apple stuff, let me know if > you'd like me to merge this. > > I see Rob has a comment, so if you want to take care merging it > yourself, that's certainly fine with me. I have a couple of IRQ patches that need to go in, so happy to route it via the irqchip tree if Rob gives his blessing. M. -- Without deviation from the norm, progress is not possible.