Commit 6a78ee88 authored by Jianyong Wu's avatar Jianyong Wu Committed by sundongxu
Browse files

clocksource: Add clocksource id for arm arch counter 

mainline inclusion
from mainline-v5.13-rc1
commit 100148d0
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8DWT1
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=100148d0fc7dcf8672fe0ac83f44dc5749b4da5c



--------------------------------

Add clocksource id to the ARM generic counter so that it can be easily
identified from callers such as ptp_kvm.

Cc: Mark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarAndre Przywara <andre.przywara@arm.com>
Signed-off-by: default avatarJianyong Wu <jianyong.wu@arm.com>
Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20201209060932.212364-6-jianyong.wu@arm.com


Signed-off-by: default avatarKunkun Jiang <jiangkunkun@huawei.com>
Signed-off-by: default avatarDongxu Sun <sundongxu3@huawei.com>
parent 3e04146d

drivers/clocksource/arm_arch_timer.c

+2 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/cpu_pm.h>

#include <linux/clockchips.h>

#include <linux/clocksource.h>

#include <linux/clocksource_ids.h>

#include <linux/interrupt.h>

#include <linux/of_irq.h>

#include <linux/of_address.h>
@@ -222,6 +223,7 @@ static u64 arch_counter_read_cc(const struct cyclecounter *cc) 


static struct clocksource clocksource_counter = {

	.name	= "arch_sys_counter",

	.id	= CSID_ARM_ARCH_COUNTER,

	.rating	= 400,

	.read	= arch_counter_read,

	.flags	= CLOCK_SOURCE_IS_CONTINUOUS,

include/linux/clocksource_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
/* Enum to give clocksources a unique identifier */

enum clocksource_ids {

	CSID_GENERIC		= 0,

	CSID_ARM_ARCH_COUNTER,

	CSID_MAX,

};