e1000: move e1000 pmd to drivers/net directory

PATCH In review Thomas F Herbert 2 participants 4 messages May 16, 2015 – May 18, 2015

lore

Share & tools

lore

Thomas F Herbert

author

2015-05-16 18:11 UTC #0 lore raw

PATCH v2 5/19 e1000: move e1000 pmd to drivers/net directory

On 5/15/15 11:56 AM, Bruce Richardson wrote:> Move e1000 pmd to drivers/net directory

Quoted 4 lines

As part of move, rename "e1000" subdirectory, which contains the code from the "base driver", to "base".
Signed-off-by Bruce Richardson <[email protected]>

Bruce,

Thanks!

I tried applying the series to master and everything was fine until I got to patch 5 which didn't apply. See below.

This patch for the e1000 seems extremely long. Is it trying to re-create all new files for the e1000 driver? It is 91000 lines long!!

--TFH

git apply ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_04_19__bond__Move_bonded_ethdev_pmd_to_drivers_net-20150515-1235382.txt [therbert@Fedora21 dpdk]$ git apply ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:322: trailing whitespace.

../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:325: trailing whitespace.

../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:329: trailing whitespace.

../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:339: trailing whitespace.

../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:28770: trailing whitespace.
Copyright (c) 2001-2014, Intel Corporation
error: patch failed: lib/librte_pmd_e1000/e1000/e1000_phy.c:1
error: lib/librte_pmd_e1000/e1000/e1000_phy.c: patch does not appl

Quoted 3 lines

---
  drivers/net/Makefile                           |    2 +-
  drivers/net/e1000/Makefile                     |   99 +

Signature · 4 lines

Thomas F Herbert
Principal Software Engineer
Red Hat
[email protected]

Bruce Richardson

2015-05-18 09:35 UTC #1 lore raw

Quoted 10 lines · Thomas F Herbert

On 5/15/15 11:56 AM, Bruce Richardson wrote:> Move e1000 pmd to drivers/net directory
Quoted 4 lines
As part of move, rename "e1000" subdirectory, which contains the code from the "base driver", to "base".
Signed-off-by Bruce Richardson <[email protected]>
Bruce,
Thanks!

Quoted 7 lines

I tried applying the series to master and everything was fine until I got to patch 5 which didn't apply. See below.
This patch for the e1000 seems extremely long. Is it trying to re-create all new files for the e1000 driver? It is 91000 lines long!!
--TFH

Yes, it's huge because the diff of moving a directory is to have chunks completely deleting each line of each old file and another chunk adding each line of the file in it's new location. I'm not aware of any way to avoid this hugeness of diff while doing renaming - which I think is why Thomas wanted all moves done in one go.

As for the failure to apply - I'll double check things myself and see if I need to resubmit any of the patches.

/Bruce

Quoted 28 lines

git apply ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_04_19__bond__Move_bonded_ethdev_pmd_to_drivers_net-20150515-1235382.txt [therbert@Fedora21 dpdk]$ git apply ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:322:
trailing whitespace.
../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:325:
trailing whitespace.
../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:329:
trailing whitespace.
../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:339:
trailing whitespace.
../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:28770:
trailing whitespace.
Copyright (c) 2001-2014, Intel Corporation
error: patch failed: lib/librte_pmd_e1000/e1000/e1000_phy.c:1
error: lib/librte_pmd_e1000/e1000/e1000_phy.c: patch does not appl
Quoted 3 lines
---
  drivers/net/Makefile                           |    2 +-
  drivers/net/e1000/Makefile                     |   99 +
Signature · 4 lines
Thomas F Herbert
Principal Software Engineer
Red Hat
[email protected]

Bruce Richardson

2015-05-18 10:54 UTC #2 lore raw

In reply to Thomas F Herbert

Quoted 10 lines · Thomas F Herbert

On 5/15/15 11:56 AM, Bruce Richardson wrote:> Move e1000 pmd to drivers/net directory
Quoted 4 lines
As part of move, rename "e1000" subdirectory, which contains the code from the "base driver", to "base".
Signed-off-by Bruce Richardson <[email protected]>
Bruce,
Thanks!

Quoted 7 lines

I tried applying the series to master and everything was fine until I got to patch 5 which didn't apply. See below.
This patch for the e1000 seems extremely long. Is it trying to re-create all new files for the e1000 driver? It is 91000 lines long!!
--TFH

The e1000 patch seems to apply ok to latest head in my testing. However, the base driver code for i40e has been applied which prevents patch 8 from applying.

/Bruce

Quoted 28 lines

git apply ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_04_19__bond__Move_bonded_ethdev_pmd_to_drivers_net-20150515-1235382.txt [therbert@Fedora21 dpdk]$ git apply ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:322:
trailing whitespace.
../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:325:
trailing whitespace.
../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:329:
trailing whitespace.
../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:339:
trailing whitespace.
../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:28770:
trailing whitespace.
Copyright (c) 2001-2014, Intel Corporation
error: patch failed: lib/librte_pmd_e1000/e1000/e1000_phy.c:1
error: lib/librte_pmd_e1000/e1000/e1000_phy.c: patch does not appl
Quoted 3 lines
---
  drivers/net/Makefile                           |    2 +-
  drivers/net/e1000/Makefile                     |   99 +
Signature · 4 lines
Thomas F Herbert
Principal Software Engineer
Red Hat
[email protected]

Thomas F Herbert

author

2015-05-18 15:29 UTC #3 lore raw

Quoted 8 lines · Bruce Richardson

Quoted 7 lines · Thomas F Herbert
On 5/15/15 11:56 AM, Bruce Richardson wrote:> Move e1000 pmd to drivers/net directory
Quoted 4 lines
As part of move, rename "e1000" subdirectory, which contains the code from the "base driver", to "base".
Signed-off-by Bruce Richardson <[email protected]>
Bruce,

...

Quoted 4 lines

Quoted 2 lines
--TFH
The e1000 patch seems to apply ok to latest head in my testing.

Here is more information on the failure by running git apply in verbose mode. Checking patch lib/librte_pmd_e1000/e1000/e1000_phy.c...
error: while searching for:
/*******************************************************************************

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.

2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

3. Neither the name of the Intel Corporation nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

***************************************************************************/

#include "e1000_api.h"
....

    /* Initialize function pointers */
    phy->ops.init_params = e1000_null_ops_generic;
    phy->ops.acquire = e1000_null_ops_generic;
    phy->ops.check_polarity = e1000_null_ops_generic;
    phy->ops.check_reset_block = e1000_null_ops_generic;
    phy->ops.commit = e1000_null_ops_generic;
    phy->ops.force_speed_duplex = e1000_null_ops_generic;
    phy->ops.get_cfg_done = e1000_null_ops_generic;
    phy->ops.get_cable_length = e1000_null_ops_generic;
    phy->ops.get_info = e1000_null_ops_generic;
    phy->ops.set_page = e1000_null_set_page;
    phy->ops.read_reg = e1000_null_read_reg;
    phy->ops.read_reg_locked = e1000_null_read_reg;
    phy->ops.read_reg_page = e1000_null_read_reg;
    phy->ops.release = e1000_null_phy_generic;
    phy->ops.reset = e1000_null_ops_generic;
    phy->ops.set_d0_lplu_state = e1000_null_lplu_state;
    phy->op

error: patch failed: lib/librte_pmd_e1000/e1000/e1000_phy.c:1
error: lib/librte_pmd_e1000/e1000/e1000_phy.c: patch does not apply Checking patch lib/librte_pmd_e1000/e1000/e1000_phy.h... Checking patch lib/librte_pmd_e1000/e1000/e1000_regs.h... Checking patch lib/librte_pmd_e1000/e1000/e1000_vf.c... Checking patch lib/librte_pmd_e1000/e1000/e1000_vf.h... Checking patch lib/librte_pmd_e1000/e1000_ethdev.h... Checking patch lib/librte_pmd_e1000/e1000_logs.h... Checking patch lib/librte_pmd_e1000/em_ethdev.c... Checking patch lib/librte_pmd_e1000/em_rxtx.c... Checking patch lib/librte_pmd_e1000/igb_ethdev.c... Checking patch lib/librte_pmd_e1000/igb_pf.c...
Checking patch lib/librte_pmd_e1000/igb_rxtx.c... Checking patch lib/librte_pmd_e1000/rte_pmd_e1000_version.map...

--TFH

However, the

Quoted 32 lines

base driver code for i40e has been applied which prevents patch 8 from applying.
/Bruce
Quoted 28 lines
git apply ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_04_19__bond__Move_bonded_ethdev_pmd_to_drivers_net-20150515-1235382.txt [therbert@Fedora21 dpdk]$ git apply ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt ../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:322:
trailing whitespace.
../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:325:
trailing whitespace.
../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:329:
trailing whitespace.
../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:339:
trailing whitespace.
../dpdkPatch_20150516-1241/messages/_dpdk-dev___PATCH_v2_05_19__e1000__move_e1000_pmd_to_drivers_net_directory-20150515-5498503.txt:28770:
trailing whitespace.
Copyright (c) 2001-2014, Intel Corporation
error: patch failed: lib/librte_pmd_e1000/e1000/e1000_phy.c:1
error: lib/librte_pmd_e1000/e1000/e1000_phy.c: patch does not appl
Quoted 3 lines
---
   drivers/net/Makefile                           |    2 +-
   drivers/net/e1000/Makefile                     |   99 +
--
Thomas F Herbert
Principal Software Engineer
Red Hat
[email protected]

Signature · 6 lines

Thomas F Herbert
Principal Software Engineer
Red Hat
[email protected]
Office: 919-301-3295
Mobile: 804-741-2695