64 lines
2.2 KiB
Diff
64 lines
2.2 KiB
Diff
From 3b33fb5615618bb666f2dea6713b4e888e2eae7a Mon Sep 17 00:00:00 2001
|
|
From: Ben Hutchings <ben@decadent.org.uk>
|
|
Date: Mon, 17 Aug 2009 01:18:50 +0100
|
|
Subject: [PATCH 1/3] ib_ipath: Disable support for IBA7220
|
|
|
|
IBA7220 requires non-free firmware which is about to be removed.
|
|
---
|
|
drivers/infiniband/hw/ipath/Makefile | 8 ++++----
|
|
drivers/infiniband/hw/ipath/ipath_driver.c | 4 ++++
|
|
2 files changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drivers/infiniband/hw/ipath/Makefile b/drivers/infiniband/hw/ipath/Makefile
|
|
index bf94500..42d8d4c 100644
|
|
--- a/drivers/infiniband/hw/ipath/Makefile
|
|
+++ b/drivers/infiniband/hw/ipath/Makefile
|
|
@@ -29,10 +29,10 @@ ib_ipath-y := \
|
|
ipath_user_pages.o \
|
|
ipath_user_sdma.o \
|
|
ipath_verbs_mcast.o \
|
|
- ipath_verbs.o \
|
|
- ipath_iba7220.o \
|
|
- ipath_sd7220.o \
|
|
- ipath_sd7220_img.o
|
|
+ ipath_verbs.o
|
|
+
|
|
+# IBA7220 depends on firmware to be removed
|
|
+ib_ipath-$(CONFIG_BROKEN) += ipath_iba7220.o ipath_sd7220.o
|
|
|
|
ib_ipath-$(CONFIG_HT_IRQ) += ipath_iba6110.o
|
|
ib_ipath-$(CONFIG_PCI_MSI) += ipath_iba6120.o
|
|
diff --git a/drivers/infiniband/hw/ipath/ipath_driver.c b/drivers/infiniband/hw/ipath/ipath_driver.c
|
|
index 04e88b6..20407a0 100644
|
|
--- a/drivers/infiniband/hw/ipath/ipath_driver.c
|
|
+++ b/drivers/infiniband/hw/ipath/ipath_driver.c
|
|
@@ -140,7 +140,9 @@ static int __devinit ipath_init_one(struct pci_dev *,
|
|
static const struct pci_device_id ipath_pci_tbl[] = {
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_PATHSCALE, PCI_DEVICE_ID_INFINIPATH_HT) },
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_PATHSCALE, PCI_DEVICE_ID_INFINIPATH_PE800) },
|
|
+#ifdef CONFIG_BROKEN
|
|
{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_INFINIPATH_7220) },
|
|
+#endif
|
|
{ 0, }
|
|
};
|
|
|
|
@@ -535,6 +537,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
|
|
"CONFIG_PCI_MSI is not enabled\n", ent->device);
|
|
return -ENODEV;
|
|
#endif
|
|
+#ifdef CONFIG_BROKEN
|
|
case PCI_DEVICE_ID_INFINIPATH_7220:
|
|
#ifndef CONFIG_PCI_MSI
|
|
ipath_dbg("CONFIG_PCI_MSI is not enabled, "
|
|
@@ -542,6 +545,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev,
|
|
#endif
|
|
ipath_init_iba7220_funcs(dd);
|
|
break;
|
|
+#endif
|
|
default:
|
|
ipath_dev_err(dd, "Found unknown QLogic deviceid 0x%x, "
|
|
"failing\n", ent->device);
|
|
--
|
|
1.6.3.3
|
|
|