Commit 617aa396 authored by Oren Weil's avatar Oren Weil Committed by Greg Kroah-Hartman
Browse files

staging: mei: removing dependency between WD and AMTHI init function. 



AMTHI need to be initialized after WD Client was initialized, moving the AMTHI outside
of the WD initialization function.
in order to remove the coupling between the initialization of those clients.

AMTHI is getting initialized (getting connected to the FW feature/client) in two ways:
 1) if mei driver fails to send connect message to watchdog client (WD initialization), then
    immediately the AMTHI client getting initialized right after the watchdog initialization function.
 2) if Watchdog client success to send connect message to watchdog client, then only after
    the driver is getting the connect response message the AMTHI client is getting initialized

Signed-off-by: default avatarOren Weil <oren.jer.weil@intel.com>
Acked-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f6c39d4f

drivers/staging/mei/init.c

+7 −1
Original line number Diff line number Diff line
@@ -521,7 +521,13 @@ void mei_host_client_properties(struct mei_device *dev) 
	bitmap_set(dev->host_clients_map, 0, 3);

	dev->mei_state = MEI_ENABLED;



	mei_wd_host_init(dev);

	/* if wd initialization fails, initialization the AMTHI client,

	 * otherwise the AMTHI client will be initialized after the WD client connect response

	 * will be received

	 */

	if (mei_wd_host_init(dev))

		mei_host_init_iamthif(dev);



	return;

}

drivers/staging/mei/interface.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ int mei_flow_ctrl_creds(struct mei_device *dev, struct mei_cl *cl); 


int mei_wd_send(struct mei_device *dev);

int mei_wd_stop(struct mei_device *dev, bool preserve);

void mei_wd_host_init(struct mei_device *dev);

bool mei_wd_host_init(struct mei_device *dev);

void mei_wd_start_setup(struct mei_device *dev);



int mei_flow_ctrl_reduce(struct mei_device *dev, struct mei_cl *cl);

drivers/staging/mei/wd.c

+12 −4
Original line number Diff line number Diff line
@@ -63,8 +63,10 @@ void mei_wd_start_setup(struct mei_device *dev) 
 *

 * @dev: the device structure

 */

void mei_wd_host_init(struct mei_device *dev)

bool mei_wd_host_init(struct mei_device *dev)

{

	bool ret = false;



	mei_cl_init(&dev->wd_cl, dev);



	/* look for WD client and connect to it */
@@ -83,19 +85,25 @@ void mei_wd_host_init(struct mei_device *dev) 
				dev_dbg(&dev->pdev->dev, "Failed to connect to WD client\n");

				dev->wd_cl.state = MEI_FILE_DISCONNECTED;

				dev->wd_cl.host_client_id = 0;

				mei_host_init_iamthif(dev) ;

				ret = false;

				goto end;

			} else {

				dev->wd_cl.timer_count = CONNECT_TIMEOUT;

			}

		} else {

			dev_dbg(&dev->pdev->dev, "Failed to find WD client\n");

			mei_host_init_iamthif(dev) ;

			ret = false;

			goto end;

		}

	} else {

		dev->wd_bypass = true;

		dev_dbg(&dev->pdev->dev, "WD requested to be disabled\n");

		mei_host_init_iamthif(dev) ;

		ret = false;

		goto end;

	}



end:

	return ret;

}



/**