Commit 6671de34 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'timers-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits)
  posix timers: fix RLIMIT_CPU && fork()
  time: ntp: fix bug in ntp_update_offset() & do_adjtimex(), fix
  time: ntp: clean up second_overflow()
  time: ntp: simplify ntp_tick_adj calculations
  time: ntp: make 64-bit constants more robust
  time: ntp: refactor do_adjtimex() some more
  time: ntp: refactor do_adjtimex()
  time: ntp: fix bug in ntp_update_offset() & do_adjtimex()
  time: ntp: micro-optimize ntp_update_offset()
  time: ntp: simplify ntp_update_offset_fll()
  time: ntp: refactor and clean up ntp_update_offset()
  time: ntp: refactor up ntp_update_frequency()
  time: ntp: clean up ntp_update_frequency()
  time: ntp: simplify the MAX_TICKADJ_SCALED definition
  time: ntp: simplify the second_overflow() code flow
  time: ntp: clean up kernel/time/ntp.c
  x86: hpet: stop HPET_COUNTER when programming periodic mode
  x86: hpet: provide separate functions to stop and start the counter
  x86: hpet: print HPET registers during setup (if hpet=verbose is used)
  time: apply NTP frequency/tick changes immediately
  ...
parents 831576fe 7c526e1f

Documentation/kernel-parameters.txt

+3 −1
Original line number Diff line number Diff line
@@ -493,10 +493,12 @@ and is between 256 and 4096 characters. It is defined in the file 
			Default: 64



	hpet=		[X86-32,HPET] option to control HPET usage

			Format: { enable (default) | disable | force }

			Format: { enable (default) | disable | force |

				verbose }

			disable: disable HPET and use PIT instead

			force: allow force enabled of undocumented chips (ICH4,

			VIA, nVidia)

			verbose: show contents of HPET registers during setup



	com20020=	[HW,NET] ARCnet - COM20020 chipset

			Format:

arch/powerpc/platforms/cell/spufs/sched.c

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static void __spu_add_to_rq(struct spu_context *ctx) 
		list_add_tail(&ctx->rq, &spu_prio->runq[ctx->prio]);

		set_bit(ctx->prio, spu_prio->bitmap);

		if (!spu_prio->nr_waiting++)

			__mod_timer(&spusched_timer, jiffies + SPUSCHED_TICK);

			mod_timer(&spusched_timer, jiffies + SPUSCHED_TICK);

	}

}

arch/x86/kernel/hpet.c

+64 −16
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ static inline void hpet_clear_mapping(void) 
 */

static int boot_hpet_disable;

int hpet_force_user;

static int hpet_verbose;



static int __init hpet_setup(char *str)

{
@@ -88,6 +89,8 @@ static int __init hpet_setup(char *str) 
			boot_hpet_disable = 1;

		if (!strncmp("force", str, 5))

			hpet_force_user = 1;

		if (!strncmp("verbose", str, 7))

			hpet_verbose = 1;

	}

	return 1;

}
@@ -119,6 +122,43 @@ int is_hpet_enabled(void) 
}

EXPORT_SYMBOL_GPL(is_hpet_enabled);



static void _hpet_print_config(const char *function, int line)

{

	u32 i, timers, l, h;

	printk(KERN_INFO "hpet: %s(%d):\n", function, line);

	l = hpet_readl(HPET_ID);

	h = hpet_readl(HPET_PERIOD);

	timers = ((l & HPET_ID_NUMBER) >> HPET_ID_NUMBER_SHIFT) + 1;

	printk(KERN_INFO "hpet: ID: 0x%x, PERIOD: 0x%x\n", l, h);

	l = hpet_readl(HPET_CFG);

	h = hpet_readl(HPET_STATUS);

	printk(KERN_INFO "hpet: CFG: 0x%x, STATUS: 0x%x\n", l, h);

	l = hpet_readl(HPET_COUNTER);

	h = hpet_readl(HPET_COUNTER+4);

	printk(KERN_INFO "hpet: COUNTER_l: 0x%x, COUNTER_h: 0x%x\n", l, h);



	for (i = 0; i < timers; i++) {

		l = hpet_readl(HPET_Tn_CFG(i));

		h = hpet_readl(HPET_Tn_CFG(i)+4);

		printk(KERN_INFO "hpet: T%d: CFG_l: 0x%x, CFG_h: 0x%x\n",

		       i, l, h);

		l = hpet_readl(HPET_Tn_CMP(i));

		h = hpet_readl(HPET_Tn_CMP(i)+4);

		printk(KERN_INFO "hpet: T%d: CMP_l: 0x%x, CMP_h: 0x%x\n",

		       i, l, h);

		l = hpet_readl(HPET_Tn_ROUTE(i));

		h = hpet_readl(HPET_Tn_ROUTE(i)+4);

		printk(KERN_INFO "hpet: T%d ROUTE_l: 0x%x, ROUTE_h: 0x%x\n",

		       i, l, h);

	}

}



#define hpet_print_config()					\

do {								\

	if (hpet_verbose)					\

		_hpet_print_config(__FUNCTION__, __LINE__);	\

} while (0)



/*

 * When the hpet driver (/dev/hpet) is enabled, we need to reserve

 * timer 0 and timer 1 in case of RTC emulation.
@@ -191,27 +231,37 @@ static struct clock_event_device hpet_clockevent = { 
	.rating		= 50,

};



static void hpet_start_counter(void)

static void hpet_stop_counter(void)

{

	unsigned long cfg = hpet_readl(HPET_CFG);



	cfg &= ~HPET_CFG_ENABLE;

	hpet_writel(cfg, HPET_CFG);

	hpet_writel(0, HPET_COUNTER);

	hpet_writel(0, HPET_COUNTER + 4);

}



static void hpet_start_counter(void)

{

	unsigned long cfg = hpet_readl(HPET_CFG);

	cfg |= HPET_CFG_ENABLE;

	hpet_writel(cfg, HPET_CFG);

}



static void hpet_restart_counter(void)

{

	hpet_stop_counter();

	hpet_start_counter();

}



static void hpet_resume_device(void)

{

	force_hpet_resume();

}



static void hpet_restart_counter(void)

static void hpet_resume_counter(void)

{

	hpet_resume_device();

	hpet_start_counter();

	hpet_restart_counter();

}



static void hpet_enable_legacy_int(void)
@@ -259,29 +309,23 @@ static int hpet_setup_msi_irq(unsigned int irq); 
static void hpet_set_mode(enum clock_event_mode mode,

			  struct clock_event_device *evt, int timer)

{

	unsigned long cfg, cmp, now;

	unsigned long cfg;

	uint64_t delta;



	switch (mode) {

	case CLOCK_EVT_MODE_PERIODIC:

		hpet_stop_counter();

		delta = ((uint64_t)(NSEC_PER_SEC/HZ)) * evt->mult;

		delta >>= evt->shift;

		now = hpet_readl(HPET_COUNTER);

		cmp = now + (unsigned long) delta;

		cfg = hpet_readl(HPET_Tn_CFG(timer));

		/* Make sure we use edge triggered interrupts */

		cfg &= ~HPET_TN_LEVEL;

		cfg |= HPET_TN_ENABLE | HPET_TN_PERIODIC |

		       HPET_TN_SETVAL | HPET_TN_32BIT;

		hpet_writel(cfg, HPET_Tn_CFG(timer));

		/*

		 * The first write after writing TN_SETVAL to the

		 * config register sets the counter value, the second

		 * write sets the period.

		 */

		hpet_writel(cmp, HPET_Tn_CMP(timer));

		udelay(1);

		hpet_writel((unsigned long) delta, HPET_Tn_CMP(timer));

		hpet_start_counter();

		hpet_print_config();

		break;



	case CLOCK_EVT_MODE_ONESHOT:
@@ -308,6 +352,7 @@ static void hpet_set_mode(enum clock_event_mode mode, 
			irq_set_affinity(hdev->irq, cpumask_of(hdev->cpu));

			enable_irq(hdev->irq);

		}

		hpet_print_config();

		break;

	}

}
@@ -526,6 +571,7 @@ static void hpet_msi_capability_lookup(unsigned int start_timer) 


	num_timers = ((id & HPET_ID_NUMBER) >> HPET_ID_NUMBER_SHIFT);

	num_timers++; /* Value read out starts from 0 */

	hpet_print_config();



	hpet_devs = kzalloc(sizeof(struct hpet_dev) * num_timers, GFP_KERNEL);

	if (!hpet_devs)
@@ -695,7 +741,7 @@ static struct clocksource clocksource_hpet = { 
	.mask		= HPET_MASK,

	.shift		= HPET_SHIFT,

	.flags		= CLOCK_SOURCE_IS_CONTINUOUS,

	.resume		= hpet_restart_counter,

	.resume		= hpet_resume_counter,

#ifdef CONFIG_X86_64

	.vread		= vread_hpet,

#endif
@@ -707,7 +753,7 @@ static int hpet_clocksource_register(void) 
	cycle_t t1;



	/* Start the counter */

	hpet_start_counter();

	hpet_restart_counter();



	/* Verify whether hpet counter works */

	t1 = read_hpet();
@@ -793,6 +839,7 @@ int __init hpet_enable(void) 
	 * information and the number of channels

	 */

	id = hpet_readl(HPET_ID);

	hpet_print_config();



#ifdef CONFIG_HPET_EMULATE_RTC

	/*
@@ -845,6 +892,7 @@ static __init int hpet_late_init(void) 
		return -ENODEV;



	hpet_reserve_platform_timers(hpet_readl(HPET_ID));

	hpet_print_config();



	for_each_online_cpu(cpu) {

		hpet_cpuhp_notify(NULL, CPU_ONLINE, (void *)(long)cpu);

arch/x86/kernel/quirks.c

+2 −1
Original line number Diff line number Diff line
@@ -172,7 +172,8 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH8_4, 
			 ich_force_enable_hpet);

DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH9_7,

			 ich_force_enable_hpet);



DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x3a16,	/* ICH10 */

			 ich_force_enable_hpet);



static struct pci_dev *cached_dev;

drivers/infiniband/hw/ipath/ipath_driver.c

+3 −3
Original line number Diff line number Diff line
@@ -2715,7 +2715,7 @@ static void ipath_hol_signal_up(struct ipath_devdata *dd) 
 * to prevent HoL blocking, then start the HoL timer that

 * periodically continues, then stop procs, so they can detect

 * link down if they want, and do something about it.

 * Timer may already be running, so use __mod_timer, not add_timer.

 * Timer may already be running, so use mod_timer, not add_timer.

 */

void ipath_hol_down(struct ipath_devdata *dd)

{
@@ -2724,7 +2724,7 @@ void ipath_hol_down(struct ipath_devdata *dd) 
	dd->ipath_hol_next = IPATH_HOL_DOWNCONT;

	dd->ipath_hol_timer.expires = jiffies +

		msecs_to_jiffies(ipath_hol_timeout_ms);

	__mod_timer(&dd->ipath_hol_timer, dd->ipath_hol_timer.expires);

	mod_timer(&dd->ipath_hol_timer, dd->ipath_hol_timer.expires);

}



/*
@@ -2763,7 +2763,7 @@ void ipath_hol_event(unsigned long opaque) 
	else {

		dd->ipath_hol_timer.expires = jiffies +

			msecs_to_jiffies(ipath_hol_timeout_ms);

		__mod_timer(&dd->ipath_hol_timer,

		mod_timer(&dd->ipath_hol_timer,

			dd->ipath_hol_timer.expires);

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE