Re: [Qemu-devel] [PATCH v5 00/10] Add Ethernet device for i.MX6 SOC

[Jason Wang <jasowang@redhat.com>]

On 2016年05月30日 14:04, Jean-Christophe DUBOIS wrote:
> Le 30/05/2016 04:19, Jason Wang a écrit :
>>
>>
>> On 2016年05月21日 16:01, Jean-Christophe Dubois wrote:
>>> 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 
>>> internet
>>>
>>> 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".
>
> This is because of commit 03dd024ff57733a55cd2e455f361d053c81b1b29 
> "hw: explicitly include qemu/log.h" that has been applied meanwhile.
>
> I'll send a new version soon.
>
> JC
>

Thanks