Commit b2dfeba6 authored by Robin Murphy's avatar Robin Murphy Committed by Will Deacon
Browse files

iommu/io-pgtable-arm-v7s: Add support for non-strict mode 



As for LPAE, it's simply a case of skipping the leaf invalidation for a
regular unmap, and ensuring that the one in split_blk_unmap() is paired
with an explicit sync ASAP rather than relying on one which might only
eventually happen way down the line.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 9662b99a

drivers/iommu/io-pgtable-arm-v7s.c

+10 −1
Original line number Original line Diff line number Diff line
@@ -587,6 +587,7 @@ static size_t arm_v7s_split_blk_unmap(struct arm_v7s_io_pgtable *data, 
	}

	}





	io_pgtable_tlb_add_flush(&data->iop, iova, size, size, true);

	io_pgtable_tlb_add_flush(&data->iop, iova, size, size, true);

	io_pgtable_tlb_sync(&data->iop);

	return size;

	return size;

}

}
@@ -642,6 +643,13 @@ static size_t __arm_v7s_unmap(struct arm_v7s_io_pgtable *data, 
				io_pgtable_tlb_sync(iop);

				io_pgtable_tlb_sync(iop);

				ptep = iopte_deref(pte[i], lvl);

				ptep = iopte_deref(pte[i], lvl);

				__arm_v7s_free_table(ptep, lvl + 1, data);

				__arm_v7s_free_table(ptep, lvl + 1, data);

			} else if (iop->cfg.quirks & IO_PGTABLE_QUIRK_NON_STRICT) {

				/*

				 * Order the PTE update against queueing the IOVA, to

				 * guarantee that a flush callback from a different CPU

				 * has observed it before the TLBIALL can be issued.

				 */

				smp_wmb();

			} else {

			} else {

				io_pgtable_tlb_add_flush(iop, iova, blk_size,

				io_pgtable_tlb_add_flush(iop, iova, blk_size,

							 blk_size, true);

							 blk_size, true);
@@ -712,7 +720,8 @@ static struct io_pgtable *arm_v7s_alloc_pgtable(struct io_pgtable_cfg *cfg, 
			    IO_PGTABLE_QUIRK_NO_PERMS |

			    IO_PGTABLE_QUIRK_NO_PERMS |

			    IO_PGTABLE_QUIRK_TLBI_ON_MAP |

			    IO_PGTABLE_QUIRK_TLBI_ON_MAP |

			    IO_PGTABLE_QUIRK_ARM_MTK_4GB |

			    IO_PGTABLE_QUIRK_ARM_MTK_4GB |

			    IO_PGTABLE_QUIRK_NO_DMA))

			    IO_PGTABLE_QUIRK_NO_DMA |

			    IO_PGTABLE_QUIRK_NON_STRICT))

		return NULL;

		return NULL;





	/* If ARM_MTK_4GB is enabled, the NO_PERMS is also expected. */

	/* If ARM_MTK_4GB is enabled, the NO_PERMS is also expected. */

CRA Git | Maintained and supported by SUSTech CRA and CCSE