From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754459AbbFRMFL (ORCPT ); Thu, 18 Jun 2015 08:05:11 -0400 Received: from down.free-electrons.com ([37.187.137.238]:33793 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751001AbbFRMFE (ORCPT ); Thu, 18 Jun 2015 08:05:04 -0400 Date: Thu, 18 Jun 2015 14:01:05 +0200 From: Maxime Ripard To: Viresh Kumar Cc: Thomas Gleixner , Daniel Lezcano , linaro-kernel@lists.linaro.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 23/41] clocksource: sun4i: Migrate to new 'set-state' interface Message-ID: <20150618120105.GM11732@lukather> References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="acOuGx3oQeOcSZJu" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org --acOuGx3oQeOcSZJu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jun 18, 2015 at 04:24:37PM +0530, Viresh Kumar wrote: > Migrate sun4i driver to the new 'set-state' interface provided by > clockevents core, the earlier 'set-mode' interface is marked obsolete > now. >=20 > This also enables us to implement callbacks for new states of clockevent > devices, for example: ONESHOT_STOPPED. >=20 > Cc: Maxime Ripard > Signed-off-by: Viresh Kumar > --- > drivers/clocksource/sun4i_timer.c | 41 +++++++++++++++++++++------------= ------ > 1 file changed, 22 insertions(+), 19 deletions(-) >=20 > diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4= i_timer.c > index 1928a8912584..6f3719d73390 100644 > --- a/drivers/clocksource/sun4i_timer.c > +++ b/drivers/clocksource/sun4i_timer.c > @@ -81,25 +81,25 @@ static void sun4i_clkevt_time_start(u8 timer, bool pe= riodic) > timer_base + TIMER_CTL_REG(timer)); > } > =20 > -static void sun4i_clkevt_mode(enum clock_event_mode mode, > - struct clock_event_device *clk) > +static int sun4i_clkevt_shutdown(struct clock_event_device *evt) > { > - switch (mode) { > - case CLOCK_EVT_MODE_PERIODIC: > - sun4i_clkevt_time_stop(0); > - sun4i_clkevt_time_setup(0, ticks_per_jiffy); > - sun4i_clkevt_time_start(0, true); > - break; > - case CLOCK_EVT_MODE_ONESHOT: > - sun4i_clkevt_time_stop(0); > - sun4i_clkevt_time_start(0, false); > - break; > - case CLOCK_EVT_MODE_UNUSED: > - case CLOCK_EVT_MODE_SHUTDOWN: > - default: > - sun4i_clkevt_time_stop(0); > - break; > - } > + sun4i_clkevt_time_stop(0); > + return 0; > +} > + > +static int sun4i_clkevt_set_oneshot(struct clock_event_device *evt) > +{ > + sun4i_clkevt_time_stop(0); > + sun4i_clkevt_time_start(0, false); > + return 0; > +} > + > +static int sun4i_clkevt_set_periodic(struct clock_event_device *evt) > +{ > + sun4i_clkevt_time_stop(0); > + sun4i_clkevt_time_setup(0, ticks_per_jiffy); > + sun4i_clkevt_time_start(0, true); > + return 0; > } > =20 > static int sun4i_clkevt_next_event(unsigned long evt, > @@ -116,7 +116,10 @@ static struct clock_event_device sun4i_clockevent = =3D { > .name =3D "sun4i_tick", > .rating =3D 350, > .features =3D CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, > - .set_mode =3D sun4i_clkevt_mode, > + .set_state_shutdown =3D sun4i_clkevt_shutdown, > + .set_state_periodic =3D sun4i_clkevt_set_periodic, > + .set_state_oneshot =3D sun4i_clkevt_set_oneshot, > + .tick_resume =3D sun4i_clkevt_shutdown, I'm not exactly sure of the context here, but I wouldn't expect a callback called tick_resume to stop a timer. Is this expected? Maxime --=20 Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com --acOuGx3oQeOcSZJu Content-Type: application/pgp-signature; name="signature.asc" Content-Description: Digital signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJVgrMBAAoJEBx+YmzsjxAgzskQALD/UU1eMVESeogbWZ+J8Zz/ lFsbAN2h7W5AOqgR9cjLZliy6U8BMaxlFQSNjCZUJUVCXwcH74mDY4QOOrAZh0yA bsWHoG4oIy9nzv6y10yXBgAUsTWXjFfJBOK9xBVLNaXauSpByvFMGZoiFEAV06VP j08kpV7INKrZPOMPEYPpswDcqe5JjJshbKoKMRUbITkNhmV3pW7rS79Yz2wH3MSR Xjxtkxhf5bj0oZNwyj+RbzFTU7OWhNXgDRU2OiZqj+t6q7/dke9jMStQniB+RlkK Cah8e9jWHktlfDA6gPviZP1zgHm8ETwZ2Ybq00ZWPqaCLXtKFKx0JV4yRc5Dm/sy lJHqxLGu6RmC2QfcDX0ArIWL7xQGouonYWEidUaPa1sQzl1hX9C5BL7tfpnmXFME wQv8YPSz8lHfRixT07GdTQPrg8Io1qfFYcMKfh0ts0jbUZ1OV6BH2VH4WGcUPGUe RUAYKwK3Q0pSxPziGYapY/8OR5MEQr1RfOoKUodQlPlf4xIqNA14tvbOX61ccZbw YR6XYvHdHV81gBEC3K84JsyT5P7gXbPLKw8TOQ1HbtEObUzPXMl0Dusft+AfQj12 41sWMoKOazevLZlicDnYCNVxzccvr7YhgwORCK6tyBs64uOYhww9VVFZkR/fI1gS CRX30zL4N3FULPSYkHYW =bmVe -----END PGP SIGNATURE----- --acOuGx3oQeOcSZJu-- From mboxrd@z Thu Jan 1 00:00:00 1970 From: maxime.ripard@free-electrons.com (Maxime Ripard) Date: Thu, 18 Jun 2015 14:01:05 +0200 Subject: [PATCH 23/41] clocksource: sun4i: Migrate to new 'set-state' interface In-Reply-To: References: Message-ID: <20150618120105.GM11732@lukather> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thu, Jun 18, 2015 at 04:24:37PM +0530, Viresh Kumar wrote: > Migrate sun4i driver to the new 'set-state' interface provided by > clockevents core, the earlier 'set-mode' interface is marked obsolete > now. > > This also enables us to implement callbacks for new states of clockevent > devices, for example: ONESHOT_STOPPED. > > Cc: Maxime Ripard > Signed-off-by: Viresh Kumar > --- > drivers/clocksource/sun4i_timer.c | 41 +++++++++++++++++++++------------------ > 1 file changed, 22 insertions(+), 19 deletions(-) > > diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c > index 1928a8912584..6f3719d73390 100644 > --- a/drivers/clocksource/sun4i_timer.c > +++ b/drivers/clocksource/sun4i_timer.c > @@ -81,25 +81,25 @@ static void sun4i_clkevt_time_start(u8 timer, bool periodic) > timer_base + TIMER_CTL_REG(timer)); > } > > -static void sun4i_clkevt_mode(enum clock_event_mode mode, > - struct clock_event_device *clk) > +static int sun4i_clkevt_shutdown(struct clock_event_device *evt) > { > - switch (mode) { > - case CLOCK_EVT_MODE_PERIODIC: > - sun4i_clkevt_time_stop(0); > - sun4i_clkevt_time_setup(0, ticks_per_jiffy); > - sun4i_clkevt_time_start(0, true); > - break; > - case CLOCK_EVT_MODE_ONESHOT: > - sun4i_clkevt_time_stop(0); > - sun4i_clkevt_time_start(0, false); > - break; > - case CLOCK_EVT_MODE_UNUSED: > - case CLOCK_EVT_MODE_SHUTDOWN: > - default: > - sun4i_clkevt_time_stop(0); > - break; > - } > + sun4i_clkevt_time_stop(0); > + return 0; > +} > + > +static int sun4i_clkevt_set_oneshot(struct clock_event_device *evt) > +{ > + sun4i_clkevt_time_stop(0); > + sun4i_clkevt_time_start(0, false); > + return 0; > +} > + > +static int sun4i_clkevt_set_periodic(struct clock_event_device *evt) > +{ > + sun4i_clkevt_time_stop(0); > + sun4i_clkevt_time_setup(0, ticks_per_jiffy); > + sun4i_clkevt_time_start(0, true); > + return 0; > } > > static int sun4i_clkevt_next_event(unsigned long evt, > @@ -116,7 +116,10 @@ static struct clock_event_device sun4i_clockevent = { > .name = "sun4i_tick", > .rating = 350, > .features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT, > - .set_mode = sun4i_clkevt_mode, > + .set_state_shutdown = sun4i_clkevt_shutdown, > + .set_state_periodic = sun4i_clkevt_set_periodic, > + .set_state_oneshot = sun4i_clkevt_set_oneshot, > + .tick_resume = sun4i_clkevt_shutdown, I'm not exactly sure of the context here, but I wouldn't expect a callback called tick_resume to stop a timer. Is this expected? Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: Digital signature URL: