From patchwork Mon Jan 9 12:03:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Szyprowski X-Patchwork-Id: 9504537 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A7B5B60710 for ; Mon, 9 Jan 2017 12:05:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 836172848D for ; Mon, 9 Jan 2017 12:05:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7686B284BB; Mon, 9 Jan 2017 12:05:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 423282848D for ; Mon, 9 Jan 2017 12:05:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752826AbdAIMFY (ORCPT ); Mon, 9 Jan 2017 07:05:24 -0500 Received: from mailout1.w1.samsung.com ([210.118.77.11]:19661 "EHLO mailout1.w1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752605AbdAIMER (ORCPT ); Mon, 9 Jan 2017 07:04:17 -0500 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OJI00HZRHJ2DP30@mailout1.w1.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 09 Jan 2017 12:04:14 +0000 (GMT) Received: from eusmges1.samsung.com (unknown [203.254.199.239]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20170109120414eucas1p2688da45548f170dc9f57e5090cee7aef~YGOYr9crC0808008080eucas1p2r; Mon, 9 Jan 2017 12:04:14 +0000 (GMT) Received: from eucas1p1.samsung.com ( [182.198.249.206]) by eusmges1.samsung.com (EUCPMTA) with SMTP id 12.EB.16908.04C73785; Mon, 9 Jan 2017 12:04:16 +0000 (GMT) Received: from eusmgms2.samsung.com (unknown [182.198.249.180]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20170109120413eucas1p19721a17d6e81e75e8f6e93ec2528f1b6~YGOXxd_iE2745427454eucas1p1U; Mon, 9 Jan 2017 12:04:13 +0000 (GMT) X-AuditID: cbfec7ef-f79d26d00000420c-df-58737c4063b9 Received: from eusync3.samsung.com ( [203.254.199.213]) by eusmgms2.samsung.com (EUCPMTA) with SMTP id 6C.FC.10233.43C73785; Mon, 9 Jan 2017 12:04:04 +0000 (GMT) Received: from AMDC2765.digital.local ([106.116.147.25]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OJI00KQMHIPLS60@eusync3.samsung.com>; Mon, 09 Jan 2017 12:04:12 +0000 (GMT) From: Marek Szyprowski To: iommu@lists.linux-foundation.org, linux-samsung-soc@vger.kernel.org Cc: Marek Szyprowski , Joerg Roedel , Krzysztof Kozlowski , Bartlomiej Zolnierkiewicz Subject: [PATCH v2 4/4] iommu/exynos: Properly release device from the default domain in ->remove Date: Mon, 09 Jan 2017 13:03:56 +0100 Message-id: <1483963436-29803-5-git-send-email-m.szyprowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1483963436-29803-1-git-send-email-m.szyprowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrIIsWRmVeSWpSXmKPExsWy7djPc7oONcURBl3XuCw2zljParFgv7VF 5+wN7BbnzwOJGef3MVmsPXKX3YHN48nBeUwem1Z1snlMvrGc0aNvyypGj8+b5AJYo7hsUlJz MstSi/TtErgyDnVPZim4yFFx4+1q5gbGGexdjJwcEgImEl83b2OCsMUkLtxbz9bFyMUhJLCM UeLIgbmMEM5nRon3v/uZYDpa37cwwlX9uX2UBcJpYJKY8GoaG0gVm4ChRNfbLjBbRMBd4vqf 52BFzAIbGCWO72li7mLk4BAWSJZYuawCpIZFQFXi9cmfYBt4BTwkWi61MkJsk5M4eWwyK4jN KeApcf/nDyaQORICz9kkvq7cyAoyR0JAVmLTAWYI00Vi6e0giFZhiVfHt0C9KSNxeXI3C4Td zyjR1KoNYc9glDj3lhfCtpY4fPwi2CpmAT6JSdumQ43klehoE4Io8ZD4sH4fG4TtKLFl5iyw ciGBOYwSi5qMJzDKLGBkWMUoklpanJueWmyoV5yYW1yal66XnJ+7iREYsaf/HX+/g/Fpc8gh RgEORiUe3gleRRFCrIllxZW5hxglOJiVRHgXVhRHCPGmJFZWpRblxxeV5qQWH2KU5mBREufd u+BKuJBAemJJanZqakFqEUyWiYNTqoFRWNx3xf5fwscr7Stu5+ixWu7OnT7/zLz59/fef/t/ tySLi6f9Ge6ox8wfn+ps8NrjbpG8bVqiTZ/w2+0q8vyN+6MXuxysTt1XUCT0t49fTWO1heR/ RePIvB3t7Ibvc8SONE6Sj7pUfGKlyclZ8fs/atgof680N73/WPPV/KXe9x/OMHFcz5iuxFKc kWioxVxUnAgAwqSlrtQCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRmVeSWpSXmKPExsVy+t/xq7omNcURBrOXW1psnLGe1WLBfmuL ztkb2C3OnwcSM87vY7JYe+QuuwObx5OD85g8Nq3qZPOYfGM5o0ffllWMHp83yQWwRrnZZKQm pqQWKaTmJeenZOal2yqFhrjpWigp5CXmptoqRej6hgQpKZQl5pQCeUYGaMDBOcA9WEnfLsEt 41D3ZJaCixwVN96uZm5gnMHexcjJISFgItH6voURwhaTuHBvPRuILSSwhFHi5DbFLkYuILuJ SWL58bssIAk2AUOJrrddYEUiAu4S1/88ZwEpYhbYwCixbsYEZpCEsECyRMunDUwgNouAqsTr kz/BbF4BD4mWS61Q2+QkTh6bzApicwp4Stz/+YMJYrOHxNEVP9knMPIuYGRYxSiSWlqcm55b bKRXnJhbXJqXrpecn7uJERjA24793LKDsetd8CFGAQ5GJR7eCV5FEUKsiWXFlbmHGCU4mJVE eBdWFEcI8aYkVlalFuXHF5XmpBYfYjQFOmois5Rocj4wuvJK4g1NDM0tDY2MLSzMjYyUxHmn frgSLiSQnliSmp2aWpBaBNPHxMEp1cDYNj9X8S77BbGn07sNAq94B/dyuDqLbOW5ftTbTief 5fXvmFPX61t+ll/P6xOav5/jrKl1uIXF5f/rbsdNcepleDln7heOJ7u2HNpYaXtm71eL6dY1 0xwnskWaHtlZ7VPI42Kn4LvQdY6k7I1ZcfmL1F+xJExoCba9enCR7s/kTD3uYo+tZceUWIoz Eg21mIuKEwHlNVKSdgIAAA== X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20170109120413eucas1p19721a17d6e81e75e8f6e93ec2528f1b6 X-Msg-Generator: CA X-Sender-IP: 182.198.249.180 X-Local-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRs=?= =?UTF-8?B?7IK87ISx7KCE7J6QG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TWFyZWsgU3p5cHJvd3NraRtTUlBPTC1LZXJuZWwgKFRQKRtT?= =?UTF-8?B?YW1zdW5nIEVsZWN0cm9uaWNzG1NlbmlvciBTb2Z0d2FyZSBFbmdpbmVlcg==?= X-Sender-Code: =?UTF-8?B?QzEwG0VIURtDMTBDRDAyQ0QwMjczOTI=?= CMS-TYPE: 201P X-HopCount: 7 X-CMS-RootMailID: 20170109120413eucas1p19721a17d6e81e75e8f6e93ec2528f1b6 X-RootMTR: 20170109120413eucas1p19721a17d6e81e75e8f6e93ec2528f1b6 References: <1483963436-29803-1-git-send-email-m.szyprowski@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP IOMMU core doesn't detach device from the default domain before calling ->iommu_remove_device, so check that and do the proper cleanup or warn if device is still attached to non-default domain. Signed-off-by: Marek Szyprowski --- drivers/iommu/exynos-iommu.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index 8bf5a06a6c01..37d9738bd023 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c @@ -1242,9 +1242,21 @@ static int exynos_iommu_add_device(struct device *dev) static void exynos_iommu_remove_device(struct device *dev) { + struct exynos_iommu_owner *owner = dev->archdata.iommu; + if (!has_sysmmu(dev)) return; + if (owner->domain) { + struct iommu_group *group = iommu_group_get(dev); + + if (group) { + WARN_ON(owner->domain != + iommu_group_default_domain(group)); + exynos_iommu_detach_device(owner->domain, dev); + iommu_group_put(group); + } + } iommu_group_remove_device(dev); }