On Thu 17 Aug 05:56 PDT 2017, Joerg Roedel wrote:
> From: Joerg Roedel <jroedel@xxxxxxx>
>
> The map and unmap functions of the IOMMU-API changed their
> semantics: They do no longer guarantee that the hardware
> TLBs are synchronized with the page-table updates they made.
>
> To make conversion easier, new synchronized functions have
> been introduced which give these guarantees again until the
> code is converted to use the new TLB-flush interface of the
> IOMMU-API, which allows certain optimizations.
>
> But for now, just convert this code to use the synchronized
> functions so that it will behave as before.
>
> Cc: Ohad Ben-Cohen <ohad@xxxxxxxxxx>
> Cc: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
> Cc: linux-remoteproc@xxxxxxxxxxxxxxx
> Signed-off-by: Joerg Roedel <jroedel@xxxxxxx>
Acked-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx>
Regards,
Bjorn
> ---
> drivers/remoteproc/remoteproc_core.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c
> index 564061d..16db19c 100644
> --- a/drivers/remoteproc/remoteproc_core.c
> +++ b/drivers/remoteproc/remoteproc_core.c
> @@ -553,7 +553,8 @@ static int rproc_handle_devmem(struct rproc *rproc, struct fw_rsc_devmem *rsc,
> if (!mapping)
> return -ENOMEM;
>
> - ret = iommu_map(rproc->domain, rsc->da, rsc->pa, rsc->len, rsc->flags);
> + ret = iommu_map_sync(rproc->domain, rsc->da,
> + rsc->pa, rsc->len, rsc->flags);
> if (ret) {
> dev_err(dev, "failed to map devmem: %d\n", ret);
> goto out;
> @@ -661,8 +662,8 @@ static int rproc_handle_carveout(struct rproc *rproc,
> goto dma_free;
> }
>
> - ret = iommu_map(rproc->domain, rsc->da, dma, rsc->len,
> - rsc->flags);
> + ret = iommu_map_sync(rproc->domain, rsc->da, dma, rsc->len,
> + rsc->flags);
> if (ret) {
> dev_err(dev, "iommu_map failed: %d\n", ret);
> goto free_mapping;
> @@ -823,7 +824,8 @@ static void rproc_resource_cleanup(struct rproc *rproc)
> list_for_each_entry_safe(entry, tmp, &rproc->mappings, node) {
> size_t unmapped;
>
> - unmapped = iommu_unmap(rproc->domain, entry->da, entry->len);
> + unmapped = iommu_unmap_sync(rproc->domain, entry->da,
> + entry->len);
> if (unmapped != entry->len) {
> /* nothing much to do besides complaining */
> dev_err(dev, "failed to unmap %u/%zu\n", entry->len,
> --
> 2.7.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-remoteproc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
