3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pru: Batch outgoing writes 

Allow pru0 to gather multiple outgoing message blocks into a single
rpmsg.  This can reduce communication overhead.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2017-09-07 17:08:58 -04:00
parent 121c747cc8
commit d618affd63
1 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/pru/pru0.c
View File

@ -31,6 +31,32 @@ static uint16_t transport_dst;
#define CHAN_DESC "Channel 30" #define CHAN_DESC "Channel 30"
#define CHAN_PORT 30 #define CHAN_PORT 30
#define RPMSG_HDR_SIZE 16
static char transmit_buf[RPMSG_BUF_SIZE - RPMSG_HDR_SIZE];
static int transmit_pos;
// Transmit all pending message blocks
static void
flush_messages(void)
{
if (!transmit_pos)
return;
pru_rpmsg_send(&transport, CHAN_PORT, transport_dst
, transmit_buf, transmit_pos);
transmit_pos = 0;
}
// Generate a message block and queue it for transmission
static void
build_message(char *msg, int msglen)
{
if (transmit_pos + msglen > sizeof(transmit_buf))
flush_messages();
memcpy(&transmit_buf[transmit_pos], msg, msglen);
command_add_frame(&transmit_buf[transmit_pos], msglen);
transmit_pos += msglen;
}
// Check if there is data to be sent from PRU1 to the host // Check if there is data to be sent from PRU1 to the host
static void static void
check_can_send(void) check_can_send(void)
@ -42,8 +68,7 @@ check_can_send(void)
if (!count) if (!count)
// Queue empty // Queue empty
break; break;
command_add_frame(s->data, count); build_message(s->data, count);
pru_rpmsg_send(&transport, CHAN_PORT, transport_dst, &s->data, count);
writel(&s->count, 0); writel(&s->count, 0);
SHARED_MEM->send_pop_pos = ( SHARED_MEM->send_pop_pos = (
(send_pop_pos + 1) % ARRAY_SIZE(SHARED_MEM->send_data)); (send_pop_pos + 1) % ARRAY_SIZE(SHARED_MEM->send_data));
@ -139,8 +164,10 @@ process_io(void)
CT_INTC.SECR0 = (1 << KICK_PRU0_FROM_ARM_EVENT) | (1 << KICK_PRU0_EVENT); CT_INTC.SECR0 = (1 << KICK_PRU0_FROM_ARM_EVENT) | (1 << KICK_PRU0_EVENT);
check_can_send(); check_can_send();
int can_sleep = check_can_read(); int can_sleep = check_can_read();
if (can_sleep) if (can_sleep) {
flush_messages();
asm("slp 1"); asm("slp 1");
}
} }
} }
@ -182,8 +209,7 @@ void
console_sendf(const struct command_encoder *ce, va_list args) console_sendf(const struct command_encoder *ce, va_list args)
{ {
char buf[MESSAGE_MIN]; char buf[MESSAGE_MIN];
command_add_frame(buf, sizeof(buf)); build_message(buf, sizeof(buf));
pru_rpmsg_send(&transport, CHAN_PORT, transport_dst, buf, sizeof(buf));
} }