From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E41BEC433E3 for ; Fri, 21 Aug 2020 08:07:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B4D0B208DB for ; Fri, 21 Aug 2020 08:07:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597997259; bh=LaMlJ8OWitxR94LYzLAW+/aCIQp70S1xt+7fdRecGkM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=blWjtkcQ23PthqXVYZDt0s2ZMy6SHgR1pXksLHrRGowMOaA0IOAMJIXbPGsmgofZm YtrZQIHlcSGQ91/9MhR6TJQGHOQxAXGurU5BeT0I9Tj3R/APxKcM5luNQ8kFeFaKae Xm4DXbCps9YNTPMrf0d3qJw6wGA+kpHWwJmnF2Hs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727877AbgHUIHf (ORCPT ); Fri, 21 Aug 2020 04:07:35 -0400 Received: from mail.kernel.org ([198.145.29.99]:35258 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727840AbgHUIHd (ORCPT ); Fri, 21 Aug 2020 04:07:33 -0400 Received: from willie-the-truck (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4DA4C2078D; Fri, 21 Aug 2020 08:07:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597997252; bh=LaMlJ8OWitxR94LYzLAW+/aCIQp70S1xt+7fdRecGkM=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=lvzNVTn3kK+R6rhX3v2r5kGGWFVmcbdZ4VJtDADKQTwh2Aes+1MU5H+LAHiN8OQ+H ket2nq3Gs0f+y7KGGrtoh30Khl+NLrKZB5sMVZ4StNWFcKM28IvThm25QAGBbg8Bw9 DAQdnRs+m1kjIK5XxPYS+MsULpHW1cs7ylBpEn4U= Date: Fri, 21 Aug 2020 09:07:25 +0100 From: Will Deacon To: Robin Murphy Cc: hch@lst.de, joro@8bytes.org, linux@armlinux.org.uk, inki.dae@samsung.com, sw0312.kim@samsung.com, kyungmin.park@samsung.com, m.szyprowski@samsung.com, agross@kernel.org, bjorn.andersson@linaro.org, thierry.reding@gmail.com, jonathanh@nvidia.com, vdumpa@nvidia.com, digetx@gmail.com, matthias.bgg@gmail.com, yong.wu@mediatek.com, geert+renesas@glider.be, magnus.damm@gmail.com, t-kristo@ti.com, s-anna@ti.com, laurent.pinchart@ideasonboard.com, linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org, linux-samsung-soc@vger.kernel.org, linux-tegra@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mediatek@lists.infradead.org, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 07/18] iommu/arm-smmu: Remove arch/arm workaround Message-ID: <20200821080724.GA20060@willie-the-truck> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Thu, Aug 20, 2020 at 04:08:26PM +0100, Robin Murphy wrote: > Now that arch/arm is wired up for default domains and iommu-dma, remove > the add_device workaround. > > Signed-off-by: Robin Murphy > --- > drivers/iommu/arm/arm-smmu/arm-smmu.c | 10 ---------- > 1 file changed, 10 deletions(-) > > diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu.c b/drivers/iommu/arm/arm-smmu/arm-smmu.c > index 09c42af9f31e..4e52d8cb67dd 100644 > --- a/drivers/iommu/arm/arm-smmu/arm-smmu.c > +++ b/drivers/iommu/arm/arm-smmu/arm-smmu.c > @@ -1164,17 +1164,7 @@ static int arm_smmu_attach_dev(struct iommu_domain *domain, struct device *dev) > return -ENXIO; > } > > - /* > - * FIXME: The arch/arm DMA API code tries to attach devices to its own > - * domains between of_xlate() and probe_device() - we have no way to cope > - * with that, so until ARM gets converted to rely on groups and default > - * domains, just say no (but more politely than by dereferencing NULL). > - * This should be at least a WARN_ON once that's sorted. > - */ > cfg = dev_iommu_priv_get(dev); > - if (!cfg) > - return -ENODEV; > - > smmu = cfg->smmu; > > ret = arm_smmu_rpm_get(smmu); Acked-by: Will Deacon Will