From patchwork Mon Oct 23 20:10:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10023017 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 BAF8B603D7 for ; Mon, 23 Oct 2017 20:16:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ABF7A2893E for ; Mon, 23 Oct 2017 20:16:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E17F28946; Mon, 23 Oct 2017 20:16:16 +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 145BC2893E for ; Mon, 23 Oct 2017 20:16:16 +0000 (UTC) Received: from localhost ([::1]:40391 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6j8x-0003Fx-7S for patchwork-qemu-devel@patchwork.kernel.org; Mon, 23 Oct 2017 16:16:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46175) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e6j4H-0000Cc-KY for qemu-devel@nongnu.org; Mon, 23 Oct 2017 16:11:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e6j4G-0002Uf-HZ for qemu-devel@nongnu.org; Mon, 23 Oct 2017 16:11:25 -0400 Received: from mail-pg0-x242.google.com ([2607:f8b0:400e:c05::242]:47826) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e6j4E-0002T7-AN; Mon, 23 Oct 2017 16:11:22 -0400 Received: by mail-pg0-x242.google.com with SMTP id r25so12629885pgn.4; Mon, 23 Oct 2017 13:11:22 -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=uYdPAHXlUYZEXoWG1xtc+4tWTdMDFGtaZFeA++rHdBk=; b=AsCWyZK9kDkRkGIM6e9zdlx6Ohaqlq/VEh6SKKDKYRJz0JhmuRoN9lzklg1A+qDJ36 vr8v5zOdjcIUL+wiN9w+NpslkmXOv/LJlZUgZtNBqHsDvhSwQpz1fnueUGxAkvy8a968 0Bb2s+Rl36Y+5kj4a1U04acuN12cwlFX8rNFbko7jeT13ARdPjYEGGdiH3eU9RPqbA3H PlUuAigS94SyIwVjBLDYHPma3SZ95nP5IPZQ+iXb08o2+hIlP1QYouiqw4mNH4ggN3Oj 5gGDgqidcN+QuWxVsC2pJ+CqaOoybb0DtFH4/7VfjtF+9vKi17Lyaw3vyDmom3K01dD+ kvkw== 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=uYdPAHXlUYZEXoWG1xtc+4tWTdMDFGtaZFeA++rHdBk=; b=KssqgRcUTTnr+oYavVNmYP3nW2Adb0zeG8FA96TG/KQ597Nv+4VYrHWjxuVOBp4z+L jtdJTM9itMNrGkEZ/rW54eElGqpHaLifT5nkj859UoOSwvRlcAwkhD/UaXJ3lmIjjBQQ 20vy8oSPvPbhQCXzGVYgSCIpxUJ6GC06h4//y5XRyqBN9+HdVtL+/lC8QuYQ0RDVGW1d ZXF9Ng0uOvMutbdeZf+KMZtZeDAY7Cg0xpHlyyD4QubicLL+F0AOQkjttBA46m1ANhqC K3N+LYqTZzZc+xtDHIRGrrt2MozSQ1qjgECgUR8tLIjR6ncoGox7+ShXGEUeW78oN8hi ivPA== X-Gm-Message-State: AMCzsaWmqV0ssUH2eydl8/bYjHiegOZ3AVR99BRF3wTAOFoIu+m2QH8b L8pKF+2xQniyLyX7n2BJwS2MMM3l X-Google-Smtp-Source: ABhQp+TfBmDG0lhlBxJsc3OPu9t2rWY0x7iAwOjh6CtS0fEyyc0PjfUJd2HAOHFrgezRoSpQzsDwLQ== X-Received: by 10.99.97.139 with SMTP id v133mr12104183pgb.300.1508789481181; Mon, 23 Oct 2017 13:11:21 -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.20 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 23 Oct 2017 13:11:20 -0700 (PDT) From: Andrey Smirnov To: qemu-arm@nongnu.org Date: Mon, 23 Oct 2017 13:10:34 -0700 Message-Id: <20171023201055.21973-7-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:c05::242 Subject: [Qemu-devel] [PATCH v2 06/27] imx_fec: Emulate SHIFT16 in ENETx_RACC 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 Needed to support latest Linux kernel driver which relies on that functionality. Cc: Peter Maydell Cc: Jason Wang Cc: Philippe Mathieu-Daudé Cc: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Cc: yurovsky@gmail.com Reviewed-by: Peter Maydell Signed-off-by: Andrey Smirnov --- hw/net/imx_fec.c | 23 +++++++++++++++++++++++ include/hw/net/imx_fec.h | 2 ++ 2 files changed, 25 insertions(+) diff --git a/hw/net/imx_fec.c b/hw/net/imx_fec.c index 18de508e8c..131e7fd734 100644 --- a/hw/net/imx_fec.c +++ b/hw/net/imx_fec.c @@ -1037,6 +1037,7 @@ static ssize_t imx_enet_receive(NetClientState *nc, const uint8_t *buf, uint8_t *crc_ptr; unsigned int buf_len; size_t size = len; + bool shift16 = s->regs[ENET_RACC] & ENET_RACC_SHIFT16; FEC_PRINTF("len %d\n", (int)size); @@ -1051,6 +1052,10 @@ static ssize_t imx_enet_receive(NetClientState *nc, const uint8_t *buf, crc = cpu_to_be32(crc32(~0, buf, size)); crc_ptr = (uint8_t *) &crc; + if (shift16) { + size += 2; + } + /* Huge frames are truncted. */ if (size > s->regs[ENET_FTRL]) { size = s->regs[ENET_FTRL]; @@ -1087,6 +1092,24 @@ static ssize_t imx_enet_receive(NetClientState *nc, const uint8_t *buf, buf_len += size - 4; } buf_addr = bd.data; + + if (shift16) { + /* + * If SHIFT16 bit of ENETx_RACC register is set we need to + * align the payload to 4-byte boundary. + */ + const uint8_t zeros[2] = { 0 }; + + dma_memory_write(&address_space_memory, buf_addr, + zeros, sizeof(zeros)); + + buf_addr += sizeof(zeros); + buf_len -= sizeof(zeros); + + /* We only do this once per Ethernet frame */ + shift16 = false; + } + dma_memory_write(&address_space_memory, buf_addr, buf, buf_len); buf += buf_len; if (size < 4) { diff --git a/include/hw/net/imx_fec.h b/include/hw/net/imx_fec.h index 0fcc4f0c71..e482d1c13b 100644 --- a/include/hw/net/imx_fec.h +++ b/include/hw/net/imx_fec.h @@ -170,6 +170,8 @@ #define ENET_TWFR_TFWR_LENGTH (6) #define ENET_TWFR_STRFWD (1 << 8) +#define ENET_RACC_SHIFT16 BIT(7) + /* Buffer Descriptor. */ typedef struct { uint16_t length;