[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20231003155842.57313-3-alkuor@gmail.com>
Date: Tue, 3 Oct 2023 11:58:35 -0400
From: Abdel Alkuor <alkuor@...il.com>
To: heikki.krogerus@...ux.intel.com, krzysztof.kozlowski+dt@...aro.org,
bryan.odonoghue@...aro.org
Cc: gregkh@...uxfoundation.org, linux-usb@...r.kernel.org,
linux-kernel@...r.kernel.org, ryan.eleceng@...il.com,
robh+dt@...nel.org, conor+dt@...nel.org,
devicetree@...r.kernel.org, Abdel Alkuor <abdelalkuor@...tab.com>
Subject: [PATCH v10 2/9] USB: typec: tsp6598x: Add cmd timeout and response delay
From: Abdel Alkuor <abdelalkuor@...tab.com>
Some commands in tps25750 take longer than 1 second
to complete, and some responses need some delay before
the result becomes available.
Signed-off-by: Abdel Alkuor <abdelalkuor@...tab.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@...ux.intel.com>
---
Changes in v10:
- No changes
Changes in v9:
- No changes
Changes in v8:
- Add Reviewed-by
Changes in v7:
- Add driver name to commit subject
Changes in v6:
- Use tps6598x_exec_cmd as a wrapper
Changes in v5:
- Incorporating tps25750 into tps6598x driver
drivers/usb/typec/tipd/core.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/typec/tipd/core.c b/drivers/usb/typec/tipd/core.c
index 37b56ce75f39..32420c61660d 100644
--- a/drivers/usb/typec/tipd/core.c
+++ b/drivers/usb/typec/tipd/core.c
@@ -282,9 +282,10 @@ static void tps6598x_disconnect(struct tps6598x *tps, u32 status)
power_supply_changed(tps->psy);
}
-static int tps6598x_exec_cmd(struct tps6598x *tps, const char *cmd,
+static int tps6598x_exec_cmd_tmo(struct tps6598x *tps, const char *cmd,
size_t in_len, u8 *in_data,
- size_t out_len, u8 *out_data)
+ size_t out_len, u8 *out_data,
+ u32 cmd_timeout_ms, u32 res_delay_ms)
{
unsigned long timeout;
u32 val;
@@ -307,8 +308,7 @@ static int tps6598x_exec_cmd(struct tps6598x *tps, const char *cmd,
if (ret < 0)
return ret;
- /* XXX: Using 1s for now, but it may not be enough for every command. */
- timeout = jiffies + msecs_to_jiffies(1000);
+ timeout = jiffies + msecs_to_jiffies(cmd_timeout_ms);
do {
ret = tps6598x_read32(tps, TPS_REG_CMD1, &val);
@@ -321,6 +321,9 @@ static int tps6598x_exec_cmd(struct tps6598x *tps, const char *cmd,
return -ETIMEDOUT;
} while (val);
+ /* some commands require delay for the result to be available */
+ mdelay(res_delay_ms);
+
if (out_len) {
ret = tps6598x_block_read(tps, TPS_REG_DATA1,
out_data, out_len);
@@ -345,6 +348,14 @@ static int tps6598x_exec_cmd(struct tps6598x *tps, const char *cmd,
return 0;
}
+static int tps6598x_exec_cmd(struct tps6598x *tps, const char *cmd,
+ size_t in_len, u8 *in_data,
+ size_t out_len, u8 *out_data)
+{
+ return tps6598x_exec_cmd_tmo(tps, cmd, in_len, in_data,
+ out_len, out_data, 1000, 0);
+}
+
static int tps6598x_dr_set(struct typec_port *port, enum typec_data_role role)
{
const char *cmd = (role == TYPEC_DEVICE) ? "SWUF" : "SWDF";
--
2.34.1
Powered by blists - more mailing lists