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

Commit 29651506 authored by Subbaraman Narayanamurthy's avatar Subbaraman Narayanamurthy
Browse files

ucsi: ucsi_glink: add SSR support 



Add subsystem restart (SSR) support to UCSI Glink driver so that
it can unregister from UCSI framework when subsystem goes down
and register with UCSI framework when it comes up again. When
subsystem goes down, it is not possible for UCSI stack to send
or receive data to and from PPM (i.e. remote subsystem)  over
PMIC Glink. Hence, return immediately in ucsi_qti_{read,write}()
to avoid error logs and handle cleanup easily.

Change-Id: I711920222bd531af27b87337cad7db8aabbaa466
Signed-off-by: default avatarSubbaraman Narayanamurthy <subbaram@codeaurora.org>
parent 04d7c9d3

drivers/usb/typec/ucsi/ucsi_glink.c

+81 −20
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ struct ucsi_dev { 
	unsigned long			cmd_requested_flags;

	struct ucsi_glink_constat_info	constat_info;

	struct work_struct		notify_work;

	struct work_struct		setup_work;

	atomic_t			state;

};



static void *ucsi_ipc_log;
@@ -267,6 +269,9 @@ static int ucsi_qti_glink_write(struct ucsi_dev *udev, unsigned int offset, 
	if (!validate_ucsi_msg(offset, val_len))

		return -EINVAL;



	if (atomic_read(&udev->state) == PMIC_GLINK_STATE_DOWN)

		return 0;



	ucsi_buf.hdr.owner = MSG_OWNER_UC;

	ucsi_buf.hdr.type = MSG_TYPE_REQ_RESP;

	ucsi_buf.hdr.opcode = UC_UCSI_WRITE_BUF_REQ;
@@ -395,6 +400,9 @@ static int ucsi_qti_read(struct ucsi *ucsi, unsigned int offset, 
	if (!validate_ucsi_msg(offset, val_len))

		return -EINVAL;



	if (atomic_read(&udev->state) == PMIC_GLINK_STATE_DOWN)

		return 0;



	ucsi_buf.hdr.owner = MSG_OWNER_UC;

	ucsi_buf.hdr.type = MSG_TYPE_REQ_RESP;

	ucsi_buf.hdr.opcode = UC_UCSI_READ_BUF_REQ;
@@ -442,6 +450,71 @@ static const struct ucsi_operations ucsi_qti_ops = { 
	.async_write = ucsi_qti_async_write

};



static int ucsi_setup(struct ucsi_dev *udev)

{

	int rc;



	if (udev->ucsi) {

		dev_err(udev->dev, "ucsi is not NULL\n");

		return -EINVAL;

	}



	udev->ucsi = ucsi_create(udev->dev, &ucsi_qti_ops);

	if (IS_ERR(udev->ucsi)) {

		rc = PTR_ERR(udev->ucsi);

		dev_err(udev->dev, "ucsi_create failed rc=%d\n", rc);

		udev->ucsi = NULL;

		return rc;

	}



	ucsi_set_drvdata(udev->ucsi, udev);



	rc = ucsi_register(udev->ucsi);

	if (rc) {

		dev_err(udev->dev, "ucsi_register failed rc=%d\n", rc);

		ucsi_destroy(udev->ucsi);

		udev->ucsi = NULL;

		return rc;

	}



	return 0;

}



static void ucsi_qti_setup_work(struct work_struct *work)

{

	struct ucsi_dev *udev = container_of(work, struct ucsi_dev,

			setup_work);



	ucsi_setup(udev);

}



static void ucsi_qti_state_cb(void *priv, enum pmic_glink_state state)

{

	struct ucsi_dev *udev = priv;



	dev_dbg(udev->dev, "state: %d\n", state);



	atomic_set(&udev->state, state);



	switch (state) {

	case PMIC_GLINK_STATE_DOWN:

		if (!udev->ucsi) {

			dev_err(udev->dev, "ucsi is NULL\n");

			return;

		}



		ucsi_unregister(udev->ucsi);

		ucsi_destroy(udev->ucsi);

		udev->ucsi = NULL;

		break;

	case PMIC_GLINK_STATE_UP:

		schedule_work(&udev->setup_work);

		break;

	default:

		break;

	}

}



static int ucsi_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;
@@ -454,6 +527,7 @@ static int ucsi_probe(struct platform_device *pdev) 
		return -ENOMEM;



	INIT_WORK(&udev->notify_work, ucsi_qti_notify_work);

	INIT_WORK(&udev->setup_work, ucsi_qti_setup_work);

	mutex_init(&udev->read_lock);

	mutex_init(&udev->write_lock);

	mutex_init(&udev->notify_lock);
@@ -461,11 +535,13 @@ static int ucsi_probe(struct platform_device *pdev) 
	init_completion(&udev->write_ack);

	init_completion(&udev->sync_write_ack);

	atomic_set(&udev->rx_valid, 0);

	atomic_set(&udev->state, PMIC_GLINK_STATE_UP);



	client_data.id = MSG_OWNER_UC;

	client_data.name = "ucsi";

	client_data.msg_cb = ucsi_callback;

	client_data.priv = udev;

	client_data.state_cb = ucsi_qti_state_cb;



	udev->client = pmic_glink_register_client(dev, &client_data);

	if (IS_ERR(udev->client)) {
@@ -477,33 +553,18 @@ static int ucsi_probe(struct platform_device *pdev) 
	}



	platform_set_drvdata(pdev, udev);

	udev->dev = dev;



	udev->ucsi = ucsi_create(dev, &ucsi_qti_ops);

	if (IS_ERR(udev->ucsi)) {

		rc = PTR_ERR(udev->ucsi);

		dev_err(dev, "ucsi_create failed rc=%d\n", rc);

		return rc;

	}



	ucsi_set_drvdata(udev->ucsi, udev);

	ucsi_ipc_log = ipc_log_context_create(NUM_LOG_PAGES, "ucsi", 0);

	if (!ucsi_ipc_log)

		dev_warn(dev, "Error in creating ipc_log_context\n");



	rc = ucsi_register(udev->ucsi);

	rc = ucsi_setup(udev);

	if (rc) {

		dev_err(dev, "ucsi_register failed rc=%d\n", rc);

		goto out;

	}



	pr_debug("driver probed\n");



	return 0;

out:

		ipc_log_context_destroy(ucsi_ipc_log);

		ucsi_ipc_log = NULL;

	ucsi_destroy(udev->ucsi);

		pmic_glink_unregister_client(udev->client);

	}



	return rc;

}