From: Yinghai Lu <yinghai@kernel.org>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>,
Bjorn Helgaas <bhelgaas@google.com>,
"Rafael J. Wysocki" <rjw@sisk.pl>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>, Joerg Roedel <joro@8bytes.org>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
Subject: [PATCH v2 12/26] x86, irq: Add realloc_irq_and_cfg_at()
Date: Fri, 8 Feb 2013 11:28:09 -0800 [thread overview]
Message-ID: <1360351703-20571-13-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1360351703-20571-1-git-send-email-yinghai@kernel.org>
For ioapic hotplug support, we need to reserve irq range for hot
added ioapic controller. After that we need to allocate those
pre-reserved one.
Add realloc_irq_and_cfg_at() to really allocate irq_desc and cfg
as pre-reserved only hold bit in allocate_irqs bit maps.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Sebastian Andrzej Siewior <sebastian@breakpoint.cc>
---
arch/x86/kernel/apic/io_apic.c | 32 +++++++++++++++++++++++++++++++-
include/linux/irq.h | 5 +++++
kernel/irq/irqdesc.c | 26 ++++++++++++++++++++++++++
3 files changed, 62 insertions(+), 1 deletion(-)
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index d2b4988..72a1351 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -301,6 +301,36 @@ static void free_irq_at(unsigned int at, struct irq_cfg *cfg)
irq_free_desc(at);
}
+static struct irq_cfg *realloc_irq_and_cfg_at(unsigned int at, int node)
+{
+ struct irq_desc *desc = irq_to_desc(at);
+ struct irq_cfg *cfg;
+ int res;
+
+ if (desc) {
+ if (irq_desc_get_irq_data(desc)->node == node)
+ return alloc_irq_and_cfg_at(at, node);
+
+ cfg = irq_desc_get_chip_data(desc);
+ if (cfg) {
+ /* shared irq */
+ if (!list_empty(&cfg->irq_2_pin))
+ return cfg;
+ free_irq_cfg(at, cfg);
+ }
+ }
+
+ res = irq_realloc_desc_at(at, node);
+ if (res >= 0) {
+ cfg = alloc_irq_cfg(at, node);
+ if (cfg) {
+ irq_set_chip_data(at, cfg);
+ return cfg;
+ }
+ }
+
+ return alloc_irq_and_cfg_at(at, node);
+}
struct io_apic {
unsigned int index;
@@ -3355,7 +3385,7 @@ int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev)
static int
io_apic_setup_irq_pin(unsigned int irq, int node, struct io_apic_irq_attr *attr)
{
- struct irq_cfg *cfg = alloc_irq_and_cfg_at(irq, node);
+ struct irq_cfg *cfg = realloc_irq_and_cfg_at(irq, node);
int ret;
if (!cfg)
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 4e0fcbb..9c6c047 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -602,6 +602,11 @@ void irq_free_descs(unsigned int irq, unsigned int cnt);
int irq_reserve_irqs(unsigned int from, unsigned int cnt);
int __irq_reserve_irqs(int irq, unsigned int from, unsigned int cnt);
+int __irq_realloc_desc(int at, int node, struct module *owner);
+/* use macros to avoid needing export.h for THIS_MODULE */
+#define irq_realloc_desc_at(at, node) \
+ __irq_realloc_desc(at, node, THIS_MODULE)
+
static inline void irq_free_desc(unsigned int irq)
{
irq_free_descs(irq, 1);
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index 3b9fb92..b48f65b 100644
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -99,6 +99,11 @@ EXPORT_SYMBOL_GPL(nr_irqs);
static DEFINE_MUTEX(sparse_irq_lock);
static DECLARE_BITMAP(allocated_irqs, IRQ_BITMAP_BITS);
+static bool __irq_is_reserved(int irq)
+{
+ return !!test_bit(irq, allocated_irqs);
+}
+
#ifdef CONFIG_SPARSE_IRQ
static RADIX_TREE(irq_desc_tree, GFP_KERNEL);
@@ -410,6 +415,27 @@ __irq_alloc_descs(int irq, unsigned int from, unsigned int cnt, int node,
EXPORT_SYMBOL_GPL(__irq_alloc_descs);
/**
+ * irq_realloc_desc - allocate irq descriptor for irq that is already reserved
+ * @irq: Allocate for specific irq number if irq >= 0
+ * @node: Preferred node on which the irq descriptor should be allocated
+ * @owner: Owning module (can be NULL)
+ *
+ * Returns the irq number or error code
+ */
+int __ref
+__irq_realloc_desc(int irq, int node, struct module *owner)
+{
+ if (!__irq_is_reserved(irq))
+ return -EINVAL;
+
+ if (irq_to_desc(irq))
+ free_desc(irq);
+
+ return alloc_descs(irq, 1, node, owner);
+}
+EXPORT_SYMBOL_GPL(__irq_realloc_desc);
+
+/**
* irq_reserve_irqs - mark irqs allocated
* @from: mark from irq number
* @cnt: number of irqs to mark
--
1.7.10.4
next prev parent reply other threads:[~2013-02-08 19:29 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-08 19:27 [PATCH v2 00/26] x86, irq: support ioapic device hotplug Yinghai Lu
2013-02-08 19:27 ` [PATCH v2 01/26] x86, irq: Change irq_remap_modify_chip_defaults to static Yinghai Lu
2013-02-08 19:27 ` [PATCH v2 02/26] x86, irq: Modify irq chip once for irq remapping Yinghai Lu
2013-03-08 20:07 ` Thomas Gleixner
2013-03-08 20:10 ` Thomas Gleixner
2013-03-09 7:25 ` Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 03/26] x86, irq: Print out MSI/MSI-X clearly Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 04/26] x86, irq: Show MSI-X in /proc/interrupt Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 05/26] x86, irq: Show pci device name for msi " Yinghai Lu
2013-03-08 19:46 ` Konrad Rzeszutek Wilk
2013-03-08 19:58 ` Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 06/26] x86, irq: Make dmar_msi/hpet_msi irq_chip name consistent Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 07/26] ia64, irq: Add dummy create_irq_nr() Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 08/26] iommu, irq: Allocate irq_desc for dmar_msi with local node Yinghai Lu
2013-02-08 20:45 ` Don Dutile
2013-02-08 20:58 ` Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 09/26] x86, irq: kill create_irq() Yinghai Lu
2013-03-08 19:48 ` Konrad Rzeszutek Wilk
2013-02-08 19:28 ` [PATCH v2 10/26] x86, irq: Convert irq_2_pin list to generic list Yinghai Lu
2013-03-08 19:50 ` Konrad Rzeszutek Wilk
2013-03-08 20:00 ` Yinghai Lu
2013-03-08 20:13 ` Konrad Rzeszutek Wilk
2013-02-08 19:28 ` [PATCH v2 11/26] genirq: Split __irq_reserve_irqs from irq_alloc_descs Yinghai Lu
2013-02-08 19:28 ` Yinghai Lu [this message]
2013-03-08 19:53 ` [PATCH v2 12/26] x86, irq: Add realloc_irq_and_cfg_at() Konrad Rzeszutek Wilk
2013-03-09 7:22 ` Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 13/26] x86, irq: Move down arch_early_irq_init() Yinghai Lu
2013-03-08 19:53 ` Konrad Rzeszutek Wilk
2013-02-08 19:28 ` [PATCH v2 14/26] x86, irq: Split out alloc_ioapic_save_registers() Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 15/26] xen, irq: call irq_realloc_desc_at() at first Yinghai Lu
2013-03-08 19:43 ` Konrad Rzeszutek Wilk
2013-03-08 19:46 ` Yinghai Lu
2013-03-08 20:01 ` Konrad Rzeszutek Wilk
2013-02-08 19:28 ` [PATCH v2 16/26] x86, irq: pre-reserve irq range/realloc for booting path Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 17/26] x86, irq: Add ioapic_gsi_to_irq Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 18/26] genirq: Bail out early in free_desc() Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 19/26] x86, irq: More strict checking about registering ioapic Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 20/26] x86, irq: Make mp_register_ioapic handle hotadd ioapic Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 21/26] x86, irq: Add mp_unregister_ioapic to handle hot-remove ioapic Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 22/26] x86, irq: Make ioapics loop skip blank slots Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 23/26] x86, ioapic: Find usable ioapic id for 64bit Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 24/26] x86: Move declaration for mp_register_ioapic() Yinghai Lu
2013-02-08 19:28 ` [PATCH v2 25/26] PCI: Disable mem in the ioapic removing path Yinghai Lu
2013-02-08 21:14 ` Bjorn Helgaas
2013-02-08 22:33 ` Yinghai Lu
2013-02-08 23:18 ` Bjorn Helgaas
2013-02-08 19:28 ` [PATCH v2 26/26] PCI, x86, ACPI: Add ioapic hotplug support with acpi host bridge Yinghai Lu
2013-02-08 21:24 ` Bjorn Helgaas
2013-02-08 22:35 ` Yinghai Lu
2013-02-09 0:26 ` [PATCH v2 26-1/26] PCI, x86: Make ioapic hotplug support built-in Yinghai Lu
2013-02-09 0:26 ` [PATCH v2 26-2/26] PCI, x86, ACPI: Link acpi ioapic register to ioapic Yinghai Lu
2013-02-09 0:26 ` [PATCH v2 26-3/26] PCI, x86, ACPI: Enable ioapic hotplug support with acpi host bridge Yinghai Lu
2013-02-09 0:26 ` [PATCH v2 26-4/26] PCI, x86, ACPI: get ioapic address from acpi device Yinghai Lu
2013-02-11 9:34 ` [PATCH v2 00/26] x86, irq: support ioapic device hotplug Ingo Molnar
2013-02-12 6:10 ` H. Peter Anvin
2013-02-13 2:36 ` 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=1360351703-20571-13-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=bhelgaas@google.com \
--cc=hpa@zytor.com \
--cc=joro@8bytes.org \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rjw@sisk.pl \
--cc=sebastian@breakpoint.cc \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).