On Tue, Nov 25, 2014 at 1:19 PM, Mark Langsdorf <mlangsdo@xxxxxxxxxx> wrote:
> The xhci platform driver needs to work on systems that either only
> support 64-bit DMA or only support 32-bit DMA. Attempt to set a
> coherent dma mask for 64-bit DMA, and attempt again with 32-bit
> DMA if that fails.
>
> Signed-off-by: Mark Langsdorf <mlangsdo@xxxxxxxxxx>
> Tested-by: Mark Salter <msalter@xxxxxxxxxx>
> ---
> Changes from v2:
> None
> Changes from v1:
> Consolidated to use dma_set_mask_and_coherent
> Got rid of the check against sizeof(dma_addr_t)
>
> drivers/usb/host/xhci-plat.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> index 3d78b0c..34cbf65 100644
> --- a/drivers/usb/host/xhci-plat.c
> +++ b/drivers/usb/host/xhci-plat.c
> @@ -96,14 +96,14 @@ static int xhci_plat_probe(struct platform_device *pdev)
> return ret;
> }
>
> - /* Initialize dma_mask and coherent_dma_mask to 32-bits */
> - ret = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32));
> - if (ret)
> - return ret;
> - if (!pdev->dev.dma_mask)
> - pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
> - else
> - dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
> + /* Try setting the coherent_dma_mask to 64 bits, then try 32 bits */
> + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
> + if (ret) {
> + ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
> + if (ret)
> + return ret;
> + }
> +
>
> hcd = usb_create_hcd(driver, &pdev->dev, dev_name(&pdev->dev));
> if (!hcd)
> --
> 1.9.3
>
Tested-by: Feng Kan <fkan@xxxxxxx>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
