Skip to contentSkip to conversation

OMAP: DSS2: RFBI driver: Cleanup "kfifo is full" test

RFC PATCH In review Heikki Orsila 2 participants 2 messages Dec 14, 2009 – Jan 7, 2010 Framebuffer layer

lore
Share & tools
lore
#0 lore raw

RFC PATCH 1/1 OMAP: DSS2: RFBI driver: Cleanup "kfifo is full" test

RFBI_CMD_FIFO_LEN_BYTES might not be a power-of-two, but kfifo() allocates the size up to the next power of two, which makes (RFBI_CMD_FIFO_LEN_BYTES - kfifo_len()) look very dubious (possibly a negative value!).

Notes:

[1] Not tested nor compiled here

[2] The removed code compares int with a size_t. It looks buggy, because if the full allocated
size of the fifo is used, the integer comparison leads to "always empty space in the fifo". Fortunately, the code can never go there, because available = 0 will come before negative integer values.

[3] Do we want to use the whole allocated space? In that case the change should be:

- available = RFBI_CMD_FIFO_LEN_BYTES -
- __kfifo_len(rfbi.cmd_fifo);
+ available = rfbi.cmd_fifo->size - __kfifo_len(rfbi.cmd_fifo);

---
 drivers/video/omap2/dss/rfbi.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
drivers/video/omap2/dss/rfbi.c +1 -4
index d0b3006..1dbe993 100644
@@ -1050,14 +1050,11 @@ static void rfbi_push_cmd(struct update_param *p)
 
 	while (1) {
 		unsigned long flags;
-		int available;
 
 		spin_lock_irqsave(rfbi.cmd_fifo->lock, flags);
-		available = RFBI_CMD_FIFO_LEN_BYTES -
-			__kfifo_len(rfbi.cmd_fifo);
 
 /*		DSSDBG("%d bytes left in fifo\n", available); */
-		if (available < sizeof(struct update_param)) {
+		if (__kfifo_len(rfbi.cmd_fifo) >= RFBI_CMD_FIFO_LEN_BYTES) {
 			DSSDBG("Going to wait because FIFO FULL..\n");
 			spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags);
 			atomic_inc(&rfbi.cmd_fifo_full);
Signature · 1 line
1.6.4.4
#1 lore raw

Re: [RFC PATCH] OMAP: DSS2: RFBI driver: Cleanup "kfifo is full"

Quoted 4 lines · ext Heikki Orsila

RFBI_CMD_FIFO_LEN_BYTES might not be a power-of-two, but kfifo() allocates the size up to the next power of two, which makes (RFBI_CMD_FIFO_LEN_BYTES - kfifo_len()) look very dubious (possibly a negative value!).

But this can never happen, as the code never pushes more than RFBI_CMD_FIFO_LEN_BYTES bytes into the fifo.

Quoted 13 lines

Notes:

[1] Not tested nor compiled here

[2] The removed code compares int with a size_t. It looks buggy, because if the full allocated
size of the fifo is used, the integer comparison leads to "always empty space in the fifo". Fortunately, the code can never go there, because available == 0 will come before negative integer values.

Quoted 1 line

[3] Do we want to use the whole allocated space?

I think if we allocate space for n bytes, we should use n bytes of the area, even though the underlying mechanism would allocate more.

Quoted 21 lines

In that case the change should be:

drivers/video/omap2/dss/rfbi.c +1 -2
-               available = RFBI_CMD_FIFO_LEN_BYTES -
-                       __kfifo_len(rfbi.cmd_fifo);
+               available = rfbi.cmd_fifo->size - __kfifo_len(rfbi.cmd_fifo);
---
 drivers/video/omap2/dss/rfbi.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)
drivers/video/omap2/dss/rfbi.c +0 -1
index d0b3006..1dbe993 100644
@@ -1050,14 +1050,11 @@ static void rfbi_push_cmd(struct update_param *p)
 
 	while (1) {
 		unsigned long flags;
-		int available;
 

drivers/video/omap2/dss/rfbi.c static void rfbi_push_cmd(struct update_param *p) · line 1060

Quoted 10 lines
drivers/video/omap2/dss/rfbi.c +1 -3
 		spin_lock_irqsave(rfbi.cmd_fifo->lock, flags);
-		available = RFBI_CMD_FIFO_LEN_BYTES -
-			__kfifo_len(rfbi.cmd_fifo);
 
 /*		DSSDBG("%d bytes left in fifo\n", available); */
-		if (available < sizeof(struct update_param)) {
+		if (__kfifo_len(rfbi.cmd_fifo) >= RFBI_CMD_FIFO_LEN_BYTES) {
 			DSSDBG("Going to wait because FIFO FULL..\n");
 			spin_unlock_irqrestore(rfbi.cmd_fifo->lock, flags);
 			atomic_inc(&rfbi.cmd_fifo_full);

Hmm, I don't think this is correct. The point is to test if there's enough space for one struct update_param in the fifo. You are testing if the fifo is full.

Tomi