linux-kernel - Re: [PATCH v4 21/24] arm/v2m: initialize arch_timers even if v2m

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]

Message-ID: <alpine.DEB.2.02.1301071719180.4981@kaball.uk.xensource.com>
Date:	Mon, 7 Jan 2013 17:21:01 +0000
From:	Stefano Stabellini <stefano.stabellini@...citrix.com>
To:	Stefano Stabellini <Stefano.Stabellini@...citrix.com>
CC:	Pawel Moll <pawel.moll@....com>, "arnd@...db.de" <arnd@...db.de>,
	"linux@....linux.org.uk" <linux@....linux.org.uk>,
	Catalin Marinas <Catalin.Marinas@....com>,
	"linaro-dev@...ts.linaro.org" <linaro-dev@...ts.linaro.org>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	"Tim (Xen.org)" <tim@....org>,
	Ian Campbell <Ian.Campbell@...rix.com>,
	"konrad.wilk@...cle.com" <konrad.wilk@...cle.com>,
	"xen-devel@...ts.xensource.com" <xen-devel@...ts.xensource.com>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Marc Zyngier <Marc.Zyngier@....com>
Subject: Re: [PATCH v4 21/24] arm/v2m: initialize arch_timers even if v2m_timer
 is not present

On Fri, 14 Sep 2012, Stefano Stabellini wrote:
> On Fri, 14 Sep 2012, Pawel Moll wrote:
> > On Fri, 2012-09-14 at 12:13 +0100, Stefano Stabellini wrote:
> > > Signed-off-by: Stefano Stabellini <stefano.stabellini@...citrix.com>
> > > CC: Russell King <linux@....linux.org.uk>
> > > CC: Pawel Moll <pawel.moll@....com>
> > > CC: Marc Zyngier <marc.zyngier@....com>
> > > ---
> > >  arch/arm/mach-vexpress/v2m.c |   11 ++++++-----
> > >  1 files changed, 6 insertions(+), 5 deletions(-)
> > > 
> > > diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c
> > > index 37608f2..4e567f7 100644
> > > --- a/arch/arm/mach-vexpress/v2m.c
> > > +++ b/arch/arm/mach-vexpress/v2m.c
> > > @@ -621,16 +621,17 @@ static void __init v2m_dt_timer_init(void)
> > >  
> > >  	v2m_clk_init();
> > >  
> > > -	err = of_property_read_string(of_aliases, "arm,v2m_timer", &path);
> > > -	if (WARN_ON(err))
> > > -		return;
> > > -	node = of_find_node_by_path(path);
> > > -	v2m_sp804_init(of_iomap(node, 0), irq_of_parse_and_map(node, 0));
> > >  	if (arch_timer_of_register() != 0)
> > >  		twd_local_timer_of_register();
> > >  
> > >  	if (arch_timer_sched_clock_init() != 0)
> > >  		versatile_sched_clock_init(v2m_sysreg_base + V2M_SYS_24MHZ, 24000000);
> > > +
> > > +	err = of_property_read_string(of_aliases, "arm,v2m_timer", &path);
> > > +	if (WARN_ON(err))
> > > +		return;
> > > +	node = of_find_node_by_path(path);
> > > +	v2m_sp804_init(of_iomap(node, 0), irq_of_parse_and_map(node, 0));
> > >  }
> > >  
> > >  static struct sys_timer v2m_dt_timer = {
> > 
> > Fair point. The alias is going to disappear anyway (I'm working on a VE
> > platform rework right now), but in case I won't get it on time for 3.7,
> > I'll make sure this one is merged instead.
> 
> Great, thanks!
> Should I leave this patch out of the Xen on ARM series for 3.7 then?
> 

I have just noticed that this patch hasn't been merged yet, but still we
need it to boot Linux on Xen.
Do you want me to rebase and resent?
--
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/