From nobody Fri Dec 19 04:27:36 2025 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=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1592302144; cv=none; d=zohomail.com; s=zohoarc; b=FUDqprbqN1W9bsAZCiB2xs60k0Z/Oou02o/1JmzxTBKO1OXlW9au15pRD8+i09DE+LygjL3B7VizZTPsvb9c8CYHKfju+VCqG/Q/ezbMwIQOZsNACEwCrIkbmkuEjYvhoQIMix+cWCB6Kqc6HxXkWl/iYzyDsyeYDRYmwI8qmP8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592302144; h=Content-Type:Content-Transfer-Encoding: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=yduhvPOTRr0xD1KiT4dgO2ixrWMeq+0pzSllB8kMbEw=; b=b5XP+cy9O2htRMhhEvYb+Y2i7tb5bSeqcPzC4UoPRhSGBt303wAgHivxZUhDigTWcvuPmPbHTQAv0CP6Hrj6RKE5BLepjOiMeVBgBe7gTcjOpXIRfC2gMkIP2eaF+fcUpck8xlRLH05job7f3b5UUEAkV+FUS9mjFK1NKHNmWmw= 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 1592302144107581.9286951358397; Tue, 16 Jun 2020 03:09:04 -0700 (PDT) Received: from localhost ([::1]:54918 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jl8Wc-00005K-Ql for importer@patchew.org; Tue, 16 Jun 2020 06:09:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jl8LU-0007f0-1B for qemu-devel@nongnu.org; Tue, 16 Jun 2020 05:57:32 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:42488) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jl8LR-00043f-8d for qemu-devel@nongnu.org; Tue, 16 Jun 2020 05:57:31 -0400 Received: by mail-wr1-x441.google.com with SMTP id p5so20053200wrw.9 for ; Tue, 16 Jun 2020 02:57:28 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id z12sm31090851wrg.9.2020.06.16.02.57.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jun 2020 02:57:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=yduhvPOTRr0xD1KiT4dgO2ixrWMeq+0pzSllB8kMbEw=; b=jYHgX7pTOZl4iCEkbnYYnqA9HgUP+QDTC2ptOZVy+F6EXu9UBK+EY5nAg9poEPdbc4 cZiEgDNw47LDlXCutzIjPhoM2zdEBGyy8EGnMIXCRoEl4ekUXr44tHFdBvidZnehhW55 eOIfPb4PgZ/jctnF6zf2VneiMwfC8T+fwiLGgf0UaOCUvJ8+eyazgasT0s4hT/ajtJ4c MmefqThn4MM4geHSIXETSybhWJ6lr0tHSVeo4M/wXkPz1O/mN63mDHyYBsZtyv4wuBQO 9yDb0X92pg1KxciNp1rdbFb7akwbmHQqDRwECLTbNqWFBdlWZOy6M5YxytXao4tn8/I1 AHaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yduhvPOTRr0xD1KiT4dgO2ixrWMeq+0pzSllB8kMbEw=; b=K0CwDN+3YOPapmMqteZzfDgNv7Hz41JgHtEfibSHajUpjmOOHLpNsoDkcxL5Qrlvrn nsbvpSXBYRKjetN7Pt8UuwpqhuSCzs51q2+3rEMPqmceE45YaJCqYP9D+Tkblp5fdtzH dU+03qUGwQxEIBBq/U5G2YDPNTajk1auWWQZzsNSQdfKr5kPyI8XXh6DxmpVF5XqoJWj ftuaqnla+JIjCfeHtckepXg4PM2cKLS0yvQ78Tvj80H4ZS2FKC1yQ+RySLI1ansrutql or94JNBaD4KHKbYNxfY/Jfx+0H4ALkHXswF+WWRLqv83prwVGkIGxoGf9b1taPmiUtVu 1aAA== X-Gm-Message-State: AOAM530GKfXOPau7IDmlfLxYnhcdo4+TTerXLMMUHndGla/fBYl+XWE1 stv107sWmcusV7wuAE7dNM2GMAXcY6Htkw== X-Google-Smtp-Source: ABdhPJxOleU28xiGnGk+uPGai4j20JVuL74C7F32TqkCBDilMjMqknZHeXQ7y0wWJGnv57U/HETg1Q== X-Received: by 2002:adf:f251:: with SMTP id b17mr2071029wrp.289.1592301447640; Tue, 16 Jun 2020 02:57:27 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 19/23] Implement configurable descriptor size in ftgmac100 Date: Tue, 16 Jun 2020 10:56:58 +0100 Message-Id: <20200616095702.25848-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200616095702.25848-1-peter.maydell@linaro.org> References: <20200616095702.25848-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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::441; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x441.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @linaro.org) From: Erik Smit The hardware supports configurable descriptor sizes, configured in the DBLAC register. Most drivers use the default 4 word descriptor, which is currently hardcode= d, but Aspeed SDK configures 8 words to store extra data. Signed-off-by: Erik Smit Reviewed-by: C=C3=A9dric Le Goater [PMM: removed unnecessary parens] Signed-off-by: Peter Maydell --- hw/net/ftgmac100.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/hw/net/ftgmac100.c b/hw/net/ftgmac100.c index 25ebee7ec2b..043ba61b864 100644 --- a/hw/net/ftgmac100.c +++ b/hw/net/ftgmac100.c @@ -79,6 +79,16 @@ #define FTGMAC100_APTC_TXPOLL_CNT(x) (((x) >> 8) & 0xf) #define FTGMAC100_APTC_TXPOLL_TIME_SEL (1 << 12) =20 +/* + * DMA burst length and arbitration control register + */ +#define FTGMAC100_DBLAC_RXBURST_SIZE(x) (((x) >> 8) & 0x3) +#define FTGMAC100_DBLAC_TXBURST_SIZE(x) (((x) >> 10) & 0x3) +#define FTGMAC100_DBLAC_RXDES_SIZE(x) ((((x) >> 12) & 0xf) * 8) +#define FTGMAC100_DBLAC_TXDES_SIZE(x) ((((x) >> 16) & 0xf) * 8) +#define FTGMAC100_DBLAC_IFG_CNT(x) (((x) >> 20) & 0x7) +#define FTGMAC100_DBLAC_IFG_INC (1 << 23) + /* * PHY control register */ @@ -553,7 +563,7 @@ static void ftgmac100_do_tx(FTGMAC100State *s, uint32_t= tx_ring, if (bd.des0 & s->txdes0_edotr) { addr =3D tx_ring; } else { - addr +=3D sizeof(FTGMAC100Desc); + addr +=3D FTGMAC100_DBLAC_TXDES_SIZE(s->dblac); } } =20 @@ -800,6 +810,18 @@ static void ftgmac100_write(void *opaque, hwaddr addr, s->phydata =3D value & 0xffff; break; case FTGMAC100_DBLAC: /* DMA Burst Length and Arbitration Control */ + if (FTGMAC100_DBLAC_TXDES_SIZE(s->dblac) < sizeof(FTGMAC100Desc)) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: transmit descriptor too small : %d bytes\n", + __func__, FTGMAC100_DBLAC_TXDES_SIZE(s->dblac)); + break; + } + if (FTGMAC100_DBLAC_RXDES_SIZE(s->dblac) < sizeof(FTGMAC100Desc)) { + qemu_log_mask(LOG_GUEST_ERROR, + "%s: receive descriptor too small : %d bytes\n", + __func__, FTGMAC100_DBLAC_RXDES_SIZE(s->dblac)); + break; + } s->dblac =3D value; break; case FTGMAC100_REVR: /* Feature Register */ @@ -982,7 +1004,7 @@ static ssize_t ftgmac100_receive(NetClientState *nc, c= onst uint8_t *buf, if (bd.des0 & s->rxdes0_edorr) { addr =3D s->rx_ring; } else { - addr +=3D sizeof(FTGMAC100Desc); + addr +=3D FTGMAC100_DBLAC_RXDES_SIZE(s->dblac); } } s->rx_descriptor =3D addr; --=20 2.20.1