[ofa-general] [PATCH] osm_port.c: do not force max_op_vls = 0 to 1

[Hal Rosenstock]

On Tue, May 5, 2009 at 9:00 AM, Doron Shoham <dorons at voltaire.com> wrote:
> when setting max_op_vls = 0
> do not force it to 1.
> 0 is valid value which means "No change"
>
> Signed-off-by: Doron Shoham <dorons at voltaire.com>
> ---
>  opensm/opensm/osm_port.c   |    6 ------
>  opensm/opensm/osm_subnet.c |    8 ++++++++
>  2 files changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/opensm/opensm/osm_port.c b/opensm/opensm/osm_port.c
> index 2e6c642..db0c27e 100644
> --- a/opensm/opensm/osm_port.c
> +++ b/opensm/opensm/osm_port.c
> @@ -380,12 +380,6 @@ uint8_t osm_physp_calc_link_op_vls(IN osm_log_t * p_log,
>        if (op_vls > p_subn->opt.max_op_vls)
>                op_vls = p_subn->opt.max_op_vls;
>
> -       if (op_vls == 0) {
> -               OSM_LOG(p_log, OSM_LOG_DEBUG, "ERR 4102: "
> -                       "Invalid OP_VLS = 0. Forcing correction to 1 (VL0)\n");
> -               op_vls = 1;
> -       }
> -

Should that only be done when max_op_vls is 0 ?

Something like:
           if (op_vls > p_subn->opt.max_op_vls)
                op_vls = p_subn->opt.max_op_vls;
           else if (op_vls == 0) {
               OSM_LOG(p_log, OSM_LOG_DEBUG, "ERR 4102: "
                       "Invalid OP_VLS = 0. Forcing correction to 1 (VL0)\n");
               op_vls = 1;
          }

-- Hal

>        OSM_LOG_EXIT(p_log);
>        return op_vls;
>  }
> diff --git a/opensm/opensm/osm_subnet.c b/opensm/opensm/osm_subnet.c
> index ec15f8a..71fc7a0 100644
> --- a/opensm/opensm/osm_subnet.c
> +++ b/opensm/opensm/osm_subnet.c
> @@ -1288,6 +1288,14 @@ int osm_subn_output_conf(FILE *out, IN osm_subn_opt_t *const p_opts)
>                "# switch port connected to a CA or router port\n"
>                "leaf_head_of_queue_lifetime 0x%02x\n\n"
>                "# Limit the maximal operational VLs\n"
> +               "# Virtual Lanes operational on this port\n"
> +               "# Values are (IB Spec 1.2.1, 14.2.5.6 Table 146 \"PortInfo\")\n"
> +               "#    0: No change; valid only on Set()\n"
> +               "#    1: VL0\n"
> +               "#    2: VL0, VL1\n"
> +               "#    3: VL0 - VL3\n"
> +               "#    4: VL0 - VL7\n"
> +               "#    5: VL0 - VL14\n"
>                "max_op_vls %u\n\n"
>                "# Force PortInfo:LinkSpeedEnabled on switch ports\n"
>                "# If 0, don't modify PortInfo:LinkSpeedEnabled on switch port\n"
> --
> 1.5.4
>
> _______________________________________________
> general mailing list
> general at lists.openfabrics.org
> http://lists.openfabrics.org/cgi-bin/mailman/listinfo/general
>
> To unsubscribe, please visit http://openib.org/mailman/listinfo/openib-general
>