From patchwork Mon Oct 23 20:10:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10023013 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 0B003603D7 for ; Mon, 23 Oct 2017 20:13:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F27D028938 for ; Mon, 23 Oct 2017 20:13:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E76992893D; Mon, 23 Oct 2017 20:13:36 +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 9810928938 for ; Mon, 23 Oct 2017 20:13:36 +0000 (UTC) Received: from localhost ([::1]:40379 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6j6N-0000zL-Oh for patchwork-qemu-devel@patchwork.kernel.org; Mon, 23 Oct 2017 16:13:35 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6j4F-00009c-IA for qemu-devel@nongnu.org; Mon, 23 Oct 2017 16:11:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e6j4E-0002Th-ON for qemu-devel@nongnu.org; Mon, 23 Oct 2017 16:11:23 -0400 Received: from mail-pf0-x244.google.com ([2607:f8b0:400e:c00::244]:54026) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e6j4C-0002Rj-AW; Mon, 23 Oct 2017 16:11:20 -0400 Received: by mail-pf0-x244.google.com with SMTP id t188so17914558pfd.10; Mon, 23 Oct 2017 13:11:20 -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=IQA5dkdKn2TG6wtuWODAbzVgGBinDJWGHrh8+bbZnfo=; b=Ps1cnZ0gxt3HxidCvPZn2TCQbCgiwF/MfuCpTuP+IpBsTmBWKd7eGFiWBK5tjkdyCs RO3F8co5WFQLl3FDGLpCUAiFlIQTP0zgYS4z3dgwcdaQXrTka+nrkcDh1AAnjIJop8ov 9b0nHN6MZ4ZYPh7f442ayNoxrHwd9Cy6sMhfAIq8wOcrOYr+g9aRomsg5ItJMi7Sdrtg NIrXzsw/UwXUWTQ6KhD8ioQbPJIljxYwoYGhvFgXFGH6yc0bKsG9WeI+FlKU53SM2x/W BpNJ1oXc5MhOYoLsSlhSbLFXq9VxoBM4dKJg55c4htRQwJTaPXTeaPkBRP9VtZH2/tMv 7aSw== 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=IQA5dkdKn2TG6wtuWODAbzVgGBinDJWGHrh8+bbZnfo=; b=q6ePLSg9KK7Xm3IsVKGavDy1U/z/9JBHlax1JdiAyb0h5/6KgOfGOq1rI1JjmwEIbf nLFprp6g7g9eJfdKRrVYKIULcnLy7t1Q9MbVKxEgFpsl7B/V/A+j658NmIzjx4Pa5eT1 Tt94J1/EOTGsNdsbvYJPjqln/6JqOwlc09KwZ9dIKZuYZVOuWD0PXXpi6CA8sRDbMIr7 pCftD6JWASdSLHiXmmMo8xtrGN0jNjNaO0V4O8SOAKgsrSibskSO7oFBN2uGoNS5wdMz K7WkU+n+GqavpWxXd2h63cVKe98y5XK4i1wZFEDazT0pZ6M0po1K+I9un+tzA1VweUdG n+NQ== X-Gm-Message-State: AMCzsaW9ZdLIctixcHgn2ndrgSCnChWtXlwCD1h8oMIPXwSpdIPdihaW 1ZESDNwP5PwejMA/oLFEhA19Exi+ X-Google-Smtp-Source: ABhQp+TNzXj21lJKTKpOHW97Ku7dF3E9HSyLfjhqvNJWVbQ316Cos9ao7Z/z2wUvQlcOlrlr0B2AnQ== X-Received: by 10.99.116.19 with SMTP id p19mr13176133pgc.47.1508789479246; Mon, 23 Oct 2017 13:11:19 -0700 (PDT) Received: from squirtle.westlake.spaceflightindustries.com ([173.226.206.194]) by smtp.gmail.com with ESMTPSA id j1sm15181623pfj.108.2017.10.23.13.11.18 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Oct 2017 13:11:18 -0700 (PDT) From: Andrey Smirnov To: qemu-arm@nongnu.org Date: Mon, 23 Oct 2017 13:10:32 -0700 Message-Id: <20171023201055.21973-5-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171023201055.21973-1-andrew.smirnov@gmail.com> References: <20171023201055.21973-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 04/27] 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)