xen-project/xen
1
0 Fork 1
mirror of https://github.com/xen-project/xen.git synced 2026-10-29 18:50:05 +01:00
Code Issues Activity

bitkeeper revision 1.1401 (4284bba5zgcyWRg6WwOIZIaOia4E2g)

Browse Source 
Merge http://xen.bkbits.net:8080/xeno-unstable.bk
into gandalf.hpl.hp.com:/var/bk/xeno-unstable.bk
This commit is contained in:
xenbk@gandalf.hpl.hp.com committed 2005-05-13 14:37:25 +00:00
2 parents 5149cc539b 9d7499580e
commit c335e13803
16 files changed
+153 -115
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

BitKeeper/etc/ignore
+1
View File
@@ -58,6 +58,7 @@ netbsd-*-tools/*
netbsd-*-xen0/*
netbsd-*-xenU/*
netbsd-*.patch
patches/*/.makedep
patches/ebtables-brnf-5_vs_2.4.25.diff
patches/ebtables.diff
patches/tmp/*
Makefile
+1 -3
View File
@@ -15,8 +15,6 @@ KERNELS ?= linux-2.6-xen0 linux-2.6-xenU
# linux-2.4-xen0 linux-2.4-xenU netbsd-2.0-xenU
# You may use wildcards in the above e.g. KERNELS=*2.4*
ALLKERNELS = $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.*))
ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse))
XKERNELS := $(foreach kernel, $(KERNELS), $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.$(kernel))) )
export DESTDIR
@@ -87,7 +85,7 @@ world:
$(MAKE) dist
# clean doesn't do a kclean
clean:
clean::
$(MAKE) -C xen clean
$(MAKE) -C tools clean
$(MAKE) -C docs clean
buildconfigs/Rules.mk
+26 -17
View File
@@ -6,6 +6,9 @@ include Config.mk
DISTDIR ?= $(CURDIR)/dist
DESTDIR ?= $(DISTDIR)/install
ALLKERNELS = $(patsubst buildconfigs/mk.%,%,$(wildcard buildconfigs/mk.*))
ALLSPARSETREES = $(patsubst %-xen-sparse,%,$(wildcard *-xen-sparse))
.PHONY: mkpatches mrproper
# Setup pristine search path
@@ -49,24 +52,30 @@ else
OS_VER = $(NETBSD_VER)
endif
pristine-%: %.tar.bz2
rm -rf tmp-$(@F) $@
mkdir -p tmp-$(@F)
tar -C tmp-$(@F) -jxf $<
mv tmp-$(@F)/* $@
$(patsubst %,pristine-%/.valid-pristine,$(ALLSPARSETREES)) : pristine-%/.valid-pristine: %.tar.bz2
rm -rf tmp-pristine-$* $(@D)
mkdir -p tmp-pristine-$*
touch tmp-pristine-$*/.bk_skip
tar -C tmp-pristine-$* -jxf $<
mv tmp-pristine-$*/* $(@D)
@rm -rf tmp-pristine-$*
touch $@ # update timestamp to avoid rebuild
touch $@/.bk_skip
@rm -rf tmp-$(@F)
OS_PATCHES = $(shell echo patches/$(OS)-$(OS_VER)/*.patch)
PATCHDIRS := $(wildcard patches/*-*)
ref-%: pristine-% $(OS_PATCHES)
rm -rf $@
cp -al $< tmp-$(@F)
-include $(patsubst %,%/.makedep,$(PATCHDIRS))
$(patsubst patches/%,patches/%/.makedep,$(PATCHDIRS)): patches/%/.makedep:
@echo 'ref-$*/.valid-ref: $$(wildcard patches/$*/*.patch)' >$@
clean::
rm -f patches/*/.makedep
ref-%/.valid-ref: pristine-%/.valid-pristine
rm -rf $(@D)
cp -al $(<D) $(@D)
[ -d patches/$* ] && \
for i in patches/$*/*.patch ; do ( cd tmp-$(@F) ; patch -p1 <../$$i ) ; done || \
true
mv tmp-$(@F) $@
for i in patches/$*/*.patch ; do ( cd $(@D) ; patch -p1 <../$$i || exit 1 ) ; done
touch $@ # update timestamp to avoid rebuild
%-build:
@@ -81,11 +90,11 @@ ref-%: pristine-% $(OS_PATCHES)
%-config:
$(MAKE) -f buildconfigs/mk.$* config
%-xen.patch: ref-%
%-xen.patch: ref-%/.valid-ref
rm -rf tmp-$@
cp -al $< tmp-$@
cp -al $(<D) tmp-$@
( cd $*-xen-sparse && ./mkbuildtree ../tmp-$@ )
diff -Nurp $< tmp-$@ > $@ || true
diff -Nurp $(<D) tmp-$@ > $@ || true
rm -rf tmp-$@
%-mrproper: %-mrproper-extra
buildconfigs/mk.linux-2.4-xen0
+7 -8
View File
@@ -5,9 +5,7 @@ LINUX_SERIES = 2.4
EXTRAVERSION = xen0
FULLVERSION = $(LINUX_VER)-$(EXTRAVERSION)
LINUX_DIR = $(OS)-$(FULLVERSION)
LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
include buildconfigs/Rules.mk
@@ -26,9 +24,9 @@ patches/tmp/ebtables.diff:
wget http://www.cl.cam.ac.uk/netos/xen/downloads/ebtables-brnf-5_vs_2.4.27.diff.gz -O- | gunzip -c > $@
$(LINUX_DIR)/include/linux/autoconf.h: patches/tmp/ebtables.diff
$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
rm -rf $(LINUX_DIR)
cp -al $< $(LINUX_DIR)
cp -al $(<D) $(LINUX_DIR)
# Apply arch-xen patches
( cd linux-$(LINUX_VER)-xen-sparse ; \
./mkbuildtree ../$(LINUX_DIR) )
@@ -39,8 +37,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
# add ebtables patch
( cd $(LINUX_DIR) ; patch -p1 -F3 < ../patches/tmp/ebtables.diff )
# Re-use config from install dir if one exits else use default config
[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
|| cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
$(LINUX_DIR)/.config
make -C $(LINUX_DIR) ARCH=xen oldconfig
@@ -51,7 +50,7 @@ config: $(LINUX_DIR)/include/linux/autoconf.h
$(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
$(MAKE) -C $(LINUX_DIR) ARCH=xen dep
clean:
clean::
$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
delete:
buildconfigs/mk.linux-2.4-xenU
+7 -8
View File
@@ -5,9 +5,7 @@ LINUX_SERIES = 2.4
EXTRAVERSION = xenU
FULLVERSION = $(LINUX_VER)-$(EXTRAVERSION)
LINUX_DIR = $(OS)-$(FULLVERSION)
LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
include buildconfigs/Rules.mk
@@ -21,9 +19,9 @@ build: $(LINUX_DIR)/include/linux/autoconf.h
fi
$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
$(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)
$(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)/.valid-ref
rm -rf $(LINUX_DIR)
cp -al $< $(LINUX_DIR)
cp -al $(<D) $(LINUX_DIR)
# Apply arch-xen patches
( cd linux-$(LINUX_VER)-xen-sparse ; \
./mkbuildtree ../$(LINUX_DIR) )
@@ -32,8 +30,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-linux-$(LINUX_VER)
sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
rm -f Makefile ; mv Mk.tmp Makefile )
# Re-use config from install dir if one exits else use default config
[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
|| cp $(LINUX_DIR)/arch/xen/defconfig-$(EXTRAVERSION) \
$(LINUX_DIR)/.config
make -C $(LINUX_DIR) ARCH=xen oldconfig
@@ -44,7 +43,7 @@ config: $(LINUX_DIR)/include/linux/autoconf.h
$(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
$(MAKE) -C $(LINUX_DIR) ARCH=xen dep
clean:
clean::
$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
delete:
buildconfigs/mk.linux-2.6-xen0
+7 -8
View File
@@ -5,9 +5,7 @@ LINUX_SERIES = 2.6
EXTRAVERSION = xen0
FULLVERSION = $(LINUX_VER)-$(EXTRAVERSION)
LINUX_DIR = $(OS)-$(FULLVERSION)
LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
include buildconfigs/Rules.mk
@@ -21,9 +19,9 @@ build: $(LINUX_DIR)/include/linux/autoconf.h
fi
$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
rm -rf $(LINUX_DIR)
cp -al $< $(LINUX_DIR)
cp -al $(<D) $(LINUX_DIR)
# Apply arch-xen patches
( cd linux-$(LINUX_VER)-xen-sparse ; \
./mkbuildtree ../$(LINUX_DIR) )
@@ -32,8 +30,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
rm -f Makefile ; mv Mk.tmp Makefile )
# Re-use config from install dir if one exits else use default config
[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
|| cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
$(LINUX_DIR)/.config
$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
@@ -42,7 +41,7 @@ config: CONFIGMODE = menuconfig
config: $(LINUX_DIR)/include/linux/autoconf.h
$(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
clean:
clean::
$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
delete:
buildconfigs/mk.linux-2.6-xenU
+7 -8
View File
@@ -5,9 +5,7 @@ LINUX_SERIES = 2.6
EXTRAVERSION = xenU
FULLVERSION = $(LINUX_VER)-$(EXTRAVERSION)
LINUX_DIR = $(OS)-$(FULLVERSION)
LINUX_DIR = $(OS)-$(LINUX_VER)-$(EXTRAVERSION)
include buildconfigs/Rules.mk
@@ -21,9 +19,9 @@ build: $(LINUX_DIR)/include/linux/autoconf.h
fi
$(MAKE) -C $(LINUX_DIR) ARCH=xen INSTALL_PATH=$(DESTDIR) install
$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
$(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)/.valid-ref
rm -rf $(LINUX_DIR)
cp -al $< $(LINUX_DIR)
cp -al $(<D) $(LINUX_DIR)
# Apply arch-xen patches
( cd linux-$(LINUX_VER)-xen-sparse ; \
./mkbuildtree ../$(LINUX_DIR) )
@@ -32,8 +30,9 @@ $(LINUX_DIR)/include/linux/autoconf.h: ref-$(OS)-$(LINUX_VER)
sed -e 's/^EXTRAVERSION.*/&-$(EXTRAVERSION)/' Makefile >Mk.tmp ; \
rm -f Makefile ; mv Mk.tmp Makefile )
# Re-use config from install dir if one exits else use default config
[ -r $(DESTDIR)/boot/config-$(FULLVERSION) ] && \
cp $(DESTDIR)/boot/config-$(FULLVERSION) $(LINUX_DIR)/.config \
CONFIG_VERSION=$$(sed -ne 's/^EXTRAVERSION = //p' $(LINUX_DIR)/Makefile); \
[ -r $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION ] && \
cp $(DESTDIR)/boot/config-$(LINUX_VER)$$CONFIG_VERSION $(LINUX_DIR)/.config \
|| cp $(LINUX_DIR)/arch/xen/configs/$(EXTRAVERSION)_defconfig_$(TARGET_SUBARCH) \
$(LINUX_DIR)/.config
$(MAKE) -C $(LINUX_DIR) ARCH=xen oldconfig
@@ -42,7 +41,7 @@ config: CONFIGMODE = menuconfig
config: $(LINUX_DIR)/include/linux/autoconf.h
$(MAKE) -C $(LINUX_DIR) ARCH=xen $(CONFIGMODE)
clean:
clean::
$(MAKE) -C $(LINUX_DIR) ARCH=xen clean
delete:
buildconfigs/mk.netbsd-2.0-xenU
+3 -3
View File
@@ -24,9 +24,9 @@ netbsd-%-tools: netbsd-%-tools.tar.bz2
tar -jxf $<
touch $@ # update timestamp to avoid rebuild
$(NETBSD_DIR)/.valid: ref-$(OS)-$(NETBSD_VER)
$(NETBSD_DIR)/.valid: ref-$(OS)-$(NETBSD_VER)/.valid-ref
$(RM) -rf $(NETBSD_DIR)
cp -al $< $(NETBSD_DIR)
cp -al $(<D) $(NETBSD_DIR)
# Apply arch-xen patches
( cd netbsd-$(NETBSD_VER)-xen-sparse ; \
./mkbuildtree ../$(NETBSD_DIR) )
@@ -38,7 +38,7 @@ netbsd-xen%: $(NETBSD_DIR)/.valid netbsd-$(NETBSD_RELEASE)-tools
$(MAKE) -C netbsd-$(FULLVERSION) netbsd
$(MAKE) -C netbsd-$(FULLVERSION) INSTALL_PATH=$(DESTDIR) INSTALL_NAME=boot/netbsd-$(NETBSD_VER)-xen$* install
clean:
clean::
$(MAKE) -C netbsd-$(FULLVERSION) clean
delete:
docs/src/user.tex
+3
View File
@@ -1791,6 +1791,9 @@ unchanged semantics.
Instruct Xen (and domain 0) to ignore any IOAPICs that are present in
the system, and instead continue to use the legacy PIC.
\item [apic=debug,verbose ]
Print more detailed information about local APIC and IOAPIC configuration.
\end{description}
\section{XenLinux Boot Options}
linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c
+2 -2
View File
@@ -328,11 +328,11 @@ static void set_pte_phys_ma(unsigned long vaddr,
}
}
new_pte = pfn_pte(phys >> PAGE_SHIFT, prot);
new_pte = pfn_pte_ma(phys >> PAGE_SHIFT, prot);
pte = pte_offset_kernel(pmd, vaddr);
if (!pte_none(*pte) &&
pte_val(*pte) != (pte_val(new_pte) & __supported_pte_mask))
pte_val_ma(*pte) != (pte_val_ma(new_pte) & __supported_pte_mask))
pte_ERROR(*pte);
/*
linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h
+1
View File
@@ -92,6 +92,7 @@ typedef struct { unsigned long pgprot; } pgprot_t;
#define pte_val(x) (((x).pte & 1) ? machine_to_phys((x).pte) : \
(x).pte)
#define pte_val_ma(x) ((x).pte)
static inline unsigned long pmd_val(pmd_t x)
{
xen/arch/x86/apic.c
+74 -51
View File
@@ -1,5 +1,5 @@
/*
* based on linux-2.6.10/arch/i386/kernel/apic.c
* based on linux-2.6.11/arch/i386/kernel/apic.c
*
* Local APIC handling, local APIC timers
*
@@ -37,11 +37,14 @@
#include <mach_apic.h>
#include <io_ports.h>
/*
* Debug level
*/
int apic_verbosity;
/* Using APIC to generate smp_local_timer_interrupt? */
int using_apic_timer = 0;
int apic_verbosity;
static int enabled_via_apicbase;
int get_physical_broadcast(void)
@@ -126,7 +129,8 @@ void __init connect_bsp_APIC(void)
* PIC mode, enable APIC mode in the IMCR, i.e.
* connect BSP's local APIC to INT and NMI lines.
*/
printk("leaving PIC mode, enabling APIC mode.\n");
apic_printk(APIC_VERBOSE, "leaving PIC mode, "
"enabling APIC mode.\n");
outb(0x70, 0x22);
outb(0x01, 0x23);
}
@@ -141,7 +145,8 @@ void disconnect_bsp_APIC(void)
* interrupts, including IPIs, won't work beyond
* this point! The only exception are INIT IPIs.
*/
printk("disabling APIC mode, entering PIC mode.\n");
apic_printk(APIC_VERBOSE, "disabling APIC mode, "
"entering PIC mode.\n");
outb(0x70, 0x22);
outb(0x00, 0x23);
}
@@ -182,10 +187,10 @@ int __init verify_local_APIC(void)
* The version register is read-only in a real APIC.
*/
reg0 = apic_read(APIC_LVR);
Dprintk("Getting VERSION: %x\n", reg0);
apic_printk(APIC_DEBUG, "Getting VERSION: %x\n", reg0);
apic_write(APIC_LVR, reg0 ^ APIC_LVR_MASK);
reg1 = apic_read(APIC_LVR);
Dprintk("Getting VERSION: %x\n", reg1);
apic_printk(APIC_DEBUG, "Getting VERSION: %x\n", reg1);
/*
* The two version reads above should print the same
@@ -209,7 +214,7 @@ int __init verify_local_APIC(void)
* The ID register is read/write in a real APIC.
*/
reg0 = apic_read(APIC_ID);
Dprintk("Getting ID: %x\n", reg0);
apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg0);
/*
* The next two are just to see if we have sane values.
@@ -217,9 +222,9 @@ int __init verify_local_APIC(void)
* compatibility mode, but most boxes are anymore.
*/
reg0 = apic_read(APIC_LVT0);
Dprintk("Getting LVT0: %x\n", reg0);
apic_printk(APIC_DEBUG, "Getting LVT0: %x\n", reg0);
reg1 = apic_read(APIC_LVT1);
Dprintk("Getting LVT1: %x\n", reg1);
apic_printk(APIC_DEBUG, "Getting LVT1: %x\n", reg1);
return 1;
}
@@ -235,20 +240,23 @@ void __init sync_Arb_IDs(void)
*/
apic_wait_icr_idle();
Dprintk("Synchronizing Arb IDs.\n");
apic_printk(APIC_DEBUG, "Synchronizing Arb IDs.\n");
apic_write_around(APIC_ICR, APIC_DEST_ALLINC | APIC_INT_LEVELTRIG
| APIC_DM_INIT);
}
extern void __error_in_apic_c (void);
/*
* An initial setup of the virtual wire mode.
*/
void __init init_bsp_APIC(void)
{
unsigned long value, ver;
/*
* Don't do the setup now if we have a SMP BIOS as the through-I/O-APIC
* virtual wire mode might be active.
* Don't do the setup now if we have a SMP BIOS as the
* through-I/O-APIC virtual wire mode might be active.
*/
if (smp_found_config || !cpu_has_apic)
return;
@@ -380,10 +388,12 @@ void __init setup_local_APIC (void)
value = apic_read(APIC_LVT0) & APIC_LVT_MASKED;
if (!smp_processor_id() && (pic_mode || !value)) {
value = APIC_DM_EXTINT;
printk("enabled ExtINT on CPU#%d\n", smp_processor_id());
apic_printk(APIC_VERBOSE, "enabled ExtINT on CPU#%d\n",
smp_processor_id());
} else {
value = APIC_DM_EXTINT | APIC_LVT_MASKED;
printk("masked ExtINT on CPU#%d\n", smp_processor_id());
apic_printk(APIC_VERBOSE, "masked ExtINT on CPU#%d\n",
smp_processor_id());
}
apic_write_around(APIC_LVT0, value);
@@ -413,8 +423,9 @@ void __init setup_local_APIC (void)
apic_write(APIC_ESR, 0);
value = apic_read(APIC_ESR);
if (value != oldvalue)
printk("ESR value before enabling vector: 0x%08lx "
"after: 0x%08lx\n", oldvalue, value);
apic_printk(APIC_VERBOSE, "ESR value before enabling "
"vector: 0x%08lx after: 0x%08lx\n",
oldvalue, value);
} else {
if (esr_disable)
/*
@@ -424,8 +435,8 @@ void __init setup_local_APIC (void)
* errors anyway - mbligh
*/
printk("Leaving ESR disabled.\n");
else
printk("No ESR for 82489DX.\n");
else
printk("No ESR for 82489DX.\n");
}
if (nmi_watchdog == NMI_LOCAL_APIC)
@@ -437,6 +448,18 @@ void __init setup_local_APIC (void)
* Original code written by Keir Fraser.
*/
static void __init apic_set_verbosity(char *str)
{
if (strcmp("debug", str) == 0)
apic_verbosity = APIC_DEBUG;
else if (strcmp("verbose", str) == 0)
apic_verbosity = APIC_VERBOSE;
else
printk(KERN_WARNING "APIC Verbosity level %s not recognised"
" use apic=verbose or apic=debug", str);
}
custom_param("apic", apic_set_verbosity);
static int __init detect_init_APIC (void)
{
u32 h, l, features;
@@ -476,8 +499,10 @@ static int __init detect_init_APIC (void)
enabled_via_apicbase = 1;
}
}
/* The APIC feature bit should now be enabled in `cpuid' */
/*
* The APIC feature bit should now be enabled
* in `cpuid'
*/
features = cpuid_edx(1);
if (!(features & (1 << X86_FEATURE_APIC))) {
printk("Could not enable APIC!\n");
@@ -520,7 +545,8 @@ void __init init_apic_mappings(void)
apic_phys = mp_lapic_addr;
set_fixmap_nocache(FIX_APIC_BASE, apic_phys);
Dprintk("mapped APIC to %08lx (%08lx)\n", APIC_BASE, apic_phys);
apic_printk(APIC_VERBOSE, "mapped APIC to %08lx (%08lx)\n", APIC_BASE,
apic_phys);
/*
* Fetch the APIC ID of the BSP in case we have a
@@ -552,8 +578,8 @@ fake_ioapic_page:
ioapic_phys = __pa(ioapic_phys);
}
set_fixmap_nocache(idx, ioapic_phys);
Dprintk("mapped IOAPIC to %08lx (%08lx)\n",
fix_to_virt(idx), ioapic_phys);
apic_printk(APIC_VERBOSE, "mapped IOAPIC to %08lx (%08lx)\n",
__fix_to_virt(idx), ioapic_phys);
idx++;
}
}
@@ -604,37 +630,32 @@ static unsigned int __init get_8254_timer_count(void)
/* next tick in 8254 can be caught by catching timer wraparound */
static void __init wait_8254_wraparound(void)
{
unsigned int curr_count, prev_count=~0;
int delta;
unsigned int curr_count, prev_count;
curr_count = get_8254_timer_count();
do {
prev_count = curr_count;
curr_count = get_8254_timer_count();
delta = curr_count-prev_count;
/*
* This limit for delta seems arbitrary, but it isn't, it's slightly
* above the level of error a buggy Mercury/Neptune chipset timer can
* cause.
*/
} while (delta < 300);
/* workaround for broken Mercury/Neptune */
if (prev_count >= curr_count + 0x100)
curr_count = get_8254_timer_count();
} while (prev_count >= curr_count);
}
/*
* Default initialization for 8254 timers. If we use other timers like HPET,
* we override this later
*/
void (*wait_timer_tick)(void) = wait_8254_wraparound;
void (*wait_timer_tick)(void) __initdata = wait_8254_wraparound;
/*
* This function sets up the local APIC timer, with a timeout of
* 'clocks' APIC bus clock. During calibration we actually call
* this function with a very large value and read the current time after
* a well defined period of time as expired.
*
* Calibration is only performed once, for CPU0!
* this function twice on the boot CPU, once with a bogus timeout
* value, second time for real. The other (noncalibrating) CPUs
* call this function only once, with the real, calibrated value.
*
* We do reads before writes even if unnecessary, to get around the
* P5 APIC double write bug.
@@ -693,7 +714,7 @@ int __init calibrate_APIC_clock(void)
int i;
const int LOOPS = HZ/10;
printk("Calibrating APIC timer for CPU%d...\n", smp_processor_id());
apic_printk(APIC_VERBOSE, "calibrating APIC timer ...\n");
/*
* Put whatever arbitrary (but long enough) timeout
@@ -730,26 +751,29 @@ int __init calibrate_APIC_clock(void)
* The APIC bus clock counter is 32 bits only, it
* might have overflown, but note that we use signed
* longs, thus no extra care needed.
* [underflown to be exact, as the timer counts down ;)]
*
* underflown to be exact, as the timer counts down ;)
*/
result = (tt1-tt2)*APIC_DIVISOR/LOOPS;
if (cpu_has_tsc)
printk("..... CPU clock speed is %ld.%04ld MHz.\n",
((long)(t2-t1)/LOOPS)/(1000000/HZ),
((long)(t2-t1)/LOOPS)%(1000000/HZ));
apic_printk(APIC_VERBOSE, "..... CPU clock speed is "
"%ld.%04ld MHz.\n",
((long)(t2-t1)/LOOPS)/(1000000/HZ),
((long)(t2-t1)/LOOPS)%(1000000/HZ));
printk("..... host bus clock speed is %ld.%04ld MHz.\n",
result/(1000000/HZ),
result%(1000000/HZ));
apic_printk(APIC_VERBOSE, "..... host bus clock speed is "
"%ld.%04ld MHz.\n",
result/(1000000/HZ),
result%(1000000/HZ));
/* set up multipliers for accurate timer code */
bus_freq = result*HZ;
bus_cycle = (u32) (1000000000000LL/bus_freq); /* in pico seconds */
bus_scale = (1000*262144)/bus_cycle;
printk("..... bus_scale = 0x%08X\n", bus_scale);
apic_printk(APIC_VERBOSE, "..... bus_scale = 0x%08X\n", bus_scale);
/* reset APIC to zero timeout value */
__setup_APIC_LVTT(0);
@@ -762,7 +786,6 @@ int __init calibrate_APIC_clock(void)
*/
void __init setup_APIC_clocks (void)
{
printk("Using local APIC timer interrupts.\n");
using_apic_timer = 1;
__cli();
/* calibrate CPU0 for CPU speed and BUS speed */
@@ -908,7 +931,7 @@ int __init APIC_init_uniprocessor (void)
* Complain if the BIOS pretends there is one.
*/
if (!cpu_has_apic && APIC_INTEGRATED(apic_version[boot_cpu_physical_apicid])) {
printk("BIOS bug, local APIC #%d not detected!...\n",
printk(KERN_ERR "BIOS bug, local APIC #%d not detected!...\n",
boot_cpu_physical_apicid);
return -1;
}
xen/arch/x86/setup.c
+7
View File
@@ -615,6 +615,13 @@ void __init __start_xen(multiboot_info_t *mbi)
strcat(cmdline, " acpi=");
strcat(cmdline, acpi_param);
}
if ( !strstr(cmdline, "apic=") )
{
if ( apic_verbosity == APIC_VERBOSE )
strcat(cmdline, " apic=verbose");
else if ( apic_verbosity == APIC_DEBUG )
strcat(cmdline, " apic=debug");
}
}
/*
xen/common/dom0_ops.c
+5 -5
View File
@@ -230,15 +230,15 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
break;
}
if ( (op->u.pincpudomain.exec_domain >= MAX_VIRT_CPUS) ||
!d->exec_domain[op->u.pincpudomain.exec_domain] )
if ( (op->u.pincpudomain.vcpu >= MAX_VIRT_CPUS) ||
!d->exec_domain[op->u.pincpudomain.vcpu] )
{
ret = -EINVAL;
put_domain(d);
break;
}
ed = d->exec_domain[op->u.pincpudomain.exec_domain];
ed = d->exec_domain[op->u.pincpudomain.vcpu];
if ( ed == NULL )
{
ret = -ESRCH;
@@ -382,14 +382,14 @@ long do_dom0_op(dom0_op_t *u_dom0_op)
break;
}
if ( op->u.getvcpucontext.exec_domain >= MAX_VIRT_CPUS )
if ( op->u.getvcpucontext.vcpu >= MAX_VIRT_CPUS )
{
ret = -EINVAL;
put_domain(d);
break;
}
ed = d->exec_domain[op->u.getvcpucontext.exec_domain];
ed = d->exec_domain[op->u.getvcpucontext.vcpu];
if ( ed == NULL )
{
ret = -ESRCH;
xen/common/domain.c
+1 -1
View File
@@ -221,7 +221,7 @@ int set_info_guest(struct domain *d, dom0_setdomaininfo_t *setdomaininfo)
{
int rc = 0;
struct vcpu_guest_context *c = NULL;
unsigned long vcpu = setdomaininfo->exec_domain;
unsigned long vcpu = setdomaininfo->vcpu;
struct exec_domain *ed;
if ( (vcpu >= MAX_VIRT_CPUS) || ((ed = d->exec_domain[vcpu]) == NULL) )
xen/include/asm-x86/processor.h
+1 -1
View File
@@ -377,7 +377,7 @@ extern struct tss_struct init_tss[NR_CPUS];
#ifdef ARCH_HAS_FAST_TRAP
#define SET_DEFAULT_FAST_TRAP(_p) \
(_p)->guest_context.fast_trap_idx = 0x20; \
(_p)->guest_context.fast_trap_idx = 0x30; \
(_p)->fast_trap_desc.a = 0; \
(_p)->fast_trap_desc.b = 0;
Reference in new issue
xen-project/xen
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.

The note is not visible to the blocked user.