lkml.org 
[lkml]   [2010]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/9] RapidIO: Add relation links between RIO device structures
    Date
    Create back and forward links between RIO devices. These links are intended for
    use by error management and hot-plug extensions.

    Signed-off-by: Alexandre Bounine <alexandre.bounine@idt.com>
    Reviewed-by: Thomas Moll <thomas.moll@sysgo.com>
    Cc: Matt Porter <mporter@kernel.crashing.org>
    Cc: Li Yang <leoli@freescale.com>
    Cc: Kumar Gala <galak@kernel.crashing.org>
    ---
    drivers/rapidio/rio-scan.c | 55 +++++++++++++++++--------------------------
    include/linux/rio.h | 6 ++++
    2 files changed, 28 insertions(+), 33 deletions(-)

    diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c
    index efe3519..5dc33d1 100644
    --- a/drivers/rapidio/rio-scan.c
    +++ b/drivers/rapidio/rio-scan.c
    @@ -442,7 +442,10 @@ static struct rio_dev __devinit *rio_setup_device(struct rio_net *net,
    if (rio_is_switch(rdev)) {
    rio_mport_read_config_32(port, destid, hopcount,
    RIO_SWP_INFO_CAR, &swpinfo);
    - rswitch = kzalloc(sizeof(struct rio_switch), GFP_KERNEL);
    + rswitch = kzalloc(sizeof(*rswitch) +
    + RIO_GET_TOTAL_PORTS(swpinfo) *
    + sizeof(rswitch->nextdev[0]),
    + GFP_KERNEL);
    if (!rswitch)
    goto cleanup;
    rswitch->switchid = next_switchid;
    @@ -450,6 +453,7 @@ static struct rio_dev __devinit *rio_setup_device(struct rio_net *net,
    rswitch->destid = destid;
    rswitch->port_ok = 0;
    rswitch->inport = (u8)(swpinfo & RIO_SWP_INFO_PORT_NUM_MASK);
    + rswitch->nports = (u8)RIO_GET_TOTAL_PORTS(swpinfo);
    rswitch->route_table = kzalloc(sizeof(u8)*
    RIO_MAX_ROUTE_ENTRIES(port->sys_size),
    GFP_KERNEL);
    @@ -721,25 +725,6 @@ static u16 rio_get_host_deviceid_lock(struct rio_mport *port, u8 hopcount)
    }

    /**
    - * rio_get_swpinfo_tports- Gets total number of ports on the switch
    - * @mport: Master port to send transaction
    - * @destid: Destination ID associated with the switch
    - * @hopcount: Number of hops to the device
    - *
    - * Returns total numbers of ports implemented by the switch device.
    - */
    -static u8 rio_get_swpinfo_tports(struct rio_mport *mport, u16 destid,
    - u8 hopcount)
    -{
    - u32 result;
    -
    - rio_mport_read_config_32(mport, destid, hopcount, RIO_SWP_INFO_CAR,
    - &result);
    -
    - return RIO_GET_TOTAL_PORTS(result);
    -}
    -
    -/**
    * rio_net_add_mport- Add a master port to a RIO network
    * @net: RIO network
    * @port: Master port to add
    @@ -759,15 +744,16 @@ static void rio_net_add_mport(struct rio_net *net, struct rio_mport *port)
    * @net: RIO network being enumerated
    * @port: Master port to send transactions
    * @hopcount: Number of hops into the network
    + * @prev: Previous RIO device connected to the enumerated one
    + * @prev_port: Port on previous RIO device
    *
    * Recursively enumerates a RIO network. Transactions are sent via the
    * master port passed in @port.
    */
    static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,
    - u8 hopcount)
    + u8 hopcount, struct rio_dev *prev, int prev_port)
    {
    int port_num;
    - int num_ports;
    int cur_destid;
    int sw_destid;
    int sw_inport;
    @@ -812,6 +798,9 @@ static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,
    if (rdev) {
    /* Add device to the global and bus/net specific list. */
    list_add_tail(&rdev->net_list, &net->devices);
    + rdev->prev = prev;
    + if (prev && rio_is_switch(prev))
    + prev->rswitch->nextdev[prev_port] = rdev;
    } else
    return -1;

    @@ -830,14 +819,13 @@ static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,
    rdev->rswitch->route_table[destid] = sw_inport;
    }

    - num_ports =
    - rio_get_swpinfo_tports(port, RIO_ANY_DESTID(port->sys_size),
    - hopcount);
    pr_debug(
    "RIO: found %s (vid %4.4x did %4.4x) with %d ports\n",
    - rio_name(rdev), rdev->vid, rdev->did, num_ports);
    + rio_name(rdev), rdev->vid, rdev->did,
    + rdev->rswitch->nports);
    sw_destid = next_destid;
    - for (port_num = 0; port_num < num_ports; port_num++) {
    + for (port_num = 0;
    + port_num < rdev->rswitch->nports; port_num++) {
    /*Enable Input Output Port (transmitter reviever)*/
    rio_enable_rx_tx_port(port, 0,
    RIO_ANY_DESTID(port->sys_size),
    @@ -862,7 +850,8 @@ static int __devinit rio_enum_peer(struct rio_net *net, struct rio_mport *port,
    RIO_ANY_DESTID(port->sys_size),
    port_num, 0);

    - if (rio_enum_peer(net, port, hopcount + 1) < 0)
    + if (rio_enum_peer(net, port, hopcount + 1,
    + rdev, port_num) < 0)
    return -1;

    /* Update routing tables */
    @@ -949,7 +938,6 @@ rio_disc_peer(struct rio_net *net, struct rio_mport *port, u16 destid,
    u8 hopcount)
    {
    u8 port_num, route_port;
    - int num_ports;
    struct rio_dev *rdev;
    u16 ndestid;

    @@ -966,11 +954,12 @@ rio_disc_peer(struct rio_net *net, struct rio_mport *port, u16 destid,
    /* Associated destid is how we accessed this switch */
    rdev->rswitch->destid = destid;

    - num_ports = rio_get_swpinfo_tports(port, destid, hopcount);
    pr_debug(
    "RIO: found %s (vid %4.4x did %4.4x) with %d ports\n",
    - rio_name(rdev), rdev->vid, rdev->did, num_ports);
    - for (port_num = 0; port_num < num_ports; port_num++) {
    + rio_name(rdev), rdev->vid, rdev->did,
    + rdev->rswitch->nports);
    + for (port_num = 0;
    + port_num < rdev->rswitch->nports; port_num++) {
    if (rdev->rswitch->inport == port_num)
    continue;

    @@ -1163,7 +1152,7 @@ int __devinit rio_enum_mport(struct rio_mport *mport)
    /* Enable Input Output Port (transmitter reviever) */
    rio_enable_rx_tx_port(mport, 1, 0, 0, 0);

    - if (rio_enum_peer(net, mport, 0) < 0) {
    + if (rio_enum_peer(net, mport, 0, NULL, 0) < 0) {
    /* A higher priority host won enumeration, bail. */
    printk(KERN_INFO
    "RIO: master port %d device has lost enumeration to a remote host\n",
    diff --git a/include/linux/rio.h b/include/linux/rio.h
    index 718075a..754895c 100644
    --- a/include/linux/rio.h
    +++ b/include/linux/rio.h
    @@ -98,6 +98,7 @@ union rio_pw_msg;
    * @riores: RIO resources this device owns
    * @pwcback: port-write callback function for this device
    * @destid: Network destination ID
    + * @prev: Previous RIO device connected to the current one
    */
    struct rio_dev {
    struct list_head global_list; /* node in list of all RIO devices */
    @@ -123,6 +124,7 @@ struct rio_dev {
    struct resource riores[RIO_MAX_DEV_RESOURCES];
    int (*pwcback) (struct rio_dev *rdev, union rio_pw_msg *msg, int step);
    u16 destid;
    + struct rio_dev *prev;
    };

    #define rio_dev_g(n) list_entry(n, struct rio_dev, global_list)
    @@ -221,6 +223,7 @@ struct rio_net {
    * @hopcount: Hopcount to this switch
    * @destid: Associated destid in the path
    * @inport: Switch ingress port number
    + * @nports: Total number of ports in the switch
    * @route_table: Copy of switch routing table
    * @port_ok: Status of each port (one bit per port) - OK=1 or UNINIT=0
    * @add_entry: Callback for switch-specific route add function
    @@ -230,6 +233,7 @@ struct rio_net {
    * @get_domain: Callback for switch-specific domain get function
    * @em_init: Callback for switch-specific error management initialization function
    * @em_handle: Callback for switch-specific error management handler function
    + * @nextdev: Array of per-port pointers to the next attached device
    */
    struct rio_switch {
    struct list_head node;
    @@ -237,6 +241,7 @@ struct rio_switch {
    u16 hopcount;
    u16 destid;
    u8 inport;
    + u8 nports;
    u8 *route_table;
    u32 port_ok;
    int (*add_entry) (struct rio_mport * mport, u16 destid, u8 hopcount,
    @@ -251,6 +256,7 @@ struct rio_switch {
    u8 *sw_domain);
    int (*em_init) (struct rio_dev *dev);
    int (*em_handle) (struct rio_dev *dev, u8 swport);
    + struct rio_dev *nextdev[0];
    };

    /* Low-level architecture-dependent routines */
    --
    1.7.0.5


    \
     
     \ /
      Last update: 2010-08-13 17:23    [W:0.033 / U:0.352 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site