From patchwork Mon Dec 5 18:25:21 2022 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: 29873 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2415292wrr; Mon, 5 Dec 2022 10:40:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf6246BAULeHVUVEGIlb/qA+FumbHpBi2vYoyDOOJo/UstH/Z0d8PxmjpIpv1QUnfzdGpkDm X-Received: by 2002:a05:6402:541a:b0:463:be84:5283 with SMTP id ev26-20020a056402541a00b00463be845283mr33095740edb.7.1670265633923; Mon, 05 Dec 2022 10:40:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670265633; cv=none; d=google.com; s=arc-20160816; b=ULledrfqhiB1aHg7NbjtWY3TzAvv3KOQJ0m5wr+4jGs0LsrrQubhXXYFZlrQElq9B9 9Q5voYBvtuo1yrKur6lYxIan20XwDnRSqHDnW0fAYCN647/BNLubyGvx7ghlOgNpXOQi 5cDJSOL9JmAOJvRf7Xxn7eethJayMLWyvHkc+aMRCxWznRY7WL9Wg4XBIzutG5jURB8n nlCQFF+FQa59+Od4jhX+q6DotFUu2DtyGsItpkMOS4fFbJfCxdfa2jFm5qJK+LWW68us 46aFP+/O0jbpIQ1RbdNZrRZ4MzlX0lFOE1NQpiJ/fJ0jmIqH4JcnoEI23mjH1phYzYTP bCoA== 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=667oBIoslqo0oieRpBWYXvRNbW6Fv1di387HPtPfYSQ=; b=YX49gwBgQx++awXCWEBs62llFJ7uwUZ6DT4oFoCDnUra0VO0zr71dP5HjdXyC3O1X5 uF2PLTLGeBLhKRRPInBOO61ptktOWuduvov9Ua05wqkC6kWXVbovbnbGMrCaKcqMHykS W7gL/0DbUWYUQcI2rgR1I94kJywjpG1GOHOjEIuz3WCqno6qPZjlHAD87JAskZkaD621 M0UFBodcR1GN39k5773sm51FrU6u7TqsKuA0n3JYZHX7gqCdkxz4cNSlAB/PqbwnG3pT 8hv+GAQ3yASlDc0W5AHSMmVKH5hOvW+R3YYqpifuC+TTnU4YI5p7FFUvp2u7ZSrnbeCF L+0g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=fpSUpg5T; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 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 (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sc16-20020a1709078a1000b007ae83c51922si11506234ejc.45.2022.12.05.10.40.10; Mon, 05 Dec 2022 10:40:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=fpSUpg5T; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232992AbiLES3X (ORCPT + 99 others); Mon, 5 Dec 2022 13:29:23 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39812 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232686AbiLESZY (ORCPT ); Mon, 5 Dec 2022 13:25:24 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 898392098A; Mon, 5 Dec 2022 10:25:23 -0800 (PST) Date: Mon, 05 Dec 2022 18:25:21 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1670264722; 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=667oBIoslqo0oieRpBWYXvRNbW6Fv1di387HPtPfYSQ=; b=fpSUpg5TCAgpyu6t1UpTSo96VLuH8HuX2QH4HhUUzVDfKiN136uqTNiT5/QM05Ovd22vNL FNkJz9FJtY3w0d3WE1wLzxXJNYBUSSWjINgt/Ht/xX5I0B/zEq1ncifUkBVuBWj/NdOpFI +evlw/9QC7txsf1xKRcuowf0UQVsNm4pmq775n9M0MdGNBLuuYJs7WAQlfEqbeCp5kDTSw DqNcu19kzyqcp6EhbZp6gPpblQ0ttidIZ+kAAFJq9zjJvEeshjZg4egtcZtcNPvuSRSqwI iQupxG6smkw8UUZGPyKgLOPRexM0MNalqqs+IqHdrJj2iJyAE6GsmfPRjDZAEw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1670264722; 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=667oBIoslqo0oieRpBWYXvRNbW6Fv1di387HPtPfYSQ=; b=pCtoYlvwFk8hm+gMgq4hTlni8qZo80b12kQxJgHvHUuKCb6QpIhhodeOF80dtT5AWpZsKH huwPW0niK0qlMqDg== 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/core] genirq/irqdomain: Rename irq_domain::dev to irq_domain:: Pm_dev Cc: Thomas Gleixner , Jason Gunthorpe , Kevin Tian , Marc Zyngier , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20221124230313.574541683@linutronix.de> References: <20221124230313.574541683@linutronix.de> MIME-Version: 1.0 Message-ID: <167026472181.4906.14684993456898030611.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,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-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751400457436791563?= X-GMAIL-MSGID: =?utf-8?q?1751400457436791563?= The following commit has been merged into the irq/core branch of tip: Commit-ID: 6a9fc4190ca23fcf327de666e1a98dbdcdd2d210 Gitweb: https://git.kernel.org/tip/6a9fc4190ca23fcf327de666e1a98dbdcdd2d210 Author: Thomas Gleixner AuthorDate: Fri, 25 Nov 2022 00:24:12 +01:00 Committer: Thomas Gleixner CommitterDate: Mon, 05 Dec 2022 19:20:58 +01:00 genirq/irqdomain: Rename irq_domain::dev to irq_domain:: Pm_dev irq_domain::dev is a misnomer as it's usually the rule that a device pointer points to something which is directly related to the instance. irq_domain::dev can point to some other device for power management to ensure that this underlying device is not powered down when an interrupt is allocated. The upcoming per device MSI domains really require a pointer to the device which instantiated the irq domain and not to some random other device which is required for power management down the chain. Rename irq_domain::dev to irq_domain::pm_dev and fixup the few sites which use that pointer. Conversion was done with the help of coccinelle. Signed-off-by: Thomas Gleixner Reviewed-by: Jason Gunthorpe Reviewed-by: Kevin Tian Acked-by: Marc Zyngier Link: https://lore.kernel.org/r/20221124230313.574541683@linutronix.de --- drivers/irqchip/irq-gic.c | 4 ++-- include/linux/irqdomain.h | 6 +++--- kernel/irq/chip.c | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index 4c7bae0..08834e5 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -401,8 +401,8 @@ static void gic_irq_print_chip(struct irq_data *d, struct seq_file *p) { struct gic_chip_data *gic = irq_data_get_irq_chip_data(d); - if (gic->domain->dev) - seq_printf(p, gic->domain->dev->of_node->name); + if (gic->domain->pm_dev) + seq_printf(p, gic->domain->pm_dev->of_node->name); else seq_printf(p, "GIC-%d", (int)(gic - &gic_data[0])); } diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index b1fdd8d..aa76da8 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h @@ -131,7 +131,7 @@ struct irq_domain_chip_generic; * @gc: Pointer to a list of generic chips. There is a helper function for * setting up one or more generic chips for interrupt controllers * drivers using the generic chip library which uses this pointer. - * @dev: Pointer to a device that can be utilized for power management + * @pm_dev: Pointer to a device that can be utilized for power management * purposes related to the irq domain. * @parent: Pointer to parent irq_domain to support hierarchy irq_domains * @@ -153,7 +153,7 @@ struct irq_domain { struct fwnode_handle *fwnode; enum irq_domain_bus_token bus_token; struct irq_domain_chip_generic *gc; - struct device *dev; + struct device *pm_dev; #ifdef CONFIG_IRQ_DOMAIN_HIERARCHY struct irq_domain *parent; #endif @@ -206,7 +206,7 @@ static inline void irq_domain_set_pm_device(struct irq_domain *d, struct device *dev) { if (d) - d->dev = dev; + d->pm_dev = dev; } #ifdef CONFIG_IRQ_DOMAIN diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 8ac37e8..49e7bc8 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -1561,10 +1561,10 @@ int irq_chip_compose_msi_msg(struct irq_data *data, struct msi_msg *msg) return 0; } -static struct device *irq_get_parent_device(struct irq_data *data) +static struct device *irq_get_pm_device(struct irq_data *data) { if (data->domain) - return data->domain->dev; + return data->domain->pm_dev; return NULL; } @@ -1578,7 +1578,7 @@ static struct device *irq_get_parent_device(struct irq_data *data) */ int irq_chip_pm_get(struct irq_data *data) { - struct device *dev = irq_get_parent_device(data); + struct device *dev = irq_get_pm_device(data); int retval = 0; if (IS_ENABLED(CONFIG_PM) && dev) @@ -1597,7 +1597,7 @@ int irq_chip_pm_get(struct irq_data *data) */ int irq_chip_pm_put(struct irq_data *data) { - struct device *dev = irq_get_parent_device(data); + struct device *dev = irq_get_pm_device(data); int retval = 0; if (IS_ENABLED(CONFIG_PM) && dev)