On Wed, 2013-06-26 at 22:39 +0530, Santosh Y wrote:
> index 19618c6..431ddb2 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -1711,6 +1711,25 @@ void ufshcd_remove(struct ufs_hba *hba)
>  EXPORT_SYMBOL_GPL(ufshcd_remove);
>  
>  /**
> + * ufshcd_set_dma_mask - Set dma mask based on the controller
> + *                    addressing capability
> + * @hba: per adapter instance
> + *
> + * Returns 0 for success, non-zero for failure
> + */
> +static int ufshcd_set_dma_mask(struct ufs_hba *hba)
> +{
> +     if (hba->capabilities & MASK_64_ADDRESSING_SUPPORT) {
> +             if (!dma_set_mask(hba->dev, DMA_BIT_MASK(64)) &&
> +                 !dma_set_coherent_mask(hba->dev, DMA_BIT_MASK(64)))
> +                     return 0;
> +     }
> +     dma_set_mask(hba->dev, DMA_BIT_MASK(32));
> +
> +     return dma_set_coherent_mask(hba->dev, DMA_BIT_MASK(32));
> +}

This isn't right per the API spec.  The guarantee is that if
dma_set_mask() succeeds then dma_set_coherent_mask of the same mask will
succeed,  so this should read

        int err;

        if (hba->capabilities & MASK_64_ADDRESSING_SUPPORT) {
                if (!dma_set_mask(hba->dev, DMA_BIT_MASK(64))) {
                        dma_set_coherent_mask(hba->dev, DMA_BIT_MASK(64)))
                        return 0;
                }
        }
        err = dma_set_mask(hba->dev, DMA_BIT_MASK(32));
        if (!err)
                dma_set_coherent_mask(hba->dev, DMA_BIT_MASK(32));
        return err;

James


--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to