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

Commit 21d05db1 authored by Brice Goglin's avatar Brice Goglin Committed by Jeff Garzik
Browse files

myri10ge: check that we can get an irq 



Now that IRQ allocation is done in myri10ge_open(), we want to still
check when loading the driver that IRQ allocation could succeed later.

Additionaly, we fix the initialization and printing of netdev->irq.

Signed-off-by: default avatarBrice Goglin <brice@myri.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 6ebc087a

drivers/net/myri10ge/myri10ge.c

+12 −3
Original line number Diff line number Diff line
@@ -2882,7 +2882,6 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	netdev->hard_start_xmit = myri10ge_xmit;

	netdev->get_stats = myri10ge_get_stats;

	netdev->base_addr = mgp->iomem_base;

	netdev->irq = pdev->irq;

	netdev->change_mtu = myri10ge_change_mtu;

	netdev->set_multicast_list = myri10ge_set_multicast_list;

	netdev->set_mac_address = myri10ge_set_mac_address;
@@ -2892,6 +2891,15 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	netdev->poll = myri10ge_poll;

	netdev->weight = myri10ge_napi_weight;



	/* make sure we can get an irq, and that MSI can be

	 * setup (if available).  Also ensure netdev->irq

	 * is set to correct value if MSI is enabled */

	status = myri10ge_request_irq(mgp);

	if (status != 0)

		goto abort_with_firmware;

	netdev->irq = pdev->irq;

	myri10ge_free_irq(mgp);



	/* Save configuration space to be restored if the

	 * nic resets due to a parity error */

	pci_save_state(pdev);
@@ -2907,8 +2915,9 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
		dev_err(&pdev->dev, "register_netdev failed: %d\n", status);

		goto abort_with_state;

	}

	dev_info(dev, "%d, tx bndry %d, fw %s, WC %s\n",

		 pdev->irq, mgp->tx.boundary, mgp->fw_name,

	dev_info(dev, "%s IRQ %d, tx bndry %d, fw %s, WC %s\n",

		 (mgp->msi_enabled ? "MSI" : "xPIC"),

		 netdev->irq, mgp->tx.boundary, mgp->fw_name,

		 (mgp->mtrr >= 0 ? "Enabled" : "Disabled"));



	return 0;