can: flexcan: add auto stop mode for IMX93 to support wakeup
Subsystems (5)
PATCH 1/3 can: flexcan: add auto stop mode for IMX93 to support wakeup
From: Haibo Chen <[email protected]>
IMX93 do not contain a GPR to config the stop mode, it will set the flexcan into stop mode automatically once the ARM core go into low power mode (WFI instruct) and gate off the flexcan related clock automatically. But to let these logic work as expect, before ARM core go into low power mode, need to make sure the flexcan related clock keep on.
To support stop mode and wakeup feature on imx93, this patch add a new fsl_imx93_devtype_data to separate from imx8mp.
--- drivers/net/can/flexcan/flexcan-core.c | 37 +++++++++++++++++++++++--- drivers/net/can/flexcan/flexcan.h | 2 ++ 2 files changed, 36 insertions(+), 3 deletions(-)
drivers/net/can/flexcan/flexcan-core.c +34 -3
@@ -345,6 +345,15 @@ static struct flexcan_devtype_data fsl_imx8mp_devtype_data = { FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR, }; +static struct flexcan_devtype_data fsl_imx93_devtype_data = { + .quirks =FLEXCAN_QUIRK_DISABLE_RXFG |FLEXCAN_QUIRK_ENABLE_EACEN_RRS | +FLEXCAN_QUIRK_DISABLE_MECR |FLEXCAN_QUIRK_USE_RX_MAILBOX | +FLEXCAN_QUIRK_BROKEN_PERR_STATE |FLEXCAN_QUIRK_AUTO_STOP_MODE | +FLEXCAN_QUIRK_SUPPORT_FD |FLEXCAN_QUIRK_SUPPORT_ECC | +FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX | +FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR , +}; +static const struct flexcan_devtype_data fsl_vf610_devtype_data = { .quirks =FLEXCAN_QUIRK_DISABLE_RXFG |FLEXCAN_QUIRK_ENABLE_EACEN_RRS | FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_RX_MAILBOX |
@@ -532,9 +541,14 @@ static inline int flexcan_enter_stop_mode(struct flexcan_priv *priv) ret =flexcan_stop_mode_enable_scfw (priv, true);if (ret <0 )return ret; - }else { + }else if (priv->devtype_data.quirks &FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR ) {regmap_update_bits (priv->stm.gpr, priv->stm.req_gpr,1 << priv->stm.req_bit,1 << priv->stm.req_bit); + }else if (priv->devtype_data.quirks &FLEXCAN_QUIRK_AUTO_STOP_MODE ) { +/* For the auto stop mode, software do nothing, hardware will cover +* all the operation automatically after system go into low power mode. +*/ +return 0 ; }return flexcan_low_power_enter_ack (priv);
@@ -551,7 +565,7 @@ static inline int flexcan_exit_stop_mode(struct flexcan_priv *priv) ret =flexcan_stop_mode_enable_scfw (priv, false);if (ret <0 )return ret; - }else { + }else if (priv->devtype_data.quirks &FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR ) {regmap_update_bits (priv->stm.gpr, priv->stm.req_gpr,1 << priv->stm.req_bit,0 ); }
@@ -560,6 +574,12 @@ static inline int flexcan_exit_stop_mode(struct flexcan_priv *priv) reg_mcr &= ~FLEXCAN_MCR_SLF_WAK ; priv->write (reg_mcr, ®s->mcr); +/* For the auto stop mode, hardware will exist stop mode +* automatically after system go out of low power mode. +*/ +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_AUTO_STOP_MODE ) +return 0 ; +return flexcan_low_power_exit_ack (priv); }
@@ -1974,6 +1994,8 @@ static int flexcan_setup_stop_mode(struct platform_device *pdev) ret =flexcan_setup_stop_mode_scfw (pdev); else if (priv->devtype_data.quirks & FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR) ret =flexcan_setup_stop_mode_gpr (pdev); + else if (priv->devtype_data.quirks & FLEXCAN_QUIRK_AUTO_STOP_MODE) + ret =0 ; else/* return 0 directly if doesn't support stop mode feature */ return 0;
@@ -1992,6 +2014,7 @@ static int flexcan_setup_stop_mode(struct platform_device *pdev)static const struct of_device_id flexcan_of_match[] = { { .compatible ="fsl,imx8qm-flexcan" , .data = &fsl_imx8qm_devtype_data, }, { .compatible ="fsl,imx8mp-flexcan" , .data = &fsl_imx8mp_devtype_data, }, + { .compatible ="fsl,imx93-flexcan" , .data = &fsl_imx93_devtype_data, }, { .compatible ="fsl,imx6q-flexcan" , .data = &fsl_imx6q_devtype_data, }, { .compatible ="fsl,imx28-flexcan" , .data = &fsl_imx28_devtype_data, }, { .compatible ="fsl,imx53-flexcan" , .data = &fsl_imx25_devtype_data, },
@@ -2299,8 +2322,16 @@ static int __maybe_unused flexcan_noirq_suspend(struct device *device)if (netif_running (dev)) {int err; -if (device_may_wakeup (device)) +if (device_may_wakeup (device)) {flexcan_enable_wakeup_irq (priv, true); +/* For auto stop mode, need to keep the clock on before +* system go into low power mode. After system go into +* low power mode, hardware will config the flexcan into +* stop mode, and gate off the clock automatically. +*/ +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_AUTO_STOP_MODE ) +return 0 ; + } err =pm_runtime_force_suspend (device);if (err)
drivers/net/can/flexcan/flexcan.h +2 -0
@@ -68,6 +68,8 @@#define FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR BIT(15)/* Device supports RX via FIFO */ #define FLEXCAN_QUIRK_SUPPORT_RX_FIFO BIT(16) +/* auto enter stop mode to support wakeup */ +#define FLEXCAN_QUIRK_AUTO_STOP_MODE BIT(17)struct flexcan_devtype_data {u32 quirks;/* quirks needed for different IP cores */
Signature · 1 line
2.34.1
PATCH 2/3 dt-bindings: can: fsl,flexcan: add imx93 compatible
From: Haibo Chen <[email protected]>
Add a new compatible string for imx93.
--- Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/net/can/fsl,flexcan.yaml +1 -0
@@ -17,6 +17,7 @@ properties: compatible: oneOf: - enum: + - fsl,imx93-flexcan - fsl,imx8qm-flexcan - fsl,imx8mp-flexcan - fsl,imx6q-flexcan
Signature · 1 line
2.34.1
Re: [PATCH 2/3] dt-bindings: can: fsl,flexcan: add imx93 compatible
Quoted 4 lines · On 22/11/2022 12:32, [email protected] wrote:
From: Haibo Chen <[email protected]>
Add a new compatible string for imx93.
Best regards,
Krzysztof
PATCH 3/3 arm64: dts: imx93: add flexcan nodes
In reply to [email protected]From: Haibo Chen <[email protected]>
Add flexcan1 and flexcan2 nodes.
--- arch/arm64/boot/dts/freescale/imx93.dtsi | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+)
arch/arm64/boot/dts/freescale/imx93.dtsi +28 -0
@@ -223,6 +223,20 @@ lpuart2: serial@44390000 { status = "disabled"; }; + flexcan1: can@443a0000 { + compatible = "fsl,imx93-flexcan"; + reg = <0x443a0000 0x10000>; + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk IMX93_CLK_BUS_AON>, + <&clk IMX93_CLK_CAN1_GATE>; + clock-names = "ipg", "per"; + assigned-clocks = <&clk IMX93_CLK_CAN1>; + assigned-clock-parents = <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>; + assigned-clock-rates = <40000000>; + fsl,clk-source = /bits/ 8 <0>; + status = "disabled"; + }; + iomuxc: pinctrl@443c0000 { compatible = "fsl,imx93-iomuxc"; reg = <0x443c0000 0x10000>;
@@ -393,6 +407,20 @@ lpuart6: serial@425a0000 { status = "disabled"; }; + flexcan2: can@425b0000 { + compatible = "fsl,imx93-flexcan"; + reg = <0x425b0000 0x10000>; + interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk IMX93_CLK_BUS_WAKEUP>, + <&clk IMX93_CLK_CAN2_GATE>; + clock-names = "ipg", "per"; + assigned-clocks = <&clk IMX93_CLK_CAN2>; + assigned-clock-parents = <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>; + assigned-clock-rates = <40000000>; + fsl,clk-source = /bits/ 8 <0>; + status = "disabled"; + }; + lpuart7: serial@42690000 { compatible = "fsl,imx93-lpuart", "fsl,imx7ulp-lpuart"; reg = <0x42690000 0x1000>;
Signature · 1 line
2.34.1
Marc Kleine-Budde
maintainerRe: [PATCH 3/3] arm64: dts: imx93: add flexcan nodes
Shawn,
do you take this patch?
Marc
Quoted 59 lines · On 22.11.2022 19:32:32, [email protected] wrote:
From: Haibo Chen <[email protected]>
Add flexcan1 and flexcan2 nodes.
Signed-off-by Haibo Chen <[email protected]>--- arch/arm64/boot/dts/freescale/imx93.dtsi | 28 ++++++++++++++++++++++++ 1 file changed, 28 insertions(+)arch/arm64/boot/dts/freescale/imx93.dtsi +28
-0@@ -223,6 +223,20 @@ lpuart2: serial@44390000 { status = "disabled"; }; + flexcan1: can@443a0000 { + compatible = "fsl,imx93-flexcan"; + reg = <0x443a0000 0x10000>; + interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk IMX93_CLK_BUS_AON>, + <&clk IMX93_CLK_CAN1_GATE>; + clock-names = "ipg", "per"; + assigned-clocks = <&clk IMX93_CLK_CAN1>; + assigned-clock-parents = <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>; + assigned-clock-rates = <40000000>; + fsl,clk-source = /bits/ 8 <0>; + status = "disabled"; + }; + iomuxc: pinctrl@443c0000 { compatible = "fsl,imx93-iomuxc"; reg = <0x443c0000 0x10000>;@@ -393,6 +407,20 @@ lpuart6: serial@425a0000 { status = "disabled"; }; + flexcan2: can@425b0000 { + compatible = "fsl,imx93-flexcan"; + reg = <0x425b0000 0x10000>; + interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>; + clocks = <&clk IMX93_CLK_BUS_WAKEUP>, + <&clk IMX93_CLK_CAN2_GATE>; + clock-names = "ipg", "per"; + assigned-clocks = <&clk IMX93_CLK_CAN2>; + assigned-clock-parents = <&clk IMX93_CLK_SYS_PLL_PFD1_DIV2>; + assigned-clock-rates = <40000000>; + fsl,clk-source = /bits/ 8 <0>; + status = "disabled"; + }; + lpuart7: serial@42690000 { compatible = "fsl,imx93-lpuart", "fsl,imx7ulp-lpuart"; reg = <0x42690000 0x1000>;Signature · 1 line
2.34.1
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Shawn Guo
AppliedRe: [PATCH 3/3] arm64: dts: imx93: add flexcan nodes
In reply to [email protected]Quoted 5 lines · On Tue, Nov 22, 2022 at 07:32:32PM +0800, [email protected] wrote:
From: Haibo Chen <[email protected]>
Add flexcan1 and flexcan2 nodes.
Signed-off-by Haibo Chen <[email protected]>
Applied, thanks!
Marc Kleine-Budde
maintainerQuoted 64 lines · On 22.11.2022 19:32:30, [email protected] wrote:
From: Haibo Chen <[email protected]>
IMX93 do not contain a GPR to config the stop mode, it will set the flexcan into stop mode automatically once the ARM core go into low power mode (WFI instruct) and gate off the flexcan related clock automatically. But to let these logic work as expect, before ARM core go into low power mode, need to make sure the flexcan related clock keep on.
To support stop mode and wakeup feature on imx93, this patch add a new
fsl_imx93_devtype_datato separate from imx8mp.Signed-off-by Haibo Chen <[email protected]>--- drivers/net/can/flexcan/flexcan-core.c | 37 +++++++++++++++++++++++--- drivers/net/can/flexcan/flexcan.h | 2 ++ 2 files changed, 36 insertions(+), 3 deletions(-)drivers/net/can/flexcan/flexcan-core.c +16
-2@@ -345,6 +345,15 @@ static struct flexcan_devtype_data fsl_imx8mp_devtype_data = { FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR, }; +static struct flexcan_devtype_data fsl_imx93_devtype_data = { + .quirks =FLEXCAN_QUIRK_DISABLE_RXFG |FLEXCAN_QUIRK_ENABLE_EACEN_RRS | +FLEXCAN_QUIRK_DISABLE_MECR |FLEXCAN_QUIRK_USE_RX_MAILBOX | +FLEXCAN_QUIRK_BROKEN_PERR_STATE |FLEXCAN_QUIRK_AUTO_STOP_MODE | +FLEXCAN_QUIRK_SUPPORT_FD |FLEXCAN_QUIRK_SUPPORT_ECC | +FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX | +FLEXCAN_QUIRK_SUPPORT_RX_MAILBOX_RTR , +}; +static const struct flexcan_devtype_data fsl_vf610_devtype_data = { .quirks =FLEXCAN_QUIRK_DISABLE_RXFG |FLEXCAN_QUIRK_ENABLE_EACEN_RRS | FLEXCAN_QUIRK_DISABLE_MECR | FLEXCAN_QUIRK_USE_RX_MAILBOX |@@ -532,9 +541,14 @@ static inline int flexcan_enter_stop_mode(struct flexcan_priv *priv) ret =flexcan_stop_mode_enable_scfw (priv, true);if (ret <0 )return ret; - }else { + }else if (priv->devtype_data.quirks &FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR ) {regmap_update_bits (priv->stm.gpr, priv->stm.req_gpr,1 << priv->stm.req_bit,1 << priv->stm.req_bit); + }else if (priv->devtype_data.quirks &FLEXCAN_QUIRK_AUTO_STOP_MODE ) { +/* For the auto stop mode, software do nothing, hardware will cover +* all the operation automatically after system go into low power mode. +*/ +return 0 ; }return flexcan_low_power_enter_ack (priv);@@ -551,7 +565,7 @@ static inline int flexcan_exit_stop_mode(struct flexcan_priv *priv) ret =flexcan_stop_mode_enable_scfw (priv, false);if (ret <0 )return ret; - }else { + }else if (priv->devtype_data.quirks &FLEXCAN_QUIRK_SETUP_STOP_MODE_GPR ) {regmap_update_bits (priv->stm.gpr, priv->stm.req_gpr,1 << priv->stm.req_bit,0 ); }
drivers/net/can/flexcan/flexcan-core.c static inline int flexcan_exit_stop_mode(struct flexcan_priv *priv) · line 577
Quoted 4 lines
drivers/net/can/flexcan/flexcan-core.c +1
-0@@ -560,6 +574,12 @@ static inline int flexcan_exit_stop_mode(struct flexcan_priv *priv) reg_mcr &= ~FLEXCAN_MCR_SLF_WAK ; priv->write (reg_mcr, ®s->mcr); +/* For the auto stop mode, hardware will exist stop mode
^^^^^
exit?No need to resend.
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Marc Kleine-Budde
maintainerQuoted 22 lines · On 22.11.2022 19:32:30, [email protected] wrote:
From: Haibo Chen <[email protected]>
IMX93 do not contain a GPR to config the stop mode, it will set the flexcan into stop mode automatically once the ARM core go into low power mode (WFI instruct) and gate off the flexcan related clock automatically. But to let these logic work as expect, before ARM core go into low power mode, need to make sure the flexcan related clock keep on.
To support stop mode and wakeup feature on imx93, this patch add a new
fsl_imx93_devtype_datato separate from imx8mp.Signed-off-by Haibo Chen <[email protected]>--- drivers/net/can/flexcan/flexcan-core.c | 37 +++++++++++++++++++++++--- drivers/net/can/flexcan/flexcan.h | 2 ++ 2 files changed, 36 insertions(+), 3 deletions(-)drivers/net/can/flexcan/flexcan-core.c +0
-0
[...]
Quoted 5 lines
drivers/net/can/flexcan/flexcan-core.c +0
-1@@ -2299,8 +2322,16 @@ static int __maybe_unused flexcan_noirq_suspend(struct device *device)if (netif_running (dev)) {int err; -if (device_may_wakeup (device))
drivers/net/can/flexcan/flexcan-core.c static int __maybe_unused flexcan_noirq_suspend(struct device *device) · line 2334
Quoted 10 lines
drivers/net/can/flexcan/flexcan-core.c +9
-0+if (device_may_wakeup (device)) {flexcan_enable_wakeup_irq (priv, true); +/* For auto stop mode, need to keep the clock on before +* system go into low power mode. After system go into +* low power mode, hardware will config the flexcan into +* stop mode, and gate off the clock automatically. +*/ +if (priv->devtype_data.quirks &FLEXCAN_QUIRK_AUTO_STOP_MODE ) +return 0 ; + }
With this change the flexcan_noirq_resume() is not symmetrical any more:pm_runtime_force_suspend() is not called for mx93, but pm_runtime_force_resume() is called.
drivers/net/can/flexcan/flexcan-core.c static int __maybe_unused flexcan_noirq_suspend(struct device *device) · line 2337
Quoted 3 lines
drivers/net/can/flexcan/flexcan-core.c +0
-0err =pm_runtime_force_suspend (device);if (err)
Marc
Signature · 4 lines
Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
Quoted 55 lines
-----Original Message-----
From: Marc Kleine-Budde <[email protected]>
Sent: 2022年11月30日 18:54
To: Bough Chen <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; dl-linux-imx <[email protected]>; [email protected]; [email protected]; [email protected]
Subject: Re: [PATCH 1/3] can: flexcan: add auto stop mode for IMX93 to support wakeupQuoted 23 lines · On 22.11.2022 19:32:30, [email protected] wrote:
From: Haibo Chen <[email protected]>
IMX93 do not contain a GPR to config the stop mode, it will set the flexcan into stop mode automatically once the ARM core go into low power mode (WFI instruct) and gate off the flexcan related clock automatically. But to let these logic work as expect, before ARM core go into low power mode, need to make sure the flexcan related clock keep on.
To support stop mode and wakeup feature on imx93, this patch add a new
fsl_imx93_devtype_datato separate from imx8mp.Signed-off-by Haibo Chen <[email protected]>--- drivers/net/can/flexcan/flexcan-core.c | 37 +++++++++++++++++++++++--- drivers/net/can/flexcan/flexcan.h | 2 ++ 2 files changed, 36 insertions(+), 3 deletions(-)drivers/net/can/flexcan/flexcan-core.c +0
-0[...]
drivers/net/can/flexcan/flexcan-core.c static int __maybe_unused
Quoted 1 line
drivers/net/can/flexcan/flexcan-core.c +0
-0@@ -2299,8 +2322,16 @@ static int __maybe_unused
flexcan_noirq_suspend(struct device *device)drivers/net/can/flexcan/flexcan-core.c static int __maybe_unused flexcan_noirq_suspend(struct device *device)
Quoted 12 lines
drivers/net/can/flexcan/flexcan-core.c +7
-1if (netif_running (dev)) {int err; -if (device_may_wakeup (device)) +if (device_may_wakeup (device)) {flexcan_enable_wakeup_irq (priv, true); +/* For auto stop mode, need to keep the clock on before +* system go into low power mode. After system go into +* low power mode, hardware will config the flexcan into +* stop mode, and gate off the clock automatically. +*/ + if (priv->devtype_data.quirks &
FLEXCAN_QUIRK_AUTO_STOP_MODE)
Quoted 6 lines
drivers/net/can/flexcan/flexcan-core.c static int __maybe_unused flexcan_noirq_suspend(struct device *device) · line 2334
Quoted 2 lines
drivers/net/can/flexcan/flexcan-core.c +2
-0+return 0 ; + }With this change the
flexcan_noirq_resume()is not symmetrical any more:pm_runtime_force_suspend()is not called for mx93, butpm_runtime_force_resume()is called.
Yes, I do not understand the logic of pm_runtime_force_suspend correctly. I also find there is an unbalance warning show up. My bad.
Will fix this and send a V2 patch.
Best Regards
Haibo Chen
Quoted 12 lines
drivers/net/can/flexcan/flexcan-core.c static int __maybe_unused flexcan_noirq_suspend(struct device *device) · line 2337
Quoted 4 lines
drivers/net/can/flexcan/flexcan-core.c +0
-0err =pm_runtime_force_suspend (device);if (err)Marc
--
Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |