Skip to content

driver: spi: silabs_siwx91x_gspi: Add pm device support for gspi driver #94373

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 22, 2025
Merged

driver: spi: silabs_siwx91x_gspi: Add pm device support for gspi driver #94373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 53 additions & 19 deletions drivers/spi/spi_silabs_siwx91x_gspi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
#include <zephyr/sys/util.h>
#include <zephyr/sys/sys_io.h>
#include <zephyr/logging/log.h>
#include <zephyr/pm/device.h>
#include <zephyr/pm/device_runtime.h>
#include "clock_update.h"

LOG_MODULE_REGISTER(spi_siwx91x_gspi, CONFIG_SPI_LOG_LEVEL);
Expand Down Expand Up @@ -209,6 +211,7 @@ static void gspi_siwx91x_dma_rx_callback(const struct device *dev, void *user_da

spi_context_cs_control(instance_ctx, false);
spi_context_complete(instance_ctx, spi_dev, status);
pm_device_runtime_put_async(spi_dev, K_NO_WAIT);
}

static int gspi_siwx91x_dma_config(const struct device *dev,
Expand Down Expand Up @@ -533,8 +536,15 @@ static int gspi_siwx91x_transceive(const struct device *dev, const struct spi_co
struct gspi_siwx91x_data *data = dev->data;
int ret = 0;

ret = pm_device_runtime_get(dev);
if (ret < 0) {
return ret;
}

if (!spi_siwx91x_is_dma_enabled_instance(dev) && asynchronous) {
ret = -ENOTSUP;
pm_device_runtime_put(dev);
return ret;
}

spi_context_lock(&data->ctx, asynchronous, cb, userdata, config);
Expand All @@ -559,6 +569,7 @@ static int gspi_siwx91x_transceive(const struct device *dev, const struct spi_co
/* Perform synchronous polling transceive */
ret = gspi_siwx91x_transceive_polling_sync(dev, &data->ctx);
spi_context_unlock_unconditionally(&data->ctx);
pm_device_runtime_put(dev);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unless I'm misunderstanding something, this doesn't seem correct to me. If DMA is used for a blocking transfer, won't the runtime_put already have happened in the DMA complete callback? It seems to me like this should be done inside the else above, and not be related to asynchronous at all.

Copy link
Contributor Author

@fimohame fimohame Oct 22, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Your correct. It's been addressed now

}

return ret;
Expand Down Expand Up @@ -592,35 +603,57 @@ static int gspi_siwx91x_release(const struct device *dev, const struct spi_confi
return 0;
}

static int gspi_siwx91x_init(const struct device *dev)
static int gspi_siwx91x_pm_action(const struct device *dev, enum pm_device_action action)
{
const struct gspi_siwx91x_config *cfg = dev->config;
struct gspi_siwx91x_data *data = dev->data;
int ret;

ret = clock_control_on(cfg->clock_dev, cfg->clock_subsys);
if (ret) {
return ret;
}
switch (action) {
case PM_DEVICE_ACTION_RESUME:
break;
case PM_DEVICE_ACTION_SUSPEND:
break;
case PM_DEVICE_ACTION_TURN_ON:
ret = clock_control_on(cfg->clock_dev, cfg->clock_subsys);
if (ret < 0 && ret != -EALREADY) {
return ret;
}

ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
if (ret) {
return ret;
}
ret = pinctrl_apply_state(cfg->pcfg, PINCTRL_STATE_DEFAULT);
if (ret < 0 && ret != -ENOENT) {
return ret;
}

ret = spi_context_cs_configure_all(&data->ctx);
if (ret) {
return ret;
}
ret = spi_context_cs_configure_all(&data->ctx);
if (ret) {
return ret;
}

spi_context_unlock_unconditionally(&data->ctx);
spi_context_unlock_unconditionally(&data->ctx);

cfg->reg->GSPI_BUS_MODE_b.SPI_HIGH_PERFORMANCE_EN = 1;
cfg->reg->GSPI_CONFIG1_b.GSPI_MANUAL_CSN = 0;
cfg->reg->GSPI_BUS_MODE_b.SPI_HIGH_PERFORMANCE_EN = 1;
cfg->reg->GSPI_CONFIG1_b.GSPI_MANUAL_CSN = 0;
data->ctx.config = NULL;
break;
case PM_DEVICE_ACTION_TURN_OFF:
ret = clock_control_off(cfg->clock_dev, cfg->clock_subsys);
if (ret < 0 && ret != -EALREADY) {
return ret;
}
break;
default:
return -ENOTSUP;
}

return 0;
}

static int gspi_siwx91x_init(const struct device *dev)
{
return pm_device_driver_init(dev, gspi_siwx91x_pm_action);
}

static DEVICE_API(spi, gspi_siwx91x_driver_api) = {
.transceive = gspi_siwx91x_transceive_sync,
#ifdef CONFIG_SPI_ASYNC
Expand Down Expand Up @@ -662,8 +695,9 @@ static DEVICE_API(spi, gspi_siwx91x_driver_api) = {
.pcfg = PINCTRL_DT_INST_DEV_CONFIG_GET(inst), \
.mosi_overrun = (uint8_t)SPI_MOSI_OVERRUN_DT(inst), \
}; \
DEVICE_DT_INST_DEFINE(inst, &gspi_siwx91x_init, NULL, &gspi_data_##inst, \
&gspi_config_##inst, POST_KERNEL, CONFIG_SPI_INIT_PRIORITY, \
&gspi_siwx91x_driver_api);
PM_DEVICE_DT_INST_DEFINE(inst, gspi_siwx91x_pm_action); \
DEVICE_DT_INST_DEFINE(inst, &gspi_siwx91x_init, PM_DEVICE_DT_INST_GET(inst), \
&gspi_data_##inst, &gspi_config_##inst, POST_KERNEL, \
CONFIG_SPI_INIT_PRIORITY, &gspi_siwx91x_driver_api);

DT_INST_FOREACH_STATUS_OKAY(SIWX91X_GSPI_INIT)
2 changes: 2 additions & 0 deletions dts/arm/silabs/siwg917.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,6 +372,8 @@
interrupts = <46 0>;
interrupt-names = "gspi";
clocks = <&clock0 SIWX91X_CLK_GSPI>;
power-domains = <&siwx91x_soc_pd>;
zephyr,pm-device-runtime-auto;
status = "disabled";
};

Expand Down