From patchwork Fri Oct 13 10:31:19 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: 152482 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2908:b0:403:3b70:6f57 with SMTP id ib8csp1792319vqb; Fri, 13 Oct 2023 03:32:11 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH7Z90NwnagShwTAU/GM74c3GV7IX/P/+8eYiRGAV3vEnD+SbACk3Ad5Vu29OrQ/YFh4TEc X-Received: by 2002:a17:90a:4ca4:b0:274:99ed:a80c with SMTP id k33-20020a17090a4ca400b0027499eda80cmr23999837pjh.3.1697193130757; Fri, 13 Oct 2023 03:32:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697193130; cv=none; d=google.com; s=arc-20160816; b=xHSoOGOpJDzC+lJkz8DxsrE+B6HSB6WNsdbjFhlucRbauMZna4F0a9mGxcWp59EIiX 5UYWw9fJDP2URQGFtdoNyN4zFkTsTEM+ATHAefCd41RC9nn8SE2Z9DsufWCIefUyghSS Va6e9zc/54DtvPckVpyZQGGv/Z5HexHSom5+Z2lYm2K53UgoNGrISgOMrhGswwvoQ0jV fz7Z1O0W6gDjAKszrbS8z9h/RDz6Iru57/1C/8CckyCycxttpT3v8P2D3tjeThsWNMKY DIUZCqcetbNHkPjiycw3jgTClFALL9qtjzM9ADokE861WOIkZ2dqOFXl1F5WvZcWho7x E+cw== 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=hob1pPMiTCm3R6nB1NIaTX7kXJllqZiibswxfoVZ4uY=; fh=Wx+kD6OW0TsBzjYh4J7LvZiIPzXPlSOCkH3oJXnaEZk=; b=F6w0JvnnMLnBYzoQqnPlJqplepmtfriVGumG0c6S9DZknYaA19zddfj7ReRUwg550C eRPuLklsupNs+m7F8BL3cZ2Q6tVZfTVhtUKZBjLP2hcLIu3cBYa4IfW1lteVT8xhMgti gXA2pQb0jVhyGCTejuoOsJ9TWiyZZrIXqwitqRqF+cnj3sBHioDiM9yNKtYe2IHZEYIe zZosWt1bfIVm6l0M0gtF+4pXbN9TZxd1pQvS6MF2ourKrD4fXkOcEGoSojJ8Hcc2S/C6 D7bAZDAZRmFQeaVwLE/2E5qwgweVOk8rIdbt+YS2NjDGTRIBEUejQDmdJDVe4sXgQcYG 63cw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nZBku9ab; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id oj7-20020a17090b4d8700b002791edaee33si4714535pjb.77.2023.10.13.03.32.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 03:32:10 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=nZBku9ab; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id AAE0F804DDA0; Fri, 13 Oct 2023 03:31:47 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230147AbjJMKb0 (ORCPT + 19 others); 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 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net 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 (snail.vger.email [0.0.0.0]); Fri, 13 Oct 2023 03:31:47 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779635984072327003 X-GMAIL-MSGID: 1779635984072327003 The following commit has been merged into the irq/core branch of tip: Commit-ID: 021a8ca2ba23c01487a98ad23b68ac062e14cf32 Gitweb: https://git.kernel.org/tip/021a8ca2ba23c01487a98ad23b68ac062e14cf32 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 *gc, const char *name, int num_ct, unsigned int irq_base, void __iomem *reg_base, irq_flow_handler_t handler) { + struct irq_chip_type *ct = gc->chip_types; + int i; + raw_spin_lock_init(&gc->lock); gc->num_ct = num_ct; gc->irq_base = irq_base; gc->reg_base = reg_base; - gc->chip_types->chip.name = name; + for (i = 0; i < num_ct; i++) + ct[i].chip.name = name; gc->chip_types->handler = handler; }