From nobody Fri Nov 14 19:26:01 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1589465911; cv=none; d=zohomail.com; s=zohoarc; b=F+8wXQkToIeH8iB+MNb+IvY0BXzY59fJgkwG9fgwapJBMm4I5SQi6sh/ASB7y83ShtrEgAFkWc+Ojgng0aELI7G99hx+6+hGSHXMNdtF3ziwnpYqMM7ptNUcHWAThv3YpF2GT43rHkw+io51dK8dNhSlOmkhp5pOnzEkaIXOy1k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589465911; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=U0q5G1KQ0rIOe1dgVo4h2VPPUpfz+JwuhrBEFOHI/4Q=; b=GXe3gwVHZ4BMuVZC6PZYjb7chPUJT5Z9k+OcRM1WHAOce/ZbEXHqcQbKt8DVcesGXuQ6A2A/FG768jbwKScSOeTSs/+HrIP7cXPv6NJtZt5PHrJzCsQe6Bzqo6wP/Znago2C4ghkBRNNEkBKgftl/VzB8Om+62oaK7/Atchvux0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158946591158189.12402118881425; Thu, 14 May 2020 07:18:31 -0700 (PDT) Received: from localhost ([::1]:54878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jZEgw-00055A-PN for importer@patchew.org; Thu, 14 May 2020 10:18:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38444) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jZEcn-0007RD-NW for qemu-devel@nongnu.org; Thu, 14 May 2020 10:14:13 -0400 Received: from mail-lf1-x134.google.com ([2a00:1450:4864:20::134]:46590) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jZEcm-0003mE-QD for qemu-devel@nongnu.org; Thu, 14 May 2020 10:14:13 -0400 Received: by mail-lf1-x134.google.com with SMTP id v5so2724629lfp.13 for ; Thu, 14 May 2020 07:14:12 -0700 (PDT) Received: from gmail.com (81-231-232-130-no39.tbcn.telia.com. [81.231.232.130]) by smtp.gmail.com with ESMTPSA id c12sm1892375lfc.92.2020.05.14.07.14.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 May 2020 07:14:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U0q5G1KQ0rIOe1dgVo4h2VPPUpfz+JwuhrBEFOHI/4Q=; b=NpEEdpSSSKgynTBrdHPGwb2xRBlmSOL/l6X+YHBLUgFwIg+9xsdIiSYzQpnWMD6tr9 91IQjtpEhsnGFA7KSTyA2yjkkEui7wiY4lljHXQtuJy9IxnYMxAAc1gcGc9Jw8e2aM3l iYolxeua/6Qel1CkdMHwo0zKUu58UaTai/n9zu7Pmqz6JTFweZi2OigoiLe0aoYxj7NJ 3EIeYPZc8OEDIdT0vkH01GlKVUg6qGWasFySrstH6JM1qSosEG69UIdctNfLxraC0WlI Bb3QwVofw7INemFWagTVKP0VL+Of5LtyZfRKc03VXxV6xzu5bU4V5u1jtVgrwHTdFdHP dA6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U0q5G1KQ0rIOe1dgVo4h2VPPUpfz+JwuhrBEFOHI/4Q=; b=TVREtZSsFSq6EeifnovGha35AJWe0/GG1sPR9lAkRIXBLHSH8W58tSmekndYVJZOKK NQHUF3rgmJCmLx1ZHNgDyDdp/OG9qWpQfZpZAxfHNrR6tjybGYTI0AS5UGY/dxMzO5uw +7qz8DiSRxw5lTqbGwDHo81wsMNgf7E/ausMwK+lUs/2RMxmvrSjDQ0wg269ikCiKfCJ VoAF7lBqFaDlc+mi1AqLjy8bDEtBeRy5l9DUe9Xwjw4JrzKSN0Q1KriVBAbu1rVMPIdG YaVDi8B4UdvFN6afanE20WJVlSuPk68RA1mbu4rjJCPvAvAE3KrugGz7Uk6667rf5mk5 Ie8g== X-Gm-Message-State: AOAM531/c78B1K0+B7ClfA0fHLVHKLXe6X5ayXbvs81D6ZnmcCC1hJNa CRPQ7j1smS3pON7OgqRPs3XFQ35OEUs= X-Google-Smtp-Source: ABdhPJyw10YVK9zKcMNfHbYTr2jMP36NX5olImVc9qjBAbWcgoiLb3EvPlrLufP0I69UKf0gFNkpRg== X-Received: by 2002:ac2:5290:: with SMTP id q16mr3481208lfm.108.1589465650679; Thu, 14 May 2020 07:14:10 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Subject: [PULL v1 05/14] hw/core: stream: Add an end-of-packet flag Date: Thu, 14 May 2020 16:13:53 +0200 Message-Id: <20200514141402.12498-6-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200514141402.12498-1-edgar.iglesias@gmail.com> References: <20200514141402.12498-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::134; envelope-from=edgar.iglesias@gmail.com; helo=mail-lf1-x134.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: 13 X-Spam_score: 1.3 X-Spam_bar: + X-Spam_report: (1.3 / 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_FROM=0.001, FSL_HELO_FAKE=3.399, 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: edgar.iglesias@xilinx.com, peter.maydell@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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. Reviewed-by: Alistair Francis Reviewed-by: Francisco Iglesias Signed-off-by: Edgar E. Iglesias Message-Id: <20200506082513.18751-6-edgar.iglesias@gmail.com> --- 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; =20 size_t -stream_push(StreamSlave *sink, uint8_t *buf, size_t len); +stream_push(StreamSlave *sink, uint8_t *buf, size_t len, bool eop); =20 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" =20 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 =3D STREAM_SLAVE_GET_CLASS(sink); =20 - return k->push(sink, buf, len); + return k->push(sink, buf, len, eop); } =20 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, Stre= amSlave *tx_data_dev, =20 if (stream_desc_sof(&s->desc)) { s->pos =3D 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); } =20 txlen =3D s->desc.control & SDESC_CTRL_LEN_MASK; @@ -298,7 +298,7 @@ static void stream_process_mem2s(struct Stream *s, Stre= amSlave *tx_data_dev, s->pos +=3D txlen; =20 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 =3D 0; stream_complete(s); } @@ -384,7 +384,7 @@ static void xilinx_axidma_reset(DeviceState *dev) =20 static size_t xilinx_axidma_control_stream_push(StreamSlave *obj, unsigned char *buf, - size_t len) + size_t len, bool eop) { XilinxAXIDMAStreamSlave *cs =3D XILINX_AXI_DMA_CONTROL_STREAM(obj); struct Stream *s =3D &cs->dma->streams[1]; @@ -416,12 +416,14 @@ xilinx_axidma_data_stream_can_push(StreamSlave *obj, } =20 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 =3D XILINX_AXI_DMA_DATA_STREAM(obj); struct Stream *s =3D &ds->dma->streams[1]; size_t ret; =20 + assert(eop); ret =3D 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 =3D stream_push(s->tx_control_dev, (void *)s->rxapp + CONTROL_PAYLOAD_SIZE - - s->rxappsize, s->rxappsize); + - s->rxappsize, s->rxappsize, true); s->rxappsize -=3D ret; } =20 while (s->rxsize && stream_can_push(s->tx_data_dev, axienet_eth_rx_notify, s)) { size_t ret =3D stream_push(s->tx_data_dev, (void *)s->rxmem + s->r= xpos, - s->rxsize); + s->rxsize, true); s->rxsize -=3D ret; s->rxpos +=3D ret; if (!s->rxsize) { @@ -874,12 +874,14 @@ static ssize_t eth_rx(NetClientState *nc, const uint8= _t *buf, size_t size) } =20 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 =3D XILINX_AXI_ENET_CONTROL_STREAM(obj); XilinxAXIEnet *s =3D cs->enet; =20 + assert(eop); if (len !=3D 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) } =20 static size_t -xilinx_axienet_data_stream_push(StreamSlave *obj, uint8_t *buf, size_t siz= e) +xilinx_axienet_data_stream_push(StreamSlave *obj, uint8_t *buf, size_t siz= e, + bool eop) { XilinxAXIEnetStreamSlave *ds =3D XILINX_AXI_ENET_DATA_STREAM(obj); XilinxAXIEnet *s =3D ds->enet; =20 + /* 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) =20 memcpy(rq->dma_buf, rxd, num); =20 - ret =3D stream_push(rq->dma, rq->dma_buf, num); + ret =3D stream_push(rq->dma, rq->dma_buf, num, false); assert(ret =3D=3D num); xlnx_zynqmp_qspips_check_flush(rq); } --=20 2.20.1