From patchwork Mon Jan 16 13:50:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johan Hovold X-Patchwork-Id: 44170 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1203294wrn; Mon, 16 Jan 2023 05:55:44 -0800 (PST) X-Google-Smtp-Source: AMrXdXvu1evLm1aWZKd62SJevH/OY7LhDTY8V0vRfbA1tjKpjHTFZdlp/Xjb48sfA5zwYw1wsrR1 X-Received: by 2002:a17:907:ca1d:b0:84d:4e77:6453 with SMTP id uk29-20020a170907ca1d00b0084d4e776453mr25802910ejc.38.1673877344494; Mon, 16 Jan 2023 05:55:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673877344; cv=none; d=google.com; s=arc-20160816; b=pQFdN79CyVaDSQ7lxc1qVIaua/ZaXT//5HCvZW/Bt6l94HZBS3OQ2NmvzbhZrQtStl iMzU3gcXROgAWflL5ChK1X3IumrwgwJBhetcS8hHLSakVxTgmqDs4WLBg+OmTXaeRV0x 60o57rWlCyTzZDbGYwNtG1RInZjaaYo6/2WJOetG30xs9k5AIxadT0dtqJGqCYd/w27I PjOifVJ12NKiA5NnlqteIV3hbSZ2WNxT52usks7c6Vh/JoNbnXqr1MAgm0Y9Maremjwr moKkRZgzZ6yN6DA5PI7riPHeJ39gjzY/P0ZbSmD/0Te1P3GQ8WM6O8prtMmwpT9cyhYR 5H/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=rJ0LngDnW2ldwPRHMknnNLUKCBzAlYm+/2EYbVFuC9g=; b=VnCRAtGsRqVQo6MLSiKhzSOqNd02Ko5+UA7/4QJj5vKwEHfl1lBckBRf3y/a9YGPu8 kwb6Jk09awxeKfFjc7uftDzY0lyymFqnNl01xdDYa7dY3phhIH9k2o98BrQk6Z4Ockky TaqPbMshVurX5ZY0xAbzbU+dLEvTUYbtED2/gi3/1u3TR3tD4V+76MvmuPteM1EzgDWB IbEG6AAG/WzJaBVv2HVFWZnZT9BuOBHbCXBrK0Z/pOU0mpiJgpmJe/gRpuFXt6NfUrN+ 7vwPYj+ZXq/LtvQVeIp9D4/UD6L452FA9oSFczYXUfmAg/Pap2ONJkQ0iQp/YXZcFAqX LMYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=BB0S7c4B; 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=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id gn9-20020a1709070d0900b007aed5ffeffbsi19338ejc.78.2023.01.16.05.55.20; Mon, 16 Jan 2023 05:55:44 -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=@kernel.org header.s=k20201202 header.b=BB0S7c4B; 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=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230281AbjAPNvx (ORCPT + 99 others); Mon, 16 Jan 2023 08:51:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231497AbjAPNus (ORCPT ); Mon, 16 Jan 2023 08:50:48 -0500 Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E614921978; Mon, 16 Jan 2023 05:50:44 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id 23001CE1160; Mon, 16 Jan 2023 13:50:43 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B222CC43443; Mon, 16 Jan 2023 13:50:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1673877040; bh=Acjdl6EsE3kWgNQwaT/lwb4EHyPJAJutY4r47DlwrFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BB0S7c4BKL1c+LF0TaXpdKTSrjvooPYOjJm0vy/8m09ELpwfW7NKgSjsDwyPf/Hw3 dB3BEcM91ZjUP9YJnVH5D9RzauAPtNR6RA5CZ7li7aOjYIVvTXFTI8FliJMHwUhhff GjDl3La0NWWatzVsJ5HTevYlnNejKrntWFC6bzCauSEDdtjCRhBcSSooALqfpJXnK0 1xpeVOJma5cocRvBG4hSnvDt/UbB+79iLPjDNoeNpdM+Vypa6+Ic7W1nLP0f1nxi4O Zr22yZn1Sdv2NHf5YodowtqMo+CFs5nDCLmbnAIewozKbOuj2Pwq+53QmTGfWAUZeh Z+jWl5XejhwEg== Received: from johan by xi.lan with local (Exim 4.94.2) (envelope-from ) id 1pHPt6-0003v0-2e; Mon, 16 Jan 2023 14:51:00 +0100 From: Johan Hovold To: Marc Zyngier , Thomas Gleixner Cc: x86@kernel.org, platform-driver-x86@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mips@vger.kernel.org, linux-kernel@vger.kernel.org, Johan Hovold , Hsin-Yi Wang , Mark-PK Tsai Subject: [PATCH v4 07/19] irqdomain: Look for existing mapping only once Date: Mon, 16 Jan 2023 14:50:32 +0100 Message-Id: <20230116135044.14998-8-johan+linaro@kernel.org> X-Mailer: git-send-email 2.38.2 In-Reply-To: <20230116135044.14998-1-johan+linaro@kernel.org> References: <20230116135044.14998-1-johan+linaro@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1755187610251910814?= X-GMAIL-MSGID: =?utf-8?q?1755187610251910814?= Avoid looking for an existing mapping twice when creating a new mapping using irq_create_fwspec_mapping() by factoring out the actual allocation which is shared with irq_create_mapping_affinity(). Tested-by: Hsin-Yi Wang Tested-by: Mark-PK Tsai Signed-off-by: Johan Hovold --- kernel/irq/irqdomain.c | 60 +++++++++++++++++++++++------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 248e6acfafbe..894bc6ee6348 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -675,6 +675,34 @@ unsigned int irq_create_direct_mapping(struct irq_domain *domain) EXPORT_SYMBOL_GPL(irq_create_direct_mapping); #endif +static unsigned int __irq_create_mapping_affinity(struct irq_domain *domain, + irq_hw_number_t hwirq, + const struct irq_affinity_desc *affinity) +{ + struct device_node *of_node = irq_domain_get_of_node(domain); + int virq; + + pr_debug("irq_create_mapping(0x%p, 0x%lx)\n", domain, hwirq); + + /* Allocate a virtual interrupt number */ + virq = irq_domain_alloc_descs(-1, 1, hwirq, of_node_to_nid(of_node), + affinity); + if (virq <= 0) { + pr_debug("-> virq allocation failed\n"); + return 0; + } + + if (irq_domain_associate(domain, virq, hwirq)) { + irq_free_desc(virq); + return 0; + } + + pr_debug("irq %lu on domain %s mapped to virtual irq %u\n", + hwirq, of_node_full_name(of_node), virq); + + return virq; +} + /** * irq_create_mapping_affinity() - Map a hardware interrupt into linux irq space * @domain: domain owning this hardware interrupt or NULL for default domain @@ -687,14 +715,11 @@ EXPORT_SYMBOL_GPL(irq_create_direct_mapping); * on the number returned from that call. */ unsigned int irq_create_mapping_affinity(struct irq_domain *domain, - irq_hw_number_t hwirq, - const struct irq_affinity_desc *affinity) + irq_hw_number_t hwirq, + const struct irq_affinity_desc *affinity) { - struct device_node *of_node; int virq; - pr_debug("irq_create_mapping(0x%p, 0x%lx)\n", domain, hwirq); - /* Look for default domain if necessary */ if (domain == NULL) domain = irq_default_domain; @@ -702,34 +727,15 @@ unsigned int irq_create_mapping_affinity(struct irq_domain *domain, WARN(1, "%s(, %lx) called with NULL domain\n", __func__, hwirq); return 0; } - pr_debug("-> using domain @%p\n", domain); - - of_node = irq_domain_get_of_node(domain); /* Check if mapping already exists */ virq = irq_find_mapping(domain, hwirq); if (virq) { - pr_debug("-> existing mapping on virq %d\n", virq); + pr_debug("existing mapping on virq %d\n", virq); return virq; } - /* Allocate a virtual interrupt number */ - virq = irq_domain_alloc_descs(-1, 1, hwirq, of_node_to_nid(of_node), - affinity); - if (virq <= 0) { - pr_debug("-> virq allocation failed\n"); - return 0; - } - - if (irq_domain_associate(domain, virq, hwirq)) { - irq_free_desc(virq); - return 0; - } - - pr_debug("irq %lu on domain %s mapped to virtual irq %u\n", - hwirq, of_node_full_name(of_node), virq); - - return virq; + return __irq_create_mapping_affinity(domain, hwirq, affinity); } EXPORT_SYMBOL_GPL(irq_create_mapping_affinity); @@ -834,7 +840,7 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) return 0; } else { /* Create mapping */ - virq = irq_create_mapping(domain, hwirq); + virq = __irq_create_mapping_affinity(domain, hwirq, NULL); if (!virq) return virq; }