ARCv2: intc: Rework the build time irq count information (f33b8cdd) · Commits · 戴 / test

Currently Kconfig knob ARC_NUMBER_OF_INTERRUPTS is used as indicator of hard irq count. But it is flawed that it doesn't affect - NR_IRQS : for number of virtual interrupts - NR_CPU_IRQS : for number of hardware interrupts Moreover the actual hardware irq count might still not be same as ARC_NUMBER_OF_INTERRUPTS. So use the information availble in the Build Configuration Registers and get rid of the Kconfig option. We still need "some" build time info about irq count to set up sufficient number of vector table entries. This is done with a sufficiently large NR_CPU_IRQS which will eventually be used soley for that purpose (subsequent patches will remove its usage elsewhere) So to summarize what this patch does: * NR_CPU_IRQS defines a maximum number of hardware interrupts. * Remove ARC_NUMBER_OF_INTERRUPTS option and create interrupts table for all possible hardware interrupts. * Increase a maximum number of virtual IRQs to 512. ARCv2 can support 240 interrupts in the core interrupts controllers and 128 interrupts in IDU. Thus 512 virtual IRQs must be enough for most configurations of boards. This patch leads to NR_CPU_IRQS in 2 places, to reduce the overall churn. The next patch will remove the 2nd definition anyways. Signed-off-by:

Yuriy Kolerov <yuriy.kolerov@synopsys.com> Signed-off-by:

Vineet Gupta <vgupta@synopsys.com> [vgupta: reworked the changelog a bit]

arch/arc/Kconfig

+0 −11

Original line number	Diff line number	Diff line
		@@ -412,17 +412,6 @@ config ARC_HAS_DIV_REM
		bool "Insn: div, divu, rem, remu"
		default y

		config ARC_NUMBER_OF_INTERRUPTS
		int "Number of interrupts"
		range 8 240
		default 32
		help
		This defines the number of interrupts on the ARCv2HS core.
		It affects the size of vector table.
		The initial 8 IRQs are fixed (Timer, ICI etc) and although configurable
		in hardware, it keep things simple for Linux to assume they are always
		present.

		endif # ISA_ARCV2

		endmenu # "ARC CPU Configuration"

arch/arc/include/asm/irq.h

+7 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,13 @@
		#ifndef __ASM_ARC_IRQ_H
		#define __ASM_ARC_IRQ_H

		#define NR_IRQS 128 /* allow some CPU external IRQ handling */
		/*
		* ARCv2 can support 240 interrupts in the core interrupts controllers and
		* 128 interrupts in IDU. Thus 512 virtual IRQs must be enough for most
		* configurations of boards.
		* This doesnt affect ARCompact, but we change it to same value
		*/
		#define NR_IRQS 512

		/* Platform Independent IRQs */
		#ifdef CONFIG_ISA_ARCV2

arch/arc/kernel/entry-arcv2.S

+6 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,11 @@
		#include <asm/arcregs.h>
		#include <asm/irqflags.h>

		; A maximum number of supported interrupts in the core interrupt controller.
		; This number is not equal to the maximum interrupt number (256) because
		; first 16 lines are reserved for exceptions and are not configurable.
		#define NR_CPU_IRQS 240

		.cpu HS

		#define VECTOR .word
		@@ -52,7 +57,7 @@ VECTOR handle_interrupt ; unused
		VECTOR handle_interrupt ; (23) unused
		# End of fixed IRQs

		.rept CONFIG_ARC_NUMBER_OF_INTERRUPTS - 8
		.rept NR_CPU_IRQS - 8
		VECTOR handle_interrupt
		.endr

Admin message