drivers/scsi/qla2xxx/Kconfig: two fixes

PATCH In review Adrian Bunk 3 participants 6 messages Jan 6, 2006 – Jan 9, 2006

Subsystems (2)

SCSI QLogic QLA2XXX FC-SCSI driver

lore

Share & tools

lore

Adrian Bunk

author

2006-01-06 16:34 UTC #0 lore raw

PATCH 1/1 drivers/scsi/qla2xxx/Kconfig: two fixes

This patch contains the following fixes for drivers/scsi/qla2xxx/Kconfig:
- add a help text for SCSI_QLA2XXX_EMBEDDED_FIRMWARE
- the firmware modules must depend on SCSI_QLA2XXX to prevent illegal configurations like SCSI_QLA2XXX=m, SCSI_QLA21XX=y

Signed-off-by Adrian Bunk <[email protected]>

---

 drivers/scsi/qla2xxx/Kconfig |   16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

drivers/scsi/qla2xxx/Kconfig renamed from drivers/scsi/qla2xxx/Kconfig.old +10 -6

@@ -29,42 +29,46 @@
 config SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	bool "  Use firmware-loader modules (DEPRECATED)"
 	depends on SCSI_QLA2XXX
+	help
+	  This option offers you the deprecated firmware-loader
+	  modules that have been obsoleted by the usage of the
+	  Firmware Loader interface in the qla2xxx driver.
 
 config SCSI_QLA21XX
 	tristate "  Build QLogic ISP2100 firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA2XXX && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 21xx (ISP2100) host adapter family.
 
 config SCSI_QLA22XX
 	tristate "  Build QLogic ISP2200 firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA2XXX && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 22xx (ISP2200) host adapter family.
 
 config SCSI_QLA2300
 	tristate "  Build QLogic ISP2300 firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA2XXX && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 2300 (ISP2300 and ISP2312) host
 	adapter family.
 
 config SCSI_QLA2322
 	tristate "  Build QLogic ISP2322 firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA2XXX && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 2322 (ISP2322) host adapter family.
 
 config SCSI_QLA6312
 	tristate "  Build QLogic ISP63xx firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA2XXX && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 63xx (ISP6312 and ISP6322) host
 	adapter family.
 
 config SCSI_QLA24XX
 	tristate "  Build QLogic ISP24xx firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA2XXX && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 24xx (ISP2422 and ISP2432) host
 	adapter family.

Andrew Vasquez

2006-01-06 21:12 UTC #1 lore raw

Quoted 8 lines · Adrian Bunk

This patch contains the following fixes for drivers/scsi/qla2xxx/Kconfig:
- add a help text for SCSI_QLA2XXX_EMBEDDED_FIRMWARE
- the firmware modules must depend on SCSI_QLA2XXX to prevent illegal configurations like SCSI_QLA2XXX=m, SCSI_QLA21XX=y
Signed-off-by Adrian Bunk <[email protected]>

Ack.

--
Andrew Vasquez

Adrian Bunk

author

2006-01-06 23:09 UTC #2 lore raw

Quoted 9 lines · Andrew Vasquez

Quoted 7 lines · Adrian Bunk
This patch contains the following fixes for drivers/scsi/qla2xxx/Kconfig:
- add a help text for SCSI_QLA2XXX_EMBEDDED_FIRMWARE
- the firmware modules must depend on SCSI_QLA2XXX to prevent illegal configurations like SCSI_QLA2XXX=m, SCSI_QLA21XX=y

Quoted 3 lines

Quoted 1 line
Signed-off-by Adrian Bunk <[email protected]>
Ack.

There's another bug that must be fixed:

SCSI_QLA2XXX must be renamed.

The problem is that up to 2.6.15, it was a not user visible variable that was set for _everyone_ with SCSI && PCI and that didn't have any influence on what was built.

E.g. it is set in the .config for my computer since my computer has PCI cards and I'm using USB mass storage.

Due to the change of SCSI_QLA2XXX to a user-visible option that builds the driver, this means that suddenly after upgrading the kernel and running "make oldconfig" a SCSI driver gets built the user never selected.

Do you have any suggestions for a new name?
We could e.g. name it SCSI_QLAXXXX since the driver also supports 6312/6322, or name it simply SCSI_QLA.

Quoted 1 line

Andrew Vasquez

cu
Adrian

Signature · 4 lines

       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed

Matthew Wilcox

2006-01-07 23:50 UTC #3 lore raw

Quoted 8 lines · Adrian Bunk

Due to the change of SCSI_QLA2XXX to a user-visible option that builds the driver, this means that suddenly after upgrading the kernel and running "make oldconfig" a SCSI driver gets built the user never selected.
Do you have any suggestions for a new name?
We could e.g. name it SCSI_QLAXXXX since the driver also supports 6312/6322, or name it simply SCSI_QLA.

SCSI_QLOGIC_FC? Or does this driver handle SAS too?

Andrew Vasquez

2006-01-09 17:56 UTC #4 lore raw

Quoted 11 lines · Matthew Wilcox

Quoted 8 lines · Adrian Bunk
Due to the change of SCSI_QLA2XXX to a user-visible option that builds the driver, this means that suddenly after upgrading the kernel and running "make oldconfig" a SCSI driver gets built the user never selected.
Do you have any suggestions for a new name?
We could e.g. name it SCSI_QLAXXXX since the driver also supports 6312/6322, or name it simply SCSI_QLA.
SCSI_QLOGIC_FC? Or does this driver handle SAS too?

There will be (shortly, I hope) an iSCSI driver for QLogic's qla4xxx boards submitted for review...

Here's a composite patch with Adrian's original additions and help-text with the new Kconfig variable SCSI_QLA_FC.

---

drivers/scsi/qla2xxx/Kconfig +12 -8

index 5205c4e..02cc794 100644
@@ -1,4 +1,4 @@
-config SCSI_QLA2XXX
+config SCSI_QLA_FC
 	tristate "QLogic QLA2XXX Fibre Channel Support"
 	depends on PCI && SCSI
 	select SCSI_FC_ATTRS

@@ -28,43 +28,47 @@ config SCSI_QLA2XXX
 
 config SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	bool "  Use firmware-loader modules (DEPRECATED)"
-	depends on SCSI_QLA2XXX
+	depends on SCSI_QLA_FC
+	help
+	  This option offers you the deprecated firmware-loader
+	  modules that have been obsoleted by the usage of the
+	  Firmware Loader interface in the qla2xxx driver.
 
 config SCSI_QLA21XX
 	tristate "  Build QLogic ISP2100 firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 21xx (ISP2100) host adapter family.
 
 config SCSI_QLA22XX
 	tristate "  Build QLogic ISP2200 firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 22xx (ISP2200) host adapter family.
 
 config SCSI_QLA2300
 	tristate "  Build QLogic ISP2300 firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 2300 (ISP2300 and ISP2312) host
 	adapter family.
 
 config SCSI_QLA2322
 	tristate "  Build QLogic ISP2322 firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 2322 (ISP2322) host adapter family.
 
 config SCSI_QLA6312
 	tristate "  Build QLogic ISP63xx firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 63xx (ISP6312 and ISP6322) host
 	adapter family.
 
 config SCSI_QLA24XX
 	tristate "  Build QLogic ISP24xx firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 24xx (ISP2422 and ISP2432) host
 	adapter family.

drivers/scsi/qla2xxx/Makefile +1 -1

index 40c0de1..d028bc5 100644
@@ -3,7 +3,7 @@ EXTRA_CFLAGS += -DUNIQUE_FW_NAME
 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
 		qla_dbg.o qla_sup.o qla_rscn.o qla_attr.o
 
-obj-$(CONFIG_SCSI_QLA2XXX) += qla2xxx.o
+obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
 
 qla2100-y := ql2100.o ql2100_fw.o
 qla2200-y := ql2200.o ql2200_fw.o

Andrew Vasquez

2006-01-09 18:17 UTC #5 lore raw

Quoted 12 lines · Andrew Vasquez

Quoted 10 lines · Matthew Wilcox
Quoted 8 lines · Adrian Bunk
Due to the change of SCSI_QLA2XXX to a user-visible option that builds the driver, this means that suddenly after upgrading the kernel and running "make oldconfig" a SCSI driver gets built the user never selected.
Do you have any suggestions for a new name?
We could e.g. name it SCSI_QLAXXXX since the driver also supports 6312/6322, or name it simply SCSI_QLA.

Quoted 7 lines

Quoted 1 line
SCSI_QLOGIC_FC? Or does this driver handle SAS too?
There will be (shortly, I hope) an iSCSI driver for QLogic's qla4xxx boards submitted for review...
Here's a composite patch with Adrian's original additions and help-text with the new Kconfig variable SCSI_QLA_FC.

Sorry, my proficiency in Kconfig is... weak to say the least...

Here's one that should work...

---

drivers/scsi/Makefile +1 -1

index f062ea0..b9d2bb8 100644
@@ -80,7 +80,7 @@ obj-$(CONFIG_SCSI_QLOGIC_FAS)	+= qlogicf
 obj-$(CONFIG_PCMCIA_QLOGIC)	+= qlogicfas408.o
 obj-$(CONFIG_SCSI_QLOGIC_FC)	+= qlogicfc.o 
 obj-$(CONFIG_SCSI_QLOGIC_1280)	+= qla1280.o 
-obj-$(CONFIG_SCSI_QLA2XXX)	+= qla2xxx/
+obj-$(CONFIG_SCSI_QLA_FC)	+= qla2xxx/
 obj-$(CONFIG_SCSI_LPFC)		+= lpfc/
 obj-$(CONFIG_SCSI_PAS16)	+= pas16.o
 obj-$(CONFIG_SCSI_SEAGATE)	+= seagate.o

drivers/scsi/qla2xxx/Kconfig +12 -8

index 5205c4e..02cc794 100644
@@ -1,4 +1,4 @@
-config SCSI_QLA2XXX
+config SCSI_QLA_FC
 	tristate "QLogic QLA2XXX Fibre Channel Support"
 	depends on PCI && SCSI
 	select SCSI_FC_ATTRS

@@ -28,43 +28,47 @@ config SCSI_QLA2XXX
 
 config SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	bool "  Use firmware-loader modules (DEPRECATED)"
-	depends on SCSI_QLA2XXX
+	depends on SCSI_QLA_FC
+	help
+	  This option offers you the deprecated firmware-loader
+	  modules that have been obsoleted by the usage of the
+	  Firmware Loader interface in the qla2xxx driver.
 
 config SCSI_QLA21XX
 	tristate "  Build QLogic ISP2100 firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 21xx (ISP2100) host adapter family.
 
 config SCSI_QLA22XX
 	tristate "  Build QLogic ISP2200 firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 22xx (ISP2200) host adapter family.
 
 config SCSI_QLA2300
 	tristate "  Build QLogic ISP2300 firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 2300 (ISP2300 and ISP2312) host
 	adapter family.
 
 config SCSI_QLA2322
 	tristate "  Build QLogic ISP2322 firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 2322 (ISP2322) host adapter family.
 
 config SCSI_QLA6312
 	tristate "  Build QLogic ISP63xx firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 63xx (ISP6312 and ISP6322) host
 	adapter family.
 
 config SCSI_QLA24XX
 	tristate "  Build QLogic ISP24xx firmware-module"
-	depends on SCSI_QLA2XXX_EMBEDDED_FIRMWARE
+	depends on SCSI_QLA_FC && SCSI_QLA2XXX_EMBEDDED_FIRMWARE
 	---help---
 	This driver supports the QLogic 24xx (ISP2422 and ISP2432) host
 	adapter family.

drivers/scsi/qla2xxx/Makefile +1 -1

index 40c0de1..d028bc5 100644
@@ -3,7 +3,7 @@ EXTRA_CFLAGS += -DUNIQUE_FW_NAME
 qla2xxx-y := qla_os.o qla_init.o qla_mbx.o qla_iocb.o qla_isr.o qla_gs.o \
 		qla_dbg.o qla_sup.o qla_rscn.o qla_attr.o
 
-obj-$(CONFIG_SCSI_QLA2XXX) += qla2xxx.o
+obj-$(CONFIG_SCSI_QLA_FC) += qla2xxx.o
 
 qla2100-y := ql2100.o ql2100_fw.o
 qla2200-y := ql2200.o ql2200_fw.o