From nobody Thu May 16 11:06:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1591128345; cv=none; d=zohomail.com; s=zohoarc; b=eYbXPwGJkftKBd8EBfGvxlYcxao9FfqRznDLYDfcH0OvLatTqD3AEn5ZROMXigntcCykuZSYqyn/cbD7+JtML2nLdFy0IR822IZOz6s3viTfXh9K+wF91n6YKmdAiNDsfzugsLcH4BUtjof7GHtXLQdiFpESQPTQK/X96KPtR1c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1591128345; h=Content-Type:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=0sRZuUdo7NhJjpmZ+QsJQg75Tos1es5ONp8As8ZlHQw=; b=mtDObQI7VgfmecouRSQ4lcJ86WNqYvvQxqQheqwjm/JvIxEe11YWaJ2wdSuswKk4H/UVqz5WlmMhhd2KjYw2xrAE0kTdoRGTHg7BDVNkVO7w0wtnPJiwVsMJ7WV+nhb3939Eh1A91yKDmrzNyQlJBrSF/wEyQJUoUqh6EIItrkI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1591128345724247.51846360846469; Tue, 2 Jun 2020 13:05:45 -0700 (PDT) Received: from localhost ([::1]:59530 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jgDAO-00018S-IB for importer@patchew.org; Tue, 02 Jun 2020 16:05:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37974) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jgA50-0006YZ-Hp; Tue, 02 Jun 2020 12:47:58 -0400 Received: from mail-ot1-x343.google.com ([2607:f8b0:4864:20::343]:35551) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jgA4z-0005GU-HZ; Tue, 02 Jun 2020 12:47:58 -0400 Received: by mail-ot1-x343.google.com with SMTP id 69so11451830otv.2; Tue, 02 Jun 2020 09:47:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=0sRZuUdo7NhJjpmZ+QsJQg75Tos1es5ONp8As8ZlHQw=; b=rW+MyXShdOfwkGOVtpsFUC9U0UcKAGwKrPZb6ff5G5ELomvSxI3PUSDi57cgc1MI0f vAtoxt4EXXqI6sHoJRyD4UnveZRfZoe9fChuZJ9YFyh47hTy/9PcsuZVVQcnuvtWCHPm tPATFQtwbdHQbmrgqhqzCTITTk6yolk4N2qOCTEq8LIbNK0Icx9X2WkJZZgIcfp3s1sf Zzgdv01eUzpCm416TOB74K8J0+fZ8TyBKNmFUCmZMO/0sfDbV+W9IF366XAlxTcI3Vb4 WzFcy9t7z+d95yClD7BhFI1zB2hx/sf+OlBH3UzZnj7N4dDzqA2RIgCd+ePOjNE+8txs D9ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=0sRZuUdo7NhJjpmZ+QsJQg75Tos1es5ONp8As8ZlHQw=; b=YAf4aBcJpp11kn7wAPH6WngrYFXk9NecRqgHLonDMd7ut/7N5xSuh0NxmQjd8MVbES OHdB1cTpcXXQULp6vn4+OSSmKJkH1FqaiaqXaRJK4T1/BEoFfSj9OD29L6A2vZXCdkAQ gbQOFdj5QdEGmvE28aVihYnZc5znoS3nvP4ZOvtaw0443nRMNZ5gJfFyd1NRnOeJbfvl eSUa6xVZWU4zAR7VL0gNabm6FrDgr5ysV5/38HAjpy2t+YZWx32oN+zLk5pbMhuMX1NQ d6UGtR01lWD5Rfdu8n029RhzOLEYt56ib0k8hXU60n5VnTv4Ma55Sy823wsRYrEEmwWz 6wtw== X-Gm-Message-State: AOAM531lTO4azqIaTOEsDtnbOouLrP814QngpbNlQUUbKVlW+MCW3z9S SGrritKiigk2qQXF4W2fsBL8rPxJSBO8p9aTnno= X-Google-Smtp-Source: ABdhPJzZ8mBb3yS6rmt/wHeElq0j5g0TRPlWJFjn6SJWRVJogeCBHsMNcIqJ1SufmhOZnRtHlw21Nzx8kkMvVA0uG2A= X-Received: by 2002:a9d:3f35:: with SMTP id m50mr179709otc.120.1591116475385; Tue, 02 Jun 2020 09:47:55 -0700 (PDT) MIME-Version: 1.0 From: Erik Smit Date: Tue, 2 Jun 2020 18:47:44 +0200 Message-ID: Subject: [PATCH] ftgmac100: Implement variable descriptor size To: =?UTF-8?Q?C=C3=A9dric_Le_Goater?= , Peter Maydell , Andrew Jeffery , Joel Stanley , Jason Wang , qemu-arm@nongnu.org, qemu-devel@nongnu.org Content-Type: multipart/alternative; boundary="0000000000004fcaa405a71cac44" 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=2607:f8b0:4864:20::343; envelope-from=erik.lucas.smit@gmail.com; helo=mail-ot1-x343.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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-Mailman-Approved-At: Tue, 02 Jun 2020 16:04:31 -0400 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @gmail.com) Content-Transfer-Encoding: quoted-printable --0000000000004fcaa405a71cac44 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 VGhlIGhhcmR3YXJlIHN1cHBvcnRzIHZhcmlhYmxlIGRlc2NyaXB0b3Igc2l6ZXMsIGNvbmZpZ3Vy ZWQgd2l0aCB0aGUgREJMQUMKcmVnaXN0ZXIuCgpNb3N0IGRyaXZlcnMgdXNlIHRoZSBkZWZhdWx0 IDIqOCwgd2hpY2ggaXMgY3VycmVudGx5IGhhcmRjb2RlZCBpbiBxZW11LCBidXQKdGhlIGltcGxl bWVudGF0aW9uIG9mIHRoZSBkcml2ZXIgaW4gU3VwZXJtaWNybyBCTUMgU01UX1gxMV8xNTggdXNl cyA0KjguCgotLQpUaGUgaW1wbGVtZW50YXRpb24gb2YgdGhlIGRyaXZlciBpbiBTdXBlcm1pY3Jv IEJNQyBTTVRfWDExXzE1OCBhZGRzIDQgZXh0cmEKNC1ieXRlcyBlbnRyaWVzOgpodHRwczovL2dp dGh1Yi5jb20veWEtbW91c2Uvb3BlbndydC1saW51eC1hc3BlZWQvYmxvYi9tYXN0ZXIvZHJpdmVy cy9uZXQvZnQ9CmdtYWMxMDBfMjYuaCNMMzg3LUwzOTEKCkFuZCBzZXRzIERCTEFDIHRvIDB4NDRm OTc6Cmh0dHBzOi8vZ2l0aHViLmNvbS95YS1tb3VzZS9vcGVud3J0LWxpbnV4LWFzcGVlZC9ibG9i L21hc3Rlci9kcml2ZXJzL25ldC9mdD0KZ21hYzEwMF8yNi5jI0w0NDkKClRoZXJlJ3Mgbm90IGEg bG90IG9mIHB1YmxpYyBkb2N1bWVudGF0aW9uIG9uIHRoaXMgaGFyZHdhcmUsIGJ1dCB0aGUKY3Vy cmVudCBsaW51eCBkcml2ZXIgc2hvd3MgdGhlIG1lYW5pbmcgb2YgdGhlc2UgcmVnaXN0ZXJzOgoK aHR0cHM6Ly9naXRodWIuY29tL3RvcnZhbGRzL2xpbnV4L2Jsb2IvbWFzdGVyL2RyaXZlcnMvbmV0 L2V0aGVybmV0L2ZhcmFkYXkvPQpmdGdtYWMxMDAuYyNMMjgwLUwyODEKCiAgICAgICAgaW93cml0 ZTMyKEZUR01BQzEwMF9EQkxBQ19SWERFU19TSVpFKDIpIHwgICAvKiAyKjggYnl0ZXMgUlggZGVz Y3MgKi8KICAgICAgICAgICAgICAgICAgRlRHTUFDMTAwX0RCTEFDX1RYREVTX1NJWkUoMikgfCAg IC8qIDIqOCBieXRlcyBUWCBkZXNjcyAqLwoKV2l0aG91dCB0aGlzIHBhdGNoLCBuZXR3b3JraW5n IGluIFNNVF9YMTFfMTU4IGRvZXMgbm90IHBhc3MgZGF0YS4KClNpZ25lZC1vZmYtYnk6IEVyaWsg U21pdCA8ZXJpay5sdWNhcy5zbWl0QGdtYWlsLmNvbT4KLS0tCiBody9uZXQvZnRnbWFjMTAwLmMg fCAxNyArKysrKysrKysrKysrKystLQogMSBmaWxlIGNoYW5nZWQsIDE1IGluc2VydGlvbnMoKyks IDIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvaHcvbmV0L2Z0Z21hYzEwMC5jIGIvaHcvbmV0 L2Z0Z21hYzEwMC5jCmluZGV4IDI1ZWJlZTdlYzIuLjE2NDBiMjRiMjMgMTAwNjQ0Ci0tLSBhL2h3 L25ldC9mdGdtYWMxMDAuYworKysgYi9ody9uZXQvZnRnbWFjMTAwLmMKQEAgLTc5LDYgKzc5LDE5 IEBACiAjZGVmaW5lIEZUR01BQzEwMF9BUFRDX1RYUE9MTF9DTlQoeCkgICAgICAgICgoKHgpID4+ IDgpICYgMHhmKQogI2RlZmluZSBGVEdNQUMxMDBfQVBUQ19UWFBPTExfVElNRV9TRUwgICAgICAo MSA8PCAxMikKCisvKgorICogRE1BIGJ1cnN0IGxlbmd0aCBhbmQgYXJiaXRyYXRpb24gY29udHJv bCByZWdpc3RlcgorICovCisjZGVmaW5lIEZUR01BQzEwMF9EQkxBQ19SWEZJRk9fTFRIUih4KSAg ICAgICgoKHgpID4+IDApICYgMHg3KQorI2RlZmluZSBGVEdNQUMxMDBfREJMQUNfUlhGSUZPX0hU SFIoeCkgICAgICAoKCh4KSA+PiAzKSAmIDB4NykKKyNkZWZpbmUgRlRHTUFDMTAwX0RCTEFDX1JY X1RIUl9FTiAgICAgICAgICAgKDEgPDwgNikKKyNkZWZpbmUgRlRHTUFDMTAwX0RCTEFDX1JYQlVS U1RfU0laRSh4KSAgICAgKCgoeCkgPj4gOCkgJiAweDMpCisjZGVmaW5lIEZUR01BQzEwMF9EQkxB Q19UWEJVUlNUX1NJWkUoeCkgICAgICgoKHgpID4+IDEwKSAmIDB4MykKKyNkZWZpbmUgRlRHTUFD MTAwX0RCTEFDX1JYREVTX1NJWkUoeCkgICAgICAgKCgoeCkgPj4gMTIpICYgMHhmKQorI2RlZmlu ZSBGVEdNQUMxMDBfREJMQUNfVFhERVNfU0laRSh4KSAgICAgICAoKCh4KSA+PiAxNikgJiAweGYp CisjZGVmaW5lIEZUR01BQzEwMF9EQkxBQ19JRkdfQ05UKHgpICAgICAgICAgICgoKHgpID4+IDIw KSAmIDB4NykKKyNkZWZpbmUgRlRHTUFDMTAwX0RCTEFDX0lGR19JTkMgICAgICAgICAgICAgKDEg PDwgMjMpCisKIC8qCiAgKiBQSFkgY29udHJvbCByZWdpc3RlcgogICovCkBAIC01NTMsNyArNTY2 LDcgQEAgc3RhdGljIHZvaWQgZnRnbWFjMTAwX2RvX3R4KEZUR01BQzEwMFN0YXRlICpzLCB1aW50 MzJfdAp0eF9yaW5nLAogICAgICAgICBpZiAoYmQuZGVzMCAmIHMtPnR4ZGVzMF9lZG90cikgewog ICAgICAgICAgICAgYWRkciA9M0QgdHhfcmluZzsKICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg ICAgIGFkZHIgKz0zRCBzaXplb2YoRlRHTUFDMTAwRGVzYyk7CisgICAgICAgICAgICBhZGRyICs9 M0QgKEZUR01BQzEwMF9EQkxBQ19UWERFU19TSVpFKHMtPmRibGFjKSkgKiA4OwogICAgICAgICB9 CiAgICAgfQoKQEAgLTk4Miw3ICs5OTUsNyBAQCBzdGF0aWMgc3NpemVfdCBmdGdtYWMxMDBfcmVj ZWl2ZShOZXRDbGllbnRTdGF0ZSAqbmMsCmNvbnN0IHVpbnQ4X3QgKmJ1ZiwKICAgICAgICAgaWYg KGJkLmRlczAgJiBzLT5yeGRlczBfZWRvcnIpIHsKICAgICAgICAgICAgIGFkZHIgPTNEIHMtPnJ4 X3Jpbmc7CiAgICAgICAgIH0gZWxzZSB7Ci0gICAgICAgICAgICBhZGRyICs9M0Qgc2l6ZW9mKEZU R01BQzEwMERlc2MpOworICAgICAgICAgICAgYWRkciArPTNEIChGVEdNQUMxMDBfREJMQUNfUlhE RVNfU0laRShzLT5kYmxhYykpICogODsKICAgICAgICAgfQogICAgIH0KICAgICBzLT5yeF9kZXNj cmlwdG9yID0zRCBhZGRyOwotLQoyLjI1LjE= --0000000000004fcaa405a71cac44 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
The hardware supports variable descriptor sizes, conf= igured with the DBLAC
register.

Most drivers use the default 2*8,= which is currently hardcoded in qemu, but
the implementation of the dri= ver in Supermicro BMC SMT_X11_158 uses 4*8.

--
The implementation= of the driver in Supermicro BMC SMT_X11_158 adds 4 extra
4-bytes entrie= s:
https://github.com/ya-mouse/openwr= t-linux-aspeed/blob/master/drivers/net/ftgmac100_26.h#L387-L391

= And sets DBLAC to 0x44f97:
https://github.= com/ya-mouse/openwrt-linux-aspeed/blob/master/drivers/net/ftgmac100_26.c#L4= 49

There's not a lot of public documentation on this hardwar= e, but the
current linux driver shows the meaning of these registers:
https://github.com/torvalds/linux/bl= ob/master/drivers/net/ethernet/faraday/ftgmac100.c#L280-L281

=C2= =A0 =C2=A0 =C2=A0 =C2=A0 iowrite32(FTGMAC100_DBLAC_RXDES_SIZE(2) | =C2=A0 /= * 2*8 bytes RX descs */
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 FTGMAC100_DBLAC_TXDES_SIZE(2) | =C2=A0 /* 2*8 bytes TX descs= */

Without this patch, networking in SMT_X11_158 does not pass data= .

Signed-off-by: Erik Smit <erik.lucas.smit@gmail.com>
---
=C2=A0hw/net/ftgmac100.= c | 17 +++++++++++++++--
=C2=A01 file changed, 15 insertions(+), 2 delet= ions(-)

diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c
inde= x 25ebee7ec2..1640b24b23 100644
--- a/hw/net/ftgmac100.c
+++ b/hw/net= /ftgmac100.c
@@ -79,6 +79,19 @@
=C2=A0#define FTGMAC100_APTC_TXPOLL_C= NT(x) =C2=A0 =C2=A0 =C2=A0 =C2=A0(((x) >> 8) & 0xf)
=C2=A0#def= ine FTGMAC100_APTC_TXPOLL_TIME_SEL =C2=A0 =C2=A0 =C2=A0(1 << 12)
<= br>+/*
+ * DMA burst length and arbitration control register
+ */
= +#define FTGMAC100_DBLAC_RXFIFO_LTHR(x) =C2=A0 =C2=A0 =C2=A0(((x) >> = 0) & 0x7)
+#define FTGMAC100_DBLAC_RXFIFO_HTHR(x) =C2=A0 =C2=A0 =C2= =A0(((x) >> 3) & 0x7)
+#define FTGMAC100_DBLAC_RX_THR_EN =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (1 << 6)
+#define FTGMAC100_DBLAC_= RXBURST_SIZE(x) =C2=A0 =C2=A0 (((x) >> 8) & 0x3)
+#define FTGM= AC100_DBLAC_TXBURST_SIZE(x) =C2=A0 =C2=A0 (((x) >> 10) & 0x3)
= +#define FTGMAC100_DBLAC_RXDES_SIZE(x) =C2=A0 =C2=A0 =C2=A0 (((x) >> = 12) & 0xf)
+#define FTGMAC100_DBLAC_TXDES_SIZE(x) =C2=A0 =C2=A0 =C2= =A0 (((x) >> 16) & 0xf)
+#define FTGMAC100_DBLAC_IFG_CNT(x) = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0(((x) >> 20) & 0x7)
+#define= FTGMAC100_DBLAC_IFG_INC =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 (1 <&= lt; 23)
+
=C2=A0/*
=C2=A0 * PHY control register
=C2=A0 */
@= @ -553,7 +566,7 @@ static void ftgmac100_do_tx(FTGMAC100State *s, uint32_t = tx_ring,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (bd.des0 & s->txdes= 0_edotr) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0addr =3D tx_r= ing;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0} else {
- =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0addr +=3D sizeof(FTGMAC100Desc);
+ =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0addr +=3D (FTGMAC100_DBLAC_TXDES_SIZE(s->dbl= ac)) * 8;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 =C2=A0}
@@ -982,7 +995,7 @@ static ssize_t ftgmac100_receive(NetClientState *= nc, const uint8_t *buf,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (bd.des0 &a= mp; s->rxdes0_edorr) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0addr =3D s->rx_ring;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0} else {- =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0addr +=3D sizeof(FTGMAC100Desc)= ;
+ =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0addr +=3D (FTGMAC100_DBLAC_= RXDES_SIZE(s->dblac)) * 8;
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
=C2= =A0 =C2=A0 =C2=A0}
=C2=A0 =C2=A0 =C2=A0s->rx_descriptor =3D addr;
= --
2.25.1
--0000000000004fcaa405a71cac44--