ALSA: fm801: propagate TUNER_ONLY bit when autodetected
PATCH 1/5 ALSA: fm801: propagate TUNER_ONLY bit when autodetected
The commit d7ba858a7f7a (ALSA: fm801: implement TEA575x tuner autodetection) brings autodetection to the driver. However the autodetection algorithm misses the TUNER_ONLY bit if it is supplied by the user.
Thus, user gets weird messages and no card registered.
snd_fm801 0000:0d:01.0: detected TEA575x radio type SF64-PCR snd_fm801 0000:0d:01.0: AC'97 interface is busy (1)
snd_fm801 0000:0d:01.0: AC'97 interface is busy (1)
...
snd_fm801 0000:0d:01.0: AC'97 0 does not respond - RESET snd_fm801 0000:0d:01.0: AC'97 interface is busy (1)
snd_fm801 0000:0d:01.0: AC'97 interface is busy (1)
snd_fm801 0000:0d:01.0: AC'97 0 access is not valid [0x0], removing mixer.
snd_fm801: probe of 0000:0d:01.0 failed with error -5
Do a copy of TUNER_ONLY bit to be applied after autodetection is done.
--- sound/pci/fm801.c | 4 ++++ 1 file changed, 4 insertions(+)
sound/pci/fm801.c +4 -0
@@ -1269,6 +1269,8 @@ static int snd_fm801_create(struct snd_card *card,return -ENODEV ; } }else if ((tea575x_tuner &TUNER_TYPE_MASK ) ==0 ) { +unsigned int tuner_only = tea575x_tuner &TUNER_ONLY ; +/* autodetect tuner connection */ for (tea575x_tuner =1 ; tea575x_tuner <=3 ; tea575x_tuner++) { chip->tea575x_tuner = tea575x_tuner;
@@ -1283,6 +1285,8 @@ static int snd_fm801_create(struct snd_card *card,dev_err (card->dev,"TEA575x radio not found\n" ); chip->tea575x_tuner =TUNER_DISABLED ; } + + chip->tea575x_tuner |= tuner_only; }if (!(chip->tea575x_tuner &TUNER_DISABLED )) { strlcpy(chip->tea.card, get_tea575x_gpio(chip)->name,
Signature · 1 line
2.6.4
PATCH 2/5 ALSA: fm801: detect FM-only card earlier
If user does not supply tea575x_tuner parameter the driver tries to detect the tuner type. The failed codec initialization is considered as FM-only card present, however the driver still registers an IRQ handler for it.
Move codec detection earlier to set tea575x_tuner parameter before check.
Here the following functions are introduced
reset_coded() resets AC97 codec
snd_fm801_chip_multichannel_init() initializes cards with multichannel support
--- sound/pci/fm801.c | 69 +++++++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 30 deletions(-)
sound/pci/fm801.c +39 -30
@@ -1098,26 +1098,20 @@ static int wait_for_codec(struct fm801 *chip, unsigned int codec_id,return -EIO ; } -static int snd_fm801_chip_init (struct fm801 *chip,int resume) +static int reset_codec (struct fm801 *chip) { -unsigned short cmdw; - -if (chip->tea575x_tuner &TUNER_ONLY ) - goto __ac97_ok; -/* codec cold reset + AC'97 warm reset */ fm801_writew (chip,CODEC_CTRL , (1 <<5 ) | (1 <<6 ));fm801_readw (chip,CODEC_CTRL );/* flush posting data */ udelay (100 );fm801_writew (chip,CODEC_CTRL ,0 ); -if (wait_for_codec (chip,0 ,AC97_RESET ,msecs_to_jiffies (750 )) <0 ) -if (!resume) { -dev_info (chip->card->dev, -"Primary AC'97 codec not found, assume SF64-PCR (tuner-only)\n" ); - chip->tea575x_tuner =3 |TUNER_ONLY ; - goto __ac97_ok; - } +return wait_for_codec (chip,0 ,AC97_RESET ,msecs_to_jiffies (750 )); +} + +static void snd_fm801_chip_multichannel_init (struct fm801 *chip) +{ +unsigned short cmdw;if (chip->multichannel) {if (chip->secondary_addr) {
@@ -1144,8 +1138,11 @@ static int snd_fm801_chip_init(struct fm801 *chip, int resume)/* cause timeout problems */ wait_for_codec (chip,0 ,AC97_VENDOR_ID1 ,msecs_to_jiffies (750 )); } +} - __ac97_ok: +static void snd_fm801_chip_init (struct fm801 *chip) +{ +unsigned short cmdw;/* init volume */ fm801_writew (chip,PCM_VOL ,0x0808 );
@@ -1166,11 +1163,8 @@ static int snd_fm801_chip_init(struct fm801 *chip, int resume)/* interrupt clear */ fm801_writew (chip,IRQ_STATUS ,FM801_IRQ_PLAYBACK |FM801_IRQ_CAPTURE |FM801_IRQ_MPU ); - -return 0 ; } -static int snd_fm801_free (struct fm801 *chip) {unsigned short cmdw;
@@ -1227,7 +1221,23 @@ static int snd_fm801_create(struct snd_card *card,if ((err =pci_request_regions (pci,"FM801" )) <0 )return err; chip->port =pci_resource_start (pci,0 ); -if ((tea575x_tuner &TUNER_ONLY ) ==0 ) { + +if (pci->revision >=0xb1 )/* FM801-AU */ + chip->multichannel =1 ; + +if (!(chip->tea575x_tuner &TUNER_ONLY )) { +if (reset_codec (chip) <0 ) { +dev_info (chip->card->dev, +"Primary AC'97 codec not found, assume SF64-PCR (tuner-only)\n" ); + chip->tea575x_tuner =3 |TUNER_ONLY ; + }else { +snd_fm801_chip_multichannel_init (chip); + } + } + +snd_fm801_chip_init (chip); + +if ((chip->tea575x_tuner &TUNER_ONLY ) ==0 ) {if (devm_request_irq (&pci->dev, pci->irq, snd_fm801_interrupt,IRQF_SHARED ,KBUILD_MODNAME , chip)) {dev_err (card->dev,"unable to grab IRQ %d\n" , pci->irq);
@@ -1238,13 +1248,6 @@ static int snd_fm801_create(struct snd_card *card,pci_set_master (pci); } -if (pci->revision >=0xb1 )/* FM801-AU */ - chip->multichannel =1 ; - -snd_fm801_chip_init (chip,0 ); -/* init might set tuner access method */ - tea575x_tuner = chip->tea575x_tuner; -if ((err =snd_device_new (card,SNDRV_DEV_LOWLEVEL , chip, &ops)) <0 ) {snd_fm801_free (chip);return err;
@@ -1261,15 +1264,15 @@ static int snd_fm801_create(struct snd_card *card, chip->tea.private_data = chip; chip->tea.ops = &snd_fm801_tea_ops;sprintf (chip->tea.bus_info,"PCI:%s" ,pci_name (pci)); -if ((tea575x_tuner &TUNER_TYPE_MASK ) >0 && - (tea575x_tuner &TUNER_TYPE_MASK ) <4 ) { +if ((chip->tea575x_tuner &TUNER_TYPE_MASK ) >0 && + (chip->tea575x_tuner &TUNER_TYPE_MASK ) <4 ) {if (snd_tea575x_init (&chip->tea,THIS_MODULE )) {dev_err (card->dev,"TEA575x radio not found\n" );snd_fm801_free (chip);return -ENODEV ; } - }else if ((tea575x_tuner &TUNER_TYPE_MASK ) ==0 ) { -unsigned int tuner_only = tea575x_tuner &TUNER_ONLY ; + }else if ((chip->tea575x_tuner &TUNER_TYPE_MASK ) ==0 ) { +unsigned int tuner_only = chip->tea575x_tuner &TUNER_ONLY ;/* autodetect tuner connection */ for (tea575x_tuner =1 ; tea575x_tuner <=3 ; tea575x_tuner++) {
@@ -1405,7 +1408,13 @@ static int snd_fm801_resume(struct device *dev)struct fm801 *chip = card->private_data;int i; -snd_fm801_chip_init (chip,1 ); +if (chip->tea575x_tuner &TUNER_ONLY ) { +snd_fm801_chip_init (chip); + }else { +reset_codec (chip); +snd_fm801_chip_multichannel_init (chip); +snd_fm801_chip_init (chip); + }snd_ac97_resume (chip->ac97);snd_ac97_resume (chip->ac97_sec);for (i =0 ; i <ARRAY_SIZE (saved_regs); i++)
Signature · 1 line
2.6.4
PATCH 3/5 ALSA: fm801: no need to suspend absent codec
In reply to Andy ShevchenkoIn case of tuner only card there is no need to take care of the codec which is anyway absent.
--- sound/pci/fm801.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
sound/pci/fm801.c +12 -6
@@ -1393,12 +1393,17 @@ static int snd_fm801_suspend(struct device *dev)int i;snd_power_change_state (card, SNDRV_CTL_POWER_D3hot); -snd_pcm_suspend_all (chip->pcm); -snd_ac97_suspend (chip->ac97); -snd_ac97_suspend (chip->ac97_sec); + +if (chip->tea575x_tuner &TUNER_ONLY ) { +/* FIXME: tea575x suspend */ + }else { +snd_pcm_suspend_all (chip->pcm); +snd_ac97_suspend (chip->ac97); +snd_ac97_suspend (chip->ac97_sec); + } +for (i =0 ; i <ARRAY_SIZE (saved_regs); i++) chip->saved_regs[i] =fm801_ioread16 (chip, saved_regs[i]); -/* FIXME: tea575x suspend */ return 0 ; }
@@ -1414,9 +1419,10 @@ static int snd_fm801_resume(struct device *dev)reset_codec (chip);snd_fm801_chip_multichannel_init (chip);snd_fm801_chip_init (chip); +snd_ac97_resume (chip->ac97); +snd_ac97_resume (chip->ac97_sec); } -snd_ac97_resume (chip->ac97); -snd_ac97_resume (chip->ac97_sec); +for (i =0 ; i <ARRAY_SIZE (saved_regs); i++)fm801_iowrite16 (chip, saved_regs[i], chip->saved_regs[i]);
Signature · 1 line
2.6.4
PATCH 4/5 ALSA: fm801: save context before suspend devices
In reply to Andy ShevchenkoIn symmetry we save context first before suspend and restore it last after resume.
--- sound/pci/fm801.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
sound/pci/fm801.c +3 -2
@@ -1394,6 +1394,9 @@ static int snd_fm801_suspend(struct device *dev)snd_power_change_state (card, SNDRV_CTL_POWER_D3hot); +for (i =0 ; i <ARRAY_SIZE (saved_regs); i++) + chip->saved_regs[i] =fm801_ioread16 (chip, saved_regs[i]); +if (chip->tea575x_tuner &TUNER_ONLY ) {/* FIXME: tea575x suspend */ }else {
@@ -1402,8 +1405,6 @@ static int snd_fm801_suspend(struct device *dev)snd_ac97_suspend (chip->ac97_sec); } -for (i =0 ; i <ARRAY_SIZE (saved_regs); i++) - chip->saved_regs[i] =fm801_ioread16 (chip, saved_regs[i]);return 0 ; }
Signature · 1 line
2.6.4
PATCH 5/5 ALSA: fm801: restore TEA575x state on resume
In reply to Andy ShevchenkoThe suspend / resume cycle resets the settings of the FM tuner. Restore frequency settings on resume.
--- sound/pci/fm801.c | 5 +++++ 1 file changed, 5 insertions(+)
sound/pci/fm801.c +5 -0
@@ -1427,6 +1427,11 @@ static int snd_fm801_resume(struct device *dev)for (i =0 ; i <ARRAY_SIZE (saved_regs); i++)fm801_iowrite16 (chip, saved_regs[i], chip->saved_regs[i]); +#ifdef CONFIG_SND_FM801_TEA575X_BOOL +if (!(chip->tea575x_tuner &TUNER_DISABLED )) +snd_tea575x_set_freq (&chip->tea); +#endif +snd_power_change_state (card,SNDRV_CTL_POWER_D0 );return 0 ; }
Signature · 1 line
2.6.4
Takashi Iwai
AppliedQuoted 17 lines · Andy Shevchenko
The commit
d7ba858a7f7a(ALSA: fm801: implement TEA575x tuner autodetection) brings autodetection to the driver. However the autodetection algorithm misses theTUNER_ONLYbit if it is supplied by the user.Thus, user gets weird messages and no card registered.
snd_fm8010000:0d:01.0: detected TEA575x radio type SF64-PCRsnd_fm8010000:0d:01.0: AC'97 interface is busy (1)
snd_fm8010000:0d:01.0: AC'97 interface is busy (1)
...
snd_fm8010000:0d:01.0: AC'97 0 does not respond - RESETsnd_fm8010000:0d:01.0: AC'97 interface is busy (1)
snd_fm8010000:0d:01.0: AC'97 interface is busy (1)
snd_fm8010000:0d:01.0: AC'97 0 access is not valid [0x0], removing mixer.
snd_fm801: probe of 0000:0d:01.0 failed with error -5
Quoted 5 lines
Do a copy of
TUNER_ONLYbit to be applied after autodetection is done.Fixes d7ba858a7f7a (ALSA: fm801: implement TEA575x tuner autodetection)Signed-off-by Andy Shevchenko <[email protected]>Cc Ondrej Zary <[email protected]>
Applied all five patches now. Thanks.
Takashi
Quoted 30 lines
--- sound/pci/fm801.c | 4 ++++ 1 file changed, 4 insertions(+)sound/pci/fm801.c +4
-0@@ -1269,6 +1269,8 @@ static int snd_fm801_create(struct snd_card *card,return -ENODEV ; } }else if ((tea575x_tuner &TUNER_TYPE_MASK ) ==0 ) { +unsigned int tuner_only = tea575x_tuner &TUNER_ONLY ; +/* autodetect tuner connection */ for (tea575x_tuner =1 ; tea575x_tuner <=3 ; tea575x_tuner++) { chip->tea575x_tuner = tea575x_tuner;@@ -1283,6 +1285,8 @@ static int snd_fm801_create(struct snd_card *card,dev_err (card->dev,"TEA575x radio not found\n" ); chip->tea575x_tuner =TUNER_DISABLED ; } + + chip->tea575x_tuner |= tuner_only; }if (!(chip->tea575x_tuner &TUNER_DISABLED )) { strlcpy(chip->tea.card, get_tea575x_gpio(chip)->name,Signature · 1 line
2.6.4