drivers: modem: hl78xx: support per-command timeout in send API

Extend modem_dynamic_cmd_send() with a response_timeout parameter to allow
callers to specify the overall script timeout per command. The previously
hardcoded 1000 ms timeout is removed (set to 0 in params) and the script
timeout is now driven by the passed-in value.

Update all internal call sites to provide MDM_CMD_TIMEOUT (in seconds) and
increase the default command timeout from 10 s to 40 s. Several chat
scripts and configuration paths are updated accordingly.

This improves reliability for long-running HL78xx operations and ensures
consistent timeout handling across sockets, RAT/band configuration, APN
setup, PDP activation, AirVantage DM session control, and TLS/TCP/UDP
socket management.

Signed-off-by: Zafer SEN <zafersn93@gmail.com>

Author: zafersn

drivers/modem/hl78xx/hl78xx.c

@@ -768,7 +768,7 @@ int modem_dynamic_cmd_send(
 			modem_chat_script_callback script_user_callback,
 			const uint8_t *cmd, uint16_t cmd_size,
 			const struct modem_chat_match *response_matches, uint16_t matches_size,
-			bool user_cmd
+			uint16_t response_timeout, bool user_cmd
 		)
 {
 	int ret = 0;
@@ -784,7 +784,7 @@ int modem_dynamic_cmd_send(
 		.request_size = cmd_size,
 		.response_matches = response_matches,
 		.response_matches_size = matches_size,
-		.timeout = 1000,
+		.timeout = 0, /* Has no effect */
 	};
 	struct modem_chat_script chat_script = {
 		.name = "dynamic_script",
@@ -793,7 +793,7 @@ int modem_dynamic_cmd_send(
 		.abort_matches = hl78xx_get_abort_matches(),
 		.abort_matches_size = hl78xx_get_abort_matches_size(),
 		.callback = script_user_callback,
-		.timeout = 1000
+		.timeout = response_timeout, /* overall script timeout */
 	};
 
 	ret = k_mutex_lock(&data->tx_lock, K_NO_WAIT);

drivers/modem/hl78xx/hl78xx.h

@@ -25,8 +25,8 @@
 #include "../modem_context.h"
 #include "../modem_socket.h"
 #include <stdint.h>
-
-#define MDM_CMD_TIMEOUT                      (10)  /*K_SECONDS*/
+/* clang-format off */
+#define MDM_CMD_TIMEOUT                      (40)  /*K_SECONDS*/
 #define MDM_DNS_TIMEOUT                      (70)  /*K_SECONDS*/
 #define MDM_CELL_BAND_SEARCH_TIMEOUT         (60)  /*K_SECONDS*/
 #define MDM_CMD_CONN_TIMEOUT                 (120) /*K_SECONDS*/
@@ -123,6 +123,8 @@
 		    (LOG_DBG(str, ##__VA_ARGS__)), \
 		    ((void)0))
 
+/* clang-format on */
+
 /* HL78XX States */
 enum hl78xx_state {
 	MODEM_HL78XX_STATE_IDLE = 0,
@@ -473,13 +475,14 @@ void iface_status_work_cb(struct hl78xx_data *data,
  * @param cmd_len Length of the command in bytes.
  * @param response_matches Array of expected response match patterns.
  * @param matches_size Number of elements in the response_matches array.
+ * @param response_timeout Response timeout in seconds.
  *
  * @return 0 on success, negative errno code on failure.
  */
 int modem_dynamic_cmd_send(struct hl78xx_data *data,
 			   modem_chat_script_callback script_user_callback, const uint8_t *cmd,
 			   uint16_t cmd_len, const struct modem_chat_match *response_matches,
-			   uint16_t matches_size, bool user_cmd);
+			   uint16_t matches_size, uint16_t response_timeout, bool user_cmd);
 
 #define HASH_MULTIPLIER 37
 /**

drivers/modem/hl78xx/hl78xx_apis.c

@@ -28,7 +28,7 @@ static int hl78xx_send_cmd(struct hl78xx_data *data, const char *cmd,
 		return -EINVAL;
 	}
 	return modem_dynamic_cmd_send(data, chat_cb, cmd, (uint16_t)strlen(cmd), matches,
-				      match_count, true);
+				      match_count, MDM_CMD_TIMEOUT, true);
 }
 
 int hl78xx_api_func_get_signal(const struct device *dev, const enum cellular_signal_type type,
@@ -292,7 +292,7 @@ int hl78xx_api_func_modem_dynamic_cmd_send(const struct device *dev, const char
 	}
 	/* respect provided matches_size and serialize modem access */
 	return modem_dynamic_cmd_send(data, NULL, cmd, cmd_size, response_matches, matches_size,
-				      true);
+				      MDM_CMD_TIMEOUT, true);
 }
 #ifdef CONFIG_MODEM_HL78XX_AIRVANTAGE
 int hl78xx_start_airvantage_dm_session(const struct device *dev)

drivers/modem/hl78xx/hl78xx_cfg.c

@@ -61,7 +61,7 @@ int hl78xx_rat_cfg(struct hl78xx_data *data, bool *modem_require_restart,
 	}
 	/* Query current rat */
 	ret = modem_dynamic_cmd_send(data, NULL, cmd_ksrat_query, strlen(cmd_ksrat_query),
-				     hl78xx_get_ksrat_match(), 1, false);
+				     hl78xx_get_ksrat_match(), 1, MDM_CMD_TIMEOUT, false);
 	if (ret < 0) {
 		goto error;
 	}

drivers/modem/hl78xx/hl78xx_chat.c

@@ -186,7 +186,7 @@ MODEM_CHAT_SCRIPT_CMDS_DEFINE(hl78xx_post_restart_chat_script_cmds,
 );
 
 MODEM_CHAT_SCRIPT_DEFINE(hl78xx_post_restart_chat_script, hl78xx_post_restart_chat_script_cmds,
-			 hl78xx_abort_matches, hl78xx_chat_callback_handler, 1000);
+			 hl78xx_abort_matches, hl78xx_chat_callback_handler, 12);
 
 /* init_fail_script moved from hl78xx.c */
 MODEM_CHAT_SCRIPT_CMDS_DEFINE(init_fail_script_cmds,

drivers/modem/hl78xx/hl78xx_sockets.c

@@ -1179,7 +1179,7 @@ void iface_status_work_cb(struct hl78xx_data *data, modem_chat_script_callback s
 	int ret = 0;
 
 	ret = modem_dynamic_cmd_send(data, script_user_callback, cmd, strlen(cmd),
-				     hl78xx_get_cgdcontrdp_match(), 1, false);
+				     hl78xx_get_cgdcontrdp_match(), 1, MDM_CMD_TIMEOUT, false);
 	if (ret < 0) {
 		LOG_ERR("Failed to send AT+CGCONTRDP command: %d", ret);
 		return;
@@ -1402,7 +1402,7 @@ static int send_tcp_or_tls_config(struct modem_socket *sock, uint16_t dst_port,
 	snprintk(cmd_buf, sizeof(cmd_buf), "AT+KTCPCFG=1,%d,\"%s\",%u,,,,%d,%s,0", mode,
 		 socket_data->tls.hostname, dst_port, af, mode == 3 ? "0" : "");
 	ret = modem_dynamic_cmd_send(socket_data->mdata_global, NULL, cmd_buf, strlen(cmd_buf),
-				     hl78xx_get_ktcpcfg_match(), 1, false);
+				     hl78xx_get_ktcpcfg_match(), 1, MDM_CMD_TIMEOUT, false);
 	if (ret < 0 ||
 	    socket_data->tcp_conn_status[HL78XX_TCP_STATUS_ID(sock->id)].is_created == false) {
 		LOG_ERR("%s ret:%d", cmd_buf, ret);
@@ -1430,7 +1430,9 @@ static int send_udp_config(const struct net_sockaddr *addr, struct hl78xx_socket
 		 (addr->sa_family - 1), 0);
 
 	ret = modem_dynamic_cmd_send(socket_data->mdata_global, NULL, cmd_buf, strlen(cmd_buf),
-				     hl78xx_get_kudpind_match(), hl78xx_get_kudpind_allow_matches_size(), MDM_CMD_TIMEOUT_MS, false);
+				     hl78xx_get_kudpind_match(),
+				     hl78xx_get_kudpind_allow_matches_size(), MDM_CMD_TIMEOUT,
+				     false);
 	if (ret < 0) {
 		goto error;
 	}
@@ -1493,7 +1495,8 @@ static int socket_close(struct hl78xx_socket_data *socket_data, struct modem_soc
 	}
 	ret = modem_dynamic_cmd_send(socket_data->mdata_global, NULL, buf, strlen(buf),
 				     hl78xx_get_sockets_allow_matches(),
-				     hl78xx_get_sockets_allow_matches_size(), false);
+				     hl78xx_get_sockets_allow_matches_size(), MDM_CMD_TIMEOUT,
+				     false);
 	if (ret < 0) {
 		LOG_ERR("%s ret:%d", buf, ret);
 	}
@@ -1516,7 +1519,8 @@ static int socket_delete(struct hl78xx_socket_data *socket_data, struct modem_so
 	snprintk(buf, sizeof(buf), "AT+KTCPDEL=%d", sock->id);
 	ret = modem_dynamic_cmd_send(socket_data->mdata_global, NULL, buf, strlen(buf),
 				     hl78xx_get_sockets_allow_matches(),
-				     hl78xx_get_sockets_allow_matches_size(), false);
+				     hl78xx_get_sockets_allow_matches_size(), MDM_CMD_TIMEOUT,
+				     false);
 	if (ret < 0) {
 		LOG_ERR("%s ret:%d", buf, ret);
 	}
@@ -1649,7 +1653,7 @@ static int offload_connect(void *obj, const struct net_sockaddr *addr, net_sockl
 	/* send connect command */
 	snprintk(cmd_buf, sizeof(cmd_buf), "AT+KTCPCNX=%d", sock->id);
 	ret = modem_dynamic_cmd_send(socket_data->mdata_global, NULL, cmd_buf, strlen(cmd_buf),
-				     hl78xx_get_ktcpind_match(), 1, false);
+				     hl78xx_get_ktcpind_match(), 1, MDM_CMD_TIMEOUT, false);
 	if (ret < 0 ||
 	    socket_data->tcp_conn_status[HL78XX_TCP_STATUS_ID(sock->id)].is_connected == false) {
 		sock->is_connected = false;
@@ -1784,7 +1788,7 @@ static void check_tcp_state_if_needed(struct hl78xx_socket_data *socket_data,
 	    sock && sock->ip_proto == NET_IPPROTO_TCP) {
 		modem_dynamic_cmd_send(socket_data->mdata_global, NULL, check_ktcp_stat,
 				       strlen(check_ktcp_stat), hl78xx_get_ktcp_state_match(), 1,
-				       true);
+				       MDM_CMD_TIMEOUT, true);
 	}
 }
 
@@ -2016,7 +2020,7 @@ static ssize_t send_socket_data(void *obj, struct hl78xx_socket_data *socket_dat
 	}
 	ret = modem_dynamic_cmd_send(socket_data->mdata_global, NULL, cmd_buf, strlen(cmd_buf),
 				     (const struct modem_chat_match *)hl78xx_get_connect_matches(),
-				     hl78xx_get_connect_matches_size(), false);
+				     hl78xx_get_connect_matches_size(), MDM_CMD_TIMEOUT, false);
 	if (ret < 0 || socket_data->socket_data_error) {
 		hl78xx_set_errno_from_code(ret);
 		ret = -1;
@@ -2417,7 +2421,7 @@ static ssize_t hl78xx_send_cert(struct hl78xx_socket_data *socket_data, const ch
 	}
 	ret = modem_dynamic_cmd_send(socket_data->mdata_global, NULL, send_buf, strlen(send_buf),
 				     (const struct modem_chat_match *)hl78xx_get_connect_matches(),
-				     hl78xx_get_connect_matches_size(), false);
+				     hl78xx_get_connect_matches_size(), MDM_CMD_TIMEOUT, false);
 	if (ret < 0) {
 		LOG_ERR("Error sending AT command %d", ret);
 	}