lkml.org 
[lkml]   [2008]   [Nov]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] IB/ehca: Fix suppression of port activation events
    Date
    A previous fix introduced a regression where port activation events were
    dropped unconditionally if port autodetection was not enabled. Fixed.

    Signed-off-by: Joachim Fenkes <fenkes@de.ibm.com>
    ---

    Roland -- this patch is made against your for-linus branch. Please review
    and apply if you think it's okay. Hope it's not too late for the next kernel.

    Joachim

    drivers/infiniband/hw/ehca/ehca_irq.c | 45 +++++++++++++++++++-------------
    1 files changed, 27 insertions(+), 18 deletions(-)

    diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
    index 9e43459..757035e 100644
    --- a/drivers/infiniband/hw/ehca/ehca_irq.c
    +++ b/drivers/infiniband/hw/ehca/ehca_irq.c
    @@ -359,34 +359,43 @@ static void notify_port_conf_change(struct ehca_shca *shca, int port_num)
    *old_attr = new_attr;
    }

    +/* replay modify_qp for sqps -- return 0 if all is well, 1 if AQP1 destroyed */
    +static int replay_modify_qp(struct ehca_sport *sport)
    +{
    + int aqp1_destroyed;
    + unsigned long flags;
    +
    + spin_lock_irqsave(&sport->mod_sqp_lock, flags);
    +
    + aqp1_destroyed = !sport->ibqp_sqp[IB_QPT_GSI];
    +
    + if (sport->ibqp_sqp[IB_QPT_SMI])
    + ehca_recover_sqp(sport->ibqp_sqp[IB_QPT_SMI]);
    + if (!aqp1_destroyed)
    + ehca_recover_sqp(sport->ibqp_sqp[IB_QPT_GSI]);
    +
    + spin_unlock_irqrestore(&sport->mod_sqp_lock, flags);
    +
    + return aqp1_destroyed;
    +}
    +
    static void parse_ec(struct ehca_shca *shca, u64 eqe)
    {
    u8 ec = EHCA_BMASK_GET(NEQE_EVENT_CODE, eqe);
    u8 port = EHCA_BMASK_GET(NEQE_PORT_NUMBER, eqe);
    u8 spec_event;
    struct ehca_sport *sport = &shca->sport[port - 1];
    - unsigned long flags;

    switch (ec) {
    case 0x30: /* port availability change */
    if (EHCA_BMASK_GET(NEQE_PORT_AVAILABILITY, eqe)) {
    - /* only for autodetect mode important */
    - if (ehca_nr_ports >= 0)
    - break;
    -
    - int suppress_event;
    - /* replay modify_qp for sqps */
    - spin_lock_irqsave(&sport->mod_sqp_lock, flags);
    - suppress_event = !sport->ibqp_sqp[IB_QPT_GSI];
    - if (sport->ibqp_sqp[IB_QPT_SMI])
    - ehca_recover_sqp(sport->ibqp_sqp[IB_QPT_SMI]);
    - if (!suppress_event)
    - ehca_recover_sqp(sport->ibqp_sqp[IB_QPT_GSI]);
    - spin_unlock_irqrestore(&sport->mod_sqp_lock, flags);
    -
    - /* AQP1 was destroyed, ignore this event */
    - if (suppress_event)
    - break;
    + /* only replay modify_qp calls in autodetect mode;
    + * if AQP1 was destroyed, the port is already down
    + * again and we can drop the event.
    + */
    + if (ehca_nr_ports < 0)
    + if (replay_modify_qp(sport))
    + break;

    sport->port_state = IB_PORT_ACTIVE;
    dispatch_port_event(shca, port, IB_EVENT_PORT_ACTIVE,
    --
    1.5.5





    \
     
     \ /
      Last update: 2008-11-07 17:45    [W:0.034 / U:60.208 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site