Skip to contentSkip to conversation

scsi: fix kconfig dependency warnings for SCSI_FC_ATTRS

PATCH In review Randy Dunlap 3 participants 6 messages Sep 19, 2014 – Sep 22, 2014

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 scsi: fix kconfig dependency warnings for SCSI_FC_ATTRS

From: Randy Dunlap <[email protected]>

Fix kconfig dependency warnings which can lead to build errors:

warning: (SCSI_BNX2X_FCOE && LIBFCOE && TCM_QLA2XXX) selects LIBFC which has unmet direct dependencies (SCSI_LOWLEVEL && SCSI && SCSI_FC_ATTRS)

warning: (FCOE && FCOE_FNIC) selects LIBFCOE which has unmet direct dependencies (SCSI_LOWLEVEL && SCSI && SCSI_FC_ATTRS)

---
 drivers/scsi/Kconfig         |    3 +++
 drivers/scsi/qla2xxx/Kconfig |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)
drivers/scsi/Kconfig +3 -0
@@ -601,6 +601,7 @@ config LIBFC
 
 config LIBFCOE
 	tristate "LibFCoE module"
+	depends on SCSI_FC_ATTRS
 	select LIBFC
 	---help---
 	  Library for Fibre Channel over Ethernet module
@@ -608,6 +609,7 @@ config LIBFCOE
 config FCOE
 	tristate "FCoE module"
 	depends on PCI
+	depends on SCSI_FC_ATTRS
 	select LIBFCOE
 	---help---
 	  Fibre Channel over Ethernet module
@@ -615,6 +617,7 @@ config FCOE
 config FCOE_FNIC
 	tristate "Cisco FNIC Driver"
 	depends on PCI && X86
+	depends on SCSI_FC_ATTRS
 	select LIBFCOE
 	help
 	  This is support for the Cisco PCI-Express FCoE HBA.
drivers/scsi/qla2xxx/Kconfig +1 -1
@@ -30,7 +30,7 @@ config SCSI_QLA_FC
 
 config TCM_QLA2XXX
 	tristate "TCM_QLA2XXX fabric module for Qlogic 2xxx series target mode HBAs"
-	depends on SCSI_QLA_FC && TARGET_CORE
+	depends on SCSI_QLA_FC && TARGET_CORE && SCSI_FC_ATTRS
 	select LIBFC
 	select BTREE
 	default n
#1 lore raw

drivers/scsi/qla2xxx/Kconfig config SCSI_QLA_FC · line 33

Quoted 8 lines · Randy Dunlap
drivers/scsi/qla2xxx/Kconfig +1 -1
@@ -30,7 +30,7 @@ config SCSI_QLA_FC
 
 config TCM_QLA2XXX
 	tristate "TCM_QLA2XXX fabric module for Qlogic 2xxx series target mode HBAs"
-	depends on SCSI_QLA_FC && TARGET_CORE
+	depends on SCSI_QLA_FC && TARGET_CORE && SCSI_FC_ATTRS

CONFIG_SCSI_QLA_FC currently selects SCSI_FC_ATTRS, so we shouldn't need this here. Also any reason not to switch that one over to a depends as well?

maintainer
#2 lore raw

From: Christoph Hellwig <[email protected]>
Date: Mon, 22 Sep 2014 07:42:13 -0700

Quoted 5 lines · Randy Dunlap
Quoted 4 lines
drivers/scsi/qla2xxx/Kconfig +0 -0
@@ -30,7 +30,7 @@ config SCSI_QLA_FC
 
Quoted 9 lines

drivers/scsi/qla2xxx/Kconfig config SCSI_QLA_FC · line 33

Quoted 4 lines
drivers/scsi/qla2xxx/Kconfig +1 -1
 config TCM_QLA2XXX
 	tristate "TCM_QLA2XXX fabric module for Qlogic 2xxx series target mode HBAs"
-	depends on SCSI_QLA_FC && TARGET_CORE
+	depends on SCSI_QLA_FC && TARGET_CORE && SCSI_FC_ATTRS

CONFIG_SCSI_QLA_FC currently selects SCSI_FC_ATTRS, so we shouldn't need this here. Also any reason not to switch that one over to a depends as well?

Yes, all selects of SCSI_FC_ATTRS have to be changed to a depends.

maintainer
#3 lore raw
In reply to Christoph Hellwig

From: Christoph Hellwig <[email protected]>
Date: Mon, 22 Sep 2014 07:42:13 -0700

Quoted 5 lines · Randy Dunlap
Quoted 4 lines
drivers/scsi/qla2xxx/Kconfig +0 -0
@@ -30,7 +30,7 @@ config SCSI_QLA_FC
 
Quoted 8 lines

drivers/scsi/qla2xxx/Kconfig config SCSI_QLA_FC · line 33

Quoted 4 lines
drivers/scsi/qla2xxx/Kconfig +1 -1
 config TCM_QLA2XXX
 	tristate "TCM_QLA2XXX fabric module for Qlogic 2xxx series target mode HBAs"
-	depends on SCSI_QLA_FC && TARGET_CORE
+	depends on SCSI_QLA_FC && TARGET_CORE && SCSI_FC_ATTRS

CONFIG_SCSI_QLA_FC currently selects SCSI_FC_ATTRS, so we shouldn't need this here. Also any reason not to switch that one over to a depends as well?

Christoph, I understand your confusion now, in the networking tree SCSI_QLA_FC "depends" on SCSI_FC_ATTRS now, and this is what Randy's patches are against.

#4 lore raw
Quoted 6 lines · David Miller
Quoted 3 lines

CONFIG_SCSI_QLA_FC currently selects SCSI_FC_ATTRS, so we shouldn't need this here. Also any reason not to switch that one over to a depends as well?

Christoph, I understand your confusion now, in the networking tree SCSI_QLA_FC "depends" on SCSI_FC_ATTRS now, and this is what Randy's patches are against.

Ok. The fixes look fine for me if you checked they make sense vs the net tree.

maintainer
#5 lore raw
In reply to Randy Dunlap

From: Randy Dunlap <[email protected]>
Date: Fri, 19 Sep 2014 16:50:59 -0700

Quoted 9 lines

From: Randy Dunlap <[email protected]>

Fix kconfig dependency warnings which can lead to build errors:

warning: (SCSI_BNX2X_FCOE && LIBFCOE && TCM_QLA2XXX) selects LIBFC which has unmet direct dependencies (SCSI_LOWLEVEL && SCSI && SCSI_FC_ATTRS)

warning: (FCOE && FCOE_FNIC) selects LIBFCOE which has unmet direct dependencies (SCSI_LOWLEVEL && SCSI && SCSI_FC_ATTRS)

Randy, I think we need to propagate usage of depends into LIBFC and LIBFCOE as well.

I'm playing around with the following patch and will probably use this to resolve everything.

Thanks.

drivers/scsi/Kconfig +3 -3
index b745012..bd85fb4 100644
@@ -592,21 +592,21 @@ config LIBFC
 
 config LIBFCOE
 	tristate "LibFCoE module"
-	select LIBFC
+	depends on LIBFC
 	---help---
 	  Library for Fibre Channel over Ethernet module
 
 config FCOE
 	tristate "FCoE module"
 	depends on PCI
-	select LIBFCOE
+	depends on LIBFCOE
 	---help---
 	  Fibre Channel over Ethernet module
 
 config FCOE_FNIC
 	tristate "Cisco FNIC Driver"
 	depends on PCI && X86
-	select LIBFCOE
+	depends on LIBFCOE
 	help
 	  This is support for the Cisco PCI-Express FCoE HBA.
 
drivers/scsi/bnx2fc/Kconfig +2 -2
index 02b0ba8..0978828 100644
@@ -2,11 +2,11 @@ config SCSI_BNX2X_FCOE
 	tristate "QLogic NetXtreme II FCoE support"
 	depends on PCI
 	depends on (IPV6 || IPV6=n)
+	depends on LIBFC
+	depends on LIBFCOE
 	select NETDEVICES
 	select ETHERNET
 	select NET_VENDOR_BROADCOM
-	select LIBFC
-	select LIBFCOE
 	select CNIC
 	---help---
 	This driver supports FCoE offload for the QLogic NetXtreme II
drivers/scsi/qla2xxx/Kconfig +1 -1
index 7d65776..113e6c9 100644
@@ -31,7 +31,7 @@ config SCSI_QLA_FC
 config TCM_QLA2XXX
 	tristate "TCM_QLA2XXX fabric module for Qlogic 2xxx series target mode HBAs"
 	depends on SCSI_QLA_FC && TARGET_CORE
-	select LIBFC
+	depends on LIBFC
 	select BTREE
 	default n
 	---help---