Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
powerpc: Revert c6102609 and replace it with the correct fix for vio dma mask setting
This patch reverts my previous "fix", and replace it with the correct
fix from Russell.
And as Russell pointed out -- dma_set_mask_and_coherent() (and the other
dma_set_mask() functions) are really supposed to be used by drivers
only.
Signed-off-by: Li Zhong <zhong@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
authored by
Li Zhong
and committed by
Benjamin Herrenschmidt
10862a0c
84744377
+2
-1
+2
-1
arch/powerpc/kernel/vio.c
+2
-1
arch/powerpc/kernel/vio.c
···
1432
1432
1433
1433
/* needed to ensure proper operation of coherent allocations
1434
1434
* later, in case driver doesn't set it explicitly */
1435
-
dma_coerce_mask_and_coherent(&viodev->dev, DMA_BIT_MASK(64));
1435
+
viodev->dev.coherent_dma_mask = DMA_BIT_MASK(64);
1436
+
viodev->dev.dma_mask = &viodev->dev.coherent_dma_mask;
1436
1437
}
1437
1438
1438
1439
/* register with generic device framework */