Re: [PATCH 1/2] ahci: Check and set 64-bit DMA mask for platform AHCI driver

From: Hans de Goede
Date: Fri Jun 13 2014 - 16:21:33 EST


Hi,

On 06/12/2014 07:40 PM, suravee.suthikulpanit@xxxxxxx wrote:
> From: Suravee Suthikulpanit <Suravee.Suthikulpanit@xxxxxxx>
>
> The current platform AHCI driver does not set the dma_mask correctly
> for 64-bit DMA capable AHCI controller. This patch checks the AHCI
> capability bit and set the dma_mask and coherent_dma_mask accordingly.
>
> Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@xxxxxxx>
> Reviewed-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
> Reviewed-by: Hans de Goede <hdegoede@xxxxxxxxxx>

I see no adverse effects from this on sunxi, please drop the
Reviewed-by: Hans .... tag and replace it with:

Tested-by: Hans de Goede <hdegoede@xxxxxxxxxx>

Regards,

Hans



> ---
> drivers/ata/libahci_platform.c | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c
> index 3a5b4ed..a958a2b 100644
> --- a/drivers/ata/libahci_platform.c
> +++ b/drivers/ata/libahci_platform.c
> @@ -364,6 +364,19 @@ int ahci_platform_init_host(struct platform_device *pdev,
> ap->ops = &ata_dummy_port_ops;
> }
>
> + if (hpriv->cap & HOST_CAP_64) {
> + rc = dma_coerce_mask_and_coherent(dev, DMA_BIT_MASK(64));
> + if (rc) {
> + rc = dma_coerce_mask_and_coherent(dev,
> + DMA_BIT_MASK(32));
> + if (rc) {
> + dev_err(dev, "Failed to enable 64-bit DMA.\n");
> + return rc;
> + }
> + dev_warn(dev, "Enable 32-bit DMA instead of 64-bit.\n");
> + }
> + }
> +
> rc = ahci_reset_controller(host);
> if (rc)
> return rc;
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/