* [PATCH 0/7] firmware: imx: scu-pd: misc update
@ 2023-07-14 9:09 Peng Fan (OSS)
2023-07-14 9:09 ` [PATCH 1/7] firmware: imx: scu-pd: enlarge PD range Peng Fan (OSS)
` (7 more replies)
0 siblings, 8 replies; 10+ messages in thread
From: Peng Fan (OSS) @ 2023-07-14 9:09 UTC (permalink / raw)
To: shawnguo, s.hauer
Cc: kernel, festevam, linux-imx, Frank.Li, aisheng.dong,
marcel.ziswiler, linux-arm-kernel, linux-kernel, Peng Fan
From: Peng Fan <peng.fan@nxp.com>
This patchset is to upstream NXP downstream scu-pd driver patches.
patch 1,2 is to support more PDs
patch 3 is to not power off console when no console suspend
patch 4 is to suppress bind
patch 5 is to make genpd align with HW state
patch 6 is to support LP mode in runtime suspend, OFF mode in system suspend.
patch 7 is to change init level to avoid uneccessary defer probe
Dong Aisheng (2):
firmware: imx: scu-pd: do not power off console if no_console_suspend
firmware: imx: scu-pd: change init level to subsys_initcall
Peng Fan (5):
firmware: imx: scu-pd: enlarge PD range
firmware: imx: scu-pd: add more PDs
firmware: imx: scu-pd: Suppress bind attrs
firmware: imx: scu-pd: initialize is_off according to HW state
firmware: imx: scu-pd: add multi states support
drivers/firmware/imx/scu-pd.c | 193 ++++++++++++++++++++++++++++++++--
1 file changed, 182 insertions(+), 11 deletions(-)
--
2.37.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 10+ messages in thread* [PATCH 1/7] firmware: imx: scu-pd: enlarge PD range 2023-07-14 9:09 [PATCH 0/7] firmware: imx: scu-pd: misc update Peng Fan (OSS) @ 2023-07-14 9:09 ` Peng Fan (OSS) 2023-07-14 9:09 ` [PATCH 2/7] firmware: imx: scu-pd: add more PDs Peng Fan (OSS) ` (6 subsequent siblings) 7 siblings, 0 replies; 10+ messages in thread From: Peng Fan (OSS) @ 2023-07-14 9:09 UTC (permalink / raw) To: shawnguo, s.hauer Cc: kernel, festevam, linux-imx, Frank.Li, aisheng.dong, marcel.ziswiler, linux-arm-kernel, linux-kernel, Peng Fan From: Peng Fan <peng.fan@nxp.com> There are 5 LPI2C, 5 LPUART and 32 DMA0 Channel resources per imx_rsrc.h, and they are in i.MX8QM, so enlarge the PD range for them. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- drivers/firmware/imx/scu-pd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/imx/scu-pd.c b/drivers/firmware/imx/scu-pd.c index 84b673427073..5a28f5af592a 100644 --- a/drivers/firmware/imx/scu-pd.c +++ b/drivers/firmware/imx/scu-pd.c @@ -121,9 +121,9 @@ static const struct imx_sc_pd_range imx8qxp_scu_pd_ranges[] = { { "audio-pll1", IMX_SC_R_AUDIO_PLL_1, 1, false, 0 }, { "audio-clk-0", IMX_SC_R_AUDIO_CLK_0, 1, false, 0 }, { "audio-clk-1", IMX_SC_R_AUDIO_CLK_1, 1, false, 0 }, - { "dma0-ch", IMX_SC_R_DMA_0_CH0, 16, true, 0 }, + { "dma0-ch", IMX_SC_R_DMA_0_CH0, 32, true, 0 }, { "dma1-ch", IMX_SC_R_DMA_1_CH0, 16, true, 0 }, - { "dma2-ch", IMX_SC_R_DMA_2_CH0, 5, true, 0 }, + { "dma2-ch", IMX_SC_R_DMA_2_CH0, 32, true, 0 }, { "asrc0", IMX_SC_R_ASRC_0, 1, false, 0 }, { "asrc1", IMX_SC_R_ASRC_1, 1, false, 0 }, { "esai0", IMX_SC_R_ESAI_0, 1, false, 0 }, @@ -143,11 +143,11 @@ static const struct imx_sc_pd_range imx8qxp_scu_pd_ranges[] = { /* DMA SS */ { "can", IMX_SC_R_CAN_0, 3, true, 0 }, { "ftm", IMX_SC_R_FTM_0, 2, true, 0 }, - { "lpi2c", IMX_SC_R_I2C_0, 4, true, 0 }, + { "lpi2c", IMX_SC_R_I2C_0, 5, true, 0 }, { "adc", IMX_SC_R_ADC_0, 2, true, 0 }, { "lcd", IMX_SC_R_LCD_0, 1, true, 0 }, { "lcd0-pwm", IMX_SC_R_LCD_0_PWM_0, 1, true, 0 }, - { "lpuart", IMX_SC_R_UART_0, 4, true, 0 }, + { "lpuart", IMX_SC_R_UART_0, 5, true, 0 }, { "lpspi", IMX_SC_R_SPI_0, 4, true, 0 }, { "irqstr_dsp", IMX_SC_R_IRQSTR_DSP, 1, false, 0 }, -- 2.37.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 2/7] firmware: imx: scu-pd: add more PDs 2023-07-14 9:09 [PATCH 0/7] firmware: imx: scu-pd: misc update Peng Fan (OSS) 2023-07-14 9:09 ` [PATCH 1/7] firmware: imx: scu-pd: enlarge PD range Peng Fan (OSS) @ 2023-07-14 9:09 ` Peng Fan (OSS) 2023-07-14 9:09 ` [PATCH 3/7] firmware: imx: scu-pd: do not power off console if no_console_suspend Peng Fan (OSS) ` (5 subsequent siblings) 7 siblings, 0 replies; 10+ messages in thread From: Peng Fan (OSS) @ 2023-07-14 9:09 UTC (permalink / raw) To: shawnguo, s.hauer Cc: kernel, festevam, linux-imx, Frank.Li, aisheng.dong, marcel.ziswiler, linux-arm-kernel, linux-kernel, Peng Fan From: Peng Fan <peng.fan@nxp.com> Add more PDs for i.MX8QM and i.MX8DXL, including dma-ch, esai, gpu1, v2x-mu, seco-mu, hdmi, img and etc. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- drivers/firmware/imx/scu-pd.c | 65 +++++++++++++++++++++++++++++++++++ 1 file changed, 65 insertions(+) diff --git a/drivers/firmware/imx/scu-pd.c b/drivers/firmware/imx/scu-pd.c index 5a28f5af592a..08583a10ac62 100644 --- a/drivers/firmware/imx/scu-pd.c +++ b/drivers/firmware/imx/scu-pd.c @@ -121,12 +121,16 @@ static const struct imx_sc_pd_range imx8qxp_scu_pd_ranges[] = { { "audio-pll1", IMX_SC_R_AUDIO_PLL_1, 1, false, 0 }, { "audio-clk-0", IMX_SC_R_AUDIO_CLK_0, 1, false, 0 }, { "audio-clk-1", IMX_SC_R_AUDIO_CLK_1, 1, false, 0 }, + { "mclk-out-0", IMX_SC_R_MCLK_OUT_0, 1, false, 0 }, + { "mclk-out-1", IMX_SC_R_MCLK_OUT_1, 1, false, 0 }, { "dma0-ch", IMX_SC_R_DMA_0_CH0, 32, true, 0 }, { "dma1-ch", IMX_SC_R_DMA_1_CH0, 16, true, 0 }, { "dma2-ch", IMX_SC_R_DMA_2_CH0, 32, true, 0 }, + { "dma3-ch", IMX_SC_R_DMA_3_CH0, 32, true, 0 }, { "asrc0", IMX_SC_R_ASRC_0, 1, false, 0 }, { "asrc1", IMX_SC_R_ASRC_1, 1, false, 0 }, { "esai0", IMX_SC_R_ESAI_0, 1, false, 0 }, + { "esai1", IMX_SC_R_ESAI_1, 1, false, 0 }, { "spdif0", IMX_SC_R_SPDIF_0, 1, false, 0 }, { "spdif1", IMX_SC_R_SPDIF_1, 1, false, 0 }, { "sai", IMX_SC_R_SAI_0, 3, true, 0 }, @@ -146,8 +150,10 @@ static const struct imx_sc_pd_range imx8qxp_scu_pd_ranges[] = { { "lpi2c", IMX_SC_R_I2C_0, 5, true, 0 }, { "adc", IMX_SC_R_ADC_0, 2, true, 0 }, { "lcd", IMX_SC_R_LCD_0, 1, true, 0 }, + { "lcd-pll", IMX_SC_R_ELCDIF_PLL, 1, true, 0 }, { "lcd0-pwm", IMX_SC_R_LCD_0_PWM_0, 1, true, 0 }, { "lpuart", IMX_SC_R_UART_0, 5, true, 0 }, + { "sim", IMX_SC_R_EMVSIM_0, 2, true, 0 }, { "lpspi", IMX_SC_R_SPI_0, 4, true, 0 }, { "irqstr_dsp", IMX_SC_R_IRQSTR_DSP, 1, false, 0 }, @@ -163,10 +169,15 @@ static const struct imx_sc_pd_range imx8qxp_scu_pd_ranges[] = { /* GPU SS */ { "gpu0-pid", IMX_SC_R_GPU_0_PID0, 4, true, 0 }, + { "gpu1-pid", IMX_SC_R_GPU_1_PID0, 4, true, 0 }, + /* HSIO SS */ + { "pcie-a", IMX_SC_R_PCIE_A, 1, false, 0 }, + { "serdes-0", IMX_SC_R_SERDES_0, 1, false, 0 }, { "pcie-b", IMX_SC_R_PCIE_B, 1, false, 0 }, { "serdes-1", IMX_SC_R_SERDES_1, 1, false, 0 }, + { "sata-0", IMX_SC_R_SATA_0, 1, false, 0 }, { "hsio-gpio", IMX_SC_R_HSIO_GPIO, 1, false, 0 }, /* MIPI SS */ @@ -186,11 +197,20 @@ static const struct imx_sc_pd_range imx8qxp_scu_pd_ranges[] = { { "lvds1-pwm", IMX_SC_R_LVDS_1_PWM_0, 1, false, 0 }, { "lvds1-lpi2c", IMX_SC_R_LVDS_1_I2C_0, 2, true, 0 }, + { "mipi1", IMX_SC_R_MIPI_1, 1, 0 }, + { "mipi1-pwm0", IMX_SC_R_MIPI_1_PWM_0, 1, 0 }, + { "mipi1-i2c", IMX_SC_R_MIPI_1_I2C_0, 2, 1 }, + { "lvds1", IMX_SC_R_LVDS_1, 1, 0 }, + /* DC SS */ { "dc0", IMX_SC_R_DC_0, 1, false, 0 }, { "dc0-pll", IMX_SC_R_DC_0_PLL_0, 2, true, 0 }, { "dc0-video", IMX_SC_R_DC_0_VIDEO0, 2, true, 0 }, + { "dc1", IMX_SC_R_DC_1, 1, false, 0 }, + { "dc1-pll", IMX_SC_R_DC_1_PLL_0, 2, true, 0 }, + { "dc1-video", IMX_SC_R_DC_1_VIDEO0, 2, true, 0 }, + /* CM40 SS */ { "cm40-i2c", IMX_SC_R_M4_0_I2C, 1, false, 0 }, { "cm40-intmux", IMX_SC_R_M4_0_INTMUX, 1, false, 0 }, @@ -205,11 +225,56 @@ static const struct imx_sc_pd_range imx8qxp_scu_pd_ranges[] = { { "cm41-mu-a1", IMX_SC_R_M4_1_MU_1A, 1, false, 0}, { "cm41-lpuart", IMX_SC_R_M4_1_UART, 1, false, 0}, + /* CM41 SS */ + { "cm41_i2c", IMX_SC_R_M4_1_I2C, 1, false, 0 }, + { "cm41_intmux", IMX_SC_R_M4_1_INTMUX, 1, false, 0 }, + + /* DB SS */ + { "perf", IMX_SC_R_PERF, 1, false, 0}, + /* IMAGE SS */ { "img-jpegdec-mp", IMX_SC_R_MJPEG_DEC_MP, 1, false, 0 }, { "img-jpegdec-s0", IMX_SC_R_MJPEG_DEC_S0, 4, true, 0 }, { "img-jpegenc-mp", IMX_SC_R_MJPEG_ENC_MP, 1, false, 0 }, { "img-jpegenc-s0", IMX_SC_R_MJPEG_ENC_S0, 4, true, 0 }, + + /* SECO SS */ + { "seco_mu", IMX_SC_R_SECO_MU_2, 3, true, 2}, + + /* V2X SS */ + { "v2x_mu", IMX_SC_R_V2X_MU_0, 2, true, 0}, + { "v2x_mu", IMX_SC_R_V2X_MU_2, 1, true, 2}, + { "v2x_mu", IMX_SC_R_V2X_MU_3, 2, true, 3}, + { "img-pdma", IMX_SC_R_ISI_CH0, 8, true, 0 }, + { "img-csi0", IMX_SC_R_CSI_0, 1, false, 0 }, + { "img-csi0-i2c0", IMX_SC_R_CSI_0_I2C_0, 1, false, 0 }, + { "img-csi0-pwm0", IMX_SC_R_CSI_0_PWM_0, 1, false, 0 }, + { "img-csi1", IMX_SC_R_CSI_1, 1, false, 0 }, + { "img-csi1-i2c0", IMX_SC_R_CSI_1_I2C_0, 1, false, 0 }, + { "img-csi1-pwm0", IMX_SC_R_CSI_1_PWM_0, 1, false, 0 }, + { "img-parallel", IMX_SC_R_PI_0, 1, false, 0 }, + { "img-parallel-i2c0", IMX_SC_R_PI_0_I2C_0, 1, false, 0 }, + { "img-parallel-pwm0", IMX_SC_R_PI_0_PWM_0, 2, true, 0 }, + { "img-parallel-pll", IMX_SC_R_PI_0_PLL, 1, false, 0 }, + + /* HDMI TX SS */ + { "hdmi-tx", IMX_SC_R_HDMI, 1, false, 0}, + { "hdmi-tx-i2s", IMX_SC_R_HDMI_I2S, 1, false, 0}, + { "hdmi-tx-i2c0", IMX_SC_R_HDMI_I2C_0, 1, false, 0}, + { "hdmi-tx-pll0", IMX_SC_R_HDMI_PLL_0, 1, false, 0}, + { "hdmi-tx-pll1", IMX_SC_R_HDMI_PLL_1, 1, false, 0}, + + /* HDMI RX SS */ + { "hdmi-rx", IMX_SC_R_HDMI_RX, 1, false, 0}, + { "hdmi-rx-pwm", IMX_SC_R_HDMI_RX_PWM_0, 1, false, 0}, + { "hdmi-rx-i2c0", IMX_SC_R_HDMI_RX_I2C_0, 1, false, 0}, + { "hdmi-rx-bypass", IMX_SC_R_HDMI_RX_BYPASS, 1, false, 0}, + + /* SECURITY SS */ + { "sec-jr", IMX_SC_R_CAAM_JR2, 2, true, 2}, + + /* BOARD SS */ + { "board", IMX_SC_R_BOARD_R0, 8, true, 0}, }; static const struct imx_sc_pd_soc imx8qxp_scu_pd = { -- 2.37.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 3/7] firmware: imx: scu-pd: do not power off console if no_console_suspend 2023-07-14 9:09 [PATCH 0/7] firmware: imx: scu-pd: misc update Peng Fan (OSS) 2023-07-14 9:09 ` [PATCH 1/7] firmware: imx: scu-pd: enlarge PD range Peng Fan (OSS) 2023-07-14 9:09 ` [PATCH 2/7] firmware: imx: scu-pd: add more PDs Peng Fan (OSS) @ 2023-07-14 9:09 ` Peng Fan (OSS) 2023-07-14 9:09 ` [PATCH 4/7] firmware: imx: scu-pd: Suppress bind attrs Peng Fan (OSS) ` (4 subsequent siblings) 7 siblings, 0 replies; 10+ messages in thread From: Peng Fan (OSS) @ 2023-07-14 9:09 UTC (permalink / raw) To: shawnguo, s.hauer Cc: kernel, festevam, linux-imx, Frank.Li, aisheng.dong, marcel.ziswiler, linux-arm-kernel, linux-kernel, Peng Fan From: Dong Aisheng <aisheng.dong@nxp.com> Do not power off console if no_console_suspend Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> --- drivers/firmware/imx/scu-pd.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/firmware/imx/scu-pd.c b/drivers/firmware/imx/scu-pd.c index 08583a10ac62..6770be51d234 100644 --- a/drivers/firmware/imx/scu-pd.c +++ b/drivers/firmware/imx/scu-pd.c @@ -52,6 +52,7 @@ */ #include <dt-bindings/firmware/imx/rsrc.h> +#include <linux/console.h> #include <linux/firmware/imx/sci.h> #include <linux/firmware/imx/svc/rm.h> #include <linux/io.h> @@ -324,6 +325,10 @@ static int imx_sc_pd_power(struct generic_pm_domain *domain, bool power_on) msg.resource = pd->rsrc; msg.mode = power_on ? IMX_SC_PM_PW_MODE_ON : IMX_SC_PM_PW_MODE_LP; + /* keep uart console power on for no_console_suspend */ + if (imx_con_rsrc == pd->rsrc && !console_suspend_enabled && !power_on) + return 0; + ret = imx_scu_call_rpc(pm_ipc_handle, &msg, true); if (ret) dev_err(&domain->dev, "failed to power %s resource %d ret %d\n", -- 2.37.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 4/7] firmware: imx: scu-pd: Suppress bind attrs 2023-07-14 9:09 [PATCH 0/7] firmware: imx: scu-pd: misc update Peng Fan (OSS) ` (2 preceding siblings ...) 2023-07-14 9:09 ` [PATCH 3/7] firmware: imx: scu-pd: do not power off console if no_console_suspend Peng Fan (OSS) @ 2023-07-14 9:09 ` Peng Fan (OSS) 2023-07-14 9:09 ` [PATCH 5/7] firmware: imx: scu-pd: initialize is_off according to HW state Peng Fan (OSS) ` (3 subsequent siblings) 7 siblings, 0 replies; 10+ messages in thread From: Peng Fan (OSS) @ 2023-07-14 9:09 UTC (permalink / raw) To: shawnguo, s.hauer Cc: kernel, festevam, linux-imx, Frank.Li, aisheng.dong, marcel.ziswiler, linux-arm-kernel, linux-kernel, Peng Fan From: Peng Fan <peng.fan@nxp.com> This driver is registered as platform driver, but removing and binding again would cause system not workable. So suppress bind attrs. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- drivers/firmware/imx/scu-pd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/firmware/imx/scu-pd.c b/drivers/firmware/imx/scu-pd.c index 6770be51d234..9f8dac7950fe 100644 --- a/drivers/firmware/imx/scu-pd.c +++ b/drivers/firmware/imx/scu-pd.c @@ -488,6 +488,7 @@ static struct platform_driver imx_sc_pd_driver = { .driver = { .name = "imx-scu-pd", .of_match_table = imx_sc_pd_match, + .suppress_bind_attrs = true, }, .probe = imx_sc_pd_probe, }; -- 2.37.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 5/7] firmware: imx: scu-pd: initialize is_off according to HW state 2023-07-14 9:09 [PATCH 0/7] firmware: imx: scu-pd: misc update Peng Fan (OSS) ` (3 preceding siblings ...) 2023-07-14 9:09 ` [PATCH 4/7] firmware: imx: scu-pd: Suppress bind attrs Peng Fan (OSS) @ 2023-07-14 9:09 ` Peng Fan (OSS) 2023-07-14 9:09 ` [PATCH 6/7] firmware: imx: scu-pd: add multi states support Peng Fan (OSS) ` (2 subsequent siblings) 7 siblings, 0 replies; 10+ messages in thread From: Peng Fan (OSS) @ 2023-07-14 9:09 UTC (permalink / raw) To: shawnguo, s.hauer Cc: kernel, festevam, linux-imx, Frank.Li, aisheng.dong, marcel.ziswiler, linux-arm-kernel, linux-kernel, Peng Fan From: Peng Fan <peng.fan@nxp.com> The current code default set is_off to true except console resource, this implies bootloader should power off all the resources it uses. But this is not always true, let's check the HW state and set is_off. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- drivers/firmware/imx/scu-pd.c | 59 ++++++++++++++++++++++++++++++++--- 1 file changed, 55 insertions(+), 4 deletions(-) diff --git a/drivers/firmware/imx/scu-pd.c b/drivers/firmware/imx/scu-pd.c index 9f8dac7950fe..763af1ac454d 100644 --- a/drivers/firmware/imx/scu-pd.c +++ b/drivers/firmware/imx/scu-pd.c @@ -72,6 +72,22 @@ struct imx_sc_msg_req_set_resource_power_mode { u8 mode; } __packed __aligned(4); +struct req_get_resource_mode { + u16 resource; +}; + +struct resp_get_resource_mode { + u8 mode; +}; + +struct imx_sc_msg_req_get_resource_power_mode { + struct imx_sc_rpc_msg hdr; + union { + struct req_get_resource_mode req; + struct resp_get_resource_mode resp; + } data; +} __packed __aligned(4); + #define IMX_SCU_PD_NAME_SIZE 20 struct imx_sc_pm_domain { struct generic_pm_domain pd; @@ -96,6 +112,14 @@ struct imx_sc_pd_soc { static int imx_con_rsrc; +/* Align with the IMX_SC_PM_PW_MODE_[OFF,STBY,LP,ON] macros */ +static const char * const imx_sc_pm_mode[] = { + "IMX_SC_PM_PW_MODE_OFF", + "IMX_SC_PM_PW_MODE_STBY", + "IMX_SC_PM_PW_MODE_LP", + "IMX_SC_PM_PW_MODE_ON" +}; + static const struct imx_sc_pd_range imx8qxp_scu_pd_ranges[] = { /* LSIO SS */ { "pwm", IMX_SC_R_PWM_0, 8, true, 0 }, @@ -308,6 +332,27 @@ static void imx_sc_pd_get_console_rsrc(void) imx_con_rsrc = specs.args[0]; } +static int imx_sc_get_pd_power(struct device *dev, u32 rsrc) +{ + struct imx_sc_msg_req_get_resource_power_mode msg; + struct imx_sc_rpc_msg *hdr = &msg.hdr; + int ret; + + hdr->ver = IMX_SC_RPC_VERSION; + hdr->svc = IMX_SC_RPC_SVC_PM; + hdr->func = IMX_SC_PM_FUNC_GET_RESOURCE_POWER_MODE; + hdr->size = 2; + + msg.data.req.resource = rsrc; + + ret = imx_scu_call_rpc(pm_ipc_handle, &msg, true); + if (ret) + dev_err(dev, "failed to get power resource %d mode, ret %d\n", + rsrc, ret); + + return msg.data.resp.mode; +} + static int imx_sc_pd_power(struct generic_pm_domain *domain, bool power_on) { struct imx_sc_msg_req_set_resource_power_mode msg; @@ -372,8 +417,8 @@ imx_scu_add_pm_domain(struct device *dev, int idx, const struct imx_sc_pd_range *pd_ranges) { struct imx_sc_pm_domain *sc_pd; - bool is_off = true; - int ret; + bool is_off; + int mode, ret; if (!imx_sc_rm_is_resource_owned(pm_ipc_handle, pd_ranges->rsrc + idx)) return NULL; @@ -394,10 +439,16 @@ imx_scu_add_pm_domain(struct device *dev, int idx, "%s", pd_ranges->name); sc_pd->pd.name = sc_pd->name; - if (imx_con_rsrc == sc_pd->rsrc) { + if (imx_con_rsrc == sc_pd->rsrc) sc_pd->pd.flags = GENPD_FLAG_RPM_ALWAYS_ON; + + mode = imx_sc_get_pd_power(dev, pd_ranges->rsrc + idx); + if (mode == IMX_SC_PM_PW_MODE_ON) is_off = false; - } + else + is_off = true; + + dev_dbg(dev, "%s : %s\n", sc_pd->name, imx_sc_pm_mode[mode]); if (sc_pd->rsrc >= IMX_SC_R_LAST) { dev_warn(dev, "invalid pd %s rsrc id %d found", -- 2.37.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 6/7] firmware: imx: scu-pd: add multi states support 2023-07-14 9:09 [PATCH 0/7] firmware: imx: scu-pd: misc update Peng Fan (OSS) ` (4 preceding siblings ...) 2023-07-14 9:09 ` [PATCH 5/7] firmware: imx: scu-pd: initialize is_off according to HW state Peng Fan (OSS) @ 2023-07-14 9:09 ` Peng Fan (OSS) 2023-07-14 9:09 ` [PATCH 7/7] firmware: imx: scu-pd: change init level to subsys_initcall Peng Fan (OSS) 2023-07-19 7:00 ` [PATCH 0/7] firmware: imx: scu-pd: misc update Shawn Guo 7 siblings, 0 replies; 10+ messages in thread From: Peng Fan (OSS) @ 2023-07-14 9:09 UTC (permalink / raw) To: shawnguo, s.hauer Cc: kernel, festevam, linux-imx, Frank.Li, aisheng.dong, marcel.ziswiler, linux-arm-kernel, linux-kernel, Peng Fan From: Peng Fan <peng.fan@nxp.com> Add multi states support, this is to support devices could run in LP mode when runtime suspend, and OFF mode when system suspend. Signed-off-by: Peng Fan <peng.fan@nxp.com> --- drivers/firmware/imx/scu-pd.c | 48 +++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-) diff --git a/drivers/firmware/imx/scu-pd.c b/drivers/firmware/imx/scu-pd.c index 763af1ac454d..31de56366a50 100644 --- a/drivers/firmware/imx/scu-pd.c +++ b/drivers/firmware/imx/scu-pd.c @@ -65,6 +65,12 @@ #include <linux/pm_domain.h> #include <linux/slab.h> +enum { + PD_STATE_LP, + PD_STATE_OFF, + PD_STATE_MAX +}; + /* SCU Power Mode Protocol definition */ struct imx_sc_msg_req_set_resource_power_mode { struct imx_sc_rpc_msg hdr; @@ -368,7 +374,8 @@ static int imx_sc_pd_power(struct generic_pm_domain *domain, bool power_on) hdr->size = 2; msg.resource = pd->rsrc; - msg.mode = power_on ? IMX_SC_PM_PW_MODE_ON : IMX_SC_PM_PW_MODE_LP; + msg.mode = power_on ? IMX_SC_PM_PW_MODE_ON : pd->pd.state_idx ? + IMX_SC_PM_PW_MODE_OFF : IMX_SC_PM_PW_MODE_LP; /* keep uart console power on for no_console_suspend */ if (imx_con_rsrc == pd->rsrc && !console_suspend_enabled && !power_on) @@ -412,11 +419,33 @@ static struct generic_pm_domain *imx_scu_pd_xlate(struct of_phandle_args *spec, return domain; } +static bool imx_sc_pd_suspend_ok(struct device *dev) +{ + /* Always true */ + return true; +} + +static bool imx_sc_pd_power_down_ok(struct dev_pm_domain *pd) +{ + struct generic_pm_domain *genpd = pd_to_genpd(pd); + + /* For runtime suspend, choose LP mode */ + genpd->state_idx = 0; + + return true; +} + +struct dev_power_governor imx_sc_pd_qos_governor = { + .suspend_ok = imx_sc_pd_suspend_ok, + .power_down_ok = imx_sc_pd_power_down_ok, +}; + static struct imx_sc_pm_domain * imx_scu_add_pm_domain(struct device *dev, int idx, const struct imx_sc_pd_range *pd_ranges) { struct imx_sc_pm_domain *sc_pd; + struct genpd_power_state *states; bool is_off; int mode, ret; @@ -427,9 +456,22 @@ imx_scu_add_pm_domain(struct device *dev, int idx, if (!sc_pd) return ERR_PTR(-ENOMEM); + states = devm_kcalloc(dev, PD_STATE_MAX, sizeof(*states), GFP_KERNEL); + if (!states) { + devm_kfree(dev, sc_pd); + return ERR_PTR(-ENOMEM); + } + sc_pd->rsrc = pd_ranges->rsrc + idx; sc_pd->pd.power_off = imx_sc_pd_power_off; sc_pd->pd.power_on = imx_sc_pd_power_on; + states[PD_STATE_LP].power_off_latency_ns = 25000; + states[PD_STATE_LP].power_on_latency_ns = 25000; + states[PD_STATE_OFF].power_off_latency_ns = 2500000; + states[PD_STATE_OFF].power_on_latency_ns = 2500000; + + sc_pd->pd.states = states; + sc_pd->pd.state_count = PD_STATE_MAX; if (pd_ranges->postfix) snprintf(sc_pd->name, sizeof(sc_pd->name), @@ -455,14 +497,16 @@ imx_scu_add_pm_domain(struct device *dev, int idx, sc_pd->name, sc_pd->rsrc); devm_kfree(dev, sc_pd); + devm_kfree(dev, states); return NULL; } - ret = pm_genpd_init(&sc_pd->pd, NULL, is_off); + ret = pm_genpd_init(&sc_pd->pd, &imx_sc_pd_qos_governor, is_off); if (ret) { dev_warn(dev, "failed to init pd %s rsrc id %d", sc_pd->name, sc_pd->rsrc); devm_kfree(dev, sc_pd); + devm_kfree(dev, states); return NULL; } -- 2.37.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 10+ messages in thread
* [PATCH 7/7] firmware: imx: scu-pd: change init level to subsys_initcall 2023-07-14 9:09 [PATCH 0/7] firmware: imx: scu-pd: misc update Peng Fan (OSS) ` (5 preceding siblings ...) 2023-07-14 9:09 ` [PATCH 6/7] firmware: imx: scu-pd: add multi states support Peng Fan (OSS) @ 2023-07-14 9:09 ` Peng Fan (OSS) 2023-07-19 7:00 ` [PATCH 0/7] firmware: imx: scu-pd: misc update Shawn Guo 7 siblings, 0 replies; 10+ messages in thread From: Peng Fan (OSS) @ 2023-07-14 9:09 UTC (permalink / raw) To: shawnguo, s.hauer Cc: kernel, festevam, linux-imx, Frank.Li, aisheng.dong, marcel.ziswiler, linux-arm-kernel, linux-kernel, Peng Fan From: Dong Aisheng <aisheng.dong@nxp.com> Change power domain init level to subsys_initcall to ensure it's probed before most devices to avoid unnecessary defer probe. Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> --- drivers/firmware/imx/scu-pd.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/firmware/imx/scu-pd.c b/drivers/firmware/imx/scu-pd.c index 31de56366a50..5e6dbadb43ae 100644 --- a/drivers/firmware/imx/scu-pd.c +++ b/drivers/firmware/imx/scu-pd.c @@ -587,7 +587,12 @@ static struct platform_driver imx_sc_pd_driver = { }, .probe = imx_sc_pd_probe, }; -builtin_platform_driver(imx_sc_pd_driver); + +static int __init imx_sc_pd_driver_init(void) +{ + return platform_driver_register(&imx_sc_pd_driver); +} +subsys_initcall(imx_sc_pd_driver_init); MODULE_AUTHOR("Dong Aisheng <aisheng.dong@nxp.com>"); MODULE_DESCRIPTION("IMX SCU Power Domain driver"); -- 2.37.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 10+ messages in thread
* Re: [PATCH 0/7] firmware: imx: scu-pd: misc update 2023-07-14 9:09 [PATCH 0/7] firmware: imx: scu-pd: misc update Peng Fan (OSS) ` (6 preceding siblings ...) 2023-07-14 9:09 ` [PATCH 7/7] firmware: imx: scu-pd: change init level to subsys_initcall Peng Fan (OSS) @ 2023-07-19 7:00 ` Shawn Guo 2023-07-20 8:19 ` Peng Fan 7 siblings, 1 reply; 10+ messages in thread From: Shawn Guo @ 2023-07-19 7:00 UTC (permalink / raw) To: Peng Fan (OSS), Ulf Hansson Cc: s.hauer, kernel, festevam, linux-imx, Frank.Li, aisheng.dong, marcel.ziswiler, linux-arm-kernel, linux-kernel, Peng Fan +Ulf On Fri, Jul 14, 2023 at 05:09:29PM +0800, Peng Fan (OSS) wrote: > From: Peng Fan <peng.fan@nxp.com> > > This patchset is to upstream NXP downstream scu-pd driver patches. > patch 1,2 is to support more PDs > patch 3 is to not power off console when no console suspend > patch 4 is to suppress bind > patch 5 is to make genpd align with HW state > patch 6 is to support LP mode in runtime suspend, OFF mode in system suspend. > patch 7 is to change init level to avoid uneccessary defer probe > > Dong Aisheng (2): > firmware: imx: scu-pd: do not power off console if no_console_suspend > firmware: imx: scu-pd: change init level to subsys_initcall > > Peng Fan (5): > firmware: imx: scu-pd: enlarge PD range > firmware: imx: scu-pd: add more PDs > firmware: imx: scu-pd: Suppress bind attrs > firmware: imx: scu-pd: initialize is_off according to HW state > firmware: imx: scu-pd: add multi states support > > drivers/firmware/imx/scu-pd.c | 193 ++++++++++++++++++++++++++++++++-- > 1 file changed, 182 insertions(+), 11 deletions(-) We have genpd subsystem [1] coming. Should we consider to move this scu-pd driver there too? Shawn [1] https://lore.kernel.org/linux-arm-kernel/20230714092301.28690-1-ulf.hansson@linaro.org/T/ _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH 0/7] firmware: imx: scu-pd: misc update 2023-07-19 7:00 ` [PATCH 0/7] firmware: imx: scu-pd: misc update Shawn Guo @ 2023-07-20 8:19 ` Peng Fan 0 siblings, 0 replies; 10+ messages in thread From: Peng Fan @ 2023-07-20 8:19 UTC (permalink / raw) To: Shawn Guo, Ulf Hansson Cc: s.hauer, kernel, festevam, linux-imx, Frank.Li, aisheng.dong, marcel.ziswiler, linux-arm-kernel, linux-kernel, Peng Fan On 7/19/2023 3:00 PM, Shawn Guo wrote: > > +Ulf > > On Fri, Jul 14, 2023 at 05:09:29PM +0800, Peng Fan (OSS) wrote: >> From: Peng Fan <peng.fan@nxp.com> >> >> This patchset is to upstream NXP downstream scu-pd driver patches. >> patch 1,2 is to support more PDs >> patch 3 is to not power off console when no console suspend >> patch 4 is to suppress bind >> patch 5 is to make genpd align with HW state >> patch 6 is to support LP mode in runtime suspend, OFF mode in system suspend. >> patch 7 is to change init level to avoid uneccessary defer probe >> >> Dong Aisheng (2): >> firmware: imx: scu-pd: do not power off console if no_console_suspend >> firmware: imx: scu-pd: change init level to subsys_initcall >> >> Peng Fan (5): >> firmware: imx: scu-pd: enlarge PD range >> firmware: imx: scu-pd: add more PDs >> firmware: imx: scu-pd: Suppress bind attrs >> firmware: imx: scu-pd: initialize is_off according to HW state >> firmware: imx: scu-pd: add multi states support >> >> drivers/firmware/imx/scu-pd.c | 193 ++++++++++++++++++++++++++++++++-- >> 1 file changed, 182 insertions(+), 11 deletions(-) > > We have genpd subsystem [1] coming. Should we consider to move this > scu-pd driver there too? ok, I could move scu-pd driver to genpd. Regards, Peng. > > Shawn > > [1] https://lore.kernel.org/linux-arm-kernel/20230714092301.28690-1-ulf.hansson@linaro.org/T/ _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 10+ messages in thread
end of thread, other threads:[~2023-07-20 8:20 UTC | newest] Thread overview: 10+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-07-14 9:09 [PATCH 0/7] firmware: imx: scu-pd: misc update Peng Fan (OSS) 2023-07-14 9:09 ` [PATCH 1/7] firmware: imx: scu-pd: enlarge PD range Peng Fan (OSS) 2023-07-14 9:09 ` [PATCH 2/7] firmware: imx: scu-pd: add more PDs Peng Fan (OSS) 2023-07-14 9:09 ` [PATCH 3/7] firmware: imx: scu-pd: do not power off console if no_console_suspend Peng Fan (OSS) 2023-07-14 9:09 ` [PATCH 4/7] firmware: imx: scu-pd: Suppress bind attrs Peng Fan (OSS) 2023-07-14 9:09 ` [PATCH 5/7] firmware: imx: scu-pd: initialize is_off according to HW state Peng Fan (OSS) 2023-07-14 9:09 ` [PATCH 6/7] firmware: imx: scu-pd: add multi states support Peng Fan (OSS) 2023-07-14 9:09 ` [PATCH 7/7] firmware: imx: scu-pd: change init level to subsys_initcall Peng Fan (OSS) 2023-07-19 7:00 ` [PATCH 0/7] firmware: imx: scu-pd: misc update Shawn Guo 2023-07-20 8:19 ` Peng Fan
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).