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=-17.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 7F277C48BE5 for ; Wed, 16 Jun 2021 15:55:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5B7D061164 for ; Wed, 16 Jun 2021 15:55:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234989AbhFPP5a (ORCPT ); Wed, 16 Jun 2021 11:57:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:20653 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234970AbhFPPyt (ORCPT ); Wed, 16 Jun 2021 11:54:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623858705; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xlBpjk0p11BKeTclm4FcvP2+RtXdSrKcaNlna0enzx0=; b=dflUIjwGERgyv1YDJp9SRcIDXTOnvAGQ1HRYgcPC9Bq05S0QrbsqJATw8L65AyPAS6ytnI YGKxB1GzIvmCNbVCqBPFp3VSOr1NpLAiMnHH9itjW5X6jogeMNaWd2rKrdCLuKZngz5lvx M5+E1QyYdz9wfm3ZormyBNhUp13VNjE= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-227-4AW4xx45MzmkkcKrl9v9Wg-1; Wed, 16 Jun 2021 11:50:54 -0400 X-MC-Unique: 4AW4xx45MzmkkcKrl9v9Wg-1 Received: by mail-wm1-f70.google.com with SMTP id l25-20020a1c79190000b02901c7057f03d1so1407256wme.4 for ; Wed, 16 Jun 2021 08:50:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:subject:to:cc:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding:content-language; bh=xlBpjk0p11BKeTclm4FcvP2+RtXdSrKcaNlna0enzx0=; b=Po3K/Jw1FTP+lS3Qb+Q6wHrJ9DXY8HjNJDTKztiVAt3pbs5xCcuHihd9D71hRJuXDR F+bgthryzZZoNL0CD0PAlpP4MTm8Cko/nIX+ezMOi3eDTNu4XZuT2av7aKWHwfK/RLNb Zk44NsWDZgysM/+eVC0meStrr7DS1NBqQZ20iTRiSDitctK2CecolNhhdEh1gylpO7nU E4ZtpltxsPR6gFnYb7FA7PS0J4n8xRf9skUvzeLPwgPJhdcQe5c8r5GsQhqQ6KXPajeF kCbZoAGr/4Mu5WLCn90mPXnN2AhNEpv32nbiHIbdOiA0/s7Ps8vQub6Ul6PvxQo8uglP NCVQ== X-Gm-Message-State: AOAM532qz43RThpYQqMyEAZKKEAMxjsZaqcKraTGFCHgHzawNzlvoaL3 MxORCROng41fQ+OleT7lPOMCSmBg/9Rblimblv8nLdxvpiV2QVtyMRHG9UjucdVMT12NcPc1iCj 8/lmt+4g7DXJGkrbTMnlW3g== X-Received: by 2002:a1c:193:: with SMTP id 141mr12231111wmb.106.1623858653021; Wed, 16 Jun 2021 08:50:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9OI2IVADygttdOre09Sy1S+JFXZdlBRd88z8bREst0fh3MJQ4Chz/ONg8Ap86S3zsy0+c3w== X-Received: by 2002:a1c:193:: with SMTP id 141mr12231096wmb.106.1623858652836; Wed, 16 Jun 2021 08:50:52 -0700 (PDT) Received: from [192.168.43.95] ([37.172.247.238]) by smtp.gmail.com with ESMTPSA id g17sm3403307wrh.72.2021.06.16.08.50.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 16 Jun 2021 08:50:52 -0700 (PDT) Reply-To: eric.auger@redhat.com Subject: Re: [PATCH v4 5/6] iommu/dma: Simplify calls to iommu_setup_dma_ops() To: Jean-Philippe Brucker , rjw@rjwysocki.net, lenb@kernel.org, joro@8bytes.org, mst@redhat.com Cc: will@kernel.org, catalin.marinas@arm.com, baolu.lu@linux.intel.com, dwmw2@infradead.org, linux-acpi@vger.kernel.org, iommu@lists.linux-foundation.org, virtualization@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, sebastien.boeuf@intel.com, robin.murphy@arm.com, kevin.tian@intel.com, lorenzo.pieralisi@arm.com, guohanjun@huawei.com, sudeep.holla@arm.com References: <20210610075130.67517-1-jean-philippe@linaro.org> <20210610075130.67517-6-jean-philippe@linaro.org> From: Eric Auger Message-ID: <210dbd62-cd04-209c-eec9-f0a4e706264d@redhat.com> Date: Wed, 16 Jun 2021 17:50:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210610075130.67517-6-jean-philippe@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-Language: en-US Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Hi Jean, On 6/10/21 9:51 AM, Jean-Philippe Brucker wrote: > dma-iommu uses the address bounds described in domain->geometry during > IOVA allocation. The address size parameters of iommu_setup_dma_ops() > are useful for describing additional limits set by the platform > firmware, but aren't needed for drivers that call this function from > probe_finalize(). The base parameter can be zero because dma-iommu > already removes the first IOVA page, and the limit parameter can be > U64_MAX because it's only checked against the domain geometry. Simplify > calls to iommu_setup_dma_ops(). > > Signed-off-by: Jean-Philippe Brucker Reviewed-by: Eric Auger Eric > --- > drivers/iommu/amd/iommu.c | 9 +-------- > drivers/iommu/dma-iommu.c | 4 +++- > drivers/iommu/intel/iommu.c | 10 +--------- > 3 files changed, 5 insertions(+), 18 deletions(-) > > diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c > index 94b96d81fcfd..d3123bc05c08 100644 > --- a/drivers/iommu/amd/iommu.c > +++ b/drivers/iommu/amd/iommu.c > @@ -1708,14 +1708,7 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev) > > static void amd_iommu_probe_finalize(struct device *dev) > { > - struct iommu_domain *domain; > - > - /* Domains are initialized for this device - have a look what we ended up with */ > - domain = iommu_get_domain_for_dev(dev); > - if (domain->type == IOMMU_DOMAIN_DMA) > - iommu_setup_dma_ops(dev, IOVA_START_PFN << PAGE_SHIFT, U64_MAX); > - else > - set_dma_ops(dev, NULL); > + iommu_setup_dma_ops(dev, 0, U64_MAX); > } > > static void amd_iommu_release_device(struct device *dev) > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > index c62e19bed302..175f8eaeb5b3 100644 > --- a/drivers/iommu/dma-iommu.c > +++ b/drivers/iommu/dma-iommu.c > @@ -1322,7 +1322,9 @@ void iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 dma_limit) > if (domain->type == IOMMU_DOMAIN_DMA) { > if (iommu_dma_init_domain(domain, dma_base, dma_limit, dev)) > goto out_err; > - dev->dma_ops = &iommu_dma_ops; > + set_dma_ops(dev, &iommu_dma_ops); > + } else { > + set_dma_ops(dev, NULL); > } > > return; > diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c > index 85f18342603c..8d866940692a 100644 > --- a/drivers/iommu/intel/iommu.c > +++ b/drivers/iommu/intel/iommu.c > @@ -5165,15 +5165,7 @@ static void intel_iommu_release_device(struct device *dev) > > static void intel_iommu_probe_finalize(struct device *dev) > { > - dma_addr_t base = IOVA_START_PFN << VTD_PAGE_SHIFT; > - struct iommu_domain *domain = iommu_get_domain_for_dev(dev); > - struct dmar_domain *dmar_domain = to_dmar_domain(domain); > - > - if (domain && domain->type == IOMMU_DOMAIN_DMA) > - iommu_setup_dma_ops(dev, base, > - __DOMAIN_MAX_ADDR(dmar_domain->gaw)); > - else > - set_dma_ops(dev, NULL); > + iommu_setup_dma_ops(dev, 0, U64_MAX); > } > > static void intel_iommu_get_resv_regions(struct device *device, 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=-15.2 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,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 5C38DC48BE5 for ; Wed, 16 Jun 2021 15:51:05 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (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 082D361166 for ; Wed, 16 Jun 2021 15:51:04 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 082D361166 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.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 smtp1.osuosl.org (Postfix) with ESMTP id C4BAF836CE; Wed, 16 Jun 2021 15:51:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gA2QZ9xOev3X; Wed, 16 Jun 2021 15:51:04 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp1.osuosl.org (Postfix) with ESMTPS id A416983506; Wed, 16 Jun 2021 15:51:03 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id 7355AC000D; Wed, 16 Jun 2021 15:51:03 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) by lists.linuxfoundation.org (Postfix) with ESMTP id 6CA1DC000B for ; Wed, 16 Jun 2021 15:51:02 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 53C8E836CE for ; Wed, 16 Jun 2021 15:51:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id siR4DH_WO6rM for ; Wed, 16 Jun 2021 15:51:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 953A283506 for ; Wed, 16 Jun 2021 15:51:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623858660; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xlBpjk0p11BKeTclm4FcvP2+RtXdSrKcaNlna0enzx0=; b=N5WO38BkCTYH2oz/swS/n/d73TExAGUVZ9zYku+iVC9Gz9y9plki9DX/HZrE1D1yDvty8r 5/UPrOL+WQkjR9b26kPSGLMm2isU3OpovYG56jKL7liKEfvLW/xJX5QWsRfKhYjUMJbzOu C/Q0rfnOkKf+fA+LsX5pJcuWPI/tnSg= Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-279--RYR_PwwN4Cm_1ZOD2wg3g-1; Wed, 16 Jun 2021 11:50:54 -0400 X-MC-Unique: -RYR_PwwN4Cm_1ZOD2wg3g-1 Received: by mail-wr1-f72.google.com with SMTP id q15-20020adfc50f0000b0290111f48b865cso1464300wrf.4 for ; Wed, 16 Jun 2021 08:50:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:subject:to:cc:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding:content-language; bh=xlBpjk0p11BKeTclm4FcvP2+RtXdSrKcaNlna0enzx0=; b=a1+/xXIzkZkOSR+aTqdViaf6C8Et125QIAmGeCIKuAk52BDhAIH8/cNY3qOULet9IU rfvYGSWQCUFj98O54v/8yjumPO3oWZ/IU3z2jGPGpElP6Jr+MYQolm+H4eD/60/U/nPL h+CPVD9BQz8s843l8sz1jk4SgOatC8Zj+EwMmU/dZXQruKRcoq4E+2PT2aTts6PgUcui vvAtNIm5HVb+cKnQW8aCn1WeImKtDB7d+qEXaqCTOQEofWGuhG+mTLF4OvmVA+CoJHs0 SsYjMp5IIs0QwOKmXi1hxnRasTtwOIbZ/yz0357YfrAwAhNNI06JsYTa9GxX3Vd8w5us di/w== X-Gm-Message-State: AOAM5305/YOJTtQ4bmg4zioGfASig0m5f/FmH2p92RyAyULNd8cd6bnb PwOXL1t2F93Pk+gow/hEHd4oVLQMlLHWy5Bw7AQSIV0tKDOsH09xqvbTCetvRgkAR1UOr95yScI WcOVHkCaA49gcP0o3YmoGqnscbBCHEw== X-Received: by 2002:a1c:193:: with SMTP id 141mr12231132wmb.106.1623858653149; Wed, 16 Jun 2021 08:50:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9OI2IVADygttdOre09Sy1S+JFXZdlBRd88z8bREst0fh3MJQ4Chz/ONg8Ap86S3zsy0+c3w== X-Received: by 2002:a1c:193:: with SMTP id 141mr12231096wmb.106.1623858652836; Wed, 16 Jun 2021 08:50:52 -0700 (PDT) Received: from [192.168.43.95] ([37.172.247.238]) by smtp.gmail.com with ESMTPSA id g17sm3403307wrh.72.2021.06.16.08.50.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 16 Jun 2021 08:50:52 -0700 (PDT) Subject: Re: [PATCH v4 5/6] iommu/dma: Simplify calls to iommu_setup_dma_ops() To: Jean-Philippe Brucker , rjw@rjwysocki.net, lenb@kernel.org, joro@8bytes.org, mst@redhat.com References: <20210610075130.67517-1-jean-philippe@linaro.org> <20210610075130.67517-6-jean-philippe@linaro.org> From: Eric Auger Message-ID: <210dbd62-cd04-209c-eec9-f0a4e706264d@redhat.com> Date: Wed, 16 Jun 2021 17:50:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210610075130.67517-6-jean-philippe@linaro.org> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Cc: kevin.tian@intel.com, catalin.marinas@arm.com, sudeep.holla@arm.com, robin.murphy@arm.com, virtualization@lists.linux-foundation.org, linux-acpi@vger.kernel.org, iommu@lists.linux-foundation.org, sebastien.boeuf@intel.com, guohanjun@huawei.com, will@kernel.org, dwmw2@infradead.org, linux-arm-kernel@lists.infradead.org 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: , Reply-To: eric.auger@redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: iommu-bounces@lists.linux-foundation.org Sender: "iommu" Hi Jean, On 6/10/21 9:51 AM, Jean-Philippe Brucker wrote: > dma-iommu uses the address bounds described in domain->geometry during > IOVA allocation. The address size parameters of iommu_setup_dma_ops() > are useful for describing additional limits set by the platform > firmware, but aren't needed for drivers that call this function from > probe_finalize(). The base parameter can be zero because dma-iommu > already removes the first IOVA page, and the limit parameter can be > U64_MAX because it's only checked against the domain geometry. Simplify > calls to iommu_setup_dma_ops(). > > Signed-off-by: Jean-Philippe Brucker Reviewed-by: Eric Auger Eric > --- > drivers/iommu/amd/iommu.c | 9 +-------- > drivers/iommu/dma-iommu.c | 4 +++- > drivers/iommu/intel/iommu.c | 10 +--------- > 3 files changed, 5 insertions(+), 18 deletions(-) > > diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c > index 94b96d81fcfd..d3123bc05c08 100644 > --- a/drivers/iommu/amd/iommu.c > +++ b/drivers/iommu/amd/iommu.c > @@ -1708,14 +1708,7 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev) > > static void amd_iommu_probe_finalize(struct device *dev) > { > - struct iommu_domain *domain; > - > - /* Domains are initialized for this device - have a look what we ended up with */ > - domain = iommu_get_domain_for_dev(dev); > - if (domain->type == IOMMU_DOMAIN_DMA) > - iommu_setup_dma_ops(dev, IOVA_START_PFN << PAGE_SHIFT, U64_MAX); > - else > - set_dma_ops(dev, NULL); > + iommu_setup_dma_ops(dev, 0, U64_MAX); > } > > static void amd_iommu_release_device(struct device *dev) > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > index c62e19bed302..175f8eaeb5b3 100644 > --- a/drivers/iommu/dma-iommu.c > +++ b/drivers/iommu/dma-iommu.c > @@ -1322,7 +1322,9 @@ void iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 dma_limit) > if (domain->type == IOMMU_DOMAIN_DMA) { > if (iommu_dma_init_domain(domain, dma_base, dma_limit, dev)) > goto out_err; > - dev->dma_ops = &iommu_dma_ops; > + set_dma_ops(dev, &iommu_dma_ops); > + } else { > + set_dma_ops(dev, NULL); > } > > return; > diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c > index 85f18342603c..8d866940692a 100644 > --- a/drivers/iommu/intel/iommu.c > +++ b/drivers/iommu/intel/iommu.c > @@ -5165,15 +5165,7 @@ static void intel_iommu_release_device(struct device *dev) > > static void intel_iommu_probe_finalize(struct device *dev) > { > - dma_addr_t base = IOVA_START_PFN << VTD_PAGE_SHIFT; > - struct iommu_domain *domain = iommu_get_domain_for_dev(dev); > - struct dmar_domain *dmar_domain = to_dmar_domain(domain); > - > - if (domain && domain->type == IOMMU_DOMAIN_DMA) > - iommu_setup_dma_ops(dev, base, > - __DOMAIN_MAX_ADDR(dmar_domain->gaw)); > - else > - set_dma_ops(dev, NULL); > + iommu_setup_dma_ops(dev, 0, U64_MAX); > } > > static void intel_iommu_get_resv_regions(struct device *device, _______________________________________________ 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=-15.2 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, 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 D13A5C48BE5 for ; Wed, 16 Jun 2021 15:51:32 +0000 (UTC) Received: from smtp3.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 6336260FF1 for ; Wed, 16 Jun 2021 15:51:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6336260FF1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=virtualization-bounces@lists.linux-foundation.org Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 2EC5B60AAB; Wed, 16 Jun 2021 15:51:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qxKMcdoMyO-H; Wed, 16 Jun 2021 15:51:31 +0000 (UTC) Received: from lists.linuxfoundation.org (lf-lists.osuosl.org [140.211.9.56]) by smtp3.osuosl.org (Postfix) with ESMTPS id D4A3260AA8; Wed, 16 Jun 2021 15:51:30 +0000 (UTC) Received: from lf-lists.osuosl.org (localhost [127.0.0.1]) by lists.linuxfoundation.org (Postfix) with ESMTP id BD471C000D; Wed, 16 Jun 2021 15:51:30 +0000 (UTC) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by lists.linuxfoundation.org (Postfix) with ESMTP id BDCC3C000B for ; Wed, 16 Jun 2021 15:51:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id ACE5B836CE for ; Wed, 16 Jun 2021 15:51:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (1024-bit key) header.d=redhat.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6sQMcGjvodfv for ; Wed, 16 Jun 2021 15:51:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by smtp1.osuosl.org (Postfix) with ESMTPS id 1276983506 for ; Wed, 16 Jun 2021 15:51:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623858688; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xlBpjk0p11BKeTclm4FcvP2+RtXdSrKcaNlna0enzx0=; b=Dm2PRK5dTxFFvCC4PEGscZMwjZZUNZPANy9E4/4AigHdDQl04PdU+jYkb/ET9nXtP+8L+g NSz6yXJecMFTuoQM49jP+MNvOHQGo1eN4TONnWObrWkunLQlcVoGRgI0fc1HIOPfj1EzFC 11ewHCtobfKF5VYWxp/0sEwdNPOkI8c= Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-218-HyjAESKtPbaLwszuakx9rA-1; Wed, 16 Jun 2021 11:50:54 -0400 X-MC-Unique: HyjAESKtPbaLwszuakx9rA-1 Received: by mail-wr1-f69.google.com with SMTP id k3-20020a5d62830000b029011a69a4d069so1234237wru.21 for ; Wed, 16 Jun 2021 08:50:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:subject:to:cc:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding:content-language; bh=xlBpjk0p11BKeTclm4FcvP2+RtXdSrKcaNlna0enzx0=; b=aSq9B1nzqfiYkusNQ4CiV+AsVbowBaJ4NfukTDsgTOHDlok5gBboiv+LTZO5GcjxY9 ulW49uF/bNw1ifI7z0y5v3PgyzcTTv3dCmr5fo7qN+3KWcfGpfKm3WICTOOlTBnFiW0z fI2RQC6IcsH45E9j0zt8HkIqcl1JtSBgNzQub4rva2FNQUyKx+8MKoac/97JcKnGTHJM WcMJJAhM0fDwy1kq2XM8QqZbfyz/X5+JGXqlhIDI8nBa/e+z38QwhkLE5vsveEmdi9+T 0cayCVGRiUdTlGkgnC495UUIePyWK4rOqWV/kKZhpNbcmecKGZeASvt77Qj5ECjTny0L Lv2Q== X-Gm-Message-State: AOAM533cVrwoKtRXD7N6IKSIdrONrrKdO2Lqn6SKPDWG6CLyxBNLSUJd wiBeJZwcvqv28eLq0ECa4BsLSycC9X2yok2DJcTbx6xWcYnf1SnGnSmdWG/Iq/+bv8RWy9u4BxV /7g147wbChLf3QYEceTawOsSKpJovNndNrLVyVecIPQ== X-Received: by 2002:a1c:193:: with SMTP id 141mr12231121wmb.106.1623858653041; Wed, 16 Jun 2021 08:50:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9OI2IVADygttdOre09Sy1S+JFXZdlBRd88z8bREst0fh3MJQ4Chz/ONg8Ap86S3zsy0+c3w== X-Received: by 2002:a1c:193:: with SMTP id 141mr12231096wmb.106.1623858652836; Wed, 16 Jun 2021 08:50:52 -0700 (PDT) Received: from [192.168.43.95] ([37.172.247.238]) by smtp.gmail.com with ESMTPSA id g17sm3403307wrh.72.2021.06.16.08.50.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 16 Jun 2021 08:50:52 -0700 (PDT) Subject: Re: [PATCH v4 5/6] iommu/dma: Simplify calls to iommu_setup_dma_ops() To: Jean-Philippe Brucker , rjw@rjwysocki.net, lenb@kernel.org, joro@8bytes.org, mst@redhat.com References: <20210610075130.67517-1-jean-philippe@linaro.org> <20210610075130.67517-6-jean-philippe@linaro.org> From: Eric Auger Message-ID: <210dbd62-cd04-209c-eec9-f0a4e706264d@redhat.com> Date: Wed, 16 Jun 2021 17:50:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210610075130.67517-6-jean-philippe@linaro.org> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Cc: lorenzo.pieralisi@arm.com, catalin.marinas@arm.com, sudeep.holla@arm.com, robin.murphy@arm.com, virtualization@lists.linux-foundation.org, linux-acpi@vger.kernel.org, iommu@lists.linux-foundation.org, sebastien.boeuf@intel.com, guohanjun@huawei.com, will@kernel.org, dwmw2@infradead.org, linux-arm-kernel@lists.infradead.org, baolu.lu@linux.intel.com X-BeenThere: virtualization@lists.linux-foundation.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux virtualization List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: eric.auger@redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: virtualization-bounces@lists.linux-foundation.org Sender: "Virtualization" Hi Jean, On 6/10/21 9:51 AM, Jean-Philippe Brucker wrote: > dma-iommu uses the address bounds described in domain->geometry during > IOVA allocation. The address size parameters of iommu_setup_dma_ops() > are useful for describing additional limits set by the platform > firmware, but aren't needed for drivers that call this function from > probe_finalize(). The base parameter can be zero because dma-iommu > already removes the first IOVA page, and the limit parameter can be > U64_MAX because it's only checked against the domain geometry. Simplify > calls to iommu_setup_dma_ops(). > > Signed-off-by: Jean-Philippe Brucker Reviewed-by: Eric Auger Eric > --- > drivers/iommu/amd/iommu.c | 9 +-------- > drivers/iommu/dma-iommu.c | 4 +++- > drivers/iommu/intel/iommu.c | 10 +--------- > 3 files changed, 5 insertions(+), 18 deletions(-) > > diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c > index 94b96d81fcfd..d3123bc05c08 100644 > --- a/drivers/iommu/amd/iommu.c > +++ b/drivers/iommu/amd/iommu.c > @@ -1708,14 +1708,7 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev) > > static void amd_iommu_probe_finalize(struct device *dev) > { > - struct iommu_domain *domain; > - > - /* Domains are initialized for this device - have a look what we ended up with */ > - domain = iommu_get_domain_for_dev(dev); > - if (domain->type == IOMMU_DOMAIN_DMA) > - iommu_setup_dma_ops(dev, IOVA_START_PFN << PAGE_SHIFT, U64_MAX); > - else > - set_dma_ops(dev, NULL); > + iommu_setup_dma_ops(dev, 0, U64_MAX); > } > > static void amd_iommu_release_device(struct device *dev) > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > index c62e19bed302..175f8eaeb5b3 100644 > --- a/drivers/iommu/dma-iommu.c > +++ b/drivers/iommu/dma-iommu.c > @@ -1322,7 +1322,9 @@ void iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 dma_limit) > if (domain->type == IOMMU_DOMAIN_DMA) { > if (iommu_dma_init_domain(domain, dma_base, dma_limit, dev)) > goto out_err; > - dev->dma_ops = &iommu_dma_ops; > + set_dma_ops(dev, &iommu_dma_ops); > + } else { > + set_dma_ops(dev, NULL); > } > > return; > diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c > index 85f18342603c..8d866940692a 100644 > --- a/drivers/iommu/intel/iommu.c > +++ b/drivers/iommu/intel/iommu.c > @@ -5165,15 +5165,7 @@ static void intel_iommu_release_device(struct device *dev) > > static void intel_iommu_probe_finalize(struct device *dev) > { > - dma_addr_t base = IOVA_START_PFN << VTD_PAGE_SHIFT; > - struct iommu_domain *domain = iommu_get_domain_for_dev(dev); > - struct dmar_domain *dmar_domain = to_dmar_domain(domain); > - > - if (domain && domain->type == IOMMU_DOMAIN_DMA) > - iommu_setup_dma_ops(dev, base, > - __DOMAIN_MAX_ADDR(dmar_domain->gaw)); > - else > - set_dma_ops(dev, NULL); > + iommu_setup_dma_ops(dev, 0, U64_MAX); > } > > static void intel_iommu_get_resv_regions(struct device *device, _______________________________________________ Virtualization mailing list Virtualization@lists.linux-foundation.org https://lists.linuxfoundation.org/mailman/listinfo/virtualization 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=-15.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,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 16685C48BE6 for ; Wed, 16 Jun 2021 15:53:19 +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 BDEA761159 for ; Wed, 16 Jun 2021 15:53:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BDEA761159 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:Reply-To:List-Subscribe:List-Help: List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date :Message-ID:From:References:Cc:To:Subject:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=SZbI3HYJI3fZJ5tdb+dDWkrX32dWvukb4RBsBUWO5Q0=; b=lbRl6fOb8OvQD2 VIZIaJis3wXDe2Fdc/jYVtovurTZln1bNNySE1cGHVpUec+J5QVMRSRnMDtFSL0aW8ngFEJVWutw1 MAZ8ckS+qwm3oNj+bXhVRJV6u7fOTQRUxE9ZDz4L6+Ocu2LMRchI2ptjVxe0aO6d9D5XGDYRwSaAR P2rlI4dUFUY+jbYri4+gX94d9KvBYBDIuD3HSKSKwrtpSi4/sVCF4SZDWYJNnkrUJn1oAGH08Cil1 Ka9DjicwTC+RRAVGvzxPAyeyvx4mYOgHTkMLkONjQQrcWn53QPQRb96epPzT2t0wgpTQnPy8FNPgR /dZKvSkFYOr6SqfGoBug==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltXpW-006yme-2v; Wed, 16 Jun 2021 15:51:50 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ltXpR-006ylv-2Y for linux-arm-kernel@lists.infradead.org; Wed, 16 Jun 2021 15:51:46 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623858703; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=xlBpjk0p11BKeTclm4FcvP2+RtXdSrKcaNlna0enzx0=; b=Wd/lsV9aqhZDBpVbE6cfJMVhzwLQpQK8DAZBR72dhRWcmQ9riqymkODJxpbKOgrLSs+Ydn k9GTLLNN6LLvdMHBUUR+D5UMtREqnkg97A6bUgEwhv36ZA0V3d791b+yf1lhzSnSHE9nuG IAZECueJHO30d4v1d+Ijghb4ABdBRog= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-279-O9nrN3RgOJSb3wBbGdkD6w-1; Wed, 16 Jun 2021 11:50:54 -0400 X-MC-Unique: O9nrN3RgOJSb3wBbGdkD6w-1 Received: by mail-wr1-f70.google.com with SMTP id n2-20020adfb7420000b029010e47b59f31so1449596wre.9 for ; Wed, 16 Jun 2021 08:50:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:reply-to:subject:to:cc:references:from :message-id:date:user-agent:mime-version:in-reply-to :content-transfer-encoding:content-language; bh=xlBpjk0p11BKeTclm4FcvP2+RtXdSrKcaNlna0enzx0=; b=LyTqAyhoMUxOT+LAXwEeiCeNUJy/rMfGxEKHeU3VyVJa7Jg3if0qJ/4n+Kiflr70Te 06jMh3pzL6rq/2S1sYFE15lqubUjEimAz9dvBqvRIQ+F+meK0MUDLBiFu3zEDA2B33wT QAz3smoA9sW3N7CPBQQ7gJBZXTFrLdKfe9Lc/O+jl8HFCNO2/3vciLJQ+d72RVzA+BJG dmiWbHYC79L7DSMaAm+uI0zMcmMkXU9d47WfQzS+sWAgCJpVWl1y8MfwDzPCLziqifCI NMuY7UiTTIM1BEn5GRzo0CQ8dNXsirAEiuE4bcI1DKTa6QpmAwbhBtCp2Q9D34B8XZAm jhdw== X-Gm-Message-State: AOAM532FSDFCNiMjrYtOxz/z5UGa9lcw9JQCeyRWeb05enRtDCsXTrE4 MlTsW5uPfmcN0xrx4MWLVsp0Sb6r5VNN1R16uhaicwvnXrwT7Fo1WzAZPlFSn6JQ5mSNLUu0OfG X6rSjsH+B63yAqvctvDzppTDGPnIFU42uHMQ= X-Received: by 2002:a1c:193:: with SMTP id 141mr12231118wmb.106.1623858653027; Wed, 16 Jun 2021 08:50:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy9OI2IVADygttdOre09Sy1S+JFXZdlBRd88z8bREst0fh3MJQ4Chz/ONg8Ap86S3zsy0+c3w== X-Received: by 2002:a1c:193:: with SMTP id 141mr12231096wmb.106.1623858652836; Wed, 16 Jun 2021 08:50:52 -0700 (PDT) Received: from [192.168.43.95] ([37.172.247.238]) by smtp.gmail.com with ESMTPSA id g17sm3403307wrh.72.2021.06.16.08.50.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 16 Jun 2021 08:50:52 -0700 (PDT) Subject: Re: [PATCH v4 5/6] iommu/dma: Simplify calls to iommu_setup_dma_ops() To: Jean-Philippe Brucker , rjw@rjwysocki.net, lenb@kernel.org, joro@8bytes.org, mst@redhat.com Cc: will@kernel.org, catalin.marinas@arm.com, baolu.lu@linux.intel.com, dwmw2@infradead.org, linux-acpi@vger.kernel.org, iommu@lists.linux-foundation.org, virtualization@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, sebastien.boeuf@intel.com, robin.murphy@arm.com, kevin.tian@intel.com, lorenzo.pieralisi@arm.com, guohanjun@huawei.com, sudeep.holla@arm.com References: <20210610075130.67517-1-jean-philippe@linaro.org> <20210610075130.67517-6-jean-philippe@linaro.org> From: Eric Auger Message-ID: <210dbd62-cd04-209c-eec9-f0a4e706264d@redhat.com> Date: Wed, 16 Jun 2021 17:50:49 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210610075130.67517-6-jean-philippe@linaro.org> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eric.auger@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210616_085145_259524_AE404702 X-CRM114-Status: GOOD ( 22.13 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: eric.auger@redhat.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Jean, On 6/10/21 9:51 AM, Jean-Philippe Brucker wrote: > dma-iommu uses the address bounds described in domain->geometry during > IOVA allocation. The address size parameters of iommu_setup_dma_ops() > are useful for describing additional limits set by the platform > firmware, but aren't needed for drivers that call this function from > probe_finalize(). The base parameter can be zero because dma-iommu > already removes the first IOVA page, and the limit parameter can be > U64_MAX because it's only checked against the domain geometry. Simplify > calls to iommu_setup_dma_ops(). > > Signed-off-by: Jean-Philippe Brucker Reviewed-by: Eric Auger Eric > --- > drivers/iommu/amd/iommu.c | 9 +-------- > drivers/iommu/dma-iommu.c | 4 +++- > drivers/iommu/intel/iommu.c | 10 +--------- > 3 files changed, 5 insertions(+), 18 deletions(-) > > diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c > index 94b96d81fcfd..d3123bc05c08 100644 > --- a/drivers/iommu/amd/iommu.c > +++ b/drivers/iommu/amd/iommu.c > @@ -1708,14 +1708,7 @@ static struct iommu_device *amd_iommu_probe_device(struct device *dev) > > static void amd_iommu_probe_finalize(struct device *dev) > { > - struct iommu_domain *domain; > - > - /* Domains are initialized for this device - have a look what we ended up with */ > - domain = iommu_get_domain_for_dev(dev); > - if (domain->type == IOMMU_DOMAIN_DMA) > - iommu_setup_dma_ops(dev, IOVA_START_PFN << PAGE_SHIFT, U64_MAX); > - else > - set_dma_ops(dev, NULL); > + iommu_setup_dma_ops(dev, 0, U64_MAX); > } > > static void amd_iommu_release_device(struct device *dev) > diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c > index c62e19bed302..175f8eaeb5b3 100644 > --- a/drivers/iommu/dma-iommu.c > +++ b/drivers/iommu/dma-iommu.c > @@ -1322,7 +1322,9 @@ void iommu_setup_dma_ops(struct device *dev, u64 dma_base, u64 dma_limit) > if (domain->type == IOMMU_DOMAIN_DMA) { > if (iommu_dma_init_domain(domain, dma_base, dma_limit, dev)) > goto out_err; > - dev->dma_ops = &iommu_dma_ops; > + set_dma_ops(dev, &iommu_dma_ops); > + } else { > + set_dma_ops(dev, NULL); > } > > return; > diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c > index 85f18342603c..8d866940692a 100644 > --- a/drivers/iommu/intel/iommu.c > +++ b/drivers/iommu/intel/iommu.c > @@ -5165,15 +5165,7 @@ static void intel_iommu_release_device(struct device *dev) > > static void intel_iommu_probe_finalize(struct device *dev) > { > - dma_addr_t base = IOVA_START_PFN << VTD_PAGE_SHIFT; > - struct iommu_domain *domain = iommu_get_domain_for_dev(dev); > - struct dmar_domain *dmar_domain = to_dmar_domain(domain); > - > - if (domain && domain->type == IOMMU_DOMAIN_DMA) > - iommu_setup_dma_ops(dev, base, > - __DOMAIN_MAX_ADDR(dmar_domain->gaw)); > - else > - set_dma_ops(dev, NULL); > + iommu_setup_dma_ops(dev, 0, U64_MAX); > } > > static void intel_iommu_get_resv_regions(struct device *device, _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel