[PATCH 16/51] DMA-API: ppc: vio.c: replace dma_set_mask()+dma_set_coherent_mask() with new helper

[Russell King - ARM Linux]

On Fri, Nov 15, 2013 at 05:16:55PM +0100, Cedric Le Goater wrote:
> The new helper routine dma_set_mask_and_coherent() breaks the 
> initialization of the pseries vio devices which do not have an 
> initial dev->dma_mask. I think we need to use dma_coerce_mask_and_coherent()
> instead.

Who wants to handle this patch?

Also, is it possible to fix it so that dev->dma_mask is correctly setup
by the code which creates the device, as it should be in the first place?

Thanks

> Signed-off-by: Cédric Le Goater <clg at fr.ibm.com>
> ---
>  arch/powerpc/kernel/vio.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
> index e7d0c88f..76a6482 100644
> --- a/arch/powerpc/kernel/vio.c
> +++ b/arch/powerpc/kernel/vio.c
> @@ -1419,7 +1419,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
>  
>  		/* needed to ensure proper operation of coherent allocations
>  		 * later, in case driver doesn't set it explicitly */
> -		dma_set_mask_and_coherent(&viodev->dev, DMA_BIT_MASK(64));
> +		dma_coerce_mask_and_coherent(&viodev->dev, DMA_BIT_MASK(64));
>  	}
>  
>  	/* register with generic device framework */
> -- 
> 1.7.10.4
> 
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel