Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

powerpc/mpic: Cache the device-tree node in "struct mpic"

Browse source 
Store the node pointer in the MPIC during initialization so that all of
the later operational code can just reuse the cached pointer.

Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Kyle Moffett 2011-12-02 06:28:06 +00:00 committed by Benjamin Herrenschmidt
parent c579bc766a
commit c51242e708
2 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/powerpc/include/asm/mpic.h
View file

@ -251,6 +251,9 @@ struct mpic_irq_save {
/* The instance data of a given MPIC */ /* The instance data of a given MPIC */
struct mpic struct mpic
{ {
/* The OpenFirmware dt node for this MPIC */
struct device_node *node;
/* The remapper for this MPIC */ /* The remapper for this MPIC */
struct irq_host *irqhost; struct irq_host *irqhost;

33
arch/powerpc/sysdev/mpic.c
View file

@ -315,26 +315,25 @@ static void _mpic_map_mmio(struct mpic *mpic, phys_addr_t phys_addr,
} }
#ifdef CONFIG_PPC_DCR #ifdef CONFIG_PPC_DCR
static void _mpic_map_dcr(struct mpic *mpic, struct device_node *node, static void _mpic_map_dcr(struct mpic *mpic, struct mpic_reg_bank *rb,
struct mpic_reg_bank *rb,
unsigned int offset, unsigned int size) unsigned int offset, unsigned int size)
{ {
phys_addr_t phys_addr = dcr_resource_start(node, 0); phys_addr_t phys_addr = dcr_resource_start(mpic->node, 0);
rb->dhost = dcr_map(mpic->node, phys_addr + offset, size); rb->dhost = dcr_map(mpic->node, phys_addr + offset, size);
BUG_ON(!DCR_MAP_OK(rb->dhost)); BUG_ON(!DCR_MAP_OK(rb->dhost));
} }
static inline void mpic_map(struct mpic *mpic, struct device_node *node, static inline void mpic_map(struct mpic *mpic,
phys_addr_t phys_addr, struct mpic_reg_bank *rb, phys_addr_t phys_addr, struct mpic_reg_bank *rb,
unsigned int offset, unsigned int size) unsigned int offset, unsigned int size)
{ {
if (mpic->flags & MPIC_USES_DCR) if (mpic->flags & MPIC_USES_DCR)
_mpic_map_dcr(mpic, node, rb, offset, size); _mpic_map_dcr(mpic, rb, offset, size);
else else
_mpic_map_mmio(mpic, phys_addr, rb, offset, size); _mpic_map_mmio(mpic, phys_addr, rb, offset, size);
} }
#else /* CONFIG_PPC_DCR */ #else /* CONFIG_PPC_DCR */
#define mpic_map(m,n,p,b,o,s) _mpic_map_mmio(m,p,b,o,s) #define mpic_map(m,p,b,o,s) _mpic_map_mmio(m,p,b,o,s)
#endif /* !CONFIG_PPC_DCR */ #endif /* !CONFIG_PPC_DCR */
@ -1172,6 +1171,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,
goto err_of_node_put; goto err_of_node_put;
mpic->name = name; mpic->name = name;
mpic->node = node;
mpic->paddr = phys_addr; mpic->paddr = phys_addr;
mpic->hc_irq = mpic_irq_chip; mpic->hc_irq = mpic_irq_chip;
@ -1218,13 +1218,13 @@ struct mpic * __init mpic_alloc(struct device_node *node,
mpic->spurious_vec = intvec_top; mpic->spurious_vec = intvec_top;
/* Check for "big-endian" in device-tree */ /* Check for "big-endian" in device-tree */
if (of_get_property(node, "big-endian", NULL) != NULL) if (of_get_property(mpic->node, "big-endian", NULL) != NULL)
mpic->flags |= MPIC_BIG_ENDIAN; mpic->flags |= MPIC_BIG_ENDIAN;
if (of_device_is_compatible(node, "fsl,mpic")) if (of_device_is_compatible(mpic->node, "fsl,mpic"))
mpic->flags |= MPIC_FSL; mpic->flags |= MPIC_FSL;
/* Look for protected sources */ /* Look for protected sources */
psrc = of_get_property(node, "protected-sources", &psize); psrc = of_get_property(mpic->node, "protected-sources", &psize);
if (psrc) { if (psrc) {
/* Allocate a bitmap with one bit per interrupt */ /* Allocate a bitmap with one bit per interrupt */
unsigned int mapsize = BITS_TO_LONGS(intvec_top + 1); unsigned int mapsize = BITS_TO_LONGS(intvec_top + 1);
@ -1259,15 +1259,15 @@ struct mpic * __init mpic_alloc(struct device_node *node,
#endif #endif
/* Map the global registers */ /* Map the global registers */
mpic_map(mpic, node, mpic->paddr, &mpic->gregs, MPIC_INFO(GREG_BASE), 0x1000); mpic_map(mpic, mpic->paddr, &mpic->gregs, MPIC_INFO(GREG_BASE), 0x1000);
mpic_map(mpic, node, mpic->paddr, &mpic->tmregs, MPIC_INFO(TIMER_BASE), 0x1000); mpic_map(mpic, mpic->paddr, &mpic->tmregs, MPIC_INFO(TIMER_BASE), 0x1000);
/* Reset */ /* Reset */
/* When using a device-node, reset requests are only honored if the MPIC /* When using a device-node, reset requests are only honored if the MPIC
* is allowed to reset. * is allowed to reset.
*/ */
if (of_get_property(node, "pic-no-reset", NULL)) if (of_get_property(mpic->node, "pic-no-reset", NULL))
mpic->flags |= MPIC_NO_RESET; mpic->flags |= MPIC_NO_RESET;
if ((flags & MPIC_WANTS_RESET) && !(mpic->flags & MPIC_NO_RESET)) { if ((flags & MPIC_WANTS_RESET) && !(mpic->flags & MPIC_NO_RESET)) {
@ -1315,7 +1315,7 @@ struct mpic * __init mpic_alloc(struct device_node *node,
for_each_possible_cpu(i) { for_each_possible_cpu(i) {
unsigned int cpu = get_hard_smp_processor_id(i); unsigned int cpu = get_hard_smp_processor_id(i);
mpic_map(mpic, node, mpic->paddr, &mpic->cpuregs[cpu], mpic_map(mpic, mpic->paddr, &mpic->cpuregs[cpu],
MPIC_INFO(CPU_BASE) + cpu * MPIC_INFO(CPU_STRIDE), MPIC_INFO(CPU_BASE) + cpu * MPIC_INFO(CPU_STRIDE),
0x1000); 0x1000);
} }
@ -1323,13 +1323,13 @@ struct mpic * __init mpic_alloc(struct device_node *node,
/* Initialize main ISU if none provided */ /* Initialize main ISU if none provided */
if (mpic->isu_size == 0) { if (mpic->isu_size == 0) {
mpic->isu_size = mpic->num_sources; mpic->isu_size = mpic->num_sources;
mpic_map(mpic, node, mpic->paddr, &mpic->isus[0], mpic_map(mpic, mpic->paddr, &mpic->isus[0],
MPIC_INFO(IRQ_BASE), MPIC_INFO(IRQ_STRIDE) * mpic->isu_size); MPIC_INFO(IRQ_BASE), MPIC_INFO(IRQ_STRIDE) * mpic->isu_size);
} }
mpic->isu_shift = 1 + __ilog2(mpic->isu_size - 1); mpic->isu_shift = 1 + __ilog2(mpic->isu_size - 1);
mpic->isu_mask = (1 << mpic->isu_shift) - 1; mpic->isu_mask = (1 << mpic->isu_shift) - 1;
mpic->irqhost = irq_alloc_host(node, IRQ_HOST_MAP_LINEAR, mpic->irqhost = irq_alloc_host(mpic->node, IRQ_HOST_MAP_LINEAR,
isu_size ? isu_size : mpic->num_sources, isu_size ? isu_size : mpic->num_sources,
&mpic_host_ops, &mpic_host_ops,
flags & MPIC_LARGE_VECTORS ? 2048 : 256); flags & MPIC_LARGE_VECTORS ? 2048 : 256);
@ -1372,7 +1372,6 @@ struct mpic * __init mpic_alloc(struct device_node *node,
irq_set_default_host(mpic->irqhost); irq_set_default_host(mpic->irqhost);
} }
of_node_put(node);
return mpic; return mpic;
err_of_node_put: err_of_node_put:
@ -1387,7 +1386,7 @@ void __init mpic_assign_isu(struct mpic *mpic, unsigned int isu_num,
BUG_ON(isu_num >= MPIC_MAX_ISU); BUG_ON(isu_num >= MPIC_MAX_ISU);
mpic_map(mpic, mpic->irqhost->of_node, mpic_map(mpic,
paddr, &mpic->isus[isu_num], 0, paddr, &mpic->isus[isu_num], 0,
MPIC_INFO(IRQ_STRIDE) * mpic->isu_size); MPIC_INFO(IRQ_STRIDE) * mpic->isu_size);