Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 62207
b: refs/heads/master
c: c5e3f9e
h: refs/heads/master
i:
  62205: 120a026
  62203: 19da2dc
  62199: c58655e
  62191: fab9718
  62175: 7a1d3b1
  62143: 38b0304
  62079: 94a2951
  61951: b28b183
v: v3
  • Loading branch information
Yasuaki Ishimatsu authored and Tony Luck committed Jul 17, 2007
1 parent ef8106d commit 327d855
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 37 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: e3a8f7b8b65c6feadab4384fd7097f79c8c1d898
refs/heads/master: c5e3f9e5a2152578db7a37090303ce66d03a7c87
60 changes: 24 additions & 36 deletions trunk/arch/ia64/kernel/iosapic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,16 +117,22 @@ static DEFINE_SPINLOCK(iosapic_lock);
* These tables map IA-64 vectors to the IOSAPIC pin that generates this
* vector.
*/
static struct iosapic {
char __iomem *addr; /* base address of IOSAPIC */
unsigned int gsi_base; /* GSI base */
unsigned short num_rte; /* # of RTEs on this IOSAPIC */
int rtes_inuse; /* # of RTEs in use on this IOSAPIC */
#ifdef CONFIG_NUMA
unsigned short node; /* numa node association via pxm */
#endif
} iosapic_lists[NR_IOSAPICS];

struct iosapic_rte_info {
struct list_head rte_list; /* node in list of RTEs sharing the
* same vector */
char __iomem *addr; /* base address of IOSAPIC */
unsigned int gsi_base; /* first GSI assigned to this
* IOSAPIC */
struct list_head rte_list; /* RTEs sharing the same vector */
char rte_index; /* IOSAPIC RTE index */
int refcnt; /* reference counter */
unsigned int flags; /* flags */
struct iosapic *iosapic;
} ____cacheline_aligned;

static struct iosapic_intr_info {
Expand All @@ -142,17 +148,6 @@ static struct iosapic_intr_info {
unsigned char trigger : 1; /* trigger mode (see iosapic.h) */
} iosapic_intr_info[IA64_NUM_VECTORS];

static struct iosapic {
char __iomem *addr; /* base address of IOSAPIC */
unsigned int gsi_base; /* first GSI assigned to this
* IOSAPIC */
unsigned short num_rte; /* # of RTEs on this IOSAPIC */
int rtes_inuse; /* # of RTEs in use on this IOSAPIC */
#ifdef CONFIG_NUMA
unsigned short node; /* numa node association via pxm */
#endif
} iosapic_lists[NR_IOSAPICS];

static unsigned char pcat_compat __devinitdata; /* 8259 compatibility flag */

static int iosapic_kmalloc_ok;
Expand Down Expand Up @@ -184,7 +179,7 @@ _gsi_to_vector (unsigned int gsi)
for (info = iosapic_intr_info; info <
iosapic_intr_info + IA64_NUM_VECTORS; ++info)
list_for_each_entry(rte, &info->rtes, rte_list)
if (rte->gsi_base + rte->rte_index == gsi)
if (rte->iosapic->gsi_base + rte->rte_index == gsi)
return info - iosapic_intr_info;
return -1;
}
Expand Down Expand Up @@ -221,7 +216,7 @@ static struct iosapic_rte_info *gsi_vector_to_rte(unsigned int gsi,
struct iosapic_rte_info *rte;

list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, rte_list)
if (rte->gsi_base + rte->rte_index == gsi)
if (rte->iosapic->gsi_base + rte->rte_index == gsi)
return rte;
return NULL;
}
Expand All @@ -243,7 +238,7 @@ set_rte (unsigned int gsi, unsigned int vector, unsigned int dest, int mask)
return; /* not an IOSAPIC interrupt */

rte_index = rte->rte_index;
addr = rte->addr;
addr = rte->iosapic->addr;
pol = iosapic_intr_info[vector].polarity;
trigger = iosapic_intr_info[vector].trigger;
dmode = iosapic_intr_info[vector].dmode;
Expand Down Expand Up @@ -297,10 +292,10 @@ kexec_disable_iosapic(void)
iosapic_intr_info + IA64_NUM_VECTORS; ++info, ++vec) {
list_for_each_entry(rte, &info->rtes,
rte_list) {
iosapic_write(rte->addr,
iosapic_write(rte->iosapic->addr,
IOSAPIC_RTE_LOW(rte->rte_index),
IOSAPIC_MASK|vec);
iosapic_eoi(rte->addr, vec);
iosapic_eoi(rte->iosapic->addr, vec);
}
}
}
Expand All @@ -323,7 +318,7 @@ mask_irq (unsigned int irq)
/* set only the mask bit */
low32 = iosapic_intr_info[vec].low32 |= IOSAPIC_MASK;
list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, rte_list) {
addr = rte->addr;
addr = rte->iosapic->addr;
rte_index = rte->rte_index;
iosapic_write(addr, IOSAPIC_RTE_LOW(rte_index), low32);
}
Expand All @@ -346,7 +341,7 @@ unmask_irq (unsigned int irq)
spin_lock_irqsave(&iosapic_lock, flags);
low32 = iosapic_intr_info[vec].low32 &= ~IOSAPIC_MASK;
list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, rte_list) {
addr = rte->addr;
addr = rte->iosapic->addr;
rte_index = rte->rte_index;
iosapic_write(addr, IOSAPIC_RTE_LOW(rte_index), low32);
}
Expand Down Expand Up @@ -394,7 +389,7 @@ iosapic_set_affinity (unsigned int irq, cpumask_t mask)
iosapic_intr_info[vec].low32 = low32;
iosapic_intr_info[vec].dest = dest;
list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, rte_list) {
addr = rte->addr;
addr = rte->iosapic->addr;
rte_index = rte->rte_index;
iosapic_write(addr, IOSAPIC_RTE_HIGH(rte_index), high32);
iosapic_write(addr, IOSAPIC_RTE_LOW(rte_index), low32);
Expand Down Expand Up @@ -422,7 +417,7 @@ iosapic_end_level_irq (unsigned int irq)

move_native_irq(irq);
list_for_each_entry(rte, &iosapic_intr_info[vec].rtes, rte_list)
iosapic_eoi(rte->addr, vec);
iosapic_eoi(rte->iosapic->addr, vec);
}

#define iosapic_shutdown_level_irq mask_irq
Expand Down Expand Up @@ -614,10 +609,7 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery,
{
irq_desc_t *idesc;
struct hw_interrupt_type *irq_type;
int rte_index;
int index;
unsigned long gsi_base;
void __iomem *iosapic_address;
struct iosapic_rte_info *rte;

index = find_iosapic(gsi);
Expand All @@ -627,9 +619,6 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery,
return -ENODEV;
}

iosapic_address = iosapic_lists[index].addr;
gsi_base = iosapic_lists[index].gsi_base;

rte = gsi_vector_to_rte(gsi, vector);
if (!rte) {
rte = iosapic_alloc_rte();
Expand All @@ -639,10 +628,8 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery,
return -ENOMEM;
}

rte_index = gsi - gsi_base;
rte->rte_index = rte_index;
rte->addr = iosapic_address;
rte->gsi_base = gsi_base;
rte->iosapic = &iosapic_lists[index];
rte->rte_index = gsi - rte->iosapic->gsi_base;
rte->refcnt++;
list_add_tail(&rte->rte_list, &iosapic_intr_info[vector].rtes);
iosapic_intr_info[vector].count++;
Expand Down Expand Up @@ -877,7 +864,8 @@ iosapic_unregister_intr (unsigned int gsi)

/* Mask the interrupt */
low32 = iosapic_intr_info[vector].low32 | IOSAPIC_MASK;
iosapic_write(rte->addr, IOSAPIC_RTE_LOW(rte->rte_index), low32);
iosapic_write(rte->iosapic->addr,
IOSAPIC_RTE_LOW(rte->rte_index), low32);

/* Remove the rte entry from the list */
list_del(&rte->rte_list);
Expand Down

0 comments on commit 327d855

Please sign in to comment.