drivers: i2c_stm32_v2: Abort on DMA error

If configuration of DMA is unsuccessful then
abort transaction and return with an error code

Signed-off-by: Erik Andersson <[email protected]>

Author: erian747

drivers/i2c/i2c_ll_stm32_v2.c

@@ -150,11 +150,12 @@ static int configure_dma(struct stream const *dma, struct dma_config *dma_cfg,
 	return 0;
 }
 
-static void dma_xfer_start(const struct device *dev, struct i2c_msg *msg)
+static int dma_xfer_start(const struct device *dev, struct i2c_msg *msg)
 {
 	const struct i2c_stm32_config *cfg = dev->config;
 	struct i2c_stm32_data *data = dev->data;
 	I2C_TypeDef *i2c = cfg->i2c;
+	int ret = 0;
 
 	if ((msg->flags & I2C_MSG_READ) != 0U) {
 		/* Configure RX DMA */
@@ -165,10 +166,9 @@ static void dma_xfer_start(const struct device *dev, struct i2c_msg *msg)
 		data->dma_blk_cfg.dest_addr_adj = DMA_ADDR_ADJ_INCREMENT;
 		data->dma_blk_cfg.block_size = data->current.len;
 
-		if (configure_dma(&cfg->rx_dma, &data->dma_rx_cfg,
-					&data->dma_blk_cfg) != 0) {
-			LOG_ERR("Problem setting up RX DMA");
-			return;
+		ret = configure_dma(&cfg->rx_dma, &data->dma_rx_cfg, &data->dma_blk_cfg);
+		if (ret != 0) {
+			return ret;
 		}
 		LL_I2C_EnableDMAReq_RX(i2c);
 	} else {
@@ -181,14 +181,14 @@ static void dma_xfer_start(const struct device *dev, struct i2c_msg *msg)
 			data->dma_blk_cfg.dest_addr_adj = DMA_ADDR_ADJ_NO_CHANGE;
 			data->dma_blk_cfg.block_size = data->current.len;
 
-			if (configure_dma(&cfg->tx_dma, &data->dma_tx_cfg,
-						&data->dma_blk_cfg) != 0) {
-				LOG_ERR("Problem setting up TX DMA");
-				return;
+			ret = configure_dma(&cfg->tx_dma, &data->dma_tx_cfg, &data->dma_blk_cfg);
+			if (ret != 0) {
+				return ret;
 			}
 			LL_I2C_EnableDMAReq_TX(i2c);
 		}
 	}
+	return 0;
 }
 
 static void dma_finish(const struct device *dev, struct i2c_msg *msg)
@@ -799,11 +799,17 @@ static int stm32_i2c_irq_xfer(const struct device *dev, struct i2c_msg *msg,
 	uint32_t cr1 = I2C_CR1_ERRIE | I2C_CR1_STOPIE | I2C_CR1_TCIE | I2C_CR1_NACKIE;
 
 #ifdef CONFIG_I2C_STM32_V2_DMA
-	dma_xfer_start(dev, msg);
+	if (dma_xfer_start(dev, msg) != 0) {
+		LL_I2C_Disable(regs);
+#if defined(CONFIG_I2C_TARGET)
+		data->master_active = false;
+#endif
+		return -EIO;
+	}
 #else
 	/* If not using DMA, also enable RX and TX empty interrupts */
 	cr1 |= I2C_CR1_TXIE | I2C_CR1_RXIE;
-#endif
+#endif /* CONFIG_I2C_STM32_V2_DMA */
 
 	/* Commit configuration to I2C controller and start transfer */
 	LL_I2C_WriteReg(regs, CR2, cr2);