From: Mintz, Yuval Date: Mon, 20 Feb 2017 20:43:34 +0000 (+0200) Subject: qede: Initialize lock and slowpath workqueue early X-Git-Tag: v4.1.12-93~2^2~173 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=62ed7dab03430f3ee1f1d074d366e98d96da2b17;p=users%2Fjedix%2Flinux-maple.git qede: Initialize lock and slowpath workqueue early Orabug: 25477939 Need to make sure the slowpath workqueue and the qede lock are ready for the registration of the netdevice, as once registered there's no guarantee those wouldn't be used. Signed-off-by: Yuval Mintz Signed-off-by: David S. Miller (cherry picked from commit 0e0b80a9a7181cbdbb965a6b4750574932106e31) Signed-off-by: Brian Maly --- diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c index 9230034fd6ef0..1134ee10372cf 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_main.c +++ b/drivers/net/ethernet/qlogic/qede/qede_main.c @@ -2653,6 +2653,13 @@ static int __qede_probe(struct pci_dev *pdev, u32 dp_module, u8 dp_level, if (rc) goto err3; + /* Prepare the lock prior to the registeration of the netdev, + * as once it's registered we might reach flows requiring it + * [it's even possible to reach a flow needing it directly + * from there, although it's unlikely]. + */ + INIT_DELAYED_WORK(&edev->sp_task, qede_sp_task); + mutex_init(&edev->qede_lock); rc = register_netdev(edev->ndev); if (rc) { DP_NOTICE(edev, "Cannot register net-device\n"); @@ -2668,8 +2675,6 @@ static int __qede_probe(struct pci_dev *pdev, u32 dp_module, u8 dp_level, qede_set_dcbnl_ops(edev->ndev); #endif - INIT_DELAYED_WORK(&edev->sp_task, qede_sp_task); - mutex_init(&edev->qede_lock); edev->rx_copybreak = QEDE_RX_HDR_SIZE; DP_INFO(edev, "Ending successfully qede probe\n");