March 2008 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] [PATCH] model for cx20549 to support laptop HP530
by Jiang zhe 06 Mar '08

06 Mar '08

Hi, Please refer to [0003821]. Currently the model laptop-hpsense use the 0x12 as ExtMic, and use 0x14 as Internal IntMic. But the hp530 only have one ExtMic, the Pin widget is 0x14. In this patch, I changed the mixer item for them. I still reserved the IntMic item, it will be helpful if other machine may use this model. Best regards! Signed-off-by: Jiang zhe <zhe.jiang(a)intel.com> --- alsa-driver-hg20080306/alsa-kernel/pci/hda/patch_conexant.c 2008-03-01 09:00:07.000000000 +0800 +++ b/alsa-kernel/pci/hda/patch_conexant.c 2008-03-06 16:12:23.000000000 +0800 @@ -519,6 +519,14 @@ static struct hda_input_mux cxt5045_capt } }; +static struct hda_input_mux cxt5045_capture_source_hp530 = { + .num_items = 2, + .items = { + { "ExtMic", 0x1 }, + { "IntMic", 0x2 }, + } +}; + /* turn on/off EAPD (+ mute HP) as a master switch */ static int cxt5045_hp_master_sw_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) @@ -647,6 +655,37 @@ static struct snd_kcontrol_new cxt5045_b {} }; +static struct snd_kcontrol_new cxt5045_mixers_hp530[] = { + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Capture Source", + .info = conexant_mux_enum_info, + .get = conexant_mux_enum_get, + .put = conexant_mux_enum_put + }, + HDA_CODEC_VOLUME("Int Mic Capture Volume", 0x1a, 0x02, HDA_INPUT), + HDA_CODEC_MUTE("Int Mic Capture Switch", 0x1a, 0x02, HDA_INPUT), + HDA_CODEC_VOLUME("Ext Mic Capture Volume", 0x1a, 0x01, HDA_INPUT), + HDA_CODEC_MUTE("Ext Mic Capture Switch", 0x1a, 0x01, HDA_INPUT), + HDA_CODEC_VOLUME("PCM Playback Volume", 0x17, 0x0, HDA_INPUT), + HDA_CODEC_MUTE("PCM Playback Switch", 0x17, 0x0, HDA_INPUT), + HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x17, 0x2, HDA_INPUT), + HDA_CODEC_MUTE("Int Mic Playback Switch", 0x17, 0x2, HDA_INPUT), + HDA_CODEC_VOLUME("Ext Mic Playback Volume", 0x17, 0x1, HDA_INPUT), + HDA_CODEC_MUTE("Ext Mic Playback Switch", 0x17, 0x1, HDA_INPUT), + HDA_BIND_VOL("Master Playback Volume", &cxt5045_hp_bind_master_vol), + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + .name = "Master Playback Switch", + .info = cxt_eapd_info, + .get = cxt_eapd_get, + .put = cxt5045_hp_master_sw_put, + .private_value = 0x10, + }, + + {} +}; + static struct hda_verb cxt5045_init_verbs[] = { /* Line in, Mic */ {0x12, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_IN }, @@ -841,6 +880,7 @@ enum { CXT5045_LAPTOP_MICSENSE, CXT5045_LAPTOP_HPMICSENSE, CXT5045_BENQ, + CXT5045_LAPTOP_HP530, #ifdef CONFIG_SND_DEBUG CXT5045_TEST, #endif @@ -852,6 +892,7 @@ static const char *cxt5045_models[CXT504 [CXT5045_LAPTOP_MICSENSE] = "laptop-micsense", [CXT5045_LAPTOP_HPMICSENSE] = "laptop-hpmicsense", [CXT5045_BENQ] = "benq", + [CXT5045_LAPTOP_HP530] = "laptop-hp530", #ifdef CONFIG_SND_DEBUG [CXT5045_TEST] = "test", #endif @@ -865,7 +906,7 @@ static struct snd_pci_quirk cxt5045_cfg_ SND_PCI_QUIRK(0x103c, 0x30bb, "HP DV8000", CXT5045_LAPTOP_HPSENSE), SND_PCI_QUIRK(0x103c, 0x30cd, "HP DV Series", CXT5045_LAPTOP_HPSENSE), SND_PCI_QUIRK(0x103c, 0x30cf, "HP DV9533EG", CXT5045_LAPTOP_HPSENSE), - SND_PCI_QUIRK(0x103c, 0x30d5, "HP 530", CXT5045_LAPTOP_HPSENSE), + SND_PCI_QUIRK(0x103c, 0x30d5, "HP 530", CXT5045_LAPTOP_HP530), SND_PCI_QUIRK(0x103c, 0x30d9, "HP Spartan", CXT5045_LAPTOP_HPSENSE), SND_PCI_QUIRK(0x152d, 0x0753, "Benq R55E", CXT5045_BENQ), SND_PCI_QUIRK(0x1734, 0x10ad, "Fujitsu Si1520", CXT5045_LAPTOP_MICSENSE), @@ -949,6 +990,14 @@ static int patch_cxt5045(struct hda_code spec->num_mixers = 2; codec->patch_ops.init = cxt5045_init; break; + case CXT5045_LAPTOP_HP530: + codec->patch_ops.unsol_event = cxt5045_hp_unsol_event; + spec->input_mux = &cxt5045_capture_source_hp530; + spec->num_init_verbs = 2; + spec->init_verbs[1] = cxt5045_hp_sense_init_verbs; + spec->mixers[0] = cxt5045_mixers_hp530; + codec->patch_ops.init = cxt5045_init; + break; #ifdef CONFIG_SND_DEBUG case CXT5045_TEST: spec->input_mux = &cxt5045_test_capture_source;

2 1

[alsa-devel] [PATCH] model for alc883 to support FUJITSU Pi2515
by Jiang zhe 06 Mar '08

06 Mar '08

Hi, Please refer to [0003800] on the alsa mantis. There is no suitable model for Pi2515. This model is to support it. Thanks! Best regards! Jiang,zhe Signed-off-by: Jiang zhe <zhe.jiang(a)intel.com> --- alsa-driver-hg20080306/alsa-kernel/pci/hda/patch_realtek.c 2008-03-05 09:00:08.000000000 +0800 +++ b/alsa-kernel/pci/hda/patch_realtek.c 2008-03-06 15:20:46.000000000 +0800 @@ -202,6 +202,7 @@ enum { ALC888_6ST_DELL, ALC883_MITAC, ALC883_CLEVO_M720R, + ALC883_FUJITSU_PI2515, ALC883_AUTO, ALC883_MODEL_LAST, }; @@ -6484,6 +6485,14 @@ static struct hda_input_mux alc883_lenov }, }; +static struct hda_input_mux alc883_fujitsu_pi2515_capture_source = { + .num_items = 2, + .items = { + { "Mic", 0x0 }, + { "Int Mic", 0x1 }, + }, +}; + #define alc883_mux_enum_info alc_mux_enum_info #define alc883_mux_enum_get alc_mux_enum_get /* ALC883 has the ALC882-type input selection */ @@ -6673,6 +6682,33 @@ static struct snd_kcontrol_new alc883_cl { } /* end */ }; +static struct snd_kcontrol_new alc883_2ch_fujitsu_pi2515_mixer[] = { + HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT), + HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT), + HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT), + HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT), + HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), + HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), + HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), + HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), + HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), + HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), + HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), + HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), + HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), + HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + /* .name = "Capture Source", */ + .name = "Input Source", + .count = 2, + .info = alc883_mux_enum_info, + .get = alc883_mux_enum_get, + .put = alc883_mux_enum_put, + }, + { } /* end */ +}; + static struct snd_kcontrol_new alc883_3ST_2ch_mixer[] = { HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), @@ -7220,6 +7256,20 @@ static struct hda_verb alc883_clevo_m720 { } /* end */ }; +static struct hda_verb alc883_2ch_fujitsu_pi2515_verbs[] = { + /* HP */ + {0x14, AC_VERB_SET_CONNECT_SEL, 0x00}, + {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, + /* Subwoofer */ + {0x15, AC_VERB_SET_CONNECT_SEL, 0x01}, + {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, + + /* enable unsolicited event */ + {0x14, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, + + { } /* end */ +}; + static struct hda_verb alc883_tagra_verbs[] = { {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, @@ -7423,6 +7473,25 @@ static void alc883_clevo_m720r_unsol_eve alc883_clevo_m720r_automute(codec); } +/* toggle speaker-output according to the hp-jack state */ +static void alc883_2ch_fujitsu_pi2515_automute(struct hda_codec *codec) +{ + unsigned int present; + unsigned char bits; + + present = snd_hda_codec_read(codec, 0x14, 0, + AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; + bits = present ? HDA_AMP_MUTE : 0; + snd_hda_codec_amp_stereo(codec, 0x15, HDA_OUTPUT, 0, + HDA_AMP_MUTE, bits); +} + +static void alc883_2ch_fujitsu_pi2515_unsol_event(struct hda_codec *codec, unsigned int res) +{ + if ((res >> 26) == ALC880_HP_EVENT) + alc883_2ch_fujitsu_pi2515_automute(codec); +} + static void alc883_haier_w66_automute(struct hda_codec *codec) { unsigned int present; @@ -7661,6 +7730,7 @@ static const char *alc883_models[ALC883_ [ALC888_6ST_DELL] = "6stack-dell", [ALC883_MITAC] = "mitac", [ALC883_CLEVO_M720R] = "clevo-m720r", + [ALC883_FUJITSU_PI2515] = "fujitsu-pi2515", [ALC883_AUTO] = "auto", }; @@ -7706,6 +7776,7 @@ static struct snd_pci_quirk alc883_cfg_t SND_PCI_QUIRK(0x1558, 0, "Clevo laptop", ALC883_LAPTOP_EAPD), SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch), SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION), + SND_PCI_QUIRK(0x1734, 0x1108, "Fujitsu AMILO Pi2515", ALC883_FUJITSU_PI2515), SND_PCI_QUIRK(0x17aa, 0x101e, "Lenovo 101e", ALC883_LENOVO_101E_2ch), SND_PCI_QUIRK(0x17aa, 0x2085, "Lenovo NB0763", ALC883_LENOVO_NB0763), SND_PCI_QUIRK(0x17aa, 0x3bfc, "Lenovo NB0763", ALC883_LENOVO_NB0763), @@ -7950,6 +8021,18 @@ static struct alc_config_preset alc883_p .unsol_event = alc883_mitac_unsol_event, .init_hook = alc883_mitac_automute, }, + [ALC883_FUJITSU_PI2515] = { + .mixers = { alc883_2ch_fujitsu_pi2515_mixer }, + .init_verbs = { alc883_init_verbs, alc883_2ch_fujitsu_pi2515_verbs}, + .num_dacs = ARRAY_SIZE(alc883_dac_nids), + .dac_nids = alc883_dac_nids, + .dig_out_nid = ALC883_DIGOUT_NID, + .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), + .channel_mode = alc883_3ST_2ch_modes, + .input_mux = &alc883_fujitsu_pi2515_capture_source, + .unsol_event = alc883_2ch_fujitsu_pi2515_unsol_event, + .init_hook = alc883_2ch_fujitsu_pi2515_automute, + }, };

2 1

[alsa-devel] [PATCH 4/5] asihpi: replace volatile with barriers
by Eliot Blennerhassett 06 Mar '08

06 Mar '08

Replace volatile with barriers where required. Other minor cleanups. Signed-off-by: Eliot Blennerhassett <linux(a)audioscience.com --- diff -r 6def4892d3f5 pci/asihpi/hpi6205.c --- a/pci/asihpi/hpi6205.c Mon Mar 03 11:05:48 2008 +0100 +++ b/pci/asihpi/hpi6205.c Thu Mar 06 12:21:54 2008 +1300 @@ -27,6 +27,7 @@ (C) Copyright AudioScience Inc. 1998-2003 *******************************************************************************/ #define SOURCEFILE_NAME "hpi6205.c" + #include "hpi.h" #include "hpidebug.h" #include "hpi6205.h" @@ -35,42 +36,42 @@ /*****************************************************************************/ /* HPI6205 specific error codes */ -#define HPI6205_ERROR_BASE 1000 -#define HPI6205_ERROR_MEM_ALLOC 1001 -#define HPI6205_ERROR_6205_NO_IRQ 1002 -#define HPI6205_ERROR_6205_INIT_FAILED 1003 +#define HPI6205_ERROR_BASE 1000 +/*#define HPI6205_ERROR_MEM_ALLOC 1001 */ +#define HPI6205_ERROR_6205_NO_IRQ 1002 +#define HPI6205_ERROR_6205_INIT_FAILED 1003 /*#define HPI6205_ERROR_MISSING_DSPCODE 1004 */ -#define HPI6205_ERROR_UNKNOWN_PCI_DEVICE 1005 -#define HPI6205_ERROR_6205_REG 1006 -#define HPI6205_ERROR_6205_DSPPAGE 1007 -#define HPI6205_ERROR_BAD_DSPINDEX 1008 -#define HPI6205_ERROR_C6713_HPIC 1009 -#define HPI6205_ERROR_C6713_HPIA 1010 -#define HPI6205_ERROR_C6713_PLL 1011 -#define HPI6205_ERROR_DSP_INTMEM 1012 -#define HPI6205_ERROR_DSP_EXTMEM 1013 -#define HPI6205_ERROR_DSP_PLD 1014 -#define HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT 1015 -#define HPI6205_ERROR_MSG_RESP_TIMEOUT 1016 -#define HPI6205_ERROR_6205_EEPROM 1017 -#define HPI6205_ERROR_DSP_EMIF 1018 +#define HPI6205_ERROR_UNKNOWN_PCI_DEVICE 1005 +#define HPI6205_ERROR_6205_REG 1006 +#define HPI6205_ERROR_6205_DSPPAGE 1007 +#define HPI6205_ERROR_BAD_DSPINDEX 1008 +#define HPI6205_ERROR_C6713_HPIC 1009 +#define HPI6205_ERROR_C6713_HPIA 1010 +#define HPI6205_ERROR_C6713_PLL 1011 +#define HPI6205_ERROR_DSP_INTMEM 1012 +#define HPI6205_ERROR_DSP_EXTMEM 1013 +#define HPI6205_ERROR_DSP_PLD 1014 +#define HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT 1015 +#define HPI6205_ERROR_MSG_RESP_TIMEOUT 1016 +#define HPI6205_ERROR_6205_EEPROM 1017 +#define HPI6205_ERROR_DSP_EMIF 1018 #define Hpi6205_Error(nDspIndex, err) (err) /*****************************************************************************/ /* for C6205 PCI i/f */ /* Host Status Register (HSR) bitfields */ -#define C6205_HSR_INTSRC 0x01 -#define C6205_HSR_INTAVAL 0x02 -#define C6205_HSR_INTAM 0x04 -#define C6205_HSR_CFGERR 0x08 -#define C6205_HSR_EEREAD 0x10 +#define C6205_HSR_INTSRC 0x01 +#define C6205_HSR_INTAVAL 0x02 +#define C6205_HSR_INTAM 0x04 +#define C6205_HSR_CFGERR 0x08 +#define C6205_HSR_EEREAD 0x10 /* Host-to-DSP Control Register (HDCR) bitfields */ -#define C6205_HDCR_WARMRESET 0x01 -#define C6205_HDCR_DSPINT 0x02 -#define C6205_HDCR_PCIBOOT 0x04 +#define C6205_HDCR_WARMRESET 0x01 +#define C6205_HDCR_DSPINT 0x02 +#define C6205_HDCR_PCIBOOT 0x04 /* DSP Page Register (DSPP) bitfields, */ /* defines 4 Mbyte page that BAR0 points to */ -#define C6205_DSPP_MAP1 0x400 +#define C6205_DSPP_MAP1 0x400 /* BAR0 maps to prefetchable 4 Mbyte memory block set by DSPP. * BAR1 maps to non-prefetchable 8 Mbyte memory block @@ -79,7 +80,7 @@ * needs to be added to the BAR1 base address set in the PCI config reg */ #define C6205_BAR1_PCI_IO_OFFSET (0x027FFF0L) -#define C6205_BAR1_HSR (C6205_BAR1_PCI_IO_OFFSET) +#define C6205_BAR1_HSR (C6205_BAR1_PCI_IO_OFFSET) #define C6205_BAR1_HDCR (C6205_BAR1_PCI_IO_OFFSET+4) #define C6205_BAR1_DSPP (C6205_BAR1_PCI_IO_OFFSET+8) @@ -87,23 +88,23 @@ #define C6205_BAR0_TIMER1_CTL (0x01980000L) /* For first 6713 in CE1 space, using DA17,16,2 */ -#define HPICL_ADDR 0x01400000L -#define HPICH_ADDR 0x01400004L -#define HPIAL_ADDR 0x01410000L -#define HPIAH_ADDR 0x01410004L -#define HPIDIL_ADDR 0x01420000L -#define HPIDIH_ADDR 0x01420004L -#define HPIDL_ADDR 0x01430000L -#define HPIDH_ADDR 0x01430004L - -#define C6713_EMIF_GCTL 0x01800000 -#define C6713_EMIF_CE1 0x01800004 -#define C6713_EMIF_CE0 0x01800008 -#define C6713_EMIF_CE2 0x01800010 -#define C6713_EMIF_CE3 0x01800014 -#define C6713_EMIF_SDRAMCTL 0x01800018 -#define C6713_EMIF_SDRAMTIMING 0x0180001C -#define C6713_EMIF_SDRAMEXT 0x01800020 +#define HPICL_ADDR 0x01400000L +#define HPICH_ADDR 0x01400004L +#define HPIAL_ADDR 0x01410000L +#define HPIAH_ADDR 0x01410004L +#define HPIDIL_ADDR 0x01420000L +#define HPIDIH_ADDR 0x01420004L +#define HPIDL_ADDR 0x01430000L +#define HPIDH_ADDR 0x01430004L + +#define C6713_EMIF_GCTL 0x01800000 +#define C6713_EMIF_CE1 0x01800004 +#define C6713_EMIF_CE0 0x01800008 +#define C6713_EMIF_CE2 0x01800010 +#define C6713_EMIF_CE3 0x01800014 +#define C6713_EMIF_SDRAMCTL 0x01800018 +#define C6713_EMIF_SDRAMTIMING 0x0180001C +#define C6713_EMIF_SDRAMEXT 0x01800020 struct hpi_hw_obj { /* PCI registers */ @@ -114,7 +115,7 @@ struct hpi_hw_obj { u32 dwDspPage; struct consistent_dma_area hLockedMem; - volatile struct bus_master_interface *pInterfaceBuffer; + struct bus_master_interface *pInterfaceBuffer; u16 flagOStreamJustReset[HPI_MAX_STREAMS]; /* a non-NULL handle means there is an HPI allocated buffer */ @@ -134,6 +135,17 @@ struct hpi_hw_obj { /* local prototypes */ #define CheckBeforeBBMCopy(status, pBBMData, lFirstWrite, lSecondWrite) + +static int WaitDspAck( + struct hpi_hw_obj *pHw6205, + int state, + int timeout_us +); + +static void SendDspCommand( + struct hpi_hw_obj *pHw6205, + int cmd +); static u16 Hpi6205_AdapterBootLoadDsp( struct hpi_adapter_obj *pao, @@ -312,11 +324,13 @@ static void ControlMessage( switch (phm->wFunction) { case HPI_CONTROL_GET_STATE: - if (pao->wHasControlCache) + if (pao->wHasControlCache) { + rmb(); /* make sure we see updates DMAed from DSP */ if (HpiCheckControlCache (&pHw6205->pControlCache[phm->u.c. wControlIndex], phm, phr)) break; + } HW_Message(pao, phm, phr); break; case HPI_CONTROL_GET_INFO: @@ -597,7 +611,7 @@ static u16 CreateAdapterObj( ) { struct hpi_hw_obj *pHw6205 = pao->priv; - volatile struct bus_master_interface *interface; + struct bus_master_interface *interface; u32 dwPhysAddr; u32 dwTimeOut = HPI6205_TIMEOUT; u32 dwTemp1; @@ -631,6 +645,7 @@ static u16 CreateAdapterObj( HPI_DEBUG_LOG(DEBUG, "Interface buffer address %p\n", pHw6205->pInterfaceBuffer); + if (pHw6205->pInterfaceBuffer) { memset((void *)pHw6205->pInterfaceBuffer, 0, sizeof(struct bus_master_interface)); @@ -647,7 +662,7 @@ static u16 CreateAdapterObj( /* allow boot load even if mem alloc wont work */ if (!pHw6205->pInterfaceBuffer) - return (Hpi6205_Error(0, HPI6205_ERROR_MEM_ALLOC)); + return (Hpi6205_Error(0, HPI_ERROR_MEMORY_ALLOC)); interface = pHw6205->pInterfaceBuffer; @@ -671,14 +686,8 @@ static u16 CreateAdapterObj( iowrite32(C6205_HSR_INTSRC, pHw6205->prHSR); /* make sure the DSP has started ok */ - dwTimeOut = 100; - while ((interface->dwDspAck != H620_HIF_RESET) && dwTimeOut) { - dwTimeOut--; - HpiOs_DelayMicroSeconds(10000); - } - - if (dwTimeOut == 0) { - HPI_DEBUG_LOG(ERROR, "Timed out waiting ack \n"); + if (!WaitDspAck(pHw6205, H620_HIF_RESET, HPI6205_TIMEOUT)) { + HPI_DEBUG_LOG(ERROR, "Timed out waiting reset state \n"); return (Hpi6205_Error(0, HPI6205_ERROR_6205_INIT_FAILED)); } /* Note that *pao, *pHw6205 are zeroed after allocation, @@ -746,14 +755,7 @@ static u16 CreateAdapterObj( } } } - /* set interface to idle */ - interface->dwHostCmd = H620_HIF_IDLE; - /* interrupt the DSP again */ - dwTemp1 = ioread32(pHw6205->prHDCR); - dwTemp1 |= (u32)C6205_HDCR_DSPINT; - iowrite32(dwTemp1, pHw6205->prHDCR); - dwTemp1 &= ~(u32)C6205_HDCR_DSPINT; - iowrite32(dwTemp1, pHw6205->prHDCR); + SendDspCommand(pHw6205, H620_HIF_IDLE); { struct hpi_message hM; @@ -789,7 +791,7 @@ static u16 CreateAdapterObj( } HPI_DEBUG_LOG(VERBOSE, "Get adapter info OK\n"); - pao->wOpen = 0; /* upon creation the adapter is closed */ + pao->wOpen = 0; /* upon creation the adapter is closed */ HPI_DEBUG_LOG(INFO, "Bootload DSP OK\n"); return (0); @@ -872,8 +874,7 @@ static void OutStreamHostBufferAllocate( u32 dwCommand = phm->u.d.u.Buffer.dwCommand; /*u16 wStreamIndex = phm->u.d.wStreamIndex; */ struct hpi_hw_obj *pHw6205 = pao->priv; - volatile struct bus_master_interface *interface = - pHw6205->pInterfaceBuffer; + struct bus_master_interface *interface = pHw6205->pInterfaceBuffer; HPI_InitResponse(phr, phm->wObject, phm->wFunction, 0); @@ -941,7 +942,7 @@ static void OutStreamHostBufferAllocate( /* GRANT phase. Set up the BBM status, tell the DSP about the buffer so it can start using BBM. */ - volatile struct hostbuffer_status_6205 *status; + struct hostbuffer_status_6205 *status; if (phm->u.d.u.Buffer. dwBufferSize & (phm->u.d.u.Buffer.dwBufferSize - 1)) { @@ -1005,7 +1006,7 @@ static void OutStreamHostBufferFree( } static long OutStreamGetSpaceAvailable( - volatile struct hostbuffer_status_6205 *status + struct hostbuffer_status_6205 *status ) { return status->dwSizeInBytes - ((long)(status->dwHostIndex) - @@ -1019,9 +1020,8 @@ static void OutStreamWrite( ) { struct hpi_hw_obj *pHw6205 = pao->priv; - volatile struct bus_master_interface *interface = - pHw6205->pInterfaceBuffer; - volatile struct hostbuffer_status_6205 *status; + struct bus_master_interface *interface = pHw6205->pInterfaceBuffer; + struct hostbuffer_status_6205 *status; long dwSpaceAvailable; if (!pHw6205->OutStreamHostBufferSize[phm->u.d.wStreamIndex]) { /* there is no BBM buffer */ @@ -1126,9 +1126,8 @@ static void OutStreamGetInfo( ) { struct hpi_hw_obj *pHw6205 = pao->priv; - volatile struct bus_master_interface *interface = - pHw6205->pInterfaceBuffer; - volatile struct hostbuffer_status_6205 *status; + struct bus_master_interface *interface = pHw6205->pInterfaceBuffer; + struct hostbuffer_status_6205 *status; if (!pHw6205->OutStreamHostBufferSize[phm->u.d.wStreamIndex]) { HW_Message(pao, phm, phr); @@ -1188,13 +1187,13 @@ static void InStreamHostBufferAllocate( u16 err = 0; u32 dwCommand = phm->u.d.u.Buffer.dwCommand; struct hpi_hw_obj *pHw6205 = pao->priv; - volatile struct bus_master_interface *interface = - pHw6205->pInterfaceBuffer; + struct bus_master_interface *interface = pHw6205->pInterfaceBuffer; HPI_InitResponse(phr, phm->wObject, phm->wFunction, 0); if (dwCommand == HPI_BUFFER_CMD_EXTERNAL || dwCommand == HPI_BUFFER_CMD_INTERNAL_ALLOC) { + phm->u.d.u.Buffer.dwBufferSize = roundup_pow_of_two(phm->u.d.u.Buffer.dwBufferSize); phr->u.d.u.stream_info.dwDataAvailable = @@ -1247,7 +1246,7 @@ static void InStreamHostBufferAllocate( if (dwCommand == HPI_BUFFER_CMD_EXTERNAL || dwCommand == HPI_BUFFER_CMD_INTERNAL_GRANTADAPTER) { - volatile struct hostbuffer_status_6205 *status; + struct hostbuffer_status_6205 *status; if (phm->u.d.u.Buffer. dwBufferSize & (phm->u.d.u.Buffer.dwBufferSize - 1)) { @@ -1267,6 +1266,7 @@ static void InStreamHostBufferAllocate( status->dwDSPIndex = 0; status->dwHostIndex = status->dwDSPIndex; status->dwSizeInBytes = phm->u.d.u.Buffer.dwBufferSize; + HW_Message(pao, phm, phr); if (phr->wError && HpiOs_LockedMem_Valid(&pHw6205-> @@ -1297,10 +1297,10 @@ static void InStreamHostBufferFree( } if (dwCommand == HPI_BUFFER_CMD_EXTERNAL || - dwCommand == HPI_BUFFER_CMD_INTERNAL_FREE) { + dwCommand == HPI_BUFFER_CMD_INTERNAL_FREE) HpiOs_LockedMem_Free(&pHw6205-> InStreamHostBuffers[phm->u.d.wStreamIndex]); - } + } else { /* Should HPI_ERROR_INVALID_OPERATION be returned if no host buffer is allocated? */ @@ -1321,7 +1321,7 @@ static void InStreamStart( } static long InStreamGetBytesAvailable( - volatile struct hostbuffer_status_6205 *status + struct hostbuffer_status_6205 *status ) { return (long)(status->dwDSPIndex) - (long)(status->dwHostIndex); @@ -1334,9 +1334,8 @@ static void InStreamRead( ) { struct hpi_hw_obj *pHw6205 = pao->priv; - volatile struct bus_master_interface *interface = - pHw6205->pInterfaceBuffer; - volatile struct hostbuffer_status_6205 *status; + struct bus_master_interface *interface = pHw6205->pInterfaceBuffer; + struct hostbuffer_status_6205 *status; long dwDataAvailable; u8 *pBBMData; long lFirstRead; @@ -1387,9 +1386,8 @@ static void InStreamGetInfo( ) { struct hpi_hw_obj *pHw6205 = pao->priv; - volatile struct bus_master_interface *interface = - pHw6205->pInterfaceBuffer; - volatile struct hostbuffer_status_6205 *status; + struct bus_master_interface *interface = pHw6205->pInterfaceBuffer; + struct hostbuffer_status_6205 *status; if (!pHw6205->InStreamHostBufferSize[phm->u.d.wStreamIndex]) { HW_Message(pao, phm, phr); return; @@ -1451,7 +1449,7 @@ static u16 Hpi6205_AdapterBootLoadDsp( dwTemp = C6205_HDCR_WARMRESET; iowrite32(dwTemp, pHw6205->prHDCR); HpiOs_DelayMicroSeconds(1000); -/* for(i=0;i<1000; i++) dwTemp = ioread32(pao,pHw6205->prHDCR); */ +/* for(i=0;i<1000; i++) dwTemp = ioread32(pao,pHw6205->prHDCR); */ /* check that PCI i/f was configured by EEPROM */ dwTemp = ioread32(pHw6205->prHSR); @@ -1620,7 +1618,7 @@ static u16 Hpi6205_AdapterBootLoadDsp( if (pHw6205->pInterfaceBuffer) { /* we need to tell the card the physical PCI address */ u32 dwPhysicalPCIaddress; - volatile struct bus_master_interface *interface = + struct bus_master_interface *interface = pHw6205->pInterfaceBuffer; u32 dwHostMailboxAddressOnDsp; u32 dwPhysicalPCIaddressVerify = 0; @@ -1628,6 +1626,7 @@ static u16 Hpi6205_AdapterBootLoadDsp( /* set ack so we know when DSP is ready to go */ /* (dwDspAck will be changed to HIF_RESET) */ interface->dwDspAck = H620_HIF_UNKNOWN; + wmb(); /* ensure ack is written before dsp writes back */ err = HpiOs_LockedMem_GetPhysAddr(&pHw6205->hLockedMem, &dwPhysicalPCIaddress); @@ -1715,7 +1714,7 @@ static u16 BootLoader_WriteMem32( struct hpi_hw_obj *pHw6205 = pao->priv; u16 err = 0; __iomem u32 *pData; - /* u32 dwVerifyData=0; */ + /* u32 dwVerifyData=0; */ if (nDSPIndex == 0) { /* DSP 0 is always C6205 */ @@ -1771,8 +1770,8 @@ static u16 BootLoader_ConfigEMIF( /* Set the EMIF */ /* memory map of C6205 */ - /* 00000000-0000FFFF 16Kx32 internal program */ - /* 00400000-00BFFFFF CE0 2Mx32 SDRAM running @ 100MHz */ + /* 00000000-0000FFFF 16Kx32 internal program */ + /* 00400000-00BFFFFF CE0 2Mx32 SDRAM running @ 100MHz */ /* EMIF config */ /*------------ */ @@ -1899,7 +1898,7 @@ static u16 BootLoader_ConfigEMIF( BootLoader_WriteMem32(pao, nDSPIndex, 0x01B7C120, 0x8002); /* peri = 189/2 */ BootLoader_WriteMem32(pao, nDSPIndex, 0x01B7C11C, 0x8001); - /* cpu = 189/1 */ + /* cpu = 189/1 */ BootLoader_WriteMem32(pao, nDSPIndex, 0x01B7C118, 0x8000); HpiOs_DelayMicroSeconds(1000); /* ** SGT test to take GPO3 high when we start the PLL */ @@ -1980,15 +1979,15 @@ static u16 BootLoader_TestMemory( dwTestAddr); if (dwData != dwTestData) { HPI_DEBUG_LOG(VERBOSE, - "Memtest error details " + "Memtest error details " "%08x %08x %08x %i\n", dwTestAddr, dwTestData, dwData, nDSPIndex); return (1); /* error */ } dwTestData = dwTestData << 1; - } /* for(j) */ - } /* for(i) */ + } /* for(j) */ + } /* for(i) */ /* for the next 100 locations test each location, leaving it as zero */ /* write a zero to the next word in memory before we read */ @@ -2001,7 +2000,7 @@ static u16 BootLoader_TestMemory( dwData = BootLoader_ReadMem32(pao, nDSPIndex, dwTestAddr); if (dwData != dwTestData) { HPI_DEBUG_LOG(VERBOSE, - "Memtest error details " + "Memtest error details " "%08x %08x %08x %i\n", dwTestAddr, dwTestData, dwData, nDSPIndex); return (1); /* error */ @@ -2015,7 +2014,7 @@ static u16 BootLoader_TestMemory( dwTestAddr = dwStartAddress + (u32)i *4; BootLoader_WriteMem32(pao, nDSPIndex, dwTestAddr, 0x0); } - return (0); /*success! */ + return (0); /*success! */ } static u16 BootLoader_TestInternalMemory( @@ -2134,22 +2133,14 @@ static short Hpi6205_TransferData( /*u8 *pData =(u8 *)phm->u.d.u.Data.dwpbData; */ /*u16 wTimeOut=8; */ u16 err = 0; - u32 dwTimeOut, dwTemp1, dwTemp2; - volatile struct bus_master_interface *interface = - pHw6205->pInterfaceBuffer; + u32 dwTimeOut, dwTemp2; + struct bus_master_interface *interface = pHw6205->pInterfaceBuffer; dwDataSize &= ~3L; /* round dwDataSize down to nearest 4 bytes */ /* make sure state is IDLE */ - dwTimeOut = HPI6205_TIMEOUT; - dwTemp2 = 0; - while ((interface->dwDspAck != H620_HIF_IDLE) && dwTimeOut--) - HpiOs_DelayMicroSeconds(1); - - if (interface->dwDspAck != H620_HIF_IDLE) + if (!WaitDspAck(pHw6205, H620_HIF_IDLE, HPI6205_TIMEOUT)) return HPI_ERROR_DSP_HARDWARE; - - interface->dwHostCmd = nOperation; while (dwDataTransferred < dwDataSize) { u32 nThisCopy = dwDataSize - dwDataTransferred; @@ -2162,13 +2153,7 @@ static short Hpi6205_TransferData( &pData[dwDataTransferred], nThisCopy); interface->dwTransferSizeInBytes = nThisCopy; - - /* interrupt the DSP */ - dwTemp1 = ioread32(pHw6205->prHDCR); - dwTemp1 |= (u32)C6205_HDCR_DSPINT; - iowrite32(dwTemp1, pHw6205->prHDCR); - dwTemp1 &= ~(u32)C6205_HDCR_DSPINT; - iowrite32(dwTemp1, pHw6205->prHDCR); + SendDspCommand(pHw6205, nOperation); /* spin waiting on the result */ dwTimeOut = HPI6205_TIMEOUT; @@ -2212,20 +2197,55 @@ static short Hpi6205_TransferData( if (interface->dwDspAck != nOperation) HPI_DEBUG_LOG(DEBUG, "interface->dwDspAck=%d, expected %d\n", interface->dwDspAck, nOperation); - /* err=HPI_ERROR_DSP_HARDWARE; */ - - /* set interface back to idle */ - interface->dwHostCmd = H620_HIF_IDLE; - /* interrupt the DSP again */ - dwTemp1 = ioread32(pHw6205->prHDCR); - dwTemp1 |= (u32)C6205_HDCR_DSPINT; - iowrite32(dwTemp1, pHw6205->prHDCR); - dwTemp1 &= ~(u32)C6205_HDCR_DSPINT; - iowrite32(dwTemp1, pHw6205->prHDCR); + /* err=HPI_ERROR_DSP_HARDWARE; */ + + SendDspCommand(pHw6205, H620_HIF_IDLE); return err; } +/* wait for up to timeout_us microseconds for the DSP + to signal state by DMA into dwDspAck +*/ +static int WaitDspAck( + struct hpi_hw_obj *pHw6205, + int state, + int timeout_us +) +{ + struct bus_master_interface *interface = pHw6205->pInterfaceBuffer; + int t = timeout_us / 4; + + rmb(); /* ensure interface->dwDspAck is up to date */ + while ((interface->dwDspAck != state) && t--) { + HpiOs_DelayMicroSeconds(4); + rmb(); /* DSP changes dwDspAck by DMA */ + } + + /*HPI_DEBUG_LOG(VERBOSE, "Spun %d for %d\n", timeout_us/4-t, state); */ + return t; +} + +/* set the busmaster interface to cmd, then interrupt the DSP */ +static void SendDspCommand( + struct hpi_hw_obj *pHw6205, + int cmd +) +{ + struct bus_master_interface *interface = pHw6205->pInterfaceBuffer; + + u32 r; + + interface->dwHostCmd = cmd; + wmb(); /* DSP gets state by DMA, make sure it is written to memory */ + /* before we interrupt the DSP */ + r = ioread32(pHw6205->prHDCR); + r |= (u32)C6205_HDCR_DSPINT; + iowrite32(r, pHw6205->prHDCR); + r &= ~(u32)C6205_HDCR_DSPINT; + iowrite32(r, pHw6205->prHDCR); +} + static unsigned int messageCount; static u16 Hpi6205_MessageResponseSequence( @@ -2234,46 +2254,26 @@ static u16 Hpi6205_MessageResponseSequen struct hpi_response *phr ) { - u32 dwTemp1, dwTemp2, dwTimeOut, dwTimeOut2; + u32 dwTemp2, dwTimeOut, dwTimeOut2; struct hpi_hw_obj *pHw6205 = pao->priv; - volatile struct bus_master_interface *interface = - pHw6205->pInterfaceBuffer; + struct bus_master_interface *interface = pHw6205->pInterfaceBuffer; u16 err = 0; messageCount++; /* Assume buffer of type struct bus_master_interface is allocated "noncacheable" */ - /* make sure state is IDLE */ - dwTimeOut = HPI6205_TIMEOUT; - dwTemp2 = 0; - while ((interface->dwDspAck != H620_HIF_IDLE) && --dwTimeOut) - HpiOs_DelayMicroSeconds(1); - - if (dwTimeOut == 0) { + if (!WaitDspAck(pHw6205, H620_HIF_IDLE, HPI6205_TIMEOUT)) { HPI_DEBUG_LOG(DEBUG, "Timeout waiting for idle\n"); return (Hpi6205_Error (0, HPI6205_ERROR_MSG_RESP_IDLE_TIMEOUT)); } interface->u.MessageBuffer = *phm; /* signal we want a response */ - interface->dwHostCmd = H620_HIF_GET_RESP; - - /* interrupt the DSP */ - dwTemp1 = ioread32(pHw6205->prHDCR); - dwTemp1 |= (u32)C6205_HDCR_DSPINT; - HpiOs_DelayMicroSeconds(1); - iowrite32(dwTemp1, pHw6205->prHDCR); - dwTemp1 &= ~(u32)C6205_HDCR_DSPINT; - iowrite32(dwTemp1, pHw6205->prHDCR); - - /* spin waiting on state change (start of msg process) */ - dwTimeOut2 = HPI6205_TIMEOUT; - dwTemp2 = 0; - while ((interface->dwDspAck != H620_HIF_GET_RESP) && --dwTimeOut2) { - dwTemp2 = ioread32(pHw6205->prHSR); - dwTemp2 &= C6205_HSR_INTSRC; - } + SendDspCommand(pHw6205, H620_HIF_GET_RESP); + + dwTimeOut2 = WaitDspAck(pHw6205, H620_HIF_GET_RESP, HPI6205_TIMEOUT); + if (dwTimeOut2 == 0) { HPI_DEBUG_LOG(DEBUG, "(%u)Timed out waiting for " @@ -2284,16 +2284,16 @@ static u16 Hpi6205_MessageResponseSequen "(%u)Transition to GET_RESP after %u\n", messageCount, HPI6205_TIMEOUT - dwTimeOut2); } - /* spin waiting on HIF interrupt flag (end of msg process) */ dwTimeOut = HPI6205_TIMEOUT; dwTemp2 = 0; while ((dwTemp2 == 0) && --dwTimeOut) { dwTemp2 = ioread32(pHw6205->prHSR); dwTemp2 &= C6205_HSR_INTSRC; - /* HpiOs_DelayMicroSeconds(5); */ + HpiOs_DelayMicroSeconds(1); } if (dwTemp2 == C6205_HSR_INTSRC) { + rmb(); /* ensure we see latest value for dwDspAck */ if ((interface->dwDspAck != H620_HIF_GET_RESP)) { HPI_DEBUG_LOG(DEBUG, "(%u)interface->dwDspAck(0x%x) != " @@ -2306,12 +2306,12 @@ static u16 Hpi6205_MessageResponseSequen messageCount, HPI6205_TIMEOUT - dwTimeOut); } - } -/* need to handle this differently... */ - else + } else { + /* can we do anything else in response to the error ? */ HPI_DEBUG_LOG(ERROR, "Interrupt from HIF module BAD (wFunction %x)\n", phm->wFunction); + } /* reset the interrupt from the DSP */ iowrite32(C6205_HSR_INTSRC, pHw6205->prHSR); @@ -2321,15 +2321,8 @@ static u16 Hpi6205_MessageResponseSequen *phr = interface->u.ResponseBuffer; /* set interface back to idle */ - interface->dwHostCmd = H620_HIF_IDLE; - /* interrupt the DSP again */ - dwTemp1 = ioread32(pHw6205->prHDCR); - dwTemp1 |= (u32)C6205_HDCR_DSPINT; - iowrite32(dwTemp1, pHw6205->prHDCR); - dwTemp1 &= ~(u32)C6205_HDCR_DSPINT; - iowrite32(dwTemp1, pHw6205->prHDCR); - -/* EWB move timeoutcheck to after IDLE command, maybe recover? */ + SendDspCommand(pHw6205, H620_HIF_IDLE); + if ((dwTimeOut == 0) || (dwTimeOut2 == 0)) { HPI_DEBUG_LOG(DEBUG, "Something timed out!\n"); return Hpi6205_Error(0, HPI6205_ERROR_MSG_RESP_TIMEOUT); @@ -2337,13 +2330,7 @@ static u16 Hpi6205_MessageResponseSequen /* special case for adapter close - */ /* wait for the DSP to indicate it is idle */ if (phm->wFunction == HPI_ADAPTER_CLOSE) { - /* make sure state is IDLE */ - dwTimeOut = HPI6205_TIMEOUT; - dwTemp2 = 0; - while ((interface->dwDspAck != H620_HIF_IDLE) && --dwTimeOut) - HpiOs_DelayMicroSeconds(1); - - if (dwTimeOut == 0) { + if (!WaitDspAck(pHw6205, H620_HIF_IDLE, HPI6205_TIMEOUT)) { HPI_DEBUG_LOG(DEBUG, "Timeout waiting for idle " "(on AdapterClose)\n"); diff -r 6def4892d3f5 pci/asihpi/hpicmn.c --- a/pci/asihpi/hpicmn.c Mon Mar 03 11:05:48 2008 +0100 +++ b/pci/asihpi/hpicmn.c Thu Mar 06 12:21:31 2008 +1300 @@ -148,7 +148,7 @@ static void SubSysGetAdapters( /* input: NONE */ /* output: wNumAdapters */ - /* awAdapter[] */ + /* awAdapter[] */ /* */ short i; @@ -178,7 +178,7 @@ static void SubSysGetAdapters( * It returns nonzero if a cache hit occurred, zero otherwise. */ short HpiCheckControlCache( - volatile struct hpi_control_cache_single *pC, + struct hpi_control_cache_single *pC, struct hpi_message *phm, struct hpi_response *phr ) @@ -301,7 +301,7 @@ Multiplexer does so use sent values Multiplexer does so use sent values */ void HpiSyncControlCache( - volatile struct hpi_control_cache_single *pC, + struct hpi_control_cache_single *pC, struct hpi_message *phm, struct hpi_response *phr ) diff -r 6def4892d3f5 pci/asihpi/hpicmn.h --- a/pci/asihpi/hpicmn.h Mon Mar 03 11:05:48 2008 +0100 +++ b/pci/asihpi/hpicmn.h Thu Mar 06 12:21:30 2008 +1300 @@ -44,12 +44,12 @@ void HpiDeleteAdapter( ); short HpiCheckControlCache( - volatile struct hpi_control_cache_single *pC, + struct hpi_control_cache_single *pC, struct hpi_message *phm, struct hpi_response *phr ); void HpiSyncControlCache( - volatile struct hpi_control_cache_single *pC, + struct hpi_control_cache_single *pC, struct hpi_message *phm, struct hpi_response *phr );

1 0

[alsa-devel] [PATCH 1/5] asihpi: minor checkpatch cleanups
by Eliot Blennerhassett 06 Mar '08

06 Mar '08

A few minor checkpatch cleanups. Make hpi ioctl cmd unique. Signed-off-by: Eliot Blennerhassett <linux(a)audioscience.com> --- diff -r 6def4892d3f5 pci/asihpi/hpi6000.c --- a/pci/asihpi/hpi6000.c Mon Mar 03 11:05:48 2008 +0100 +++ b/pci/asihpi/hpi6000.c Wed Mar 05 21:59:25 2008 +1300 @@ -923,15 +923,15 @@ static short Hpi6000_AdapterBootLoadDsp( 0 - 1 - 2 - - 3 CLK2EN=1 CLKOUT2 enabled - 4 CLK1EN=0 CLKOUT1 disabled - 5 EKEN=1 <----------------!! C6713 specific, enables ECLKOUT + 3 CLK2EN = 1 CLKOUT2 enabled + 4 CLK1EN = 0 CLKOUT1 disabled + 5 EKEN = 1 <--!! C6713 specific, enables ECLKOUT 6 - - 7 NOHOLD=1 external HOLD disabled - 8 HOLDA=0 HOLDA output is low - 9 HOLD=0 HOLD input is low - 10 ARDY=1 ARDY input is high - 11 BUSREQ=0 BUSREQ output is low + 7 NOHOLD = 1 external HOLD disabled + 8 HOLDA = 0 HOLDA output is low + 9 HOLD = 0 HOLD input is low + 10 ARDY = 1 ARDY input is high + 11 BUSREQ = 0 BUSREQ output is low 12,13 Reserved = 1 */ HpiWriteWord(pdo, 0x01800000, 0x34A8); @@ -952,12 +952,12 @@ static short Hpi6000_AdapterBootLoadDsp( /* EMIF SDRAM Extension 31-21 0 20 WR2RD = 0 - 19-18 WR2DEAC=1 - 17 WR2WR=0 - 16-15 R2WDQM=2 - 14-12 RD2WR=4 - 11-10 RD2DEAC=1 - 9 RD2RD= 1 + 19-18 WR2DEAC = 1 + 17 WR2WR = 0 + 16-15 R2WDQM = 2 + 14-12 RD2WR = 4 + 11-10 RD2DEAC = 1 + 9 RD2RD = 1 8-7 THZP = 10b 6-5 TWR = 2-1 = 01b (tWR = 10ns) 4 TRRD = 0b = 2 ECLK (tRRD = 14ns) diff -r 6def4892d3f5 pci/asihpi/hpi6205.h --- a/pci/asihpi/hpi6205.h Mon Mar 03 11:05:48 2008 +0100 +++ b/pci/asihpi/hpi6205.h Wed Mar 05 22:06:08 2008 +1300 @@ -30,14 +30,14 @@ Copyright AudioScience, Inc., 2003 /*********************************************************** Defines used for basic messaging ************************************************************/ -#define H620_HIF_RESET 0 -#define H620_HIF_IDLE 1 -#define H620_HIF_GET_RESP 2 -#define H620_HIF_DATA_DONE 3 -#define H620_HIF_DATA_MASK 0x10 -#define H620_HIF_SEND_DATA 0x14 -#define H620_HIF_GET_DATA 0x15 -#define H620_HIF_UNKNOWN 0xffff +#define H620_HIF_RESET 0 +#define H620_HIF_IDLE 1 +#define H620_HIF_GET_RESP 2 +#define H620_HIF_DATA_DONE 3 +#define H620_HIF_DATA_MASK 0x10 +#define H620_HIF_SEND_DATA 0x14 +#define H620_HIF_GET_DATA 0x15 +#define H620_HIF_UNKNOWN 0xffff /*********************************************************** Types used for mixer control caching @@ -48,7 +48,7 @@ Copyright AudioScience, Inc., 2003 #define HPI_NMIXER_CONTROLS 2048 /********************************************************************* - This is used for background buffer bus mastering stream buffers. +This is used for background buffer bus mastering stream buffers. **********************************************************************/ struct hostbuffer_status_6205 { u32 dwSamplesProcessed; @@ -62,7 +62,7 @@ struct hostbuffer_status_6205 { }; /********************************************************************* - This is used for dynamic control cache allocation +This is used for dynamic control cache allocation **********************************************************************/ struct controlcache_6205 { u32 dwNumberOfControls; @@ -71,7 +71,7 @@ struct controlcache_6205 { }; /********************************************************************* - This is used for dynamic allocation of async event array +This is used for dynamic allocation of async event array **********************************************************************/ struct async_event_buffer_6205 { u32 dwPhysicalPCI32address; @@ -80,8 +80,8 @@ struct async_event_buffer_6205 { }; /*********************************************************** - The Host located memory buffer that the 6205 will bus master - in and out of. +The Host located memory buffer that the 6205 will bus master +in and out of. ************************************************************/ #define HPI6205_SIZEOF_DATA (16*1024) struct bus_master_interface { diff -r 6def4892d3f5 pci/asihpi/hpimsginit.c --- a/pci/asihpi/hpimsginit.c Mon Mar 03 11:05:48 2008 +0100 +++ b/pci/asihpi/hpimsginit.c Thu Mar 06 12:21:47 2008 +1300 @@ -29,7 +29,7 @@ static u16 aMsgSize[HPI_OBJ_MAXINDEX + 1 /* The actual response size for each object type */ static u16 aResSize[HPI_OBJ_MAXINDEX + 1] = HPI_RESPONSE_SIZE_BY_OBJECT; /* Flag to enable alternate message type for SSX2 bypass. */ -static u16 gwSSX2Bypass = 0; +static u16 gwSSX2Bypass; /** \internal * Used by ASIO driver to disable SSX2 for a single process diff -r 6def4892d3f5 pci/asihpi/hpios.h --- a/pci/asihpi/hpios.h Mon Mar 03 11:05:48 2008 +0100 +++ b/pci/asihpi/hpios.h Wed Mar 05 21:58:51 2008 +1300 @@ -27,13 +27,6 @@ HPI Operating System function declaratio #ifndef STR_SIZE #define STR_SIZE(a) (a) -#endif - -#ifndef __user -#define __user -#endif -#ifndef __iomem -#define __iomem #endif /* physical memory allocation */ diff -r 6def4892d3f5 pci/asihpi/hpios_linux_kernel.h --- a/pci/asihpi/hpios_linux_kernel.h Mon Mar 03 11:05:48 2008 +0100 +++ b/pci/asihpi/hpios_linux_kernel.h Wed Mar 05 21:59:18 2008 +1300 @@ -28,6 +28,7 @@ HPI Operating System Specific macros for #endif #include <asm/io.h> +#include <asm/system.h> #include <linux/ioctl.h> #include <linux/kernel.h> #include <linux/string.h> @@ -35,10 +36,7 @@ HPI Operating System Specific macros for #include <linux/firmware.h> #include <linux/interrupt.h> #include <linux/pci.h> - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2 , 5 , 0)) -# include <linux/device.h> -#endif +#include <linux/device.h> #define INLINE inline @@ -104,9 +102,8 @@ struct hpi_ioctl_linux { /* Conflict?: H is already used by a number of drivers hid, bluetooth hci, and some sound drivers sb16, hdsp, emu10k. AFAIK 0xFC is ununsed command +*/ #define HPI_IOCTL_LINUX _IOWR('H', 0xFC, struct hpi_ioctl_linux) -*/ -#define HPI_IOCTL_LINUX _IOWR('H', 1, struct hpi_ioctl_linux) #define HPI_DEBUG_FLAG_ERROR KERN_ERR #define HPI_DEBUG_FLAG_WARNING KERN_WARNING

1 0

[alsa-devel] sound/pci/au88x0/au88x0_core.c: incorrect for loop in vortex_mixer_init()
by Roel Kluin 05 Mar '08

05 Mar '08

in sound/pci/au88x0/au88x0_core.c:430 (linus' tree) it reads in commented code: for (x = 0; x > 0x80; x++) { Not sure whether this is important but it appears to be incorrect. should it be 'x < 0x80' ?

1 0

[alsa-devel] volume control
by Reiner 05 Mar '08

05 Mar '08

Hello, is there a function available to control the volume of playback? Thanks Reiner

1 0

[alsa-devel] Alsa MMAP emulation
by Mathieu Monney 05 Mar '08

05 Mar '08

Hi, I'm trying to get working Alsa with the PortAudio library on an embedded device (Nokia N810). The problem is that the sound driver is not an hardware driver for Alsa but a plugin which deals with the internal DSP of the device. This plugin doesn't support mmap'ing at all. So I was wondering if it is possible to configure Alsa a way such PortAudio can use mmap'ing on my DSP plugin ? I saw there is a mmap_emulation flag but the problem is that it seems to be only available on HW driver and not on alsa plugins. Any clues ? Thank you in advance Mathieu

3 3

[alsa-devel] HDMI v. ICH8 on Dell XPS M1330
by Armando Di Cianno 05 Mar '08

05 Mar '08

I figured this was more appropriate for devel, and not user. Sorry, if that's wrong. First, I'm using the 1.0.16 release tarballs. They work better than the in-kernel drivers, as they survive both suspend and hibernate, whereas the kernel drivers do not. I'm eager to see audio over HDMI working on my Dell XPS M1330. I'm pretty sure that this is /not supported/ at the moment -- if this isn't the case, please stop reading, and let me know the particulars. HDMI seems to be supported noted, but mainly for the ATI chips. I'm pretty sure the m1330 has a STAC9228 setup. None of the suggested model= module parameters succeeded in getting audio over HDMI, beyond what is autodetected without any parameter specified. model=5stack seems to show a digital SPDIF device added. If there is anyway I can help the core developers get HDMI audio working, I would be glad to help. I will post all the relevant information I can think of following; please let me know if other information would be helpful. I will gladly turn on any excessive debugging options needed. I am an ALSA n00b, but I will happily do any required work that I can do from this end. Thanks! -- Armando Di Cianno http://dicianno.org/blog armando(a)dicianno.org armando(a)goodship.net w/o model= parameter # aplay -l **** List of PLAYBACK Hardware Devices **** card 0: Intel [HDA Intel], device 0: STAC92xx Analog [STAC92xx Analog] Subdevices: 1/1 w/ model=5stack # aplay -l **** List of PLAYBACK Hardware Devices **** card 0: Intel [HDA Intel], device 0: STAC92xx Analog [STAC92xx Analog] Subdevices: 1/1 Subdevice #0: subdevice #0 card 0: Intel [HDA Intel], device 1: STAC92xx Digital [STAC92xx Digital] Subdevices: 1/1 Subdevice #0: subdevice #0 # lspci -nvvvv -d 8086:284b 00:1b.0 0403: 8086:284b (rev 02) Subsystem: 1028:0209 Control: I/O- Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR+ FastB2B- DisINTx- Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0, Cache Line Size: 64 bytes Interrupt: pin A routed to IRQ 21 Region 0: Memory at febfc000 (64-bit, non-prefetchable) [size=16K] Capabilities: [50] Power Management version 2 Flags: PMEClk- DSI- D1- D2- AuxCurrent=55mA PME(D0+,D1-,D2-,D3hot +,D3cold+) Status: D0 PME-Enable- DSel=0 DScale=0 PME- Capabilities: [60] Message Signalled Interrupts: Mask- 64bit+ Queue=0/0 Enable- Address: 0000000000000000 Data: 0000 Capabilities: [70] Express (v1) Root Complex Integrated Endpoint, MSI 00 DevCap: MaxPayload 128 bytes, PhantFunc 0, Latency L0s unlimited, L1 unlimited ExtTag- RBE- FLReset- DevCtl: Report errors: Correctable- Non-Fatal- Fatal- Unsupported- RlxdOrd- ExtTag- PhantFunc- AuxPwr- NoSnoop+ MaxPayload 128 bytes, MaxReadReq 128 bytes DevSta: CorrErr- UncorrErr- FatalErr- UnsuppReq- AuxPwr+ TransPend- LnkCap: Port #0, Speed unknown, Width x0, ASPM unknown, Latency L0 <64ns, L1 <1us ClockPM- Suprise- LLActRep- BwNot- LnkCtl: ASPM Disabled; Disabled- Retrain- CommClk- ExtSynch- ClockPM- AutWidDis- BWInt- AutBWInt- LnkSta: Speed unknown, Width x0, TrErr- Train- SlotClk- DLActive- BWMgmt- ABWMgmt- Capabilities: [100] Virtual Channel <?> Capabilities: [130] Root Complex Link <?> Kernel driver in use: HDA Intel Kernel modules: snd-hda-intel

6 20

[alsa-devel] [PATCH] model for alc883 to support M720R
by Jiang zhe 04 Mar '08

04 Mar '08

Hi, Please refer to [0003781] on the alsa mantis. There is no suitable model for M720R. This patch is to support HP jack-sensing and mixer. The reporter complained that there was a constant noise when he recorded from Mic, It existed even after he muted the input. I checked the codec info carefully, the input widget was muted indeed. It's strange, Is there anything special for this codec? Thanks! Signed-off-by: Jiang zhe <zhe.jiang(a)intel.com> --- alsa-driver-hg20080304/alsa-kernel/pci/hda/patch_realtek.c 2008-03-01 09:00:07.000000000 +0800 +++ b/alsa-kernel/pci/hda/patch_realtek.c 2008-03-04 16:49:09.000000000 +0800 @@ -201,6 +201,7 @@ enum { ALC888_3ST_HP, ALC888_6ST_DELL, ALC883_MITAC, + ALC883_CLEVO_M720R, ALC883_AUTO, ALC883_MODEL_LAST, }; @@ -6645,6 +6646,33 @@ static struct snd_kcontrol_new alc883_mi { } /* end */ }; +static struct snd_kcontrol_new alc883_clevo_m720r_mixer[] = { + HDA_CODEC_VOLUME("Headphone Playback Volume", 0x0c, 0x0, HDA_OUTPUT), + HDA_BIND_MUTE("Headphone Playback Switch", 0x0c, 2, HDA_INPUT), + HDA_CODEC_VOLUME("Speaker Playback Volume", 0x0d, 0x0, HDA_OUTPUT), + HDA_BIND_MUTE("Speaker Playback Switch", 0x0d, 2, HDA_INPUT), + HDA_CODEC_VOLUME("Mic Playback Volume", 0x0b, 0x0, HDA_INPUT), + HDA_CODEC_VOLUME("Mic Boost", 0x18, 0, HDA_INPUT), + HDA_CODEC_MUTE("Mic Playback Switch", 0x0b, 0x0, HDA_INPUT), + HDA_CODEC_VOLUME("Int Mic Playback Volume", 0x0b, 0x1, HDA_INPUT), + HDA_CODEC_VOLUME("Int Mic Boost", 0x19, 0, HDA_INPUT), + HDA_CODEC_MUTE("Int Mic Playback Switch", 0x0b, 0x1, HDA_INPUT), + HDA_CODEC_VOLUME("Capture Volume", 0x08, 0x0, HDA_INPUT), + HDA_CODEC_MUTE("Capture Switch", 0x08, 0x0, HDA_INPUT), + HDA_CODEC_VOLUME_IDX("Capture Volume", 1, 0x09, 0x0, HDA_INPUT), + HDA_CODEC_MUTE_IDX("Capture Switch", 1, 0x09, 0x0, HDA_INPUT), + { + .iface = SNDRV_CTL_ELEM_IFACE_MIXER, + /* .name = "Capture Source", */ + .name = "Input Source", + .count = 2, + .info = alc883_mux_enum_info, + .get = alc883_mux_enum_get, + .put = alc883_mux_enum_put, + }, + { } /* end */ +}; + static struct snd_kcontrol_new alc883_3ST_2ch_mixer[] = { HDA_CODEC_VOLUME("Front Playback Volume", 0x0c, 0x0, HDA_OUTPUT), HDA_BIND_MUTE("Front Playback Switch", 0x0c, 2, HDA_INPUT), @@ -7178,6 +7206,20 @@ static struct hda_verb alc883_mitac_verb { } /* end */ }; +static struct hda_verb alc883_clevo_m720r_verbs[] = { + /* HP */ + {0x15, AC_VERB_SET_CONNECT_SEL, 0x00}, + {0x15, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_HP}, + /* Int speaker */ + {0x14, AC_VERB_SET_CONNECT_SEL, 0x01}, + {0x14, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT}, + + /* enable unsolicited event */ + {0x15, AC_VERB_SET_UNSOLICITED_ENABLE, ALC880_HP_EVENT | AC_USRSP_EN}, + + { } /* end */ +}; + static struct hda_verb alc883_tagra_verbs[] = { {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(0)}, {0x0c, AC_VERB_SET_AMP_GAIN_MUTE, AMP_IN_UNMUTE(1)}, @@ -7361,6 +7403,25 @@ static void alc883_tagra_unsol_event(str alc883_tagra_automute(codec); } +/* toggle speaker-output according to the hp-jack state */ +static void alc883_clevo_m720r_automute(struct hda_codec *codec) +{ + unsigned int present; + unsigned char bits; + + present = snd_hda_codec_read(codec, 0x15, 0, + AC_VERB_GET_PIN_SENSE, 0) & 0x80000000; + bits = present ? HDA_AMP_MUTE : 0; + snd_hda_codec_amp_stereo(codec, 0x14, HDA_OUTPUT, 0, + HDA_AMP_MUTE, bits); +} + +static void alc883_clevo_m720r_unsol_event(struct hda_codec *codec, unsigned int res) +{ + if ((res >> 26) == ALC880_HP_EVENT) + alc883_clevo_m720r_automute(codec); +} + static void alc883_haier_w66_automute(struct hda_codec *codec) { unsigned int present; @@ -7598,6 +7659,7 @@ static const char *alc883_models[ALC883_ [ALC888_3ST_HP] = "3stack-hp", [ALC888_6ST_DELL] = "6stack-dell", [ALC883_MITAC] = "mitac", + [ALC883_CLEVO_M720R] = "clevo-m720r", [ALC883_AUTO] = "auto", }; @@ -7638,6 +7700,7 @@ static struct snd_pci_quirk alc883_cfg_t SND_PCI_QUIRK(0x1462, 0x7327, "MSI", ALC883_6ST_DIG), SND_PCI_QUIRK(0x1462, 0xa422, "MSI", ALC883_TARGA_2ch_DIG), SND_PCI_QUIRK(0x147b, 0x1083, "Abit IP35-PRO", ALC883_6ST_DIG), + SND_PCI_QUIRK(0x1558, 0x0721, "Clevo laptop M720R", ALC883_CLEVO_M720R), SND_PCI_QUIRK(0x1558, 0, "Clevo laptop", ALC883_LAPTOP_EAPD), SND_PCI_QUIRK(0x15d9, 0x8780, "Supermicro PDSBA", ALC883_3ST_6ch), SND_PCI_QUIRK(0x161f, 0x2054, "Medion laptop", ALC883_MEDION), @@ -7780,6 +7843,18 @@ static struct alc_config_preset alc883_p .channel_mode = alc883_3ST_2ch_modes, .input_mux = &alc883_capture_source, }, + [ALC883_CLEVO_M720R] = { + .mixers = { alc883_clevo_m720r_mixer }, + .init_verbs = { alc883_init_verbs, alc883_clevo_m720r_verbs }, + .num_dacs = ARRAY_SIZE(alc883_dac_nids), + .dac_nids = alc883_dac_nids, + .dig_out_nid = ALC883_DIGOUT_NID, + .num_channel_mode = ARRAY_SIZE(alc883_3ST_2ch_modes), + .channel_mode = alc883_3ST_2ch_modes, + .input_mux = &alc883_capture_source, + .unsol_event = alc883_clevo_m720r_unsol_event, + .init_hook = alc883_clevo_m720r_automute, + }, [ALC883_LENOVO_101E_2ch] = { .mixers = { alc883_lenovo_101e_2ch_mixer}, .init_verbs = { alc883_init_verbs, alc883_lenovo_101e_verbs},

3 4

[alsa-devel] Driver recovers from underrun in plain ALSA mode, but not in OSS emulation
by Timur Tabi 04 Mar '08

04 Mar '08

I'm stress-testing my sound driver using mplayer to see how it handles underrun during jumps in CPU loads. That is, I start playing a movie, and then I cause the CPU to jump to 100%, and then I drop the CPU back to normal. During the times when the CPU is at 100%, I get underruns and other problems. That's normal. When I tell mplayer to use the ALSA API, my driver recovers nicely from an underrun situation when the CPU load drops back to normal. However, if I tell mplayer to use the OSS API (i.e. ALSA's OSS emulation), it does not recover from an underrun situation. The audio and video playback remains distorted. I need to tell mplayer to pause and resume to get it to recover. Is this normal for ALSA drivers? Before I try to debug this problem the hard way, I want to know if this could be the result of a common programming mistake in my driver or something like similar. (FYI, the source code for my driver is in sound/soc/fsl/) -- Timur Tabi Linux kernel developer at Freescale

2 3