lkml.org 
[lkml]   [2005]   [Dec]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH 5/13] Time: i386 Conversion - part 1: Move timer_pit.c to i8253.c
    All,
    The conversion of i386 to use the generic timeofday subsystem has been
    split into 6 parts. This patch, the first of six, is just a simple
    cleanup for the i386 arch in preparation of moving to the generic
    timeofday infrastructure. It simply moves some code from timer_pit.c to
    i8253.c.

    It applies on top of my timeofday-core patch. This patch is part the
    timeofday-arch-i386 patchset, so without the following parts it is not
    expected to compile (although just this one should).

    thanks
    -john

    Signed-off-by: John Stultz <johnstul@us.ibm.com>

    Makefile | 2 -
    i8253.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++
    time.c | 6 -----
    timers/timer_pit.c | 13 -----------
    4 files changed, 60 insertions(+), 20 deletions(-)

    linux-2.6.15-rc3-mm1_timeofday-arch-i386-part1_B12.patch
    ==========================
    diff -ruN tod-mm1/arch/i386/kernel/i8253.c tod-mm2/arch/i386/kernel/i8253.c
    --- tod-mm1/arch/i386/kernel/i8253.c 1969-12-31 16:00:00.000000000 -0800
    +++ tod-mm2/arch/i386/kernel/i8253.c 2005-12-01 18:23:24.000000000 -0800
    @@ -0,0 +1,59 @@
    +/*
    + * i8253.c 8253/PIT functions
    + *
    + */
    +#include <linux/spinlock.h>
    +#include <linux/jiffies.h>
    +#include <linux/sysdev.h>
    +#include <linux/module.h>
    +#include <linux/init.h>
    +
    +#include <asm/smp.h>
    +#include <asm/delay.h>
    +#include <asm/i8253.h>
    +#include <asm/io.h>
    +
    +#include "io_ports.h"
    +
    +DEFINE_SPINLOCK(i8253_lock);
    +EXPORT_SYMBOL(i8253_lock);
    +
    +void setup_pit_timer(void)
    +{
    + unsigned long flags;
    +
    + spin_lock_irqsave(&i8253_lock, flags);
    + outb_p(0x34,PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */
    + udelay(10);
    + outb_p(LATCH & 0xff , PIT_CH0); /* LSB */
    + udelay(10);
    + outb(LATCH >> 8 , PIT_CH0); /* MSB */
    + spin_unlock_irqrestore(&i8253_lock, flags);
    +}
    +
    +static int timer_resume(struct sys_device *dev)
    +{
    + setup_pit_timer();
    +
    + return 0;
    +}
    +
    +static struct sysdev_class timer_sysclass = {
    + set_kset_name("timer_pit"),
    + .resume = timer_resume,
    +};
    +
    +static struct sys_device device_timer = {
    + .id = 0,
    + .cls = &timer_sysclass,
    +};
    +
    +static int __init init_timer_sysfs(void)
    +{
    + int error = sysdev_class_register(&timer_sysclass);
    + if (!error)
    + error = sysdev_register(&device_timer);
    + return error;
    +}
    +
    +device_initcall(init_timer_sysfs);
    diff -ruN tod-mm1/arch/i386/kernel/Makefile tod-mm2/arch/i386/kernel/Makefile
    --- tod-mm1/arch/i386/kernel/Makefile 2005-12-01 18:12:56.000000000 -0800
    +++ tod-mm2/arch/i386/kernel/Makefile 2005-12-01 18:23:57.000000000 -0800
    @@ -7,7 +7,7 @@
    obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
    ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
    pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \
    - quirks.o i8237.o
    + quirks.o i8237.o i8253.o

    obj-y += cpu/
    obj-y += timers/
    diff -ruN tod-mm1/arch/i386/kernel/time.c tod-mm2/arch/i386/kernel/time.c
    --- tod-mm1/arch/i386/kernel/time.c 2005-12-01 18:12:56.000000000 -0800
    +++ tod-mm2/arch/i386/kernel/time.c 2005-12-01 18:23:24.000000000 -0800
    @@ -82,11 +82,6 @@
    DEFINE_SPINLOCK(rtc_lock);
    EXPORT_SYMBOL(rtc_lock);

    -#include <asm/i8253.h>
    -
    -DEFINE_SPINLOCK(i8253_lock);
    -EXPORT_SYMBOL(i8253_lock);
    -
    struct timer_opts *cur_timer __read_mostly = &timer_none;

    /*
    @@ -400,7 +395,6 @@
    if (is_hpet_enabled())
    hpet_reenable();
    #endif
    - setup_pit_timer();
    sec = get_cmos_time() + clock_cmos_diff;
    sleep_length = (get_cmos_time() - sleep_start) * HZ;
    write_seqlock_irqsave(&xtime_lock, flags);
    diff -ruN tod-mm1/arch/i386/kernel/timers/timer_pit.c tod-mm2/arch/i386/kernel/timers/timer_pit.c
    --- tod-mm1/arch/i386/kernel/timers/timer_pit.c 2005-12-01 18:12:56.000000000 -0800
    +++ tod-mm2/arch/i386/kernel/timers/timer_pit.c 2005-12-01 18:23:24.000000000 -0800
    @@ -162,16 +162,3 @@
    .init = init_pit,
    .opts = &timer_pit,
    };
    -
    -void setup_pit_timer(void)
    -{
    - unsigned long flags;
    -
    - spin_lock_irqsave(&i8253_lock, flags);
    - outb_p(0x34,PIT_MODE); /* binary, mode 2, LSB/MSB, ch 0 */
    - udelay(10);
    - outb_p(LATCH & 0xff , PIT_CH0); /* LSB */
    - udelay(10);
    - outb(LATCH >> 8 , PIT_CH0); /* MSB */
    - spin_unlock_irqrestore(&i8253_lock, flags);
    -}
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/
    \
     
     \ /
      Last update: 2005-12-02 04:31    [W:0.027 / U:92.968 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site