From: Brian W Hart Date: Thu, 31 Jul 2014 19:24:37 +0000 (-0500) Subject: powerpc/powernv: Update dev->dma_mask in pci_set_dma_mask() path X-Git-Tag: v4.14-rc1~7077^2~30 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a32305bf90a2ae0e6a9a93370c7616565f75e15a;p=platform%2Fkernel%2Flinux-rpi.git powerpc/powernv: Update dev->dma_mask in pci_set_dma_mask() path powerpc defines various machine-specific routines for handling pci_set_dma_mask(). The routines for machine "PowerNV" may neglect to set dev->dma_mask. This could confuse anyone (e.g. drivers) that consult dev->dma_mask to find the current mask. Set the dma_mask in the PowerNV leaf routine. Signed-off-by: Brian W. Hart CC: Signed-off-by: Benjamin Herrenschmidt --- diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index fa3029a..866692b 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -491,6 +491,7 @@ static int pnv_pci_ioda_dma_set_mask(struct pnv_phb *phb, set_dma_ops(&pdev->dev, &dma_iommu_ops); set_iommu_table_base(&pdev->dev, &pe->tce32_table); } + *pdev->dev.dma_mask = dma_mask; return 0; }