Skip to contentSkip to conversation

net: dsa: qca8k: move driver to qca dir

PATCH Applied Christian Marangi 4 participants 9 messages Jul 13, 2022 – Jul 15, 2022

Subsystems (4)
lore
Share & tools
lore

Christian Marangi

author maintainer
#0 lore raw

PATCH 1/1 net: dsa: qca8k: move driver to qca dir

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

---

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%)
drivers/net/dsa/Kconfig +0 -8
index 702d68ae435a..d8ae0e8af2a0 100644
@@ -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
drivers/net/dsa/Makefile +0 -1
index b32907afa702..16eb879e0cb4 100644
@@ -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
drivers/net/dsa/qca/Kconfig +8 -0
index 13b7e679b8b5..ba339747362c 100644
@@ -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.
drivers/net/dsa/qca/Makefile +1 -0
index 274022319066..40bb7c27285b 100644
@@ -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
drivers/net/dsa/qca/qca8k.c renamed from drivers/net/dsa/qca8k.c +0 -0
similarity index 100%
rename from drivers/net/dsa/qca8k.c
rename to drivers/net/dsa/qca/qca8k.c
drivers/net/dsa/qca/qca8k.h renamed from drivers/net/dsa/qca8k.h +0 -0
similarity index 100%
rename from drivers/net/dsa/qca8k.h
rename to drivers/net/dsa/qca/qca8k.h
Signature · 1 line
2.36.1
maintainer
#2 lore raw
In reply to Christian Marangi
Quoted 8 lines · 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.

author maintainer
#3 lore raw
Quoted 10 lines · Jakub Kicinski
Quoted 8 lines · 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?))

Quoted 5 lines

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.

Signature · 1 line
	Ansuel
maintainer
#4 lore raw
Quoted 6 lines · On Fri, 15 Jul 2022 03:57:46 +0200 Christian Marangi wrote:
Quoted 5 lines

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.

Quoted 8 lines

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.

Quoted 1 line

Tell me what do you prefer.

author maintainer
#5 lore raw
Quoted 9 lines · Jakub Kicinski
Quoted 8 lines · On Fri, 15 Jul 2022 03:57:46 +0200 Christian Marangi wrote:
Quoted 5 lines

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"?

Quoted 9 lines
Quoted 6 lines

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)

Quoted 1 line
Quoted 1 line

Tell me what do you prefer.

Signature · 1 line
	Ansuel
maintainer
#6 lore raw
Quoted 7 lines · On Fri, 15 Jul 2022 21:16:46 +0200 Christian Marangi wrote:
Quoted 3 lines
Quoted 1 line

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.

author maintainer
#7 lore raw
Quoted 5 lines · Jakub Kicinski
Quoted 4 lines · On Fri, 15 Jul 2022 21:16:46 +0200 Christian Marangi wrote:
Quoted 3 lines
Quoted 1 line

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

Yup that's what I prefer.

Quoted 8 lines
Quoted 3 lines

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...

Signature · 1 line
	Ansuel
#8 lore raw
In reply to Christian Marangi
This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:

Hello:

This patch was applied to netdev/net-next.git (master) by David S. Miller <[email protected]>:

Quoted 11 lines · 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.

---

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!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html