From nobody Wed Oct 29 09:14:48 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513028233415511.06330220238556; Mon, 11 Dec 2017 13:37:13 -0800 (PST) Received: from localhost ([::1]:55564 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eOVkz-000645-OV for importer@patchew.org; Mon, 11 Dec 2017 16:37:01 -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) 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) 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) 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Needed to support latest Linux kernel driver which relies on that functionality. Cc: Peter Maydell Cc: Jason Wang Cc: Philippe Mathieu-Daud=C3=A9 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, c= onst uint8_t *buf, uint8_t *crc_ptr; unsigned int buf_len; size_t size =3D len; + bool shift16 =3D s->regs[ENET_RACC] & ENET_RACC_SHIFT16; =20 FEC_PRINTF("len %d\n", (int)size); =20 @@ -1051,6 +1052,10 @@ static ssize_t imx_enet_receive(NetClientState *nc, = const uint8_t *buf, crc =3D cpu_to_be32(crc32(~0, buf, size)); crc_ptr =3D (uint8_t *) &crc; =20 + if (shift16) { + size +=3D 2; + } + /* Huge frames are truncted. */ if (size > s->regs[ENET_FTRL]) { size =3D s->regs[ENET_FTRL]; @@ -1087,6 +1092,24 @@ static ssize_t imx_enet_receive(NetClientState *nc, = const uint8_t *buf, buf_len +=3D size - 4; } buf_addr =3D 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] =3D { 0 }; + + dma_memory_write(&address_space_memory, buf_addr, + zeros, sizeof(zeros)); + + buf_addr +=3D sizeof(zeros); + buf_len -=3D sizeof(zeros); + + /* We only do this once per Ethernet frame */ + shift16 =3D false; + } + dma_memory_write(&address_space_memory, buf_addr, buf, buf_len); buf +=3D 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) =20 +#define ENET_RACC_SHIFT16 BIT(7) + /* Buffer Descriptor. */ typedef struct { uint16_t length; --=20 2.14.3