[net-next PATCH] net: dsa: qca8k: move driver to qca dir

[net-next PATCH] net: dsa: qca8k: move driver to qca dir

[Christian Marangi]

Move qca8k driver to qca dir in preparation for code split and
introduction of ipq4019 switch based on qca8k.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---

This is a start for the required changes for code
split. Greg wasn't so negative about this kind of change
so I think we can finally make the move.

Still waiting some comments about the code split.
(Can I split qca8k to common function that will be
used by ipq4019? (and later propose the actual 
ipq4019 driver?))

 drivers/net/dsa/Kconfig           | 8 --------
 drivers/net/dsa/Makefile          | 1 -
 drivers/net/dsa/qca/Kconfig       | 8 ++++++++
 drivers/net/dsa/qca/Makefile      | 1 +
 drivers/net/dsa/{ => qca}/qca8k.c | 0
 drivers/net/dsa/{ => qca}/qca8k.h | 0
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename drivers/net/dsa/{ => qca}/qca8k.c (100%)
 rename drivers/net/dsa/{ => qca}/qca8k.h (100%)

diff --git a/drivers/net/dsa/Kconfig b/drivers/net/dsa/Kconfig
index 702d68ae435a..d8ae0e8af2a0 100644
--- a/drivers/net/dsa/Kconfig
+++ b/drivers/net/dsa/Kconfig
@@ -60,14 +60,6 @@ source "drivers/net/dsa/sja1105/Kconfig"
 
 source "drivers/net/dsa/xrs700x/Kconfig"
 
-config NET_DSA_QCA8K
-	tristate "Qualcomm Atheros QCA8K Ethernet switch family support"
-	select NET_DSA_TAG_QCA
-	select REGMAP
-	help
-	  This enables support for the Qualcomm Atheros QCA8K Ethernet
-	  switch chips.
-
 source "drivers/net/dsa/realtek/Kconfig"
 
 config NET_DSA_RZN1_A5PSW
diff --git a/drivers/net/dsa/Makefile b/drivers/net/dsa/Makefile
index b32907afa702..16eb879e0cb4 100644
--- a/drivers/net/dsa/Makefile
+++ b/drivers/net/dsa/Makefile
@@ -8,7 +8,6 @@ endif
 obj-$(CONFIG_NET_DSA_LANTIQ_GSWIP) += lantiq_gswip.o
 obj-$(CONFIG_NET_DSA_MT7530)	+= mt7530.o
 obj-$(CONFIG_NET_DSA_MV88E6060) += mv88e6060.o
-obj-$(CONFIG_NET_DSA_QCA8K)	+= qca8k.o
 obj-$(CONFIG_NET_DSA_RZN1_A5PSW) += rzn1_a5psw.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303) += lan9303-core.o
 obj-$(CONFIG_NET_DSA_SMSC_LAN9303_I2C) += lan9303_i2c.o
diff --git a/drivers/net/dsa/qca/Kconfig b/drivers/net/dsa/qca/Kconfig
index 13b7e679b8b5..ba339747362c 100644
--- a/drivers/net/dsa/qca/Kconfig
+++ b/drivers/net/dsa/qca/Kconfig
@@ -7,3 +7,11 @@ config NET_DSA_AR9331
 	help
 	  This enables support for the Qualcomm Atheros AR9331 built-in Ethernet
 	  switch.
+
+config NET_DSA_QCA8K
+	tristate "Qualcomm Atheros QCA8K Ethernet switch family support"
+	select NET_DSA_TAG_QCA
+	select REGMAP
+	help
+	  This enables support for the Qualcomm Atheros QCA8K Ethernet
+	  switch chips.
diff --git a/drivers/net/dsa/qca/Makefile b/drivers/net/dsa/qca/Makefile
index 274022319066..40bb7c27285b 100644
--- a/drivers/net/dsa/qca/Makefile
+++ b/drivers/net/dsa/qca/Makefile
@@ -1,2 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0-only
 obj-$(CONFIG_NET_DSA_AR9331)	+= ar9331.o
+obj-$(CONFIG_NET_DSA_QCA8K)	+= qca8k.o
diff --git a/drivers/net/dsa/qca8k.c b/drivers/net/dsa/qca/qca8k.c
similarity index 100%
rename from drivers/net/dsa/qca8k.c
rename to drivers/net/dsa/qca/qca8k.c
diff --git a/drivers/net/dsa/qca8k.h b/drivers/net/dsa/qca/qca8k.h
similarity index 100%
rename from drivers/net/dsa/qca8k.h
rename to drivers/net/dsa/qca/qca8k.h
-- 
2.36.1

Re: [net-next PATCH] net: dsa: qca8k: move driver to qca dir

[Florian Fainelli]

On 7/13/22 13:53, Christian Marangi wrote:
> Move qca8k driver to qca dir in preparation for code split and
> introduction of ipq4019 switch based on qca8k.
> 
> Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
-- 
Florian

Re: [net-next PATCH] net: dsa: qca8k: move driver to qca dir

[Christian Marangi]

On Thu, Jul 14, 2022 at 10:03:54PM -0700, Jakub Kicinski wrote:
> On Wed, 13 Jul 2022 22:53:50 +0200 Christian Marangi wrote:
> > This is a start for the required changes for code
> > split. Greg wasn't so negative about this kind of change
> > so I think we can finally make the move.
> > 
> > Still waiting some comments about the code split.
> > (Can I split qca8k to common function that will be
> > used by ipq4019? (and later propose the actual 
> > ipq4019 driver?))
> 
> Does the split mean that this code will move again?
> If so perhaps better to put this patch in the series 
> that does the split? We're ~2 weeks away from the merge 
> window so we don't want to end up moving the same code
> twice in two consecutive releases.

What to you mean with "will move again"?

The code will be split to qca8k-common.c and qca8k-8xxx.c
And later qca8k-ipq4019.c will be proposed. 

So the files will all stay in qca/ dir.

Or should I just propose the move and the code split in one series?

Tell me what do you prefer.

-- 
	Ansuel

Re: [net-next PATCH] net: dsa: qca8k: move driver to qca dir

[Jakub Kicinski]

On Wed, 13 Jul 2022 22:53:50 +0200 Christian Marangi wrote:
> This is a start for the required changes for code
> split. Greg wasn't so negative about this kind of change
> so I think we can finally make the move.
> 
> Still waiting some comments about the code split.
> (Can I split qca8k to common function that will be
> used by ipq4019? (and later propose the actual 
> ipq4019 driver?))

Does the split mean that this code will move again?
If so perhaps better to put this patch in the series 
that does the split? We're ~2 weeks away from the merge 
window so we don't want to end up moving the same code
twice in two consecutive releases.

Re: [net-next PATCH] net: dsa: qca8k: move driver to qca dir

[patchwork-bot+netdevbpf]

Hello:

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

On Wed, 13 Jul 2022 22:53:50 +0200 you wrote:
> Move qca8k driver to qca dir in preparation for code split and
> introduction of ipq4019 switch based on qca8k.
> 
> Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
> ---
> 
> This is a start for the required changes for code
> split. Greg wasn't so negative about this kind of change
> so I think we can finally make the move.
> 
> [...]

Here is the summary with links:
  - [net-next] net: dsa: qca8k: move driver to qca dir
    https://git.kernel.org/netdev/net-next/c/4bbaf764e1e1

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: [net-next PATCH] net: dsa: qca8k: move driver to qca dir

[Christian Marangi]

On Fri, Jul 15, 2022 at 12:37:43PM -0700, Jakub Kicinski wrote:
> On Fri, 15 Jul 2022 03:57:46 +0200 Christian Marangi wrote:
> > > Does the split mean that this code will move again?
> > > If so perhaps better to put this patch in the series 
> > > that does the split? We're ~2 weeks away from the merge 
> > > window so we don't want to end up moving the same code
> > > twice in two consecutive releases.  
> > 
> > What to you mean with "will move again"?
> >  
> > The code will be split to qca8k-common.c and qca8k-8xxx.c
> > And later qca8k-ipq4019.c will be proposed. 
> > 
> > So the files will all stay in qca/ dir.
> > 
> > Or should I just propose the move and the code split in one series?
> 
> Yup that's what I prefer.
>

Ok no problem, if the current merged commit is a problem, np for me with
a revert! (it was really to prevent sending a bigger series, sorry for
the mess)

> > Tell me what do you prefer.

-- 
	Ansuel

Re: [net-next PATCH] net: dsa: qca8k: move driver to qca dir

[Christian Marangi]

On Fri, Jul 15, 2022 at 12:47:17PM -0700, Jakub Kicinski wrote:
> On Fri, 15 Jul 2022 21:16:46 +0200 Christian Marangi wrote:
> > > > Or should I just propose the move and the code split in one series?  
> > > 
> > > Yup that's what I prefer.
> > 
> > Ok no problem, if the current merged commit is a problem, np for me with
> > a revert! (it was really to prevent sending a bigger series, sorry for
> > the mess)
> 
> Oh, I didn't realize Dave already merged it. No worries, it's not a big
> deal. Would be great to prioritize getting the split done next. If both
> are merged for before 5.19 final is cut - it doesn't really matter if
> they were one series or two.

I'm just working on that... hoping to send a patch soon, just need to
investigate regmap bulk read/write changes...

-- 
	Ansuel

Re: [net-next PATCH] net: dsa: qca8k: move driver to qca dir

[Jakub Kicinski]

On Fri, 15 Jul 2022 03:57:46 +0200 Christian Marangi wrote:
> > Does the split mean that this code will move again?
> > If so perhaps better to put this patch in the series 
> > that does the split? We're ~2 weeks away from the merge 
> > window so we don't want to end up moving the same code
> > twice in two consecutive releases.  
> 
> What to you mean with "will move again"?
>  
> The code will be split to qca8k-common.c and qca8k-8xxx.c
> And later qca8k-ipq4019.c will be proposed. 
> 
> So the files will all stay in qca/ dir.
> 
> Or should I just propose the move and the code split in one series?

Yup that's what I prefer.

> Tell me what do you prefer.

Re: [net-next PATCH] net: dsa: qca8k: move driver to qca dir

[Jakub Kicinski]

On Fri, 15 Jul 2022 21:16:46 +0200 Christian Marangi wrote:
> > > Or should I just propose the move and the code split in one series?  
> > 
> > Yup that's what I prefer.
> 
> Ok no problem, if the current merged commit is a problem, np for me with
> a revert! (it was really to prevent sending a bigger series, sorry for
> the mess)

Oh, I didn't realize Dave already merged it. No worries, it's not a big
deal. Would be great to prioritize getting the split done next. If both
are merged for before 5.19 final is cut - it doesn't really matter if
they were one series or two.