public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>,
	Len Brown <len.brown@intel.com>, Jiang Liu <jiang.liu@huawei.com>,
	Suresh Siddha <suresh.b.siddha@intel.com>, x86 <x86@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	Yinghai Lu <yinghai@kernel.org>
Subject: [RFC PATCH 08/14] IOMMU: iommu_unique_seq_id()
Date: Mon,  2 Apr 2012 19:19:35 -0700	[thread overview]
Message-ID: <1333419581-7836-9-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1333419581-7836-1-git-send-email-yinghai@kernel.org>

So for hot-remove/hot-add will reuse seq_id.

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
 drivers/iommu/dmar.c |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c
index fde4991..043192e 100644
--- a/drivers/iommu/dmar.c
+++ b/drivers/iommu/dmar.c
@@ -707,13 +707,23 @@ int __init detect_intel_iommu(void)
 	return ret ? 1 : -ENODEV;
 }
 
+static DECLARE_BITMAP(iommu_allocated, 1024);
+
+static int iommu_unique_seq_id(void)
+{
+	int id;
+
+	id = find_first_zero_bit(iommu_allocated, 1024);
+	__set_bit(id, iommu_allocated);
+
+	return id;
+}
 
 int alloc_iommu(struct dmar_drhd_unit *drhd)
 {
 	struct intel_iommu *iommu;
 	int map_size;
 	u32 ver;
-	static int iommu_allocated = 0;
 	int agaw = 0;
 	int msagaw = 0;
 
@@ -726,7 +736,7 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
 	if (!iommu)
 		return -ENOMEM;
 
-	iommu->seq_id = iommu_allocated++;
+	iommu->seq_id = iommu_unique_seq_id();
 	sprintf (iommu->name, "dmar%d", iommu->seq_id);
 
 	iommu->reg = ioremap(drhd->reg_base_addr, VTD_PAGE_SIZE);
@@ -790,6 +800,7 @@ int alloc_iommu(struct dmar_drhd_unit *drhd)
  err_unmap:
 	iounmap(iommu->reg);
  error:
+	__clear_bit(iommu->seq_id, iommu_allocated);
 	kfree(iommu);
 	return -1;
 }
@@ -803,6 +814,7 @@ void free_iommu(struct intel_iommu *iommu)
 
 	if (iommu->reg)
 		iounmap(iommu->reg);
+	__clear_bit(iommu->seq_id, iommu_allocated);
 	kfree(iommu);
 }
 
-- 
1.7.7


  parent reply	other threads:[~2012-04-03  2:20 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-03  2:19 [RFC PATCH 00/14] IOMMU: irq-remapping and dmar hotplug support Yinghai Lu
2012-04-03  2:19 ` [RFC PATCH 01/14] ACPI, PCI: Stop pci devices before acpi_pci_driver remove calling Yinghai Lu
2012-04-03  2:19 ` [RFC PATCH 02/14] PCI, x86: Move pci_enable_bridges() down Yinghai Lu
2012-04-03  2:19 ` [RFC PATCH 03/14] ACPI, PCI: Skip extra pci_enable_bridges for non hot-add root Yinghai Lu
2012-04-03  2:19 ` [RFC PATCH 04/14] PCI: set dev_node early for pci_dev Yinghai Lu
2012-04-03  2:19 ` [RFC PATCH 05/14] IOMMU: Update dmar units devices list during hotplug Yinghai Lu
2012-04-03  2:19 ` [RFC PATCH 06/14] IOMMU: Fix tboot force iommu logic Yinghai Lu
2012-04-03  2:19 ` [RFC PATCH 07/14] IOMMU: Don't clean handler data before free_irq() Yinghai Lu
2012-04-03  2:19 ` Yinghai Lu [this message]
2012-04-03  2:19 ` [RFC PATCH 09/14] ACPI: Add acpi_run_dsm() Yinghai Lu
2012-04-03  2:19 ` [RFC PATCH 10/14] IOMMU: Separate free_dmar_iommu from free_iommu Yinghai Lu
2012-04-03  2:19 ` [RFC PATCH 11/14] IOMMU: Add init_dmar_one() Yinghai Lu
2012-04-03  2:19 ` [RFC PATCH 12/14] IOMMU: Add intel_enable_irq_remapping_one() Yinghai Lu
2012-04-03  2:19 ` [RFC PATCH 13/14] IOMMU: Add dmar_parse_one_drhd() Yinghai Lu
2012-04-03  2:19 ` [RFC PATCH 14/14] IOMMU: Add intel iommu irq-remapping and dmar hotplug support Yinghai Lu

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=1333419581-7836-9-git-send-email-yinghai@kernel.org \
    --to=yinghai@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=bhelgaas@google.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=jiang.liu@huawei.com \
    --cc=len.brown@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=suresh.b.siddha@intel.com \
    --cc=torvalds@linux-foundation.org \
    --cc=x86@kernel.org \
    /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