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

Commit e4d8270e authored by Alexander Usyskin's avatar Alexander Usyskin Committed by Greg Kroah-Hartman
Browse files

mei: set connecting state just upon connection request is sent to the fw 



Adding power gating introduced new waiting state for client also during
connection attempt, a connection request can be queued for later either due
device is power gated or due to other on going connection.
We setting client connection state before start of full connect procedure so
in both cased the client state will be MEI_FILE_CONNECTING
which create interlock between the two connection attempts, both
detecting that another connection is in progress.

The interlock is resolved by moving client to connecting state
only upon connection request transmission, so the  first
cb in queue can be processed.

Signed-off-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 86113500

drivers/misc/mei/amthif.c

+0 −2
Original line number Diff line number Diff line
@@ -111,8 +111,6 @@ int mei_amthif_host_init(struct mei_device *dev) 
		return ret;

	}



	cl->state = MEI_FILE_CONNECTING;



	ret = mei_cl_connect(cl, NULL);



	dev->iamthif_state = MEI_IAMTHIF_IDLE;

drivers/misc/mei/bus.c

+0 −2
Original line number Diff line number Diff line
@@ -427,8 +427,6 @@ int mei_cl_enable_device(struct mei_cl_device *device) 


	mutex_lock(&dev->device_lock);



	cl->state = MEI_FILE_CONNECTING;



	err = mei_cl_connect(cl, NULL);

	if (err < 0) {

		mutex_unlock(&dev->device_lock);

drivers/misc/mei/client.c

+1 −0
Original line number Diff line number Diff line
@@ -597,6 +597,7 @@ int mei_cl_connect(struct mei_cl *cl, struct file *file) 


	/* run hbuf acquire last so we don't have to undo */

	if (!mei_cl_is_other_connecting(cl) && mei_hbuf_acquire(dev)) {

		cl->state = MEI_FILE_CONNECTING;

		if (mei_hbm_cl_connect_req(dev, cl)) {

			rets = -ENODEV;

			goto out;

drivers/misc/mei/main.c

+0 −1
Original line number Diff line number Diff line
@@ -467,7 +467,6 @@ static int mei_ioctl_connect_client(struct file *file, 
	}



	cl->me_client_id = dev->me_clients[i].client_id;

	cl->state = MEI_FILE_CONNECTING;



	dev_dbg(&dev->pdev->dev, "Connect to FW Client ID = %d\n",

			cl->me_client_id);

drivers/misc/mei/wd.c

+0 −2
Original line number Diff line number Diff line
@@ -84,8 +84,6 @@ int mei_wd_host_init(struct mei_device *dev) 
		return ret;

	}



	cl->state = MEI_FILE_CONNECTING;



	ret = mei_cl_connect(cl, NULL);



	if (ret) {