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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 CB387C43381 for ; Tue, 12 Mar 2019 06:06:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 9915D214D8 for ; Tue, 12 Mar 2019 06:06:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727268AbfCLGGG (ORCPT ); Tue, 12 Mar 2019 02:06:06 -0400 Received: from mga04.intel.com ([192.55.52.120]:22866 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727077AbfCLGGD (ORCPT ); Tue, 12 Mar 2019 02:06:03 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Mar 2019 23:06:03 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.58,470,1544515200"; d="scan'208";a="141228510" Received: from allen-box.sh.intel.com ([10.239.159.136]) by orsmga002.jf.intel.com with ESMTP; 11 Mar 2019 23:06:00 -0700 From: Lu Baolu To: David Woodhouse , Joerg Roedel , ashok.raj@intel.com, jacob.jun.pan@intel.com, alan.cox@intel.com, kevin.tian@intel.com, mika.westerberg@linux.intel.com, pengfei.xu@intel.com Cc: iommu@lists.linux-foundation.org, linux-kernel@vger.kernel.org, Lu Baolu , Jacob Pan Subject: [PATCH v1 5/9] iommu/vt-d: Add bounce buffer API for dma sync Date: Tue, 12 Mar 2019 14:00:01 +0800 Message-Id: <20190312060005.12189-6-baolu.lu@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190312060005.12189-1-baolu.lu@linux.intel.com> References: <20190312060005.12189-1-baolu.lu@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This adds the APIs for bounce buffer specified dma sync ops. Cc: Ashok Raj Cc: Jacob Pan Signed-off-by: Lu Baolu Tested-by: Xu Pengfei Tested-by: Mika Westerberg --- drivers/iommu/intel-pgtable.c | 112 ++++++++++++++++++++++++++++++++++ include/linux/intel-iommu.h | 6 ++ 2 files changed, 118 insertions(+) diff --git a/drivers/iommu/intel-pgtable.c b/drivers/iommu/intel-pgtable.c index e8317982c5ab..d175045fe236 100644 --- a/drivers/iommu/intel-pgtable.c +++ b/drivers/iommu/intel-pgtable.c @@ -331,6 +331,100 @@ static const struct addr_walk walk_bounce_unmap = { .high = bounce_unmap_high, }; +static int +bounce_sync_iova_pfn(struct dmar_domain *domain, dma_addr_t addr, + size_t size, struct bounce_param *param, + enum dma_data_direction dir) +{ + struct bounce_cookie *cookie; + unsigned long flags; + + spin_lock_irqsave(&bounce_lock, flags); + cookie = idr_find(&domain->bounce_idr, addr >> PAGE_SHIFT); + spin_unlock_irqrestore(&bounce_lock, flags); + if (!cookie) + return 0; + + return bounce_sync(cookie->original_phys, cookie->bounce_phys, + size, dir); +} + +static int +bounce_sync_for_device_low(struct dmar_domain *domain, dma_addr_t addr, + phys_addr_t paddr, size_t size, + struct bounce_param *param) +{ + if (param->dir == DMA_BIDIRECTIONAL || param->dir == DMA_TO_DEVICE) + return bounce_sync_iova_pfn(domain, addr, size, + param, DMA_TO_DEVICE); + + return 0; +} + +static int +bounce_sync_for_device_middle(struct dmar_domain *domain, dma_addr_t addr, + phys_addr_t paddr, size_t size, + struct bounce_param *param) +{ + return 0; +} + +static int +bounce_sync_for_device_high(struct dmar_domain *domain, dma_addr_t addr, + phys_addr_t paddr, size_t size, + struct bounce_param *param) +{ + if (param->dir == DMA_BIDIRECTIONAL || param->dir == DMA_TO_DEVICE) + return bounce_sync_iova_pfn(domain, addr, size, + param, DMA_TO_DEVICE); + + return 0; +} + +const struct addr_walk walk_bounce_sync_for_device = { + .low = bounce_sync_for_device_low, + .middle = bounce_sync_for_device_middle, + .high = bounce_sync_for_device_high, +}; + +static int +bounce_sync_for_cpu_low(struct dmar_domain *domain, dma_addr_t addr, + phys_addr_t paddr, size_t size, + struct bounce_param *param) +{ + if (param->dir == DMA_BIDIRECTIONAL || param->dir == DMA_FROM_DEVICE) + return bounce_sync_iova_pfn(domain, addr, size, + param, DMA_FROM_DEVICE); + + return 0; +} + +static int +bounce_sync_for_cpu_middle(struct dmar_domain *domain, dma_addr_t addr, + phys_addr_t paddr, size_t size, + struct bounce_param *param) +{ + return 0; +} + +static int +bounce_sync_for_cpu_high(struct dmar_domain *domain, dma_addr_t addr, + phys_addr_t paddr, size_t size, + struct bounce_param *param) +{ + if (param->dir == DMA_BIDIRECTIONAL || param->dir == DMA_FROM_DEVICE) + return bounce_sync_iova_pfn(domain, addr, size, + param, DMA_FROM_DEVICE); + + return 0; +} + +const struct addr_walk walk_bounce_sync_for_cpu = { + .low = bounce_sync_for_cpu_low, + .middle = bounce_sync_for_cpu_middle, + .high = bounce_sync_for_cpu_high, +}; + static int domain_walk_addr_range(const struct addr_walk *walk, struct dmar_domain *domain, @@ -404,3 +498,21 @@ domain_bounce_unmap(struct dmar_domain *domain, dma_addr_t addr, return domain_walk_addr_range(&walk_bounce_unmap, domain, addr, paddr, size, param); } + +int +domain_bounce_sync_for_device(struct dmar_domain *domain, dma_addr_t addr, + phys_addr_t paddr, size_t size, + struct bounce_param *param) +{ + return domain_walk_addr_range(&walk_bounce_sync_for_device, domain, + addr, paddr, size, param); +} + +int +domain_bounce_sync_for_cpu(struct dmar_domain *domain, dma_addr_t addr, + phys_addr_t paddr, size_t size, + struct bounce_param *param) +{ + return domain_walk_addr_range(&walk_bounce_sync_for_cpu, domain, + addr, paddr, size, param); +} diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 8b5ba91ab606..f4f313df7249 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -681,6 +681,12 @@ int domain_bounce_map(struct dmar_domain *domain, dma_addr_t addr, int domain_bounce_unmap(struct dmar_domain *domain, dma_addr_t addr, phys_addr_t paddr, size_t size, struct bounce_param *param); +int domain_bounce_sync_for_device(struct dmar_domain *domain, dma_addr_t addr, + phys_addr_t paddr, size_t size, + struct bounce_param *param); +int domain_bounce_sync_for_cpu(struct dmar_domain *domain, dma_addr_t addr, + phys_addr_t paddr, size_t size, + struct bounce_param *param); #ifdef CONFIG_INTEL_IOMMU_SVM int intel_svm_init(struct intel_iommu *iommu); extern int intel_svm_enable_prq(struct intel_iommu *iommu); -- 2.17.1