From patchwork Mon Dec 11 21:30:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 10105803 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 508CD60751 for ; Mon, 11 Dec 2017 21:36:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4AFEC29912 for ; Mon, 11 Dec 2017 21:36:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F5E229919; Mon, 11 Dec 2017 21:36:33 +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 BA18429912 for ; Mon, 11 Dec 2017 21:36:32 +0000 (UTC) Received: from localhost ([::1]:55564 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOVkV-000645-S7 for patchwork-qemu-devel@patchwork.kernel.org; Mon, 11 Dec 2017 16:36:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35815) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOVfA-0000oZ-8N for qemu-devel@nongnu.org; Mon, 11 Dec 2017 16:31:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eOVf9-0004Jq-7p for qemu-devel@nongnu.org; Mon, 11 Dec 2017 16:31:00 -0500 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]:42787) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eOVf6-00048u-FR; Mon, 11 Dec 2017 16:30:56 -0500 Received: by mail-pf0-x241.google.com with SMTP id d23so12532175pfe.9; Mon, 11 Dec 2017 13:30:56 -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=E08NgLB+iZxe+FQ8+m6OK1RQdn04+8BR1I1ixtM1hXU=; b=MBXbYmB2pfKASG2jZrIOeB4DG8GKRpvbZTi51fpzPemSzeHcolYbn3h8HkwqEbnhi4 RPNW5c0Vhv9mMDLXSXqNN0EwiZ2QvFN5XN2EYOtAmEmK5UuIwozmgsIsaOvytRga3KMX BN1bjgRbk/7VBvmNrm5c0NHuFvyAjmIKhBi2vDaM4lP1bQDuaxpvNCvJX65cQW3Yoddn vOZcIyZZHY6WLwR0I6TeP9VV3RDZa3/gTWciLj2H7718KDWxQXGTpmlqg/ufQGI209O7 bhzrmF2HOgTC+GyZ6Bf39M0b+G08jod4UcQ7Gf5iIQ1AdZwC+DNF9MIySfucY1pubtHt BcBQ== 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=E08NgLB+iZxe+FQ8+m6OK1RQdn04+8BR1I1ixtM1hXU=; b=KdP/HB59QEEoEdGwZj9HMybjOMWoU5DoxWLCCNO0rr1IiV39eXQ97JQtRppx22e0LD O81Svmh89YePe0VHT+c8dw8gYkojv/BnC5pn4fShkVi98tYdauETugmJ5TKe5kJUZ0W+ lew6YbiznLYulGGO+XQtvBG1uoHAE3AWBuVPwLZzpPGJPmPgckceF+bBc71zib8pi083 Qvt8xdA4VpYevvUvulPCOFgAPA4F8Gpw3Yc5ieEdyv0WV9H0AzEcyjsbOMPSj1HJegKJ jtoS6PLhSyF9g5gZ22tEU85z31KebNps0G0S20pgcZFjyU/wHO1sT8U8vn1QBkxTwEvu OrHg== X-Gm-Message-State: AKGB3mL6UEm2ZveKS+PsdoS7bN/UwRcYhxZj2bS4MagvYwPEo4+QNpQE /bgRtVEiPt2FtUNSy3OwX/cybOLe X-Google-Smtp-Source: ACJfBosBOHCbS2fQhX0PkFg+6wvkUg3Y3uVkY7SejakY8wCUwGizRYu1olGB28Pu65UA445+PnTu/g== X-Received: by 10.159.253.144 with SMTP id q16mr1714601pls.104.1513027855146; Mon, 11 Dec 2017 13:30:55 -0800 (PST) Received: from squirtle.westlake.spaceflightindustries.com ([173.226.206.194]) by smtp.gmail.com with ESMTPSA id q10sm25359690pgc.84.2017.12.11.13.30.54 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Dec 2017 13:30:54 -0800 (PST) From: Andrey Smirnov To: qemu-arm@nongnu.org Date: Mon, 11 Dec 2017 13:30:01 -0800 Message-Id: <20171211213007.7353-8-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171211213007.7353-1-andrew.smirnov@gmail.com> References: <20171211213007.7353-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::241 Subject: [Qemu-devel] [PATCH 07/13] 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 6feda18742..825c879a28 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 a390d704a6..af0840a0fa 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;