[Fwd: [Ubuntu PATCH] FIx no mpu401 interface can cause hard freeze]

James Courtier-Dutton

author

2006-07-03 23:21 UTC #0 lore raw

PATCH 1/1 FIx no mpu401 interface can cause hard freeze]

Does anyone see any problems with this patch. It looks OK to me, but I don't have time to test it.
If it looks OK, could someone please check it in..

Thanks

James

This patch fixes the remaining instances in our tree where a non- existent mpu401 interface can cause a hard freeze when i/o is issued.

This commit closes Malone #34831.

Bug https://launchpad.net/distros/ubuntu/+source/linux-source-2.6.15/+bug/34831

patch location:
http://www.kernel.org/git/?p=linux/kernel/git/bcollins/ubuntu-dapper.git;a=commitdiff;h=b422309cdd980cfefe99379796c04e961d3c1544

---
 sound/pci/emu10k1/emu10k1x.c  |   35 +++++++++++++++++++++++++----------
 sound/pci/emu10k1/emumpu401.c |   35 +++++++++++++++++++++++++----------
 2 files changed, 50 insertions(+), 20 deletions(-)

sound/pci/emu10k1/emu10k1x.c +25 ~~-10~~

@@ -1286,7 +1286,7 @@ static void snd_emu10k1x_midi_interrupt(
 	do_emu10k1x_midi_interrupt(emu, &emu->midi, status);
 }
 
-static void snd_emu10k1x_midi_cmd(struct emu10k1x * emu,
+static int snd_emu10k1x_midi_cmd(struct emu10k1x * emu,
 				  struct emu10k1x_midi *midi, unsigned char cmd, int ack)
 {
 	unsigned long flags;

@@ -1312,11 +1312,14 @@ static void snd_emu10k1x_midi_cmd(struct
 		ok = 1;
 	}
 	spin_unlock_irqrestore(&midi->input_lock, flags);
-	if (!ok)
+	if (!ok) {
 		snd_printk(KERN_ERR "midi_cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)!!!\n",
 			   cmd, emu->port,
 			   mpu401_read_stat(emu, midi),
 			   mpu401_read_data(emu, midi));
+		return 1;
+	}
+	return 0;
 }
 
 static int snd_emu10k1x_midi_input_open(struct snd_rawmidi_substream *substream)

@@ -1332,12 +1335,17 @@ static int snd_emu10k1x_midi_input_open(
 	midi->substream_input = substream;
 	if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_OUTPUT)) {
 		spin_unlock_irqrestore(&midi->open_lock, flags);
-		snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1);
-		snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1);
+		if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1))
+			goto error_out;
+		if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))
+			goto error_out;
 	} else {
 		spin_unlock_irqrestore(&midi->open_lock, flags);
 	}
 	return 0;
+
+error_out:
+	return -EIO;
 }
 
 static int snd_emu10k1x_midi_output_open(struct snd_rawmidi_substream *substream)

@@ -1353,12 +1361,17 @@ static int snd_emu10k1x_midi_output_open
 	midi->substream_output = substream;
 	if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_INPUT)) {
 		spin_unlock_irqrestore(&midi->open_lock, flags);
-		snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1);
-		snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1);
+		if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 1))
+			goto error_out;
+		if (snd_emu10k1x_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))
+			goto error_out;
 	} else {
 		spin_unlock_irqrestore(&midi->open_lock, flags);
 	}
 	return 0;
+
+error_out:
+	return -EIO;
 }
 
 static int snd_emu10k1x_midi_input_close(struct snd_rawmidi_substream *substream)

@@ -1366,6 +1379,7 @@ static int snd_emu10k1x_midi_input_close
 	struct emu10k1x *emu;
 	struct emu10k1x_midi *midi = substream->rmidi->private_data;
 	unsigned long flags;
+	int err = 0;
 
 	emu = midi->emu;
 	snd_assert(emu, return -ENXIO);

@@ -1375,11 +1389,11 @@ static int snd_emu10k1x_midi_input_close
 	midi->substream_input = NULL;
 	if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_OUTPUT)) {
 		spin_unlock_irqrestore(&midi->open_lock, flags);
-		snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);
+		err = snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);
 	} else {
 		spin_unlock_irqrestore(&midi->open_lock, flags);
 	}
-	return 0;
+	return err;
 }
 
 static int snd_emu10k1x_midi_output_close(struct snd_rawmidi_substream *substream)

@@ -1387,6 +1401,7 @@ static int snd_emu10k1x_midi_output_clos
 	struct emu10k1x *emu;
 	struct emu10k1x_midi *midi = substream->rmidi->private_data;
 	unsigned long flags;
+	int err = 0;
 
 	emu = midi->emu;
 	snd_assert(emu, return -ENXIO);

@@ -1396,11 +1411,11 @@ static int snd_emu10k1x_midi_output_clos
 	midi->substream_output = NULL;
 	if (!(midi->midi_mode & EMU10K1X_MIDI_MODE_INPUT)) {
 		spin_unlock_irqrestore(&midi->open_lock, flags);
-		snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);
+		err = snd_emu10k1x_midi_cmd(emu, midi, MPU401_RESET, 0);
 	} else {
 		spin_unlock_irqrestore(&midi->open_lock, flags);
 	}
-	return 0;
+	return err;
 }
 
 static void snd_emu10k1x_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)

sound/pci/emu10k1/emumpu401.c +25 ~~-10~~

@@ -116,7 +116,7 @@ static void snd_emu10k1_midi_interrupt2(
 	do_emu10k1_midi_interrupt(emu, &emu->midi2, status);
 }
 
-static void snd_emu10k1_midi_cmd(struct snd_emu10k1 * emu, struct snd_emu10k1_midi *midi, unsigned char cmd, int ack)
+static int snd_emu10k1_midi_cmd(struct snd_emu10k1 * emu, struct snd_emu10k1_midi *midi, unsigned char cmd, int ack)
 {
 	unsigned long flags;
 	int timeout, ok;

@@ -141,11 +141,14 @@ static void snd_emu10k1_midi_cmd(struct 
 		ok = 1;
 	}
 	spin_unlock_irqrestore(&midi->input_lock, flags);
-	if (!ok)
+	if (!ok) {
 		snd_printk(KERN_ERR "midi_cmd: 0x%x failed at 0x%lx (status = 0x%x, data = 0x%x)!!!\n",
 			   cmd, emu->port,
 			   mpu401_read_stat(emu, midi),
 			   mpu401_read_data(emu, midi));
+		return 1;
+	}
+	return 0;
 }
 
 static int snd_emu10k1_midi_input_open(struct snd_rawmidi_substream *substream)

@@ -161,12 +164,17 @@ static int snd_emu10k1_midi_input_open(s
 	midi->substream_input = substream;
 	if (!(midi->midi_mode & EMU10K1_MIDI_MODE_OUTPUT)) {
 		spin_unlock_irqrestore(&midi->open_lock, flags);
-		snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1);
-		snd_emu10k1_midi_cmd(emu, midi, MPU401_ENTER_UART, 1);
+		if (snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1))
+			goto error_out;
+		if (snd_emu10k1_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))
+			goto error_out;
 	} else {
 		spin_unlock_irqrestore(&midi->open_lock, flags);
 	}
 	return 0;
+
+error_out:
+	return -EIO;
 }
 
 static int snd_emu10k1_midi_output_open(struct snd_rawmidi_substream *substream)

@@ -182,12 +190,17 @@ static int snd_emu10k1_midi_output_open(
 	midi->substream_output = substream;
 	if (!(midi->midi_mode & EMU10K1_MIDI_MODE_INPUT)) {
 		spin_unlock_irqrestore(&midi->open_lock, flags);
-		snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1);
-		snd_emu10k1_midi_cmd(emu, midi, MPU401_ENTER_UART, 1);
+		if (snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 1))
+			goto error_out;
+		if (snd_emu10k1_midi_cmd(emu, midi, MPU401_ENTER_UART, 1))
+			goto error_out;
 	} else {
 		spin_unlock_irqrestore(&midi->open_lock, flags);
 	}
 	return 0;
+
+error_out:
+	return -EIO;
 }
 
 static int snd_emu10k1_midi_input_close(struct snd_rawmidi_substream *substream)

@@ -195,6 +208,7 @@ static int snd_emu10k1_midi_input_close(
 	struct snd_emu10k1 *emu;
 	struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
 	unsigned long flags;
+	int err = 0;
 
 	emu = midi->emu;
 	snd_assert(emu, return -ENXIO);

@@ -204,11 +218,11 @@ static int snd_emu10k1_midi_input_close(
 	midi->substream_input = NULL;
 	if (!(midi->midi_mode & EMU10K1_MIDI_MODE_OUTPUT)) {
 		spin_unlock_irqrestore(&midi->open_lock, flags);
-		snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);
+		err = snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);
 	} else {
 		spin_unlock_irqrestore(&midi->open_lock, flags);
 	}
-	return 0;
+	return err;
 }
 
 static int snd_emu10k1_midi_output_close(struct snd_rawmidi_substream *substream)

@@ -216,6 +230,7 @@ static int snd_emu10k1_midi_output_close
 	struct snd_emu10k1 *emu;
 	struct snd_emu10k1_midi *midi = (struct snd_emu10k1_midi *)substream->rmidi->private_data;
 	unsigned long flags;
+	int err = 0;
 
 	emu = midi->emu;
 	snd_assert(emu, return -ENXIO);

@@ -225,11 +240,11 @@ static int snd_emu10k1_midi_output_close
 	midi->substream_output = NULL;
 	if (!(midi->midi_mode & EMU10K1_MIDI_MODE_INPUT)) {
 		spin_unlock_irqrestore(&midi->open_lock, flags);
-		snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);
+		err = snd_emu10k1_midi_cmd(emu, midi, MPU401_RESET, 0);
 	} else {
 		spin_unlock_irqrestore(&midi->open_lock, flags);
 	}
-	return 0;
+	return err;
 }
 
 static void snd_emu10k1_midi_input_trigger(struct snd_rawmidi_substream *substream, int up)

Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

_______________________________________________
Alsa-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/alsa-devel

Takashi Iwai

2006-07-04 12:26 UTC #1 lore raw

At Tue, 04 Jul 2006 00:21:26 +0100,

Quoted 4 lines · James Courtier-Dutton

Does anyone see any problems with this patch. It looks OK to me, but I don't have time to test it.
If it looks OK, could someone please check it in..

Yes, I committed to HG repo now.

thanks,

Takashi

Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

James Courtier-Dutton

author

2006-07-04 15:32 UTC #2 lore raw

Quoted 11 lines · Takashi Iwai

At Tue, 04 Jul 2006 00:21:26 +0100,
Quoted 3 lines · James Courtier-Dutton
Does anyone see any problems with this patch. It looks OK to me, but I don't have time to test it.
If it looks OK, could someone please check it in..
Yes, I committed to HG repo now.
thanks,
Takashi

I just noticed. We don't seem to have a sign off line for this patch.

James

Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

Takashi Iwai

2006-07-04 15:37 UTC #3 lore raw

At Tue, 04 Jul 2006 16:32:33 +0100,

Quoted 8 lines · James Courtier-Dutton

Quoted 6 lines · Takashi Iwai
At Tue, 04 Jul 2006 00:21:26 +0100,
Quoted 3 lines · James Courtier-Dutton
Does anyone see any problems with this patch. It looks OK to me, but I don't have time to test it.
If it looks OK, could someone please check it in..

Quoted 7 lines

Quoted 5 lines
Yes, I committed to HG repo now.
thanks,
Takashi
I just noticed. We don't seem to have a sign off line for this patch.

The signed-off-by of the committer will be added automatically when passed to alsa git patch.

Takashi

Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

James Courtier-Dutton

author

2006-07-04 15:48 UTC #4 lore raw

Quoted 12 lines · Takashi Iwai

At Tue, 04 Jul 2006 16:32:33 +0100,
Quoted 10 lines · James Courtier-Dutton
Quoted 9 lines · Takashi Iwai
At Tue, 04 Jul 2006 00:21:26 +0100,
Quoted 3 lines · James Courtier-Dutton
Does anyone see any problems with this patch. It looks OK to me, but I don't have time to test it.
If it looks OK, could someone please check it in..
Yes, I committed to HG repo now.
thanks,

Quoted 8 lines

Quoted 2 lines
Quoted 1 line
Takashi
I just noticed. We don't seem to have a sign off line for this patch.
The signed-off-by of the committer will be added automatically when passed to alsa git patch.
Takashi

What I mean, is the original poster of the patch did not provide a signed off line, so are we allowed to include it?

Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

Takashi Iwai

2006-07-04 16:01 UTC #5 lore raw

At Tue, 04 Jul 2006 16:48:05 +0100,

Quoted 17 lines · James Courtier-Dutton

Quoted 15 lines · Takashi Iwai
At Tue, 04 Jul 2006 16:32:33 +0100,
Quoted 12 lines · James Courtier-Dutton
Quoted 10 lines · Takashi Iwai
At Tue, 04 Jul 2006 00:21:26 +0100,
Quoted 3 lines · James Courtier-Dutton
Does anyone see any problems with this patch. It looks OK to me, but I don't have time to test it.
If it looks OK, could someone please check it in..
Yes, I committed to HG repo now.
thanks,
Takashi
I just noticed. We don't seem to have a sign off line for this patch.

Quoted 8 lines

Quoted 5 lines
The signed-off-by of the committer will be added automatically when passed to alsa git patch.
Takashi
What I mean, is the original poster of the patch did not provide a signed off line, so are we allowed to include it?

Yes.

Takashi

Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642