diff for duplicates of <11180976152959@foobar.com> diff --git a/a/1.txt b/N1/1.txt index 1ff9f0b..3420595 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -159,7 +159,7 @@ new file mode 100644 + +/** + * struct rio_mport - RIO master port info -+ * @dbells: List of doorbell events=20 ++ * @dbells: List of doorbell events + * @node: Node in global list of master ports + * @nnode: Node in network list of master ports + * @iores: I/O mem resource that this master port interface owns @@ -320,8 +320,7 @@ new file mode 100644 +/* Architecture and hardware-specific functions */ +extern int rio_init_mports(void); +extern void rio_register_mport(struct rio_mport *); -+extern int rio_hw_add_outb_message(struct rio_mport *, struct rio_dev *, i= -nt, ++extern int rio_hw_add_outb_message(struct rio_mport *, struct rio_dev *, int, + void *, size_t); +extern int rio_hw_add_inb_buffer(struct rio_mport *, int, void *); +extern void *rio_hw_get_inb_message(struct rio_mport *, int); @@ -393,12 +392,11 @@ new file mode 100644 + * @port: Master port + * @offset: Offset into local configuration space + * @data: Pointer to read data into -+ *=20 ++ * + * Reads 32 bits of data from the specified offset within the local + * device's configuration space. + */ -+static inline int rio_local_read_config_32(struct rio_mport *port, u32 off= -set, ++static inline int rio_local_read_config_32(struct rio_mport *port, u32 offset, + u32 * data) +{ + return __rio_local_read_config_32(port, offset, data); @@ -408,13 +406,12 @@ set, + * rio_local_write_config_32 - Write 32 bits to local configuration space + * @port: Master port + * @offset: Offset into local configuration space -+ * @data: Data to be written=20 -+ *=20 ++ * @data: Data to be written ++ * + * Writes 32 bits of data to the specified offset within the local + * device's configuration space. + */ -+static inline int rio_local_write_config_32(struct rio_mport *port, u32 of= -fset, ++static inline int rio_local_write_config_32(struct rio_mport *port, u32 offset, + u32 data) +{ + return __rio_local_write_config_32(port, offset, data); @@ -425,12 +422,11 @@ fset, + * @port: Master port + * @offset: Offset into local configuration space + * @data: Pointer to read data into -+ *=20 ++ * + * Reads 16 bits of data from the specified offset within the local + * device's configuration space. + */ -+static inline int rio_local_read_config_16(struct rio_mport *port, u32 off= -set, ++static inline int rio_local_read_config_16(struct rio_mport *port, u32 offset, + u16 * data) +{ + return __rio_local_read_config_16(port, offset, data); @@ -440,14 +436,13 @@ set, + * rio_local_write_config_16 - Write 16 bits to local configuration space + * @port: Master port + * @offset: Offset into local configuration space -+ * @data: Data to be written=20 -+ *=20 ++ * @data: Data to be written ++ * + * Writes 16 bits of data to the specified offset within the local + * device's configuration space. + */ + -+static inline int rio_local_write_config_16(struct rio_mport *port, u32 of= -fset, ++static inline int rio_local_write_config_16(struct rio_mport *port, u32 offset, + u16 data) +{ + return __rio_local_write_config_16(port, offset, data); @@ -458,12 +453,11 @@ fset, + * @port: Master port + * @offset: Offset into local configuration space + * @data: Pointer to read data into -+ *=20 ++ * + * Reads 8 bits of data from the specified offset within the local + * device's configuration space. + */ -+static inline int rio_local_read_config_8(struct rio_mport *port, u32 offs= -et, ++static inline int rio_local_read_config_8(struct rio_mport *port, u32 offset, + u8 * data) +{ + return __rio_local_read_config_8(port, offset, data); @@ -473,13 +467,12 @@ et, + * rio_local_write_config_8 - Write 8 bits to local configuration space + * @port: Master port + * @offset: Offset into local configuration space -+ * @data: Data to be written=20 -+ *=20 ++ * @data: Data to be written ++ * + * Writes 8 bits of data to the specified offset within the local + * device's configuration space. + */ -+static inline int rio_local_write_config_8(struct rio_mport *port, u32 off= -set, ++static inline int rio_local_write_config_8(struct rio_mport *port, u32 offset, + u8 data) +{ + return __rio_local_write_config_8(port, offset, data); @@ -490,19 +483,19 @@ set, + * @rdev: RIO device + * @offset: Offset into device configuration space + * @data: Pointer to read data into -+ *=20 ++ * + * Reads 32 bits of data from the specified offset within the + * RIO device's configuration space. + */ +static inline int rio_read_config_32(struct rio_dev *rdev, u32 offset, + u32 * data) +{ -+ u8 hopcount =3D 0xff; -+ u16 destid =3D rdev->destid; ++ u8 hopcount = 0xff; ++ u16 destid = rdev->destid; + + if (rdev->rswitch) { -+ destid =3D rdev->rswitch->destid; -+ hopcount =3D rdev->rswitch->hopcount; ++ destid = rdev->rswitch->destid; ++ hopcount = rdev->rswitch->hopcount; + } + + return rio_mport_read_config_32(rdev->net->hport, destid, hopcount, @@ -514,19 +507,19 @@ set, + * @rdev: RIO device + * @offset: Offset into device configuration space + * @data: Data to be written -+ *=20 ++ * + * Writes 32 bits of data to the specified offset within the + * RIO device's configuration space. + */ +static inline int rio_write_config_32(struct rio_dev *rdev, u32 offset, + u32 data) +{ -+ u8 hopcount =3D 0xff; -+ u16 destid =3D rdev->destid; ++ u8 hopcount = 0xff; ++ u16 destid = rdev->destid; + + if (rdev->rswitch) { -+ destid =3D rdev->rswitch->destid; -+ hopcount =3D rdev->rswitch->hopcount; ++ destid = rdev->rswitch->destid; ++ hopcount = rdev->rswitch->hopcount; + } + + return rio_mport_write_config_32(rdev->net->hport, destid, hopcount, @@ -538,19 +531,19 @@ set, + * @rdev: RIO device + * @offset: Offset into device configuration space + * @data: Pointer to read data into -+ *=20 ++ * + * Reads 16 bits of data from the specified offset within the + * RIO device's configuration space. + */ +static inline int rio_read_config_16(struct rio_dev *rdev, u32 offset, + u16 * data) +{ -+ u8 hopcount =3D 0xff; -+ u16 destid =3D rdev->destid; ++ u8 hopcount = 0xff; ++ u16 destid = rdev->destid; + + if (rdev->rswitch) { -+ destid =3D rdev->rswitch->destid; -+ hopcount =3D rdev->rswitch->hopcount; ++ destid = rdev->rswitch->destid; ++ hopcount = rdev->rswitch->hopcount; + } + + return rio_mport_read_config_16(rdev->net->hport, destid, hopcount, @@ -562,19 +555,19 @@ set, + * @rdev: RIO device + * @offset: Offset into device configuration space + * @data: Data to be written -+ *=20 ++ * + * Writes 16 bits of data to the specified offset within the + * RIO device's configuration space. + */ +static inline int rio_write_config_16(struct rio_dev *rdev, u32 offset, + u16 data) +{ -+ u8 hopcount =3D 0xff; -+ u16 destid =3D rdev->destid; ++ u8 hopcount = 0xff; ++ u16 destid = rdev->destid; + + if (rdev->rswitch) { -+ destid =3D rdev->rswitch->destid; -+ hopcount =3D rdev->rswitch->hopcount; ++ destid = rdev->rswitch->destid; ++ hopcount = rdev->rswitch->hopcount; + } + + return rio_mport_write_config_16(rdev->net->hport, destid, hopcount, @@ -586,19 +579,18 @@ set, + * @rdev: RIO device + * @offset: Offset into device configuration space + * @data: Pointer to read data into -+ *=20 ++ * + * Reads 8 bits of data from the specified offset within the + * RIO device's configuration space. + */ -+static inline int rio_read_config_8(struct rio_dev *rdev, u32 offset, u8 *= - data) ++static inline int rio_read_config_8(struct rio_dev *rdev, u32 offset, u8 * data) +{ -+ u8 hopcount =3D 0xff; -+ u16 destid =3D rdev->destid; ++ u8 hopcount = 0xff; ++ u16 destid = rdev->destid; + + if (rdev->rswitch) { -+ destid =3D rdev->rswitch->destid; -+ hopcount =3D rdev->rswitch->hopcount; ++ destid = rdev->rswitch->destid; ++ hopcount = rdev->rswitch->hopcount; + } + + return rio_mport_read_config_8(rdev->net->hport, destid, hopcount, @@ -610,19 +602,18 @@ set, + * @rdev: RIO device + * @offset: Offset into device configuration space + * @data: Data to be written -+ *=20 ++ * + * Writes 8 bits of data to the specified offset within the + * RIO device's configuration space. + */ -+static inline int rio_write_config_8(struct rio_dev *rdev, u32 offset, u8 = -data) ++static inline int rio_write_config_8(struct rio_dev *rdev, u32 offset, u8 data) +{ -+ u8 hopcount =3D 0xff; -+ u16 destid =3D rdev->destid; ++ u8 hopcount = 0xff; ++ u16 destid = rdev->destid; + + if (rdev->rswitch) { -+ destid =3D rdev->rswitch->destid; -+ hopcount =3D rdev->rswitch->hopcount; ++ destid = rdev->rswitch->destid; ++ hopcount = rdev->rswitch->hopcount; + } + + return rio_mport_write_config_8(rdev->net->hport, destid, hopcount, @@ -636,7 +627,7 @@ data) + * rio_send_doorbell - Send a doorbell message to a device + * @rdev: RIO device + * @data: Doorbell message data -+ *=20 ++ * + * Send a doorbell message to a RIO device. The doorbell message + * has a 16-bit info field provided by the @data argument. + */ @@ -655,13 +646,12 @@ data) + * for use as a mailbox resource. It initializes a range of + * mailboxes using the start and end arguments. + */ -+static inline void rio_init_mbox_res(struct resource *res, int start, int = -end) ++static inline void rio_init_mbox_res(struct resource *res, int start, int end) +{ + memset(res, 0, sizeof(struct resource)); -+ res->start =3D start; -+ res->end =3D end; -+ res->flags =3D RIO_RESOURCE_MAILBOX; ++ res->start = start; ++ res->end = end; ++ res->flags = RIO_RESOURCE_MAILBOX; +} + +/** @@ -674,13 +664,12 @@ end) + * for use as a doorbell resource. It initializes a range of + * doorbell messages using the start and end arguments. + */ -+static inline void rio_init_dbell_res(struct resource *res, u16 start, u16= - end) ++static inline void rio_init_dbell_res(struct resource *res, u16 start, u16 end) +{ + memset(res, 0, sizeof(struct resource)); -+ res->start =3D start; -+ res->end =3D end; -+ res->flags =3D RIO_RESOURCE_DOORBELL; ++ res->start = start; ++ res->end = end; ++ res->flags = RIO_RESOURCE_DOORBELL; +} + +/** @@ -693,8 +682,8 @@ end) + * will be set to %RIO_ANY_ID. + */ +#define RIO_DEVICE(dev,ven) \ -+ .did =3D (dev), .vid =3D (ven), \ -+ .asm_did =3D RIO_ANY_ID, .asm_vid =3D RIO_ANY_ID ++ .did = (dev), .vid = (ven), \ ++ .asm_did = RIO_ANY_ID, .asm_vid = RIO_ANY_ID + +/* Mailbox management */ +extern int rio_request_outb_mbox(struct rio_mport *, int, int, @@ -810,10 +799,8 @@ end) + +/* Misc driver helpers */ +extern u16 rio_local_get_device_id(struct rio_mport *port); -+extern struct rio_dev *rio_get_device(u16 vid, u16 did, struct rio_dev *fr= -om); -+extern struct rio_dev *rio_get_asm(u16 vid, u16 did, u16 asm_vid, u16 asm_= -did, ++extern struct rio_dev *rio_get_device(u16 vid, u16 did, struct rio_dev *from); ++extern struct rio_dev *rio_get_asm(u16 vid, u16 did, u16 asm_vid, u16 asm_did, + struct rio_dev *from); + +#endif /* __KERNEL__ */ @@ -900,10 +887,8 @@ new file mode 100644 +#define RIO_PEF_ADDR_34 0x00000001 /* [I] 34 bits */ + +#define RIO_SWP_INFO_CAR 0x14 /* [I] Switch Port Information CAR */ -+#define RIO_SWP_INFO_PORT_TOTAL_MASK 0x0000ff00 /* [I] Total number of po= -rts */ -+#define RIO_SWP_INFO_PORT_NUM_MASK 0x000000ff /* [I] Maintenance transact= -ion port number */ ++#define RIO_SWP_INFO_PORT_TOTAL_MASK 0x0000ff00 /* [I] Total number of ports */ ++#define RIO_SWP_INFO_PORT_NUM_MASK 0x000000ff /* [I] Maintenance transaction port number */ +#define RIO_GET_TOTAL_PORTS(x) ((x & RIO_SWP_INFO_PORT_TOTAL_MASK) >> 8) + +#define RIO_SRC_OPS_CAR 0x18 /* [I] Source Operations CAR */ @@ -1027,22 +1012,19 @@ ion port number */ +#define RIO_EFB_PAR_EP_REC_ID 0x0002 /* [IV] LP/LVDS EP Recovery Devices */ +#define RIO_EFB_PAR_EP_FREE_ID 0x0003 /* [IV] LP/LVDS EP Free Devices */ +#define RIO_EFB_SER_EP_ID 0x0004 /* [VI] LP/Serial EP Devices */ -+#define RIO_EFB_SER_EP_REC_ID 0x0005 /* [VI] LP/Serial EP Recovery Devices= - */ ++#define RIO_EFB_SER_EP_REC_ID 0x0005 /* [VI] LP/Serial EP Recovery Devices */ +#define RIO_EFB_SER_EP_FREE_ID 0x0006 /* [VI] LP/Serial EP Free Devices */ + +/* + * Physical 8/16 LP-LVDS -+ * ID=3D0x0001, Generic End Point Devices -+ * ID=3D0x0002, Generic End Point Devices, software assisted recovery opti= -on -+ * ID=3D0x0003, Generic End Point Free Devices ++ * ID=0x0001, Generic End Point Devices ++ * ID=0x0002, Generic End Point Devices, software assisted recovery option ++ * ID=0x0003, Generic End Point Free Devices + * + * Physical LP-Serial -+ * ID=3D0x0004, Generic End Point Devices -+ * ID=3D0x0005, Generic End Point Devices, software assisted recovery opti= -on -+ * ID=3D0x0006, Generic End Point Free Devices ++ * ID=0x0004, Generic End Point Devices ++ * ID=0x0005, Generic End Point Devices, software assisted recovery option ++ * ID=0x0006, Generic End Point Free Devices + */ +#define RIO_PORT_MNT_HEADER 0x0000 +#define RIO_PORT_REQ_CTL_CSR 0x0020 diff --git a/a/content_digest b/N1/content_digest index e06f2b6..c750946 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -168,7 +168,7 @@ "+\n" "+/**\n" "+ * struct rio_mport - RIO master port info\n" - "+ * @dbells: List of doorbell events=20\n" + "+ * @dbells: List of doorbell events \n" "+ * @node: Node in global list of master ports\n" "+ * @nnode: Node in network list of master ports\n" "+ * @iores: I/O mem resource that this master port interface owns\n" @@ -329,8 +329,7 @@ "+/* Architecture and hardware-specific functions */\n" "+extern int rio_init_mports(void);\n" "+extern void rio_register_mport(struct rio_mport *);\n" - "+extern int rio_hw_add_outb_message(struct rio_mport *, struct rio_dev *, i=\n" - "nt,\n" + "+extern int rio_hw_add_outb_message(struct rio_mport *, struct rio_dev *, int,\n" "+\t\t\t\t void *, size_t);\n" "+extern int rio_hw_add_inb_buffer(struct rio_mport *, int, void *);\n" "+extern void *rio_hw_get_inb_message(struct rio_mport *, int);\n" @@ -402,12 +401,11 @@ "+ * @port: Master port\n" "+ * @offset: Offset into local configuration space\n" "+ * @data: Pointer to read data into\n" - "+ *=20\n" + "+ * \n" "+ * Reads 32 bits of data from the specified offset within the local\n" "+ * device's configuration space.\n" "+ */\n" - "+static inline int rio_local_read_config_32(struct rio_mport *port, u32 off=\n" - "set,\n" + "+static inline int rio_local_read_config_32(struct rio_mport *port, u32 offset,\n" "+\t\t\t\t\t u32 * data)\n" "+{\n" "+\treturn __rio_local_read_config_32(port, offset, data);\n" @@ -417,13 +415,12 @@ "+ * rio_local_write_config_32 - Write 32 bits to local configuration space\n" "+ * @port: Master port\n" "+ * @offset: Offset into local configuration space\n" - "+ * @data: Data to be written=20\n" - "+ *=20\n" + "+ * @data: Data to be written \n" + "+ * \n" "+ * Writes 32 bits of data to the specified offset within the local\n" "+ * device's configuration space.\n" "+ */\n" - "+static inline int rio_local_write_config_32(struct rio_mport *port, u32 of=\n" - "fset,\n" + "+static inline int rio_local_write_config_32(struct rio_mport *port, u32 offset,\n" "+\t\t\t\t\t u32 data)\n" "+{\n" "+\treturn __rio_local_write_config_32(port, offset, data);\n" @@ -434,12 +431,11 @@ "+ * @port: Master port\n" "+ * @offset: Offset into local configuration space\n" "+ * @data: Pointer to read data into\n" - "+ *=20\n" + "+ * \n" "+ * Reads 16 bits of data from the specified offset within the local\n" "+ * device's configuration space.\n" "+ */\n" - "+static inline int rio_local_read_config_16(struct rio_mport *port, u32 off=\n" - "set,\n" + "+static inline int rio_local_read_config_16(struct rio_mport *port, u32 offset,\n" "+\t\t\t\t\t u16 * data)\n" "+{\n" "+\treturn __rio_local_read_config_16(port, offset, data);\n" @@ -449,14 +445,13 @@ "+ * rio_local_write_config_16 - Write 16 bits to local configuration space\n" "+ * @port: Master port\n" "+ * @offset: Offset into local configuration space\n" - "+ * @data: Data to be written=20\n" - "+ *=20\n" + "+ * @data: Data to be written \n" + "+ * \n" "+ * Writes 16 bits of data to the specified offset within the local\n" "+ * device's configuration space.\n" "+ */\n" "+\n" - "+static inline int rio_local_write_config_16(struct rio_mport *port, u32 of=\n" - "fset,\n" + "+static inline int rio_local_write_config_16(struct rio_mport *port, u32 offset,\n" "+\t\t\t\t\t u16 data)\n" "+{\n" "+\treturn __rio_local_write_config_16(port, offset, data);\n" @@ -467,12 +462,11 @@ "+ * @port: Master port\n" "+ * @offset: Offset into local configuration space\n" "+ * @data: Pointer to read data into\n" - "+ *=20\n" + "+ * \n" "+ * Reads 8 bits of data from the specified offset within the local\n" "+ * device's configuration space.\n" "+ */\n" - "+static inline int rio_local_read_config_8(struct rio_mport *port, u32 offs=\n" - "et,\n" + "+static inline int rio_local_read_config_8(struct rio_mport *port, u32 offset,\n" "+\t\t\t\t\t u8 * data)\n" "+{\n" "+\treturn __rio_local_read_config_8(port, offset, data);\n" @@ -482,13 +476,12 @@ "+ * rio_local_write_config_8 - Write 8 bits to local configuration space\n" "+ * @port: Master port\n" "+ * @offset: Offset into local configuration space\n" - "+ * @data: Data to be written=20\n" - "+ *=20\n" + "+ * @data: Data to be written \n" + "+ * \n" "+ * Writes 8 bits of data to the specified offset within the local\n" "+ * device's configuration space.\n" "+ */\n" - "+static inline int rio_local_write_config_8(struct rio_mport *port, u32 off=\n" - "set,\n" + "+static inline int rio_local_write_config_8(struct rio_mport *port, u32 offset,\n" "+\t\t\t\t\t u8 data)\n" "+{\n" "+\treturn __rio_local_write_config_8(port, offset, data);\n" @@ -499,19 +492,19 @@ "+ * @rdev: RIO device\n" "+ * @offset: Offset into device configuration space\n" "+ * @data: Pointer to read data into\n" - "+ *=20\n" + "+ * \n" "+ * Reads 32 bits of data from the specified offset within the\n" "+ * RIO device's configuration space.\n" "+ */\n" "+static inline int rio_read_config_32(struct rio_dev *rdev, u32 offset,\n" "+\t\t\t\t u32 * data)\n" "+{\n" - "+\tu8 hopcount =3D 0xff;\n" - "+\tu16 destid =3D rdev->destid;\n" + "+\tu8 hopcount = 0xff;\n" + "+\tu16 destid = rdev->destid;\n" "+\n" "+\tif (rdev->rswitch) {\n" - "+\t\tdestid =3D rdev->rswitch->destid;\n" - "+\t\thopcount =3D rdev->rswitch->hopcount;\n" + "+\t\tdestid = rdev->rswitch->destid;\n" + "+\t\thopcount = rdev->rswitch->hopcount;\n" "+\t}\n" "+\n" "+\treturn rio_mport_read_config_32(rdev->net->hport, destid, hopcount,\n" @@ -523,19 +516,19 @@ "+ * @rdev: RIO device\n" "+ * @offset: Offset into device configuration space\n" "+ * @data: Data to be written\n" - "+ *=20\n" + "+ * \n" "+ * Writes 32 bits of data to the specified offset within the\n" "+ * RIO device's configuration space.\n" "+ */\n" "+static inline int rio_write_config_32(struct rio_dev *rdev, u32 offset,\n" "+\t\t\t\t u32 data)\n" "+{\n" - "+\tu8 hopcount =3D 0xff;\n" - "+\tu16 destid =3D rdev->destid;\n" + "+\tu8 hopcount = 0xff;\n" + "+\tu16 destid = rdev->destid;\n" "+\n" "+\tif (rdev->rswitch) {\n" - "+\t\tdestid =3D rdev->rswitch->destid;\n" - "+\t\thopcount =3D rdev->rswitch->hopcount;\n" + "+\t\tdestid = rdev->rswitch->destid;\n" + "+\t\thopcount = rdev->rswitch->hopcount;\n" "+\t}\n" "+\n" "+\treturn rio_mport_write_config_32(rdev->net->hport, destid, hopcount,\n" @@ -547,19 +540,19 @@ "+ * @rdev: RIO device\n" "+ * @offset: Offset into device configuration space\n" "+ * @data: Pointer to read data into\n" - "+ *=20\n" + "+ * \n" "+ * Reads 16 bits of data from the specified offset within the\n" "+ * RIO device's configuration space.\n" "+ */\n" "+static inline int rio_read_config_16(struct rio_dev *rdev, u32 offset,\n" "+\t\t\t\t u16 * data)\n" "+{\n" - "+\tu8 hopcount =3D 0xff;\n" - "+\tu16 destid =3D rdev->destid;\n" + "+\tu8 hopcount = 0xff;\n" + "+\tu16 destid = rdev->destid;\n" "+\n" "+\tif (rdev->rswitch) {\n" - "+\t\tdestid =3D rdev->rswitch->destid;\n" - "+\t\thopcount =3D rdev->rswitch->hopcount;\n" + "+\t\tdestid = rdev->rswitch->destid;\n" + "+\t\thopcount = rdev->rswitch->hopcount;\n" "+\t}\n" "+\n" "+\treturn rio_mport_read_config_16(rdev->net->hport, destid, hopcount,\n" @@ -571,19 +564,19 @@ "+ * @rdev: RIO device\n" "+ * @offset: Offset into device configuration space\n" "+ * @data: Data to be written\n" - "+ *=20\n" + "+ * \n" "+ * Writes 16 bits of data to the specified offset within the\n" "+ * RIO device's configuration space.\n" "+ */\n" "+static inline int rio_write_config_16(struct rio_dev *rdev, u32 offset,\n" "+\t\t\t\t u16 data)\n" "+{\n" - "+\tu8 hopcount =3D 0xff;\n" - "+\tu16 destid =3D rdev->destid;\n" + "+\tu8 hopcount = 0xff;\n" + "+\tu16 destid = rdev->destid;\n" "+\n" "+\tif (rdev->rswitch) {\n" - "+\t\tdestid =3D rdev->rswitch->destid;\n" - "+\t\thopcount =3D rdev->rswitch->hopcount;\n" + "+\t\tdestid = rdev->rswitch->destid;\n" + "+\t\thopcount = rdev->rswitch->hopcount;\n" "+\t}\n" "+\n" "+\treturn rio_mport_write_config_16(rdev->net->hport, destid, hopcount,\n" @@ -595,19 +588,18 @@ "+ * @rdev: RIO device\n" "+ * @offset: Offset into device configuration space\n" "+ * @data: Pointer to read data into\n" - "+ *=20\n" + "+ * \n" "+ * Reads 8 bits of data from the specified offset within the\n" "+ * RIO device's configuration space.\n" "+ */\n" - "+static inline int rio_read_config_8(struct rio_dev *rdev, u32 offset, u8 *=\n" - " data)\n" + "+static inline int rio_read_config_8(struct rio_dev *rdev, u32 offset, u8 * data)\n" "+{\n" - "+\tu8 hopcount =3D 0xff;\n" - "+\tu16 destid =3D rdev->destid;\n" + "+\tu8 hopcount = 0xff;\n" + "+\tu16 destid = rdev->destid;\n" "+\n" "+\tif (rdev->rswitch) {\n" - "+\t\tdestid =3D rdev->rswitch->destid;\n" - "+\t\thopcount =3D rdev->rswitch->hopcount;\n" + "+\t\tdestid = rdev->rswitch->destid;\n" + "+\t\thopcount = rdev->rswitch->hopcount;\n" "+\t}\n" "+\n" "+\treturn rio_mport_read_config_8(rdev->net->hport, destid, hopcount,\n" @@ -619,19 +611,18 @@ "+ * @rdev: RIO device\n" "+ * @offset: Offset into device configuration space\n" "+ * @data: Data to be written\n" - "+ *=20\n" + "+ * \n" "+ * Writes 8 bits of data to the specified offset within the\n" "+ * RIO device's configuration space.\n" "+ */\n" - "+static inline int rio_write_config_8(struct rio_dev *rdev, u32 offset, u8 =\n" - "data)\n" + "+static inline int rio_write_config_8(struct rio_dev *rdev, u32 offset, u8 data)\n" "+{\n" - "+\tu8 hopcount =3D 0xff;\n" - "+\tu16 destid =3D rdev->destid;\n" + "+\tu8 hopcount = 0xff;\n" + "+\tu16 destid = rdev->destid;\n" "+\n" "+\tif (rdev->rswitch) {\n" - "+\t\tdestid =3D rdev->rswitch->destid;\n" - "+\t\thopcount =3D rdev->rswitch->hopcount;\n" + "+\t\tdestid = rdev->rswitch->destid;\n" + "+\t\thopcount = rdev->rswitch->hopcount;\n" "+\t}\n" "+\n" "+\treturn rio_mport_write_config_8(rdev->net->hport, destid, hopcount,\n" @@ -645,7 +636,7 @@ "+ * rio_send_doorbell - Send a doorbell message to a device\n" "+ * @rdev: RIO device\n" "+ * @data: Doorbell message data\n" - "+ *=20\n" + "+ * \n" "+ * Send a doorbell message to a RIO device. The doorbell message\n" "+ * has a 16-bit info field provided by the @data argument.\n" "+ */\n" @@ -664,13 +655,12 @@ "+ * for use as a mailbox resource. It initializes a range of\n" "+ * mailboxes using the start and end arguments.\n" "+ */\n" - "+static inline void rio_init_mbox_res(struct resource *res, int start, int =\n" - "end)\n" + "+static inline void rio_init_mbox_res(struct resource *res, int start, int end)\n" "+{\n" "+\tmemset(res, 0, sizeof(struct resource));\n" - "+\tres->start =3D start;\n" - "+\tres->end =3D end;\n" - "+\tres->flags =3D RIO_RESOURCE_MAILBOX;\n" + "+\tres->start = start;\n" + "+\tres->end = end;\n" + "+\tres->flags = RIO_RESOURCE_MAILBOX;\n" "+}\n" "+\n" "+/**\n" @@ -683,13 +673,12 @@ "+ * for use as a doorbell resource. It initializes a range of\n" "+ * doorbell messages using the start and end arguments.\n" "+ */\n" - "+static inline void rio_init_dbell_res(struct resource *res, u16 start, u16=\n" - " end)\n" + "+static inline void rio_init_dbell_res(struct resource *res, u16 start, u16 end)\n" "+{\n" "+\tmemset(res, 0, sizeof(struct resource));\n" - "+\tres->start =3D start;\n" - "+\tres->end =3D end;\n" - "+\tres->flags =3D RIO_RESOURCE_DOORBELL;\n" + "+\tres->start = start;\n" + "+\tres->end = end;\n" + "+\tres->flags = RIO_RESOURCE_DOORBELL;\n" "+}\n" "+\n" "+/**\n" @@ -702,8 +691,8 @@ "+ * will be set to %RIO_ANY_ID.\n" "+ */\n" "+#define RIO_DEVICE(dev,ven) \\\n" - "+\t.did =3D (dev), .vid =3D (ven), \\\n" - "+\t.asm_did =3D RIO_ANY_ID, .asm_vid =3D RIO_ANY_ID\n" + "+\t.did = (dev), .vid = (ven), \\\n" + "+\t.asm_did = RIO_ANY_ID, .asm_vid = RIO_ANY_ID\n" "+\n" "+/* Mailbox management */\n" "+extern int rio_request_outb_mbox(struct rio_mport *, int, int,\n" @@ -819,10 +808,8 @@ "+\n" "+/* Misc driver helpers */\n" "+extern u16 rio_local_get_device_id(struct rio_mport *port);\n" - "+extern struct rio_dev *rio_get_device(u16 vid, u16 did, struct rio_dev *fr=\n" - "om);\n" - "+extern struct rio_dev *rio_get_asm(u16 vid, u16 did, u16 asm_vid, u16 asm_=\n" - "did,\n" + "+extern struct rio_dev *rio_get_device(u16 vid, u16 did, struct rio_dev *from);\n" + "+extern struct rio_dev *rio_get_asm(u16 vid, u16 did, u16 asm_vid, u16 asm_did,\n" "+\t\t\t\t struct rio_dev *from);\n" "+\n" "+#endif\t\t\t\t/* __KERNEL__ */\n" @@ -909,10 +896,8 @@ "+#define RIO_PEF_ADDR_34\t\t0x00000001\t/* [I] 34 bits */\n" "+\n" "+#define RIO_SWP_INFO_CAR\t0x14\t/* [I] Switch Port Information CAR */\n" - "+#define RIO_SWP_INFO_PORT_TOTAL_MASK\t0x0000ff00\t/* [I] Total number of po=\n" - "rts */\n" - "+#define RIO_SWP_INFO_PORT_NUM_MASK\t0x000000ff\t/* [I] Maintenance transact=\n" - "ion port number */\n" + "+#define RIO_SWP_INFO_PORT_TOTAL_MASK\t0x0000ff00\t/* [I] Total number of ports */\n" + "+#define RIO_SWP_INFO_PORT_NUM_MASK\t0x000000ff\t/* [I] Maintenance transaction port number */\n" "+#define RIO_GET_TOTAL_PORTS(x)\t\t((x & RIO_SWP_INFO_PORT_TOTAL_MASK) >> 8)\n" "+\n" "+#define RIO_SRC_OPS_CAR\t\t0x18\t/* [I] Source Operations CAR */\n" @@ -1036,22 +1021,19 @@ "+#define RIO_EFB_PAR_EP_REC_ID\t0x0002\t/* [IV] LP/LVDS EP Recovery Devices */\n" "+#define RIO_EFB_PAR_EP_FREE_ID\t0x0003\t/* [IV] LP/LVDS EP Free Devices */\n" "+#define RIO_EFB_SER_EP_ID\t0x0004\t/* [VI] LP/Serial EP Devices */\n" - "+#define RIO_EFB_SER_EP_REC_ID\t0x0005\t/* [VI] LP/Serial EP Recovery Devices=\n" - " */\n" + "+#define RIO_EFB_SER_EP_REC_ID\t0x0005\t/* [VI] LP/Serial EP Recovery Devices */\n" "+#define RIO_EFB_SER_EP_FREE_ID\t0x0006\t/* [VI] LP/Serial EP Free Devices */\n" "+\n" "+/*\n" "+ * Physical 8/16 LP-LVDS\n" - "+ * ID=3D0x0001, Generic End Point Devices\n" - "+ * ID=3D0x0002, Generic End Point Devices, software assisted recovery opti=\n" - "on\n" - "+ * ID=3D0x0003, Generic End Point Free Devices\n" + "+ * ID=0x0001, Generic End Point Devices\n" + "+ * ID=0x0002, Generic End Point Devices, software assisted recovery option\n" + "+ * ID=0x0003, Generic End Point Free Devices\n" "+ *\n" "+ * Physical LP-Serial\n" - "+ * ID=3D0x0004, Generic End Point Devices\n" - "+ * ID=3D0x0005, Generic End Point Devices, software assisted recovery opti=\n" - "on\n" - "+ * ID=3D0x0006, Generic End Point Free Devices\n" + "+ * ID=0x0004, Generic End Point Devices\n" + "+ * ID=0x0005, Generic End Point Devices, software assisted recovery option\n" + "+ * ID=0x0006, Generic End Point Free Devices\n" "+ */\n" "+#define RIO_PORT_MNT_HEADER\t\t0x0000\n" "+#define RIO_PORT_REQ_CTL_CSR\t\t0x0020\n" @@ -1069,4 +1051,4 @@ "+\n" "+#endif\t\t\t\t/* LINUX_RIO_REGS_H */" -2d9a6c0396db085145440c95d36d4eabc3db3949074ae5ac60ad1d6a8f884c0e +926b7214cd8ab88f785e35e57f389d18f672be2f7109d9671ffe7f0f180d0512
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.