Skip to contentSkip to conversation

sound/oss/pss: Fix test of unsigned in pss_reset_dsp() and pss_download_boot()

PATCH In review Roel Kluin 3 participants 6 messages Dec 15, 2009 – Dec 17, 2009 Sound

lore
Share & tools
lore

Roel Kluin

author
#0 lore raw

PATCH 1/1 sound/oss/pss: Fix test of unsigned in pss_reset_dsp() and pss_download_boot()

limit and jiffies are unsigned so the test does not work.

---
Found using coccinelle: http://coccinelle.lip6.fr/

sound/oss/pss.c +3 -3
index 83f5ee2..9325f4d 100644
@@ -269,7 +269,7 @@ static int pss_reset_dsp(pss_confdata * devc)
 	unsigned long   i, limit = jiffies + HZ/10;
 
 	outw(0x2000, REG(PSS_CONTROL));
-	for (i = 0; i < 32768 && (limit-jiffies >= 0); i++)
+	for (i = 0; i < 32768 && (limit >= jiffies); i++)
 		inw(REG(PSS_CONTROL));
 	outw(0x0000, REG(PSS_CONTROL));
 	return 1;
@@ -369,11 +369,11 @@ static int pss_download_boot(pss_confdata * devc, unsigned char *block, int size
 		outw(0, REG(PSS_DATA));
 
 		limit = jiffies + HZ/10;
-		for (i = 0; i < 32768 && (limit - jiffies >= 0); i++)
+		for (i = 0; i < 32768 && (limit >= jiffies); i++)
 			val = inw(REG(PSS_STATUS));
 
 		limit = jiffies + HZ/10;
-		for (i = 0; i < 32768 && (limit-jiffies >= 0); i++)
+		for (i = 0; i < 32768 && (limit >= jiffies); i++)
 		{
 			val = inw(REG(PSS_STATUS));
 			if (val & 0x4000)
#1 lore raw

At Tue, 15 Dec 2009 23:06:18 +0100,

Quoted 12 lines · Roel Kluin

limit and jiffies are unsigned so the test does not work.

---
Found using coccinelle: http://coccinelle.lip6.fr/

sound/oss/pss.c +0 -0
index 83f5ee2..9325f4d 100644

sound/oss/pss.c static int pss_reset_dsp(pss_confdata * devc) · line 272

Quoted 5 lines
sound/oss/pss.c +1 -1
@@ -269,7 +269,7 @@ static int pss_reset_dsp(pss_confdata * devc)
 	unsigned long   i, limit = jiffies + HZ/10;
 
 	outw(0x2000, REG(PSS_CONTROL));
-	for (i = 0; i < 32768 && (limit-jiffies >= 0); i++)
+	for (i = 0; i < 32768 && (limit >= jiffies); i++)

No, it should use time_after_eq(limit, jiffies) instead.

thanks,

Takashi

author
#2 lore raw

limit and jiffies are unsigned so the test did not work.

---
Found using coccinelle: http://coccinelle.lip6.fr/

Quoted 10 lines

Review

Quoted 2 lines
(quoted diff) +1 -1
-	for (i = 0; i < 32768 && (limit-jiffies >= 0); i++)
+	for (i = 0; i < 32768 && (limit >= jiffies); i++)

No, it should use time_after_eq(limit, jiffies) instead.

thanks,

Takashi

Ok,

sound/oss/pss.c +3 -3
index 83f5ee2..e19dd5d 100644
@@ -269,7 +269,7 @@ static int pss_reset_dsp(pss_confdata * devc)
 	unsigned long   i, limit = jiffies + HZ/10;
 
 	outw(0x2000, REG(PSS_CONTROL));
-	for (i = 0; i < 32768 && (limit-jiffies >= 0); i++)
+	for (i = 0; i < 32768 && time_after_eq(limit, jiffies); i++)
 		inw(REG(PSS_CONTROL));
 	outw(0x0000, REG(PSS_CONTROL));
 	return 1;
@@ -369,11 +369,11 @@ static int pss_download_boot(pss_confdata * devc, unsigned char *block, int size
 		outw(0, REG(PSS_DATA));
 
 		limit = jiffies + HZ/10;
-		for (i = 0; i < 32768 && (limit - jiffies >= 0); i++)
+		for (i = 0; i < 32768 && time_after_eq(limit, jiffies); i++)
 			val = inw(REG(PSS_STATUS));
 
 		limit = jiffies + HZ/10;
-		for (i = 0; i < 32768 && (limit-jiffies >= 0); i++)
+		for (i = 0; i < 32768 && time_after_eq(limit, jiffies); i++)
 		{
 			val = inw(REG(PSS_STATUS));
 			if (val & 0x4000)
#4 lore raw
In reply to Roel Kluin
Quoted 11 lines · Roel Kluin

limit and jiffies are unsigned so the test does not work.

---
Found using coccinelle: http://coccinelle.lip6.fr/

sound/oss/pss.c +0 -0
index 83f5ee2..9325f4d 100644

sound/oss/pss.c static int pss_reset_dsp(pss_confdata * devc) · line 272

Quoted 4 lines
sound/oss/pss.c +0 -1
@@ -269,7 +269,7 @@ static int pss_reset_dsp(pss_confdata * devc)
 	unsigned long   i, limit = jiffies + HZ/10;
 
 	outw(0x2000, REG(PSS_CONTROL));
-	for (i = 0; i < 32768 && (limit-jiffies >= 0); i++)

I think

	for (i = 0; i < 32768 && ( (int)(limit-jiffies) >= 0); i++)

works better when jiffies wrap

Quoted 23 lines
sound/oss/pss.c +3 -2
+	for (i = 0; i < 32768 && (limit >= jiffies); i++)
 		inw(REG(PSS_CONTROL));
 	outw(0x0000, REG(PSS_CONTROL));
 	return 1;
@@ -369,11 +369,11 @@ static int pss_download_boot(pss_confdata * devc, unsigned char *block, int size
 		outw(0, REG(PSS_DATA));
 
 		limit = jiffies + HZ/10;
-		for (i = 0; i < 32768 && (limit - jiffies >= 0); i++)
+		for (i = 0; i < 32768 && (limit >= jiffies); i++)
 			val = inw(REG(PSS_STATUS));
 
 		limit = jiffies + HZ/10;
-		for (i = 0; i < 32768 && (limit-jiffies >= 0); i++)
+		for (i = 0; i < 32768 && (limit >= jiffies); i++)
 		{
 			val = inw(REG(PSS_STATUS));
 			if (val & 0x4000)

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

#5 lore raw

At Wed, 16 Dec 2009 17:23:03 -0700,

Quoted 15 lines · Troy Kisky
Quoted 13 lines · Roel Kluin

limit and jiffies are unsigned so the test does not work.

---
Found using coccinelle: http://coccinelle.lip6.fr/

sound/oss/pss.c +0 -0
index 83f5ee2..9325f4d 100644
@@ -269,7 +269,7 @@ static int pss_reset_dsp(pss_confdata * devc)
 	unsigned long   i, limit = jiffies + HZ/10;
 
Quoted 7 lines

sound/oss/pss.c static int pss_reset_dsp(pss_confdata * devc) · line 272

Quoted 2 lines
sound/oss/pss.c +0 -1
 	outw(0x2000, REG(PSS_CONTROL));
-	for (i = 0; i < 32768 && (limit-jiffies >= 0); i++)

I think

	for (i = 0; i < 32768 && ( (int)(limit-jiffies) >= 0); i++)

works better when jiffies wrap

Yes, and time_after_eq() takes care of it nicely :)

Takashi

#3 lore raw
In reply to Roel Kluin

At Wed, 16 Dec 2009 16:54:43 +0100,

Quoted 13 lines · Roel Kluin

limit and jiffies are unsigned so the test did not work.

---
Found using coccinelle: http://coccinelle.lip6.fr/

Quoted 6 lines

Review

Quoted 2 lines
(quoted diff) +1 -1
-	for (i = 0; i < 32768 && (limit-jiffies >= 0); i++)
+	for (i = 0; i < 32768 && (limit >= jiffies); i++)

No, it should use time_after_eq(limit, jiffies) instead.

Quoted 6 lines
Quoted 4 lines

thanks,

Takashi

Ok,

Applied now. Thanks.

Takashi

Quoted 33 lines
sound/oss/pss.c +3 -3
index 83f5ee2..e19dd5d 100644
@@ -269,7 +269,7 @@ static int pss_reset_dsp(pss_confdata * devc)
 	unsigned long   i, limit = jiffies + HZ/10;
 
 	outw(0x2000, REG(PSS_CONTROL));
-	for (i = 0; i < 32768 && (limit-jiffies >= 0); i++)
+	for (i = 0; i < 32768 && time_after_eq(limit, jiffies); i++)
 		inw(REG(PSS_CONTROL));
 	outw(0x0000, REG(PSS_CONTROL));
 	return 1;
@@ -369,11 +369,11 @@ static int pss_download_boot(pss_confdata * devc, unsigned char *block, int size
 		outw(0, REG(PSS_DATA));
 
 		limit = jiffies + HZ/10;
-		for (i = 0; i < 32768 && (limit - jiffies >= 0); i++)
+		for (i = 0; i < 32768 && time_after_eq(limit, jiffies); i++)
 			val = inw(REG(PSS_STATUS));
 
 		limit = jiffies + HZ/10;
-		for (i = 0; i < 32768 && (limit-jiffies >= 0); i++)
+		for (i = 0; i < 32768 && time_after_eq(limit, jiffies); i++)
 		{
 			val = inw(REG(PSS_STATUS));
 			if (val & 0x4000)

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel