IB/ipath: Remove support for QLogic PCIe QLE devices (f6d60848) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/infiniband/hw/ipath/Kconfig

+5 −3

Original line number	Original line	Diff line number	Diff line
	config INFINIBAND_IPATH		config INFINIBAND_IPATH
	tristate "QLogic InfiniPath Driver"		tristate "QLogic HTX HCA support"
	depends on 64BIT && NET		depends on 64BIT && NET && HT_IRQ
	---help---		---help---
	This is a driver for QLogic InfiniPath host channel adapters,		This is a driver for the obsolete QLogic Hyper-Transport
			IB host channel adapter (model QHT7140),
	including InfiniBand verbs support. This driver allows these		including InfiniBand verbs support. This driver allows these
	devices to be used with both kernel upper level protocols such		devices to be used with both kernel upper level protocols such
	as IP-over-InfiniBand as well as with userspace applications		as IP-over-InfiniBand as well as with userspace applications
	(in conjunction with InfiniBand userspace access).		(in conjunction with InfiniBand userspace access).
			For QLogic PCIe QLE based cards, use the QIB driver instead.

drivers/infiniband/hw/ipath/Makefile

+1 −5

Original line number	Original line	Diff line number	Diff line
	@@ -29,13 +29,9 @@ ib_ipath-y := \
	ipath_user_pages.o \		ipath_user_pages.o \
	ipath_user_sdma.o \		ipath_user_sdma.o \
	ipath_verbs_mcast.o \		ipath_verbs_mcast.o \
	ipath_verbs.o \		ipath_verbs.o
	ipath_iba7220.o \
	ipath_sd7220.o \
	ipath_sd7220_img.o

	ib_ipath-$(CONFIG_HT_IRQ) += ipath_iba6110.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_X86_64) += ipath_wc_x86_64.o
	ib_ipath-$(CONFIG_PPC64) += ipath_wc_ppc64.o		ib_ipath-$(CONFIG_PPC64) += ipath_wc_ppc64.o

drivers/infiniband/hw/ipath/ipath_7220.h

deleted100644 → 0

+0 −57

Original line number	Original line	Diff line number	Diff line
	#ifndef _IPATH_7220_H
	#define _IPATH_7220_H
	/*
	* Copyright (c) 2007 QLogic Corporation. All rights reserved.
	*
	* This software is available to you under a choice of one of two
	* licenses. You may choose to be licensed under the terms of the GNU
	* General Public License (GPL) Version 2, available from the file
	* COPYING in the main directory of this source tree, or the
	* OpenIB.org BSD license below:
	*
	* Redistribution and use in source and binary forms, with or
	* without modification, are permitted provided that the following
	* conditions are met:
	*
	* - Redistributions of source code must retain the above
	* copyright notice, this list of conditions and the following
	* disclaimer.
	*
	* - Redistributions in binary form must reproduce the above
	* copyright notice, this list of conditions and the following
	* disclaimer in the documentation and/or other materials
	* provided with the distribution.
	*
	* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
	* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
	* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
	* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
	* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
	* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
	* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
	* SOFTWARE.
	*/

	/*
	* This header file provides the declarations and common definitions
	* for (mostly) manipulation of the SerDes blocks within the IBA7220.
	* the functions declared should only be called from within other
	* 7220-related files such as ipath_iba7220.c or ipath_sd7220.c.
	*/
	int ipath_sd7220_presets(struct ipath_devdata *dd);
	int ipath_sd7220_init(struct ipath_devdata *dd, int was_reset);
	int ipath_sd7220_prog_ld(struct ipath_devdata dd, int sdnum, u8 img,
	int len, int offset);
	int ipath_sd7220_prog_vfy(struct ipath_devdata dd, int sdnum, const u8 img,
	int len, int offset);
	/*
	* Below used for sdnum parameter, selecting one of the two sections
	* used for PCIe, or the single SerDes used for IB, which is the
	* only one currently used
	*/
	#define IB_7220_SERDES 2

	int ipath_sd7220_ib_load(struct ipath_devdata *dd);
	int ipath_sd7220_ib_vfy(struct ipath_devdata *dd);

	#endif /* _IPATH_7220_H */

drivers/infiniband/hw/ipath/ipath_driver.c

+1 −27

Original line number	Original line	Diff line number	Diff line
	@@ -132,18 +132,13 @@ static int __devinit ipath_init_one(struct pci_dev *,

	/* Only needed for registration, nothing else needs this info */		/* Only needed for registration, nothing else needs this info */
	#define PCI_VENDOR_ID_PATHSCALE 0x1fc1		#define PCI_VENDOR_ID_PATHSCALE 0x1fc1
	#define PCI_VENDOR_ID_QLOGIC 0x1077
	#define PCI_DEVICE_ID_INFINIPATH_HT 0xd		#define PCI_DEVICE_ID_INFINIPATH_HT 0xd
	#define PCI_DEVICE_ID_INFINIPATH_PE800 0x10
	#define PCI_DEVICE_ID_INFINIPATH_7220 0x7220

	/* Number of seconds before our card status check... */		/* Number of seconds before our card status check... */
	#define STATUS_TIMEOUT 60		#define STATUS_TIMEOUT 60

	static const struct pci_device_id ipath_pci_tbl[] = {		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_HT) },
	{ PCI_DEVICE(PCI_VENDOR_ID_PATHSCALE, PCI_DEVICE_ID_INFINIPATH_PE800) },
	{ PCI_DEVICE(PCI_VENDOR_ID_QLOGIC, PCI_DEVICE_ID_INFINIPATH_7220) },
	{ 0, }		{ 0, }
	};		};

	@@ -521,30 +516,9 @@ 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) {
	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
	case PCI_DEVICE_ID_INFINIPATH_PE800:
	#ifdef CONFIG_PCI_MSI
	ipath_init_iba6120_funcs(dd);
	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
	case PCI_DEVICE_ID_INFINIPATH_7220:
	#ifndef CONFIG_PCI_MSI
	ipath_dbg("CONFIG_PCI_MSI is not enabled, "
	"using INTx for unit %u\n", dd->ipath_unit);
	#endif
	ipath_init_iba7220_funcs(dd);
	break;
	default:		default:
	ipath_dev_err(dd, "Found unknown QLogic deviceid 0x%x, "		ipath_dev_err(dd, "Found unknown QLogic deviceid 0x%x, "
	"failing\n", ent->device);		"failing\n", ent->device);

drivers/infiniband/hw/ipath/ipath_iba6120.c

deleted100644 → 0

+0 −1862

File deleted.

Preview size limit exceeded, changes collapsed.