drivers: modem: sim7080: Made dns timeout and retry configurable

Timeout and retries for DNS lookups were hardcoded. This commit
introduces kconfig settings for the default values and functions
for runtime configuration.

Signed-off-by: Lukas Gehreke <[email protected]>

Author: lgehreke

drivers/modem/simcom/sim7080/Kconfig

@@ -57,6 +57,20 @@ config MODEM_SIMCOM_SIM7080_BAUDRATE
 		the modem is configured to use autobaud. The driver will then
 		configure the modem to use a fixed baudrate for faster startups.
 
+config MODEM_SIMCOM_SIM7080_DNS_DEFAULT_RECOUNT
+	int "Retry count for a DNS query"
+	range 0 10
+	default 10
+	help
+		The number of retries for a DNS lookup
+
+config MODEM_SIMCOM_SIM7080_DNS_DEFAULT_TIMEOUT
+	int "Timeout for a DNS query"
+	range 0 60000
+	default 20000
+	help
+		The timeout for DNS queries in milliseconds
+
 choice MODEM_SIMCOM_SIM7080_RAT
 	bool "Radio Access Technology Mode"
 	default MODEM_SIMCOM_SIM7080_RAT_NB1

drivers/modem/simcom/sim7080/sim7080.c

@@ -832,6 +832,9 @@ static int modem_init(const struct device *dev)
 	mdata.current_sock_fd = -1;
 	mdata.current_sock_written = 0;
 
+	mdata.dns.recount = CONFIG_MODEM_SIMCOM_SIM7080_DNS_DEFAULT_RECOUNT;
+	mdata.dns.timeout = CONFIG_MODEM_SIMCOM_SIM7080_DNS_DEFAULT_TIMEOUT;
+
 	mdata.ftp.read_buffer = NULL;
 	mdata.ftp.nread = 0;
 	mdata.ftp.state = SIM7080_FTP_CONNECTION_STATE_INITIAL;

drivers/modem/simcom/sim7080/sim7080.h

@@ -143,6 +143,13 @@ struct sim7080_data {
 	uint8_t sms_buffer_pos;
 	/* Status of the last http operation */
 	uint16_t http_status;
+	/* DNS related variables */
+	struct {
+		/* Number of DNS retries */
+		uint8_t recount;
+		/* Timeout in milliseconds */
+		uint16_t timeout;
+	} dns;
 	/* Ftp related variables. */
 	struct {
 		/* User buffer for ftp data. */

drivers/modem/simcom/sim7080/sim7080_dns.c

@@ -115,7 +115,13 @@ static int offload_getaddrinfo(const char *node, const char *service,
 		return DNS_EAI_NONAME;
 	}
 
-	snprintk(sendbuf, sizeof(sendbuf), "AT+CDNSGIP=\"%s\",10,20000", node);
+	ret = snprintk(sendbuf, sizeof(sendbuf), "AT+CDNSGIP=\"%s\",%u,%u", node,
+				mdata.dns.recount, mdata.dns.timeout);
+	if (ret < 0) {
+		LOG_ERR("Formatting dns query failed");
+		return ret;
+	}
+
 	ret = modem_cmd_send(&mctx.iface, &mctx.cmd_handler, cmd, ARRAY_SIZE(cmd), sendbuf,
 				 &mdata.sem_dns, MDM_DNS_TIMEOUT);
 	if (ret < 0) {
@@ -142,3 +148,26 @@ const struct socket_dns_offload offload_dns_ops = {
 	.getaddrinfo = offload_getaddrinfo,
 	.freeaddrinfo = offload_freeaddrinfo,
 };
+
+int mdm_sim7080_dns_set_lookup_params(uint8_t recount, uint16_t timeout)
+{
+	if (recount > SIM7080_DNS_MAX_RECOUNT || timeout > SIM7080_DNS_MAX_TIMEOUT_MS) {
+		return -EINVAL;
+	}
+
+	mdata.dns.recount = recount;
+	mdata.dns.timeout = timeout;
+
+	return 0;
+}
+
+void mdm_sim7080_dns_get_lookup_params(uint8_t *recount, uint16_t *timeout)
+{
+	if (recount) {
+		*recount = mdata.dns.recount;
+	}
+
+	if (timeout) {
+		*timeout = mdata.dns.timeout;
+	}
+}

include/zephyr/drivers/modem/simcom-sim7080.h

@@ -24,6 +24,10 @@ extern "C" {
 #define SIM7080_SMS_MAX_LEN 160
 /** Maximum UE system information band size */
 #define SIM7080_UE_SYS_INFO_BAND_SIZE 32
+/** Maximum number of DNS retries */
+#define SIM7080_DNS_MAX_RECOUNT 10
+/** Maximum timeout for DNS queries in milliseconds */
+#define SIM7080_DNS_MAX_TIMEOUT_MS 60000
 
 /** Sim7080 modem state */
 enum sim7080_state {
@@ -423,6 +427,25 @@ int mdm_sim7080_get_ue_sys_info(struct sim7080_ue_sys_info *info);
  */
 int mdm_sim7080_get_local_time(struct tm *t);
 
+/**
+ * Set the dns query lookup parameters.
+ *
+ * @param recount Number of retries per query.
+ *				  Maximum @c SIM7080_DNS_MAX_RECOUNT
+ * @param timeout Timeout for a dns query in milliseconds.
+ *				  Maximum @c SIM7080_DNS_MAX_TIMEOUT_MS
+ * @return 0 on success. Otherwise a negative error is returned.
+ */
+int mdm_sim7080_dns_set_lookup_params(uint8_t recount, uint16_t timeout);
+
+/**
+ * Get the dns query lookup parameters.
+ *
+ * @param recount [out] Number of retries per query.
+ * @param timeout [out] Timeout for a dns query in milliseconds.
+ */
+void mdm_sim7080_dns_get_lookup_params(uint8_t *recount, uint16_t *timeout);
+
 #ifdef __cplusplus
 }
 #endif