From: Magnus Damm <damm+rene...@opensource.se>

Introduce support for two bit SL0 bitfield in IMTTBCR
by using a separate feature flag.

Signed-off-by: Magnus Damm <damm+rene...@opensource.se>
---

 Changes since V3:
 - None

 Changes since V2:
 - None

 Changes since V1:
 - None

 drivers/iommu/ipmmu-vmsa.c |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

--- 0027/drivers/iommu/ipmmu-vmsa.c
+++ work/drivers/iommu/ipmmu-vmsa.c     2017-06-19 14:08:26.100607110 +0900
@@ -40,6 +40,7 @@ struct ipmmu_features {
        bool has_cache_leaf_nodes;
        unsigned int number_of_contexts;
        bool setup_imbuscr;
+       bool twobit_imttbcr_sl0;
 };
 
 struct ipmmu_vmsa_device {
@@ -149,6 +150,10 @@ static struct ipmmu_vmsa_iommu_priv *to_
 #define IMTTBCR_TSZ0_MASK              (7 << 0)
 #define IMTTBCR_TSZ0_SHIFT             O
 
+#define IMTTBCR_SL0_TWOBIT_LVL_3       (0 << 6)
+#define IMTTBCR_SL0_TWOBIT_LVL_2       (1 << 6)
+#define IMTTBCR_SL0_TWOBIT_LVL_1       (2 << 6)
+
 #define IMBUSCR                                0x000c
 #define IMBUSCR_DVM                    (1 << 2)
 #define IMBUSCR_BUSSEL_SYS             (0 << 0)
@@ -393,6 +398,7 @@ static int ipmmu_domain_allocate_context
 static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain)
 {
        u64 ttbr;
+       u32 tmp;
        int ret;
 
        /*
@@ -445,9 +451,14 @@ static int ipmmu_domain_init_context(str
         * We use long descriptors with inner-shareable WBWA tables and allocate
         * the whole 32-bit VA space to TTBR0.
         */
+       if (domain->root->features->twobit_imttbcr_sl0)
+               tmp = IMTTBCR_SL0_TWOBIT_LVL_1;
+       else
+               tmp = IMTTBCR_SL0_LVL_1;
+
        ipmmu_ctx_write_root(domain, IMTTBCR, IMTTBCR_EAE |
                             IMTTBCR_SH0_INNER_SHAREABLE | IMTTBCR_ORGN0_WB_WA |
-                            IMTTBCR_IRGN0_WB_WA | IMTTBCR_SL0_LVL_1);
+                            IMTTBCR_IRGN0_WB_WA | tmp);
 
        /* MAIR0 */
        ipmmu_ctx_write_root(domain, IMMAIR0,
@@ -989,6 +1000,7 @@ static const struct ipmmu_features ipmmu
        .has_cache_leaf_nodes = false,
        .number_of_contexts = 1, /* software only tested with one context */
        .setup_imbuscr = true,
+       .twobit_imttbcr_sl0 = false,
 };
 
 static const struct of_device_id ipmmu_of_ids[] = {
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Reply via email to