gpio: mvebu: Add clk support to prevent lockup
Subsystems (2)
PATCH v2 1/1 gpio: mvebu: Add clk support to prevent lockup
The kirkwood SoC GPIO cores use the runit clock. Add code to clk_prepare_enable() runit, otherwise there is a danger of locking up the SoC by accessing the GPIO registers when runit clock is not ticking.
---
Since v1:
ChangeLog: tclk->runit clock
arch/arm/boot/dts/kirkwood.dtsi | 2 ++ drivers/gpio/gpio-mvebu.c | 7 +++++++ 2 files changed, 9 insertions(+)
arch/arm/boot/dts/kirkwood.dtsi +2 -0
@@ -38,6 +38,7 @@ interrupt-controller; #interrupt-cells = <2>; interrupts = <35>, <36>, <37>, <38>; + clocks = <&gate_clk 7>; }; gpio1: gpio at 10140 {
@@ -49,6 +50,7 @@ interrupt-controller; #interrupt-cells = <2>; interrupts = <39>, <40>, <41>; + clocks = <&gate_clk 7>; }; serial at 12000 {
drivers/gpio/gpio-mvebu.c +7 -0
@@ -41,6 +41,7 @@#include <linux/io.h> #include <linux/of_irq.h> #include <linux/of_device.h> +#include <linux/clk.h> #include <linux/pinctrl/consumer.h> /*
@@ -495,6 +496,7 @@ static int mvebu_gpio_probe(struct platform_device *pdev)struct resource *res;struct irq_chip_generic *gc;struct irq_chip_type *ct; +struct clk *clk;unsigned int ngpios;int soc_variant;int i, cpu, id;
@@ -528,6 +530,11 @@ static int mvebu_gpio_probe(struct platform_device *pdev)return id; } + clk =devm_clk_get (&pdev->dev,NULL ); +/* Not all SoCs require a clock.*/ +if (!IS_ERR (clk)) +clk_prepare_enable (clk); + mvchip->soc_variant = soc_variant; mvchip->chip.label =dev_name (&pdev->dev); mvchip->chip.dev = &pdev->dev;
Signature · 1 line
1.7.10.4
PATCH v2 1/1 gpio: mvebu: Add clk support to prevent lockup
Quoted 7 lines · Andrew Lunn
The kirkwood SoC GPIO cores use the runit clock. Add code to
clk_prepare_enable()runit, otherwise there is a danger of locking up the SoC by accessing the GPIO registers when runit clock is not ticking.Reported-by Simon Baatz <[email protected]>Signed-off-by Andrew Lunn <[email protected]>
After boot (GPIO is the only driver enabling runit at this point in time):
# cat /sys/kernel/debug/clk/tclk/runit/clk_enable_count 2
- Simon
PATCH v2 1/1 gpio: mvebu: Add clk support to prevent lockup
In reply to Andrew LunnQuoted 7 lines · Andrew Lunn
The kirkwood SoC GPIO cores use the runit clock. Add code to
clk_prepare_enable()runit, otherwise there is a danger of locking up the SoC by accessing the GPIO registers when runit clock is not ticking.Reported-by Simon Baatz <[email protected]>Signed-off-by Andrew Lunn <[email protected]>
Quoted 7 lines
---
Since v1:
ChangeLog:tclk->runitclockarch/arm/boot/dts/kirkwood.dtsi | 2 ++ drivers/gpio/gpio-mvebu.c | 7 +++++++ 2 files changed, 9 insertions(+)
Linus,
I merge-tested this against your gpio/fixes branch since you had a patch to the same file:
11c0cee gpio: mvebu: Don't free chip label memory
There were no conflicts. If you don't mind, I'd like to take this through mvebu/fixes -> arm-soc since this is one of four patches to fix one reported issue. I'd like to keep them in the same branch.
If this causes a headache for you, please let me know and you can take it.
Otherwise, applied to mvebu/fixes with Simon's Tested-by:
thx,
Jason.
PATCH v2 1/1 gpio: mvebu: Add clk support to prevent lockup
Quoted 18 lines · Jason Cooper
Quoted 7 lines · Andrew Lunn
The kirkwood SoC GPIO cores use the runit clock. Add code to
clk_prepare_enable()runit, otherwise there is a danger of locking up the SoC by accessing the GPIO registers when runit clock is not ticking.Reported-by Simon Baatz <[email protected]>Signed-off-by Andrew Lunn <[email protected]>Quoted 7 lines
---
Since v1:
ChangeLog:tclk->runitclockarch/arm/boot/dts/kirkwood.dtsi | 2 ++ drivers/gpio/gpio-mvebu.c | 7 +++++++ 2 files changed, 9 insertions(+)Linus,
Quoted 8 lines
I merge-tested this against your gpio/fixes branch since you had a patch to the same file:
11c0cee gpio: mvebu: Don't free chip label memory
There were no conflicts. If you don't mind, I'd like to take this through mvebu/fixes -> arm-soc since this is one of four patches to fix one reported issue. I'd like to keep them in the same branch.
No problem, go ahead.
Yours,
Linus Walleij