summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Ott <sebott@linux.vnet.ibm.com>2016-06-03 19:03:12 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2016-06-13 15:58:24 +0200
commit53b1bc9aba525a599721565507d9e3aebae80a1d (patch)
tree832d2f102483e81b12ab2c0461cfcf8d5d61e1de
parentbb98f396f14477480273a92a75da448af6a9ae85 (diff)
downloadlwn-53b1bc9aba525a599721565507d9e3aebae80a1d.tar.gz
lwn-53b1bc9aba525a599721565507d9e3aebae80a1d.zip
s390/pci: ensure page aligned dma start address
We don't have an architectural guarantee on the value of the dma offset but rely on it to be at least page aligned. Enforce page alignemt of start_dma. Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com> Reviewed-by: Gerald Schaefer <gerald.schaefer@de.ibm.com> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/pci/pci_dma.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c
index 1ea8c07eab84..494eb832bcc5 100644
--- a/arch/s390/pci/pci_dma.c
+++ b/arch/s390/pci/pci_dma.c
@@ -469,6 +469,7 @@ int zpci_dma_init_device(struct zpci_dev *zdev)
* Also set zdev->end_dma to the actual end address of the usable
* range, instead of the theoretical maximum as reported by hardware.
*/
+ zdev->start_dma = PAGE_ALIGN(zdev->start_dma);
zdev->iommu_size = min3((u64) high_memory,
ZPCI_TABLE_SIZE_RT - zdev->start_dma,
zdev->end_dma - zdev->start_dma + 1);