From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 03E1DC47254 for ; Tue, 5 May 2020 16:44:56 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id BEE6B20746 for ; Tue, 5 May 2020 16:44:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jmOI8HGa" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BEE6B20746 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:36046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jW0gg-0005Cd-SS for qemu-devel@archiver.kernel.org; Tue, 05 May 2020 12:44:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32912) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jW0fp-0003jj-B5; Tue, 05 May 2020 12:44:01 -0400 Received: from mail-il1-x143.google.com ([2607:f8b0:4864:20::143]:33358) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jW0fo-0007l0-8Q; Tue, 05 May 2020 12:44:01 -0400 Received: by mail-il1-x143.google.com with SMTP id q10so1522869ile.0; Tue, 05 May 2020 09:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=wqdwOW5QWQWm0aoEe56QBtIKJ0jX/fQehIh+NEDaZbA=; b=jmOI8HGa38zkgxoHm/vasVvqbAo0ayBDYjBAVrc9v9r7Tqmk8vIw6loKdvUpXYlr2P Yp0Q2Z7KrTq79RLcv08bx0lQB+lqWTIhqLXpLQ3cmbaFlhQMEl/JDR6Zs4FTDEQpS9vk cYBz4uxwZZPJ/CswQ/JzoZfkhleJeKaCkEQ4edtwQ+eYyIsFYJ9nlwWnVoMK/uNpty+j k3Y5tNjH1Hj8p+umrQV5pkhsT9DUqw6f4KdDGndMpYCfhlcEidCGYYaDPVjPbi1QhAaw 7hJHOViYtKhjzFnmdtyjo0pQvBMgqM9Koq41fg1i8KzoPPJwevAfuIkdqhlDTPqHs9Cz KSfw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=wqdwOW5QWQWm0aoEe56QBtIKJ0jX/fQehIh+NEDaZbA=; b=LGJlQl4Wf09J7i5/+ei8E2XotZHn5VQ5JeJZK0J1w1ytX8ZUfhHcexqCG+sEuOzEcK PjtwRezphEU56vxXpbic5+lFdhPQQXCSIxyNS5DO2sFeBjtSIuT/GkwfLGdBmPvH7f6a k36M1E+6LdPbcm/K6Wxi7MUPdPbXJ9ra7dh9Ak+F+ppagRrPNHZTwD032NmcPw1j9xkt IM2aBX/2HmMzZ52LVXUgOGxewqUHtZCfouo9+wgRJf/6bVnCovhrbSGXVMMkkyjnJ2Z3 sWjIXf97t71WieJwWPtBwGxL/xR85TB0DX9FcLNTKIcyTlOetg6928OIHtVLAJMDirgQ jyjQ== X-Gm-Message-State: AGi0PuY4yqglZoI6cLm9w8cOTb4Ny9AhSKmTinBoxm38hebWrxjTVV5R YcINc85hU69r0JO3vbIFu6P5X9IFBkTyFhBsY+8= X-Google-Smtp-Source: APiQypJ1vBzwREQBVI3y+ONHj1zFGQ+YhH0euR7gDQ43/MgCzfCPRoZdT2nG36zlxcemYzSFfyuxbWUP2qn7DJNm9Aw= X-Received: by 2002:a92:ad09:: with SMTP id w9mr4794232ilh.177.1588697038667; Tue, 05 May 2020 09:43:58 -0700 (PDT) MIME-Version: 1.0 References: <20200430162439.2659-1-edgar.iglesias@gmail.com> <20200430162439.2659-6-edgar.iglesias@gmail.com> In-Reply-To: <20200430162439.2659-6-edgar.iglesias@gmail.com> From: Alistair Francis Date: Tue, 5 May 2020 09:35:17 -0700 Message-ID: Subject: Re: [PATCH v1 5/9] hw/core: stream: Add an end-of-packet flag To: "Edgar E. Iglesias" Content-Type: text/plain; charset="UTF-8" Received-SPF: pass client-ip=2607:f8b0:4864:20::143; envelope-from=alistair23@gmail.com; helo=mail-il1-x143.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Damien Hedde , Peter Maydell , Edgar Iglesias , Sai Pavan Boddu , Francisco Iglesias , Jason Wang , Alistair Francis , "qemu-devel@nongnu.org Developers" , KONRAD Frederic , Stefano Stabellini , qemu-arm , =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= , Luc Michel , figlesia@xilinx.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, Apr 30, 2020 at 9:26 AM Edgar E. Iglesias wrote: > > From: "Edgar E. Iglesias" > > Some stream clients stream an endless stream of data while > other clients stream data in packets. Stream interfaces > usually have a way to signal the end of a packet or the > last beat of a transfer. > > This adds an end-of-packet flag to the push interface. > > Signed-off-by: Edgar E. Iglesias Reviewed-by: Alistair Francis Alistair > --- > include/hw/stream.h | 5 +++-- > hw/core/stream.c | 4 ++-- > hw/dma/xilinx_axidma.c | 10 ++++++---- > hw/net/xilinx_axienet.c | 14 ++++++++++---- > hw/ssi/xilinx_spips.c | 2 +- > 5 files changed, 22 insertions(+), 13 deletions(-) > > diff --git a/include/hw/stream.h b/include/hw/stream.h > index d02f62ca89..ed09e83683 100644 > --- a/include/hw/stream.h > +++ b/include/hw/stream.h > @@ -39,12 +39,13 @@ typedef struct StreamSlaveClass { > * @obj: Stream slave to push to > * @buf: Data to write > * @len: Maximum number of bytes to write > + * @eop: End of packet flag > */ > - size_t (*push)(StreamSlave *obj, unsigned char *buf, size_t len); > + size_t (*push)(StreamSlave *obj, unsigned char *buf, size_t len, bool eop); > } StreamSlaveClass; > > size_t > -stream_push(StreamSlave *sink, uint8_t *buf, size_t len); > +stream_push(StreamSlave *sink, uint8_t *buf, size_t len, bool eop); > > bool > stream_can_push(StreamSlave *sink, StreamCanPushNotifyFn notify, > diff --git a/hw/core/stream.c b/hw/core/stream.c > index 39b1e595cd..a65ad1208d 100644 > --- a/hw/core/stream.c > +++ b/hw/core/stream.c > @@ -3,11 +3,11 @@ > #include "qemu/module.h" > > size_t > -stream_push(StreamSlave *sink, uint8_t *buf, size_t len) > +stream_push(StreamSlave *sink, uint8_t *buf, size_t len, bool eop) > { > StreamSlaveClass *k = STREAM_SLAVE_GET_CLASS(sink); > > - return k->push(sink, buf, len); > + return k->push(sink, buf, len, eop); > } > > bool > diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c > index 4540051448..a770e12c96 100644 > --- a/hw/dma/xilinx_axidma.c > +++ b/hw/dma/xilinx_axidma.c > @@ -283,7 +283,7 @@ static void stream_process_mem2s(struct Stream *s, StreamSlave *tx_data_dev, > > if (stream_desc_sof(&s->desc)) { > s->pos = 0; > - stream_push(tx_control_dev, s->desc.app, sizeof(s->desc.app)); > + stream_push(tx_control_dev, s->desc.app, sizeof(s->desc.app), true); > } > > txlen = s->desc.control & SDESC_CTRL_LEN_MASK; > @@ -298,7 +298,7 @@ static void stream_process_mem2s(struct Stream *s, StreamSlave *tx_data_dev, > s->pos += txlen; > > if (stream_desc_eof(&s->desc)) { > - stream_push(tx_data_dev, s->txbuf, s->pos); > + stream_push(tx_data_dev, s->txbuf, s->pos, true); > s->pos = 0; > stream_complete(s); > } > @@ -384,7 +384,7 @@ static void xilinx_axidma_reset(DeviceState *dev) > > static size_t > xilinx_axidma_control_stream_push(StreamSlave *obj, unsigned char *buf, > - size_t len) > + size_t len, bool eop) > { > XilinxAXIDMAStreamSlave *cs = XILINX_AXI_DMA_CONTROL_STREAM(obj); > struct Stream *s = &cs->dma->streams[1]; > @@ -416,12 +416,14 @@ xilinx_axidma_data_stream_can_push(StreamSlave *obj, > } > > static size_t > -xilinx_axidma_data_stream_push(StreamSlave *obj, unsigned char *buf, size_t len) > +xilinx_axidma_data_stream_push(StreamSlave *obj, unsigned char *buf, size_t len, > + bool eop) > { > XilinxAXIDMAStreamSlave *ds = XILINX_AXI_DMA_DATA_STREAM(obj); > struct Stream *s = &ds->dma->streams[1]; > size_t ret; > > + assert(eop); > ret = stream_process_s2mem(s, buf, len); > stream_update_irq(s); > return ret; > diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c > index c8dfcda3ee..bd48305577 100644 > --- a/hw/net/xilinx_axienet.c > +++ b/hw/net/xilinx_axienet.c > @@ -697,14 +697,14 @@ static void axienet_eth_rx_notify(void *opaque) > axienet_eth_rx_notify, s)) { > size_t ret = stream_push(s->tx_control_dev, > (void *)s->rxapp + CONTROL_PAYLOAD_SIZE > - - s->rxappsize, s->rxappsize); > + - s->rxappsize, s->rxappsize, true); > s->rxappsize -= ret; > } > > while (s->rxsize && stream_can_push(s->tx_data_dev, > axienet_eth_rx_notify, s)) { > size_t ret = stream_push(s->tx_data_dev, (void *)s->rxmem + s->rxpos, > - s->rxsize); > + s->rxsize, true); > s->rxsize -= ret; > s->rxpos += ret; > if (!s->rxsize) { > @@ -874,12 +874,14 @@ static ssize_t eth_rx(NetClientState *nc, const uint8_t *buf, size_t size) > } > > static size_t > -xilinx_axienet_control_stream_push(StreamSlave *obj, uint8_t *buf, size_t len) > +xilinx_axienet_control_stream_push(StreamSlave *obj, uint8_t *buf, size_t len, > + bool eop) > { > int i; > XilinxAXIEnetStreamSlave *cs = XILINX_AXI_ENET_CONTROL_STREAM(obj); > XilinxAXIEnet *s = cs->enet; > > + assert(eop); > if (len != CONTROL_PAYLOAD_SIZE) { > hw_error("AXI Enet requires %d byte control stream payload\n", > (int)CONTROL_PAYLOAD_SIZE); > @@ -894,11 +896,15 @@ xilinx_axienet_control_stream_push(StreamSlave *obj, uint8_t *buf, size_t len) > } > > static size_t > -xilinx_axienet_data_stream_push(StreamSlave *obj, uint8_t *buf, size_t size) > +xilinx_axienet_data_stream_push(StreamSlave *obj, uint8_t *buf, size_t size, > + bool eop) > { > XilinxAXIEnetStreamSlave *ds = XILINX_AXI_ENET_DATA_STREAM(obj); > XilinxAXIEnet *s = ds->enet; > > + /* We don't support fragmented packets yet. */ > + assert(eop); > + > /* TX enable ? */ > if (!(s->tc & TC_TX)) { > return size; > diff --git a/hw/ssi/xilinx_spips.c b/hw/ssi/xilinx_spips.c > index c57850a505..4cfce882ab 100644 > --- a/hw/ssi/xilinx_spips.c > +++ b/hw/ssi/xilinx_spips.c > @@ -868,7 +868,7 @@ static void xlnx_zynqmp_qspips_notify(void *opaque) > > memcpy(rq->dma_buf, rxd, num); > > - ret = stream_push(rq->dma, rq->dma_buf, num); > + ret = stream_push(rq->dma, rq->dma_buf, num, false); > assert(ret == num); > xlnx_zynqmp_qspips_check_flush(rq); > } > -- > 2.20.1 > >