diff mbox series

[3/5] clocksource: exynos_mct: Increase priority over ARM arch timer

Message ID 20190215125229.30180-4-m.szyprowski@samsung.com
State Superseded
Headers show
Series Exynos SoCs: enable support for ARM Architected Timers | expand

Commit Message

Marek Szyprowski Feb. 15, 2019, 12:52 p.m. UTC 
Exynos Multi-Core Timer driver (exynos_mct) must be started before ARM
Architected Timers (arch_timer), because they both share some common
hardware blocks (global system counter) and turning on MCT is needed
to get ARM Architected Timer working properly. Increase MCT timer rating
and hotplug priority over ARM Archictected timer driver to achieve that.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

---
 drivers/clocksource/exynos_mct.c | 4 ++--
 include/linux/cpuhotplug.h       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

-- 
2.17.1

Comments

Krzysztof Kozlowski Feb. 15, 2019, 12:59 p.m. UTC | #1 
On Fri, 15 Feb 2019 at 13:52, Marek Szyprowski <m.szyprowski@samsung.com> wrote:
>

> Exynos Multi-Core Timer driver (exynos_mct) must be started before ARM

> Architected Timers (arch_timer), because they both share some common

> hardware blocks (global system counter) and turning on MCT is needed

> to get ARM Architected Timer working properly. Increase MCT timer rating

> and hotplug priority over ARM Archictected timer driver to achieve that.

>

> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

> ---

>  drivers/clocksource/exynos_mct.c | 4 ++--

>  include/linux/cpuhotplug.h       | 2 +-

>  2 files changed, 3 insertions(+), 3 deletions(-)


Reviewed-by: Krzysztof Kozlowski <krzk@kernel.org>


Best regards,
Krzysztof
Daniel Lezcano Feb. 15, 2019, 4:35 p.m. UTC | #2 
On 15/02/2019 13:52, Marek Szyprowski wrote:
> Exynos Multi-Core Timer driver (exynos_mct) must be started before ARM

> Architected Timers (arch_timer), because they both share some common

> hardware blocks (global system counter) and turning on MCT is needed

> to get ARM Architected Timer working properly. Increase MCT timer rating

> and hotplug priority over ARM Archictected timer driver to achieve that.


This is a hack.

There are mechanisms to handle this kind of dependency.

eg. https://www.kernel.org/doc/html/v4.15/driver-api/device_link.html


> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

> ---

>  drivers/clocksource/exynos_mct.c | 4 ++--

>  include/linux/cpuhotplug.h       | 2 +-

>  2 files changed, 3 insertions(+), 3 deletions(-)

> 

> diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c

> index 49413900b24c..58090f57ada3 100644

> --- a/drivers/clocksource/exynos_mct.c

> +++ b/drivers/clocksource/exynos_mct.c

> @@ -211,7 +211,7 @@ static void exynos4_frc_resume(struct clocksource *cs)

>  

>  static struct clocksource mct_frc = {

>  	.name		= "mct-frc",

> -	.rating		= 400,

> +	.rating		= 450,

>  	.read		= exynos4_frc_read,

>  	.mask		= CLOCKSOURCE_MASK(32),

>  	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

> @@ -465,7 +465,7 @@ static int exynos4_mct_starting_cpu(unsigned int cpu)

>  	evt->set_state_oneshot_stopped = set_state_shutdown;

>  	evt->tick_resume = set_state_shutdown;

>  	evt->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;

> -	evt->rating = 450;

> +	evt->rating = 500;

>  

>  	exynos4_mct_write(TICK_BASE_CNT, mevt->base + MCT_L_TCNTB_OFFSET);

>  

> diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h

> index fd586d0301e7..bdd544f21102 100644

> --- a/include/linux/cpuhotplug.h

> +++ b/include/linux/cpuhotplug.h

> @@ -115,10 +115,10 @@ enum cpuhp_state {

>  	CPUHP_AP_PERF_ARM_ACPI_STARTING,

>  	CPUHP_AP_PERF_ARM_STARTING,

>  	CPUHP_AP_ARM_L2X0_STARTING,

> +	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,

>  	CPUHP_AP_ARM_ARCH_TIMER_STARTING,

>  	CPUHP_AP_ARM_GLOBAL_TIMER_STARTING,

>  	CPUHP_AP_JCORE_TIMER_STARTING,

> -	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,

>  	CPUHP_AP_ARM_TWD_STARTING,

>  	CPUHP_AP_QCOM_TIMER_STARTING,

>  	CPUHP_AP_ARMADA_TIMER_STARTING,

> 



-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
Marek Szyprowski Feb. 18, 2019, 7:41 a.m. UTC | #3 
Hi Daniel,

On 2019-02-15 17:35, Daniel Lezcano wrote:
> On 15/02/2019 13:52, Marek Szyprowski wrote:

>> Exynos Multi-Core Timer driver (exynos_mct) must be started before ARM

>> Architected Timers (arch_timer), because they both share some common

>> hardware blocks (global system counter) and turning on MCT is needed

>> to get ARM Architected Timer working properly. Increase MCT timer rating

>> and hotplug priority over ARM Archictected timer driver to achieve that.

> This is a hack.

>

> There are mechanisms to handle this kind of dependency.

>

> eg. https://www.kernel.org/doc/html/v4.15/driver-api/device_link.html


Sorry, but this is not a hack, but proper way to handle this in
clocksource/timers framework. The ratings assigned to each driver and
cpu hotplug priority list are exactly for managing the requested order
of operations if more than one driver has been registered.

Device links operates on the 'kernel device' objects, which are created
and managed much later than clocksource/timers are initialized. I see no
use of device links in this context.

>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

>> ---

>>  drivers/clocksource/exynos_mct.c | 4 ++--

>>  include/linux/cpuhotplug.h       | 2 +-

>>  2 files changed, 3 insertions(+), 3 deletions(-)

>>

>> diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c

>> index 49413900b24c..58090f57ada3 100644

>> --- a/drivers/clocksource/exynos_mct.c

>> +++ b/drivers/clocksource/exynos_mct.c

>> @@ -211,7 +211,7 @@ static void exynos4_frc_resume(struct clocksource *cs)

>>  

>>  static struct clocksource mct_frc = {

>>  	.name		= "mct-frc",

>> -	.rating		= 400,

>> +	.rating		= 450,

>>  	.read		= exynos4_frc_read,

>>  	.mask		= CLOCKSOURCE_MASK(32),

>>  	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

>> @@ -465,7 +465,7 @@ static int exynos4_mct_starting_cpu(unsigned int cpu)

>>  	evt->set_state_oneshot_stopped = set_state_shutdown;

>>  	evt->tick_resume = set_state_shutdown;

>>  	evt->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;

>> -	evt->rating = 450;

>> +	evt->rating = 500;

>>  

>>  	exynos4_mct_write(TICK_BASE_CNT, mevt->base + MCT_L_TCNTB_OFFSET);

>>  

>> diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h

>> index fd586d0301e7..bdd544f21102 100644

>> --- a/include/linux/cpuhotplug.h

>> +++ b/include/linux/cpuhotplug.h

>> @@ -115,10 +115,10 @@ enum cpuhp_state {

>>  	CPUHP_AP_PERF_ARM_ACPI_STARTING,

>>  	CPUHP_AP_PERF_ARM_STARTING,

>>  	CPUHP_AP_ARM_L2X0_STARTING,

>> +	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,

>>  	CPUHP_AP_ARM_ARCH_TIMER_STARTING,

>>  	CPUHP_AP_ARM_GLOBAL_TIMER_STARTING,

>>  	CPUHP_AP_JCORE_TIMER_STARTING,

>> -	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,

>>  	CPUHP_AP_ARM_TWD_STARTING,

>>  	CPUHP_AP_QCOM_TIMER_STARTING,

>>  	CPUHP_AP_ARMADA_TIMER_STARTING,

>>

>

Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland
Krzysztof Kozlowski Feb. 18, 2019, 8:53 a.m. UTC | #4 
On Fri, 15 Feb 2019 at 17:35, Daniel Lezcano <daniel.lezcano@linaro.org> wrote:
>

> On 15/02/2019 13:52, Marek Szyprowski wrote:

> > Exynos Multi-Core Timer driver (exynos_mct) must be started before ARM

> > Architected Timers (arch_timer), because they both share some common

> > hardware blocks (global system counter) and turning on MCT is needed

> > to get ARM Architected Timer working properly. Increase MCT timer rating

> > and hotplug priority over ARM Archictected timer driver to achieve that.

>

> This is a hack.

>

> There are mechanisms to handle this kind of dependency.

>

> eg. https://www.kernel.org/doc/html/v4.15/driver-api/device_link.html


Hi Daniel,

Are you sure you have proper devices at this point so you can order
dependencies with device links?

Best regards,
Krzysztof
Daniel Lezcano Feb. 18, 2019, 8:55 a.m. UTC | #5 
On 18/02/2019 09:53, Krzysztof Kozlowski wrote:
> On Fri, 15 Feb 2019 at 17:35, Daniel Lezcano <daniel.lezcano@linaro.org> wrote:

>>

>> On 15/02/2019 13:52, Marek Szyprowski wrote:

>>> Exynos Multi-Core Timer driver (exynos_mct) must be started before ARM

>>> Architected Timers (arch_timer), because they both share some common

>>> hardware blocks (global system counter) and turning on MCT is needed

>>> to get ARM Architected Timer working properly. Increase MCT timer rating

>>> and hotplug priority over ARM Archictected timer driver to achieve that.

>>

>> This is a hack.

>>

>> There are mechanisms to handle this kind of dependency.

>>

>> eg. https://www.kernel.org/doc/html/v4.15/driver-api/device_link.html

> 

> Hi Daniel,

> 

> Are you sure you have proper devices at this point so you can order

> dependencies with device links?


No, it was an example to show there are mechanism to handle the
dependencies. Agree it is a confusing example.




-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
Daniel Lezcano Feb. 18, 2019, 9:24 a.m. UTC | #6 
On 18/02/2019 08:41, Marek Szyprowski wrote:
> Hi Daniel,

> 

> On 2019-02-15 17:35, Daniel Lezcano wrote:

>> On 15/02/2019 13:52, Marek Szyprowski wrote:

>>> Exynos Multi-Core Timer driver (exynos_mct) must be started before ARM

>>> Architected Timers (arch_timer), because they both share some common

>>> hardware blocks (global system counter) and turning on MCT is needed

>>> to get ARM Architected Timer working properly. Increase MCT timer rating

>>> and hotplug priority over ARM Archictected timer driver to achieve that.

>> This is a hack.

>>

>> There are mechanisms to handle this kind of dependency.

>>

>> eg. https://www.kernel.org/doc/html/v4.15/driver-api/device_link.html

> 

> Sorry, but this is not a hack, but proper way to handle this in

> clocksource/timers framework. The ratings assigned to each driver and

> cpu hotplug priority list are exactly for managing the requested order

> of operations if more than one driver has been registered.


Actually, I'm reluctant with this change (even if it is correct) because
it introduces an implicit dependency in the cpu hotplug enumeration for
the timer subsystem while it may be more correct to have it explicitly
with the hardware description (or whatever).

However I don't see a proper way to describe this dependency without
touching the DT and add a phandle to the arch timer in the exynos_mct
timer description.

> Device links operates on the 'kernel device' objects, which are created

> and managed much later than clocksource/timers are initialized. I see no

> use of device links in this context.


Yes, that was just an example to show there are mechanisms to allow
proper ordering. As said before, not the best example for this situation.

>>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

>>> ---

>>>  drivers/clocksource/exynos_mct.c | 4 ++--

>>>  include/linux/cpuhotplug.h       | 2 +-

>>>  2 files changed, 3 insertions(+), 3 deletions(-)

>>>

>>> diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c

>>> index 49413900b24c..58090f57ada3 100644

>>> --- a/drivers/clocksource/exynos_mct.c

>>> +++ b/drivers/clocksource/exynos_mct.c

>>> @@ -211,7 +211,7 @@ static void exynos4_frc_resume(struct clocksource *cs)

>>>  

>>>  static struct clocksource mct_frc = {

>>>  	.name		= "mct-frc",

>>> -	.rating		= 400,

>>> +	.rating		= 450,

>>>  	.read		= exynos4_frc_read,

>>>  	.mask		= CLOCKSOURCE_MASK(32),

>>>  	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

>>> @@ -465,7 +465,7 @@ static int exynos4_mct_starting_cpu(unsigned int cpu)

>>>  	evt->set_state_oneshot_stopped = set_state_shutdown;

>>>  	evt->tick_resume = set_state_shutdown;

>>>  	evt->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;

>>> -	evt->rating = 450;

>>> +	evt->rating = 500;

>>>  

>>>  	exynos4_mct_write(TICK_BASE_CNT, mevt->base + MCT_L_TCNTB_OFFSET);

>>>  

>>> diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h

>>> index fd586d0301e7..bdd544f21102 100644

>>> --- a/include/linux/cpuhotplug.h

>>> +++ b/include/linux/cpuhotplug.h

>>> @@ -115,10 +115,10 @@ enum cpuhp_state {

>>>  	CPUHP_AP_PERF_ARM_ACPI_STARTING,

>>>  	CPUHP_AP_PERF_ARM_STARTING,

>>>  	CPUHP_AP_ARM_L2X0_STARTING,

>>> +	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,

>>>  	CPUHP_AP_ARM_ARCH_TIMER_STARTING,

>>>  	CPUHP_AP_ARM_GLOBAL_TIMER_STARTING,

>>>  	CPUHP_AP_JCORE_TIMER_STARTING,

>>> -	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,

>>>  	CPUHP_AP_ARM_TWD_STARTING,

>>>  	CPUHP_AP_QCOM_TIMER_STARTING,

>>>  	CPUHP_AP_ARMADA_TIMER_STARTING,

>>>

>>

> Best regards

> 



-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
Marek Szyprowski Feb. 18, 2019, 9:49 a.m. UTC | #7 
Hi Daniel,

On 2019-02-18 10:24, Daniel Lezcano wrote:
> On 18/02/2019 08:41, Marek Szyprowski wrote:

>> On 2019-02-15 17:35, Daniel Lezcano wrote:

>>> On 15/02/2019 13:52, Marek Szyprowski wrote:

>>>> Exynos Multi-Core Timer driver (exynos_mct) must be started before ARM

>>>> Architected Timers (arch_timer), because they both share some common

>>>> hardware blocks (global system counter) and turning on MCT is needed

>>>> to get ARM Architected Timer working properly. Increase MCT timer rating

>>>> and hotplug priority over ARM Archictected timer driver to achieve that.

>>> This is a hack.

>>>

>>> There are mechanisms to handle this kind of dependency.

>>>

>>> eg. https://www.kernel.org/doc/html/v4.15/driver-api/device_link.html

>> Sorry, but this is not a hack, but proper way to handle this in

>> clocksource/timers framework. The ratings assigned to each driver and

>> cpu hotplug priority list are exactly for managing the requested order

>> of operations if more than one driver has been registered.

> Actually, I'm reluctant with this change (even if it is correct) because

> it introduces an implicit dependency in the cpu hotplug enumeration for

> the timer subsystem while it may be more correct to have it explicitly

> with the hardware description (or whatever).


Maybe additional comment in the cpu hotplug list will convince you? For
the current code changing the order of enums it is more than enough.
There are no dynamic CPU hotplug priorities, so MCT driver cannot change
its behavior depending on any dt-property or so. Increasing MCT priority
has no side-effects in relation to other drivers (as they cannot
existing on the same board).

> However I don't see a proper way to describe this dependency without

> touching the DT and add a phandle to the arch timer in the exynos_mct

> timer description.

>

>> Device links operates on the 'kernel device' objects, which are created

>> and managed much later than clocksource/timers are initialized. I see no

>> use of device links in this context.

> Yes, that was just an example to show there are mechanisms to allow

> proper ordering. As said before, not the best example for this situation.

>

>>>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

>>>> ---

>>>>  drivers/clocksource/exynos_mct.c | 4 ++--

>>>>  include/linux/cpuhotplug.h       | 2 +-

>>>>  2 files changed, 3 insertions(+), 3 deletions(-)

>>>>

>>>> diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c

>>>> index 49413900b24c..58090f57ada3 100644

>>>> --- a/drivers/clocksource/exynos_mct.c

>>>> +++ b/drivers/clocksource/exynos_mct.c

>>>> @@ -211,7 +211,7 @@ static void exynos4_frc_resume(struct clocksource *cs)

>>>>  

>>>>  static struct clocksource mct_frc = {

>>>>  	.name		= "mct-frc",

>>>> -	.rating		= 400,

>>>> +	.rating		= 450,

>>>>  	.read		= exynos4_frc_read,

>>>>  	.mask		= CLOCKSOURCE_MASK(32),

>>>>  	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

>>>> @@ -465,7 +465,7 @@ static int exynos4_mct_starting_cpu(unsigned int cpu)

>>>>  	evt->set_state_oneshot_stopped = set_state_shutdown;

>>>>  	evt->tick_resume = set_state_shutdown;

>>>>  	evt->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;

>>>> -	evt->rating = 450;

>>>> +	evt->rating = 500;

>>>>  

>>>>  	exynos4_mct_write(TICK_BASE_CNT, mevt->base + MCT_L_TCNTB_OFFSET);

>>>>  

>>>> diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h

>>>> index fd586d0301e7..bdd544f21102 100644

>>>> --- a/include/linux/cpuhotplug.h

>>>> +++ b/include/linux/cpuhotplug.h

>>>> @@ -115,10 +115,10 @@ enum cpuhp_state {

>>>>  	CPUHP_AP_PERF_ARM_ACPI_STARTING,

>>>>  	CPUHP_AP_PERF_ARM_STARTING,

>>>>  	CPUHP_AP_ARM_L2X0_STARTING,

>>>> +	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,

>>>>  	CPUHP_AP_ARM_ARCH_TIMER_STARTING,

>>>>  	CPUHP_AP_ARM_GLOBAL_TIMER_STARTING,

>>>>  	CPUHP_AP_JCORE_TIMER_STARTING,

>>>> -	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,

>>>>  	CPUHP_AP_ARM_TWD_STARTING,

>>>>  	CPUHP_AP_QCOM_TIMER_STARTING,

>>>>  	CPUHP_AP_ARMADA_TIMER_STARTING,

>>>>

Best regards
-- 
Marek Szyprowski, PhD
Samsung R&D Institute Poland
Daniel Lezcano Feb. 18, 2019, 10:21 a.m. UTC | #8 
On 18/02/2019 10:49, Marek Szyprowski wrote:
> Hi Daniel,

> 

> On 2019-02-18 10:24, Daniel Lezcano wrote:

>> On 18/02/2019 08:41, Marek Szyprowski wrote:

>>> On 2019-02-15 17:35, Daniel Lezcano wrote:

>>>> On 15/02/2019 13:52, Marek Szyprowski wrote:

>>>>> Exynos Multi-Core Timer driver (exynos_mct) must be started before ARM

>>>>> Architected Timers (arch_timer), because they both share some common

>>>>> hardware blocks (global system counter) and turning on MCT is needed

>>>>> to get ARM Architected Timer working properly. Increase MCT timer rating

>>>>> and hotplug priority over ARM Archictected timer driver to achieve that.

>>>> This is a hack.

>>>>

>>>> There are mechanisms to handle this kind of dependency.

>>>>

>>>> eg. https://www.kernel.org/doc/html/v4.15/driver-api/device_link.html

>>> Sorry, but this is not a hack, but proper way to handle this in

>>> clocksource/timers framework. The ratings assigned to each driver and

>>> cpu hotplug priority list are exactly for managing the requested order

>>> of operations if more than one driver has been registered.

>> Actually, I'm reluctant with this change (even if it is correct) because

>> it introduces an implicit dependency in the cpu hotplug enumeration for

>> the timer subsystem while it may be more correct to have it explicitly

>> with the hardware description (or whatever).

> 

> Maybe additional comment in the cpu hotplug list will convince you? For

> the current code changing the order of enums it is more than enough.

> There are no dynamic CPU hotplug priorities, so MCT driver cannot change

> its behavior depending on any dt-property or so. Increasing MCT priority

> has no side-effects in relation to other drivers (as they cannot

> existing on the same board).


It is Thomas's call, I will let him decide if it is ok .



>> However I don't see a proper way to describe this dependency without

>> touching the DT and add a phandle to the arch timer in the exynos_mct

>> timer description.

>>

>>> Device links operates on the 'kernel device' objects, which are created

>>> and managed much later than clocksource/timers are initialized. I see no

>>> use of device links in this context.

>> Yes, that was just an example to show there are mechanisms to allow

>> proper ordering. As said before, not the best example for this situation.

>>

>>>>> Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

>>>>> ---

>>>>>  drivers/clocksource/exynos_mct.c | 4 ++--

>>>>>  include/linux/cpuhotplug.h       | 2 +-

>>>>>  2 files changed, 3 insertions(+), 3 deletions(-)

>>>>>

>>>>> diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c

>>>>> index 49413900b24c..58090f57ada3 100644

>>>>> --- a/drivers/clocksource/exynos_mct.c

>>>>> +++ b/drivers/clocksource/exynos_mct.c

>>>>> @@ -211,7 +211,7 @@ static void exynos4_frc_resume(struct clocksource *cs)

>>>>>  

>>>>>  static struct clocksource mct_frc = {

>>>>>  	.name		= "mct-frc",

>>>>> -	.rating		= 400,

>>>>> +	.rating		= 450,

>>>>>  	.read		= exynos4_frc_read,

>>>>>  	.mask		= CLOCKSOURCE_MASK(32),

>>>>>  	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

>>>>> @@ -465,7 +465,7 @@ static int exynos4_mct_starting_cpu(unsigned int cpu)

>>>>>  	evt->set_state_oneshot_stopped = set_state_shutdown;

>>>>>  	evt->tick_resume = set_state_shutdown;

>>>>>  	evt->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;

>>>>> -	evt->rating = 450;

>>>>> +	evt->rating = 500;

>>>>>  

>>>>>  	exynos4_mct_write(TICK_BASE_CNT, mevt->base + MCT_L_TCNTB_OFFSET);

>>>>>  

>>>>> diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h

>>>>> index fd586d0301e7..bdd544f21102 100644

>>>>> --- a/include/linux/cpuhotplug.h

>>>>> +++ b/include/linux/cpuhotplug.h

>>>>> @@ -115,10 +115,10 @@ enum cpuhp_state {

>>>>>  	CPUHP_AP_PERF_ARM_ACPI_STARTING,

>>>>>  	CPUHP_AP_PERF_ARM_STARTING,

>>>>>  	CPUHP_AP_ARM_L2X0_STARTING,

>>>>> +	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,

>>>>>  	CPUHP_AP_ARM_ARCH_TIMER_STARTING,

>>>>>  	CPUHP_AP_ARM_GLOBAL_TIMER_STARTING,

>>>>>  	CPUHP_AP_JCORE_TIMER_STARTING,

>>>>> -	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,

>>>>>  	CPUHP_AP_ARM_TWD_STARTING,

>>>>>  	CPUHP_AP_QCOM_TIMER_STARTING,

>>>>>  	CPUHP_AP_ARMADA_TIMER_STARTING,

>>>>>

> Best regards

> 



-- 
 <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
diff mbox series

Patch

diff --git a/drivers/clocksource/exynos_mct.c b/drivers/clocksource/exynos_mct.c
index 49413900b24c..58090f57ada3 100644
--- a/drivers/clocksource/exynos_mct.c
+++ b/drivers/clocksource/exynos_mct.c
@@ -211,7 +211,7 @@  static void exynos4_frc_resume(struct clocksource *cs)
 
 static struct clocksource mct_frc = {
 	.name		= "mct-frc",
-	.rating		= 400,
+	.rating		= 450,
 	.read		= exynos4_frc_read,
 	.mask		= CLOCKSOURCE_MASK(32),
 	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,
@@ -465,7 +465,7 @@  static int exynos4_mct_starting_cpu(unsigned int cpu)
 	evt->set_state_oneshot_stopped = set_state_shutdown;
 	evt->tick_resume = set_state_shutdown;
 	evt->features = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT;
-	evt->rating = 450;
+	evt->rating = 500;
 
 	exynos4_mct_write(TICK_BASE_CNT, mevt->base + MCT_L_TCNTB_OFFSET);
 
diff --git a/include/linux/cpuhotplug.h b/include/linux/cpuhotplug.h
index fd586d0301e7..bdd544f21102 100644
--- a/include/linux/cpuhotplug.h
+++ b/include/linux/cpuhotplug.h
@@ -115,10 +115,10 @@  enum cpuhp_state {
 	CPUHP_AP_PERF_ARM_ACPI_STARTING,
 	CPUHP_AP_PERF_ARM_STARTING,
 	CPUHP_AP_ARM_L2X0_STARTING,
+	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,
 	CPUHP_AP_ARM_ARCH_TIMER_STARTING,
 	CPUHP_AP_ARM_GLOBAL_TIMER_STARTING,
 	CPUHP_AP_JCORE_TIMER_STARTING,
-	CPUHP_AP_EXYNOS4_MCT_TIMER_STARTING,
 	CPUHP_AP_ARM_TWD_STARTING,
 	CPUHP_AP_QCOM_TIMER_STARTING,
 	CPUHP_AP_ARMADA_TIMER_STARTING,