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

Commit f66e9c32 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "iommu: arm-smmu: Disable bypass mode by default"" into msm-4.8

parents 4f6829d2 a728cfdc

drivers/iommu/arm-smmu.c

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ static int force_stage; 
module_param(force_stage, int, S_IRUGO);

MODULE_PARM_DESC(force_stage,

	"Force SMMU mappings to be installed at a particular stage of translation. A value of '1' or '2' forces the corresponding stage. All other values are ignored (i.e. no stage is forced). Note that selecting a specific stage will disable support for nested translation.");

static bool disable_bypass = 1;

static bool disable_bypass;

module_param(disable_bypass, bool, S_IRUGO);

MODULE_PARM_DESC(disable_bypass,

	"Disable bypass streams such that incoming transactions from devices that are not attached to an iommu domain will report an abort back to the device and will not be allowed to pass through the SMMU.");