From: Bill Sumner <bill.sumner@hp.com>
To: dwmw2@infradead.org, indou.takao@jp.fujitsu.com, bhe@redhat.com,
joro@8bytes.org
Cc: linux-pci@vger.kernel.org, kexec@lists.infradead.org,
alex.williamson@redhat.com, linux-kernel@vger.kernel.org,
iommu@lists.linux-foundation.org, ddutile@redhat.com,
doug.hatch@hp.com, ishii.hironobu@jp.fujitsu.com,
bhelgaas@google.com, zhenhua@hp.com, bill.sumner@hp.com
Subject: [PATCH 4/8] Update iommu_attach_domain() and its callers
Date: Tue, 15 Apr 2014 17:09:05 -0600 [thread overview]
Message-ID: <1397603349-30930-5-git-send-email-bill.sumner@hp.com> (raw)
In-Reply-To: <1397603349-30930-1-git-send-email-bill.sumner@hp.com>
Allow specification of the domain-id for the new domain.
Signed-off-by: Bill Sumner <bill.sumner@hp.com>
---
drivers/iommu/intel-iommu.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c
index 4352731..0c00c2d 100644
--- a/drivers/iommu/intel-iommu.c
+++ b/drivers/iommu/intel-iommu.c
@@ -1003,7 +1003,8 @@ static struct dmar_domain *alloc_domain(void)
}
static int iommu_attach_domain(struct dmar_domain *domain,
- struct intel_iommu *iommu)
+ struct intel_iommu *iommu,
+ int domain_number)
{
int num;
unsigned long ndomains;
@@ -1013,12 +1014,15 @@ static int iommu_attach_domain(struct dmar_domain *domain,
spin_lock_irqsave(&iommu->lock, flags);
- num = find_first_zero_bit(iommu->domain_ids, ndomains);
- if (num >= ndomains) {
- spin_unlock_irqrestore(&iommu->lock, flags);
- printk(KERN_ERR "IOMMU: no free domain ids\n");
- return -ENOMEM;
- }
+ if (domain_number < 0) {
+ num = find_first_zero_bit(iommu->domain_ids, ndomains);
+ if (num >= ndomains) {
+ spin_unlock_irqrestore(&iommu->lock, flags);
+ pr_err("IOMMU: no free domain ids\n");
+ return -ENOMEM;
+ }
+ } else
+ num = domain_number;
domain->id = num;
set_bit(num, iommu->domain_ids);
@@ -1629,6 +1633,7 @@ static struct dmar_domain *get_domain_for_dev(struct pci_dev *pdev, int gaw)
int bus = 0, devfn = 0;
int segment;
int ret;
+ int did = -1; /* Default to "no domain_id supplied" */
domain = find_domain(pdev);
if (domain)
@@ -1675,7 +1680,7 @@ static struct dmar_domain *get_domain_for_dev(struct pci_dev *pdev, int gaw)
}
iommu = drhd->iommu;
- ret = iommu_attach_domain(domain, iommu);
+ ret = iommu_attach_domain(domain, iommu, did);
if (ret) {
free_domain_mem(domain);
goto error;
@@ -1894,7 +1899,7 @@ static int __init si_domain_init(int hw)
return -EFAULT;
for_each_active_iommu(iommu, drhd) {
- ret = iommu_attach_domain(si_domain, iommu);
+ ret = iommu_attach_domain(si_domain, iommu, (int) -1);
if (ret) {
domain_exit(si_domain);
return -EFAULT;
--
Bill Sumner <bill.sumner@hp.com>
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2014-04-15 23:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-15 23:09 [PATCH 0/8] Fix crashdump failure caused by legacy DMA/IO Bill Sumner
2014-04-15 23:09 ` [PATCH 1/8] Fix a few existing lines that checkpatch.pl will complain about later Bill Sumner
2014-04-15 23:09 ` [PATCH 2/8] Consolidate all .h lines at front of intel-iommu.c file Bill Sumner
2014-04-19 14:05 ` Baoquan He
2014-04-15 23:09 ` [PATCH 3/8] Create intel-iommu-private.h Bill Sumner
2014-04-15 23:09 ` Bill Sumner [this message]
2014-04-15 23:09 ` [PATCH 5/8] Add new definitions & prototypes to intel-iommu-private.h Bill Sumner
2014-04-15 23:09 ` [PATCH 6/8] Create intel-iommu-kdump.c Bill Sumner
2014-04-15 23:09 ` [PATCH 7/8] Add domain-id functions to intel-iommu-kdump.c Bill Sumner
2014-04-15 23:09 ` [PATCH 8/8] Add remaining changes to intel-iommu.c to fix crashdump Bill Sumner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1397603349-30930-5-git-send-email-bill.sumner@hp.com \
--to=bill.sumner@hp.com \
--cc=alex.williamson@redhat.com \
--cc=bhe@redhat.com \
--cc=bhelgaas@google.com \
--cc=ddutile@redhat.com \
--cc=doug.hatch@hp.com \
--cc=dwmw2@infradead.org \
--cc=indou.takao@jp.fujitsu.com \
--cc=iommu@lists.linux-foundation.org \
--cc=ishii.hironobu@jp.fujitsu.com \
--cc=joro@8bytes.org \
--cc=kexec@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=zhenhua@hp.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox