| From aa82130a22f77c1aa5794703730304d035a0c1f4 Mon Sep 17 00:00:00 2001 |
| From: Wesley Sheng <wesley.sheng@microchip.com> |
| Date: Mon, 6 Jan 2020 12:03:26 -0700 |
| Subject: PCI/switchtec: Use dma_set_mask_and_coherent() |
| |
| From: Wesley Sheng <wesley.sheng@microchip.com> |
| |
| commit aa82130a22f77c1aa5794703730304d035a0c1f4 upstream. |
| |
| Use dma_set_mask_and_coherent() instead of dma_set_coherent_mask() as the |
| Switchtec hardware fully supports 64bit addressing and we should set both |
| the streaming and coherent masks the same. |
| |
| [logang@deltatee.com: reworked commit message] |
| Fixes: aff614c6339c ("switchtec: Set DMA coherent mask") |
| Link: https://lore.kernel.org/r/20200106190337.2428-2-logang@deltatee.com |
| Signed-off-by: Wesley Sheng <wesley.sheng@microchip.com> |
| Signed-off-by: Logan Gunthorpe <logang@deltatee.com> |
| Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/pci/switch/switchtec.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/pci/switch/switchtec.c |
| +++ b/drivers/pci/switch/switchtec.c |
| @@ -1349,7 +1349,7 @@ static int switchtec_init_pci(struct swi |
| if (rc) |
| return rc; |
| |
| - rc = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64)); |
| + rc = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); |
| if (rc) |
| return rc; |
| |
