rpms/kernel/F-8 linux-2.6-alsa-emu10k1-fix-audigy2.patch, NONE, 1.1 kernel.spec, 1.460, 1.461

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4335

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-alsa-emu10k1-fix-audigy2.patch 
Log Message:
* Mon Jun 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.6-21
- Fix hang with audigy2 sound card (#326411)


linux-2.6-alsa-emu10k1-fix-audigy2.patch:

--- NEW FILE linux-2.6-alsa-emu10k1-fix-audigy2.patch ---
From: Jaroslav Franek <jarin.franek at post.cz>
Date: Fri, 6 Jun 2008 09:04:19 +0000 (+0200)
Subject: sound: emu10k1 - fix system hang with Audigy2 ZS Notebook PCMCIA card
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=868e15dbd2940f9453b4399117686f408dc77299

sound: emu10k1 - fix system hang with Audigy2 ZS Notebook PCMCIA card

When the Linux kernel is compiled with CONFIG_DEBUG_SHIRQ=y,
the Soundblaster Audigy2 ZS Notebook PCMCIA card causes the
system hang during boot (udev stage) or when the card is hot-plug.
The CONFIG_DEBUG_SHIRQ flag is by default 'y' with all Fedora
kernels since 2.6.23. The problem was reported as
https://bugzilla.redhat.com/show_bug.cgi?id=326411

The issue was hunted down to the snd_emu10k1_create() routine:

/* pseudo-code */
snd_emu10k1_create(...) {
	...
	request_irq(... IRQF_SHARED ...) {
		register the irq handler
		#ifdef CONFIG_DEBUG_SHIRQ
		call the irq handler: snd_emu10k1_interrupt() {
			poll I/O port   // <---- !! system hangs
			...
		}
		#endif
	}
	...
	snd_emu10k1_cardbus_init(...) {
		initialize I/O ports
	}
	...
}

The early access to I/O port in the interrupt handler causes
the freeze. Obviously it is necessary to init the I/O ports
before accessing them. This patch moves the registration of
the irq handler after the initialization of the I/O ports.

Signed-off-by: Jaroslav Franek <jarin.franek at post.cz>
Acked-by: James Courtier-Dutton <James at superbug.co.uk>
Signed-off-by: Takashi Iwai <tiwai at suse.de>
---

diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index abde5b9..548c9cc 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -1818,13 +1818,6 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
 	}
 	emu->port = pci_resource_start(pci, 0);
 
-	if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_SHARED,
-			"EMU10K1", emu)) {
-		err = -EBUSY;
-		goto error;
-	}
-	emu->irq = pci->irq;
-
 	emu->max_cache_pages = max_cache_bytes >> PAGE_SHIFT;
 	if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
 				32 * 1024, &emu->ptb_pages) < 0) {
@@ -1887,6 +1880,14 @@ int __devinit snd_emu10k1_create(struct snd_card *card,
 	emu->fx8010.etram_pages.area = NULL;
 	emu->fx8010.etram_pages.bytes = 0;
 
+	/* irq handler must be registered after I/O ports are activated */
+	if (request_irq(pci->irq, snd_emu10k1_interrupt, IRQF_SHARED,
+			"EMU10K1", emu)) {
+		err = -EBUSY;
+		goto error;
+	}
+	emu->irq = pci->irq;
+
 	/*
 	 *  Init to 0x02109204 :
 	 *  Clock accuracy    = 0     (1000ppm)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-8/kernel.spec,v
retrieving revision 1.460
retrieving revision 1.461
diff -u -r1.460 -r1.461
--- kernel.spec	9 Jun 2008 20:59:48 -0000	1.460
+++ kernel.spec	9 Jun 2008 21:32:32 -0000	1.461
@@ -576,6 +576,7 @@
 Patch91: linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch
 Patch92: linux-2.6-alsa-hda-codec-add-AD1884A.patch
 Patch93: linux-2.6-alsa-kill-annoying-messages.patch
+Patch94: linux-2.6-alsa-emu10k1-fix-audigy2.patch
 
 Patch123: linux-2.6-ppc-rtc.patch
 Patch130: linux-2.6-ppc-use-libgcc.patch
@@ -973,6 +974,8 @@
 ApplyPatch linux-2.6-alsa-hda-codec-add-AD1884A-x300.patch
 # kill annoying messages
 ApplyPatch linux-2.6-alsa-kill-annoying-messages.patch
+# fix hang with audigy2
+ApplyPatch linux-2.6-alsa-emu10k1-fix-audigy2.patch
 
 # Nouveau DRM + drm fixes
 ApplyPatch nouveau-drm.patch
@@ -1805,6 +1808,9 @@
 
 
 %changelog
+* Mon Jun 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.6-21
+- Fix hang with audigy2 sound card (#326411)
+
 * Mon Jun 09 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.25.6-20
 - Linux 2.6.25.6
 - Dropped patches: