sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SAMA5D4: Don't touch ISLR unless PIO is configured as an interrupt

Browse Source
This commit is contained in:
Gregory Nutt 2014-06-30 09:17:42 -06:00
parent 6422d76217
commit 9a06ff38ec
2 changed files with 48 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
arch/arm/src/sama5/sam_pio.c
View File

@ -137,7 +137,7 @@ static inline int sam_piopin(pio_pinset_t cfgset)
static inline int sam_configinput(uintptr_t base, uint32_t pin, static inline int sam_configinput(uintptr_t base, uint32_t pin,
pio_pinset_t cfgset) pio_pinset_t cfgset)
{ {
#if defined(PIO_HAVE_SCHMITT) || defined(PIO_HAVE_DRIVE) || defined(SAM_PIO_ISLR_OFFSET) #if defined(PIO_HAVE_SCHMITT) || defined(PIO_HAVE_DRIVE)
uint32_t regval; uint32_t regval;
#endif #endif
#if defined(PIO_HAVE_DRIVE) #if defined(PIO_HAVE_DRIVE)
@ -151,14 +151,6 @@ static inline int sam_configinput(uintptr_t base, uint32_t pin,
putreg32(pin, base + SAM_PIO_IDR_OFFSET); putreg32(pin, base + SAM_PIO_IDR_OFFSET);
#if defined(SAM_PIO_ISLR_OFFSET)
/* Assume unsecure */
regval = getreg32(base + SAM_PIO_ISLR_OFFSET);
regval |= pin;
putreg32(regval, base + SAM_PIO_ISLR_OFFSET);
#endif
/* Enable/disable the pull-up as requested */ /* Enable/disable the pull-up as requested */
if ((cfgset & PIO_CFG_PULLUP) != 0) if ((cfgset & PIO_CFG_PULLUP) != 0)
@ -256,22 +248,10 @@ static inline int sam_configinput(uintptr_t base, uint32_t pin,
static inline int sam_configoutput(uintptr_t base, uint32_t pin, static inline int sam_configoutput(uintptr_t base, uint32_t pin,
pio_pinset_t cfgset) pio_pinset_t cfgset)
{ {
#if defined(SAM_PIO_ISLR_OFFSET)
uint32_t regval;
#endif
/* Disable interrupts on the pin */ /* Disable interrupts on the pin */
putreg32(pin, base + SAM_PIO_IDR_OFFSET); putreg32(pin, base + SAM_PIO_IDR_OFFSET);
#if defined(SAM_PIO_ISLR_OFFSET)
/* Assume unsecure */
regval = getreg32(base + SAM_PIO_ISLR_OFFSET);
regval |= pin;
putreg32(regval, base + SAM_PIO_ISLR_OFFSET);
#endif
/* Enable/disable the pull-up as requested */ /* Enable/disable the pull-up as requested */
if ((cfgset & PIO_CFG_PULLUP) != 0) if ((cfgset & PIO_CFG_PULLUP) != 0)
@ -343,14 +323,6 @@ static inline int sam_configperiph(uintptr_t base, uint32_t pin,
putreg32(pin, base + SAM_PIO_IDR_OFFSET); putreg32(pin, base + SAM_PIO_IDR_OFFSET);
#if defined(SAM_PIO_ISLR_OFFSET)
/* Assume unsecure */
regval = getreg32(base + SAM_PIO_ISLR_OFFSET);
regval |= pin;
putreg32(regval, base + SAM_PIO_ISLR_OFFSET);
#endif
/* Enable/disable the pull-up as requested */ /* Enable/disable the pull-up as requested */
if ((cfgset & PIO_CFG_PULLUP) != 0) if ((cfgset & PIO_CFG_PULLUP) != 0)
@ -466,7 +438,21 @@ int sam_configpio(pio_pinset_t cfgset)
flags = irqsave(); flags = irqsave();
/* Enable writing to PIO registers */ /* Enable writing to PIO registers. The following registers are protected:
*
* - PIO Enable/Disable Registers (PER/PDR)
* - PIO Output Enable/Disable Registers (OER/ODR)
* - PIO Interrupt Security Level Register (ISLR)
* - PIO Input Filter Enable/Disable Registers (IFER/IFDR)
* - PIO Multi-driver Enable/Disable Registers (MDER/MDDR)
* - PIO Pull-Up Enable/Disable Registers (PUER/PUDR)
* - PIO Peripheral ABCD Select Register 1/2 (ABCDSR1/2)
* - PIO Output Write Enable/Disable Registers
* - PIO Pad Pull-Down Enable/Disable Registers (PPER/PPDR)
*
* I suspect that the default state is the WPMR is unprotected, so these
* operations could probably all be avoided.
*/
putreg32(PIO_WPMR_WPKEY, base + SAM_PIO_WPMR_OFFSET); putreg32(PIO_WPMR_WPKEY, base + SAM_PIO_WPMR_OFFSET);

36
arch/arm/src/sama5/sam_pioirq.c
View File

@ -375,22 +375,48 @@ void sam_pioirqinitialize(void)
void sam_pioirq(pio_pinset_t pinset) void sam_pioirq(pio_pinset_t pinset)
{ {
#if defined(SAM_PIO_ISLR_OFFSET)
uint32_t regval;
#endif
uint32_t base = sam_piobase(pinset); uint32_t base = sam_piobase(pinset);
int pin = sam_piopin(pinset); int pin = sam_piopin(pinset);
/* Enable writing to PIO registers */ #if defined(SAM_PIO_ISLR_OFFSET)
/* Enable writing to PIO registers. The following registers are protected:
*
* - PIO Enable/Disable Registers (PER/PDR)
* - PIO Output Enable/Disable Registers (OER/ODR)
* - PIO Interrupt Security Level Register (ISLR)
* - PIO Input Filter Enable/Disable Registers (IFER/IFDR)
* - PIO Multi-driver Enable/Disable Registers (MDER/MDDR)
* - PIO Pull-Up Enable/Disable Registers (PUER/PUDR)
* - PIO Peripheral ABCD Select Register 1/2 (ABCDSR1/2)
* - PIO Output Write Enable/Disable Registers
* - PIO Pad Pull-Down Enable/Disable Registers (PPER/PPDR)
*
* I suspect that the default state is the WPMR is unprotected, so these
* operations could probably all be avoided.
*/
putreg32(PIO_WPMR_WPKEY, base + SAM_PIO_WPMR_OFFSET); putreg32(PIO_WPMR_WPKEY, base + SAM_PIO_WPMR_OFFSET);
#if defined(SAMA5_SAIC) && defined(SAM_PIO_ISLR_OFFSET)
/* Is the interrupt secure? */ /* Is the interrupt secure? */
regval = getreg32(base + SAM_PIO_ISLR_OFFSET);
if ((pinset & PIO_INT_SECURE) != 0) if ((pinset & PIO_INT_SECURE) != 0)
{ {
uint32_t regval = getreg32(base + SAM_PIO_ISLR_OFFSET); /* Yes.. make sure that the corresponding bit in ISLR is cleared */
regval &= ~pin; regval &= ~pin;
putreg32(regval, base + SAM_PIO_ISLR_OFFSET);
} }
else
{
/* Yes.. make sure that the corresponding bit in ISLR is set */
regval |= pin;
}
putreg32(regval, base + SAM_PIO_ISLR_OFFSET);
#endif #endif
/* Are any additional interrupt modes selected? */ /* Are any additional interrupt modes selected? */
@ -430,9 +456,11 @@ void sam_pioirq(pio_pinset_t pinset)
putreg32(pin, base + SAM_PIO_AIMDR_OFFSET); putreg32(pin, base + SAM_PIO_AIMDR_OFFSET);
} }
#if defined(SAM_PIO_ISLR_OFFSET)
/* Disable writing to PIO registers */ /* Disable writing to PIO registers */
putreg32(PIO_WPMR_WPEN | PIO_WPMR_WPKEY, base + SAM_PIO_WPMR_OFFSET); putreg32(PIO_WPMR_WPEN | PIO_WPMR_WPKEY, base + SAM_PIO_WPMR_OFFSET);
#endif
} }
/************************************************************************************ /************************************************************************************