Received: by 2002:a25:d7c1:0:0:0:0:0 with SMTP id o184csp4006983ybg; Fri, 25 Oct 2019 12:01:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqwbPKI9zcBadufow02pCDbsvUAonVEgXMsrxk1Rj/2X2F4c7k5+ChPX0cpNFzCwwBtjI3lq X-Received: by 2002:a17:906:31c1:: with SMTP id f1mr4858263ejf.242.1572030069055; Fri, 25 Oct 2019 12:01:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572030069; cv=none; d=google.com; s=arc-20160816; b=BU4VboJmE0iYhu4GkV4RSA4Ai8BTM5HiY9BXRpppwIzs5ktIbTS1gw/7F1DGHzMcYA WJ9SclfD8++tc5aMMLmGy6X7Yfjvjnirw3h6I44mGIgmrd5JGhr05guc12p0SU+78t5B 8TPUFl2cyGm70LNYSfV2UGKjl8cKZeHGfpCLLCaX3BCf0vRJQt+kzcwgc7miSEbCljgz A1mzsdW0isaWwvdmUjaENeZasC6U4GYPmVJvHfTo7T38GHDEQLLTpW8vKtliG63CIrYa ZhXu+ObGj56A3wLAswvzxYMTqtvnaeKxCiJ9A13/mtyBSX5VW6ih+xovUPhgwpP5c3dS scYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=3M+CIDnr4GEavaT6ibLns07CdceWs1QzYDEjEIKq2xY=; b=Xi6hUmO3VwvKiO0cBgeb6RhQuGCnCN2N7uOKrz73p3pCeqSOJxgZcS8femV3Ndh+Qa T8f2sbOPSL3CTX1ES5riA9isD+w4kkK1ZP7gl19VVZjhtYWIp+EUaJXB4kAleL5mIPxR IriOjqtvxSrtyQkx5Wtxid3FgHDY3PqYtegZ3gkmLwxTrPmkJ2epErYvJaS3GAMNsDxU MpiIVSwB7tFOAxAWlJWr1lOi5H5kbP1KvCghDnGpn82PZKQTDnmpeyI/rzbeUe8SDOFD j/0OQXlowaTRokfLVKR6KgRPS7dBwkadk8pOP2P0knCaZgS/sjC5NkbiXjz2vaqDPL9b 3Mmg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m1si1833967ejb.44.2019.10.25.12.00.45; Fri, 25 Oct 2019 12:01:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2501894AbfJXTvN (ORCPT + 99 others); Thu, 24 Oct 2019 15:51:13 -0400 Received: from mga07.intel.com ([134.134.136.100]:62195 "EHLO mga07.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2438038AbfJXTur (ORCPT ); Thu, 24 Oct 2019 15:50:47 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 24 Oct 2019 12:50:43 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.68,225,1569308400"; d="scan'208";a="282043149" Received: from jacob-builder.jf.intel.com ([10.7.199.155]) by orsmga001.jf.intel.com with ESMTP; 24 Oct 2019 12:50:43 -0700 From: Jacob Pan To: iommu@lists.linux-foundation.org, LKML , Joerg Roedel , David Woodhouse , Alex Williamson , Jean-Philippe Brucker Cc: "Yi Liu" , "Tian, Kevin" , Raj Ashok , "Christoph Hellwig" , "Lu Baolu" , Jonathan Cameron , Eric Auger , Jacob Pan Subject: [PATCH v7 05/11] iommu/vt-d: Move domain helper to header Date: Thu, 24 Oct 2019 12:54:58 -0700 Message-Id: <1571946904-86776-6-git-send-email-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1571946904-86776-1-git-send-email-jacob.jun.pan@linux.intel.com> References: <1571946904-86776-1-git-send-email-jacob.jun.pan@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move domain helper to header to be used by SVA code. Signed-off-by: Jacob Pan Reviewed-by: Eric Auger --- drivers/iommu/intel-iommu.c | 6 ------ include/linux/intel-iommu.h | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 2ea09b988a23..acd1ac787d8b 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -428,12 +428,6 @@ static void init_translation_status(struct intel_iommu *iommu) iommu->flags |= VTD_FLAG_TRANS_PRE_ENABLED; } -/* Convert generic 'struct iommu_domain to private struct dmar_domain */ -static struct dmar_domain *to_dmar_domain(struct iommu_domain *dom) -{ - return container_of(dom, struct dmar_domain, domain); -} - static int __init intel_iommu_setup(char *str) { if (!str) diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index c624733cb2e6..3dba6ad3e9ad 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -594,6 +594,12 @@ static inline void __iommu_flush_cache( clflush_cache_range(addr, size); } +/* Convert generic struct iommu_domain to private struct dmar_domain */ +static inline struct dmar_domain *to_dmar_domain(struct iommu_domain *dom) +{ + return container_of(dom, struct dmar_domain, domain); +} + /* * 0: readable * 1: writable -- 2.7.4