From 5797ae203555254c36fd21bc5aaa76a92ac4bd6c Mon Sep 17 00:00:00 2001 From: Anup Patel Date: Wed, 2 Jan 2019 14:51:30 +0530 Subject: [PATCH] include: Remove redundant tmp0 from struct sbi_scratch The tmp0 member was added in struct sbi_scratch to assist register save/restore at time of trap handling. This tmp0 is not unsed any more hence removing it. Signed-off-by: Anup Patel --- firmware/fw_base.S | 1 - include/sbi/sbi_scratch.h | 20 +++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/firmware/fw_base.S b/firmware/fw_base.S index ab67a70..ad6371b 100644 --- a/firmware/fw_base.S +++ b/firmware/fw_base.S @@ -154,7 +154,6 @@ _start_warm: csrw mscratch, tp /* Initialize scratch space */ - REG_S zero, SBI_SCRATCH_TMP0_OFFSET(tp) la a4, _fw_start la a5, _fw_end mul t0, s7, s8 diff --git a/include/sbi/sbi_scratch.h b/include/sbi/sbi_scratch.h index 14c72a8..25b00c3 100644 --- a/include/sbi/sbi_scratch.h +++ b/include/sbi/sbi_scratch.h @@ -12,16 +12,15 @@ #include -#define SBI_SCRATCH_TMP0_OFFSET (0 * __SIZEOF_POINTER__) -#define SBI_SCRATCH_FW_START_OFFSET (1 * __SIZEOF_POINTER__) -#define SBI_SCRATCH_FW_SIZE_OFFSET (2 * __SIZEOF_POINTER__) -#define SBI_SCRATCH_NEXT_ARG1_OFFSET (3 * __SIZEOF_POINTER__) -#define SBI_SCRATCH_NEXT_ADDR_OFFSET (4 * __SIZEOF_POINTER__) -#define SBI_SCRATCH_NEXT_MODE_OFFSET (5 * __SIZEOF_POINTER__) -#define SBI_SCRATCH_WARMBOOT_ADDR_OFFSET (6 * __SIZEOF_POINTER__) -#define SBI_SCRATCH_PLATFORM_ADDR_OFFSET (7 * __SIZEOF_POINTER__) -#define SBI_SCRATCH_HARTID_TO_SCRATCH_OFFSET (8 * __SIZEOF_POINTER__) -#define SBI_SCRATCH_IPI_TYPE_OFFSET (9 * __SIZEOF_POINTER__) +#define SBI_SCRATCH_FW_START_OFFSET (0 * __SIZEOF_POINTER__) +#define SBI_SCRATCH_FW_SIZE_OFFSET (1 * __SIZEOF_POINTER__) +#define SBI_SCRATCH_NEXT_ARG1_OFFSET (2 * __SIZEOF_POINTER__) +#define SBI_SCRATCH_NEXT_ADDR_OFFSET (3 * __SIZEOF_POINTER__) +#define SBI_SCRATCH_NEXT_MODE_OFFSET (4 * __SIZEOF_POINTER__) +#define SBI_SCRATCH_WARMBOOT_ADDR_OFFSET (5 * __SIZEOF_POINTER__) +#define SBI_SCRATCH_PLATFORM_ADDR_OFFSET (6 * __SIZEOF_POINTER__) +#define SBI_SCRATCH_HARTID_TO_SCRATCH_OFFSET (7 * __SIZEOF_POINTER__) +#define SBI_SCRATCH_IPI_TYPE_OFFSET (8 * __SIZEOF_POINTER__) #define SBI_SCRATCH_SIZE 256 #ifndef __ASSEMBLY__ @@ -29,7 +28,6 @@ #include struct sbi_scratch { - unsigned long tmp0; unsigned long fw_start; unsigned long fw_size; unsigned long next_arg1;