From: Jeffy Chen <jeffy.chen@rock-chips.com> To: linux-kernel@vger.kernel.org Cc: jcliang@chromium.org, robin.murphy@arm.com, xxm@rock-chips.com, tfiga@chromium.org, Jeffy Chen <jeffy.chen@rock-chips.com>, Heiko Stuebner <heiko@sntech.de>, linux-rockchip@lists.infradead.org, iommu@lists.linux-foundation.org, Joerg Roedel <joro@8bytes.org>, linux-arm-kernel@lists.infradead.org Subject: [RESEND PATCH v6 04/14] iommu/rockchip: Fix error handling in attach Date: Thu, 1 Mar 2018 18:18:27 +0800 [thread overview] Message-ID: <20180301101837.27969-5-jeffy.chen@rock-chips.com> (raw) In-Reply-To: <20180301101837.27969-1-jeffy.chen@rock-chips.com> From: Tomasz Figa <tfiga@chromium.org> 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 <tfiga@chromium.org> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Reviewed-by: Robin Murphy <robin.murphy@arm.com> --- Changes in v6: None Changes in v5: Use out labels to save the duplication between the error and success paths. Changes in v4: None Changes in v3: None Changes in v2: Move irq request to probe(in patch[0]) drivers/iommu/rockchip-iommu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index b743d82e6fe1..f7ff3a3645ea 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -824,7 +824,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, ret = rk_iommu_force_reset(iommu); if (ret) - return ret; + goto out_disable_stall; iommu->domain = domain; @@ -837,7 +837,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, ret = rk_iommu_enable_paging(iommu); if (ret) - return ret; + goto out_disable_stall; spin_lock_irqsave(&rk_domain->iommus_lock, flags); list_add_tail(&iommu->node, &rk_domain->iommus); @@ -845,9 +845,9 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, dev_dbg(dev, "Attached to iommu domain\n"); +out_disable_stall: rk_iommu_disable_stall(iommu); - - return 0; + return ret; } static void rk_iommu_detach_device(struct iommu_domain *domain, -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: jeffy.chen@rock-chips.com (Jeffy Chen) To: linux-arm-kernel@lists.infradead.org Subject: [RESEND PATCH v6 04/14] iommu/rockchip: Fix error handling in attach Date: Thu, 1 Mar 2018 18:18:27 +0800 [thread overview] Message-ID: <20180301101837.27969-5-jeffy.chen@rock-chips.com> (raw) In-Reply-To: <20180301101837.27969-1-jeffy.chen@rock-chips.com> From: Tomasz Figa <tfiga@chromium.org> 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 <tfiga@chromium.org> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com> Reviewed-by: Robin Murphy <robin.murphy@arm.com> --- Changes in v6: None Changes in v5: Use out labels to save the duplication between the error and success paths. Changes in v4: None Changes in v3: None Changes in v2: Move irq request to probe(in patch[0]) drivers/iommu/rockchip-iommu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index b743d82e6fe1..f7ff3a3645ea 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -824,7 +824,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, ret = rk_iommu_force_reset(iommu); if (ret) - return ret; + goto out_disable_stall; iommu->domain = domain; @@ -837,7 +837,7 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, ret = rk_iommu_enable_paging(iommu); if (ret) - return ret; + goto out_disable_stall; spin_lock_irqsave(&rk_domain->iommus_lock, flags); list_add_tail(&iommu->node, &rk_domain->iommus); @@ -845,9 +845,9 @@ static int rk_iommu_attach_device(struct iommu_domain *domain, dev_dbg(dev, "Attached to iommu domain\n"); +out_disable_stall: rk_iommu_disable_stall(iommu); - - return 0; + return ret; } static void rk_iommu_detach_device(struct iommu_domain *domain, -- 2.11.0
next prev parent reply other threads:[~2018-03-01 10:19 UTC|newest] Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-03-01 10:18 [RESEND PATCH v6 00/14] iommu/rockchip: Use OF_IOMMU Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` [RESEND PATCH v6 01/14] iommu/rockchip: Prohibit unbind and remove Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` [RESEND PATCH v6 02/14] iommu/rockchip: Fix error handling in probe Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` [RESEND PATCH v6 03/14] iommu/rockchip: Request irqs in rk_iommu_probe() Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-05 13:30 ` Tomasz Figa 2018-03-05 13:30 ` Tomasz Figa 2018-03-05 13:30 ` Tomasz Figa 2018-03-01 10:18 ` Jeffy Chen [this message] 2018-03-01 10:18 ` [RESEND PATCH v6 04/14] iommu/rockchip: Fix error handling in attach Jeffy Chen 2018-03-01 10:18 ` [RESEND PATCH v6 05/14] iommu/rockchip: Use iopoll helpers to wait for hardware Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` [RESEND PATCH v6 06/14] iommu/rockchip: Fix TLB flush of secondary IOMMUs Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` [RESEND PATCH v6 07/14] ARM: dts: rockchip: add clocks in iommu nodes Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` [RESEND PATCH v6 08/14] iommu/rockchip: Control clocks needed to access the IOMMU Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` [RESEND PATCH v6 09/14] dt-bindings: iommu/rockchip: Add clock property Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-06 2:27 ` Rob Herring 2018-03-06 2:27 ` Rob Herring 2018-03-06 2:27 ` Rob Herring 2018-03-06 2:32 ` JeffyChen 2018-03-06 2:32 ` JeffyChen 2018-03-06 2:32 ` JeffyChen 2018-03-01 10:18 ` [RESEND PATCH v6 10/14] iommu/rockchip: Use IOMMU device for dma mapping operations Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` [RESEND PATCH v6 11/14] iommu/rockchip: Use OF_IOMMU to attach devices automatically Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` [RESEND PATCH v6 12/14] iommu/rockchip: Fix error handling in init Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` [RESEND PATCH v6 13/14] iommu/rockchip: Add runtime PM support Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-05 13:49 ` Tomasz Figa 2018-03-05 13:49 ` Tomasz Figa 2018-03-05 14:13 ` Robin Murphy 2018-03-05 14:13 ` Robin Murphy 2018-03-05 14:13 ` Robin Murphy 2018-03-05 14:34 ` Tomasz Figa 2018-03-05 14:34 ` Tomasz Figa 2018-03-05 14:34 ` Tomasz Figa [not found] ` <CAAFQd5D2SY2RV9HLTeTQigfnVCkF9wDq74_+t3OV2YEb9wJtqg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2018-03-06 1:57 ` JeffyChen 2018-03-06 2:04 ` Tomasz Figa 2018-03-06 2:04 ` Tomasz Figa 2018-03-01 10:18 ` [RESEND PATCH v6 14/14] iommu/rockchip: Support sharing IOMMU between masters Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 10:18 ` Jeffy Chen 2018-03-01 11:03 ` Robin Murphy 2018-03-01 11:03 ` Robin Murphy 2018-03-01 11:03 ` Robin Murphy 2018-03-01 11:14 ` JeffyChen 2018-03-01 11:14 ` JeffyChen 2018-03-01 11:14 ` JeffyChen
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20180301101837.27969-5-jeffy.chen@rock-chips.com \ --to=jeffy.chen@rock-chips.com \ --cc=heiko@sntech.de \ --cc=iommu@lists.linux-foundation.org \ --cc=jcliang@chromium.org \ --cc=joro@8bytes.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rockchip@lists.infradead.org \ --cc=robin.murphy@arm.com \ --cc=tfiga@chromium.org \ --cc=xxm@rock-chips.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.