Skip to contentSkip to conversation

ia64: fix allmodconfig build

PATCH In review [email protected] 3 participants 4 messages Nov 16, 2006 InfiniBand

lore
Share & tools
lore
#0 lore raw

PATCH 4/4 ia64: fix allmodconfig build

From: "Luck, Tony" <[email protected]>

The HP_SIMSCSI driver can't be built as a module (unhealthy dependencies on things that shouldn't really be exported).

AMD and nVidia IDE support doesn't sound too useful for ia64 either :-)

With these two patches allmodconfig builds (but takes 11m24s, ouch!)

---

 arch/ia64/hp/sim/Kconfig |    4 ++--
 drivers/ide/Kconfig      |    1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
arch/ia64/hp/sim/Kconfig renamed from arch/ia64/hp/sim/Kconfig~ia64-fix-allmodconfig-build +2 -2
diff -puN arch/ia64/hp/sim/Kconfig~ia64-fix-allmodconfig-build arch/ia64/hp/sim/Kconfig
@@ -13,8 +13,8 @@ config HP_SIMSERIAL_CONSOLE
 	depends on HP_SIMSERIAL
 
 config HP_SIMSCSI
-	tristate "Simulated SCSI disk"
-	depends on SCSI
+	bool "Simulated SCSI disk"
+	depends on SCSI=y
 
 endmenu
 
drivers/ide/Kconfig renamed from drivers/ide/Kconfig~ia64-fix-allmodconfig-build +1 -0
diff -puN drivers/ide/Kconfig~ia64-fix-allmodconfig-build drivers/ide/Kconfig
@@ -486,6 +486,7 @@ config WDC_ALI15X3
 
 config BLK_DEV_AMD74XX
 	tristate "AMD and nVidia IDE support"
+	depends on X86
 	help
 	  This driver adds explicit support for AMD-7xx and AMD-8111 chips
 	  and also for the nVidia nForce chip.  This allows the kernel to

_

#1 lore raw

drivers/ide/Kconfig config WDC_ALI15X3 · line 492

Quoted 11 lines

diff -puN drivers/ide/Kconfig~ia64-fix-allmodconfig-build drivers/ide/Kconfig

drivers/ide/Kconfig renamed from drivers/ide/Kconfig~ia64-fix-allmodconfig-build +1 -0
@@ -486,6 +486,7 @@ config WDC_ALI15X3
 
 config BLK_DEV_AMD74XX
 	tristate "AMD and nVidia IDE support"
+	depends on X86
 	help
 	  This driver adds explicit support for AMD-7xx and AMD-8111 chips
 	  and also for the nVidia nForce chip.  This allows the kernel to

NAK this part. The AMD74xx chipset also supports Alpha. I've no idea what the situation is with the Nvidia parts. It also goes against the general policy of building everything that can be built on each platform so as to find bugs/portability problems early.

Alan

#2 lore raw
In reply to [email protected]
Quoted 8 lines · Alan

drivers/ide/Kconfig config WDC_ALI15X3 · line 489

Quoted 3 lines

config BLK_DEV_AMD74XX

drivers/ide/Kconfig renamed from drivers/ide/Kconfig~ia64-fix-allmodconfig-build +1 -0
 	tristate "AMD and nVidia IDE support"
+	depends on X86

NAK this part. The AMD74xx chipset also supports Alpha. I've no idea what the situation is with the Nvidia parts. It also goes against the general policy of building everything that can be built on each platform so as to find bugs/portability problems early.

Is the problem is with the driver? amd74xx.c uses pci_get_legacy_ide_irq(), ia64 doesn't have this defined (and I don't think that creating such a function would be right for ia64).

This is the only driver that uses pci_get_legacy_ide_irq ... is that a red flag that it is doing something strange (or something that has been superceeded by some other mechanism)?

I'll apply the other hunk (for simscsi). Some bit of infiniband is now also breaking allmodconfig, so it is not like this patch is the only thing stopping allmodconfig from working.

-Tony

#3 lore raw
In reply to [email protected]
Quoted 3 lines · Tony

Some bit of infiniband is
now also breaking allmodconfig, so it is not like this patch is the only thing stopping allmodconfig from working.

I sent the below to Linus yesterday - it should fix that.

From: "Bryan O'Sullivan" <[email protected]>

The PCI Express and Hypertransport chip-specific source files should only be built when the kernel has the capability of actually compiling them.

This fixes the driver build on, for example, ia64.

Cc "Eric W. Biederman" <[email protected]>
Cc Roland Dreier <[email protected]>

---

 drivers/infiniband/hw/ipath/Kconfig        |    2 +-
 drivers/infiniband/hw/ipath/Makefile       |    5 +++--
 drivers/infiniband/hw/ipath/ipath_driver.c |    4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)
drivers/infiniband/hw/ipath/Kconfig renamed from drivers/infiniband/hw/ipath/Kconfig~ib-ipath-fix-driver-build-for-platforms-with-pci-but-not-ht +1 -1
diff -puN drivers/infiniband/hw/ipath/Kconfig~ib-ipath-fix-driver-build-for-platforms-with-pci-but-not-ht drivers/infiniband/hw/ipath/Kconfig
@@ -1,6 +1,6 @@
 config INFINIBAND_IPATH
 	tristate "QLogic InfiniPath Driver"
-	depends on PCI_MSI && 64BIT && INFINIBAND
+	depends on (PCI_MSI || HT_IRQ) && 64BIT && INFINIBAND
 	---help---
 	This is a driver for QLogic InfiniPath host channel adapters,
 	including InfiniBand verbs support.  This driver allows these
drivers/infiniband/hw/ipath/Makefile renamed from drivers/infiniband/hw/ipath/Makefile~ib-ipath-fix-driver-build-for-platforms-with-pci-but-not-ht +3 -2
diff -puN drivers/infiniband/hw/ipath/Makefile~ib-ipath-fix-driver-build-for-platforms-with-pci-but-not-ht drivers/infiniband/hw/ipath/Makefile
@@ -10,8 +10,6 @@ ib_ipath-y := \
 	ipath_eeprom.o \
 	ipath_file_ops.o \
 	ipath_fs.o \
-	ipath_iba6110.o \
-	ipath_iba6120.o \
 	ipath_init_chip.o \
 	ipath_intr.o \
 	ipath_keys.o \
@@ -31,5 +29,8 @@ ib_ipath-y := \
 	ipath_verbs_mcast.o \
 	ipath_verbs.o
 
+ib_ipath-$(CONFIG_HT_IRQ) += ipath_iba6110.o
+ib_ipath-$(CONFIG_PCI_MSI) += ipath_iba6120.o
+
 ib_ipath-$(CONFIG_X86_64) += ipath_wc_x86_64.o
 ib_ipath-$(CONFIG_PPC64) += ipath_wc_ppc64.o
drivers/infiniband/hw/ipath/ipath_driver.c renamed from drivers/infiniband/hw/ipath/ipath_driver.c~ib-ipath-fix-driver-build-for-platforms-with-pci-but-not-ht +4 -0
diff -puN drivers/infiniband/hw/ipath/ipath_driver.c~ib-ipath-fix-driver-build-for-platforms-with-pci-but-not-ht drivers/infiniband/hw/ipath/ipath_driver.c
@@ -390,12 +390,16 @@ static int __devinit ipath_init_one(stru
 
 	/* setup the chip-specific functions, as early as possible. */
 	switch (ent->device) {
+#ifdef CONFIG_HT_IRQ
 	case PCI_DEVICE_ID_INFINIPATH_HT:
 		ipath_init_iba6110_funcs(dd);
 		break;
+#endif
+#ifdef CONFIG_PCI_MSI
 	case PCI_DEVICE_ID_INFINIPATH_PE800:
 		ipath_init_iba6120_funcs(dd);
 		break;
+#endif
 	default:
 		ipath_dev_err(dd, "Found unknown QLogic deviceid 0x%x, "
 			      "failing\n", ent->device);

_