From patchwork Fri Jun 22 17:01:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Palmer Dabbelt X-Patchwork-Id: 10482725 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7B2B6602CB for ; Fri, 22 Jun 2018 17:03:01 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A8F728F85 for ; Fri, 22 Jun 2018 17:03:01 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5EFEB28F87; Fri, 22 Jun 2018 17:03:01 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DF6B928F85 for ; Fri, 22 Jun 2018 17:03:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:To:From:References: In-Reply-To:Message-Id:Date:Subject:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=SzeOnCBoa1frkr5M2Kxve9rbxmtZzS40JpEaZM+eXEU=; b=j/vRhZ8Vj4pJmR IrzAc9cOSxnnna3p14VBm5qT8uo4aelUSeG4sZqyVWEKs+iXFq5PyHZmCgP47gt2yFsQ10fGu+T3D GJfKL6tHAt8v44cB4wwf/EJHl+N4hIm3+CSmEwl4TtVPSM71O8L60xxJBXPLDK0lgUvT1nf4BTEXZ 4WgVaLbbRSWq56JNfWkOJEnhzb7GIvT29MsUdb5yXwSzkgb1FR+MY0dMitCpS3o+nPm/nTOxcXpB0 d2PH/NJHzkWR22GXoYvoiVI0dXdElYfoTcECjnQ5qVMWtX7CHv7Z0+ED2XDnFvIBslnRTAZLUV25e oZuOHJR1aDbVnfmpZDlg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fWPSS-0003wb-TN; Fri, 22 Jun 2018 17:02:48 +0000 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fWPRo-0003bG-5b for linux-arm-kernel@lists.infradead.org; Fri, 22 Jun 2018 17:02:09 +0000 Received: by mail-pf0-x241.google.com with SMTP id q1-v6so3491507pff.13 for ; Fri, 22 Jun 2018 10:01:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sifive.com; s=google; h=subject:date:message-id:in-reply-to:references:cc:from:to; bh=otYr7TQZHqhiSjOgFmTHNL4jAFEirhqc4NoVnkYDhoc=; b=LGldYwe2KwXUIL2MQRKDwyGJxx1SpnOGCBEBZ5QSqPk0KHicNlDl4NFdpLQI6O/O3K SAFWHPpEGOYQh9QR+Y9h9zs8NkMW/eKu0ZzF3lpwDTYzi+M1duDpK3X5BZu5f9YqXRES gureOJ40zJHCoxmU+2yjISbvbZp2Zbro9bUjVUd9teadSHVJmlEWdYG0BSGb4Fqs6J9I 8EwZwn4xuaWSFDYDVFJSnW0srtD+sBiyH9Fbs2qtng3WEKJcOwmvIi8kZGucN0B/7KI8 KwuhqWU4ETeIAyk9dKLCTR1RPvCOd8fgRrPlKbtJe+AJki8hjynYGwr42qmeJAGrKk3f gZYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:date:message-id:in-reply-to:references :cc:from:to; bh=otYr7TQZHqhiSjOgFmTHNL4jAFEirhqc4NoVnkYDhoc=; b=IZj0L901qwXH199vLwg363Wu3xiOM87zlyOS/wedBkBgLaOaQaYdSM8rXvGjaiPDIs hEuCyN0Np4WkNPBEYxXkd6Px3ekKeYpGqZk2oRhh/0NoNc1MVbDik6bMCTdZBkZYpZvf GGHWDJTEs4xw3wWkm4xqNbQMR8fZutVNmY/Ujdi5QNf6Cd4guPGE1xTz9S7++rqSMDZh Ja0y1c06uA1wPIn5aLsevoYGJjSZHoWHotUinPaJXB1W26buMlmzT4QtH6ZSMNAxXXLy S5K9HNblzOJE9aUqjxPhs3F+x89Qv9DXG1mVV0QICo1B7i2M8CWK9KBbY4p5gg7HNPGR j1Qw== X-Gm-Message-State: APt69E0fpHfduuhllLJpkBduKq5WmDXMU2PXrHYCl1gZad781U71igOi pvXWsIbW1Z2qtYM+CQZVChVYyA== X-Google-Smtp-Source: ADUXVKKO1DxhznwrUyw6nIqXWQ26oZeFRfncpgiuIZD9PtkknR2bCGORZpN7W+K2i5bx12H8iFjhpA== X-Received: by 2002:a63:b307:: with SMTP id i7-v6mr2119105pgf.448.1529686917223; Fri, 22 Jun 2018 10:01:57 -0700 (PDT) Received: from localhost ([12.206.222.5]) by smtp.gmail.com with ESMTPSA id b83-v6sm23123835pfe.159.2018.06.22.10.01.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Jun 2018 10:01:56 -0700 (PDT) Subject: [PATCH 1/5] irq: Port the ARM IRQ drivers to GENERIC_IRQ_MULTI_HANDLER Date: Fri, 22 Jun 2018 10:01:22 -0700 Message-Id: <20180622170126.6308-2-palmer@sifive.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20180622170126.6308-1-palmer@sifive.com> References: <20180621181756.12493-1-palmer@sifive.com> <20180622170126.6308-1-palmer@sifive.com> From: Palmer Dabbelt To: tglx@linutronix.de X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180622_100208_245764_B5E6D181 X-CRM114-Status: GOOD ( 11.45 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: nicolas.pitre@linaro.org, mark.rutland@arm.com, alexandre.belloni@bootlin.com, catalin.marinas@arm.com, Palmer Dabbelt , Will Deacon , yamada.masahiro@socionext.com, keescook@chromium.org, jonas@southpole.se, linux@armlinux.org.uk, Shea Levy , jhogan@kernel.org, vladimir.murzin@arm.com, jason@lakedaemon.net, Arnd Bergmann , marc.zyngier@arm.com, stefan.kristiansson@saunalahti.fi, jinb.park7@gmail.com, openrisc@lists.librecores.org, shorne@gmail.com, linux-arm-kernel@lists.infradead.org, ard.biesheuvel@linaro.org, Greg KH , linux-kernel@vger.kernel.org, james.morse@arm.com, pombredanne@nexb.com, kstewart@linuxfoundation.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP GENERIC_IRQ_MULTI_HANDLER is incompatible with MULTI_IRQ_HANDLER because they define the same symbols. Multiple generic irqchip drivers select MULTI_IRQ_HANDLER, which is now defined on all architectures that provide set_handle_irq(). This patch selects GENERIC_IRQ_MULTI_HANDLER for all drivers that used to select MULTI_IRQ_HANDLER, but only when MULTI_IRQ_HANDLER doesn't exist. I'll then convert every architecture over from MULTI_IRQ_HANDLER to GENERIC_IRQ_MULTI_HANDLER before removing the extra MULTI_IRQ_HANDLER scaffolding. CC: Shea Levy CC: Arnd Bergmann Signed-off-by: Palmer Dabbelt --- drivers/irqchip/Kconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index e9233db16e03..7527f6a9adae 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -9,6 +9,7 @@ config ARM_GIC select IRQ_DOMAIN select IRQ_DOMAIN_HIERARCHY select MULTI_IRQ_HANDLER + select GENERIC_IRQ_MULTI_HANDLER if !MULTI_IRQ_HANDLER select GENERIC_IRQ_EFFECTIVE_AFF_MASK config ARM_GIC_PM @@ -35,6 +36,7 @@ config ARM_GIC_V3 bool select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select GENERIC_IRQ_MULTI_HANDLER if !MULTI_IRQ_HANDLER select IRQ_DOMAIN_HIERARCHY select PARTITION_PERCPU select GENERIC_IRQ_EFFECTIVE_AFF_MASK @@ -67,6 +69,7 @@ config ARM_VIC bool select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select GENERIC_IRQ_MULTI_HANDLER if !MULTI_IRQ_HANDLER config ARM_VIC_NR int @@ -94,6 +97,7 @@ config ATMEL_AIC_IRQ select GENERIC_IRQ_CHIP select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select GENERIC_IRQ_MULTI_HANDLER if !MULTI_IRQ_HANDLER select SPARSE_IRQ config ATMEL_AIC5_IRQ @@ -101,6 +105,7 @@ config ATMEL_AIC5_IRQ select GENERIC_IRQ_CHIP select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select GENERIC_IRQ_MULTI_HANDLER if !MULTI_IRQ_HANDLER select SPARSE_IRQ config I8259 @@ -138,6 +143,7 @@ config FARADAY_FTINTC010 bool select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select GENERIC_IRQ_MULTI_HANDLER if !MULTI_IRQ_HANDLER select SPARSE_IRQ config HISILICON_IRQ_MBIGEN @@ -163,6 +169,7 @@ config CLPS711X_IRQCHIP depends on ARCH_CLPS711X select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select GENERIC_IRQ_MULTI_HANDLER if !MULTI_IRQ_HANDLER select SPARSE_IRQ default y @@ -182,6 +189,7 @@ config ORION_IRQCHIP bool select IRQ_DOMAIN select MULTI_IRQ_HANDLER + select GENERIC_IRQ_MULTI_HANDLER if !MULTI_IRQ_HANDLER config PIC32_EVIC bool