UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

iommu/exynos: Remove custom fault handler 

This commit removes custom fault handler. The device drivers that
need to register fault handler can register
with iommu_set_fault_handler().

CC: Grant Grundler <grundler@chromium.org>
Signed-off-by: Cho KyongHo <pullip.cho@samsung.com>
Signed-off-by: Shaik Ameer Basha <shaik.ameer@samsung.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Cho KyongHo 2014-05-12 11:44:56 +05:30 committed by Joerg Roedel
parent 7060587052
commit 1fab7fa723
1 changed files with 24 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
drivers/iommu/exynos-iommu.c
View File

@ -125,16 +125,6 @@ enum exynos_sysmmu_inttype {
SYSMMU_FAULTS_NUM SYSMMU_FAULTS_NUM
}; };
/*
* @itype: type of fault.
* @pgtable_base: the physical address of page table base. This is 0 if @itype
* is SYSMMU_BUSERROR.
* @fault_addr: the device (virtual) address that the System MMU tried to
* translated. This is 0 if @itype is SYSMMU_BUSERROR.
*/
typedef int (*sysmmu_fault_handler_t)(enum exynos_sysmmu_inttype itype,
phys_addr_t pgtable_base, unsigned long fault_addr);
static unsigned short fault_reg_offset[SYSMMU_FAULTS_NUM] = { static unsigned short fault_reg_offset[SYSMMU_FAULTS_NUM] = {
REG_PAGE_FAULT_ADDR, REG_PAGE_FAULT_ADDR,
REG_AR_FAULT_ADDR, REG_AR_FAULT_ADDR,
@ -176,7 +166,6 @@ struct sysmmu_drvdata {
int activations; int activations;
rwlock_t lock; rwlock_t lock;
struct iommu_domain *domain; struct iommu_domain *domain;
sysmmu_fault_handler_t fault_handler;
phys_addr_t pgtable; phys_addr_t pgtable;
}; };
@ -245,25 +234,8 @@ static void __sysmmu_set_ptbase(void __iomem *sfrbase,
__sysmmu_tlb_invalidate(sfrbase); __sysmmu_tlb_invalidate(sfrbase);
} }
static void __set_fault_handler(struct sysmmu_drvdata *data, static void show_fault_information(const char *name,
sysmmu_fault_handler_t handler) enum exynos_sysmmu_inttype itype,
{
unsigned long flags;
write_lock_irqsave(&data->lock, flags);
data->fault_handler = handler;
write_unlock_irqrestore(&data->lock, flags);
}
void exynos_sysmmu_set_fault_handler(struct device *dev,
sysmmu_fault_handler_t handler)
{
struct sysmmu_drvdata *data = dev_get_drvdata(dev->archdata.iommu);
__set_fault_handler(data, handler);
}
static int default_fault_handler(enum exynos_sysmmu_inttype itype,
phys_addr_t pgtable_base, unsigned long fault_addr) phys_addr_t pgtable_base, unsigned long fault_addr)
{ {
unsigned long *ent; unsigned long *ent;
@ -271,8 +243,8 @@ static int default_fault_handler(enum exynos_sysmmu_inttype itype,
if ((itype >= SYSMMU_FAULTS_NUM) || (itype < SYSMMU_PAGEFAULT)) if ((itype >= SYSMMU_FAULTS_NUM) || (itype < SYSMMU_PAGEFAULT))
itype = SYSMMU_FAULT_UNKNOWN; itype = SYSMMU_FAULT_UNKNOWN;
pr_err("%s occurred at 0x%lx(Page table base: %pa)\n", pr_err("%s occurred at %#lx by %s(Page table base: %pa)\n",
sysmmu_fault_name[itype], fault_addr, &pgtable_base); sysmmu_fault_name[itype], fault_addr, name, &pgtable_base);
ent = section_entry(phys_to_virt(pgtable_base), fault_addr); ent = section_entry(phys_to_virt(pgtable_base), fault_addr);
pr_err("\tLv1 entry: 0x%lx\n", *ent); pr_err("\tLv1 entry: 0x%lx\n", *ent);
@ -281,12 +253,6 @@ static int default_fault_handler(enum exynos_sysmmu_inttype itype,
ent = page_entry(ent, fault_addr); ent = page_entry(ent, fault_addr);
pr_err("\t Lv2 entry: 0x%lx\n", *ent); pr_err("\t Lv2 entry: 0x%lx\n", *ent);
} }
pr_err("Generating Kernel OOPS... because it is unrecoverable.\n");
BUG();
return 0;
} }
static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id) static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id)
@ -310,23 +276,27 @@ static irqreturn_t exynos_sysmmu_irq(int irq, void *dev_id)
else else
addr = __raw_readl(data->sfrbase + fault_reg_offset[itype]); addr = __raw_readl(data->sfrbase + fault_reg_offset[itype]);
if (itype == SYSMMU_FAULT_UNKNOWN) {
pr_err("%s: Fault is not occurred by System MMU '%s'!\n",
__func__, dev_name(data->sysmmu));
pr_err("%s: Please check if IRQ is correctly configured.\n",
__func__);
BUG();
} else {
unsigned long base =
__raw_readl(data->sfrbase + REG_PT_BASE_ADDR);
show_fault_information(dev_name(data->sysmmu),
itype, base, addr);
if (data->domain) if (data->domain)
ret = report_iommu_fault(data->domain, data->dev, addr, itype); ret = report_iommu_fault(data->domain,
data->dev, addr, itype);
if ((ret == -ENOSYS) && data->fault_handler) {
unsigned long base = data->pgtable;
if (itype != SYSMMU_FAULT_UNKNOWN)
base = __raw_readl(data->sfrbase + REG_PT_BASE_ADDR);
ret = data->fault_handler(itype, base, addr);
} }
if (!ret && (itype != SYSMMU_FAULT_UNKNOWN)) /* fault is not recovered by fault handler */
__raw_writel(1 << itype, data->sfrbase + REG_INT_CLEAR); BUG_ON(ret != 0);
else
dev_dbg(data->sysmmu, "%s is not handled.\n", __raw_writel(1 << itype, data->sfrbase + REG_INT_CLEAR);
sysmmu_fault_name[itype]);
if (itype != SYSMMU_FAULT_UNKNOWN)
sysmmu_unblock(data->sfrbase); sysmmu_unblock(data->sfrbase);
if (!IS_ERR(data->clk_master)) if (!IS_ERR(data->clk_master))
@ -576,8 +546,6 @@ static int exynos_sysmmu_probe(struct platform_device *pdev)
rwlock_init(&data->lock); rwlock_init(&data->lock);
INIT_LIST_HEAD(&data->node); INIT_LIST_HEAD(&data->node);
__set_fault_handler(data, &default_fault_handler);
platform_set_drvdata(pdev, data); platform_set_drvdata(pdev, data);
pm_runtime_enable(dev); pm_runtime_enable(dev);