From patchwork Tue Oct 24 14:34:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 13434697 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 21601C00A8F for ; Tue, 24 Oct 2023 14:35:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=R5UB4hOuCSSC6N9iGI7gQM9gtLxoj0vGuAfU3N5tluQ=; b=2iV/F2yfCViuNP enKIjrWDOdkNEVcNumq0v0ef8b4737fCYvxlljeqYhmd1KgtXUoyjIClHEzuK9oDYgcovJuxEe4LY /3xuk5YxntR9Ow6iQCL5F9LgeQyVveNXYVKLFfdWCjapN9fsChla1uRDiv76Ff+FnEyIKv9cQExSf NqP5LIbLDtMA+UoZ1tS5K9eSS3CfItbJ58jAkrtVmYRQ4sAOJLr1XuWnErJf8f28FbdeUVfSHXBKI Ay/v7sLb0ZQiAc7Cs9tdABOBi2XA4ozjP/qWahiUdZyc7CAAY3XxlZg5UMuvz2xrimiri33zaii+v GjFlk0mrU2c60uHFnnSg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qvIVC-00A98e-1n; Tue, 24 Oct 2023 14:35:26 +0000 Received: from ams.source.kernel.org ([145.40.68.75]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qvIV9-00A97j-2v for linux-arm-kernel@lists.infradead.org; Tue, 24 Oct 2023 14:35:25 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by ams.source.kernel.org (Postfix) with ESMTP id 3A505B824CD; Tue, 24 Oct 2023 14:35:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 86B2AC433C8; Tue, 24 Oct 2023 14:34:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1698158091; bh=0EcLCqFouJP0hY8CNrI3CsIj9BAxE4T9i5fPItqAv0c=; h=From:To:Cc:Subject:Date:From; b=TSPUXGwOds8PIYzY2u1wv4dS+kG7ASiDxO6BPzFcICge3VQ2LE+LJ37M/PdrdGI7T MIoZY7q1+456RCEme3UQ839oZi5qbfSnJunKgdcHb2zA4tkHOklL2VlYm7DLmeSy3d SltmN1Q3N6xrOHFCpGsgXtrIxbrQBTznP4Im5V3PvCPC5+6pfFALAZTnj+8GRp8L3H anN1xHdV5VXWBIT2QFich5957eHD3R9D0rL+yW++RO8UkTTu0z5AIIA3/+jzXUCaRX zUJwVKqjY0yIxaYQpqdo1PLEsK0lW9UApaZg+ktQ9wmrj7ninWpnhrBHCiaufvcRWL P8qyAbc3lkdiQ== Received: from sofa.misterjones.org ([185.219.108.64] helo=valley-girl.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1qvIUb-007Ewh-89; Tue, 24 Oct 2023 15:34:49 +0100 From: Marc Zyngier To: Thomas Gleixner Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, lpieralisi@kernel.org, Dominic Rath Subject: [PATCH] irqchip/gic-v3-its: Don't override quirk settings with default values Date: Tue, 24 Oct 2023 15:34:31 +0100 Message-Id: <20231024143431.2144579-1-maz@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: tglx@linutronix.de, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, lpieralisi@kernel.org, dominic.rath@ibv-augsburg.net X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231024_073524_098956_A8F1AF72 X-CRM114-Status: GOOD ( 14.85 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org When splitting the allocation of the ITS node from its configuration, some of the default settings were kept in the latter instead of being moved to the former. This has the side effect of negating some of the quirk detection that have happened in between, amongst which the dreaded Synquacer hack (that also affect Dominic's TI platform). Move the initialisation of these fields early, so that they can again be overriden by the Synquacer quirk. Fixes: 9585a495ac93 ("irqchip/gic-v3-its: Split allocation from initialisation of its_node") Reported by: Dominic Rath Tested-by: Dominic Rath Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20231024084831.GA3788@JADEVM-DRA --- Notes: Hi Thomas, This is an urgent, last-minute fix for a regression that I introduced in -rc6. I'd appreciate it if you could send it along to Linus before v6.6 gets released. Thanks, M. drivers/irqchip/irq-gic-v3-its.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/irqchip/irq-gic-v3-its.c b/drivers/irqchip/irq-gic-v3-its.c index 75a2dd550625..a8c89df1a997 100644 --- a/drivers/irqchip/irq-gic-v3-its.c +++ b/drivers/irqchip/irq-gic-v3-its.c @@ -5112,8 +5112,6 @@ static int __init its_probe_one(struct its_node *its) } its->cmd_base = (void *)page_address(page); its->cmd_write = its->cmd_base; - its->get_msi_base = its_irq_get_msi_base; - its->msi_domain_flags = IRQ_DOMAIN_FLAG_ISOLATED_MSI; err = its_alloc_tables(its); if (err) @@ -5362,6 +5360,8 @@ static struct its_node __init *its_node_init(struct resource *res, its->typer = gic_read_typer(its_base + GITS_TYPER); its->base = its_base; its->phys_base = res->start; + its->get_msi_base = its_irq_get_msi_base; + its->msi_domain_flags = IRQ_DOMAIN_FLAG_ISOLATED_MSI; its->numa_node = numa_node; its->fwnode_handle = handle;