From patchwork Mon Nov 6 15:47:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10043751 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 33E98603FF for ; Mon, 6 Nov 2017 15:52:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BA4C29C88 for ; Mon, 6 Nov 2017 15:52:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1090229E0C; Mon, 6 Nov 2017 15:52:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8304429E07 for ; Mon, 6 Nov 2017 15:52:55 +0000 (UTC) Received: from localhost ([::1]:48779 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBjhm-0001BH-Nz for patchwork-qemu-devel@patchwork.kernel.org; Mon, 06 Nov 2017 10:52:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33360) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eBjdc-000720-HX for qemu-devel@nongnu.org; Mon, 06 Nov 2017 10:48:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eBjdb-0000PJ-MW for qemu-devel@nongnu.org; Mon, 06 Nov 2017 10:48:36 -0500 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]:45189) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eBjdZ-0000N9-Cw; Mon, 06 Nov 2017 10:48:33 -0500 Received: by mail-pg0-x241.google.com with SMTP id b192so8515659pga.2; Mon, 06 Nov 2017 07:48:33 -0800 (PST) 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=P9EQP+u+vNQBVnrsWrC2coZt+UETAIa48JorqpJmjA4=; b=H/7vWcgq7esG5XEmmxB9vKZnmyjTbEvZkYKbyGcPnfefKkyFLV0+GRTXz35ekFO0jQ /4GqHFBWhN5vTYC1roTaSQcNLwve0LvoW+DC/Gyua67W6ROSUDzETUw79lBWCtTerEat t0bW/1xhoOYDB1UD0BGfy1s4lO1AILdac4abhXEgAcN5NwAcljf/oVB0xyAdkgirPkbb 3yrpsYWwY6T422xB6qCKRP1A3xLQEyEspRz/j52EOE9shBsyGi8pIKOi4jf9Z27ccie3 DhffraxKQySd9KEPFtVDWWOoMQJc4BRbM1/BZQ0K8w8VndmiMbExRxzWxgtm1N4Y30IY 6A+A== 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=P9EQP+u+vNQBVnrsWrC2coZt+UETAIa48JorqpJmjA4=; b=i/9aMoPdy87omKk4RkFBDjbmoEeqV6AAawvCxtfXP0CVAPZd+84f8G8GWlcu9ED9Yg NLKmNYXICX0gnNQ54r/S4urzurMo2osiDPbiHyxJG/GC4QnuUC7k/NOlD4z2WuWXEXtx uprMMCLK1baEIDGeFmqTVDjQzy5FQBL98AaGIXd5Q4+IGWK8+lD0hNozegpfB2J1ckdg 8pG5pzZZE3Q7Fsh0tWNc5OgBjFu0DLjz2AVBLkPoGlHbTzIHmdwqWtZJ9RQG+csIrLFm jwobOCjNnCAIPK0D0dLP3z/gLaCMIPigBS/ZwFPPQJgCggDdJhUZpsP90seZ1wOw7QK7 PsCw== X-Gm-Message-State: AMCzsaXBm2YDjqDbOlE7eW13Lc9BKo7s5d9lppvfjE3iVVXs2epI7RZ3 xJv5TXfOXhRfdnlAAyLWxZ0pD4T50IQ= X-Google-Smtp-Source: ABhQp+R6tdK1pcuHredmFFKnsDWHUWE1xdzD/XIcVNNegi7ogINuHLhF0935iz1HxTFe3tYTapsKZA== X-Received: by 10.98.198.138 with SMTP id x10mr17118904pfk.55.1509983312144; Mon, 06 Nov 2017 07:48:32 -0800 (PST) Received: from squirtle.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id x1sm22719590pfh.113.2017.11.06.07.48.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Nov 2017 07:48:31 -0800 (PST) From: Andrey Smirnov To: qemu-arm@nongnu.org Date: Mon, 6 Nov 2017 07:47:47 -0800 Message-Id: <20171106154813.19936-5-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171106154813.19936-1-andrew.smirnov@gmail.com> References: <20171106154813.19936-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c05::241 Subject: [Qemu-devel] [PATCH v3 04/30] imx_fec: Use ENET_FTRL to determine truncation length X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Andrey Smirnov , Jason Wang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, yurovsky@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Frame truncation length, TRUNC_FL, is determined by the contents of ENET_FTRL register, so convert the code to use it instead of a hardcoded constant. To avoid the case where TRUNC_FL is greater that ENET_MAX_FRAME_SIZE, increase the value of the latter to its theoretical maximum of 16K. Cc: Peter Maydell Cc: Jason Wang Cc: Philippe Mathieu-Daudé Cc: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Cc: yurovsky@gmail.com Signed-off-by: Andrey Smirnov --- hw/net/imx_fec.c | 4 ++-- include/hw/net/imx_fec.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index eb034ffd0c..dda0816fb3 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -1052,8 +1052,8 @@ static ssize_t imx_enet_receive(NetClientState *nc, const uint8_t *buf, crc_ptr = (uint8_t *) &crc; /* Huge frames are truncted. */ - if (size > ENET_MAX_FRAME_SIZE) { - size = ENET_MAX_FRAME_SIZE; + if (size > s->regs[ENET_FTRL]) { + size = s->regs[ENET_FTRL]; flags |= ENET_BD_TR | ENET_BD_LG; } diff --git a/include/hw/net/imx_fec.h b/include/hw/net/imx_fec.h index 4bc8f03ec2..0fcc4f0c71 100644 --- a/include/hw/net/imx_fec.h +++ b/include/hw/net/imx_fec.h @@ -86,7 +86,6 @@ #define ENET_TCCR3 393 #define ENET_MAX 400 -#define ENET_MAX_FRAME_SIZE 2032 /* EIR and EIMR */ #define ENET_INT_HB (1 << 31) @@ -155,6 +154,8 @@ #define ENET_RCR_NLC (1 << 30) #define ENET_RCR_GRS (1 << 31) +#define ENET_MAX_FRAME_SIZE (1 << ENET_RCR_MAX_FL_LENGTH) + /* TCR */ #define ENET_TCR_GTS (1 << 0) #define ENET_TCR_FDEN (1 << 2)