clk: spacemit: mark K1 pll1_d8 as critical
Subsystems (3)
PATCH 1/1 clk: spacemit: mark K1 pll1_d8 as critical
The pll1_d8 clock is enabled by the boot loader, and is ultimately a parent for numerous clocks, including those used by APB and AXI buses. Guodong Xu discovered that this clock got disabled while responding to getting -EPROBE_DEFER when requesting a reset controller.
The needed clock (CLK_DMA, along with its parents) had already been enabled. To respond to the probe deferral return, the CLK_DMA clock was disabled, and this led to parent clocks also reducing their enable count. When the enable count for pll1_d8 was decremented it became 0, which caused it to be disabled. This led to a system hang.
Marking that clock critical resolves this by preventing it from being disabled.
Define a new macro CCU_FACTOR_GATE_DEFINE() to allow clock flags to be supplied for a CCU_FACTOR_GATE clock.
---
v2: Reworded the description to provide better detail
drivers/clk/spacemit/ccu-k1.c | 3 ++- drivers/clk/spacemit/ccu_mix.h | 21 +++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-)
drivers/clk/spacemit/ccu-k1.c +2 -1
@@ -170,7 +170,8 @@ CCU_FACTOR_GATE_DEFINE(pll1_d4, CCU_PARENT_HW(pll1), APBS_PLL1_SWCR2, BIT(3), 4,CCU_FACTOR_GATE_DEFINE (pll1_d5,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (4 ),5 ,1 );CCU_FACTOR_GATE_DEFINE (pll1_d6,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (5 ),6 ,1 );CCU_FACTOR_GATE_DEFINE (pll1_d7,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (6 ),7 ,1 ); -CCU_FACTOR_GATE_DEFINE (pll1_d8,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (7 ),8 ,1 ); +CCU_FACTOR_GATE_FLAGS_DEFINE (pll1_d8,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (7 ),8 ,1 , +CLK_IS_CRITICAL );CCU_FACTOR_GATE_DEFINE (pll1_d11_223p4,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (15 ),11 ,1 );CCU_FACTOR_GATE_DEFINE (pll1_d13_189,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (16 ),13 ,1 );CCU_FACTOR_GATE_DEFINE (pll1_d23_106p8,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (20 ),23 ,1 );
drivers/clk/spacemit/ccu_mix.h +13 -8
@@ -101,16 +101,21 @@ static struct ccu_mix _name = { \ } \ } +#define CCU_FACTOR_GATE_FLAGS_DEFINE (_name, _parent, _reg_ctrl, _mask_gate, _div, \ + _mul, _flags) \ +struct ccu_mix _name = { \ + .gate = CCU_GATE_INIT(_mask_gate), \ + .factor = CCU_FACTOR_INIT(_div, _mul), \ + .common = { \ + .reg_ctrl = _reg_ctrl, \ + CCU_MIX_INITHW(_name, _parent, spacemit_ccu_factor_gate_ops, _flags) \ + } \ +} +#define CCU_FACTOR_GATE_DEFINE (_name, _parent, _reg_ctrl, _mask_gate, _div, \ _mul) \ -static struct ccu_mix _name = { \ - .gate = CCU_GATE_INIT(_mask_gate), \ - .factor = CCU_FACTOR_INIT(_div, _mul), \ - .common = { \ - .reg_ctrl = _reg_ctrl, \ - CCU_MIX_INITHW(_name, _parent, spacemit_ccu_factor_gate_ops, 0) \ - } \ -} + CCU_FACTOR_GATE_FLAGS_DEFINE(_name, _parent, _reg_ctrl, _mask_gate, _div, \ + _mul, 0)#define CCU_MUX_GATE_DEFINE (_name, _parents, _reg_ctrl, _shift, _width, \ _mask_gate, _flags) \
base-commit: 19272b37aa4f83ca52bdf9c16d5d81bdd1354494
Signature · 1 line
2.45.2
Quoted 14 lines · Alex Elder
The
pll1_d8clock is enabled by the boot loader, and is ultimately a parent for numerous clocks, including those used by APB and AXI buses. Guodong Xu discovered that this clock got disabled while responding to getting -EPROBE_DEFER when requesting a reset controller.The needed clock (
CLK_DMA, along with its parents) had already been enabled. To respond to the probe deferral return, theCLK_DMAclock was disabled, and this led to parent clocks also reducing their enable count. When the enable count forpll1_d8was decremented it became 0, which caused it to be disabled. This led to a system hang.Marking that clock critical resolves this by preventing it from being disabled.
Quoted 6 lines
Define a new macro
CCU_FACTOR_GATE_DEFINE()to allow clock flags to be supplied for aCCU_FACTOR_GATEclock.Fixes 1b72c59db0add ("clk: spacemit: Add clock support for SpacemiT K1 SoC")Signed-off-by Alex Elder <[email protected]>Tested-by Guodong Xu <[email protected]>
I'm very sorry, this path is v2 and I neglected to indicate that in the subject line. Here is v1:
https://lore.kernel.org/lkml/[email protected]/
-Alex
Quoted 57 lines
---
v2: Reworded the description to provide better detaildrivers/clk/spacemit/ccu-k1.c | 3 ++- drivers/clk/spacemit/ccu_mix.h | 21 +++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-)drivers/clk/spacemit/ccu-k1.c +2
-1@@ -170,7 +170,8 @@ CCU_FACTOR_GATE_DEFINE(pll1_d4, CCU_PARENT_HW(pll1), APBS_PLL1_SWCR2, BIT(3), 4,CCU_FACTOR_GATE_DEFINE (pll1_d5,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (4 ),5 ,1 );CCU_FACTOR_GATE_DEFINE (pll1_d6,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (5 ),6 ,1 );CCU_FACTOR_GATE_DEFINE (pll1_d7,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (6 ),7 ,1 ); -CCU_FACTOR_GATE_DEFINE (pll1_d8,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (7 ),8 ,1 ); +CCU_FACTOR_GATE_FLAGS_DEFINE (pll1_d8,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (7 ),8 ,1 , +CLK_IS_CRITICAL );CCU_FACTOR_GATE_DEFINE (pll1_d11_223p4,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (15 ),11 ,1 );CCU_FACTOR_GATE_DEFINE (pll1_d13_189,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (16 ),13 ,1 );CCU_FACTOR_GATE_DEFINE (pll1_d23_106p8,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (20 ),23 ,1 );drivers/clk/spacemit/ccu_mix.h +13
-8@@ -101,16 +101,21 @@ static struct ccu_mix _name = { \ } \ } +#define CCU_FACTOR_GATE_FLAGS_DEFINE (_name, _parent, _reg_ctrl, _mask_gate, _div, \ + _mul, _flags) \ +struct ccu_mix _name = { \ + .gate = CCU_GATE_INIT(_mask_gate), \ + .factor = CCU_FACTOR_INIT(_div, _mul), \ + .common = { \ + .reg_ctrl = _reg_ctrl, \ + CCU_MIX_INITHW(_name, _parent, spacemit_ccu_factor_gate_ops, _flags) \ + } \ +} +#define CCU_FACTOR_GATE_DEFINE (_name, _parent, _reg_ctrl, _mask_gate, _div, \ _mul) \ -static struct ccu_mix _name = { \ - .gate = CCU_GATE_INIT(_mask_gate), \ - .factor = CCU_FACTOR_INIT(_div, _mul), \ - .common = { \ - .reg_ctrl = _reg_ctrl, \ - CCU_MIX_INITHW(_name, _parent, spacemit_ccu_factor_gate_ops, 0) \ - } \ -} + CCU_FACTOR_GATE_FLAGS_DEFINE(_name, _parent, _reg_ctrl, _mask_gate, _div, \ + _mul, 0)#define CCU_MUX_GATE_DEFINE (_name, _parents, _reg_ctrl, _shift, _width, \ _mask_gate, _flags) \base-commit:
19272b37aa4f83ca52bdf9c16d5d81bdd1354494
Quoted 46 lines · Alex Elder
The
pll1_d8clock is enabled by the boot loader, and is ultimately a parent for numerous clocks, including those used by APB and AXI buses. Guodong Xu discovered that this clock got disabled while responding to getting -EPROBE_DEFER when requesting a reset controller.The needed clock (
CLK_DMA, along with its parents) had already been enabled. To respond to the probe deferral return, theCLK_DMAclock was disabled, and this led to parent clocks also reducing their enable count. When the enable count forpll1_d8was decremented it became 0, which caused it to be disabled. This led to a system hang.Marking that clock critical resolves this by preventing it from being disabled.
Define a new macro
CCU_FACTOR_GATE_DEFINE()to allow clock flags to be supplied for aCCU_FACTOR_GATEclock.Fixes 1b72c59db0add ("clk: spacemit: Add clock support for SpacemiT K1 SoC")Signed-off-by Alex Elder <[email protected]>Tested-by Guodong Xu <[email protected]>---
v2: Reworded the description to provide better detaildrivers/clk/spacemit/ccu-k1.c | 3 ++- drivers/clk/spacemit/ccu_mix.h | 21 +++++++++++++-------- 2 files changed, 15 insertions(+), 9 deletions(-)drivers/clk/spacemit/ccu-k1.c +2
-1@@ -170,7 +170,8 @@ CCU_FACTOR_GATE_DEFINE(pll1_d4, CCU_PARENT_HW(pll1), APBS_PLL1_SWCR2, BIT(3), 4,CCU_FACTOR_GATE_DEFINE (pll1_d5,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (4 ),5 ,1 );CCU_FACTOR_GATE_DEFINE (pll1_d6,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (5 ),6 ,1 );CCU_FACTOR_GATE_DEFINE (pll1_d7,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (6 ),7 ,1 ); -CCU_FACTOR_GATE_DEFINE (pll1_d8,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (7 ),8 ,1 ); +CCU_FACTOR_GATE_FLAGS_DEFINE (pll1_d8,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (7 ),8 ,1 , +CLK_IS_CRITICAL );CCU_FACTOR_GATE_DEFINE (pll1_d11_223p4,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (15 ),11 ,1 );CCU_FACTOR_GATE_DEFINE (pll1_d13_189,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (16 ),13 ,1 );CCU_FACTOR_GATE_DEFINE (pll1_d23_106p8,CCU_PARENT_HW (pll1),APBS_PLL1_SWCR2 ,BIT (20 ),23 ,1 );drivers/clk/spacemit/ccu_mix.h +0
-0
drivers/clk/spacemit/ccu_mix.h static struct ccu_mix _name = { \ · line 106
Quoted 6 lines
drivers/clk/spacemit/ccu_mix.h +3
-0@@ -101,16 +101,21 @@ static struct ccu_mix _name = { \ } \ } +#define CCU_FACTOR_GATE_FLAGS_DEFINE (_name, _parent, _reg_ctrl, _mask_gate, _div, \ + _mul, _flags) \ +struct ccu_mix _name = { \
This should be defined as static as well. I think this is the cause of CI warnings in v1.
With this fixed,
Quoted 28 lines
drivers/clk/spacemit/ccu_mix.h +10
-8+ .gate = CCU_GATE_INIT(_mask_gate), \ + .factor = CCU_FACTOR_INIT(_div, _mul), \ + .common = { \ + .reg_ctrl = _reg_ctrl, \ + CCU_MIX_INITHW(_name, _parent, spacemit_ccu_factor_gate_ops, _flags) \ + } \ +} +#define CCU_FACTOR_GATE_DEFINE (_name, _parent, _reg_ctrl, _mask_gate, _div, \ _mul) \ -static struct ccu_mix _name = { \ - .gate = CCU_GATE_INIT(_mask_gate), \ - .factor = CCU_FACTOR_INIT(_div, _mul), \ - .common = { \ - .reg_ctrl = _reg_ctrl, \ - CCU_MIX_INITHW(_name, _parent, spacemit_ccu_factor_gate_ops, 0) \ - } \ -} + CCU_FACTOR_GATE_FLAGS_DEFINE(_name, _parent, _reg_ctrl, _mask_gate, _div, \ + _mul, 0)#define CCU_MUX_GATE_DEFINE (_name, _parents, _reg_ctrl, _shift, _width, \ _mask_gate, _flags) \base-commit:
19272b37aa4f83ca52bdf9c16d5d81bdd1354494Signature · 1 line
2.45.2