Reboot (for DFU) much nicer and more generic

This commit is contained in:
Ross Owen
2013-07-25 14:04:26 +01:00
parent 2cd8fbdcb6
commit a5d7145adc

View File

@@ -5,6 +5,11 @@
#define XS1_SU_PERIPH_USB_ID 0x1 #define XS1_SU_PERIPH_USB_ID 0x1
/* Note, this function is prototyped in xs1.h only from 13 tools onwards */
unsigned get_tile_id(tileref);
extern tileref tile[];
/* Reboots XMOS device by writing to the PLL config register */ /* Reboots XMOS device by writing to the PLL config register */
void device_reboot_implementation(chanend spare) void device_reboot_implementation(chanend spare)
{ {
@@ -17,21 +22,37 @@ void device_reboot_implementation(chanend spare)
/* Disable USB and issue reset to xcore only - not analogue chip */ /* Disable USB and issue reset to xcore only - not analogue chip */
write_node_config_reg(usb_tile, XS1_SU_CFG_RST_MISC_NUM,0b10); write_node_config_reg(usb_tile, XS1_SU_CFG_RST_MISC_NUM,0b10);
#else #else
unsigned int pllVal;
unsigned int localTileId = get_local_tile_id();
unsigned int tileId;
unsigned int tileArrayLength;
outct(spare, XS1_CT_END); // have to do this before freeing the chanend outct(spare, XS1_CT_END); // have to do this before freeing the chanend
inct(spare); // Receive end ct from usb_buffer to close down in both directions inct(spare); // Receive end ct from usb_buffer to close down in both directions
// Need a spare chanend so we can talk to the pll register /* Need a spare chanend so we can talk to the pll register */
asm("freer res[%0]"::"r"(spare)); asm("freer res[%0]"::"r"(spare));
{ /* Find size of tile array - note in future tools versions this will be available from platform.h */
unsigned int pllVal; asm volatile ("ldc %0, tile.globound":"=r"(tileArrayLength));
unsigned int tile_id = get_local_tile_id();
read_sswitch_reg(tile_id, 6, pllVal);
/* Not this accounts for 2 tiles of an L2.. */ /* Reset all remote tiles */
write_sswitch_reg_no_ack(tile_id^0x8000, 6, pllVal); for(int i = 0; i< tileArrayLength; i++)
write_sswitch_reg_no_ack(tile_id, 6, pllVal); {
/* Cannot cast tileref to unsigned! */
tileId = get_tile_id(tile[i]);
/* Do not reboot local tile yet! */
if(localTileId != tileId)
{
read_sswitch_reg(tileId, 6, pllVal);
write_sswitch_reg_no_ack(tileId, 6, pllVal);
}
} }
/* Finally reboot this tile! */
read_sswitch_reg(localTileId, 6, pllVal);
write_sswitch_reg_no_ack(localTileId, 6, pllVal);
#endif #endif
} }