From patchwork Wed Jun 15 12:04:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shunqian Zheng X-Patchwork-Id: 9178321 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 DC2A66021C for ; Wed, 15 Jun 2016 12:10:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CCBCC27BFC for ; Wed, 15 Jun 2016 12:10:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C1A8E27CEA; Wed, 15 Jun 2016 12:10:39 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5963F27BFC for ; Wed, 15 Jun 2016 12:10:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 147416E902; Wed, 15 Jun 2016 12:10:27 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by gabe.freedesktop.org (Postfix) with ESMTPS id 92C9A6E901 for ; Wed, 15 Jun 2016 12:07:58 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id 66so1672037pfy.1 for ; Wed, 15 Jun 2016 05:07:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=L3T/YnSKBobWS3kQ0kcSy9fo4ICpFjM8Xis2JCGrfTI=; b=jclM/hidhRhdKXdADazckRVgwBIQKJJjWO+CPPM4GGc/oowXyC0ftjHlhI77CJqCv3 /JS+G1nuazObCMyeGrYtoXq1BjV0Rbn7hZm8TBuE3D5vI5Uf5OGKr3bvt1lav4t8U+jO k7/RGXpVA2flsjWXeGVZsNqNWPAYjq3VR9Vge8JwsnVJohhzLPeOU1Q1KjXBnbkA9Gwt dkRU47q5bfr0xfgIHBwP6+cBmihuLylYdfb9JnTph6M9djkselBTgk3bORFL4zZMdUT9 Tk3dFTyj48SUcf67rmgCrdO82BW2bAYDo3LIdrinB/g0d5YZTSv+M6/o2i6fSr3lzamz k0aw== X-Gm-Message-State: ALyK8tLjADLsMZpOEUkgqIwGfO3FCRn5H5jPzr7KQZFPHaO78iCeaDKzGQFvzLff712Nww== X-Received: by 10.98.37.70 with SMTP id l67mr3527261pfl.56.1465992477645; Wed, 15 Jun 2016 05:07:57 -0700 (PDT) Received: from SHUNQIAN-W530.example.org ([103.29.142.67]) by smtp.gmail.com with ESMTPSA id e9sm52724619pfg.2.2016.06.15.05.07.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 15 Jun 2016 05:07:57 -0700 (PDT) From: Shunqian Zheng To: joro@8bytes.org, heiko@sntech.de, robh+dt@kernel.org, mark.rutland@arm.com, linux@armlinux.org.uk, mark.yao@rock-chips.com, airlied@linux.ie, tfiga@google.com, xxm@rock-chips.com Subject: [PATCH v3 4/6] drm: rockchip: use common iommu api to attach iommu Date: Wed, 15 Jun 2016 20:04:43 +0800 Message-Id: <1465992285-16187-5-git-send-email-zhengsq@rock-chips.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1465992285-16187-1-git-send-email-zhengsq@rock-chips.com> References: <1465992285-16187-1-git-send-email-zhengsq@rock-chips.com> X-Mailman-Approved-At: Wed, 15 Jun 2016 12:10:25 +0000 Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-rockchip@lists.infradead.org, iommu@lists.linux-foundation.org, Shunqian Zheng , linux-arm-kernel@lists.infradead.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Rockchip DRM used the arm special API, arm_iommu_*(), to attach iommu for ARM32 SoCs. This patch convert to common iommu API so it would support ARM64 like RK3399. The general idea is domain_alloc(), attach_device() and arch_setup_dma_ops() to set dma_ops manually for DRM at the last. Signed-off-by: Shunqian Zheng --- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 112 +++++++++++++++++----------- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 1 + 2 files changed, 71 insertions(+), 42 deletions(-) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index f5a68fc..b52c38d 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -14,16 +14,16 @@ * GNU General Public License for more details. */ -#include - #include #include #include +#include #include #include #include #include #include +#include #include "rockchip_drm_drv.h" #include "rockchip_drm_fb.h" @@ -46,7 +46,8 @@ static bool is_support_iommu = true; int rockchip_drm_dma_attach_device(struct drm_device *drm_dev, struct device *dev) { - struct dma_iommu_mapping *mapping = drm_dev->dev->archdata.mapping; + struct rockchip_drm_private *private = drm_dev->dev_private; + struct iommu_domain *domain = private->domain; int ret; if (!is_support_iommu) @@ -58,16 +59,25 @@ int rockchip_drm_dma_attach_device(struct drm_device *drm_dev, dma_set_max_seg_size(dev, DMA_BIT_MASK(32)); - return arm_iommu_attach_device(dev, mapping); + ret = iommu_attach_device(domain, dev); + if (ret) { + dev_err(dev, "Failed to attach iommu device\n"); + return ret; + } + + /* TODO(djkurtz): fetch the mapping start/size from somewhere */ + arch_setup_dma_ops(dev, 0x00000000, SZ_2G, dev->bus->iommu_ops, false); + return 0; } void rockchip_drm_dma_detach_device(struct drm_device *drm_dev, struct device *dev) { - if (!is_support_iommu) - return; + struct rockchip_drm_private *private = drm_dev->dev_private; + struct iommu_domain *domain = private->domain; - arm_iommu_detach_device(dev); + if (is_support_iommu) + iommu_detach_device(domain, dev); } int rockchip_register_crtc_funcs(struct drm_crtc *crtc, @@ -132,10 +142,52 @@ static void rockchip_drm_crtc_disable_vblank(struct drm_device *dev, priv->crtc_funcs[pipe]->disable_vblank(crtc); } +static int rockchip_drm_init_iommu(struct drm_device *drm_dev) +{ + struct rockchip_drm_private *private = drm_dev->dev_private; + struct device *dev = drm_dev->dev; + int ret; + + dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms), + GFP_KERNEL); + if (!dev->dma_parms) + return -ENOMEM; + + private->domain = iommu_domain_alloc(&platform_bus_type); + if (!private->domain) + return -ENOMEM; + + /* TODO(djkurtz): fetch the mapping start/size from somewhere */ + ret = iommu_dma_init_domain(private->domain, 0x00000000, SZ_2G); + if (ret) { + dev_err(dev, "Failed to init domain\n"); + goto err_free_domain; + } + + ret = rockchip_drm_dma_attach_device(drm_dev, dev); + if (ret) { + dev_err(dev, "Failed to attach device\n"); + goto err_free_domain; + } + + return 0; + +err_free_domain: + iommu_domain_free(private->domain); + + return ret; +} + +static void rockchip_iommu_cleanup(struct drm_device *drm_dev) +{ + struct rockchip_drm_private *private = drm_dev->dev_private; + + iommu_domain_free(private->domain); +} + static int rockchip_drm_load(struct drm_device *drm_dev, unsigned long flags) { struct rockchip_drm_private *private; - struct dma_iommu_mapping *mapping = NULL; struct device *dev = drm_dev->dev; struct drm_connector *connector; int ret; @@ -153,38 +205,18 @@ static int rockchip_drm_load(struct drm_device *drm_dev, unsigned long flags) rockchip_drm_mode_config_init(drm_dev); - dev->dma_parms = devm_kzalloc(dev, sizeof(*dev->dma_parms), - GFP_KERNEL); - if (!dev->dma_parms) { - ret = -ENOMEM; - goto err_config_cleanup; - } - if (is_support_iommu) { - /* TODO(djkurtz): fetch the mapping start/size from somewhere */ - mapping = arm_iommu_create_mapping(&platform_bus_type, - 0x00000000, - SZ_2G); - if (IS_ERR(mapping)) { - ret = PTR_ERR(mapping); - goto err_config_cleanup; - } - - ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)); - if (ret) - goto err_release_mapping; - - dma_set_max_seg_size(dev, DMA_BIT_MASK(32)); - - ret = arm_iommu_attach_device(dev, mapping); + ret = rockchip_drm_init_iommu(drm_dev); if (ret) - goto err_release_mapping; + goto err_config_cleanup; } /* Try to bind all sub drivers. */ ret = component_bind_all(dev, drm_dev); - if (ret) - goto err_detach_device; + if (ret) { + dev_err(dev, "Failed to bind components\n"); + goto err_iommu_cleanup; + } /* * All components are now added, we can publish the connector sysfs @@ -222,21 +254,17 @@ static int rockchip_drm_load(struct drm_device *drm_dev, unsigned long flags) if (ret) goto err_vblank_cleanup; - if (is_support_iommu) - arm_iommu_release_mapping(mapping); return 0; + err_vblank_cleanup: drm_vblank_cleanup(drm_dev); err_kms_helper_poll_fini: drm_kms_helper_poll_fini(drm_dev); err_unbind: component_unbind_all(dev, drm_dev); -err_detach_device: - if (is_support_iommu) - arm_iommu_detach_device(dev); -err_release_mapping: +err_iommu_cleanup: if (is_support_iommu) - arm_iommu_release_mapping(mapping); + rockchip_iommu_cleanup(drm_dev); err_config_cleanup: drm_mode_config_cleanup(drm_dev); drm_dev->dev_private = NULL; @@ -252,7 +280,7 @@ static int rockchip_drm_unload(struct drm_device *drm_dev) drm_kms_helper_poll_fini(drm_dev); component_unbind_all(dev, drm_dev); if (is_support_iommu) - arm_iommu_detach_device(dev); + rockchip_iommu_cleanup(drm_dev); drm_mode_config_cleanup(drm_dev); drm_dev->dev_private = NULL; diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h index 56f43a3..1e2a666 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -70,6 +70,7 @@ struct rockchip_drm_private { const struct rockchip_crtc_funcs *crtc_funcs[ROCKCHIP_MAX_CRTC]; struct rockchip_atomic_commit commit; + struct iommu_domain *domain; }; void rockchip_drm_atomic_work(struct work_struct *work);