linux-kernel - Re: [PATCH v2 4/4] clocksource: dw_apb_timer_of: use clocksource_of

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Date:	Tue, 4 Jun 2013 15:21:20 +0100
From:	Jamie Iles <jamie@...ieiles.com>
To:	Heiko Stübner <heiko@...ech.de>
Cc:	John Stultz <john.stultz@...aro.org>,
	Thomas Gleixner <tglx@...utronix.de>,
	Jamie Iles <jamie@...ieiles.com>,
	Dinh Nguyen <dinguyen@...era.com>,
	Grant Likely <grant.likely@...aro.org>,
	linux-arm-kernel@...ts.infradead.org,
	Rob Herring <rob.herring@...xeda.com>,
	devicetree-discuss@...ts.ozlabs.org, linux-kernel@...r.kernel.org,
	Arnd Bergmann <arnd@...db.de>,
	Linus Walleij <linus.walleij@...aro.org>,
	Baruch Siach <baruch@...s.co.il>
Subject: Re: [PATCH v2 4/4] clocksource: dw_apb_timer_of: use
 clocksource_of_init

Hi Heiko,

On Tue, Jun 04, 2013 at 11:38:42AM +0200, Heiko Stübner wrote:
> dw_apb_timer_init used to search the devicetree for matching timer
> devices, making calls to it from board files necessary.
> 
> Change the dw_apb_timer_init to work with CLOCKSOURCE_OF_DECLARE.
> With this change the function gets called once for each timer node
> and tracks these number of calls to attach clockevent and clocksource
> devices to the nodes.
> 
> Also remove the calls to dw_apb_timer_init from all previous users, as
> clocksource_of_init is the default for init_time now.
> 
> Tested on the upcoming rk3066 code.
> 
> Signed-off-by: Heiko Stuebner <heiko@...ech.de>
> Acked-by: Rob Herring <rob.herring@...xeda.com>
> Acked-by: Arnd Bergmann <arnd@...db.de>
> ---
...
> -void __init dw_apb_timer_init(void)
> +static int num_called;
> +static void __init dw_apb_timer_init(struct device_node *timer)
>  {
> -	struct device_node *event_timer, *source_timer;
> -
> -	event_timer = of_find_matching_node(NULL, osctimer_ids);
> -	if (!event_timer)
> -		panic("No timer for clockevent");
> -	add_clockevent(event_timer);
> -
> -	source_timer = of_find_matching_node(event_timer, osctimer_ids);
> -	if (!source_timer)
> -		panic("No timer for clocksource");
> -	add_clocksource(source_timer);
> -
> -	of_node_put(source_timer);
> +	switch (num_called) {
> +	case 0:
> +		pr_debug("%s: found clockevent timer\n", __func__);
> +		add_clockevent(timer);
> +		of_node_put(timer);
> +		break;
> +	case 1:
> +		pr_debug("%s: found clocksource timer\n", __func__);
> +		add_clocksource(timer);
> +		of_node_put(timer);
> +		init_sched_clock();
> +		break;
> +	default:
> +		break;
> +	}
>  
> -	init_sched_clock();
> +	num_called++;
>  }
> +CLOCKSOURCE_OF_DECLARE(pc3x2_timer, "picochip,pc3x2-timer", dw_apb_timer_init);
> +CLOCKSOURCE_OF_DECLARE(apb_timer, "snps,dw-apb-timer-osc", dw_apb_timer_init);

I think maybe we also want CLOCKSOURCE_OF_DECLARE() instances for the 
contents of sptimer_ids for completeness, otherwise looks good.

Acked-by: Jamie Iles <jamie@...ieiles.com>

Thanks,

Jamie
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/