leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: uv: Clean up the direct access to irq_desc

Browse Source 
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Thomas Gleixner 2010-09-30 11:43:08 +02:00
parent 1a8ce7ff68
commit 48b2650196
3 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/include/asm/hw_irq.h
View File

@ -101,7 +101,6 @@ struct irq_cfg {
#endif #endif
}; };
extern struct irq_cfg *irq_cfg(unsigned int);
extern int assign_irq_vector(int, struct irq_cfg *, const struct cpumask *); extern int assign_irq_vector(int, struct irq_cfg *, const struct cpumask *);
extern void send_cleanup_vector(struct irq_cfg *); extern void send_cleanup_vector(struct irq_cfg *);

2
arch/x86/kernel/apic/io_apic.c
View File

@ -178,7 +178,7 @@ int __init arch_early_irq_init(void)
} }
#ifdef CONFIG_SPARSE_IRQ #ifdef CONFIG_SPARSE_IRQ
struct irq_cfg *irq_cfg(unsigned int irq) static struct irq_cfg *irq_cfg(unsigned int irq)
{ {
return get_irq_chip_data(irq); return get_irq_chip_data(irq);
} }

55
arch/x86/kernel/uv_irq.c
View File

@ -28,34 +28,21 @@ struct uv_irq_2_mmr_pnode{
static spinlock_t uv_irq_lock; static spinlock_t uv_irq_lock;
static struct rb_root uv_irq_root; static struct rb_root uv_irq_root;
static int uv_set_irq_affinity(unsigned int, const struct cpumask *); static int uv_set_irq_affinity(struct irq_data *, const struct cpumask *, bool);
static void uv_noop(unsigned int irq) static void uv_noop(struct irq_data *data) { }
{
}
static unsigned int uv_noop_ret(unsigned int irq) static void uv_ack_apic(struct irq_data *data)
{
return 0;
}
static void uv_ack_apic(unsigned int irq)
{ {
ack_APIC_irq(); ack_APIC_irq();
} }
static struct irq_chip uv_irq_chip = { static struct irq_chip uv_irq_chip = {
.name = "UV-CORE", .name = "UV-CORE",
.startup = uv_noop_ret, .irq_mask = uv_noop,
.shutdown = uv_noop, .irq_unmask = uv_noop,
.enable = uv_noop, .irq_eoi = uv_ack_apic,
.disable = uv_noop, .irq_set_affinity = uv_set_irq_affinity,
.ack = uv_noop,
.mask = uv_noop,
.unmask = uv_noop,
.eoi = uv_ack_apic,
.end = uv_noop,
.set_affinity = uv_set_irq_affinity,
}; };
/* /*
@ -144,26 +131,22 @@ arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade,
unsigned long mmr_offset, int limit) unsigned long mmr_offset, int limit)
{ {
const struct cpumask *eligible_cpu = cpumask_of(cpu); const struct cpumask *eligible_cpu = cpumask_of(cpu);
struct irq_desc *desc = irq_to_desc(irq); struct irq_cfg *cfg = get_irq_chip_data(irq);
struct irq_cfg *cfg;
int mmr_pnode;
unsigned long mmr_value; unsigned long mmr_value;
struct uv_IO_APIC_route_entry *entry; struct uv_IO_APIC_route_entry *entry;
int err; int mmr_pnode, err;
BUILD_BUG_ON(sizeof(struct uv_IO_APIC_route_entry) != BUILD_BUG_ON(sizeof(struct uv_IO_APIC_route_entry) !=
sizeof(unsigned long)); sizeof(unsigned long));
cfg = irq_cfg(irq);
err = assign_irq_vector(irq, cfg, eligible_cpu); err = assign_irq_vector(irq, cfg, eligible_cpu);
if (err != 0) if (err != 0)
return err; return err;
if (limit == UV_AFFINITY_CPU) if (limit == UV_AFFINITY_CPU)
desc->status |= IRQ_NO_BALANCING; irq_set_status_flags(irq, IRQ_NO_BALANCING);
else else
desc->status |= IRQ_MOVE_PCNTXT; irq_set_status_flags(irq, IRQ_MOVE_PCNTXT);
set_irq_chip_and_handler_name(irq, &uv_irq_chip, handle_percpu_irq, set_irq_chip_and_handler_name(irq, &uv_irq_chip, handle_percpu_irq,
irq_name); irq_name);
@ -206,17 +189,17 @@ static void arch_disable_uv_irq(int mmr_pnode, unsigned long mmr_offset)
uv_write_global_mmr64(mmr_pnode, mmr_offset, mmr_value); uv_write_global_mmr64(mmr_pnode, mmr_offset, mmr_value);
} }
static int uv_set_irq_affinity(unsigned int irq, const struct cpumask *mask) static int
uv_set_irq_affinity(struct irq_data *data, const struct cpumask *mask,
bool force)
{ {
struct irq_desc *desc = irq_to_desc(irq); struct irq_cfg *cfg = data->chip_data;
struct irq_cfg *cfg = get_irq_desc_chip_data(desc);
unsigned int dest; unsigned int dest;
unsigned long mmr_value; unsigned long mmr_value, mmr_offset;
struct uv_IO_APIC_route_entry *entry; struct uv_IO_APIC_route_entry *entry;
unsigned long mmr_offset;
int mmr_pnode; int mmr_pnode;
if (__ioapic_set_affinity(&desc->irq_data, mask, &dest)) if (__ioapic_set_affinity(data, mask, &dest))
return -1; return -1;
mmr_value = 0; mmr_value = 0;
@ -231,7 +214,7 @@ static int uv_set_irq_affinity(unsigned int irq, const struct cpumask *mask)
entry->dest = dest; entry->dest = dest;
/* Get previously stored MMR and pnode of hub sourcing interrupts */ /* Get previously stored MMR and pnode of hub sourcing interrupts */
if (uv_irq_2_mmr_info(irq, &mmr_offset, &mmr_pnode)) if (uv_irq_2_mmr_info(data->irq, &mmr_offset, &mmr_pnode))
return -1; return -1;
uv_write_global_mmr64(mmr_pnode, mmr_offset, mmr_value); uv_write_global_mmr64(mmr_pnode, mmr_offset, mmr_value);