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

Commit 2db77e0f authored by Vasanthy Kolluri's avatar Vasanthy Kolluri Committed by David S. Miller
Browse files

enic: Replace firmware devcmd CMD_ENABLE with CMD_ENABLE_WAIT 



Replace no wait CMD_ENABLE firmware devcmd with CMD_ENABLE_WAIT

Signed-off-by: default avatarVasanthy Kolluri <vkolluri@cisco.com>
Signed-off-by: default avatarRoopa Prabhu <roprabhu@cisco.com>
Signed-off-by: default avatarDavid Wang <dwang2@cisco.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c76fd32d

drivers/net/enic/enic_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1787,7 +1787,7 @@ static int enic_dev_enable(struct enic *enic) 
	int err;



	spin_lock(&enic->devcmd_lock);

	err = vnic_dev_enable(enic->vdev);

	err = vnic_dev_enable_wait(enic->vdev);

	spin_unlock(&enic->devcmd_lock);



	return err;

drivers/net/enic/vnic_dev.c

+8 −2
Original line number Diff line number Diff line
@@ -487,11 +487,17 @@ int vnic_dev_close(struct vnic_dev *vdev) 
	return vnic_dev_cmd(vdev, CMD_CLOSE, &a0, &a1, wait);

}



int vnic_dev_enable(struct vnic_dev *vdev)

int vnic_dev_enable_wait(struct vnic_dev *vdev)

{

	u64 a0 = 0, a1 = 0;

	int wait = 1000;

	int err;



	err = vnic_dev_cmd(vdev, CMD_ENABLE_WAIT, &a0, &a1, wait);

	if (err == ERR_ECMDUNKNOWN)

		return vnic_dev_cmd(vdev, CMD_ENABLE, &a0, &a1, wait);



	return err;

}



int vnic_dev_disable(struct vnic_dev *vdev)

drivers/net/enic/vnic_dev.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ u32 vnic_dev_port_speed(struct vnic_dev *vdev); 
u32 vnic_dev_msg_lvl(struct vnic_dev *vdev);

u32 vnic_dev_mtu(struct vnic_dev *vdev);

int vnic_dev_close(struct vnic_dev *vdev);

int vnic_dev_enable(struct vnic_dev *vdev);

int vnic_dev_enable_wait(struct vnic_dev *vdev);

int vnic_dev_disable(struct vnic_dev *vdev);

int vnic_dev_open(struct vnic_dev *vdev, int arg);

int vnic_dev_open_done(struct vnic_dev *vdev, int *done);