Date:   Thu, 5 May 2022 14:00:24 +0100
From:   Martin Habets <habetsm.xilinx@...il.com>
To:     Jakub Kicinski <kuba@...nel.org>
Cc:     edumazet@...gle.com, pabeni@...hat.com, davem@...emloft.net,
        netdev@...r.kernel.org, ecree.xilinx@...il.com
Subject: Re: [PATCH net-next v3 00/13]: Move Siena into a separate
 subdirectory

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

Powered by blists - more mailing lists