mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-19 13:11:14 +00:00
rapidio: modify for rev.3 specification changes
Implement changes made in RapidIO specification rev.3 to LP-Serial Physical Layer register definitions: - use per-port register offset calculations based on LP-Serial Extended Features Block (EFB) Register Map type (I or II) with different per-port offset step (0x20 vs 0x40 respectfully). - remove deprecated Parallel Physical layer definitions and related code. [alexandre.bounine@idt.com: fix DocBook warning for gen3 update] Link: http://lkml.kernel.org/r/1469191173-19338-1-git-send-email-alexandre.bounine@idt.com Link: http://lkml.kernel.org/r/1469125134-16523-12-git-send-email-alexandre.bounine@idt.com Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com> Tested-by: Barry Wood <barry.wood@idt.com> Cc: Matt Porter <mporter@kernel.crashing.org> Cc: Andre van Herk <andre.van.herk@prodrive-technologies.com> Cc: Barry Wood <barry.wood@idt.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
a057a52e94
commit
1ae842de1d
8 changed files with 249 additions and 191 deletions
|
@ -163,6 +163,7 @@ enum rio_device_state {
|
|||
* @dst_ops: Destination operation capabilities
|
||||
* @comp_tag: RIO component tag
|
||||
* @phys_efptr: RIO device extended features pointer
|
||||
* @phys_rmap: LP-Serial Register Map Type (1 or 2)
|
||||
* @em_efptr: RIO Error Management features pointer
|
||||
* @dma_mask: Mask of bits of RIO address this device implements
|
||||
* @driver: Driver claiming this device
|
||||
|
@ -193,6 +194,7 @@ struct rio_dev {
|
|||
u32 dst_ops;
|
||||
u32 comp_tag;
|
||||
u32 phys_efptr;
|
||||
u32 phys_rmap;
|
||||
u32 em_efptr;
|
||||
u64 dma_mask;
|
||||
struct rio_driver *driver; /* RIO driver claiming this device */
|
||||
|
@ -237,11 +239,6 @@ struct rio_dbell {
|
|||
void *dev_id;
|
||||
};
|
||||
|
||||
enum rio_phy_type {
|
||||
RIO_PHY_PARALLEL,
|
||||
RIO_PHY_SERIAL,
|
||||
};
|
||||
|
||||
/**
|
||||
* struct rio_mport - RIO master port info
|
||||
* @dbells: List of doorbell events
|
||||
|
@ -259,8 +256,8 @@ enum rio_phy_type {
|
|||
* @id: Port ID, unique among all ports
|
||||
* @index: Port index, unique among all port interfaces of the same type
|
||||
* @sys_size: RapidIO common transport system size
|
||||
* @phy_type: RapidIO phy type
|
||||
* @phys_efptr: RIO port extended features pointer
|
||||
* @phys_rmap: LP-Serial EFB Register Mapping type (1 or 2).
|
||||
* @name: Port name string
|
||||
* @dev: device structure associated with an mport
|
||||
* @priv: Master port private data
|
||||
|
@ -289,8 +286,8 @@ struct rio_mport {
|
|||
* 0 - Small size. 256 devices.
|
||||
* 1 - Large size, 65536 devices.
|
||||
*/
|
||||
enum rio_phy_type phy_type; /* RapidIO phy type */
|
||||
u32 phys_efptr;
|
||||
u32 phys_rmap;
|
||||
unsigned char name[RIO_MAX_MPORT_NAME];
|
||||
struct device dev;
|
||||
void *priv; /* Master port private data */
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue