AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-17 10:59:01 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

iommu/rockchip: Request irqs in rk_iommu_probe()

Browse Source 
Move request_irq to the end of rk_iommu_probe().

Suggested-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Acked-by: Robin Murphy <robin.murphy@arm.com>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Jeffy Chen 2018-03-23 15:38:03 +08:00 committed by Joerg Roedel
parent 6d9ffaad7e
commit d0b912bd4c
1 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
drivers/iommu/rockchip-iommu.c
View File

@ -90,8 +90,6 @@ struct rk_iommu {
struct device *dev; struct device *dev;
void __iomem **bases; void __iomem **bases;
int num_mmu; int num_mmu;
int *irq;
int num_irq;
bool reset_disabled; bool reset_disabled;
struct iommu_device iommu; struct iommu_device iommu;
struct list_head node; /* entry in rk_iommu_domain.iommus */ struct list_head node; /* entry in rk_iommu_domain.iommus */
@ -830,13 +828,6 @@ static int rk_iommu_attach_device(struct iommu_domain *domain,
iommu->domain = domain; iommu->domain = domain;
for (i = 0; i < iommu->num_irq; i++) {
ret = devm_request_irq(iommu->dev, iommu->irq[i], rk_iommu_irq,
IRQF_SHARED, dev_name(dev), iommu);
if (ret)
return ret;
}
for (i = 0; i < iommu->num_mmu; i++) { for (i = 0; i < iommu->num_mmu; i++) {
rk_iommu_write(iommu->bases[i], RK_MMU_DTE_ADDR, rk_iommu_write(iommu->bases[i], RK_MMU_DTE_ADDR,
rk_domain->dt_dma); rk_domain->dt_dma);
@ -885,9 +876,6 @@ static void rk_iommu_detach_device(struct iommu_domain *domain,
} }
rk_iommu_disable_stall(iommu); rk_iommu_disable_stall(iommu);
for (i = 0; i < iommu->num_irq; i++)
devm_free_irq(iommu->dev, iommu->irq[i], iommu);
iommu->domain = NULL; iommu->domain = NULL;
dev_dbg(dev, "Detached from iommu domain\n"); dev_dbg(dev, "Detached from iommu domain\n");
@ -1138,7 +1126,7 @@ static int rk_iommu_probe(struct platform_device *pdev)
struct rk_iommu *iommu; struct rk_iommu *iommu;
struct resource *res; struct resource *res;
int num_res = pdev->num_resources; int num_res = pdev->num_resources;
int err, i; int err, i, irq;
iommu = devm_kzalloc(dev, sizeof(*iommu), GFP_KERNEL); iommu = devm_kzalloc(dev, sizeof(*iommu), GFP_KERNEL);
if (!iommu) if (!iommu)
@ -1165,23 +1153,15 @@ static int rk_iommu_probe(struct platform_device *pdev)
if (iommu->num_mmu == 0) if (iommu->num_mmu == 0)
return PTR_ERR(iommu->bases[0]); return PTR_ERR(iommu->bases[0]);
iommu->num_irq = platform_irq_count(pdev); i = 0;
if (iommu->num_irq < 0) while ((irq = platform_get_irq(pdev, i++)) != -ENXIO) {
return iommu->num_irq; if (irq < 0)
if (iommu->num_irq == 0) return irq;
return -ENXIO;
iommu->irq = devm_kcalloc(dev, iommu->num_irq, sizeof(*iommu->irq), err = devm_request_irq(iommu->dev, irq, rk_iommu_irq,
GFP_KERNEL); IRQF_SHARED, dev_name(dev), iommu);
if (!iommu->irq) if (err)
return -ENOMEM; return err;
for (i = 0; i < iommu->num_irq; i++) {
iommu->irq[i] = platform_get_irq(pdev, i);
if (iommu->irq[i] < 0) {
dev_err(dev, "Failed to get IRQ, %d\n", iommu->irq[i]);
return -ENXIO;
}
} }
iommu->reset_disabled = device_property_read_bool(dev, iommu->reset_disabled = device_property_read_bool(dev,