diff options
author | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 14:24:56 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@inhelltoy.tec.linutronix.de> | 2007-10-17 14:24:56 -0400 |
commit | b515e4767ffd07d1b14f4dc4f328d75f765215ab (patch) | |
tree | a2f54256a757a0ca272b59b3751dedbfd202ea60 | |
parent | 2dc27f01ec3990d79fc97386459191fc3da2b02f (diff) |
x86: unify include/asm/floppy_32/64.h
Same file, except for whitespace, comment formatting and:
32-bit: if((unsigned int) addr >= (unsigned int) high_memory)
64-bit: if((unsigned long) addr >= (unsigned long) high_memory)
where the latter can be used safely for both.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Conflicts:
include/asm-x86/floppy_32.h
include/asm-x86/floppy_64.h
-rw-r--r-- | include/asm-x86/floppy.h | 281 | ||||
-rw-r--r-- | include/asm-x86/floppy_32.h | 280 | ||||
-rw-r--r-- | include/asm-x86/floppy_64.h | 279 |
3 files changed, 277 insertions, 563 deletions
diff --git a/include/asm-x86/floppy.h b/include/asm-x86/floppy.h index aecbb6dca21d..a48d7153c097 100644 --- a/include/asm-x86/floppy.h +++ b/include/asm-x86/floppy.h | |||
@@ -1,5 +1,278 @@ | |||
1 | #ifdef CONFIG_X86_32 | 1 | /* |
2 | # include "floppy_32.h" | 2 | * Architecture specific parts of the Floppy driver |
3 | #else | 3 | * |
4 | # include "floppy_64.h" | 4 | * This file is subject to the terms and conditions of the GNU General Public |
5 | * License. See the file "COPYING" in the main directory of this archive | ||
6 | * for more details. | ||
7 | * | ||
8 | * Copyright (C) 1995 | ||
9 | */ | ||
10 | #ifndef _ASM_X86_FLOPPY_H | ||
11 | #define _ASM_X86_FLOPPY_H | ||
12 | |||
13 | #include <linux/vmalloc.h> | ||
14 | |||
15 | /* | ||
16 | * The DMA channel used by the floppy controller cannot access data at | ||
17 | * addresses >= 16MB | ||
18 | * | ||
19 | * Went back to the 1MB limit, as some people had problems with the floppy | ||
20 | * driver otherwise. It doesn't matter much for performance anyway, as most | ||
21 | * floppy accesses go through the track buffer. | ||
22 | */ | ||
23 | #define _CROSS_64KB(a,s,vdma) \ | ||
24 | (!(vdma) && ((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64)) | ||
25 | |||
26 | #define CROSS_64KB(a,s) _CROSS_64KB(a,s,use_virtual_dma & 1) | ||
27 | |||
28 | |||
29 | #define SW fd_routine[use_virtual_dma&1] | ||
30 | #define CSW fd_routine[can_use_virtual_dma & 1] | ||
31 | |||
32 | |||
33 | #define fd_inb(port) inb_p(port) | ||
34 | #define fd_outb(value,port) outb_p(value,port) | ||
35 | |||
36 | #define fd_request_dma() CSW._request_dma(FLOPPY_DMA,"floppy") | ||
37 | #define fd_free_dma() CSW._free_dma(FLOPPY_DMA) | ||
38 | #define fd_enable_irq() enable_irq(FLOPPY_IRQ) | ||
39 | #define fd_disable_irq() disable_irq(FLOPPY_IRQ) | ||
40 | #define fd_free_irq() free_irq(FLOPPY_IRQ, NULL) | ||
41 | #define fd_get_dma_residue() SW._get_dma_residue(FLOPPY_DMA) | ||
42 | #define fd_dma_mem_alloc(size) SW._dma_mem_alloc(size) | ||
43 | #define fd_dma_setup(addr, size, mode, io) SW._dma_setup(addr, size, mode, io) | ||
44 | |||
45 | #define FLOPPY_CAN_FALLBACK_ON_NODMA | ||
46 | |||
47 | static int virtual_dma_count; | ||
48 | static int virtual_dma_residue; | ||
49 | static char *virtual_dma_addr; | ||
50 | static int virtual_dma_mode; | ||
51 | static int doing_pdma; | ||
52 | |||
53 | static irqreturn_t floppy_hardint(int irq, void *dev_id) | ||
54 | { | ||
55 | register unsigned char st; | ||
56 | |||
57 | #undef TRACE_FLPY_INT | ||
58 | |||
59 | #ifdef TRACE_FLPY_INT | ||
60 | static int calls=0; | ||
61 | static int bytes=0; | ||
62 | static int dma_wait=0; | ||
5 | #endif | 63 | #endif |
64 | if (!doing_pdma) | ||
65 | return floppy_interrupt(irq, dev_id); | ||
66 | |||
67 | #ifdef TRACE_FLPY_INT | ||
68 | if(!calls) | ||
69 | bytes = virtual_dma_count; | ||
70 | #endif | ||
71 | |||
72 | { | ||
73 | register int lcount; | ||
74 | register char *lptr; | ||
75 | |||
76 | st = 1; | ||
77 | for(lcount=virtual_dma_count, lptr=virtual_dma_addr; | ||
78 | lcount; lcount--, lptr++) { | ||
79 | st=inb(virtual_dma_port+4) & 0xa0 ; | ||
80 | if(st != 0xa0) | ||
81 | break; | ||
82 | if(virtual_dma_mode) | ||
83 | outb_p(*lptr, virtual_dma_port+5); | ||
84 | else | ||
85 | *lptr = inb_p(virtual_dma_port+5); | ||
86 | } | ||
87 | virtual_dma_count = lcount; | ||
88 | virtual_dma_addr = lptr; | ||
89 | st = inb(virtual_dma_port+4); | ||
90 | } | ||
91 | |||
92 | #ifdef TRACE_FLPY_INT | ||
93 | calls++; | ||
94 | #endif | ||
95 | if(st == 0x20) | ||
96 | return IRQ_HANDLED; | ||
97 | if(!(st & 0x20)) { | ||
98 | virtual_dma_residue += virtual_dma_count; | ||
99 | virtual_dma_count=0; | ||
100 | #ifdef TRACE_FLPY_INT | ||
101 | printk("count=%x, residue=%x calls=%d bytes=%d dma_wait=%d\n", | ||
102 | virtual_dma_count, virtual_dma_residue, calls, bytes, | ||
103 | dma_wait); | ||
104 | calls = 0; | ||
105 | dma_wait=0; | ||
106 | #endif | ||
107 | doing_pdma = 0; | ||
108 | floppy_interrupt(irq, dev_id); | ||
109 | return IRQ_HANDLED; | ||
110 | } | ||
111 | #ifdef TRACE_FLPY_INT | ||
112 | if(!virtual_dma_count) | ||
113 | dma_wait++; | ||
114 | #endif | ||
115 | return IRQ_HANDLED; | ||
116 | } | ||
117 | |||
118 | static void fd_disable_dma(void) | ||
119 | { | ||
120 | if(! (can_use_virtual_dma & 1)) | ||
121 | disable_dma(FLOPPY_DMA); | ||
122 | doing_pdma = 0; | ||
123 | virtual_dma_residue += virtual_dma_count; | ||
124 | virtual_dma_count=0; | ||
125 | } | ||
126 | |||
127 | static int vdma_request_dma(unsigned int dmanr, const char * device_id) | ||
128 | { | ||
129 | return 0; | ||
130 | } | ||
131 | |||
132 | static void vdma_nop(unsigned int dummy) | ||
133 | { | ||
134 | } | ||
135 | |||
136 | |||
137 | static int vdma_get_dma_residue(unsigned int dummy) | ||
138 | { | ||
139 | return virtual_dma_count + virtual_dma_residue; | ||
140 | } | ||
141 | |||
142 | |||
143 | static int fd_request_irq(void) | ||
144 | { | ||
145 | if(can_use_virtual_dma) | ||
146 | return request_irq(FLOPPY_IRQ, floppy_hardint, | ||
147 | IRQF_DISABLED, "floppy", NULL); | ||
148 | else | ||
149 | return request_irq(FLOPPY_IRQ, floppy_interrupt, | ||
150 | IRQF_DISABLED, "floppy", NULL); | ||
151 | } | ||
152 | |||
153 | static unsigned long dma_mem_alloc(unsigned long size) | ||
154 | { | ||
155 | return __get_dma_pages(GFP_KERNEL|__GFP_NORETRY,get_order(size)); | ||
156 | } | ||
157 | |||
158 | |||
159 | static unsigned long vdma_mem_alloc(unsigned long size) | ||
160 | { | ||
161 | return (unsigned long) vmalloc(size); | ||
162 | |||
163 | } | ||
164 | |||
165 | #define nodma_mem_alloc(size) vdma_mem_alloc(size) | ||
166 | |||
167 | static void _fd_dma_mem_free(unsigned long addr, unsigned long size) | ||
168 | { | ||
169 | if((unsigned long) addr >= (unsigned long) high_memory) | ||
170 | vfree((void *)addr); | ||
171 | else | ||
172 | free_pages(addr, get_order(size)); | ||
173 | } | ||
174 | |||
175 | #define fd_dma_mem_free(addr, size) _fd_dma_mem_free(addr, size) | ||
176 | |||
177 | static void _fd_chose_dma_mode(char *addr, unsigned long size) | ||
178 | { | ||
179 | if(can_use_virtual_dma == 2) { | ||
180 | if((unsigned long) addr >= (unsigned long) high_memory || | ||
181 | isa_virt_to_bus(addr) >= 0x1000000 || | ||
182 | _CROSS_64KB(addr, size, 0)) | ||
183 | use_virtual_dma = 1; | ||
184 | else | ||
185 | use_virtual_dma = 0; | ||
186 | } else { | ||
187 | use_virtual_dma = can_use_virtual_dma & 1; | ||
188 | } | ||
189 | } | ||
190 | |||
191 | #define fd_chose_dma_mode(addr, size) _fd_chose_dma_mode(addr, size) | ||
192 | |||
193 | |||
194 | static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io) | ||
195 | { | ||
196 | doing_pdma = 1; | ||
197 | virtual_dma_port = io; | ||
198 | virtual_dma_mode = (mode == DMA_MODE_WRITE); | ||
199 | virtual_dma_addr = addr; | ||
200 | virtual_dma_count = size; | ||
201 | virtual_dma_residue = 0; | ||
202 | return 0; | ||
203 | } | ||
204 | |||
205 | static int hard_dma_setup(char *addr, unsigned long size, int mode, int io) | ||
206 | { | ||
207 | #ifdef FLOPPY_SANITY_CHECK | ||
208 | if (CROSS_64KB(addr, size)) { | ||
209 | printk("DMA crossing 64-K boundary %p-%p\n", addr, addr+size); | ||
210 | return -1; | ||
211 | } | ||
212 | #endif | ||
213 | /* actual, physical DMA */ | ||
214 | doing_pdma = 0; | ||
215 | clear_dma_ff(FLOPPY_DMA); | ||
216 | set_dma_mode(FLOPPY_DMA,mode); | ||
217 | set_dma_addr(FLOPPY_DMA,isa_virt_to_bus(addr)); | ||
218 | set_dma_count(FLOPPY_DMA,size); | ||
219 | enable_dma(FLOPPY_DMA); | ||
220 | return 0; | ||
221 | } | ||
222 | |||
223 | static struct fd_routine_l { | ||
224 | int (*_request_dma)(unsigned int dmanr, const char * device_id); | ||
225 | void (*_free_dma)(unsigned int dmanr); | ||
226 | int (*_get_dma_residue)(unsigned int dummy); | ||
227 | unsigned long (*_dma_mem_alloc) (unsigned long size); | ||
228 | int (*_dma_setup)(char *addr, unsigned long size, int mode, int io); | ||
229 | } fd_routine[] = { | ||
230 | { | ||
231 | request_dma, | ||
232 | free_dma, | ||
233 | get_dma_residue, | ||
234 | dma_mem_alloc, | ||
235 | hard_dma_setup | ||
236 | }, | ||
237 | { | ||
238 | vdma_request_dma, | ||
239 | vdma_nop, | ||
240 | vdma_get_dma_residue, | ||
241 | vdma_mem_alloc, | ||
242 | vdma_dma_setup | ||
243 | } | ||
244 | }; | ||
245 | |||
246 | |||
247 | static int FDC1 = 0x3f0; | ||
248 | static int FDC2 = -1; | ||
249 | |||
250 | /* | ||
251 | * Floppy types are stored in the rtc's CMOS RAM and so rtc_lock | ||
252 | * is needed to prevent corrupted CMOS RAM in case "insmod floppy" | ||
253 | * coincides with another rtc CMOS user. Paul G. | ||
254 | */ | ||
255 | #define FLOPPY0_TYPE ({ \ | ||
256 | unsigned long flags; \ | ||
257 | unsigned char val; \ | ||
258 | spin_lock_irqsave(&rtc_lock, flags); \ | ||
259 | val = (CMOS_READ(0x10) >> 4) & 15; \ | ||
260 | spin_unlock_irqrestore(&rtc_lock, flags); \ | ||
261 | val; \ | ||
262 | }) | ||
263 | |||
264 | #define FLOPPY1_TYPE ({ \ | ||
265 | unsigned long flags; \ | ||
266 | unsigned char val; \ | ||
267 | spin_lock_irqsave(&rtc_lock, flags); \ | ||
268 | val = CMOS_READ(0x10) & 15; \ | ||
269 | spin_unlock_irqrestore(&rtc_lock, flags); \ | ||
270 | val; \ | ||
271 | }) | ||
272 | |||
273 | #define N_FDC 2 | ||
274 | #define N_DRIVE 8 | ||
275 | |||
276 | #define EXTRA_FLOPPY_PARAMS | ||
277 | |||
278 | #endif /* _ASM_X86_FLOPPY_H */ | ||
diff --git a/include/asm-x86/floppy_32.h b/include/asm-x86/floppy_32.h deleted file mode 100644 index cca9be7f6c81..000000000000 --- a/include/asm-x86/floppy_32.h +++ /dev/null | |||
@@ -1,280 +0,0 @@ | |||
1 | /* | ||
2 | * Architecture specific parts of the Floppy driver | ||
3 | * | ||
4 | * This file is subject to the terms and conditions of the GNU General Public | ||
5 | * License. See the file "COPYING" in the main directory of this archive | ||
6 | * for more details. | ||
7 | * | ||
8 | * Copyright (C) 1995 | ||
9 | */ | ||
10 | #ifndef __ASM_I386_FLOPPY_H | ||
11 | #define __ASM_I386_FLOPPY_H | ||
12 | |||
13 | #include <linux/vmalloc.h> | ||
14 | |||
15 | |||
16 | /* | ||
17 | * The DMA channel used by the floppy controller cannot access data at | ||
18 | * addresses >= 16MB | ||
19 | * | ||
20 | * Went back to the 1MB limit, as some people had problems with the floppy | ||
21 | * driver otherwise. It doesn't matter much for performance anyway, as most | ||
22 | * floppy accesses go through the track buffer. | ||
23 | */ | ||
24 | #define _CROSS_64KB(a,s,vdma) \ | ||
25 | (!(vdma) && ((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64)) | ||
26 | |||
27 | #define CROSS_64KB(a,s) _CROSS_64KB(a,s,use_virtual_dma & 1) | ||
28 | |||
29 | |||
30 | #define SW fd_routine[use_virtual_dma&1] | ||
31 | #define CSW fd_routine[can_use_virtual_dma & 1] | ||
32 | |||
33 | |||
34 | #define fd_inb(port) inb_p(port) | ||
35 | #define fd_outb(value,port) outb_p(value,port) | ||
36 | |||
37 | #define fd_request_dma() CSW._request_dma(FLOPPY_DMA,"floppy") | ||
38 | #define fd_free_dma() CSW._free_dma(FLOPPY_DMA) | ||
39 | #define fd_enable_irq() enable_irq(FLOPPY_IRQ) | ||
40 | #define fd_disable_irq() disable_irq(FLOPPY_IRQ) | ||
41 | #define fd_free_irq() free_irq(FLOPPY_IRQ, NULL) | ||
42 | #define fd_get_dma_residue() SW._get_dma_residue(FLOPPY_DMA) | ||
43 | #define fd_dma_mem_alloc(size) SW._dma_mem_alloc(size) | ||
44 | #define fd_dma_setup(addr, size, mode, io) SW._dma_setup(addr, size, mode, io) | ||
45 | |||
46 | #define FLOPPY_CAN_FALLBACK_ON_NODMA | ||
47 | |||
48 | static int virtual_dma_count; | ||
49 | static int virtual_dma_residue; | ||
50 | static char *virtual_dma_addr; | ||
51 | static int virtual_dma_mode; | ||
52 | static int doing_pdma; | ||
53 | |||
54 | static irqreturn_t floppy_hardint(int irq, void *dev_id) | ||
55 | { | ||
56 | register unsigned char st; | ||
57 | |||
58 | #undef TRACE_FLPY_INT | ||
59 | |||
60 | #ifdef TRACE_FLPY_INT | ||
61 | static int calls=0; | ||
62 | static int bytes=0; | ||
63 | static int dma_wait=0; | ||
64 | #endif | ||
65 | if (!doing_pdma) | ||
66 | return floppy_interrupt(irq, dev_id); | ||
67 | |||
68 | #ifdef TRACE_FLPY_INT | ||
69 | if(!calls) | ||
70 | bytes = virtual_dma_count; | ||
71 | #endif | ||
72 | |||
73 | { | ||
74 | register int lcount; | ||
75 | register char *lptr; | ||
76 | |||
77 | st = 1; | ||
78 | for(lcount=virtual_dma_count, lptr=virtual_dma_addr; | ||
79 | lcount; lcount--, lptr++) { | ||
80 | st=inb(virtual_dma_port+4) & 0xa0 ; | ||
81 | if(st != 0xa0) | ||
82 | break; | ||
83 | if(virtual_dma_mode) | ||
84 | outb_p(*lptr, virtual_dma_port+5); | ||
85 | else | ||
86 | *lptr = inb_p(virtual_dma_port+5); | ||
87 | } | ||
88 | virtual_dma_count = lcount; | ||
89 | virtual_dma_addr = lptr; | ||
90 | st = inb(virtual_dma_port+4); | ||
91 | } | ||
92 | |||
93 | #ifdef TRACE_FLPY_INT | ||
94 | calls++; | ||
95 | #endif | ||
96 | if(st == 0x20) | ||
97 | return IRQ_HANDLED; | ||
98 | if(!(st & 0x20)) { | ||
99 | virtual_dma_residue += virtual_dma_count; | ||
100 | virtual_dma_count=0; | ||
101 | #ifdef TRACE_FLPY_INT | ||
102 | printk("count=%x, residue=%x calls=%d bytes=%d dma_wait=%d\n", | ||
103 | virtual_dma_count, virtual_dma_residue, calls, bytes, | ||
104 | dma_wait); | ||
105 | calls = 0; | ||
106 | dma_wait=0; | ||
107 | #endif | ||
108 | doing_pdma = 0; | ||
109 | floppy_interrupt(irq, dev_id); | ||
110 | return IRQ_HANDLED; | ||
111 | } | ||
112 | #ifdef TRACE_FLPY_INT | ||
113 | if(!virtual_dma_count) | ||
114 | dma_wait++; | ||
115 | #endif | ||
116 | return IRQ_HANDLED; | ||
117 | } | ||
118 | |||
119 | static void fd_disable_dma(void) | ||
120 | { | ||
121 | if(! (can_use_virtual_dma & 1)) | ||
122 | disable_dma(FLOPPY_DMA); | ||
123 | doing_pdma = 0; | ||
124 | virtual_dma_residue += virtual_dma_count; | ||
125 | virtual_dma_count=0; | ||
126 | } | ||
127 | |||
128 | static int vdma_request_dma(unsigned int dmanr, const char * device_id) | ||
129 | { | ||
130 | return 0; | ||
131 | } | ||
132 | |||
133 | static void vdma_nop(unsigned int dummy) | ||
134 | { | ||
135 | } | ||
136 | |||
137 | |||
138 | static int vdma_get_dma_residue(unsigned int dummy) | ||
139 | { | ||
140 | return virtual_dma_count + virtual_dma_residue; | ||
141 | } | ||
142 | |||
143 | |||
144 | static int fd_request_irq(void) | ||
145 | { | ||
146 | if(can_use_virtual_dma) | ||
147 | return request_irq(FLOPPY_IRQ, floppy_hardint, | ||
148 | IRQF_DISABLED, "floppy", NULL); | ||
149 | else | ||
150 | return request_irq(FLOPPY_IRQ, floppy_interrupt, | ||
151 | IRQF_DISABLED, "floppy", NULL); | ||
152 | |||
153 | } | ||
154 | |||
155 | static unsigned long dma_mem_alloc(unsigned long size) | ||
156 | { | ||
157 | return __get_dma_pages(GFP_KERNEL | __GFP_NORETRY, get_order(size)); | ||
158 | } | ||
159 | |||
160 | |||
161 | static unsigned long vdma_mem_alloc(unsigned long size) | ||
162 | { | ||
163 | return (unsigned long) vmalloc(size); | ||
164 | |||
165 | } | ||
166 | |||
167 | #define nodma_mem_alloc(size) vdma_mem_alloc(size) | ||
168 | |||
169 | static void _fd_dma_mem_free(unsigned long addr, unsigned long size) | ||
170 | { | ||
171 | if((unsigned int) addr >= (unsigned int) high_memory) | ||
172 | vfree((void *)addr); | ||
173 | else | ||
174 | free_pages(addr, get_order(size)); | ||
175 | } | ||
176 | |||
177 | #define fd_dma_mem_free(addr, size) _fd_dma_mem_free(addr, size) | ||
178 | |||
179 | static void _fd_chose_dma_mode(char *addr, unsigned long size) | ||
180 | { | ||
181 | if(can_use_virtual_dma == 2) { | ||
182 | if((unsigned int) addr >= (unsigned int) high_memory || | ||
183 | isa_virt_to_bus(addr) >= 0x1000000 || | ||
184 | _CROSS_64KB(addr, size, 0)) | ||
185 | use_virtual_dma = 1; | ||
186 | else | ||
187 | use_virtual_dma = 0; | ||
188 | } else { | ||
189 | use_virtual_dma = can_use_virtual_dma & 1; | ||
190 | } | ||
191 | } | ||
192 | |||
193 | #define fd_chose_dma_mode(addr, size) _fd_chose_dma_mode(addr, size) | ||
194 | |||
195 | |||
196 | static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io) | ||
197 | { | ||
198 | doing_pdma = 1; | ||
199 | virtual_dma_port = io; | ||
200 | virtual_dma_mode = (mode == DMA_MODE_WRITE); | ||
201 | virtual_dma_addr = addr; | ||
202 | virtual_dma_count = size; | ||
203 | virtual_dma_residue = 0; | ||
204 | return 0; | ||
205 | } | ||
206 | |||
207 | static int hard_dma_setup(char *addr, unsigned long size, int mode, int io) | ||
208 | { | ||
209 | #ifdef FLOPPY_SANITY_CHECK | ||
210 | if (CROSS_64KB(addr, size)) { | ||
211 | printk("DMA crossing 64-K boundary %p-%p\n", addr, addr+size); | ||
212 | return -1; | ||
213 | } | ||
214 | #endif | ||
215 | /* actual, physical DMA */ | ||
216 | doing_pdma = 0; | ||
217 | clear_dma_ff(FLOPPY_DMA); | ||
218 | set_dma_mode(FLOPPY_DMA,mode); | ||
219 | set_dma_addr(FLOPPY_DMA,isa_virt_to_bus(addr)); | ||
220 | set_dma_count(FLOPPY_DMA,size); | ||
221 | enable_dma(FLOPPY_DMA); | ||
222 | return 0; | ||
223 | } | ||
224 | |||
225 | static struct fd_routine_l { | ||
226 | int (*_request_dma)(unsigned int dmanr, const char * device_id); | ||
227 | void (*_free_dma)(unsigned int dmanr); | ||
228 | int (*_get_dma_residue)(unsigned int dummy); | ||
229 | unsigned long (*_dma_mem_alloc) (unsigned long size); | ||
230 | int (*_dma_setup)(char *addr, unsigned long size, int mode, int io); | ||
231 | } fd_routine[] = { | ||
232 | { | ||
233 | request_dma, | ||
234 | free_dma, | ||
235 | get_dma_residue, | ||
236 | dma_mem_alloc, | ||
237 | hard_dma_setup | ||
238 | }, | ||
239 | { | ||
240 | vdma_request_dma, | ||
241 | vdma_nop, | ||
242 | vdma_get_dma_residue, | ||
243 | vdma_mem_alloc, | ||
244 | vdma_dma_setup | ||
245 | } | ||
246 | }; | ||
247 | |||
248 | |||
249 | static int FDC1 = 0x3f0; | ||
250 | static int FDC2 = -1; | ||
251 | |||
252 | /* | ||
253 | * Floppy types are stored in the rtc's CMOS RAM and so rtc_lock | ||
254 | * is needed to prevent corrupted CMOS RAM in case "insmod floppy" | ||
255 | * coincides with another rtc CMOS user. Paul G. | ||
256 | */ | ||
257 | #define FLOPPY0_TYPE ({ \ | ||
258 | unsigned long flags; \ | ||
259 | unsigned char val; \ | ||
260 | spin_lock_irqsave(&rtc_lock, flags); \ | ||
261 | val = (CMOS_READ(0x10) >> 4) & 15; \ | ||
262 | spin_unlock_irqrestore(&rtc_lock, flags); \ | ||
263 | val; \ | ||
264 | }) | ||
265 | |||
266 | #define FLOPPY1_TYPE ({ \ | ||
267 | unsigned long flags; \ | ||
268 | unsigned char val; \ | ||
269 | spin_lock_irqsave(&rtc_lock, flags); \ | ||
270 | val = CMOS_READ(0x10) & 15; \ | ||
271 | spin_unlock_irqrestore(&rtc_lock, flags); \ | ||
272 | val; \ | ||
273 | }) | ||
274 | |||
275 | #define N_FDC 2 | ||
276 | #define N_DRIVE 8 | ||
277 | |||
278 | #define EXTRA_FLOPPY_PARAMS | ||
279 | |||
280 | #endif /* __ASM_I386_FLOPPY_H */ | ||
diff --git a/include/asm-x86/floppy_64.h b/include/asm-x86/floppy_64.h deleted file mode 100644 index d993380dcb47..000000000000 --- a/include/asm-x86/floppy_64.h +++ /dev/null | |||
@@ -1,279 +0,0 @@ | |||
1 | /* | ||
2 | * Architecture specific parts of the Floppy driver | ||
3 | * | ||
4 | * This file is subject to the terms and conditions of the GNU General Public | ||
5 | * License. See the file "COPYING" in the main directory of this archive | ||
6 | * for more details. | ||
7 | * | ||
8 | * Copyright (C) 1995 | ||
9 | */ | ||
10 | #ifndef __ASM_X86_64_FLOPPY_H | ||
11 | #define __ASM_X86_64_FLOPPY_H | ||
12 | |||
13 | #include <linux/vmalloc.h> | ||
14 | |||
15 | |||
16 | /* | ||
17 | * The DMA channel used by the floppy controller cannot access data at | ||
18 | * addresses >= 16MB | ||
19 | * | ||
20 | * Went back to the 1MB limit, as some people had problems with the floppy | ||
21 | * driver otherwise. It doesn't matter much for performance anyway, as most | ||
22 | * floppy accesses go through the track buffer. | ||
23 | */ | ||
24 | #define _CROSS_64KB(a,s,vdma) \ | ||
25 | (!(vdma) && ((unsigned long)(a)/K_64 != ((unsigned long)(a) + (s) - 1) / K_64)) | ||
26 | |||
27 | #define CROSS_64KB(a,s) _CROSS_64KB(a,s,use_virtual_dma & 1) | ||
28 | |||
29 | |||
30 | #define SW fd_routine[use_virtual_dma&1] | ||
31 | #define CSW fd_routine[can_use_virtual_dma & 1] | ||
32 | |||
33 | |||
34 | #define fd_inb(port) inb_p(port) | ||
35 | #define fd_outb(value,port) outb_p(value,port) | ||
36 | |||
37 | #define fd_request_dma() CSW._request_dma(FLOPPY_DMA,"floppy") | ||
38 | #define fd_free_dma() CSW._free_dma(FLOPPY_DMA) | ||
39 | #define fd_enable_irq() enable_irq(FLOPPY_IRQ) | ||
40 | #define fd_disable_irq() disable_irq(FLOPPY_IRQ) | ||
41 | #define fd_free_irq() free_irq(FLOPPY_IRQ, NULL) | ||
42 | #define fd_get_dma_residue() SW._get_dma_residue(FLOPPY_DMA) | ||
43 | #define fd_dma_mem_alloc(size) SW._dma_mem_alloc(size) | ||
44 | #define fd_dma_setup(addr, size, mode, io) SW._dma_setup(addr, size, mode, io) | ||
45 | |||
46 | #define FLOPPY_CAN_FALLBACK_ON_NODMA | ||
47 | |||
48 | static int virtual_dma_count; | ||
49 | static int virtual_dma_residue; | ||
50 | static char *virtual_dma_addr; | ||
51 | static int virtual_dma_mode; | ||
52 | static int doing_pdma; | ||
53 | |||
54 | static irqreturn_t floppy_hardint(int irq, void *dev_id) | ||
55 | { | ||
56 | register unsigned char st; | ||
57 | |||
58 | #undef TRACE_FLPY_INT | ||
59 | |||
60 | #ifdef TRACE_FLPY_INT | ||
61 | static int calls=0; | ||
62 | static int bytes=0; | ||
63 | static int dma_wait=0; | ||
64 | #endif | ||
65 | if (!doing_pdma) | ||
66 | return floppy_interrupt(irq, dev_id); | ||
67 | |||
68 | #ifdef TRACE_FLPY_INT | ||
69 | if(!calls) | ||
70 | bytes = virtual_dma_count; | ||
71 | #endif | ||
72 | |||
73 | { | ||
74 | register int lcount; | ||
75 | register char *lptr; | ||
76 | |||
77 | st = 1; | ||
78 | for(lcount=virtual_dma_count, lptr=virtual_dma_addr; | ||
79 | lcount; lcount--, lptr++) { | ||
80 | st=inb(virtual_dma_port+4) & 0xa0 ; | ||
81 | if(st != 0xa0) | ||
82 | break; | ||
83 | if(virtual_dma_mode) | ||
84 | outb_p(*lptr, virtual_dma_port+5); | ||
85 | else | ||
86 | *lptr = inb_p(virtual_dma_port+5); | ||
87 | } | ||
88 | virtual_dma_count = lcount; | ||
89 | virtual_dma_addr = lptr; | ||
90 | st = inb(virtual_dma_port+4); | ||
91 | } | ||
92 | |||
93 | #ifdef TRACE_FLPY_INT | ||
94 | calls++; | ||
95 | #endif | ||
96 | if(st == 0x20) | ||
97 | return IRQ_HANDLED; | ||
98 | if(!(st & 0x20)) { | ||
99 | virtual_dma_residue += virtual_dma_count; | ||
100 | virtual_dma_count=0; | ||
101 | #ifdef TRACE_FLPY_INT | ||
102 | printk("count=%x, residue=%x calls=%d bytes=%d dma_wait=%d\n", | ||
103 | virtual_dma_count, virtual_dma_residue, calls, bytes, | ||
104 | dma_wait); | ||
105 | calls = 0; | ||
106 | dma_wait=0; | ||
107 | #endif | ||
108 | doing_pdma = 0; | ||
109 | floppy_interrupt(irq, dev_id); | ||
110 | return IRQ_HANDLED; | ||
111 | } | ||
112 | #ifdef TRACE_FLPY_INT | ||
113 | if(!virtual_dma_count) | ||
114 | dma_wait++; | ||
115 | #endif | ||
116 | return IRQ_HANDLED; | ||
117 | } | ||
118 | |||
119 | static void fd_disable_dma(void) | ||
120 | { | ||
121 | if(! (can_use_virtual_dma & 1)) | ||
122 | disable_dma(FLOPPY_DMA); | ||
123 | doing_pdma = 0; | ||
124 | virtual_dma_residue += virtual_dma_count; | ||
125 | virtual_dma_count=0; | ||
126 | } | ||
127 | |||
128 | static int vdma_request_dma(unsigned int dmanr, const char * device_id) | ||
129 | { | ||
130 | return 0; | ||
131 | } | ||
132 | |||
133 | static void vdma_nop(unsigned int dummy) | ||
134 | { | ||
135 | } | ||
136 | |||
137 | |||
138 | static int vdma_get_dma_residue(unsigned int dummy) | ||
139 | { | ||
140 | return virtual_dma_count + virtual_dma_residue; | ||
141 | } | ||
142 | |||
143 | |||
144 | static int fd_request_irq(void) | ||
145 | { | ||
146 | if(can_use_virtual_dma) | ||
147 | return request_irq(FLOPPY_IRQ, floppy_hardint, | ||
148 | IRQF_DISABLED, "floppy", NULL); | ||
149 | else | ||
150 | return request_irq(FLOPPY_IRQ, floppy_interrupt, | ||
151 | IRQF_DISABLED, "floppy", NULL); | ||
152 | } | ||
153 | |||
154 | static unsigned long dma_mem_alloc(unsigned long size) | ||
155 | { | ||
156 | return __get_dma_pages(GFP_KERNEL|__GFP_NORETRY,get_order(size)); | ||
157 | } | ||
158 | |||
159 | |||
160 | static unsigned long vdma_mem_alloc(unsigned long size) | ||
161 | { | ||
162 | return (unsigned long) vmalloc(size); | ||
163 | |||
164 | } | ||
165 | |||
166 | #define nodma_mem_alloc(size) vdma_mem_alloc(size) | ||
167 | |||
168 | static void _fd_dma_mem_free(unsigned long addr, unsigned long size) | ||
169 | { | ||
170 | if((unsigned long) addr >= (unsigned long) high_memory) | ||
171 | vfree((void *)addr); | ||
172 | else | ||
173 | free_pages(addr, get_order(size)); | ||
174 | } | ||
175 | |||
176 | #define fd_dma_mem_free(addr, size) _fd_dma_mem_free(addr, size) | ||
177 | |||
178 | static void _fd_chose_dma_mode(char *addr, unsigned long size) | ||
179 | { | ||
180 | if(can_use_virtual_dma == 2) { | ||
181 | if((unsigned long) addr >= (unsigned long) high_memory || | ||
182 | isa_virt_to_bus(addr) >= 0x1000000 || | ||
183 | _CROSS_64KB(addr, size, 0)) | ||
184 | use_virtual_dma = 1; | ||
185 | else | ||
186 | use_virtual_dma = 0; | ||
187 | } else { | ||
188 | use_virtual_dma = can_use_virtual_dma & 1; | ||
189 | } | ||
190 | } | ||
191 | |||
192 | #define fd_chose_dma_mode(addr, size) _fd_chose_dma_mode(addr, size) | ||
193 | |||
194 | |||
195 | static int vdma_dma_setup(char *addr, unsigned long size, int mode, int io) | ||
196 | { | ||
197 | doing_pdma = 1; | ||
198 | virtual_dma_port = io; | ||
199 | virtual_dma_mode = (mode == DMA_MODE_WRITE); | ||
200 | virtual_dma_addr = addr; | ||
201 | virtual_dma_count = size; | ||
202 | virtual_dma_residue = 0; | ||
203 | return 0; | ||
204 | } | ||
205 | |||
206 | static int hard_dma_setup(char *addr, unsigned long size, int mode, int io) | ||
207 | { | ||
208 | #ifdef FLOPPY_SANITY_CHECK | ||
209 | if (CROSS_64KB(addr, size)) { | ||
210 | printk("DMA crossing 64-K boundary %p-%p\n", addr, addr+size); | ||
211 | return -1; | ||
212 | } | ||
213 | #endif | ||
214 | /* actual, physical DMA */ | ||
215 | doing_pdma = 0; | ||
216 | clear_dma_ff(FLOPPY_DMA); | ||
217 | set_dma_mode(FLOPPY_DMA,mode); | ||
218 | set_dma_addr(FLOPPY_DMA,isa_virt_to_bus(addr)); | ||
219 | set_dma_count(FLOPPY_DMA,size); | ||
220 | enable_dma(FLOPPY_DMA); | ||
221 | return 0; | ||
222 | } | ||
223 | |||
224 | static struct fd_routine_l { | ||
225 | int (*_request_dma)(unsigned int dmanr, const char * device_id); | ||
226 | void (*_free_dma)(unsigned int dmanr); | ||
227 | int (*_get_dma_residue)(unsigned int dummy); | ||
228 | unsigned long (*_dma_mem_alloc) (unsigned long size); | ||
229 | int (*_dma_setup)(char *addr, unsigned long size, int mode, int io); | ||
230 | } fd_routine[] = { | ||
231 | { | ||
232 | request_dma, | ||
233 | free_dma, | ||
234 | get_dma_residue, | ||
235 | dma_mem_alloc, | ||
236 | hard_dma_setup | ||
237 | }, | ||
238 | { | ||
239 | vdma_request_dma, | ||
240 | vdma_nop, | ||
241 | vdma_get_dma_residue, | ||
242 | vdma_mem_alloc, | ||
243 | vdma_dma_setup | ||
244 | } | ||
245 | }; | ||
246 | |||
247 | |||
248 | static int FDC1 = 0x3f0; | ||
249 | static int FDC2 = -1; | ||
250 | |||
251 | /* | ||
252 | * Floppy types are stored in the rtc's CMOS RAM and so rtc_lock | ||
253 | * is needed to prevent corrupted CMOS RAM in case "insmod floppy" | ||
254 | * coincides with another rtc CMOS user. Paul G. | ||
255 | */ | ||
256 | #define FLOPPY0_TYPE ({ \ | ||
257 | unsigned long flags; \ | ||
258 | unsigned char val; \ | ||
259 | spin_lock_irqsave(&rtc_lock, flags); \ | ||
260 | val = (CMOS_READ(0x10) >> 4) & 15; \ | ||
261 | spin_unlock_irqrestore(&rtc_lock, flags); \ | ||
262 | val; \ | ||
263 | }) | ||
264 | |||
265 | #define FLOPPY1_TYPE ({ \ | ||
266 | unsigned long flags; \ | ||
267 | unsigned char val; \ | ||
268 | spin_lock_irqsave(&rtc_lock, flags); \ | ||
269 | val = CMOS_READ(0x10) & 15; \ | ||
270 | spin_unlock_irqrestore(&rtc_lock, flags); \ | ||
271 | val; \ | ||
272 | }) | ||
273 | |||
274 | #define N_FDC 2 | ||
275 | #define N_DRIVE 8 | ||
276 | |||
277 | #define EXTRA_FLOPPY_PARAMS | ||
278 | |||
279 | #endif /* __ASM_X86_64_FLOPPY_H */ | ||