UPSTREAM: arm64: pass ESR_ELx to die() of cfi_handler

Commit 0f2cb928 ("arm64: consistently pass ESR_ELx to die()") caused
all callers to pass the ESR_ELx value to die().

For consistency, this patch also adds esr to die() call of cfi_handler.
Also, when CFI error occurs, die handlers can use ESR_ELx value.

Signed-off-by: Sangmoon Kim <sangmoon.kim@samsung.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20230220073441.2753-1-sangmoon.kim@samsung.com


Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

Bug: 273333300
Change-Id: If0998121dbd821b844523fd05f70946a2050a9d7
(cherry picked from commit b61b82f8)
Signed-off-by: Sangmoon Kim <sangmoon.kim@samsung.com>