Received: by 10.223.185.116 with SMTP id b49csp3315509wrg; Mon, 5 Mar 2018 19:05:04 -0800 (PST) X-Google-Smtp-Source: AG47ELvb0648pYy9EqhlUFc9qQTxbe2mZG4zP4AzFPBNOx1+9J/QbJQwp3Mh9tBQ1S9awdW/01KP X-Received: by 10.99.50.66 with SMTP id y63mr14268340pgy.207.1520305504663; Mon, 05 Mar 2018 19:05:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520305504; cv=none; d=google.com; s=arc-20160816; b=Z4lkwG3wAtBDlLBSVw2Z8iFatJQ1blISdU0z43bLcFZu4Jlpt3pR9MdWUHDYsYhDQv bDVc73QFO8PZwhRGp552END/DuulOhuXzbeFNrhK3G2EgFosn+iUGr95b8wzptVeEIp+ NckaM1zTETd9PI/8LtKbdnR8U52AIg9lpjip9cVsyYHgKW51HlYlIvdOLaVQtM6e7X/H 1XpksgErBMMJdZlMryWaJU92M9zzfYDnfZJoN0AdAkLYn7DNk52TxrzI9Y0tc0n0rhhM hT0e2Pz/VhFZ1eaQfxPppjP4mS139lE5TLdHuP0pQ0cWcubYYmTjO/s4DaVY/UdAh7HK 6LkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=DkaXV5H7xPlRRM5XCteq8qfS6SKXLsvq55PXHaqiifI=; b=x1RCBBBUfWv0nREZ8uSHlvfhcjEzJK2cQMCsWeABk8HujqOpHeDM8+acwY1TgPAxyC IEWj4IY66ppRpSC/aLEwZsZplGHHwFAajZ+5ubQCnO/f1Uk8jotCWOoXriXC45bwWFGE AlUby2WcyrIjKBaIr9stF7bONzNjZAnQDeoJKRfCVnGHnOSLELDSsbCrzm+vKhwu/y2z CrbEwZA+ClfpgiIev24WQI+fE3qtrsfZomfSq8rJLmjlWlujqmAc+y4RjZvIksLx/XC1 DmGlxfSr6zWHWb3Exsv5pAQWD2HJcl9LmaSysmKgWIJ0yJnmsX7rNfLcGGaJ6DwWAbZz 8Tmg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t2-v6si4013392plm.3.2018.03.05.19.04.50; Mon, 05 Mar 2018 19:05:04 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932575AbeCFDDp (ORCPT + 99 others); Mon, 5 Mar 2018 22:03:45 -0500 Received: from regular1.263xmail.com ([211.150.99.130]:37274 "EHLO regular1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932417AbeCFDDm (ORCPT ); Mon, 5 Mar 2018 22:03:42 -0500 Received: from jeffy.chen?rock-chips.com (unknown [192.168.167.13]) by regular1.263xmail.com (Postfix) with ESMTP id 6B2EAB27A; Tue, 6 Mar 2018 11:03:34 +0800 (CST) X-263anti-spam: KSV:0; X-MAIL-GRAY: 0 X-MAIL-DELIVERY: 1 X-KSVirus-check: 0 X-ABS-CHECKED: 4 Received: from localhost (localhost [127.0.0.1]) by smtp.263.net (Postfix) with ESMTPA id 5797C3BE; Tue, 6 Mar 2018 11:03:29 +0800 (CST) X-RL-SENDER: jeffy.chen@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 103.29.142.67 X-LOGIN-NAME: jeffy.chen@rock-chips.com X-UNIQUE-TAG: X-ATTACHMENT-NUM: 0 X-SENDER: cjf@rock-chips.com X-DNS-TYPE: 0 Received: from localhost (unknown [103.29.142.67]) by smtp.263.net (Postfix) whith ESMTP id 313303TY1UB; Tue, 06 Mar 2018 11:03:34 +0800 (CST) From: Jeffy Chen To: linux-kernel@vger.kernel.org Cc: jcliang@chromium.org, robin.murphy@arm.com, xxm@rock-chips.com, tfiga@chromium.org, Jeffy Chen , Heiko Stuebner , linux-rockchip@lists.infradead.org, iommu@lists.linux-foundation.org, Joerg Roedel , linux-arm-kernel@lists.infradead.org Subject: [PATCH v7 01/14] iommu/rockchip: Prohibit unbind and remove Date: Tue, 6 Mar 2018 11:02:39 +0800 Message-Id: <20180306030252.3197-2-jeffy.chen@rock-chips.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180306030252.3197-1-jeffy.chen@rock-chips.com> References: <20180306030252.3197-1-jeffy.chen@rock-chips.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Removal of IOMMUs cannot be done reliably. This is similar to exynos iommu driver. Signed-off-by: Jeffy Chen Reviewed-by: Tomasz Figa --- Changes in v7: None Changes in v6: None Changes in v5: None Changes in v4: Rewrite commit message. Changes in v3: Also remove remove() and module_exit() as Tomasz suggested. Changes in v2: None drivers/iommu/rockchip-iommu.c | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/drivers/iommu/rockchip-iommu.c b/drivers/iommu/rockchip-iommu.c index 9d991c2d8767..16cd8780c289 100644 --- a/drivers/iommu/rockchip-iommu.c +++ b/drivers/iommu/rockchip-iommu.c @@ -1197,18 +1197,6 @@ static int rk_iommu_probe(struct platform_device *pdev) return err; } -static int rk_iommu_remove(struct platform_device *pdev) -{ - struct rk_iommu *iommu = platform_get_drvdata(pdev); - - if (iommu) { - iommu_device_sysfs_remove(&iommu->iommu); - iommu_device_unregister(&iommu->iommu); - } - - return 0; -} - static const struct of_device_id rk_iommu_dt_ids[] = { { .compatible = "rockchip,iommu" }, { /* sentinel */ } @@ -1217,10 +1205,10 @@ MODULE_DEVICE_TABLE(of, rk_iommu_dt_ids); static struct platform_driver rk_iommu_driver = { .probe = rk_iommu_probe, - .remove = rk_iommu_remove, .driver = { .name = "rk_iommu", .of_match_table = rk_iommu_dt_ids, + .suppress_bind_attrs = true, }, }; @@ -1248,14 +1236,7 @@ static int __init rk_iommu_init(void) platform_driver_unregister(&rk_iommu_domain_driver); return ret; } -static void __exit rk_iommu_exit(void) -{ - platform_driver_unregister(&rk_iommu_driver); - platform_driver_unregister(&rk_iommu_domain_driver); -} - subsys_initcall(rk_iommu_init); -module_exit(rk_iommu_exit); MODULE_DESCRIPTION("IOMMU API for Rockchip"); MODULE_AUTHOR("Simon Xue and Daniel Kurtz "); -- 2.11.0