laiyp/lib_xua
1
0
Fork 0
forked from PAWPAW-Mirror/lib_xua
Code Pull Requests Activity

Reboot tidy (still has issues for non-trivial networks)

Browse Source
This commit is contained in:
xross
2018-01-17 11:34:07 +00:00
parent a39715823a
commit 1fc3a99f47
1 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
lib_xua/src/core/support/reboot.xc
View File

@@ -21,7 +21,7 @@ unsigned get_tile_id(tileref);
extern tileref tile[]; extern tileref tile[];
/* Function to reset the given tile */ /* Function to reset the given tile */
void reset_tile(unsigned tileId) static void reset_tile(unsigned const tileId)
{ {
unsigned int pllVal; unsigned int pllVal;
@@ -30,7 +30,8 @@ void reset_tile(unsigned tileId)
write_sswitch_reg_no_ack(tileId, 6, pllVal); write_sswitch_reg_no_ack(tileId, 6, pllVal);
} }
void device_reboot_aux(void) /* Note - resetting is per *node* not tile */
static inline void device_reboot_aux(void)
{ {
#if (XUD_SERIES_SUPPORT == 1) #if (XUD_SERIES_SUPPORT == 1)
/* Disconnect from bus */ /* Disconnect from bus */
@@ -45,9 +46,7 @@ void device_reboot_aux(void)
unsigned int localTileId = get_local_tile_id(); unsigned int localTileId = get_local_tile_id();
unsigned int tileId; unsigned int tileId;
unsigned int tileArrayLength; unsigned int tileArrayLength;
#ifdef __XS2A__
unsigned int localTileNum; unsigned int localTileNum;
#endif
#if (XUD_SERIES_SUPPORT == 4) #if (XUD_SERIES_SUPPORT == 4)
/* Disconnect from bus */ /* Disconnect from bus */
@@ -55,44 +54,46 @@ void device_reboot_aux(void)
write_periph_32(usb_tile, XS2_SU_PERIPH_USB_ID, XS1_GLX_PER_UIFM_FUNC_CONTROL_NUM, 1, data); write_periph_32(usb_tile, XS2_SU_PERIPH_USB_ID, XS1_GLX_PER_UIFM_FUNC_CONTROL_NUM, 1, data);
#endif #endif
/* Find size of tile array - note in future tools versions this will be available from platform.h */ tileArrayLength = sizeof(tile)/sizeof(tileref);
asm volatile ("ldc %0, tile.globound":"=r"(tileArrayLength));
#ifdef __XS2A__ /* Note - we could be in trouble if this doesn't return 0/1 since
/* Find tile number of the local tile ID*/ * this code doesn't properly handle any network topology other than a
for(int tileNum = 0; tileNum<tileArrayLength; tileNum++) { * simple line
if (get_tile_id(tile[tileNum]) == localTileId) { */
/* Find tile index of the local tile ID */
for(int tileNum = 0; tileNum<tileArrayLength; tileNum++)
{
if (get_tile_id(tile[tileNum]) == localTileId)
{
localTileNum = tileNum; localTileNum = tileNum;
break; break;
} }
} }
#endif
#ifndef __XS2A__ #ifdef __XS2A__
/* Reset all tiles, starting from the remote ones */
for(int tileNum = tileArrayLength-1; tileNum>=0; tileNum--)
#else
/* Reset all even tiles, starting from the remote ones */ /* Reset all even tiles, starting from the remote ones */
for(int tileNum = tileArrayLength-2; tileNum>=0; tileNum=tileNum-2) for(unsigned int tileNum = tileArrayLength-2; tileNum>=0; tileNum-2)
#else
/* Reset all tiles, starting from the remote ones */
for(unsigned int tileNum = tileArrayLength-1; tileNum>=0; tileNum--)
#endif #endif
{ {
/* Cannot cast tileref to unsigned! */ /* Cannot cast tileref to unsigned! */
tileId = get_tile_id(tile[tileNum]); tileId = get_tile_id(tile[tileNum]);
/* Do not reboot local tile yet! */ /* Do not reboot local tile (or tiles residing on the same node) yet */
#ifndef __XS2A__ #ifdef __XS2A__
if(localTileId != tileId) if((localTileNum | 1) != (tileNum | 1))
#else #else
/* In XS2A the tile paired up with the local tile can't be rebooted either */ if(localTileNum != tileNum)
if((localTileNum|0x01) != (tileNum|0x01))
#endif #endif
{ {
reset_tile(tileId); reset_tile(tileId);
} }
} }
/* Finally reboot this tile! */ /* Finally reboot the node this tile resides on */
reset_tile(localTileId); reset_tile(localTileId);
#endif #endif
} }