Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 212188
b: refs/heads/master
c: 90297c5
h: refs/heads/master
v: v3
  • Loading branch information
Thomas Gleixner committed Oct 12, 2010
1 parent 0a3bb3d commit 5d1234e
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 53 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 61a38ce3f59cdb4654e9444329195bd57c3baf74
refs/heads/master: 90297c5fe71d32a2a0ead38bd8f6b1112a2e5ac0
95 changes: 43 additions & 52 deletions trunk/arch/x86/kernel/apic/io_apic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -592,11 +592,9 @@ static void mask_ioapic(struct irq_cfg *cfg)
raw_spin_unlock_irqrestore(&ioapic_lock, flags);
}

static void mask_ioapic_irq(unsigned int irq)
static void mask_ioapic_irq(struct irq_data *data)
{
struct irq_cfg *cfg = get_irq_chip_data(irq);

mask_ioapic(cfg);
mask_ioapic(data->chip_data);
}

static void __unmask_ioapic(struct irq_cfg *cfg)
Expand All @@ -613,11 +611,9 @@ static void unmask_ioapic(struct irq_cfg *cfg)
raw_spin_unlock_irqrestore(&ioapic_lock, flags);
}

static void unmask_ioapic_irq(unsigned int irq)
static void unmask_ioapic_irq(struct irq_data *data)
{
struct irq_cfg *cfg = get_irq_chip_data(irq);

unmask_ioapic(cfg);
unmask_ioapic(data->chip_data);
}

static void clear_IO_APIC_pin(unsigned int apic, unsigned int pin)
Expand Down Expand Up @@ -2235,10 +2231,9 @@ static unsigned int startup_ioapic_irq(struct irq_data *data)
return was_pending;
}

static int ioapic_retrigger_irq(unsigned int irq)
static int ioapic_retrigger_irq(struct irq_data *data)
{

struct irq_cfg *cfg = irq_cfg(irq);
struct irq_cfg *cfg = data->chip_data;
unsigned long flags;

raw_spin_lock_irqsave(&vector_lock, flags);
Expand Down Expand Up @@ -2519,12 +2514,10 @@ void irq_force_complete_move(int irq)
static inline void irq_complete_move(struct irq_cfg *cfg) { }
#endif

static void ack_apic_edge(unsigned int irq)
static void ack_apic_edge(struct irq_data *data)
{
struct irq_cfg *cfg = get_irq_chip_data(irq);

irq_complete_move(cfg);
move_native_irq(irq);
irq_complete_move(data->chip_data);
move_native_irq(data->irq);
ack_APIC_irq();
}

Expand Down Expand Up @@ -2572,11 +2565,11 @@ static void eoi_ioapic_irq(unsigned int irq, struct irq_cfg *cfg)
raw_spin_unlock_irqrestore(&ioapic_lock, flags);
}

static void ack_apic_level(unsigned int irq)
static void ack_apic_level(struct irq_data *data)
{
struct irq_cfg *cfg = data->chip_data;
int i, do_unmask_irq = 0, irq = data->irq;
struct irq_desc *desc = irq_to_desc(irq);
struct irq_cfg *cfg = get_irq_desc_chip_data(desc);
int i, do_unmask_irq = 0;
unsigned long v;

irq_complete_move(cfg);
Expand Down Expand Up @@ -2677,46 +2670,44 @@ static void ack_apic_level(unsigned int irq)
}

#ifdef CONFIG_INTR_REMAP
static void ir_ack_apic_edge(unsigned int irq)
static void ir_ack_apic_edge(struct irq_data *data)
{
ack_APIC_irq();
}

static void ir_ack_apic_level(unsigned int irq)
static void ir_ack_apic_level(struct irq_data *data)
{
struct irq_cfg *cfg = get_irq_chip_data(irq);

ack_APIC_irq();
eoi_ioapic_irq(irq, cfg);
eoi_ioapic_irq(data->irq, data->chip_data);
}
#endif /* CONFIG_INTR_REMAP */

static struct irq_chip ioapic_chip __read_mostly = {
.name = "IO-APIC",
.irq_startup = startup_ioapic_irq,
.mask = mask_ioapic_irq,
.unmask = unmask_ioapic_irq,
.ack = ack_apic_edge,
.eoi = ack_apic_level,
.irq_mask = mask_ioapic_irq,
.irq_unmask = unmask_ioapic_irq,
.irq_ack = ack_apic_edge,
.irq_eoi = ack_apic_level,
#ifdef CONFIG_SMP
.set_affinity = set_ioapic_affinity_irq,
#endif
.retrigger = ioapic_retrigger_irq,
.irq_retrigger = ioapic_retrigger_irq,
};

static struct irq_chip ir_ioapic_chip __read_mostly = {
.name = "IR-IO-APIC",
.irq_startup = startup_ioapic_irq,
.mask = mask_ioapic_irq,
.unmask = unmask_ioapic_irq,
.irq_mask = mask_ioapic_irq,
.irq_unmask = unmask_ioapic_irq,
#ifdef CONFIG_INTR_REMAP
.ack = ir_ack_apic_edge,
.eoi = ir_ack_apic_level,
.irq_ack = ir_ack_apic_edge,
.irq_eoi = ir_ack_apic_level,
#ifdef CONFIG_SMP
.set_affinity = set_ir_ioapic_affinity_irq,
#endif
#endif
.retrigger = ioapic_retrigger_irq,
.irq_retrigger = ioapic_retrigger_irq,
};

static inline void init_IO_APIC_traps(void)
Expand Down Expand Up @@ -2757,32 +2748,32 @@ static inline void init_IO_APIC_traps(void)
* The local APIC irq-chip implementation:
*/

static void mask_lapic_irq(unsigned int irq)
static void mask_lapic_irq(struct irq_data *data)
{
unsigned long v;

v = apic_read(APIC_LVT0);
apic_write(APIC_LVT0, v | APIC_LVT_MASKED);
}

static void unmask_lapic_irq(unsigned int irq)
static void unmask_lapic_irq(struct irq_data *data)
{
unsigned long v;

v = apic_read(APIC_LVT0);
apic_write(APIC_LVT0, v & ~APIC_LVT_MASKED);
}

static void ack_lapic_irq(unsigned int irq)
static void ack_lapic_irq(struct irq_data *data)
{
ack_APIC_irq();
}

static struct irq_chip lapic_chip __read_mostly = {
.name = "local-APIC",
.mask = mask_lapic_irq,
.unmask = unmask_lapic_irq,
.ack = ack_lapic_irq,
.irq_mask = mask_lapic_irq,
.irq_unmask = unmask_lapic_irq,
.irq_ack = ack_lapic_irq,
};

static void lapic_register_intr(int irq, struct irq_desc *desc)
Expand Down Expand Up @@ -3417,24 +3408,24 @@ static struct irq_chip msi_chip = {
.name = "PCI-MSI",
.irq_unmask = unmask_msi_irq,
.irq_mask = mask_msi_irq,
.ack = ack_apic_edge,
.irq_ack = ack_apic_edge,
#ifdef CONFIG_SMP
.set_affinity = set_msi_irq_affinity,
#endif
.retrigger = ioapic_retrigger_irq,
.irq_retrigger = ioapic_retrigger_irq,
};

static struct irq_chip msi_ir_chip = {
.name = "IR-PCI-MSI",
.irq_unmask = unmask_msi_irq,
.irq_mask = mask_msi_irq,
#ifdef CONFIG_INTR_REMAP
.ack = ir_ack_apic_edge,
.irq_ack = ir_ack_apic_edge,
#ifdef CONFIG_SMP
.set_affinity = ir_set_msi_irq_affinity,
#endif
#endif
.retrigger = ioapic_retrigger_irq,
.irq_retrigger = ioapic_retrigger_irq,
};

/*
Expand Down Expand Up @@ -3589,11 +3580,11 @@ static struct irq_chip dmar_msi_type = {
.name = "DMAR_MSI",
.unmask = dmar_msi_unmask,
.mask = dmar_msi_mask,
.ack = ack_apic_edge,
.irq_ack = ack_apic_edge,
#ifdef CONFIG_SMP
.set_affinity = dmar_msi_set_affinity,
#endif
.retrigger = ioapic_retrigger_irq,
.irq_retrigger = ioapic_retrigger_irq,
};

int arch_setup_dmar_msi(unsigned int irq)
Expand Down Expand Up @@ -3645,23 +3636,23 @@ static struct irq_chip ir_hpet_msi_type = {
.unmask = hpet_msi_unmask,
.mask = hpet_msi_mask,
#ifdef CONFIG_INTR_REMAP
.ack = ir_ack_apic_edge,
.irq_ack = ir_ack_apic_edge,
#ifdef CONFIG_SMP
.set_affinity = ir_set_msi_irq_affinity,
#endif
#endif
.retrigger = ioapic_retrigger_irq,
.irq_retrigger = ioapic_retrigger_irq,
};

static struct irq_chip hpet_msi_type = {
.name = "HPET_MSI",
.unmask = hpet_msi_unmask,
.mask = hpet_msi_mask,
.ack = ack_apic_edge,
.irq_ack = ack_apic_edge,
#ifdef CONFIG_SMP
.set_affinity = hpet_msi_set_affinity,
#endif
.retrigger = ioapic_retrigger_irq,
.irq_retrigger = ioapic_retrigger_irq,
};

int arch_setup_hpet_msi(unsigned int irq, unsigned int id)
Expand Down Expand Up @@ -3743,11 +3734,11 @@ static struct irq_chip ht_irq_chip = {
.name = "PCI-HT",
.mask = mask_ht_irq,
.unmask = unmask_ht_irq,
.ack = ack_apic_edge,
.irq_ack = ack_apic_edge,
#ifdef CONFIG_SMP
.set_affinity = set_ht_irq_affinity,
#endif
.retrigger = ioapic_retrigger_irq,
.irq_retrigger = ioapic_retrigger_irq,
};

int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev)
Expand Down

0 comments on commit 5d1234e

Please sign in to comment.