Merge pull request #19 from autosportlabs/p/jeffc/enable_optimizations

P/jeffc/enable optimizations

Author: Jeff-Ciesielski

Makefile

@@ -68,9 +68,9 @@ GDB     := $(PREFIX)-gdb
 INCLUDES += $(CPU_INCLUDES) $(BOARD_INCLUDES) $(LIB_INCLUDES) $(APP_INCLUDES)
 INCLUDES += -Icpu/common -Iboard/common
 
-CFLAGS ?= -Os -g -Wall -fno-common -c -mthumb
+CFLAGS ?= -Os -g -Wall -fno-common -c -mthumb -fno-strict-aliasing
 CFLAGS += -mcpu=$(CPU_TYPE) -MD -std=gnu99
-#CFLAGS += -ffunction-sections -fdata-sections -flto
+CFLAGS += -ffunction-sections -fdata-sections
 CFLAGS += $(INCLUDES) $(CPU_DEFINES) $(BOARD_DEFINES) $(APP_DEFINES) $(CPU_FLAGS)
 
 ASFLAGS += -mcpu=$(CPU_TYPE) $(FPU) -g -Wa,--warn
@@ -79,8 +79,8 @@ LIBS = -lnosys
 
 LDFLAGS ?= --specs=nano.specs -lc -lgcc $(LIBS) -mcpu=$(CPU_TYPE) -g -gdwarf-2 
 LDFLAGS += -L. -Lcpu/common -L$(CPU_BASE) -T$(CPU_LINK_MEM) -Tlink_sections.ld 
-LDFLAGS += -nostartfiles -Wl,--gc-sections -mthumb -mcpu=$(CPU_TYPE)
-#LDFLAGS += -ffunction-sections -fdata-sections -flto -Os
+LDFLAGS += -nostartfiles -Wl,--gc-sections -mthumb -mcpu=$(CPU_TYPE) -Os
+LDFLAGS += -ffunction-sections -fdata-sections
 LDFLAGS += -msoft-float -Wl,--Map=$(TARGET).map
 
 # Be silent per default, but 'make V=1' will show all compiler calls.

cpu/stm32f3xx/cdc_acm/hw_config.c

@@ -34,7 +34,7 @@
 #include "hw_config.h"
 #include "usb_pwr.h"
 
-
+#define USB_IRQ_PRIORITY 7
 /* Private typedef -----------------------------------------------------------*/
 /* Private define ------------------------------------------------------------*/
 /* Private macro -------------------------------------------------------------*/
@@ -118,13 +118,6 @@ void Set_System(void)
   GPIO_PinAFConfig(GPIOA, GPIO_PinSource11, GPIO_AF_14);
   GPIO_PinAFConfig(GPIOA, GPIO_PinSource12, GPIO_AF_14);
 
-  /* USB_DISCONNECT used as USB pull-up */
-  GPIO_InitStructure.GPIO_Pin = USB_DISCONNECT_PIN;
-  GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;
-  GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
-  GPIO_InitStructure.GPIO_OType = GPIO_OType_OD;
-  GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_NOPULL;
-  GPIO_Init(USB_DISCONNECT, &GPIO_InitStructure);
 #endif /* STM32F37X && STM32F30X */
 
   /* Configure the EXTI line 18 connected internally to the USB IP */
@@ -202,48 +195,19 @@ void USB_Interrupts_Config(void)
 {
   NVIC_InitTypeDef NVIC_InitStructure;
 
-  /* 2 bit for pre-emption priority, 2 bits for subpriority */
+  /* We use no bits for nested sub priority */
   NVIC_PriorityGroupConfig(NVIC_PriorityGroup_4);
 
-#if defined(STM32L1XX_MD) || defined(STM32L1XX_HD)|| defined(STM32L1XX_MD_PLUS)
-  NVIC_InitStructure.NVIC_IRQChannel = USB_LP_IRQn;
-  NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 2;
-  NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
-  NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
-  NVIC_Init(&NVIC_InitStructure);
-
-    /* Enable the USB Wake-up interrupt */
-  NVIC_InitStructure.NVIC_IRQChannel = USB_FS_WKUP_IRQn;
-  NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 0;
-  NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
-  NVIC_Init(&NVIC_InitStructure);
-
-#elif defined(STM32F37X)
-  /* Enable the USB interrupt */
-  NVIC_InitStructure.NVIC_IRQChannel = USB_LP_IRQn;
-  NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 2;
-  NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
-  NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
-  NVIC_Init(&NVIC_InitStructure);
-
-  /* Enable the USB Wake-up interrupt */
-  NVIC_InitStructure.NVIC_IRQChannel = USBWakeUp_IRQn;
-  NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 0;
-  NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
-  NVIC_Init(&NVIC_InitStructure);
-
-#else
   NVIC_InitStructure.NVIC_IRQChannel = USB_LP_CAN1_RX0_IRQn;
-  NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 2;
+  NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = USB_IRQ_PRIORITY;
   NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0;
   NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE;
   NVIC_Init(&NVIC_InitStructure);
 
     /* Enable the USB Wake-up interrupt */
   NVIC_InitStructure.NVIC_IRQChannel = USBWakeUp_IRQn;
-  NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 0;
+  NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = USB_IRQ_PRIORITY;
   NVIC_Init(&NVIC_InitStructure);
-#endif /* STM32L1XX_XD */
 
   /* Enable USART Interrupt  */
   /* We don't need to do this since we're intercepting traffic directly */

cpu/stm32f3xx/cdc_acm/usb_conf.h

@@ -69,15 +69,17 @@
 /* IMR_MSK */
 /* mask defining which events has to be handled */
 /* by the device application software */
-/*
+
+/* JC: Original configuration
+
   #define IMR_MSK (CNTR_CTRM  | CNTR_WKUPM | CNTR_SUSPM | CNTR_ERRM  | CNTR_SOFM \
                 | CNTR_ESOFM | CNTR_RESETM )
 */
 
+/* JC: WKUP/SUSPEND Functionality disabled */
 #define IMR_MSK (CNTR_CTRM | CNTR_ERRM  | CNTR_SOFM \
                  | CNTR_ESOFM | CNTR_RESETM )
 
-
 /*#define CTR_CALLBACK*/
 /*#define DOVR_CALLBACK*/
 /*#define ERR_CALLBACK*/

cpu/stm32f3xx/cdc_acm/usb_desc.c

@@ -62,7 +62,8 @@ const uint8_t Virtual_Com_Port_ConfigDescriptor[] =
     0x00,
     0x02,   /* bNumInterfaces: 2 interface */
     0x01,   /* bConfigurationValue: Configuration value */
-    0x00,   /* iConfiguration: Index of string descriptor describing the configuration */
+    0x00,   /* iConfiguration: Index of string descriptor describing
+	     * the configuration */
     0x80,   /* bmAttributes: bus powered */
     0xFA,   /* MaxPower 500 mA */
     /*Interface Descriptor*/

cpu/stm32f3xx/cdc_acm/usb_pwr.c

@@ -37,7 +37,7 @@
 /* Private macro -------------------------------------------------------------*/
 /* Private variables ---------------------------------------------------------*/
 __IO uint32_t bDeviceState = UNCONNECTED; /* USB device status */
-__IO bool fSuspendEnabled = FALSE;  /* true when suspend is possible */
+__IO bool fSuspendEnabled = TRUE;  /* true when suspend is possible */
 __IO uint32_t EP[8];
 
 struct

cpu/stm32f4xx/cdc_acm/USB-CDC_device_stm32.c

@@ -26,11 +26,11 @@ int USB_CDC_device_init(void)
 
 int USB_CDC_device_deinit(void)
 {
+	USBD_DeInit(&USB_OTG_dev);
+
 	return 0;
 }
 
-
-/* TODO: Plumb */
 int USB_CDC_read(uint8_t *dst, int len )
 {
 	return vcp_rx(dst, len, 0xffffffff);

img_utils.c

@@ -92,19 +92,16 @@ struct app_info_block *scan_for_app(void)
 	return NULL;
 }
 
-__attribute__((__naked__,__noreturn__))
+__attribute__((__naked__, __noreturn__))
 void jump_to_app(uint32_t address)
 {
 	typedef void (*func_ptr)(void);
 
-	/* Function pointer to our app */
-	func_ptr reset_vec;
-
 	/* Variable to hold the start address of the application */
 	const uint32_t *vec_table = (uint32_t*) address;
 
 	/* Get the reset vector from the vector table */
-	reset_vec = (func_ptr)((uint32_t)vec_table[1]);
+	const func_ptr reset_vec = (func_ptr)((uint32_t)vec_table[1]);
 
 	/* Disable all interrupts */
 	for (int i = 0; i < 8; i++)
@@ -114,6 +111,13 @@ void jump_to_app(uint32_t address)
 	__set_MSP((uint32_t)(vec_table[0]));
 	__set_PSP((uint32_t)(vec_table[0]));
 
+	/*
+	 * Perform a pipeline flush to ensure stack pointers are set
+	 * before jumping
+	 */
+	__DSB();
+	__ISB();
+
 	/* Execute the reset vector (we don't return from this) */
 	reset_vec();
 

upgrade_agent/upgrade_agent_handlers.c

@@ -45,28 +45,29 @@ void xbvc_handle_verify_command(struct x_verify_command *msg)
 
 void xbvc_handle_run_command(struct x_run_command *msg)
 {
-	struct x_run_response rsp;
-	rsp.error = ERR_SUCCESS;
+	struct x_run_response rsp =  {.error = ERR_SUCCESS};
 
-	if (last_known_info == NULL)
+	/* If we don't know about any applications, check to see if
+	 * one has been flashed into NVM */
+	if (NULL == last_known_info) {
 		last_known_info = scan_for_app();
 
-	if (last_known_info == NULL)
-		rsp.error = ERR_RUN_FAIL;
-	else
-		rsp.error = ERR_SUCCESS;
+		/* Check again, if we still didn't find anything,
+		 * set an appropriate error response*/
+		if (NULL == last_known_info) {
+			rsp.error = ERR_RUN_FAIL;
+		}
+	}
 
 	xbvc_send(&rsp, E_MSG_RUN_RESPONSE);
 
 	/* Make sure we sent the run response */
 	upgrade_agent_usb_flush();
 
-	if (last_known_info != NULL) {
-		/* Shut down the USB interface */
-		upgrade_agent_usb_deinit();
-
-		/* Get going */
-		jump_to_app(last_known_info->start_addr);
+	/* Simply perform a reset, the bootloader will pick up the
+	 * application and execute it on the next go around */
+	if (ERR_SUCCESS == rsp.error) {
+		NVIC_SystemReset();
 	}
 }
 

version.h

@@ -2,7 +2,7 @@
 #define _VERSION_H_
 
 #define VER_MAJOR 0
-#define VER_MINOR 2
+#define VER_MINOR 3
 #define VER_BUGFIX 0
 
 #endif