From patchwork Tue Oct 19 21:58:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12571193 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17565C433EF for ; Tue, 19 Oct 2021 22:02:26 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id D65E260E0C for ; Tue, 19 Oct 2021 22:02:25 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org D65E260E0C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UGB1O4i99J9EkRC75hTxBJ/n+neyFDOGlpEOFNcIrz0=; b=EONwBbCU6ORSaF f2lR6OqhNCufajGUf2bSG0XwgCTsLY3veivEmzxK/vgWF87ePichTWyyoY/gE0McuXHJnBMHAdnna t3XGempaeIRWckoqKHYGW/3g5qjnBMGqNRsclATGpkk1/quCeLgPxv5lpm8wUfGlq8pUGrP/g3JSY HrrB38mgygOUu3p3fjkfDSv9JclCtspi8CUtsGI3gOCibFpKuF44d2dTmtsukzbfIocPCl3Pv4r1O pGltB/ctWFa2nWB78ntLbmjdSAbdJt+mVGcwkgbnl8Di/yCm+PlloaJTsddcrY74r6ryEgSG2ayQ6 /bGQCLPyYYzAteSpGXyw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxAD-002jiO-Lt; Tue, 19 Oct 2021 22:00:53 +0000 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcx8R-002im1-KJ for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 21:59:05 +0000 Received: by mail-pg1-x531.google.com with SMTP id t184so7650553pgd.8 for ; Tue, 19 Oct 2021 14:59:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Dv8ie/kzP99OSKx2zPfoLqRlI0izEadzKVnoX+2n0Ow=; b=AY2Ha5MT0GGSiAQJtui4C9ngVrORBxADCZ2UfDcWMFG49K8fbexaNgX+wtRbjAPmOs h1EEcZ3Vs5nGsU3lxyyBJQMwREZVYsbTP/YzlXMZWlzD5GbioJ60HLdgBxq2ORiyZHQE 4xyeZJ9jjQsOYUQ61XMmMS62pVe4SGhnSo6SPFOPxwphnh0bXAM/2XCi5hPWH7W7fV/a FodWYf/Ikfz1FcNJecK5z/opptgGMCyXJvoGJlCnRQuG9Y9QYUO0RNppBhkS/g4Jf9TO Zq4H8Ih541/TPH4MSdRSiP1RLwvGXN/GMeWW4RX/0QiH1IfwYTZumd/Vuclo5j+8ay3s 6QYw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Dv8ie/kzP99OSKx2zPfoLqRlI0izEadzKVnoX+2n0Ow=; b=n2azWI/yALAXANnXuB3q4Fv+Xo3IVsm0zfAKjpNVhE7zKyGlF/xTapXSoRWqLVu/lR VYbxZ9uCr6f2WQW7NBmUm13/NGf7gXtozuDmFsLn2V4ZDbJPHTDQL5wSM2V/OEz8sU6j RKZcg68odDrsk7Z1YKGQOlTpFl1N+lm4QoYKbqBkBo6nsbbAMwCvL3qM5HUhCJ+DIlwj +MldZXRwJ7rY/8UsMMjw/i0m7zqTKj6j0h9wJ3yK9D9+7dabQ/LkMaIbwxfRNj+AzrYl nYNupvlFIwbq0/G60OnLol0TRojku1bPz5h793/dor1ujsG3xmVk8OKMBQCEJcuk+mhY IKZA== X-Gm-Message-State: AOAM532h04V0AAYKIMPO1CSiZBVadss7zcbcp+yJgI2B0ZSXcCzKi401 B4PQiIcr9YxwoEVWhlnxiU8= X-Google-Smtp-Source: ABdhPJxg80f3aU9s30YTITBpGuu/MH1V8WZnV8yB6ev7fGNeckIaO0jlPiUPY6LwoY00LNnGswTQWA== X-Received: by 2002:a05:6a00:1a8e:b0:44c:5f27:e971 with SMTP id e14-20020a056a001a8e00b0044c5f27e971mr2464454pfv.72.1634680742412; Tue, 19 Oct 2021 14:59:02 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bf7sm139325pjb.14.2021.10.19.14.59.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 14:59:01 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Rob Herring , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Russell King , Catalin Marinas , Will Deacon , Thomas Bogendoerfer , Thomas Gleixner , Marc Zyngier , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org (moderated list:ARM SUB-ARCHITECTURES), linux-mips@vger.kernel.org (open list:MIPS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v5 01/14] irqchip: Provide platform_device to of_irq_init_cb_t Date: Tue, 19 Oct 2021 14:58:42 -0700 Message-Id: <20211019215855.1920099-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019215855.1920099-1-f.fainelli@gmail.com> References: <20211019215855.1920099-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_145903_706534_47161F67 X-CRM114-Status: GOOD ( 18.94 ) 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 Provide the platform device mapping to the interrupt controller node to the of_irq_init_cb_t callback such that drivers can make use of it. Reviewed-by: Rob Herring Signed-off-by: Florian Fainelli --- drivers/irqchip/irqchip.c | 2 +- drivers/irqchip/qcom-pdc.c | 3 ++- drivers/of/irq.c | 2 +- include/linux/of_irq.h | 5 ++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/irqchip/irqchip.c b/drivers/irqchip/irqchip.c index 3570f0a588c4..289784eefd00 100644 --- a/drivers/irqchip/irqchip.c +++ b/drivers/irqchip/irqchip.c @@ -55,6 +55,6 @@ int platform_irqchip_probe(struct platform_device *pdev) if (par_np && !irq_find_matching_host(par_np, DOMAIN_BUS_ANY)) return -EPROBE_DEFER; - return irq_init_cb(np, par_np); + return irq_init_cb(np, par_np, pdev); } EXPORT_SYMBOL_GPL(platform_irqchip_probe); diff --git a/drivers/irqchip/qcom-pdc.c b/drivers/irqchip/qcom-pdc.c index 173e6520e06e..819a93360b96 100644 --- a/drivers/irqchip/qcom-pdc.c +++ b/drivers/irqchip/qcom-pdc.c @@ -359,7 +359,8 @@ static int pdc_setup_pin_mapping(struct device_node *np) return 0; } -static int qcom_pdc_init(struct device_node *node, struct device_node *parent) +static int qcom_pdc_init(struct device_node *node, struct device_node *parent, + struct platform_device *pdev) { struct irq_domain *parent_domain, *pdc_domain, *pdc_gpio_domain; int ret; diff --git a/drivers/of/irq.c b/drivers/of/irq.c index 352e14b007e7..18f3f5c00c87 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -538,7 +538,7 @@ void __init of_irq_init(const struct of_device_id *matches) desc->dev, desc->dev, desc->interrupt_parent); ret = desc->irq_init_cb(desc->dev, - desc->interrupt_parent); + desc->interrupt_parent, NULL); if (ret) { of_node_clear_flag(desc->dev, OF_POPULATED); kfree(desc); diff --git a/include/linux/of_irq.h b/include/linux/of_irq.h index aaf219bd0354..89acc8b089f0 100644 --- a/include/linux/of_irq.h +++ b/include/linux/of_irq.h @@ -9,7 +9,10 @@ #include #include -typedef int (*of_irq_init_cb_t)(struct device_node *, struct device_node *); +struct platform_device; + +typedef int (*of_irq_init_cb_t)(struct device_node *, struct device_node *, + struct platform_device *); /* * Workarounds only applied to 32bit powermac machines From patchwork Tue Oct 19 21:58:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12571195 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58962C433EF for ; Tue, 19 Oct 2021 22:02:49 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 17E9A60560 for ; Tue, 19 Oct 2021 22:02:49 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 17E9A60560 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=r3p/2FpQ/HCPoEcUgtvRJR2A0QvYdg6cCV0S+tMckTU=; b=e3GRLB9iIiDV3A NOesgMOOErozipPXVSocnFc+im0OXZrrjpTx2VXiIgiMLS/zELXKDwlJPRvxKgLMHTFCgueoqxEcf cNee59RUqdHNzF5W3otUN78LIG997dsB2VdOjN0t6t7VJYKROpiLqRYfcWpkuGaW8WtyrxQyYi64c 5mxw1w9HdHoOjbDe+a5IE4OSh7AaBoGckYN6F8xrIc+IJcmWl0kgrUqA2cBtwVs5L+Ir07CbK6dqS LR9OYvY+i9hXzV4fjbCaeFdxFqDX+MaV35TGJqR+dLkjAteab7zO2jLSIJCLO9PssP34MSMowcd+B eHJ8Ft0xWuUK2nua05Kw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxAY-002jrw-48; Tue, 19 Oct 2021 22:01:14 +0000 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcx8T-002imv-BH for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 21:59:07 +0000 Received: by mail-pl1-x636.google.com with SMTP id n11so14686734plf.4 for ; Tue, 19 Oct 2021 14:59:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=znmARRiQVkqC85lKLifIrCv0U2JcIdQKNsLQ6jRH+xY=; b=iOwxBK/TBiRJqvUSowWx2AA+29dqSDb4BJLm/ACFVY9kpVKPukdLQjJMjtIRG35jxz li9haYYODUCYEVlrXFPfWq5ITUkWgQHXdOF4IinFTkAgyLiN1CSU7YjqdR7g7CMSkyUY Z2KYctppGisktlOigbfAe6ufEkKiCWoHNj+v+UZOaRj4wrX0lKwRSG5+C36OAHSEAA20 ZCwTKxmNp9EZGUE/qpnKPULv7qAaCZr0ULSaJG5e4QgRgV7xpwUTF24lj65tawxl7gwt /ibDDCQH75MwkpxuHLxILX4XTnoX79ea9fMsyoIAaftpYjDe1+aHy1P/hJj8yAih9yX/ NWOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=znmARRiQVkqC85lKLifIrCv0U2JcIdQKNsLQ6jRH+xY=; b=7zIWHaTfIbcO8ya2I69Mm9WrqwoECUxiSF0k6HwZfx/Gcyd/5xvGDLZoywTt//nEkM hSMflpS64GOiGh0PirId5RueCA25Gd2ragDmmJgdvf6PNVbsbzpqM3hZxuhOmFhUDNtj OGBV5YhWJzKsZ4uiSQCfbvU5eozQ3eQZLA9n+Rg5SEzqCSHggn3ypc9qiVrzS5yQV/UT 3uEA0rl0lsKxfmpGduBEkGlWXvvPHEFQIsdo15C6plhomQG2+uQ+Tms1peawwHlkuxsI zB1+BH//BFMlRVX2wP3N+Kj0jiQh268kxMoTZA/biCnG07NtebzR2OuhQIq00Di5JRPF D/hg== X-Gm-Message-State: AOAM533m5f/Rq6n1iYOLDqHnm7vrm6cXFZa5lZ+qB7x5YLPxC+s10bgc ZmFb4LHhXHotCtwVtXBaMEc= X-Google-Smtp-Source: ABdhPJwmPwkzadG3IzGXM+TH9X3zzcrVGu+ztbuKjc6ySuF3D88YvREs89DstisX7TitObSh959W+g== X-Received: by 2002:a17:90b:4a47:: with SMTP id lb7mr2655148pjb.192.1634680744128; Tue, 19 Oct 2021 14:59:04 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bf7sm139325pjb.14.2021.10.19.14.59.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 14:59:03 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Thomas Gleixner , Thomas Bogendoerfer , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Russell King , Catalin Marinas , Will Deacon , Marc Zyngier , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org (moderated list:ARM SUB-ARCHITECTURES), linux-mips@vger.kernel.org (open list:MIPS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v5 02/14] MIPS: BMIPS: Remove use of irq_cpu_offline Date: Tue, 19 Oct 2021 14:58:43 -0700 Message-Id: <20211019215855.1920099-3-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019215855.1920099-1-f.fainelli@gmail.com> References: <20211019215855.1920099-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_145905_451366_A81A82C9 X-CRM114-Status: GOOD ( 16.73 ) 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 irq_cpu_offline() is only used by MIPS and we should instead use irq_migrate_all_off_this_cpu(). This will be helpful in order to remove drivers/irqchip/irq-bcm7038-l1.c irq_cpu_offline callback which would have got in the way of making this driver modular. Suggested-by: Thomas Gleixner Acked-by: Thomas Bogendoerfer Signed-off-by: Florian Fainelli --- arch/mips/Kconfig | 1 + arch/mips/kernel/smp-bmips.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index 771ca53af06d..2c03b27cec02 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -1782,6 +1782,7 @@ config CPU_BMIPS select CPU_HAS_PREFETCH select CPU_SUPPORTS_CPUFREQ select MIPS_EXTERNAL_TIMER + select GENERIC_IRQ_MIGRATION if HOTPLUG_CPU help Support for BMIPS32/3300/4350/4380 and BMIPS5000 processors. diff --git a/arch/mips/kernel/smp-bmips.c b/arch/mips/kernel/smp-bmips.c index b6ef5f7312cf..f5d7bfa3472a 100644 --- a/arch/mips/kernel/smp-bmips.c +++ b/arch/mips/kernel/smp-bmips.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -373,7 +374,7 @@ static int bmips_cpu_disable(void) set_cpu_online(cpu, false); calculate_cpu_foreign_map(); - irq_cpu_offline(); + irq_migrate_all_off_this_cpu(); clear_c0_status(IE_IRQ5); local_flush_tlb_all(); From patchwork Tue Oct 19 21:58:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12571235 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 38BD4C433EF for ; Tue, 19 Oct 2021 22:03:06 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 0362461260 for ; Tue, 19 Oct 2021 22:03:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 0362461260 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=dX7z4Kl/qXNg24Rf2jbO+TrgQCc2vwgDm0pndgG8lAM=; b=iRXzOKbsYXiIbs I9FPy3wIIV0y6Z2ib4ZFdeQYg/SVOshNX2/Ee+2GkJA6p/gjJQq1rpchNl+ZP0baWeAermGUDvnNH qP6YFx1dC9mHYToFwa7lyTLnTSUxfpszwaxfcIVxAXy1dWclesG9/L5hg0tWr330CAXqJmI9VXQg5 MqKr4KgW77wPeo37ViZqpHk2/xGR1Y2IweXuj2wohhbHslez1r4gE+gbzbETWHIjQqEYCnevg11Ds JyBABAmXy6nwai1uubE0dcW173GxKO5GBtq83p62P0ElotXFlKdN0LnlMr423vyeaoy9LGuJ91fVJ EjqtPccYo7Qkm0HapH8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxAs-002k2K-NV; Tue, 19 Oct 2021 22:01:35 +0000 Received: from mail-pg1-x536.google.com ([2607:f8b0:4864:20::536]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcx8U-002ioO-Rh for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 21:59:08 +0000 Received: by mail-pg1-x536.google.com with SMTP id e65so18231970pgc.5 for ; Tue, 19 Oct 2021 14:59:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=knXL02VOmkFLU9YLWF/5g5SfaxjLRPWcMFGGkfQ2MJo=; b=J+bh9w6aQV5iXo7J6TIa1ul0MoxIg7yVn5hvtsa5Q5IAo7h29Xhz+WFwGg0o2ja4JD iUTXrKfNk2rmhsKYmfF1VB2gv3CohHuYRZkWpG1wFi2j3QRZ17vsb9z/lzC4rWZvPyAU EID8cEcjJ/2HcKQ0SPyqe5S05W6eEnIQz4zU5GuKiCJ/BhQ8tEI9f19gdvqdBuRKKtLe iDqHyEeN33YKQ2CU2DbV8/1N5flnMz3vmojbomEDvHXEbBQW2/gkCrlPOfqRv9MbaoIw Y1Cq1Lw7Xu9A0ah5d43Ia/Hnw4OA1nhVmACgd1RaEmWQGMahfP30Udp2egS0xyXyseod u25Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=knXL02VOmkFLU9YLWF/5g5SfaxjLRPWcMFGGkfQ2MJo=; b=Ofw48/GQw//WOysuhhQTd0yZ7NIYRADLdKSOFGfg34MaBvkPaDXJbKoUrd8l1W3Kxt 2QdOf9/lp2uk4k6L0pql3q4ApTAKNDjyYDqfnIZhM6cWm5LE2edWc4/OZus1RM3civup W5VFP6N3IPGZpD+L9soneLSHuFvMOzR+GmWDEL5Tfm8mwnZVLTivM4mE/+/5NNjiBtJq DVFx7AeBTIhaEViUhLKLcLFxcGwIeFKCPLIGdR7tMtTwLAAOCQdmYq3Fp2hgAE/y/x4T E9xepGFxnLiXhkPWLIBcRiNsAsRlfZyn5yxdBafxpQtr6ChZ7krziGg5qs3u/B2++Umr kPjQ== X-Gm-Message-State: AOAM5325MkuNDd5vTZPEzlnZsW2z6n4fy/UiEvWzdwRE2pSjqjcbKOkQ X3kizy091r7qnzt5MMadL3I= X-Google-Smtp-Source: ABdhPJy+NOsLn0raHM4ZDL83rHjFaSBpPTZAUubBRpBpGrD32O0ki56vb2RyQVDqxdAtAoZpE0tJTA== X-Received: by 2002:a62:7a8b:0:b0:44d:47e2:99bf with SMTP id v133-20020a627a8b000000b0044d47e299bfmr2305391pfc.64.1634680745695; Tue, 19 Oct 2021 14:59:05 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bf7sm139325pjb.14.2021.10.19.14.59.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 14:59:05 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Russell King , Catalin Marinas , Will Deacon , Thomas Bogendoerfer , Thomas Gleixner , Marc Zyngier , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org (moderated list:ARM SUB-ARCHITECTURES), linux-mips@vger.kernel.org (open list:MIPS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v5 03/14] irqchip/irq-bcm7038-l1: Remove .irq_cpu_offline() Date: Tue, 19 Oct 2021 14:58:44 -0700 Message-Id: <20211019215855.1920099-4-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019215855.1920099-1-f.fainelli@gmail.com> References: <20211019215855.1920099-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_145906_940320_5A5E9CB8 X-CRM114-Status: GOOD ( 15.88 ) 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 With arch/mips/kernel/smp-bmips.c having been migrated away from irq_cpu_offline() and use irq_migrate_all_off_this_cpu() instead, we no longer need to implement an .irq_cpu_offline() callback. This is a necessary change to facilitate the building of this driver as a module. Signed-off-by: Florian Fainelli --- drivers/irqchip/irq-bcm7038-l1.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038-l1.c index a035c385ca7a..750156217c82 100644 --- a/drivers/irqchip/irq-bcm7038-l1.c +++ b/drivers/irqchip/irq-bcm7038-l1.c @@ -221,33 +221,6 @@ static int bcm7038_l1_set_affinity(struct irq_data *d, return 0; } -#ifdef CONFIG_SMP -static void bcm7038_l1_cpu_offline(struct irq_data *d) -{ - struct cpumask *mask = irq_data_get_affinity_mask(d); - int cpu = smp_processor_id(); - cpumask_t new_affinity; - - /* This CPU was not on the affinity mask */ - if (!cpumask_test_cpu(cpu, mask)) - return; - - if (cpumask_weight(mask) > 1) { - /* - * Multiple CPU affinity, remove this CPU from the affinity - * mask - */ - cpumask_copy(&new_affinity, mask); - cpumask_clear_cpu(cpu, &new_affinity); - } else { - /* Only CPU, put on the lowest online CPU */ - cpumask_clear(&new_affinity); - cpumask_set_cpu(cpumask_first(cpu_online_mask), &new_affinity); - } - irq_set_affinity_locked(d, &new_affinity, false); -} -#endif - static int __init bcm7038_l1_init_one(struct device_node *dn, unsigned int idx, struct bcm7038_l1_chip *intc) @@ -396,9 +369,6 @@ static struct irq_chip bcm7038_l1_irq_chip = { .irq_mask = bcm7038_l1_mask, .irq_unmask = bcm7038_l1_unmask, .irq_set_affinity = bcm7038_l1_set_affinity, -#ifdef CONFIG_SMP - .irq_cpu_offline = bcm7038_l1_cpu_offline, -#endif #ifdef CONFIG_PM_SLEEP .irq_set_wake = bcm7038_l1_set_wake, #endif From patchwork Tue Oct 19 21:58:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12571237 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8EBE5C433F5 for ; Tue, 19 Oct 2021 22:03:35 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 605F56113D for ; Tue, 19 Oct 2021 22:03:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 605F56113D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=n9reuRIPVjKqnJmb4/HFW15pg1LEXrSsoTLiQ4fWpMM=; b=E0rvvTo0Lykg2e pxdApLh0p3Vc2/wreyeCPxOJDe4U3iaUCUivQYI3Ii6gT8daLCFJQXzqTgh9dyF7BaLl9WxVX3aVb i3FbzMAFhx2uSQvVpUZfZfL8YVwBunZPLFwuo+zra+/jCiO0kgOAIzBZ8xGQX2AJMQL5FlrvBuJa5 IMu+oO0hqIhYw4FgjoOoipKrqTAyE6gZMsdiaHrwZW9NNmsDoGMWZ+u50nLG5dbYSkBzJFxExO83M pNjsIMXeKChKgkiw9p0dWJIRc8R0g24ILBS1m6gPSmfjMGGIWoOWPY7HDHTMken6LmadI2GV+ARwA 7UqU4e34wNkC4NzZDC9A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxBL-002kFV-EU; Tue, 19 Oct 2021 22:02:03 +0000 Received: from mail-pj1-x1036.google.com ([2607:f8b0:4864:20::1036]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcx8W-002iow-FV for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 21:59:09 +0000 Received: by mail-pj1-x1036.google.com with SMTP id ls18-20020a17090b351200b001a00250584aso931945pjb.4 for ; Tue, 19 Oct 2021 14:59:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b+ZBi3anDomFQV4e/giygkqAUlU4kNEpUMbqtcbvyD0=; b=jn9QML4KK77DYsSugzmcoMS/1b2NGB1u/HjX5lJrHxBI1MzFsQ/UO85N3H7XNBP9Db 6sSnbegctLVAjR3i2QPHtgFSOFWqCb+xBs4954wAMB6Aul32aB+Yun15zcZQ/tF5LCo9 I/w8HoHhQnxa/7nRVfyy1uiod3qXVk4f3VyjQoQpP0NsdPxCJNEKgHe2P1FPNMdhOawG CyRpHvAHruURxaLkvscPrng8VifYeMnB2ZZszM9Wax4GYvysMfeNB5Lf9yAlZ6TsVhzP wHYdrcXtqldANQUZmAAVkFi1NfHqn7DgBRhZrK7nyjmXGWagNa3OHtOadRDTJkJ05hUQ e9Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b+ZBi3anDomFQV4e/giygkqAUlU4kNEpUMbqtcbvyD0=; b=IrcBSzzeSiF2eOkKL6Nc3/WXw9yeLNYLwftnJd2VkenuhVJL1XRKJa273dnGrSSLZW YSJ3DTWeYWvFU7ok59iq2aK5JyqXKUO4ib4QaKkBIa7ko8R2keC+tLRwCZvO7DQzg7T8 wQxWcwcSthyXI/E1IEKM1z32h94nU+KdH/KGt5HXZWKaDxxPVJo3BKyk6spH2BzB6xvi ZmOdR0XmN6xtYysR5Y1iMhyb/RPzLkCoif/O1m7WEgRnvBwPgJ865HBI7D2Q3Pp0zI2q RwfCEl2GR01Mj+3PAYCCgjz4JqN5JSddGohquAxP6WzgIz/2OM/PbOhcRLJPfiTfCrg3 he3Q== X-Gm-Message-State: AOAM531Q4GsCJIZtbGP1KxG7o9UJZ2KyOnZFTKZBRlFTUfocTA6qtFe5 3jr8pSRfTmAEwRkmi2D/LCw= X-Google-Smtp-Source: ABdhPJw6vrFWYOXdAx+iTte/s/JqTgZ03LVQ6UZ7rk2h0Ha78jN26yD/7ThDWzeIPkjCe5yaxltnNg== X-Received: by 2002:a17:90a:f68a:: with SMTP id cl10mr2664896pjb.39.1634680747281; Tue, 19 Oct 2021 14:59:07 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bf7sm139325pjb.14.2021.10.19.14.59.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 14:59:06 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Russell King , Catalin Marinas , Will Deacon , Thomas Bogendoerfer , Thomas Gleixner , Marc Zyngier , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org (moderated list:ARM SUB-ARCHITECTURES), linux-mips@vger.kernel.org (open list:MIPS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v5 04/14] irqchip/irq-bcm7038-l1: Use irq_get_irq_data() Date: Tue, 19 Oct 2021 14:58:45 -0700 Message-Id: <20211019215855.1920099-5-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019215855.1920099-1-f.fainelli@gmail.com> References: <20211019215855.1920099-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_145908_545749_571099C8 X-CRM114-Status: GOOD ( 16.81 ) 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 Using irq_desc_get_irq_data(irq_to_desc()) to retrieve the irq_data structure from a virtual interrupt number is going to be problematic to make irq-bcm7038-l1 a module because irq_to_desc() is not exported, and there is no intent to export it to modules, see 64a1b95bb9fe ("genirq: Restrict export of irq_to_desc()"). Signed-off-by: Florian Fainelli --- drivers/irqchip/irq-bcm7038-l1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038-l1.c index 750156217c82..14caf32dc23e 100644 --- a/drivers/irqchip/irq-bcm7038-l1.c +++ b/drivers/irqchip/irq-bcm7038-l1.c @@ -386,7 +386,7 @@ static int bcm7038_l1_map(struct irq_domain *d, unsigned int virq, irq_set_chip_and_handler(virq, &bcm7038_l1_irq_chip, handle_level_irq); irq_set_chip_data(virq, d->host_data); - irqd_set_single_target(irq_desc_get_irq_data(irq_to_desc(virq))); + irqd_set_single_target(irq_get_irq_data(virq)); return 0; } From patchwork Tue Oct 19 21:58:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12571239 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F3506C433EF for ; Tue, 19 Oct 2021 22:04:15 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id C25326128B for ; Tue, 19 Oct 2021 22:04:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C25326128B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=cbXc//a3QKMZb5S6hDJlArxbGE2QXmiK2nSjyVtT4AY=; b=ARio6oCi9C4MVo tRVsljzxmIHRTV1HPSek7OudjfpFjzSa8/HXWue96kWQY7DEWeZV0uR3/ozlZ/7hmWshDvgb1hRZJ Zvd1GQurkF+4bFzfANfT0HlfXQ0o5D/w59S1EqtLG90i3mienr8QopHIZd9fNpYlWoWlvp0jhCZUO p70N/kRtsnv1k0v3hX1TWc407KUqkfW+3h8ghGn3gOKHfz8o+3yx173d8LQAkAcVqZwd21ub0YV7Z Ed6+LNsczxPFSJ14WnpPRG2XRd4uyopIDBFuSHfqahbBdWhIAFwptRb8Z9P7kTZ1r+CocQd5MdzOG cQu4qLvltULWPlRFoT7A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxBr-002kV3-1g; Tue, 19 Oct 2021 22:02:35 +0000 Received: from mail-pf1-x429.google.com ([2607:f8b0:4864:20::429]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcx8Y-002ipy-60 for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 21:59:11 +0000 Received: by mail-pf1-x429.google.com with SMTP id 187so1153302pfc.10 for ; Tue, 19 Oct 2021 14:59:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=G1RiT4GRKPcXSkOjyrks/jOWZL3DTQpMJtRhCsgVjY8=; b=cyzCM8cEq98+2JVInYARdzvnPFDlb+RpcmSxGjOnuPsTHUOiMok/KttJldug/14e8M rQvVnOyJ0CELKk8zzWnj0ffDJDHKcoQ4KTlUYzf8nLXmXm0aQq+BK1FeklFZvir79kyv lWfVmE/A64KuJHq+tZWeo+1PgoyOuo9FNfsSNPpyS+8V0dAF265+uleCgPN8vWjn67W5 h8rj5Jb3ITfWWh4W0gfJECjAMnOdhIviVMm+OMMTDszHr1W5jCJd2kq4XsWkW4dfguPj L+BsJeVzfw2kFltIQEdVeWByilZqd4OhMBVOTgAH6SB4uABOe3o0mXXY8MqCZ3JJs295 RChA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G1RiT4GRKPcXSkOjyrks/jOWZL3DTQpMJtRhCsgVjY8=; b=g+YUj6vDeKlpPM+nVvinR5xJgf8vKJNpZCh6L5P0ANJMkJAb5fD22XRD2ZCwiUtYCL NP7/iJXTLLy/KMF6uoRXhBISqsc/Nl3OHbEUl8ijFzvuX7uMIaW0UPkYv90IZSLWd5JV cr3AOJHPRO3cFmTPlbBbBSKnjU2T1WzWnPO/AyI2tmpROT3xsDYRRASdKnAediskzdjS xfrZsMdDoMV31NDw9RjxTedi3ZXCA9fH3lGmN1xVcZl3hiG2u2G9oHhC2t5lQQuN0Vyi xtA17FkzGTDAPTt9d4rkP3kNrt33/3nJujndoSqzSpSoEXjIvAGyRtT1r3kzEUMLrdGJ Do8A== X-Gm-Message-State: AOAM530bH38OTMGJsgxXhIFziAAjOZe3789Cv65BVxbfSpY9vHkxPz94 d/ZPNmfh6utEqMs/+wxQRlY= X-Google-Smtp-Source: ABdhPJyvXt8tiZQtburDOapFUkwxCPRPZJWC0e1+JlkT1IrqiUQ8MYGqccDWPCmqXGW0OBwRnOhxrw== X-Received: by 2002:a62:804a:0:b0:44c:5bfd:7765 with SMTP id j71-20020a62804a000000b0044c5bfd7765mr2360576pfd.83.1634680748991; Tue, 19 Oct 2021 14:59:08 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bf7sm139325pjb.14.2021.10.19.14.59.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 14:59:08 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Russell King , Catalin Marinas , Will Deacon , Thomas Bogendoerfer , Thomas Gleixner , Marc Zyngier , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org (moderated list:ARM SUB-ARCHITECTURES), linux-mips@vger.kernel.org (open list:MIPS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v5 05/14] irqchip/irq-bcm7038-l1: Gate use of CPU logical map to MIPS Date: Tue, 19 Oct 2021 14:58:46 -0700 Message-Id: <20211019215855.1920099-6-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019215855.1920099-1-f.fainelli@gmail.com> References: <20211019215855.1920099-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_145910_294375_B5471B70 X-CRM114-Status: GOOD ( 18.76 ) 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 The use of the cpu_logical_map[] array is only relevant for MIPS based platform where this driver is used as a first level interrupt controller and contains multiple register groups to map with an associated CPU. On ARM/ARM64 based systems this interrupt controller is present and used as a second level interrupt controller hanging off the ARM GIC. That copy of the interrupt controller contains a single group, resulting in the intc->cpus[] array to be of size 1. Things happened to work in that case because we install that interrupt controller as a chained handler which does not allow it to be affine to any CPU but the boot CPU which happens to be 0, therefore we never de-reference past intc->cpus[] but with the current code in place, we do leave a chance of de-referencing the array past its bounds. Signed-off-by: Florian Fainelli --- drivers/irqchip/irq-bcm7038-l1.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038-l1.c index 14caf32dc23e..3c4e348c661e 100644 --- a/drivers/irqchip/irq-bcm7038-l1.c +++ b/drivers/irqchip/irq-bcm7038-l1.c @@ -28,9 +28,6 @@ #include #include #include -#ifdef CONFIG_ARM -#include -#endif #define IRQS_PER_WORD 32 #define REG_BYTES_PER_IRQ_WORD (sizeof(u32) * 4) @@ -127,7 +124,7 @@ static void bcm7038_l1_irq_handle(struct irq_desc *desc) struct irq_chip *chip = irq_desc_get_chip(desc); unsigned int idx; -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && defined(CONFIG_MIPS) cpu = intc->cpus[cpu_logical_map(smp_processor_id())]; #else cpu = intc->cpus[0]; @@ -301,7 +298,7 @@ static int bcm7038_l1_suspend(void) u32 val; /* Wakeup interrupt should only come from the boot cpu */ -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && defined(CONFIG_MIPS) boot_cpu = cpu_logical_map(0); #else boot_cpu = 0; @@ -325,7 +322,7 @@ static void bcm7038_l1_resume(void) struct bcm7038_l1_chip *intc; int boot_cpu, word; -#ifdef CONFIG_SMP +#if defined(CONFIG_SMP) && defined(CONFIG_MIPS) boot_cpu = cpu_logical_map(0); #else boot_cpu = 0; From patchwork Tue Oct 19 21:58:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12571241 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24D1FC433EF for ; Tue, 19 Oct 2021 22:05:02 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id DDD306128B for ; Tue, 19 Oct 2021 22:05:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org DDD306128B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=uwYt1LbcutwbTHmo21nE6BAa4F3WOOaI7MOYHYOC3yU=; b=CEcewNRrQMwxFW g1anP+BkEJjsMFJ0lCBxH+ScMqlUs7f33kGRKJAQsRO3ccNZDVznbH2DhSqLQMxJFzqEg7FPL/JMp hNzx3BSbUnIb7PVxGPgr0kIT3ChzRVuY7QZhrdIz2aqg5XhWHLBkeMV4x/kew6t5PNzItQC3iUKoj YbjY4xLTzdzFvuPmvj4ptY/r1CZzQvd/ByOpfzcthsWq2CiaCa0qk9dj0a0t0q6sJr4pmik+9Mo11 oR58/hDKkk29Z+Sy64e4qxf94ZN1xozGSRmjPVkx45SSHyTKgTbaqqPEXrz2S9QMq1qmmQK8dlfxT 1U/GSBO60vdWsO1Nue/w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxCT-002klx-3W; Tue, 19 Oct 2021 22:03:14 +0000 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcx8Z-002iqz-VS for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 21:59:13 +0000 Received: by mail-pf1-x435.google.com with SMTP id f11so1143693pfc.12 for ; Tue, 19 Oct 2021 14:59:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eUj8nxm+KdP0d5VfXzrEXZEp4lkprKHXeVwPIifh+Cg=; b=cbYN7Cxv2G8RvGsn2smJXy6cbTiy+3imwrLXUgvBV/rkM8Cf2RL0aDdiDTn02Y4N0Q Q8qtXGA6cCKuilQCMq49WArq3yFCq1LG0QOOqBkRkPUgq9NOL00dZagNnq/bX0vaBTHL VyZw2Bc9id6udegI/MIKajPvPyHrLJK+1+zVXmpwFAv2XhYrMGl+fdtEfQfq8w3OszQf SpfIoAFfkuChdTbto7TcECACxWFtenRMwH1Cb7Yl1jkp+/5vjmdAA+D/UjOZ37JLepIi 5Fc/3TrL12aqEZ5Q3VZzHQLcUoxOxwfPuDmDpeHWAEgn02MZyOyVXjTwuV7jz40GkZfR pc3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=eUj8nxm+KdP0d5VfXzrEXZEp4lkprKHXeVwPIifh+Cg=; b=p+YxVJpdrNRq42SZYZReMlCbs+JhRyCNnglHTRfVfyFrAxiwlFyasL8+uixph8GqQP 0ZlYXpTKG06Qi2YgIWYK1ibn1M1/AQtlvkgKqah3l50qfG/EIS9hcEbCHPOQmIZWKF47 LVS+hzszaxvFR0ULwjzpFAaw79uvXuZTtjDagBJBd5lENr+u4EnE4gD59488xrH/OqPR ElAmJqKqRwoWEMFz6vzRCK0coMDyTScOH+uPQrHl2XApGZyLnptW6X7dt5LMHnh1Wx6U G3mIb2Xy08zOO1pYyz32NNxL+Ru6pB1XYu3CSbruMXkMjLFZQwCT0Gm2gdfBMQ805AGJ MXtg== X-Gm-Message-State: AOAM530LJB3ZABI+d5BrhFTlDK1c7T9q2o3WWBr+t/S3Xx9GYArwDvtw QHnOLUIEXmVBuH/JK/+B3gc= X-Google-Smtp-Source: ABdhPJxO03IacjIGjGc2dtfuUG7h/DIWCyZfIiZmC+P4q0hindtJohdpIN11hs7wH/XGXefV+oGdDA== X-Received: by 2002:aa7:8f28:0:b0:44c:f281:c261 with SMTP id y8-20020aa78f28000000b0044cf281c261mr2390018pfr.76.1634680750770; Tue, 19 Oct 2021 14:59:10 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bf7sm139325pjb.14.2021.10.19.14.59.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 14:59:10 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Russell King , Catalin Marinas , Will Deacon , Thomas Bogendoerfer , Thomas Gleixner , Marc Zyngier , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org (moderated list:ARM SUB-ARCHITECTURES), linux-mips@vger.kernel.org (open list:MIPS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v5 06/14] irqchip/irq-bcm7038-l1: Restrict affinity setting to MIPS Date: Tue, 19 Oct 2021 14:58:47 -0700 Message-Id: <20211019215855.1920099-7-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019215855.1920099-1-f.fainelli@gmail.com> References: <20211019215855.1920099-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_145912_051156_9702ABCE X-CRM114-Status: GOOD ( 18.28 ) 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 Only MIPS based platforms using this interrupt controller as first level interrupt controller can actually change the affinity of interrupts by re-programming the affinity mask of the interrupt controller and use another word group to have another CPU process the interrupt. When this interrupt is used as a second level interrupt controller on ARM/ARM64 there is no way to change the interrupt affinity. This fixes a NULL pointer de-reference while trying to change the affinity since there is only a single word group in that case, and we would have been overruning the intc->cpus[] array. Signed-off-by: Florian Fainelli --- drivers/irqchip/irq-bcm7038-l1.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038-l1.c index 3c4e348c661e..357570dd8780 100644 --- a/drivers/irqchip/irq-bcm7038-l1.c +++ b/drivers/irqchip/irq-bcm7038-l1.c @@ -191,6 +191,7 @@ static void bcm7038_l1_mask(struct irq_data *d) raw_spin_unlock_irqrestore(&intc->lock, flags); } +#if defined(CONFIG_MIPS) && defined(CONFIG_SMP) static int bcm7038_l1_set_affinity(struct irq_data *d, const struct cpumask *dest, bool force) @@ -217,6 +218,7 @@ static int bcm7038_l1_set_affinity(struct irq_data *d, return 0; } +#endif static int __init bcm7038_l1_init_one(struct device_node *dn, unsigned int idx, @@ -365,7 +367,9 @@ static struct irq_chip bcm7038_l1_irq_chip = { .name = "bcm7038-l1", .irq_mask = bcm7038_l1_mask, .irq_unmask = bcm7038_l1_unmask, +#if defined(CONFIG_SMP) && defined(CONFIG_MIPS) .irq_set_affinity = bcm7038_l1_set_affinity, +#endif #ifdef CONFIG_PM_SLEEP .irq_set_wake = bcm7038_l1_set_wake, #endif From patchwork Tue Oct 19 21:58:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12571253 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CE2EC433F5 for ; Tue, 19 Oct 2021 22:11:09 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id F2E436128B for ; Tue, 19 Oct 2021 22:11:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org F2E436128B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V5I59gxnmUhuHihW2C+dj4POONCD8Ez6DdxbhhtDWWc=; b=N3M48k0mfhnwVj JxtpZSGf7TjEpuQ1Z//tpsySa6WiyccZoGrXylcXSSygN6SFXMu7s71cyuV/bhlejkYM4Pu58AVbu fnVeGM0oi6oe439++Igc0mKEyGk/km8Yrwu7KiTT2c4NaxwFI3u78HAce7iQuF7M6x3x2382fKO2J CvOPlilpdrVoc10tKPOsSURW+OaIqYLUwWmnSM5bMce72xewLiRi3vtOg82AC0HDsrgyDGbgyP1BQ U1ggKcIc2weCaeAUT0rISATq7YMKamYP/73yQGd6LltV0ruLB2qvtb3UDNPj7/VJAdAcZzZpUBKS2 4Bn8B6uZKivQW60Yc2rw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxII-002n1F-PV; Tue, 19 Oct 2021 22:09:16 +0000 Received: from mail-pf1-x42b.google.com ([2607:f8b0:4864:20::42b]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcx8b-002is6-LU for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 21:59:15 +0000 Received: by mail-pf1-x42b.google.com with SMTP id d5so1180713pfu.1 for ; Tue, 19 Oct 2021 14:59:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=aWPYyECBOs5OYjE8k6irOqRBKiYPlvj6VE98fHuBoEM=; b=gZJWRC+2dFqFJj4c/rZEMg7264OkMv1n7MpdwjL+0E5AyiCh7SwkFyhVWQrKQxvFln BoJWZLAvC0rh06ocnMSl8dSZzgjd/fWRf9dWTk4b+oQlmmojeV9XJx7mZ0qUaQs8skcS DGv9/lu7KmhHmXvVjGo4u76T0nPOwcvWxCWJJ/50ZZvCZQCG+FK1EDpdJ5drIGB9jf5P sMFZJOooOtzmlEI9zWLMbZKYXVKlxSVf8XgwjWB0dUKUrCxHvskWF37pd/oKcPWhPZbJ V0pxx9lLTvUFgKtkKjhkJQnZIEPK/dFfbdiEh9IJIKCl6BIkBXz2aZAz0J0VWwnU4Iv2 uPIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aWPYyECBOs5OYjE8k6irOqRBKiYPlvj6VE98fHuBoEM=; b=1eZzN2Et0fDUN9X9eIvBf1cwZcLOy6tH/RmEORp2475ZZVE5TPwjkS1+3CYB1/SU+J 84SgrRvqk6uP9yIn3OE6lX+XPyptzUpbQpFFwEKO7WzJzA+sY3RB1ASwi/P9sYtZUg0c uhTvSoyrL37d9Wg0Kwpa943+O7RAodM3yhnFa8RPfXfgccFGt51bVjXq4AtohFinGvkx IVLR66tLyy/3AEkovp0gwmpU0FrQSK8kJdbmAg/m2RXDGMfRGDJ+q1t/ClBoQe1GsLnV YV4zPOVnZDCJ4q8Kp1oLoOxaAg0vc4CdXfNLGr92LAYrJsKZ7phn6jDZKQvdMwy7mTxL 9bfA== X-Gm-Message-State: AOAM533OeZul8eL5MxpzMdJs2H0Fzm8UU33eXmxFH5IuygGkh3qF4c3J QZRs1fKeV6G7CEVAEI6OWTIZPxOkilk= X-Google-Smtp-Source: ABdhPJy8A7uayRH/1ly9xr+VoiYI9yqmLB8Gb5p6PceSN1VUrSXpmwLJnuuudGx3zOEDJiGe6n11qQ== X-Received: by 2002:a62:7752:0:b0:44c:eb65:8561 with SMTP id s79-20020a627752000000b0044ceb658561mr2386280pfc.43.1634680752487; Tue, 19 Oct 2021 14:59:12 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bf7sm139325pjb.14.2021.10.19.14.59.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 14:59:11 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Russell King , Catalin Marinas , Will Deacon , Thomas Bogendoerfer , Thomas Gleixner , Marc Zyngier , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org (moderated list:ARM SUB-ARCHITECTURES), linux-mips@vger.kernel.org (open list:MIPS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v5 07/14] irqchip/irq-bcm7038-l1: Switch to IRQCHIP_PLATFORM_DRIVER Date: Tue, 19 Oct 2021 14:58:48 -0700 Message-Id: <20211019215855.1920099-8-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019215855.1920099-1-f.fainelli@gmail.com> References: <20211019215855.1920099-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_145913_739864_95AA45C0 X-CRM114-Status: GOOD ( 17.33 ) 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 Allow the user selection and building of this interrupt controller driver as a module since it is used on ARM/ARM64 based systems as a second level interrupt controller hanging off the ARM GIC and is therefore loadable during boot. Signed-off-by: Florian Fainelli --- drivers/irqchip/Kconfig | 4 +++- drivers/irqchip/irq-bcm7038-l1.c | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 4d5924e9f766..3022f6137096 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -115,7 +115,9 @@ config BCM6345_L1_IRQ select GENERIC_IRQ_EFFECTIVE_AFF_MASK config BCM7038_L1_IRQ - bool + tristate "Broadcom STB 7038-style L1/L2 interrupt controller driver" + depends on ARCH_BRCMSTB || BMIPS_GENERIC + default ARCH_BRCMSTB || BMIPS_GENERIC select GENERIC_IRQ_CHIP select IRQ_DOMAIN select GENERIC_IRQ_EFFECTIVE_AFF_MASK diff --git a/drivers/irqchip/irq-bcm7038-l1.c b/drivers/irqchip/irq-bcm7038-l1.c index 357570dd8780..f1e6e14145d2 100644 --- a/drivers/irqchip/irq-bcm7038-l1.c +++ b/drivers/irqchip/irq-bcm7038-l1.c @@ -397,7 +397,8 @@ static const struct irq_domain_ops bcm7038_l1_domain_ops = { }; static int __init bcm7038_l1_of_init(struct device_node *dn, - struct device_node *parent) + struct device_node *parent, + struct platform_device *pdev) { struct bcm7038_l1_chip *intc; int idx, ret; @@ -455,4 +456,8 @@ static int __init bcm7038_l1_of_init(struct device_node *dn, return ret; } -IRQCHIP_DECLARE(bcm7038_l1, "brcm,bcm7038-l1-intc", bcm7038_l1_of_init); +IRQCHIP_PLATFORM_DRIVER_BEGIN(bcm7038_l1) +IRQCHIP_MATCH("brcm,bcm7038-l1-intc", bcm7038_l1_of_init) +IRQCHIP_PLATFORM_DRIVER_END(bcm7038_l1) +MODULE_DESCRIPTION("Broadcom STB 7038-style L1/L2 interrupt controller"); +MODULE_LICENSE("GPL v2"); From patchwork Tue Oct 19 21:58:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12571255 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E35AFC433F5 for ; Tue, 19 Oct 2021 22:12:28 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id A7DD260FDA for ; Tue, 19 Oct 2021 22:12:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org A7DD260FDA Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=zp0p34aRBR+FtXcEY33TrVNXmBrkAw1zRoraIIipP3w=; b=MlaCvfRaWW8AhI fsuf/kDHsotVSDl5v1vt1YCGIRgcgLp7EXRkFLxUwkrzLRau1PZgZw2EkEY7KWIr1paWJ9fo7HqM1 tp4RqlNeVx8eE55xF+jV3o+28QIZVAGvCfDd7WnXBp/BplC89AMUBsDX2Y3PxSH7W0ecq9CoXXHXl Fxf5Kmoio2E8As/tFYjlR0PZ/XM2QGIgxaysQq/LDzSRwE3hDD8QupG+EkcAzbjKGLOLUGQlVle1K BtIYPt0xp7bUpMS61IRjEwLMHfx0eEzOdn/ChYr+yRwm1+yup5Kh91EC5AS1O71brwonUmegdwx6v H4g3U1TwhN1l+ZpJZgKA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxJO-002nQl-TH; Tue, 19 Oct 2021 22:10:24 +0000 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcx8d-002itA-8e for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 21:59:16 +0000 Received: by mail-pg1-x52a.google.com with SMTP id j190so13898064pgd.0 for ; Tue, 19 Oct 2021 14:59:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cLaNe7Oyl1seZD/HRHq9xGsMnTdlxwayLK+zY+0ZWyA=; b=UxZffa8of+qRMmxkBmX59yI9CaualuW1iIkSGhTsGXsRQJebcPI4ojMvSTNCwceycn 0SVvPz9TvMUHg/QV/9VtKdJmPBQCnEzG14KTxi21rLqaHzxpY8gm8gdAyIm1B5ohlN6d mdspW0614fbIBKuR36i9VX0IMYbvgZi+L+hq+Vrs6ePQVfXr5BJxTEF/RnIeHABCmal8 sS+GInlNEgp5Ll5HM60DVKUsvbt31bIxEb2uozduRvitvOqsMQ1WC/hlN52+swE552P9 FMWtcI8ADB7m/L5U603PwB96dXOjZeqne3LitVXpeqaJQuWewPYLnmVNJgaypAP1Xa7y 4QyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cLaNe7Oyl1seZD/HRHq9xGsMnTdlxwayLK+zY+0ZWyA=; b=K0IfmdLhlcTB9Fvj0Lok2SoHWFdFrjvpnajfTUo0a3WJ/BSJQQJSWgHkdcmqRsSZ/x K9kHke8SFekYJ5kDE9/qGQIV1X47t3HnU23boyi+nMJagFH6ZcRjctC61XBMGncNu3FD qPzQYyG/SHY9xZErq20E5MQ7joumeS6IHw2G1FwCApBDUigLjfUX8ERB9NraoODzU5nf p7sMd3nU5gge9gqKD3komtQYcIeKPv1XLB7CoLFbUVX0LJdRUs9tTzVT/hRZyvwfeZpq tOddIvCPH0zsUEUy5IA76WHAL3SeNRt6/nY3GD0+2I2n0phVmVQFviYupKh2AYdU1cS6 MY7w== X-Gm-Message-State: AOAM531rp5cf9N7Tkvefi3LKkIcI4RdMfPUxCo6rdbpkcP/LOVnkGGhX Wmdh1CLlS5RPgilOwiTvo2o= X-Google-Smtp-Source: ABdhPJzH/1H0jAf6Bo9RBA1rC8dh6J6XEcNujKK5YsWIhsGlQikRSaFksEuOuAqG8A9QksCSzuNq3w== X-Received: by 2002:a63:e516:: with SMTP id r22mr31282243pgh.197.1634680754125; Tue, 19 Oct 2021 14:59:14 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bf7sm139325pjb.14.2021.10.19.14.59.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 14:59:13 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Russell King , Catalin Marinas , Will Deacon , Thomas Bogendoerfer , Thomas Gleixner , Marc Zyngier , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org (moderated list:ARM SUB-ARCHITECTURES), linux-mips@vger.kernel.org (open list:MIPS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v5 08/14] genirq: Export irq_gc_{unmask_enable, mask_disable}_reg Date: Tue, 19 Oct 2021 14:58:49 -0700 Message-Id: <20211019215855.1920099-9-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019215855.1920099-1-f.fainelli@gmail.com> References: <20211019215855.1920099-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_145915_349954_FCC769A9 X-CRM114-Status: GOOD ( 12.03 ) 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 In order to allow drivers/irqchip/irq-brcmstb-l2.c to be built as a module we need to export: irq_gc_unmask_enable_reg() and irq_gc_mask_disable_reg(). Signed-off-by: Florian Fainelli --- kernel/irq/generic-chip.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c index cc7cdd26e23e..4c011c21bb1a 100644 --- a/kernel/irq/generic-chip.c +++ b/kernel/irq/generic-chip.c @@ -44,6 +44,7 @@ void irq_gc_mask_disable_reg(struct irq_data *d) *ct->mask_cache &= ~mask; irq_gc_unlock(gc); } +EXPORT_SYMBOL_GPL(irq_gc_mask_disable_reg); /** * irq_gc_mask_set_bit - Mask chip via setting bit in mask register @@ -103,6 +104,7 @@ void irq_gc_unmask_enable_reg(struct irq_data *d) *ct->mask_cache |= mask; irq_gc_unlock(gc); } +EXPORT_SYMBOL_GPL(irq_gc_unmask_enable_reg); /** * irq_gc_ack_set_bit - Ack pending interrupt via setting bit From patchwork Tue Oct 19 21:58:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12571243 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7C56C433EF for ; Tue, 19 Oct 2021 22:05:56 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B382961260 for ; Tue, 19 Oct 2021 22:05:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B382961260 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=eWraK/BnNDvV2vvHd/nsF6eLUp8A4WhxCkMrqMvqQiA=; b=D9Ps6+tbklpfqJ t7VXki49mZc7BKOHh8Ap3WcioeqCrM0iOipmwS5mFIqGTnCwZ2QXYwNlf+J/3wqURadLYUL7+xBbO lqs4JAnvFhf99NsiI/xg2Yt8ZqRVF71EZ/1i0uYAX8m2fT9t+6tERqGSggK/IIm3jbmehe2+RppTG FWIV+z/+DE/BXAYFZiU8CQ2aQhnl55RFXoy9i25ov5U5NA5VnY5gimQuDXrW0HeRnaXQCto1EtkIW k5tXEEVZWpcqo9WWNIeupgNt0lhYrhQlnY+FbPBusGz6TbK6HgdFDbYGroCBVxA2BG1wKT75JSsmQ V3+MgaoB6N4cw93PlWHA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxDQ-002lBv-9z; Tue, 19 Oct 2021 22:04:12 +0000 Received: from mail-pg1-x52c.google.com ([2607:f8b0:4864:20::52c]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcx8f-002iuH-2Z for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 21:59:18 +0000 Received: by mail-pg1-x52c.google.com with SMTP id 136so862006pgc.2 for ; Tue, 19 Oct 2021 14:59:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=c8Bh3Ui9YNGBrxgDKS29OGaqvTCLClNr/nEGx5BqRmI=; b=dgqh2Eqhu+SfYYXYGbhsVilHapzEJ4OIDr1BtT0zoO05zpsy/wA5LbMzHctCKYnuQx Q0bIqbzAzKQwxjJn26zO+bYhhJlyY+53hoVZ5q/J3KsWY58jm0PILctaAQ7Nr24PFhLb HTQY2Av9jkP/SmrmdIShdLYdbLf4d/GCs1HihLWv8thq0MFbiapI1qzzSbGbA9uW9tqZ pfxFRyeAb40kvS1knlN/uOK81VJZNbYsu+cYH6xcsk6jRvma0KE16RmMH7VxhGY5NPQ3 kk1Z7As/8cfqHlKefmp1xpcoDjElcmxox4m+7WFBpizRLpwQc1K407bngwoZK7CCQ7ca LZgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=c8Bh3Ui9YNGBrxgDKS29OGaqvTCLClNr/nEGx5BqRmI=; b=WZJSjYg9QcEr4oAQUNKQBJX0fl1mWaXUI4ujIkIS/5nZRY8h7gK8uV4G0Zz7BcDiQk NDAUh6z6DopTWdvP14xS1G52uV16w38dlCJ22R152Ajfpsr21aRoCc9gYrKwowKeRRR9 oexMYmaFedfigPFl8IFF2ylJsjYRzzQ7Tmx/sUCTs1BGuE92fGG4FZJXX3ilpBozjXdA gusHwgouZ1fDS5BIwngt2HbOHHhjebWXgCE1wNjSP07A3WW1avKpEMeOZhaKDWBfE6nI xsfKpcUH+pFcKJ4t+3fLndEqEw+b0TAZmlO1CbzwchXoXXuaE8YRvaVEhZ0Oc9Tu2K8R dylQ== X-Gm-Message-State: AOAM5326Ubwhz1IOI/F675jYL7V6iMW7scwAOxH20m1KBmTeUWbWlc+E 5Mm6ecF8r/791IzeLg+5SrxCokt42mo= X-Google-Smtp-Source: ABdhPJyau3kDcMWS70+R/w5sw3Fb11r/gal7Glmb2cGuuWx6ZK/a1vJ8yzGBjBB5Xp/mGuHAYq52hA== X-Received: by 2002:a63:724b:: with SMTP id c11mr9662708pgn.59.1634680755869; Tue, 19 Oct 2021 14:59:15 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bf7sm139325pjb.14.2021.10.19.14.59.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 14:59:15 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Russell King , Catalin Marinas , Will Deacon , Thomas Bogendoerfer , Thomas Gleixner , Marc Zyngier , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org (moderated list:ARM SUB-ARCHITECTURES), linux-mips@vger.kernel.org (open list:MIPS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v5 09/14] irqchip/irq-brcmstb-l2: Switch to IRQCHIP_PLATFORM_DRIVER Date: Tue, 19 Oct 2021 14:58:50 -0700 Message-Id: <20211019215855.1920099-10-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019215855.1920099-1-f.fainelli@gmail.com> References: <20211019215855.1920099-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_145917_158773_DC4933CB X-CRM114-Status: GOOD ( 16.14 ) 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 Allow the user selection and building of this interrupt controller driver as a module since it is used on ARM/ARM64 based systems as a second level interrupt controller hanging off the ARM GIC and is therefore loadable during boot. Signed-off-by: Florian Fainelli --- drivers/irqchip/Kconfig | 4 +++- drivers/irqchip/irq-brcmstb-l2.c | 22 +++++++++++++--------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 3022f6137096..dfe54bf9b35f 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -128,7 +128,9 @@ config BCM7120_L2_IRQ select IRQ_DOMAIN config BRCMSTB_L2_IRQ - bool + tristate "Broadcom STB generic L2 interrupt controller driver" + depends on ARCH_BCM2835 || ARCH_BRCMSTB || BMIPS_GENERIC + default ARCH_BCM2835 || ARCH_BRCMSTB || BMIPS_GENERIC select GENERIC_IRQ_CHIP select IRQ_DOMAIN diff --git a/drivers/irqchip/irq-brcmstb-l2.c b/drivers/irqchip/irq-brcmstb-l2.c index 8e0911561f2d..06364ba67d1d 100644 --- a/drivers/irqchip/irq-brcmstb-l2.c +++ b/drivers/irqchip/irq-brcmstb-l2.c @@ -271,20 +271,24 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np, } static int __init brcmstb_l2_edge_intc_of_init(struct device_node *np, - struct device_node *parent) + struct device_node *parent, + struct platform_device *pdev) { return brcmstb_l2_intc_of_init(np, parent, &l2_edge_intc_init); } -IRQCHIP_DECLARE(brcmstb_l2_intc, "brcm,l2-intc", brcmstb_l2_edge_intc_of_init); -IRQCHIP_DECLARE(brcmstb_hif_spi_l2_intc, "brcm,hif-spi-l2-intc", - brcmstb_l2_edge_intc_of_init); -IRQCHIP_DECLARE(brcmstb_upg_aux_aon_l2_intc, "brcm,upg-aux-aon-l2-intc", - brcmstb_l2_edge_intc_of_init); static int __init brcmstb_l2_lvl_intc_of_init(struct device_node *np, - struct device_node *parent) + struct device_node *parent, + struct platform_device *pdev) { return brcmstb_l2_intc_of_init(np, parent, &l2_lvl_intc_init); } -IRQCHIP_DECLARE(bcm7271_l2_intc, "brcm,bcm7271-l2-intc", - brcmstb_l2_lvl_intc_of_init); + +IRQCHIP_PLATFORM_DRIVER_BEGIN(brcmstb_l2) +IRQCHIP_MATCH("brcm,l2-intc", brcmstb_l2_edge_intc_of_init) +IRQCHIP_MATCH("brcm,hif-spi-l2-intc", brcmstb_l2_edge_intc_of_init) +IRQCHIP_MATCH("brcm,upg-aux-aon-l2-intc", brcmstb_l2_edge_intc_of_init) +IRQCHIP_MATCH("brcm,bcm7271-l2-intc", brcmstb_l2_lvl_intc_of_init) +IRQCHIP_PLATFORM_DRIVER_END(brcmstb_l2) +MODULE_DESCRIPTION("Broadcom STB generic L2 interrupt controller"); +MODULE_LICENSE("GPL v2"); From patchwork Tue Oct 19 21:58:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12571245 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0FA88C433F5 for ; Tue, 19 Oct 2021 22:06:43 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id C30F86128B for ; Tue, 19 Oct 2021 22:06:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org C30F86128B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=IVcA6d0LEGX9QAguQ3JTJJAQ3jpS8RGXOJZxcRXOqT0=; b=mlS/cnDppsx/su 7YkAwIcPcHZjD6E6jiaqjGC9mhLyYtcOnanFDogyS0W3fHrywjGm3UBB1qZR7hEBRBxbw/2RDUSyb BaTXIgEuLeQ2UHggAxxxgrNcQc2ezs6nziUEJiwxeeCX/K2eSkLfLAaBNlRtaJKIRlImW8X3nsgWI 7FKQJr3foL1BidltMyfZgamr/JPe7GxvVsGdg8tZWyJlgAe5VlYLI3fFIoFIbXph5ZrwjgUMTR1O+ VWAo9OeJeT2diAwbSI7UYwfi0Vym2MmZG/ExMvETDDWp8i4HQg1TIWGRZD8yYkMWKqZuw6eOF8p69 0Uz11vkI3AkCoD2uajCA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxE7-002lUZ-QH; Tue, 19 Oct 2021 22:04:56 +0000 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcx8g-002ivW-Q4 for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 21:59:20 +0000 Received: by mail-pf1-x42f.google.com with SMTP id f11so1143905pfc.12 for ; Tue, 19 Oct 2021 14:59:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HFON70fhXDszaD5v9yYPo/8gY6ecjeQthvGng5DXIkI=; b=NUH8PhewK1rIp/oj2+fAqEIqilcPjyVTvAvaV67rQFbGcZBQukOVGLuKdVj2Tt44SO jUasWzYA85KMUC4ohthpa9Rq3Cyll2wuzWbp6LEsgo8fEZsf1omxm6BU93Iw+6zfUvo4 YpH2jDWJStutIcTGBBHbaYzsbhLErWWOx7A4VqzuuB8aFeZzLLD/w0ZkW9j6g3Z3QDC4 O0h80Y2k4Nx/z2gSLHlgHhzpi0Unalvou52ci2AFLCgM2rhSiWijUGdvXXLNfrjQmHKc upsegXX6KN5MwV+kMMJPU6Vc+Rx6gGTLuAyO54dnBVkr7OHyMzvbaQFIgXUWvXa5YTUl QrxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=HFON70fhXDszaD5v9yYPo/8gY6ecjeQthvGng5DXIkI=; b=rLz2S7bG2SjrXIPSfQ6m6/awaX3N3iGSk/UFjtQyvlvSBpmoXyR1tZVgCITYyQBcSL 2s+p9VX89gBzDJK0MJq2C/nI8Un3IVEcwCgNdQYovs/t1znPcyOftX6IICyQTzt4uW3O CGuEmRfGnarSBpJ74j/HntuXagEZ8DxhnFWklOt/M0nHohhgXd21VyLOJlOQ/SHkfFlU ze46eiSmN2GiGqzQLmeFQrG56vqL8cXAdGDt8BSGQApAbSIgGnkK5tDl1+IwZjG2pKMV 8lis8Sp0vV9Yj4Sz05GpOkErvmfaXrw3sq2NiOtTlfq2owZb/z4MUvUBsyGuOUi09nsp /nmg== X-Gm-Message-State: AOAM530asRki5y4OG+ws0Z9lC4LM8xT2xFnYhytvzz17f1CMEcD0E3OV Zmj37oTEqcQzzKCpEDSOxZs= X-Google-Smtp-Source: ABdhPJxu9CgzVTcZCjgwFxlmhCuf1nnhd3NDbzSWdoFwOrZQKasg47nSSV4dr8wa0FneiDUPY+Pvkg== X-Received: by 2002:a62:27c7:0:b0:44d:b86:54f2 with SMTP id n190-20020a6227c7000000b0044d0b8654f2mr2435129pfn.68.1634680757552; Tue, 19 Oct 2021 14:59:17 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bf7sm139325pjb.14.2021.10.19.14.59.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 14:59:17 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Russell King , Catalin Marinas , Will Deacon , Thomas Bogendoerfer , Thomas Gleixner , Marc Zyngier , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org (moderated list:ARM SUB-ARCHITECTURES), linux-mips@vger.kernel.org (open list:MIPS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v5 10/14] genirq: Export irq_gc_noop() Date: Tue, 19 Oct 2021 14:58:51 -0700 Message-Id: <20211019215855.1920099-11-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019215855.1920099-1-f.fainelli@gmail.com> References: <20211019215855.1920099-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_145918_873716_223EEDF4 X-CRM114-Status: GOOD ( 11.81 ) 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 In order to build drivers/irqchip/irq-bcm7120-l2.c as a module which references irq_gc_noop(), we need to export it towards modules. Signed-off-by: Florian Fainelli --- kernel/irq/generic-chip.c | 1 + 1 file changed, 1 insertion(+) diff --git a/kernel/irq/generic-chip.c b/kernel/irq/generic-chip.c index 4c011c21bb1a..6f29bf4c8515 100644 --- a/kernel/irq/generic-chip.c +++ b/kernel/irq/generic-chip.c @@ -25,6 +25,7 @@ static DEFINE_RAW_SPINLOCK(gc_lock); void irq_gc_noop(struct irq_data *d) { } +EXPORT_SYMBOL_GPL(irq_gc_noop); /** * irq_gc_mask_disable_reg - Mask chip via disable register From patchwork Tue Oct 19 21:58:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12571247 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3A166C433EF for ; Tue, 19 Oct 2021 22:07:54 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 023E061260 for ; Tue, 19 Oct 2021 22:07:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 023E061260 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=6Mit3rxaLxBibsUkuwdhvLpDPKmT8un7Ku31iGk+h24=; b=YuQkl6pqgrg5NI 7j6jj13OoweyosQ0Eecjn/lBTo3S36OcsIyVKo+0sFosPhhNjhaRh/36byLZRcRDtUxrxBfwwx52d 0YCynoTsi5b/VqW1BBZsz78Ga0aQ/XD8LnOKp2mcRbeXV0hAEj5l9ZztjpJR4oUBDIA7qjupY/0Yp J2iXYgXnWd7QE5iZYms+rNKtN2GhTFFtIcfCCNVeolZFfAP6ecUDFcVPy4s31KL5B1jjwDPfO1tE4 +paiFyQ6+hiaLNP3gXJbYe2TvRD9HX7K4FgZXZKLmQ0/9VvtQFT3lviHFASU2HF+A0iaoGRIFvubJ 5URaLsN7WCGMLvQYgcMg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxF6-002lrb-Jl; Tue, 19 Oct 2021 22:05:57 +0000 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcx8i-002iwU-Aa for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 21:59:21 +0000 Received: by mail-pf1-x430.google.com with SMTP id d9so1168198pfl.6 for ; Tue, 19 Oct 2021 14:59:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=T+nuZjtMi8lifdnlhi4/+fNb2Wj4qKRZZKIw/UMDjOI=; b=pnk2Ki9piaE+Jf4iFrqOU1lKxOr4VVKqgnzA6M0Q1bvCpFY0cqleKo31AGAzmqF0e1 NSFhLdZ5Fq3W4nymSNGrhF0/syk0CZKc5+levWF5Afh0mmgNn1li4LB64emC+RRfU2t3 hHP7JBe/gsgD+QdqRp1HZemxZ4WKQTa5S2w2W+ujJJn8pl41ymO/xKUDMHdhevll4LOk wNwqIfZYLkxH4XTcBaJAFHKwN3mFB2aBgJSOvDjrhP4m8OCI0zoKGDiX0izDyi/lLeBC cA6Iv0n/Ys+U40IggBld3Nssr5StzgHVt1myOzTCPAM6RjVBAoCEqDAboW5fyHVzCtPC Vk5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=T+nuZjtMi8lifdnlhi4/+fNb2Wj4qKRZZKIw/UMDjOI=; b=xnFwkiBRpD+2XuZk6iz1xrV5jYzhOHL4jJIp8Xrb5nzFXc3INDp1+HqQO6w7Wx4CV2 cb4L1dLEZdp7y1xDLJUMjvvsthuphJAmg4kKvPR4njekQ3N4vgm6xGMdJiJFuzfgTOQD 9kwIkqwdrxkDVoYfzFLq2ca+SZ6WRdSB5ZE/N7wh1GkD3h5fjMNXdsRiuu8aDyjLXCP7 tBQVDruGwke81M+X+fZeNMJfU2CPv9Nj1/23V58U9KLQ9PTcviq4OvYNMV8j6hCQb/q7 DqYBVH7CXloLmLX3s+D8dzOLwT3rmFDLFlWBSOwGE6qUtf+dxEZxFnRMSKl3vBBQ6+Qj +2ZA== X-Gm-Message-State: AOAM532khIb5w/AKM6CkE5IB4+XxAepbXW8xp9JiJYocTH/BVpLdu7zM j1KpT0aQwf2flN9kqH5YN/Q= X-Google-Smtp-Source: ABdhPJxLuePV0+uMoFQjH8ssdV4w2GVRjyIuIhxVjnIoy7crBYQp4NMCio/lroj0C7Pdni9mP1UP6Q== X-Received: by 2002:aa7:9d0b:0:b0:44c:62a6:8679 with SMTP id k11-20020aa79d0b000000b0044c62a68679mr2384955pfp.0.1634680759089; Tue, 19 Oct 2021 14:59:19 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bf7sm139325pjb.14.2021.10.19.14.59.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 14:59:18 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Russell King , Catalin Marinas , Will Deacon , Thomas Bogendoerfer , Thomas Gleixner , Marc Zyngier , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org (moderated list:ARM SUB-ARCHITECTURES), linux-mips@vger.kernel.org (open list:MIPS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v5 11/14] irqchip/irq-bcm7120-l2: Switch to IRQCHIP_PLATFORM_DRIVER Date: Tue, 19 Oct 2021 14:58:52 -0700 Message-Id: <20211019215855.1920099-12-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019215855.1920099-1-f.fainelli@gmail.com> References: <20211019215855.1920099-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_145920_403055_F192FAEF X-CRM114-Status: GOOD ( 19.03 ) 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 Allow the user selection and building of this interrupt controller driver as a module since it is used on ARM/ARM64 based systems as a second level interrupt controller hanging off the ARM GIC and is therefore loadable during boot. To avoid using of_irq_count() which is not exported towards module, switch the driver to use the platform_device provided by the irqchip platform driver code and resolve the number of interrupts using platform_irq_count(). Signed-off-by: Florian Fainelli --- drivers/irqchip/Kconfig | 4 +++- drivers/irqchip/irq-bcm7120-l2.c | 28 ++++++++++++++++------------ 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index dfe54bf9b35f..c7320bed5668 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -123,7 +123,9 @@ config BCM7038_L1_IRQ select GENERIC_IRQ_EFFECTIVE_AFF_MASK config BCM7120_L2_IRQ - bool + tristate "Broadcom STB 7120-style L2 interrupt controller driver" + depends on ARCH_BRCMSTB || BMIPS_GENERIC + default ARCH_BRCMSTB || BMIPS_GENERIC select GENERIC_IRQ_CHIP select IRQ_DOMAIN diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c index f23d7651ea84..9b1edf7747fd 100644 --- a/drivers/irqchip/irq-bcm7120-l2.c +++ b/drivers/irqchip/irq-bcm7120-l2.c @@ -214,6 +214,7 @@ static int __init bcm7120_l2_intc_iomap_3380(struct device_node *dn, static int __init bcm7120_l2_intc_probe(struct device_node *dn, struct device_node *parent, + struct platform_device *pdev, int (*iomap_regs_fn)(struct device_node *, struct bcm7120_l2_intc_data *), const char *intc_name) @@ -230,7 +231,7 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn, if (!data) return -ENOMEM; - data->num_parent_irqs = of_irq_count(dn); + data->num_parent_irqs = platform_irq_count(pdev); if (data->num_parent_irqs <= 0) { pr_err("invalid number of parent interrupts\n"); ret = -ENOMEM; @@ -334,21 +335,24 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn, } static int __init bcm7120_l2_intc_probe_7120(struct device_node *dn, - struct device_node *parent) + struct device_node *parent, + struct platform_device *pdev) { - return bcm7120_l2_intc_probe(dn, parent, bcm7120_l2_intc_iomap_7120, - "BCM7120 L2"); + return bcm7120_l2_intc_probe(dn, parent, pdev, + bcm7120_l2_intc_iomap_7120, "BCM7120 L2"); } static int __init bcm7120_l2_intc_probe_3380(struct device_node *dn, - struct device_node *parent) + struct device_node *parent, + struct platform_device *pdev) { - return bcm7120_l2_intc_probe(dn, parent, bcm7120_l2_intc_iomap_3380, - "BCM3380 L2"); + return bcm7120_l2_intc_probe(dn, parent, pdev, + bcm7120_l2_intc_iomap_3380, "BCM3380 L2"); } -IRQCHIP_DECLARE(bcm7120_l2_intc, "brcm,bcm7120-l2-intc", - bcm7120_l2_intc_probe_7120); - -IRQCHIP_DECLARE(bcm3380_l2_intc, "brcm,bcm3380-l2-intc", - bcm7120_l2_intc_probe_3380); +IRQCHIP_PLATFORM_DRIVER_BEGIN(bcm7120_l2) +IRQCHIP_MATCH("brcm,bcm7120-l2-intc", bcm7120_l2_intc_probe_7120) +IRQCHIP_MATCH("brcm,bcm3380-l2-intc", bcm7120_l2_intc_probe_3380) +IRQCHIP_PLATFORM_DRIVER_END(bcm7120_l2) +MODULE_DESCRIPTION("Broadcom STB 7120-style L2 interrupt controller driver"); +MODULE_LICENSE("GPL v2"); From patchwork Tue Oct 19 21:58:53 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12571249 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EB3DAC433F5 for ; Tue, 19 Oct 2021 22:08:53 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id AF32D6128B for ; Tue, 19 Oct 2021 22:08:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AF32D6128B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=LY4Q00sZLX3QRTvo/lwIuTenkMggTQmiDELEy4+X+/4=; b=dtJpK3T+6ALViU tne+xiRCVfwFRHtZb3+AO8eyjY9onkx+o9T3lKte6O42frAH252d13zjo5irTFKBu0OvO2pofS/fe 3WSc+hmSXAmAYMLqSWRL3j5MQMKIMA3DSRxWYhqWWa+HRi27lU/eqAhzpJMBJJLFuiMkX1GNjAvHK Om4t3r+D225uFQ85OZpgur/xO/y4FdPB2lACSfJ7wxW6GtUZwlQcK4v4UxXQnUJ0BgsHlKCGX7V2o MD3haH2XYz+/ZCheHJnH2U4hN9l+xQHR2j75fz1x2yjJA8W5g1ywnfHex0dsq+r4cHgGq9nG4hzzZ hoiIEZFDmR9Qr1nM/3+A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxG7-002mEf-Lo; Tue, 19 Oct 2021 22:07:00 +0000 Received: from mail-pj1-x1033.google.com ([2607:f8b0:4864:20::1033]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcx8j-002ixv-OA for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 21:59:23 +0000 Received: by mail-pj1-x1033.google.com with SMTP id ls18so981026pjb.3 for ; Tue, 19 Oct 2021 14:59:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5ALk99V/yV50Q7B1PyIb1+nfNEsL1ZZBgIrsEIIgD/g=; b=N46xaqCV1Ya66lu9pnPn3P2UGULweE5FkPxi51wwEsY3ca5TIRpTzowGIL9KK0CPBd xTcD4xP4sWSF3N+YSRfzKX/zOJ0ASy5mWLUroMF6p+/7zzT/pCQZ5C4RyCEOQ3kWl0Fn 4QTFPTlqbPzsd1i+mpwFG3UJnuE+PKVvNMBurUUk4LXu/moYXJlxQ5IWkxS5SIwu3mV7 Fjmo6dmQRu1yWQpzxvONABKB6yssqySAklq9VFsXYW6R2anUHbMhpbttbKBqVvqlnXge WTxNHYIqKjoGntVnE+LVUSQg0v1JKP5ZM0X2PG25/79y/iiz+Fi9bFDA0KhwfsLtnsGT 9s0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=5ALk99V/yV50Q7B1PyIb1+nfNEsL1ZZBgIrsEIIgD/g=; b=eouzpN/Ui0KtqD+0dtA1a7IqnG6DZWLqqDFst8ERF8Qp44RTJtMqEsiA7kura2GC+L KRs7ivXG4oGlCRdQvftxxgrZ2W4PUA/WeZ9qoTxW0KUBlvkfM+5+JzYA/rdnK6zV1Vt1 yRFeuaxhgWlL0ApWnYZqpwOsuY3HLliU77Em+Wx0LmnWn7mUsu+/Gz/wg8QKt9bSeHfh w15vuEsNOpHhvJbvwhYanoORm92XGDKkvtpfaKJ0b778j8CN2M7F3nqtjmVCvwtqqFIQ 6K/zIEyJGhlD9DqbRIZBNqUQHYRFKTisNMXNxDv5Ikpo4VMzICDlgse0s+uWMHHflGd2 tYzA== X-Gm-Message-State: AOAM530AiIEUGLJMvIsTEAzTrJeOIkQ1VEpWy2orSXpvbAzKICqbuYTl EKtrkqiXP9TgcNnOLHAlcgo= X-Google-Smtp-Source: ABdhPJzWpyM1C2qGr1nMlYAwXWIVZOv+GkHF0hDeN/rI0sLoSSxh4Qx7D4dUFc53gJhlcJ4NP6RBCQ== X-Received: by 2002:a17:90b:1a87:: with SMTP id ng7mr2823769pjb.69.1634680760605; Tue, 19 Oct 2021 14:59:20 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bf7sm139325pjb.14.2021.10.19.14.59.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 14:59:20 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Russell King , Catalin Marinas , Will Deacon , Thomas Bogendoerfer , Thomas Gleixner , Marc Zyngier , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org (moderated list:ARM SUB-ARCHITECTURES), linux-mips@vger.kernel.org (open list:MIPS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v5 12/14] arm64: broadcom: Removed forced select of interrupt controllers Date: Tue, 19 Oct 2021 14:58:53 -0700 Message-Id: <20211019215855.1920099-13-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019215855.1920099-1-f.fainelli@gmail.com> References: <20211019215855.1920099-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_145921_820983_8886FF96 X-CRM114-Status: GOOD ( 13.09 ) 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 Now that the various second level interrupt controllers have been moved to IRQCHIP_PLATFORM_DRIVER and they do default to ARCH_BRCMSTB and ARCH_BCM2835 where relevant, remove their forced selection from the machine entry to allow an user to build them as modules. Signed-off-by: Florian Fainelli --- arch/arm64/Kconfig.platforms | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index b0ce18d4cc98..2e9440f2da22 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -44,7 +44,6 @@ config ARCH_BCM2835 select ARM_AMBA select ARM_GIC select ARM_TIMER_SP804 - select BRCMSTB_L2_IRQ help This enables support for the Broadcom BCM2837 and BCM2711 SoC. These SoCs are used in the Raspberry Pi 3 and 4 devices. @@ -82,8 +81,6 @@ config ARCH_BITMAIN config ARCH_BRCMSTB bool "Broadcom Set-Top-Box SoCs" select ARCH_HAS_RESET_CONTROLLER - select BCM7038_L1_IRQ - select BRCMSTB_L2_IRQ select GENERIC_IRQ_CHIP select PINCTRL help From patchwork Tue Oct 19 21:58:54 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12571251 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4BF0C433F5 for ; Tue, 19 Oct 2021 22:10:04 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 729F86128B for ; Tue, 19 Oct 2021 22:10:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 729F86128B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=IjtZu2/XIwIRVQMS5fIHdj8UCLdos7xLH5lYbfZ9fJA=; b=ZEaU0eF7y0GIE+ E95sP63KsuaQT3R9TS2A+vyh7luHr0Tb6mTFxEsXdQVG6VA7FMYeOCFQ2OXuCYoAqyB/jeVWQkXvp Pn50DxNWgZJqIDeTwTh6okafXP7Fn1Fb6gEWfgMtgXhgP9w19HTfk5XECIdJ6Asrwug7TuceulsZ+ tMCVjhLyge6/tfLiHkPKWKwxYvCcw5HmJqhUMMN9DGN4ob+6G2nZxC7d4mzzTOgofALpJ2Mz+/Gr7 IjcAB/UrUycsg2QPetZd47gFHiTgh4nFfNTQtokfcZdBQBmHEe+Gvw8SX1+Rnz+VaanOVSuvUoQyF 0TkrwKqVNAnOoAALghBg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxGz-002mY3-Iq; Tue, 19 Oct 2021 22:07:54 +0000 Received: from mail-pg1-x52a.google.com ([2607:f8b0:4864:20::52a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcx8k-002iyt-MB for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 21:59:24 +0000 Received: by mail-pg1-x52a.google.com with SMTP id 136so862227pgc.2 for ; Tue, 19 Oct 2021 14:59:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=cvv2iZxij6FWrFEEKivGkcFAPGtCwuGKeJ0S/lB+6EU=; b=puyoSqrav3ko0lxLZDxOgj+HF1tMBUhtqeS8ibOhQkHM6TZio2/uRT9KT/AchkliH3 ojpy87guSLAevK+3haRFgpyrMyenPSCxA/7CDUwQNDghnHe1BonrgUntG+wx2GlzwV/w oFvg2SQa2sTNuLN0OS3TC4d3u9P4F1+jU/4NjMmAYds3xMymzYbZQUKXh08AQeHsIQH9 dV/8N7WeiA8dANrE6ZS4h4KRMuKbWSFgIchErMO0d7Hm/o+TRrcvYGkoyZTAvnJ5RpNP 0LlcwFaFC1omp4VwK4XmrfAMSm9glKW0hKMXS4zWp6DlQlGaNwhi7U2NTaQPz0k7a1mi Y7nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=cvv2iZxij6FWrFEEKivGkcFAPGtCwuGKeJ0S/lB+6EU=; b=ifh5NA4cMSqSVIOOvWnXkHmyUUlQJnpKqKmgfbyGvwM/v6le5N49lQxDEcaXnWb/cs wnKbT5mUHjIRcgmyPxEGahE/3qdv8Dw2+YYuaXAzh1UtJ57suO6/JC+3ZICwsLu/Yjjp Ymhjj4wV7yBq8Gn8YrcOvkWeAkWObDCVNANt44vLSeIpZpEtVuYMI/lrEwUNiZn9rlt+ bX3EmvfIXlPczTaIStNYHOBuDBDoz56iEBwtZ49HPzYl6vJCSy6WJikdkasQ4194J3OC 3Ut8qoZYHHMi0wVhpLB0wKVfKamOW09GCH+LYUY8LrvUGRa94HnJpjZzoFw9VgoLPiqg EHzg== X-Gm-Message-State: AOAM532ESeBkhbxStqGS6+K+T5VX2mQwMGtUNN4vSC3aunKRYta7i6/I VVOswRw59pqwV0P+/ceCLKw= X-Google-Smtp-Source: ABdhPJxhzjt2b4JpAP5y08pLkv/ZLh6VuVP+HWQ9UgMTyxUq1vcrNg8BwCWVmSqBUvmU5OQowhuk1Q== X-Received: by 2002:a63:3d8c:: with SMTP id k134mr30384423pga.394.1634680762159; Tue, 19 Oct 2021 14:59:22 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bf7sm139325pjb.14.2021.10.19.14.59.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 14:59:21 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Russell King , Catalin Marinas , Will Deacon , Thomas Bogendoerfer , Thomas Gleixner , Marc Zyngier , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org (moderated list:ARM SUB-ARCHITECTURES), linux-mips@vger.kernel.org (open list:MIPS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v5 13/14] ARM: bcm: Removed forced select of interrupt controllers Date: Tue, 19 Oct 2021 14:58:54 -0700 Message-Id: <20211019215855.1920099-14-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019215855.1920099-1-f.fainelli@gmail.com> References: <20211019215855.1920099-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_145922_777763_3024DA2C X-CRM114-Status: GOOD ( 13.29 ) 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 Now that the various second level interrupt controllers have been moved to IRQCHIP_PLATFORM_DRIVER and they do default to ARCH_BRCMSTB and ARCH_BCM2835 where relevant, remove their forced selection from the machine entry to allow an user to build them as modules. Signed-off-by: Florian Fainelli --- arch/arm/mach-bcm/Kconfig | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig index 2890e61b2b46..bd3f82788ebc 100644 --- a/arch/arm/mach-bcm/Kconfig +++ b/arch/arm/mach-bcm/Kconfig @@ -161,7 +161,6 @@ config ARCH_BCM2835 select ARM_TIMER_SP804 select HAVE_ARM_ARCH_TIMER if ARCH_MULTI_V7 select BCM2835_TIMER - select BRCMSTB_L2_IRQ select PINCTRL select PINCTRL_BCM2835 select MFD_CORE @@ -209,9 +208,6 @@ config ARCH_BRCMSTB select ARM_GIC select ARM_ERRATA_798181 if SMP select HAVE_ARM_ARCH_TIMER - select BCM7038_L1_IRQ - select BRCMSTB_L2_IRQ - select BCM7120_L2_IRQ select ZONE_DMA if ARM_LPAE select SOC_BRCMSTB select SOC_BUS From patchwork Tue Oct 19 21:58:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 12571257 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 32A3DC433F5 for ; Tue, 19 Oct 2021 22:13:18 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id EF56561038 for ; Tue, 19 Oct 2021 22:13:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org EF56561038 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=yEwxeIQc+UU+L7yj3eECEoI06gerT965sLE+23vm7OY=; b=qlNt8DyondF6mF HPj4XptW6cI7OIVIW//dBpZhXodRuggZ7qh2cQ1v5K1Q6HmH3s1K28pqdq++tNDCy51vS4qzpAo53 3rAcdza8cez2IOAZStdL8JlCNtIUzbSmBTJotQE+tbI64k8Lk0xfAEA1XEv+vNDCJ5DrAKQK8KpPg 2tusoflthwHQRODgCJBrnDqxu5l+rkN2iReJzW3wQaKqH9sD0iBNd5gMI29ynMpyF2ANld8BX3r// oUUEcmYfbgGg7fd7Bmae9yKbKza4gcUWysD+jTI5LZ7cEawyH/Znvv3R6VuOFrcnT//ep1Vemq491 BYl6qT3U+tNaIC1TX/kg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcxKW-002nqV-HU; Tue, 19 Oct 2021 22:11:33 +0000 Received: from mail-pg1-x52f.google.com ([2607:f8b0:4864:20::52f]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mcx8m-002izt-SI for linux-arm-kernel@lists.infradead.org; Tue, 19 Oct 2021 21:59:26 +0000 Received: by mail-pg1-x52f.google.com with SMTP id 136so862273pgc.2 for ; Tue, 19 Oct 2021 14:59:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2G1kdri23kWnlj1enPufIZN1leyxpMasJ2EyRU0acfw=; b=Y5clh4hJuQyM8eC5A+hgiBCp367+x4gkBxd+43EC3gI8EhkdW9oupc9VprJN88A+SS MXTHIQCNafVT3DbL2pCZSy3fiLeF0SEKKp0m6MVaa6nk70CD2U8zGmq/1cEi5NM/7I3X DVM4WarHYUHHtzY263A4Kz2rszp3lsNoKs0v2rvv6hfDsyAFR7ILK2Ov1P81G/OXu7+n UuW4Sa46ne3mVkOBB09KzfcE/ffd4WXtx3d1ugUwrqtf/VI+0bfPdTMw128tcJ4+X95R a1/YA5eKCmN+kkII9t5ISBDNRfN5T4/yLr6NPGd1/mT3rgLbS5u860+VgdrpyHIxNta2 A1sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2G1kdri23kWnlj1enPufIZN1leyxpMasJ2EyRU0acfw=; b=6KII/myrKNV2k99dZiCZW20JywoLnT8Z8OgE4j5eGeGqsW90Um6mLWIooq3uTsni+m KP3uqNL77QWfUpJKEcRIumUoDAr9IApTg8I0n9cMi+75JiayxQr5XMDvRmceGCB0Pabp CbmVKHkbKbv+akoT5+JiGTFh8hJWVuaJMFZQH6bXxHPcpoXbh6SQx8pamdEn44gpSxmv oBlBsIAX3GwJNojaHoRVK8Le/qktaA77vYkETf4Xnzsjrz+DntiG0bPuOO4Myi3br6su pjJh80t7EKDrLY1YBwoClB22EObOaj5FZETwDshPR7aYtAGtANaMED+SpLr1vQVDrrjX cGFg== X-Gm-Message-State: AOAM530HEA5Hhm01oeo0Z2IdlR7UqYiW/FBQb6eFnvdS56Md2L/Q4WzR b7aZb/SJ6pAOYpGkucxOMww= X-Google-Smtp-Source: ABdhPJxR3R8hw1YDkPeaq+1XWGII38BdkuxodKSXvnmpG9QGveZCyXnqmGNQGOxR6w5CknBLqcfbnA== X-Received: by 2002:a63:7514:: with SMTP id q20mr5138672pgc.232.1634680763731; Tue, 19 Oct 2021 14:59:23 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id bf7sm139325pjb.14.2021.10.19.14.59.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Oct 2021 14:59:23 -0700 (PDT) From: Florian Fainelli To: linux-kernel@vger.kernel.org Cc: Florian Fainelli , Ray Jui , Scott Branden , bcm-kernel-feedback-list@broadcom.com (maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE...), Russell King , Catalin Marinas , Will Deacon , Thomas Bogendoerfer , Thomas Gleixner , Marc Zyngier , Rob Herring , Frank Rowand , linux-arm-kernel@lists.infradead.org (moderated list:ARM SUB-ARCHITECTURES), linux-mips@vger.kernel.org (open list:MIPS), devicetree@vger.kernel.org (open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE) Subject: [PATCH v5 14/14] irqchip: Fix kernel-doc parameter typo for IRQCHIP_DECLARE Date: Tue, 19 Oct 2021 14:58:55 -0700 Message-Id: <20211019215855.1920099-15-f.fainelli@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211019215855.1920099-1-f.fainelli@gmail.com> References: <20211019215855.1920099-1-f.fainelli@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211019_145924_940003_8DBBEDB5 X-CRM114-Status: GOOD ( 15.64 ) 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 The documentation refers to "compstr" when we have the parameter named "compat", fix the typo. Signed-off-by: Florian Fainelli --- include/linux/irqchip.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/irqchip.h b/include/linux/irqchip.h index 67351aac65ef..ccf32758ea85 100644 --- a/include/linux/irqchip.h +++ b/include/linux/irqchip.h @@ -23,7 +23,7 @@ * * @name: name that must be unique across all IRQCHIP_DECLARE of the * same file. - * @compstr: compatible string of the irqchip driver + * @compat: compatible string of the irqchip driver * @fn: initialization function */ #define IRQCHIP_DECLARE(name, compat, fn) OF_DECLARE_2(irqchip, name, compat, fn)