Commit 077e9894 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird 

* 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/bird:
  [PATCH] missing readb/readw in rio
  [PATCH] copy_to_user() from iomem is a bad thing
  [PATCH] forgotten swap of copyout() arguments
  [PATCH] handling rio MEMDUMP
  [PATCH] fix rio_copy_to_card() for OLDPCI case
  [PATCH] uses of ->Copy() in rioroute are bogus
  [PATCH] bogus order of copy_from_user() arguments
  [PATCH] rio ->Copy() expects the sourse as first argument
  [PATCH] trivial annotations in rio
parents d9eaec9e 92af11cd

drivers/char/rio/daemon.h

+6 −6
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ struct Error { 
};



struct DownLoad {

	char *DataP;

	char __user *DataP;

	unsigned int Count;

	unsigned int ProductCode;

};
@@ -83,18 +83,18 @@ struct PortSetup { 
struct LpbReq {

	unsigned int Host;

	unsigned int Link;

	struct LPB *LpbP;

	struct LPB __user *LpbP;

};



struct RupReq {

	unsigned int HostNum;

	unsigned int RupNum;

	struct RUP *RupP;

	struct RUP __user *RupP;

};



struct PortReq {

	unsigned int SysPort;

	struct Port *PortP;

	struct Port __user *PortP;

};



struct StreamInfo {
@@ -105,12 +105,12 @@ struct StreamInfo { 


struct HostReq {

	unsigned int HostNum;

	struct Host *HostP;

	struct Host __user *HostP;

};



struct HostDpRam {

	unsigned int HostNum;

	struct DpRam *DpRamP;

	struct DpRam __user *DpRamP;

};



struct DebugCtrl {

drivers/char/rio/func.h

+13 −12
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ int RIOBootCodeRTA(struct rio_info *, struct DownLoad *); 
int RIOBootCodeHOST(struct rio_info *, struct DownLoad *);

int RIOBootCodeUNKNOWN(struct rio_info *, struct DownLoad *);

void msec_timeout(struct Host *);

int RIOBootRup(struct rio_info *, unsigned int, struct Host *, struct PKT *);

int RIOBootRup(struct rio_info *, unsigned int, struct Host *, struct PKT __iomem *);

int RIOBootOk(struct rio_info *, struct Host *, unsigned long);

int RIORtaBound(struct rio_info *, unsigned int);

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 *); 
int RIOFoadRta(struct Host *, struct Map *);

int RIOZombieRta(struct Host *, struct Map *);

int RIOCommandRta(struct rio_info *, unsigned long, int (*func) (struct Host *, struct Map *));

int RIOIdentifyRta(struct rio_info *, void *);

int RIOKillNeighbour(struct rio_info *, void *);

int RIOIdentifyRta(struct rio_info *, void __user *);

int RIOKillNeighbour(struct rio_info *, void __user *);

int RIOSuspendBootRta(struct Host *, int, int);

int RIOFoadWakeup(struct rio_info *);

struct CmdBlk *RIOGetCmdBlk(void);
@@ -68,7 +68,8 @@ int RIORFlushEnable(unsigned long, struct CmdBlk *); 
int RIOUnUse(unsigned long, struct CmdBlk *);



/* rioctrl.c */

int riocontrol(struct rio_info *, dev_t, int, caddr_t, int);

int riocontrol(struct rio_info *, dev_t, int, unsigned long, int);



int RIOPreemptiveCmd(struct rio_info *, struct Port *, unsigned char);



/* rioinit.c */
@@ -77,13 +78,13 @@ void RIOInitHosts(struct rio_info *, struct RioHostInfo *); 
void RIOISAinit(struct rio_info *, int);

int RIODoAT(struct rio_info *, int, int);

caddr_t RIOCheckForATCard(int);

int RIOAssignAT(struct rio_info *, int, caddr_t, int);

int RIOBoardTest(unsigned long, caddr_t, unsigned char, int);

int RIOAssignAT(struct rio_info *, int, void __iomem *, int);

int RIOBoardTest(unsigned long, void __iomem *, unsigned char, int);

void RIOAllocDataStructs(struct rio_info *);

void RIOSetupDataStructs(struct rio_info *);

int RIODefaultName(struct rio_info *, struct Host *, unsigned int);

struct rioVersion *RIOVersid(void);

void RIOHostReset(unsigned int, struct DpRam *, unsigned int);

void RIOHostReset(unsigned int, struct DpRam __iomem *, unsigned int);



/* riointr.c */

void RIOTxEnable(char *);
@@ -95,14 +96,14 @@ int RIOParam(struct Port *, int, int, int); 
int RIODelay(struct Port *PortP, int);

int RIODelay_ni(struct Port *PortP, int);

void ms_timeout(struct Port *);

int can_add_transmit(struct PKT **, struct Port *);

int can_add_transmit(struct PKT __iomem **, struct Port *);

void add_transmit(struct Port *);

void put_free_end(struct Host *, struct PKT *);

int can_remove_receive(struct PKT **, struct Port *);

void put_free_end(struct Host *, struct PKT __iomem *);

int can_remove_receive(struct PKT __iomem **, struct Port *);

void remove_receive(struct Port *);



/* rioroute.c */

int RIORouteRup(struct rio_info *, unsigned int, struct Host *, struct PKT *);

int RIORouteRup(struct rio_info *, unsigned int, struct Host *, struct PKT __iomem *);

void RIOFixPhbs(struct rio_info *, struct Host *, unsigned int);

unsigned int GetUnitType(unsigned int);

int RIOSetChange(struct rio_info *);
@@ -139,7 +140,7 @@ int rio_isr_thread(char *); 
struct rio_info *rio_info_store(int cmd, struct rio_info *p);

#endif



extern void rio_copy_to_card(void *to, void *from, int len);

extern void rio_copy_to_card(void *from, void __iomem *to, int len);

extern int rio_minor(struct tty_struct *tty);

extern int rio_ismodem(struct tty_struct *tty);

drivers/char/rio/host.h

+8 −8
Original line number Diff line number Diff line
@@ -48,8 +48,8 @@ struct Host { 
	unsigned char Ivec;		/* POLLED or ivec number */

	unsigned char Mode;		/* Control stuff */

	unsigned char Slot;		/* Slot */

	caddr_t Caddr;			/* KV address of DPRAM */

	struct DpRam *CardP;		/* KV address of DPRAM, with overlay */

	void  __iomem *Caddr;		/* KV address of DPRAM */

	struct DpRam __iomem *CardP;	/* KV address of DPRAM, with overlay */

	unsigned long PaddrP;		/* Phys. address of DPRAM */

	char Name[MAX_NAME_LEN];	/* The name of the host */

	unsigned int UniqueNum;		/* host unique number */
@@ -57,7 +57,7 @@ struct Host { 
	unsigned int WorkToBeDone;	/* set to true each interrupt */

	unsigned int InIntr;		/* Being serviced? */

	unsigned int IntSrvDone;	/* host's interrupt has been serviced */

	void (*Copy) (void *, void *, int);	/* copy func */

	void (*Copy) (void *, void __iomem *, int);	/* copy func */

	struct timer_list timer;

	/*

	 **               I M P O R T A N T !
@@ -83,11 +83,11 @@ struct Host { 


	struct Top Topology[LINKS_PER_UNIT];	/* one per link */

	struct Map Mapping[MAX_RUP];		/* Mappings for host */

	struct PHB *PhbP;			/* Pointer to the PHB array */

	unsigned short *PhbNumP;		/* Ptr to Number of PHB's */

	struct LPB *LinkStrP;			/* Link Structure Array */

	struct RUP *RupP;			/* Sixteen real rups here */

	struct PARM_MAP *ParmMapP;		/* points to the parmmap */

	struct PHB __iomem *PhbP;		/* Pointer to the PHB array */

	unsigned short __iomem *PhbNumP;	/* Ptr to Number of PHB's */

	struct LPB __iomem *LinkStrP;		/* Link Structure Array */

	struct RUP __iomem *RupP;		/* Sixteen real rups here */

	struct PARM_MAP __iomem *ParmMapP;	/* points to the parmmap */

	unsigned int ExtraUnits[MAX_EXTRA_UNITS];	/* unknown things */

	unsigned int NumExtraBooted;		/* how many of the above */

	/*

drivers/char/rio/port.h

+8 −8
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ struct Port { 
	struct gs_port gs;

	int PortNum;			/* RIO port no., 0-511 */

	struct Host *HostP;

	caddr_t Caddr;

	void __iomem *Caddr;

	unsigned short HostPort;	/* Port number on host card */

	unsigned char RupNum;		/* Number of RUP for port */

	unsigned char ID2;		/* Second ID of RTA for port */
@@ -92,13 +92,13 @@ struct Port { 
#define RIO_RTSFLOW	0x0400		/* RIO's own RTSFLOW flag */





	struct PHB *PhbP;		/* pointer to PHB for port */

	u16 *TxAdd;			/* Add packets here */

	u16 *TxStart;			/* Start of add array */

	u16 *TxEnd;			/* End of add array */

	u16 *RxRemove;			/* Remove packets here */

	u16 *RxStart;			/* Start of remove array */

	u16 *RxEnd;			/* End of remove array */

	struct PHB __iomem *PhbP;	/* pointer to PHB for port */

	u16 __iomem *TxAdd;		/* Add packets here */

	u16 __iomem *TxStart;		/* Start of add array */

	u16 __iomem *TxEnd;		/* End of add array */

	u16 __iomem *RxRemove;		/* Remove packets here */

	u16 __iomem *RxStart;		/* Start of remove array */

	u16 __iomem *RxEnd;		/* End of remove array */

	unsigned int RtaUniqueNum;	/* Unique number of RTA */

	unsigned short PortState;	/* status of port */

	unsigned short ModemState;	/* status of modem lines */

drivers/char/rio/rio.h

+2 −2
Original line number Diff line number Diff line
@@ -129,8 +129,8 @@ 
**	RIO_OBJ takes hostp->Caddr and a UNIX pointer to an object and

**	returns the offset into the DP RAM area.

*/

#define	RIO_PTR(C,O) (((unsigned char *)(C))+(0xFFFF&(O)))

#define	RIO_OFF(C,O) ((long)(O)-(long)(C))

#define	RIO_PTR(C,O) (((unsigned char __iomem *)(C))+(0xFFFF&(O)))

#define	RIO_OFF(C,O) ((unsigned char __iomem *)(O)-(unsigned char __iomem *)(C))



/*

**	How to convert from various different device number formats:

CRA Git | Maintained and supported by SUSTech CRA and CCSE