diff options
author | Mark Maule <maule@sgi.com> | 2006-04-14 17:03:49 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-21 14:59:59 -0400 |
commit | 10083072bfabc40bc47306e512c158c57cf55c2e (patch) | |
tree | 2c7c3f08ae779594026e67a7a36915c2f97d73b9 /arch/ia64/sn | |
parent | fd58e55fcf5568e51da2ed54d7acd049c3fdb184 (diff) |
[PATCH] PCI: per-platform IA64_{FIRST,LAST}_DEVICE_VECTOR definitions
Abstract IA64_FIRST_DEVICE_VECTOR/IA64_LAST_DEVICE_VECTOR since SN platforms
use a subset of the IA64 range. Implement this by making the above macros
global variables which the platform can override in it setup code.
Also add a reserve_irq_vector() routine used by SN to mark a vector's as
in-use when that weren't allocated through assign_irq_vector().
Signed-off-by: Mark Maule <maule@sgi.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/ia64/sn')
-rw-r--r-- | arch/ia64/sn/kernel/irq.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c index c265e02f5036..db187f5cdae1 100644 --- a/arch/ia64/sn/kernel/irq.c +++ b/arch/ia64/sn/kernel/irq.c | |||
@@ -202,6 +202,9 @@ void sn_irq_init(void) | |||
202 | int i; | 202 | int i; |
203 | irq_desc_t *base_desc = irq_desc; | 203 | irq_desc_t *base_desc = irq_desc; |
204 | 204 | ||
205 | ia64_first_device_vector = IA64_SN2_FIRST_DEVICE_VECTOR; | ||
206 | ia64_last_device_vector = IA64_SN2_LAST_DEVICE_VECTOR; | ||
207 | |||
205 | for (i = 0; i < NR_IRQS; i++) { | 208 | for (i = 0; i < NR_IRQS; i++) { |
206 | if (base_desc[i].handler == &no_irq_type) { | 209 | if (base_desc[i].handler == &no_irq_type) { |
207 | base_desc[i].handler = &irq_type_sn; | 210 | base_desc[i].handler = &irq_type_sn; |
@@ -285,6 +288,7 @@ void sn_irq_fixup(struct pci_dev *pci_dev, struct sn_irq_info *sn_irq_info) | |||
285 | /* link it into the sn_irq[irq] list */ | 288 | /* link it into the sn_irq[irq] list */ |
286 | spin_lock(&sn_irq_info_lock); | 289 | spin_lock(&sn_irq_info_lock); |
287 | list_add_rcu(&sn_irq_info->list, sn_irq_lh[sn_irq_info->irq_irq]); | 290 | list_add_rcu(&sn_irq_info->list, sn_irq_lh[sn_irq_info->irq_irq]); |
291 | reserve_irq_vector(sn_irq_info->irq_irq); | ||
288 | spin_unlock(&sn_irq_info_lock); | 292 | spin_unlock(&sn_irq_info_lock); |
289 | 293 | ||
290 | register_intr_pda(sn_irq_info); | 294 | register_intr_pda(sn_irq_info); |
@@ -310,8 +314,11 @@ void sn_irq_unfixup(struct pci_dev *pci_dev) | |||
310 | spin_lock(&sn_irq_info_lock); | 314 | spin_lock(&sn_irq_info_lock); |
311 | list_del_rcu(&sn_irq_info->list); | 315 | list_del_rcu(&sn_irq_info->list); |
312 | spin_unlock(&sn_irq_info_lock); | 316 | spin_unlock(&sn_irq_info_lock); |
317 | if (list_empty(sn_irq_lh[sn_irq_info->irq_irq])) | ||
318 | free_irq_vector(sn_irq_info->irq_irq); | ||
313 | call_rcu(&sn_irq_info->rcu, sn_irq_info_free); | 319 | call_rcu(&sn_irq_info->rcu, sn_irq_info_free); |
314 | pci_dev_put(pci_dev); | 320 | pci_dev_put(pci_dev); |
321 | |||
315 | } | 322 | } |
316 | 323 | ||
317 | static inline void | 324 | static inline void |