On Wed, Nov 06, 2024 at 12:15:20PM -0400, Jason Gunthorpe wrote: > On Wed, Nov 06, 2024 at 03:53:23PM +0000, Will Deacon wrote: > > On Tue, 05 Nov 2024 14:14:23 -0400, Jason Gunthorpe wrote: > > > This is the result of the discussion on removing split. We agreed that > > > split is not required, and no application should ask for anything that > > > would not unmap a full large IOPTE. > > > > > > Instead of split the two ARM drivers will now WARN_ON and return 0. This > > > is in contrast to what several other drivers do of removing the whole > > > IOPTE and returning 0. > > > > > > [...] > > > > Applied to iommu (arm/smmu), thanks! > > > > [1/3] iommu/io-pgtable-arm: Remove split on unmap behavior > > https://git.kernel.org/iommu/c/33729a5fc0ca > > [2/3] iommu/io-pgtable-arm-v7s: Remove split on unmap behavior > > https://git.kernel.org/iommu/c/fd50651636fb > > [3/3] iommu: Add a kdoc to iommu_unmap() > > https://git.kernel.org/iommu/c/6ac7dffe7cca > > Thanks, can you add this hunk to fix the W=1 warning? > > --- a/drivers/iommu/io-pgtable-arm-v7s.c > +++ b/drivers/iommu/io-pgtable-arm-v7s.c > @@ -820,7 +820,7 @@ static int __init arm_v7s_do_selftests(void) > .pgsize_bitmap = SZ_4K | SZ_64K | SZ_1M | SZ_16M, > }; > unsigned int iova, size; > - unsigned int i, loopnr = 0; > + unsigned int i; > size_t mapped; > > selftest_running = true; > @@ -868,7 +868,6 @@ static int __init arm_v7s_do_selftests(void) > return __FAIL(ops); > > iova += SZ_16M; > - loopnr++; > } > > /* Full unmap */
I think I'd already folded that in, but please check! Will
