Fixed bug #482.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@6841 35acf78f-673a-0410-8e92-d51de3d6d3f4

os/hal/platforms/STM32/OTGv1/usb_lld.c

@@ -861,6 +861,10 @@ void usb_lld_start(USBDriver *usbp) {
       rccEnableOTG_HS(FALSE);
       rccResetOTG_HS();
 
+      /* Workaround for the problem described here:
+         http://forum.chibios.org/phpbb/viewtopic.php?f=16&t=1798 */
+      rccDisableOTG_HSULPI(TRUE);
+
       /* Enables IRQ vector.*/
       nvicEnableVector(STM32_OTG2_NUMBER,
                        CORTEX_PRIORITY_MASK(STM32_USB_OTG2_IRQ_PRIORITY));

os/hal/platforms/STM32F4xx/stm32_rcc.h

@@ -664,6 +664,24 @@
  * @api
  */
 #define rccResetOTG_HS() rccResetAHB1(RCC_AHB1RSTR_OTGHSRST)
+
+/**
+ * @brief   Enables the OTG_HS peripheral clock.
+ *
+ * @param[in] lp        low power enable flag
+ *
+ * @api
+ */
+#define rccEnableOTG_HSULPI(lp) rccEnableAHB1(RCC_AHB1ENR_OTGHSULPIEN, lp)
+
+/**
+ * @brief   Disables the OTG_HS peripheral clock.
+ *
+ * @param[in] lp        low power enable flag
+ *
+ * @api
+ */
+#define rccDisableOTG_HSULPI(lp) rccDisableAHB1(RCC_AHB1ENR_OTGHSULPIEN, lp)
 /** @} */
 
 /**

readme.txt

@@ -89,6 +89,8 @@
 *****************************************************************************
 
 *** 2.7.0 ***
+- FIX: Fixed OTG HS failure when WFI instruction is enabled (bug #482)
+  (backported to 2.6.4).
 - FIX: Fixed wrong STM32F4 TIM6 vector number symbol (bug #480)
   (backported to 2.6.4).
 - FIX: Fixed problem in STM32 SDADC driver initialization (bug #479)