michaelh/zephyr
1
0
Fork 0
Code Releases Activity

mvic: fix how local interrupts are programmed

Browse source 
MVIC has only one local interrupt: the timer IRQ. What IRQ line
to use is not fixed, instead it is programmed into the LVTTIMER
register. This is unlike LOAPIC which has a fixed IRQ for the timer
and instead the *vector* to use for it is programmed into LVTTIMER.

We don't want _loapic_int_vec_set() to do anything as the relationship
between IRQ lines and vectors is fixed and we do not want to be
programming vector numbers into bits 0-3 of LVTTIMER.

The IRQ line to use for timer interrupts is programmed into LVTTIMER
when the MVIC is initialized.

Change-Id: Icba0429f65ece7541fa8542814a8fdc39ad43936
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
Andrew Boie 2015-12-08 11:22:48 -08:00 • committed by Anas Nashif
commit 999e706dba
1 changed files with 12 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

45
drivers/interrupt_controller/mvic.c
View file

@ -129,9 +129,13 @@ int _mvic_init(struct device *unused)
/* program Local Vector Table for the Virtual Wire Mode */ /* program Local Vector Table for the Virtual Wire Mode */
/* lock the MVIC timer interrupt */ /* lock the MVIC timer interrupt, set which IRQ line should be
* used for timer interrupts (this is unlike LOAPIC where the
*(volatile int *)(CONFIG_LOAPIC_BASE_ADDRESS + LOAPIC_TIMER) = LOAPIC_LVT_MASKED; * vector is programmed instead).
*/
__ASSERT_NO_MSG(CONFIG_LOAPIC_TIMER_IRQ <= 15);
*(volatile int *)(CONFIG_LOAPIC_BASE_ADDRESS + LOAPIC_TIMER) =
LOAPIC_LVT_MASKED | CONFIG_LOAPIC_TIMER_IRQ;
/* discard a pending interrupt if any */ /* discard a pending interrupt if any */
@ -265,6 +269,8 @@ void _ioapic_irq_set(unsigned int irq, unsigned int vector, uint32_t flags)
*/ */
void _ioapic_int_vec_set(unsigned int irq, unsigned int vector) void _ioapic_int_vec_set(unsigned int irq, unsigned int vector)
{ {
ARG_UNUSED(irq);
ARG_UNUSED(vector);
} }
/** /**
@ -306,10 +312,7 @@ void _loapic_disable(void)
* *
* @brief Set the vector field in the specified RTE * @brief Set the vector field in the specified RTE
* *
* This routine is utilized by the platform-provided routined _SysIntVecAllocate() * Fixed vectors on this HW. Nothing to do.
* which in turn is provided to support the irq_connect() API. Once
* a vector has been allocated, this routine is invoked to update the LVT
* entry associated with <irq> with the vector.
* *
* @param irq IRQ number of the interrupt * @param irq IRQ number of the interrupt
* @param vector vector to copy into the LVT * @param vector vector to copy into the LVT
@ -318,32 +321,8 @@ void _loapic_disable(void)
*/ */
void _loapic_int_vec_set(unsigned int irq, unsigned int vector) void _loapic_int_vec_set(unsigned int irq, unsigned int vector)
{ {
volatile int *pLvt; /* pointer to local vector table */ ARG_UNUSED(irq);
int32_t oldLevel; /* previous interrupt lock level */ ARG_UNUSED(vector);
/*
* irq is actually an index to local APIC LVT register.
* ASSERT if out of range for MVIC implementation.
*/
__ASSERT_NO_MSG(irq < LOAPIC_IRQ_COUNT);
/*
* The following mappings are used:
*
* LVT0 -> LOAPIC_TIMER
*
* It's assumed that LVTs are spaced by LOAPIC_LVT_REG_SPACING bytes
*/
pLvt = (volatile int *)(CONFIG_LOAPIC_BASE_ADDRESS + LOAPIC_TIMER +
(irq * LOAPIC_LVT_REG_SPACING));
/* update the 'vector' bits in the LVT */
oldLevel = irq_lock();
*pLvt = (*pLvt & ~LOAPIC_VECTOR) | vector;
irq_unlock(oldLevel);
} }
/** /**