Firmware/opensbi
8
0
Fork 0
forked from Mirrors/opensbi
Code Pull Requests Activity

lib: Create a sbi_ipi_data structure

Browse Source 
Create a sbi_ipi_data structure that holds unpacked IPI information. At
the same time remove ipi_type from the sbi_scratch struct and use a
fixed offset to access it.

This structure fits in behind the sbi_scratch structure.

This fixes https://github.com/riscv/opensbi/issues/81

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Alistair Francis
2019-03-08 11:22:22 -08:00
committed by Anup Patel
parent 007a6b26d9
commit 508a27204c
3 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/fw_base.S
View File

@@ -183,7 +183,6 @@ _start_warm:
REG_S a4, SBI_SCRATCH_PLATFORM_ADDR_OFFSET(tp) REG_S a4, SBI_SCRATCH_PLATFORM_ADDR_OFFSET(tp)
la a4, _hartid_to_scratch la a4, _hartid_to_scratch
REG_S a4, SBI_SCRATCH_HARTID_TO_SCRATCH_OFFSET(tp) REG_S a4, SBI_SCRATCH_HARTID_TO_SCRATCH_OFFSET(tp)
REG_S zero, SBI_SCRATCH_IPI_TYPE_OFFSET(tp)
REG_S zero, SBI_SCRATCH_TMP0_OFFSET(tp) REG_S zero, SBI_SCRATCH_TMP0_OFFSET(tp)
/* Setup stack */ /* Setup stack */

23
include/sbi/sbi_scratch.h
View File

@@ -28,17 +28,24 @@
#define SBI_SCRATCH_PLATFORM_ADDR_OFFSET (6 * __SIZEOF_POINTER__) #define SBI_SCRATCH_PLATFORM_ADDR_OFFSET (6 * __SIZEOF_POINTER__)
/** Offset of hartid_to_scratch member in sbi_scratch */ /** Offset of hartid_to_scratch member in sbi_scratch */
#define SBI_SCRATCH_HARTID_TO_SCRATCH_OFFSET (7 * __SIZEOF_POINTER__) #define SBI_SCRATCH_HARTID_TO_SCRATCH_OFFSET (7 * __SIZEOF_POINTER__)
/** Offset of ipi_type member in sbi_scratch */
#define SBI_SCRATCH_IPI_TYPE_OFFSET (8 * __SIZEOF_POINTER__)
/** Offset of tmp0 member in sbi_scratch */ /** Offset of tmp0 member in sbi_scratch */
#define SBI_SCRATCH_TMP0_OFFSET (9 * __SIZEOF_POINTER__) #define SBI_SCRATCH_TMP0_OFFSET (8 * __SIZEOF_POINTER__)
/** Maximum size of sbi_scratch */
#define SBI_SCRATCH_SIZE 256 /** sbi_ipi_data is located behind sbi_scratch. This struct is not packed. */
/** Offset of ipi_type in sbi_ipi_data */
#define SBI_IPI_DATA_IPI_TYPE_OFFSET (15 * __SIZEOF_POINTER__)
/** Maximum size of sbi_scratch and sbi_ipi_data */
#define SBI_SCRATCH_SIZE (32 * __SIZEOF_POINTER__)
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
#include <sbi/sbi_types.h> #include <sbi/sbi_types.h>
struct sbi_ipi_data {
unsigned long ipi_type;
};
/** Representation of per-HART scratch space */ /** Representation of per-HART scratch space */
struct sbi_scratch { struct sbi_scratch {
/** Start (or base) address of firmware linked to OpenSBI library */ /** Start (or base) address of firmware linked to OpenSBI library */
@@ -57,8 +64,6 @@ struct sbi_scratch {
unsigned long platform_addr; unsigned long platform_addr;
/** Address of HART ID to sbi_scratch conversion function */ /** Address of HART ID to sbi_scratch conversion function */
unsigned long hartid_to_scratch; unsigned long hartid_to_scratch;
/** IPI type (or flags) */
unsigned long ipi_type;
/** Temporary storage */ /** Temporary storage */
unsigned long tmp0; unsigned long tmp0;
} __packed; } __packed;
@@ -71,6 +76,10 @@ struct sbi_scratch {
#define sbi_scratch_thishart_arg1_ptr() \ #define sbi_scratch_thishart_arg1_ptr() \
((void *)(sbi_scratch_thishart_ptr()->next_arg1)) ((void *)(sbi_scratch_thishart_ptr()->next_arg1))
/** Get pointer to sbi_ipi_data from sbi_scratch */
#define sbi_ipi_data_ptr(scratch) \
((struct sbi_ipi_data *)(void*)scratch + SBI_IPI_DATA_IPI_TYPE_OFFSET)
#endif #endif
#endif #endif

8
lib/sbi_ipi.c
View File

@@ -31,7 +31,7 @@ static int sbi_ipi_send(struct sbi_scratch *scratch, u32 hartid, u32 event)
* trigger the interrupt * trigger the interrupt
*/ */
remote_scratch = sbi_hart_id_to_scratch(scratch, hartid); remote_scratch = sbi_hart_id_to_scratch(scratch, hartid);
atomic_raw_set_bit(event, &remote_scratch->ipi_type); atomic_raw_set_bit(event, &sbi_ipi_data_ptr(remote_scratch)->ipi_type);
mb(); mb();
sbi_platform_ipi_send(plat, hartid); sbi_platform_ipi_send(plat, hartid);
if (event != SBI_IPI_EVENT_SOFT) if (event != SBI_IPI_EVENT_SOFT)
@@ -80,7 +80,7 @@ void sbi_ipi_process(struct sbi_scratch *scratch)
sbi_platform_ipi_clear(plat, hartid); sbi_platform_ipi_clear(plat, hartid);
do { do {
ipi_type = scratch->ipi_type; ipi_type = sbi_ipi_data_ptr(scratch)->ipi_type;
rmb(); rmb();
ipi_event = __ffs(ipi_type); ipi_event = __ffs(ipi_type);
switch (ipi_event) { switch (ipi_event) {
@@ -97,12 +97,14 @@ void sbi_ipi_process(struct sbi_scratch *scratch)
sbi_hart_hang(); sbi_hart_hang();
break; break;
}; };
ipi_type = atomic_raw_clear_bit(ipi_event, &scratch->ipi_type); ipi_type = atomic_raw_clear_bit(ipi_event, &sbi_ipi_data_ptr(scratch)->ipi_type);
} while(ipi_type > 0); } while(ipi_type > 0);
} }
int sbi_ipi_init(struct sbi_scratch *scratch, bool cold_boot) int sbi_ipi_init(struct sbi_scratch *scratch, bool cold_boot)
{ {
sbi_ipi_data_ptr(scratch)->ipi_type = 0x00;
/* Enable software interrupts */ /* Enable software interrupts */
csr_set(CSR_MIE, MIP_MSIP); csr_set(CSR_MIE, MIP_MSIP);