Unverified Commit 9bec2b9c authored by Samuel Holland's avatar Samuel Holland Committed by Maxime Ripard
Browse files

clk: sunxi-ng: Unregister clocks/resets when unbinding 



Currently, unbinding a CCU driver unmaps the device's MMIO region, while
leaving its clocks/resets and their providers registered. This can cause
a page fault later when some clock operation tries to perform MMIO. Fix
this by separating the CCU initialization from the memory allocation,
and then using a devres callback to unregister the clocks and resets.

This also fixes a memory leak of the `struct ccu_reset`, and uses the
correct owner (the specific platform driver) for the clocks and resets.

Early OF clock providers are never unregistered, and limited error
handling is possible, so they are mostly unchanged. The error reporting
is made more consistent by moving the message inside of_sunxi_ccu_probe.

Signed-off-by: default avatarSamuel Holland <samuel@sholland.org>
Signed-off-by: default avatarMaxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20210901050526.45673-2-samuel@sholland.org
parent 4abfc297

drivers/clk/sunxi-ng/ccu-sun4i-a10.c

+1 −1
Original line number Diff line number Diff line
@@ -1464,7 +1464,7 @@ static void __init sun4i_ccu_init(struct device_node *node, 
	val &= ~GENMASK(7, 6);

	writel(val | (2 << 6), reg + SUN4I_AHB_REG);



	sunxi_ccu_probe(node, reg, desc);

	of_sunxi_ccu_probe(node, reg, desc);

}



static void __init sun4i_a10_ccu_setup(struct device_node *node)

drivers/clk/sunxi-ng/ccu-sun50i-a100-r.c

+1 −1
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static int sun50i_a100_r_ccu_probe(struct platform_device *pdev) 
	if (IS_ERR(reg))

		return PTR_ERR(reg);



	return sunxi_ccu_probe(pdev->dev.of_node, reg, &sun50i_a100_r_ccu_desc);

	return devm_sunxi_ccu_probe(&pdev->dev, reg, &sun50i_a100_r_ccu_desc);

}



static const struct of_device_id sun50i_a100_r_ccu_ids[] = {

drivers/clk/sunxi-ng/ccu-sun50i-a100.c

+1 −1
Original line number Diff line number Diff line
@@ -1247,7 +1247,7 @@ static int sun50i_a100_ccu_probe(struct platform_device *pdev) 
		writel(val, reg + sun50i_a100_usb2_clk_regs[i]);

	}



	ret = sunxi_ccu_probe(pdev->dev.of_node, reg, &sun50i_a100_ccu_desc);

	ret = devm_sunxi_ccu_probe(&pdev->dev, reg, &sun50i_a100_ccu_desc);

	if (ret)

		return ret;

drivers/clk/sunxi-ng/ccu-sun50i-a64.c

+1 −1
Original line number Diff line number Diff line
@@ -955,7 +955,7 @@ static int sun50i_a64_ccu_probe(struct platform_device *pdev) 


	writel(0x515, reg + SUN50I_A64_PLL_MIPI_REG);



	ret = sunxi_ccu_probe(pdev->dev.of_node, reg, &sun50i_a64_ccu_desc);

	ret = devm_sunxi_ccu_probe(&pdev->dev, reg, &sun50i_a64_ccu_desc);

	if (ret)

		return ret;

drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c

+1 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ static void __init sunxi_r_ccu_init(struct device_node *node, 
		return;

	}



	sunxi_ccu_probe(node, reg, desc);

	of_sunxi_ccu_probe(node, reg, desc);

}



static void __init sun50i_h6_r_ccu_setup(struct device_node *node)