summaryrefslogtreecommitdiffstats
path: root/drivers/pci/switch
diff options
context:
space:
mode:
authorWesley Sheng <wesley.sheng@microchip.com>2020-01-06 12:03:26 -0700
committerBjorn Helgaas <bhelgaas@google.com>2020-01-08 15:42:45 -0600
commitaa82130a22f77c1aa5794703730304d035a0c1f4 (patch)
tree66b6cc28658692c24d879da3f9c1cdcb687680f8 /drivers/pci/switch
parente42617b825f8073569da76dc4510bfa019b1c35a (diff)
downloadlinux-aa82130a22f77c1aa5794703730304d035a0c1f4.tar.bz2
PCI/switchtec: Use dma_set_mask_and_coherent()
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>
Diffstat (limited to 'drivers/pci/switch')
-rw-r--r--drivers/pci/switch/switchtec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c
index 88091bbfe77f..2bf670977b9c 100644
--- a/drivers/pci/switch/switchtec.c
+++ b/drivers/pci/switch/switchtec.c
@@ -1349,7 +1349,7 @@ static int switchtec_init_pci(struct switchtec_dev *stdev,
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;