From: "Jan Beulich" <JBeulich@novell.com>
To: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>
Subject: [PATCH 2/7] move request_irq() into .init.text
Date: Thu, 31 Mar 2011 16:55:16 +0100 [thread overview]
Message-ID: <4D94C00402000078000396BD@vpn.id2.novell.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 3490 bytes --]
With no modular drivers, all interrupt setup is supposed to happen
during boot.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- a/xen/arch/ia64/linux-xen/irq_ia64.c
+++ b/xen/arch/ia64/linux-xen/irq_ia64.c
@@ -267,7 +267,7 @@ register_percpu_irq (ia64_vector vec, st
}
#ifdef XEN
-int request_irq_vector(unsigned int vector,
+int __init request_irq_vector(unsigned int vector,
void (*handler)(int, void *, struct cpu_user_regs *),
unsigned long irqflags, const char * devname, void *dev_id)
{
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -643,7 +643,7 @@ static int __init irq_ratelimit_init(voi
}
__initcall(irq_ratelimit_init);
-int request_irq(unsigned int irq,
+int __init request_irq(unsigned int irq,
void (*handler)(int, void *, struct cpu_user_regs *),
unsigned long irqflags, const char * devname, void *dev_id)
{
--- a/xen/drivers/passthrough/amd/iommu_init.c
+++ b/xen/drivers/passthrough/amd/iommu_init.c
@@ -535,7 +535,7 @@ static void amd_iommu_page_fault(int irq
spin_unlock_irqrestore(&iommu->lock, flags);
}
-static int set_iommu_interrupt_handler(struct amd_iommu *iommu)
+static int __init set_iommu_interrupt_handler(struct amd_iommu *iommu)
{
int irq, ret;
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -1038,7 +1038,7 @@ static hw_irq_controller dma_msi_type =
.set_affinity = dma_msi_set_affinity,
};
-static int iommu_set_interrupt(struct iommu *iommu)
+static int __init iommu_set_interrupt(struct iommu *iommu)
{
int irq, ret;
@@ -1937,7 +1937,6 @@ static int init_vtd_hw(void)
struct acpi_drhd_unit *drhd;
struct iommu *iommu;
struct iommu_flush *flush = NULL;
- int irq;
int ret;
unsigned long flags;
struct irq_cfg *cfg;
@@ -1948,16 +1947,6 @@ static int init_vtd_hw(void)
for_each_drhd_unit ( drhd )
{
iommu = drhd->iommu;
- if ( iommu->irq < 0 )
- {
- irq = iommu_set_interrupt(iommu);
- if ( irq < 0 )
- {
- dprintk(XENLOG_ERR VTDPREFIX, "IOMMU: interrupt setup failed\n");
- return irq;
- }
- iommu->irq = irq;
- }
cfg = irq_cfg(iommu->irq);
dma_msi_set_affinity(iommu->irq, cfg->cpu_mask);
@@ -2060,6 +2049,7 @@ int __init intel_vtd_setup(void)
{
struct acpi_drhd_unit *drhd;
struct iommu *iommu;
+ int ret;
if ( list_empty(&acpi_drhd_units) )
return -ENODEV;
@@ -2092,6 +2082,14 @@ int __init intel_vtd_setup(void)
if ( iommu_intremap && !ecap_intr_remap(iommu->ecap) )
iommu_intremap = 0;
+
+ ret = iommu_set_interrupt(iommu);
+ if ( ret < 0 )
+ {
+ dprintk(XENLOG_ERR VTDPREFIX, "IOMMU: interrupt setup failed\n");
+ goto error;
+ }
+ iommu->irq = ret;
}
if ( !iommu_qinval && iommu_intremap )
@@ -2110,7 +2108,8 @@ int __init intel_vtd_setup(void)
scan_pci_devices();
- if ( init_vtd_hw() )
+ ret = init_vtd_hw();
+ if ( ret )
goto error;
register_keyhandler('V', &dump_iommu_info_keyhandler);
@@ -2123,7 +2122,7 @@ int __init intel_vtd_setup(void)
iommu_passthrough = 0;
iommu_qinval = 0;
iommu_intremap = 0;
- return -ENOMEM;
+ return ret;
}
/*
[-- Attachment #2: request_irq-init.patch --]
[-- Type: text/plain, Size: 3484 bytes --]
With no modular drivers, all interrupt setup is supposed to happen
during boot.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- a/xen/arch/ia64/linux-xen/irq_ia64.c
+++ b/xen/arch/ia64/linux-xen/irq_ia64.c
@@ -267,7 +267,7 @@ register_percpu_irq (ia64_vector vec, st
}
#ifdef XEN
-int request_irq_vector(unsigned int vector,
+int __init request_irq_vector(unsigned int vector,
void (*handler)(int, void *, struct cpu_user_regs *),
unsigned long irqflags, const char * devname, void *dev_id)
{
--- a/xen/arch/x86/irq.c
+++ b/xen/arch/x86/irq.c
@@ -643,7 +643,7 @@ static int __init irq_ratelimit_init(voi
}
__initcall(irq_ratelimit_init);
-int request_irq(unsigned int irq,
+int __init request_irq(unsigned int irq,
void (*handler)(int, void *, struct cpu_user_regs *),
unsigned long irqflags, const char * devname, void *dev_id)
{
--- a/xen/drivers/passthrough/amd/iommu_init.c
+++ b/xen/drivers/passthrough/amd/iommu_init.c
@@ -535,7 +535,7 @@ static void amd_iommu_page_fault(int irq
spin_unlock_irqrestore(&iommu->lock, flags);
}
-static int set_iommu_interrupt_handler(struct amd_iommu *iommu)
+static int __init set_iommu_interrupt_handler(struct amd_iommu *iommu)
{
int irq, ret;
--- a/xen/drivers/passthrough/vtd/iommu.c
+++ b/xen/drivers/passthrough/vtd/iommu.c
@@ -1038,7 +1038,7 @@ static hw_irq_controller dma_msi_type =
.set_affinity = dma_msi_set_affinity,
};
-static int iommu_set_interrupt(struct iommu *iommu)
+static int __init iommu_set_interrupt(struct iommu *iommu)
{
int irq, ret;
@@ -1937,7 +1937,6 @@ static int init_vtd_hw(void)
struct acpi_drhd_unit *drhd;
struct iommu *iommu;
struct iommu_flush *flush = NULL;
- int irq;
int ret;
unsigned long flags;
struct irq_cfg *cfg;
@@ -1948,16 +1947,6 @@ static int init_vtd_hw(void)
for_each_drhd_unit ( drhd )
{
iommu = drhd->iommu;
- if ( iommu->irq < 0 )
- {
- irq = iommu_set_interrupt(iommu);
- if ( irq < 0 )
- {
- dprintk(XENLOG_ERR VTDPREFIX, "IOMMU: interrupt setup failed\n");
- return irq;
- }
- iommu->irq = irq;
- }
cfg = irq_cfg(iommu->irq);
dma_msi_set_affinity(iommu->irq, cfg->cpu_mask);
@@ -2060,6 +2049,7 @@ int __init intel_vtd_setup(void)
{
struct acpi_drhd_unit *drhd;
struct iommu *iommu;
+ int ret;
if ( list_empty(&acpi_drhd_units) )
return -ENODEV;
@@ -2092,6 +2082,14 @@ int __init intel_vtd_setup(void)
if ( iommu_intremap && !ecap_intr_remap(iommu->ecap) )
iommu_intremap = 0;
+
+ ret = iommu_set_interrupt(iommu);
+ if ( ret < 0 )
+ {
+ dprintk(XENLOG_ERR VTDPREFIX, "IOMMU: interrupt setup failed\n");
+ goto error;
+ }
+ iommu->irq = ret;
}
if ( !iommu_qinval && iommu_intremap )
@@ -2110,7 +2108,8 @@ int __init intel_vtd_setup(void)
scan_pci_devices();
- if ( init_vtd_hw() )
+ ret = init_vtd_hw();
+ if ( ret )
goto error;
register_keyhandler('V', &dump_iommu_info_keyhandler);
@@ -2123,7 +2122,7 @@ int __init intel_vtd_setup(void)
iommu_passthrough = 0;
iommu_qinval = 0;
iommu_intremap = 0;
- return -ENOMEM;
+ return ret;
}
/*
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
reply other threads:[~2011-03-31 15:55 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=4D94C00402000078000396BD@vpn.id2.novell.com \
--to=jbeulich@novell.com \
--cc=xen-devel@lists.xensource.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;
as well as URLs for NNTP newsgroup(s).