From patchwork Thu Dec 14 14:52:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10112379 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 9922C6019C for ; Thu, 14 Dec 2017 14:55:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 89A8028E1D for ; Thu, 14 Dec 2017 14:55:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7DD8628E98; Thu, 14 Dec 2017 14:55:41 +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 00C4A28E1D for ; Thu, 14 Dec 2017 14:55:40 +0000 (UTC) Received: from localhost ([::1]:41374 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePUvE-0003I1-6C for patchwork-qemu-devel@patchwork.kernel.org; Thu, 14 Dec 2017 09:55:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePUtA-0001TJ-B2 for qemu-devel@nongnu.org; Thu, 14 Dec 2017 09:53:33 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePUt8-0000UZ-OQ for qemu-devel@nongnu.org; Thu, 14 Dec 2017 09:53:32 -0500 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:41641) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePUt5-0000N0-1E; Thu, 14 Dec 2017 09:53:27 -0500 Received: by mail-pf0-x244.google.com with SMTP id j28so3763294pfk.8; Thu, 14 Dec 2017 06:53:26 -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=kMa8TkEq3z2Qro3C9PTAL2M+BRkC3wXbaQ/oArzF9YE=; b=Z/y+rmMY6Om7+dzLEqIq3dDatdl3V5YwA1P+0woypwiH6tKqOxoGItoQxAOqEPYnVZ PGMIQwDjaRkeWm0VpDZbAfh1xf9LIWIny1r+oxumM8ZxEbyCSevEneU05Xjsb9i5otuC mvumptJdvtIL3+J+Q9y0c8ObPH/YXWpGdB+XPSDkuJwsHI6zQ7X6cEi+gquIOqhpUaVH PdBSCvub+4jO+DWiU0fL29WWMQx1eiBBy27azjB1JEDzbHolNAxX+wKKXwNKJfcGF+PX 3kPD6oWkNgQYSFaVVB9VNLjGyNiJf2tJTFX807QFLWkpI/UtU7kx4aU1sXyCnwh7khGU 58uQ== 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=kMa8TkEq3z2Qro3C9PTAL2M+BRkC3wXbaQ/oArzF9YE=; b=rqWeEfg7JFXmGK9HLRQ54D5ZIJZUTNdW0MmbKHTyBOxam9EPfD4ZPe+vaSQsZDMko3 0TEs+kj/aMKd+l9f6nEydDz5T/D+XaMszYfJ2Q7SH1KKiGSvzt0SRSvrFqNFIrTDp9YM 1cW5mG3wd2Ii3aSewLaJX74N61QQwKHlM4VDUEL++rJ9doblg1sTJBcDVBvX6nDkASFd AMJeBFStJiaFZSnuzYIlui0eDxPqOsTfK9R7pBHFy/SZ/76o+KR1eg53xCFTwCQezN0S m2TrrgE5ouZAJYKHF3GEvSKztGyNA0vazj0xUToVJVCqqWYsf6fX2pCt61GNvUj8Y0RE sQiQ== X-Gm-Message-State: AKGB3mJEEPgKxTSazS7woNv9+7bS93pJjRR4xxnvDHolne9MPOMs70r1 jOzLwPsQZ8N/yvFTNaeDO+T3YN7x X-Google-Smtp-Source: ACJfBouPAJOpKKuKJIWAtDCmvysPcNfNxcHKRouDN1J+7Ii85bFaCJTc6RAxskpg01LEcTgCcUJvBg== X-Received: by 10.159.207.136 with SMTP id z8mr9924843plo.223.1513263205697; Thu, 14 Dec 2017 06:53:25 -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 e7sm8757439pfj.44.2017.12.14.06.53.24 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Dec 2017 06:53:24 -0800 (PST) From: Andrey Smirnov To: qemu-arm@nongnu.org Date: Thu, 14 Dec 2017 06:52:45 -0800 Message-Id: <20171214145255.31545-6-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171214145255.31545-1-andrew.smirnov@gmail.com> References: <20171214145255.31545-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:c00::244 Subject: [Qemu-devel] [PATCH v2 05/15] 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 56cb72273c..50da91bf9e 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 67993870a2..a390d704a6 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)