From nobody Sat Apr 18 03:04:05 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 05038C433EF for ; Tue, 19 Jul 2022 14:19:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238131AbiGSOTq (ORCPT ); Tue, 19 Jul 2022 10:19:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32800 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234994AbiGSOS7 (ORCPT ); Tue, 19 Jul 2022 10:18:59 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3ADA37F52E for ; Tue, 19 Jul 2022 06:55:51 -0700 (PDT) Date: Tue, 19 Jul 2022 13:55:48 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1658238949; 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=XCsyc41ZvNp9njn6uqBiyVKAtQUMD4aN+KF64YaG1r0=; b=YPdHyUmK5vyVXAw657qq8kazjqN4Yy5XiVlPrYAikcV6WP09ViYoQ0MlYTg6tk9uBMif5P sNcX9ZPul80F6/3T7fU5vqmU4TiS4gCSHAANKD+/AiQWgUr37w+1ht0/k9miwu6N9r374l 0MPVLAnkh8c6Co6FGW5BTp3DdBYGO4/R6JBd2SpdaRlLMLUn1hFUjEBnLPeRF+xMZiymQk i5mCYYQjkvQBX2jEUUesk8lQuoKfDbuF0N5oASFfjJOlyAgB4mywXEhFw5DlnqNwQ0NF2X uWTxRpa9ICN9mXrMeZHAokExg+8ZA2Y3k927qJYgx88q6Y3qyYgFn2ggasY6XA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1658238949; 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=XCsyc41ZvNp9njn6uqBiyVKAtQUMD4aN+KF64YaG1r0=; b=kwqm4ry+CPtz1gxepLFpMbANO/aPy0k/J42CnfLn1bLhhv4R1forz7H0VzqaVgxioR6wWr 0KI+48rU++5k0tCQ== From: "irqchip-bot for Xu Qiang" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-kernel@vger.kernel.org Subject: [irqchip: irq/irqchip-next] irqdomain: Report irq number for NOMAP domains Cc: Xu Qiang , Marc Zyngier , tglx@linutronix.de In-Reply-To: <20220719063641.56541-2-xuqiang36@huawei.com> References: <20220719063641.56541-2-xuqiang36@huawei.com> MIME-Version: 1.0 Message-ID: <165823894877.15455.10845543417521952692.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the irq/irqchip-next branch of ir= qchip: Commit-ID: 6f194c99f466147148cc08452718b46664112548 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-plat= forms/6f194c99f466147148cc08452718b46664112548 Author: Xu Qiang AuthorDate: Tue, 19 Jul 2022 06:36:40=20 Committer: Marc Zyngier CommitterDate: Tue, 19 Jul 2022 14:51:13 +01:00 irqdomain: Report irq number for NOMAP domains When using a NOMAP domain, __irq_resolve_mapping() doesn't store the Linux IRQ number at the address optionally provided by the caller. While this isn't a huge deal (the returned value is guaranteed to the hwirq that was passed as a parameter), let's honour the letter of the API by writing the expected value. Fixes: d22558dd0a6c (=E2=80=9Cirqdomain: Introduce irq_resolve_mapping()=E2= =80=9D) Signed-off-by: Xu Qiang [maz: commit message] Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20220719063641.56541-2-xuqiang36@huawei.com --- kernel/irq/irqdomain.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index d5ce965..481abb8 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -910,6 +910,8 @@ struct irq_desc *__irq_resolve_mapping(struct irq_domai= n *domain, data =3D irq_domain_get_irq_data(domain, hwirq); if (data && data->hwirq =3D=3D hwirq) desc =3D irq_data_to_desc(data); + if (irq && desc) + *irq =3D hwirq; } =20 return desc;