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

Commit 79ad08da authored by Arjun Vynipadath's avatar Arjun Vynipadath Committed by Greg Kroah-Hartman
Browse files

cxgb4: Setup FW queues before registering netdev 



[ Upstream commit 843bd7db79c861b49e2912d723625f5fa8e94502 ]

When NetworkManager is enabled, there are chances that interface up
is called even before probe completes. This means we have not yet
allocated the FW sge queues, hence rest of ingress queue allocation
wont be proper. Fix this by calling setup_fw_sge_queues() before
register_netdev().

Fixes: 0fbc81b3 ('chcr/cxgb4i/cxgbit/RDMA/cxgb4: Allocate resources dynamically for all cxgb4 ULD's')
Signed-off-by: default avatarArjun Vynipadath <arjun@chelsio.com>
Signed-off-by: default avatarCasey Leedom <leedom@chelsio.com>
Signed-off-by: default avatarGanesh Goudar <ganeshgr@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e63ff84e

drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c

+8 −3
Original line number Diff line number Diff line
@@ -836,8 +836,6 @@ static int setup_fw_sge_queues(struct adapter *adap) 


	err = t4_sge_alloc_rxq(adap, &s->fw_evtq, true, adap->port[0],

			       adap->msi_idx, NULL, fwevtq_handler, NULL, -1);

	if (err)

		t4_free_sge_resources(adap);

	return err;

}
@@ -4940,6 +4938,13 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (err)

		goto out_free_dev;



	err = setup_fw_sge_queues(adapter);

	if (err) {

		dev_err(adapter->pdev_dev,

			"FW sge queue allocation failed, err %d", err);

		goto out_free_dev;

	}



	/*

	 * The card is now ready to go.  If any errors occur during device

	 * registration we do not fail the whole card but rather proceed only
@@ -4983,7 +4988,6 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	}



	print_adapter_info(adapter);

	setup_fw_sge_queues(adapter);

	return 0;



sriov:
@@ -5035,6 +5039,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
#endif



 out_free_dev:

	t4_free_sge_resources(adapter);

	free_some_resources(adapter);

	if (adapter->flags & USING_MSIX)

		free_msix_info(adapter);