diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2006-05-27 00:08:25 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2006-05-27 02:26:14 -0400 |
commit | d886cb586f60a5ccf156392f96a39bc52db925d0 (patch) | |
tree | 5862de796cf8dfd2f38e30d36cc589a07b5f9d88 /drivers | |
parent | a8bd60705aa17a998516837d9c1e503ad4cbd7fc (diff) |
[PATCH] trivial annotations in rio
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/char/rio/daemon.h | 12 | ||||
-rw-r--r-- | drivers/char/rio/func.h | 25 | ||||
-rw-r--r-- | drivers/char/rio/host.h | 16 | ||||
-rw-r--r-- | drivers/char/rio/port.h | 16 | ||||
-rw-r--r-- | drivers/char/rio/rio.h | 4 | ||||
-rw-r--r-- | drivers/char/rio/rio_linux.c | 29 | ||||
-rw-r--r-- | drivers/char/rio/rio_linux.h | 10 | ||||
-rw-r--r-- | drivers/char/rio/rioboot.c | 52 | ||||
-rw-r--r-- | drivers/char/rio/riocmd.c | 20 | ||||
-rw-r--r-- | drivers/char/rio/rioctrl.c | 164 | ||||
-rw-r--r-- | drivers/char/rio/rioinit.c | 28 | ||||
-rw-r--r-- | drivers/char/rio/riointr.c | 18 | ||||
-rw-r--r-- | drivers/char/rio/rioparam.c | 28 | ||||
-rw-r--r-- | drivers/char/rio/rioroute.c | 12 | ||||
-rw-r--r-- | drivers/char/rio/riotable.c | 20 | ||||
-rw-r--r-- | drivers/char/rio/riotty.c | 2 | ||||
-rw-r--r-- | drivers/char/rio/unixrup.h | 2 |
17 files changed, 228 insertions, 230 deletions
diff --git a/drivers/char/rio/daemon.h b/drivers/char/rio/daemon.h index 5818a8aa46e0..6e63f8b2c479 100644 --- a/drivers/char/rio/daemon.h +++ b/drivers/char/rio/daemon.h | |||
@@ -51,7 +51,7 @@ struct Error { | |||
51 | }; | 51 | }; |
52 | 52 | ||
53 | struct DownLoad { | 53 | struct DownLoad { |
54 | char *DataP; | 54 | char __user *DataP; |
55 | unsigned int Count; | 55 | unsigned int Count; |
56 | unsigned int ProductCode; | 56 | unsigned int ProductCode; |
57 | }; | 57 | }; |
@@ -83,18 +83,18 @@ struct PortSetup { | |||
83 | struct LpbReq { | 83 | struct LpbReq { |
84 | unsigned int Host; | 84 | unsigned int Host; |
85 | unsigned int Link; | 85 | unsigned int Link; |
86 | struct LPB *LpbP; | 86 | struct LPB __user *LpbP; |
87 | }; | 87 | }; |
88 | 88 | ||
89 | struct RupReq { | 89 | struct RupReq { |
90 | unsigned int HostNum; | 90 | unsigned int HostNum; |
91 | unsigned int RupNum; | 91 | unsigned int RupNum; |
92 | struct RUP *RupP; | 92 | struct RUP __user *RupP; |
93 | }; | 93 | }; |
94 | 94 | ||
95 | struct PortReq { | 95 | struct PortReq { |
96 | unsigned int SysPort; | 96 | unsigned int SysPort; |
97 | struct Port *PortP; | 97 | struct Port __user *PortP; |
98 | }; | 98 | }; |
99 | 99 | ||
100 | struct StreamInfo { | 100 | struct StreamInfo { |
@@ -105,12 +105,12 @@ struct StreamInfo { | |||
105 | 105 | ||
106 | struct HostReq { | 106 | struct HostReq { |
107 | unsigned int HostNum; | 107 | unsigned int HostNum; |
108 | struct Host *HostP; | 108 | struct Host __user *HostP; |
109 | }; | 109 | }; |
110 | 110 | ||
111 | struct HostDpRam { | 111 | struct HostDpRam { |
112 | unsigned int HostNum; | 112 | unsigned int HostNum; |
113 | struct DpRam *DpRamP; | 113 | struct DpRam __user *DpRamP; |
114 | }; | 114 | }; |
115 | 115 | ||
116 | struct DebugCtrl { | 116 | struct DebugCtrl { |
diff --git a/drivers/char/rio/func.h b/drivers/char/rio/func.h index e64fe9912394..0707af33f017 100644 --- a/drivers/char/rio/func.h +++ b/drivers/char/rio/func.h | |||
@@ -46,7 +46,7 @@ int RIOBootCodeRTA(struct rio_info *, struct DownLoad *); | |||
46 | int RIOBootCodeHOST(struct rio_info *, struct DownLoad *); | 46 | int RIOBootCodeHOST(struct rio_info *, struct DownLoad *); |
47 | int RIOBootCodeUNKNOWN(struct rio_info *, struct DownLoad *); | 47 | int RIOBootCodeUNKNOWN(struct rio_info *, struct DownLoad *); |
48 | void msec_timeout(struct Host *); | 48 | void msec_timeout(struct Host *); |
49 | int RIOBootRup(struct rio_info *, unsigned int, struct Host *, struct PKT *); | 49 | int RIOBootRup(struct rio_info *, unsigned int, struct Host *, struct PKT __iomem *); |
50 | int RIOBootOk(struct rio_info *, struct Host *, unsigned long); | 50 | int RIOBootOk(struct rio_info *, struct Host *, unsigned long); |
51 | int RIORtaBound(struct rio_info *, unsigned int); | 51 | int RIORtaBound(struct rio_info *, unsigned int); |
52 | void rio_fill_host_slot(int, int, unsigned int, struct Host *); | 52 | void rio_fill_host_slot(int, int, unsigned int, struct Host *); |
@@ -55,8 +55,8 @@ void rio_fill_host_slot(int, int, unsigned int, struct Host *); | |||
55 | int RIOFoadRta(struct Host *, struct Map *); | 55 | int RIOFoadRta(struct Host *, struct Map *); |
56 | int RIOZombieRta(struct Host *, struct Map *); | 56 | int RIOZombieRta(struct Host *, struct Map *); |
57 | int RIOCommandRta(struct rio_info *, unsigned long, int (*func) (struct Host *, struct Map *)); | 57 | int RIOCommandRta(struct rio_info *, unsigned long, int (*func) (struct Host *, struct Map *)); |
58 | int RIOIdentifyRta(struct rio_info *, void *); | 58 | int RIOIdentifyRta(struct rio_info *, void __user *); |
59 | int RIOKillNeighbour(struct rio_info *, void *); | 59 | int RIOKillNeighbour(struct rio_info *, void __user *); |
60 | int RIOSuspendBootRta(struct Host *, int, int); | 60 | int RIOSuspendBootRta(struct Host *, int, int); |
61 | int RIOFoadWakeup(struct rio_info *); | 61 | int RIOFoadWakeup(struct rio_info *); |
62 | struct CmdBlk *RIOGetCmdBlk(void); | 62 | struct CmdBlk *RIOGetCmdBlk(void); |
@@ -68,7 +68,8 @@ int RIORFlushEnable(unsigned long, struct CmdBlk *); | |||
68 | int RIOUnUse(unsigned long, struct CmdBlk *); | 68 | int RIOUnUse(unsigned long, struct CmdBlk *); |
69 | 69 | ||
70 | /* rioctrl.c */ | 70 | /* rioctrl.c */ |
71 | int riocontrol(struct rio_info *, dev_t, int, caddr_t, int); | 71 | int riocontrol(struct rio_info *, dev_t, int, unsigned long, int); |
72 | |||
72 | int RIOPreemptiveCmd(struct rio_info *, struct Port *, unsigned char); | 73 | int RIOPreemptiveCmd(struct rio_info *, struct Port *, unsigned char); |
73 | 74 | ||
74 | /* rioinit.c */ | 75 | /* rioinit.c */ |
@@ -77,13 +78,13 @@ void RIOInitHosts(struct rio_info *, struct RioHostInfo *); | |||
77 | void RIOISAinit(struct rio_info *, int); | 78 | void RIOISAinit(struct rio_info *, int); |
78 | int RIODoAT(struct rio_info *, int, int); | 79 | int RIODoAT(struct rio_info *, int, int); |
79 | caddr_t RIOCheckForATCard(int); | 80 | caddr_t RIOCheckForATCard(int); |
80 | int RIOAssignAT(struct rio_info *, int, caddr_t, int); | 81 | int RIOAssignAT(struct rio_info *, int, void __iomem *, int); |
81 | int RIOBoardTest(unsigned long, caddr_t, unsigned char, int); | 82 | int RIOBoardTest(unsigned long, void __iomem *, unsigned char, int); |
82 | void RIOAllocDataStructs(struct rio_info *); | 83 | void RIOAllocDataStructs(struct rio_info *); |
83 | void RIOSetupDataStructs(struct rio_info *); | 84 | void RIOSetupDataStructs(struct rio_info *); |
84 | int RIODefaultName(struct rio_info *, struct Host *, unsigned int); | 85 | int RIODefaultName(struct rio_info *, struct Host *, unsigned int); |
85 | struct rioVersion *RIOVersid(void); | 86 | struct rioVersion *RIOVersid(void); |
86 | void RIOHostReset(unsigned int, struct DpRam *, unsigned int); | 87 | void RIOHostReset(unsigned int, struct DpRam __iomem *, unsigned int); |
87 | 88 | ||
88 | /* riointr.c */ | 89 | /* riointr.c */ |
89 | void RIOTxEnable(char *); | 90 | void RIOTxEnable(char *); |
@@ -95,14 +96,14 @@ int RIOParam(struct Port *, int, int, int); | |||
95 | int RIODelay(struct Port *PortP, int); | 96 | int RIODelay(struct Port *PortP, int); |
96 | int RIODelay_ni(struct Port *PortP, int); | 97 | int RIODelay_ni(struct Port *PortP, int); |
97 | void ms_timeout(struct Port *); | 98 | void ms_timeout(struct Port *); |
98 | int can_add_transmit(struct PKT **, struct Port *); | 99 | int can_add_transmit(struct PKT __iomem **, struct Port *); |
99 | void add_transmit(struct Port *); | 100 | void add_transmit(struct Port *); |
100 | void put_free_end(struct Host *, struct PKT *); | 101 | void put_free_end(struct Host *, struct PKT __iomem *); |
101 | int can_remove_receive(struct PKT **, struct Port *); | 102 | int can_remove_receive(struct PKT __iomem **, struct Port *); |
102 | void remove_receive(struct Port *); | 103 | void remove_receive(struct Port *); |
103 | 104 | ||
104 | /* rioroute.c */ | 105 | /* rioroute.c */ |
105 | int RIORouteRup(struct rio_info *, unsigned int, struct Host *, struct PKT *); | 106 | int RIORouteRup(struct rio_info *, unsigned int, struct Host *, struct PKT __iomem *); |
106 | void RIOFixPhbs(struct rio_info *, struct Host *, unsigned int); | 107 | void RIOFixPhbs(struct rio_info *, struct Host *, unsigned int); |
107 | unsigned int GetUnitType(unsigned int); | 108 | unsigned int GetUnitType(unsigned int); |
108 | int RIOSetChange(struct rio_info *); | 109 | int RIOSetChange(struct rio_info *); |
@@ -139,7 +140,7 @@ int rio_isr_thread(char *); | |||
139 | struct rio_info *rio_info_store(int cmd, struct rio_info *p); | 140 | struct rio_info *rio_info_store(int cmd, struct rio_info *p); |
140 | #endif | 141 | #endif |
141 | 142 | ||
142 | extern void rio_copy_to_card(void *to, void *from, int len); | 143 | extern void rio_copy_to_card(void __iomem *to, void *from, int len); |
143 | extern int rio_minor(struct tty_struct *tty); | 144 | extern int rio_minor(struct tty_struct *tty); |
144 | extern int rio_ismodem(struct tty_struct *tty); | 145 | extern int rio_ismodem(struct tty_struct *tty); |
145 | 146 | ||
diff --git a/drivers/char/rio/host.h b/drivers/char/rio/host.h index 179cdbea712b..ee2ddea7a63a 100644 --- a/drivers/char/rio/host.h +++ b/drivers/char/rio/host.h | |||
@@ -48,8 +48,8 @@ struct Host { | |||
48 | unsigned char Ivec; /* POLLED or ivec number */ | 48 | unsigned char Ivec; /* POLLED or ivec number */ |
49 | unsigned char Mode; /* Control stuff */ | 49 | unsigned char Mode; /* Control stuff */ |
50 | unsigned char Slot; /* Slot */ | 50 | unsigned char Slot; /* Slot */ |
51 | caddr_t Caddr; /* KV address of DPRAM */ | 51 | void __iomem *Caddr; /* KV address of DPRAM */ |
52 | struct DpRam *CardP; /* KV address of DPRAM, with overlay */ | 52 | struct DpRam __iomem *CardP; /* KV address of DPRAM, with overlay */ |
53 | unsigned long PaddrP; /* Phys. address of DPRAM */ | 53 | unsigned long PaddrP; /* Phys. address of DPRAM */ |
54 | char Name[MAX_NAME_LEN]; /* The name of the host */ | 54 | char Name[MAX_NAME_LEN]; /* The name of the host */ |
55 | unsigned int UniqueNum; /* host unique number */ | 55 | unsigned int UniqueNum; /* host unique number */ |
@@ -57,7 +57,7 @@ struct Host { | |||
57 | unsigned int WorkToBeDone; /* set to true each interrupt */ | 57 | unsigned int WorkToBeDone; /* set to true each interrupt */ |
58 | unsigned int InIntr; /* Being serviced? */ | 58 | unsigned int InIntr; /* Being serviced? */ |
59 | unsigned int IntSrvDone; /* host's interrupt has been serviced */ | 59 | unsigned int IntSrvDone; /* host's interrupt has been serviced */ |
60 | void (*Copy) (void *, void *, int); /* copy func */ | 60 | void (*Copy) (void *, void __iomem *, int); /* copy func */ |
61 | struct timer_list timer; | 61 | struct timer_list timer; |
62 | /* | 62 | /* |
63 | ** I M P O R T A N T ! | 63 | ** I M P O R T A N T ! |
@@ -83,11 +83,11 @@ struct Host { | |||
83 | 83 | ||
84 | struct Top Topology[LINKS_PER_UNIT]; /* one per link */ | 84 | struct Top Topology[LINKS_PER_UNIT]; /* one per link */ |
85 | struct Map Mapping[MAX_RUP]; /* Mappings for host */ | 85 | struct Map Mapping[MAX_RUP]; /* Mappings for host */ |
86 | struct PHB *PhbP; /* Pointer to the PHB array */ | 86 | struct PHB __iomem *PhbP; /* Pointer to the PHB array */ |
87 | unsigned short *PhbNumP; /* Ptr to Number of PHB's */ | 87 | unsigned short __iomem *PhbNumP; /* Ptr to Number of PHB's */ |
88 | struct LPB *LinkStrP; /* Link Structure Array */ | 88 | struct LPB __iomem *LinkStrP; /* Link Structure Array */ |
89 | struct RUP *RupP; /* Sixteen real rups here */ | 89 | struct RUP __iomem *RupP; /* Sixteen real rups here */ |
90 | struct PARM_MAP *ParmMapP; /* points to the parmmap */ | 90 | struct PARM_MAP __iomem *ParmMapP; /* points to the parmmap */ |
91 | unsigned int ExtraUnits[MAX_EXTRA_UNITS]; /* unknown things */ | 91 | unsigned int ExtraUnits[MAX_EXTRA_UNITS]; /* unknown things */ |
92 | unsigned int NumExtraBooted; /* how many of the above */ | 92 | unsigned int NumExtraBooted; /* how many of the above */ |
93 | /* | 93 | /* |
diff --git a/drivers/char/rio/port.h b/drivers/char/rio/port.h index 9b5fa3eb0402..49cf6d15ee54 100644 --- a/drivers/char/rio/port.h +++ b/drivers/char/rio/port.h | |||
@@ -40,7 +40,7 @@ struct Port { | |||
40 | struct gs_port gs; | 40 | struct gs_port gs; |
41 | int PortNum; /* RIO port no., 0-511 */ | 41 | int PortNum; /* RIO port no., 0-511 */ |
42 | struct Host *HostP; | 42 | struct Host *HostP; |
43 | caddr_t Caddr; | 43 | void __iomem *Caddr; |
44 | unsigned short HostPort; /* Port number on host card */ | 44 | unsigned short HostPort; /* Port number on host card */ |
45 | unsigned char RupNum; /* Number of RUP for port */ | 45 | unsigned char RupNum; /* Number of RUP for port */ |
46 | unsigned char ID2; /* Second ID of RTA for port */ | 46 | unsigned char ID2; /* Second ID of RTA for port */ |
@@ -92,13 +92,13 @@ struct Port { | |||
92 | #define RIO_RTSFLOW 0x0400 /* RIO's own RTSFLOW flag */ | 92 | #define RIO_RTSFLOW 0x0400 /* RIO's own RTSFLOW flag */ |
93 | 93 | ||
94 | 94 | ||
95 | struct PHB *PhbP; /* pointer to PHB for port */ | 95 | struct PHB __iomem *PhbP; /* pointer to PHB for port */ |
96 | u16 *TxAdd; /* Add packets here */ | 96 | u16 __iomem *TxAdd; /* Add packets here */ |
97 | u16 *TxStart; /* Start of add array */ | 97 | u16 __iomem *TxStart; /* Start of add array */ |
98 | u16 *TxEnd; /* End of add array */ | 98 | u16 __iomem *TxEnd; /* End of add array */ |
99 | u16 *RxRemove; /* Remove packets here */ | 99 | u16 __iomem *RxRemove; /* Remove packets here */ |
100 | u16 *RxStart; /* Start of remove array */ | 100 | u16 __iomem *RxStart; /* Start of remove array */ |
101 | u16 *RxEnd; /* End of remove array */ | 101 | u16 __iomem *RxEnd; /* End of remove array */ |
102 | unsigned int RtaUniqueNum; /* Unique number of RTA */ | 102 | unsigned int RtaUniqueNum; /* Unique number of RTA */ |
103 | unsigned short PortState; /* status of port */ | 103 | unsigned short PortState; /* status of port */ |
104 | unsigned short ModemState; /* status of modem lines */ | 104 | unsigned short ModemState; /* status of modem lines */ |
diff --git a/drivers/char/rio/rio.h b/drivers/char/rio/rio.h index b4c91871ba28..1bf36223a4e8 100644 --- a/drivers/char/rio/rio.h +++ b/drivers/char/rio/rio.h | |||
@@ -129,8 +129,8 @@ | |||
129 | ** RIO_OBJ takes hostp->Caddr and a UNIX pointer to an object and | 129 | ** RIO_OBJ takes hostp->Caddr and a UNIX pointer to an object and |
130 | ** returns the offset into the DP RAM area. | 130 | ** returns the offset into the DP RAM area. |
131 | */ | 131 | */ |
132 | #define RIO_PTR(C,O) (((unsigned char *)(C))+(0xFFFF&(O))) | 132 | #define RIO_PTR(C,O) (((unsigned char __iomem *)(C))+(0xFFFF&(O))) |
133 | #define RIO_OFF(C,O) ((long)(O)-(long)(C)) | 133 | #define RIO_OFF(C,O) ((unsigned char __iomem *)(O)-(unsigned char __iomem *)(C)) |
134 | 134 | ||
135 | /* | 135 | /* |
136 | ** How to convert from various different device number formats: | 136 | ** How to convert from various different device number formats: |
diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c index 78dd856534ce..39277e53d9a8 100644 --- a/drivers/char/rio/rio_linux.c +++ b/drivers/char/rio/rio_linux.c | |||
@@ -333,7 +333,7 @@ int RIODelay_ni(struct Port *PortP, int njiffies) | |||
333 | return !RIO_FAIL; | 333 | return !RIO_FAIL; |
334 | } | 334 | } |
335 | 335 | ||
336 | void rio_copy_to_card(void *to, void *from, int len) | 336 | void rio_copy_to_card(void __iomem *to, void *from, int len) |
337 | { | 337 | { |
338 | rio_memcpy_toio(NULL, to, from, len); | 338 | rio_memcpy_toio(NULL, to, from, len); |
339 | } | 339 | } |
@@ -573,7 +573,7 @@ static int rio_fw_ioctl(struct inode *inode, struct file *filp, unsigned int cmd | |||
573 | func_enter(); | 573 | func_enter(); |
574 | 574 | ||
575 | /* The "dev" argument isn't used. */ | 575 | /* The "dev" argument isn't used. */ |
576 | rc = riocontrol(p, 0, cmd, (void *) arg, capable(CAP_SYS_ADMIN)); | 576 | rc = riocontrol(p, 0, cmd, arg, capable(CAP_SYS_ADMIN)); |
577 | 577 | ||
578 | func_exit(); | 578 | func_exit(); |
579 | return rc; | 579 | return rc; |
@@ -583,6 +583,7 @@ extern int RIOShortCommand(struct rio_info *p, struct Port *PortP, int command, | |||
583 | 583 | ||
584 | static int rio_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd, unsigned long arg) | 584 | static int rio_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd, unsigned long arg) |
585 | { | 585 | { |
586 | void __user *argp = (void __user *)arg; | ||
586 | int rc; | 587 | int rc; |
587 | struct Port *PortP; | 588 | struct Port *PortP; |
588 | int ival; | 589 | int ival; |
@@ -594,14 +595,14 @@ static int rio_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd | |||
594 | rc = 0; | 595 | rc = 0; |
595 | switch (cmd) { | 596 | switch (cmd) { |
596 | case TIOCSSOFTCAR: | 597 | case TIOCSSOFTCAR: |
597 | if ((rc = get_user(ival, (unsigned int *) arg)) == 0) { | 598 | if ((rc = get_user(ival, (unsigned __user *) argp)) == 0) { |
598 | tty->termios->c_cflag = (tty->termios->c_cflag & ~CLOCAL) | (ival ? CLOCAL : 0); | 599 | tty->termios->c_cflag = (tty->termios->c_cflag & ~CLOCAL) | (ival ? CLOCAL : 0); |
599 | } | 600 | } |
600 | break; | 601 | break; |
601 | case TIOCGSERIAL: | 602 | case TIOCGSERIAL: |
602 | rc = -EFAULT; | 603 | rc = -EFAULT; |
603 | if (access_ok(VERIFY_WRITE, (void *) arg, sizeof(struct serial_struct))) | 604 | if (access_ok(VERIFY_WRITE, argp, sizeof(struct serial_struct))) |
604 | rc = gs_getserial(&PortP->gs, (struct serial_struct *) arg); | 605 | rc = gs_getserial(&PortP->gs, argp); |
605 | break; | 606 | break; |
606 | case TCSBRK: | 607 | case TCSBRK: |
607 | if (PortP->State & RIO_DELETED) { | 608 | if (PortP->State & RIO_DELETED) { |
@@ -631,8 +632,8 @@ static int rio_ioctl(struct tty_struct *tty, struct file *filp, unsigned int cmd | |||
631 | break; | 632 | break; |
632 | case TIOCSSERIAL: | 633 | case TIOCSSERIAL: |
633 | rc = -EFAULT; | 634 | rc = -EFAULT; |
634 | if (access_ok(VERIFY_READ, (void *) arg, sizeof(struct serial_struct))) | 635 | if (access_ok(VERIFY_READ, argp, sizeof(struct serial_struct))) |
635 | rc = gs_setserial(&PortP->gs, (struct serial_struct *) arg); | 636 | rc = gs_setserial(&PortP->gs, argp); |
636 | break; | 637 | break; |
637 | default: | 638 | default: |
638 | rc = -ENOIOCTLCMD; | 639 | rc = -ENOIOCTLCMD; |
@@ -919,7 +920,7 @@ static void __exit rio_release_drivers(void) | |||
919 | static void fix_rio_pci(struct pci_dev *pdev) | 920 | static void fix_rio_pci(struct pci_dev *pdev) |
920 | { | 921 | { |
921 | unsigned long hwbase; | 922 | unsigned long hwbase; |
922 | unsigned char *rebase; | 923 | unsigned char __iomem *rebase; |
923 | unsigned int t; | 924 | unsigned int t; |
924 | 925 | ||
925 | #define CNTRL_REG_OFFSET 0x50 | 926 | #define CNTRL_REG_OFFSET 0x50 |
@@ -999,7 +1000,7 @@ static int __init rio_init(void) | |||
999 | if (((1 << hp->Ivec) & rio_irqmask) == 0) | 1000 | if (((1 << hp->Ivec) & rio_irqmask) == 0) |
1000 | hp->Ivec = 0; | 1001 | hp->Ivec = 0; |
1001 | hp->Caddr = ioremap(p->RIOHosts[p->RIONumHosts].PaddrP, RIO_WINDOW_LEN); | 1002 | hp->Caddr = ioremap(p->RIOHosts[p->RIONumHosts].PaddrP, RIO_WINDOW_LEN); |
1002 | hp->CardP = (struct DpRam *) hp->Caddr; | 1003 | hp->CardP = (struct DpRam __iomem *) hp->Caddr; |
1003 | hp->Type = RIO_PCI; | 1004 | hp->Type = RIO_PCI; |
1004 | hp->Copy = rio_copy_to_card; | 1005 | hp->Copy = rio_copy_to_card; |
1005 | hp->Mode = RIO_PCI_BOOT_FROM_RAM; | 1006 | hp->Mode = RIO_PCI_BOOT_FROM_RAM; |
@@ -1021,7 +1022,7 @@ static int __init rio_init(void) | |||
1021 | p->RIONumHosts++; | 1022 | p->RIONumHosts++; |
1022 | found++; | 1023 | found++; |
1023 | } else { | 1024 | } else { |
1024 | iounmap((char *) (p->RIOHosts[p->RIONumHosts].Caddr)); | 1025 | iounmap(p->RIOHosts[p->RIONumHosts].Caddr); |
1025 | } | 1026 | } |
1026 | } | 1027 | } |
1027 | 1028 | ||
@@ -1047,7 +1048,7 @@ static int __init rio_init(void) | |||
1047 | hp->Ivec = 0; | 1048 | hp->Ivec = 0; |
1048 | hp->Ivec |= 0x8000; /* Mark as non-sharable */ | 1049 | hp->Ivec |= 0x8000; /* Mark as non-sharable */ |
1049 | hp->Caddr = ioremap(p->RIOHosts[p->RIONumHosts].PaddrP, RIO_WINDOW_LEN); | 1050 | hp->Caddr = ioremap(p->RIOHosts[p->RIONumHosts].PaddrP, RIO_WINDOW_LEN); |
1050 | hp->CardP = (struct DpRam *) hp->Caddr; | 1051 | hp->CardP = (struct DpRam __iomem *) hp->Caddr; |
1051 | hp->Type = RIO_PCI; | 1052 | hp->Type = RIO_PCI; |
1052 | hp->Copy = rio_copy_to_card; | 1053 | hp->Copy = rio_copy_to_card; |
1053 | hp->Mode = RIO_PCI_BOOT_FROM_RAM; | 1054 | hp->Mode = RIO_PCI_BOOT_FROM_RAM; |
@@ -1070,7 +1071,7 @@ static int __init rio_init(void) | |||
1070 | p->RIONumHosts++; | 1071 | p->RIONumHosts++; |
1071 | found++; | 1072 | found++; |
1072 | } else { | 1073 | } else { |
1073 | iounmap((char *) (p->RIOHosts[p->RIONumHosts].Caddr)); | 1074 | iounmap(p->RIOHosts[p->RIONumHosts].Caddr); |
1074 | } | 1075 | } |
1075 | #else | 1076 | #else |
1076 | printk(KERN_ERR "Found an older RIO PCI card, but the driver is not " "compiled to support it.\n"); | 1077 | printk(KERN_ERR "Found an older RIO PCI card, but the driver is not " "compiled to support it.\n"); |
@@ -1085,7 +1086,7 @@ static int __init rio_init(void) | |||
1085 | /* There was something about the IRQs of these cards. 'Forget what.--REW */ | 1086 | /* There was something about the IRQs of these cards. 'Forget what.--REW */ |
1086 | hp->Ivec = 0; | 1087 | hp->Ivec = 0; |
1087 | hp->Caddr = ioremap(p->RIOHosts[p->RIONumHosts].PaddrP, RIO_WINDOW_LEN); | 1088 | hp->Caddr = ioremap(p->RIOHosts[p->RIONumHosts].PaddrP, RIO_WINDOW_LEN); |
1088 | hp->CardP = (struct DpRam *) hp->Caddr; | 1089 | hp->CardP = (struct DpRam __iomem *) hp->Caddr; |
1089 | hp->Type = RIO_AT; | 1090 | hp->Type = RIO_AT; |
1090 | hp->Copy = rio_copy_to_card; /* AT card PCI???? - PVDL | 1091 | hp->Copy = rio_copy_to_card; /* AT card PCI???? - PVDL |
1091 | * -- YES! this is now a normal copy. Only the | 1092 | * -- YES! this is now a normal copy. Only the |
@@ -1111,7 +1112,7 @@ static int __init rio_init(void) | |||
1111 | } | 1112 | } |
1112 | 1113 | ||
1113 | if (!okboard) | 1114 | if (!okboard) |
1114 | iounmap((char *) (hp->Caddr)); | 1115 | iounmap(hp->Caddr); |
1115 | } | 1116 | } |
1116 | } | 1117 | } |
1117 | 1118 | ||
diff --git a/drivers/char/rio/rio_linux.h b/drivers/char/rio/rio_linux.h index 4ce77fb1fae5..99c7447b6113 100644 --- a/drivers/char/rio/rio_linux.h +++ b/drivers/char/rio/rio_linux.h | |||
@@ -131,24 +131,24 @@ struct vpd_prom { | |||
131 | 131 | ||
132 | 132 | ||
133 | #ifdef CONFIG_RIO_OLDPCI | 133 | #ifdef CONFIG_RIO_OLDPCI |
134 | static inline void *rio_memcpy_toio(void *dummy, void *dest, void *source, int n) | 134 | static inline void __iomem *rio_memcpy_toio(void __iomem *dummy, void __iomem *dest, void *source, int n) |
135 | { | 135 | { |
136 | char *dst = dest; | 136 | char __iomem *dst = dest; |
137 | char *src = source; | 137 | char *src = source; |
138 | 138 | ||
139 | while (n--) { | 139 | while (n--) { |
140 | writeb(*src++, dst++); | 140 | writeb(*src++, dst++); |
141 | (void) readb(dummy); | 141 | (void) readb(dummy); /* WTF? */ |
142 | } | 142 | } |
143 | 143 | ||
144 | return dest; | 144 | return dest; |
145 | } | 145 | } |
146 | 146 | ||
147 | 147 | ||
148 | static inline void *rio_memcpy_fromio(void *dest, void *source, int n) | 148 | static inline void *rio_memcpy_fromio(void *dest, void __iomem *source, int n) |
149 | { | 149 | { |
150 | char *dst = dest; | 150 | char *dst = dest; |
151 | char *src = source; | 151 | char __iomem *src = source; |
152 | 152 | ||
153 | while (n--) | 153 | while (n--) |
154 | *dst++ = readb(src++); | 154 | *dst++ = readb(src++); |
diff --git a/drivers/char/rio/rioboot.c b/drivers/char/rio/rioboot.c index 290143addd34..b9abbd0e7ec2 100644 --- a/drivers/char/rio/rioboot.c +++ b/drivers/char/rio/rioboot.c | |||
@@ -71,7 +71,7 @@ | |||
71 | #include "cmdblk.h" | 71 | #include "cmdblk.h" |
72 | #include "route.h" | 72 | #include "route.h" |
73 | 73 | ||
74 | static int RIOBootComplete(struct rio_info *p, struct Host *HostP, unsigned int Rup, struct PktCmd *PktCmdP); | 74 | static int RIOBootComplete(struct rio_info *p, struct Host *HostP, unsigned int Rup, struct PktCmd __iomem *PktCmdP); |
75 | 75 | ||
76 | static const unsigned char RIOAtVec2Ctrl[] = { | 76 | static const unsigned char RIOAtVec2Ctrl[] = { |
77 | /* 0 */ INTERRUPT_DISABLE, | 77 | /* 0 */ INTERRUPT_DISABLE, |
@@ -204,13 +204,13 @@ void rio_start_card_running(struct Host *HostP) | |||
204 | int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp) | 204 | int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp) |
205 | { | 205 | { |
206 | struct Host *HostP; | 206 | struct Host *HostP; |
207 | u8 *Cad; | 207 | u8 __iomem *Cad; |
208 | PARM_MAP *ParmMapP; | 208 | PARM_MAP __iomem *ParmMapP; |
209 | int RupN; | 209 | int RupN; |
210 | int PortN; | 210 | int PortN; |
211 | unsigned int host; | 211 | unsigned int host; |
212 | u8 *StartP; | 212 | u8 __iomem *StartP; |
213 | u8 *DestP; | 213 | u8 __iomem *DestP; |
214 | int wait_count; | 214 | int wait_count; |
215 | u16 OldParmMap; | 215 | u16 OldParmMap; |
216 | u16 offset; /* It is very important that this is a u16 */ | 216 | u16 offset; /* It is very important that this is a u16 */ |
@@ -262,7 +262,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp) | |||
262 | ** Ensure that the host really is stopped. | 262 | ** Ensure that the host really is stopped. |
263 | ** Disable it's external bus & twang its reset line. | 263 | ** Disable it's external bus & twang its reset line. |
264 | */ | 264 | */ |
265 | RIOHostReset(HostP->Type, (struct DpRam *) HostP->CardP, HostP->Slot); | 265 | RIOHostReset(HostP->Type, HostP->CardP, HostP->Slot); |
266 | 266 | ||
267 | /* | 267 | /* |
268 | ** Copy the data directly from user space to the SRAM. | 268 | ** Copy the data directly from user space to the SRAM. |
@@ -366,7 +366,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp) | |||
366 | ** a short branch to 0x7FF8, where a long branch is coded. | 366 | ** a short branch to 0x7FF8, where a long branch is coded. |
367 | */ | 367 | */ |
368 | 368 | ||
369 | DestP = (u8 *) &Cad[0x7FF8]; /* <<<---- READ THE ABOVE COMMENTS */ | 369 | DestP = &Cad[0x7FF8]; /* <<<---- READ THE ABOVE COMMENTS */ |
370 | 370 | ||
371 | #define NFIX(N) (0x60 | (N)) /* .O = (~(.O + N))<<4 */ | 371 | #define NFIX(N) (0x60 | (N)) /* .O = (~(.O + N))<<4 */ |
372 | #define PFIX(N) (0x20 | (N)) /* .O = (.O + N)<<4 */ | 372 | #define PFIX(N) (0x20 | (N)) /* .O = (.O + N)<<4 */ |
@@ -438,7 +438,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp) | |||
438 | rio_dprintk(RIO_DEBUG_BOOT, "RIO Mesg Run Fail\n"); | 438 | rio_dprintk(RIO_DEBUG_BOOT, "RIO Mesg Run Fail\n"); |
439 | HostP->Flags &= ~RUN_STATE; | 439 | HostP->Flags &= ~RUN_STATE; |
440 | HostP->Flags |= RC_STUFFED; | 440 | HostP->Flags |= RC_STUFFED; |
441 | RIOHostReset( HostP->Type, (struct DpRam *)HostP->CardP, HostP->Slot ); | 441 | RIOHostReset( HostP->Type, HostP->CardP, HostP->Slot ); |
442 | continue; | 442 | continue; |
443 | } | 443 | } |
444 | 444 | ||
@@ -453,9 +453,9 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp) | |||
453 | /* | 453 | /* |
454 | ** Grab a 32 bit pointer to the parmmap structure | 454 | ** Grab a 32 bit pointer to the parmmap structure |
455 | */ | 455 | */ |
456 | ParmMapP = (PARM_MAP *) RIO_PTR(Cad, readw(&HostP->__ParmMapR)); | 456 | ParmMapP = (PARM_MAP __iomem *) RIO_PTR(Cad, readw(&HostP->__ParmMapR)); |
457 | rio_dprintk(RIO_DEBUG_BOOT, "ParmMapP : %p\n", ParmMapP); | 457 | rio_dprintk(RIO_DEBUG_BOOT, "ParmMapP : %p\n", ParmMapP); |
458 | ParmMapP = (PARM_MAP *) ((unsigned long) Cad + readw(&HostP->__ParmMapR)); | 458 | ParmMapP = (PARM_MAP __iomem *)(Cad + readw(&HostP->__ParmMapR)); |
459 | rio_dprintk(RIO_DEBUG_BOOT, "ParmMapP : %p\n", ParmMapP); | 459 | rio_dprintk(RIO_DEBUG_BOOT, "ParmMapP : %p\n", ParmMapP); |
460 | 460 | ||
461 | /* | 461 | /* |
@@ -468,7 +468,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp) | |||
468 | rio_dprintk(RIO_DEBUG_BOOT, "Links = 0x%x\n", readw(&ParmMapP->links)); | 468 | rio_dprintk(RIO_DEBUG_BOOT, "Links = 0x%x\n", readw(&ParmMapP->links)); |
469 | HostP->Flags &= ~RUN_STATE; | 469 | HostP->Flags &= ~RUN_STATE; |
470 | HostP->Flags |= RC_STUFFED; | 470 | HostP->Flags |= RC_STUFFED; |
471 | RIOHostReset( HostP->Type, (struct DpRam *)HostP->CardP, HostP->Slot ); | 471 | RIOHostReset( HostP->Type, HostP->CardP, HostP->Slot ); |
472 | continue; | 472 | continue; |
473 | } | 473 | } |
474 | 474 | ||
@@ -491,7 +491,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp) | |||
491 | rio_dprintk(RIO_DEBUG_BOOT, "Timedout waiting for init_done\n"); | 491 | rio_dprintk(RIO_DEBUG_BOOT, "Timedout waiting for init_done\n"); |
492 | HostP->Flags &= ~RUN_STATE; | 492 | HostP->Flags &= ~RUN_STATE; |
493 | HostP->Flags |= RC_STUFFED; | 493 | HostP->Flags |= RC_STUFFED; |
494 | RIOHostReset( HostP->Type, (struct DpRam *)HostP->CardP, HostP->Slot ); | 494 | RIOHostReset( HostP->Type, HostP->CardP, HostP->Slot ); |
495 | continue; | 495 | continue; |
496 | } | 496 | } |
497 | 497 | ||
@@ -512,10 +512,10 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp) | |||
512 | ** 32 bit pointers for the driver in ioremap space. | 512 | ** 32 bit pointers for the driver in ioremap space. |
513 | */ | 513 | */ |
514 | HostP->ParmMapP = ParmMapP; | 514 | HostP->ParmMapP = ParmMapP; |
515 | HostP->PhbP = (struct PHB *) RIO_PTR(Cad, readw(&ParmMapP->phb_ptr)); | 515 | HostP->PhbP = (struct PHB __iomem *) RIO_PTR(Cad, readw(&ParmMapP->phb_ptr)); |
516 | HostP->RupP = (struct RUP *) RIO_PTR(Cad, readw(&ParmMapP->rups)); | 516 | HostP->RupP = (struct RUP __iomem *) RIO_PTR(Cad, readw(&ParmMapP->rups)); |
517 | HostP->PhbNumP = (unsigned short *) RIO_PTR(Cad, readw(&ParmMapP->phb_num_ptr)); | 517 | HostP->PhbNumP = (unsigned short __iomem *) RIO_PTR(Cad, readw(&ParmMapP->phb_num_ptr)); |
518 | HostP->LinkStrP = (struct LPB *) RIO_PTR(Cad, readw(&ParmMapP->link_str_ptr)); | 518 | HostP->LinkStrP = (struct LPB __iomem *) RIO_PTR(Cad, readw(&ParmMapP->link_str_ptr)); |
519 | 519 | ||
520 | /* | 520 | /* |
521 | ** point the UnixRups at the real Rups | 521 | ** point the UnixRups at the real Rups |
@@ -540,7 +540,7 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp) | |||
540 | for (PortN = p->RIOFirstPortsMapped; PortN < p->RIOLastPortsMapped + PORTS_PER_RTA; PortN++) { | 540 | for (PortN = p->RIOFirstPortsMapped; PortN < p->RIOLastPortsMapped + PORTS_PER_RTA; PortN++) { |
541 | if (p->RIOPortp[PortN]->HostP == HostP) { | 541 | if (p->RIOPortp[PortN]->HostP == HostP) { |
542 | struct Port *PortP = p->RIOPortp[PortN]; | 542 | struct Port *PortP = p->RIOPortp[PortN]; |
543 | struct PHB *PhbP; | 543 | struct PHB __iomem *PhbP; |
544 | /* int oldspl; */ | 544 | /* int oldspl; */ |
545 | 545 | ||
546 | if (!PortP->Mapped) | 546 | if (!PortP->Mapped) |
@@ -551,12 +551,12 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp) | |||
551 | 551 | ||
552 | PortP->PhbP = PhbP; | 552 | PortP->PhbP = PhbP; |
553 | 553 | ||
554 | PortP->TxAdd = (u16 *) RIO_PTR(Cad, readw(&PhbP->tx_add)); | 554 | PortP->TxAdd = (u16 __iomem *) RIO_PTR(Cad, readw(&PhbP->tx_add)); |
555 | PortP->TxStart = (u16 *) RIO_PTR(Cad, readw(&PhbP->tx_start)); | 555 | PortP->TxStart = (u16 __iomem *) RIO_PTR(Cad, readw(&PhbP->tx_start)); |
556 | PortP->TxEnd = (u16 *) RIO_PTR(Cad, readw(&PhbP->tx_end)); | 556 | PortP->TxEnd = (u16 __iomem *) RIO_PTR(Cad, readw(&PhbP->tx_end)); |
557 | PortP->RxRemove = (u16 *) RIO_PTR(Cad, readw(&PhbP->rx_remove)); | 557 | PortP->RxRemove = (u16 __iomem *) RIO_PTR(Cad, readw(&PhbP->rx_remove)); |
558 | PortP->RxStart = (u16 *) RIO_PTR(Cad, readw(&PhbP->rx_start)); | 558 | PortP->RxStart = (u16 __iomem *) RIO_PTR(Cad, readw(&PhbP->rx_start)); |
559 | PortP->RxEnd = (u16 *) RIO_PTR(Cad, readw(&PhbP->rx_end)); | 559 | PortP->RxEnd = (u16 __iomem *) RIO_PTR(Cad, readw(&PhbP->rx_end)); |
560 | 560 | ||
561 | rio_spin_unlock_irqrestore(&PortP->portSem, flags); | 561 | rio_spin_unlock_irqrestore(&PortP->portSem, flags); |
562 | /* | 562 | /* |
@@ -601,9 +601,9 @@ int RIOBootCodeHOST(struct rio_info *p, struct DownLoad *rbp) | |||
601 | * return 1. If we havent, then return 0. | 601 | * return 1. If we havent, then return 0. |
602 | */ | 602 | */ |
603 | 603 | ||
604 | int RIOBootRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct PKT *PacketP) | 604 | int RIOBootRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct PKT __iomem *PacketP) |
605 | { | 605 | { |
606 | struct PktCmd *PktCmdP = (struct PktCmd *) PacketP->data; | 606 | struct PktCmd __iomem *PktCmdP = (struct PktCmd __iomem *) PacketP->data; |
607 | struct PktCmd_M *PktReplyP; | 607 | struct PktCmd_M *PktReplyP; |
608 | struct CmdBlk *CmdBlkP; | 608 | struct CmdBlk *CmdBlkP; |
609 | unsigned int sequence; | 609 | unsigned int sequence; |
@@ -722,7 +722,7 @@ int RIOBootRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct | |||
722 | * RtaUniq is the booted RTA. | 722 | * RtaUniq is the booted RTA. |
723 | */ | 723 | */ |
724 | 724 | ||
725 | static int RIOBootComplete(struct rio_info *p, struct Host *HostP, unsigned int Rup, struct PktCmd *PktCmdP) | 725 | static int RIOBootComplete(struct rio_info *p, struct Host *HostP, unsigned int Rup, struct PktCmd __iomem *PktCmdP) |
726 | { | 726 | { |
727 | struct Map *MapP = NULL; | 727 | struct Map *MapP = NULL; |
728 | struct Map *MapP2 = NULL; | 728 | struct Map *MapP2 = NULL; |
diff --git a/drivers/char/rio/riocmd.c b/drivers/char/rio/riocmd.c index e6d2b14b5e65..595f7a9de70f 100644 --- a/drivers/char/rio/riocmd.c +++ b/drivers/char/rio/riocmd.c | |||
@@ -180,7 +180,7 @@ int RIOCommandRta(struct rio_info *p, unsigned long RtaUnique, int (*func) (stru | |||
180 | } | 180 | } |
181 | 181 | ||
182 | 182 | ||
183 | int RIOIdentifyRta(struct rio_info *p, void * arg) | 183 | int RIOIdentifyRta(struct rio_info *p, void __user * arg) |
184 | { | 184 | { |
185 | unsigned int Host; | 185 | unsigned int Host; |
186 | 186 | ||
@@ -245,7 +245,7 @@ int RIOIdentifyRta(struct rio_info *p, void * arg) | |||
245 | } | 245 | } |
246 | 246 | ||
247 | 247 | ||
248 | int RIOKillNeighbour(struct rio_info *p, void * arg) | 248 | int RIOKillNeighbour(struct rio_info *p, void __user * arg) |
249 | { | 249 | { |
250 | uint Host; | 250 | uint Host; |
251 | uint ID; | 251 | uint ID; |
@@ -370,9 +370,9 @@ int RIOFoadWakeup(struct rio_info *p) | |||
370 | /* | 370 | /* |
371 | ** Incoming command on the COMMAND_RUP to be processed. | 371 | ** Incoming command on the COMMAND_RUP to be processed. |
372 | */ | 372 | */ |
373 | static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struct PKT * PacketP) | 373 | static int RIOCommandRup(struct rio_info *p, uint Rup, struct Host *HostP, struct PKT __iomem *PacketP) |
374 | { | 374 | { |
375 | struct PktCmd *PktCmdP = (struct PktCmd *) PacketP->data; | 375 | struct PktCmd __iomem *PktCmdP = (struct PktCmd __iomem *)PacketP->data; |
376 | struct Port *PortP; | 376 | struct Port *PortP; |
377 | struct UnixRup *UnixRupP; | 377 | struct UnixRup *UnixRupP; |
378 | unsigned short SysPort; | 378 | unsigned short SysPort; |
@@ -601,7 +601,7 @@ int RIOQueueCmdBlk(struct Host *HostP, uint Rup, struct CmdBlk *CmdBlkP) | |||
601 | /* | 601 | /* |
602 | ** Whammy! blat that pack! | 602 | ** Whammy! blat that pack! |
603 | */ | 603 | */ |
604 | HostP->Copy((caddr_t) & CmdBlkP->Packet, RIO_PTR(HostP->Caddr, UnixRupP->RupP->txpkt), sizeof(struct PKT)); | 604 | HostP->Copy(&CmdBlkP->Packet, RIO_PTR(HostP->Caddr, UnixRupP->RupP->txpkt), sizeof(struct PKT)); |
605 | 605 | ||
606 | /* | 606 | /* |
607 | ** place command packet on the pending position. | 607 | ** place command packet on the pending position. |
@@ -655,7 +655,7 @@ void RIOPollHostCommands(struct rio_info *p, struct Host *HostP) | |||
655 | { | 655 | { |
656 | struct CmdBlk *CmdBlkP; | 656 | struct CmdBlk *CmdBlkP; |
657 | struct UnixRup *UnixRupP; | 657 | struct UnixRup *UnixRupP; |
658 | struct PKT *PacketP; | 658 | struct PKT __iomem *PacketP; |
659 | unsigned short Rup; | 659 | unsigned short Rup; |
660 | unsigned long flags; | 660 | unsigned long flags; |
661 | 661 | ||
@@ -676,7 +676,7 @@ void RIOPollHostCommands(struct rio_info *p, struct Host *HostP) | |||
676 | if (readw(&UnixRupP->RupP->rxcontrol) != RX_RUP_INACTIVE) { | 676 | if (readw(&UnixRupP->RupP->rxcontrol) != RX_RUP_INACTIVE) { |
677 | int FreeMe; | 677 | int FreeMe; |
678 | 678 | ||
679 | PacketP = (struct PKT *) RIO_PTR(HostP->Caddr, readw(&UnixRupP->RupP->rxpkt)); | 679 | PacketP = (struct PKT __iomem *) RIO_PTR(HostP->Caddr, readw(&UnixRupP->RupP->rxpkt)); |
680 | 680 | ||
681 | switch (readb(&PacketP->dest_port)) { | 681 | switch (readb(&PacketP->dest_port)) { |
682 | case BOOT_RUP: | 682 | case BOOT_RUP: |
@@ -696,7 +696,7 @@ void RIOPollHostCommands(struct rio_info *p, struct Host *HostP) | |||
696 | FreeMe = RIOCommandRup(p, Rup, HostP, PacketP); | 696 | FreeMe = RIOCommandRup(p, Rup, HostP, PacketP); |
697 | if (PacketP->data[5] == MEMDUMP) { | 697 | if (PacketP->data[5] == MEMDUMP) { |
698 | rio_dprintk(RIO_DEBUG_CMD, "Memdump from 0x%x complete\n", *(unsigned short *) & (PacketP->data[6])); | 698 | rio_dprintk(RIO_DEBUG_CMD, "Memdump from 0x%x complete\n", *(unsigned short *) & (PacketP->data[6])); |
699 | HostP->Copy((caddr_t) & (PacketP->data[8]), (caddr_t) p->RIOMemDump, 32); | 699 | HostP->Copy(&(PacketP->data[8]), p->RIOMemDump, 32); |
700 | } | 700 | } |
701 | rio_spin_lock_irqsave(&UnixRupP->RupLock, flags); | 701 | rio_spin_lock_irqsave(&UnixRupP->RupLock, flags); |
702 | break; | 702 | break; |
@@ -782,7 +782,7 @@ void RIOPollHostCommands(struct rio_info *p, struct Host *HostP) | |||
782 | /* | 782 | /* |
783 | ** Whammy! blat that pack! | 783 | ** Whammy! blat that pack! |
784 | */ | 784 | */ |
785 | HostP->Copy((caddr_t) & CmdBlkP->Packet, RIO_PTR(HostP->Caddr, UnixRupP->RupP->txpkt), sizeof(struct PKT)); | 785 | HostP->Copy(&CmdBlkP->Packet, RIO_PTR(HostP->Caddr, UnixRupP->RupP->txpkt), sizeof(struct PKT)); |
786 | 786 | ||
787 | /* | 787 | /* |
788 | ** remove the command from the rup command queue... | 788 | ** remove the command from the rup command queue... |
@@ -824,7 +824,7 @@ int RIOWFlushMark(unsigned long iPortP, struct CmdBlk *CmdBlkP) | |||
824 | int RIORFlushEnable(unsigned long iPortP, struct CmdBlk *CmdBlkP) | 824 | int RIORFlushEnable(unsigned long iPortP, struct CmdBlk *CmdBlkP) |
825 | { | 825 | { |
826 | struct Port *PortP = (struct Port *) iPortP; | 826 | struct Port *PortP = (struct Port *) iPortP; |
827 | struct PKT *PacketP; | 827 | struct PKT __iomem *PacketP; |
828 | unsigned long flags; | 828 | unsigned long flags; |
829 | 829 | ||
830 | rio_spin_lock_irqsave(&PortP->portSem, flags); | 830 | rio_spin_lock_irqsave(&PortP->portSem, flags); |
diff --git a/drivers/char/rio/rioctrl.c b/drivers/char/rio/rioctrl.c index 75b2557c37ec..732e7db5f717 100644 --- a/drivers/char/rio/rioctrl.c +++ b/drivers/char/rio/rioctrl.c | |||
@@ -80,7 +80,7 @@ static char *_rioctrl_c_sccs_ = "@(#)rioctrl.c 1.3"; | |||
80 | static struct LpbReq LpbReq; | 80 | static struct LpbReq LpbReq; |
81 | static struct RupReq RupReq; | 81 | static struct RupReq RupReq; |
82 | static struct PortReq PortReq; | 82 | static struct PortReq PortReq; |
83 | static struct HostReq HostReq; | 83 | static struct HostReq HostReq; /* oh really? global? and no locking? */ |
84 | static struct HostDpRam HostDpRam; | 84 | static struct HostDpRam HostDpRam; |
85 | static struct DebugCtrl DebugCtrl; | 85 | static struct DebugCtrl DebugCtrl; |
86 | static struct Map MapEnt; | 86 | static struct Map MapEnt; |
@@ -126,12 +126,7 @@ static int | |||
126 | 126 | ||
127 | #define drv_makedev(maj, min) ((((uint) maj & 0xff) << 8) | ((uint) min & 0xff)) | 127 | #define drv_makedev(maj, min) ((((uint) maj & 0xff) << 8) | ((uint) min & 0xff)) |
128 | 128 | ||
129 | int riocontrol(p, dev, cmd, arg, su) | 129 | int riocontrol(struct rio_info *p, dev_t dev, int cmd, unsigned long arg, int su) |
130 | struct rio_info *p; | ||
131 | dev_t dev; | ||
132 | int cmd; | ||
133 | caddr_t arg; | ||
134 | int su; | ||
135 | { | 130 | { |
136 | uint Host; /* leave me unsigned! */ | 131 | uint Host; /* leave me unsigned! */ |
137 | uint port; /* and me! */ | 132 | uint port; /* and me! */ |
@@ -139,9 +134,10 @@ int su; | |||
139 | ushort loop; | 134 | ushort loop; |
140 | int Entry; | 135 | int Entry; |
141 | struct Port *PortP; | 136 | struct Port *PortP; |
142 | struct PKT *PacketP; | 137 | struct PKT __iomem *PacketP; |
143 | int retval = 0; | 138 | int retval = 0; |
144 | unsigned long flags; | 139 | unsigned long flags; |
140 | void __user *argp = (void __user *)arg; | ||
145 | 141 | ||
146 | func_enter(); | 142 | func_enter(); |
147 | 143 | ||
@@ -149,7 +145,7 @@ int su; | |||
149 | Host = 0; | 145 | Host = 0; |
150 | PortP = NULL; | 146 | PortP = NULL; |
151 | 147 | ||
152 | rio_dprintk(RIO_DEBUG_CTRL, "control ioctl cmd: 0x%x arg: %p\n", cmd, arg); | 148 | rio_dprintk(RIO_DEBUG_CTRL, "control ioctl cmd: 0x%x arg: %p\n", cmd, argp); |
153 | 149 | ||
154 | switch (cmd) { | 150 | switch (cmd) { |
155 | /* | 151 | /* |
@@ -160,11 +156,11 @@ int su; | |||
160 | ** otherwise just the specified host card will be changed. | 156 | ** otherwise just the specified host card will be changed. |
161 | */ | 157 | */ |
162 | case RIO_SET_TIMER: | 158 | case RIO_SET_TIMER: |
163 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET_TIMER to %ldms\n", (unsigned long)arg); | 159 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET_TIMER to %ldms\n", arg); |
164 | { | 160 | { |
165 | int host, value; | 161 | int host, value; |
166 | host = ((unsigned long) arg >> 16) & 0x0000FFFF; | 162 | host = (arg >> 16) & 0x0000FFFF; |
167 | value = (unsigned long) arg & 0x0000ffff; | 163 | value = arg & 0x0000ffff; |
168 | if (host == -1) { | 164 | if (host == -1) { |
169 | for (host = 0; host < p->RIONumHosts; host++) { | 165 | for (host = 0; host < p->RIONumHosts; host++) { |
170 | if (p->RIOHosts[host].Flags == RC_RUNNING) { | 166 | if (p->RIOHosts[host].Flags == RC_RUNNING) { |
@@ -183,26 +179,26 @@ int su; | |||
183 | 179 | ||
184 | case RIO_FOAD_RTA: | 180 | case RIO_FOAD_RTA: |
185 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_FOAD_RTA\n"); | 181 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_FOAD_RTA\n"); |
186 | return RIOCommandRta(p, (unsigned long)arg, RIOFoadRta); | 182 | return RIOCommandRta(p, arg, RIOFoadRta); |
187 | 183 | ||
188 | case RIO_ZOMBIE_RTA: | 184 | case RIO_ZOMBIE_RTA: |
189 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_ZOMBIE_RTA\n"); | 185 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_ZOMBIE_RTA\n"); |
190 | return RIOCommandRta(p, (unsigned long)arg, RIOZombieRta); | 186 | return RIOCommandRta(p, arg, RIOZombieRta); |
191 | 187 | ||
192 | case RIO_IDENTIFY_RTA: | 188 | case RIO_IDENTIFY_RTA: |
193 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_IDENTIFY_RTA\n"); | 189 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_IDENTIFY_RTA\n"); |
194 | return RIOIdentifyRta(p, arg); | 190 | return RIOIdentifyRta(p, argp); |
195 | 191 | ||
196 | case RIO_KILL_NEIGHBOUR: | 192 | case RIO_KILL_NEIGHBOUR: |
197 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_KILL_NEIGHBOUR\n"); | 193 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_KILL_NEIGHBOUR\n"); |
198 | return RIOKillNeighbour(p, arg); | 194 | return RIOKillNeighbour(p, argp); |
199 | 195 | ||
200 | case SPECIAL_RUP_CMD: | 196 | case SPECIAL_RUP_CMD: |
201 | { | 197 | { |
202 | struct CmdBlk *CmdBlkP; | 198 | struct CmdBlk *CmdBlkP; |
203 | 199 | ||
204 | rio_dprintk(RIO_DEBUG_CTRL, "SPECIAL_RUP_CMD\n"); | 200 | rio_dprintk(RIO_DEBUG_CTRL, "SPECIAL_RUP_CMD\n"); |
205 | if (copy_from_user(&SpecialRupCmd, arg, sizeof(SpecialRupCmd))) { | 201 | if (copy_from_user(&SpecialRupCmd, argp, sizeof(SpecialRupCmd))) { |
206 | rio_dprintk(RIO_DEBUG_CTRL, "SPECIAL_RUP_CMD copy failed\n"); | 202 | rio_dprintk(RIO_DEBUG_CTRL, "SPECIAL_RUP_CMD copy failed\n"); |
207 | p->RIOError.Error = COPYIN_FAILED; | 203 | p->RIOError.Error = COPYIN_FAILED; |
208 | return -EFAULT; | 204 | return -EFAULT; |
@@ -239,7 +235,7 @@ int su; | |||
239 | if ((retval = RIOApel(p)) != 0) | 235 | if ((retval = RIOApel(p)) != 0) |
240 | return retval; | 236 | return retval; |
241 | 237 | ||
242 | if (copy_to_user(arg, p->RIOConnectTable, TOTAL_MAP_ENTRIES * sizeof(struct Map))) { | 238 | if (copy_to_user(argp, p->RIOConnectTable, TOTAL_MAP_ENTRIES * sizeof(struct Map))) { |
243 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_TABLE copy failed\n"); | 239 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_TABLE copy failed\n"); |
244 | p->RIOError.Error = COPYOUT_FAILED; | 240 | p->RIOError.Error = COPYOUT_FAILED; |
245 | return -EFAULT; | 241 | return -EFAULT; |
@@ -284,7 +280,7 @@ int su; | |||
284 | p->RIOError.Error = NOT_SUPER_USER; | 280 | p->RIOError.Error = NOT_SUPER_USER; |
285 | return -EPERM; | 281 | return -EPERM; |
286 | } | 282 | } |
287 | if (copy_from_user(&p->RIOConnectTable[0], arg, TOTAL_MAP_ENTRIES * sizeof(struct Map))) { | 283 | if (copy_from_user(&p->RIOConnectTable[0], argp, TOTAL_MAP_ENTRIES * sizeof(struct Map))) { |
288 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_PUT_TABLE copy failed\n"); | 284 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_PUT_TABLE copy failed\n"); |
289 | p->RIOError.Error = COPYIN_FAILED; | 285 | p->RIOError.Error = COPYIN_FAILED; |
290 | return -EFAULT; | 286 | return -EFAULT; |
@@ -330,7 +326,7 @@ int su; | |||
330 | p->RIOError.Error = NOT_SUPER_USER; | 326 | p->RIOError.Error = NOT_SUPER_USER; |
331 | return -EPERM; | 327 | return -EPERM; |
332 | } | 328 | } |
333 | if (copy_to_user(arg, p->RIOBindTab, (sizeof(ulong) * MAX_RTA_BINDINGS))) { | 329 | if (copy_to_user(argp, p->RIOBindTab, (sizeof(ulong) * MAX_RTA_BINDINGS))) { |
334 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_BINDINGS copy failed\n"); | 330 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_BINDINGS copy failed\n"); |
335 | p->RIOError.Error = COPYOUT_FAILED; | 331 | p->RIOError.Error = COPYOUT_FAILED; |
336 | return -EFAULT; | 332 | return -EFAULT; |
@@ -349,7 +345,7 @@ int su; | |||
349 | p->RIOError.Error = NOT_SUPER_USER; | 345 | p->RIOError.Error = NOT_SUPER_USER; |
350 | return -EPERM; | 346 | return -EPERM; |
351 | } | 347 | } |
352 | if (copy_from_user(&p->RIOBindTab[0], arg, (sizeof(ulong) * MAX_RTA_BINDINGS))) { | 348 | if (copy_from_user(&p->RIOBindTab[0], argp, (sizeof(ulong) * MAX_RTA_BINDINGS))) { |
353 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_PUT_BINDINGS copy failed\n"); | 349 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_PUT_BINDINGS copy failed\n"); |
354 | p->RIOError.Error = COPYIN_FAILED; | 350 | p->RIOError.Error = COPYIN_FAILED; |
355 | return -EFAULT; | 351 | return -EFAULT; |
@@ -373,12 +369,12 @@ int su; | |||
373 | for (Entry = 0; Entry < MAX_RTA_BINDINGS; Entry++) { | 369 | for (Entry = 0; Entry < MAX_RTA_BINDINGS; Entry++) { |
374 | if ((EmptySlot == -1) && (p->RIOBindTab[Entry] == 0L)) | 370 | if ((EmptySlot == -1) && (p->RIOBindTab[Entry] == 0L)) |
375 | EmptySlot = Entry; | 371 | EmptySlot = Entry; |
376 | else if (p->RIOBindTab[Entry] == (long)arg) { | 372 | else if (p->RIOBindTab[Entry] == arg) { |
377 | /* | 373 | /* |
378 | ** Already exists - delete | 374 | ** Already exists - delete |
379 | */ | 375 | */ |
380 | p->RIOBindTab[Entry] = 0L; | 376 | p->RIOBindTab[Entry] = 0L; |
381 | rio_dprintk(RIO_DEBUG_CTRL, "Removing Rta %ld from p->RIOBindTab\n", (unsigned long)arg); | 377 | rio_dprintk(RIO_DEBUG_CTRL, "Removing Rta %ld from p->RIOBindTab\n", arg); |
382 | return 0; | 378 | return 0; |
383 | } | 379 | } |
384 | } | 380 | } |
@@ -386,10 +382,10 @@ int su; | |||
386 | ** Dosen't exist - add | 382 | ** Dosen't exist - add |
387 | */ | 383 | */ |
388 | if (EmptySlot != -1) { | 384 | if (EmptySlot != -1) { |
389 | p->RIOBindTab[EmptySlot] = (unsigned long)arg; | 385 | p->RIOBindTab[EmptySlot] = arg; |
390 | rio_dprintk(RIO_DEBUG_CTRL, "Adding Rta %lx to p->RIOBindTab\n", (unsigned long) arg); | 386 | rio_dprintk(RIO_DEBUG_CTRL, "Adding Rta %lx to p->RIOBindTab\n", arg); |
391 | } else { | 387 | } else { |
392 | rio_dprintk(RIO_DEBUG_CTRL, "p->RIOBindTab full! - Rta %lx not added\n", (unsigned long) arg); | 388 | rio_dprintk(RIO_DEBUG_CTRL, "p->RIOBindTab full! - Rta %lx not added\n", arg); |
393 | return -ENOMEM; | 389 | return -ENOMEM; |
394 | } | 390 | } |
395 | return 0; | 391 | return 0; |
@@ -397,7 +393,7 @@ int su; | |||
397 | 393 | ||
398 | case RIO_RESUME: | 394 | case RIO_RESUME: |
399 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_RESUME\n"); | 395 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_RESUME\n"); |
400 | port = (unsigned long) arg; | 396 | port = arg; |
401 | if ((port < 0) || (port > 511)) { | 397 | if ((port < 0) || (port > 511)) { |
402 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_RESUME: Bad port number %d\n", port); | 398 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_RESUME: Bad port number %d\n", port); |
403 | p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE; | 399 | p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE; |
@@ -433,7 +429,7 @@ int su; | |||
433 | p->RIOError.Error = NOT_SUPER_USER; | 429 | p->RIOError.Error = NOT_SUPER_USER; |
434 | return -EPERM; | 430 | return -EPERM; |
435 | } | 431 | } |
436 | if (copy_from_user(&MapEnt, arg, sizeof(MapEnt))) { | 432 | if (copy_from_user(&MapEnt, argp, sizeof(MapEnt))) { |
437 | rio_dprintk(RIO_DEBUG_CTRL, "Copy from user space failed\n"); | 433 | rio_dprintk(RIO_DEBUG_CTRL, "Copy from user space failed\n"); |
438 | p->RIOError.Error = COPYIN_FAILED; | 434 | p->RIOError.Error = COPYIN_FAILED; |
439 | return -EFAULT; | 435 | return -EFAULT; |
@@ -447,7 +443,7 @@ int su; | |||
447 | p->RIOError.Error = NOT_SUPER_USER; | 443 | p->RIOError.Error = NOT_SUPER_USER; |
448 | return -EPERM; | 444 | return -EPERM; |
449 | } | 445 | } |
450 | if (copy_from_user(&MapEnt, arg, sizeof(MapEnt))) { | 446 | if (copy_from_user(&MapEnt, argp, sizeof(MapEnt))) { |
451 | rio_dprintk(RIO_DEBUG_CTRL, "Copy from user space failed\n"); | 447 | rio_dprintk(RIO_DEBUG_CTRL, "Copy from user space failed\n"); |
452 | p->RIOError.Error = COPYIN_FAILED; | 448 | p->RIOError.Error = COPYIN_FAILED; |
453 | return -EFAULT; | 449 | return -EFAULT; |
@@ -461,7 +457,7 @@ int su; | |||
461 | p->RIOError.Error = NOT_SUPER_USER; | 457 | p->RIOError.Error = NOT_SUPER_USER; |
462 | return -EPERM; | 458 | return -EPERM; |
463 | } | 459 | } |
464 | if (copy_from_user(&MapEnt, arg, sizeof(MapEnt))) { | 460 | if (copy_from_user(&MapEnt, argp, sizeof(MapEnt))) { |
465 | rio_dprintk(RIO_DEBUG_CTRL, "Copy from data space failed\n"); | 461 | rio_dprintk(RIO_DEBUG_CTRL, "Copy from data space failed\n"); |
466 | p->RIOError.Error = COPYIN_FAILED; | 462 | p->RIOError.Error = COPYIN_FAILED; |
467 | return -EFAULT; | 463 | return -EFAULT; |
@@ -469,14 +465,14 @@ int su; | |||
469 | return RIODeleteRta(p, &MapEnt); | 465 | return RIODeleteRta(p, &MapEnt); |
470 | 466 | ||
471 | case RIO_QUICK_CHECK: | 467 | case RIO_QUICK_CHECK: |
472 | if (copy_to_user(arg, &p->RIORtaDisCons, sizeof(unsigned int))) { | 468 | if (copy_to_user(argp, &p->RIORtaDisCons, sizeof(unsigned int))) { |
473 | p->RIOError.Error = COPYOUT_FAILED; | 469 | p->RIOError.Error = COPYOUT_FAILED; |
474 | return -EFAULT; | 470 | return -EFAULT; |
475 | } | 471 | } |
476 | return 0; | 472 | return 0; |
477 | 473 | ||
478 | case RIO_LAST_ERROR: | 474 | case RIO_LAST_ERROR: |
479 | if (copy_to_user(arg, &p->RIOError, sizeof(struct Error))) | 475 | if (copy_to_user(argp, &p->RIOError, sizeof(struct Error))) |
480 | return -EFAULT; | 476 | return -EFAULT; |
481 | return 0; | 477 | return 0; |
482 | 478 | ||
@@ -485,7 +481,7 @@ int su; | |||
485 | return -EINVAL; | 481 | return -EINVAL; |
486 | 482 | ||
487 | case RIO_GET_MODTYPE: | 483 | case RIO_GET_MODTYPE: |
488 | if (copy_from_user(&port, arg, sizeof(unsigned int))) { | 484 | if (copy_from_user(&port, argp, sizeof(unsigned int))) { |
489 | p->RIOError.Error = COPYIN_FAILED; | 485 | p->RIOError.Error = COPYIN_FAILED; |
490 | return -EFAULT; | 486 | return -EFAULT; |
491 | } | 487 | } |
@@ -505,7 +501,7 @@ int su; | |||
505 | ** Return module type of port | 501 | ** Return module type of port |
506 | */ | 502 | */ |
507 | port = PortP->HostP->UnixRups[PortP->RupNum].ModTypes; | 503 | port = PortP->HostP->UnixRups[PortP->RupNum].ModTypes; |
508 | if (copy_to_user(arg, &port, sizeof(unsigned int))) { | 504 | if (copy_to_user(argp, &port, sizeof(unsigned int))) { |
509 | p->RIOError.Error = COPYOUT_FAILED; | 505 | p->RIOError.Error = COPYOUT_FAILED; |
510 | return -EFAULT; | 506 | return -EFAULT; |
511 | } | 507 | } |
@@ -521,7 +517,7 @@ int su; | |||
521 | 517 | ||
522 | case RIO_SETUP_PORTS: | 518 | case RIO_SETUP_PORTS: |
523 | rio_dprintk(RIO_DEBUG_CTRL, "Setup ports\n"); | 519 | rio_dprintk(RIO_DEBUG_CTRL, "Setup ports\n"); |
524 | if (copy_from_user(&PortSetup, arg, sizeof(PortSetup))) { | 520 | if (copy_from_user(&PortSetup, argp, sizeof(PortSetup))) { |
525 | p->RIOError.Error = COPYIN_FAILED; | 521 | p->RIOError.Error = COPYIN_FAILED; |
526 | rio_dprintk(RIO_DEBUG_CTRL, "EFAULT"); | 522 | rio_dprintk(RIO_DEBUG_CTRL, "EFAULT"); |
527 | return -EFAULT; | 523 | return -EFAULT; |
@@ -551,7 +547,7 @@ int su; | |||
551 | 547 | ||
552 | case RIO_GET_PORT_SETUP: | 548 | case RIO_GET_PORT_SETUP: |
553 | rio_dprintk(RIO_DEBUG_CTRL, "Get port setup\n"); | 549 | rio_dprintk(RIO_DEBUG_CTRL, "Get port setup\n"); |
554 | if (copy_from_user(&PortSetup, arg, sizeof(PortSetup))) { | 550 | if (copy_from_user(&PortSetup, argp, sizeof(PortSetup))) { |
555 | p->RIOError.Error = COPYIN_FAILED; | 551 | p->RIOError.Error = COPYIN_FAILED; |
556 | return -EFAULT; | 552 | return -EFAULT; |
557 | } | 553 | } |
@@ -572,7 +568,7 @@ int su; | |||
572 | PortSetup.XpOn[MAX_XP_CTRL_LEN - 1] = '\0'; | 568 | PortSetup.XpOn[MAX_XP_CTRL_LEN - 1] = '\0'; |
573 | PortSetup.XpOff[MAX_XP_CTRL_LEN - 1] = '\0'; | 569 | PortSetup.XpOff[MAX_XP_CTRL_LEN - 1] = '\0'; |
574 | 570 | ||
575 | if (copy_to_user(arg, &PortSetup, sizeof(PortSetup))) { | 571 | if (copy_to_user(argp, &PortSetup, sizeof(PortSetup))) { |
576 | p->RIOError.Error = COPYOUT_FAILED; | 572 | p->RIOError.Error = COPYOUT_FAILED; |
577 | return -EFAULT; | 573 | return -EFAULT; |
578 | } | 574 | } |
@@ -580,7 +576,7 @@ int su; | |||
580 | 576 | ||
581 | case RIO_GET_PORT_PARAMS: | 577 | case RIO_GET_PORT_PARAMS: |
582 | rio_dprintk(RIO_DEBUG_CTRL, "Get port params\n"); | 578 | rio_dprintk(RIO_DEBUG_CTRL, "Get port params\n"); |
583 | if (copy_from_user(&PortParams, arg, sizeof(struct PortParams))) { | 579 | if (copy_from_user(&PortParams, argp, sizeof(struct PortParams))) { |
584 | p->RIOError.Error = COPYIN_FAILED; | 580 | p->RIOError.Error = COPYIN_FAILED; |
585 | return -EFAULT; | 581 | return -EFAULT; |
586 | } | 582 | } |
@@ -593,7 +589,7 @@ int su; | |||
593 | PortParams.State = PortP->State; | 589 | PortParams.State = PortP->State; |
594 | rio_dprintk(RIO_DEBUG_CTRL, "Port %d\n", PortParams.Port); | 590 | rio_dprintk(RIO_DEBUG_CTRL, "Port %d\n", PortParams.Port); |
595 | 591 | ||
596 | if (copy_to_user(arg, &PortParams, sizeof(struct PortParams))) { | 592 | if (copy_to_user(argp, &PortParams, sizeof(struct PortParams))) { |
597 | p->RIOError.Error = COPYOUT_FAILED; | 593 | p->RIOError.Error = COPYOUT_FAILED; |
598 | return -EFAULT; | 594 | return -EFAULT; |
599 | } | 595 | } |
@@ -601,7 +597,7 @@ int su; | |||
601 | 597 | ||
602 | case RIO_GET_PORT_TTY: | 598 | case RIO_GET_PORT_TTY: |
603 | rio_dprintk(RIO_DEBUG_CTRL, "Get port tty\n"); | 599 | rio_dprintk(RIO_DEBUG_CTRL, "Get port tty\n"); |
604 | if (copy_from_user(&PortTty, arg, sizeof(struct PortTty))) { | 600 | if (copy_from_user(&PortTty, argp, sizeof(struct PortTty))) { |
605 | p->RIOError.Error = COPYIN_FAILED; | 601 | p->RIOError.Error = COPYIN_FAILED; |
606 | return -EFAULT; | 602 | return -EFAULT; |
607 | } | 603 | } |
@@ -612,14 +608,14 @@ int su; | |||
612 | 608 | ||
613 | rio_dprintk(RIO_DEBUG_CTRL, "Port %d\n", PortTty.port); | 609 | rio_dprintk(RIO_DEBUG_CTRL, "Port %d\n", PortTty.port); |
614 | PortP = (p->RIOPortp[PortTty.port]); | 610 | PortP = (p->RIOPortp[PortTty.port]); |
615 | if (copy_to_user(arg, &PortTty, sizeof(struct PortTty))) { | 611 | if (copy_to_user(argp, &PortTty, sizeof(struct PortTty))) { |
616 | p->RIOError.Error = COPYOUT_FAILED; | 612 | p->RIOError.Error = COPYOUT_FAILED; |
617 | return -EFAULT; | 613 | return -EFAULT; |
618 | } | 614 | } |
619 | return retval; | 615 | return retval; |
620 | 616 | ||
621 | case RIO_SET_PORT_TTY: | 617 | case RIO_SET_PORT_TTY: |
622 | if (copy_from_user(&PortTty, arg, sizeof(struct PortTty))) { | 618 | if (copy_from_user(&PortTty, argp, sizeof(struct PortTty))) { |
623 | p->RIOError.Error = COPYIN_FAILED; | 619 | p->RIOError.Error = COPYIN_FAILED; |
624 | return -EFAULT; | 620 | return -EFAULT; |
625 | } | 621 | } |
@@ -634,7 +630,7 @@ int su; | |||
634 | 630 | ||
635 | case RIO_SET_PORT_PARAMS: | 631 | case RIO_SET_PORT_PARAMS: |
636 | rio_dprintk(RIO_DEBUG_CTRL, "Set port params\n"); | 632 | rio_dprintk(RIO_DEBUG_CTRL, "Set port params\n"); |
637 | if (copy_from_user(&PortParams, arg, sizeof(PortParams))) { | 633 | if (copy_from_user(&PortParams, argp, sizeof(PortParams))) { |
638 | p->RIOError.Error = COPYIN_FAILED; | 634 | p->RIOError.Error = COPYIN_FAILED; |
639 | return -EFAULT; | 635 | return -EFAULT; |
640 | } | 636 | } |
@@ -650,7 +646,7 @@ int su; | |||
650 | 646 | ||
651 | case RIO_GET_PORT_STATS: | 647 | case RIO_GET_PORT_STATS: |
652 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_PORT_STATS\n"); | 648 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_GET_PORT_STATS\n"); |
653 | if (copy_from_user(&portStats, arg, sizeof(struct portStats))) { | 649 | if (copy_from_user(&portStats, argp, sizeof(struct portStats))) { |
654 | p->RIOError.Error = COPYIN_FAILED; | 650 | p->RIOError.Error = COPYIN_FAILED; |
655 | return -EFAULT; | 651 | return -EFAULT; |
656 | } | 652 | } |
@@ -665,14 +661,14 @@ int su; | |||
665 | portStats.opens = PortP->opens; | 661 | portStats.opens = PortP->opens; |
666 | portStats.closes = PortP->closes; | 662 | portStats.closes = PortP->closes; |
667 | portStats.ioctls = PortP->ioctls; | 663 | portStats.ioctls = PortP->ioctls; |
668 | if (copy_to_user(arg, &portStats, sizeof(struct portStats))) { | 664 | if (copy_to_user(argp, &portStats, sizeof(struct portStats))) { |
669 | p->RIOError.Error = COPYOUT_FAILED; | 665 | p->RIOError.Error = COPYOUT_FAILED; |
670 | return -EFAULT; | 666 | return -EFAULT; |
671 | } | 667 | } |
672 | return retval; | 668 | return retval; |
673 | 669 | ||
674 | case RIO_RESET_PORT_STATS: | 670 | case RIO_RESET_PORT_STATS: |
675 | port = (unsigned long) arg; | 671 | port = arg; |
676 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_RESET_PORT_STATS\n"); | 672 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_RESET_PORT_STATS\n"); |
677 | if (port >= RIO_PORTS) { | 673 | if (port >= RIO_PORTS) { |
678 | p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE; | 674 | p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE; |
@@ -690,7 +686,7 @@ int su; | |||
690 | 686 | ||
691 | case RIO_GATHER_PORT_STATS: | 687 | case RIO_GATHER_PORT_STATS: |
692 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_GATHER_PORT_STATS\n"); | 688 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_GATHER_PORT_STATS\n"); |
693 | if (copy_from_user(&portStats, arg, sizeof(struct portStats))) { | 689 | if (copy_from_user(&portStats, argp, sizeof(struct portStats))) { |
694 | p->RIOError.Error = COPYIN_FAILED; | 690 | p->RIOError.Error = COPYIN_FAILED; |
695 | return -EFAULT; | 691 | return -EFAULT; |
696 | } | 692 | } |
@@ -706,7 +702,7 @@ int su; | |||
706 | 702 | ||
707 | case RIO_READ_CONFIG: | 703 | case RIO_READ_CONFIG: |
708 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_READ_CONFIG\n"); | 704 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_READ_CONFIG\n"); |
709 | if (copy_to_user(arg, &p->RIOConf, sizeof(struct Conf))) { | 705 | if (copy_to_user(argp, &p->RIOConf, sizeof(struct Conf))) { |
710 | p->RIOError.Error = COPYOUT_FAILED; | 706 | p->RIOError.Error = COPYOUT_FAILED; |
711 | return -EFAULT; | 707 | return -EFAULT; |
712 | } | 708 | } |
@@ -718,7 +714,7 @@ int su; | |||
718 | p->RIOError.Error = NOT_SUPER_USER; | 714 | p->RIOError.Error = NOT_SUPER_USER; |
719 | return -EPERM; | 715 | return -EPERM; |
720 | } | 716 | } |
721 | if (copy_from_user(&p->RIOConf, arg, sizeof(struct Conf))) { | 717 | if (copy_from_user(&p->RIOConf, argp, sizeof(struct Conf))) { |
722 | p->RIOError.Error = COPYIN_FAILED; | 718 | p->RIOError.Error = COPYIN_FAILED; |
723 | return -EFAULT; | 719 | return -EFAULT; |
724 | } | 720 | } |
@@ -746,7 +742,7 @@ int su; | |||
746 | case RIO_SETDEBUG: | 742 | case RIO_SETDEBUG: |
747 | case RIO_GETDEBUG: | 743 | case RIO_GETDEBUG: |
748 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_SETDEBUG/RIO_GETDEBUG\n"); | 744 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_SETDEBUG/RIO_GETDEBUG\n"); |
749 | if (copy_from_user(&DebugCtrl, arg, sizeof(DebugCtrl))) { | 745 | if (copy_from_user(&DebugCtrl, argp, sizeof(DebugCtrl))) { |
750 | p->RIOError.Error = COPYIN_FAILED; | 746 | p->RIOError.Error = COPYIN_FAILED; |
751 | return -EFAULT; | 747 | return -EFAULT; |
752 | } | 748 | } |
@@ -763,7 +759,7 @@ int su; | |||
763 | rio_dprintk(RIO_DEBUG_CTRL, "Get global debug 0x%x wait 0x%x\n", p->rio_debug, p->RIODebugWait); | 759 | rio_dprintk(RIO_DEBUG_CTRL, "Get global debug 0x%x wait 0x%x\n", p->rio_debug, p->RIODebugWait); |
764 | DebugCtrl.Debug = p->rio_debug; | 760 | DebugCtrl.Debug = p->rio_debug; |
765 | DebugCtrl.Wait = p->RIODebugWait; | 761 | DebugCtrl.Wait = p->RIODebugWait; |
766 | if (copy_to_user(arg, &DebugCtrl, sizeof(DebugCtrl))) { | 762 | if (copy_to_user(argp, &DebugCtrl, sizeof(DebugCtrl))) { |
767 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET/GET DEBUG: bad port number %d\n", DebugCtrl.SysPort); | 763 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET/GET DEBUG: bad port number %d\n", DebugCtrl.SysPort); |
768 | p->RIOError.Error = COPYOUT_FAILED; | 764 | p->RIOError.Error = COPYOUT_FAILED; |
769 | return -EFAULT; | 765 | return -EFAULT; |
@@ -785,7 +781,7 @@ int su; | |||
785 | } else { | 781 | } else { |
786 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_GETDEBUG 0x%x\n", p->RIOPortp[DebugCtrl.SysPort]->Debug); | 782 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_GETDEBUG 0x%x\n", p->RIOPortp[DebugCtrl.SysPort]->Debug); |
787 | DebugCtrl.Debug = p->RIOPortp[DebugCtrl.SysPort]->Debug; | 783 | DebugCtrl.Debug = p->RIOPortp[DebugCtrl.SysPort]->Debug; |
788 | if (copy_to_user(arg, &DebugCtrl, sizeof(DebugCtrl))) { | 784 | if (copy_to_user(argp, &DebugCtrl, sizeof(DebugCtrl))) { |
789 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_GETDEBUG: Bad copy to user space\n"); | 785 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_GETDEBUG: Bad copy to user space\n"); |
790 | p->RIOError.Error = COPYOUT_FAILED; | 786 | p->RIOError.Error = COPYOUT_FAILED; |
791 | return -EFAULT; | 787 | return -EFAULT; |
@@ -800,7 +796,7 @@ int su; | |||
800 | ** textual null terminated string. | 796 | ** textual null terminated string. |
801 | */ | 797 | */ |
802 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_VERSID\n"); | 798 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_VERSID\n"); |
803 | if (copy_to_user(arg, RIOVersid(), sizeof(struct rioVersion))) { | 799 | if (copy_to_user(argp, RIOVersid(), sizeof(struct rioVersion))) { |
804 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_VERSID: Bad copy to user space (host=%d)\n", Host); | 800 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_VERSID: Bad copy to user space (host=%d)\n", Host); |
805 | p->RIOError.Error = COPYOUT_FAILED; | 801 | p->RIOError.Error = COPYOUT_FAILED; |
806 | return -EFAULT; | 802 | return -EFAULT; |
@@ -813,7 +809,7 @@ int su; | |||
813 | ** at init time. | 809 | ** at init time. |
814 | */ | 810 | */ |
815 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_NUM_HOSTS\n"); | 811 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_NUM_HOSTS\n"); |
816 | if (copy_to_user(arg, &p->RIONumHosts, sizeof(p->RIONumHosts))) { | 812 | if (copy_to_user(argp, &p->RIONumHosts, sizeof(p->RIONumHosts))) { |
817 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_NUM_HOSTS: Bad copy to user space\n"); | 813 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_NUM_HOSTS: Bad copy to user space\n"); |
818 | p->RIOError.Error = COPYOUT_FAILED; | 814 | p->RIOError.Error = COPYOUT_FAILED; |
819 | return -EFAULT; | 815 | return -EFAULT; |
@@ -824,7 +820,7 @@ int su; | |||
824 | /* | 820 | /* |
825 | ** Kill host. This may not be in the final version... | 821 | ** Kill host. This may not be in the final version... |
826 | */ | 822 | */ |
827 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_FOAD %ld\n", (unsigned long) arg); | 823 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_FOAD %ld\n", arg); |
828 | if (!su) { | 824 | if (!su) { |
829 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_FOAD: Not super user\n"); | 825 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_FOAD: Not super user\n"); |
830 | p->RIOError.Error = NOT_SUPER_USER; | 826 | p->RIOError.Error = NOT_SUPER_USER; |
@@ -858,7 +854,7 @@ int su; | |||
858 | p->RIOError.Error = NOT_SUPER_USER; | 854 | p->RIOError.Error = NOT_SUPER_USER; |
859 | return -EPERM; | 855 | return -EPERM; |
860 | } | 856 | } |
861 | if (copy_from_user(&DownLoad, arg, sizeof(DownLoad))) { | 857 | if (copy_from_user(&DownLoad, argp, sizeof(DownLoad))) { |
862 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_DOWNLOAD: Copy in from user space failed\n"); | 858 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_DOWNLOAD: Copy in from user space failed\n"); |
863 | p->RIOError.Error = COPYIN_FAILED; | 859 | p->RIOError.Error = COPYIN_FAILED; |
864 | return -EFAULT; | 860 | return -EFAULT; |
@@ -888,7 +884,7 @@ int su; | |||
888 | { | 884 | { |
889 | unsigned int host; | 885 | unsigned int host; |
890 | 886 | ||
891 | if (copy_from_user(&host, arg, sizeof(host))) { | 887 | if (copy_from_user(&host, argp, sizeof(host))) { |
892 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_REQ: Copy in from user space failed\n"); | 888 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_REQ: Copy in from user space failed\n"); |
893 | p->RIOError.Error = COPYIN_FAILED; | 889 | p->RIOError.Error = COPYIN_FAILED; |
894 | return -EFAULT; | 890 | return -EFAULT; |
@@ -897,7 +893,7 @@ int su; | |||
897 | ** Fetch the parmmap | 893 | ** Fetch the parmmap |
898 | */ | 894 | */ |
899 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_PARMS\n"); | 895 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_PARMS\n"); |
900 | if (copy_to_user(arg, p->RIOHosts[host].ParmMapP, sizeof(PARM_MAP))) { | 896 | if (copy_to_user(argp, p->RIOHosts[host].ParmMapP, sizeof(PARM_MAP))) { |
901 | p->RIOError.Error = COPYOUT_FAILED; | 897 | p->RIOError.Error = COPYOUT_FAILED; |
902 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_PARMS: Copy out to user space failed\n"); | 898 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_PARMS: Copy out to user space failed\n"); |
903 | return -EFAULT; | 899 | return -EFAULT; |
@@ -907,7 +903,7 @@ int su; | |||
907 | 903 | ||
908 | case RIO_HOST_REQ: | 904 | case RIO_HOST_REQ: |
909 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_REQ\n"); | 905 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_REQ\n"); |
910 | if (copy_from_user(&HostReq, arg, sizeof(HostReq))) { | 906 | if (copy_from_user(&HostReq, argp, sizeof(HostReq))) { |
911 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_REQ: Copy in from user space failed\n"); | 907 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_REQ: Copy in from user space failed\n"); |
912 | p->RIOError.Error = COPYIN_FAILED; | 908 | p->RIOError.Error = COPYIN_FAILED; |
913 | return -EFAULT; | 909 | return -EFAULT; |
@@ -928,7 +924,7 @@ int su; | |||
928 | 924 | ||
929 | case RIO_HOST_DPRAM: | 925 | case RIO_HOST_DPRAM: |
930 | rio_dprintk(RIO_DEBUG_CTRL, "Request for DPRAM\n"); | 926 | rio_dprintk(RIO_DEBUG_CTRL, "Request for DPRAM\n"); |
931 | if (copy_from_user(&HostDpRam, arg, sizeof(HostDpRam))) { | 927 | if (copy_from_user(&HostDpRam, argp, sizeof(HostDpRam))) { |
932 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_DPRAM: Copy in from user space failed\n"); | 928 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_DPRAM: Copy in from user space failed\n"); |
933 | p->RIOError.Error = COPYIN_FAILED; | 929 | p->RIOError.Error = COPYIN_FAILED; |
934 | return -EFAULT; | 930 | return -EFAULT; |
@@ -945,7 +941,7 @@ int su; | |||
945 | /* It's hardware like this that really gets on my tits. */ | 941 | /* It's hardware like this that really gets on my tits. */ |
946 | static unsigned char copy[sizeof(struct DpRam)]; | 942 | static unsigned char copy[sizeof(struct DpRam)]; |
947 | for (off = 0; off < sizeof(struct DpRam); off++) | 943 | for (off = 0; off < sizeof(struct DpRam); off++) |
948 | copy[off] = readb(&p->RIOHosts[HostDpRam.HostNum].Caddr[off]); | 944 | copy[off] = readb(p->RIOHosts[HostDpRam.HostNum].Caddr + off); |
949 | if (copy_to_user(HostDpRam.DpRamP, copy, sizeof(struct DpRam))) { | 945 | if (copy_to_user(HostDpRam.DpRamP, copy, sizeof(struct DpRam))) { |
950 | p->RIOError.Error = COPYOUT_FAILED; | 946 | p->RIOError.Error = COPYOUT_FAILED; |
951 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_DPRAM: Bad copy to user space\n"); | 947 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_DPRAM: Bad copy to user space\n"); |
@@ -960,13 +956,13 @@ int su; | |||
960 | 956 | ||
961 | case RIO_SET_BUSY: | 957 | case RIO_SET_BUSY: |
962 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET_BUSY\n"); | 958 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET_BUSY\n"); |
963 | if ((unsigned long) arg > 511) { | 959 | if (arg > 511) { |
964 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET_BUSY: Bad port number %ld\n", (unsigned long) arg); | 960 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_SET_BUSY: Bad port number %ld\n", arg); |
965 | p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE; | 961 | p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE; |
966 | return -EINVAL; | 962 | return -EINVAL; |
967 | } | 963 | } |
968 | rio_spin_lock_irqsave(&PortP->portSem, flags); | 964 | rio_spin_lock_irqsave(&PortP->portSem, flags); |
969 | p->RIOPortp[(unsigned long) arg]->State |= RIO_BUSY; | 965 | p->RIOPortp[arg]->State |= RIO_BUSY; |
970 | rio_spin_unlock_irqrestore(&PortP->portSem, flags); | 966 | rio_spin_unlock_irqrestore(&PortP->portSem, flags); |
971 | return retval; | 967 | return retval; |
972 | 968 | ||
@@ -976,7 +972,7 @@ int su; | |||
976 | ** (probably for debug reasons) | 972 | ** (probably for debug reasons) |
977 | */ | 973 | */ |
978 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_PORT\n"); | 974 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_PORT\n"); |
979 | if (copy_from_user(&PortReq, arg, sizeof(PortReq))) { | 975 | if (copy_from_user(&PortReq, argp, sizeof(PortReq))) { |
980 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_PORT: Copy in from user space failed\n"); | 976 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_PORT: Copy in from user space failed\n"); |
981 | p->RIOError.Error = COPYIN_FAILED; | 977 | p->RIOError.Error = COPYIN_FAILED; |
982 | return -EFAULT; | 978 | return -EFAULT; |
@@ -1001,7 +997,7 @@ int su; | |||
1001 | ** (probably for debug reasons) | 997 | ** (probably for debug reasons) |
1002 | */ | 998 | */ |
1003 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_RUP\n"); | 999 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_RUP\n"); |
1004 | if (copy_from_user(&RupReq, arg, sizeof(RupReq))) { | 1000 | if (copy_from_user(&RupReq, argp, sizeof(RupReq))) { |
1005 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_RUP: Copy in from user space failed\n"); | 1001 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_RUP: Copy in from user space failed\n"); |
1006 | p->RIOError.Error = COPYIN_FAILED; | 1002 | p->RIOError.Error = COPYIN_FAILED; |
1007 | return -EFAULT; | 1003 | return -EFAULT; |
@@ -1038,7 +1034,7 @@ int su; | |||
1038 | ** (probably for debug reasons) | 1034 | ** (probably for debug reasons) |
1039 | */ | 1035 | */ |
1040 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_LPB\n"); | 1036 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_LPB\n"); |
1041 | if (copy_from_user(&LpbReq, arg, sizeof(LpbReq))) { | 1037 | if (copy_from_user(&LpbReq, argp, sizeof(LpbReq))) { |
1042 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_LPB: Bad copy from user space\n"); | 1038 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_HOST_LPB: Bad copy from user space\n"); |
1043 | p->RIOError.Error = COPYIN_FAILED; | 1039 | p->RIOError.Error = COPYIN_FAILED; |
1044 | return -EFAULT; | 1040 | return -EFAULT; |
@@ -1136,7 +1132,7 @@ int su; | |||
1136 | case RIO_MAP_B110_TO_110: | 1132 | case RIO_MAP_B110_TO_110: |
1137 | case RIO_MAP_B110_TO_115200: | 1133 | case RIO_MAP_B110_TO_115200: |
1138 | rio_dprintk(RIO_DEBUG_CTRL, "Baud rate mapping\n"); | 1134 | rio_dprintk(RIO_DEBUG_CTRL, "Baud rate mapping\n"); |
1139 | port = (unsigned long) arg; | 1135 | port = arg; |
1140 | if (port < 0 || port > 511) { | 1136 | if (port < 0 || port > 511) { |
1141 | rio_dprintk(RIO_DEBUG_CTRL, "Baud rate mapping: Bad port number %d\n", port); | 1137 | rio_dprintk(RIO_DEBUG_CTRL, "Baud rate mapping: Bad port number %d\n", port); |
1142 | p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE; | 1138 | p->RIOError.Error = PORT_NUMBER_OUT_OF_RANGE; |
@@ -1166,7 +1162,7 @@ int su; | |||
1166 | 1162 | ||
1167 | case RIO_SEND_PACKET: | 1163 | case RIO_SEND_PACKET: |
1168 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_SEND_PACKET\n"); | 1164 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_SEND_PACKET\n"); |
1169 | if (copy_from_user(&SendPack, arg, sizeof(SendPack))) { | 1165 | if (copy_from_user(&SendPack, argp, sizeof(SendPack))) { |
1170 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_SEND_PACKET: Bad copy from user space\n"); | 1166 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_SEND_PACKET: Bad copy from user space\n"); |
1171 | p->RIOError.Error = COPYIN_FAILED; | 1167 | p->RIOError.Error = COPYIN_FAILED; |
1172 | return -EFAULT; | 1168 | return -EFAULT; |
@@ -1210,7 +1206,7 @@ int su; | |||
1210 | return su ? 0 : -EPERM; | 1206 | return su ? 0 : -EPERM; |
1211 | 1207 | ||
1212 | case RIO_WHAT_MESG: | 1208 | case RIO_WHAT_MESG: |
1213 | if (copy_to_user(arg, &p->RIONoMessage, sizeof(p->RIONoMessage))) { | 1209 | if (copy_to_user(argp, &p->RIONoMessage, sizeof(p->RIONoMessage))) { |
1214 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_WHAT_MESG: Bad copy to user space\n"); | 1210 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_WHAT_MESG: Bad copy to user space\n"); |
1215 | p->RIOError.Error = COPYOUT_FAILED; | 1211 | p->RIOError.Error = COPYOUT_FAILED; |
1216 | return -EFAULT; | 1212 | return -EFAULT; |
@@ -1218,7 +1214,7 @@ int su; | |||
1218 | return 0; | 1214 | return 0; |
1219 | 1215 | ||
1220 | case RIO_MEM_DUMP: | 1216 | case RIO_MEM_DUMP: |
1221 | if (copy_from_user(&SubCmd, arg, sizeof(struct SubCmdStruct))) { | 1217 | if (copy_from_user(&SubCmd, argp, sizeof(struct SubCmdStruct))) { |
1222 | p->RIOError.Error = COPYIN_FAILED; | 1218 | p->RIOError.Error = COPYIN_FAILED; |
1223 | return -EFAULT; | 1219 | return -EFAULT; |
1224 | } | 1220 | } |
@@ -1248,7 +1244,7 @@ int su; | |||
1248 | PortP->State |= RIO_BUSY; | 1244 | PortP->State |= RIO_BUSY; |
1249 | 1245 | ||
1250 | rio_spin_unlock_irqrestore(&PortP->portSem, flags); | 1246 | rio_spin_unlock_irqrestore(&PortP->portSem, flags); |
1251 | if (copy_to_user(arg, p->RIOMemDump, MEMDUMP_SIZE)) { | 1247 | if (copy_to_user(argp, p->RIOMemDump, MEMDUMP_SIZE)) { |
1252 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_MEM_DUMP copy failed\n"); | 1248 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_MEM_DUMP copy failed\n"); |
1253 | p->RIOError.Error = COPYOUT_FAILED; | 1249 | p->RIOError.Error = COPYOUT_FAILED; |
1254 | return -EFAULT; | 1250 | return -EFAULT; |
@@ -1256,30 +1252,30 @@ int su; | |||
1256 | return 0; | 1252 | return 0; |
1257 | 1253 | ||
1258 | case RIO_TICK: | 1254 | case RIO_TICK: |
1259 | if ((unsigned long) arg >= p->RIONumHosts) | 1255 | if (arg >= p->RIONumHosts) |
1260 | return -EINVAL; | 1256 | return -EINVAL; |
1261 | rio_dprintk(RIO_DEBUG_CTRL, "Set interrupt for host %ld\n", (unsigned long) arg); | 1257 | rio_dprintk(RIO_DEBUG_CTRL, "Set interrupt for host %ld\n", arg); |
1262 | writeb(0xFF, &p->RIOHosts[(unsigned long) arg].SetInt); | 1258 | writeb(0xFF, &p->RIOHosts[arg].SetInt); |
1263 | return 0; | 1259 | return 0; |
1264 | 1260 | ||
1265 | case RIO_TOCK: | 1261 | case RIO_TOCK: |
1266 | if ((unsigned long) arg >= p->RIONumHosts) | 1262 | if (arg >= p->RIONumHosts) |
1267 | return -EINVAL; | 1263 | return -EINVAL; |
1268 | rio_dprintk(RIO_DEBUG_CTRL, "Clear interrupt for host %ld\n", (unsigned long) arg); | 1264 | rio_dprintk(RIO_DEBUG_CTRL, "Clear interrupt for host %ld\n", arg); |
1269 | writeb(0xFF, &p->RIOHosts[(unsigned long) arg].ResetInt); | 1265 | writeb(0xFF, &p->RIOHosts[arg].ResetInt); |
1270 | return 0; | 1266 | return 0; |
1271 | 1267 | ||
1272 | case RIO_READ_CHECK: | 1268 | case RIO_READ_CHECK: |
1273 | /* Check reads for pkts with data[0] the same */ | 1269 | /* Check reads for pkts with data[0] the same */ |
1274 | p->RIOReadCheck = !p->RIOReadCheck; | 1270 | p->RIOReadCheck = !p->RIOReadCheck; |
1275 | if (copy_to_user(arg, &p->RIOReadCheck, sizeof(unsigned int))) { | 1271 | if (copy_to_user(argp, &p->RIOReadCheck, sizeof(unsigned int))) { |
1276 | p->RIOError.Error = COPYOUT_FAILED; | 1272 | p->RIOError.Error = COPYOUT_FAILED; |
1277 | return -EFAULT; | 1273 | return -EFAULT; |
1278 | } | 1274 | } |
1279 | return 0; | 1275 | return 0; |
1280 | 1276 | ||
1281 | case RIO_READ_REGISTER: | 1277 | case RIO_READ_REGISTER: |
1282 | if (copy_from_user(&SubCmd, arg, sizeof(struct SubCmdStruct))) { | 1278 | if (copy_from_user(&SubCmd, argp, sizeof(struct SubCmdStruct))) { |
1283 | p->RIOError.Error = COPYIN_FAILED; | 1279 | p->RIOError.Error = COPYIN_FAILED; |
1284 | return -EFAULT; | 1280 | return -EFAULT; |
1285 | } | 1281 | } |
@@ -1314,7 +1310,7 @@ int su; | |||
1314 | PortP->State |= RIO_BUSY; | 1310 | PortP->State |= RIO_BUSY; |
1315 | 1311 | ||
1316 | rio_spin_unlock_irqrestore(&PortP->portSem, flags); | 1312 | rio_spin_unlock_irqrestore(&PortP->portSem, flags); |
1317 | if (copy_to_user(arg, &p->CdRegister, sizeof(unsigned int))) { | 1313 | if (copy_to_user(argp, &p->CdRegister, sizeof(unsigned int))) { |
1318 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_READ_REGISTER copy failed\n"); | 1314 | rio_dprintk(RIO_DEBUG_CTRL, "RIO_READ_REGISTER copy failed\n"); |
1319 | p->RIOError.Error = COPYOUT_FAILED; | 1315 | p->RIOError.Error = COPYOUT_FAILED; |
1320 | return -EFAULT; | 1316 | return -EFAULT; |
@@ -1327,10 +1323,10 @@ int su; | |||
1327 | */ | 1323 | */ |
1328 | case RIO_MAKE_DEV: | 1324 | case RIO_MAKE_DEV: |
1329 | { | 1325 | { |
1330 | unsigned int port = (unsigned long) arg & RIO_MODEM_MASK; | 1326 | unsigned int port = arg & RIO_MODEM_MASK; |
1331 | unsigned int ret; | 1327 | unsigned int ret; |
1332 | 1328 | ||
1333 | switch ((unsigned long) arg & RIO_DEV_MASK) { | 1329 | switch (arg & RIO_DEV_MASK) { |
1334 | case RIO_DEV_DIRECT: | 1330 | case RIO_DEV_DIRECT: |
1335 | ret = drv_makedev(MAJOR(dev), port); | 1331 | ret = drv_makedev(MAJOR(dev), port); |
1336 | rio_dprintk(RIO_DEBUG_CTRL, "Makedev direct 0x%x is 0x%x\n", port, ret); | 1332 | rio_dprintk(RIO_DEBUG_CTRL, "Makedev direct 0x%x is 0x%x\n", port, ret); |
@@ -1358,7 +1354,7 @@ int su; | |||
1358 | int mino; | 1354 | int mino; |
1359 | unsigned long ret; | 1355 | unsigned long ret; |
1360 | 1356 | ||
1361 | dv = (dev_t) ((unsigned long) arg); | 1357 | dv = (dev_t) (arg); |
1362 | mino = RIO_UNMODEM(dv); | 1358 | mino = RIO_UNMODEM(dv); |
1363 | 1359 | ||
1364 | if (RIO_ISMODEM(dv)) { | 1360 | if (RIO_ISMODEM(dv)) { |
diff --git a/drivers/char/rio/rioinit.c b/drivers/char/rio/rioinit.c index 24d2992154cc..12e34bc3f7ce 100644 --- a/drivers/char/rio/rioinit.c +++ b/drivers/char/rio/rioinit.c | |||
@@ -79,7 +79,7 @@ static char *_rioinit_c_sccs_ = "@(#)rioinit.c 1.3"; | |||
79 | 79 | ||
80 | int RIOPCIinit(struct rio_info *p, int Mode); | 80 | int RIOPCIinit(struct rio_info *p, int Mode); |
81 | 81 | ||
82 | static int RIOScrub(int, u8 *, int); | 82 | static int RIOScrub(int, u8 __iomem *, int); |
83 | 83 | ||
84 | 84 | ||
85 | /** | 85 | /** |
@@ -92,10 +92,10 @@ static int RIOScrub(int, u8 *, int); | |||
92 | ** bits > 0 indicates 16 bit operation. | 92 | ** bits > 0 indicates 16 bit operation. |
93 | */ | 93 | */ |
94 | 94 | ||
95 | int RIOAssignAT(struct rio_info *p, int Base, caddr_t virtAddr, int mode) | 95 | int RIOAssignAT(struct rio_info *p, int Base, void __iomem *virtAddr, int mode) |
96 | { | 96 | { |
97 | int bits; | 97 | int bits; |
98 | struct DpRam *cardp = (struct DpRam *)virtAddr; | 98 | struct DpRam __iomem *cardp = (struct DpRam __iomem *)virtAddr; |
99 | 99 | ||
100 | if ((Base < ONE_MEG) || (mode & BYTE_ACCESS_MODE)) | 100 | if ((Base < ONE_MEG) || (mode & BYTE_ACCESS_MODE)) |
101 | bits = BYTE_OPERATION; | 101 | bits = BYTE_OPERATION; |
@@ -107,7 +107,7 @@ int RIOAssignAT(struct rio_info *p, int Base, caddr_t virtAddr, int mode) | |||
107 | ** transient stuff. | 107 | ** transient stuff. |
108 | */ | 108 | */ |
109 | p->RIOHosts[p->RIONumHosts].Caddr = virtAddr; | 109 | p->RIOHosts[p->RIONumHosts].Caddr = virtAddr; |
110 | p->RIOHosts[p->RIONumHosts].CardP = (struct DpRam *)virtAddr; | 110 | p->RIOHosts[p->RIONumHosts].CardP = virtAddr; |
111 | 111 | ||
112 | /* | 112 | /* |
113 | ** Revision 01 AT host cards don't support WORD operations, | 113 | ** Revision 01 AT host cards don't support WORD operations, |
@@ -151,10 +151,10 @@ static u8 val[] = { | |||
151 | ** RAM test a board. | 151 | ** RAM test a board. |
152 | ** Nothing too complicated, just enough to check it out. | 152 | ** Nothing too complicated, just enough to check it out. |
153 | */ | 153 | */ |
154 | int RIOBoardTest(unsigned long paddr, caddr_t caddr, unsigned char type, int slot) | 154 | int RIOBoardTest(unsigned long paddr, void __iomem *caddr, unsigned char type, int slot) |
155 | { | 155 | { |
156 | struct DpRam *DpRam = (struct DpRam *)caddr; | 156 | struct DpRam __iomem *DpRam = caddr; |
157 | char *ram[4]; | 157 | void __iomem *ram[4]; |
158 | int size[4]; | 158 | int size[4]; |
159 | int op, bank; | 159 | int op, bank; |
160 | int nbanks; | 160 | int nbanks; |
@@ -179,12 +179,12 @@ int RIOBoardTest(unsigned long paddr, caddr_t caddr, unsigned char type, int slo | |||
179 | size[2] = DP_SRAM3_SIZE; | 179 | size[2] = DP_SRAM3_SIZE; |
180 | size[3] = DP_SCRATCH_SIZE; | 180 | size[3] = DP_SCRATCH_SIZE; |
181 | 181 | ||
182 | ram[0] = (char *)&DpRam->DpSram1[0]; | 182 | ram[0] = DpRam->DpSram1; |
183 | ram[1] = (char *)&DpRam->DpSram2[0]; | 183 | ram[1] = DpRam->DpSram2; |
184 | ram[2] = (char *)&DpRam->DpSram3[0]; | 184 | ram[2] = DpRam->DpSram3; |
185 | nbanks = (type == RIO_PCI) ? 3 : 4; | 185 | nbanks = (type == RIO_PCI) ? 3 : 4; |
186 | if (nbanks == 4) | 186 | if (nbanks == 4) |
187 | ram[3] = (char *)&DpRam->DpScratch[0]; | 187 | ram[3] = DpRam->DpScratch; |
188 | 188 | ||
189 | 189 | ||
190 | if (nbanks == 3) { | 190 | if (nbanks == 3) { |
@@ -202,7 +202,7 @@ int RIOBoardTest(unsigned long paddr, caddr_t caddr, unsigned char type, int slo | |||
202 | */ | 202 | */ |
203 | for (op=0; op<TEST_END; op++) { | 203 | for (op=0; op<TEST_END; op++) { |
204 | for (bank=0; bank<nbanks; bank++) { | 204 | for (bank=0; bank<nbanks; bank++) { |
205 | if (RIOScrub(op, (u8 *)ram[bank], size[bank]) == RIO_FAIL) { | 205 | if (RIOScrub(op, ram[bank], size[bank]) == RIO_FAIL) { |
206 | rio_dprintk (RIO_DEBUG_INIT, "RIO-init: RIOScrub band %d, op %d failed\n", | 206 | rio_dprintk (RIO_DEBUG_INIT, "RIO-init: RIOScrub band %d, op %d failed\n", |
207 | bank, op); | 207 | bank, op); |
208 | return RIO_FAIL; | 208 | return RIO_FAIL; |
@@ -227,7 +227,7 @@ int RIOBoardTest(unsigned long paddr, caddr_t caddr, unsigned char type, int slo | |||
227 | ** to check that the data from the previous phase was retained. | 227 | ** to check that the data from the previous phase was retained. |
228 | */ | 228 | */ |
229 | 229 | ||
230 | static int RIOScrub(int op, u8 *ram, int size) | 230 | static int RIOScrub(int op, u8 __iomem *ram, int size) |
231 | { | 231 | { |
232 | int off; | 232 | int off; |
233 | unsigned char oldbyte; | 233 | unsigned char oldbyte; |
@@ -393,7 +393,7 @@ struct rioVersion *RIOVersid(void) | |||
393 | return &stVersion; | 393 | return &stVersion; |
394 | } | 394 | } |
395 | 395 | ||
396 | void RIOHostReset(unsigned int Type, struct DpRam *DpRamP, unsigned int Slot) | 396 | void RIOHostReset(unsigned int Type, struct DpRam __iomem *DpRamP, unsigned int Slot) |
397 | { | 397 | { |
398 | /* | 398 | /* |
399 | ** Reset the Tpu | 399 | ** Reset the Tpu |
diff --git a/drivers/char/rio/riointr.c b/drivers/char/rio/riointr.c index 97f0fa550652..c05e84c6b0d3 100644 --- a/drivers/char/rio/riointr.c +++ b/drivers/char/rio/riointr.c | |||
@@ -102,7 +102,7 @@ void RIOTxEnable(char *en) | |||
102 | struct rio_info *p; | 102 | struct rio_info *p; |
103 | struct tty_struct *tty; | 103 | struct tty_struct *tty; |
104 | int c; | 104 | int c; |
105 | struct PKT *PacketP; | 105 | struct PKT __iomem *PacketP; |
106 | unsigned long flags; | 106 | unsigned long flags; |
107 | 107 | ||
108 | PortP = (struct Port *) en; | 108 | PortP = (struct Port *) en; |
@@ -144,7 +144,7 @@ void RIOTxEnable(char *en) | |||
144 | if (c == 0) | 144 | if (c == 0) |
145 | break; | 145 | break; |
146 | 146 | ||
147 | rio_memcpy_toio(PortP->HostP->Caddr, (caddr_t) PacketP->data, PortP->gs.xmit_buf + PortP->gs.xmit_tail, c); | 147 | rio_memcpy_toio(PortP->HostP->Caddr, PacketP->data, PortP->gs.xmit_buf + PortP->gs.xmit_tail, c); |
148 | /* udelay (1); */ | 148 | /* udelay (1); */ |
149 | 149 | ||
150 | writeb(c, &(PacketP->len)); | 150 | writeb(c, &(PacketP->len)); |
@@ -219,7 +219,7 @@ void RIOServiceHost(struct rio_info *p, struct Host *HostP, int From) | |||
219 | for (port = p->RIOFirstPortsBooted; port < p->RIOLastPortsBooted + PORTS_PER_RTA; port++) { | 219 | for (port = p->RIOFirstPortsBooted; port < p->RIOLastPortsBooted + PORTS_PER_RTA; port++) { |
220 | struct Port *PortP = p->RIOPortp[port]; | 220 | struct Port *PortP = p->RIOPortp[port]; |
221 | struct tty_struct *ttyP; | 221 | struct tty_struct *ttyP; |
222 | struct PKT *PacketP; | 222 | struct PKT __iomem *PacketP; |
223 | 223 | ||
224 | /* | 224 | /* |
225 | ** not mapped in - most of the RIOPortp[] information | 225 | ** not mapped in - most of the RIOPortp[] information |
@@ -298,7 +298,7 @@ void RIOServiceHost(struct rio_info *p, struct Host *HostP, int From) | |||
298 | for (port = p->RIOFirstPortsBooted; port < p->RIOLastPortsBooted + PORTS_PER_RTA; port++) { | 298 | for (port = p->RIOFirstPortsBooted; port < p->RIOLastPortsBooted + PORTS_PER_RTA; port++) { |
299 | struct Port *PortP = p->RIOPortp[port]; | 299 | struct Port *PortP = p->RIOPortp[port]; |
300 | struct tty_struct *ttyP; | 300 | struct tty_struct *ttyP; |
301 | struct PKT *PacketP; | 301 | struct PKT __iomem *PacketP; |
302 | 302 | ||
303 | /* | 303 | /* |
304 | ** not mapped in - most of the RIOPortp[] information | 304 | ** not mapped in - most of the RIOPortp[] information |
@@ -427,13 +427,13 @@ void RIOServiceHost(struct rio_info *p, struct Host *HostP, int From) | |||
427 | 427 | ||
428 | while (PortP->WflushFlag && can_add_transmit(&PacketP, PortP) && (PortP->InUse == NOT_INUSE)) { | 428 | while (PortP->WflushFlag && can_add_transmit(&PacketP, PortP) && (PortP->InUse == NOT_INUSE)) { |
429 | int p; | 429 | int p; |
430 | struct PktCmd *PktCmdP; | 430 | struct PktCmd __iomem *PktCmdP; |
431 | 431 | ||
432 | rio_dprintk(RIO_DEBUG_INTR, "Add WFLUSH marker to data queue\n"); | 432 | rio_dprintk(RIO_DEBUG_INTR, "Add WFLUSH marker to data queue\n"); |
433 | /* | 433 | /* |
434 | ** make it look just like a WFLUSH command | 434 | ** make it look just like a WFLUSH command |
435 | */ | 435 | */ |
436 | PktCmdP = (struct PktCmd *) &PacketP->data[0]; | 436 | PktCmdP = (struct PktCmd __iomem *) &PacketP->data[0]; |
437 | 437 | ||
438 | writeb(WFLUSH, &PktCmdP->Command); | 438 | writeb(WFLUSH, &PktCmdP->Command); |
439 | 439 | ||
@@ -525,9 +525,9 @@ static void RIOReceive(struct rio_info *p, struct Port *PortP) | |||
525 | { | 525 | { |
526 | struct tty_struct *TtyP; | 526 | struct tty_struct *TtyP; |
527 | unsigned short transCount; | 527 | unsigned short transCount; |
528 | struct PKT *PacketP; | 528 | struct PKT __iomem *PacketP; |
529 | register unsigned int DataCnt; | 529 | register unsigned int DataCnt; |
530 | unsigned char *ptr; | 530 | unsigned char __iomem *ptr; |
531 | unsigned char *buf; | 531 | unsigned char *buf; |
532 | int copied = 0; | 532 | int copied = 0; |
533 | 533 | ||
@@ -625,7 +625,7 @@ static void RIOReceive(struct rio_info *p, struct Port *PortP) | |||
625 | ** to '#define', (this is the only place ___DEBUG_IT___ occurs in the | 625 | ** to '#define', (this is the only place ___DEBUG_IT___ occurs in the |
626 | ** driver). | 626 | ** driver). |
627 | */ | 627 | */ |
628 | ptr = (unsigned char *) PacketP->data + PortP->RxDataStart; | 628 | ptr = (unsigned char __iomem *) PacketP->data + PortP->RxDataStart; |
629 | 629 | ||
630 | tty_prepare_flip_string(TtyP, &buf, transCount); | 630 | tty_prepare_flip_string(TtyP, &buf, transCount); |
631 | rio_memcpy_fromio(buf, ptr, transCount); | 631 | rio_memcpy_fromio(buf, ptr, transCount); |
diff --git a/drivers/char/rio/rioparam.c b/drivers/char/rio/rioparam.c index d2e8092cdb29..1066d9760704 100644 --- a/drivers/char/rio/rioparam.c +++ b/drivers/char/rio/rioparam.c | |||
@@ -154,8 +154,8 @@ int RIOParam(struct Port *PortP, int cmd, int Modem, int SleepFlag) | |||
154 | { | 154 | { |
155 | struct tty_struct *TtyP; | 155 | struct tty_struct *TtyP; |
156 | int retval; | 156 | int retval; |
157 | struct phb_param *phb_param_ptr; | 157 | struct phb_param __iomem *phb_param_ptr; |
158 | struct PKT *PacketP; | 158 | struct PKT __iomem *PacketP; |
159 | int res; | 159 | int res; |
160 | u8 Cor1 = 0, Cor2 = 0, Cor4 = 0, Cor5 = 0; | 160 | u8 Cor1 = 0, Cor2 = 0, Cor4 = 0, Cor5 = 0; |
161 | u8 TxXon = 0, TxXoff = 0, RxXon = 0, RxXoff = 0; | 161 | u8 TxXon = 0, TxXoff = 0, RxXon = 0, RxXoff = 0; |
@@ -235,7 +235,7 @@ int RIOParam(struct Port *PortP, int cmd, int Modem, int SleepFlag) | |||
235 | rio_dprintk(RIO_DEBUG_PARAM, "can_add_transmit() returns %x\n", res); | 235 | rio_dprintk(RIO_DEBUG_PARAM, "can_add_transmit() returns %x\n", res); |
236 | rio_dprintk(RIO_DEBUG_PARAM, "Packet is %p\n", PacketP); | 236 | rio_dprintk(RIO_DEBUG_PARAM, "Packet is %p\n", PacketP); |
237 | 237 | ||
238 | phb_param_ptr = (struct phb_param *) PacketP->data; | 238 | phb_param_ptr = (struct phb_param __iomem *) PacketP->data; |
239 | 239 | ||
240 | 240 | ||
241 | switch (TtyP->termios->c_cflag & CSIZE) { | 241 | switch (TtyP->termios->c_cflag & CSIZE) { |
@@ -580,11 +580,11 @@ int RIOParam(struct Port *PortP, int cmd, int Modem, int SleepFlag) | |||
580 | ** We can add another packet to a transmit queue if the packet pointer pointed | 580 | ** We can add another packet to a transmit queue if the packet pointer pointed |
581 | ** to by the TxAdd pointer has PKT_IN_USE clear in its address. | 581 | ** to by the TxAdd pointer has PKT_IN_USE clear in its address. |
582 | */ | 582 | */ |
583 | int can_add_transmit(struct PKT **PktP, struct Port *PortP) | 583 | int can_add_transmit(struct PKT __iomem **PktP, struct Port *PortP) |
584 | { | 584 | { |
585 | struct PKT *tp; | 585 | struct PKT __iomem *tp; |
586 | 586 | ||
587 | *PktP = tp = (struct PKT *) RIO_PTR(PortP->Caddr, readw(PortP->TxAdd)); | 587 | *PktP = tp = (struct PKT __iomem *) RIO_PTR(PortP->Caddr, readw(PortP->TxAdd)); |
588 | 588 | ||
589 | return !((unsigned long) tp & PKT_IN_USE); | 589 | return !((unsigned long) tp & PKT_IN_USE); |
590 | } | 590 | } |
@@ -608,9 +608,9 @@ void add_transmit(struct Port *PortP) | |||
608 | * Put a packet onto the end of the | 608 | * Put a packet onto the end of the |
609 | * free list | 609 | * free list |
610 | ****************************************/ | 610 | ****************************************/ |
611 | void put_free_end(struct Host *HostP, struct PKT *PktP) | 611 | void put_free_end(struct Host *HostP, struct PKT __iomem *PktP) |
612 | { | 612 | { |
613 | struct rio_free_list *tmp_pointer; | 613 | struct rio_free_list __iomem *tmp_pointer; |
614 | unsigned short old_end, new_end; | 614 | unsigned short old_end, new_end; |
615 | unsigned long flags; | 615 | unsigned long flags; |
616 | 616 | ||
@@ -625,15 +625,15 @@ void put_free_end(struct Host *HostP, struct PKT *PktP) | |||
625 | 625 | ||
626 | if ((old_end = readw(&HostP->ParmMapP->free_list_end)) != TPNULL) { | 626 | if ((old_end = readw(&HostP->ParmMapP->free_list_end)) != TPNULL) { |
627 | new_end = RIO_OFF(HostP->Caddr, PktP); | 627 | new_end = RIO_OFF(HostP->Caddr, PktP); |
628 | tmp_pointer = (struct rio_free_list *) RIO_PTR(HostP->Caddr, old_end); | 628 | tmp_pointer = (struct rio_free_list __iomem *) RIO_PTR(HostP->Caddr, old_end); |
629 | writew(new_end, &tmp_pointer->next); | 629 | writew(new_end, &tmp_pointer->next); |
630 | writew(old_end, &((struct rio_free_list *) PktP)->prev); | 630 | writew(old_end, &((struct rio_free_list __iomem *) PktP)->prev); |
631 | writew(TPNULL, &((struct rio_free_list *) PktP)->next); | 631 | writew(TPNULL, &((struct rio_free_list __iomem *) PktP)->next); |
632 | writew(new_end, &HostP->ParmMapP->free_list_end); | 632 | writew(new_end, &HostP->ParmMapP->free_list_end); |
633 | } else { /* First packet on the free list this should never happen! */ | 633 | } else { /* First packet on the free list this should never happen! */ |
634 | rio_dprintk(RIO_DEBUG_PFE, "put_free_end(): This should never happen\n"); | 634 | rio_dprintk(RIO_DEBUG_PFE, "put_free_end(): This should never happen\n"); |
635 | writew(RIO_OFF(HostP->Caddr, PktP), &HostP->ParmMapP->free_list_end); | 635 | writew(RIO_OFF(HostP->Caddr, PktP), &HostP->ParmMapP->free_list_end); |
636 | tmp_pointer = (struct rio_free_list *) PktP; | 636 | tmp_pointer = (struct rio_free_list __iomem *) PktP; |
637 | writew(TPNULL, &tmp_pointer->prev); | 637 | writew(TPNULL, &tmp_pointer->prev); |
638 | writew(TPNULL, &tmp_pointer->next); | 638 | writew(TPNULL, &tmp_pointer->next); |
639 | } | 639 | } |
@@ -647,10 +647,10 @@ void put_free_end(struct Host *HostP, struct PKT *PktP) | |||
647 | ** relevant packet, [having cleared the PKT_IN_USE bit]. If PKT_IN_USE is clear, | 647 | ** relevant packet, [having cleared the PKT_IN_USE bit]. If PKT_IN_USE is clear, |
648 | ** then can_remove_receive() returns 0. | 648 | ** then can_remove_receive() returns 0. |
649 | */ | 649 | */ |
650 | int can_remove_receive(struct PKT **PktP, struct Port *PortP) | 650 | int can_remove_receive(struct PKT __iomem **PktP, struct Port *PortP) |
651 | { | 651 | { |
652 | if (readw(PortP->RxRemove) & PKT_IN_USE) { | 652 | if (readw(PortP->RxRemove) & PKT_IN_USE) { |
653 | *PktP = (struct PKT *) RIO_PTR(PortP->Caddr, readw(PortP->RxRemove) & ~PKT_IN_USE); | 653 | *PktP = (struct PKT __iomem *) RIO_PTR(PortP->Caddr, readw(PortP->RxRemove) & ~PKT_IN_USE); |
654 | return 1; | 654 | return 1; |
655 | } | 655 | } |
656 | return 0; | 656 | return 0; |
diff --git a/drivers/char/rio/rioroute.c b/drivers/char/rio/rioroute.c index 357085337942..376d0e353dc4 100644 --- a/drivers/char/rio/rioroute.c +++ b/drivers/char/rio/rioroute.c | |||
@@ -86,9 +86,9 @@ static void RIOConCon(struct rio_info *, struct Host *, unsigned int, unsigned i | |||
86 | ** Incoming on the ROUTE_RUP | 86 | ** Incoming on the ROUTE_RUP |
87 | ** I wrote this while I was tired. Forgive me. | 87 | ** I wrote this while I was tired. Forgive me. |
88 | */ | 88 | */ |
89 | int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct PKT * PacketP) | 89 | int RIORouteRup(struct rio_info *p, unsigned int Rup, struct Host *HostP, struct PKT __iomem * PacketP) |
90 | { | 90 | { |
91 | struct PktCmd *PktCmdP = (struct PktCmd *) PacketP->data; | 91 | struct PktCmd __iomem *PktCmdP = (struct PktCmd __iomem *) PacketP->data; |
92 | struct PktCmd_M *PktReplyP; | 92 | struct PktCmd_M *PktReplyP; |
93 | struct CmdBlk *CmdBlkP; | 93 | struct CmdBlk *CmdBlkP; |
94 | struct Port *PortP; | 94 | struct Port *PortP; |
@@ -517,8 +517,8 @@ void RIOFixPhbs(struct rio_info *p, struct Host *HostP, unsigned int unit) | |||
517 | 517 | ||
518 | for (port = 0; port < PORTS_PER_RTA; port++, PortN++) { | 518 | for (port = 0; port < PORTS_PER_RTA; port++, PortN++) { |
519 | unsigned short dest_port = port + 8; | 519 | unsigned short dest_port = port + 8; |
520 | u16 *TxPktP; | 520 | u16 __iomem *TxPktP; |
521 | struct PKT *Pkt; | 521 | struct PKT __iomem *Pkt; |
522 | 522 | ||
523 | PortP = p->RIOPortp[PortN]; | 523 | PortP = p->RIOPortp[PortN]; |
524 | 524 | ||
@@ -555,12 +555,12 @@ void RIOFixPhbs(struct rio_info *p, struct Host *HostP, unsigned int unit) | |||
555 | ** card. This needs to be translated into a 32 bit pointer | 555 | ** card. This needs to be translated into a 32 bit pointer |
556 | ** so it can be accessed from the driver. | 556 | ** so it can be accessed from the driver. |
557 | */ | 557 | */ |
558 | Pkt = (struct PKT *) RIO_PTR(HostP->Caddr, readw(TxPktP)); | 558 | Pkt = (struct PKT __iomem *) RIO_PTR(HostP->Caddr, readw(TxPktP)); |
559 | 559 | ||
560 | /* | 560 | /* |
561 | ** If the packet is used, reset it. | 561 | ** If the packet is used, reset it. |
562 | */ | 562 | */ |
563 | Pkt = (struct PKT *) ((unsigned long) Pkt & ~PKT_IN_USE); | 563 | Pkt = (struct PKT __iomem *) ((unsigned long) Pkt & ~PKT_IN_USE); |
564 | writeb(dest_unit, &Pkt->dest_unit); | 564 | writeb(dest_unit, &Pkt->dest_unit); |
565 | writeb(dest_port, &Pkt->dest_port); | 565 | writeb(dest_port, &Pkt->dest_port); |
566 | } | 566 | } |
diff --git a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c index d3abe0d37d64..364119e975b4 100644 --- a/drivers/char/rio/riotable.c +++ b/drivers/char/rio/riotable.c | |||
@@ -534,8 +534,8 @@ int RIODeleteRta(struct rio_info *p, struct Map *MapP) | |||
534 | if (PortP->SecondBlock) { | 534 | if (PortP->SecondBlock) { |
535 | u16 dest_unit = HostMapP->ID; | 535 | u16 dest_unit = HostMapP->ID; |
536 | u16 dest_port = port - SysPort; | 536 | u16 dest_port = port - SysPort; |
537 | u16 *TxPktP; | 537 | u16 __iomem *TxPktP; |
538 | struct PKT *Pkt; | 538 | struct PKT __iomem *Pkt; |
539 | 539 | ||
540 | for (TxPktP = PortP->TxStart; TxPktP <= PortP->TxEnd; TxPktP++) { | 540 | for (TxPktP = PortP->TxStart; TxPktP <= PortP->TxEnd; TxPktP++) { |
541 | /* | 541 | /* |
@@ -545,7 +545,7 @@ int RIODeleteRta(struct rio_info *p, struct Map *MapP) | |||
545 | ** a 32 bit pointer so it can be | 545 | ** a 32 bit pointer so it can be |
546 | ** accessed from the driver. | 546 | ** accessed from the driver. |
547 | */ | 547 | */ |
548 | Pkt = (struct PKT *) RIO_PTR(HostP->Caddr, readw(&*TxPktP)); | 548 | Pkt = (struct PKT __iomem *) RIO_PTR(HostP->Caddr, readw(&*TxPktP)); |
549 | rio_dprintk(RIO_DEBUG_TABLE, "Tx packet (%x) destination: Old %x:%x New %x:%x\n", *TxPktP, Pkt->dest_unit, Pkt->dest_port, dest_unit, dest_port); | 549 | rio_dprintk(RIO_DEBUG_TABLE, "Tx packet (%x) destination: Old %x:%x New %x:%x\n", *TxPktP, Pkt->dest_unit, Pkt->dest_port, dest_unit, dest_port); |
550 | writew(dest_unit, &Pkt->dest_unit); | 550 | writew(dest_unit, &Pkt->dest_unit); |
551 | writew(dest_port, &Pkt->dest_port); | 551 | writew(dest_port, &Pkt->dest_port); |
@@ -781,13 +781,13 @@ int RIOReMapPorts(struct rio_info *p, struct Host *HostP, struct Map *HostMapP) | |||
781 | ** unless the host has been booted | 781 | ** unless the host has been booted |
782 | */ | 782 | */ |
783 | if ((HostP->Flags & RUN_STATE) == RC_RUNNING) { | 783 | if ((HostP->Flags & RUN_STATE) == RC_RUNNING) { |
784 | struct PHB *PhbP = PortP->PhbP = &HostP->PhbP[HostPort]; | 784 | struct PHB __iomem *PhbP = PortP->PhbP = &HostP->PhbP[HostPort]; |
785 | PortP->TxAdd = (u16 *) RIO_PTR(HostP->Caddr, readw(&PhbP->tx_add)); | 785 | PortP->TxAdd = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->tx_add)); |
786 | PortP->TxStart = (u16 *) RIO_PTR(HostP->Caddr, readw(&PhbP->tx_start)); | 786 | PortP->TxStart = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->tx_start)); |
787 | PortP->TxEnd = (u16 *) RIO_PTR(HostP->Caddr, readw(&PhbP->tx_end)); | 787 | PortP->TxEnd = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->tx_end)); |
788 | PortP->RxRemove = (u16 *) RIO_PTR(HostP->Caddr, readw(&PhbP->rx_remove)); | 788 | PortP->RxRemove = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->rx_remove)); |
789 | PortP->RxStart = (u16 *) RIO_PTR(HostP->Caddr, readw(&PhbP->rx_start)); | 789 | PortP->RxStart = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->rx_start)); |
790 | PortP->RxEnd = (u16 *) RIO_PTR(HostP->Caddr, readw(&PhbP->rx_end)); | 790 | PortP->RxEnd = (u16 __iomem *) RIO_PTR(HostP->Caddr, readw(&PhbP->rx_end)); |
791 | } else | 791 | } else |
792 | PortP->PhbP = NULL; | 792 | PortP->PhbP = NULL; |
793 | 793 | ||
diff --git a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c index 204267613c9c..a4f0b1e3e7fa 100644 --- a/drivers/char/rio/riotty.c +++ b/drivers/char/rio/riotty.c | |||
@@ -576,7 +576,7 @@ static void RIOClearUp(struct Port *PortP) | |||
576 | */ | 576 | */ |
577 | int RIOShortCommand(struct rio_info *p, struct Port *PortP, int command, int len, int arg) | 577 | int RIOShortCommand(struct rio_info *p, struct Port *PortP, int command, int len, int arg) |
578 | { | 578 | { |
579 | struct PKT *PacketP; | 579 | struct PKT __iomem *PacketP; |
580 | int retries = 20; /* at 10 per second -> 2 seconds */ | 580 | int retries = 20; /* at 10 per second -> 2 seconds */ |
581 | unsigned long flags; | 581 | unsigned long flags; |
582 | 582 | ||
diff --git a/drivers/char/rio/unixrup.h b/drivers/char/rio/unixrup.h index 4306e01dbf01..46bd532f7746 100644 --- a/drivers/char/rio/unixrup.h +++ b/drivers/char/rio/unixrup.h | |||
@@ -44,7 +44,7 @@ static char *_unixrup_h_sccs_ = "@(#)unixrup.h 1.2"; | |||
44 | struct UnixRup { | 44 | struct UnixRup { |
45 | struct CmdBlk *CmdsWaitingP; /* Commands waiting to be done */ | 45 | struct CmdBlk *CmdsWaitingP; /* Commands waiting to be done */ |
46 | struct CmdBlk *CmdPendingP; /* The command currently being sent */ | 46 | struct CmdBlk *CmdPendingP; /* The command currently being sent */ |
47 | struct RUP *RupP; /* the Rup to send it to */ | 47 | struct RUP __iomem *RupP; /* the Rup to send it to */ |
48 | unsigned int Id; /* Id number */ | 48 | unsigned int Id; /* Id number */ |
49 | unsigned int BaseSysPort; /* SysPort of first tty on this RTA */ | 49 | unsigned int BaseSysPort; /* SysPort of first tty on this RTA */ |
50 | unsigned int ModTypes; /* Modules on this RTA */ | 50 | unsigned int ModTypes; /* Modules on this RTA */ |