mbox series

[net-next,v3,00/13] : Move Siena into a separate subdirectory

Message ID 165165052672.13116.6437319692346674708.stgit@palantir17.mph.net (mailing list archive)
Headers show
Series : Move Siena into a separate subdirectory | expand

Message

Martin Habets May 4, 2022, 7:49 a.m. UTC
The Siena NICs (SFN5000 and SFN6000 series) went EOL in November 2021.
Most of these adapters have been remove from our test labs, and testing
has been reduced to a minimum.

This patch series creates a separate kernel module for the Siena architecture,
analogous to what was done for Falcon some years ago.
This reduces our maintenance for the sfc.ko module, and allows us to
enhance the EF10 and EF100 drivers without the risk of breaking Siena NICs.

After this series further enhancements are needed to differentiate the
new kernel module from sfc.ko, and the Siena code can be removed from sfc.ko.
Thes will be posted as a small follow-up series.
The Siena module is not built by default, but can be enabled
using Kconfig option SFC_SIENA. This will create module sfc-siena.ko.

	Patches

Patch 1 disables the Siena code in the sfc.ko module.
Patches 2-6 establish the code base for the Siena driver.
Patches 7-12 ensure the allyesconfig build succeeds.
Patch 13 adds the basic Siena module.

I do not expect patch 2 through 5 to be reviewed, they are FYI only.
No checkpatch issues were resolved as part of these, but they
were fixed in the subsequent patches.

	Testing

Various build tests were done such as allyesconfig, W=1 and sparse.
The new sfc-siena.ko and sfc.ko modules were tested on a machine with both
these NICs in them, and several tests were run on both drivers.

Martin
---

v3:
- Fix build errors after rebase.

v2:
- Split up patch that copies existing files.
- Only copy a subset of mcdi_pcol.h.
- Use --find-copies-harder as suggested by Benjamin Poirier.
- Merge several patches for the allyesconfig build into larger ones.

---

Martin Habets (13):
      sfc: Disable Siena support
      sfc: Move Siena specific files
      sfc: Copy shared files needed for Siena (part 1)
      sfc: Copy shared files needed for Siena (part 2)
      sfc: Copy a subset of mcdi_pcol.h to siena
      sfc/siena: Remove build references to missing functionality
      sfc/siena: Rename functions in efx headers to avoid conflicts with sfc
      sfc/siena: Rename RX/TX functions to avoid conflicts with sfc
      sfc/siena: Rename peripheral functions to avoid conflicts with sfc
      sfc/siena: Rename functions in mcdi headers to avoid conflicts with sfc
      sfc/siena: Rename functions in nic_common.h to avoid conflicts with sfc
      sfc/siena: Inline functions in sriov.h to avoid conflicts with sfc
      sfc: Add a basic Siena module


 drivers/net/ethernet/sfc/Kconfig                  |    9 
 drivers/net/ethernet/sfc/Makefile                 |    5 
 drivers/net/ethernet/sfc/efx.c                    |   17 
 drivers/net/ethernet/sfc/nic.h                    |    4 
 drivers/net/ethernet/sfc/siena/Kconfig            |   12 
 drivers/net/ethernet/sfc/siena/Makefile           |   11 
 drivers/net/ethernet/sfc/siena/bitfield.h         |    0 
 drivers/net/ethernet/sfc/siena/efx.c              |  231 
 drivers/net/ethernet/sfc/siena/efx.h              |  218 
 drivers/net/ethernet/sfc/siena/efx_channels.c     | 1376 ++
 drivers/net/ethernet/sfc/siena/efx_channels.h     |   45 
 drivers/net/ethernet/sfc/siena/efx_common.c       | 1408 ++
 drivers/net/ethernet/sfc/siena/efx_common.h       |  118 
 drivers/net/ethernet/sfc/siena/enum.h             |  176 
 drivers/net/ethernet/sfc/siena/ethtool.c          |  282 
 drivers/net/ethernet/sfc/siena/ethtool_common.c   | 1340 ++
 drivers/net/ethernet/sfc/siena/ethtool_common.h   |   60 
 drivers/net/ethernet/sfc/siena/farch.c            |   58 
 drivers/net/ethernet/sfc/siena/farch_regs.h       |    0 
 drivers/net/ethernet/sfc/siena/filter.h           |    0 
 drivers/net/ethernet/sfc/siena/io.h               |    0 
 drivers/net/ethernet/sfc/siena/mcdi.c             | 2259 +++
 drivers/net/ethernet/sfc/siena/mcdi.h             |  386 
 drivers/net/ethernet/sfc/siena/mcdi_mon.c         |  531 +
 drivers/net/ethernet/sfc/siena/mcdi_pcol.h        |17204 +++++++++++++++++++++
 drivers/net/ethernet/sfc/siena/mcdi_port.c        |  110 
 drivers/net/ethernet/sfc/siena/mcdi_port.h        |   17 
 drivers/net/ethernet/sfc/siena/mcdi_port_common.c | 1282 ++
 drivers/net/ethernet/sfc/siena/mcdi_port_common.h |   58 
 drivers/net/ethernet/sfc/siena/mtd.c              |  124 
 drivers/net/ethernet/sfc/siena/net_driver.h       | 1715 ++
 drivers/net/ethernet/sfc/siena/nic.c              |  530 +
 drivers/net/ethernet/sfc/siena/nic.h              |  192 
 drivers/net/ethernet/sfc/siena/nic_common.h       |  251 
 drivers/net/ethernet/sfc/siena/ptp.c              | 2200 +++
 drivers/net/ethernet/sfc/siena/ptp.h              |   45 
 drivers/net/ethernet/sfc/siena/rx.c               |  400 
 drivers/net/ethernet/sfc/siena/rx_common.c        | 1094 +
 drivers/net/ethernet/sfc/siena/rx_common.h        |  110 
 drivers/net/ethernet/sfc/siena/selftest.c         |  807 +
 drivers/net/ethernet/sfc/siena/selftest.h         |   52 
 drivers/net/ethernet/sfc/siena/siena.c            |  158 
 drivers/net/ethernet/sfc/siena/siena_sriov.c      |   35 
 drivers/net/ethernet/sfc/siena/siena_sriov.h      |    0 
 drivers/net/ethernet/sfc/siena/sriov.h            |   83 
 drivers/net/ethernet/sfc/siena/tx.c               |  399 
 drivers/net/ethernet/sfc/siena/tx.h               |   40 
 drivers/net/ethernet/sfc/siena/tx_common.c        |  448 +
 drivers/net/ethernet/sfc/siena/tx_common.h        |   39 
 drivers/net/ethernet/sfc/siena/vfdi.h             |    0 
 drivers/net/ethernet/sfc/siena/workarounds.h      |   28 
 51 files changed, 35490 insertions(+), 477 deletions(-)
 create mode 100644 drivers/net/ethernet/sfc/siena/Kconfig
 create mode 100644 drivers/net/ethernet/sfc/siena/Makefile
 copy drivers/net/ethernet/sfc/{bitfield.h => siena/bitfield.h} (100%)
 copy drivers/net/ethernet/sfc/{efx.c => siena/efx.c} (84%)
 create mode 100644 drivers/net/ethernet/sfc/siena/efx.h
 create mode 100644 drivers/net/ethernet/sfc/siena/efx_channels.c
 create mode 100644 drivers/net/ethernet/sfc/siena/efx_channels.h
 create mode 100644 drivers/net/ethernet/sfc/siena/efx_common.c
 create mode 100644 drivers/net/ethernet/sfc/siena/efx_common.h
 create mode 100644 drivers/net/ethernet/sfc/siena/enum.h
 create mode 100644 drivers/net/ethernet/sfc/siena/ethtool.c
 create mode 100644 drivers/net/ethernet/sfc/siena/ethtool_common.c
 create mode 100644 drivers/net/ethernet/sfc/siena/ethtool_common.h
 rename drivers/net/ethernet/sfc/{farch.c => siena/farch.c} (98%)
 copy drivers/net/ethernet/sfc/{farch_regs.h => siena/farch_regs.h} (100%)
 copy drivers/net/ethernet/sfc/{filter.h => siena/filter.h} (100%)
 copy drivers/net/ethernet/sfc/{io.h => siena/io.h} (100%)
 create mode 100644 drivers/net/ethernet/sfc/siena/mcdi.c
 create mode 100644 drivers/net/ethernet/sfc/siena/mcdi.h
 create mode 100644 drivers/net/ethernet/sfc/siena/mcdi_mon.c
 create mode 100644 drivers/net/ethernet/sfc/siena/mcdi_pcol.h
 create mode 100644 drivers/net/ethernet/sfc/siena/mcdi_port.c
 create mode 100644 drivers/net/ethernet/sfc/siena/mcdi_port.h
 create mode 100644 drivers/net/ethernet/sfc/siena/mcdi_port_common.c
 create mode 100644 drivers/net/ethernet/sfc/siena/mcdi_port_common.h
 create mode 100644 drivers/net/ethernet/sfc/siena/mtd.c
 create mode 100644 drivers/net/ethernet/sfc/siena/net_driver.h
 create mode 100644 drivers/net/ethernet/sfc/siena/nic.c
 copy drivers/net/ethernet/sfc/{nic.h => siena/nic.h} (51%)
 create mode 100644 drivers/net/ethernet/sfc/siena/nic_common.h
 create mode 100644 drivers/net/ethernet/sfc/siena/ptp.c
 create mode 100644 drivers/net/ethernet/sfc/siena/ptp.h
 create mode 100644 drivers/net/ethernet/sfc/siena/rx.c
 create mode 100644 drivers/net/ethernet/sfc/siena/rx_common.c
 create mode 100644 drivers/net/ethernet/sfc/siena/rx_common.h
 create mode 100644 drivers/net/ethernet/sfc/siena/selftest.c
 create mode 100644 drivers/net/ethernet/sfc/siena/selftest.h
 rename drivers/net/ethernet/sfc/{siena.c => siena/siena.c} (89%)
 rename drivers/net/ethernet/sfc/{siena_sriov.c => siena/siena_sriov.c} (98%)
 rename drivers/net/ethernet/sfc/{siena_sriov.h => siena/siena_sriov.h} (100%)
 create mode 100644 drivers/net/ethernet/sfc/siena/sriov.h
 create mode 100644 drivers/net/ethernet/sfc/siena/tx.c
 create mode 100644 drivers/net/ethernet/sfc/siena/tx.h
 create mode 100644 drivers/net/ethernet/sfc/siena/tx_common.c
 create mode 100644 drivers/net/ethernet/sfc/siena/tx_common.h
 copy drivers/net/ethernet/sfc/{vfdi.h => siena/vfdi.h} (100%)
 create mode 100644 drivers/net/ethernet/sfc/siena/workarounds.h

--
Martin Habets <habetsm.xilinx@gmail.com>

Comments

patchwork-bot+netdevbpf@kernel.org May 4, 2022, 10:10 a.m. UTC | #1
Hello:

This series was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft.net>:

On Wed, 04 May 2022 08:49:41 +0100 you wrote:
> The Siena NICs (SFN5000 and SFN6000 series) went EOL in November 2021.
> Most of these adapters have been remove from our test labs, and testing
> has been reduced to a minimum.
> 
> This patch series creates a separate kernel module for the Siena architecture,
> analogous to what was done for Falcon some years ago.
> This reduces our maintenance for the sfc.ko module, and allows us to
> enhance the EF10 and EF100 drivers without the risk of breaking Siena NICs.
> 
> [...]

Here is the summary with links:
  - [net-next,v3,01/13] sfc: Disable Siena support
    (no matching commit)
  - [net-next,v3,02/13] sfc: Move Siena specific files
    https://git.kernel.org/netdev/net-next/c/6a9b3de82516
  - [net-next,v3,03/13] sfc: Copy shared files needed for Siena (part 1)
    https://git.kernel.org/netdev/net-next/c/6a9b3de82516
  - [net-next,v3,04/13] sfc: Copy shared files needed for Siena (part 2)
    https://git.kernel.org/netdev/net-next/c/6a9b3de82516
  - [net-next,v3,05/13] sfc: Copy a subset of mcdi_pcol.h to siena
    (no matching commit)
  - [net-next,v3,06/13] sfc/siena: Remove build references to missing functionality
    (no matching commit)
  - [net-next,v3,07/13] sfc/siena: Rename functions in efx headers to avoid conflicts with sfc
    (no matching commit)
  - [net-next,v3,08/13] sfc/siena: Rename RX/TX functions to avoid conflicts with sfc
    (no matching commit)
  - [net-next,v3,09/13] sfc/siena: Rename peripheral functions to avoid conflicts with sfc
    (no matching commit)
  - [net-next,v3,10/13] sfc/siena: Rename functions in mcdi headers to avoid conflicts with sfc
    (no matching commit)
  - [net-next,v3,11/13] sfc/siena: Rename functions in nic_common.h to avoid conflicts with sfc
    (no matching commit)
  - [net-next,v3,12/13] sfc/siena: Inline functions in sriov.h to avoid conflicts with sfc
    (no matching commit)
  - [net-next,v3,13/13] sfc: Add a basic Siena module
    (no matching commit)

You are awesome, thank you!
patchwork-bot+netdevbpf@kernel.org May 4, 2022, 10:20 a.m. UTC | #2
Hello:

This series was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft.net>:

On Wed, 04 May 2022 08:49:41 +0100 you wrote:
> The Siena NICs (SFN5000 and SFN6000 series) went EOL in November 2021.
> Most of these adapters have been remove from our test labs, and testing
> has been reduced to a minimum.
> 
> This patch series creates a separate kernel module for the Siena architecture,
> analogous to what was done for Falcon some years ago.
> This reduces our maintenance for the sfc.ko module, and allows us to
> enhance the EF10 and EF100 drivers without the risk of breaking Siena NICs.
> 
> [...]

Here is the summary with links:
  - [net-next,v3,01/13] sfc: Disable Siena support
    https://git.kernel.org/netdev/net-next/c/0c38a5bd60eb
  - [net-next,v3,02/13] sfc: Move Siena specific files
    (no matching commit)
  - [net-next,v3,03/13] sfc: Copy shared files needed for Siena (part 1)
    (no matching commit)
  - [net-next,v3,04/13] sfc: Copy shared files needed for Siena (part 2)
    (no matching commit)
  - [net-next,v3,05/13] sfc: Copy a subset of mcdi_pcol.h to siena
    (no matching commit)
  - [net-next,v3,06/13] sfc/siena: Remove build references to missing functionality
    (no matching commit)
  - [net-next,v3,07/13] sfc/siena: Rename functions in efx headers to avoid conflicts with sfc
    (no matching commit)
  - [net-next,v3,08/13] sfc/siena: Rename RX/TX functions to avoid conflicts with sfc
    (no matching commit)
  - [net-next,v3,09/13] sfc/siena: Rename peripheral functions to avoid conflicts with sfc
    (no matching commit)
  - [net-next,v3,10/13] sfc/siena: Rename functions in mcdi headers to avoid conflicts with sfc
    (no matching commit)
  - [net-next,v3,11/13] sfc/siena: Rename functions in nic_common.h to avoid conflicts with sfc
    (no matching commit)
  - [net-next,v3,12/13] sfc/siena: Inline functions in sriov.h to avoid conflicts with sfc
    (no matching commit)
  - [net-next,v3,13/13] sfc: Add a basic Siena module
    (no matching commit)

You are awesome, thank you!
Jakub Kicinski May 5, 2022, 3:45 a.m. UTC | #3
On Wed, 04 May 2022 08:49:41 +0100 Martin Habets wrote:
> The Siena NICs (SFN5000 and SFN6000 series) went EOL in November 2021.
> Most of these adapters have been remove from our test labs, and testing
> has been reduced to a minimum.
> 
> This patch series creates a separate kernel module for the Siena architecture,
> analogous to what was done for Falcon some years ago.
> This reduces our maintenance for the sfc.ko module, and allows us to
> enhance the EF10 and EF100 drivers without the risk of breaking Siena NICs.
> 
> After this series further enhancements are needed to differentiate the
> new kernel module from sfc.ko, and the Siena code can be removed from sfc.ko.
> Thes will be posted as a small follow-up series.
> The Siena module is not built by default, but can be enabled
> using Kconfig option SFC_SIENA. This will create module sfc-siena.ko.
> 
> 	Patches
> 
> Patch 1 disables the Siena code in the sfc.ko module.
> Patches 2-6 establish the code base for the Siena driver.
> Patches 7-12 ensure the allyesconfig build succeeds.
> Patch 13 adds the basic Siena module.
> 
> I do not expect patch 2 through 5 to be reviewed, they are FYI only.
> No checkpatch issues were resolved as part of these, but they
> were fixed in the subsequent patches.

Still funky:

$ git pw series apply 638179
Applying: sfc: Disable Siena support
Using index info to reconstruct a base tree...
M	drivers/net/ethernet/sfc/Kconfig
M	drivers/net/ethernet/sfc/Makefile
M	drivers/net/ethernet/sfc/efx.c
M	drivers/net/ethernet/sfc/nic.h
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: sfc: Move Siena specific files
Applying: sfc: Copy shared files needed for Siena (part 1)
Applying: sfc: Copy shared files needed for Siena (part 2)
Applying: sfc: Copy a subset of mcdi_pcol.h to siena
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
No changes -- Patch already applied.
Applying: sfc/siena: Remove build references to missing functionality
Applying: sfc/siena: Rename functions in efx headers to avoid conflicts with sfc
Applying: sfc/siena: Rename RX/TX functions to avoid conflicts with sfc
Applying: sfc/siena: Rename peripheral functions to avoid conflicts with sfc
Applying: sfc/siena: Rename functions in mcdi headers to avoid conflicts with sfc
Applying: sfc/siena: Rename functions in nic_common.h to avoid conflicts with sfc
Applying: sfc/siena: Inline functions in sriov.h to avoid conflicts with sfc
Applying: sfc: Add a basic Siena module
Martin Habets May 5, 2022, 1 p.m. UTC | #4
On Wed, May 04, 2022 at 08:45:31PM -0700, Jakub Kicinski wrote:
> On Wed, 04 May 2022 08:49:41 +0100 Martin Habets wrote:
> > The Siena NICs (SFN5000 and SFN6000 series) went EOL in November 2021.
> > Most of these adapters have been remove from our test labs, and testing
> > has been reduced to a minimum.
> > 
> > This patch series creates a separate kernel module for the Siena architecture,
> > analogous to what was done for Falcon some years ago.
> > This reduces our maintenance for the sfc.ko module, and allows us to
> > enhance the EF10 and EF100 drivers without the risk of breaking Siena NICs.
> > 
> > After this series further enhancements are needed to differentiate the
> > new kernel module from sfc.ko, and the Siena code can be removed from sfc.ko.
> > Thes will be posted as a small follow-up series.
> > The Siena module is not built by default, but can be enabled
> > using Kconfig option SFC_SIENA. This will create module sfc-siena.ko.
> > 
> > 	Patches
> > 
> > Patch 1 disables the Siena code in the sfc.ko module.
> > Patches 2-6 establish the code base for the Siena driver.
> > Patches 7-12 ensure the allyesconfig build succeeds.
> > Patch 13 adds the basic Siena module.
> > 
> > I do not expect patch 2 through 5 to be reviewed, they are FYI only.
> > No checkpatch issues were resolved as part of these, but they
> > were fixed in the subsequent patches.
> 
> Still funky:
> 
> $ git pw series apply 638179
> Applying: sfc: Disable Siena support
> Using index info to reconstruct a base tree...
> M	drivers/net/ethernet/sfc/Kconfig
> M	drivers/net/ethernet/sfc/Makefile
> M	drivers/net/ethernet/sfc/efx.c
> M	drivers/net/ethernet/sfc/nic.h
> Falling back to patching base and 3-way merge...
> No changes -- Patch already applied.

git is right, this got applied by Dave with commit
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=0c38a5bd60eb

> Applying: sfc: Move Siena specific files
> Applying: sfc: Copy shared files needed for Siena (part 1)
> Applying: sfc: Copy shared files needed for Siena (part 2)
> Applying: sfc: Copy a subset of mcdi_pcol.h to siena
> Using index info to reconstruct a base tree...
> Falling back to patching base and 3-way merge...
> No changes -- Patch already applied.

git is right, this got applied by Dave with commit
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=6b73f20ab6c401a1a7860f02734ab11bf748e69b

> Applying: sfc/siena: Remove build references to missing functionality
> Applying: sfc/siena: Rename functions in efx headers to avoid conflicts with sfc
> Applying: sfc/siena: Rename RX/TX functions to avoid conflicts with sfc
> Applying: sfc/siena: Rename peripheral functions to avoid conflicts with sfc
> Applying: sfc/siena: Rename functions in mcdi headers to avoid conflicts with sfc
> Applying: sfc/siena: Rename functions in nic_common.h to avoid conflicts with sfc
> Applying: sfc/siena: Inline functions in sriov.h to avoid conflicts with sfc
> Applying: sfc: Add a basic Siena module

The other patches I don't see upstream.
There is also merge commit
https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=39e85fe01127cfb1b4b59a08e5d81fed45ee5633
but that only covers the ones that got applied.

So my summary is that patch 1 and 5 are in, but the others are not.
Pretty confusing stuff. I wonder if the --find-copies-harder option is too
clever.

From what I can see net-next is not broken, other than Siena NICs being
disabled. Your git pw series apply seems correct.

Martin
Jakub Kicinski May 5, 2022, 4:28 p.m. UTC | #5
On Thu, 5 May 2022 14:00:24 +0100 Martin Habets wrote:
> > Still funky:
> > 
> > $ git pw series apply 638179
> > Applying: sfc: Disable Siena support
> > Using index info to reconstruct a base tree...
> > M	drivers/net/ethernet/sfc/Kconfig
> > M	drivers/net/ethernet/sfc/Makefile
> > M	drivers/net/ethernet/sfc/efx.c
> > M	drivers/net/ethernet/sfc/nic.h
> > Falling back to patching base and 3-way merge...
> > No changes -- Patch already applied.  
> 
> git is right, this got applied by Dave with commit
> https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=0c38a5bd60eb
> 
> > Applying: sfc: Move Siena specific files
> > Applying: sfc: Copy shared files needed for Siena (part 1)
> > Applying: sfc: Copy shared files needed for Siena (part 2)
> > Applying: sfc: Copy a subset of mcdi_pcol.h to siena
> > Using index info to reconstruct a base tree...
> > Falling back to patching base and 3-way merge...
> > No changes -- Patch already applied.  
> 
> git is right, this got applied by Dave with commit
> https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=6b73f20ab6c401a1a7860f02734ab11bf748e69b
> 
> > Applying: sfc/siena: Remove build references to missing functionality
> > Applying: sfc/siena: Rename functions in efx headers to avoid conflicts with sfc
> > Applying: sfc/siena: Rename RX/TX functions to avoid conflicts with sfc
> > Applying: sfc/siena: Rename peripheral functions to avoid conflicts with sfc
> > Applying: sfc/siena: Rename functions in mcdi headers to avoid conflicts with sfc
> > Applying: sfc/siena: Rename functions in nic_common.h to avoid conflicts with sfc
> > Applying: sfc/siena: Inline functions in sriov.h to avoid conflicts with sfc
> > Applying: sfc: Add a basic Siena module  
> 
> The other patches I don't see upstream.
> There is also merge commit
> https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=39e85fe01127cfb1b4b59a08e5d81fed45ee5633
> but that only covers the ones that got applied.
> 
> So my summary is that patch 1 and 5 are in, but the others are not.
> Pretty confusing stuff. I wonder if the --find-copies-harder option is too
> clever.
> 
> From what I can see net-next is not broken, other than Siena NICs being
> disabled. Your git pw series apply seems correct.

Oh. Well. That I did not suspect. I ignored the confused pw-bot replies.

Would you prefer me to revert what's in the tree or send incremental
patches?

Either way I'd prefer if you posted once more, if that's okay, so that
the pw build bot can take a swing at the series. Looks like the patches
were merged before the build bot got to them this time.
Martin Habets May 9, 2022, 8:13 a.m. UTC | #6
On Thu, May 05, 2022 at 09:28:53AM -0700, Jakub Kicinski wrote:
> On Thu, 5 May 2022 14:00:24 +0100 Martin Habets wrote:
> > > Still funky:
> > > 
> > > $ git pw series apply 638179
> > > Applying: sfc: Disable Siena support
> > > Using index info to reconstruct a base tree...
> > > M	drivers/net/ethernet/sfc/Kconfig
> > > M	drivers/net/ethernet/sfc/Makefile
> > > M	drivers/net/ethernet/sfc/efx.c
> > > M	drivers/net/ethernet/sfc/nic.h
> > > Falling back to patching base and 3-way merge...
> > > No changes -- Patch already applied.  
> > 
> > git is right, this got applied by Dave with commit
> > https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=0c38a5bd60eb
> > 
> > > Applying: sfc: Move Siena specific files
> > > Applying: sfc: Copy shared files needed for Siena (part 1)
> > > Applying: sfc: Copy shared files needed for Siena (part 2)
> > > Applying: sfc: Copy a subset of mcdi_pcol.h to siena
> > > Using index info to reconstruct a base tree...
> > > Falling back to patching base and 3-way merge...
> > > No changes -- Patch already applied.  
> > 
> > git is right, this got applied by Dave with commit
> > https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=6b73f20ab6c401a1a7860f02734ab11bf748e69b
> > 
> > > Applying: sfc/siena: Remove build references to missing functionality
> > > Applying: sfc/siena: Rename functions in efx headers to avoid conflicts with sfc
> > > Applying: sfc/siena: Rename RX/TX functions to avoid conflicts with sfc
> > > Applying: sfc/siena: Rename peripheral functions to avoid conflicts with sfc
> > > Applying: sfc/siena: Rename functions in mcdi headers to avoid conflicts with sfc
> > > Applying: sfc/siena: Rename functions in nic_common.h to avoid conflicts with sfc
> > > Applying: sfc/siena: Inline functions in sriov.h to avoid conflicts with sfc
> > > Applying: sfc: Add a basic Siena module  
> > 
> > The other patches I don't see upstream.
> > There is also merge commit
> > https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/commit/?id=39e85fe01127cfb1b4b59a08e5d81fed45ee5633
> > but that only covers the ones that got applied.
> > 
> > So my summary is that patch 1 and 5 are in, but the others are not.
> > Pretty confusing stuff. I wonder if the --find-copies-harder option is too
> > clever.
> > 
> > From what I can see net-next is not broken, other than Siena NICs being
> > disabled. Your git pw series apply seems correct.
> 
> Oh. Well. That I did not suspect. I ignored the confused pw-bot replies.
> 
> Would you prefer me to revert what's in the tree or send incremental
> patches?

I'll send an incremental series.

> Either way I'd prefer if you posted once more, if that's okay, so that
> the pw build bot can take a swing at the series. Looks like the patches
> were merged before the build bot got to them this time.

Will do.

Martin