AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

x86/hpet: Use cached info instead of extra flags

Browse Source 
Now that HPET clockevent support is integrated into the channel data, reuse
the cached boot configuration instead of copying the same information into
a flags field.

This also allows to consolidate the reservation code into one place, which
can now solely depend on the mode information.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Ingo Molnar <mingo@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ricardo Neri <ricardo.neri-calderon@linux.intel.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Andi Kleen <andi.kleen@intel.com>
Cc: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Ravi Shankar <ravi.v.shankar@intel.com>
Link: https://lkml.kernel.org/r/20190623132436.277510163@linutronix.de
This commit is contained in:
Thomas Gleixner 2019-06-23 15:24:04 +02:00
parent 4d5e68330d
commit 45e0a41563
1 changed files with 23 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
arch/x86/kernel/hpet.c
View File

@ -25,8 +25,8 @@ struct hpet_channel {
unsigned int num; unsigned int num;
unsigned int cpu; unsigned int cpu;
unsigned int irq; unsigned int irq;
unsigned int in_use;
enum hpet_mode mode; enum hpet_mode mode;
unsigned int flags;
unsigned int boot_cfg; unsigned int boot_cfg;
char name[10]; char name[10];
}; };
@ -40,12 +40,6 @@ struct hpet_base {
#define HPET_MASK CLOCKSOURCE_MASK(32) #define HPET_MASK CLOCKSOURCE_MASK(32)
#define HPET_DEV_USED_BIT 2
#define HPET_DEV_USED (1 << HPET_DEV_USED_BIT)
#define HPET_DEV_VALID 0x8
#define HPET_DEV_FSB_CAP 0x1000
#define HPET_DEV_PERI_CAP 0x2000
#define HPET_MIN_CYCLES 128 #define HPET_MIN_CYCLES 128
#define HPET_MIN_PROG_DELTA (HPET_MIN_CYCLES + (HPET_MIN_CYCLES >> 1)) #define HPET_MIN_PROG_DELTA (HPET_MIN_CYCLES + (HPET_MIN_CYCLES >> 1))
@ -62,6 +56,7 @@ static struct irq_domain *hpet_domain;
#endif #endif
static void __iomem *hpet_virt_address; static void __iomem *hpet_virt_address;
static struct hpet_base hpet_base; static struct hpet_base hpet_base;
static bool hpet_legacy_int_enabled; static bool hpet_legacy_int_enabled;
@ -190,8 +185,6 @@ do { \
*/ */
#ifdef CONFIG_HPET #ifdef CONFIG_HPET
static void hpet_reserve_msi_timers(struct hpet_data *hd);
static void __init hpet_reserve_platform_timers(void) static void __init hpet_reserve_platform_timers(void)
{ {
struct hpet_data hd; struct hpet_data hd;
@ -201,11 +194,6 @@ static void __init hpet_reserve_platform_timers(void)
hd.hd_phys_address = hpet_address; hd.hd_phys_address = hpet_address;
hd.hd_address = hpet_virt_address; hd.hd_address = hpet_virt_address;
hd.hd_nirqs = hpet_base.nr_channels; hd.hd_nirqs = hpet_base.nr_channels;
hpet_reserve_timer(&hd, 0);
#ifdef CONFIG_HPET_EMULATE_RTC
hpet_reserve_timer(&hd, 1);
#endif
/* /*
* NOTE that hd_irq[] reflects IOAPIC input pins (LEGACY_8254 * NOTE that hd_irq[] reflects IOAPIC input pins (LEGACY_8254
@ -215,13 +203,25 @@ static void __init hpet_reserve_platform_timers(void)
hd.hd_irq[0] = HPET_LEGACY_8254; hd.hd_irq[0] = HPET_LEGACY_8254;
hd.hd_irq[1] = HPET_LEGACY_RTC; hd.hd_irq[1] = HPET_LEGACY_RTC;
for (i = 2; i < hpet_base.nr_channels; i++) for (i = 0; i < hpet_base.nr_channels; i++) {
hd.hd_irq[i] = hpet_base.channels[i].irq; struct hpet_channel *hc = hpet_base.channels + i;
hpet_reserve_msi_timers(&hd); if (i >= 2)
hd.hd_irq[i] = hc->irq;
switch (hc->mode) {
case HPET_MODE_UNUSED:
case HPET_MODE_DEVICE:
hc->mode = HPET_MODE_DEVICE;
break;
case HPET_MODE_CLOCKEVT:
case HPET_MODE_LEGACY:
hpet_reserve_timer(&hd, hc->num);
break;
}
}
hpet_alloc(&hd); hpet_alloc(&hd);
} }
static void __init hpet_select_device_channel(void) static void __init hpet_select_device_channel(void)
@ -543,13 +543,11 @@ static int hpet_setup_irq(struct hpet_channel *hc)
return 0; return 0;
} }
/* Invoked from the hotplug callback on @cpu */
static void init_one_hpet_msi_clockevent(struct hpet_channel *hc, int cpu) static void init_one_hpet_msi_clockevent(struct hpet_channel *hc, int cpu)
{ {
struct clock_event_device *evt = &hc->evt; struct clock_event_device *evt = &hc->evt;
if (!(hc->flags & HPET_DEV_VALID))
return;
hc->cpu = cpu; hc->cpu = cpu;
per_cpu(cpu_hpet_channel, cpu) = hc; per_cpu(cpu_hpet_channel, cpu) = hc;
evt->name = hc->name; evt->name = hc->name;
@ -558,7 +556,7 @@ static void init_one_hpet_msi_clockevent(struct hpet_channel *hc, int cpu)
evt->rating = 110; evt->rating = 110;
evt->features = CLOCK_EVT_FEAT_ONESHOT; evt->features = CLOCK_EVT_FEAT_ONESHOT;
if (hc->flags & HPET_DEV_PERI_CAP) { if (hc->boot_cfg & HPET_TN_PERIODIC) {
evt->features |= CLOCK_EVT_FEAT_PERIODIC; evt->features |= CLOCK_EVT_FEAT_PERIODIC;
evt->set_state_periodic = hpet_msi_set_periodic; evt->set_state_periodic = hpet_msi_set_periodic;
} }
@ -580,11 +578,9 @@ static struct hpet_channel *hpet_get_unused_clockevent(void)
for (i = 0; i < hpet_base.nr_channels; i++) { for (i = 0; i < hpet_base.nr_channels; i++) {
struct hpet_channel *hc = hpet_base.channels + i; struct hpet_channel *hc = hpet_base.channels + i;
if (!(hc->flags & HPET_DEV_VALID)) if (hc->mode != HPET_MODE_CLOCKEVT || hc->in_use)
continue;
if (test_and_set_bit(HPET_DEV_USED_BIT,
(unsigned long *)&hc->flags))
continue; continue;
hc->in_use = 1;
return hc; return hc;
} }
return NULL; return NULL;
@ -606,7 +602,7 @@ static int hpet_cpuhp_dead(unsigned int cpu)
if (!hc) if (!hc)
return 0; return 0;
free_irq(hc->irq, hc); free_irq(hc->irq, hc);
hc->flags &= ~HPET_DEV_USED; hc->in_use = 0;
per_cpu(cpu_hpet_channel, cpu) = NULL; per_cpu(cpu_hpet_channel, cpu) = NULL;
return 0; return 0;
} }
@ -638,9 +634,6 @@ static void __init hpet_select_clockevents(void)
if (!(hc->boot_cfg & HPET_TN_FSB_CAP)) if (!(hc->boot_cfg & HPET_TN_FSB_CAP))
continue; continue;
hc->flags = 0;
if (hc->boot_cfg & HPET_TN_PERIODIC_CAP)
hc->flags |= HPET_DEV_PERI_CAP;
sprintf(hc->name, "hpet%d", i); sprintf(hc->name, "hpet%d", i);
irq = hpet_assign_irq(hpet_domain, hc, hc->num); irq = hpet_assign_irq(hpet_domain, hc, hc->num);
@ -648,8 +641,6 @@ static void __init hpet_select_clockevents(void)
continue; continue;
hc->irq = irq; hc->irq = irq;
hc->flags |= HPET_DEV_FSB_CAP;
hc->flags |= HPET_DEV_VALID;
hc->mode = HPET_MODE_CLOCKEVT; hc->mode = HPET_MODE_CLOCKEVT;
if (++hpet_base.nr_clockevents == num_possible_cpus()) if (++hpet_base.nr_clockevents == num_possible_cpus())
@ -660,31 +651,10 @@ static void __init hpet_select_clockevents(void)
hpet_base.nr_channels, hpet_base.nr_clockevents); hpet_base.nr_channels, hpet_base.nr_clockevents);
} }
#ifdef CONFIG_HPET
static void __init hpet_reserve_msi_timers(struct hpet_data *hd)
{
int i;
for (i = 0; i < hpet_base.nr_channels; i++) {
struct hpet_channel *hc = hpet_base.channels + i;
if (!(hc->flags & HPET_DEV_VALID))
continue;
hd->hd_irq[hc->num] = hc->irq;
hpet_reserve_timer(hd, hc->num);
}
}
#endif
#else #else
static inline void hpet_select_clockevents(void) { } static inline void hpet_select_clockevents(void) { }
#ifdef CONFIG_HPET
static inline void hpet_reserve_msi_timers(struct hpet_data *hd) { }
#endif
#define hpet_cpuhp_online NULL #define hpet_cpuhp_online NULL
#define hpet_cpuhp_dead NULL #define hpet_cpuhp_dead NULL