From mboxrd@z Thu Jan 1 00:00:00 1970 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 0CA7DC433F5 for ; Tue, 8 Feb 2022 15:30:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:From:References:Cc:To:Subject: MIME-Version:Date:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=bdw/9+nlYZhg2Vy7jOXfy4aBV8Wrw+M9eTA4Pa8BjGE=; b=bxYxlCt/mSNdWE NdYM01LykNluZ7s+n0YJitDUdvRyWyMFXe/r9fnpjtOb0cybBGCK46AZqY78mhPO/gaOa8if3vMwM O0qlLovvZQdlCLNURHEB8E/35/gYNMn6n1FWkmd1S+rg/9GNezF/lvrHa7+1KMmfTmNpThDKZoYCB nzA4irHfpQASQBW0zqLdwoB1ScftOFqiHophUt0QrMYDBGnslPyry11EIrf1Vnxu4llS1/xKjcdqy 7n/NGnaH6BdmRWElIA/1xOLvN8+LOOeCTDib2ixOsohe/JfJ7fEPZrnEuaMBRbxcAgaXar9lc1N64 xKpbtMFH80OH6ZbMaHVA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nHSQT-00EUH4-7w; Tue, 08 Feb 2022 15:29:05 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nHSQN-00EUEb-QU for linux-arm-kernel@lists.infradead.org; Tue, 08 Feb 2022 15:29:01 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2A18B2B; Tue, 8 Feb 2022 07:28:57 -0800 (PST) Received: from [10.57.70.89] (unknown [10.57.70.89]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 02BD33F73B; Tue, 8 Feb 2022 07:28:54 -0800 (PST) Message-ID: Date: Tue, 8 Feb 2022 15:28:50 +0000 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Thunderbird/91.5.1 Subject: Re: [PATCH 1/2] iommu/arm-smmu: Use platform_irq_count() to get the interrupt count Content-Language: en-GB To: Will Deacon Cc: Lad Prabhakar , Joerg Roedel , Rob Clark , linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, Xin Tan , Sai Prakash Ranjan , "Isaac J. Manjarres" , Rob Herring , linux-kernel@vger.kernel.org, Prabhakar References: <20211223130046.9365-1-prabhakar.mahadev-lad.rj@bp.renesas.com> <20211223130046.9365-2-prabhakar.mahadev-lad.rj@bp.renesas.com> <20220208151932.GB1802@willie-the-truck> From: Robin Murphy In-Reply-To: <20220208151932.GB1802@willie-the-truck> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220208_072900_031493_E369662F X-CRM114-Status: GOOD ( 19.59 ) 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: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 2022-02-08 15:19, Will Deacon wrote: > On Thu, Dec 23, 2021 at 02:14:35PM +0000, Robin Murphy wrote: >> On 2021-12-23 13:00, Lad Prabhakar wrote: >>> platform_get_resource(pdev, IORESOURCE_IRQ, ..) relies on static >>> allocation of IRQ resources in DT core code, this causes an issue >>> when using hierarchical interrupt domains using "interrupts" property >>> in the node as this bypasses the hierarchical setup and messes up the >>> irq chaining. >>> >>> In preparation for removal of static setup of IRQ resource from DT core >>> code use platform_get_irq_count(). >> >> Nit: platform_irq_count() >> >>> Signed-off-by: Lad Prabhakar >>> --- >>> drivers/iommu/arm/arm-smmu/arm-smmu.c | 12 ++++++------ >>> 1 file changed, 6 insertions(+), 6 deletions(-) >>> >>> diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c >>> index 4bc75c4ce402..4844cd075644 100644 >>> --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c >>> +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c >>> @@ -2105,12 +2105,12 @@ static int arm_smmu_device_probe(struct platform_device *pdev) >>> if (IS_ERR(smmu)) >>> return PTR_ERR(smmu); >>> - num_irqs = 0; >>> - while ((res = platform_get_resource(pdev, IORESOURCE_IRQ, num_irqs))) { >>> - num_irqs++; >>> - if (num_irqs > smmu->num_global_irqs) >>> - smmu->num_context_irqs++; >>> - } >>> + num_irqs = platform_irq_count(pdev); >>> + if (num_irqs < 0) >>> + return num_irqs; >>> + >>> + if (num_irqs > smmu->num_global_irqs) >>> + smmu->num_context_irqs += (num_irqs - smmu->num_global_irqs); >> >> This seems a bit overcomplicated. I reckon: >> >> smmu->num_context_irqs = num_irqs - smmu->num_global_irqs; >> if (num_irqs <= smmu->num_global_irqs) { >> dev_err(... >> >> should do it. >> >> However, FYI I have some patches refactoring most of the IRQ stuff here that >> I plan to post next cycle (didn't quite have time to get them done for 5.17 >> as I'd hoped...), so unless this needs to go in right now as an urgent fix, >> I'm happy to take care of removing platform_get_resource() as part of that >> if it's easier. > > Did you get anywhere with this? December 23rd is long forgotten by now ;) Yup: https://gitlab.arm.com/linux-arm/linux-rm/-/commit/b2a40caaf1622eb35c555074a0d72f4f0513cff9 I'm still cleaning up the PMU driver that justifies the whole thing, but I can send that patch now if you reckon it's not complete nonsense out of context. Otherwise, I'll aim to get the whole lot out next week. Cheers, Robin. _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel