| Message ID | 20210208134029.3269384-6-maz@kernel.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | KVM: arm64: Add host/guest KVM-PTP support | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Not a local patch |
On Mon, 8 Feb 2021 13:40:27 +0000 Marc Zyngier <maz@kernel.org> wrote: > From: Jianyong Wu <jianyong.wu@arm.com> > > 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> > Signed-off-by: Jianyong Wu <jianyong.wu@arm.com> > Signed-off-by: Marc Zyngier <maz@kernel.org> > Link: https://lore.kernel.org/r/20201209060932.212364-6-jianyong.wu@arm.com Reviewed-by: Andre Przywara <andre.przywara@arm.com> Cheers, Andre > --- > drivers/clocksource/arm_arch_timer.c | 2 ++ > include/linux/clocksource_ids.h | 1 + > 2 files changed, 3 insertions(+) > > diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c > index d0177824c518..8f12e223703f 100644 > --- a/drivers/clocksource/arm_arch_timer.c > +++ b/drivers/clocksource/arm_arch_timer.c > @@ -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> > @@ -191,6 +192,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, > .mask = CLOCKSOURCE_MASK(56), > diff --git a/include/linux/clocksource_ids.h b/include/linux/clocksource_ids.h > index 4d8e19e05328..16775d7d8f8d 100644 > --- a/include/linux/clocksource_ids.h > +++ b/include/linux/clocksource_ids.h > @@ -5,6 +5,7 @@ > /* Enum to give clocksources a unique identifier */ > enum clocksource_ids { > CSID_GENERIC = 0, > + CSID_ARM_ARCH_COUNTER, > CSID_MAX, > }; >
diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c index d0177824c518..8f12e223703f 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c @@ -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> @@ -191,6 +192,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, .mask = CLOCKSOURCE_MASK(56), diff --git a/include/linux/clocksource_ids.h b/include/linux/clocksource_ids.h index 4d8e19e05328..16775d7d8f8d 100644 --- a/include/linux/clocksource_ids.h +++ b/include/linux/clocksource_ids.h @@ -5,6 +5,7 @@ /* Enum to give clocksources a unique identifier */ enum clocksource_ids { CSID_GENERIC = 0, + CSID_ARM_ARCH_COUNTER, CSID_MAX, };