From patchwork Fri Aug 16 12:49:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 13766085 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 706E6C52D7D for ; Fri, 16 Aug 2024 12:50:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=ke0AjxBAncE489wmYzkh+nSMUTPo+pIzRMAmnYnwJNQ=; b=HWk22ApS1FsvGTa5NZXG5AfFuZ IEMFH7xxvfsjPXJqwk65OfPOaZUwPEO4UT/vDFBRvWwuDtPSl+p/B/K09cOwmjCPJ9UFXtYJKVVPe cq8No4n7gV+BFJNXlx3rx9LTUAdqxBqYyMEUG9zsoGFom85ZhcEaI/rqVVbcoRDc9q+ugP6L18QRn xB8qhL1vwcBCeAXQgt/x+ZCAslgbMgWXXzGKs7FLHRE1L90g4TLjyhkguRsSgTA/CsUgfwDjrQl7w vkSJMYbj6OFG3vju3rU+oinBdCtfmbmuI9vopVR/a4mTmYflcy8SIvJUoYyCfjQcKbhXP+VP8RbdA cfWAzmqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sewPj-0000000Cw9O-3yAO; Fri, 16 Aug 2024 12:50:43 +0000 Received: from mail-wr1-x433.google.com ([2a00:1450:4864:20::433]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sewP3-0000000CvyA-3ecx for linux-arm-kernel@lists.infradead.org; Fri, 16 Aug 2024 12:50:03 +0000 Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3718eaf4046so840042f8f.3 for ; Fri, 16 Aug 2024 05:50:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ventanamicro.com; s=google; t=1723812599; x=1724417399; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=ke0AjxBAncE489wmYzkh+nSMUTPo+pIzRMAmnYnwJNQ=; b=IowozLaVaHCjh2JJgpQqfqcaglI3JFoNZkKv2AgjX0Vt0lvHiZF0dwtNd3RBMDrB0S QYYD6z9u/42kmYvaGDgkOVcKOxBqA0n7xpPz+CqPu3iQGCLMfeJjao9+GhWDvGw+tIvh 1OTWYoziOMbEKNjdON0bAkRN4HpLhqWPExRzOxfnj92KnYclc7RBsr1Gf/pE76HgWnCq Ex+Y52DLPUfBrIZyIOoHZTjDbxDMqFC2OhecXg7qyQxgOCzp6MucfUNGqYhbAYmdqEbc N7cuix+jCtx876TFwQGxWjHpMc3LugbNHr+w86QfEO/NB/EMUGuLCb9quYjA0x9E3RUQ lu2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723812599; x=1724417399; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ke0AjxBAncE489wmYzkh+nSMUTPo+pIzRMAmnYnwJNQ=; b=RVF5+xDdJ/tvvo+Kwxhj//lidmq7kaRh2OJXHIB5VSrGTkI3SAoYbnSlKN76Xq6xam Ey7ojtS+kQ9LHUuuND756KRbMkEfXFfPMlYEwK4SlSQsTf9Lfyzi8XbvZcF2rtiRAnPQ ylfuCAFjWDQ8Z59OuI/g2+cEXUpY02dSmfNBro4Vj+H+Y76aseKMmOhv6xp56EY8v9Go /bMmBxP6mDFHr5T3bLAP+BnVoxVfoZ2A7iZcYPmle2IYzrCx5KdSMuNQvjEHfMAbi7H5 Y23vqoT4xjbHnXGj+i6wAT49gi5L7TywpZfoOOxU+0XZfOjDs3/8avOX6k88vJTqFrPM EPgQ== X-Forwarded-Encrypted: i=1; AJvYcCWU9tCG/GFGhyjuYHadLaWcxcIGIwCDB0DR2qYdme+1onX+AjDSAVmDvwZM37lzjwlwtQ9DqkF/CSg9ZXU30ZrT@lists.infradead.org X-Gm-Message-State: AOJu0YytB37RRGl+4e+unVP1QnWUC8kezycb3k8UdUpZNKKwuq3epvZL doY7k02WAbdF6XBlkEta/Oihw35WgLJBVkX7DT1OECrb6r0eNUd8sodak0mySwA= X-Google-Smtp-Source: AGHT+IGM4LtUkED1FVNx+BEXnUbZCpfDI0OMEbuSoUR17hoiKqSTIP6vlmoZg/GiQAQSJ3CnFpyexA== X-Received: by 2002:adf:e907:0:b0:371:8e24:1191 with SMTP id ffacd0b85a97d-371946a4455mr2184543f8f.53.1723812598913; Fri, 16 Aug 2024 05:49:58 -0700 (PDT) Received: from localhost (2001-1ae9-1c2-4c00-20f-c6b4-1e57-7965.ip6.tmcz.cz. [2001:1ae9:1c2:4c00:20f:c6b4:1e57:7965]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-371898aa393sm3570531f8f.90.2024.08.16.05.49.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Aug 2024 05:49:58 -0700 (PDT) From: Andrew Jones To: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-riscv@lists.infradead.org, linux-arm-kernel@lists.infradead.org, loongarch@lists.linux.dev, linux-mips@vger.kernel.org Cc: maz@kernel.org, mark.rutland@arm.com, robh@kernel.org, saravanak@google.com, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, Anup Patel Subject: [PATCH v2] of/irq: Support #msi-cells=<0> in of_msi_get_domain Date: Fri, 16 Aug 2024 14:49:58 +0200 Message-ID: <20240816124957.130017-2-ajones@ventanamicro.com> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240816_055002_007847_73586672 X-CRM114-Status: GOOD ( 18.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org An 'msi-parent' property with a single entry and no accompanying '#msi-cells' property is considered the legacy definition as opposed to its definition after being expanded with commit 126b16e2ad98 ("Docs: dt: add generic MSI bindings"). However, the legacy definition is completely compatible with the current definition and, since of_phandle_iterator_next() tolerates missing and present-but- zero *cells properties since commit e42ee61017f5 ("of: Let of_for_each_phandle fallback to non-negative cell_count"), there's no need anymore to special case the legacy definition in of_msi_get_domain(). Indeed, special casing has turned out to be harmful, because, as of commit 7c025238b47a ("dt-bindings: irqchip: Describe the IMX MU block as a MSI controller"), MSI controller DT bindings have started specifying '#msi-cells' as a required property (even when the value must be zero) as an effort to make the bindings more explicit. But, since the special casing of 'msi-parent' only uses the existence of '#msi-cells' for its heuristic, and not whether or not it's also nonzero, the legacy path is not taken. Furthermore, the path to support the new, broader definition isn't taken either since that path has been restricted to the platform-msi bus. But, neither the definition of 'msi-parent' nor the definition of '#msi-cells' is platform-msi-specific (the platform-msi bus was just the first bus that needed '#msi-cells'), so remove both the special casing and the restriction. The code removal also requires changing to of_parse_phandle_with_optional_args() in order to ensure the legacy (but compatible) use of 'msi-parent' remains supported. This not only simplifies the code but also resolves an issue with PCI devices finding their MSI controllers on riscv, as the riscv,imsics binding requires '#msi-cells=<0>'. Signed-off-by: Andrew Jones --- v2: - switch to of_parse_phandle_with_optional_args() to ensure the absence of #msi-cells means count=0 drivers/of/irq.c | 37 +++++++++++-------------------------- 1 file changed, 11 insertions(+), 26 deletions(-) diff --git a/drivers/of/irq.c b/drivers/of/irq.c index c94203ce65bb..690df4b71ab9 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -709,8 +709,7 @@ struct irq_domain *of_msi_map_get_device_domain(struct device *dev, u32 id, * @np: device node for @dev * @token: bus type for this domain * - * Parse the msi-parent property (both the simple and the complex - * versions), and returns the corresponding MSI domain. + * Parse the msi-parent property and returns the corresponding MSI domain. * * Returns: the MSI domain for this device (or NULL on failure). */ @@ -718,33 +717,19 @@ struct irq_domain *of_msi_get_domain(struct device *dev, struct device_node *np, enum irq_domain_bus_token token) { - struct device_node *msi_np; + struct of_phandle_args args; struct irq_domain *d; + int index = 0; - /* Check for a single msi-parent property */ - msi_np = of_parse_phandle(np, "msi-parent", 0); - if (msi_np && !of_property_read_bool(msi_np, "#msi-cells")) { - d = irq_find_matching_host(msi_np, token); - if (!d) - of_node_put(msi_np); - return d; - } - - if (token == DOMAIN_BUS_PLATFORM_MSI) { - /* Check for the complex msi-parent version */ - struct of_phandle_args args; - int index = 0; + while (!of_parse_phandle_with_optional_args(np, "msi-parent", + "#msi-cells", + index, &args)) { + d = irq_find_matching_host(args.np, token); + if (d) + return d; - while (!of_parse_phandle_with_args(np, "msi-parent", - "#msi-cells", - index, &args)) { - d = irq_find_matching_host(args.np, token); - if (d) - return d; - - of_node_put(args.np); - index++; - } + of_node_put(args.np); + index++; } return NULL;