Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp2264817ybi; Sun, 9 Jun 2019 07:36:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqyoEkyKvG9UldLqGpvYwDjWC4/qDHMpSkpFtV6yk9fyxM6MdDjKIPG/ZfTSBmWnxt4cgHX1 X-Received: by 2002:a17:90a:bc02:: with SMTP id w2mr6699136pjr.101.1560090967151; Sun, 09 Jun 2019 07:36:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560090967; cv=none; d=google.com; s=arc-20160816; b=DAFhIm8JhUmr9Htd7aNPi6+6sJ/aIdwM+/kMOkq9K8CWhU5g6rLWbLetowPGLUKsqd 8XXWtb/5hY8J34YiL9Y9DUGUM6vTTt74Y4onKG0K19/xDjVsuXfUGkMAPiZGkULg+dNK 7pTBiUxAFpOgK/B0ixwrhVdC642EjcpQRy1sVKkgMTl+5+u2VNu6SVTepYKAwj/SCrzW HalZdqkb+bLhy0KDB95pKKQfSrFrFYz/1VORUjRl/drJnE7uJgi+VxFymo1dDKMKowbk mjRma0Du9FbDCvU//1hBQWU4ET7hrBPwmT6bPOHLNphkIZbxAVJTNh+p1Lqz0vWf8eCK b8CQ== 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=93xmRtn4cfvhZSyeK3JzUnjKjhZIWf31tVOhHhMQRVU=; b=LcVkznuUbo1qmszcLnoF/aFY+v4ZzKuGagCnhdJ7Sg8sh7xms/i6GUTkHHK6YLyyCm vRqhWNPII5XAj1NtGN2xfCerYNElji7FsErc9gaYHxC2Nxe+e6j0WRd91WJjt0dZJxap r7emXz1MlCJB9wSEDzLTjHIQQ0eXcJIeCgtC6ZH4eS0G4SEXTJtlQcqr0uIdjswff3aJ Z5GrszUyIbooW/2INravhbK0qAsHXorORCbjExhqtwo4cptMt/8+r3URvZJXCSYxcdty m/TrceUrAwEKnBKmqwP0X9vxQG3hXGbPcSnVcrbE7jrf+k3BeOCHGxOGE7s3eZyH68vO d92A== 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 h68si7339162pgc.270.2019.06.09.07.35.14; Sun, 09 Jun 2019 07:36:07 -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 S1729028AbfFINlX (ORCPT + 99 others); Sun, 9 Jun 2019 09:41:23 -0400 Received: from mga12.intel.com ([192.55.52.136]:31607 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728952AbfFINlV (ORCPT ); Sun, 9 Jun 2019 09:41:21 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 09 Jun 2019 06:41:18 -0700 X-ExtLoop1: 1 Received: from jacob-builder.jf.intel.com ([10.7.199.155]) by orsmga003.jf.intel.com with ESMTP; 09 Jun 2019 06:41:18 -0700 From: Jacob Pan To: iommu@lists.linux-foundation.org, LKML , Joerg Roedel , David Woodhouse , Eric Auger , Alex Williamson , Jean-Philippe Brucker Cc: "Yi Liu" , "Tian, Kevin" , Raj Ashok , "Christoph Hellwig" , "Lu Baolu" , Andriy Shevchenko , Jacob Pan Subject: [PATCH v4 16/22] iommu/vt-d: Move domain helper to header Date: Sun, 9 Jun 2019 06:44:16 -0700 Message-Id: <1560087862-57608-17-git-send-email-jacob.jun.pan@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1560087862-57608-1-git-send-email-jacob.jun.pan@linux.intel.com> References: <1560087862-57608-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 domainer helper to header to be used by SVA code. Signed-off-by: Jacob Pan --- 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 39b63fe..7cfa0eb 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -427,12 +427,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 8605c74..b75f17d 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -597,6 +597,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