From patchwork Tue Feb 20 16:33:14 2024 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: 203686 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp525708dyc; Tue, 20 Feb 2024 08:45:34 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVAWJE0gclYz5Lur5eR7ctBwQ0Vv6gk2AYUqeXWRHRCi0mDC75viO6vWS6lh2SxP/UEVsq1jHeOIOvvgYDWSae2Ra7h1A== X-Google-Smtp-Source: AGHT+IE3KSJ35acuFlfMsTbCe+o8QmxYGlmYwOMpzh3PpxbhgscNe7cX+7bvdklD06irsJvhj0ZM X-Received: by 2002:a05:6358:5696:b0:178:8d35:9003 with SMTP id o22-20020a056358569600b001788d359003mr18964450rwf.4.1708447533763; Tue, 20 Feb 2024 08:45:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708447533; cv=pass; d=google.com; s=arc-20160816; b=OZlQRhmnqkhVocdTyZuupjA+lJRfPFdEET6ogxj7huOFy++BCNbZ4Tobi0lLBhiXd4 t7WZ5o69lAOe6+KEXcW5d7hLAdfaVCZytZ6JkLzICag1OpL3zXOIjcHv2VzJabdYS1lK NBo1Rj4pXIykePybzGlvRQCkN+hYd+4Eqsjdr3Wq+pkHcHOvY4U6FeIiyKvRApTFtiaa B3EYR+bmd/iVYG62NshvOjR0FsgzkQmawm+PGsxABR/agCNJgQNgopW/sqF6Sn+JnkBh QvzvrObHpLLFt90P2tD9P8h0ZredcVOC0G/hpf6G54Di1EtU4SN3m/2okMQAYv1sNIC2 FvgQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:precedence:robot-unsubscribe:robot-id :message-id:mime-version:list-unsubscribe:list-subscribe:list-id :precedence:references:in-reply-to:cc:subject:to:reply-to:sender :from:dkim-signature:dkim-signature:date; bh=2G4Ce1NHXdD7vfzRk5AY1poHLo5i4hx/u9gfnKxfS5k=; fh=lGaduIk/bZfOx3a5cIzWM3zJis4nFAwJvBIv3ITZiwA=; b=X2SIKgEXMxMdI/DfuZtPmc+1D3dpa4QKryQWMqPf+3Rd7HOxwEiAuKhURMhFQExWT6 RqKM9TreiR9SHDbB6YPqKu1yk/lVSlfuqFJXqQrQHHkGOe28fwvKmI2/EwzTfIf2v7CQ TMCLBEt52wFPFur1A1cdCrpKay5/Pa+A6tOAfXHKHBd1vPxt6VYVr7ck8u+xTdm4xR8Q orXN41FaNUO4IFbtcG1Vn+z5PSzVF+lGljcff1zNEu/mmio0hEg0JINyj5q7hkGRfuou 65Wn+VNmNgsGgp8eaZeMLXhrQpL5yEwdC8nC5eOyiw2r/bNmvNonk8xDbhyVo5FUZOH5 mpfw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=gFx8YLQU; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-73365-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73365-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id l70-20020a638849000000b005d8b7c3a00csi6520016pgd.145.2024.02.20.08.45.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 08:45:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-73365-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=gFx8YLQU; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; arc=pass (i=1 spf=pass spfdomain=linutronix.de dkim=pass dkdomain=linutronix.de dmarc=pass fromdomain=linutronix.de); spf=pass (google.com: domain of linux-kernel+bounces-73365-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-73365-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 134CAB2630E for ; Tue, 20 Feb 2024 16:33:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C632A76C66; Tue, 20 Feb 2024 16:33:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="gFx8YLQU"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="tV0GSSnl" Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D854F1E48F; Tue, 20 Feb 2024 16:33:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708446798; cv=none; b=sTBlnrw0dY3U9zXPFBzytj5X/7taFPlcaZgKLdKgNpwYLb83NSgdeD35AkySUEzPna3T0/tb5BYJt0npTqpBatDCxg0PJ1t6cAydWF78RbJOMw051CJ8xUi7EPyPLU7NGLF3YOUXd80ZY9B9Yjp4QvnzkKWGG61rMnAuFMlNaaE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708446798; c=relaxed/simple; bh=crx0V2jmDalbGCAYJq3hX4FwWQckI1QCtvZXcYEsB5E=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=nfzPhAJRbUL0r5F0r1Hep7IGmwQRclLdkUv2u8cVX01q/DS10HjeeNFtU1zbCAY/yW2jAywzIsQO8AO/+lJHYBUhTi21Fmb9D++55B4fqCgvMe8N36ojfkkSFpyuLHFRt8ww4eWemgZX9w30+aSxcm0Bkr04beMkO+22Ep32Miw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=gFx8YLQU; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=tV0GSSnl; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Date: Tue, 20 Feb 2024 16:33:14 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1708446795; 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=2G4Ce1NHXdD7vfzRk5AY1poHLo5i4hx/u9gfnKxfS5k=; b=gFx8YLQUFZM7K5S0mV8EzRqV7BYLFhmma8b+DZQVKszOpld+WwgxZh7+Tm3RMux0q3Pg9b 1ZHNuPDkm/Op3EeB5/TdN13757DuETiXIKD7DWGzW/DmgBd45SOdP15elAn5x57GPbOLCt PK7T+Jm5yttg81sehZF1DNjuOfhvX4w4pVupI+cG0y04CAbpYwbp+Eu2BbBFttB7aGlBs4 t+Mtzau/4SMZo/Et/ulw7cnZ9mKT64Uil7T0gok11yzxoMW1gImo8mMlMN714PS8Q1JsuF pjp6oU5SdGJT+9C5ibz6uvCO11g9hRNj+zu2gyNZwUz7AatCi61OgHrVYa+Rlw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1708446795; 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=2G4Ce1NHXdD7vfzRk5AY1poHLo5i4hx/u9gfnKxfS5k=; b=tV0GSSnl3NEwN41db3czNKhX0njHDF/cY874G4yvBlW5vZvnmchjxV9pgINkX45Bh6/xb7 UnuJNqYpHjYBpSAg== From: "tip-bot2 for Thomas Gleixner" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/msi] irqchip/imx-intmux: Handle pure domain searches correctly Cc: Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <87ttm3ikok.ffs@tglx> References: <87ttm3ikok.ffs@tglx> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <170844679441.398.5678441273073530090.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791437081307468537 X-GMAIL-MSGID: 1791437081307468537 The following commit has been merged into the irq/msi branch of tip: Commit-ID: 34da27aa8956d3a75c7556a59c9c7cfd0b3f18ab Gitweb: https://git.kernel.org/tip/34da27aa8956d3a75c7556a59c9c7cfd0b3f18ab Author: Thomas Gleixner AuthorDate: Tue, 20 Feb 2024 09:46:19 +01:00 Committer: Thomas Gleixner CommitterDate: Tue, 20 Feb 2024 17:30:57 +01:00 irqchip/imx-intmux: Handle pure domain searches correctly The removal of the paremeter count restriction in the core code to allow pure domain token based select() decisions broke the IMX intmux select callback as that unconditioally expects that there is a parameter. Add the missing check for zero parameter count and the token match. Fixes: de1ff306dcf4 ("genirq/irqdomain: Remove the param count restriction from select()") Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/87ttm3ikok.ffs@tglx --- drivers/irqchip/irq-imx-intmux.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/irqchip/irq-imx-intmux.c b/drivers/irqchip/irq-imx-intmux.c index aa041e4..65084c7 100644 --- a/drivers/irqchip/irq-imx-intmux.c +++ b/drivers/irqchip/irq-imx-intmux.c @@ -166,6 +166,10 @@ static int imx_intmux_irq_select(struct irq_domain *d, struct irq_fwspec *fwspec if (fwspec->fwnode != d->fwnode) return false; + /* Handle pure domain searches */ + if (!fwspec->param_count) + return d->bus_token == bus_token; + return irqchip_data->chanidx == fwspec->param[1]; }