[PATCH 1/2] soc: ixp4xx: List the whole directory in MAINTAINERS

[PATCH 1/2] soc: ixp4xx: List the whole directory in MAINTAINERS

[Jean Delvare]

Mention the whole directory containing the ixp4xx soc drivers in
MAINTAINERS instead of each driver separately. Otherwise changes
done to Makefile and Kconfig will fail to find a matching entry.
This will also let future drivers match without having to update
the entry each time.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Krzysztof Halasa <khalasa@piap.pl>
---
 MAINTAINERS |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

--- linux-5.2.orig/MAINTAINERS	2019-07-12 15:33:28.106852821 +0200
+++ linux-5.2/MAINTAINERS	2019-07-12 15:35:54.309067537 +0200
@@ -8023,10 +8023,8 @@ F:	Documentation/media/v4l-drivers/ipu3.
 INTEL IXP4XX QMGR, NPE, ETHERNET and HSS SUPPORT
 M:	Krzysztof Halasa <khalasa@piap.pl>
 S:	Maintained
-F:	include/linux/soc/ixp4xx/qmgr.h
-F:	include/linux/soc/ixp4xx/npe.h
-F:	drivers/soc/ixp4xx/ixp4xx-qmgr.c
-F:	drivers/soc/ixp4xx/ixp4xx-npe.c
+F:	include/linux/soc/ixp4xx/
+F:	drivers/soc/ixp4xx/
 F:	drivers/net/ethernet/xscale/ixp4xx_eth.c
 F:	drivers/net/wan/ixp4xx_hss.c
 

-- 
Jean Delvare
SUSE L3 Support

[PATCH 2/3] soc: ixp4xx: Really select helper drivers automatically

[Jean Delvare]

Kconfig claims that the ixp4xx-qmgr and ixp4xx-npe helper drivers
are selected automatically as needed. However this is not what the
Kconfig entries are doing. Convert depends to select to match the
help texts.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Krzysztof Halasa <khalasa@piap.pl>
---
Sorry about the weird patch numbering, I found this issue right before
sending the other patch so I had to insert a new patch in the middle of
the series.

This should get tested on ixp4xx, I could only test on x86.

 drivers/net/ethernet/xscale/Kconfig |    7 ++++---
 drivers/net/wan/Kconfig             |    4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

--- linux-5.2.orig/drivers/net/ethernet/xscale/Kconfig	2019-07-12 15:44:22.617698231 +0200
+++ linux-5.2/drivers/net/ethernet/xscale/Kconfig	2019-07-12 15:48:00.538938930 +0200
@@ -6,8 +6,7 @@
 config NET_VENDOR_XSCALE
 	bool "Intel XScale IXP devices"
 	default y
-	depends on NET_VENDOR_INTEL && (ARM && ARCH_IXP4XX && \
-		   IXP4XX_NPE && IXP4XX_QMGR)
+	depends on NET_VENDOR_INTEL && (ARM && ARCH_IXP4XX)
 	---help---
 	  If you have a network (Ethernet) card belonging to this class, say Y.
 
@@ -20,9 +19,11 @@ if NET_VENDOR_XSCALE
 
 config IXP4XX_ETH
 	tristate "Intel IXP4xx Ethernet support"
-	depends on ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR
+	depends on ARM && ARCH_IXP4XX
 	select PHYLIB
 	select NET_PTP_CLASSIFY
+	select IXP4XX_NPE
+	select IXP4XX_QMGR
 	---help---
 	  Say Y here if you want to use built-in Ethernet ports
 	  on IXP4xx processor.
--- linux-5.2.orig/drivers/net/wan/Kconfig	2019-07-12 15:44:22.628698395 +0200
+++ linux-5.2/drivers/net/wan/Kconfig	2019-07-12 15:47:25.211414758 +0200
@@ -329,7 +329,9 @@ config DSCC4_PCI_RST
 
 config IXP4XX_HSS
 	tristate "Intel IXP4xx HSS (synchronous serial port) support"
-	depends on HDLC && ARM && ARCH_IXP4XX && IXP4XX_NPE && IXP4XX_QMGR
+	depends on HDLC && ARM && ARCH_IXP4XX
+	select IXP4XX_NPE
+	select IXP4XX_QMGR
 	help
 	  Say Y here if you want to use built-in HSS ports
 	  on IXP4xx processor.

-- 
Jean Delvare
SUSE L3 Support

[PATCH 3/3] soc: ixp4xx: Hide auto-selected drivers

[Jean Delvare]

The 2 IXP4xx SOC drivers qmgr and npe are selected automatically when
needed so they do not need to be presented to the user.

Furthermore these helper drivers are specific to the IXP4xx arch so
hide them completely on other architectures so as to not clutter the
config file.

Signed-off-by: Jean Delvare <jdelvare@suse.de>
Cc: Krzysztof Halasa <khalasa@piap.pl>
Cc: Linus Walleij <linus.walleij@linaro.org>
---
Note: Ultimately all I want is that non-ixp4xx users are not asked
about IXP4XX_QMGR and IXP4XX_NPE. If there is another preferred option
to achieve the same, that would work with me too, just let me know.

 drivers/soc/ixp4xx/Kconfig |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

--- linux-5.2.orig/drivers/soc/ixp4xx/Kconfig	2019-07-08 00:41:56.000000000 +0200
+++ linux-5.2/drivers/soc/ixp4xx/Kconfig	2019-07-12 15:21:44.769229835 +0200
@@ -1,17 +1,19 @@
 # SPDX-License-Identifier: GPL-2.0-only
+if ARCH_IXP4XX
 menu "IXP4xx SoC drivers"
 
 config IXP4XX_QMGR
-	tristate "IXP4xx Queue Manager support"
+	tristate
 	help
 	  This driver supports IXP4xx built-in hardware queue manager
 	  and is automatically selected by Ethernet and HSS drivers.
 
 config IXP4XX_NPE
-	tristate "IXP4xx Network Processor Engine support"
+	tristate
 	select FW_LOADER
 	help
 	  This driver supports IXP4xx built-in network coprocessors
 	  and is automatically selected by Ethernet and HSS drivers.
 
 endmenu
+endif

-- 
Jean Delvare
SUSE L3 Support

Re: [PATCH 3/3] soc: ixp4xx: Hide auto-selected drivers

[Linus Walleij]

On Fri, Jul 12, 2019 at 3:57 PM Jean Delvare <jdelvare@suse.de> wrote:

> The 2 IXP4xx SOC drivers qmgr and npe are selected automatically when
> needed so they do not need to be presented to the user.
>
> Furthermore these helper drivers are specific to the IXP4xx arch so
> hide them completely on other architectures so as to not clutter the
> config file.
>
> Signed-off-by: Jean Delvare <jdelvare@suse.de>
> Cc: Krzysztof Halasa <khalasa@piap.pl>
> Cc: Linus Walleij <linus.walleij@linaro.org>
> ---
> Note: Ultimately all I want is that non-ixp4xx users are not asked
> about IXP4XX_QMGR and IXP4XX_NPE. If there is another preferred option
> to achieve the same, that would work with me too, just let me know.

Reviewed-by: Linus Walleij <linus.walleij@linaro.org>

This is the right thing to do, sorry for not doing it like this to begin
with. I'll queue it in my ixp4xx tree.

Yours,
Linus Walleij