Index: 2005-12-16/include/asm-i386/floppy.h =================================================================== --- 2005-12-16.orig/include/asm-i386/floppy.h 2005-11-21 16:42:07.000000000 +0100 +++ 2005-12-16/include/asm-i386/floppy.h 2005-12-20 13:22:31.208875264 +0100 @@ -6,6 +6,8 @@ * for more details. * * Copyright (C) 1995 + * + * Modifications for Xen are Copyright (c) 2004, Keir Fraser. */ #ifndef __ASM_I386_FLOPPY_H #define __ASM_I386_FLOPPY_H @@ -13,6 +15,7 @@ #include +#ifndef CONFIG_X86_XEN /* * The DMA channel used by the floppy controller cannot access data at * addresses >= 16MB @@ -25,6 +28,13 @@ (!(vdma) && ((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64)) #define CROSS_64KB(a,s) _CROSS_64KB(a,s,use_virtual_dma & 1) +#else +/* XEN: Hit DMA paths on the head. This trick from asm-m68k/floppy.h. */ +#include +#undef MAX_DMA_ADDRESS +#define MAX_DMA_ADDRESS 0 +#define CROSS_64KB(a,s) (0) +#endif #define SW fd_routine[use_virtual_dma&1] @@ -43,7 +53,9 @@ #define fd_dma_mem_alloc(size) SW._dma_mem_alloc(size) #define fd_dma_setup(addr, size, mode, io) SW._dma_setup(addr, size, mode, io) +#ifndef CONFIG_X86_XEN #define FLOPPY_CAN_FALLBACK_ON_NODMA +#endif static int virtual_dma_count; static int virtual_dma_residue; @@ -187,6 +199,8 @@ static int fd_request_irq(void) } +#ifndef CONFIG_X86_XEN + static unsigned long dma_mem_alloc(unsigned long size) { return __get_dma_pages(GFP_KERNEL,get_order(size)); @@ -227,6 +241,18 @@ static void _fd_chose_dma_mode(char *add #define fd_chose_dma_mode(addr, size) _fd_chose_dma_mode(addr, size) +#else + +static unsigned long vdma_mem_alloc(unsigned long size) +{ + /* + * Do not use vmalloc/vfree: floppy_release_irq_and_dma() gets called from + * softirq context via motor_off_callback. A generic bug we happen to trigger. + */ + return __get_free_pages(GFP_KERNEL, get_order(size)); +} + +#endif static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io) { @@ -239,6 +265,7 @@ static int vdma_dma_setup(char *addr, un return 0; } +#ifndef CONFIG_X86_XEN static int hard_dma_setup(char *addr, unsigned long size, int mode, int io) { #ifdef FLOPPY_SANITY_CHECK @@ -256,6 +283,7 @@ static int hard_dma_setup(char *addr, un enable_dma(FLOPPY_DMA); return 0; } +#endif static struct fd_routine_l { int (*_request_dma)(unsigned int dmanr, const char * device_id); @@ -265,11 +293,13 @@ static struct fd_routine_l { int (*_dma_setup)(char *addr, unsigned long size, int mode, int io); } fd_routine[] = { { +#ifndef CONFIG_X86_XEN request_dma, free_dma, get_dma_residue, dma_mem_alloc, hard_dma_setup +#endif }, { vdma_request_dma, @@ -281,7 +311,18 @@ static struct fd_routine_l { }; +#ifndef CONFIG_X86_XEN static int FDC1 = 0x3f0; +#else +/* XEN: This trick to force 'virtual DMA' is from include/asm-m68k/floppy.h. */ +static int xen_floppy_init(void) +{ + use_virtual_dma = 1; + can_use_virtual_dma = 1; + return 0x3f0; +} +#define FDC1 xen_floppy_init() +#endif static int FDC2 = -1; /* @@ -312,7 +353,9 @@ static int FDC2 = -1; #define FLOPPY_MOTOR_MASK 0xf0 +#ifndef CONFIG_X86_XEN #define AUTO_DMA +#endif #define EXTRA_FLOPPY_PARAMS Index: 2005-12-16/include/asm-i386/mach-xen/asm/floppy.h =================================================================== --- 2005-12-16.orig/include/asm-i386/mach-xen/asm/floppy.h 2005-11-21 16:42:07.000000000 +0100 +++ /dev/null 1970-01-01 00:00:00.000000000 +0000 @@ -1,147 +0,0 @@ -/* - * Architecture specific parts of the Floppy driver - * - * This file is subject to the terms and conditions of the GNU General Public - * License. See the file "COPYING" in the main directory of this archive - * for more details. - * - * Copyright (C) 1995 - * - * Modifications for Xen are Copyright (c) 2004, Keir Fraser. - */ -#ifndef __ASM_XEN_I386_FLOPPY_H -#define __ASM_XEN_I386_FLOPPY_H - -#include - -/* XEN: Hit DMA paths on the head. This trick from asm-m68k/floppy.h. */ -#include -#undef MAX_DMA_ADDRESS -#define MAX_DMA_ADDRESS 0 -#define CROSS_64KB(a,s) (0) - -#define fd_inb(port) inb_p(port) -#define fd_outb(value,port) outb_p(value,port) - -#define fd_request_dma() (0) -#define fd_free_dma() ((void)0) -#define fd_enable_irq() enable_irq(FLOPPY_IRQ) -#define fd_disable_irq() disable_irq(FLOPPY_IRQ) -#define fd_free_irq() free_irq(FLOPPY_IRQ, NULL) -#define fd_get_dma_residue() (virtual_dma_count + virtual_dma_residue) -#define fd_dma_setup(addr, size, mode, io) vdma_dma_setup(addr, size, mode, io) -/* - * Do not use vmalloc/vfree: floppy_release_irq_and_dma() gets called from - * softirq context via motor_off_callback. A generic bug we happen to trigger. - */ -#define fd_dma_mem_alloc(size) __get_free_pages(GFP_KERNEL, get_order(size)) -#define fd_dma_mem_free(addr, size) free_pages(addr, get_order(size)) - -static int virtual_dma_count; -static int virtual_dma_residue; -static char *virtual_dma_addr; -static int virtual_dma_mode; -static int doing_pdma; - -static irqreturn_t floppy_hardint(int irq, void *dev_id, struct pt_regs * regs) -{ - register unsigned char st; - register int lcount; - register char *lptr; - - if (!doing_pdma) - return floppy_interrupt(irq, dev_id, regs); - - st = 1; - for(lcount=virtual_dma_count, lptr=virtual_dma_addr; - lcount; lcount--, lptr++) { - st=inb(virtual_dma_port+4) & 0xa0 ; - if(st != 0xa0) - break; - if(virtual_dma_mode) - outb_p(*lptr, virtual_dma_port+5); - else - *lptr = inb_p(virtual_dma_port+5); - } - virtual_dma_count = lcount; - virtual_dma_addr = lptr; - st = inb(virtual_dma_port+4); - - if(st == 0x20) - return IRQ_HANDLED; - if(!(st & 0x20)) { - virtual_dma_residue += virtual_dma_count; - virtual_dma_count=0; - doing_pdma = 0; - floppy_interrupt(irq, dev_id, regs); - return IRQ_HANDLED; - } - return IRQ_HANDLED; -} - -static void fd_disable_dma(void) -{ - doing_pdma = 0; - virtual_dma_residue += virtual_dma_count; - virtual_dma_count=0; -} - -static int fd_request_irq(void) -{ - return request_irq(FLOPPY_IRQ, floppy_hardint,SA_INTERRUPT, - "floppy", NULL); -} - -static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io) -{ - doing_pdma = 1; - virtual_dma_port = io; - virtual_dma_mode = (mode == DMA_MODE_WRITE); - virtual_dma_addr = addr; - virtual_dma_count = size; - virtual_dma_residue = 0; - return 0; -} - -/* XEN: This trick to force 'virtual DMA' is from include/asm-m68k/floppy.h. */ -#define FDC1 xen_floppy_init() -static int FDC2 = -1; - -static int xen_floppy_init(void) -{ - use_virtual_dma = 1; - can_use_virtual_dma = 1; - return 0x3f0; -} - -/* - * Floppy types are stored in the rtc's CMOS RAM and so rtc_lock - * is needed to prevent corrupted CMOS RAM in case "insmod floppy" - * coincides with another rtc CMOS user. Paul G. - */ -#define FLOPPY0_TYPE ({ \ - unsigned long flags; \ - unsigned char val; \ - spin_lock_irqsave(&rtc_lock, flags); \ - val = (CMOS_READ(0x10) >> 4) & 15; \ - spin_unlock_irqrestore(&rtc_lock, flags); \ - val; \ -}) - -#define FLOPPY1_TYPE ({ \ - unsigned long flags; \ - unsigned char val; \ - spin_lock_irqsave(&rtc_lock, flags); \ - val = CMOS_READ(0x10) & 15; \ - spin_unlock_irqrestore(&rtc_lock, flags); \ - val; \ -}) - -#define N_FDC 2 -#define N_DRIVE 8 - -#define FLOPPY_MOTOR_MASK 0xf0 - -#define EXTRA_FLOPPY_PARAMS - -#endif /* __ASM_XEN_I386_FLOPPY_H */