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=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham 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 F1AC2C43331 for ; Wed, 25 Mar 2020 12:51:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D11C22078A for ; Wed, 25 Mar 2020 12:51:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727328AbgCYMvg (ORCPT ); Wed, 25 Mar 2020 08:51:36 -0400 Received: from foss.arm.com ([217.140.110.172]:48004 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727290AbgCYMvg (ORCPT ); Wed, 25 Mar 2020 08:51:36 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 495FC31B; Wed, 25 Mar 2020 05:51:35 -0700 (PDT) Received: from red-moon.cambridge.arm.com (unknown [10.57.20.165]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3F43B3F71F; Wed, 25 Mar 2020 05:51:30 -0700 (PDT) Date: Wed, 25 Mar 2020 12:51:18 +0000 From: Lorenzo Pieralisi To: laurentiu.tudor@nxp.com Cc: linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org, robin.murphy@arm.com, ard.biesheuvel@linaro.org, ioana.ciornei@nxp.com, diana.craciun@oss.nxp.com, maz@kernel.org, jon@solid-run.com, pankaj.bansal@nxp.com, makarand.pawagi@nxp.com, calvin.johnson@nxp.com, V.Sethi@nxp.com, cristian.sovaiala@nxp.com, Stuart.Yoder@arm.com, jeremy.linton@arm.com, joro@8bytes.org, tglx@linutronix.de, jason@lakedaemon.net Subject: Re: [RFC PATCH 1/4] bus: fsl-mc: add custom .dma_configure implementation Message-ID: <20200325125109.GA5430@red-moon.cambridge.arm.com> References: <20200227100542.13819-1-laurentiu.tudor@nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200227100542.13819-1-laurentiu.tudor@nxp.com> User-Agent: Mutt/1.9.4 (2018-02-28) Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org On Thu, Feb 27, 2020 at 12:05:39PM +0200, laurentiu.tudor@nxp.com wrote: > From: Laurentiu Tudor > > The devices on this bus are not discovered by way of device tree > but by queries to the firmware. It makes little sense to trick the > generic of layer into thinking that these devices are of related so > that we can get our dma configuration. Instead of doing that, add > our custom dma configuration implementation. > > Signed-off-by: Laurentiu Tudor > --- > drivers/bus/fsl-mc/fsl-mc-bus.c | 31 ++++++++++++++++++++++++++++++- > 1 file changed, 30 insertions(+), 1 deletion(-) > > diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c > index 36eb25f82c8e..eafaa0e0b906 100644 > --- a/drivers/bus/fsl-mc/fsl-mc-bus.c > +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c > @@ -132,11 +132,40 @@ static int fsl_mc_bus_uevent(struct device *dev, struct kobj_uevent_env *env) > static int fsl_mc_dma_configure(struct device *dev) > { > struct device *dma_dev = dev; > + struct iommu_fwspec *fwspec; > + const struct iommu_ops *iommu_ops; > + struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev); > + int ret; > + u32 icid; > > while (dev_is_fsl_mc(dma_dev)) > dma_dev = dma_dev->parent; > > - return of_dma_configure(dev, dma_dev->of_node, 0); > + fwspec = dev_iommu_fwspec_get(dma_dev); > + if (!fwspec) > + return -ENODEV; > + iommu_ops = iommu_ops_from_fwnode(fwspec->iommu_fwnode); > + if (!iommu_ops) > + return -ENODEV; > + > + ret = iommu_fwspec_init(dev, fwspec->iommu_fwnode, iommu_ops); > + if (ret) > + return ret; > + > + icid = mc_dev->icid; > + ret = iommu_fwspec_add_ids(dev, &icid, 1); I see. So with this patch we would use the MC named component only to retrieve the iommu_ops - the streamid are injected directly here bypassing OF/IORT bindings translations altogether. Am I reading this code correctly ? Thanks, Lorenzo > + if (ret) > + return ret; > + > + if (!device_iommu_mapped(dev)) { > + ret = iommu_probe_device(dev); > + if (ret) > + return ret; > + } > + > + arch_setup_dma_ops(dev, 0, *dma_dev->dma_mask + 1, iommu_ops, true); > + > + return 0; > } > > static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, > -- > 2.17.1 > 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=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, 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 27013C1975A for ; Wed, 25 Mar 2020 12:51:42 +0000 (UTC) Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E65A92076A for ; Wed, 25 Mar 2020 12:51:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E65A92076A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=iommu-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id EE9CD204A8; Wed, 25 Mar 2020 12:51:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id UNDXFJ56Fo-B; Wed, 25 Mar 2020 12:51:38 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by silver.osuosl.org (Postfix) with ESMTP id E3816203CE; Wed, 25 Mar 2020 12:51:38 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id D6A83C1D74; Wed, 25 Mar 2020 12:51:38 +0000 (UTC) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by lists.linuxfoundation.org (Postfix) with ESMTP id E6D69C0177 for ; Wed, 25 Mar 2020 12:51:36 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CF298883AE for ; Wed, 25 Mar 2020 12:51:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NBiLGTjvx37E for ; Wed, 25 Mar 2020 12:51:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by hemlock.osuosl.org (Postfix) with ESMTP id DE8D8882E7 for ; Wed, 25 Mar 2020 12:51:35 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 495FC31B; Wed, 25 Mar 2020 05:51:35 -0700 (PDT) Received: from red-moon.cambridge.arm.com (unknown [10.57.20.165]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3F43B3F71F; Wed, 25 Mar 2020 05:51:30 -0700 (PDT) Date: Wed, 25 Mar 2020 12:51:18 +0000 From: Lorenzo Pieralisi To: laurentiu.tudor@nxp.com Subject: Re: [RFC PATCH 1/4] bus: fsl-mc: add custom .dma_configure implementation Message-ID: <20200325125109.GA5430@red-moon.cambridge.arm.com> References: <20200227100542.13819-1-laurentiu.tudor@nxp.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200227100542.13819-1-laurentiu.tudor@nxp.com> User-Agent: Mutt/1.9.4 (2018-02-28) Cc: jason@lakedaemon.net, calvin.johnson@nxp.com, ard.biesheuvel@linaro.org, maz@kernel.org, pankaj.bansal@nxp.com, diana.craciun@oss.nxp.com, jon@solid-run.com, linux-kernel@vger.kernel.org, jeremy.linton@arm.com, linux-acpi@vger.kernel.org, iommu@lists.linux-foundation.org, cristian.sovaiala@nxp.com, tglx@linutronix.de, makarand.pawagi@nxp.com, ioana.ciornei@nxp.com, Stuart.Yoder@arm.com, robin.murphy@arm.com, linux-arm-kernel@lists.infradead.org, V.Sethi@nxp.com X-BeenThere: iommu@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development issues for Linux IOMMU support List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" On Thu, Feb 27, 2020 at 12:05:39PM +0200, laurentiu.tudor@nxp.com wrote: > From: Laurentiu Tudor > > The devices on this bus are not discovered by way of device tree > but by queries to the firmware. It makes little sense to trick the > generic of layer into thinking that these devices are of related so > that we can get our dma configuration. Instead of doing that, add > our custom dma configuration implementation. > > Signed-off-by: Laurentiu Tudor > --- > drivers/bus/fsl-mc/fsl-mc-bus.c | 31 ++++++++++++++++++++++++++++++- > 1 file changed, 30 insertions(+), 1 deletion(-) > > diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c > index 36eb25f82c8e..eafaa0e0b906 100644 > --- a/drivers/bus/fsl-mc/fsl-mc-bus.c > +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c > @@ -132,11 +132,40 @@ static int fsl_mc_bus_uevent(struct device *dev, struct kobj_uevent_env *env) > static int fsl_mc_dma_configure(struct device *dev) > { > struct device *dma_dev = dev; > + struct iommu_fwspec *fwspec; > + const struct iommu_ops *iommu_ops; > + struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev); > + int ret; > + u32 icid; > > while (dev_is_fsl_mc(dma_dev)) > dma_dev = dma_dev->parent; > > - return of_dma_configure(dev, dma_dev->of_node, 0); > + fwspec = dev_iommu_fwspec_get(dma_dev); > + if (!fwspec) > + return -ENODEV; > + iommu_ops = iommu_ops_from_fwnode(fwspec->iommu_fwnode); > + if (!iommu_ops) > + return -ENODEV; > + > + ret = iommu_fwspec_init(dev, fwspec->iommu_fwnode, iommu_ops); > + if (ret) > + return ret; > + > + icid = mc_dev->icid; > + ret = iommu_fwspec_add_ids(dev, &icid, 1); I see. So with this patch we would use the MC named component only to retrieve the iommu_ops - the streamid are injected directly here bypassing OF/IORT bindings translations altogether. Am I reading this code correctly ? Thanks, Lorenzo > + if (ret) > + return ret; > + > + if (!device_iommu_mapped(dev)) { > + ret = iommu_probe_device(dev); > + if (ret) > + return ret; > + } > + > + arch_setup_dma_ops(dev, 0, *dma_dev->dma_mask + 1, iommu_ops, true); > + > + return 0; > } > > static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, > -- > 2.17.1 > _______________________________________________ iommu mailing list iommu@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/iommu 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=-8.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 D13E0C43331 for ; Wed, 25 Mar 2020 12:51:43 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9E8152076A for ; Wed, 25 Mar 2020 12:51:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="b+RzYILA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9E8152076A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=r3URSMmHp6A950Zo2KNLDKSWN7cpL4Fz3+44Un9rywQ=; b=b+RzYILAGdhVUM T3hl2tH4YeADXasSDn156nPSxGxN2g5pkN/hh1qGCodRX7HhZGyLlGD5ggsL6L39Xfm1Yj3OtXgFe 5kdpSsRVZoWUQAkpk0Z3S3XNbu7PAaWND2+jiRw3+olg61O84e04KTlAMQlnrSHmZKy4zI3hliswU XV9HhLxYlqnGElFCAn/JVYV1smkqAinTfBrODhb3/eErQESnrHd0cAPV0O++AMVXJF+z6pNl7MJ0v GfQpXhFyqOpc8yHLakQsTzPqjrZ4CXHvn7mn4/MSdjnrc3x/cum57vnbXEneB/es+HhUX6RIelUP7 XxrlBzW4AwMcfono8Tcw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jH5VX-0007EO-3a; Wed, 25 Mar 2020 12:51:43 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jH5VU-0007DZ-J1 for linux-arm-kernel@lists.infradead.org; Wed, 25 Mar 2020 12:51:42 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 495FC31B; Wed, 25 Mar 2020 05:51:35 -0700 (PDT) Received: from red-moon.cambridge.arm.com (unknown [10.57.20.165]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 3F43B3F71F; Wed, 25 Mar 2020 05:51:30 -0700 (PDT) Date: Wed, 25 Mar 2020 12:51:18 +0000 From: Lorenzo Pieralisi To: laurentiu.tudor@nxp.com Subject: Re: [RFC PATCH 1/4] bus: fsl-mc: add custom .dma_configure implementation Message-ID: <20200325125109.GA5430@red-moon.cambridge.arm.com> References: <20200227100542.13819-1-laurentiu.tudor@nxp.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200227100542.13819-1-laurentiu.tudor@nxp.com> User-Agent: Mutt/1.9.4 (2018-02-28) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200325_055140_671308_99D32718 X-CRM114-Status: GOOD ( 20.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jason@lakedaemon.net, calvin.johnson@nxp.com, ard.biesheuvel@linaro.org, maz@kernel.org, pankaj.bansal@nxp.com, diana.craciun@oss.nxp.com, jon@solid-run.com, linux-kernel@vger.kernel.org, jeremy.linton@arm.com, linux-acpi@vger.kernel.org, iommu@lists.linux-foundation.org, cristian.sovaiala@nxp.com, tglx@linutronix.de, makarand.pawagi@nxp.com, ioana.ciornei@nxp.com, Stuart.Yoder@arm.com, robin.murphy@arm.com, joro@8bytes.org, linux-arm-kernel@lists.infradead.org, V.Sethi@nxp.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Feb 27, 2020 at 12:05:39PM +0200, laurentiu.tudor@nxp.com wrote: > From: Laurentiu Tudor > > The devices on this bus are not discovered by way of device tree > but by queries to the firmware. It makes little sense to trick the > generic of layer into thinking that these devices are of related so > that we can get our dma configuration. Instead of doing that, add > our custom dma configuration implementation. > > Signed-off-by: Laurentiu Tudor > --- > drivers/bus/fsl-mc/fsl-mc-bus.c | 31 ++++++++++++++++++++++++++++++- > 1 file changed, 30 insertions(+), 1 deletion(-) > > diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c > index 36eb25f82c8e..eafaa0e0b906 100644 > --- a/drivers/bus/fsl-mc/fsl-mc-bus.c > +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c > @@ -132,11 +132,40 @@ static int fsl_mc_bus_uevent(struct device *dev, struct kobj_uevent_env *env) > static int fsl_mc_dma_configure(struct device *dev) > { > struct device *dma_dev = dev; > + struct iommu_fwspec *fwspec; > + const struct iommu_ops *iommu_ops; > + struct fsl_mc_device *mc_dev = to_fsl_mc_device(dev); > + int ret; > + u32 icid; > > while (dev_is_fsl_mc(dma_dev)) > dma_dev = dma_dev->parent; > > - return of_dma_configure(dev, dma_dev->of_node, 0); > + fwspec = dev_iommu_fwspec_get(dma_dev); > + if (!fwspec) > + return -ENODEV; > + iommu_ops = iommu_ops_from_fwnode(fwspec->iommu_fwnode); > + if (!iommu_ops) > + return -ENODEV; > + > + ret = iommu_fwspec_init(dev, fwspec->iommu_fwnode, iommu_ops); > + if (ret) > + return ret; > + > + icid = mc_dev->icid; > + ret = iommu_fwspec_add_ids(dev, &icid, 1); I see. So with this patch we would use the MC named component only to retrieve the iommu_ops - the streamid are injected directly here bypassing OF/IORT bindings translations altogether. Am I reading this code correctly ? Thanks, Lorenzo > + if (ret) > + return ret; > + > + if (!device_iommu_mapped(dev)) { > + ret = iommu_probe_device(dev); > + if (ret) > + return ret; > + } > + > + arch_setup_dma_ops(dev, 0, *dma_dev->dma_mask + 1, iommu_ops, true); > + > + return 0; > } > > static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel