diff options
author | Cho KyongHo <pullip.cho@samsung.com> | 2014-03-10 16:34:12 +0900 |
---|---|---|
committer | Tushar Behera <tushar.behera@linaro.org> | 2014-03-21 14:15:26 +0530 |
commit | e2a1924610750854763b86833c1d08b39459d141 (patch) | |
tree | 5083ffec369b870f885b8fca3cee5c7b4349e75b | |
parent | a847ce040211aa5c1c8664ed8449c7a48816e56c (diff) |
iommu/exynos: use simpler function to get MMU version
This commit changes the function to get MMU version simpler.
Signed-off-by: Cho KyongHo <pullip.cho@samsung.com>
-rw-r--r-- | drivers/iommu/exynos-iommu.c | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 6e716cc2d8aa..3d4dabbef2b8 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -251,24 +251,6 @@ static unsigned int __raw_sysmmu_version(struct sysmmu_drvdata *data) return MMU_RAW_VER(__raw_readl(data->sfrbase + REG_MMU_VERSION)); } -static unsigned int __sysmmu_version(struct sysmmu_drvdata *data, - unsigned int *minor) -{ - unsigned int ver = 0; - - ver = __raw_sysmmu_version(data); - if (ver > MAKE_MMU_VER(3, 3)) { - dev_err(data->sysmmu, "%s: version(%d.%d) is higher than 3.3\n", - __func__, MMU_MAJ_VER(ver), MMU_MIN_VER(ver)); - BUG(); - } - - if (minor) - *minor = MMU_MIN_VER(ver); - - return MMU_MAJ_VER(ver); -} - static bool sysmmu_block(void __iomem *sfrbase) { int i = 120; @@ -422,13 +404,13 @@ static bool __sysmmu_disable(struct sysmmu_drvdata *data) static void __sysmmu_init_config(struct sysmmu_drvdata *data) { unsigned int cfg = CFG_LRU | CFG_QOS(15); - int maj, min = 0; + unsigned int ver; - maj = __sysmmu_version(data, &min); - if (maj == 3) { - if (min >= 2) { + ver = __raw_sysmmu_version(data); + if (MMU_MAJ_VER(ver) == 3) { + if (MMU_MIN_VER(ver) >= 2) { cfg |= CFG_FLPDCACHE; - if (min == 3) { + if (MMU_MIN_VER(ver) == 3) { cfg |= CFG_ACGEN; cfg &= ~CFG_LRU; } else { @@ -583,7 +565,7 @@ static void sysmmu_tlb_invalidate_entry(struct device *dev, sysmmu_iova_t iova, * 1MB page can be cached in one of all sets. * 64KB page can be one of 16 consecutive sets. */ - if (__sysmmu_version(data, NULL) == 2) + if (MMU_MAJ_VER(__raw_sysmmu_version(data)) == 2) num_inv = min_t(unsigned int, size / PAGE_SIZE, 64); |