From nobody Tue Dec 16 19:57:01 2025 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 B3E0FCDB47E for ; Fri, 13 Oct 2023 10:31:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230155AbjJMKb0 (ORCPT ); Fri, 13 Oct 2023 06:31:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229794AbjJMKbY (ORCPT ); Fri, 13 Oct 2023 06:31:24 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB9A6CA; Fri, 13 Oct 2023 03:31:21 -0700 (PDT) Date: Fri, 13 Oct 2023 10:31:19 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1697193080; 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=hob1pPMiTCm3R6nB1NIaTX7kXJllqZiibswxfoVZ4uY=; b=nZBku9abSMRq9jgjupGcxGjrEQ8/dGMNkvmQBBus1/vHko+hiEmCpNkrsuEkOruJ+2P+k+ AzbXu+MIwlFIsjCIBdBp0q2+8PFme2vScIUasxDleSPGoFtJPs/EKteawgVyfIuVnJsW9B P/CM2lJHqTVwwa9YFVXTh9gD0zg6u8HQaHHFmKWAOeZWE4c++AZ6uZeO455pH6u6fUI7PG bh5Uf/Wwzh46lJw6pugCqZkwa0GjYZGnQApMmw+MUn+JXRaS45z7Yf5Fjz5dwSwE5aYp/q 2aPjVP61ZJrNR1fGexIRiytiRqH6z6oXKOIJxFws7Nej6qdoavL21oadty7Dug== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1697193080; 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=hob1pPMiTCm3R6nB1NIaTX7kXJllqZiibswxfoVZ4uY=; b=OfWI2O4obWmqEuIwGijGjzk2YcUFbKEvFU6I28PoEkYr+S+KvxatOnh6EK8ZqotC31zEt4 5UX9ewcWCxfvzuAA== From: "tip-bot2 for Keguang Zhang" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/core] genirq/generic-chip: Fix the irq_chip name for /proc/interrupts Cc: Keguang Zhang , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org, maz@kernel.org In-Reply-To: <20230925121734.93017-1-keguang.zhang@gmail.com> References: <20230925121734.93017-1-keguang.zhang@gmail.com> MIME-Version: 1.0 Message-ID: <169719307970.3135.13937631733550216078.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/core branch of tip: Commit-ID: 021a8ca2ba23c01487a98ad23b68ac062e14cf32 Gitweb: https://git.kernel.org/tip/021a8ca2ba23c01487a98ad23b68ac062= e14cf32 Author: Keguang Zhang AuthorDate: Mon, 25 Sep 2023 20:17:34 +08:00 Committer: Thomas Gleixner CommitterDate: Fri, 13 Oct 2023 12:25:31 +02:00 genirq/generic-chip: Fix the irq_chip name for /proc/interrupts irq_init_generic_chip() only sets the name for the first chip type, which leads to empty names for other chip types. Eventually, these names will be shown as "-" /proc/interrupts. Set the name for all chip types by default. Signed-off-by: Keguang Zhang Signed-off-by: Thomas Gleixner Link: https://lore.kernel.org/r/20230925121734.93017-1-keguang.zhang@gmail.= com --- kernel/irq/generic-chip.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c index c653cd3..81ecca0 100644 --- a/kernel/irq/generic-chip.c +++ b/kernel/irq/generic-chip.c @@ -219,11 +219,15 @@ void irq_init_generic_chip(struct irq_chip_generic *g= c, const char *name, int num_ct, unsigned int irq_base, void __iomem *reg_base, irq_flow_handler_t handler) { + struct irq_chip_type *ct =3D gc->chip_types; + int i; + raw_spin_lock_init(&gc->lock); gc->num_ct =3D num_ct; gc->irq_base =3D irq_base; gc->reg_base =3D reg_base; - gc->chip_types->chip.name =3D name; + for (i =3D 0; i < num_ct; i++) + ct[i].chip.name =3D name; gc->chip_types->handler =3D handler; }