diff mbox series

[4/4] platform: chrome: cros_ec_ishtp: use helper functions for connection

Message ID 1701741033-26222-5-git-send-email-even.xu@intel.com (mailing list archive)
State Handled Elsewhere
Headers show
Series Simplify ISHTP client interface | expand

Commit Message

Xu, Even Dec. 5, 2023, 1:50 a.m. UTC 
Use helper functions ishtp_cl_establish_connection() and
ishtp_cl_destroy_connection() to establish and destroy connection
respectively. These functions are used during initialization, reset and
deinitialization flows.

No functional changes are expected.

Signed-off-by: Even Xu <even.xu@intel.com>
Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
 drivers/platform/chrome/cros_ec_ishtp.c | 74 +++++++--------------------------
 1 file changed, 15 insertions(+), 59 deletions(-)

Comments

Tzung-Bi Shih Dec. 6, 2023, 3:33 a.m. UTC | #1 
On Tue, Dec 05, 2023 at 09:50:33AM +0800, Even Xu wrote:
> Use helper functions ishtp_cl_establish_connection() and
> ishtp_cl_destroy_connection() to establish and destroy connection
> respectively. These functions are used during initialization, reset and
> deinitialization flows.
> 
> No functional changes are expected.
> 
> Signed-off-by: Even Xu <even.xu@intel.com>
> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>

Acked-by: Tzung-Bi Shih <tzungbi@kernel.org>

One minor suggestion: we usually use "platform/chrome:" instead of
"platform: chrome:" for the title prefix.
Xu, Even Dec. 6, 2023, 3:53 a.m. UTC | #2 
Thanks Tzung-Bi!

Best Regards,
Even Xu

-----Original Message-----
From: Tzung-Bi Shih <tzungbi@kernel.org> 
Sent: Wednesday, December 6, 2023 11:33 AM
To: Xu, Even <even.xu@intel.com>
Cc: jikos@kernel.org; srinivas.pandruvada@linux.intel.com; bleung@chromium.org; groeck@chromium.org; linux-input@vger.kernel.org; chrome-platform@lists.linux.dev
Subject: Re: [PATCH 4/4] platform: chrome: cros_ec_ishtp: use helper functions for connection

On Tue, Dec 05, 2023 at 09:50:33AM +0800, Even Xu wrote:
> Use helper functions ishtp_cl_establish_connection() and
> ishtp_cl_destroy_connection() to establish and destroy connection 
> respectively. These functions are used during initialization, reset 
> and deinitialization flows.
> 
> No functional changes are expected.
> 
> Signed-off-by: Even Xu <even.xu@intel.com>
> Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>

Acked-by: Tzung-Bi Shih <tzungbi@kernel.org>

One minor suggestion: we usually use "platform/chrome:" instead of
"platform: chrome:" for the title prefix.
Jiri Kosina Dec. 6, 2023, 10:34 a.m. UTC | #3 
On Wed, 6 Dec 2023, Tzung-Bi Shih wrote:

> On Tue, Dec 05, 2023 at 09:50:33AM +0800, Even Xu wrote:
> > Use helper functions ishtp_cl_establish_connection() and
> > ishtp_cl_destroy_connection() to establish and destroy connection
> > respectively. These functions are used during initialization, reset and
> > deinitialization flows.
> > 
> > No functional changes are expected.
> > 
> > Signed-off-by: Even Xu <even.xu@intel.com>
> > Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> 
> Acked-by: Tzung-Bi Shih <tzungbi@kernel.org>

Thanks.

> One minor suggestion: we usually use "platform/chrome:" instead of
> "platform: chrome:" for the title prefix.

I have changed that, and am taking it together with the rest of the series 
through hid.git#for-6.8/intel-ish.
Xu, Even Dec. 8, 2023, 12:38 a.m. UTC | #4 
Thanks Jiri!

Best Regards,
Even Xu

-----Original Message-----
From: Jiri Kosina <jkosina@suse.com> 
Sent: Wednesday, December 6, 2023 6:34 PM
To: Tzung-Bi Shih <tzungbi@kernel.org>
Cc: Xu, Even <even.xu@intel.com>; srinivas.pandruvada@linux.intel.com; bleung@chromium.org; groeck@chromium.org; linux-input@vger.kernel.org; chrome-platform@lists.linux.dev
Subject: Re: [PATCH 4/4] platform: chrome: cros_ec_ishtp: use helper functions for connection

On Wed, 6 Dec 2023, Tzung-Bi Shih wrote:

> On Tue, Dec 05, 2023 at 09:50:33AM +0800, Even Xu wrote:
> > Use helper functions ishtp_cl_establish_connection() and
> > ishtp_cl_destroy_connection() to establish and destroy connection 
> > respectively. These functions are used during initialization, reset 
> > and deinitialization flows.
> > 
> > No functional changes are expected.
> > 
> > Signed-off-by: Even Xu <even.xu@intel.com>
> > Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> 
> Acked-by: Tzung-Bi Shih <tzungbi@kernel.org>

Thanks.

> One minor suggestion: we usually use "platform/chrome:" instead of
> "platform: chrome:" for the title prefix.

I have changed that, and am taking it together with the rest of the series through hid.git#for-6.8/intel-ish.

--
Jiri Kosina
SUSE Labs
diff mbox series

Patch

diff --git a/drivers/platform/chrome/cros_ec_ishtp.c b/drivers/platform/chrome/cros_ec_ishtp.c
index cb2031c..5ac37bd 100644
--- a/drivers/platform/chrome/cros_ec_ishtp.c
+++ b/drivers/platform/chrome/cros_ec_ishtp.c
@@ -367,55 +367,33 @@  static void ish_event_cb(struct ishtp_cl_device *cl_device)
 /**
  * cros_ish_init() - Init function for ISHTP client
  * @cros_ish_cl: ISHTP client instance
+ * @reset: true if called from reset handler
  *
  * This function complete the initializtion of the client.
  *
  * Return: 0 for success, negative error code for failure.
  */
-static int cros_ish_init(struct ishtp_cl *cros_ish_cl)
+static int cros_ish_init(struct ishtp_cl *cros_ish_cl, bool reset)
 {
 	int rv;
-	struct ishtp_device *dev;
-	struct ishtp_fw_client *fw_client;
 	struct ishtp_cl_data *client_data = ishtp_get_client_data(cros_ish_cl);
 
-	rv = ishtp_cl_link(cros_ish_cl);
-	if (rv) {
-		dev_err(cl_data_to_dev(client_data),
-			"ishtp_cl_link failed\n");
-		return rv;
-	}
-
-	dev = ishtp_get_ishtp_device(cros_ish_cl);
-
-	/* Connect to firmware client */
-	ishtp_set_tx_ring_size(cros_ish_cl, CROS_ISH_CL_TX_RING_SIZE);
-	ishtp_set_rx_ring_size(cros_ish_cl, CROS_ISH_CL_RX_RING_SIZE);
-
-	fw_client = ishtp_fw_cl_get_client(dev, &cros_ec_ishtp_id_table[0].guid);
-	if (!fw_client) {
-		dev_err(cl_data_to_dev(client_data),
-			"ish client uuid not found\n");
-		rv = -ENOENT;
-		goto err_cl_unlink;
-	}
-
-	ishtp_cl_set_fw_client_id(cros_ish_cl,
-				  ishtp_get_fw_client_id(fw_client));
-	ishtp_set_connection_state(cros_ish_cl, ISHTP_CL_CONNECTING);
-
-	rv = ishtp_cl_connect(cros_ish_cl);
+	rv = ishtp_cl_establish_connection(cros_ish_cl,
+					   &cros_ec_ishtp_id_table[0].guid,
+					   CROS_ISH_CL_TX_RING_SIZE,
+					   CROS_ISH_CL_RX_RING_SIZE,
+					   reset);
 	if (rv) {
 		dev_err(cl_data_to_dev(client_data),
 			"client connect fail\n");
-		goto err_cl_unlink;
+		goto err_cl_disconnect;
 	}
 
 	ishtp_register_event_cb(client_data->cl_device, ish_event_cb);
 	return 0;
 
-err_cl_unlink:
-	ishtp_cl_unlink(cros_ish_cl);
+err_cl_disconnect:
+	ishtp_cl_destroy_connection(cros_ish_cl, reset);
 	return rv;
 }
 
@@ -427,10 +405,7 @@  static int cros_ish_init(struct ishtp_cl *cros_ish_cl)
  */
 static void cros_ish_deinit(struct ishtp_cl *cros_ish_cl)
 {
-	ishtp_set_connection_state(cros_ish_cl, ISHTP_CL_DISCONNECTING);
-	ishtp_cl_disconnect(cros_ish_cl);
-	ishtp_cl_unlink(cros_ish_cl);
-	ishtp_cl_flush_queues(cros_ish_cl);
+	ishtp_cl_destroy_connection(cros_ish_cl, false);
 
 	/* Disband and free all Tx and Rx client-level rings */
 	ishtp_cl_free(cros_ish_cl);
@@ -592,7 +567,6 @@  static void reset_handler(struct work_struct *work)
 	int rv;
 	struct device *dev;
 	struct ishtp_cl *cros_ish_cl;
-	struct ishtp_cl_device *cl_device;
 	struct ishtp_cl_data *client_data =
 		container_of(work, struct ishtp_cl_data, work_ishtp_reset);
 
@@ -600,26 +574,11 @@  static void reset_handler(struct work_struct *work)
 	down_write(&init_lock);
 
 	cros_ish_cl = client_data->cros_ish_cl;
-	cl_device = client_data->cl_device;
 
-	/* Unlink, flush queues & start again */
-	ishtp_cl_unlink(cros_ish_cl);
-	ishtp_cl_flush_queues(cros_ish_cl);
-	ishtp_cl_free(cros_ish_cl);
-
-	cros_ish_cl = ishtp_cl_allocate(cl_device);
-	if (!cros_ish_cl) {
-		up_write(&init_lock);
-		return;
-	}
-
-	ishtp_set_drvdata(cl_device, cros_ish_cl);
-	ishtp_set_client_data(cros_ish_cl, client_data);
-	client_data->cros_ish_cl = cros_ish_cl;
+	ishtp_cl_destroy_connection(cros_ish_cl, true);
 
-	rv = cros_ish_init(cros_ish_cl);
+	rv = cros_ish_init(cros_ish_cl, true);
 	if (rv) {
-		ishtp_cl_free(cros_ish_cl);
 		dev_err(cl_data_to_dev(client_data), "Reset Failed\n");
 		up_write(&init_lock);
 		return;
@@ -672,7 +631,7 @@  static int cros_ec_ishtp_probe(struct ishtp_cl_device *cl_device)
 	INIT_WORK(&client_data->work_ec_evt,
 		  ish_evt_handler);
 
-	rv = cros_ish_init(cros_ish_cl);
+	rv = cros_ish_init(cros_ish_cl, false);
 	if (rv)
 		goto end_ishtp_cl_init_error;
 
@@ -690,10 +649,7 @@  static int cros_ec_ishtp_probe(struct ishtp_cl_device *cl_device)
 	return 0;
 
 end_cros_ec_dev_init_error:
-	ishtp_set_connection_state(cros_ish_cl, ISHTP_CL_DISCONNECTING);
-	ishtp_cl_disconnect(cros_ish_cl);
-	ishtp_cl_unlink(cros_ish_cl);
-	ishtp_cl_flush_queues(cros_ish_cl);
+	ishtp_cl_destroy_connection(cros_ish_cl, false);
 	ishtp_put_device(cl_device);
 end_ishtp_cl_init_error:
 	ishtp_cl_free(cros_ish_cl);