Skip to contentSkip to conversation

dma/ipu: change ipu_irq_handler() to remove compile warning

PATCH Superseded yalin wang 3 participants 5 messages Aug 25, 2015 – Aug 28, 2015 dmaengine

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

yalin wang

author
#0 lore raw

PATCH 1/1 dma/ipu: change ipu_irq_handler() to remove compile warning

Change ipu_irq_handler() to avoid gcc warning:

drivers/dma/ipu/ipu_irq.c:305:4: warning: 'irq' may be used uninitialized in this function [-Wmaybe-uninitialized]

    generic_handle_irq(irq);
---
 drivers/dma/ipu/ipu_irq.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/dma/ipu/ipu_irq.c +2 -4
index 7489d2a..1a74eee 100644
@@ -286,23 +286,21 @@ static void ipu_irq_handler(unsigned int __irq, struct irq_desc *desc)
 		raw_spin_unlock(&bank_lock);
 		while ((line = ffs(status))) {
 			struct ipu_irq_map *map;
-			unsigned int irq;
 
 			line--;
 			status &= ~(1UL << line);
 
 			raw_spin_lock(&bank_lock);
 			map = src2map(32 * i + line);
-			if (map)
-				irq = map->irq;
 			raw_spin_unlock(&bank_lock);
 
 			if (!map) {
 				pr_err("IPU: Interrupt on unmapped source %u bank %d\n",
 				       line, i);
 				continue;
+			} else {
+				generic_handle_irq(map->irq);
 			}
-			generic_handle_irq(irq);
 		}
 	}
 }
Signature · 1 line
1.9.1
#1 lore raw
Quoted 5 lines · yalin wang

Change ipu_irq_handler() to avoid gcc warning:

drivers/dma/ipu/ipu_irq.c:305:4: warning: 'irq' may be used uninitialized in this function [-Wmaybe-uninitialized]

    generic_handle_irq(irq);

That's a false positive from GCC. irq is always initialized when generic_handle_irq() is called.

Quoted 20 lines
---
 drivers/dma/ipu/ipu_irq.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/dma/ipu/ipu_irq.c +0 -1
index 7489d2a..1a74eee 100644
@@ -286,23 +286,21 @@ static void ipu_irq_handler(unsigned int __irq, struct irq_desc *desc)
 		raw_spin_unlock(&bank_lock);
 		while ((line = ffs(status))) {
 			struct ipu_irq_map *map;
-			unsigned int irq;
 
 			line--;
 			status &= ~(1UL << line);
 
 			raw_spin_lock(&bank_lock);
 			map = src2map(32 * i + line);

drivers/dma/ipu/ipu_irq.c static void ipu_irq_handler(unsigned int __irq, struct irq_desc *desc) · line 302

Quoted 10 lines
drivers/dma/ipu/ipu_irq.c +2 -2
-			if (map)
-				irq = map->irq;
 			raw_spin_unlock(&bank_lock);
 
 			if (!map) {
 				pr_err("IPU: Interrupt on unmapped source %u bank %d\n",
 				       line, i);
 				continue;
+			} else {
+				generic_handle_irq(map->irq);

So you change that from retrieving the irq number with bank lock held to an unprotected access.

Thanks,

tglx

author
#2 lore raw
Quoted 37 lines · Thomas Gleixner
Quoted 5 lines · yalin wang

Change ipu_irq_handler() to avoid gcc warning:

drivers/dma/ipu/ipu_irq.c:305:4: warning: 'irq' may be used uninitialized in this function [-Wmaybe-uninitialized]
generic_handle_irq(irq);

That's a false positive from GCC. irq is always initialized when generic_handle_irq() is called.

Quoted 24 lines

---
drivers/dma/ipu/ipu_irq.c | 6 ++----

1 file changed, 2 insertions(+), 4 deletions(-)
drivers/dma/ipu/ipu_irq.c +0 -3
index 7489d2a..1a74eee 100644
@@ -286,23 +286,21 @@ static void ipu_irq_handler(unsigned int __irq, struct irq_desc *desc)
 		raw_spin_unlock(&bank_lock);
 		while ((line = ffs(status))) {
 			struct ipu_irq_map *map;
-			unsigned int irq;
 
 			line--;
 			status &= ~(1UL << line);
 
 			raw_spin_lock(&bank_lock);
 			map = src2map(32 * i + line);
-			if (map)
-				irq = map->irq;
 			raw_spin_unlock(&bank_lock);
 
Quoted 9 lines

drivers/dma/ipu/ipu_irq.c static void ipu_irq_handler(unsigned int __irq, struct irq_desc *desc) · line 302

Quoted 6 lines
drivers/dma/ipu/ipu_irq.c +2 -0
 			if (!map) {
 				pr_err("IPU: Interrupt on unmapped source %u bank %d\n",
 				       line, i);
 				continue;
+			} else {
+				generic_handle_irq(map->irq);

So you change that from retrieving the irq number with bank lock held to an unprotected access.

i see,
i will send a V2 patch .

#3 lore raw
In reply to yalin wang
Quoted 5 lines · yalin wang

Change ipu_irq_handler() to avoid gcc warning:

drivers/dma/ipu/ipu_irq.c:305:4: warning: 'irq' may be used uninitialized in this function [-Wmaybe-uninitialized]

    generic_handle_irq(irq);

Applied after fixing subsystem name

Signature · 1 line
~Vinod
#4 lore raw
Quoted 8 lines · Vinod Koul
Quoted 5 lines · yalin wang

Change ipu_irq_handler() to avoid gcc warning:

drivers/dma/ipu/ipu_irq.c:305:4: warning: 'irq' may be used uninitialized in this function [-Wmaybe-uninitialized]

    generic_handle_irq(irq);

Applied after fixing subsystem name

Just to be clear, V2 of this patch was applied

Signature · 1 line
~Vinod