From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7CoL-0007Jk-V6 for qemu-devel@nongnu.org; Sun, 29 May 2016 22:20:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b7CoF-0007OP-Va for qemu-devel@nongnu.org; Sun, 29 May 2016 22:20:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48704) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b7CoF-0007OJ-Pi for qemu-devel@nongnu.org; Sun, 29 May 2016 22:20:03 -0400 References: From: Jason Wang Message-ID: <574BA34C.8090007@redhat.com> Date: Mon, 30 May 2016 10:19:56 +0800 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v5 00/10] Add Ethernet device for i.MX6 SOC List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Jean-Christophe Dubois , qemu-devel@nongnu.org, peter.maydell@linaro.org On 2016=E5=B9=B405=E6=9C=8821=E6=97=A5 16:01, Jean-Christophe Dubois wrot= e: > This patch series adds Gb ENET Ethernet device to the i.MX6 SOC. > > The ENET device is an evolution of the FEC device present on the i.MX25= SOC > and is backward compatible with it. > > Therefore the ENET support has been added to the actual Qemu FEC device= ( > rather than adding a new device). > > The Patch has been tested by: > * Booting linux on i.MX25 PDK board emulation and accessing internet > * Booting linux on i.MX6 Sabrelite board emulation and accessing inte= rnet > > Jean-Christophe Dubois (10): > net: improve UDP/TCP checksum computation. > net: handle optional VLAN header in checksum computation. > i.MX: Fix FEC code for MDIO operation selection > i.MX: Fix FEC code for MDIO address selection > i.MX: Fix FEC code for ECR register reset value. > i.MX: reset TX/RX descriptors when FEC is disabled. > i.MX: Rename i.MX FEC defines to ENET_XXX > i.MX: move FEC device to a register array structure. > Add ENET/Gbps Ethernet support to FEC device > Add ENET device to i.MX6 SOC. > > hw/arm/fsl-imx25.c | 1 + > hw/arm/fsl-imx6.c | 17 + > hw/net/imx_fec.c | 1009 ++++++++++++++++++++++++++++++++++--= --------- > include/hw/arm/fsl-imx6.h | 6 +- > include/hw/net/imx_fec.h | 250 ++++++++--- > net/checksum.c | 121 ++++-- > 6 files changed, 1077 insertions(+), 327 deletions(-) > Want to merge this, but I get: Applying: net: improve UDP/TCP checksum computation. Applying: net: handle optional VLAN header in checksum computation. Applying: i.MX: Fix FEC code for MDIO operation selection Applying: i.MX: Fix FEC code for MDIO address selection Applying: i.MX: Fix FEC code for ECR register reset value. Applying: i.MX: reset TX/RX descriptors when FEC is disabled. Applying: i.MX: Rename i.MX FEC defines to ENET_XXX Applying: i.MX: move FEC device to a register array structure. Applying: Add ENET/Gbps Ethernet support to FEC device error: patch failed: hw/net/imx_fec.c:24 error: hw/net/imx_fec.c: patch does not apply Patch failed at 0009 Add ENET/Gbps Ethernet support to FEC device The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort".