From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jordan Crouse Subject: [RFC PATCH v1 03/15] iommu/io-pgtable: Allow TLB operations to be optional Date: Fri, 1 Mar 2019 12:38:25 -0700 Message-ID: <1551469117-3404-4-git-send-email-jcrouse@codeaurora.org> References: <1551469117-3404-1-git-send-email-jcrouse@codeaurora.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1551469117-3404-1-git-send-email-jcrouse-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: freedreno-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Sender: "Freedreno" To: freedreno-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org Cc: jean-philippe.brucker-5wv7dgnIgG8@public.gmane.org, linux-arm-msm-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Joerg Roedel , linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org, dianders-uWgjrcJnOmJ4cg9Nei1l7Q@public.gmane.org, hoegsberg-hpIqsD4AKlfQT0dZR+AlfA@public.gmane.org, baolu.lu-VuQAYsv1563Yd54FQh9/CA@public.gmane.org List-Id: linux-arm-msm@vger.kernel.org QW4gdXBjb21pbmcgY2hhbmdlIHRvIGFybS1zbW11IHdpbGwgYWRkIGF1eGlsaWFyeSBkb21haW5z IHRoYXQgd2lsbCBhbGxvdwphIGxlYWYgZHJpdmVyIHRvIGNyZWF0ZSBhbmQgbWFwIGFkZGl0aW9u YWwgcGFnZXRhYmxlcyBmb3IgZGV2aWNlCnNwZWNpZmljIHVzZXMuIEJ5IGRlZmluaXRpb24gYXV4 IGFybS1zbW11IGRvbWFpbnMgd2lsbCBub3QgYmUgYWxsb3dlZAp0byB0b3VjaCB0aGUgaGFyZHdh cmUgZGlyZWN0bHkgc28gYWxsb3cgZm9yIHRoZSBUTEIgb3BlcmF0aW9ucyBmb3IKYSBnaXZlbiBw YWdldGFibGUgY29uZmlndXJhdGlvbiB0byBiZSBOVUxMIGp1c3QgaW4gY2FzZSB0aGUgY2FsbGVy CmFjY2lkZW50YWxseSBjYWxscyBmb3IgYSBmbHVzaCB3aXRoIHRoZSB3cm9uZyBkZXZpY2UuCgpT aWduZWQtb2ZmLWJ5OiBKb3JkYW4gQ3JvdXNlIDxqY3JvdXNlQGNvZGVhdXJvcmEub3JnPgotLS0K CiBkcml2ZXJzL2lvbW11L2lvLXBndGFibGUuaCB8IDEwICsrKysrKystLS0KIDEgZmlsZSBjaGFu Z2VkLCA3IGluc2VydGlvbnMoKyksIDMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZHJpdmVy cy9pb21tdS9pby1wZ3RhYmxlLmggYi9kcml2ZXJzL2lvbW11L2lvLXBndGFibGUuaAppbmRleCA0 N2Q1YWU1Li5mYmZkM2M5IDEwMDY0NAotLS0gYS9kcml2ZXJzL2lvbW11L2lvLXBndGFibGUuaAor KysgYi9kcml2ZXJzL2lvbW11L2lvLXBndGFibGUuaApAQCAtMTc4LDE4ICsxNzgsMjIgQEAgc3Ry dWN0IGlvX3BndGFibGUgewogCiBzdGF0aWMgaW5saW5lIHZvaWQgaW9fcGd0YWJsZV90bGJfZmx1 c2hfYWxsKHN0cnVjdCBpb19wZ3RhYmxlICppb3ApCiB7Ci0JaW9wLT5jZmcudGxiLT50bGJfZmx1 c2hfYWxsKGlvcC0+Y29va2llKTsKKwlpZiAoaW9wLT5jZmcudGxiKQorCQlpb3AtPmNmZy50bGIt PnRsYl9mbHVzaF9hbGwoaW9wLT5jb29raWUpOwogfQogCiBzdGF0aWMgaW5saW5lIHZvaWQgaW9f cGd0YWJsZV90bGJfYWRkX2ZsdXNoKHN0cnVjdCBpb19wZ3RhYmxlICppb3AsCiAJCXVuc2lnbmVk IGxvbmcgaW92YSwgc2l6ZV90IHNpemUsIHNpemVfdCBncmFudWxlLCBib29sIGxlYWYpCiB7Ci0J aW9wLT5jZmcudGxiLT50bGJfYWRkX2ZsdXNoKGlvdmEsIHNpemUsIGdyYW51bGUsIGxlYWYsIGlv cC0+Y29va2llKTsKKwlpZiAoaW9wLT5jZmcudGxiKQorCQlpb3AtPmNmZy50bGItPnRsYl9hZGRf Zmx1c2goaW92YSwgc2l6ZSwgZ3JhbnVsZSwgbGVhZiwKKwkJCWlvcC0+Y29va2llKTsKIH0KIAog c3RhdGljIGlubGluZSB2b2lkIGlvX3BndGFibGVfdGxiX3N5bmMoc3RydWN0IGlvX3BndGFibGUg KmlvcCkKIHsKLQlpb3AtPmNmZy50bGItPnRsYl9zeW5jKGlvcC0+Y29va2llKTsKKwlpZiAoaW9w LT5jZmcudGxiKQorCQlpb3AtPmNmZy50bGItPnRsYl9zeW5jKGlvcC0+Y29va2llKTsKIH0KIAog LyoqCi0tIAoyLjcuNAoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KRnJlZWRyZW5vIG1haWxpbmcgbGlzdApGcmVlZHJlbm9AbGlzdHMuZnJlZWRlc2t0b3Au b3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vZnJlZWRy ZW5v From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D8BBC43381 for ; Fri, 1 Mar 2019 19:38:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 067782070B for ; Fri, 1 Mar 2019 19:38:54 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="OHyw6Dfj"; dkim=fail reason="key not found in DNS" (0-bit key) header.d=codeaurora.org header.i=@codeaurora.org header.b="iS0+5jQG" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726913AbfCATix (ORCPT ); Fri, 1 Mar 2019 14:38:53 -0500 Received: from smtp.codeaurora.org ([198.145.29.96]:38574 "EHLO smtp.codeaurora.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725958AbfCATiu (ORCPT ); Fri, 1 Mar 2019 14:38:50 -0500 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id 59CA16137D; Fri, 1 Mar 2019 19:38:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1551469129; bh=yiM3MHxtEWnuKGlpNzeBQzZIjM/3LSdBrGjOjD3denE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OHyw6DfjBkaBgLxeHlOi1ips/LncsNAdmVJ1W/lfLbYsxryGcWo+bU4GT2nQlrA4y nPTMtSJEYBjZ/XbJO8hyxK+w4v8u0KRPlXysoOnPYuHbNBPCgaOPKKSzhJQF4bX5Ky LpYzLT+1ddIw/rkxc2EwAli+j6DWGnr+XoXaDErI= Received: from jcrouse1-lnx.qualcomm.com (i-global254.qualcomm.com [199.106.103.254]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: jcrouse@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 6C0A66118F; Fri, 1 Mar 2019 19:38:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1551469127; bh=yiM3MHxtEWnuKGlpNzeBQzZIjM/3LSdBrGjOjD3denE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iS0+5jQGHS7NSjotRfx0f6XPrg4BdV9K/8qxL3jpIylLxaMaW6AL90uuUylwgk33H 1bicE/EzGjmqeT5pawvYXgjVnJkLUGwM2DpNPUxFaUF9DM0WBfxHpukNy4VnEzCOcm 7ff1qyO3DdsI4QRQu27s7GRISKAZ20wbHc1reuuI= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 6C0A66118F Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=jcrouse@codeaurora.org From: Jordan Crouse To: freedreno@lists.freedesktop.org Cc: jean-philippe.brucker@arm.com, linux-arm-msm@vger.kernel.org, dianders@chromimum.org, hoegsberg@google.com, baolu.lu@linux.intel.com, iommu@lists.linux-foundation.org, Joerg Roedel , linux-kernel@vger.kernel.org Subject: [RFC PATCH v1 03/15] iommu/io-pgtable: Allow TLB operations to be optional Date: Fri, 1 Mar 2019 12:38:25 -0700 Message-Id: <1551469117-3404-4-git-send-email-jcrouse@codeaurora.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1551469117-3404-1-git-send-email-jcrouse@codeaurora.org> References: <1551469117-3404-1-git-send-email-jcrouse@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org An upcoming change to arm-smmu will add auxiliary domains that will allow a leaf driver to create and map additional pagetables for device specific uses. By definition aux arm-smmu domains will not be allowed to touch the hardware directly so allow for the TLB operations for a given pagetable configuration to be NULL just in case the caller accidentally calls for a flush with the wrong device. Signed-off-by: Jordan Crouse --- drivers/iommu/io-pgtable.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/io-pgtable.h b/drivers/iommu/io-pgtable.h index 47d5ae5..fbfd3c9 100644 --- a/drivers/iommu/io-pgtable.h +++ b/drivers/iommu/io-pgtable.h @@ -178,18 +178,22 @@ struct io_pgtable { static inline void io_pgtable_tlb_flush_all(struct io_pgtable *iop) { - iop->cfg.tlb->tlb_flush_all(iop->cookie); + if (iop->cfg.tlb) + iop->cfg.tlb->tlb_flush_all(iop->cookie); } static inline void io_pgtable_tlb_add_flush(struct io_pgtable *iop, unsigned long iova, size_t size, size_t granule, bool leaf) { - iop->cfg.tlb->tlb_add_flush(iova, size, granule, leaf, iop->cookie); + if (iop->cfg.tlb) + iop->cfg.tlb->tlb_add_flush(iova, size, granule, leaf, + iop->cookie); } static inline void io_pgtable_tlb_sync(struct io_pgtable *iop) { - iop->cfg.tlb->tlb_sync(iop->cookie); + if (iop->cfg.tlb) + iop->cfg.tlb->tlb_sync(iop->cookie); } /** -- 2.7.4