- Vax-linux - LUG OWL

[LV] Current state of RTC rework.
by Jan-Benedict Glaw 09 Apr '06

09 Apr '06

Hi! This is currently in my RTC rework branch. I've still not decided how to do the Kconfig'ury for it... arch/vax/kernel/clock.c | 70 ------------------------------------- b/arch/vax/Kconfig | 8 ++++ b/arch/vax/kernel/Makefile | 4 +- b/arch/vax/kernel/cpu_ka41.c | 4 +- b/arch/vax/kernel/cpu_ka410.c | 18 +++++++++ b/arch/vax/kernel/cpu_ka42.c | 4 +- b/arch/vax/kernel/cpu_ka43.c | 4 +- b/arch/vax/kernel/cpu_ka46.c | 4 +- b/arch/vax/kernel/cpu_ka48.c | 4 +- b/arch/vax/kernel/cpu_ka49.c | 4 +- b/arch/vax/kernel/cpu_ka52.c | 4 +- b/arch/vax/kernel/cpu_ka55.c | 2 - b/arch/vax/kernel/cpu_ka62.c | 16 ++++++++ b/arch/vax/kernel/cpu_ka630.c | 16 ++++++++ b/arch/vax/kernel/cpu_ka640.c | 16 ++++++++ b/arch/vax/kernel/cpu_ka650.c | 3 + b/arch/vax/kernel/cpu_ka660.c | 3 + b/arch/vax/kernel/cpu_vxt.c | 3 + b/arch/vax/kernel/rtc-generic.c | 75 ++++++++++++++++++++++++++++++++++++++++ b/include/asm-vax/clock.h | 22 ++++++----- b/include/asm-vax/mv.h | 3 - 21 files changed, 193 insertions(+), 94 deletions(-) diff --git a/arch/vax/Kconfig b/arch/vax/Kconfig index d62323f..45cf6a6 100644 --- a/arch/vax/Kconfig +++ b/arch/vax/Kconfig @@ -70,6 +70,14 @@ config CMDLINE help This is the command line the booting kernel will get. +config VAX_RTC + bool "VAX RTC support" + default y + help + This enables RTC support. You'll probably want to have this. + +source "drivers/rtc/Kconfig" + config EARLY_PRINTK bool default y diff --git a/arch/vax/kernel/Makefile b/arch/vax/kernel/Makefile index d5cb600..6bdd541 100644 --- a/arch/vax/kernel/Makefile +++ b/arch/vax/kernel/Makefile @@ -9,7 +9,7 @@ extra-y := vmlinux.lds obj-y := ptrace.o process.o setup.o regdump.o interrupt.o entry.o time.o \ ioprobe.o syscall.o signal.o semaphore.o vax_dev_init.o \ - init_task.o reboot.o cpu_generic.o clock.o + init_task.o reboot.o cpu_generic.o obj-y += bootcons/ @@ -29,7 +29,7 @@ obj-$(CONFIG_CPU_KA660) += cpu_ka660.o obj-$(CONFIG_CPU_VXT) += cpu_vxt.o obj-$(CONFIG_MODULES) += module.o +obj-$(CONFIG_VAX_RTC) += rtc-generic.o obj-$(CONFIG_VAX_DIAG_LED) += diag_led.o - obj-$(CONFIG_EARLY_PRINTK) += early_printk.o diff --git a/arch/vax/kernel/clock.c b/arch/vax/kernel/clock.c deleted file mode 100644 index 1045629..0000000 --- a/arch/vax/kernel/clock.c +++ /dev/null @@ -1,70 +0,0 @@ -/* arch/vax/kernel/clock.c - * - * Copyright atp 2002. license: GPL - * - * Routines to manipulate the real time clock on VAXen. - * - * There are two sorts of battery backed hardware clocks. There is the - * TODR (time of day register) found on big VAXen, and the familiar - * Dallas CMOS clock on the desktop VAXen. - * - * The init routines are called through the machine vector. See - * cpu_kaxx.c for details of that. The callers are time_init() and - * the rtc clock driver (drivers/char/rtc.c), using macros defined - * in asm/mc146818rtc.h. - * - * Prototypes for some of these functions are in asm/mc146818rtc.h - * and some in asm/clock.h. (The ones that are used in the mv - * initialisation are in clock.h, and the ones used in mc146818rtc.h - * are in that file). - * - */ - -#include <linux/config.h> -#include <asm/io.h> /* For ioremap() */ -#include <asm/mtpr.h> -#include <asm/mv.h> -#include <asm/clock.h> /* for TODR, if anyone feels like implementing it */ -#include <asm/bus/vsbus.h> -#include <linux/mc146818rtc.h> /* includes asm/mc146818rtc.h */ - /* - needed for offsets in debug output */ - - -/* this does nothing, and is a placeholder */ -void generic_clock_init(void) -{ - printk (KERN_WARNING "No RTC used\n"); - return; -} - -/* Map the ROM clock page, and put address in mv */ -void ka4x_clock_init(void) -{ - mv->clock_base = ioremap(VSA_CLOCK_BASE, 1); /* FIXME: 1 is the wrong len! */ - printk("Mapped RTC clock page (v %p p %08x )\n", mv->clock_base, - VSA_CLOCK_BASE); - - printk("RTC date is %2.2d:%2.2d:%4.4d %2.2d:%2.2d:%2.2d\n", - CMOS_READ(RTC_DAY_OF_MONTH), CMOS_READ(RTC_MONTH), - CMOS_READ(RTC_YEAR), CMOS_READ(RTC_HOURS), - CMOS_READ(RTC_MINUTES), CMOS_READ(RTC_SECONDS)); - - return; -} - -unsigned char ka4x_clock_read(unsigned long offset) -{ - if (mv->clock_base) - return mv->clock_base[offset] >> 2; - - return 0; -} - -void ka4x_clock_write(unsigned char val, unsigned long offset) -{ - if (mv->clock_base) - mv->clock_base[offset] = val << 2; - - return; -} - diff --git a/arch/vax/kernel/cpu_ka41.c b/arch/vax/kernel/cpu_ka41.c index 7699553..2a561e8 100644 --- a/arch/vax/kernel/cpu_ka41.c +++ b/arch/vax/kernel/cpu_ka41.c @@ -36,7 +36,6 @@ struct vax_mv mv_ka41 = { .post_vm_putchar = dz11_putchar, .post_vm_getchar = dz11_getchar, .cpu_type_str = ka41_cpu_type_str, - .clock_init = ka4x_clock_init, }; static struct cpu_match __CPU_MATCH cpu_match_ka41 = { @@ -65,6 +64,9 @@ static int __init ka41_platform_device_i return -ENODEV; platform_device_register (&ka41_diag_led_device); +#ifdef CONFIG_VAX_RTC + vax_ds1287_rtc_register (VSA_CLOCK_BASE); +#endif retval = platform_device_register (&ka41_vsbus_device); if (!retval) { diff --git a/arch/vax/kernel/cpu_ka410.c b/arch/vax/kernel/cpu_ka410.c index e96c1b1..f8afab4 100644 --- a/arch/vax/kernel/cpu_ka410.c +++ b/arch/vax/kernel/cpu_ka410.c @@ -35,7 +35,6 @@ struct vax_mv mv_ka410 = { .post_vm_putchar = dz11_putchar, .post_vm_getchar = dz11_getchar, .cpu_type_str = ka410_cpu_type_str, - .clock_init = ka4x_clock_init, }; static struct cpu_match __CPU_MATCH cpumatch_ka410 = { @@ -48,3 +47,20 @@ static struct cpu_match __CPU_MATCH cpum .sidex_match = 0x00000000, }; +static int __init +ka410_platform_device_init (void) +{ + int retval = 0; + + if (!is_ka410()) + return -ENODEV; + +#ifdef CONFIG_VAX_RTC + vax_ds1287_rtc_register (VSA_CLOCK_BASE); +#endif + + return retval; +} + +arch_initcall (ka410_platform_device_init); + diff --git a/arch/vax/kernel/cpu_ka42.c b/arch/vax/kernel/cpu_ka42.c index eb33de3..d77c109 100644 --- a/arch/vax/kernel/cpu_ka42.c +++ b/arch/vax/kernel/cpu_ka42.c @@ -43,7 +43,6 @@ struct vax_mv mv_ka42 = { .post_vm_putchar = dz11_putchar, .post_vm_getchar = dz11_getchar, .cpu_type_str = ka42_cpu_type_str, - .clock_init = ka4x_clock_init, }; static struct cpu_match __CPU_MATCH cpu_match_ka42 = { @@ -72,6 +71,9 @@ static int __init ka42_platform_device_i return -ENODEV; platform_device_register(&ka42_diag_led_device); +#ifdef CONFIG_VAX_RTC + vax_ds1287_rtc_register (VSA_CLOCK_BASE); +#endif retval = platform_device_register(&ka42_vsbus_device); if (!retval) { diff --git a/arch/vax/kernel/cpu_ka43.c b/arch/vax/kernel/cpu_ka43.c index e06d5de..bcc96c4 100644 --- a/arch/vax/kernel/cpu_ka43.c +++ b/arch/vax/kernel/cpu_ka43.c @@ -223,7 +223,6 @@ struct vax_mv mv_ka43 = { .post_vm_getchar = dz11_getchar, .mcheck = ka43_mcheck, .cpu_type_str = ka43_cpu_type_str, - .clock_init = ka4x_clock_init, }; static struct cpu_match __CPU_MATCH cpumatch_ka43 = { @@ -251,6 +250,9 @@ static int __init ka43_platform_device_i return -ENODEV; platform_device_register(&ka43_diag_led_device); +#ifdef CONFIG_VAX_RTC + vax_ds1287_rtc_register (VSA_CLOCK_BASE); +#endif retval = platform_device_register(&ka43_vsbus_device); if (!retval) { diff --git a/arch/vax/kernel/cpu_ka46.c b/arch/vax/kernel/cpu_ka46.c index c85e0ba..d9faf33 100644 --- a/arch/vax/kernel/cpu_ka46.c +++ b/arch/vax/kernel/cpu_ka46.c @@ -128,7 +128,6 @@ struct vax_mv mv_ka46 = { .post_vm_getchar = dz11_getchar, .init_devices = ka46_init_devices, .cpu_type_str = ka46_cpu_type_str, - .clock_init = ka4x_clock_init, }; static struct cpu_match __CPU_MATCH cpumatch_ka46 = { @@ -156,6 +155,9 @@ static int __init ka46_platform_device_i return -ENODEV; platform_device_register(&ka46_diag_led_device); +#ifdef CONFIG_VAX_RTC + vax_ds1287_rtc_register (VSA_CLOCK_BASE); +#endif retval = platform_device_register(&ka46_vsbus_device); if (!retval) { diff --git a/arch/vax/kernel/cpu_ka48.c b/arch/vax/kernel/cpu_ka48.c index 39c6779..f72b1f0 100644 --- a/arch/vax/kernel/cpu_ka48.c +++ b/arch/vax/kernel/cpu_ka48.c @@ -124,7 +124,6 @@ struct vax_mv mv_ka48 = { .post_vm_getchar = dz11_getchar, .init_devices = ka48_init_devices, .cpu_type_str = ka48_cpu_type_str, - .clock_init = ka4x_clock_init, }; static struct cpu_match __CPU_MATCH cpumatch_ka48 = { @@ -147,6 +146,9 @@ static int __init ka48_platform_device_i if (!is_ka48()) return -ENODEV; +#ifdef CONFIG_VAX_RTC + vax_ds1287_rtc_register (VSA_CLOCK_BASE); +#endif retval = platform_device_register(&ka48_vsbus_device); if (!retval) { vsbus_add_fixed_device(&ka48_vsbus_device.dev, "lance", 0x200e0000, 1); diff --git a/arch/vax/kernel/cpu_ka49.c b/arch/vax/kernel/cpu_ka49.c index fd3e159..e7fc41e 100644 --- a/arch/vax/kernel/cpu_ka49.c +++ b/arch/vax/kernel/cpu_ka49.c @@ -134,7 +134,6 @@ struct vax_mv mv_ka49 = { .post_vm_getchar = dz11_getchar, .init_devices = ka49_init_devices, .cpu_type_str = ka49_cpu_type_str, - .clock_init = ka4x_clock_init, .nicr_required = 1, }; @@ -164,6 +163,9 @@ static int __init ka49_platform_device_i return -ENODEV; platform_device_register (&ka49_diag_led_device); +#ifdef CONFIG_VAX_RTC + vax_ds1287_rtc_register (VSA_CLOCK_BASE); +#endif retval = platform_device_register (&ka49_vsbus_device); if (!retval) { diff --git a/arch/vax/kernel/cpu_ka52.c b/arch/vax/kernel/cpu_ka52.c index 080b517..a428f40 100644 --- a/arch/vax/kernel/cpu_ka52.c +++ b/arch/vax/kernel/cpu_ka52.c @@ -62,7 +62,6 @@ struct vax_mv mv_ka52 = { .post_vm_putchar = ka46_48_49_prom_putchar /*ka52_postvm_putchar*/, .post_vm_getchar = dz11_getchar, .cpu_type_str = ka52_cpu_type_str, - //.clock_init = ka4x_clock_init, .mcheck = ka52_mcheck, .nicr_required = 1, }; @@ -92,6 +91,9 @@ static int __init ka52_platform_device_i return -ENODEV; platform_device_register (&ka52_diag_led_device); +#ifdef CONFIG_VAX_RTC + vax_no_rtc_register (); /* FIXME: RTC available? */ +#endif retval = platform_device_register (&ka52_vsbus_device); if (!retval) { diff --git a/arch/vax/kernel/cpu_ka55.c b/arch/vax/kernel/cpu_ka55.c index 931221f..82e3559 100644 --- a/arch/vax/kernel/cpu_ka55.c +++ b/arch/vax/kernel/cpu_ka55.c @@ -62,6 +62,6 @@ struct vax_mv mv_ka55 = { }; #warning "KA55 needs a struct cpumatch" - #warning "KA55 needs a platform_device_init function" +#warning "Needs a RTC" diff --git a/arch/vax/kernel/cpu_ka62.c b/arch/vax/kernel/cpu_ka62.c index 7326186..8876eb4 100644 --- a/arch/vax/kernel/cpu_ka62.c +++ b/arch/vax/kernel/cpu_ka62.c @@ -30,3 +30,19 @@ static struct cpu_match __CPU_MATCH cpum .sidex_addr = 0, }; +static int __init ka62_platform_device_init(void) +{ + int retval = 0; + + if (!is_ka62 ()) + return -ENODEV; + +#ifdef CONFIG_VAX_RTC + vax_no_rtc_register (); /* FIXME: RTC available? */ +#endif + + return retval; +} + +arch_initcall (ka62_platform_device_init); + diff --git a/arch/vax/kernel/cpu_ka630.c b/arch/vax/kernel/cpu_ka630.c index a28b608..03ee05e 100644 --- a/arch/vax/kernel/cpu_ka630.c +++ b/arch/vax/kernel/cpu_ka630.c @@ -46,3 +46,19 @@ static struct cpu_match __CPU_MATCH cpum .sidex_match = 0x00000000, }; +static int __init ka630_platform_device_init(void) +{ + int retval = 0; + + if (!is_ka630 ()) + return -ENODEV; + +#ifdef CONFIG_VAX_RTC + vax_no_rtc_register (); /* FIXME: RTC available? */ +#endif + + return retval; +} + +arch_initcall (ka630_platform_device_init); + diff --git a/arch/vax/kernel/cpu_ka640.c b/arch/vax/kernel/cpu_ka640.c index fed0bed..5c50552 100644 --- a/arch/vax/kernel/cpu_ka640.c +++ b/arch/vax/kernel/cpu_ka640.c @@ -61,3 +61,19 @@ static struct cpu_match __CPU_MATCH cpum (CVAX_Q22_SUBTYPE_KA640 << CVAX_Q22_SUBTYPE_SHIFT), }; +static int __init ka640_platform_device_init(void) +{ + int retval = 0; + + if (!is_ka630 ()) + return -ENODEV; + +#ifdef CONFIG_VAX_RTC + vax_no_rtc_register (); /* FIXME: RTC available? */ +#endif + + return retval; +} + +arch_initcall (ka640_platform_device_init); + diff --git a/arch/vax/kernel/cpu_ka650.c b/arch/vax/kernel/cpu_ka650.c index 636f828..d78ccc6 100644 --- a/arch/vax/kernel/cpu_ka650.c +++ b/arch/vax/kernel/cpu_ka650.c @@ -119,6 +119,9 @@ static int __init ka650_platform_device_ platform_device_register(&ka650_cqbic_device); platform_device_register(&ka650_iprcons_device); platform_device_register(&ka650_diag_led_device); +#ifdef CONFIG_VAX_RTC + vax_no_rtc_register (); /* FIXME: RTC available? */ +#endif return 0; } diff --git a/arch/vax/kernel/cpu_ka660.c b/arch/vax/kernel/cpu_ka660.c index 8428b33..d3db1e1 100644 --- a/arch/vax/kernel/cpu_ka660.c +++ b/arch/vax/kernel/cpu_ka660.c @@ -61,6 +61,9 @@ static int __init ka660_platform_device_ platform_device_register(&ka660_cqbic_device); platform_device_register(&ka660_iprcons_device); +#ifdef CONFIG_VAX_RTC + vax_no_rtc_register (); /* FIXME: RTC available? */ +#endif return 0; } diff --git a/arch/vax/kernel/cpu_vxt.c b/arch/vax/kernel/cpu_vxt.c index 7f3ef13..8a7c10d 100644 --- a/arch/vax/kernel/cpu_vxt.c +++ b/arch/vax/kernel/cpu_vxt.c @@ -68,6 +68,9 @@ static int __init vxt_platform_device_in return -ENODEV; platform_device_register (&vxt_diag_led_device); +#ifdef CONFIG_VAX_RTC + vax_no_rtc_register (); /* FIXME: RTC available? */ +#endif return 0; } diff --git a/arch/vax/kernel/rtc-generic.c b/arch/vax/kernel/rtc-generic.c new file mode 100644 index 0000000..8256664 --- /dev/null +++ b/arch/vax/kernel/rtc-generic.c @@ -0,0 +1,75 @@ +/* + * Support functions for VAX RTC access. Used by all cpu_xxx.c files. + */ + +#include <linux/m48t86.h> +#include <linux/platform_device.h> +#include <linux/io.h> + +/********************************************************************/ +/* Internal memory access helpers */ +/********************************************************************/ +/* + * Normal bus I/O. One byte (in the low byte) per longword. All data starts + * at bit #2, so we need to shift out the lower two bits. + */ +static volatile uint32_t __iomem *vax_rtc_io_base = NULL; + +static unsigned char +vax_rtc_bus_io_readb (unsigned long addr) +{ + unsigned char ret = 0; + + if (vax_rtc_io_base) + ret = (vax_rtc_io_base[addr] >> 2) & 0xff; + + printk (KERN_INFO "rtc_read: 0x%08lx --> %02x\n", (unsigned long) &vax_rtc_io_base[addr], ret); + + return ret; +} + +static void +vax_rtc_bus_io_writeb (unsigned char value, unsigned long addr) +{ + printk (KERN_INFO "rtc_write: 0x%02x --> 0x%08lx\n", value, (unsigned long) &vax_rtc_io_base[addr]); + + if (vax_rtc_io_base) + vax_rtc_io_base[addr] = value << 2; +} + +static struct m48t86_ops vax_rtc_bus_io_ops = { + .readb = vax_rtc_bus_io_readb, + .writeb = vax_rtc_bus_io_writeb, +}; + + +/********************************************************************/ +/* RTC-specific registration data */ +/********************************************************************/ +static struct platform_device vax_ds1287_rtc_platform_device = { + .name = "rtc-m48t86", + .id = -1, + .dev = { + .platform_data = &vax_rtc_bus_io_ops, + }, + .num_resources = 0, +}; + +/********************************************************************/ +/* External interface for use in cpu_xxx.c files */ +/********************************************************************/ +int +vax_ds1287_rtc_register (unsigned long phys_addr) +{ + vax_rtc_io_base = ioremap (phys_addr, 60 * 4); /* 60 I/O bytes of RTC, one per longword. */ + return platform_device_register (&vax_ds1287_rtc_platform_device); +} + +void +vax_no_rtc_register (void) +{ + printk (KERN_ERR "Warning: There is no RTC defined for your CPU.\n"); + printk (KERN_ERR "Please report to the VAX-Linux Mailing List at " + "<linux-vax(a)pergamentum.com>\n"); +} + diff --git a/include/asm-vax/clock.h b/include/asm-vax/clock.h index 83f0e0c..3aa896f 100644 --- a/include/asm-vax/clock.h +++ b/include/asm-vax/clock.h @@ -6,20 +6,22 @@ * Definitions for VAX clocks (interval counter and time-of-day) */ -/* structure of ICCS register (Interval Clock Control and Status) */ +/* Structure of ICCS register (Interval Clock Control and Status) */ -#define ICCS_ERROR (0x80000000) /* counter overflowed, INTERRUPT +#define ICCS_ERROR 0x80000000 /* Counter overflowed, INTERRUPT already set, write 1 to clear */ -#define ICCS_INTERRUPT (0x00000080) /* Set when ICR overflows, write 1 +#define ICCS_INTERRUPT 0x00000080 /* Set when ICR overflows, write 1 to clear */ -#define ICCS_TRANSFER (0x00000040) /* Copy NICR to ICR */ -#define ICCS_SINGLESTEP (0x00000020) /* increment Interval Count Register +#define ICCS_TRANSFER 0x00000040 /* Copy NICR to ICR */ +#define ICCS_SINGLESTEP 0x00000020 /* Increment Interval Count Register (ICR) by one, only if RUN is 0 */ -#define ICCS_INTENABLE (0x00000010) /* enable clock interrupts */ -#define ICCS_RUN (0x00000001) /* enable counter */ +#define ICCS_INTENABLE 0x00000010 /* Enable clock interrupts */ +#define ICCS_RUN 0x00000001 /* Enable counter */ -/* prototypes for clock handling functions in arch/vax/clock.c */ -void generic_clock_init(void); -void ka4x_clock_init(void); + +/* Prototypes for RTC register functions in ./arch/vax/rtc-generic.c */ + +extern int vax_ds1287_rtc_register (unsigned long base_address); +extern void vax_no_rtc_register (void); #endif /* _VAX_CLOCK_H_ */ diff --git a/include/asm-vax/mv.h b/include/asm-vax/mv.h index 6bdcd28..983ac38 100644 --- a/include/asm-vax/mv.h +++ b/include/asm-vax/mv.h @@ -40,9 +40,6 @@ struct vax_mv { const char * (*cpu_type_str)(void); - void (*clock_init)(void); /* Called by time_init() to set up RTC */ - unsigned int *clock_base; /* Address of clock page for vsbus RTC */ - unsigned int sidex; /* If not available, it's set to 0 */ /* Flags for very CPU-specific features */ -- Jan-Benedict Glaw jbglaw(a)lug-owl.de . +49-172-7608481 _ O _ "Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg _ _ O für einen Freien Staat voll Freier Bürger" | im Internet! | im Irak! O O O ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA)); _______________________________________________ Linux-Vax mailing list Linux-Vax(a)pergamentum.com http://www.pergamentum.com/mailman/listinfo/linux-vax

1 0

[LV] [RFC] RTC/TOY cleanup: move to new RTC API
by Jan-Benedict Glaw 09 Apr '06

09 Apr '06

Hi! Some month ago, the new RTC lib went into the upstream kernel. I've "converted" KA43 to use this (using a standard DS1287A as RTC). This is still a draft; the Kconfig stuff needs to be cleaned out, and another RTC driver for the TOY-based VAXen needs to be written. On the other side, we no longer need to mv->clock_base and mv->clock_init stuff. This also substitutes arch/vax/kernel/clock.c . Comments? MfG, JBG diff --git a/arch/vax/Kconfig b/arch/vax/Kconfig index d62323f..45cf6a6 100644 --- a/arch/vax/Kconfig +++ b/arch/vax/Kconfig @@ -70,6 +70,14 @@ config CMDLINE help This is the command line the booting kernel will get. +config VAX_RTC + bool "VAX RTC support" + default y + help + This enables RTC support. You'll probably want to have this. + +source "drivers/rtc/Kconfig" + config EARLY_PRINTK bool default y diff --git a/arch/vax/kernel/Makefile b/arch/vax/kernel/Makefile index 671aab3..aa15883 100644 --- a/arch/vax/kernel/Makefile +++ b/arch/vax/kernel/Makefile @@ -29,7 +29,7 @@ obj-$(CONFIG_CPU_KA660) += cpu_ka660.o obj-$(CONFIG_CPU_VXT) += cpu_vxt.o obj-$(CONFIG_MODULES) += module.o +obj-$(CONFIG_VAX_RTC) += rtc-generic.o obj-$(CONFIG_VAX_DIAG_LED) += diag_led.o - obj-$(CONFIG_EARLY_PRINTK) += early_printk.o diff --git a/arch/vax/kernel/cpu_ka43.c b/arch/vax/kernel/cpu_ka43.c index e06d5de..fb7fbbb 100644 --- a/arch/vax/kernel/cpu_ka43.c +++ b/arch/vax/kernel/cpu_ka43.c @@ -26,6 +26,11 @@ #include <asm/clock.h> /* For clock_init routines */ #include <asm/bus/vsbus.h> + + +extern int vax_ds1287_register (unsigned long phys_addr); + + /* Internal CPU register space */ static volatile struct ka43_cpu_regs __iomem *cpu_regs; @@ -223,7 +228,8 @@ struct vax_mv mv_ka43 = { .post_vm_getchar = dz11_getchar, .mcheck = ka43_mcheck, .cpu_type_str = ka43_cpu_type_str, - .clock_init = ka4x_clock_init, + //.clock_init = ka4x_clock_init, + .clock_init = NULL, }; static struct cpu_match __CPU_MATCH cpumatch_ka43 = { @@ -251,6 +257,7 @@ static int __init ka43_platform_device_i return -ENODEV; platform_device_register(&ka43_diag_led_device); + vax_ds1287_register (VSA_CLOCK_BASE); retval = platform_device_register(&ka43_vsbus_device); if (!retval) { diff --git a/arch/vax/kernel/time.c b/arch/vax/kernel/time.c diff --git a/drivers/rtc/rtc-m48t86.c b/drivers/rtc/rtc-m48t86.c --- /dev/null 2006-03-21 19:51:06.723350640 +0100 +++ linux-2.6/arch/vax/kernel/rtc-generic.c 2006-04-09 11:18:52.000000000 +0200 @@ -0,0 +1,67 @@ +/* + * Support functions for VAX RTC access. Used by all cpu_xxx.c files. + */ + +#include <linux/m48t86.h> +#include <linux/platform_device.h> +#include <linux/io.h> + +/********************************************************************/ +/* Internal memory access helpers */ +/********************************************************************/ +/* + * Normal bus I/O. One byte (in the low byte) per longword. All data starts + * at bit #2, so we need to shift out the lower two bits. + */ +static volatile uint32_t __iomem *vax_rtc_io_base = NULL; + +static unsigned char +vax_rtc_bus_io_readb (unsigned long addr) +{ + unsigned char ret = 0; + + if (vax_rtc_io_base) + ret = (vax_rtc_io_base[addr] >> 2) & 0xff; + + printk (KERN_INFO "rtc_read: 0x%08lx --> %02x\n", (unsigned long) &vax_rtc_io_base[addr], ret); + + return ret; +} + +static void +vax_rtc_bus_io_writeb (unsigned char value, unsigned long addr) +{ + printk (KERN_INFO "rtc_write: 0x%02x --> 0x%08lx\n", value, (unsigned long) &vax_rtc_io_base[addr]); + + if (vax_rtc_io_base) + vax_rtc_io_base[addr] = value << 2; +} + +static struct m48t86_ops vax_rtc_bus_io_ops = { + .readb = vax_rtc_bus_io_readb, + .writeb = vax_rtc_bus_io_writeb, +}; + + +/********************************************************************/ +/* RTC-specific registration data */ +/********************************************************************/ +static struct platform_device vax_ds1287_rtc_platform_device = { + .name = "rtc-m48t86", + .id = -1, + .dev = { + .platform_data = &vax_rtc_bus_io_ops, + }, + .num_resources = 0, +}; + +/********************************************************************/ +/* External interface for use in cpu_xxx.c files */ +/********************************************************************/ +int +vax_ds1287_register (unsigned long phys_addr) +{ + vax_rtc_io_base = ioremap (phys_addr, 60 * 4); /* 60 I/O bytes of RTC, one per longword. */ + return platform_device_register (&vax_ds1287_rtc_platform_device); +} + -- Jan-Benedict Glaw jbglaw(a)lug-owl.de . +49-172-7608481 _ O _ "Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg _ _ O für einen Freien Staat voll Freier Bürger" | im Internet! | im Irak! O O O ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA)); _______________________________________________ Linux-Vax mailing list Linux-Vax(a)pergamentum.com http://www.pergamentum.com/mailman/listinfo/linux-vax

2 1

[LV] [RFC] Implement higher clock precision
by Jan-Benedict Glaw 08 Apr '06

08 Apr '06

Hi! I still haven't put up a new NFS server so I'd like you to give this a test run. I noticed that printk() (with timestamps enabled) only prints timestamps with a resolution of 10msec. This is obviously HZ-related and indeed, sched_clock() is used, which just returns jiffies (converted to nsec resolution). This patch adds the Intervall Counter Register value (after subtracting NICR and multiplying the result with 1000 because we're "only" running at 1usec, not 1nsec...) On my KA43, this doesn't make much of a difference because ICR always reads as zero... Could somebody test that on a different box (KA42, KA46, SIMH...)? diff --git a/arch/vax/kernel/time.c b/arch/vax/kernel/time.c index 4204fe0..df3f400 100644 --- a/arch/vax/kernel/time.c +++ b/arch/vax/kernel/time.c @@ -32,7 +32,8 @@ spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED; extern unsigned long wall_jiffies; /* kernel/timer.c */ -#define TICK_SIZE (tick_nsec / 1000) +#define TICK_SIZE (tick_nsec / 1000) +#define NICR_START (0xffffffff - 1000000/HZ) /* last time the cmos clock got updated */ static long last_rtc_update; @@ -73,7 +74,7 @@ void __init time_init(void) * to get more than one interrupt per hour:-) */ if (mv->nicr_required) - __mtpr(0xffffffff - 1000000/HZ, PR_NICR); + __mtpr(NICR_START, PR_NICR); /* Set the clock ticking and enable clock interrupts */ __mtpr(ICCS_ERROR | ICCS_INTERRUPT | /* clear error and interrupt bits */ @@ -334,6 +335,7 @@ unsigned long get_cmos_time(void) */ unsigned long long sched_clock(void) { - return (unsigned long long)jiffies * (1000000000 / HZ); + return (unsigned long long)jiffies * (1000000000 / HZ) + + (__mfpr (PR_ICR) - NICR_START) * 1000; } MfG, JBG -- Jan-Benedict Glaw jbglaw(a)lug-owl.de . +49-172-7608481 _ O _ "Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg _ _ O für einen Freien Staat voll Freier Bürger" | im Internet! | im Irak! O O O ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA)); _______________________________________________ Linux-Vax mailing list Linux-Vax(a)pergamentum.com http://www.pergamentum.com/mailman/listinfo/linux-vax

1 0

Re: [LV] [LV-k25-commit] Linux for the VAX architecture: Changes to 'vax4linus'
by Kenn Humborg 08 Apr '06

08 Apr '06

> diff --git a/arch/vax/boot/head.S b/arch/vax/boot/head.S > index 3861e3a..bf59290 100644 > --- a/arch/vax/boot/head.S > +++ b/arch/vax/boot/head.S .. > + /* > + * Prepare to fix some of the Machine Vector pointers to > + * point to physical memory (instead of virtual addresses) because > + * we haven't yet enabled mapping, but want to use the function > + * pointers (eg. to print something.) > + */ > + movl mv, %r10 /* R10 = &mv */ > + moval start, %r8 /* R8 = &start */ That comment should be R10 = mv. Later, Kenn _______________________________________________ Linux-Vax mailing list Linux-Vax(a)pergamentum.com http://www.pergamentum.com/mailman/listinfo/linux-vax

2 2

[LV] Kernel updated
by Jan-Benedict Glaw 05 Apr '06

05 Apr '06

Hi! I've just pushed all my changes to my kernel.org GIT repo. It's now up-to-date with Linus again :-) I've also played with the hooks. These can actually emit some kind of commit email, so if you want to be noticed by mail of new pushes to the repo, let me know. Alternatively I'd also make it point to one of our mailing lists. (That would probably be more convenient?) The updated kernel boots for me on KA43, but my bootserver (DHCP/NFS) broke due to my move to the new flat so this isn't userland tested yet. MfG, JBG -- Jan-Benedict Glaw jbglaw(a)lug-owl.de . +49-172-7608481 _ O _ "Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg _ _ O für einen Freien Staat voll Freier Bürger" | im Internet! | im Irak! O O O ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA)); _______________________________________________ Linux-Vax mailing list Linux-Vax(a)pergamentum.com http://www.pergamentum.com/mailman/listinfo/linux-vax

2 3

[LV] VAX boots again with Linus's current GIT tree
by Jan-Benedict Glaw 02 Apr '06

02 Apr '06

Hi! Duribg this weekends time, I've worked on the VAX tree again. On a KA43, it boots again up to where it'll want to start init. Unfortunately, my boot server didn't survive the move (power supply unit doesn't start swinging...) so I'll first need to configure a different machine for that task. The patches will probably go into my upstream GIT repo tomorrow... MfG, JBG -- Jan-Benedict Glaw jbglaw(a)lug-owl.de . +49-172-7608481 _ O _ "Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg _ _ O für einen Freien Staat voll Freier Bürger" | im Internet! | im Irak! O O O ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA)); _______________________________________________ Linux-Vax mailing list Linux-Vax(a)pergamentum.com http://www.pergamentum.com/mailman/listinfo/linux-vax

1 0

[LV] Back to the VAX: bitops
by Jan-Benedict Glaw 02 Apr '06

02 Apr '06

Hi! Finally, my move is mostly finished and I've started to look at the VAXen again. I'm currently looking at <asm/bitops.h>, which should get a touch-up to use the newly defined generic functions in <asm-generic/bitops/*>. Was there a specific reason for this: /* Supposed to not be atomic. */ static __inline__ void __set_bit(int nr, volatile void *addr) { __asm__( " bbss %1, %0, 2f \n" "2: \n" : "=m" (ADDR) : "ir" (nr)); } /* Supposed to be atomic. */ static __inline__ void set_bit(int nr, volatile void *addr) { __asm__ __volatile__( " bbss %1, %0, 1f \n" "1: \n" : "=m" (ADDR) : "ir" (nr)); } In both cases, bbss was chosen, but I guess bbssi would have been more correct for set_bit()? MfG, JBG -- Jan-Benedict Glaw jbglaw(a)lug-owl.de . +49-172-7608481 _ O _ "Eine Freie Meinung in einem Freien Kopf | Gegen Zensur | Gegen Krieg _ _ O für einen Freien Staat voll Freier Bürger" | im Internet! | im Irak! O O O ret = do_actions((curr | FREE_SPEECH) & ~(NEW_COPYRIGHT_LAW | DRM | TCPA)); _______________________________________________ Linux-Vax mailing list Linux-Vax(a)pergamentum.com http://www.pergamentum.com/mailman/listinfo/linux-vax

2 2

Re: [LV] VAX 4000/500A System
by Ruckman, Thomas 30 Mär '06

30 Mär '06

Let me know when you want to pick up the VAX 4000/500A. We want to remove it from our premises as soon as possible. Thanks, Tom Ruckman Systems Administrator Stoneridge, Inc. Hi-Stat Lexington Div. Phone: 419-884-4126 E-mail: thomas.ruckman(a)hst.stoneridge.com -----Original Message----- From: linux-vax-bounces(a)pergamentum.com [mailto:linux-vax-bounces@pergamentum.com] On Behalf Of 9000 VAX Sent: Thursday, March 09, 2006 9:44 AM To: Linux Vax Mailing List Subject: Re: [LV] VAX 4000/500A System On 3/9/06, Ruckman, Thomas <Thomas.Ruckman(a)hst.stoneridge.com> wrote: > > > > We have a VAX 4000/500A we have just decommissioned. We are now looking for > someone to take it off our hands. Would you be interested? I am in Cleveland and I drive to Columbus from time to time. I can provide a temperary home for the vax before somebody actively contributes to the linux-vax port could get it. We can talk privately if you are interested. Thank you! http://www.mscpscsi.com vax, 9000 > > > > Tom Ruckman > > Systems Administrator > > Stoneridge, Inc. Hi-Stat Lexington Div. > > Phone: 419-884-4126 > > E-mail: thomas.ruckman(a)hst.stoneridge.com > > > > > > ________________________________ > > > This electronic mail transmission contains confidential information intended > only for the person(s) named. Any use, distribution, copying or disclosure > by any other person is strictly prohibited. If you received this > transmission in error, please send an electronic mail message to > postmaster(a)hst.stoneridge.com. > _______________________________________________ > Linux-Vax mailing list > Linux-Vax(a)pergamentum.com > http://www.pergamentum.com/mailman/listinfo/linux-vax > > > _______________________________________________ Linux-Vax mailing list Linux-Vax(a)pergamentum.com http://www.pergamentum.com/mailman/listinfo/linux-vax _______________________________________________ Linux-Vax mailing list Linux-Vax(a)pergamentum.com http://www.pergamentum.com/mailman/listinfo/linux-vax

1 0