Browse Source

IB/ipath: Print better error messages if kernel is misconfigured

Signed-off-by: Bryan O'Sullivan <bryan.osullivan@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
Bryan O'Sullivan 18 năm trước cách đây
mục cha
commit
820054b7ca

+ 10 - 2
drivers/infiniband/hw/ipath/ipath_driver.c

@@ -390,15 +390,23 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
 
 
 	/* setup the chip-specific functions, as early as possible. */
 	/* setup the chip-specific functions, as early as possible. */
 	switch (ent->device) {
 	switch (ent->device) {
-#ifdef CONFIG_HT_IRQ
 	case PCI_DEVICE_ID_INFINIPATH_HT:
 	case PCI_DEVICE_ID_INFINIPATH_HT:
+#ifdef CONFIG_HT_IRQ
 		ipath_init_iba6110_funcs(dd);
 		ipath_init_iba6110_funcs(dd);
 		break;
 		break;
+#else
+		ipath_dev_err(dd, "QLogic HT device 0x%x cannot work if "
+			      "CONFIG_HT_IRQ is not enabled\n", ent->device);
+		return -ENODEV;
 #endif
 #endif
-#ifdef CONFIG_PCI_MSI
 	case PCI_DEVICE_ID_INFINIPATH_PE800:
 	case PCI_DEVICE_ID_INFINIPATH_PE800:
+#ifdef CONFIG_PCI_MSI
 		ipath_init_iba6120_funcs(dd);
 		ipath_init_iba6120_funcs(dd);
 		break;
 		break;
+#else
+		ipath_dev_err(dd, "QLogic PCIE device 0x%x cannot work if "
+			      "CONFIG_PCI_MSI is not enabled\n", ent->device);
+		return -ENODEV;
 #endif
 #endif
 	default:
 	default:
 		ipath_dev_err(dd, "Found unknown QLogic deviceid 0x%x, "
 		ipath_dev_err(dd, "Found unknown QLogic deviceid 0x%x, "