Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bdd5a2e authored by Daniel Lezcano's avatar Daniel Lezcano
Browse files

clocksource/drivers/rockchip_timer: Convert init function to return error 



The init functions do not return any error. They behave as the following:

 - panic, thus leading to a kernel crash while another timer may work and
   make the system boot up correctly

 or

 - print an error and let the caller unaware if the state of the system

Change that by converting the init functions to return an error conforming
to the CLOCKSOURCE_OF_RET prototype.

Proper error handling (rollback, errno value) will be changed later case
by case, thus this change just return back an error or success in the init
function.

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>

on a rk3399-evb
Tested-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent b7c4db86

drivers/clocksource/rockchip_timer.c

+21 −14
Original line number Original line Diff line number Diff line
@@ -113,38 +113,42 @@ static irqreturn_t rk_timer_interrupt(int irq, void *dev_id) 
	return IRQ_HANDLED;

	return IRQ_HANDLED;

}

}





static void __init rk_timer_init(struct device_node *np, u32 ctrl_reg)

static int __init rk_timer_init(struct device_node *np, u32 ctrl_reg)

{

{

	struct clock_event_device *ce = &bc_timer.ce;

	struct clock_event_device *ce = &bc_timer.ce;

	struct clk *timer_clk;

	struct clk *timer_clk;

	struct clk *pclk;

	struct clk *pclk;

	int ret, irq;

	int ret = -EINVAL, irq;





	bc_timer.base = of_iomap(np, 0);

	bc_timer.base = of_iomap(np, 0);

	if (!bc_timer.base) {

	if (!bc_timer.base) {

		pr_err("Failed to get base address for '%s'\n", TIMER_NAME);

		pr_err("Failed to get base address for '%s'\n", TIMER_NAME);

		return;

		return -ENXIO;

	}

	}

	bc_timer.ctrl = bc_timer.base + ctrl_reg;

	bc_timer.ctrl = bc_timer.base + ctrl_reg;





	pclk = of_clk_get_by_name(np, "pclk");

	pclk = of_clk_get_by_name(np, "pclk");

	if (IS_ERR(pclk)) {

	if (IS_ERR(pclk)) {

		ret = PTR_ERR(pclk);

		pr_err("Failed to get pclk for '%s'\n", TIMER_NAME);

		pr_err("Failed to get pclk for '%s'\n", TIMER_NAME);

		goto out_unmap;

		goto out_unmap;

	}

	}





	if (clk_prepare_enable(pclk)) {

	ret = clk_prepare_enable(pclk);

	if (ret) {

		pr_err("Failed to enable pclk for '%s'\n", TIMER_NAME);

		pr_err("Failed to enable pclk for '%s'\n", TIMER_NAME);

		goto out_unmap;

		goto out_unmap;

	}

	}





	timer_clk = of_clk_get_by_name(np, "timer");

	timer_clk = of_clk_get_by_name(np, "timer");

	if (IS_ERR(timer_clk)) {

	if (IS_ERR(timer_clk)) {

		ret = PTR_ERR(timer_clk);

		pr_err("Failed to get timer clock for '%s'\n", TIMER_NAME);

		pr_err("Failed to get timer clock for '%s'\n", TIMER_NAME);

		goto out_timer_clk;

		goto out_timer_clk;

	}

	}





	if (clk_prepare_enable(timer_clk)) {

	ret = clk_prepare_enable(timer_clk);

	if (ret) {

		pr_err("Failed to enable timer clock\n");

		pr_err("Failed to enable timer clock\n");

		goto out_timer_clk;

		goto out_timer_clk;

	}

	}
@@ -153,6 +157,7 @@ static void __init rk_timer_init(struct device_node *np, u32 ctrl_reg) 




	irq = irq_of_parse_and_map(np, 0);

	irq = irq_of_parse_and_map(np, 0);

	if (!irq) {

	if (!irq) {

		ret = -EINVAL;

		pr_err("Failed to map interrupts for '%s'\n", TIMER_NAME);

		pr_err("Failed to map interrupts for '%s'\n", TIMER_NAME);

		goto out_irq;

		goto out_irq;

	}

	}
@@ -178,7 +183,7 @@ static void __init rk_timer_init(struct device_node *np, u32 ctrl_reg) 




	clockevents_config_and_register(ce, bc_timer.freq, 1, UINT_MAX);

	clockevents_config_and_register(ce, bc_timer.freq, 1, UINT_MAX);





	return;

	return 0;





out_irq:

out_irq:

	clk_disable_unprepare(timer_clk);

	clk_disable_unprepare(timer_clk);
@@ -186,19 +191,21 @@ static void __init rk_timer_init(struct device_node *np, u32 ctrl_reg) 
	clk_disable_unprepare(pclk);

	clk_disable_unprepare(pclk);

out_unmap:

out_unmap:

	iounmap(bc_timer.base);

	iounmap(bc_timer.base);



	return ret;

}

}





static void __init rk3288_timer_init(struct device_node *np)

static int __init rk3288_timer_init(struct device_node *np)

{

{

	rk_timer_init(np, TIMER_CONTROL_REG3288);

	return rk_timer_init(np, TIMER_CONTROL_REG3288);

}

}





static void __init rk3399_timer_init(struct device_node *np)

static int __init rk3399_timer_init(struct device_node *np)

{

{

	rk_timer_init(np, TIMER_CONTROL_REG3399);

	return rk_timer_init(np, TIMER_CONTROL_REG3399);

}

}





CLOCKSOURCE_OF_DECLARE(rk3288_timer, "rockchip,rk3288-timer",

CLOCKSOURCE_OF_DECLARE_RET(rk3288_timer, "rockchip,rk3288-timer",

			   rk3288_timer_init);

			   rk3288_timer_init);

CLOCKSOURCE_OF_DECLARE(rk3399_timer, "rockchip,rk3399-timer",

CLOCKSOURCE_OF_DECLARE_RET(rk3399_timer, "rockchip,rk3399-timer",

			   rk3399_timer_init);
 
			   rk3399_timer_init);