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

lib: sbi: Checking fifo validness in sbi_fifo_is_empty and is_full

Browse Source 
As other exported fifo functions, we should check whether the fifo is
valid in sbi_fifo_is_empty and sbi_fifo_is_full. To this end, this patch
changes the retval from bool to int, and the two functions will return
SBI_EINVAL in the case the fifo is invalid.

Signed-off-by: Dong Du <Dd_nirvana@sjtu.edu.cn>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
This commit is contained in:
Dong Du
2021-08-27 22:46:28 +08:00
committed by Anup Patel
parent c262306533
commit 1718b1642e
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/sbi/sbi_fifo.h
View File

@@ -33,8 +33,8 @@ int sbi_fifo_dequeue(struct sbi_fifo *fifo, void *data);
int sbi_fifo_enqueue(struct sbi_fifo *fifo, void *data); int sbi_fifo_enqueue(struct sbi_fifo *fifo, void *data);
void sbi_fifo_init(struct sbi_fifo *fifo, void *queue_mem, u16 entries, void sbi_fifo_init(struct sbi_fifo *fifo, void *queue_mem, u16 entries,
u16 entry_size); u16 entry_size);
bool sbi_fifo_is_empty(struct sbi_fifo *fifo); int sbi_fifo_is_empty(struct sbi_fifo *fifo);
bool sbi_fifo_is_full(struct sbi_fifo *fifo); int sbi_fifo_is_full(struct sbi_fifo *fifo);
int sbi_fifo_inplace_update(struct sbi_fifo *fifo, void *in, int sbi_fifo_inplace_update(struct sbi_fifo *fifo, void *in,
int (*fptr)(void *in, void *data)); int (*fptr)(void *in, void *data));
u16 sbi_fifo_avail(struct sbi_fifo *fifo); u16 sbi_fifo_avail(struct sbi_fifo *fifo);

10
lib/sbi/sbi_fifo.c
View File

@@ -43,10 +43,13 @@ u16 sbi_fifo_avail(struct sbi_fifo *fifo)
return ret; return ret;
} }
bool sbi_fifo_is_full(struct sbi_fifo *fifo) int sbi_fifo_is_full(struct sbi_fifo *fifo)
{ {
bool ret; bool ret;
if (!fifo)
return SBI_EINVAL;
spin_lock(&fifo->qlock); spin_lock(&fifo->qlock);
ret = __sbi_fifo_is_full(fifo); ret = __sbi_fifo_is_full(fifo);
spin_unlock(&fifo->qlock); spin_unlock(&fifo->qlock);
@@ -75,10 +78,13 @@ static inline bool __sbi_fifo_is_empty(struct sbi_fifo *fifo)
return (fifo->avail == 0) ? TRUE : FALSE; return (fifo->avail == 0) ? TRUE : FALSE;
} }
bool sbi_fifo_is_empty(struct sbi_fifo *fifo) int sbi_fifo_is_empty(struct sbi_fifo *fifo)
{ {
bool ret; bool ret;
if (!fifo)
return SBI_EINVAL;
spin_lock(&fifo->qlock); spin_lock(&fifo->qlock);
ret = __sbi_fifo_is_empty(fifo); ret = __sbi_fifo_is_empty(fifo);
spin_unlock(&fifo->qlock); spin_unlock(&fifo->qlock);