| Message ID | 20180702074205.12837-1-aik@ozlabs.ru (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 00c376fdd7ed6cc083da3a3c51a63a75f270d647 |
| Headers | show |
| Series | [kernel] powerpc/powernv/ioda2: Add 256M IOMMU page size to the default POWER8 case | expand |
On Mon, 2 Jul 2018 17:42:05 +1000 Alexey Kardashevskiy <aik@ozlabs.ru> wrote: > The sketchy bypass uses 256M pages so add this page size as well. > > This should cause no behavioral change but will be used later. > > Fixes: 477afd6ea6 "powerpc/ioda: Use ibm,supported-tce-sizes for IOMMU page size mask" > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> > --- > arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c > index 5bd0eb6..557c11d 100644 > --- a/arch/powerpc/platforms/powernv/pci-ioda.c > +++ b/arch/powerpc/platforms/powernv/pci-ioda.c > @@ -2925,7 +2925,7 @@ static unsigned long pnv_ioda_parse_tce_sizes(struct pnv_phb *phb) > /* Add 16M for POWER8 by default */ > if (cpu_has_feature(CPU_FTR_ARCH_207S) && > !cpu_has_feature(CPU_FTR_ARCH_300)) > - mask |= SZ_16M; > + mask |= SZ_16M | SZ_256M; Ping? > return mask; > } > > -- > 2.11.0 > -- Alexey
On Mon, 2018-07-02 at 17:42 +1000, Alexey Kardashevskiy wrote: > The sketchy bypass uses 256M pages so add this page size as well. > > This should cause no behavioral change but will be used later. > > Fixes: 477afd6ea6 "powerpc/ioda: Use ibm,supported-tce-sizes for > IOMMU page size mask" > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Reviewed-by: Russell Currey <ruscur@russell.cc> > --- > arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c > b/arch/powerpc/platforms/powernv/pci-ioda.c > index 5bd0eb6..557c11d 100644 > --- a/arch/powerpc/platforms/powernv/pci-ioda.c > +++ b/arch/powerpc/platforms/powernv/pci-ioda.c > @@ -2925,7 +2925,7 @@ static unsigned long > pnv_ioda_parse_tce_sizes(struct pnv_phb *phb) > /* Add 16M for POWER8 by default */ > if (cpu_has_feature(CPU_FTR_ARCH_207S) && > !cpu_has_feature(CPU_FTR_ARCH_300)) > - mask |= SZ_16M; > + mask |= SZ_16M | SZ_256M; > return mask; > } >
On Mon, 2018-07-02 at 07:42:05 UTC, Alexey Kardashevskiy wrote: > The sketchy bypass uses 256M pages so add this page size as well. > > This should cause no behavioral change but will be used later. > > Fixes: 477afd6ea6 "powerpc/ioda: Use ibm,supported-tce-sizes for IOMMU page size mask" > Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/00c376fdd7ed6cc083da3a3c51a63a cheers
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index 5bd0eb6..557c11d 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -2925,7 +2925,7 @@ static unsigned long pnv_ioda_parse_tce_sizes(struct pnv_phb *phb) /* Add 16M for POWER8 by default */ if (cpu_has_feature(CPU_FTR_ARCH_207S) && !cpu_has_feature(CPU_FTR_ARCH_300)) - mask |= SZ_16M; + mask |= SZ_16M | SZ_256M; return mask; }
The sketchy bypass uses 256M pages so add this page size as well. This should cause no behavioral change but will be used later. Fixes: 477afd6ea6 "powerpc/ioda: Use ibm,supported-tce-sizes for IOMMU page size mask" Signed-off-by: Alexey Kardashevskiy <aik@ozlabs.ru> --- arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)