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

[alsa-devel] snd_pcm_open device names
by Reiner 06 Mar '08

06 Mar '08

with snd_pcm_open (handle, "default", SND_PCM_STREAM_PLAYBACK, 0) I can open a device twice with snd_pcm_open (handle, "plughw:0,0", SND_PCM_STREAM_PLAYBACK, 0) the 2. call fails with error -16. The docu says: The default device is equal to plug plugin with hw plugin as slave. ???? Reiner

3 3

[alsa-devel] [PATCH] Support for playing WAV files with "extensible format" header using aplay.
by Pawel MOLL 06 Mar '08

06 Mar '08

Support for playing WAV files with "extensible format" header using aplay. WAV files with more than 2 channels or with more than 16 bits per samples can be saved with "extensible format" chunk (see http://msdn2.microsoft.com/en-us/library/ms713496(VS.85).aspx). For instance, sox, when converting data to 24- or 32-bits per sample format uses this format, and aplay was unable to play such file. Now the problem is solved :-) Signed-off-by: Pawel MOLL <pawel.moll(a)st.com> --- diff -r 9c822ff3e9b9 aplay/aplay.c --- a/aplay/aplay.c Thu Feb 21 09:12:53 2008 +0100 +++ b/aplay/aplay.c Thu Mar 06 14:25:52 2008 +0000 @@ -745,16 +745,29 @@ static ssize_t test_wavefile(int fd, u_c check_wavefile_space(buffer, len, blimit); test_wavefile_read(fd, buffer, &size, len, __LINE__); f = (WaveFmtBody*) buffer; + if (LE_SHORT(f->format) == WAV_FMT_EXTENSIBLE) { + WaveFmtExtensibleBody *fe = (WaveFmtExtensibleBody*)buffer; + if (len < sizeof(WaveFmtExtensibleBody)) { + error(_("unknown length of extensible 'fmt ' chunk (read %u, should be %u at least)"), + len, (u_int)sizeof(WaveFmtExtensibleBody)); + exit(EXIT_FAILURE); + } + if (memcmp(fe->guid_tag, WAV_GUID_TAG, 14) != 0) { + error(_("wrong format tag in extensible 'fmt ' chunk")); + exit(EXIT_FAILURE); + } + f->format = fe->guid_format; + } if (LE_SHORT(f->format) != WAV_FMT_PCM && LE_SHORT(f->format) != WAV_FMT_IEEE_FLOAT) { error(_("can't play WAVE-file format 0x%04x which is not PCM or FLOAT encoded"), LE_SHORT(f->format)); exit(EXIT_FAILURE); } - if (LE_SHORT(f->modus) < 1) { - error(_("can't play WAVE-files with %d tracks"), LE_SHORT(f->modus)); - exit(EXIT_FAILURE); - } - hwparams.channels = LE_SHORT(f->modus); + if (LE_SHORT(f->channels) < 1) { + error(_("can't play WAVE-files with %d tracks"), LE_SHORT(f->channels)); + exit(EXIT_FAILURE); + } + hwparams.channels = LE_SHORT(f->channels); switch (LE_SHORT(f->bit_p_spl)) { case 8: if (hwparams.format != DEFAULT_FORMAT && @@ -1805,7 +1818,7 @@ static void begin_wave(int fd, size_t cn f.format = LE_SHORT(WAV_FMT_IEEE_FLOAT); else f.format = LE_SHORT(WAV_FMT_PCM); - f.modus = LE_SHORT(hwparams.channels); + f.channels = LE_SHORT(hwparams.channels); f.sample_fq = LE_INT(hwparams.rate); #if 0 tmp2 = (samplesize == 8) ? 1 : 2; diff -r 9c822ff3e9b9 aplay/formats.h --- a/aplay/formats.h Thu Feb 21 09:12:53 2008 +0100 +++ b/aplay/formats.h Thu Mar 06 14:25:52 2008 +0000 @@ -69,6 +69,10 @@ typedef struct voc_ext_block { #define WAV_FMT_PCM 0x0001 #define WAV_FMT_IEEE_FLOAT 0x0003 #define WAV_FMT_DOLBY_AC3_SPDIF 0x0092 +#define WAV_FMT_EXTENSIBLE 0xfffe + +/* Used with WAV_FMT_EXTENSIBLE format */ +#define WAV_GUID_TAG "\x00\x00\x00\x00\x10\x00\x80\x00\x00\xAA\x00\x38\x9B\x71" /* it's in chunks like .voc and AMIGA iff, but my source say there are in only in this combination, so I combined them in one header; @@ -81,13 +85,22 @@ typedef struct { } WaveHeader; typedef struct { - u_short format; /* should be 1 for PCM-code */ - u_short modus; /* 1 Mono, 2 Stereo */ + u_short format; /* see WAV_FMT_* */ + u_short channels; u_int sample_fq; /* frequence of sample */ u_int byte_p_sec; u_short byte_p_spl; /* samplesize; 1 or 2 bytes */ u_short bit_p_spl; /* 8, 12 or 16 bit */ } WaveFmtBody; + +typedef struct { + WaveFmtBody format; + u_short ext_size; + u_short bit_p_spl; + u_int channel_mask; + u_short guid_format; /* WAV_FMT_* */ + u_char guid_tag[14]; /* WAV_GUID_TAG */ +} WaveFmtExtensibleBody; typedef struct { u_int type; /* 'data' */

2 1

[alsa-devel] Problems with ALSA in embedded device
by Imanol Trapote 06 Mar '08

06 Mar '08

Hi all, I am developing a product in an embedded system that uses ALSA library. This system can't use the dynamic linker, I am using flat binaries. I use this configuration options: --without-libdl \ --with-pthread \ --with-softload \ --disable-alisp \ --disable-hwdep \ --disable-seq \ --disable-resmgr \ --disable-rawmidi \ --disable-old-symbols \ --disable-python \ --disable-mixer I try to use the same configuration options in a PC for debugging, and I get the same problem, when I try to list devices with aplay, I get this: aplay -L ALSA lib conf.c:2699:(snd_config_hooks_call) Cannot open shared library (null) ALSA lib conf.c:3076:(snd_config_update_r) hooks failed, removing configuration It's possible use ALSA without dynamic libraries, with this configuration Thanks in advance. Imanol Trapote ----------------------------------------- PLEASE NOTE ------------------------------------------- This message, along with any attachments, may be confidential or legally privileged. It is intended only for the named person(s), who is/are the only authorized recipients. If this message has reached you in error, kindly destroy it without review and notify the sender immediately. Thank you for your help. ZIV uses virus scanning software but excludes any liability for viruses contained in any attachment. ------------------------------------ ROGAMOS LEA ESTE TEXTO ------------------------------- Este mensaje y sus anexos pueden contener información confidencial y/o con derecho legal. Está dirigido únicamente a la/s persona/s o entidad/es reseñadas como único destinatario autorizado. Si este mensaje le hubiera llegado por error, por favor elimínelo sin revisarlo ni reenviarlo y notifíquelo inmediatamente al remitente. Gracias por su colaboración. ZIV utiliza software antivirus, pero no se hace responsable de los virus contenidos en los ficheros anexos.

2 3

[alsa-devel] [PATCH] hda_intel: Add the DIDs of nvidia MCP79 HD audio controller to hda_intel.c
by peerchen 06 Mar '08

06 Mar '08

Add the Device IDs of nvidia MCP79 HD audio controller to hda_intel.c Signed-off-by: Peer Chen <peerchen(a)gmail.com> --- --- linux-2.6.25-rc4/sound/pci/hda/hda_intel.c.orig 2008-03-04 21:51:07.000000000 -0500 +++ linux-2.6.25-rc4/sound/pci/hda/hda_intel.c 2008-03-04 21:53:43.000000000 -0500 @@ -2036,6 +2036,10 @@ static struct pci_device_id azx_ids[] = { 0x10de, 0x0ac1, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP79 */ { 0x10de, 0x0ac2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP79 */ { 0x10de, 0x0ac3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP79 */ + { 0x10de, 0x0bd4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP7B */ + { 0x10de, 0x0bd5, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP7B */ + { 0x10de, 0x0bd6, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP7B */ + { 0x10de, 0x0bd7, PCI_ANY_ID, PCI_ANY_ID, 0, 0, AZX_DRIVER_NVIDIA }, /* NVIDIA MCP7B */ { 0, } }; MODULE_DEVICE_TABLE(pci, azx_ids); -

2 1

[alsa-devel] How to do pause/resume in ALSA application
by Aggarwal, Anuj 06 Mar '08

06 Mar '08

Hi, I am using the snd_pcm_pause API in my application but it is returning error: Invalid argument. I am passing the PCM handle of the playback stream which I opened earlier and using to play a WAV file. Although I am able to hear the WAV file correctly, I am not able to pause. I checked whether the pause functionality is supported, using snd_pcm_hw_params_can_pause() and it returned me success. Any help is welcome. Thanks & Regards, Anuj Aggarwal

2 3

[alsa-devel] aplay error - cant resolve symbol alsa_lisp_init
by Pharaoh . 06 Mar '08

06 Mar '08

Hi, I am trying to run aplay on my board, I have got alsa-lib and alsa-utils on board and when I try to run aplay, I get following. # aplay -h Dec 31 16:04:42 kernel: Error -5 while decompressing! Dec 31 16:04:42 kernel: c0234d4a(1911)->c35e3000(4096) aplay: can't resolve symbol 'alsa_lisp_init_objects' Dec 31 16:04:42 kernel: aplay used greatest stack depth: 5676 bytes left # aplay --help aplay: can't resolve symbol 'alsa_lisp_init_objects' Any clue? -pharaoh.

2 1

[alsa-devel] [PATCH 5/5] asihpi: add hwdep (experimental)
by Eliot Blennerhassett 06 Mar '08

06 Mar '08

Add hpi ioctl via hwdep (experimental, disabled by default). Adjust sampleclock control to use new hpi apis. Signed-off-by: Eliot Blennerhassett <linux(a)audioscience.com --- diff -r 6def4892d3f5 pci/Kconfig --- a/pci/Kconfig Mon Mar 03 11:05:48 2008 +0100 +++ b/pci/Kconfig Sat Feb 23 20:24:59 2008 +1300 @@ -17,6 +17,7 @@ config SND_ASIHPI depends on SND && X86 select FW_LOADER select SND_PCM + select SND_HWDEP help Say 'Y' or 'M' to include support for AudioScience ASIxxxx soundcards. diff -r 6def4892d3f5 pci/asihpi/asihpi.c --- a/pci/asihpi/asihpi.c Mon Mar 03 11:05:48 2008 +0100 +++ b/pci/asihpi/asihpi.c Wed Mar 05 21:59:31 2008 +1300 @@ -23,6 +23,9 @@ */ /* >0: print Hw params, timer vars. >1: print stream write/copy sizes */ #define REALLY_VERBOSE_LOGGING 0 + +/* Experimental HPI hwdep interface */ +#define EXPERIMENTAL_HWDEP 0 #if REALLY_VERBOSE_LOGGING #define VPRINTK1 printk @@ -66,19 +69,28 @@ #include <sound/info.h> #include <sound/initval.h> #include <sound/tlv.h> +#include <sound/hwdep.h> #include "hpi.h" static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR; /* ID for this card */ static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP; - -module_param_array(index, int, NULL, 0444); +static int enable_hpi_hwdep; + +module_param_array(index, int, NULL, S_IRUGO); MODULE_PARM_DESC(index, "ALSA Index value for AudioScience soundcard."); -module_param_array(id, charp, NULL, 0444); + +module_param_array(id, charp, NULL, S_IRUGO); MODULE_PARM_DESC(id, "ALSA ID string for AudioScience soundcard."); -module_param_array(enable, bool, NULL, 0444); + +module_param_array(enable, bool, NULL, S_IRUGO); MODULE_PARM_DESC(enable, "ALSA Enable AudioScience soundcard."); + +module_param(enable_hpi_hwdep, bool, S_IRUGO|S_IWUSR); +MODULE_PARM_DESC(enable_hpi_hwdep, + "ALSA Enable HPI hwdep for AudioScience soundcard " + "(experimental)"); /* used by hpimod.c, stop sparse from complaining */ int snd_asihpi_bind(struct hpi_adapter *hpi_card); @@ -114,6 +126,7 @@ struct clk_source { struct clk_cache { int count; + int has_local; struct clk_source s[MAX_CLOCKSOURCES]; }; @@ -1602,7 +1615,6 @@ static int __devinit snd_asihpi_aesebu_t snd_control->info = snd_asihpi_aesebu_format_info; snd_control->get = snd_asihpi_aesebu_tx_format_get; snd_control->put = snd_asihpi_aesebu_tx_format_put; - snd_control->index = asihpi_control->wDstNodeIndex + ixb; asihpi_ctl_name(snd_control, asihpi_control, "Format"); @@ -1909,9 +1921,9 @@ static int log2lin[] = { 6790940, 2147484, /* -60dB */ 679094, - 214748, + 214748, /* -80 */ 67909, - 21475, + 21475, /* -100 */ 6791, 2147, 679, @@ -2153,8 +2165,9 @@ static void __devinit snd_asihpi_cmode_n ------------------------------------------------------------*/ static char *sampleclock_sources[MAX_CLOCKSOURCES] = - { "N/A", "Adapter", "AES/EBU Sync", "Word External", "Word Header", - "SMPTE", "AES/EBU In1", "Auto", "Cobranet", + { "N/A", "Local PLL", "AES/EBU Sync", "Word External", "Word Header", + "SMPTE", "AES/EBU In1", "Auto", "Network", "Invalid", + "Prev Module", "AES/EBU In2", "AES/EBU In3", "AES/EBU In4", "AES/EBU In5", "AES/EBU In6", "AES/EBU In7", "AES/EBU In8"}; @@ -2239,7 +2252,9 @@ static void __devinit snd_asihpi_clksrc_ snd_control->info = snd_asihpi_clksrc_info; snd_control->get = snd_asihpi_clksrc_get; snd_control->put = snd_asihpi_clksrc_put; - asihpi_ctl_name(snd_control, asihpi_control, "ClockSource"); + asihpi_ctl_name(snd_control, asihpi_control, "Source"); + + clkcache->has_local = 0; for (i = 0; i <= HPI_SAMPLECLOCK_SOURCE_LAST; i++) { if (HPI_ControlQuery(phSubSys, hSC, @@ -2250,6 +2265,8 @@ static void __devinit snd_asihpi_clksrc_ clkcache->s[i].name = sampleclock_sources[wSource]; if (wSource == HPI_SAMPLECLOCK_SOURCE_AESEBU_INPUT) hasAesIn = 1; + if (wSource == HPI_SAMPLECLOCK_SOURCE_LOCAL) + clkcache->has_local = 1; } if (hasAesIn) /* already will have picked up index 0 above */ @@ -2271,7 +2288,7 @@ static void __devinit snd_asihpi_clksrc_ /*------------------------------------------------------------ Clkrate controls ------------------------------------------------------------*/ -static int snd_asihpi_clkrate_info(struct snd_kcontrol *kcontrol, +static int snd_asihpi_clklocal_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo) { uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; @@ -2283,18 +2300,18 @@ static int snd_asihpi_clkrate_info(struc return 0; } -static int snd_asihpi_clkrate_get(struct snd_kcontrol *kcontrol, +static int snd_asihpi_clklocal_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { u32 hControl = kcontrol->private_value; u32 dwRate; - HPI_SampleClock_GetSampleRate(phSubSys, hControl, &dwRate); + HPI_SampleClock_GetLocalRate(phSubSys, hControl, &dwRate); ucontrol->value.integer.value[0] = dwRate; return 0; } -static int snd_asihpi_clkrate_put(struct snd_kcontrol *kcontrol, +static int snd_asihpi_clklocal_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { int change; @@ -2304,21 +2321,55 @@ static int snd_asihpi_clkrate_put(struct asihpi->mixer_clkrate[addr][1] != right; */ change = 1; - HPI_SampleClock_SetSampleRate(phSubSys, hControl, + HPI_SampleClock_SetLocalRate(phSubSys, hControl, ucontrol->value.integer.value[0]); return change; } +static void __devinit snd_asihpi_clklocal_new( + struct hpi_control *asihpi_control, + struct snd_kcontrol_new *snd_control) +{ + snd_control->info = snd_asihpi_clklocal_info; + snd_control->get = snd_asihpi_clklocal_get; + snd_control->put = snd_asihpi_clklocal_put; + + asihpi_ctl_name(snd_control, asihpi_control, "LocalRate"); +} + +static int snd_asihpi_clkrate_info(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_info *uinfo) +{ + uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; + uinfo->count = 1; + uinfo->value.integer.min = 8000; + uinfo->value.integer.max = 192000; + uinfo->value.integer.step = 100; + + return 0; +} + +static int snd_asihpi_clkrate_get(struct snd_kcontrol *kcontrol, + struct snd_ctl_elem_value *ucontrol) +{ + u32 hControl = kcontrol->private_value; + u32 dwRate; + + HPI_SampleClock_GetSampleRate(phSubSys, hControl, &dwRate); + ucontrol->value.integer.value[0] = dwRate; + return 0; +} + static void __devinit snd_asihpi_clkrate_new(struct hpi_control *asihpi_control, struct snd_kcontrol_new *snd_control) { snd_control->info = snd_asihpi_clkrate_info; snd_control->get = snd_asihpi_clkrate_get; - snd_control->put = snd_asihpi_clkrate_put; + snd_control->access = + SNDRV_CTL_ELEM_ACCESS_VOLATILE | SNDRV_CTL_ELEM_ACCESS_READ; asihpi_ctl_name(snd_control, asihpi_control, "Rate"); } - /*------------------------------------------------------------ Mixer ------------------------------------------------------------*/ @@ -2404,6 +2455,14 @@ static int __devinit snd_card_asihpi_mix return err; snd_asihpi_clkrate_new(&asihpi_control, &snd_control); + err = snd_ctl_add(card, + snd_ctl_new1(&snd_control, asihpi)); + if (err < 0) + return err; + if (asihpi->cc.has_local) + snd_asihpi_clklocal_new(&asihpi_control, + &snd_control); + break; case HPI_CONTROL_CONNECTION: /* ignore these */ continue; @@ -2510,6 +2569,55 @@ static void __devinit snd_asihpi_proc_in } /*------------------------------------------------------------ + HWDEP + ------------------------------------------------------------*/ + +static int snd_asihpi_hpi_open(struct snd_hwdep * hw, struct file *file) +{ + return 0; +} + +static int snd_asihpi_hpi_release(struct snd_hwdep * hw, struct file *file) +{ + return 0; +} + +long asihpi_hpi_ioctl(struct file *file, + unsigned int cmd, unsigned long arg); + +static int snd_asihpi_hpi_ioctl(struct snd_hwdep * hw, struct file *file, + unsigned int cmd, unsigned long arg) +{ + return asihpi_hpi_ioctl(file, cmd, arg); +} + + +/* results in /dev/snd/hwC#D0 file for each card with index # + also /proc/asound/hwdep will contain '#-00: asihpi (HPI) for each card' +*/ +int __devinit snd_asihpi_hpi_new(struct snd_card_asihpi *asihpi, int device, + struct snd_hwdep ** rhwdep) +{ + struct snd_hwdep *hw; + int err; + + if (rhwdep) + *rhwdep = NULL; + err = snd_hwdep_new(asihpi->card, "HPI", device, &hw); + if (err < 0) + return err; + strcpy(hw->name, "asihpi (HPI)"); + hw->iface = SNDRV_HWDEP_IFACE_LAST; + hw->ops.open = snd_asihpi_hpi_open; + hw->ops.ioctl = snd_asihpi_hpi_ioctl; + hw->ops.release = snd_asihpi_hpi_release; + hw->private_data = asihpi; + if (rhwdep) + *rhwdep = hw; + return 0; +} + +/*------------------------------------------------------------ CARD ------------------------------------------------------------*/ int __devinit snd_asihpi_bind(struct hpi_adapter *hpi_card) @@ -2602,10 +2710,13 @@ int __devinit snd_asihpi_bind(struct hpi HPI_CONTROL_SAMPLECLOCK, &hControl); if (!err) - err = HPI_SampleClock_SetSampleRate(phSubSys, + err = HPI_SampleClock_SetLocalRate(phSubSys, hControl, adapter_fs); snd_asihpi_proc_init(asihpi); + + if (enable_hpi_hwdep) + snd_asihpi_hpi_new(asihpi, 0, NULL); if (asihpi->support_mmap) strcpy(card->driver, "ASIHPI-MMAP"); diff -r 6def4892d3f5 pci/asihpi/hpimod.c --- a/pci/asihpi/hpimod.c Mon Mar 03 11:05:48 2008 +0100 +++ b/pci/asihpi/hpimod.c Wed Mar 05 21:59:31 2008 +1300 @@ -24,14 +24,10 @@ Linux HPI driver module #include "hpi.h" #include "hpidebug.h" #include "hpimsgx.h" + #include <linux/fs.h> #include <linux/slab.h> #include <linux/moduleparam.h> -#include <linux/pci.h> -#include <linux/device.h> -#include <linux/interrupt.h> -#include <linux/mutex.h> -#include <linux/version.h> #include <asm/uaccess.h> #include <linux/stringify.h> @@ -167,13 +163,13 @@ static int hpi_release( } #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 11) -static long hpi_ioctl( +long asihpi_hpi_ioctl( struct file *file, unsigned int cmd, unsigned long arg ) #else -static int hpi_ioctl( +static int asihpi_hpi_ioctl( struct inode *inode, struct file *file, unsigned int cmd, @@ -225,8 +221,18 @@ static int hpi_ioctl( /* -1=no data 0=read from user mem, 1=write to user mem */ int wrflag = -1; - int nAdapter = hm.wAdapterIndex; + u32 nAdapter = hm.wAdapterIndex; switch (hm.wFunction) { + case HPI_SUBSYS_CREATE_ADAPTER: + case HPI_SUBSYS_DELETE_ADAPTER: + /* Application must not use these functions! */ + hr.wSize = sizeof(struct hpi_response_header); + hr.wError = HPI_ERROR_INVALID_OPERATION; + hr.wFunction = hm.wFunction; + uncopied_bytes = copy_to_user(phr, &hr, hr.wSize); + if (uncopied_bytes) + return -EFAULT; + return 0; case HPI_OSTREAM_WRITE: case HPI_ISTREAM_READ: /* Yes, sparse, this is correct. */ @@ -252,60 +258,49 @@ static int hpi_ioctl( break; } - if ((nAdapter >= HPI_MAX_ADAPTERS || nAdapter < 0) && - (hm.wObject != HPI_OBJ_SUBSYSTEM)) - hr.wError = HPI_ERROR_INVALID_OBJ_INDEX; - else { - if (mutex_lock_interruptible(&adapters[nAdapter]. - mutex)) - return -EINTR; - - if (wrflag == 0) { - if (size > bufsize) { - mutex_unlock(&adapters[nAdapter]. - mutex); - HPI_DEBUG_LOG(ERROR, - "Requested transfer of %d " - "bytes, max buffer size " - "is %d bytes.\n", size, - bufsize); - return -EINVAL; - } - - uncopied_bytes = - copy_from_user(pa->pBuffer, ptr, - size); - if (uncopied_bytes) - HPI_DEBUG_LOG(WARNING, - "Missed %d of %d " - "bytes from user\n", - uncopied_bytes, size); + if (mutex_lock_interruptible(&adapters[nAdapter].mutex)) + return -EINTR; + + if (wrflag == 0) { + if (size > bufsize) { + mutex_unlock(&adapters[nAdapter].mutex); + HPI_DEBUG_LOG(ERROR, + "Requested transfer of %d " + "bytes, max buffer size " + "is %d bytes.\n", size, bufsize); + return -EINVAL; } - HPI_MessageF(&hm, &hr, file); - - if (wrflag == 1) { - if (size > bufsize) { - mutex_unlock(&adapters[nAdapter]. - mutex); - HPI_DEBUG_LOG(ERROR, - "Requested transfer of %d " - "bytes, max buffer size is " - "%d bytes.\n", size, bufsize); - return -EINVAL; - } - - uncopied_bytes = - copy_to_user(ptr, pa->pBuffer, size); - if (uncopied_bytes) - HPI_DEBUG_LOG(WARNING, - "Missed %d of %d " - "bytes to user\n", - uncopied_bytes, size); + uncopied_bytes = + copy_from_user(pa->pBuffer, ptr, size); + if (uncopied_bytes) + HPI_DEBUG_LOG(WARNING, + "Missed %d of %d " + "bytes from user\n", + uncopied_bytes, size); + } + + HPI_MessageF(&hm, &hr, file); + + if (wrflag == 1) { + if (size > bufsize) { + mutex_unlock(&adapters[nAdapter].mutex); + HPI_DEBUG_LOG(ERROR, + "Requested transfer of %d " + "bytes, max buffer size is " + "%d bytes.\n", size, bufsize); + return -EINVAL; } - mutex_unlock(&adapters[nAdapter].mutex); + uncopied_bytes = copy_to_user(ptr, pa->pBuffer, size); + if (uncopied_bytes) + HPI_DEBUG_LOG(WARNING, + "Missed %d of %d " + "bytes to user\n", + uncopied_bytes, size); } + + mutex_unlock(&adapters[nAdapter].mutex); } /* on return response size must be set */ @@ -322,9 +317,9 @@ static struct file_operations hpi_fops = static struct file_operations hpi_fops = { .owner = THIS_MODULE, #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 11) - .unlocked_ioctl = hpi_ioctl, + .unlocked_ioctl = asihpi_hpi_ioctl, #else - .ioctl = hpi_ioctl, + .ioctl = asihpi_hpi_ioctl, #endif .open = hpi_open, .release = hpi_release @@ -399,6 +394,9 @@ static int __devinit adapter_probe( /* call CreateAdapterObject on the relevant hpi module */ HPI_MessageEx(&hm, &hr, HOWNER_KERNEL); + if (hr.wError) + goto err; + adapter.pBuffer = vmalloc(bufsize); if (adapter.pBuffer == NULL) { HPI_DEBUG_LOG(ERROR, @@ -407,39 +405,37 @@ static int __devinit adapter_probe( goto err; } - if (hr.wError == 0) { - adapter.index = hr.u.s.wAdapterIndex; - adapter.type = hr.u.s.awAdapterList[adapter.index]; + adapter.index = hr.u.s.wAdapterIndex; + adapter.type = hr.u.s.awAdapterList[adapter.index]; + hm.wAdapterIndex = adapter.index; + + err = HPI_AdapterOpen(NULL, adapter.index); + if (err) + goto err; + + adapter.snd_card_asihpi = NULL; + /* WARNING can't init sem in 'adapter' + * and then copy it to adapters[] ?!?! + */ + adapters[hr.u.s.wAdapterIndex] = adapter; + mutex_init(&adapters[adapter.index].mutex); +#ifdef ALSA_BUILD + if (snd_asihpi_bind(&adapters[adapter.index])) { + HPI_InitMessage(&hm, HPI_OBJ_SUBSYSTEM, + HPI_SUBSYS_DELETE_ADAPTER); hm.wAdapterIndex = adapter.index; - - err = HPI_AdapterOpen(NULL, adapter.index); - if (err) - goto err; - - adapter.snd_card_asihpi = NULL; - /* WARNING can't init sem in 'adapter' - * and then copy it to adapters[] ?!?! - */ - adapters[hr.u.s.wAdapterIndex] = adapter; - mutex_init(&adapters[adapter.index].mutex); -#ifdef ALSA_BUILD - if (snd_asihpi_bind(&adapters[adapter.index])) { - HPI_InitMessage(&hm, HPI_OBJ_SUBSYSTEM, - HPI_SUBSYS_DELETE_ADAPTER); - hm.wAdapterIndex = adapter.index; - HPI_MessageEx(&hm, &hr, HOWNER_KERNEL); - goto err; - } -#endif - - pci_set_drvdata(pci_dev, &adapters[adapter.index]); - adapter_count++; - - printk(KERN_INFO - "Probe found adapter ASI%04X HPI index #%d.\n", - adapter.type, adapter.index); - return 0; - } + HPI_MessageEx(&hm, &hr, HOWNER_KERNEL); + goto err; + } +#endif + + pci_set_drvdata(pci_dev, &adapters[adapter.index]); + adapter_count++; + + printk(KERN_INFO + "Probe found adapter ASI%04X HPI index #%d.\n", + adapter.type, adapter.index); + return 0; err: for (idx = 0; idx < HPI_MAX_ADAPTER_MEM_SPACES; idx++) {

4 6

[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