drivers: disk: sdmmc_stm32: power up on request

Move power configuration from the device init function into the
`DISK_IOCTL_CTRL_INIT` and `DISK_IOCTL_CTRL_DEINIT` handlers. If
`pwr-gpios` is defined, this ensures that the card is not powered up
until requested, and enables power down the card when not in use.

This behaviour matches the implementation for `sdhc_spi`.

Signed-off-by: Jordan Yates <[email protected]>

Author: JordanYates

drivers/disk/sdmmc_stm32.c

@@ -277,34 +277,65 @@ static int stm32_sdmmc_dma_deinit(struct stm32_sdmmc_priv *priv)
 
 #endif
 
+/* Forward declarations */
+static int stm32_sdmmc_pwr_on(struct stm32_sdmmc_priv *priv);
+static int stm32_sdmmc_pwr_off(struct stm32_sdmmc_priv *priv);
+static int stm32_sdmmc_card_detect_init(struct stm32_sdmmc_priv *priv);
+static bool stm32_sdmmc_card_present(struct stm32_sdmmc_priv *priv);
+static int stm32_sdmmc_card_detect_uninit(struct stm32_sdmmc_priv *priv);
+
 static int stm32_sdmmc_access_init(struct disk_info *disk)
 {
 	const struct device *dev = disk->dev;
 	struct stm32_sdmmc_priv *priv = dev->data;
 	int err;
 
-	if (priv->status == DISK_STATUS_NOMEDIA) {
-		return -ENODEV;
+	err = stm32_sdmmc_pwr_on(priv);
+	if (err) {
+		return -EIO;
+	}
+
+	/* Configure dt provided device signals when available */
+	err = pinctrl_apply_state(priv->pcfg, PINCTRL_STATE_DEFAULT);
+	if (err < 0) {
+		stm32_sdmmc_pwr_off(priv);
+		return err;
+	}
+
+#if !defined(CONFIG_SDMMC_STM32_EMMC)
+	err = stm32_sdmmc_card_detect_init(priv);
+	if (err) {
+		stm32_sdmmc_pwr_off(priv);
+		return err;
+	}
+#endif
+
+	if (stm32_sdmmc_card_present(priv)) {
+		priv->status = DISK_STATUS_UNINIT;
+	} else {
+		priv->status = DISK_STATUS_NOMEDIA;
+		err = -ENODEV;
+		goto error;
 	}
 
 #if STM32_SDMMC_USE_DMA
 	err = stm32_sdmmc_dma_init(priv);
 	if (err) {
 		LOG_ERR("DMA init failed");
-		return err;
+		goto error;
 	}
 #endif
 
 	err = stm32_sdmmc_clock_enable(priv);
 	if (err) {
 		LOG_ERR("failed to init clocks");
-		return err;
+		goto error;
 	}
 
 	err = reset_line_toggle_dt(&priv->reset);
 	if (err) {
 		LOG_ERR("failed to reset peripheral");
-		return err;
+		goto error;
 	}
 
 #ifdef CONFIG_SDMMC_STM32_EMMC
@@ -314,7 +345,8 @@ static int stm32_sdmmc_access_init(struct disk_info *disk)
 #endif
 	if (err != HAL_OK) {
 		LOG_ERR("failed to init stm32_sdmmc (ErrorCode 0x%X)", priv->hsd.ErrorCode);
-		return -EIO;
+		err = -EIO;
+		goto error;
 	}
 
 #ifdef CONFIG_SDMMC_STM32_HWFC
@@ -323,6 +355,12 @@ static int stm32_sdmmc_access_init(struct disk_info *disk)
 
 	priv->status = DISK_STATUS_OK;
 	return 0;
+error:
+#if !defined(CONFIG_SDMMC_STM32_EMMC)
+	stm32_sdmmc_card_detect_uninit(priv);
+#endif
+	stm32_sdmmc_pwr_off(priv);
+	return err;
 }
 
 static int stm32_sdmmc_access_deinit(struct stm32_sdmmc_priv *priv)
@@ -348,6 +386,11 @@ static int stm32_sdmmc_access_deinit(struct stm32_sdmmc_priv *priv)
 		return err;
 	}
 
+#if !defined(CONFIG_SDMMC_STM32_EMMC)
+	stm32_sdmmc_card_detect_uninit(priv);
+#endif
+	stm32_sdmmc_pwr_off(priv);
+
 	priv->status = DISK_STATUS_UNINIT;
 	return 0;
 }
@@ -646,7 +689,7 @@ static int stm32_sdmmc_card_detect_uninit(struct stm32_sdmmc_priv *priv)
 }
 #endif /* !CONFIG_SDMMC_STM32_EMMC */
 
-static int stm32_sdmmc_pwr_init(struct stm32_sdmmc_priv *priv)
+static int stm32_sdmmc_pwr_on(struct stm32_sdmmc_priv *priv)
 {
 	int err;
 
@@ -668,21 +711,20 @@ static int stm32_sdmmc_pwr_init(struct stm32_sdmmc_priv *priv)
 	return 0;
 }
 
-static int stm32_sdmmc_pwr_uninit(struct stm32_sdmmc_priv *priv)
+static int stm32_sdmmc_pwr_off(struct stm32_sdmmc_priv *priv)
 {
 	if (!priv->pe.port) {
 		return 0;
 	}
 
-	gpio_pin_configure_dt(&priv->pe, GPIO_DISCONNECTED);
+	gpio_pin_configure_dt(&priv->pe, GPIO_OUTPUT_INACTIVE);
 	return 0;
 }
 
 static int disk_stm32_sdmmc_init(const struct device *dev)
 {
 	struct stm32_sdmmc_priv *priv = dev->data;
 	const struct device *const clk = DEVICE_DT_GET(STM32_CLOCK_CONTROL_NODE);
-	int err;
 
 	if (!device_is_ready(clk)) {
 		LOG_ERR("clock control device not ready");
@@ -694,12 +736,6 @@ static int disk_stm32_sdmmc_init(const struct device *dev)
 		return -ENODEV;
 	}
 
-	/* Configure dt provided device signals when available */
-	err = pinctrl_apply_state(priv->pcfg, PINCTRL_STATE_DEFAULT);
-	if (err < 0) {
-		return err;
-	}
-
 	priv->irq_config(dev);
 
 	/* Initialize semaphores */
@@ -708,38 +744,13 @@ static int disk_stm32_sdmmc_init(const struct device *dev)
 
 #if !defined(CONFIG_SDMMC_STM32_EMMC)
 	k_work_init(&priv->work, stm32_sdmmc_cd_handler);
-
-	err = stm32_sdmmc_card_detect_init(priv);
-	if (err) {
-		return err;
-	}
 #endif
 
-	err = stm32_sdmmc_pwr_init(priv);
-	if (err) {
-		goto err_card_detect;
-	}
-
-	if (stm32_sdmmc_card_present(priv)) {
-		priv->status = DISK_STATUS_UNINIT;
-	} else {
-		priv->status = DISK_STATUS_NOMEDIA;
-	}
+	/* Ensure off by default */
+	stm32_sdmmc_pwr_off(priv);
 
 	stm32_sdmmc_info.dev = dev;
-	err = disk_access_register(&stm32_sdmmc_info);
-	if (err) {
-		goto err_pwr;
-	}
-	return 0;
-
-err_pwr:
-	stm32_sdmmc_pwr_uninit(priv);
-err_card_detect:
-#if !defined(CONFIG_SDMMC_STM32_EMMC)
-	stm32_sdmmc_card_detect_uninit(priv);
-#endif
-	return err;
+	return disk_access_register(&stm32_sdmmc_info);
 }
 
 #if DT_NODE_HAS_STATUS_OKAY(DT_DRV_INST(0))