drivers: i2c: i2c_mspm0g3xxx: fix watchdog init

start the watchdog timer only before we are about to receive a byte
and after we set the ack/nack

Signed-off-by: Dimitris Karnikis <[email protected]>

Author: dkarnikis

drivers/i2c/i2c_mspm0g3xxx.c

@@ -131,7 +131,7 @@ static void i2c_mspm0g3xxx_target_stop_watchdog(struct i2c_mspm0g3xxx_data *data
 	}
 }
 
-static void i2c_mspm0g3xxx_target_reset(const struct device *dev, uint8_t channel, uint32_t ticks,
+static void i2c_mspm0g3xxx_panic(const struct device *dev, uint8_t channel, uint32_t ticks,
                              void *user_data)
 {
        struct i2c_mspm0g3xxx_data *data = user_data;
@@ -197,25 +197,22 @@ void i2c_mspm0g3xxx_target_thread_work(void)
 			if (data->state == I2C_mspm0g3xxx_TARGET_STARTED) {
 				data->state = I2C_mspm0g3xxx_TARGET_RX_INPROGRESS;
 				if (tconfig->callbacks->write_requested != NULL) {
-					i2c_mspm0g3xxx_target_start_watchdog(data);
 					data->target_rx_valid =
 						tconfig->callbacks->write_requested(tconfig);
-					i2c_mspm0g3xxx_target_stop_watchdog(data);
 				}
 			}
 			/* Store received data in buffer */
 			if (tconfig->callbacks->write_received != NULL) {
 				uint8_t nextByte;
 				while (DL_I2C_isTargetRXFIFOEmpty((I2C_Regs *)config->base) !=
 				       true) {
+				        i2c_mspm0g3xxx_target_start_watchdog(data);
 					if (data->target_rx_valid == 0) {
 						nextByte = DL_I2C_receiveTargetData(
 							(I2C_Regs *)config->base);
-						i2c_mspm0g3xxx_target_start_watchdog(data);
 						data->target_rx_valid =
 							tconfig->callbacks->write_received(
 								tconfig, nextByte);
-						i2c_mspm0g3xxx_target_stop_watchdog(data);
 
 						if (data->target_rx_valid == 0) {
 							DL_I2C_setTargetACKOverrideValue(
@@ -233,6 +230,7 @@ void i2c_mspm0g3xxx_target_thread_work(void)
 							(I2C_Regs *)config->base,
 							DL_I2C_TARGET_RESPONSE_OVERRIDE_VALUE_NACK);
 					}
+					i2c_mspm0g3xxx_target_stop_watchdog(data);
 				}
 			}
 
@@ -241,11 +239,10 @@ void i2c_mspm0g3xxx_target_thread_work(void)
 			data->state = I2C_mspm0g3xxx_TARGET_TX_INPROGRESS;
 			/* Fill TX FIFO if there are more bytes to send */
 			if (tconfig->callbacks->read_requested != NULL) {
-				uint8_t nextByte;
 				i2c_mspm0g3xxx_target_start_watchdog(data);
+				uint8_t nextByte;
 				data->target_tx_valid =
 					tconfig->callbacks->read_requested(tconfig, &nextByte);
-				i2c_mspm0g3xxx_target_stop_watchdog(data);
 				if (data->target_tx_valid == 0) {
 					DL_I2C_transmitTargetData((I2C_Regs *)config->base,
 								  nextByte);
@@ -254,20 +251,22 @@ void i2c_mspm0g3xxx_target_thread_work(void)
 					 * 0's are transmitted */
 					DL_I2C_transmitTargetData((I2C_Regs *)config->base, 0x00);
 				}
+
+				i2c_mspm0g3xxx_target_stop_watchdog(data);
 			}
 			break;
 		case DL_I2C_IIDX_TARGET_TXFIFO_EMPTY:
 			if (tconfig->callbacks->read_processed != NULL) {
+				i2c_mspm0g3xxx_target_start_watchdog(data);
 				/* still using the FIFO, we call read_processed in order to add
 				 * additional data rather than from a buffer. If the write-received
 				 * function chooses to return 0 (no more data present), then 0's
 				 * will be filled in */
 				uint8_t nextByte;
+
 				if (data->target_tx_valid == 0) {
-					i2c_mspm0g3xxx_target_start_watchdog(data);
 					data->target_tx_valid = tconfig->callbacks->read_processed(
 						tconfig, &nextByte);
-					i2c_mspm0g3xxx_target_stop_watchdog(data);
 				}
 
 				if (data->target_tx_valid == 0) {
@@ -278,15 +277,15 @@ void i2c_mspm0g3xxx_target_thread_work(void)
 					 * 0's are transmitted */
 					DL_I2C_transmitTargetData((I2C_Regs *)config->base, 0x00);
 				}
+
+				i2c_mspm0g3xxx_target_stop_watchdog(data);
 			}
 			break;
 		case DL_I2C_IIDX_TARGET_STOP:
 			data->state = I2C_mspm0g3xxx_IDLE;
 			k_sem_give(&data->i2c_busy_sem);
 			if (tconfig->callbacks->stop) {
-				i2c_mspm0g3xxx_target_start_watchdog(data);
 				tconfig->callbacks->stop(tconfig);
-				i2c_mspm0g3xxx_target_stop_watchdog(data);
 			}
 			break;
 		default:
@@ -847,7 +846,7 @@ static int i2c_mspm0g3xxx_init(const struct device *dev)
 		}
 
 		data->watchdog_timer_cfg.user_data = (void *)data;
-		data->watchdog_timer_cfg.callback = i2c_mspm0g3xxx_target_reset;
+		data->watchdog_timer_cfg.callback = i2c_mspm0g3xxx_panic;
 		data->watchdog_timer_cfg.ticks = counter_us_to_ticks(
 			config->watchdog_timer, CONFIG_I2C_MSPM0G3XXX_WATCHDOG_TIMEOUT);
 	}