Skip to content

Commit 41544f9

Browse files
EmbeddedAndroidolofj
authored andcommitted
reset: sunxi: fix spinlock initialization
Call spin_lock_init() before the spinlocks are used, both in early init and probe functions preventing a lockdep splat. I have been observing lockdep complaining [1] during boot on my a80 optimus [2] when CONFIG_PROVE_LOCKING has been enabled. This patch resolves the splat, and has been tested on a few other sunxi platforms without issue. [1] http://storage.kernelci.org/next/next-20150107/arm-multi_v7_defconfig+CONFIG_PROVE_LOCKING=y/lab-tbaker/boot-sun9i-a80-optimus.html [2] http://kernelci.org/boot/?a80-optimus Signed-off-by: Tyler Baker <tyler.baker@linaro.org> Cc: <stable@vger.kernel.org> Acked-by: Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by: Kevin Hilman <khilman@linaro.org> Signed-off-by: Olof Johansson <olof@lixom.net>
1 parent a30e931 commit 41544f9

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

drivers/reset/reset-sunxi.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,8 @@ static int sunxi_reset_init(struct device_node *np)
102102
goto err_alloc;
103103
}
104104

105+
spin_lock_init(&data->lock);
106+
105107
data->rcdev.owner = THIS_MODULE;
106108
data->rcdev.nr_resets = size * 32;
107109
data->rcdev.ops = &sunxi_reset_ops;
@@ -157,6 +159,8 @@ static int sunxi_reset_probe(struct platform_device *pdev)
157159
if (IS_ERR(data->membase))
158160
return PTR_ERR(data->membase);
159161

162+
spin_lock_init(&data->lock);
163+
160164
data->rcdev.owner = THIS_MODULE;
161165
data->rcdev.nr_resets = resource_size(res) * 32;
162166
data->rcdev.ops = &sunxi_reset_ops;

0 commit comments

Comments
 (0)