From 4f4f651b8cf4d97ab45fc90efff405eb5cecbc40 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Mon, 31 Oct 2005 17:27:38 -0600 Subject: [PATCH 01/20] Fixes for first step in getting domU back up (by Kevin Tian) --- .../ia64/xen/drivers/patches/privcmd.c.patch | 50 ++++++++++--------- xen/arch/ia64/xen/hypercall.c | 4 ++ xen/arch/ia64/xen/xenmisc.c | 4 +- 3 files changed, 33 insertions(+), 25 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/privcmd.c.patch b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/privcmd.c.patch index c3903baa56..cce9fec2fc 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/privcmd.c.patch +++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/privcmd.c.patch @@ -11,39 +11,43 @@ diff -Naur xen/privcmd/privcmd.c xen.patched/privcmd/privcmd.c if ((rc = direct_remap_pfn_range( vma, msg[j].va&PAGE_MASK, -@@ -148,6 +151,7 @@ - } - break; +@@ -180,6 +183,15 @@ + for (i = 0; i < m.num; i++, addr += PAGE_SIZE, p++) { + if (get_user(mfn, p)) + return -EFAULT; ++#ifdef __ia64__ ++ ret = remap_pfn_range(vma, ++ addr&PAGE_MASK, ++ mfn, ++ 1<vm_page_prot); ++ if (ret < 0) ++ goto batch_err; ++#else -+#ifndef __ia64__ - case IOCTL_PRIVCMD_MMAPBATCH: { - mmu_update_t u; - privcmd_mmapbatch_t m; -@@ -206,7 +210,9 @@ - } + ret = create_lookup_pte_addr(vma->vm_mm, addr, &ptep); + if (ret) +@@ -190,6 +202,7 @@ + + if (HYPERVISOR_mmu_update(&u, 1, NULL, m.dom) < 0) + put_user(0xF0000000 | mfn, p); ++#endif + } + + ret = 0; +@@ -205,6 +218,7 @@ break; #endif -+#endif +#ifndef __ia64__ case IOCTL_PRIVCMD_GET_MACH2PHYS_START_MFN: { unsigned long m2pv = (unsigned long)machine_to_phys_mapping; pgd_t *pgd = pgd_offset_k(m2pv); -@@ -218,6 +224,7 @@ +@@ -216,6 +230,7 @@ -EFAULT: 0; } break; +#endif - case IOCTL_PRIVCMD_INITDOMAIN_STORE: { - extern int do_xenbus_probe(void*); -@@ -241,6 +248,9 @@ - - /* Initial connect. Setup channel and page. */ - xen_start_info->store_evtchn = data; -+#ifdef __ia64__ -+#define pfn_to_mfn(x) (x) -+#endif - xen_start_info->store_mfn = - pfn_to_mfn(virt_to_phys((void *)page) >> - PAGE_SHIFT); + default: + ret = -EINVAL; diff --git a/xen/arch/ia64/xen/hypercall.c b/xen/arch/ia64/xen/hypercall.c index 111219e97b..13f17500a9 100644 --- a/xen/arch/ia64/xen/hypercall.c +++ b/xen/arch/ia64/xen/hypercall.c @@ -187,6 +187,10 @@ ia64_hypercall (struct pt_regs *regs) regs->r8 = do_console_io(regs->r14, regs->r15, regs->r16); break; + case __HYPERVISOR_xen_version: + regs->r8 = do_xen_version(regs->r14, regs->r15); + break; + default: printf("unknown hypercall %x\n", regs->r2); regs->r8 = (unsigned long)-1; diff --git a/xen/arch/ia64/xen/xenmisc.c b/xen/arch/ia64/xen/xenmisc.c index a51059174c..1d2d74afb4 100644 --- a/xen/arch/ia64/xen/xenmisc.c +++ b/xen/arch/ia64/xen/xenmisc.c @@ -290,8 +290,8 @@ void context_switch(struct vcpu *prev, struct vcpu *next) //prev->domain->domain_id,(long)prev&0xffffff,next->domain->domain_id,(long)next&0xffffff); //if (prev->domain->domain_id == 1 && next->domain->domain_id == 0) cs10foo(); //if (prev->domain->domain_id == 0 && next->domain->domain_id == 1) cs01foo(); -printk("@@sw%d/%x %d->%d\n",smp_processor_id(), hard_smp_processor_id (), - prev->domain->domain_id,next->domain->domain_id); +//printk("@@sw%d/%x %d->%d\n",smp_processor_id(), hard_smp_processor_id (), +// prev->domain->domain_id,next->domain->domain_id); if(VMX_DOMAIN(prev)){ vtm_domain_out(prev); } From fa58ebdcadd51d7639b95eefa04dfeb731314c3c Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Mon, 31 Oct 2005 22:07:56 -0600 Subject: [PATCH 02/20] Load kernel regs from virtual kernel regs at domain switch (found by Kevin Tian) --- xen/arch/ia64/xen/process.c | 5 ++--- xen/arch/ia64/xen/regionreg.c | 13 +------------ xen/arch/ia64/xen/vcpu.c | 13 ++++++++++++- xen/arch/ia64/xen/xenmisc.c | 1 + 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/xen/arch/ia64/xen/process.c b/xen/arch/ia64/xen/process.c index c3eb890a8b..2c9063e800 100644 --- a/xen/arch/ia64/xen/process.c +++ b/xen/arch/ia64/xen/process.c @@ -83,9 +83,8 @@ void schedule_tail(struct vcpu *next) if(VMX_DOMAIN(current)){ vmx_load_all_rr(current); }else{ - if (rr7 = load_region_regs(current)) { - printk("schedule_tail: change to rr7 not yet implemented\n"); - } + load_region_regs(current); + vcpu_load_kernel_regs(current); } } diff --git a/xen/arch/ia64/xen/regionreg.c b/xen/arch/ia64/xen/regionreg.c index 2e0bb6425f..35277513c2 100644 --- a/xen/arch/ia64/xen/regionreg.c +++ b/xen/arch/ia64/xen/regionreg.c @@ -341,23 +341,13 @@ virtualize_rid(struct vcpu *v, unsigned long rrval) // rr7 (because we have to to assembly and physical mode // to change rr7). If no change to rr7 is required, returns 0. // -unsigned long load_region_regs(struct vcpu *v) +void load_region_regs(struct vcpu *v) { unsigned long rr0, rr1,rr2, rr3, rr4, rr5, rr6, rr7; // TODO: These probably should be validated unsigned long bad = 0; if (VCPU(v,metaphysical_mode)) { - ia64_rr rrv; - -#if 0 - rrv.rrval = 0; - rrv.rid = v->domain->arch.metaphysical_rr0; - rrv.ps = PAGE_SHIFT; - rrv.ve = 1; - rr0 = rrv.rrval; - set_rr_no_srlz(0x0000000000000000L, rr0); -#endif rr0 = v->domain->arch.metaphysical_rr0; ia64_set_rr(0x0000000000000000L, rr0); ia64_srlz_d(); @@ -383,5 +373,4 @@ unsigned long load_region_regs(struct vcpu *v) if (bad) { panic_domain(0,"load_region_regs: can't set! bad=%lx\n",bad); } - return 0; } diff --git a/xen/arch/ia64/xen/vcpu.c b/xen/arch/ia64/xen/vcpu.c index bcb0428fab..ce38e1d229 100644 --- a/xen/arch/ia64/xen/vcpu.c +++ b/xen/arch/ia64/xen/vcpu.c @@ -135,6 +135,18 @@ vcpu_set_gr(VCPU *vcpu, unsigned reg, UINT64 value) VCPU privileged application register access routines **************************************************************************/ +void vcpu_load_kernel_regs(VCPU *vcpu) +{ + ia64_set_kr(0, VCPU(vcpu, krs[0])); + ia64_set_kr(1, VCPU(vcpu, krs[1])); + ia64_set_kr(2, VCPU(vcpu, krs[2])); + ia64_set_kr(3, VCPU(vcpu, krs[3])); + ia64_set_kr(4, VCPU(vcpu, krs[4])); + ia64_set_kr(5, VCPU(vcpu, krs[5])); + ia64_set_kr(6, VCPU(vcpu, krs[6])); + ia64_set_kr(7, VCPU(vcpu, krs[7])); +} + IA64FAULT vcpu_set_ar(VCPU *vcpu, UINT64 reg, UINT64 val) { if (reg == 44) return (vcpu_set_itc(vcpu,val)); @@ -1872,4 +1884,3 @@ IA64FAULT vcpu_ptr_i(VCPU *vcpu,UINT64 vadr,UINT64 addr_range) // don't forget to recompute itr_regions return (IA64_ILLOP_FAULT); } - diff --git a/xen/arch/ia64/xen/xenmisc.c b/xen/arch/ia64/xen/xenmisc.c index 1d2d74afb4..aa8ca1124c 100644 --- a/xen/arch/ia64/xen/xenmisc.c +++ b/xen/arch/ia64/xen/xenmisc.c @@ -320,6 +320,7 @@ if (!i--) { printk("+",id); i = 1000000; } VHPT_ENABLED); if (!is_idle_task(current->domain)) { load_region_regs(current); + vcpu_load_kernel_regs(current); if (vcpu_timer_expired(current)) vcpu_pend_timer(current); } if (vcpu_timer_expired(current)) vcpu_pend_timer(current); From 98ccd0ad1dbc53432a282758aeb42f7bd529eb11 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Mon, 31 Oct 2005 22:43:11 -0600 Subject: [PATCH 03/20] Mask vector for delivering vhpt fault correctly. Signed-off-by Kevin Tian --- xen/arch/ia64/xen/process.c | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/arch/ia64/xen/process.c b/xen/arch/ia64/xen/process.c index 2c9063e800..7504805d3a 100644 --- a/xen/arch/ia64/xen/process.c +++ b/xen/arch/ia64/xen/process.c @@ -184,6 +184,7 @@ void check_bad_nested_interruption(unsigned long isr, struct pt_regs *regs, unsi if (!(PSCB(v,ipsr) & IA64_PSR_DT)) { panic_domain(regs,"psr.dt off, trying to deliver nested dtlb!\n"); } + vector &= ~0xf; if (vector != IA64_DATA_TLB_VECTOR && vector != IA64_ALT_DATA_TLB_VECTOR && vector != IA64_VHPT_TRANS_VECTOR) { From 1ac76039193600b80c73a6fe4576cacaf394fdda Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Tue, 1 Nov 2005 08:37:40 -0600 Subject: [PATCH 04/20] Fix hyper_set_kr bug -- was always setting kr0. (Found by Kevin Tian) --- xen/arch/ia64/xen/hyperprivop.S | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/ia64/xen/hyperprivop.S b/xen/arch/ia64/xen/hyperprivop.S index d472806a1e..b65a5075be 100644 --- a/xen/arch/ia64/xen/hyperprivop.S +++ b/xen/arch/ia64/xen/hyperprivop.S @@ -1485,7 +1485,7 @@ ENTRY(hyper_set_kr) adds r21=XSI_KR0_OFS-XSI_PSR_IC_OFS,r18 ;; shl r20=r8,3;; add r22=r20,r21;; - st8 [r21]=r9;; + st8 [r22]=r9;; cmp.eq p7,p0=r8,r0 adds r8=-1,r8;; (p7) mov ar0=r9;; From f19a6d6bd33cfd514534daf3df11630edca712e3 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Wed, 2 Nov 2005 11:45:49 -0600 Subject: [PATCH 05/20] Adapt for recent change in xen-unstable common/trace.c --- xen/include/asm-ia64/time.h | 1 + 1 file changed, 1 insertion(+) diff --git a/xen/include/asm-ia64/time.h b/xen/include/asm-ia64/time.h index c3872726cf..c55fb1fbc4 100644 --- a/xen/include/asm-ia64/time.h +++ b/xen/include/asm-ia64/time.h @@ -1 +1,2 @@ #include +#include From e6bb78f26db7cc954a7bc53f8a31ad2b9519f0c1 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Thu, 3 Nov 2005 07:14:09 -0600 Subject: [PATCH 06/20] Fix ar.unat save/restore for fast rfi (by Anthony Xu) --- xen/arch/ia64/xen/hyperprivop.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xen/arch/ia64/xen/hyperprivop.S b/xen/arch/ia64/xen/hyperprivop.S index b65a5075be..a048850a3b 100644 --- a/xen/arch/ia64/xen/hyperprivop.S +++ b/xen/arch/ia64/xen/hyperprivop.S @@ -807,6 +807,7 @@ just_do_rfi: // OK, now all set to go except for switch to virtual bank1 mov r22=1;; st4 [r20]=r22; mov r30=r2; mov r29=r3;; + mov r17=ar.unat;; adds r16=XSI_B1NATS_OFS-XSI_PSR_IC_OFS,r18 adds r2=XSI_BANK1_OFS-XSI_PSR_IC_OFS,r18; adds r3=(XSI_BANK1_OFS+8)-XSI_PSR_IC_OFS,r18;; @@ -832,6 +833,7 @@ just_do_rfi: .mem.offset 8,0; ld8.fill r30=[r2],16 ; .mem.offset 8,0; ld8.fill r31=[r3],16 ;; bsw.0 ;; + mov ar.unat=r17;; mov r2=r30; mov r3=r29;; 1: mov pr=r31,-1 ;; From a5d0b7646445ca72abe1d82577327842103b2c75 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Thu, 3 Nov 2005 07:21:26 -0600 Subject: [PATCH 07/20] Fix console output and bug in evtchn_ia64 (by Tristan Gingold) --- .../arch/ia64/xen/drivers/evtchn_ia64.c | 1 + .../ia64/xen/drivers/patches/console.c.patch | 20 +++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c index ac8ff9ec4c..236881e3fe 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c +++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/evtchn_ia64.c @@ -22,6 +22,7 @@ unsigned int bind_virq_to_evtchn(int virq) op.cmd = EVTCHNOP_bind_virq; op.u.bind_virq.virq = virq; + op.u.bind_virq.vcpu = 0; if ( HYPERVISOR_event_channel_op(&op) != 0 ) BUG(); diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch index 12e9a018b0..d9b30e633b 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch +++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch @@ -1,7 +1,16 @@ -diff -Naur xen/console/console.c xen.patched/console/console.c ---- xen/console/console.c 2005-09-23 10:54:50.000000000 -0600 -+++ xen.patched/console/console.c 2005-09-23 10:57:51.000000000 -0600 -@@ -768,9 +768,16 @@ +--- xen/console/console.c 2005-11-02 14:13:07.000000000 +0100 ++++ xen.patched/console/console.c 2005-11-02 14:21:20.000000000 +0100 +@@ -196,6 +196,9 @@ + void xen_console_init(void) + #endif + { ++ if (xen_init() < 0) ++ return __RETCODE; ++ + if (xen_start_info->flags & SIF_INITDOMAIN) { + if (xc_mode == XC_DEFAULT) + xc_mode = XC_SERIAL; +@@ -768,9 +771,15 @@ #endif if (xen_start_info->flags & SIF_INITDOMAIN) { @@ -10,8 +19,7 @@ diff -Naur xen/console/console.c xen.patched/console/console.c + bind_evtchn_to_irqhandler(xencons_priv_irq, + xencons_priv_interrupt, 0, "console", NULL); +#else -+ - xencons_priv_irq = bind_virq_to_irq(VIRQ_CONSOLE); + xencons_priv_irq = bind_virq_to_irq(VIRQ_CONSOLE, 0); (void)request_irq(xencons_priv_irq, xencons_priv_interrupt, 0, "console", NULL); +#endif From aab5203039b990adadeaa35384653497b6472604 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Thu, 3 Nov 2005 16:01:38 -0600 Subject: [PATCH 08/20] Test new config --- .../arch/xen/configs/xen0_defconfig_ia64 | 703 +++++++++--------- 1 file changed, 335 insertions(+), 368 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_ia64 b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_ia64 index b26686a525..316538a427 100644 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_ia64 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_ia64 @@ -1,37 +1,35 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.12 -# Thu Sep 15 11:04:33 2005 +# Linux kernel version: 2.6.12.2 +# Thu Nov 3 12:14:08 2005 # # # Code maturity level options # CONFIG_EXPERIMENTAL=y -# CONFIG_CLEAN_COMPILE is not set -CONFIG_BROKEN=y -CONFIG_BROKEN_ON_SMP=y +CONFIG_CLEAN_COMPILE=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup # -CONFIG_LOCALVERSION="xen" +CONFIG_LOCALVERSION="" CONFIG_SWAP=y CONFIG_SYSVIPC=y -# CONFIG_POSIX_MQUEUE is not set -CONFIG_BSD_PROCESS_ACCT=y -# CONFIG_BSD_PROCESS_ACCT_V3 is not set +CONFIG_POSIX_MQUEUE=y +# CONFIG_BSD_PROCESS_ACCT is not set CONFIG_SYSCTL=y # CONFIG_AUDIT is not set CONFIG_HOTPLUG=y CONFIG_KOBJECT_UEVENT=y -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=y +CONFIG_IKCONFIG_PROC=y # CONFIG_CPUSETS is not set # CONFIG_EMBEDDED is not set CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_ALL=y # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_PRINTK=y CONFIG_BUG=y @@ -50,11 +48,13 @@ CONFIG_BASE_SMALL=0 # Loadable module support # CONFIG_MODULES=y -# CONFIG_MODULE_UNLOAD is not set +CONFIG_MODULE_UNLOAD=y +# CONFIG_MODULE_FORCE_UNLOAD is not set CONFIG_OBSOLETE_MODPARM=y -# CONFIG_MODVERSIONS is not set +CONFIG_MODVERSIONS=y # CONFIG_MODULE_SRCVERSION_ALL is not set -# CONFIG_KMOD is not set +CONFIG_KMOD=y +CONFIG_STOP_MACHINE=y # # Processor type and features @@ -67,15 +67,10 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_TIME_INTERPOLATION=y CONFIG_EFI=y CONFIG_GENERIC_IOMAP=y -CONFIG_XEN=y -CONFIG_ARCH_XEN=y -CONFIG_XEN_PRIVILEGED_GUEST=y -CONFIG_XEN_PHYSDEV_ACCESS=y -CONFIG_XEN_BLKDEV_GRANT=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y -# CONFIG_IA64_GENERIC is not set +CONFIG_IA64_GENERIC=y # CONFIG_IA64_DIG is not set -CONFIG_IA64_HP_ZX1=y +# CONFIG_IA64_HP_ZX1 is not set # CONFIG_IA64_HP_ZX1_SWIOTLB is not set # CONFIG_IA64_SGI_SN2 is not set # CONFIG_IA64_HP_SIM is not set @@ -86,14 +81,15 @@ CONFIG_MCKINLEY=y CONFIG_IA64_PAGE_SIZE_16KB=y # CONFIG_IA64_PAGE_SIZE_64KB is not set CONFIG_IA64_L1_CACHE_SHIFT=7 -# CONFIG_NUMA is not set +CONFIG_NUMA=y CONFIG_VIRTUAL_MEM_MAP=y CONFIG_HOLES_IN_ZONE=y -# CONFIG_IA64_CYCLONE is not set +CONFIG_DISCONTIGMEM=y +CONFIG_IA64_CYCLONE=y CONFIG_IOSAPIC=y CONFIG_FORCE_MAX_ZONEORDER=18 CONFIG_SMP=y -CONFIG_NR_CPUS=16 +CONFIG_NR_CPUS=2 # CONFIG_HOTPLUG_CPU is not set # CONFIG_SCHED_SMT is not set # CONFIG_PREEMPT is not set @@ -104,13 +100,18 @@ CONFIG_PERFMON=y CONFIG_IA64_PALINFO=y CONFIG_ACPI_DEALLOCATE_IRQ=y +CONFIG_XEN=y +CONFIG_XEN_PRIVILEGED_GUEST=y +CONFIG_XEN_PHYSDEV_ACCESS=y +CONFIG_XEN_BLKDEV_GRANT=y + # # Firmware Drivers # CONFIG_EFI_VARS=y CONFIG_EFI_PCDP=y CONFIG_BINFMT_ELF=y -CONFIG_BINFMT_MISC=y +CONFIG_BINFMT_MISC=m # # Power management and ACPI @@ -123,18 +124,19 @@ CONFIG_ACPI=y # CONFIG_ACPI_BOOT=y CONFIG_ACPI_INTERPRETER=y -CONFIG_ACPI_BUTTON=y -# CONFIG_ACPI_VIDEO is not set -CONFIG_ACPI_FAN=y -CONFIG_ACPI_PROCESSOR=y -CONFIG_ACPI_THERMAL=y +CONFIG_ACPI_BUTTON=m +CONFIG_ACPI_VIDEO=m +CONFIG_ACPI_FAN=m +CONFIG_ACPI_PROCESSOR=m +CONFIG_ACPI_THERMAL=m +CONFIG_ACPI_NUMA=y CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_BUS=y CONFIG_ACPI_POWER=y CONFIG_ACPI_PCI=y CONFIG_ACPI_SYSTEM=y -# CONFIG_ACPI_CONTAINER is not set +CONFIG_ACPI_CONTAINER=m # # Bus options (PCI, PCMCIA) @@ -149,9 +151,9 @@ CONFIG_PCI_NAMES=y # # PCI Hotplug Support # -CONFIG_HOTPLUG_PCI=y +CONFIG_HOTPLUG_PCI=m # CONFIG_HOTPLUG_PCI_FAKE is not set -CONFIG_HOTPLUG_PCI_ACPI=y +CONFIG_HOTPLUG_PCI_ACPI=m # CONFIG_HOTPLUG_PCI_ACPI_IBM is not set # CONFIG_HOTPLUG_PCI_CPCI is not set # CONFIG_HOTPLUG_PCI_SHPC is not set @@ -196,9 +198,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=y -# CONFIG_BLK_DEV_CRYPTOLOOP is not set -# CONFIG_BLK_DEV_NBD is not set +CONFIG_BLK_DEV_LOOP=m +CONFIG_BLK_DEV_CRYPTOLOOP=m +CONFIG_BLK_DEV_NBD=m # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y @@ -220,7 +222,60 @@ CONFIG_IOSCHED_CFQ=y # # ATA/ATAPI/MFM/RLL support # -# CONFIG_IDE is not set +CONFIG_IDE=y +CONFIG_BLK_DEV_IDE=y + +# +# Please see Documentation/ide.txt for help/info on IDE drives +# +# CONFIG_BLK_DEV_IDE_SATA is not set +CONFIG_BLK_DEV_IDEDISK=y +# CONFIG_IDEDISK_MULTI_MODE is not set +CONFIG_BLK_DEV_IDECD=y +# CONFIG_BLK_DEV_IDETAPE is not set +CONFIG_BLK_DEV_IDEFLOPPY=y +CONFIG_BLK_DEV_IDESCSI=m +# CONFIG_IDE_TASK_IOCTL is not set + +# +# IDE chipset support/bugfixes +# +CONFIG_IDE_GENERIC=y +CONFIG_BLK_DEV_IDEPCI=y +# CONFIG_IDEPCI_SHARE_IRQ is not set +# CONFIG_BLK_DEV_OFFBOARD is not set +CONFIG_BLK_DEV_GENERIC=y +# CONFIG_BLK_DEV_OPTI621 is not set +CONFIG_BLK_DEV_IDEDMA_PCI=y +# CONFIG_BLK_DEV_IDEDMA_FORCED is not set +CONFIG_IDEDMA_PCI_AUTO=y +# CONFIG_IDEDMA_ONLYDISK is not set +# CONFIG_BLK_DEV_AEC62XX is not set +# CONFIG_BLK_DEV_ALI15X3 is not set +# CONFIG_BLK_DEV_AMD74XX is not set +CONFIG_BLK_DEV_CMD64X=y +# CONFIG_BLK_DEV_TRIFLEX is not set +# CONFIG_BLK_DEV_CY82C693 is not set +# CONFIG_BLK_DEV_CS5520 is not set +# CONFIG_BLK_DEV_CS5530 is not set +# CONFIG_BLK_DEV_HPT34X is not set +# CONFIG_BLK_DEV_HPT366 is not set +# CONFIG_BLK_DEV_SC1200 is not set +CONFIG_BLK_DEV_PIIX=y +# CONFIG_BLK_DEV_NS87415 is not set +# CONFIG_BLK_DEV_PDC202XX_OLD is not set +# CONFIG_BLK_DEV_PDC202XX_NEW is not set +# CONFIG_BLK_DEV_SVWKS is not set +CONFIG_BLK_DEV_SGIIOC4=y +# CONFIG_BLK_DEV_SIIMAGE is not set +# CONFIG_BLK_DEV_SLC90E66 is not set +# CONFIG_BLK_DEV_TRM290 is not set +# CONFIG_BLK_DEV_VIA82CXXX is not set +# CONFIG_IDE_ARM is not set +CONFIG_BLK_DEV_IDEDMA=y +# CONFIG_IDEDMA_IVB is not set +CONFIG_IDEDMA_AUTO=y +# CONFIG_BLK_DEV_HD is not set # # SCSI device support @@ -232,24 +287,24 @@ CONFIG_SCSI_PROC_FS=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=y -CONFIG_CHR_DEV_OSST=y -CONFIG_BLK_DEV_SR=y -CONFIG_BLK_DEV_SR_VENDOR=y +CONFIG_CHR_DEV_ST=m +# CONFIG_CHR_DEV_OSST is not set +CONFIG_BLK_DEV_SR=m +# CONFIG_BLK_DEV_SR_VENDOR is not set CONFIG_CHR_DEV_SG=y # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs # -CONFIG_SCSI_MULTI_LUN=y -CONFIG_SCSI_CONSTANTS=y -CONFIG_SCSI_LOGGING=y +# CONFIG_SCSI_MULTI_LUN is not set +# CONFIG_SCSI_CONSTANTS is not set +# CONFIG_SCSI_LOGGING is not set # # SCSI Transport Attributes # CONFIG_SCSI_SPI_ATTRS=y -# CONFIG_SCSI_FC_ATTRS is not set +CONFIG_SCSI_FC_ATTRS=y # CONFIG_SCSI_ISCSI_ATTRS is not set # @@ -262,13 +317,10 @@ CONFIG_SCSI_SPI_ATTRS=y # CONFIG_SCSI_AIC7XXX is not set # CONFIG_SCSI_AIC7XXX_OLD is not set # CONFIG_SCSI_AIC79XX is not set -# CONFIG_SCSI_ADVANSYS is not set # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_LEGACY is not set # CONFIG_SCSI_SATA is not set -# CONFIG_SCSI_CPQFCTS is not set # CONFIG_SCSI_DMX3191D is not set -# CONFIG_SCSI_EATA_PIO is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_IPS is not set # CONFIG_SCSI_INITIO is not set @@ -279,17 +331,15 @@ CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set # CONFIG_SCSI_IPR is not set -# CONFIG_SCSI_PCI2000 is not set -# CONFIG_SCSI_PCI2220I is not set -# CONFIG_SCSI_QLOGIC_ISP is not set -# CONFIG_SCSI_QLOGIC_FC is not set +CONFIG_SCSI_QLOGIC_FC=y +# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set CONFIG_SCSI_QLOGIC_1280=y # CONFIG_SCSI_QLOGIC_1280_1040 is not set CONFIG_SCSI_QLA2XXX=y -# CONFIG_SCSI_QLA21XX is not set -# CONFIG_SCSI_QLA22XX is not set -# CONFIG_SCSI_QLA2300 is not set -# CONFIG_SCSI_QLA2322 is not set +CONFIG_SCSI_QLA21XX=m +CONFIG_SCSI_QLA22XX=m +CONFIG_SCSI_QLA2300=y +CONFIG_SCSI_QLA2322=m # CONFIG_SCSI_QLA6312 is not set # CONFIG_SCSI_LPFC is not set # CONFIG_SCSI_DC395x is not set @@ -299,7 +349,22 @@ CONFIG_SCSI_QLA2XXX=y # # Multi-device support (RAID and LVM) # -# CONFIG_MD is not set +CONFIG_MD=y +CONFIG_BLK_DEV_MD=m +CONFIG_MD_LINEAR=m +CONFIG_MD_RAID0=m +CONFIG_MD_RAID1=m +# CONFIG_MD_RAID10 is not set +CONFIG_MD_RAID5=m +CONFIG_MD_RAID6=m +CONFIG_MD_MULTIPATH=m +# CONFIG_MD_FAULTY is not set +CONFIG_BLK_DEV_DM=m +CONFIG_DM_CRYPT=m +CONFIG_DM_SNAPSHOT=m +CONFIG_DM_MIRROR=m +CONFIG_DM_ZERO=m +# CONFIG_DM_MULTIPATH is not set # # Fusion MPT device support @@ -337,33 +402,16 @@ CONFIG_IP_MULTICAST=y # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_IP_MROUTE is not set -# CONFIG_ARPD is not set -# CONFIG_SYN_COOKIES is not set +CONFIG_ARPD=y +CONFIG_SYN_COOKIES=y # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_TUNNEL is not set -# CONFIG_IP_TCPDIAG is not set +CONFIG_IP_TCPDIAG=y # CONFIG_IP_TCPDIAG_IPV6 is not set - -# -# IP: Virtual Server Configuration -# -# CONFIG_IP_VS is not set # CONFIG_IPV6 is not set -CONFIG_NETFILTER=y -# CONFIG_NETFILTER_DEBUG is not set - -# -# IP: Netfilter Configuration -# -# CONFIG_IP_NF_CONNTRACK is not set -# CONFIG_IP_NF_CONNTRACK_MARK is not set -# CONFIG_IP_NF_QUEUE is not set -# CONFIG_IP_NF_IPTABLES is not set -CONFIG_IP_NF_ARPTABLES=y -# CONFIG_IP_NF_ARPFILTER is not set -# CONFIG_IP_NF_ARP_MANGLE is not set +# CONFIG_NETFILTER is not set # # SCTP Configuration (EXPERIMENTAL) @@ -392,13 +440,15 @@ CONFIG_IP_NF_ARPTABLES=y # Network testing # # CONFIG_NET_PKTGEN is not set -# CONFIG_NETPOLL is not set -# CONFIG_NET_POLL_CONTROLLER is not set +CONFIG_NETPOLL=y +# CONFIG_NETPOLL_RX is not set +# CONFIG_NETPOLL_TRAP is not set +CONFIG_NET_POLL_CONTROLLER=y # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set # CONFIG_BT is not set CONFIG_NETDEVICES=y -CONFIG_DUMMY=y +CONFIG_DUMMY=m # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set @@ -412,7 +462,7 @@ CONFIG_DUMMY=y # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y -CONFIG_MII=y +CONFIG_MII=m # CONFIG_HAPPYMEAL is not set # CONFIG_SUNGEM is not set # CONFIG_NET_VENDOR_3COM is not set @@ -422,11 +472,10 @@ CONFIG_MII=y # CONFIG_NET_TULIP=y # CONFIG_DE2104X is not set -CONFIG_TULIP=y -CONFIG_TULIP_MWI=y -CONFIG_TULIP_MMIO=y -CONFIG_TULIP_NAPI=y -CONFIG_TULIP_NAPI_HW_MITIGATION=y +CONFIG_TULIP=m +# CONFIG_TULIP_MWI is not set +# CONFIG_TULIP_MMIO is not set +# CONFIG_TULIP_NAPI is not set # CONFIG_DE4X5 is not set # CONFIG_WINBOND_840 is not set # CONFIG_DM9102 is not set @@ -438,8 +487,8 @@ CONFIG_NET_PCI=y # CONFIG_B44 is not set # CONFIG_FORCEDETH is not set # CONFIG_DGRS is not set -# CONFIG_EEPRO100 is not set -CONFIG_E100=y +CONFIG_EEPRO100=m +CONFIG_E100=m # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set @@ -492,7 +541,7 @@ CONFIG_TIGON3=y # CONFIG_SLIP is not set # CONFIG_NET_FC is not set # CONFIG_SHAPER is not set -# CONFIG_NETCONSOLE is not set +CONFIG_NETCONSOLE=y # # ISDN subsystem @@ -516,16 +565,24 @@ CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -CONFIG_INPUT_JOYDEV=y +# CONFIG_INPUT_JOYDEV is not set # CONFIG_INPUT_TSDEV is not set -CONFIG_INPUT_EVDEV=y +# CONFIG_INPUT_EVDEV is not set # CONFIG_INPUT_EVBUG is not set # # Input Device Drivers # -# CONFIG_INPUT_KEYBOARD is not set -# CONFIG_INPUT_MOUSE is not set +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_ATKBD=y +# CONFIG_KEYBOARD_SUNKBD is not set +# CONFIG_KEYBOARD_LKKBD is not set +# CONFIG_KEYBOARD_XTKBD is not set +# CONFIG_KEYBOARD_NEWTON is not set +CONFIG_INPUT_MOUSE=y +CONFIG_MOUSE_PS2=y +# CONFIG_MOUSE_SERIAL is not set +# CONFIG_MOUSE_VSXXXAA is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set @@ -534,17 +591,34 @@ CONFIG_INPUT_EVDEV=y # Hardware I/O ports # CONFIG_SERIO=y -# CONFIG_SERIO_I8042 is not set +CONFIG_SERIO_I8042=y # CONFIG_SERIO_SERPORT is not set # CONFIG_SERIO_PCIPS2 is not set +CONFIG_SERIO_LIBPS2=y # CONFIG_SERIO_RAW is not set -# CONFIG_GAMEPORT is not set +CONFIG_GAMEPORT=m +# CONFIG_GAMEPORT_NS558 is not set +# CONFIG_GAMEPORT_L4 is not set +# CONFIG_GAMEPORT_EMU10K1 is not set +# CONFIG_GAMEPORT_VORTEX is not set +# CONFIG_GAMEPORT_FM801 is not set +# CONFIG_GAMEPORT_CS461X is not set # # Character devices # # CONFIG_VT is not set -# CONFIG_SERIAL_NONSTANDARD is not set +# CONFIG_ROCKETPORT is not set +# CONFIG_CYCLADES is not set +# CONFIG_MOXA_SMARTIO is not set +# CONFIG_ISI is not set +# CONFIG_SYNCLINKMP is not set +# CONFIG_N_HDLC is not set +# CONFIG_SPECIALIX is not set +# CONFIG_SX is not set +# CONFIG_STALDRV is not set +CONFIG_SGI_SNSC=y +# CONFIG_SGI_TIOCX is not set # # Serial drivers @@ -552,7 +626,7 @@ CONFIG_SERIO=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_ACPI=y -CONFIG_SERIAL_8250_NR_UARTS=8 +CONFIG_SERIAL_8250_NR_UARTS=6 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set @@ -564,6 +638,7 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_SGI_L1_CONSOLE=y # CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y @@ -587,18 +662,23 @@ CONFIG_EFI_RTC=y # # Ftape, the floppy tape device driver # -CONFIG_AGP=y -CONFIG_AGP_HP_ZX1=y -CONFIG_DRM=y -# CONFIG_DRM_TDFX is not set -# CONFIG_DRM_GAMMA is not set -# CONFIG_DRM_R128 is not set -CONFIG_DRM_RADEON=y -# CONFIG_DRM_MGA is not set -# CONFIG_DRM_SIS is not set -# CONFIG_RAW_DRIVER is not set -# CONFIG_HPET is not set +CONFIG_AGP=m +CONFIG_AGP_I460=m +CONFIG_AGP_HP_ZX1=m +# CONFIG_AGP_SGI_TIOCA is not set +CONFIG_DRM=m +CONFIG_DRM_TDFX=m +CONFIG_DRM_R128=m +CONFIG_DRM_RADEON=m +CONFIG_DRM_MGA=m +CONFIG_DRM_SIS=m +CONFIG_RAW_DRIVER=m +CONFIG_HPET=y +# CONFIG_HPET_RTC_IRQ is not set +CONFIG_HPET_MMAP=y +CONFIG_MAX_RAW_DEVS=256 # CONFIG_HANGCHECK_TIMER is not set +CONFIG_MMTIMER=y # # TPM devices @@ -608,89 +688,7 @@ CONFIG_DRM_RADEON=y # # I2C support # -CONFIG_I2C=y -CONFIG_I2C_CHARDEV=y - -# -# I2C Algorithms -# -CONFIG_I2C_ALGOBIT=y -CONFIG_I2C_ALGOPCF=y -# CONFIG_I2C_ALGOPCA is not set - -# -# I2C Hardware Bus support -# -# CONFIG_I2C_ALI1535 is not set -# CONFIG_I2C_ALI1563 is not set -# CONFIG_I2C_ALI15X3 is not set -# CONFIG_I2C_AMD756 is not set -# CONFIG_I2C_AMD8111 is not set -# CONFIG_I2C_I801 is not set -# CONFIG_I2C_I810 is not set -# CONFIG_I2C_PIIX4 is not set -# CONFIG_I2C_ISA is not set -# CONFIG_I2C_NFORCE2 is not set -# CONFIG_I2C_PARPORT_LIGHT is not set -# CONFIG_I2C_PROSAVAGE is not set -# CONFIG_I2C_SAVAGE4 is not set -# CONFIG_SCx200_ACB is not set -# CONFIG_I2C_SIS5595 is not set -# CONFIG_I2C_SIS630 is not set -# CONFIG_I2C_SIS96X is not set -# CONFIG_I2C_STUB is not set -# CONFIG_I2C_VIA is not set -# CONFIG_I2C_VIAPRO is not set -# CONFIG_I2C_VOODOO3 is not set -# CONFIG_I2C_PCA_ISA is not set - -# -# Hardware Sensors Chip support -# -# CONFIG_I2C_SENSOR is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ASB100 is not set -# CONFIG_SENSORS_DS1621 is not set -# CONFIG_SENSORS_FSCHER is not set -# CONFIG_SENSORS_FSCPOS is not set -# CONFIG_SENSORS_GL518SM is not set -# CONFIG_SENSORS_GL520SM is not set -# CONFIG_SENSORS_IT87 is not set -# CONFIG_SENSORS_LM63 is not set -# CONFIG_SENSORS_LM75 is not set -# CONFIG_SENSORS_LM77 is not set -# CONFIG_SENSORS_LM78 is not set -# CONFIG_SENSORS_LM80 is not set -# CONFIG_SENSORS_LM83 is not set -# CONFIG_SENSORS_LM85 is not set -# CONFIG_SENSORS_LM87 is not set -# CONFIG_SENSORS_LM90 is not set -# CONFIG_SENSORS_LM92 is not set -# CONFIG_SENSORS_MAX1619 is not set -# CONFIG_SENSORS_PC87360 is not set -# CONFIG_SENSORS_SMSC47B397 is not set -# CONFIG_SENSORS_SIS5595 is not set -# CONFIG_SENSORS_SMSC47M1 is not set -# CONFIG_SENSORS_VIA686A is not set -# CONFIG_SENSORS_W83781D is not set -# CONFIG_SENSORS_W83L785TS is not set -# CONFIG_SENSORS_W83627HF is not set - -# -# Other I2C Chip support -# -# CONFIG_SENSORS_DS1337 is not set -# CONFIG_SENSORS_EEPROM is not set -# CONFIG_SENSORS_PCF8574 is not set -# CONFIG_SENSORS_PCF8591 is not set -# CONFIG_SENSORS_RTC8564 is not set -# CONFIG_I2C_DEBUG_CORE is not set -# CONFIG_I2C_DEBUG_ALGO is not set -# CONFIG_I2C_DEBUG_BUS is not set -# CONFIG_I2C_DEBUG_CHIP is not set +# CONFIG_I2C is not set # # Dallas's 1-wire bus @@ -704,37 +702,7 @@ CONFIG_I2C_ALGOPCF=y # # Multimedia devices # -CONFIG_VIDEO_DEV=y - -# -# Video For Linux -# - -# -# Video Adapters -# -# CONFIG_VIDEO_BT848 is not set -# CONFIG_VIDEO_CPIA is not set -# CONFIG_VIDEO_SAA5246A is not set -# CONFIG_VIDEO_SAA5249 is not set -# CONFIG_TUNER_3036 is not set -# CONFIG_VIDEO_STRADIS is not set -# CONFIG_VIDEO_ZORAN is not set -# CONFIG_VIDEO_ZR36120 is not set -# CONFIG_VIDEO_SAA7134 is not set -# CONFIG_VIDEO_MXB is not set -# CONFIG_VIDEO_DPC is not set -# CONFIG_VIDEO_HEXIUM_ORION is not set -# CONFIG_VIDEO_HEXIUM_GEMINI is not set -# CONFIG_VIDEO_CX88 is not set -# CONFIG_VIDEO_OVCAMCHIP is not set - -# -# Radio Adapters -# -# CONFIG_RADIO_GEMTEK_PCI is not set -# CONFIG_RADIO_MAXIRADIO is not set -# CONFIG_RADIO_MAESTRO is not set +# CONFIG_VIDEO_DEV is not set # # Digital Video Broadcasting Devices @@ -744,85 +712,51 @@ CONFIG_VIDEO_DEV=y # # Graphics support # -CONFIG_FB=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_SOFT_CURSOR=y -# CONFIG_FB_MACMODES is not set -CONFIG_FB_MODE_HELPERS=y -# CONFIG_FB_TILEBLITTING is not set -# CONFIG_FB_CIRRUS is not set -# CONFIG_FB_PM2 is not set -# CONFIG_FB_CYBER2000 is not set -# CONFIG_FB_ASILIANT is not set -# CONFIG_FB_IMSTT is not set -# CONFIG_FB_NVIDIA is not set -# CONFIG_FB_RIVA is not set -# CONFIG_FB_MATROX is not set -# CONFIG_FB_RADEON_OLD is not set -CONFIG_FB_RADEON=y -CONFIG_FB_RADEON_I2C=y -CONFIG_FB_RADEON_DEBUG=y -# CONFIG_FB_ATY128 is not set -# CONFIG_FB_ATY is not set -# CONFIG_FB_SAVAGE is not set -# CONFIG_FB_SIS is not set -# CONFIG_FB_NEOMAGIC is not set -# CONFIG_FB_KYRO is not set -# CONFIG_FB_3DFX is not set -# CONFIG_FB_VOODOO1 is not set -# CONFIG_FB_TRIDENT is not set -# CONFIG_FB_PM3 is not set -# CONFIG_FB_S1D13XXX is not set -# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB is not set # -# Logo configuration +# Console display driver support # -CONFIG_LOGO=y -# CONFIG_LOGO_LINUX_MONO is not set -# CONFIG_LOGO_LINUX_VGA16 is not set -CONFIG_LOGO_LINUX_CLUT224=y -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_VGA_CONSOLE=y +CONFIG_DUMMY_CONSOLE=y # # Sound # -CONFIG_SOUND=y +CONFIG_SOUND=m # # Advanced Linux Sound Architecture # -CONFIG_SND=y -CONFIG_SND_TIMER=y -CONFIG_SND_PCM=y -CONFIG_SND_HWDEP=y -CONFIG_SND_RAWMIDI=y -CONFIG_SND_SEQUENCER=y -# CONFIG_SND_SEQ_DUMMY is not set +CONFIG_SND=m +CONFIG_SND_TIMER=m +CONFIG_SND_PCM=m +CONFIG_SND_HWDEP=m +CONFIG_SND_RAWMIDI=m +CONFIG_SND_SEQUENCER=m +CONFIG_SND_SEQ_DUMMY=m CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=y -CONFIG_SND_PCM_OSS=y +CONFIG_SND_MIXER_OSS=m +CONFIG_SND_PCM_OSS=m CONFIG_SND_SEQUENCER_OSS=y -# CONFIG_SND_VERBOSE_PRINTK is not set +CONFIG_SND_VERBOSE_PRINTK=y # CONFIG_SND_DEBUG is not set # # Generic devices # -CONFIG_SND_MPU401_UART=y -CONFIG_SND_OPL3_LIB=y -# CONFIG_SND_DUMMY is not set -# CONFIG_SND_VIRMIDI is not set -# CONFIG_SND_MTPAV is not set -# CONFIG_SND_SERIAL_U16550 is not set -# CONFIG_SND_MPU401 is not set +CONFIG_SND_MPU401_UART=m +CONFIG_SND_OPL3_LIB=m +CONFIG_SND_DUMMY=m +CONFIG_SND_VIRMIDI=m +CONFIG_SND_MTPAV=m +CONFIG_SND_SERIAL_U16550=m +CONFIG_SND_MPU401=m # # PCI devices # -CONFIG_SND_AC97_CODEC=y +CONFIG_SND_AC97_CODEC=m # CONFIG_SND_ALI5451 is not set # CONFIG_SND_ATIIXP is not set # CONFIG_SND_ATIIXP_MODEM is not set @@ -831,9 +765,10 @@ CONFIG_SND_AC97_CODEC=y # CONFIG_SND_AU8830 is not set # CONFIG_SND_AZT3328 is not set # CONFIG_SND_BT87X is not set -# CONFIG_SND_CS46XX is not set -# CONFIG_SND_CS4281 is not set -# CONFIG_SND_EMU10K1 is not set +CONFIG_SND_CS46XX=m +CONFIG_SND_CS46XX_NEW_DSP=y +CONFIG_SND_CS4281=m +CONFIG_SND_EMU10K1=m # CONFIG_SND_EMU10K1X is not set # CONFIG_SND_CA0106 is not set # CONFIG_SND_KORG1212 is not set @@ -852,8 +787,8 @@ CONFIG_SND_AC97_CODEC=y # CONFIG_SND_ES1938 is not set # CONFIG_SND_ES1968 is not set # CONFIG_SND_MAESTRO3 is not set -CONFIG_SND_FM801=y -CONFIG_SND_FM801_TEA575X=y +CONFIG_SND_FM801=m +# CONFIG_SND_FM801_TEA575X is not set # CONFIG_SND_ICE1712 is not set # CONFIG_SND_ICE1724 is not set # CONFIG_SND_INTEL8X0 is not set @@ -879,14 +814,14 @@ CONFIG_SND_FM801_TEA575X=y # CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB=y +CONFIG_USB=m # CONFIG_USB_DEBUG is not set # # Miscellaneous USB options # -# CONFIG_USB_DEVICEFS is not set -CONFIG_USB_BANDWIDTH=y +CONFIG_USB_DEVICEFS=y +# CONFIG_USB_BANDWIDTH is not set # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set # CONFIG_USB_OTG is not set @@ -894,13 +829,13 @@ CONFIG_USB_BANDWIDTH=y # # USB Host Controller Drivers # -CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD=m # CONFIG_USB_EHCI_SPLIT_ISO is not set # CONFIG_USB_EHCI_ROOT_HUB_TT is not set -CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD=m # CONFIG_USB_OHCI_BIG_ENDIAN is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=y +CONFIG_USB_UHCI_HCD=m # CONFIG_USB_SL811_HCD is not set # @@ -915,10 +850,11 @@ CONFIG_USB_UHCI_HCD=y # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information # -CONFIG_USB_STORAGE=y +CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set +# CONFIG_USB_STORAGE_ISD200 is not set # CONFIG_USB_STORAGE_DPCM is not set # CONFIG_USB_STORAGE_USBAT is not set # CONFIG_USB_STORAGE_SDDR09 is not set @@ -928,10 +864,16 @@ CONFIG_USB_STORAGE=y # # USB Input Devices # -CONFIG_USB_HID=y +CONFIG_USB_HID=m CONFIG_USB_HIDINPUT=y # CONFIG_HID_FF is not set -CONFIG_USB_HIDDEV=y +# CONFIG_USB_HIDDEV is not set + +# +# USB HID Boot Protocol drivers +# +# CONFIG_USB_KBD is not set +# CONFIG_USB_MOUSE is not set # CONFIG_USB_AIPTEK is not set # CONFIG_USB_WACOM is not set # CONFIG_USB_KBTAB is not set @@ -951,15 +893,10 @@ CONFIG_USB_HIDDEV=y # USB Multimedia devices # # CONFIG_USB_DABUSB is not set -# CONFIG_USB_VICAM is not set -# CONFIG_USB_DSBR is not set -# CONFIG_USB_IBMCAM is not set -# CONFIG_USB_KONICAWC is not set -# CONFIG_USB_OV511 is not set -# CONFIG_USB_SE401 is not set -# CONFIG_USB_SN9C102 is not set -# CONFIG_USB_STV680 is not set -# CONFIG_USB_PWC is not set + +# +# Video4Linux support is needed for USB Multimedia device support +# # # USB Network Adapters @@ -969,7 +906,7 @@ CONFIG_USB_HIDDEV=y # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set # CONFIG_USB_USBNET is not set -CONFIG_USB_MON=y +CONFIG_USB_MON=m # # USB port drivers @@ -995,6 +932,7 @@ CONFIG_USB_MON=y # CONFIG_USB_PHIDGETSERVO is not set # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_SISUSBVGA is not set +# CONFIG_USB_TEST is not set # # USB ATM/DSL drivers @@ -1013,54 +951,71 @@ CONFIG_USB_MON=y # # InfiniBand support # -# CONFIG_INFINIBAND is not set +CONFIG_INFINIBAND=m +CONFIG_INFINIBAND_MTHCA=m +# CONFIG_INFINIBAND_MTHCA_DEBUG is not set +CONFIG_INFINIBAND_IPOIB=m +# CONFIG_INFINIBAND_IPOIB_DEBUG is not set # # File systems # CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y -# CONFIG_EXT2_FS_POSIX_ACL is not set -# CONFIG_EXT2_FS_SECURITY is not set +CONFIG_EXT2_FS_POSIX_ACL=y +CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y -# CONFIG_EXT3_FS_POSIX_ACL is not set -# CONFIG_EXT3_FS_SECURITY is not set +CONFIG_EXT3_FS_POSIX_ACL=y +CONFIG_EXT3_FS_SECURITY=y CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set CONFIG_FS_MBCACHE=y -# CONFIG_REISERFS_FS is not set +CONFIG_REISERFS_FS=m +# CONFIG_REISERFS_CHECK is not set +# CONFIG_REISERFS_PROC_INFO is not set +CONFIG_REISERFS_FS_XATTR=y +CONFIG_REISERFS_FS_POSIX_ACL=y +CONFIG_REISERFS_FS_SECURITY=y # CONFIG_JFS_FS is not set +CONFIG_FS_POSIX_ACL=y # # XFS support # -# CONFIG_XFS_FS is not set +CONFIG_XFS_FS=m +CONFIG_XFS_EXPORT=y +# CONFIG_XFS_RT is not set +# CONFIG_XFS_QUOTA is not set +# CONFIG_XFS_SECURITY is not set +# CONFIG_XFS_POSIX_ACL is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y CONFIG_AUTOFS_FS=y -# CONFIG_AUTOFS4_FS is not set +CONFIG_AUTOFS4_FS=y # # CD-ROM/DVD Filesystems # -CONFIG_ISO9660_FS=y +CONFIG_ISO9660_FS=m CONFIG_JOLIET=y # CONFIG_ZISOFS is not set -CONFIG_UDF_FS=y +CONFIG_UDF_FS=m CONFIG_UDF_NLS=y # # DOS/FAT/NT Filesystems # CONFIG_FAT_FS=y -CONFIG_MSDOS_FS=y +# CONFIG_MSDOS_FS is not set CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -# CONFIG_NTFS_FS is not set +CONFIG_NTFS_FS=m +# CONFIG_NTFS_DEBUG is not set +# CONFIG_NTFS_RW is not set # # Pseudo filesystems @@ -1097,23 +1052,28 @@ CONFIG_RAMFS=y # # Network File Systems # -CONFIG_NFS_FS=y +CONFIG_NFS_FS=m CONFIG_NFS_V3=y CONFIG_NFS_V4=y -# CONFIG_NFS_DIRECTIO is not set -CONFIG_NFSD=y +CONFIG_NFS_DIRECTIO=y +CONFIG_NFSD=m CONFIG_NFSD_V3=y -# CONFIG_NFSD_V4 is not set -# CONFIG_NFSD_TCP is not set -CONFIG_LOCKD=y +CONFIG_NFSD_V4=y +CONFIG_NFSD_TCP=y +CONFIG_LOCKD=m CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=y -CONFIG_SUNRPC=y -CONFIG_SUNRPC_GSS=y -CONFIG_RPCSEC_GSS_KRB5=y +CONFIG_EXPORTFS=m +CONFIG_SUNRPC=m +CONFIG_SUNRPC_GSS=m +CONFIG_RPCSEC_GSS_KRB5=m # CONFIG_RPCSEC_GSS_SPKM3 is not set -# CONFIG_SMB_FS is not set -# CONFIG_CIFS is not set +CONFIG_SMB_FS=m +CONFIG_SMB_NLS_DEFAULT=y +CONFIG_SMB_NLS_REMOTE="cp437" +CONFIG_CIFS=m +# CONFIG_CIFS_STATS is not set +# CONFIG_CIFS_XATTR is not set +# CONFIG_CIFS_EXPERIMENTAL is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -1133,7 +1093,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set # CONFIG_LDM_PARTITION is not set -# CONFIG_SGI_PARTITION is not set +CONFIG_SGI_PARTITION=y # CONFIG_ULTRIX_PARTITION is not set # CONFIG_SUN_PARTITION is not set CONFIG_EFI_PARTITION=y @@ -1144,43 +1104,43 @@ CONFIG_EFI_PARTITION=y CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=y -CONFIG_NLS_CODEPAGE_775=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_CODEPAGE_852=y -CONFIG_NLS_CODEPAGE_855=y -CONFIG_NLS_CODEPAGE_857=y -CONFIG_NLS_CODEPAGE_860=y -CONFIG_NLS_CODEPAGE_861=y -CONFIG_NLS_CODEPAGE_862=y -CONFIG_NLS_CODEPAGE_863=y -CONFIG_NLS_CODEPAGE_864=y -CONFIG_NLS_CODEPAGE_865=y -CONFIG_NLS_CODEPAGE_866=y -CONFIG_NLS_CODEPAGE_869=y -CONFIG_NLS_CODEPAGE_936=y -CONFIG_NLS_CODEPAGE_950=y -CONFIG_NLS_CODEPAGE_932=y -CONFIG_NLS_CODEPAGE_949=y -CONFIG_NLS_CODEPAGE_874=y -CONFIG_NLS_ISO8859_8=y -# CONFIG_NLS_CODEPAGE_1250 is not set -CONFIG_NLS_CODEPAGE_1251=y +CONFIG_NLS_CODEPAGE_737=m +CONFIG_NLS_CODEPAGE_775=m +CONFIG_NLS_CODEPAGE_850=m +CONFIG_NLS_CODEPAGE_852=m +CONFIG_NLS_CODEPAGE_855=m +CONFIG_NLS_CODEPAGE_857=m +CONFIG_NLS_CODEPAGE_860=m +CONFIG_NLS_CODEPAGE_861=m +CONFIG_NLS_CODEPAGE_862=m +CONFIG_NLS_CODEPAGE_863=m +CONFIG_NLS_CODEPAGE_864=m +CONFIG_NLS_CODEPAGE_865=m +CONFIG_NLS_CODEPAGE_866=m +CONFIG_NLS_CODEPAGE_869=m +CONFIG_NLS_CODEPAGE_936=m +CONFIG_NLS_CODEPAGE_950=m +CONFIG_NLS_CODEPAGE_932=m +CONFIG_NLS_CODEPAGE_949=m +CONFIG_NLS_CODEPAGE_874=m +CONFIG_NLS_ISO8859_8=m +CONFIG_NLS_CODEPAGE_1250=m +CONFIG_NLS_CODEPAGE_1251=m # CONFIG_NLS_ASCII is not set CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=y -CONFIG_NLS_ISO8859_3=y -CONFIG_NLS_ISO8859_4=y -CONFIG_NLS_ISO8859_5=y -CONFIG_NLS_ISO8859_6=y -CONFIG_NLS_ISO8859_7=y -CONFIG_NLS_ISO8859_9=y -CONFIG_NLS_ISO8859_13=y -CONFIG_NLS_ISO8859_14=y -CONFIG_NLS_ISO8859_15=y -CONFIG_NLS_KOI8_R=y -CONFIG_NLS_KOI8_U=y -CONFIG_NLS_UTF8=y +CONFIG_NLS_ISO8859_2=m +CONFIG_NLS_ISO8859_3=m +CONFIG_NLS_ISO8859_4=m +CONFIG_NLS_ISO8859_5=m +CONFIG_NLS_ISO8859_6=m +CONFIG_NLS_ISO8859_7=m +CONFIG_NLS_ISO8859_9=m +CONFIG_NLS_ISO8859_13=m +CONFIG_NLS_ISO8859_14=m +CONFIG_NLS_ISO8859_15=m +CONFIG_NLS_KOI8_R=m +CONFIG_NLS_KOI8_U=m +CONFIG_NLS_UTF8=m # # Library routines @@ -1191,6 +1151,13 @@ CONFIG_CRC32=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y +# +# HP Simulator drivers +# +# CONFIG_HP_SIMETH is not set +# CONFIG_HP_SIMSERIAL is not set +# CONFIG_HP_SIMSCSI is not set + # # Profiling support # @@ -1202,7 +1169,7 @@ CONFIG_GENERIC_IRQ_PROBE=y # CONFIG_PRINTK_TIME is not set CONFIG_DEBUG_KERNEL=y CONFIG_MAGIC_SYSRQ=y -CONFIG_LOG_BUF_SHIFT=17 +CONFIG_LOG_BUF_SHIFT=20 # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -1212,7 +1179,7 @@ CONFIG_LOG_BUF_SHIFT=17 # CONFIG_DEBUG_FS is not set CONFIG_IA64_GRANULE_16MB=y # CONFIG_IA64_GRANULE_64MB is not set -CONFIG_IA64_PRINT_HAZARDS=y +# CONFIG_IA64_PRINT_HAZARDS is not set # CONFIG_DISABLE_VHPT is not set # CONFIG_IA64_DEBUG_CMPXCHG is not set # CONFIG_IA64_DEBUG_IRQ is not set @@ -1230,13 +1197,13 @@ CONFIG_CRYPTO=y # CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set -CONFIG_CRYPTO_MD5=y +CONFIG_CRYPTO_MD5=m # CONFIG_CRYPTO_SHA1 is not set # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_WP512 is not set # CONFIG_CRYPTO_TGR192 is not set -CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_DES=m # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_SERPENT is not set From 5c68156782c366fcf183af26519684e8b4283122 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Thu, 3 Nov 2005 16:50:44 -0600 Subject: [PATCH 09/20] Oops, backout accidental test config, committed in wrong directory --- .../arch/xen/configs/xen0_defconfig_ia64 | 703 +++++++++--------- 1 file changed, 368 insertions(+), 335 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_ia64 b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_ia64 index 316538a427..b26686a525 100644 --- a/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_ia64 +++ b/linux-2.6-xen-sparse/arch/xen/configs/xen0_defconfig_ia64 @@ -1,35 +1,37 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.12.2 -# Thu Nov 3 12:14:08 2005 +# Linux kernel version: 2.6.12 +# Thu Sep 15 11:04:33 2005 # # # Code maturity level options # CONFIG_EXPERIMENTAL=y -CONFIG_CLEAN_COMPILE=y +# CONFIG_CLEAN_COMPILE is not set +CONFIG_BROKEN=y +CONFIG_BROKEN_ON_SMP=y CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 # # General setup # -CONFIG_LOCALVERSION="" +CONFIG_LOCALVERSION="xen" CONFIG_SWAP=y CONFIG_SYSVIPC=y -CONFIG_POSIX_MQUEUE=y -# CONFIG_BSD_PROCESS_ACCT is not set +# CONFIG_POSIX_MQUEUE is not set +CONFIG_BSD_PROCESS_ACCT=y +# CONFIG_BSD_PROCESS_ACCT_V3 is not set CONFIG_SYSCTL=y # CONFIG_AUDIT is not set CONFIG_HOTPLUG=y CONFIG_KOBJECT_UEVENT=y -CONFIG_IKCONFIG=y -CONFIG_IKCONFIG_PROC=y +# CONFIG_IKCONFIG is not set # CONFIG_CPUSETS is not set # CONFIG_EMBEDDED is not set CONFIG_KALLSYMS=y -CONFIG_KALLSYMS_ALL=y +# CONFIG_KALLSYMS_ALL is not set # CONFIG_KALLSYMS_EXTRA_PASS is not set CONFIG_PRINTK=y CONFIG_BUG=y @@ -48,13 +50,11 @@ CONFIG_BASE_SMALL=0 # Loadable module support # CONFIG_MODULES=y -CONFIG_MODULE_UNLOAD=y -# CONFIG_MODULE_FORCE_UNLOAD is not set +# CONFIG_MODULE_UNLOAD is not set CONFIG_OBSOLETE_MODPARM=y -CONFIG_MODVERSIONS=y +# CONFIG_MODVERSIONS is not set # CONFIG_MODULE_SRCVERSION_ALL is not set -CONFIG_KMOD=y -CONFIG_STOP_MACHINE=y +# CONFIG_KMOD is not set # # Processor type and features @@ -67,10 +67,15 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_TIME_INTERPOLATION=y CONFIG_EFI=y CONFIG_GENERIC_IOMAP=y +CONFIG_XEN=y +CONFIG_ARCH_XEN=y +CONFIG_XEN_PRIVILEGED_GUEST=y +CONFIG_XEN_PHYSDEV_ACCESS=y +CONFIG_XEN_BLKDEV_GRANT=y CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y -CONFIG_IA64_GENERIC=y +# CONFIG_IA64_GENERIC is not set # CONFIG_IA64_DIG is not set -# CONFIG_IA64_HP_ZX1 is not set +CONFIG_IA64_HP_ZX1=y # CONFIG_IA64_HP_ZX1_SWIOTLB is not set # CONFIG_IA64_SGI_SN2 is not set # CONFIG_IA64_HP_SIM is not set @@ -81,15 +86,14 @@ CONFIG_MCKINLEY=y CONFIG_IA64_PAGE_SIZE_16KB=y # CONFIG_IA64_PAGE_SIZE_64KB is not set CONFIG_IA64_L1_CACHE_SHIFT=7 -CONFIG_NUMA=y +# CONFIG_NUMA is not set CONFIG_VIRTUAL_MEM_MAP=y CONFIG_HOLES_IN_ZONE=y -CONFIG_DISCONTIGMEM=y -CONFIG_IA64_CYCLONE=y +# CONFIG_IA64_CYCLONE is not set CONFIG_IOSAPIC=y CONFIG_FORCE_MAX_ZONEORDER=18 CONFIG_SMP=y -CONFIG_NR_CPUS=2 +CONFIG_NR_CPUS=16 # CONFIG_HOTPLUG_CPU is not set # CONFIG_SCHED_SMT is not set # CONFIG_PREEMPT is not set @@ -100,18 +104,13 @@ CONFIG_PERFMON=y CONFIG_IA64_PALINFO=y CONFIG_ACPI_DEALLOCATE_IRQ=y -CONFIG_XEN=y -CONFIG_XEN_PRIVILEGED_GUEST=y -CONFIG_XEN_PHYSDEV_ACCESS=y -CONFIG_XEN_BLKDEV_GRANT=y - # # Firmware Drivers # CONFIG_EFI_VARS=y CONFIG_EFI_PCDP=y CONFIG_BINFMT_ELF=y -CONFIG_BINFMT_MISC=m +CONFIG_BINFMT_MISC=y # # Power management and ACPI @@ -124,19 +123,18 @@ CONFIG_ACPI=y # CONFIG_ACPI_BOOT=y CONFIG_ACPI_INTERPRETER=y -CONFIG_ACPI_BUTTON=m -CONFIG_ACPI_VIDEO=m -CONFIG_ACPI_FAN=m -CONFIG_ACPI_PROCESSOR=m -CONFIG_ACPI_THERMAL=m -CONFIG_ACPI_NUMA=y +CONFIG_ACPI_BUTTON=y +# CONFIG_ACPI_VIDEO is not set +CONFIG_ACPI_FAN=y +CONFIG_ACPI_PROCESSOR=y +CONFIG_ACPI_THERMAL=y CONFIG_ACPI_BLACKLIST_YEAR=0 # CONFIG_ACPI_DEBUG is not set CONFIG_ACPI_BUS=y CONFIG_ACPI_POWER=y CONFIG_ACPI_PCI=y CONFIG_ACPI_SYSTEM=y -CONFIG_ACPI_CONTAINER=m +# CONFIG_ACPI_CONTAINER is not set # # Bus options (PCI, PCMCIA) @@ -151,9 +149,9 @@ CONFIG_PCI_NAMES=y # # PCI Hotplug Support # -CONFIG_HOTPLUG_PCI=m +CONFIG_HOTPLUG_PCI=y # CONFIG_HOTPLUG_PCI_FAKE is not set -CONFIG_HOTPLUG_PCI_ACPI=m +CONFIG_HOTPLUG_PCI_ACPI=y # CONFIG_HOTPLUG_PCI_ACPI_IBM is not set # CONFIG_HOTPLUG_PCI_CPCI is not set # CONFIG_HOTPLUG_PCI_SHPC is not set @@ -198,9 +196,9 @@ CONFIG_PREVENT_FIRMWARE_BUILD=y # CONFIG_BLK_DEV_DAC960 is not set # CONFIG_BLK_DEV_UMEM is not set # CONFIG_BLK_DEV_COW_COMMON is not set -CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m -CONFIG_BLK_DEV_NBD=m +CONFIG_BLK_DEV_LOOP=y +# CONFIG_BLK_DEV_CRYPTOLOOP is not set +# CONFIG_BLK_DEV_NBD is not set # CONFIG_BLK_DEV_SX8 is not set # CONFIG_BLK_DEV_UB is not set CONFIG_BLK_DEV_RAM=y @@ -222,60 +220,7 @@ CONFIG_IOSCHED_CFQ=y # # ATA/ATAPI/MFM/RLL support # -CONFIG_IDE=y -CONFIG_BLK_DEV_IDE=y - -# -# Please see Documentation/ide.txt for help/info on IDE drives -# -# CONFIG_BLK_DEV_IDE_SATA is not set -CONFIG_BLK_DEV_IDEDISK=y -# CONFIG_IDEDISK_MULTI_MODE is not set -CONFIG_BLK_DEV_IDECD=y -# CONFIG_BLK_DEV_IDETAPE is not set -CONFIG_BLK_DEV_IDEFLOPPY=y -CONFIG_BLK_DEV_IDESCSI=m -# CONFIG_IDE_TASK_IOCTL is not set - -# -# IDE chipset support/bugfixes -# -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_IDEPCI=y -# CONFIG_IDEPCI_SHARE_IRQ is not set -# CONFIG_BLK_DEV_OFFBOARD is not set -CONFIG_BLK_DEV_GENERIC=y -# CONFIG_BLK_DEV_OPTI621 is not set -CONFIG_BLK_DEV_IDEDMA_PCI=y -# CONFIG_BLK_DEV_IDEDMA_FORCED is not set -CONFIG_IDEDMA_PCI_AUTO=y -# CONFIG_IDEDMA_ONLYDISK is not set -# CONFIG_BLK_DEV_AEC62XX is not set -# CONFIG_BLK_DEV_ALI15X3 is not set -# CONFIG_BLK_DEV_AMD74XX is not set -CONFIG_BLK_DEV_CMD64X=y -# CONFIG_BLK_DEV_TRIFLEX is not set -# CONFIG_BLK_DEV_CY82C693 is not set -# CONFIG_BLK_DEV_CS5520 is not set -# CONFIG_BLK_DEV_CS5530 is not set -# CONFIG_BLK_DEV_HPT34X is not set -# CONFIG_BLK_DEV_HPT366 is not set -# CONFIG_BLK_DEV_SC1200 is not set -CONFIG_BLK_DEV_PIIX=y -# CONFIG_BLK_DEV_NS87415 is not set -# CONFIG_BLK_DEV_PDC202XX_OLD is not set -# CONFIG_BLK_DEV_PDC202XX_NEW is not set -# CONFIG_BLK_DEV_SVWKS is not set -CONFIG_BLK_DEV_SGIIOC4=y -# CONFIG_BLK_DEV_SIIMAGE is not set -# CONFIG_BLK_DEV_SLC90E66 is not set -# CONFIG_BLK_DEV_TRM290 is not set -# CONFIG_BLK_DEV_VIA82CXXX is not set -# CONFIG_IDE_ARM is not set -CONFIG_BLK_DEV_IDEDMA=y -# CONFIG_IDEDMA_IVB is not set -CONFIG_IDEDMA_AUTO=y -# CONFIG_BLK_DEV_HD is not set +# CONFIG_IDE is not set # # SCSI device support @@ -287,24 +232,24 @@ CONFIG_SCSI_PROC_FS=y # SCSI support type (disk, tape, CD-ROM) # CONFIG_BLK_DEV_SD=y -CONFIG_CHR_DEV_ST=m -# CONFIG_CHR_DEV_OSST is not set -CONFIG_BLK_DEV_SR=m -# CONFIG_BLK_DEV_SR_VENDOR is not set +CONFIG_CHR_DEV_ST=y +CONFIG_CHR_DEV_OSST=y +CONFIG_BLK_DEV_SR=y +CONFIG_BLK_DEV_SR_VENDOR=y CONFIG_CHR_DEV_SG=y # # Some SCSI devices (e.g. CD jukebox) support multiple LUNs # -# CONFIG_SCSI_MULTI_LUN is not set -# CONFIG_SCSI_CONSTANTS is not set -# CONFIG_SCSI_LOGGING is not set +CONFIG_SCSI_MULTI_LUN=y +CONFIG_SCSI_CONSTANTS=y +CONFIG_SCSI_LOGGING=y # # SCSI Transport Attributes # CONFIG_SCSI_SPI_ATTRS=y -CONFIG_SCSI_FC_ATTRS=y +# CONFIG_SCSI_FC_ATTRS is not set # CONFIG_SCSI_ISCSI_ATTRS is not set # @@ -317,10 +262,13 @@ CONFIG_SCSI_FC_ATTRS=y # CONFIG_SCSI_AIC7XXX is not set # CONFIG_SCSI_AIC7XXX_OLD is not set # CONFIG_SCSI_AIC79XX is not set +# CONFIG_SCSI_ADVANSYS is not set # CONFIG_MEGARAID_NEWGEN is not set # CONFIG_MEGARAID_LEGACY is not set # CONFIG_SCSI_SATA is not set +# CONFIG_SCSI_CPQFCTS is not set # CONFIG_SCSI_DMX3191D is not set +# CONFIG_SCSI_EATA_PIO is not set # CONFIG_SCSI_FUTURE_DOMAIN is not set # CONFIG_SCSI_IPS is not set # CONFIG_SCSI_INITIO is not set @@ -331,15 +279,17 @@ CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set # CONFIG_SCSI_IPR is not set -CONFIG_SCSI_QLOGIC_FC=y -# CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set +# CONFIG_SCSI_PCI2000 is not set +# CONFIG_SCSI_PCI2220I is not set +# CONFIG_SCSI_QLOGIC_ISP is not set +# CONFIG_SCSI_QLOGIC_FC is not set CONFIG_SCSI_QLOGIC_1280=y # CONFIG_SCSI_QLOGIC_1280_1040 is not set CONFIG_SCSI_QLA2XXX=y -CONFIG_SCSI_QLA21XX=m -CONFIG_SCSI_QLA22XX=m -CONFIG_SCSI_QLA2300=y -CONFIG_SCSI_QLA2322=m +# CONFIG_SCSI_QLA21XX is not set +# CONFIG_SCSI_QLA22XX is not set +# CONFIG_SCSI_QLA2300 is not set +# CONFIG_SCSI_QLA2322 is not set # CONFIG_SCSI_QLA6312 is not set # CONFIG_SCSI_LPFC is not set # CONFIG_SCSI_DC395x is not set @@ -349,22 +299,7 @@ CONFIG_SCSI_QLA2322=m # # Multi-device support (RAID and LVM) # -CONFIG_MD=y -CONFIG_BLK_DEV_MD=m -CONFIG_MD_LINEAR=m -CONFIG_MD_RAID0=m -CONFIG_MD_RAID1=m -# CONFIG_MD_RAID10 is not set -CONFIG_MD_RAID5=m -CONFIG_MD_RAID6=m -CONFIG_MD_MULTIPATH=m -# CONFIG_MD_FAULTY is not set -CONFIG_BLK_DEV_DM=m -CONFIG_DM_CRYPT=m -CONFIG_DM_SNAPSHOT=m -CONFIG_DM_MIRROR=m -CONFIG_DM_ZERO=m -# CONFIG_DM_MULTIPATH is not set +# CONFIG_MD is not set # # Fusion MPT device support @@ -402,16 +337,33 @@ CONFIG_IP_MULTICAST=y # CONFIG_NET_IPIP is not set # CONFIG_NET_IPGRE is not set # CONFIG_IP_MROUTE is not set -CONFIG_ARPD=y -CONFIG_SYN_COOKIES=y +# CONFIG_ARPD is not set +# CONFIG_SYN_COOKIES is not set # CONFIG_INET_AH is not set # CONFIG_INET_ESP is not set # CONFIG_INET_IPCOMP is not set # CONFIG_INET_TUNNEL is not set -CONFIG_IP_TCPDIAG=y +# CONFIG_IP_TCPDIAG is not set # CONFIG_IP_TCPDIAG_IPV6 is not set + +# +# IP: Virtual Server Configuration +# +# CONFIG_IP_VS is not set # CONFIG_IPV6 is not set -# CONFIG_NETFILTER is not set +CONFIG_NETFILTER=y +# CONFIG_NETFILTER_DEBUG is not set + +# +# IP: Netfilter Configuration +# +# CONFIG_IP_NF_CONNTRACK is not set +# CONFIG_IP_NF_CONNTRACK_MARK is not set +# CONFIG_IP_NF_QUEUE is not set +# CONFIG_IP_NF_IPTABLES is not set +CONFIG_IP_NF_ARPTABLES=y +# CONFIG_IP_NF_ARPFILTER is not set +# CONFIG_IP_NF_ARP_MANGLE is not set # # SCTP Configuration (EXPERIMENTAL) @@ -440,15 +392,13 @@ CONFIG_IP_TCPDIAG=y # Network testing # # CONFIG_NET_PKTGEN is not set -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_RX is not set -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set # CONFIG_HAMRADIO is not set # CONFIG_IRDA is not set # CONFIG_BT is not set CONFIG_NETDEVICES=y -CONFIG_DUMMY=m +CONFIG_DUMMY=y # CONFIG_BONDING is not set # CONFIG_EQUALIZER is not set # CONFIG_TUN is not set @@ -462,7 +412,7 @@ CONFIG_DUMMY=m # Ethernet (10 or 100Mbit) # CONFIG_NET_ETHERNET=y -CONFIG_MII=m +CONFIG_MII=y # CONFIG_HAPPYMEAL is not set # CONFIG_SUNGEM is not set # CONFIG_NET_VENDOR_3COM is not set @@ -472,10 +422,11 @@ CONFIG_MII=m # CONFIG_NET_TULIP=y # CONFIG_DE2104X is not set -CONFIG_TULIP=m -# CONFIG_TULIP_MWI is not set -# CONFIG_TULIP_MMIO is not set -# CONFIG_TULIP_NAPI is not set +CONFIG_TULIP=y +CONFIG_TULIP_MWI=y +CONFIG_TULIP_MMIO=y +CONFIG_TULIP_NAPI=y +CONFIG_TULIP_NAPI_HW_MITIGATION=y # CONFIG_DE4X5 is not set # CONFIG_WINBOND_840 is not set # CONFIG_DM9102 is not set @@ -487,8 +438,8 @@ CONFIG_NET_PCI=y # CONFIG_B44 is not set # CONFIG_FORCEDETH is not set # CONFIG_DGRS is not set -CONFIG_EEPRO100=m -CONFIG_E100=m +# CONFIG_EEPRO100 is not set +CONFIG_E100=y # CONFIG_FEALNX is not set # CONFIG_NATSEMI is not set # CONFIG_NE2K_PCI is not set @@ -541,7 +492,7 @@ CONFIG_TIGON3=y # CONFIG_SLIP is not set # CONFIG_NET_FC is not set # CONFIG_SHAPER is not set -CONFIG_NETCONSOLE=y +# CONFIG_NETCONSOLE is not set # # ISDN subsystem @@ -565,24 +516,16 @@ CONFIG_INPUT_MOUSEDEV=y CONFIG_INPUT_MOUSEDEV_PSAUX=y CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -# CONFIG_INPUT_JOYDEV is not set +CONFIG_INPUT_JOYDEV=y # CONFIG_INPUT_TSDEV is not set -# CONFIG_INPUT_EVDEV is not set +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_EVBUG is not set # # Input Device Drivers # -CONFIG_INPUT_KEYBOARD=y -CONFIG_KEYBOARD_ATKBD=y -# CONFIG_KEYBOARD_SUNKBD is not set -# CONFIG_KEYBOARD_LKKBD is not set -# CONFIG_KEYBOARD_XTKBD is not set -# CONFIG_KEYBOARD_NEWTON is not set -CONFIG_INPUT_MOUSE=y -CONFIG_MOUSE_PS2=y -# CONFIG_MOUSE_SERIAL is not set -# CONFIG_MOUSE_VSXXXAA is not set +# CONFIG_INPUT_KEYBOARD is not set +# CONFIG_INPUT_MOUSE is not set # CONFIG_INPUT_JOYSTICK is not set # CONFIG_INPUT_TOUCHSCREEN is not set # CONFIG_INPUT_MISC is not set @@ -591,34 +534,17 @@ CONFIG_MOUSE_PS2=y # Hardware I/O ports # CONFIG_SERIO=y -CONFIG_SERIO_I8042=y +# CONFIG_SERIO_I8042 is not set # CONFIG_SERIO_SERPORT is not set # CONFIG_SERIO_PCIPS2 is not set -CONFIG_SERIO_LIBPS2=y # CONFIG_SERIO_RAW is not set -CONFIG_GAMEPORT=m -# CONFIG_GAMEPORT_NS558 is not set -# CONFIG_GAMEPORT_L4 is not set -# CONFIG_GAMEPORT_EMU10K1 is not set -# CONFIG_GAMEPORT_VORTEX is not set -# CONFIG_GAMEPORT_FM801 is not set -# CONFIG_GAMEPORT_CS461X is not set +# CONFIG_GAMEPORT is not set # # Character devices # # CONFIG_VT is not set -# CONFIG_ROCKETPORT is not set -# CONFIG_CYCLADES is not set -# CONFIG_MOXA_SMARTIO is not set -# CONFIG_ISI is not set -# CONFIG_SYNCLINKMP is not set -# CONFIG_N_HDLC is not set -# CONFIG_SPECIALIX is not set -# CONFIG_SX is not set -# CONFIG_STALDRV is not set -CONFIG_SGI_SNSC=y -# CONFIG_SGI_TIOCX is not set +# CONFIG_SERIAL_NONSTANDARD is not set # # Serial drivers @@ -626,7 +552,7 @@ CONFIG_SGI_SNSC=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_ACPI=y -CONFIG_SERIAL_8250_NR_UARTS=6 +CONFIG_SERIAL_8250_NR_UARTS=8 CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_8250_DETECT_IRQ is not set @@ -638,7 +564,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y # CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y -CONFIG_SERIAL_SGI_L1_CONSOLE=y # CONFIG_SERIAL_JSM is not set CONFIG_UNIX98_PTYS=y CONFIG_LEGACY_PTYS=y @@ -662,23 +587,18 @@ CONFIG_EFI_RTC=y # # Ftape, the floppy tape device driver # -CONFIG_AGP=m -CONFIG_AGP_I460=m -CONFIG_AGP_HP_ZX1=m -# CONFIG_AGP_SGI_TIOCA is not set -CONFIG_DRM=m -CONFIG_DRM_TDFX=m -CONFIG_DRM_R128=m -CONFIG_DRM_RADEON=m -CONFIG_DRM_MGA=m -CONFIG_DRM_SIS=m -CONFIG_RAW_DRIVER=m -CONFIG_HPET=y -# CONFIG_HPET_RTC_IRQ is not set -CONFIG_HPET_MMAP=y -CONFIG_MAX_RAW_DEVS=256 +CONFIG_AGP=y +CONFIG_AGP_HP_ZX1=y +CONFIG_DRM=y +# CONFIG_DRM_TDFX is not set +# CONFIG_DRM_GAMMA is not set +# CONFIG_DRM_R128 is not set +CONFIG_DRM_RADEON=y +# CONFIG_DRM_MGA is not set +# CONFIG_DRM_SIS is not set +# CONFIG_RAW_DRIVER is not set +# CONFIG_HPET is not set # CONFIG_HANGCHECK_TIMER is not set -CONFIG_MMTIMER=y # # TPM devices @@ -688,7 +608,89 @@ CONFIG_MMTIMER=y # # I2C support # -# CONFIG_I2C is not set +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y + +# +# I2C Algorithms +# +CONFIG_I2C_ALGOBIT=y +CONFIG_I2C_ALGOPCF=y +# CONFIG_I2C_ALGOPCA is not set + +# +# I2C Hardware Bus support +# +# CONFIG_I2C_ALI1535 is not set +# CONFIG_I2C_ALI1563 is not set +# CONFIG_I2C_ALI15X3 is not set +# CONFIG_I2C_AMD756 is not set +# CONFIG_I2C_AMD8111 is not set +# CONFIG_I2C_I801 is not set +# CONFIG_I2C_I810 is not set +# CONFIG_I2C_PIIX4 is not set +# CONFIG_I2C_ISA is not set +# CONFIG_I2C_NFORCE2 is not set +# CONFIG_I2C_PARPORT_LIGHT is not set +# CONFIG_I2C_PROSAVAGE is not set +# CONFIG_I2C_SAVAGE4 is not set +# CONFIG_SCx200_ACB is not set +# CONFIG_I2C_SIS5595 is not set +# CONFIG_I2C_SIS630 is not set +# CONFIG_I2C_SIS96X is not set +# CONFIG_I2C_STUB is not set +# CONFIG_I2C_VIA is not set +# CONFIG_I2C_VIAPRO is not set +# CONFIG_I2C_VOODOO3 is not set +# CONFIG_I2C_PCA_ISA is not set + +# +# Hardware Sensors Chip support +# +# CONFIG_I2C_SENSOR is not set +# CONFIG_SENSORS_ADM1021 is not set +# CONFIG_SENSORS_ADM1025 is not set +# CONFIG_SENSORS_ADM1026 is not set +# CONFIG_SENSORS_ADM1031 is not set +# CONFIG_SENSORS_ASB100 is not set +# CONFIG_SENSORS_DS1621 is not set +# CONFIG_SENSORS_FSCHER is not set +# CONFIG_SENSORS_FSCPOS is not set +# CONFIG_SENSORS_GL518SM is not set +# CONFIG_SENSORS_GL520SM is not set +# CONFIG_SENSORS_IT87 is not set +# CONFIG_SENSORS_LM63 is not set +# CONFIG_SENSORS_LM75 is not set +# CONFIG_SENSORS_LM77 is not set +# CONFIG_SENSORS_LM78 is not set +# CONFIG_SENSORS_LM80 is not set +# CONFIG_SENSORS_LM83 is not set +# CONFIG_SENSORS_LM85 is not set +# CONFIG_SENSORS_LM87 is not set +# CONFIG_SENSORS_LM90 is not set +# CONFIG_SENSORS_LM92 is not set +# CONFIG_SENSORS_MAX1619 is not set +# CONFIG_SENSORS_PC87360 is not set +# CONFIG_SENSORS_SMSC47B397 is not set +# CONFIG_SENSORS_SIS5595 is not set +# CONFIG_SENSORS_SMSC47M1 is not set +# CONFIG_SENSORS_VIA686A is not set +# CONFIG_SENSORS_W83781D is not set +# CONFIG_SENSORS_W83L785TS is not set +# CONFIG_SENSORS_W83627HF is not set + +# +# Other I2C Chip support +# +# CONFIG_SENSORS_DS1337 is not set +# CONFIG_SENSORS_EEPROM is not set +# CONFIG_SENSORS_PCF8574 is not set +# CONFIG_SENSORS_PCF8591 is not set +# CONFIG_SENSORS_RTC8564 is not set +# CONFIG_I2C_DEBUG_CORE is not set +# CONFIG_I2C_DEBUG_ALGO is not set +# CONFIG_I2C_DEBUG_BUS is not set +# CONFIG_I2C_DEBUG_CHIP is not set # # Dallas's 1-wire bus @@ -702,7 +704,37 @@ CONFIG_MMTIMER=y # # Multimedia devices # -# CONFIG_VIDEO_DEV is not set +CONFIG_VIDEO_DEV=y + +# +# Video For Linux +# + +# +# Video Adapters +# +# CONFIG_VIDEO_BT848 is not set +# CONFIG_VIDEO_CPIA is not set +# CONFIG_VIDEO_SAA5246A is not set +# CONFIG_VIDEO_SAA5249 is not set +# CONFIG_TUNER_3036 is not set +# CONFIG_VIDEO_STRADIS is not set +# CONFIG_VIDEO_ZORAN is not set +# CONFIG_VIDEO_ZR36120 is not set +# CONFIG_VIDEO_SAA7134 is not set +# CONFIG_VIDEO_MXB is not set +# CONFIG_VIDEO_DPC is not set +# CONFIG_VIDEO_HEXIUM_ORION is not set +# CONFIG_VIDEO_HEXIUM_GEMINI is not set +# CONFIG_VIDEO_CX88 is not set +# CONFIG_VIDEO_OVCAMCHIP is not set + +# +# Radio Adapters +# +# CONFIG_RADIO_GEMTEK_PCI is not set +# CONFIG_RADIO_MAXIRADIO is not set +# CONFIG_RADIO_MAESTRO is not set # # Digital Video Broadcasting Devices @@ -712,51 +744,85 @@ CONFIG_MMTIMER=y # # Graphics support # -# CONFIG_FB is not set +CONFIG_FB=y +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +CONFIG_FB_SOFT_CURSOR=y +# CONFIG_FB_MACMODES is not set +CONFIG_FB_MODE_HELPERS=y +# CONFIG_FB_TILEBLITTING is not set +# CONFIG_FB_CIRRUS is not set +# CONFIG_FB_PM2 is not set +# CONFIG_FB_CYBER2000 is not set +# CONFIG_FB_ASILIANT is not set +# CONFIG_FB_IMSTT is not set +# CONFIG_FB_NVIDIA is not set +# CONFIG_FB_RIVA is not set +# CONFIG_FB_MATROX is not set +# CONFIG_FB_RADEON_OLD is not set +CONFIG_FB_RADEON=y +CONFIG_FB_RADEON_I2C=y +CONFIG_FB_RADEON_DEBUG=y +# CONFIG_FB_ATY128 is not set +# CONFIG_FB_ATY is not set +# CONFIG_FB_SAVAGE is not set +# CONFIG_FB_SIS is not set +# CONFIG_FB_NEOMAGIC is not set +# CONFIG_FB_KYRO is not set +# CONFIG_FB_3DFX is not set +# CONFIG_FB_VOODOO1 is not set +# CONFIG_FB_TRIDENT is not set +# CONFIG_FB_PM3 is not set +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_VIRTUAL is not set # -# Console display driver support +# Logo configuration # -CONFIG_VGA_CONSOLE=y -CONFIG_DUMMY_CONSOLE=y +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +CONFIG_LOGO_LINUX_CLUT224=y +# CONFIG_BACKLIGHT_LCD_SUPPORT is not set # # Sound # -CONFIG_SOUND=m +CONFIG_SOUND=y # # Advanced Linux Sound Architecture # -CONFIG_SND=m -CONFIG_SND_TIMER=m -CONFIG_SND_PCM=m -CONFIG_SND_HWDEP=m -CONFIG_SND_RAWMIDI=m -CONFIG_SND_SEQUENCER=m -CONFIG_SND_SEQ_DUMMY=m +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_HWDEP=y +CONFIG_SND_RAWMIDI=y +CONFIG_SND_SEQUENCER=y +# CONFIG_SND_SEQ_DUMMY is not set CONFIG_SND_OSSEMUL=y -CONFIG_SND_MIXER_OSS=m -CONFIG_SND_PCM_OSS=m +CONFIG_SND_MIXER_OSS=y +CONFIG_SND_PCM_OSS=y CONFIG_SND_SEQUENCER_OSS=y -CONFIG_SND_VERBOSE_PRINTK=y +# CONFIG_SND_VERBOSE_PRINTK is not set # CONFIG_SND_DEBUG is not set # # Generic devices # -CONFIG_SND_MPU401_UART=m -CONFIG_SND_OPL3_LIB=m -CONFIG_SND_DUMMY=m -CONFIG_SND_VIRMIDI=m -CONFIG_SND_MTPAV=m -CONFIG_SND_SERIAL_U16550=m -CONFIG_SND_MPU401=m +CONFIG_SND_MPU401_UART=y +CONFIG_SND_OPL3_LIB=y +# CONFIG_SND_DUMMY is not set +# CONFIG_SND_VIRMIDI is not set +# CONFIG_SND_MTPAV is not set +# CONFIG_SND_SERIAL_U16550 is not set +# CONFIG_SND_MPU401 is not set # # PCI devices # -CONFIG_SND_AC97_CODEC=m +CONFIG_SND_AC97_CODEC=y # CONFIG_SND_ALI5451 is not set # CONFIG_SND_ATIIXP is not set # CONFIG_SND_ATIIXP_MODEM is not set @@ -765,10 +831,9 @@ CONFIG_SND_AC97_CODEC=m # CONFIG_SND_AU8830 is not set # CONFIG_SND_AZT3328 is not set # CONFIG_SND_BT87X is not set -CONFIG_SND_CS46XX=m -CONFIG_SND_CS46XX_NEW_DSP=y -CONFIG_SND_CS4281=m -CONFIG_SND_EMU10K1=m +# CONFIG_SND_CS46XX is not set +# CONFIG_SND_CS4281 is not set +# CONFIG_SND_EMU10K1 is not set # CONFIG_SND_EMU10K1X is not set # CONFIG_SND_CA0106 is not set # CONFIG_SND_KORG1212 is not set @@ -787,8 +852,8 @@ CONFIG_SND_EMU10K1=m # CONFIG_SND_ES1938 is not set # CONFIG_SND_ES1968 is not set # CONFIG_SND_MAESTRO3 is not set -CONFIG_SND_FM801=m -# CONFIG_SND_FM801_TEA575X is not set +CONFIG_SND_FM801=y +CONFIG_SND_FM801_TEA575X=y # CONFIG_SND_ICE1712 is not set # CONFIG_SND_ICE1724 is not set # CONFIG_SND_INTEL8X0 is not set @@ -814,14 +879,14 @@ CONFIG_SND_FM801=m # CONFIG_USB_ARCH_HAS_HCD=y CONFIG_USB_ARCH_HAS_OHCI=y -CONFIG_USB=m +CONFIG_USB=y # CONFIG_USB_DEBUG is not set # # Miscellaneous USB options # -CONFIG_USB_DEVICEFS=y -# CONFIG_USB_BANDWIDTH is not set +# CONFIG_USB_DEVICEFS is not set +CONFIG_USB_BANDWIDTH=y # CONFIG_USB_DYNAMIC_MINORS is not set # CONFIG_USB_SUSPEND is not set # CONFIG_USB_OTG is not set @@ -829,13 +894,13 @@ CONFIG_USB_DEVICEFS=y # # USB Host Controller Drivers # -CONFIG_USB_EHCI_HCD=m +CONFIG_USB_EHCI_HCD=y # CONFIG_USB_EHCI_SPLIT_ISO is not set # CONFIG_USB_EHCI_ROOT_HUB_TT is not set -CONFIG_USB_OHCI_HCD=m +CONFIG_USB_OHCI_HCD=y # CONFIG_USB_OHCI_BIG_ENDIAN is not set CONFIG_USB_OHCI_LITTLE_ENDIAN=y -CONFIG_USB_UHCI_HCD=m +CONFIG_USB_UHCI_HCD=y # CONFIG_USB_SL811_HCD is not set # @@ -850,11 +915,10 @@ CONFIG_USB_UHCI_HCD=m # # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information # -CONFIG_USB_STORAGE=m +CONFIG_USB_STORAGE=y # CONFIG_USB_STORAGE_DEBUG is not set # CONFIG_USB_STORAGE_DATAFAB is not set # CONFIG_USB_STORAGE_FREECOM is not set -# CONFIG_USB_STORAGE_ISD200 is not set # CONFIG_USB_STORAGE_DPCM is not set # CONFIG_USB_STORAGE_USBAT is not set # CONFIG_USB_STORAGE_SDDR09 is not set @@ -864,16 +928,10 @@ CONFIG_USB_STORAGE=m # # USB Input Devices # -CONFIG_USB_HID=m +CONFIG_USB_HID=y CONFIG_USB_HIDINPUT=y # CONFIG_HID_FF is not set -# CONFIG_USB_HIDDEV is not set - -# -# USB HID Boot Protocol drivers -# -# CONFIG_USB_KBD is not set -# CONFIG_USB_MOUSE is not set +CONFIG_USB_HIDDEV=y # CONFIG_USB_AIPTEK is not set # CONFIG_USB_WACOM is not set # CONFIG_USB_KBTAB is not set @@ -893,10 +951,15 @@ CONFIG_USB_HIDINPUT=y # USB Multimedia devices # # CONFIG_USB_DABUSB is not set - -# -# Video4Linux support is needed for USB Multimedia device support -# +# CONFIG_USB_VICAM is not set +# CONFIG_USB_DSBR is not set +# CONFIG_USB_IBMCAM is not set +# CONFIG_USB_KONICAWC is not set +# CONFIG_USB_OV511 is not set +# CONFIG_USB_SE401 is not set +# CONFIG_USB_SN9C102 is not set +# CONFIG_USB_STV680 is not set +# CONFIG_USB_PWC is not set # # USB Network Adapters @@ -906,7 +969,7 @@ CONFIG_USB_HIDINPUT=y # CONFIG_USB_PEGASUS is not set # CONFIG_USB_RTL8150 is not set # CONFIG_USB_USBNET is not set -CONFIG_USB_MON=m +CONFIG_USB_MON=y # # USB port drivers @@ -932,7 +995,6 @@ CONFIG_USB_MON=m # CONFIG_USB_PHIDGETSERVO is not set # CONFIG_USB_IDMOUSE is not set # CONFIG_USB_SISUSBVGA is not set -# CONFIG_USB_TEST is not set # # USB ATM/DSL drivers @@ -951,71 +1013,54 @@ CONFIG_USB_MON=m # # InfiniBand support # -CONFIG_INFINIBAND=m -CONFIG_INFINIBAND_MTHCA=m -# CONFIG_INFINIBAND_MTHCA_DEBUG is not set -CONFIG_INFINIBAND_IPOIB=m -# CONFIG_INFINIBAND_IPOIB_DEBUG is not set +# CONFIG_INFINIBAND is not set # # File systems # CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y -CONFIG_EXT2_FS_POSIX_ACL=y -CONFIG_EXT2_FS_SECURITY=y +# CONFIG_EXT2_FS_POSIX_ACL is not set +# CONFIG_EXT2_FS_SECURITY is not set CONFIG_EXT3_FS=y CONFIG_EXT3_FS_XATTR=y -CONFIG_EXT3_FS_POSIX_ACL=y -CONFIG_EXT3_FS_SECURITY=y +# CONFIG_EXT3_FS_POSIX_ACL is not set +# CONFIG_EXT3_FS_SECURITY is not set CONFIG_JBD=y # CONFIG_JBD_DEBUG is not set CONFIG_FS_MBCACHE=y -CONFIG_REISERFS_FS=m -# CONFIG_REISERFS_CHECK is not set -# CONFIG_REISERFS_PROC_INFO is not set -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -CONFIG_REISERFS_FS_SECURITY=y +# CONFIG_REISERFS_FS is not set # CONFIG_JFS_FS is not set -CONFIG_FS_POSIX_ACL=y # # XFS support # -CONFIG_XFS_FS=m -CONFIG_XFS_EXPORT=y -# CONFIG_XFS_RT is not set -# CONFIG_XFS_QUOTA is not set -# CONFIG_XFS_SECURITY is not set -# CONFIG_XFS_POSIX_ACL is not set +# CONFIG_XFS_FS is not set # CONFIG_MINIX_FS is not set # CONFIG_ROMFS_FS is not set # CONFIG_QUOTA is not set CONFIG_DNOTIFY=y CONFIG_AUTOFS_FS=y -CONFIG_AUTOFS4_FS=y +# CONFIG_AUTOFS4_FS is not set # # CD-ROM/DVD Filesystems # -CONFIG_ISO9660_FS=m +CONFIG_ISO9660_FS=y CONFIG_JOLIET=y # CONFIG_ZISOFS is not set -CONFIG_UDF_FS=m +CONFIG_UDF_FS=y CONFIG_UDF_NLS=y # # DOS/FAT/NT Filesystems # CONFIG_FAT_FS=y -# CONFIG_MSDOS_FS is not set +CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -CONFIG_NTFS_FS=m -# CONFIG_NTFS_DEBUG is not set -# CONFIG_NTFS_RW is not set +# CONFIG_NTFS_FS is not set # # Pseudo filesystems @@ -1052,28 +1097,23 @@ CONFIG_RAMFS=y # # Network File Systems # -CONFIG_NFS_FS=m +CONFIG_NFS_FS=y CONFIG_NFS_V3=y CONFIG_NFS_V4=y -CONFIG_NFS_DIRECTIO=y -CONFIG_NFSD=m +# CONFIG_NFS_DIRECTIO is not set +CONFIG_NFSD=y CONFIG_NFSD_V3=y -CONFIG_NFSD_V4=y -CONFIG_NFSD_TCP=y -CONFIG_LOCKD=m +# CONFIG_NFSD_V4 is not set +# CONFIG_NFSD_TCP is not set +CONFIG_LOCKD=y CONFIG_LOCKD_V4=y -CONFIG_EXPORTFS=m -CONFIG_SUNRPC=m -CONFIG_SUNRPC_GSS=m -CONFIG_RPCSEC_GSS_KRB5=m +CONFIG_EXPORTFS=y +CONFIG_SUNRPC=y +CONFIG_SUNRPC_GSS=y +CONFIG_RPCSEC_GSS_KRB5=y # CONFIG_RPCSEC_GSS_SPKM3 is not set -CONFIG_SMB_FS=m -CONFIG_SMB_NLS_DEFAULT=y -CONFIG_SMB_NLS_REMOTE="cp437" -CONFIG_CIFS=m -# CONFIG_CIFS_STATS is not set -# CONFIG_CIFS_XATTR is not set -# CONFIG_CIFS_EXPERIMENTAL is not set +# CONFIG_SMB_FS is not set +# CONFIG_CIFS is not set # CONFIG_NCP_FS is not set # CONFIG_CODA_FS is not set # CONFIG_AFS_FS is not set @@ -1093,7 +1133,7 @@ CONFIG_MSDOS_PARTITION=y # CONFIG_SOLARIS_X86_PARTITION is not set # CONFIG_UNIXWARE_DISKLABEL is not set # CONFIG_LDM_PARTITION is not set -CONFIG_SGI_PARTITION=y +# CONFIG_SGI_PARTITION is not set # CONFIG_ULTRIX_PARTITION is not set # CONFIG_SUN_PARTITION is not set CONFIG_EFI_PARTITION=y @@ -1104,43 +1144,43 @@ CONFIG_EFI_PARTITION=y CONFIG_NLS=y CONFIG_NLS_DEFAULT="iso8859-1" CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_737=m -CONFIG_NLS_CODEPAGE_775=m -CONFIG_NLS_CODEPAGE_850=m -CONFIG_NLS_CODEPAGE_852=m -CONFIG_NLS_CODEPAGE_855=m -CONFIG_NLS_CODEPAGE_857=m -CONFIG_NLS_CODEPAGE_860=m -CONFIG_NLS_CODEPAGE_861=m -CONFIG_NLS_CODEPAGE_862=m -CONFIG_NLS_CODEPAGE_863=m -CONFIG_NLS_CODEPAGE_864=m -CONFIG_NLS_CODEPAGE_865=m -CONFIG_NLS_CODEPAGE_866=m -CONFIG_NLS_CODEPAGE_869=m -CONFIG_NLS_CODEPAGE_936=m -CONFIG_NLS_CODEPAGE_950=m -CONFIG_NLS_CODEPAGE_932=m -CONFIG_NLS_CODEPAGE_949=m -CONFIG_NLS_CODEPAGE_874=m -CONFIG_NLS_ISO8859_8=m -CONFIG_NLS_CODEPAGE_1250=m -CONFIG_NLS_CODEPAGE_1251=m +CONFIG_NLS_CODEPAGE_737=y +CONFIG_NLS_CODEPAGE_775=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_CODEPAGE_852=y +CONFIG_NLS_CODEPAGE_855=y +CONFIG_NLS_CODEPAGE_857=y +CONFIG_NLS_CODEPAGE_860=y +CONFIG_NLS_CODEPAGE_861=y +CONFIG_NLS_CODEPAGE_862=y +CONFIG_NLS_CODEPAGE_863=y +CONFIG_NLS_CODEPAGE_864=y +CONFIG_NLS_CODEPAGE_865=y +CONFIG_NLS_CODEPAGE_866=y +CONFIG_NLS_CODEPAGE_869=y +CONFIG_NLS_CODEPAGE_936=y +CONFIG_NLS_CODEPAGE_950=y +CONFIG_NLS_CODEPAGE_932=y +CONFIG_NLS_CODEPAGE_949=y +CONFIG_NLS_CODEPAGE_874=y +CONFIG_NLS_ISO8859_8=y +# CONFIG_NLS_CODEPAGE_1250 is not set +CONFIG_NLS_CODEPAGE_1251=y # CONFIG_NLS_ASCII is not set CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_ISO8859_2=m -CONFIG_NLS_ISO8859_3=m -CONFIG_NLS_ISO8859_4=m -CONFIG_NLS_ISO8859_5=m -CONFIG_NLS_ISO8859_6=m -CONFIG_NLS_ISO8859_7=m -CONFIG_NLS_ISO8859_9=m -CONFIG_NLS_ISO8859_13=m -CONFIG_NLS_ISO8859_14=m -CONFIG_NLS_ISO8859_15=m -CONFIG_NLS_KOI8_R=m -CONFIG_NLS_KOI8_U=m -CONFIG_NLS_UTF8=m +CONFIG_NLS_ISO8859_2=y +CONFIG_NLS_ISO8859_3=y +CONFIG_NLS_ISO8859_4=y +CONFIG_NLS_ISO8859_5=y +CONFIG_NLS_ISO8859_6=y +CONFIG_NLS_ISO8859_7=y +CONFIG_NLS_ISO8859_9=y +CONFIG_NLS_ISO8859_13=y +CONFIG_NLS_ISO8859_14=y +CONFIG_NLS_ISO8859_15=y +CONFIG_NLS_KOI8_R=y +CONFIG_NLS_KOI8_U=y +CONFIG_NLS_UTF8=y # # Library routines @@ -1151,13 +1191,6 @@ CONFIG_CRC32=y CONFIG_GENERIC_HARDIRQS=y CONFIG_GENERIC_IRQ_PROBE=y -# -# HP Simulator drivers -# -# CONFIG_HP_SIMETH is not set -# CONFIG_HP_SIMSERIAL is not set -# CONFIG_HP_SIMSCSI is not set - # # Profiling support # @@ -1169,7 +1202,7 @@ CONFIG_GENERIC_IRQ_PROBE=y # CONFIG_PRINTK_TIME is not set CONFIG_DEBUG_KERNEL=y CONFIG_MAGIC_SYSRQ=y -CONFIG_LOG_BUF_SHIFT=20 +CONFIG_LOG_BUF_SHIFT=17 # CONFIG_SCHEDSTATS is not set # CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_SPINLOCK is not set @@ -1179,7 +1212,7 @@ CONFIG_LOG_BUF_SHIFT=20 # CONFIG_DEBUG_FS is not set CONFIG_IA64_GRANULE_16MB=y # CONFIG_IA64_GRANULE_64MB is not set -# CONFIG_IA64_PRINT_HAZARDS is not set +CONFIG_IA64_PRINT_HAZARDS=y # CONFIG_DISABLE_VHPT is not set # CONFIG_IA64_DEBUG_CMPXCHG is not set # CONFIG_IA64_DEBUG_IRQ is not set @@ -1197,13 +1230,13 @@ CONFIG_CRYPTO=y # CONFIG_CRYPTO_HMAC is not set # CONFIG_CRYPTO_NULL is not set # CONFIG_CRYPTO_MD4 is not set -CONFIG_CRYPTO_MD5=m +CONFIG_CRYPTO_MD5=y # CONFIG_CRYPTO_SHA1 is not set # CONFIG_CRYPTO_SHA256 is not set # CONFIG_CRYPTO_SHA512 is not set # CONFIG_CRYPTO_WP512 is not set # CONFIG_CRYPTO_TGR192 is not set -CONFIG_CRYPTO_DES=m +CONFIG_CRYPTO_DES=y # CONFIG_CRYPTO_BLOWFISH is not set # CONFIG_CRYPTO_TWOFISH is not set # CONFIG_CRYPTO_SERPENT is not set From aeeb4d285458ac6e30c5702953a7d9e98de8ee49 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Thu, 3 Nov 2005 18:06:15 -0600 Subject: [PATCH 10/20] Fix gcc-3.4 compiler errors (submitted by Takebe Akio) --- xen/arch/ia64/linux-xen/efi.c | 3 ++- xen/arch/ia64/linux-xen/mm_contig.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/ia64/linux-xen/efi.c b/xen/arch/ia64/linux-xen/efi.c index c75f0fe728..d42935ddea 100644 --- a/xen/arch/ia64/linux-xen/efi.c +++ b/xen/arch/ia64/linux-xen/efi.c @@ -24,7 +24,6 @@ #include #include #include -#include #include #include @@ -33,6 +32,8 @@ #include #include +#include + #define EFI_DEBUG 0 extern efi_status_t efi_call_phys (void *, ...); diff --git a/xen/arch/ia64/linux-xen/mm_contig.c b/xen/arch/ia64/linux-xen/mm_contig.c index 896a871c3b..ee1d510636 100644 --- a/xen/arch/ia64/linux-xen/mm_contig.c +++ b/xen/arch/ia64/linux-xen/mm_contig.c @@ -16,7 +16,6 @@ */ #include #include -#include #include #include @@ -26,6 +25,7 @@ #include #include +#include #ifdef CONFIG_VIRTUAL_MEM_MAP static unsigned long num_dma_physpages; #endif From c3583237393703110adc2b2562af8cbd1c27662c Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Thu, 3 Nov 2005 21:37:29 -0600 Subject: [PATCH 11/20] Enable test for running_on_xen from modules Signed-off by: Dan Magenheimer --- linux-2.6-xen-sparse/arch/ia64/xen/Makefile | 2 +- linux-2.6-xen-sparse/arch/ia64/xen/xen_ksyms.c | 12 ++++++++++++ linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S | 6 ++++++ linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h | 5 +++++ 4 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 linux-2.6-xen-sparse/arch/ia64/xen/xen_ksyms.c diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/Makefile b/linux-2.6-xen-sparse/arch/ia64/xen/Makefile index 0ecefd3c89..8a83e57310 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/Makefile +++ b/linux-2.6-xen-sparse/arch/ia64/xen/Makefile @@ -2,4 +2,4 @@ # Makefile for Xen components # -obj-y := hypercall.o xenivt.o xenentry.o xensetup.o xenpal.o xenhpski.o xenconsole.o +obj-y := hypercall.o xenivt.o xenentry.o xensetup.o xenpal.o xenhpski.o xenconsole.o xen_ksyms.o diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/xen_ksyms.c b/linux-2.6-xen-sparse/arch/ia64/xen/xen_ksyms.c new file mode 100644 index 0000000000..83cff0b0c4 --- /dev/null +++ b/linux-2.6-xen-sparse/arch/ia64/xen/xen_ksyms.c @@ -0,0 +1,12 @@ +/* + * Architecture-specific kernel symbols + * + * Don't put any exports here unless it's defined in an assembler file. + * All other exports should be put directly after the definition. + */ + +#include +#include + +extern int is_running_on_xen(void); +EXPORT_SYMBOL(is_running_on_xen); diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S b/linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S index 6f078961d4..242c5c2f25 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S +++ b/linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S @@ -25,3 +25,9 @@ GLOBAL_ENTRY(early_xen_setup) (p7) mov cr.iva=r10 br.ret.sptk.many rp;; END(xen_init) + +GLOBAL_ENTRY(is_running_on_xen) + movl r9=running_on_xen;; + ld4 r8=[r9];; + br.ret.sptk.many rp;; +END(is_running_on_xen) diff --git a/linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h b/linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h index e746cd93b4..235197b8f4 100644 --- a/linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h +++ b/linux-2.6-xen-sparse/include/asm-ia64/xen/privop.h @@ -36,7 +36,12 @@ #endif #ifndef __ASSEMBLY__ +#ifdef MODULE +extern int is_running_on_xen(void); +#define running_on_xen (is_running_on_xen()) +#else extern int running_on_xen; +#endif #define XEN_HYPER_SSM_I asm("break 0x7"); #define XEN_HYPER_GET_IVR asm("break 0x8"); From 15e7453af8cbc7684f19e1feab73604eb3fb64e1 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Fri, 4 Nov 2005 10:40:29 -0600 Subject: [PATCH 12/20] Minor driver code changes/rearrangement to reduce ia64-specific patches Signed-off by: Dan Magenheimer --- .../ia64/xen/drivers/patches/console.c.patch | 10 --------- .../ia64/xen/drivers/patches/devmem.c.patch | 10 --------- .../ia64/xen/drivers/patches/gnttab.c.patch | 22 ------------------- .../ia64/xen/drivers/patches/privcmd.c.patch | 10 --------- linux-2.6-xen-sparse/arch/xen/kernel/devmem.c | 1 + .../drivers/xen/blkback/blkback.c | 4 ++++ .../drivers/xen/blkfront/blkfront.c | 4 ++++ .../drivers/xen/console/console.c | 3 +++ .../drivers/xen/privcmd/privcmd.c | 1 + .../include/asm-xen/asm-ia64/fixmap.h | 3 ++- .../include/asm-xen/asm-ia64/synch_bitops.h | 2 ++ 11 files changed, 17 insertions(+), 53 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch index d9b30e633b..71d655d4fd 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch +++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch @@ -1,15 +1,5 @@ --- xen/console/console.c 2005-11-02 14:13:07.000000000 +0100 +++ xen.patched/console/console.c 2005-11-02 14:21:20.000000000 +0100 -@@ -196,6 +196,9 @@ - void xen_console_init(void) - #endif - { -+ if (xen_init() < 0) -+ return __RETCODE; -+ - if (xen_start_info->flags & SIF_INITDOMAIN) { - if (xc_mode == XC_DEFAULT) - xc_mode = XC_SERIAL; @@ -768,9 +771,15 @@ #endif diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/devmem.c.patch b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/devmem.c.patch index ec6e9b3c83..924296442e 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/devmem.c.patch +++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/devmem.c.patch @@ -1,13 +1,3 @@ diff -Naur xen/core/devmem.c xen.patched/core/devmem.c --- xen/core/devmem.c 2005-09-23 10:54:50.000000000 -0600 +++ xen.patched/core/devmem.c 2005-09-23 10:57:51.000000000 -0600 -@@ -93,6 +93,9 @@ - if (uncached_access(file)) - vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); - -+#ifdef __ia64__ -+#define direct_remap_pfn_range(a,b,c,d,e,f) remap_pfn_range(a,b,c,d,e) -+#endif - if (direct_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff, - vma->vm_end - vma->vm_start, - vma->vm_page_prot, DOMID_IO)) diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/gnttab.c.patch b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/gnttab.c.patch index 84d89e1825..90272db1f4 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/gnttab.c.patch +++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/gnttab.c.patch @@ -1,17 +1,6 @@ diff -Naur xen/core/gnttab.c xen.patched/core/gnttab.c --- xen/core/gnttab.c 2005-09-23 10:54:50.000000000 -0600 +++ xen.patched/core/gnttab.c 2005-09-23 10:57:51.000000000 -0600 -@@ -19,6 +19,10 @@ - #include - #include - -+#ifdef __ia64__ -+#define synch_cmpxchg ia64_cmpxchg4_acq -+#endif -+ - #if 1 - #define ASSERT(_p) \ - if ( !(_p) ) { printk(KERN_ALERT"Assertion '%s': line %d, file %s\n", \ @@ -346,6 +350,10 @@ if ( hypercall.op != __HYPERVISOR_grant_table_op ) return -ENOSYS; @@ -43,17 +32,6 @@ diff -Naur xen/core/gnttab.c xen.patched/core/gnttab.c set_fixmap(FIX_GNTTAB_END - i, frames[i] << PAGE_SHIFT); +#endif - return 0; - } -@@ -434,8 +448,10 @@ - { - int i; - -+#ifndef __ia64__ - for (i = 0; i < NR_GRANT_FRAMES; i++) - clear_fixmap(FIX_GNTTAB_END - i); -+#endif - return 0; } @@ -450,7 +466,9 @@ diff --git a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/privcmd.c.patch b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/privcmd.c.patch index cce9fec2fc..347ffa792d 100644 --- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/privcmd.c.patch +++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/privcmd.c.patch @@ -1,16 +1,6 @@ diff -Naur xen/privcmd/privcmd.c xen.patched/privcmd/privcmd.c --- xen/privcmd/privcmd.c 2005-09-23 10:54:50.000000000 -0600 +++ xen.patched/privcmd/privcmd.c 2005-09-23 10:57:51.000000000 -0600 -@@ -134,6 +134,9 @@ - > vma->vm_end ) - return -EINVAL; - -+#ifdef __ia64__ -+#define direct_remap_pfn_range(a,b,c,d,e,f) remap_pfn_range(a,b,c,d,e) -+#endif - if ((rc = direct_remap_pfn_range( - vma, - msg[j].va&PAGE_MASK, @@ -180,6 +183,15 @@ for (i = 0; i < m.num; i++, addr += PAGE_SIZE, p++) { if (get_user(mfn, p)) diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/devmem.c b/linux-2.6-xen-sparse/arch/xen/kernel/devmem.c index 13b8320ccf..215804538c 100644 --- a/linux-2.6-xen-sparse/arch/xen/kernel/devmem.c +++ b/linux-2.6-xen-sparse/arch/xen/kernel/devmem.c @@ -26,6 +26,7 @@ #include #include #include +#include static inline int uncached_access(struct file *file) { diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c index c9d812695e..3f9e90cfa8 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c @@ -13,6 +13,7 @@ #include #include +#include #include "common.h" /* @@ -494,6 +495,9 @@ static int __init blkif_init(void) int i; struct page *page; + if (xen_init() < 0) + return -ENODEV; + blkif_interface_init(); page = balloon_alloc_empty_page_range(MMAP_PAGES); diff --git a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c index 671f16038c..00f3674f73 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c @@ -49,6 +49,7 @@ #include #include #include +#include #define BLKIF_STATE_DISCONNECTED 0 #define BLKIF_STATE_CONNECTED 1 @@ -727,6 +728,9 @@ static struct xenbus_driver blkfront = { static int __init xlblk_init(void) { + if (xen_init() < 0) + return -ENODEV; + xenbus_register_driver(&blkfront); return 0; } diff --git a/linux-2.6-xen-sparse/drivers/xen/console/console.c b/linux-2.6-xen-sparse/drivers/xen/console/console.c index 1a23f4495e..6da5d9159c 100644 --- a/linux-2.6-xen-sparse/drivers/xen/console/console.c +++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c @@ -196,6 +196,9 @@ static int __init xen_console_init(void) void xen_console_init(void) #endif { + if (xen_init() < 0) + return __RETCODE; + if (xen_start_info->flags & SIF_INITDOMAIN) { if (xc_mode == XC_DEFAULT) xc_mode = XC_SERIAL; diff --git a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c index db954ca768..8a9e295651 100644 --- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c +++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/fixmap.h b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/fixmap.h index 40a8c178f1..4b32a82980 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/fixmap.h +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/fixmap.h @@ -1 +1,2 @@ -/* empty */ +#define clear_fixmap(x) do {} while (0) +#define set_fixmap(x,y) do {} while (0) diff --git a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/synch_bitops.h b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/synch_bitops.h index 9ad2d1f390..ee1330659c 100644 --- a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/synch_bitops.h +++ b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/synch_bitops.h @@ -51,6 +51,8 @@ static __inline__ int synch_var_test_bit(int nr, volatile void * addr) return test_bit(nr, addr); } +#define synch_cmpxchg ia64_cmpxchg4_acq + #define synch_test_bit(nr,addr) \ (__builtin_constant_p(nr) ? \ synch_const_test_bit((nr),(addr)) : \ From 06aee5fcb9951388b54d17c98a6e72b2b4137b94 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Mon, 7 Nov 2005 10:40:42 -0600 Subject: [PATCH 13/20] Fast tlb miss reflection (mostly working, missing robustness, default off) Signed-off by: Dan Magenheimer I've been maintaining this out-of-tree partially finished for some time so am now checking it in but default off. The current version needs some additional error checking and only works (fast) for domain0, but it makes a significant performance differenece. --- xen/arch/ia64/xen/hyperprivop.S | 332 +++++++++++++++++++++++++++++--- xen/arch/ia64/xen/ivt.S | 15 +- xen/arch/ia64/xen/privop.c | 11 +- xen/arch/ia64/xen/vcpu.c | 3 + 4 files changed, 332 insertions(+), 29 deletions(-) diff --git a/xen/arch/ia64/xen/hyperprivop.S b/xen/arch/ia64/xen/hyperprivop.S index a048850a3b..a351bf29f3 100644 --- a/xen/arch/ia64/xen/hyperprivop.S +++ b/xen/arch/ia64/xen/hyperprivop.S @@ -14,6 +14,7 @@ #include #include + #define _PAGE_PPN_MASK 0x0003fffffffff000 //asm/pgtable.h doesn't do assembly #define PAGE_PHYS 0x0010000000000761 //__pgprot(__DIRTY_BITS|_PAGE_PL_2|_PAGE_AR_RWX) #define _PAGE_PL_2 (2<<7) @@ -22,13 +23,14 @@ #define FAST_HYPERPRIVOPS #define FAST_HYPERPRIVOP_CNT #define FAST_REFLECT_CNT -//#define FAST_TICK +//#define FAST_TICK // mostly working (unat problems) but default off for now +//#define FAST_TLB_MISS_REFLECT // mostly working but default off for now +//#define FAST_ITC // working but default off for now #define FAST_BREAK #define FAST_ACCESS_REFLECT #define FAST_RFI #define FAST_SSM_I #define FAST_PTC_GA -#undef FAST_ITC // working but default off for now #undef RFI_TO_INTERRUPT // not working yet #endif @@ -705,6 +707,251 @@ GLOBAL_ENTRY(fast_access_reflect) st8 [r23]=r22;; br.cond.sptk.many fast_reflect;; +// when we get to here, VHPT_CCHAIN_LOOKUP has failed and everything +// is as it was at the time of original miss. We want to preserve that +// so if we get a nested fault, we can just branch to page_fault +GLOBAL_ENTRY(fast_tlb_miss_reflect) +#ifndef FAST_TLB_MISS_REFLECT // see beginning of file + br.spnt.few page_fault ;; +#endif + mov r31=pr + mov r30=cr.ipsr + mov r29=cr.iip + mov r16=cr.isr + mov r17=cr.ifa;; + // for now, always take slow path for region 0 (e.g. metaphys mode) + extr.u r21=r17,61,3;; + cmp.eq p7,p0=r0,r21 +(p7) br.spnt.few page_fault ;; + // always take slow path for PL0 (e.g. __copy_from_user) + extr.u r21=r30,IA64_PSR_CPL0_BIT,2 ;; + cmp.eq p7,p0=r21,r0 +(p7) br.spnt.few page_fault ;; + // slow path if strange ipsr or isr bits set + extr.u r21=r30,IA64_PSR_BE_BIT,1 ;; + cmp.ne p7,p0=r21,r0 +(p7) br.spnt.few page_fault ;; + extr.u r21=r30,IA64_PSR_PP_BIT,1 ;; + cmp.ne p7,p0=r21,r0 +(p7) br.spnt.few page_fault ;; + movl r21=IA64_ISR_IR|IA64_ISR_SP|IA64_ISR_NA ;; + and r21=r16,r21;; + cmp.ne p7,p0=r0,r21 +(p7) br.spnt.few page_fault ;; + // also take slow path if virtual psr.ic=0 + movl r18=XSI_PSR_IC;; + ld4 r21=[r18];; + cmp.eq p7,p0=r0,r21 +(p7) br.spnt.few page_fault ;; + // OK, if we get to here, we are doing a fast vcpu_translate. Need to: + // 1) look in the virtual TR's (pinned), if not there + // 2) look in the 1-entry TLB (pinned), if not there + // 3) check the domain VHPT (NOT pinned, accesses domain memory!) + // If we find it in any of these places, we need to effectively do + // a hyper_itc_i/d + + // short-term hack for now, if in region 5-7, take slow path + // since all Linux TRs are in region 5 or 7, we need not check TRs + extr.u r21=r17,61,3;; + cmp.le p7,p0=5,r21 +(p7) br.spnt.few page_fault ;; +fast_tlb_no_tr_match: + movl r27=THIS_CPU(cpu_kr)+IA64_KR_CURRENT_OFFSET;; + ld8 r27=[r27];; + tbit.nz p6,p7=r16,IA64_ISR_X_BIT;; +(p6) adds r25=IA64_VCPU_ITLB_OFFSET,r27;; +(p7) adds r25=IA64_VCPU_DTLB_OFFSET,r27;; + ld8 r20=[r25],8;; + tbit.z p7,p0=r20,0;; // present? +(p7) br.cond.spnt.few 1f;; + // if ifa is in range of tlb, don't bother to check rid, go slow path + ld8 r21=[r25],8;; + mov r23=1 + extr.u r21=r21,2,6;; + shl r22=r23,r21 + ld8 r21=[r25],8;; + cmp.ltu p7,p0=r17,r21 +(p7) br.cond.sptk.many 1f; + add r21=r22,r21;; + cmp.ltu p7,p0=r17,r21 +(p7) br.cond.spnt.few page_fault;; + +1: // check the guest VHPT + adds r19 = XSI_PTA_OFS-XSI_PSR_IC_OFS, r18;; + ld8 r19=[r19];; + tbit.nz p7,p0=r19,IA64_PTA_VF_BIT;; // long format VHPT +(p7) br.cond.spnt.few page_fault;; + // if (!rr.ve || !(pta & IA64_PTA_VE)) take slow way for now + // FIXME: later, we deliver an alt_d/i vector after thash and itir + tbit.z p7,p0=r19,IA64_PTA_VE_BIT;; // +(p7) br.cond.spnt.few page_fault;; + extr.u r25=r17,61,3;; + adds r21=XSI_RR0_OFS-XSI_PSR_IC_OFS,r18 ;; + shl r25=r25,3;; + add r21=r21,r25;; + ld8 r22=[r21];; + tbit.z p7,p0=r22,0 +(p7) br.cond.spnt.few page_fault;; + + // compute and save away itir (r22 & RR_PS_MASK) + movl r21=0xfc;; + and r22=r22,r21;; + adds r21=XSI_ITIR_OFS-XSI_PSR_IC_OFS,r18 ;; + st8 [r21]=r22;; + + // save away ifa + adds r21=XSI_IFA_OFS-XSI_PSR_IC_OFS,r18 ;; + st8 [r21]=r17;; + // see vcpu_thash to save away iha + shr.u r20 = r17, 61 + addl r25 = 1, r0 + movl r30 = 0xe000000000000000 + ;; + and r21 = r30, r17 // VHPT_Addr1 + ;; + shladd r28 = r20, 3, r18 + adds r19 = XSI_PTA_OFS-XSI_PSR_IC_OFS, r18 + ;; + adds r27 = XSI_RR0_OFS-XSI_PSR_IC_OFS, r28 + addl r28 = 32767, r0 + ld8 r24 = [r19] // pta + ;; + ld8 r23 = [r27] // rrs[vadr>>61] + extr.u r26 = r24, 2, 6 + ;; + extr.u r22 = r23, 2, 6 + shl r30 = r25, r26 + ;; + shr.u r19 = r17, r22 + shr.u r29 = r24, 15 + ;; + adds r30 = -1, r30 + ;; + shladd r27 = r19, 3, r0 + extr.u r26 = r30, 15, 46 + ;; + andcm r24 = r29, r26 + and r19 = r28, r27 + shr.u r25 = r27, 15 + ;; + and r23 = r26, r25 + ;; + or r22 = r24, r23 + ;; + dep.z r20 = r22, 15, 46 + ;; + or r30 = r20, r21 + ;; + //or r8 = r19, r30 + or r19 = r19, r30 + ;; + adds r23=XSI_IHA_OFS-XSI_PSR_IC_OFS,r18 ;; + st8 [r23]=r19;; + // done with thash, check guest VHPT + + adds r20 = XSI_PTA_OFS-XSI_PSR_IC_OFS, r18;; + ld8 r24 = [r20];; // pta + // avoid recursively walking the VHPT + // if (((r17=address ^ r24=pta) & ((itir_mask(pta) << 3) >> 3)) != 0) { + mov r20=-8 + xor r21=r17,r24 + extr.u r24=r24,2,6;; + shl r20=r20,r24;; + shr.u r20=r20,3;; + and r21=r20,r21;; + cmp.eq p7,p0=r21,r0 +(p7) br.cond.spnt.few 1f;; + // __copy_from_user(&pte, r19=(void *)(*iha), sizeof(pte)=8) + // prepare for possible nested dtlb fault + mov r29=b0 + movl r30=guest_vhpt_miss;; + // now go fetch the entry from the guest VHPT + ld8 r20=[r19];; + // if we wind up here, we successfully loaded the VHPT entry + + // this VHPT walker aborts on non-present pages instead + // of inserting a not-present translation, this allows + // vectoring directly to the miss handler + tbit.z p7,p0=r20,0 +(p7) br.cond.spnt.few page_not_present;; + +#ifdef FAST_REFLECT_CNT + movl r21=fast_vhpt_translate_count;; + ld8 r22=[r21];; + adds r22=1,r22;; + st8 [r21]=r22;; +#endif + +// prepare for fast_insert(PSCB(ifa),PSCB(itir),r16=pte) +// r16 == pte +// r17 == bit0: 1=inst, 0=data; bit1: 1=itc, 0=vcpu_translate +// r18 == XSI_PSR_IC_OFS +// r24 == ps +// r29 == saved value of b0 in case of recovery +// r30 == recovery ip if failure occurs +// r31 == pr + tbit.nz p6,p7=r16,IA64_ISR_X_BIT;; +(p6) mov r17=1;; +(p7) mov r17=0;; + mov r16=r20 + mov r29=b0 ;; + movl r30=recover_and_page_fault ;; + adds r21=XSI_ITIR_OFS-XSI_PSR_IC_OFS,r18 ;; + ld8 r24=[r21];; + extr.u r24=r24,2,6;; + // IFA already in PSCB + br.cond.sptk.many fast_insert;; + +// we get here if fast_insert fails (e.g. due to metaphysical lookup) +ENTRY(recover_and_page_fault) +#ifdef FAST_REFLECT_CNT + movl r21=recover_to_page_fault_count;; + ld8 r22=[r21];; + adds r22=1,r22;; + st8 [r21]=r22;; +#endif + mov b0=r29;; + br.cond.sptk.many page_fault;; + +// if we wind up here, we missed in guest VHPT so recover +// from nested dtlb fault and reflect a tlb fault to the guest +guest_vhpt_miss: + mov b0=r29;; + // fault = IA64_VHPT_FAULT + mov r20=r0 + br.cond.sptk.many 1f; + + // if we get to here, we are ready to reflect + // need to set up virtual ifa, iha, itir (fast_reflect handles + // virtual isr, iip, ipsr, ifs + // see vcpu_get_itir_on_fault: get ps,rid,(FIXME key) from rr[ifa] +page_not_present: + tbit.nz p6,p7=r16,IA64_ISR_X_BIT;; +(p6) movl r20=0x400;; +(p7) movl r20=0x800;; + +1: extr.u r25=r17,61,3;; + adds r21=XSI_RR0_OFS-XSI_PSR_IC_OFS,r18 ;; + shl r25=r25,3;; + add r21=r21,r25;; + ld8 r22=[r21];; + extr.u r22=r22,2,30;; + dep.z r22=r22,2,30;; + adds r23=XSI_ITIR_OFS-XSI_PSR_IC_OFS,r18 ;; + st8 [r23]=r22;; + + // fast reflect expects + // r16 == cr.isr + // r18 == XSI_PSR_IC + // r20 == offset into ivt + // r29 == iip + // r30 == ipsr + // r31 == pr + //mov r16=cr.isr + mov r29=cr.iip + mov r30=cr.ipsr + br.sptk.many fast_reflect;; +END(fast_tlb_miss_reflect) // ensure that, if giving up, registers at entry to fast_hyperprivop unchanged ENTRY(hyper_rfi) @@ -1673,6 +1920,17 @@ ENTRY(hyper_ptc_ga) ;; END(hyper_ptc_ga) +// recovery block for hyper_itc metaphysical memory lookup +ENTRY(recover_and_dispatch_break_fault) +#ifdef FAST_REFLECT_CNT + movl r21=recover_to_break_fault_count;; + ld8 r22=[r21];; + adds r22=1,r22;; + st8 [r21]=r22;; +#endif + mov b0=r29 ;; + br.sptk.many dispatch_break_fault;; + // Registers at entry // r17 = break immediate (XEN_HYPER_ITC_D or I) // r18 == XSI_PSR_IC_OFS @@ -1682,24 +1940,14 @@ ENTRY(hyper_itc_i) // fall through, hyper_itc_d handles both i and d ENTRY(hyper_itc_d) #ifndef FAST_ITC - br.spnt.many dispatch_break_fault ;; + br.sptk.many dispatch_break_fault ;; #endif + // ensure itir.ps >= xen's pagesize adds r23=XSI_ITIR_OFS-XSI_PSR_IC_OFS,r18 ;; ld8 r23=[r23];; extr.u r24=r23,2,6;; // r24==logps cmp.gt p7,p0=PAGE_SHIFT,r24 (p7) br.spnt.many dispatch_break_fault ;; - // translate_domain_pte(r8=pteval,PSCB(ifa)=address,r24=itir) - mov r19=1;; - shl r20=r19,r24;; - adds r20=-1,r20;; // r20 == mask - movl r19=_PAGE_PPN_MASK;; - and r22=r8,r19;; // r22 == pteval & _PAGE_PPN_MASK - andcm r19=r22,r20;; - adds r21=XSI_IFA_OFS-XSI_PSR_IC_OFS,r18 ;; - ld8 r21=[r21];; - and r20=r21,r20;; - or r19=r19,r20;; // r19 == mpaddr movl r27=THIS_CPU(cpu_kr)+IA64_KR_CURRENT_OFFSET;; ld8 r27=[r27];; adds r27=IA64_VCPU_DOMAIN_OFFSET,r27;; @@ -1710,7 +1958,6 @@ ENTRY(hyper_itc_d) // FIXME: for now, only handle dom0 (see lookup_domain_mpa below) cmp.ne p7,p0=r27,r28 (p7) br.spnt.many dispatch_break_fault ;; - // if region 6, go slow way #ifdef FAST_HYPERPRIVOP_CNT cmp.eq p6,p7=XEN_HYPER_ITC_D,r17;; (p6) movl r20=fast_hyperpriv_cnt+(8*XEN_HYPER_ITC_D);; @@ -1719,19 +1966,47 @@ ENTRY(hyper_itc_d) adds r21=1,r21;; st8 [r20]=r21;; #endif +(p6) mov r17=2;; +(p7) mov r17=3;; + mov r29=b0 ;; + movl r30=recover_and_dispatch_break_fault ;; + mov r16=r8;; + // fall through + + +// fast_insert(PSCB(ifa),r24=ps,r16=pte) +// r16 == pte +// r17 == bit0: 1=inst, 0=data; bit1: 1=itc, 0=vcpu_translate +// r18 == XSI_PSR_IC_OFS +// r24 == ps +// r29 == saved value of b0 in case of recovery +// r30 == recovery ip if failure occurs +// r31 == pr +GLOBAL_ENTRY(fast_insert) + // translate_domain_pte(r16=pteval,PSCB(ifa)=address,r24=itir) + mov r19=1;; + shl r20=r19,r24;; + adds r20=-1,r20;; // r20 == mask + movl r19=_PAGE_PPN_MASK;; + and r22=r16,r19;; // r22 == pteval & _PAGE_PPN_MASK + andcm r19=r22,r20;; + adds r21=XSI_IFA_OFS-XSI_PSR_IC_OFS,r18 ;; + ld8 r21=[r21];; + and r20=r21,r20;; + or r19=r19,r20;; // r19 == mpaddr // FIXME: for now, just do domain0 and skip mpaddr range checks dep r20=r0,r19,0,PAGE_SHIFT movl r21=PAGE_PHYS ;; or r20=r20,r21 ;; // r20==return value from lookup_domain_mpa - // r8=pteval,r20=pteval2 + // r16=pteval,r20=pteval2 movl r19=_PAGE_PPN_MASK movl r21=_PAGE_PL_2;; - andcm r25=r8,r19;; // r25==pteval & ~_PAGE_PPN_MASK + andcm r25=r16,r19;; // r25==pteval & ~_PAGE_PPN_MASK and r22=r20,r19;; or r22=r22,r21;; or r22=r22,r25;; // r22==return value from translate_domain_pte // done with translate_domain_pte - // now do vcpu_itc_no_srlz(vcpu,IorD,ifa,r22=pte,r8=mppte,r24=logps) + // now do vcpu_itc_no_srlz(vcpu,IorD,ifa,r22=pte,r16=mppte,r24=logps) // FIXME: for now, just domain0 and skip range check // psr.ic already cleared // NOTE: r24 still contains ps (from above) @@ -1740,7 +2015,7 @@ ENTRY(hyper_itc_d) adds r23=XSI_IFA_OFS-XSI_PSR_IC_OFS,r18 ;; ld8 r23=[r23];; mov cr.ifa=r23;; - cmp.eq p6,p7=XEN_HYPER_ITC_D,r17;; + tbit.z p6,p7=r17,0;; (p6) itc.d r22;; (p7) itc.i r22;; dv_serialize_data @@ -1757,7 +2032,7 @@ ENTRY(hyper_itc_d) st8 [r20]=r21;; // vcpu_set_tr_entry(trp,r22=pte|1,r24=itir,r23=ifa) // TR_ENTRY = {page_flags,itir,addr,rid} - cmp.eq p6,p7=XEN_HYPER_ITC_D,r17 + tbit.z p6,p7=r17,0;; movl r27=THIS_CPU(cpu_kr)+IA64_KR_CURRENT_OFFSET;; ld8 r27=[r27];; adds r28=IA64_VCPU_STARTING_RID_OFFSET,r27 @@ -1768,7 +2043,6 @@ ENTRY(hyper_itc_d) mov r19=-4096;; and r23=r23,r19;; st8 [r27]=r23,8;; // ifa & ~0xfff -// ?? is virtualize_rid(v,get_rr(ifa))==vcpu_get_rr(ifa)?? YES!! adds r29 = XSI_RR0_OFS-XSI_PSR_IC_OFS,r18 extr.u r25=r23,61,3;; shladd r29=r25,3,r29;; @@ -1806,13 +2080,16 @@ ENTRY(hyper_itc_d) //PSCBX(vcpu,i/dtlb_pte) = mp_pte movl r27=THIS_CPU(cpu_kr)+IA64_KR_CURRENT_OFFSET;; ld8 r27=[r27];; - cmp.eq p6,p7=XEN_HYPER_ITC_D,r17;; + tbit.z p6,p7=r17,0;; (p6) adds r27=IA64_VCPU_DTLB_PTE_OFFSET,r27 (p7) adds r27=IA64_VCPU_ITLB_PTE_OFFSET,r27;; - st8 [r27]=r8;; + st8 [r27]=r16;; // done with vcpu_itc_no_srlz - // done, increment to point to next instruction + // if hyper_itc, increment to point to next instruction + tbit.z p7,p0=r17,1 +(p7) br.cond.sptk.few no_inc_iip;; + mov r29=cr.ipsr mov r30=cr.iip;; extr.u r26=r29,41,2 ;; @@ -1824,8 +2101,11 @@ ENTRY(hyper_itc_d) dep r29=r26,r29,41,2 ;; mov cr.ipsr=r29 - mov cr.iip=r30 + mov cr.iip=r30;; + +no_inc_iip: mov pr=r31,-1 ;; rfi ;; -END(hyper_itc_d) +END(fast_insert) + diff --git a/xen/arch/ia64/xen/ivt.S b/xen/arch/ia64/xen/ivt.S index d01f276278..dc209b8a48 100644 --- a/xen/arch/ia64/xen/ivt.S +++ b/xen/arch/ia64/xen/ivt.S @@ -246,7 +246,8 @@ ENTRY(itlb_miss) #ifdef XEN VHPT_CCHAIN_LOOKUP(itlb_miss,i) #ifdef VHPT_GLOBAL - br.cond.sptk page_fault +// br.cond.sptk page_fault + br.cond.sptk fast_tlb_miss_reflect ;; #endif #endif @@ -297,7 +298,8 @@ ENTRY(dtlb_miss) #ifdef XEN VHPT_CCHAIN_LOOKUP(dtlb_miss,d) #ifdef VHPT_GLOBAL - br.cond.sptk page_fault +// br.cond.sptk page_fault + br.cond.sptk fast_tlb_miss_reflect ;; #endif #endif @@ -485,6 +487,11 @@ END(alt_dtlb_miss) // 0x1400 Entry 5 (size 64 bundles) Data nested TLB (6,45) ENTRY(nested_dtlb_miss) DBG_FAULT(5) +#ifdef XEN + mov b0=r30 + br.sptk.many b0 // return to continuation point + ;; +#endif /* * In the absence of kernel bugs, we get here when the virtually mapped linear * page table is accessed non-speculatively (e.g., in the Dirty-bit, Instruction @@ -562,7 +569,11 @@ END(ikey_miss) //----------------------------------------------------------------------------------- // call do_page_fault (predicates are in r31, psr.dt may be off, r16 is faulting address) +#ifdef XEN +GLOBAL_ENTRY(page_fault) +#else ENTRY(page_fault) +#endif ssm psr.dt ;; srlz.i diff --git a/xen/arch/ia64/xen/privop.c b/xen/arch/ia64/xen/privop.c index ed50eb0d2f..c7999d4928 100644 --- a/xen/arch/ia64/xen/privop.c +++ b/xen/arch/ia64/xen/privop.c @@ -1040,6 +1040,9 @@ extern unsigned long dtlb_translate_count; extern unsigned long tr_translate_count; extern unsigned long phys_translate_count; extern unsigned long vhpt_translate_count; +extern unsigned long fast_vhpt_translate_count; +extern unsigned long recover_to_page_fault_count; +extern unsigned long recover_to_break_fault_count; extern unsigned long lazy_cover_count; extern unsigned long idle_when_pending; extern unsigned long pal_halt_light_count; @@ -1049,9 +1052,12 @@ int dump_misc_stats(char *buf) { char *s = buf; s += sprintf(s,"Virtual TR translations: %d\n",tr_translate_count); - s += sprintf(s,"Virtual VHPT translations: %d\n",vhpt_translate_count); + s += sprintf(s,"Virtual VHPT slow translations: %d\n",vhpt_translate_count); + s += sprintf(s,"Virtual VHPT fast translations: %d\n",fast_vhpt_translate_count); s += sprintf(s,"Virtual DTLB translations: %d\n",dtlb_translate_count); s += sprintf(s,"Physical translations: %d\n",phys_translate_count); + s += sprintf(s,"Recoveries to page fault: %d\n",recover_to_page_fault_count); + s += sprintf(s,"Recoveries to break fault: %d\n",recover_to_break_fault_count); s += sprintf(s,"Idle when pending: %d\n",idle_when_pending); s += sprintf(s,"PAL_HALT_LIGHT (no pending): %d\n",pal_halt_light_count); s += sprintf(s,"context switches: %d\n",context_switch_count); @@ -1065,6 +1071,9 @@ void zero_misc_stats(void) tr_translate_count = 0; phys_translate_count = 0; vhpt_translate_count = 0; + fast_vhpt_translate_count = 0; + recover_to_page_fault_count = 0; + recover_to_break_fault_count = 0; lazy_cover_count = 0; pal_halt_light_count = 0; idle_when_pending = 0; diff --git a/xen/arch/ia64/xen/vcpu.c b/xen/arch/ia64/xen/vcpu.c index ce38e1d229..f59ad244e2 100644 --- a/xen/arch/ia64/xen/vcpu.c +++ b/xen/arch/ia64/xen/vcpu.c @@ -1283,6 +1283,9 @@ IA64FAULT vcpu_ttag(VCPU *vcpu, UINT64 vadr, UINT64 *padr) #define itir_mask(itir) (~((1UL << itir_ps(itir)) - 1)) unsigned long vhpt_translate_count = 0; +unsigned long fast_vhpt_translate_count = 0; +unsigned long recover_to_page_fault_count = 0; +unsigned long recover_to_break_fault_count = 0; IA64FAULT vcpu_translate(VCPU *vcpu, UINT64 address, BOOLEAN is_data, UINT64 *pteval, UINT64 *itir, UINT64 *iha) { From 7d9cb9cf9b011430839d1847e6f6173fec48cbb3 Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Mon, 7 Nov 2005 11:25:59 -0600 Subject: [PATCH 14/20] Missed ia64 changes to one drivers/xen file --- linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c index 8a9e295651..9898982115 100644 --- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c +++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c @@ -181,6 +181,15 @@ static int privcmd_ioctl(struct inode *inode, struct file *file, for (i = 0; i < m.num; i++, addr += PAGE_SIZE, p++) { if (get_user(mfn, p)) return -EFAULT; +#ifdef __ia64__ + ret = remap_pfn_range(vma, + addr&PAGE_MASK, + mfn, + 1<vm_page_prot); + if (ret < 0) + goto batch_err; +#else ret = create_lookup_pte_addr(vma->vm_mm, addr, &ptep); if (ret) @@ -191,6 +200,7 @@ static int privcmd_ioctl(struct inode *inode, struct file *file, if (HYPERVISOR_mmu_update(&u, 1, NULL, m.dom) < 0) put_user(0xF0000000 | mfn, p); +#endif } ret = 0; @@ -206,6 +216,7 @@ static int privcmd_ioctl(struct inode *inode, struct file *file, break; #endif +#ifndef __ia64__ case IOCTL_PRIVCMD_GET_MACH2PHYS_START_MFN: { unsigned long m2pv = (unsigned long)machine_to_phys_mapping; pgd_t *pgd = pgd_offset_k(m2pv); @@ -217,6 +228,7 @@ static int privcmd_ioctl(struct inode *inode, struct file *file, -EFAULT: 0; } break; +#endif default: ret = -EINVAL; From a2a2124025021525a9f2e9c4e83ef1f23076b86d Mon Sep 17 00:00:00 2001 From: "djm@kirby.fc.hp.com" Date: Mon, 7 Nov 2005 16:53:25 -0600 Subject: [PATCH 15/20] Enable ar.unat handling for fast paths (by Anthony Xu) --- xen/arch/ia64/xen/hyperprivop.S | 51 ++++++++++++++++++++++----------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/xen/arch/ia64/xen/hyperprivop.S b/xen/arch/ia64/xen/hyperprivop.S index a351bf29f3..87ec9060c6 100644 --- a/xen/arch/ia64/xen/hyperprivop.S +++ b/xen/arch/ia64/xen/hyperprivop.S @@ -59,7 +59,7 @@ #endif // FIXME: turn off for now... but NaTs may crash Xen so re-enable soon! -//#define HANDLE_AR_UNAT +#define HANDLE_AR_UNAT // FIXME: This is defined in include/asm-ia64/hw_irq.h but this // doesn't appear to be include'able from assembly? @@ -497,19 +497,29 @@ GLOBAL_ENTRY(fast_tick_reflect) .mem.offset 0,0; st8.spill [r2]=r30,16; .mem.offset 8,0; st8.spill [r3]=r31,16 ;; #ifdef HANDLE_AR_UNAT - // bank0 regs have no NaT bit, so ensure they are NaT clean - mov r16=r0; mov r17=r0; mov r18=r0; mov r19=r0; - mov r20=r0; mov r21=r0; mov r22=r0; mov r23=r0; - mov r24=r0; mov r25=r0; mov r26=r0; mov r27=r0; - mov r28=r0; mov r29=r0; mov r30=r0; movl r31=XSI_IPSR;; + // r16~r23 are preserved regsin bank0 regs, we need to restore them, + // r24~r31 are scratch regs, we don't need to handle NaT bit, + // because OS handler must assign it before access it + ld8 r16=[r2],16; + ld8 r17=[r3],16;; + ld8 r18=[r2],16; + ld8 r19=[r3],16;; + ld8 r20=[r2],16; + ld8 r21=[r3],16;; + ld8 r22=[r2],16; + ld8 r23=[r3],16;; #endif - bsw.0 ;; - mov r2=r30; mov r3=r29;; + movl r31=XSI_IPSR;; + bsw.0 ;; + mov r24=ar.unat; + mov r2=r30; mov r3=r29;; #ifdef HANDLE_AR_UNAT - mov ar.unat=r28; + mov ar.unat=r28; #endif - adds r20=XSI_BANKNUM_OFS-XSI_PSR_IC_OFS,r18 ;; - st4 [r20]=r0 ;; + adds r25=XSI_B1NATS_OFS-XSI_PSR_IC_OFS,r18 ; + adds r20=XSI_BANKNUM_OFS-XSI_PSR_IC_OFS,r18 ;; + st8 [r25]=r24; + st4 [r20]=r0 ;; fast_tick_reflect_done: mov pr=r31,-1 ;; rfi @@ -651,19 +661,28 @@ ENTRY(fast_reflect) .mem.offset 0,0; st8.spill [r2]=r30,16; .mem.offset 8,0; st8.spill [r3]=r31,16 ;; #ifdef HANDLE_AR_UNAT - // bank0 regs have no NaT bit, so ensure they are NaT clean - mov r16=r0; mov r17=r0; mov r18=r0; mov r19=r0; - mov r20=r0; mov r21=r0; mov r22=r0; mov r23=r0; - mov r24=r0; mov r25=r0; mov r26=r0; mov r27=r0; - mov r28=r0; mov r29=r0; mov r30=r0; movl r31=XSI_IPSR;; + // r16~r23 are preserved regsin bank0 regs, we need to restore them, + // r24~r31 are scratch regs, we don't need to handle NaT bit, + // because OS handler must assign it before access it + ld8 r16=[r2],16; + ld8 r17=[r3],16;; + ld8 r18=[r2],16; + ld8 r19=[r3],16;; + ld8 r20=[r2],16; + ld8 r21=[r3],16;; + ld8 r22=[r2],16; + ld8 r23=[r3],16;; #endif movl r31=XSI_IPSR;; bsw.0 ;; + mov r24=ar.unat; mov r2=r30; mov r3=r29;; #ifdef HANDLE_AR_UNAT mov ar.unat=r28; #endif + adds r25=XSI_B1NATS_OFS-XSI_PSR_IC_OFS,r18 ; adds r20=XSI_BANKNUM_OFS-XSI_PSR_IC_OFS,r18 ;; + st8 [r25]=r24; st4 [r20]=r0 ;; mov pr=r31,-1 ;; rfi From 5e034a1be81bd22da0c9f5d927e0d38125654eb4 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Tue, 8 Nov 2005 12:06:18 +0100 Subject: [PATCH 16/20] Fix the clean target of the tools/xenstore Makefile to remove all files created. Currently leaves some of its files behind. Signed-off-by: Tobias Hunger --- tools/xenstore/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile index 6fc3992d21..7b56ad497b 100644 --- a/tools/xenstore/Makefile +++ b/tools/xenstore/Makefile @@ -77,7 +77,7 @@ libxenstore.so: xs.opic xs_lib.opic clean: testsuite-clean rm -f *.o *.opic *.so rm -f xenstored xs_random xs_stress xs_crashme - rm -f xs_test xenstored_test xs_tdb_dump + rm -f xs_test xenstored_test xs_tdb_dump xsls $(CLIENTS) $(RM) $(PROG_DEP) print-dir: From bf4822dafb7e632422318a93a82d03482346a428 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Tue, 8 Nov 2005 12:14:33 +0100 Subject: [PATCH 17/20] Remove the execute bit from shell snipplets (the -common files not starting with #!) found in the example directory under tools. It further changes the installation path of the udev rules to comply with what debian does: It places the rules file in /etc/udev/ und creates a symlink to it in /etc/udev/rules.d. Signed-off-by: Tobias Hunger --- tools/examples/Makefile | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/examples/Makefile b/tools/examples/Makefile index c1e974093b..844a7f7330 100644 --- a/tools/examples/Makefile +++ b/tools/examples/Makefile @@ -26,14 +26,14 @@ XEN_SCRIPTS += network-route vif-route XEN_SCRIPTS += network-nat vif-nat XEN_SCRIPTS += block XEN_SCRIPTS += block-enbd block-nbd -XEN_SCRIPTS += xen-script-common.sh -XEN_SCRIPTS += xen-hotplug-common.sh xen-network-common.sh vif-common.sh -XEN_SCRIPTS += block-common.sh +XEN_SCRIPT_DATA = xen-script-common.sh +XEN_SCRIPT_DATA += xen-hotplug-common.sh xen-network-common.sh vif-common.sh +XEN_SCRIPT_DATA += block-common.sh XEN_HOTPLUG_DIR = /etc/hotplug XEN_HOTPLUG_SCRIPTS = xen-backend.agent -UDEV_RULES_DIR = /etc/udev/rules.d +UDEV_RULES_DIR = /etc/udev UDEV_RULES = xen-backend.rules DI = $(shell readlink -f $(DISTDIR)) @@ -77,6 +77,10 @@ install-scripts: do \ $(INSTALL_PROG) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \ done + for i in $(XEN_SCRIPT_DATA); \ + do \ + $(INSTALL_DATA) $$i $(DESTDIR)$(XEN_SCRIPT_DIR); \ + done install-hotplug: [ -d $(DESTDIR)$(XEN_HOTPLUG_DIR) ] || \ @@ -88,10 +92,12 @@ install-hotplug: install-udev: [ -d $(DESTDIR)$(UDEV_RULES_DIR) ] || \ - $(INSTALL_DIR) $(DESTDIR)$(UDEV_RULES_DIR) + $(INSTALL_DIR) $(DESTDIR)$(UDEV_RULES_DIR)/rules.d for i in $(UDEV_RULES); \ do \ - $(INSTALL_PROG) $$i $(DESTDIR)$(UDEV_RULES_DIR); \ + $(INSTALL_DATA) $$i $(DESTDIR)$(UDEV_RULES_DIR); \ + ( cd $(DESTDIR)$(UDEV_RULES_DIR)/rules.d ; \ + ln -sf ../$$i . ) \ done clean: From e1734495d865739a76f23d90258e60c797ead65b Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Tue, 8 Nov 2005 12:16:37 +0100 Subject: [PATCH 18/20] After move randomMac to netif in 7637, we need to this for vmx guest. otherwise, if no mac address configured, vmx guest can not be created. Signed-off-by: Xiaofeng Ling --- tools/python/xen/xend/image.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py index 0b54e83ca0..6f8231aac7 100644 --- a/tools/python/xen/xend/image.py +++ b/tools/python/xen/xend/image.py @@ -24,6 +24,7 @@ import xen.lowlevel.xc from xen.xend import sxp from xen.xend.XendError import VmError from xen.xend.XendLogging import log +from xen.xend.server.netif import randomMAC xc = xen.lowlevel.xc.new() @@ -276,6 +277,8 @@ class VmxImageHandler(ImageHandler): ret.append("%s" % vbdparam) if name == 'vif': mac = sxp.child_value(info, 'mac') + if mac == None: + mac = randomMAC() ret.append("-macaddr") ret.append("%s" % mac) if name == 'vtpm': From 385317d87076777689d56965508ad3ce8de2f76b Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Tue, 8 Nov 2005 12:17:53 +0100 Subject: [PATCH 19/20] Update tools/examples docs. Signed-off-by: Nivedita Singhvi --- tools/examples/README | 37 +++++++++++++++++++++++-------------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/tools/examples/README b/tools/examples/README index 0fffb5e4b0..889333ab63 100644 --- a/tools/examples/README +++ b/tools/examples/README @@ -9,20 +9,29 @@ If you write a useful script and would like to share it, please do send it (preferably with a little summary to go in this file) to so we can add it to this directory. +block - called by xen-backend.agent to bind/unbind dev +block-common.sh - sourced by block, block-* block-enbd - binds/unbinds network block devices -block-file - binds/unbinds file to loopback device -mem-map.sxp - memory map xend configuration file. -network - default network setup script called by xend at startup. -network-route - default xen network start/stop script. -network-nat - default xen network start/stop script when using NAT. -vif-bridge - default virtual network interface setup script. -vif-route - default xen virtual network start/stop script -vif-nat - configures vif in routed-nat mode. -xend-config.sxp - default xend configuration file. -xmexample1 - example configuration script for 'xm create'. -xmexample2 - a more complex configuration script for 'xm create'. +block-nbd - binds/unbinds network block devices +network-bridge - xen network start/stop script when using bridging +network-nat - xen network start/stop script when using NAT +network-route - xen network start/stop script when using routing +vif-bridge - virtual network start/stop script in bridged mode +vif-common.sh - sourced by vif-bridge +vif-nat - xen virtual network start/stop script in NAT mode +vif-route - xen virtual network start/stop script in routed mode +xen-backend.agent - calls block, vif-* scripts to add, remove, hotplug + devices +xen-backend.rules - hotplug script rules +xend-config.sxp - default xend configuration file +xen-hotplug-common.sh - sourced by vif-common.sh +xen-network-common.sh - sourced by vif-common.sh +xen-script-common.sh - sourced by network-bridge, xen-hotplug-common.sh +xmexample1 - example configuration script for 'xm create' +xmexample2 - a more complex configuration script for 'xm create' xmexample3 - an advanced configuration script for 'xm create' - that utilizes the vmid. + that utilizes the vmid +xmexample.nbd - configuration script that uses NBD filesystems xmexample.vmx - a configuration script for creating a vmx domain with - 'xm create'. - + 'xm create' +xmexample.vti - a configuration script for creating a domain on vti From fb57a01c9033260ce1f73471aa587092638203f9 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Tue, 8 Nov 2005 12:25:09 +0100 Subject: [PATCH 20/20] Remove unused and unnecessary gnttab ioctl. Signed-off-by: Keir Fraser --- linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c | 48 +------------------ 1 file changed, 1 insertion(+), 47 deletions(-) diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c b/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c index 4c0a10541b..e996b9d832 100644 --- a/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c +++ b/linux-2.6-xen-sparse/arch/xen/kernel/gnttab.c @@ -337,53 +337,7 @@ gnttab_request_free_callback(struct gnttab_free_callback *callback, #ifdef CONFIG_PROC_FS static struct proc_dir_entry *grant_pde; - -static int -grant_ioctl(struct inode *inode, struct file *file, unsigned int cmd, - unsigned long data) -{ - int ret; - privcmd_hypercall_t hypercall; - - /* - * XXX Need safety checks here if using for anything other - * than debugging. - */ - return -ENOSYS; - - if ( cmd != IOCTL_PRIVCMD_HYPERCALL ) - return -ENOSYS; - - if ( copy_from_user(&hypercall, (void *)data, sizeof(hypercall)) ) - return -EFAULT; - - if ( hypercall.op != __HYPERVISOR_grant_table_op ) - return -ENOSYS; - -#ifdef __ia64__ - ret = HYPERVISOR_grant_table_op(hypercall.arg[0], (void *)hypercall.arg[1], hypercall.arg[2]); -#else - /* hypercall-invoking asm taken from privcmd.c */ - __asm__ __volatile__ ( - "pushl %%ebx; pushl %%ecx; pushl %%edx; " - "pushl %%esi; pushl %%edi; " - "movl 4(%%eax),%%ebx ;" - "movl 8(%%eax),%%ecx ;" - "movl 12(%%eax),%%edx ;" - "movl 16(%%eax),%%esi ;" - "movl 20(%%eax),%%edi ;" - "movl (%%eax),%%eax ;" - TRAP_INSTR "; " - "popl %%edi; popl %%esi; popl %%edx; popl %%ecx; popl %%ebx" - : "=a" (ret) : "0" (&hypercall) : "memory" ); -#endif - - return ret; -} - -static struct file_operations grant_file_ops = { - ioctl: grant_ioctl, -}; +static struct file_operations grant_file_ops; static int grant_read(char *page, char **start, off_t off, int count, int *eof,