aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/sparc/Makefile1
-rw-r--r--include/asm-sparc/ide.h102
-rw-r--r--include/asm-sparc/ide_32.h95
-rw-r--r--include/asm-sparc/ide_64.h118
-rw-r--r--include/asm-sparc/io_32.h1
-rw-r--r--include/asm-sparc/io_64.h2
6 files changed, 100 insertions, 219 deletions
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index fef28e267a52..6668e6037af6 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -18,6 +18,7 @@ CHECKFLAGS += -D__sparc__
18#KBUILD_CFLAGS += -g -pipe -fcall-used-g5 -fcall-used-g7 18#KBUILD_CFLAGS += -g -pipe -fcall-used-g5 -fcall-used-g7
19KBUILD_CFLAGS += -m32 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7 19KBUILD_CFLAGS += -m32 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7
20KBUILD_AFLAGS += -m32 20KBUILD_AFLAGS += -m32
21CPPFLAGS_vmlinux.lds += -m32
21 22
22#LDFLAGS_vmlinux = -N -Ttext 0xf0004000 23#LDFLAGS_vmlinux = -N -Ttext 0xf0004000
23# Since 2.5.40, the first stage is left not btfix-ed. 24# Since 2.5.40, the first stage is left not btfix-ed.
diff --git a/include/asm-sparc/ide.h b/include/asm-sparc/ide.h
index a3c7f5ff270a..879fcec72dc1 100644
--- a/include/asm-sparc/ide.h
+++ b/include/asm-sparc/ide.h
@@ -1,8 +1,100 @@
1#ifndef ___ASM_SPARC_IDE_H 1/* ide.h: SPARC PCI specific IDE glue.
2#define ___ASM_SPARC_IDE_H 2 *
3#if defined(__sparc__) && defined(__arch64__) 3 * Copyright (C) 1997 David S. Miller (davem@davemloft.net)
4#include <asm-sparc/ide_64.h> 4 * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be)
5 * Adaptation from sparc64 version to sparc by Pete Zaitcev.
6 */
7
8#ifndef _SPARC_IDE_H
9#define _SPARC_IDE_H
10
11#ifdef __KERNEL__
12
13#include <asm/io.h>
14#ifdef CONFIG_SPARC64
15#include <asm/pgalloc.h>
16#include <asm/spitfire.h>
17#include <asm/cacheflush.h>
18#include <asm/page.h>
5#else 19#else
6#include <asm-sparc/ide_32.h> 20#include <asm/pgtable.h>
21#include <asm/psr.h>
7#endif 22#endif
23
24#undef MAX_HWIFS
25#define MAX_HWIFS 2
26
27#define __ide_insl(data_reg, buffer, wcount) \
28 __ide_insw(data_reg, buffer, (wcount)<<1)
29#define __ide_outsl(data_reg, buffer, wcount) \
30 __ide_outsw(data_reg, buffer, (wcount)<<1)
31
32/* On sparc, I/O ports and MMIO registers are accessed identically. */
33#define __ide_mm_insw __ide_insw
34#define __ide_mm_insl __ide_insl
35#define __ide_mm_outsw __ide_outsw
36#define __ide_mm_outsl __ide_outsl
37
38static inline void __ide_insw(void __iomem *port, void *dst, u32 count)
39{
40#if defined(CONFIG_SPARC64) && defined(DCACHE_ALIASING_POSSIBLE)
41 unsigned long end = (unsigned long)dst + (count << 1);
8#endif 42#endif
43 u16 *ps = dst;
44 u32 *pi;
45
46 if(((unsigned long)ps) & 0x2) {
47 *ps++ = __raw_readw(port);
48 count--;
49 }
50 pi = (u32 *)ps;
51 while(count >= 2) {
52 u32 w;
53
54 w = __raw_readw(port) << 16;
55 w |= __raw_readw(port);
56 *pi++ = w;
57 count -= 2;
58 }
59 ps = (u16 *)pi;
60 if(count)
61 *ps++ = __raw_readw(port);
62
63#if defined(CONFIG_SPARC64) && defined(DCACHE_ALIASING_POSSIBLE)
64 __flush_dcache_range((unsigned long)dst, end);
65#endif
66}
67
68static inline void __ide_outsw(void __iomem *port, const void *src, u32 count)
69{
70#if defined(CONFIG_SPARC64) && defined(DCACHE_ALIASING_POSSIBLE)
71 unsigned long end = (unsigned long)src + (count << 1);
72#endif
73 const u16 *ps = src;
74 const u32 *pi;
75
76 if(((unsigned long)src) & 0x2) {
77 __raw_writew(*ps++, port);
78 count--;
79 }
80 pi = (const u32 *)ps;
81 while(count >= 2) {
82 u32 w;
83
84 w = *pi++;
85 __raw_writew((w >> 16), port);
86 __raw_writew(w, port);
87 count -= 2;
88 }
89 ps = (const u16 *)pi;
90 if(count)
91 __raw_writew(*ps, port);
92
93#if defined(CONFIG_SPARC64) && defined(DCACHE_ALIASING_POSSIBLE)
94 __flush_dcache_range((unsigned long)src, end);
95#endif
96}
97
98#endif /* __KERNEL__ */
99
100#endif /* _SPARC_IDE_H */
diff --git a/include/asm-sparc/ide_32.h b/include/asm-sparc/ide_32.h
deleted file mode 100644
index afd1736ed480..000000000000
--- a/include/asm-sparc/ide_32.h
+++ /dev/null
@@ -1,95 +0,0 @@
1/* ide.h: SPARC PCI specific IDE glue.
2 *
3 * Copyright (C) 1997 David S. Miller (davem@davemloft.net)
4 * Copyright (C) 1998 Eddie C. Dost (ecd@skynet.be)
5 * Adaptation from sparc64 version to sparc by Pete Zaitcev.
6 */
7
8#ifndef _SPARC_IDE_H
9#define _SPARC_IDE_H
10
11#ifdef __KERNEL__
12
13#include <asm/pgtable.h>
14#include <asm/io.h>
15#include <asm/psr.h>
16
17#undef MAX_HWIFS
18#define MAX_HWIFS 2
19
20#define __ide_insl(data_reg, buffer, wcount) \
21 __ide_insw(data_reg, buffer, (wcount)<<1)
22#define __ide_outsl(data_reg, buffer, wcount) \
23 __ide_outsw(data_reg, buffer, (wcount)<<1)
24
25/* On sparc, I/O ports and MMIO registers are accessed identically. */
26#define __ide_mm_insw __ide_insw
27#define __ide_mm_insl __ide_insl
28#define __ide_mm_outsw __ide_outsw
29#define __ide_mm_outsl __ide_outsl
30
31static inline void __ide_insw(unsigned long port,
32 void *dst,
33 unsigned long count)
34{
35 volatile unsigned short *data_port;
36 /* unsigned long end = (unsigned long)dst + (count << 1); */ /* P3 */
37 u16 *ps = dst;
38 u32 *pi;
39
40 data_port = (volatile unsigned short *)port;
41
42 if(((unsigned long)ps) & 0x2) {
43 *ps++ = *data_port;
44 count--;
45 }
46 pi = (u32 *)ps;
47 while(count >= 2) {
48 u32 w;
49
50 w = (*data_port) << 16;
51 w |= (*data_port);
52 *pi++ = w;
53 count -= 2;
54 }
55 ps = (u16 *)pi;
56 if(count)
57 *ps++ = *data_port;
58
59 /* __flush_dcache_range((unsigned long)dst, end); */ /* P3 see hme */
60}
61
62static inline void __ide_outsw(unsigned long port,
63 const void *src,
64 unsigned long count)
65{
66 volatile unsigned short *data_port;
67 /* unsigned long end = (unsigned long)src + (count << 1); */
68 const u16 *ps = src;
69 const u32 *pi;
70
71 data_port = (volatile unsigned short *)port;
72
73 if(((unsigned long)src) & 0x2) {
74 *data_port = *ps++;
75 count--;
76 }
77 pi = (const u32 *)ps;
78 while(count >= 2) {
79 u32 w;
80
81 w = *pi++;
82 *data_port = (w >> 16);