From: Jeff Garzik <jgarzik@pobox.com>
To: Andrew Morton <akpm@osdl.org>, Linus Torvalds <torvalds@osdl.org>
Cc: linux-ide@vger.kernel.org, linux-kernel@vger.kernel.org,
davej@redhat.com
Subject: [PATCH] libata: fix broken Kconfig setup
Date: Mon, 17 Oct 2005 00:46:06 -0400 [thread overview]
Message-ID: <20051017044606.GA1266@havoc.gtf.org> (raw)
The patch described in commit faa725332f39329288f52b7f872ffda866ba5b09
> [PATCH] SCSI_SATA has to be a tristate
causes the PCI quirk in drivers/pci/quirk.c (quirk_intel_ide_combined)
to disappear, unless CONFIG_SCSI_SATA==y. This, in turn, causes all
manner of booting and interaction problems between the IDE driver and
libata.
CONFIG_SCSI_SATA is truly a boolean option, not a tristate.
Since the Kconfig dependencies are insufficient to describe this (2.4
had dep_mbool), we need to resort to 'if'.
This fix is twofold:
1) Fix IDE/libata conflict by ensuring that CONFIG_SCSI_SATA symbol
always exists (rather than bothering with CONFIG_SCSI_SATA_MODULE).
2) Restore CONFIG_SCSI_SATA's rightful boolean status, and employ
'if' to obtain the proper menu behavior.
Please apply, so that people cursed with PATA/SATA "combined mode"
can have a working configuration again.
diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -437,7 +437,7 @@ config SCSI_IN2000
source "drivers/scsi/megaraid/Kconfig.megaraid"
config SCSI_SATA
- tristate "Serial ATA (SATA) support"
+ bool "Serial ATA (SATA) support"
depends on SCSI
help
This driver family supports Serial ATA host controllers
@@ -445,9 +445,11 @@ config SCSI_SATA
If unsure, say N.
+if SCSI_SATA
+
config SCSI_SATA_AHCI
tristate "AHCI SATA support"
- depends on SCSI_SATA && PCI
+ depends on SCSI && PCI
help
This option enables support for AHCI Serial ATA.
@@ -455,7 +457,7 @@ config SCSI_SATA_AHCI
config SCSI_SATA_SVW
tristate "ServerWorks Frodo / Apple K2 SATA support"
- depends on SCSI_SATA && PCI
+ depends on SCSI && PCI
help
This option enables support for Broadcom/Serverworks/Apple K2
SATA support.
@@ -464,7 +466,7 @@ config SCSI_SATA_SVW
config SCSI_ATA_PIIX
tristate "Intel PIIX/ICH SATA support"
- depends on SCSI_SATA && PCI
+ depends on SCSI && PCI
help
This option enables support for ICH5 Serial ATA.
If PATA support was enabled previously, this enables
@@ -474,7 +476,7 @@ config SCSI_ATA_PIIX
config SCSI_SATA_MV
tristate "Marvell SATA support"
- depends on SCSI_SATA && PCI && EXPERIMENTAL
+ depends on SCSI && PCI && EXPERIMENTAL
help
This option enables support for the Marvell Serial ATA family.
Currently supports 88SX[56]0[48][01] chips.
@@ -483,7 +485,7 @@ config SCSI_SATA_MV
config SCSI_SATA_NV
tristate "NVIDIA SATA support"
- depends on SCSI_SATA && PCI && EXPERIMENTAL
+ depends on SCSI && PCI && EXPERIMENTAL
help
This option enables support for NVIDIA Serial ATA.
@@ -491,7 +493,7 @@ config SCSI_SATA_NV
config SCSI_SATA_PROMISE
tristate "Promise SATA TX2/TX4 support"
- depends on SCSI_SATA && PCI
+ depends on SCSI && PCI
help
This option enables support for Promise Serial ATA TX2/TX4.
@@ -499,7 +501,7 @@ config SCSI_SATA_PROMISE
config SCSI_SATA_QSTOR
tristate "Pacific Digital SATA QStor support"
- depends on SCSI_SATA && PCI
+ depends on SCSI && PCI
help
This option enables support for Pacific Digital Serial ATA QStor.
@@ -507,7 +509,7 @@ config SCSI_SATA_QSTOR
config SCSI_SATA_SX4
tristate "Promise SATA SX4 support"
- depends on SCSI_SATA && PCI && EXPERIMENTAL
+ depends on SCSI && PCI && EXPERIMENTAL
help
This option enables support for Promise Serial ATA SX4.
@@ -515,7 +517,7 @@ config SCSI_SATA_SX4
config SCSI_SATA_SIL
tristate "Silicon Image SATA support"
- depends on SCSI_SATA && PCI && EXPERIMENTAL
+ depends on SCSI && PCI && EXPERIMENTAL
help
This option enables support for Silicon Image Serial ATA.
@@ -523,7 +525,7 @@ config SCSI_SATA_SIL
config SCSI_SATA_SIS
tristate "SiS 964/180 SATA support"
- depends on SCSI_SATA && PCI && EXPERIMENTAL
+ depends on SCSI && PCI && EXPERIMENTAL
help
This option enables support for SiS Serial ATA 964/180.
@@ -531,7 +533,7 @@ config SCSI_SATA_SIS
config SCSI_SATA_ULI
tristate "ULi Electronics SATA support"
- depends on SCSI_SATA && PCI && EXPERIMENTAL
+ depends on SCSI && PCI && EXPERIMENTAL
help
This option enables support for ULi Electronics SATA.
@@ -539,7 +541,7 @@ config SCSI_SATA_ULI
config SCSI_SATA_VIA
tristate "VIA SATA support"
- depends on SCSI_SATA && PCI
+ depends on SCSI && PCI
help
This option enables support for VIA Serial ATA.
@@ -547,12 +549,14 @@ config SCSI_SATA_VIA
config SCSI_SATA_VITESSE
tristate "VITESSE VSC-7174 SATA support"
- depends on SCSI_SATA && PCI
+ depends on SCSI && PCI
help
This option enables support for Vitesse VSC7174 Serial ATA.
If unsure, say N.
+endif # if SCSI_SATA
+
config SCSI_BUSLOGIC
tristate "BusLogic SCSI support"
depends on (PCI || ISA || MCA) && SCSI && ISA_DMA_API
next reply other threads:[~2005-10-17 4:46 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-17 4:46 Jeff Garzik [this message]
2005-10-17 11:10 ` [PATCH] libata: fix broken Kconfig setup Matthias Urlichs
2005-10-17 11:20 ` Jeff Garzik
2005-10-17 15:14 ` Linus Torvalds
2005-10-17 15:32 ` Jeff Garzik
2005-10-17 15:58 ` Linus Torvalds
2005-10-17 16:21 ` Jeff Garzik
2005-10-17 16:38 ` Linus Torvalds
2005-10-17 16:53 ` Linus Torvalds
2005-10-17 17:11 ` Jeff Garzik
2005-10-17 17:25 ` Linus Torvalds
2005-10-17 17:38 ` Jeff Garzik
2005-10-19 11:49 ` Alistair John Strachan
2005-10-19 16:02 ` Randy.Dunlap
2005-10-17 17:01 ` Jeff Garzik
2005-10-18 11:15 ` Sergey Vlasov
2005-10-18 20:56 ` Jeff Garzik
2005-10-17 17:12 ` Linus Torvalds
2005-10-17 17:22 ` Jeff Garzik
2005-10-17 16:52 ` Jesse Barnes
2005-10-17 17:03 ` Jeff Garzik
2005-10-17 17:06 ` Jesse Barnes
2005-10-17 17:16 ` Jeff Garzik
2005-10-20 14:14 ` Alan Cox
2005-10-20 16:45 ` Jesse Barnes
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051017044606.GA1266@havoc.gtf.org \
--to=jgarzik@pobox.com \
--cc=akpm@osdl.org \
--cc=davej@redhat.com \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).