From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751397AbbCSFh0 (ORCPT ); Thu, 19 Mar 2015 01:37:26 -0400 Received: from g4t3427.houston.hp.com ([15.201.208.55]:50703 "EHLO g4t3427.houston.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750729AbbCSFhL (ORCPT ); Thu, 19 Mar 2015 01:37:11 -0400 From: "Li, Zhen-Hua" To: , , , , , Cc: , , , , , , , , , , , , , , , Subject: [PATCH v9 01/10] iommu/vt-d: New function to attach domain with id Date: Thu, 19 Mar 2015 13:36:19 +0800 Message-Id: <1426743388-26908-2-git-send-email-zhen-hual@hp.com> X-Mailer: git-send-email 2.0.0-rc0 In-Reply-To: <1426743388-26908-1-git-send-email-zhen-hual@hp.com> References: <1426743388-26908-1-git-send-email-zhen-hual@hp.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Allow specification of the domain-id for the new domain. This patch only adds a new function iommu_attach_domain_with_id, it is like the function iommu_attach_domain(), only adding a parameter "did". Bill Sumner: (In older versions) Add new 'did' parameter to iommu_attach_domain(); The caller of this function. Li, Zhenhua: New function iommu_attach_domain_with_id(), instead of updating funtion iommu_attach_domain(); Signed-off-by: Bill Sumner Signed-off-by: Li, Zhen-Hua --- drivers/iommu/intel-iommu.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index ae4c1a8..76674a1 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -1558,6 +1558,16 @@ static int iommu_attach_domain(struct dmar_domain *domain, return num; } +static int iommu_attach_domain_with_id(struct dmar_domain *domain, + struct intel_iommu *iommu, + int domain_number) +{ + if (domain_number >= 0) + return domain_number; + + return iommu_attach_domain(domain, iommu); +} + static int iommu_attach_vm_domain(struct dmar_domain *domain, struct intel_iommu *iommu) { @@ -2225,6 +2235,7 @@ static struct dmar_domain *get_domain_for_dev(struct device *dev, int gaw) u16 dma_alias; unsigned long flags; u8 bus, devfn; + int did = -1; /* Default to "no domain_id supplied" */ domain = find_domain(dev); if (domain) @@ -2258,7 +2269,7 @@ static struct dmar_domain *get_domain_for_dev(struct device *dev, int gaw) domain = alloc_domain(0); if (!domain) return NULL; - domain->id = iommu_attach_domain(domain, iommu); + domain->id = iommu_attach_domain_with_id(domain, iommu, did); if (domain->id < 0) { free_domain_mem(domain); return NULL; -- 2.0.0-rc0