Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d1f5d9f7 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu: msm: actually disable L2 redirect when CONFIG_IOMMU_PGTABLES_L2=n"

parents c7e720ae 55f4a14f

drivers/iommu/msm_iommu-v0.c

+7 −1
Original line number Diff line number Diff line
@@ -424,6 +424,12 @@ static void __program_context(struct msm_iommu_drvdata *iommu_drvdata, 
	msm_iommu_remote_spin_unlock(iommu_drvdata->needs_rem_spinlock);

}



#ifdef CONFIG_IOMMU_PGTABLES_L2

#define INITIAL_REDIRECT_VAL 1

#else

#define INITIAL_REDIRECT_VAL 0

#endif



static int msm_iommu_domain_init(struct iommu_domain *domain)

{

	struct msm_iommu_priv *priv = kzalloc(sizeof(*priv), GFP_KERNEL);
@@ -438,7 +444,7 @@ static int msm_iommu_domain_init(struct iommu_domain *domain) 
	if (!priv->pt.fl_table)

		goto fail_nomem;



	priv->pt.redirect = 1;

	priv->pt.redirect = INITIAL_REDIRECT_VAL;



	memset(priv->pt.fl_table, 0, SZ_16K);

	domain->priv = priv;

drivers/iommu/msm_iommu-v1.c

+7 −1
Original line number Diff line number Diff line
@@ -740,6 +740,12 @@ static void __program_context(struct msm_iommu_drvdata *iommu_drvdata, 
	mb();

}



#ifdef CONFIG_IOMMU_PGTABLES_L2

#define INITIAL_REDIRECT_VAL 1

#else

#define INITIAL_REDIRECT_VAL 0

#endif



static int msm_iommu_domain_init(struct iommu_domain *domain)

{

	struct msm_iommu_priv *priv;
@@ -748,7 +754,7 @@ static int msm_iommu_domain_init(struct iommu_domain *domain) 
	if (!priv)

		goto fail_nomem;



	priv->pt.redirect = 1;

	priv->pt.redirect = INITIAL_REDIRECT_VAL;



	INIT_LIST_HEAD(&priv->list_attached);

	if (msm_iommu_pagetable_alloc(&priv->pt))