Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 80750147 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/ipath: Correct capitalization "IntX" -> "INTx"
  IB/ipath: Remove tests of PCI_MSI in ipath_iba7220.c
  IB/ipath: Remove dependency on PCI_MSI || HT_IRQ
  IB/ipath: Build IBA7220 code unconditionally
  IB/ipath: Remove reference to dev->class_dev
  IB/ipath: Fix module parameter description for disable_sma
  RDMA/nes: Remove unneeded function declarations

Fix up conflict in drivers/infiniband/hw/ipath/ipath_verbs.c (by picking
the solution from the infiniband branch)
parents 28480770 bc751fe6

drivers/infiniband/hw/ipath/Kconfig

+1 −1
Original line number Diff line number Diff line 
config INFINIBAND_IPATH

	tristate "QLogic InfiniPath Driver"

	depends on (PCI_MSI || HT_IRQ) && 64BIT && NET

	depends on 64BIT && NET

	---help---

	This is a driver for QLogic InfiniPath host channel adapters,

	including InfiniBand verbs support.  This driver allows these

drivers/infiniband/hw/ipath/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -29,11 +29,13 @@ ib_ipath-y := \ 
	ipath_user_pages.o \

	ipath_user_sdma.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_PCI_MSI) += ipath_iba6120.o

ib_ipath-$(CONFIG_PCI_MSI) += ipath_iba7220.o ipath_sd7220.o ipath_sd7220_img.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

+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ static int __devinit ipath_init_one(struct pci_dev *pdev, 
	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);

			  "using INTx for unit %u\n", dd->ipath_unit);

#endif

		ipath_init_iba7220_funcs(dd);

		break;

drivers/infiniband/hw/ipath/ipath_iba7220.c

+9 −14
Original line number Diff line number Diff line
@@ -1215,13 +1215,13 @@ static int ipath_msi_enabled(struct pci_dev *pdev) 


/*

 * disable msi interrupt if enabled, and clear the flag.

 * flag is used primarily for the fallback to IntX, but

 * flag is used primarily for the fallback to INTx, but

 * is also used in reinit after reset as a flag.

 */

static void ipath_7220_nomsi(struct ipath_devdata *dd)

{

	dd->ipath_msi_lo = 0;

#ifdef CONFIG_PCI_MSI



	if (ipath_msi_enabled(dd->pcidev)) {

		/*

		 * free, but don't zero; later kernels require
@@ -1232,7 +1232,6 @@ static void ipath_7220_nomsi(struct ipath_devdata *dd) 
			free_irq(dd->ipath_irq, dd);

		pci_disable_msi(dd->pcidev);

	}

#endif

}



/*
@@ -1344,7 +1343,7 @@ static int ipath_setup_7220_config(struct ipath_devdata *dd, 
	u32 boardrev;



	dd->ipath_msi_lo = 0;	/* used as a flag during reset processing */

#ifdef CONFIG_PCI_MSI



	pos = pci_find_capability(pdev, PCI_CAP_ID_MSI);

	if (!strcmp(int_type, "force_msi") || !strcmp(int_type, "auto"))

		ret = pci_enable_msi(pdev);
@@ -1377,10 +1376,6 @@ static int ipath_setup_7220_config(struct ipath_devdata *dd, 
	} else

		ipath_dev_err(dd, "Can't find MSI capability, "

			      "can't save MSI settings for reset\n");

#else

	ipath_dbg("PCI_MSI not configured, using IntX interrupts\n");

	ipath_enable_intx(pdev);

#endif



	dd->ipath_irq = pdev->irq;
@@ -1583,7 +1578,7 @@ static void ipath_init_7220_variables(struct ipath_devdata *dd) 
static int ipath_reinit_msi(struct ipath_devdata *dd)

{

	int ret = 0;

#ifdef CONFIG_PCI_MSI



	int pos;

	u16 control;

	if (!dd->ipath_msi_lo) /* Using intX, or init problem */
@@ -1617,10 +1612,10 @@ static int ipath_reinit_msi(struct ipath_devdata *dd) 
			      ((control & PCI_MSI_FLAGS_64BIT) ? 12 : 8),

			      dd->ipath_msi_data);

	ret = 1;



bail:

#endif

	if (!ret) {

		ipath_dbg("Using IntX, MSI disabled or not configured\n");

		ipath_dbg("Using INTx, MSI disabled or not configured\n");

		ipath_enable_intx(dd->pcidev);

		ret = 1;

	}
@@ -2149,12 +2144,12 @@ static void ipath_7220_read_counters(struct ipath_devdata *dd, 
		counters[i] = ipath_snap_cntr(dd, i);

}



/* if we are using MSI, try to fallback to IntX */

/* if we are using MSI, try to fallback to INTx */

static int ipath_7220_intr_fallback(struct ipath_devdata *dd)

{

	if (dd->ipath_msi_lo) {

		dev_info(&dd->pcidev->dev, "MSI interrupt not detected,"

			" trying IntX interrupts\n");

			" trying INTx interrupts\n");

		ipath_7220_nomsi(dd);

		ipath_enable_intx(dd->pcidev);

		/*
@@ -2167,7 +2162,7 @@ static int ipath_7220_intr_fallback(struct ipath_devdata *dd) 
		if (request_irq(dd->ipath_irq, ipath_intr, IRQF_SHARED,

			IPATH_DRV_NAME, dd))

			ipath_dev_err(dd,

				"Could not re-request_irq for IntX\n");

				"Could not re-request_irq for INTx\n");

		return 1;

	}

	return 0;

drivers/infiniband/hw/ipath/ipath_verbs.c

+1 −2
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ MODULE_PARM_DESC(max_srq_wrs, "Maximum number of SRQ WRs support"); 


static unsigned int ib_ipath_disable_sma;

module_param_named(disable_sma, ib_ipath_disable_sma, uint, S_IWUSR | S_IRUGO);

MODULE_PARM_DESC(ib_ipath_disable_sma, "Disable the SMA");

MODULE_PARM_DESC(disable_sma, "Disable the SMA");



const int ib_ipath_state_ops[IB_QPS_ERR + 1] = {

	[IB_QPS_RESET] = 0,
@@ -2067,7 +2067,6 @@ int ipath_register_ib_device(struct ipath_devdata *dd) 
	dev->phys_port_cnt = 1;

	dev->num_comp_vectors = 1;

	dev->dma_device = &dd->pcidev->dev;

	dev->dev.parent = dev->dma_device;

	dev->query_device = ipath_query_device;

	dev->modify_device = ipath_modify_device;

	dev->query_port = ipath_query_port;