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

Commit b37eb210 authored by Manish Chopra's avatar Manish Chopra Committed by David S. Miller
Browse files

netxen_nic: Avoid mixed mode interrupts 



o Adapters do not support co-existence of INTx Interrupt with
  MSI-X or MSI among multiple functions. Prevent attaching
  of a function during normal load, if adapter gets into mixed
  mode of interrupts

Signed-off-by: default avatarManish Chopra <manish.chopra@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a120e864

drivers/net/ethernet/qlogic/netxen/netxen_nic_hdr.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -734,6 +734,9 @@ enum { 
#define NIC_CRB_BASE_2		(NETXEN_CAM_RAM(0x700))

#define NIC_CRB_BASE_2		(NETXEN_CAM_RAM(0x700))

#define NETXEN_NIC_REG(X)	(NIC_CRB_BASE+(X))

#define NETXEN_NIC_REG(X)	(NIC_CRB_BASE+(X))

#define NETXEN_NIC_REG_2(X)	(NIC_CRB_BASE_2+(X))

#define NETXEN_NIC_REG_2(X)	(NIC_CRB_BASE_2+(X))

#define NETXEN_INTR_MODE_REG	NETXEN_NIC_REG(0x44)

#define NETXEN_MSI_MODE		0x1

#define NETXEN_INTX_MODE	0x2





#define NX_CDRP_CRB_OFFSET		(NETXEN_NIC_REG(0x18))

#define NX_CDRP_CRB_OFFSET		(NETXEN_NIC_REG(0x18))

#define NX_ARG1_CRB_OFFSET		(NETXEN_NIC_REG(0x1c))

#define NX_ARG1_CRB_OFFSET		(NETXEN_NIC_REG(0x1c))

drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c

+43 −7
Original line number Original line Diff line number Diff line
@@ -592,6 +592,22 @@ static const struct net_device_ops netxen_netdev_ops = { 
#endif

#endif

};

};





static inline bool netxen_function_zero(struct pci_dev *pdev)

{

	return (PCI_FUNC(pdev->devfn) == 0) ? true : false;

}



static inline void netxen_set_interrupt_mode(struct netxen_adapter *adapter,

					     u32 mode)

{

	NXWR32(adapter, NETXEN_INTR_MODE_REG, mode);

}



static inline u32 netxen_get_interrupt_mode(struct netxen_adapter *adapter)

{

	return NXRD32(adapter, NETXEN_INTR_MODE_REG);

}



static void

static void

netxen_initialize_interrupt_registers(struct netxen_adapter *adapter)

netxen_initialize_interrupt_registers(struct netxen_adapter *adapter)

{

{
@@ -654,10 +670,11 @@ static int netxen_setup_msi_interrupts(struct netxen_adapter *adapter, 
		return 0;

		return 0;

	}

	}





	dev_err(&pdev->dev, "Failed to acquire MSI-X/MSI interrupt vector\n");

	return -EIO;

	return -EIO;

}

}





static void netxen_setup_intr(struct netxen_adapter *adapter)

static int netxen_setup_intr(struct netxen_adapter *adapter)

{

{

	struct pci_dev *pdev = adapter->pdev;

	struct pci_dev *pdev = adapter->pdev;

	int num_msix;

	int num_msix;
@@ -674,12 +691,25 @@ static void netxen_setup_intr(struct netxen_adapter *adapter) 
	netxen_initialize_interrupt_registers(adapter);

	netxen_initialize_interrupt_registers(adapter);

	netxen_set_msix_bit(pdev, 0);

	netxen_set_msix_bit(pdev, 0);





	if (netxen_function_zero(pdev)) {

		if (!netxen_setup_msi_interrupts(adapter, num_msix))

		if (!netxen_setup_msi_interrupts(adapter, num_msix))

		return;

			netxen_set_interrupt_mode(adapter, NETXEN_MSI_MODE);

		else

			netxen_set_interrupt_mode(adapter, NETXEN_INTX_MODE);

	} else {

		if (netxen_get_interrupt_mode(adapter) == NETXEN_MSI_MODE &&

		    netxen_setup_msi_interrupts(adapter, num_msix)) {

			dev_err(&pdev->dev, "Co-existence of MSI-X/MSI and INTx interrupts is not supported\n");

			return -EIO;

		}

	}





	if (!NETXEN_IS_MSI_FAMILY(adapter)) {

		adapter->msix_entries[0].vector = pdev->irq;

		adapter->msix_entries[0].vector = pdev->irq;

		dev_info(&pdev->dev, "using legacy interrupts\n");

		dev_info(&pdev->dev, "using legacy interrupts\n");

	}

	}

	return 0;

}





static void

static void

netxen_teardown_intr(struct netxen_adapter *adapter)

netxen_teardown_intr(struct netxen_adapter *adapter)
@@ -1525,7 +1555,13 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 




	netxen_nic_clear_stats(adapter);

	netxen_nic_clear_stats(adapter);





	netxen_setup_intr(adapter);

	err = netxen_setup_intr(adapter);



	if (err) {

		dev_err(&adapter->pdev->dev,

			"Failed to setup interrupts, error = %d\n", err);

		goto err_out_disable_msi;

	}





	err = netxen_setup_netdev(adapter, netdev);

	err = netxen_setup_netdev(adapter, netdev);

	if (err)

	if (err)
@@ -1613,7 +1649,7 @@ static void netxen_nic_remove(struct pci_dev *pdev) 
	clear_bit(__NX_RESETTING, &adapter->state);

	clear_bit(__NX_RESETTING, &adapter->state);





	netxen_teardown_intr(adapter);

	netxen_teardown_intr(adapter);



	netxen_set_interrupt_mode(adapter, 0);

	netxen_remove_diag_entries(adapter);

	netxen_remove_diag_entries(adapter);





	netxen_cleanup_pci_map(adapter);

	netxen_cleanup_pci_map(adapter);