target/linux/layerscape/patches-5.4/701-net-0006-soc-fsl-bqman-page-align-iommu-mapping-sizes.patch

   1 From 218274ea02e908846fabb5b9a2ab7409da06a85f Mon Sep 17 00:00:00 2001
   2 From: Laurentiu Tudor <laurentiu.tudor@nxp.com>
   3 Date: Thu, 22 Nov 2018 12:32:13 +0200
   4 Subject: [PATCH] soc/fsl/bqman: page align iommu mapping sizes
   5
   6 Prior to calling iommu_map()/iommu_unmap() page align the size or
   7 failures such as below could happen:
   8
   9 iommu: unaligned: iova 0x... pa 0x... size 0x4000 min_pagesz 0x10000
  10 qman_portal 500000000.qman-portal: failed to iommu_map() -22
  11
  12 Seen when booted a kernel compiled with 64K page size support.
  13
  14 Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
  15 ---
  16  drivers/soc/fsl/qbman/bman_ccsr.c   | 2 +-
  17  drivers/soc/fsl/qbman/qman_ccsr.c   | 4 ++--
  18  drivers/soc/fsl/qbman/qman_portal.c | 2 +-
  19  3 files changed, 4 insertions(+), 4 deletions(-)
  20
  21 --- a/drivers/soc/fsl/qbman/bman_ccsr.c
  22 +++ b/drivers/soc/fsl/qbman/bman_ccsr.c
  23 @@ -262,7 +262,7 @@ static int fsl_bman_probe(struct platfor
  24         /* Create an 1-to-1 iommu mapping for FBPR area */
  25         domain = iommu_get_domain_for_dev(dev);
  26         if (domain) {
  27 -               ret = iommu_map(domain, fbpr_a, fbpr_a, fbpr_sz,
  28 +               ret = iommu_map(domain, fbpr_a, fbpr_a, PAGE_ALIGN(fbpr_sz),
  29                                 IOMMU_READ | IOMMU_WRITE | IOMMU_CACHE);
  30                 if (ret)
  31                         dev_warn(dev, "failed to iommu_map() %d\n", ret);
  32 --- a/drivers/soc/fsl/qbman/qman_ccsr.c
  33 +++ b/drivers/soc/fsl/qbman/qman_ccsr.c
  34 @@ -839,11 +839,11 @@ static int fsl_qman_probe(struct platfor
  35         /* Create an 1-to-1 iommu mapping for fqd and pfdr areas */
  36         domain = iommu_get_domain_for_dev(dev);
  37         if (domain) {
  38 -               ret = iommu_map(domain, fqd_a, fqd_a, fqd_sz,
  39 +               ret = iommu_map(domain, fqd_a, fqd_a, PAGE_ALIGN(fqd_sz),
  40                                 IOMMU_READ | IOMMU_WRITE | IOMMU_CACHE);
  41                 if (ret)
  42                         dev_warn(dev, "iommu_map(fqd) failed %d\n", ret);
  43 -               ret = iommu_map(domain, pfdr_a, pfdr_a, pfdr_sz,
  44 +               ret = iommu_map(domain, pfdr_a, pfdr_a, PAGE_ALIGN(pfdr_sz),
  45                                 IOMMU_READ | IOMMU_WRITE | IOMMU_CACHE);
  46                 if (ret)
  47                         dev_warn(dev, "iommu_map(pfdr) failed %d\n", ret);
  48 --- a/drivers/soc/fsl/qbman/qman_portal.c
  49 +++ b/drivers/soc/fsl/qbman/qman_portal.c
  50 @@ -305,7 +305,7 @@ static int qman_portal_probe(struct plat
  51                  */
  52                 err = iommu_map(domain,
  53                                 addr_phys[0]->start, addr_phys[0]->start,
  54 -                               resource_size(addr_phys[0]),
  55 +                               PAGE_ALIGN(resource_size(addr_phys[0])),
  56                                 IOMMU_READ | IOMMU_WRITE | IOMMU_CACHE);
  57                 if (err)
  58                         dev_warn(dev, "failed to iommu_map() %d\n", err);