michaelh/zephyr
1
0
Fork 0
Code Releases Activity

pm: fix incorrect usages of PM_DEVICE_STATE_OFF

Browse source 
According to the documentation the OFF state has to be used when the
devices is fully turned off, ie, power removed. Most drivers were using
a sort of fall-through for all non-active states, leading to behaviors
not following the specifications.

Signed-off-by: Gerard Marull-Paretas <gerard.marull@nordicsemi.no>
This commit is contained in:
Gerard Marull-Paretas 2021-07-05 10:54:01 +02:00 • committed by Anas Nashif
commit 6d273f49bd
10 changed files with 3 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/flash/spi_flash_at45.c
View file

@ -637,8 +637,6 @@ static int spi_flash_at45_pm_control(const struct device *dev,
break;
case PM_DEVICE_STATE_SUSPENDED:
__fallthrough;
case PM_DEVICE_STATE_OFF:
acquire(dev);
power_down_op(dev,
dev_config->use_udpd ? CMD_ENTER_UDPD : CMD_ENTER_DPD,

2
drivers/i2c/i2c_nrfx_twi.c
View file

@ -231,8 +231,6 @@ static int twi_nrfx_pm_control(const struct device *dev,
break;
case PM_DEVICE_STATE_SUSPENDED:
__fallthrough;
case PM_DEVICE_STATE_OFF:
nrfx_twi_uninit(&get_dev_config(dev)->twi);
break;

2
drivers/i2c/i2c_nrfx_twim.c
View file

@ -269,8 +269,6 @@ static int twim_nrfx_pm_control(const struct device *dev,
break;
case PM_DEVICE_STATE_SUSPENDED:
__fallthrough;
case PM_DEVICE_STATE_OFF:
nrfx_twim_uninit(&get_dev_config(dev)->twim);
break;

2
drivers/interrupt_controller/intc_ioapic.c
View file

@ -319,8 +319,6 @@ static int ioapic_device_ctrl(const struct device *dev,
ret = ioapic_resume_from_suspend(dev);
break;
case PM_DEVICE_STATE_SUSPENDED:
__fallthrough;
case PM_DEVICE_STATE_OFF:
ret = ioapic_suspend(dev);
break;
default:

2
drivers/modem/hl7800.c
View file

@ -3505,7 +3505,7 @@ static void shutdown_uart(void)
HL7800_IO_DBG_LOG("Power OFF the UART");
uart_irq_rx_disable(ictx.mdm_ctx.uart_dev);
rc = pm_device_state_set(ictx.mdm_ctx.uart_dev,
PM_DEVICE_STATE_OFF);
PM_DEVICE_STATE_SUSPENDED);
if (rc) {
LOG_ERR("Error disabling UART peripheral (%d)", rc);
}

2
drivers/pwm/pwm_nrfx.c
View file

@ -301,8 +301,6 @@ static int pwm_nrfx_pm_control(const struct device *dev,
err = pwm_nrfx_init(dev);
break;
case PM_DEVICE_STATE_SUSPENDED:
__fallthrough;
case PM_DEVICE_STATE_OFF:
pwm_nrfx_uninit(dev);
break;
default:

6
drivers/sensor/bme280/bme280.c
View file

@ -197,8 +197,8 @@ static int bme280_sample_fetch(const struct device *dev,
#ifdef CONFIG_PM_DEVICE
enum pm_device_state state;
(void)pm_device_state_get(dev, &state);
/* Do not allow sample fetching from OFF state */
if (state == PM_DEVICE_STATE_OFF)
/* Do not allow sample fetching from suspended state */
if (state == PM_DEVICE_STATE_SUSPENDED)
return -EIO;
#endif
@ -420,8 +420,6 @@ int bme280_pm_ctrl(const struct device *dev, enum pm_device_state state)
ret = bme280_chip_init(dev);
break;
case PM_DEVICE_STATE_SUSPENDED:
__fallthrough;
case PM_DEVICE_STATE_OFF:
/* Put the chip into sleep mode */
ret = bme280_reg_write(dev,
BME280_REG_CTRL_MEAS,

2
drivers/sensor/bmp388/bmp388.c
View file

@ -559,8 +559,6 @@ static int bmp388_device_ctrl(const struct device *dev,
reg_val = BMP388_PWR_CTRL_MODE_NORMAL;
break;
case PM_DEVICE_STATE_SUSPENDED:
__fallthrough;
case PM_DEVICE_STATE_OFF:
reg_val = BMP388_PWR_CTRL_MODE_SLEEP;
break;
default:

1
drivers/spi/spi_nrfx_spi.c
View file

@ -292,7 +292,6 @@ static int spi_nrfx_pm_control(const struct device *dev,
break;
case PM_DEVICE_STATE_SUSPENDED:
case PM_DEVICE_STATE_OFF:
nrfx_spi_uninit(&config->spi);
break;

1
drivers/spi/spi_nrfx_spim.c
View file

@ -339,7 +339,6 @@ static int spim_nrfx_pm_control(const struct device *dev,
break;
case PM_DEVICE_STATE_SUSPENDED:
case PM_DEVICE_STATE_OFF:
nrfx_spim_uninit(&config->spim);
break;