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

STM32 OTGFS device: Various changes to try to reduce that amount of time in interrupts handles and with interrupts disbled. Needs verification on other platforms. From Petteri Aimonen

Browse Source
This commit is contained in:
Gregory Nutt 2014-07-22 07:23:17 -06:00
parent f76cac2773
commit 3bb6a877fd
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
arch/arm/src/stm32/stm32_otgfsdev.c
View File

@ -1,7 +1,7 @@
/******************************************************************************* /*******************************************************************************
* arch/arm/src/stm32/stm32_otgfsdev.c * arch/arm/src/stm32/stm32_otgfsdev.c
* *
* Copyright (C) 2012-2013 Gregory Nutt. All rights reserved. * Copyright (C) 2012-2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -4055,7 +4055,7 @@ static void stm32_epout_disable(FAR struct stm32_ep_s *privep)
while ((stm32_getreg(regaddr) & OTGFS_DOEPINT_EPDISD) == 0); while ((stm32_getreg(regaddr) & OTGFS_DOEPINT_EPDISD) == 0);
#else #else
/* REVISIT: */ /* REVISIT: */
up_mdelay(50); up_udelay(10);
#endif #endif
/* Clear the EPDISD interrupt indication */ /* Clear the EPDISD interrupt indication */
@ -4113,7 +4113,6 @@ static void stm32_epin_disable(FAR struct stm32_ep_s *privep)
*/ */
#if 0 #if 0
/* Make sure that there is no pending IPEPNE interrupt (because we are /* Make sure that there is no pending IPEPNE interrupt (because we are
* to poll this bit below). * to poll this bit below).
*/ */
@ -4136,7 +4135,6 @@ static void stm32_epin_disable(FAR struct stm32_ep_s *privep)
/* Clear the INEPNE interrupt indication */ /* Clear the INEPNE interrupt indication */
stm32_putreg(OTGFS_DIEPINT_INEPNE, regaddr); stm32_putreg(OTGFS_DIEPINT_INEPNE, regaddr);
#endif #endif
/* Deactivate and disable the endpoint by setting the EPDIS and SNAK bits /* Deactivate and disable the endpoint by setting the EPDIS and SNAK bits
@ -4174,7 +4172,6 @@ static void stm32_epin_disable(FAR struct stm32_ep_s *privep)
/* Cancel any queued write requests */ /* Cancel any queued write requests */
stm32_req_cancel(privep, -ESHUTDOWN); stm32_req_cancel(privep, -ESHUTDOWN);
irqrestore(flags); irqrestore(flags);
} }
@ -4197,6 +4194,7 @@ static int stm32_ep_disable(FAR struct usbdev_ep_s *ep)
return -EINVAL; return -EINVAL;
} }
#endif #endif
usbtrace(TRACE_EPDISABLE, privep->epphy); usbtrace(TRACE_EPDISABLE, privep->epphy);
/* Is this an IN or an OUT endpoint */ /* Is this an IN or an OUT endpoint */
@ -4236,6 +4234,7 @@ static FAR struct usbdev_req_s *stm32_ep_allocreq(FAR struct usbdev_ep_s *ep)
return NULL; return NULL;
} }
#endif #endif
usbtrace(TRACE_EPALLOCREQ, ((FAR struct stm32_ep_s *)ep)->epphy); usbtrace(TRACE_EPALLOCREQ, ((FAR struct stm32_ep_s *)ep)->epphy);
privreq = (FAR struct stm32_req_s *)kmalloc(sizeof(struct stm32_req_s)); privreq = (FAR struct stm32_req_s *)kmalloc(sizeof(struct stm32_req_s));
@ -4485,7 +4484,7 @@ static int stm32_epout_setstall(FAR struct stm32_ep_s *privep)
while ((stm32_getreg(regaddr) & OTGFS_DOEPINT_EPDISD) == 0); while ((stm32_getreg(regaddr) & OTGFS_DOEPINT_EPDISD) == 0);
#else #else
/* REVISIT: */ /* REVISIT: */
up_mdelay(50); up_udelay(10);
#endif #endif
/* Disable Global OUT NAK mode */ /* Disable Global OUT NAK mode */
@ -4870,7 +4869,7 @@ static int stm32_wakeup(struct usbdev_s *dev)
* Name: stm32_selfpowered * Name: stm32_selfpowered
* *
* Description: * Description:
* Sets/clears the device selfpowered feature * Sets/clears the device self-powered feature
* *
*******************************************************************************/ *******************************************************************************/
@ -4926,8 +4925,6 @@ static int stm32_pullup(struct usbdev_s *dev, bool enable)
} }
stm32_putreg(regval, STM32_OTGFS_DCTL); stm32_putreg(regval, STM32_OTGFS_DCTL);
up_mdelay(3);
irqrestore(flags); irqrestore(flags);
return OK; return OK;
} }
@ -5133,7 +5130,7 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv)
uint32_t address; uint32_t address;
int i; int i;
/* At startup the core is in FS mode. */ /* At start-up the core is in FS mode. */
/* Disable global interrupts by clearing the GINTMASK bit in the GAHBCFG /* Disable global interrupts by clearing the GINTMASK bit in the GAHBCFG
* register; Set the TXFELVL bit in the GAHBCFG register so that TxFIFO * register; Set the TXFELVL bit in the GAHBCFG register so that TxFIFO
@ -5204,7 +5201,7 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv)
up_mdelay(50); up_mdelay(50);
/* Initialize device mode */ /* Initialize device mode */
/* Restart the Phy Clock */ /* Restart the PHY Clock */
stm32_putreg(0, STM32_OTGFS_PCGCCTL); stm32_putreg(0, STM32_OTGFS_PCGCCTL);
@ -5215,7 +5212,7 @@ static void stm32_hwinitialize(FAR struct stm32_usbdev_s *priv)
regval |= OTGFS_DCFG_PFIVL_80PCT; regval |= OTGFS_DCFG_PFIVL_80PCT;
stm32_putreg(regval, STM32_OTGFS_DCFG); stm32_putreg(regval, STM32_OTGFS_DCFG);
/* Set full speed phy */ /* Set full speed PHY */
regval = stm32_getreg(STM32_OTGFS_DCFG); regval = stm32_getreg(STM32_OTGFS_DCFG);
regval &= ~OTGFS_DCFG_DSPD_MASK; regval &= ~OTGFS_DCFG_DSPD_MASK;
@ -5637,6 +5634,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
flags = irqsave(); flags = irqsave();
stm32_usbreset(priv); stm32_usbreset(priv);
irqrestore(flags);
/* Unbind the class driver */ /* Unbind the class driver */
@ -5644,6 +5642,7 @@ int usbdev_unregister(struct usbdevclass_driver_s *driver)
/* Disable USB controller interrupts */ /* Disable USB controller interrupts */
flags = irqsave();
up_disable_irq(STM32_IRQ_OTGFS); up_disable_irq(STM32_IRQ_OTGFS);
/* Disconnect device */ /* Disconnect device */