[rt2x00-users] [PATCH 3/4] rt2x00: initialize queues before giving up due to DMA error

[Gertjan van Wingerde]

On 03/27/12 16:51, Jakub Kicinski wrote:
> Don't immediately abort .start if DMA is busy before we
> initialize the queues. Some drivers do not deinitialize
> queues properly and we would fail to take over after them.
> 
> This behaviour is consistent with legacy driver.
> 
> Signed-off-by: Jakub Kicinski <kubakici at wp.pl>

Acked-by: Gertjan van Wingerde <gwingerde at gmail.com>

> ---
> 2011_0406_RT5390_RT5392_Linux_STA_V2.5.0.3_DPO
> common/rtmp_init.c:2007
> ---
>  drivers/net/wireless/rt2x00/rt2800lib.c |    2 +-
>  drivers/net/wireless/rt2x00/rt2800pci.c |    6 ++++--
>  2 files changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c
> index c872ba6..de975ef 100644
> --- a/drivers/net/wireless/rt2x00/rt2800lib.c
> +++ b/drivers/net/wireless/rt2x00/rt2800lib.c
> @@ -290,7 +290,7 @@ int rt2800_wait_wpdma_ready(struct rt2x00_dev *rt2x00dev)
>  		msleep(10);
>  	}
>  
> -	ERROR(rt2x00dev, "WPDMA TX/RX busy, aborting.\n");
> +	ERROR(rt2x00dev, "WPDMA TX/RX busy [0x%08x].\n", reg);
>  	return -EACCES;
>  }
>  EXPORT_SYMBOL_GPL(rt2800_wait_wpdma_ready);
> diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
> index 5a2f68f..f39587b 100644
> --- a/drivers/net/wireless/rt2x00/rt2800pci.c
> +++ b/drivers/net/wireless/rt2x00/rt2800pci.c
> @@ -501,8 +501,10 @@ static int rt2800pci_enable_radio(struct rt2x00_dev *rt2x00dev)
>  {
>  	int retval;
>  
> -	if (unlikely(rt2800_wait_wpdma_ready(rt2x00dev) ||
> -		     rt2800pci_init_queues(rt2x00dev)))
> +	/* Wait for DMA, ignore error until we initialize queues. */
> +	rt2800_wait_wpdma_ready(rt2x00dev);
> +
> +	if (unlikely(rt2800pci_init_queues(rt2x00dev)))
>  		return -EIO;
>  
>  	retval = rt2800_enable_radio(rt2x00dev);


-- 
---
Gertjan