diff options
| author | Bjorn Andersson <bjorn.andersson@linaro.org> | 2020-07-08 22:01:43 -0700 |
|---|---|---|
| committer | Vinod Koul <vkoul@kernel.org> | 2020-09-02 10:56:16 +0530 |
| commit | 827c88c6eeea3115a4b2a306499eadde6cdc43cb (patch) | |
| tree | 8e4b3679ddcc64ca87528972dcf87c8c7a4312e9 | |
| parent | 8bcaaba0bcfd05adeb4c294c63fd347aebbb93f2 (diff) | |
iommu/arm-smmu: Move SMR and S2CR definitions to header file
Expose the SMR and S2CR structs in the header file, to allow platform
specific implementations to populate/initialize the smrs and s2cr
arrays.
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Message-Id: <20200709050145.3520931-4-bjorn.andersson@linaro.org>
Signed-off-by: Vinod Koul <vkoul@kernel.org>
| -rw-r--r-- | drivers/iommu/arm/arm-smmu/arm-smmu.c | 14 | ||||
| -rw-r--r-- | drivers/iommu/arm/arm-smmu/arm-smmu.h | 15 |
2 files changed, 15 insertions, 14 deletions
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c index 4d8a5f386200..38f745430fce 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c @@ -65,24 +65,10 @@ 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."); -struct arm_smmu_s2cr { - struct iommu_group *group; - int count; - enum arm_smmu_s2cr_type type; - enum arm_smmu_s2cr_privcfg privcfg; - u8 cbndx; -}; - #define s2cr_init_val (struct arm_smmu_s2cr){ \ .type = disable_bypass ? S2CR_TYPE_FAULT : S2CR_TYPE_BYPASS, \ } -struct arm_smmu_smr { - u16 mask; - u16 id; - bool valid; -}; - struct arm_smmu_cb { u64 ttbr[2]; u32 tcr[2]; diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.h b/drivers/iommu/arm/arm-smmu/arm-smmu.h index e6698270f0b9..014ad7fdb5ea 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu.h +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.h @@ -254,6 +254,21 @@ enum arm_smmu_implementation { QCOM_SMMUV2, }; +struct arm_smmu_s2cr { + struct iommu_group *group; + int count; + enum arm_smmu_s2cr_type type; + enum arm_smmu_s2cr_privcfg privcfg; + u8 cbndx; +}; + +struct arm_smmu_smr { + u16 mask; + u16 id; + bool valid; + bool pinned; +}; + struct arm_smmu_device { struct device *dev; |