mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
iommu/exynos: Don't read version register on every tlb operation
This patch removes reading of REG_MMU_VERSION register on every tlb operation and caches SYSMMU version in driver's internal data. Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com> Tested-by: Javier Martinez Canillas <javier.martinez@collabora.co.uk> Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
parent
d7ef9995f1
commit
512bd0c6cc
1 changed files with 5 additions and 8 deletions
|
@ -213,6 +213,7 @@ struct sysmmu_drvdata {
|
|||
spinlock_t lock;
|
||||
struct iommu_domain *domain;
|
||||
phys_addr_t pgtable;
|
||||
unsigned int version;
|
||||
};
|
||||
|
||||
static struct exynos_iommu_domain *to_exynos_domain(struct iommu_domain *dom)
|
||||
|
@ -244,11 +245,6 @@ static void sysmmu_unblock(void __iomem *sfrbase)
|
|||
__raw_writel(CTRL_ENABLE, sfrbase + REG_MMU_CTRL);
|
||||
}
|
||||
|
||||
static unsigned int __raw_sysmmu_version(struct sysmmu_drvdata *data)
|
||||
{
|
||||
return MMU_RAW_VER(__raw_readl(data->sfrbase + REG_MMU_VERSION));
|
||||
}
|
||||
|
||||
static bool sysmmu_block(void __iomem *sfrbase)
|
||||
{
|
||||
int i = 120;
|
||||
|
@ -408,7 +404,7 @@ static void __sysmmu_init_config(struct sysmmu_drvdata *data)
|
|||
unsigned int cfg = CFG_LRU | CFG_QOS(15);
|
||||
unsigned int ver;
|
||||
|
||||
ver = __raw_sysmmu_version(data);
|
||||
ver = MMU_RAW_VER(__raw_readl(data->sfrbase + REG_MMU_VERSION));
|
||||
if (MMU_MAJ_VER(ver) == 3) {
|
||||
if (MMU_MIN_VER(ver) >= 2) {
|
||||
cfg |= CFG_FLPDCACHE;
|
||||
|
@ -422,6 +418,7 @@ static void __sysmmu_init_config(struct sysmmu_drvdata *data)
|
|||
}
|
||||
|
||||
__raw_writel(cfg, data->sfrbase + REG_MMU_CFG);
|
||||
data->version = ver;
|
||||
}
|
||||
|
||||
static void __sysmmu_enable_nocount(struct sysmmu_drvdata *data)
|
||||
|
@ -531,7 +528,7 @@ static bool exynos_sysmmu_disable(struct device *dev)
|
|||
static void __sysmmu_tlb_invalidate_flpdcache(struct sysmmu_drvdata *data,
|
||||
sysmmu_iova_t iova)
|
||||
{
|
||||
if (__raw_sysmmu_version(data) == MAKE_MMU_VER(3, 3))
|
||||
if (data->version == MAKE_MMU_VER(3, 3))
|
||||
__raw_writel(iova | 0x1, data->sfrbase + REG_MMU_FLUSH_ENTRY);
|
||||
}
|
||||
|
||||
|
@ -580,7 +577,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 (MMU_MAJ_VER(__raw_sysmmu_version(data)) == 2)
|
||||
if (MMU_MAJ_VER(data->version) == 2)
|
||||
num_inv = min_t(unsigned int, size / PAGE_SIZE, 64);
|
||||
|
||||
if (sysmmu_block(data->sfrbase)) {
|
||||
|
|
Loading…
Reference in a new issue