Skip to content

Commit 7871fa4

Browse files
committed
t234spe/tcu: Make CCPLEX be the first stream
Also make smux:er default to first stream. This makes it work OK even if we're using a dumb terminal at the other end
1 parent 9c8eab2 commit 7871fa4

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

src/platform/t234spe/tcu.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,15 +76,16 @@ tcu_init_early(void)
7676
static void __attribute__((constructor(5000)))
7777
tcu_init_late(void)
7878
{
79-
stream_t *svec[6];
8079

81-
// SPE (this is us)
82-
pipe(&svec[0], &spe_tcu_console);
80+
stream_t *svec[6];
8381

8482
// CCPLEX
85-
svec[1] = hsp_mbox_stream(NV_ADDRESS_MAP_AON_HSP_BASE, 1,
83+
svec[0] = hsp_mbox_stream(NV_ADDRESS_MAP_AON_HSP_BASE, 1,
8684
NV_ADDRESS_MAP_TOP0_HSP_BASE, 0);
8785

86+
// SPE (this is us)
87+
pipe(&svec[1], &spe_tcu_console);
88+
8889
// BPMP
8990
svec[2] = hsp_mbox_stream(NV_ADDRESS_MAP_AON_HSP_BASE, 6, 0, 0);
9091

@@ -98,8 +99,8 @@ tcu_init_late(void)
9899
svec[5] = hsp_mbox_stream(NV_ADDRESS_MAP_AON_HSP_BASE, 5, 0, 0);
99100

100101
static const uint8_t tcuids[6] = {
101-
TCU_CHANNEL_SPE,
102102
TCU_CHANNEL_CCPLEX,
103+
TCU_CHANNEL_SPE,
103104
TCU_CHANNEL_BPMP,
104105
TCU_CHANNEL_SCE,
105106
TCU_CHANNEL_TZ,

src/util/smux.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ smux_rx_thread(void *arg)
107107
{
108108
smux_t *smux = arg;
109109

110-
stream_t *channel = NULL;
110+
stream_t *channel = smux->ps[0].obj;
111111
int esc = 0;
112112
uint8_t buf[32];
113113

0 commit comments

Comments
 (0)