Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933810AbeAKPrb (ORCPT + 1 other); Thu, 11 Jan 2018 10:47:31 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:33306 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754418AbeAKPra (ORCPT ); Thu, 11 Jan 2018 10:47:30 -0500 Subject: Re: [PATCH 2/9] iommu/rockchip: Fix error handling in attach To: Jeffy Chen , linux-kernel@vger.kernel.org Cc: jcliang@chromium.org, tfiga@chromium.org, Heiko Stuebner , linux-rockchip@lists.infradead.org, iommu@lists.linux-foundation.org, Joerg Roedel , linux-arm-kernel@lists.infradead.org References: <20180111082229.24011-1-jeffy.chen@rock-chips.com> <20180111082229.24011-3-jeffy.chen@rock-chips.com> From: Robin Murphy Message-ID: <427ecf29-2024-b746-c567-903c1ce02e75@arm.com> Date: Thu, 11 Jan 2018 15:47:27 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <20180111082229.24011-3-jeffy.chen@rock-chips.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-GB Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: On 11/01/18 08:22, Jeffy Chen wrote: > From: Tomasz Figa > > Currently if the driver encounters an error while attaching device, it > will leave the IOMMU in an inconsistent state. Even though it shouldn't > really happen in reality, let's just add proper error path to keep > things consistent. > > Signed-off-by: Tomasz Figa > Signed-off-by: Jeffy Chen > --- > > drivers/iommu/rockchip-iommu.c | 26 +++++++++++++++++--------- > 1 file changed, 17 insertions(+), 9 deletions(-) > > diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c > index 9d991c2d8767..ee805e1dfba7 100644 > --- a/drivers/iommu/rockchip-iommu.c > +++ b/drivers/iommu/rockchip-iommu.c > @@ -826,17 +826,10 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, > > ret = rk_iommu_force_reset(iommu); > if (ret) > - return ret; > + goto err_disable_stall; > > 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++) { > rk_iommu_write(iommu->bases[i], RK_MMU_DTE_ADDR, > rk_domain->dt_dma); > @@ -844,9 +837,16 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, > rk_iommu_write(iommu->bases[i], RK_MMU_INT_MASK, RK_MMU_IRQ_MASK); > } > > + 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); Why aren't we simply requesting the IRQ once in rk_iommu_probe()? Given that the hardware doesn't handle multiple translation contexts, there doesn't seem to be much point in being this dynamic about it. Robin. > + if (ret) > + goto err_free_irq; > + } > + > ret = rk_iommu_enable_paging(iommu); > if (ret) > - return ret; > + goto err_free_irq; > > spin_lock_irqsave(&rk_domain->iommus_lock, flags); > list_add_tail(&iommu->node, &rk_domain->iommus); > @@ -857,6 +857,14 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, > rk_iommu_disable_stall(iommu); > > return 0; > + > +err_free_irq: > + while (i--) > + devm_free_irq(iommu->dev, iommu->irq[i], iommu); > +err_disable_stall: > + rk_iommu_disable_stall(iommu); > + > + return ret; > } > > static void rk_iommu_detach_device(struct iommu_domain *domain, >