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

Commit fb136c07 authored by Auke Kok's avatar Auke Kok Committed by Jeff Garzik
Browse files

ixgb: don't print error if pci_enable_msi() fails, cleanup minor leak 



pci_enable_msi calls can fail for normal operational reasons. Driver
should not print an error message in that case. Fix a leak that leaves
msi enabled if pci_request_irq fails. We can remove CONFIG_PCI_MSI
ifdefs alltogether

Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 4a79a04e

drivers/net/ixgb/ixgb.h

+0 −2
Original line number Diff line number Diff line
@@ -193,8 +193,6 @@ struct ixgb_adapter { 
	u16 msg_enable;

	struct ixgb_hw_stats stats;

	uint32_t alloc_rx_buff_failed;

#ifdef CONFIG_PCI_MSI

	boolean_t have_msi;

#endif

};

#endif /* _IXGB_H_ */

drivers/net/ixgb/ixgb_main.c

+15 −21
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ int 
ixgb_up(struct ixgb_adapter *adapter)

{

	struct net_device *netdev = adapter->netdev;

	int err;

	int err, irq_flags = IRQF_SHARED;

	int max_frame = netdev->mtu + ENET_HEADER_SIZE + ENET_FCS_LENGTH;

	struct ixgb_hw *hw = &adapter->hw;
@@ -246,26 +246,21 @@ ixgb_up(struct ixgb_adapter *adapter) 
	/* disable interrupts and get the hardware into a known state */

	IXGB_WRITE_REG(&adapter->hw, IMC, 0xffffffff);



#ifdef CONFIG_PCI_MSI

	{

	boolean_t pcix = (IXGB_READ_REG(&adapter->hw, STATUS) & 

						  IXGB_STATUS_PCIX_MODE) ? TRUE : FALSE;

	adapter->have_msi = TRUE;



	if (!pcix)

	   adapter->have_msi = FALSE;

	else if((err = pci_enable_msi(adapter->pdev))) {

		DPRINTK(PROBE, ERR,

		 "Unable to allocate MSI interrupt Error: %d\n", err);

		adapter->have_msi = FALSE;

		/* proceed to try to request regular interrupt */

	/* only enable MSI if bus is in PCI-X mode */

	if (IXGB_READ_REG(&adapter->hw, STATUS) & IXGB_STATUS_PCIX_MODE) {

		err = pci_enable_msi(adapter->pdev);

		if (!err) {

			adapter->have_msi = 1;

			irq_flags = 0;

		}

		/* proceed to try to request regular interrupt */

	}



#endif

	if((err = request_irq(adapter->pdev->irq, &ixgb_intr,

				  IRQF_SHARED | IRQF_SAMPLE_RANDOM,

			          netdev->name, netdev))) {

	err = request_irq(adapter->pdev->irq, &ixgb_intr, irq_flags,

	                  netdev->name, netdev);

	if (err) {

		if (adapter->have_msi)

			pci_disable_msi(adapter->pdev);

		DPRINTK(PROBE, ERR,

		 "Unable to allocate interrupt Error: %d\n", err);

		return err;
@@ -307,11 +302,10 @@ ixgb_down(struct ixgb_adapter *adapter, boolean_t kill_watchdog) 


	ixgb_irq_disable(adapter);

	free_irq(adapter->pdev->irq, netdev);

#ifdef CONFIG_PCI_MSI

	if(adapter->have_msi == TRUE)



	if (adapter->have_msi)

		pci_disable_msi(adapter->pdev);



#endif

	if(kill_watchdog)

		del_timer_sync(&adapter->watchdog_timer);

#ifdef CONFIG_IXGB_NAPI