[PATCH 15/15] ppc/vio: ensure dma_coherent_mask is set

[Benjamin Herrenschmidt]

On Wed, 2010-09-15 at 11:05 -0700, Nishanth Aravamudan wrote:
> Without this change drivers, such as ibmvscsi, fail to load with the
> previous change.
> ---

So you broke bisection... fold the patch instead or invert them

Cheers,
Ben.

>  arch/powerpc/kernel/vio.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
> index 3c3083f..e8d73de 100644
> --- a/arch/powerpc/kernel/vio.c
> +++ b/arch/powerpc/kernel/vio.c
> @@ -1259,6 +1259,9 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
>  	viodev->dev.parent = &vio_bus_device.dev;
>  	viodev->dev.bus = &vio_bus_type;
>  	viodev->dev.release = vio_dev_release;
> +        /* needed to ensure proper operation of coherent allocations
> +         * later, in case driver doesn't set it explicitly */
> +        dma_set_coherent_mask(&viodev->dev, DMA_BIT_MASK(64));
>  
>  	/* register with generic device framework */
>  	if (device_register(&viodev->dev)) {