From patchwork Wed Oct 25 19:51:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 158259 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp199452vqb; Wed, 25 Oct 2023 12:52:21 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHrOolIyuWaqNNf/c3cj9gUZfBORVKe4hSwq/ypmnNabtOAy3jhoEl3S1mPsGN7bo9S2OAS X-Received: by 2002:a05:690c:ec8:b0:5a7:af9d:53fd with SMTP id cs8-20020a05690c0ec800b005a7af9d53fdmr19450961ywb.9.1698263540956; Wed, 25 Oct 2023 12:52:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698263540; cv=none; d=google.com; s=arc-20160816; b=Ui3XKO7Dn9QCCgwOq2pZWpjpHR9bOFgO4xOjxypGoo8SP0TyDR2WjSCNTOyPTaOOlK tfiw/Y0bNgeGwwADwNmeZ9LuUaYSDV9LkJ756m//1lFrsY4zkk3TRD5PEcUgiqaqFfda j/9URiCxigN8k+ND1Reu1UaprphmYSfwfVaAerBEbWD0Au5BXSuTwPIyFrrPV3ibqeCN cwh++z/iH2jXbeZfTZ/mUIZxGErfVJDisyvlNNJtQW3prxkDHHOLzZBaE784k1EDrPFN klNTa3Scjayvb/rOjrlrs3YWdNVPaWIWZ7KRYHSBo5i0A0vnDISWsv0R2bFYQ9T79YFw fv1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=MOyEPsS1aamKfmJDRVQS6sjzRNlmifn7UPI8xWBiJVc=; fh=CICNesA9yUT5h7+POHOC5Bz1qPNS6XsP5tnxUBmjQyw=; b=BhHqA82PBnOmWw2kLaxlNbwUswms86mYmybPnLiWMva/sOpB3/451QkWmEoRbw0wIf 1gTFPntIbWukbd3dqoQaFW83wmZjGuGwijM1QczmG2kTOS1L5e7lMQcCd7bifc2sQZum dn3GpZEzpMiriIt472KJwib49WITsYO0zHgZPaZqsqxHPR1JMOKQz4T2WemZZJcbzRHg oCcOYhwQKcFMAz3kBj+gi6VbiDqgHMYOnLnEdAvU2SobNNdZP/ezIizsTOP5c1WZdHnE ZZWIyRF13qmhLmoE/ZFgFAYcT6ldgUsId6Wb2OX/ayT/TNcabFug85pMX8DWnhUu23J0 e97g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=kfrs8Adj; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=YJuJ+FYn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from howler.vger.email (howler.vger.email. [2620:137:e000::3:4]) by mx.google.com with ESMTPS id k4-20020a819304000000b0059c07cce3d0si12419275ywg.321.2023.10.25.12.52.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Oct 2023 12:52:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) client-ip=2620:137:e000::3:4; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=kfrs8Adj; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=YJuJ+FYn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:4 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by howler.vger.email (Postfix) with ESMTP id EB23F8023431; Wed, 25 Oct 2023 12:52:17 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232688AbjJYTvb (ORCPT + 25 others); Wed, 25 Oct 2023 15:51:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229874AbjJYTv3 (ORCPT ); Wed, 25 Oct 2023 15:51:29 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CF219C4; Wed, 25 Oct 2023 12:51:26 -0700 (PDT) Date: Wed, 25 Oct 2023 19:51:23 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1698263484; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MOyEPsS1aamKfmJDRVQS6sjzRNlmifn7UPI8xWBiJVc=; b=kfrs8AdjC01v+JaEqPHXoMgn9J/hwKBjV4y50kFE6O3D99mXD6+taNrInnAgx/YjSzpBf/ RuatY4ktrwnjMWxuzDdH/NXRa83NmybE2QmT2bmOf4eBYLtQA7FKeUPo6u05vhlP9TSpgF PPbBSAXUsW4Bmc3R1G9SbKHvG82cYR7TJmMu3iYfMTF8bcqRCLqvTSuIR9RuN/PIXMfnTm 2fYMwF2WwM5eYi8ptUViEoMw4wDGKVUpXKPm9k3N3cOrvrtm+DocqIhnu9CMrKHqcm9bzE yNGIL/o9uJsbatIAbOV806TYRcfFuTcs+rO1qCZidWQZ4s7qrl8SMPD1ITtvww== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1698263484; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MOyEPsS1aamKfmJDRVQS6sjzRNlmifn7UPI8xWBiJVc=; b=YJuJ+FYnaqoRTvb7oquodrziLNacUc5xWYrW0GPH0cMLLtMQVI5J+gxeD4DSFhJ+/es/x+ cBitRXtXpmIAqIAg== From: "tip-bot2 for Marc Zyngier" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/urgent] irqchip/gic-v3-its: Don't override quirk settings with default values Cc: Marc Zyngier , Thomas Gleixner , Dominic Rath , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231024084831.GA3788@JADEVM-DRA> References: <20231024084831.GA3788@JADEVM-DRA> MIME-Version: 1.0 Message-ID: <169826348318.3135.13818857870075312568.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Wed, 25 Oct 2023 12:52:18 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1780758390853593954 X-GMAIL-MSGID: 1780758390853593954 The following commit has been merged into the irq/urgent branch of tip: Commit-ID: f199bf5bf84c19a4f488a39d7d694ab10787de35 Gitweb: https://git.kernel.org/tip/f199bf5bf84c19a4f488a39d7d694ab10787de35 Author: Marc Zyngier AuthorDate: Tue, 24 Oct 2023 15:34:31 +01:00 Committer: Thomas Gleixner CommitterDate: Wed, 25 Oct 2023 21:44:49 +02:00 irqchip/gic-v3-its: Don't override quirk settings with default values 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 detections 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 Signed-off-by: Marc Zyngier Signed-off-by: Thomas Gleixner Tested-by: Dominic Rath Link: https://lore.kernel.org/r/20231024084831.GA3788@JADEVM-DRA Link: https://lore.kernel.org/r/20231024143431.2144579-1-maz@kernel.org --- 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 75a2dd5..a8c89df 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;