[patch 27/29] x86/hpet: Carve out shareable parts of init_one_hpet_msi_clockevent()

From: Thomas Gleixner
Date: Sun Jun 23 2019 - 09:28:38 EST


To finally remove the static channel0/clockevent storage and to utilize the
channel 0 storage in hpet_base, it's required to run time initialize the
clockevent. The MSI clockevents already have a run time init function.

Carve out the parts which can be shared between the legacy and the MSI
implementation.

Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
---
arch/x86/kernel/hpet.c | 34 ++++++++++++++++++++--------------
1 file changed, 20 insertions(+), 14 deletions(-)

--- a/arch/x86/kernel/hpet.c
+++ b/arch/x86/kernel/hpet.c
@@ -411,6 +411,25 @@ hpet_clkevt_set_next_event(unsigned long
return res < HPET_MIN_CYCLES ? -ETIME : 0;
}

+static void hpet_init_clockevent(struct hpet_channel *hc, unsigned int rating)
+{
+ struct clock_event_device *evt = &hc->evt;
+
+ evt->rating = rating;
+ evt->irq = hc->irq;
+ evt->name = hc->name;
+ evt->cpumask = cpumask_of(hc->cpu);
+ evt->set_state_oneshot = hpet_clkevt_set_oneshot;
+ evt->set_next_event = hpet_clkevt_set_next_event;
+ evt->set_state_shutdown = hpet_clkevt_shutdown;
+
+ evt->features = CLOCK_EVT_FEAT_ONESHOT;
+ if (hc->boot_cfg & HPET_TN_PERIODIC) {
+ evt->features |= CLOCK_EVT_FEAT_PERIODIC;
+ evt->set_state_periodic = hpet_clkevt_set_periodic;
+ }
+}
+
/*
* The HPET clock event device wrapped in a channel for conversion
*/
@@ -510,23 +529,10 @@ static void init_one_hpet_msi_clockevent

hc->cpu = cpu;
per_cpu(cpu_hpet_channel, cpu) = hc;
- evt->name = hc->name;
hpet_setup_msi_irq(hc);
- evt->irq = hc->irq;

- evt->rating = 110;
- evt->features = CLOCK_EVT_FEAT_ONESHOT;
- if (hc->boot_cfg & HPET_TN_PERIODIC) {
- evt->features |= CLOCK_EVT_FEAT_PERIODIC;
- evt->set_state_periodic = hpet_clkevt_set_periodic;
- }
-
- evt->set_state_shutdown = hpet_clkevt_shutdown;
- evt->set_state_oneshot = hpet_clkevt_set_oneshot;
- evt->set_next_event = hpet_clkevt_set_next_event;
+ hpet_init_clockevent(hc, 110);
evt->tick_resume = hpet_clkevt_msi_resume;
- evt->cpumask = cpumask_of(hc->cpu);
-
clockevents_config_and_register(evt, hpet_freq, HPET_MIN_PROG_DELTA,
0x7FFFFFFF);
}