[alsa-devel] [PATCH] cs4236: detect cs4236+ chip in one pass
Krzysztof Helt
krzysztof.h1 at poczta.fm
Sun Nov 1 12:47:38 CET 2009
From: Krzysztof Helt <krzysztof.h1 at wp.pl>
The cs4236 was two step detection with call to the snd_wss_free()
between two steps. The snd_wss_free() did not free a sound device
created in the snd_wss_create(). This caused an OOPS during module
removal as the same sound device was released twice. The same OOPS
happened if the cs4236 module loading failed.
Fix this by adapting the snd_cs4236_create() to correctly work with
chips less capable then cs4236. The snd_cs4236_create() behaves the
same as the snd_wss_create() if the chip is less capable than the cs4236.
Signed-off-by: Krzysztof Helt <krzysztof.h1 at wp.pl>
---
It is related to the kernel bug #13379. If the snd-cs4236 is forced to be loaded
with isapnp=0 and wrong control port is given, the driver OOPS and it is not
possible to reload the driver until reboot.
The OOPS from Wim Osternholt is below:
ALSA sound/isa/cs423x/cs4236_lib.c:313: CS4236: [0x210] C1 (version) = 0xff, ext = 0xe8
ALSA sound/isa/cs423x/cs4236_lib.c:316: CS4236+ chip detected, but control port 0x210 is not valid
BUG: unable to handle kernel NULL pointer dereference at 00000018
IP: [<c02285c6>] release_resource+0x16/0x48
*pde = 00000000
Oops: 0000 [#1] SMP
last sysfs file: /sys/devices/pci0000:00/0000:00:01.1/ide1/1.0/block/hdc/size
Modules linked in: snd_cs4236(+) snd_wss_lib snd_opl3_lib snd_hwdep snd_mpu401_uart snd_rawmidi snd_pcm snd_timer snd_page_alloc snd_mixer_oss sd_mod
svgalib_helper uhci_hcd neofb cfbcopyarea vgastate cfbimgblt cfbfillrect usbcore xircom_cb Oct 29 12:43:16 barbapapa
Pid: 5317, comm: modprobe Not tainted (2.6.30-gentoo-r8 #3) 2645310
EIP: 0060:[<c02285c6>] EFLAGS: 00010206 CPU: 0
EIP is at release_resource+0x16/0x48
EAX: c066a91c EBX: c8f40d80 ECX: 00000018 EDX: cad81fb0
ESI: c83c0000 EDI: 00002fff EBP: c8379df8 ESP: c8379df4
DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
Process modprobe (pid: 5317, ti=c8378000 task=c8322be0 task.ti=c8378000)
Stack:
c8f40d80 c8379e04 c04186f3 c82ca000 c8379e10 cad81f38 c8f40240 c8379e18
cad81fbb c8379e28 c041883e c83c0000 00002000 c8379e3c c04188f2 c83c0000
c83c0000 c8f42d80 c8379e48 c04147e7 00000000 c8379e74 c04152a3 c83c01b4
Call Trace:
[<c04186f3>] ? release_and_free_resource+0xf/0x1c
[<cad81f38>] ? snd_wss_free+0xe/0x86 [snd_wss_lib]
[<cad81fbb>] ? snd_wss_dev_free+0xb/0xd [snd_wss_lib]
[<c041883e>] ? snd_device_free+0x8d/0xea
[<c04188f2>] ? snd_device_free_all+0x57/0x79
[<c04147e7>] ? snd_card_do_free+0x6e/0xd2
[<c04152a3>] ? snd_card_free+0x7f/0x89
[<cad9973d>] ? snd_cs423x_isa_probe+0x3e/0x4d [snd_cs4236]
[<cad996ff>] ? snd_cs423x_isa_probe+0x0/0x4d [snd_cs4236]
[<c03b9802>] ? isa_bus_probe+0x1c/0x1f
[<c03b60b7>] ? driver_probe_device+0x8e/0x102
[<c03b62ee>] ? __device_attach+0x0/0x32
[<c03b6316>] ? __device_attach+0x28/0x32
[<c03b5590>] ? bus_for_each_drv+0x39/0x63
[<c03b61ee>] ? device_attach+0x45/0x59
[<c03b62ee>] ? __device_attach+0x0/0x32
[<c03b552d>] ? bus_attach_device+0x1e/0x48
[<c03b44cd>] ? device_add+0x331/0x471
[<c034d63e>] ? kobject_init+0x35/0x5a
[<c03b461f>] ? device_register+0x12/0x15
[<c03b9994>] ? isa_register_driver+0xde/0x146
[<cada1000>] ? alsa_card_cs423x_init+0x0/0x74 [snd_cs4236]
[<cada1012>] ? alsa_card_cs423x_init+0x12/0x74 [snd_cs4236]
[<c0201141>] ? do_one_initcall+0x4c/0x131
[<c024445f>] ? sys_init_module+0x87/0x190
[<c02029f5>] ? syscall_call+0x7/0xb
Code: 3b 4e 04 8b 55 ec 7c e5 7f 04 3b 16 72 df 59 5b 5b 5e 5f 5d c3 55 89 e5 53 89
c3 b8 1c a9 66 c0 e8 7b de 2d 00 8b 4b 10 83 c1 18 <8b> 11 85 d2 74 19 39 da
75 10 8b 42 14 89 01 31 c0 c7 42 10 00
[<c02285c6>] release_resource+0x16/0x48 SS:ESP 0068:c8379df4
CR2: 0000000000000018
include/sound/wss.h | 1 -
sound/isa/cs423x/cs4236.c | 13 +---
sound/isa/cs423x/cs4236_lib.c | 143 ++++++++++++++++++++++-------------------
sound/isa/wss/wss_lib.c | 3 +-
4 files changed, 80 insertions(+), 80 deletions(-)
diff --git a/include/sound/wss.h b/include/sound/wss.h
index 6d65f32..fd01f22 100644
--- a/include/sound/wss.h
+++ b/include/sound/wss.h
@@ -154,7 +154,6 @@ int snd_wss_create(struct snd_card *card,
unsigned short hardware,
unsigned short hwshare,
struct snd_wss **rchip);
-int snd_wss_free(struct snd_wss *chip);
int snd_wss_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm);
int snd_wss_timer(struct snd_wss *chip, int device, struct snd_timer **rtimer);
int snd_wss_mixer(struct snd_wss *chip);
diff --git a/sound/isa/cs423x/cs4236.c b/sound/isa/cs423x/cs4236.c
index a076a6c..93fa672 100644
--- a/sound/isa/cs423x/cs4236.c
+++ b/sound/isa/cs423x/cs4236.c
@@ -394,21 +394,15 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)
return -EBUSY;
}
- err = snd_wss_create(card, port[dev], cport[dev],
+ err = snd_cs4236_create(card, port[dev], cport[dev],
irq[dev],
dma1[dev], dma2[dev],
WSS_HW_DETECT3, 0, &chip);
if (err < 0)
return err;
+
+ acard->chip = chip;
if (chip->hardware & WSS_HW_CS4236B_MASK) {
- snd_wss_free(chip);
- err = snd_cs4236_create(card,
- port[dev], cport[dev],
- irq[dev], dma1[dev], dma2[dev],
- WSS_HW_DETECT, 0, &chip);
- if (err < 0)
- return err;
- acard->chip = chip;
err = snd_cs4236_pcm(chip, 0, &pcm);
if (err < 0)
@@ -418,7 +412,6 @@ static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)
if (err < 0)
return err;
} else {
- acard->chip = chip;
err = snd_wss_pcm(chip, 0, &pcm);
if (err < 0)
return err;
diff --git a/sound/isa/cs423x/cs4236_lib.c b/sound/isa/cs423x/cs4236_lib.c
index 38835f3..2f9f430 100644
--- a/sound/isa/cs423x/cs4236_lib.c
+++ b/sound/isa/cs423x/cs4236_lib.c
@@ -87,6 +87,7 @@
#include <sound/core.h>
#include <sound/wss.h>
#include <sound/asoundef.h>
+#include <sound/initval.h>
/*
*
@@ -264,7 +265,10 @@ static void snd_cs4236_resume(struct snd_wss *chip)
}
#endif /* CONFIG_PM */
-
+/*
+ * This function does no fail if the chip is not CS4236B or compatible.
+ * It just an equivalent to the snd_wss_create() then.
+ */
int snd_cs4236_create(struct snd_card *card,
unsigned long port,
unsigned long cport,
@@ -281,83 +285,88 @@ int snd_cs4236_create(struct snd_card *card,
*rchip = NULL;
if (hardware == WSS_HW_DETECT)
hardware = WSS_HW_DETECT3;
- if (cport < 0x100) {
- snd_printk(KERN_ERR "please, specify control port "
- "for CS4236+ chips\n");
- return -ENODEV;
- }
+
err = snd_wss_create(card, port, cport,
irq, dma1, dma2, hardware, hwshare, &chip);
if (err < 0)
return err;
- if (!(chip->hardware & WSS_HW_CS4236B_MASK)) {
- snd_printk(KERN_ERR "CS4236+: MODE3 and extended registers "
- "not available, hardware=0x%x\n", chip->hardware);
- snd_device_free(card, chip);
- return -ENODEV;
- }
+ if (chip->hardware & WSS_HW_CS4236B_MASK) {
#if 0
- {
- int idx;
- for (idx = 0; idx < 8; idx++)
- snd_printk(KERN_DEBUG "CD%i = 0x%x\n",
- idx, inb(chip->cport + idx));
- for (idx = 0; idx < 9; idx++)
- snd_printk(KERN_DEBUG "C%i = 0x%x\n",
- idx, snd_cs4236_ctrl_in(chip, idx));
- }
+ {
+ int idx;
+ for (idx = 0; idx < 8; idx++)
+ snd_printk(KERN_DEBUG "CD%i = 0x%x\n",
+ idx, inb(chip->cport + idx));
+ for (idx = 0; idx < 9; idx++)
+ snd_printk(KERN_DEBUG "C%i = 0x%x\n",
+ idx, snd_cs4236_ctrl_in(chip, idx));
+ }
#endif
- ver1 = snd_cs4236_ctrl_in(chip, 1);
- ver2 = snd_cs4236_ext_in(chip, CS4236_VERSION);
- snd_printdd("CS4236: [0x%lx] C1 (version) = 0x%x, ext = 0x%x\n", cport, ver1, ver2);
- if (ver1 != ver2) {
- snd_printk(KERN_ERR "CS4236+ chip detected, but "
- "control port 0x%lx is not valid\n", cport);
- snd_device_free(card, chip);
- return -ENODEV;
- }
- snd_cs4236_ctrl_out(chip, 0, 0x00);
- snd_cs4236_ctrl_out(chip, 2, 0xff);
- snd_cs4236_ctrl_out(chip, 3, 0x00);
- snd_cs4236_ctrl_out(chip, 4, 0x80);
- snd_cs4236_ctrl_out(chip, 5, ((IEC958_AES1_CON_PCM_CODER & 3) << 6) | IEC958_AES0_CON_EMPHASIS_NONE);
- snd_cs4236_ctrl_out(chip, 6, IEC958_AES1_CON_PCM_CODER >> 2);
- snd_cs4236_ctrl_out(chip, 7, 0x00);
- /* 0x8c for C8 is valid for Turtle Beach Malibu - the IEC-958 output */
- /* is working with this setup, other hardware should have */
- /* different signal paths and this value should be selectable */
- /* in the future */
- snd_cs4236_ctrl_out(chip, 8, 0x8c);
- chip->rate_constraint = snd_cs4236_xrate;
- chip->set_playback_format = snd_cs4236_playback_format;
- chip->set_capture_format = snd_cs4236_capture_format;
+ if (cport < 0x100 || cport == SNDRV_AUTO_PORT) {
+ snd_printk(KERN_ERR "please, specify control port "
+ "for CS4236+ chips\n");
+ return -ENODEV;
+ }
+ ver1 = snd_cs4236_ctrl_in(chip, 1);
+ ver2 = snd_cs4236_ext_in(chip, CS4236_VERSION);
+ snd_printdd("CS4236: [0x%lx] C1 (version) = 0x%x, ext = 0x%x\n",
+ cport, ver1, ver2);
+ if (ver1 != ver2) {
+ snd_printk(KERN_ERR "CS4236+ chip detected, but "
+ "control port 0x%lx is not valid\n", cport);
+ snd_device_free(card, chip);
+ return -ENODEV;
+ }
+ snd_cs4236_ctrl_out(chip, 0, 0x00);
+ snd_cs4236_ctrl_out(chip, 2, 0xff);
+ snd_cs4236_ctrl_out(chip, 3, 0x00);
+ snd_cs4236_ctrl_out(chip, 4, 0x80);
+ reg = ((IEC958_AES1_CON_PCM_CODER & 3) << 6) |
+ IEC958_AES0_CON_EMPHASIS_NONE;
+ snd_cs4236_ctrl_out(chip, 5, reg);
+ snd_cs4236_ctrl_out(chip, 6, IEC958_AES1_CON_PCM_CODER >> 2);
+ snd_cs4236_ctrl_out(chip, 7, 0x00);
+ /*
+ * 0x8c for C8 is valid for Turtle Beach Malibu - the IEC-958
+ * output is working with this setup, other hardware should
+ * have different signal paths and this value should be
+ * selectable in the future
+ * */
+ snd_cs4236_ctrl_out(chip, 8, 0x8c);
+ chip->rate_constraint = snd_cs4236_xrate;
+ chip->set_playback_format = snd_cs4236_playback_format;
+ chip->set_capture_format = snd_cs4236_capture_format;
#ifdef CONFIG_PM
- chip->suspend = snd_cs4236_suspend;
- chip->resume = snd_cs4236_resume;
+ chip->suspend = snd_cs4236_suspend;
+ chip->resume = snd_cs4236_resume;
#endif
- /* initialize extended registers */
- for (reg = 0; reg < sizeof(snd_cs4236_ext_map); reg++)
- snd_cs4236_ext_out(chip, CS4236_I23VAL(reg), snd_cs4236_ext_map[reg]);
-
- /* initialize compatible but more featured registers */
- snd_wss_out(chip, CS4231_LEFT_INPUT, 0x40);
- snd_wss_out(chip, CS4231_RIGHT_INPUT, 0x40);
- snd_wss_out(chip, CS4231_AUX1_LEFT_INPUT, 0xff);
- snd_wss_out(chip, CS4231_AUX1_RIGHT_INPUT, 0xff);
- snd_wss_out(chip, CS4231_AUX2_LEFT_INPUT, 0xdf);
- snd_wss_out(chip, CS4231_AUX2_RIGHT_INPUT, 0xdf);
- snd_wss_out(chip, CS4231_RIGHT_LINE_IN, 0xff);
- snd_wss_out(chip, CS4231_LEFT_LINE_IN, 0xff);
- snd_wss_out(chip, CS4231_RIGHT_LINE_IN, 0xff);
- switch (chip->hardware) {
- case WSS_HW_CS4235:
- case WSS_HW_CS4239:
- snd_wss_out(chip, CS4235_LEFT_MASTER, 0xff);
- snd_wss_out(chip, CS4235_RIGHT_MASTER, 0xff);
- break;
- }
+ /* initialize extended registers */
+ for (reg = 0; reg < sizeof(snd_cs4236_ext_map); reg++)
+ snd_cs4236_ext_out(chip, CS4236_I23VAL(reg),
+ snd_cs4236_ext_map[reg]);
+
+ /* initialize compatible but more featured registers */
+ snd_wss_out(chip, CS4231_LEFT_INPUT, 0x40);
+ snd_wss_out(chip, CS4231_RIGHT_INPUT, 0x40);
+ snd_wss_out(chip, CS4231_AUX1_LEFT_INPUT, 0xff);
+ snd_wss_out(chip, CS4231_AUX1_RIGHT_INPUT, 0xff);
+ snd_wss_out(chip, CS4231_AUX2_LEFT_INPUT, 0xdf);
+ snd_wss_out(chip, CS4231_AUX2_RIGHT_INPUT, 0xdf);
+ snd_wss_out(chip, CS4231_RIGHT_LINE_IN, 0xff);
+ snd_wss_out(chip, CS4231_LEFT_LINE_IN, 0xff);
+ snd_wss_out(chip, CS4231_RIGHT_LINE_IN, 0xff);
+ switch (chip->hardware) {
+ case WSS_HW_CS4235:
+ case WSS_HW_CS4239:
+ snd_wss_out(chip, CS4235_LEFT_MASTER, 0xff);
+ snd_wss_out(chip, CS4235_RIGHT_MASTER, 0xff);
+ break;
+ }
+ } else
+ snd_printd("chip is not CS4236+, hardware=0x%x\n",
+ chip->hardware);
*rchip = chip;
return 0;
diff --git a/sound/isa/wss/wss_lib.c b/sound/isa/wss/wss_lib.c
index 5d2ba1b..aab44e7 100644
--- a/sound/isa/wss/wss_lib.c
+++ b/sound/isa/wss/wss_lib.c
@@ -1682,7 +1682,7 @@ static void snd_wss_resume(struct snd_wss *chip)
}
#endif /* CONFIG_PM */
-int snd_wss_free(struct snd_wss *chip)
+static int snd_wss_free(struct snd_wss *chip)
{
release_and_free_resource(chip->res_port);
release_and_free_resource(chip->res_cport);
@@ -1705,7 +1705,6 @@ int snd_wss_free(struct snd_wss *chip)
kfree(chip);
return 0;
}
-EXPORT_SYMBOL(snd_wss_free);
static int snd_wss_dev_free(struct snd_device *device)
{
--
1.6.4
------------------------------------------------------------------------------
Strrraszny konkurs z Scooby-Doo!
Wez udzial >> http://link.interia.pl/f2412
More information about the Alsa-devel
mailing list