[alsa-devel] [PATCH 2/2] alsa: lx6464es - fix device communication via command bus

[Takashi Iwai]

At Tue, 22 Nov 2011 11:15:45 +0100,
Tim Blechmann wrote:
> 
> commit 6175ddf06b6172046a329e3abfd9c901a43efd2e optimized the mem*io
> functions that have been used to send commands to the device. these
> optimizations somehow corrupted the communication with the lx6464es,
> that resulted the device to be unusable with kernels after 2.6.33.
> 
> this patch emulates the memcpy_*_io functions via a loop to avoid these
> problems.
> 
> Signed-off-by: Tim Blechmann <tim at klingt.org>
> LKML-Reference: <4ECB5257.4040600 at ladisch.de>

This should be applied to stable kernel post 2.6.34, right?


thanks,

Takashi

> ---
>  sound/pci/lx6464es/lx_core.c |   16 ++++++++++++----
>  1 files changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/sound/pci/lx6464es/lx_core.c b/sound/pci/lx6464es/lx_core.c
> index ad52f41..8c3e7fc 100644
> --- a/sound/pci/lx6464es/lx_core.c
> +++ b/sound/pci/lx6464es/lx_core.c
> @@ -81,8 +81,12 @@ unsigned long lx_dsp_reg_read(struct lx6464es *chip, int port)
>  static void lx_dsp_reg_readbuf(struct lx6464es *chip, int port, u32 *data,
>  			       u32 len)
>  {
> -	void __iomem *address = lx_dsp_register(chip, port);
> -	memcpy_fromio(data, address, len*sizeof(u32));
> +	u32 __iomem *address = lx_dsp_register(chip, port);
> +	int i;
> +
> +	/* we cannot use memcpy_fromio */
> +	for (i = 0; i != len; ++i)
> +		data[i] = ioread32(address + i);
>  }
>  
>  
> @@ -95,8 +99,12 @@ void lx_dsp_reg_write(struct lx6464es *chip, int port, unsigned data)
>  static void lx_dsp_reg_writebuf(struct lx6464es *chip, int port,
>  				const u32 *data, u32 len)
>  {
> -	void __iomem *address = lx_dsp_register(chip, port);
> -	memcpy_toio(address, data, len*sizeof(u32));
> +	u32 __iomem *address = lx_dsp_register(chip, port);
> +	int i;
> +
> +	/* we cannot use memcpy_to */
> +	for (i = 0; i != len; ++i)
> +		iowrite32(data[i], address + i);
>  }
>  
>  
> -- 
> 1.7.5.4
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel at alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>