From patchwork Wed Sep 29 02:35:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 12524419 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 65C90C433EF for ; Wed, 29 Sep 2021 02:34:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4AF7F6124A for ; Wed, 29 Sep 2021 02:34:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243912AbhI2Cfl (ORCPT ); Tue, 28 Sep 2021 22:35:41 -0400 Received: from szxga03-in.huawei.com ([45.249.212.189]:23229 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243899AbhI2Cfe (ORCPT ); Tue, 28 Sep 2021 22:35:34 -0400 Received: from dggemv711-chm.china.huawei.com (unknown [172.30.72.56]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4HK0lx3YWMz8tXH; Wed, 29 Sep 2021 10:33:01 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggemv711-chm.china.huawei.com (10.1.198.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Wed, 29 Sep 2021 10:33:40 +0800 Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Wed, 29 Sep 2021 10:33:40 +0800 From: Kefeng Wang To: Thomas Gleixner , Guo Ren , Yoshinori Sato , Rich Felker , , , CC: Kefeng Wang , Geert Uytterhoeven Subject: [PATCH v1 1/3] sh: Cleanup about SPARSE_IRQ Date: Wed, 29 Sep 2021 10:35:20 +0800 Message-ID: <20210929023522.57732-2-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210929023522.57732-1-wangkefeng.wang@huawei.com> References: <20210929023522.57732-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org After commit 37744feebc08 ("sh: remove sh5 support"), sh always enable SPARSE_IRQ, kill unused MAY_HAVE_SPARSE_IRQ and NR_IRQS define. Cc: Yoshinori Sato Cc: Rich Felker Reviewed-by: Geert Uytterhoeven Signed-off-by: Kefeng Wang --- arch/sh/Kconfig | 1 - arch/sh/include/asm/irq.h | 11 ----------- 2 files changed, 12 deletions(-) diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index 6904f4bdbf00..70afb30e0b32 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig @@ -56,7 +56,6 @@ config SUPERH select HAVE_STACKPROTECTOR select HAVE_SYSCALL_TRACEPOINTS select IRQ_FORCED_THREADING - select MAY_HAVE_SPARSE_IRQ select MODULES_USE_ELF_RELA select NEED_SG_DMA_LENGTH select NO_DMA if !MMU && !DMA_COHERENT diff --git a/arch/sh/include/asm/irq.h b/arch/sh/include/asm/irq.h index 839551ce398c..1c4923502fd4 100644 --- a/arch/sh/include/asm/irq.h +++ b/arch/sh/include/asm/irq.h @@ -5,17 +5,6 @@ #include #include -/* - * Only legacy non-sparseirq platforms have to set a reasonably sane - * value here. sparseirq platforms allocate their irq_descs on the fly, - * so will expand automatically based on the number of registered IRQs. - */ -#ifdef CONFIG_SPARSE_IRQ -# define NR_IRQS 8 -#else -# define NR_IRQS 512 -#endif - /* * This is a special IRQ number for indicating that no IRQ has been * triggered and to simply ignore the IRQ dispatch. This is a special From patchwork Wed Sep 29 02:35:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 12524417 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 ADF38C433FE for ; Wed, 29 Sep 2021 02:33:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 946DF613DB for ; Wed, 29 Sep 2021 02:33:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243852AbhI2Cfi (ORCPT ); Tue, 28 Sep 2021 22:35:38 -0400 Received: from szxga03-in.huawei.com ([45.249.212.189]:23228 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243862AbhI2Cf0 (ORCPT ); Tue, 28 Sep 2021 22:35:26 -0400 Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4HK0lm0R79z8tX5; Wed, 29 Sep 2021 10:32:52 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Wed, 29 Sep 2021 10:33:41 +0800 Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Wed, 29 Sep 2021 10:33:40 +0800 From: Kefeng Wang To: Thomas Gleixner , Guo Ren , Yoshinori Sato , Rich Felker , , , CC: Kefeng Wang Subject: [PATCH v2 2/3] csky: Kill MAY_HAVE_SPARSE_IRQ Date: Wed, 29 Sep 2021 10:35:21 +0800 Message-ID: <20210929023522.57732-3-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210929023522.57732-1-wangkefeng.wang@huawei.com> References: <20210929023522.57732-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org The csky platforms use statical irq descriptors allocation by default, and the dynamical and statical irq allocation are alternative, it is no need to maintain a separate MAY_HAVE_SPARSE_IRQ, kill it. Cc: Guo Ren Signed-off-by: Kefeng Wang --- arch/csky/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/csky/Kconfig b/arch/csky/Kconfig index 9d4d898df76b..45ac662bd011 100644 --- a/arch/csky/Kconfig +++ b/arch/csky/Kconfig @@ -69,7 +69,6 @@ config CSKY select HAVE_RSEQ select HAVE_STACKPROTECTOR select HAVE_SYSCALL_TRACEPOINTS - select MAY_HAVE_SPARSE_IRQ select MODULES_USE_ELF_RELA if MODULES select OF select OF_EARLY_FLATTREE From patchwork Wed Sep 29 02:35:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 12524415 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 E8AD4C433F5 for ; Wed, 29 Sep 2021 02:33:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id CC82A61407 for ; Wed, 29 Sep 2021 02:33:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243868AbhI2Cfi (ORCPT ); Tue, 28 Sep 2021 22:35:38 -0400 Received: from szxga01-in.huawei.com ([45.249.212.187]:12965 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243851AbhI2CfY (ORCPT ); Tue, 28 Sep 2021 22:35:24 -0400 Received: from dggemv703-chm.china.huawei.com (unknown [172.30.72.53]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4HK0lC0RyYzWZG7; Wed, 29 Sep 2021 10:32:23 +0800 (CST) Received: from dggpemm500001.china.huawei.com (7.185.36.107) by dggemv703-chm.china.huawei.com (10.3.19.46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Wed, 29 Sep 2021 10:33:41 +0800 Received: from localhost.localdomain.localdomain (10.175.113.25) by dggpemm500001.china.huawei.com (7.185.36.107) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2308.8; Wed, 29 Sep 2021 10:33:41 +0800 From: Kefeng Wang To: Thomas Gleixner , Guo Ren , Yoshinori Sato , Rich Felker , , , CC: Kefeng Wang Subject: [PATCH v3 3/3] genirq: Cleanup Kconfig Date: Wed, 29 Sep 2021 10:35:22 +0800 Message-ID: <20210929023522.57732-4-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210929023522.57732-1-wangkefeng.wang@huawei.com> References: <20210929023522.57732-1-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.113.25] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500001.china.huawei.com (7.185.36.107) X-CFilter-Loop: Reflected Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org As the last user of MAY_HAVE_SPARSE_IRQ is gone, kill it, and clean up the SPARSE_IRQ description, covert the help text into comment. Also move GENERIC_IRQ_MULTI_HANDLER into menu, and change all spaces to tabs to fix alignment issue. Cc: Thomas Gleixner Signed-off-by: Kefeng Wang --- kernel/irq/Kconfig | 50 +++++++++++++++++++--------------------------- 1 file changed, 20 insertions(+), 30 deletions(-) diff --git a/kernel/irq/Kconfig b/kernel/irq/Kconfig index fbc54c2a7f23..aa7d0e3edea6 100644 --- a/kernel/irq/Kconfig +++ b/kernel/irq/Kconfig @@ -2,13 +2,9 @@ menu "IRQ subsystem" # Options selectable by the architecture code -# Make sparse irq Kconfig switch below available -config MAY_HAVE_SPARSE_IRQ - bool - # Legacy support, required for itanic config GENERIC_IRQ_LEGACY - bool + bool # Enable the generic irq autoprobe mechanism config GENERIC_IRQ_PROBE @@ -16,15 +12,15 @@ config GENERIC_IRQ_PROBE # Use the generic /proc/interrupts implementation config GENERIC_IRQ_SHOW - bool + bool # Print level/edge extra information config GENERIC_IRQ_SHOW_LEVEL - bool + bool # Supports effective affinity mask config GENERIC_IRQ_EFFECTIVE_AFF_MASK - bool + bool # Support for delayed migration from interrupt context config GENERIC_PENDING_IRQ @@ -36,7 +32,7 @@ config GENERIC_IRQ_MIGRATION # Alpha specific irq affinity mechanism config AUTO_IRQ_AFFINITY - bool + bool # Interrupt injection mechanism config GENERIC_IRQ_INJECTION @@ -44,16 +40,16 @@ config GENERIC_IRQ_INJECTION # Tasklet based software resend for pending interrupts on enable_irq() config HARDIRQS_SW_RESEND - bool + bool # Edge style eoi based handler (cell) config IRQ_EDGE_EOI_HANDLER - bool + bool # Generic configurable interrupt chip implementation config GENERIC_IRQ_CHIP - bool - select IRQ_DOMAIN + bool + select IRQ_DOMAIN # Generic irq_domain hw <--> linux irq number translation config IRQ_DOMAIN @@ -103,6 +99,10 @@ config HANDLE_DOMAIN_IRQ config IRQ_TIMINGS bool +# Allow to specify the low level IRQ handler at run time. +config GENERIC_IRQ_MULTI_HANDLER + bool + config GENERIC_IRQ_MATRIX_ALLOCATOR bool @@ -111,20 +111,15 @@ config GENERIC_IRQ_RESERVATION_MODE # Support forced irq threading config IRQ_FORCED_THREADING - bool + bool +# Sparse irq numbering is useful for distro kernels that want +# to define a high CONFIG_NR_CPUS value but still want to have +# low kernel memory footprint on smaller machines. +# Sparse irqs can also be beneficial on NUMA boxes, as they spread +# out the interrupt descriptors in a more NUMA-friendly way. config SPARSE_IRQ - bool "Support sparse irq numbering" if MAY_HAVE_SPARSE_IRQ - help - - Sparse irq numbering is useful for distro kernels that want - to define a high CONFIG_NR_CPUS value but still want to have - low kernel memory footprint on smaller machines. - - ( Sparse irqs can also be beneficial on NUMA boxes, as they spread - out the interrupt descriptors in a more NUMA-friendly way. ) - - If you don't know what to do here, say N. + bool config GENERIC_IRQ_DEBUGFS bool "Expose irq internals in debugfs" @@ -139,8 +134,3 @@ config GENERIC_IRQ_DEBUGFS If you don't know what to do here, say N. endmenu - -config GENERIC_IRQ_MULTI_HANDLER - bool - help - Allow to specify the low level IRQ handler at run time.