From patchwork Mon Feb 13 19:40:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 56507 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2537308wrn; Mon, 13 Feb 2023 11:42:58 -0800 (PST) X-Google-Smtp-Source: AK7set/k7JuABt9dW0zuYJQvL+laHfYGkMGEacPNRFeQGYnl7S9BzoSNcqI/jR3QQgCKn9uq2ASI X-Received: by 2002:a17:906:c25a:b0:8ae:11ca:81de with SMTP id bl26-20020a170906c25a00b008ae11ca81demr86703ejb.34.1676317377840; Mon, 13 Feb 2023 11:42:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676317377; cv=none; d=google.com; s=arc-20160816; b=JugxhZ/jmlxC0waqlhSQjUuv35Yr+D3qE+/jKERAn9OSspfIh8mC/hCE/7ogsU61vC 8LznDJJBwKxfYDdQjgd381EucJNb3vZnhIACe91/fBECUJ5HYyEVZsi7QrCs0JtGhc7q hHAEXKifJrm4X72soccG9zqJHqVlO/cqH0LaovUOun7nAEHykilPke7tWlD3gQ1yAJ8t z+l5rVZPg6F2VukNKmg/T6IWR6FgMXQv9as8pin2fQ7ddjbyQWpDfGj8QReLRaIC3CwM W6eTArJPvCS0ulWOW2diLkJrRX2ERKmP/AFUUZCS5xCcN66uP96OQr6sQBwoB/wv0tJs yiMA== 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=pUZ8DY1X6mipS81KMMM93WRvzcBoTcY1XAr45mGjkts=; b=Kj3hN2FkTwaMQCfsu2ltPeln4LwWoziHqch6tkHkqLo+3iiEBPFFs8IbDlqtcdVpqL teGKUaUJT1r0KoOmPoHQnh0ZuP/MaNBn7uZkmvPoFT1hbvVQl1jkQsEXdyxZmz+vW6fy 0Md4aDF2POhnwuwbxANHBxUvSlq/CR6H7Uf5vb9Mgzr7b9z+DWWoZKNL5An57M/2EH3x 71Guyx+hETB94r09OKRBkwHTGchYVE1Z+gYGXHcQyJnZkC7hZ2pKuu7ORbzgMKF3DKGR o8ZTFdkdWh+rWbgQrWIbutJfc/d9weqr+Vbku/diuD5GmlVaBNbn13ctE8HIH9JfwpJv iGAQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=11cfAxuV; dkim=neutral (no key) header.i=@linutronix.de header.b=Tgm+h9w+; 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 mv11-20020a170907838b00b0087f812bc0a0si13060827ejc.860.2023.02.13.11.42.35; Mon, 13 Feb 2023 11:42:57 -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=11cfAxuV; dkim=neutral (no key) header.i=@linutronix.de header.b=Tgm+h9w+; 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 S231366AbjBMTlL (ORCPT + 99 others); Mon, 13 Feb 2023 14:41:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231243AbjBMTkr (ORCPT ); Mon, 13 Feb 2023 14:40:47 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7387713538 for ; Mon, 13 Feb 2023 11:40:45 -0800 (PST) Date: Mon, 13 Feb 2023 19:40:43 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1676317244; 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=pUZ8DY1X6mipS81KMMM93WRvzcBoTcY1XAr45mGjkts=; b=11cfAxuVdZKzuVhYqBXVr2ctsoiYyZ1xLeAE7ba3Lu/lODccaZZdrsm5WHpI+p2Kgaebsa gWhzg1TUP67tiN18Bsb580O9QTziyvN5qJZ7r9UJux/Fhdu9ZkQ+NQ40aVChCrHiXc5ER5 bNa3ixHiDnjxxHVJUeuTwFZJxxh8PliQr+2bGV3miBEVILaNzuqfaiGiCiCWT/uVrVJemf 1v7jQk0qFWMKTf2BzG2NXuuwFW87EDVLftlNnCfkK4chF5OlhN/ifxuYP11cgVgnnM6eer s06hehAdSbxo8seM+F2tWulTvOaELOzVYrh2Bdzo/ScUtZymxtRbSCXpFl+QDw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1676317244; 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=pUZ8DY1X6mipS81KMMM93WRvzcBoTcY1XAr45mGjkts=; b=Tgm+h9w+1WaeJMXb1WuEXq7EysocE2B/peBU5LDGloTvyPEitQglzOm+mN/C+wlRIkPiI5 obPNs4Pz1xoXuCDA== From: "irqchip-bot for Johan Hovold" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-kernel@vger.kernel.org Subject: [irqchip: irq/irqchip-next] irqdomain: Clean up irq_domain_push/pop_irq() Cc: philmd@linaro.org, "Hsin-Yi Wang" , "Mark-PK Tsai" , Johan Hovold , Marc Zyngier , tglx@linutronix.de In-Reply-To: <20230213104302.17307-12-johan+linaro@kernel.org> References: <20230213104302.17307-12-johan+linaro@kernel.org> MIME-Version: 1.0 Message-ID: <167631724376.4906.5660868139142354177.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?1757712276720660438?= X-GMAIL-MSGID: =?utf-8?q?1757746170638080806?= The following commit has been merged into the irq/irqchip-next branch of irqchip: Commit-ID: 930a1bbbef01cdcd682d9c2b4bc9e36b9618fed3 Gitweb: https://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms/930a1bbbef01cdcd682d9c2b4bc9e36b9618fed3 Author: Johan Hovold AuthorDate: Mon, 13 Feb 2023 11:42:53 +01:00 Committer: Marc Zyngier CommitterDate: Mon, 13 Feb 2023 19:31:24 irqdomain: Clean up irq_domain_push/pop_irq() The irq_domain_push_irq() interface is used to add a new (outmost) level to a hierarchical domain after IRQs have been allocated. Possibly due to differing mental images of hierarchical domains, the names used for the irq_data variables make these functions much harder to understand than what they need to be. Rename the struct irq_data pointer to the data embedded in the descriptor as simply 'irq_data' and refer to the data allocated by this interface as 'parent_irq_data' so that the names reflect how hierarchical domains are implemented. Reviewed-by: Philippe Mathieu-Daudé Tested-by: Hsin-Yi Wang Tested-by: Mark-PK Tsai Signed-off-by: Johan Hovold Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20230213104302.17307-12-johan+linaro@kernel.org --- kernel/irq/irqdomain.c | 65 ++++++++++++++++++++--------------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 3a3213d..6d480dc 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -1598,8 +1598,8 @@ static void irq_domain_fix_revmap(struct irq_data *d) */ int irq_domain_push_irq(struct irq_domain *domain, int virq, void *arg) { - struct irq_data *child_irq_data; - struct irq_data *root_irq_data = irq_get_irq_data(virq); + struct irq_data *irq_data = irq_get_irq_data(virq); + struct irq_data *parent_irq_data; struct irq_desc *desc; int rv = 0; @@ -1624,45 +1624,44 @@ int irq_domain_push_irq(struct irq_domain *domain, int virq, void *arg) if (WARN_ON(!irq_domain_is_hierarchy(domain))) return -EINVAL; - if (!root_irq_data) + if (!irq_data) return -EINVAL; - if (domain->parent != root_irq_data->domain) + if (domain->parent != irq_data->domain) return -EINVAL; - child_irq_data = kzalloc_node(sizeof(*child_irq_data), GFP_KERNEL, - irq_data_get_node(root_irq_data)); - if (!child_irq_data) + parent_irq_data = kzalloc_node(sizeof(*parent_irq_data), GFP_KERNEL, + irq_data_get_node(irq_data)); + if (!parent_irq_data) return -ENOMEM; mutex_lock(&irq_domain_mutex); /* Copy the original irq_data. */ - *child_irq_data = *root_irq_data; + *parent_irq_data = *irq_data; /* - * Overwrite the root_irq_data, which is embedded in struct - * irq_desc, with values for this domain. + * Overwrite the irq_data, which is embedded in struct irq_desc, with + * values for this domain. */ - root_irq_data->parent_data = child_irq_data; - root_irq_data->domain = domain; - root_irq_data->mask = 0; - root_irq_data->hwirq = 0; - root_irq_data->chip = NULL; - root_irq_data->chip_data = NULL; + irq_data->parent_data = parent_irq_data; + irq_data->domain = domain; + irq_data->mask = 0; + irq_data->hwirq = 0; + irq_data->chip = NULL; + irq_data->chip_data = NULL; /* May (probably does) set hwirq, chip, etc. */ rv = irq_domain_alloc_irqs_hierarchy(domain, virq, 1, arg); if (rv) { /* Restore the original irq_data. */ - *root_irq_data = *child_irq_data; - kfree(child_irq_data); + *irq_data = *parent_irq_data; + kfree(parent_irq_data); goto error; } - irq_domain_fix_revmap(child_irq_data); - irq_domain_set_mapping(domain, root_irq_data->hwirq, root_irq_data); - + irq_domain_fix_revmap(parent_irq_data); + irq_domain_set_mapping(domain, irq_data->hwirq, irq_data); error: mutex_unlock(&irq_domain_mutex); @@ -1680,8 +1679,8 @@ EXPORT_SYMBOL_GPL(irq_domain_push_irq); */ int irq_domain_pop_irq(struct irq_domain *domain, int virq) { - struct irq_data *root_irq_data = irq_get_irq_data(virq); - struct irq_data *child_irq_data; + struct irq_data *irq_data = irq_get_irq_data(virq); + struct irq_data *parent_irq_data; struct irq_data *tmp_irq_data; struct irq_desc *desc; @@ -1703,37 +1702,37 @@ int irq_domain_pop_irq(struct irq_domain *domain, int virq) if (domain == NULL) return -EINVAL; - if (!root_irq_data) + if (!irq_data) return -EINVAL; tmp_irq_data = irq_domain_get_irq_data(domain, virq); /* We can only "pop" if this domain is at the top of the list */ - if (WARN_ON(root_irq_data != tmp_irq_data)) + if (WARN_ON(irq_data != tmp_irq_data)) return -EINVAL; - if (WARN_ON(root_irq_data->domain != domain)) + if (WARN_ON(irq_data->domain != domain)) return -EINVAL; - child_irq_data = root_irq_data->parent_data; - if (WARN_ON(!child_irq_data)) + parent_irq_data = irq_data->parent_data; + if (WARN_ON(!parent_irq_data)) return -EINVAL; mutex_lock(&irq_domain_mutex); - root_irq_data->parent_data = NULL; + irq_data->parent_data = NULL; - irq_domain_clear_mapping(domain, root_irq_data->hwirq); + irq_domain_clear_mapping(domain, irq_data->hwirq); irq_domain_free_irqs_hierarchy(domain, virq, 1); /* Restore the original irq_data. */ - *root_irq_data = *child_irq_data; + *irq_data = *parent_irq_data; - irq_domain_fix_revmap(root_irq_data); + irq_domain_fix_revmap(irq_data); mutex_unlock(&irq_domain_mutex); - kfree(child_irq_data); + kfree(parent_irq_data); return 0; }