From mboxrd@z Thu Jan 1 00:00:00 1970 From: james.morse@arm.com (James Morse) Date: Wed, 03 Jan 2018 16:00:55 +0000 Subject: [PATCH v4 10/21] arm64: entry.S: move SError handling into a C function for future expansion In-Reply-To: References: <20171019145807.23251-1-james.morse@arm.com> <20171019145807.23251-11-james.morse@arm.com> Message-ID: <5A4CFE37.3010002@arm.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Hi Adam, On 02/01/18 21:07, Adam Wallis wrote: > On 10/19/2017 10:57 AM, James Morse wrote: > [..] >> kernel_ventry el1_fiq_invalid // FIQ EL1h >> - kernel_ventry el1_error_invalid // Error EL1h >> + kernel_ventry el1_error // Error EL1h >> kernel_ventry el0_sync // Synchronous 64-bit EL0 >> kernel_ventry el0_irq // IRQ 64-bit EL0 >> kernel_ventry el0_fiq_invalid // FIQ 64-bit EL0 >> - kernel_ventry el0_error_invalid // Error 64-bit EL0 >> + kernel_ventry el0_error // Error 64-bit EL0 >> >> #ifdef CONFIG_COMPAT >> kernel_ventry el0_sync_compat // Synchronous 32-bit EL0 >> kernel_ventry el0_irq_compat // IRQ 32-bit EL0 >> kernel_ventry el0_fiq_invalid_compat // FIQ 32-bit EL0 >> - kernel_ventry el0_error_invalid_compat // Error 32-bit EL0 >> + kernel_ventry el0_error_compat // Error 32-bit EL0 >> #else >> kernel_ventry el0_sync_invalid // Synchronous 32-bit EL0 >> kernel_ventry el0_irq_invalid // IRQ 32-bit EL0 >> @@ -455,10 +455,6 @@ ENDPROC(el0_error_invalid) >> el0_fiq_invalid_compat: >> inv_entry 0, BAD_FIQ, 32 >> ENDPROC(el0_fiq_invalid_compat) >> - >> -el0_error_invalid_compat: >> - inv_entry 0, BAD_ERROR, 32 >> -ENDPROC(el0_error_invalid_compat) >> #endif > Perhaps I missed something quite obvious, but is there any reason to not also > remove el1_error_invalid, since SError handling now jumps to el1_error? There is still a caller for el1_error_invalid: depending on SPSel we are in thread or handler mode, which causes exceptions to use a different entry in the vectors. The kernel always uses handler mode, all the thread mode entries point at their '_invalid' versions. If we take an SError from EL1t, SPsel==0 then it uses vectors+0x180. (just cut off the top of this diff). The el1_error change above is for EL1h, SPsel==1, which uses vectors+0x380. Thanks for taking a look! James