Skip to content

Commit 28cde75

Browse files
nfontdavem330
authored andcommitted
ibmvnic: Reset the CRQ queue during driver reset
When a driver reset operation occurs there is not a need to release the CRQ resources and re-allocate them. Instead a reset of the CRQ will suffice. Signed-off-by: Nathan Fontenot <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 152ce47 commit 28cde75

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

drivers/net/ethernet/ibm/ibmvnic.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,7 +1260,6 @@ static int do_reset(struct ibmvnic_adapter *adapter,
12601260

12611261
release_resources(adapter);
12621262
release_sub_crqs(adapter);
1263-
release_crq_queue(adapter);
12641263

12651264
rc = ibmvnic_init(adapter);
12661265
if (rc)
@@ -3517,7 +3516,14 @@ static int ibmvnic_init(struct ibmvnic_adapter *adapter)
35173516
unsigned long timeout = msecs_to_jiffies(30000);
35183517
int rc;
35193518

3520-
rc = init_crq_queue(adapter);
3519+
if (adapter->resetting) {
3520+
rc = ibmvnic_reset_crq(adapter);
3521+
if (!rc)
3522+
rc = vio_enable_interrupts(adapter->vdev);
3523+
} else {
3524+
rc = init_crq_queue(adapter);
3525+
}
3526+
35213527
if (rc) {
35223528
dev_err(dev, "Couldn't initialize crq. rc=%d\n", rc);
35233529
return rc;

0 commit comments

Comments
 (0)