ia64/xen-unstable

changeset 2732:38c3276d3022

bitkeeper revision 1.1159.1.274 (417d5b7aBQcNIemD9-XNvIL8F-nEtQ)

g/c unchanged mach-xen/mach-default files.
author cl349@freefall.cl.cam.ac.uk
date Mon Oct 25 20:00:58 2004 +0000 (2004-10-25)
parents 337efea3503e
children b5c439563b62
files .rootkeys linux-2.6.9-xen-sparse/arch/xen/i386/Makefile linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/bios_ebda.h linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/io_ports.h linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/mach_mpspec.h linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/mach_reboot.h linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/mach_time.h linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/mach_timer.h linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/mach_traps.h linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/pci-functions.h
line diff
     1.1 --- a/.rootkeys	Mon Oct 25 17:24:26 2004 +0000
     1.2 +++ b/.rootkeys	Mon Oct 25 20:00:58 2004 +0000
     1.3 @@ -213,16 +213,8 @@ 4107adf1E5O4ztGHNGMzCCNhcvqNow linux-2.6
     1.4  40f5623akIoBsQ3KxSB2kufkbgONXQ linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/fixmap.h
     1.5  4118b6a418gnL6AZsTdglC92YGqYTg linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/highmem.h
     1.6  40f5623aJVXQwpJMOLE99XgvGsfQ8Q linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/io.h
     1.7 -417d36c6TD52EqC__mHeIj9CHnuEjA linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/bios_ebda.h
     1.8  40f5623am9BzluYFuV6EQfTd-so3dA linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/do_timer.h
     1.9 -40f5623adZQ1IZGPxbDXONjyZGYuTA linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/io_ports.h
    1.10  40f5623aKXkBBxgpLx2NcvkncQ1Yyw linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/irq_vectors.h
    1.11 -40f5623aMQZoYuf4ml9v69N3gu8ing linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/mach_mpspec.h
    1.12 -40f5623a8LroVMnZ5YRzJJmIc-zHlw linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/mach_reboot.h
    1.13 -40f5623ayR1vnzfF__htza35a8Ft-g linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/mach_time.h
    1.14 -40f5623a4YdRdVzYWJzOOoqe8mnrXA linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/mach_timer.h
    1.15 -40f5623aDLxmbOtUHvkWztKjAO4EjA linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/mach_traps.h
    1.16 -41062ab7HMSSuaUv3_Z4agLpjSO88A linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/pci-functions.h
    1.17  40f5623aDMCsWOFO0jktZ4e8sjwvEg linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_post.h
    1.18  40f5623arsFXkGdPvIqvFi3yFXGR0Q linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/setup_arch_pre.h
    1.19  4120f807GCO0uqsLqdZj9csxR1Wthw linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mmu_context.h
     2.1 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/Makefile	Mon Oct 25 17:24:26 2004 +0000
     2.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/Makefile	Mon Oct 25 20:00:58 2004 +0000
     2.3 @@ -84,7 +84,8 @@ obj-	+= kernel/ mm/ pci/
     2.4  #../../i386/$(mcore-y)/
     2.5  #obj-	+= ../../i386/pci/ ../../i386/oprofile/ ../../i386/power/
     2.6  
     2.7 -xenflags-y += -Iinclude/asm-xen/asm-i386/mach-xen
     2.8 +xenflags-y += -Iinclude/asm-xen/asm-i386/mach-xen \
     2.9 +		-Iinclude/asm-i386/mach-default
    2.10  CFLAGS += $(xenflags-y)
    2.11  AFLAGS += $(xenflags-y)
    2.12  
     3.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/bios_ebda.h	Mon Oct 25 17:24:26 2004 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,15 +0,0 @@
     3.4 -#ifndef _MACH_BIOS_EBDA_H
     3.5 -#define _MACH_BIOS_EBDA_H
     3.6 -
     3.7 -/*
     3.8 - * there is a real-mode segmented pointer pointing to the
     3.9 - * 4K EBDA area at 0x40E.
    3.10 - */
    3.11 -static inline unsigned int get_bios_ebda(void)
    3.12 -{
    3.13 -	unsigned int address = *(unsigned short *)phys_to_virt(0x40E);
    3.14 -	address <<= 4;
    3.15 -	return address;	/* 0 means none */
    3.16 -}
    3.17 -
    3.18 -#endif /* _MACH_BIOS_EBDA_H */
     4.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/io_ports.h	Mon Oct 25 17:24:26 2004 +0000
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,30 +0,0 @@
     4.4 -/*
     4.5 - *  arch/i386/mach-generic/io_ports.h
     4.6 - *
     4.7 - *  Machine specific IO port address definition for generic.
     4.8 - *  Written by Osamu Tomita <tomita@cinet.co.jp>
     4.9 - */
    4.10 -#ifndef _MACH_IO_PORTS_H
    4.11 -#define _MACH_IO_PORTS_H
    4.12 -
    4.13 -/* i8253A PIT registers */
    4.14 -#define PIT_MODE		0x43
    4.15 -#define PIT_CH0			0x40
    4.16 -#define PIT_CH2			0x42
    4.17 -
    4.18 -/* i8259A PIC registers */
    4.19 -#define PIC_MASTER_CMD		0x20
    4.20 -#define PIC_MASTER_IMR		0x21
    4.21 -#define PIC_MASTER_ISR		PIC_MASTER_CMD
    4.22 -#define PIC_MASTER_POLL		PIC_MASTER_ISR
    4.23 -#define PIC_MASTER_OCW3		PIC_MASTER_ISR
    4.24 -#define PIC_SLAVE_CMD		0xa0
    4.25 -#define PIC_SLAVE_IMR		0xa1
    4.26 -
    4.27 -/* i8259A PIC related value */
    4.28 -#define PIC_CASCADE_IR		2
    4.29 -#define MASTER_ICW4_DEFAULT	0x01
    4.30 -#define SLAVE_ICW4_DEFAULT	0x01
    4.31 -#define PIC_ICW4_AEOI		2
    4.32 -
    4.33 -#endif /* !_MACH_IO_PORTS_H */
     5.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/mach_mpspec.h	Mon Oct 25 17:24:26 2004 +0000
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,8 +0,0 @@
     5.4 -#ifndef __ASM_MACH_MPSPEC_H
     5.5 -#define __ASM_MACH_MPSPEC_H
     5.6 -
     5.7 -#define MAX_IRQ_SOURCES 256
     5.8 -
     5.9 -#define MAX_MP_BUSSES 32
    5.10 -
    5.11 -#endif /* __ASM_MACH_MPSPEC_H */
     6.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/mach_reboot.h	Mon Oct 25 17:24:26 2004 +0000
     6.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.3 @@ -1,30 +0,0 @@
     6.4 -/*
     6.5 - *  arch/i386/mach-generic/mach_reboot.h
     6.6 - *
     6.7 - *  Machine specific reboot functions for generic.
     6.8 - *  Split out from reboot.c by Osamu Tomita <tomita@cinet.co.jp>
     6.9 - */
    6.10 -#ifndef _MACH_REBOOT_H
    6.11 -#define _MACH_REBOOT_H
    6.12 -
    6.13 -static inline void kb_wait(void)
    6.14 -{
    6.15 -	int i;
    6.16 -
    6.17 -	for (i = 0; i < 0x10000; i++)
    6.18 -		if ((inb_p(0x64) & 0x02) == 0)
    6.19 -			break;
    6.20 -}
    6.21 -
    6.22 -static inline void mach_reboot(void)
    6.23 -{
    6.24 -	int i;
    6.25 -	for (i = 0; i < 100; i++) {
    6.26 -		kb_wait();
    6.27 -		udelay(50);
    6.28 -		outb(0xfe, 0x64);         /* pulse reset low */
    6.29 -		udelay(50);
    6.30 -	}
    6.31 -}
    6.32 -
    6.33 -#endif /* !_MACH_REBOOT_H */
     7.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/mach_time.h	Mon Oct 25 17:24:26 2004 +0000
     7.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     7.3 @@ -1,122 +0,0 @@
     7.4 -/*
     7.5 - *  include/asm-i386/mach-default/mach_time.h
     7.6 - *
     7.7 - *  Machine specific set RTC function for generic.
     7.8 - *  Split out from time.c by Osamu Tomita <tomita@cinet.co.jp>
     7.9 - */
    7.10 -#ifndef _MACH_TIME_H
    7.11 -#define _MACH_TIME_H
    7.12 -
    7.13 -#include <linux/mc146818rtc.h>
    7.14 -
    7.15 -/* for check timing call set_rtc_mmss() 500ms     */
    7.16 -/* used in arch/i386/time.c::do_timer_interrupt() */
    7.17 -#define USEC_AFTER	500000
    7.18 -#define USEC_BEFORE	500000
    7.19 -
    7.20 -/*
    7.21 - * In order to set the CMOS clock precisely, set_rtc_mmss has to be
    7.22 - * called 500 ms after the second nowtime has started, because when
    7.23 - * nowtime is written into the registers of the CMOS clock, it will
    7.24 - * jump to the next second precisely 500 ms later. Check the Motorola
    7.25 - * MC146818A or Dallas DS12887 data sheet for details.
    7.26 - *
    7.27 - * BUG: This routine does not handle hour overflow properly; it just
    7.28 - *      sets the minutes. Usually you'll only notice that after reboot!
    7.29 - */
    7.30 -static inline int mach_set_rtc_mmss(unsigned long nowtime)
    7.31 -{
    7.32 -	int retval = 0;
    7.33 -	int real_seconds, real_minutes, cmos_minutes;
    7.34 -	unsigned char save_control, save_freq_select;
    7.35 -
    7.36 -	save_control = CMOS_READ(RTC_CONTROL); /* tell the clock it's being set */
    7.37 -	CMOS_WRITE((save_control|RTC_SET), RTC_CONTROL);
    7.38 -
    7.39 -	save_freq_select = CMOS_READ(RTC_FREQ_SELECT); /* stop and reset prescaler */
    7.40 -	CMOS_WRITE((save_freq_select|RTC_DIV_RESET2), RTC_FREQ_SELECT);
    7.41 -
    7.42 -	cmos_minutes = CMOS_READ(RTC_MINUTES);
    7.43 -	if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
    7.44 -		BCD_TO_BIN(cmos_minutes);
    7.45 -
    7.46 -	/*
    7.47 -	 * since we're only adjusting minutes and seconds,
    7.48 -	 * don't interfere with hour overflow. This avoids
    7.49 -	 * messing with unknown time zones but requires your
    7.50 -	 * RTC not to be off by more than 15 minutes
    7.51 -	 */
    7.52 -	real_seconds = nowtime % 60;
    7.53 -	real_minutes = nowtime / 60;
    7.54 -	if (((abs(real_minutes - cmos_minutes) + 15)/30) & 1)
    7.55 -		real_minutes += 30;		/* correct for half hour time zone */
    7.56 -	real_minutes %= 60;
    7.57 -
    7.58 -	if (abs(real_minutes - cmos_minutes) < 30) {
    7.59 -		if (!(save_control & RTC_DM_BINARY) || RTC_ALWAYS_BCD) {
    7.60 -			BIN_TO_BCD(real_seconds);
    7.61 -			BIN_TO_BCD(real_minutes);
    7.62 -		}
    7.63 -		CMOS_WRITE(real_seconds,RTC_SECONDS);
    7.64 -		CMOS_WRITE(real_minutes,RTC_MINUTES);
    7.65 -	} else {
    7.66 -		printk(KERN_WARNING
    7.67 -		       "set_rtc_mmss: can't update from %d to %d\n",
    7.68 -		       cmos_minutes, real_minutes);
    7.69 -		retval = -1;
    7.70 -	}
    7.71 -
    7.72 -	/* The following flags have to be released exactly in this order,
    7.73 -	 * otherwise the DS12887 (popular MC146818A clone with integrated
    7.74 -	 * battery and quartz) will not reset the oscillator and will not
    7.75 -	 * update precisely 500 ms later. You won't find this mentioned in
    7.76 -	 * the Dallas Semiconductor data sheets, but who believes data
    7.77 -	 * sheets anyway ...                           -- Markus Kuhn
    7.78 -	 */
    7.79 -	CMOS_WRITE(save_control, RTC_CONTROL);
    7.80 -	CMOS_WRITE(save_freq_select, RTC_FREQ_SELECT);
    7.81 -
    7.82 -	return retval;
    7.83 -}
    7.84 -
    7.85 -static inline unsigned long mach_get_cmos_time(void)
    7.86 -{
    7.87 -	unsigned int year, mon, day, hour, min, sec;
    7.88 -	int i;
    7.89 -
    7.90 -	/* The Linux interpretation of the CMOS clock register contents:
    7.91 -	 * When the Update-In-Progress (UIP) flag goes from 1 to 0, the
    7.92 -	 * RTC registers show the second which has precisely just started.
    7.93 -	 * Let's hope other operating systems interpret the RTC the same way.
    7.94 -	 */
    7.95 -	/* read RTC exactly on falling edge of update flag */
    7.96 -	for (i = 0 ; i < 1000000 ; i++)	/* may take up to 1 second... */
    7.97 -		if (CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP)
    7.98 -			break;
    7.99 -	for (i = 0 ; i < 1000000 ; i++)	/* must try at least 2.228 ms */
   7.100 -		if (!(CMOS_READ(RTC_FREQ_SELECT) & RTC_UIP))
   7.101 -			break;
   7.102 -	do { /* Isn't this overkill ? UIP above should guarantee consistency */
   7.103 -		sec = CMOS_READ(RTC_SECONDS);
   7.104 -		min = CMOS_READ(RTC_MINUTES);
   7.105 -		hour = CMOS_READ(RTC_HOURS);
   7.106 -		day = CMOS_READ(RTC_DAY_OF_MONTH);
   7.107 -		mon = CMOS_READ(RTC_MONTH);
   7.108 -		year = CMOS_READ(RTC_YEAR);
   7.109 -	} while (sec != CMOS_READ(RTC_SECONDS));
   7.110 -	if (!(CMOS_READ(RTC_CONTROL) & RTC_DM_BINARY) || RTC_ALWAYS_BCD)
   7.111 -	  {
   7.112 -	    BCD_TO_BIN(sec);
   7.113 -	    BCD_TO_BIN(min);
   7.114 -	    BCD_TO_BIN(hour);
   7.115 -	    BCD_TO_BIN(day);
   7.116 -	    BCD_TO_BIN(mon);
   7.117 -	    BCD_TO_BIN(year);
   7.118 -	  }
   7.119 -	if ((year += 1900) < 1970)
   7.120 -		year += 100;
   7.121 -
   7.122 -	return mktime(year, mon, day, hour, min, sec);
   7.123 -}
   7.124 -
   7.125 -#endif /* !_MACH_TIME_H */
     8.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/mach_timer.h	Mon Oct 25 17:24:26 2004 +0000
     8.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.3 @@ -1,48 +0,0 @@
     8.4 -/*
     8.5 - *  include/asm-i386/mach-default/mach_timer.h
     8.6 - *
     8.7 - *  Machine specific calibrate_tsc() for generic.
     8.8 - *  Split out from timer_tsc.c by Osamu Tomita <tomita@cinet.co.jp>
     8.9 - */
    8.10 -/* ------ Calibrate the TSC ------- 
    8.11 - * Return 2^32 * (1 / (TSC clocks per usec)) for do_fast_gettimeoffset().
    8.12 - * Too much 64-bit arithmetic here to do this cleanly in C, and for
    8.13 - * accuracy's sake we want to keep the overhead on the CTC speaker (channel 2)
    8.14 - * output busy loop as low as possible. We avoid reading the CTC registers
    8.15 - * directly because of the awkward 8-bit access mechanism of the 82C54
    8.16 - * device.
    8.17 - */
    8.18 -#ifndef _MACH_TIMER_H
    8.19 -#define _MACH_TIMER_H
    8.20 -
    8.21 -#define CALIBRATE_LATCH	(5 * LATCH)
    8.22 -
    8.23 -static inline void mach_prepare_counter(void)
    8.24 -{
    8.25 -       /* Set the Gate high, disable speaker */
    8.26 -	outb((inb(0x61) & ~0x02) | 0x01, 0x61);
    8.27 -
    8.28 -	/*
    8.29 -	 * Now let's take care of CTC channel 2
    8.30 -	 *
    8.31 -	 * Set the Gate high, program CTC channel 2 for mode 0,
    8.32 -	 * (interrupt on terminal count mode), binary count,
    8.33 -	 * load 5 * LATCH count, (LSB and MSB) to begin countdown.
    8.34 -	 *
    8.35 -	 * Some devices need a delay here.
    8.36 -	 */
    8.37 -	outb(0xb0, 0x43);			/* binary, mode 0, LSB/MSB, Ch 2 */
    8.38 -	outb_p(CALIBRATE_LATCH & 0xff, 0x42);	/* LSB of count */
    8.39 -	outb_p(CALIBRATE_LATCH >> 8, 0x42);       /* MSB of count */
    8.40 -}
    8.41 -
    8.42 -static inline void mach_countup(unsigned long *count_p)
    8.43 -{
    8.44 -	unsigned long count = 0;
    8.45 -	do {
    8.46 -		count++;
    8.47 -	} while ((inb_p(0x61) & 0x20) == 0);
    8.48 -	*count_p = count;
    8.49 -}
    8.50 -
    8.51 -#endif /* !_MACH_TIMER_H */
     9.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/mach_traps.h	Mon Oct 25 17:24:26 2004 +0000
     9.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.3 @@ -1,29 +0,0 @@
     9.4 -/*
     9.5 - *  include/asm-i386/mach-default/mach_traps.h
     9.6 - *
     9.7 - *  Machine specific NMI handling for generic.
     9.8 - *  Split out from traps.c by Osamu Tomita <tomita@cinet.co.jp>
     9.9 - */
    9.10 -#ifndef _MACH_TRAPS_H
    9.11 -#define _MACH_TRAPS_H
    9.12 -
    9.13 -static inline void clear_mem_error(unsigned char reason)
    9.14 -{
    9.15 -	reason = (reason & 0xf) | 4;
    9.16 -	outb(reason, 0x61);
    9.17 -}
    9.18 -
    9.19 -static inline unsigned char get_nmi_reason(void)
    9.20 -{
    9.21 -	return inb(0x61);
    9.22 -}
    9.23 -
    9.24 -static inline void reassert_nmi(void)
    9.25 -{
    9.26 -	outb(0x8f, 0x70);
    9.27 -	inb(0x71);		/* dummy */
    9.28 -	outb(0x0f, 0x70);
    9.29 -	inb(0x71);		/* dummy */
    9.30 -}
    9.31 -
    9.32 -#endif /* !_MACH_TRAPS_H */
    10.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/mach-xen/pci-functions.h	Mon Oct 25 17:24:26 2004 +0000
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,19 +0,0 @@
    10.4 -/*
    10.5 - *	PCI BIOS function numbering for conventional PCI BIOS 
    10.6 - *	systems
    10.7 - */
    10.8 -
    10.9 -#define PCIBIOS_PCI_FUNCTION_ID 	0xb1XX
   10.10 -#define PCIBIOS_PCI_BIOS_PRESENT 	0xb101
   10.11 -#define PCIBIOS_FIND_PCI_DEVICE		0xb102
   10.12 -#define PCIBIOS_FIND_PCI_CLASS_CODE	0xb103
   10.13 -#define PCIBIOS_GENERATE_SPECIAL_CYCLE	0xb106
   10.14 -#define PCIBIOS_READ_CONFIG_BYTE	0xb108
   10.15 -#define PCIBIOS_READ_CONFIG_WORD	0xb109
   10.16 -#define PCIBIOS_READ_CONFIG_DWORD	0xb10a
   10.17 -#define PCIBIOS_WRITE_CONFIG_BYTE	0xb10b
   10.18 -#define PCIBIOS_WRITE_CONFIG_WORD	0xb10c
   10.19 -#define PCIBIOS_WRITE_CONFIG_DWORD	0xb10d
   10.20 -#define PCIBIOS_GET_ROUTING_OPTIONS	0xb10e
   10.21 -#define PCIBIOS_SET_PCI_HW_INT		0xb10f
   10.22 -