From patchwork Mon May 11 09:52:45 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Zhen-Hua" X-Patchwork-Id: 6375491 X-Patchwork-Delegate: bhelgaas@google.com Return-Path: X-Original-To: patchwork-linux-pci@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 876859F1C2 for ; Mon, 11 May 2015 09:58:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B554D203EB for ; Mon, 11 May 2015 09:58:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AC6E820225 for ; Mon, 11 May 2015 09:57:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753115AbbEKJ56 (ORCPT ); Mon, 11 May 2015 05:57:58 -0400 Received: from g2t2354.austin.hp.com ([15.217.128.53]:48176 "EHLO g2t2354.austin.hp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752963AbbEKJyE (ORCPT ); Mon, 11 May 2015 05:54:04 -0400 Received: from g2t2360.austin.hp.com (g2t2360.austin.hp.com [16.197.8.247]) by g2t2354.austin.hp.com (Postfix) with ESMTP id B81B6C5; Mon, 11 May 2015 09:54:03 +0000 (UTC) Received: from piepie.asiapacific.hpqcorp.net (piepie.asiapacific.hpqcorp.net [16.187.246.216]) by g2t2360.austin.hp.com (Postfix) with ESMTP id 93C3F64; Mon, 11 May 2015 09:53:58 +0000 (UTC) From: "Li, Zhen-Hua" To: , , , , , Cc: , , , , , , , , , , , , , , , Subject: [PATCH v11 01/10] iommu/vt-d: New function to attach domain with id Date: Mon, 11 May 2015 17:52:45 +0800 Message-Id: <1431337974-545-2-git-send-email-zhen-hual@hp.com> X-Mailer: git-send-email 2.0.0-rc0 In-Reply-To: <1431337974-545-1-git-send-email-zhen-hual@hp.com> References: <1431337974-545-1-git-send-email-zhen-hual@hp.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 function 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 68d43be..cb9d6cc 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c @@ -1552,6 +1552,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) { @@ -2220,6 +2230,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) @@ -2253,7 +2264,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;