From: Ira Weiny <weiny2-i2BcT+NCU+M@public.gmane.org>
To: Hal Rosenstock <hal-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
Cc: "linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
<linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: Re: [PATCHv2] infiniband-diags: Fix cap_mask extended link speed supported endian checks
Date: Wed, 31 Aug 2011 19:04:46 -0700 [thread overview]
Message-ID: <20110831190446.2f650c99.weiny2@llnl.gov> (raw)
In-Reply-To: <4E5EE43B.9030805-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
On Wed, 31 Aug 2011 18:47:39 -0700
Hal Rosenstock <hal-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org> wrote:
>
> Similar to previous patch for ibnetdiscover.c
>
> Signed-off-by: Hal Rosenstock <hal-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
thanks applied,
Ira
> ---
> Changes since v1:
> Rebased to latest master
> Also, found one additional place in libibnetdisc/src/ibnetdisc.c
>
> diff --git a/libibnetdisc/src/ibnetdisc.c b/libibnetdisc/src/ibnetdisc.c
> index 60bd28d..86210eb 100644
> --- a/libibnetdisc/src/ibnetdisc.c
> +++ b/libibnetdisc/src/ibnetdisc.c
> @@ -184,7 +184,7 @@ static void debug_port(ib_portid_t * portid, ibnd_port_t * port)
> else
> info = (uint8_t *)&port->info;
> cap_mask = mad_get_field(info, 0, IB_PORT_CAPMASK_F);
> - if (cap_mask & IB_PORT_CAP_HAS_EXT_SPEEDS)
> + if (cap_mask & CL_NTOH32(IB_PORT_CAP_HAS_EXT_SPEEDS))
> espeed = mad_get_field(port->info, 0, IB_PORT_LINK_SPEED_EXT_ACTIVE_F);
> else
> espeed = 0;
> @@ -368,7 +368,7 @@ static int recv_port_info(smp_engine_t * engine, ibnd_smp_t * smp,
> else
> info = (uint8_t *)&port->info;
> cap_mask = mad_get_field(info, 0, IB_PORT_CAPMASK_F);
> - if (cap_mask & IB_PORT_CAP_HAS_EXT_SPEEDS)
> + if (cap_mask & CL_NTOH32(IB_PORT_CAP_HAS_EXT_SPEEDS))
> espeed = mad_get_field(port->info, 0, IB_PORT_LINK_SPEED_EXT_ACTIVE_F);
> else
> espeed = 0;
> diff --git a/src/ibdiag_common.c b/src/ibdiag_common.c
> index e6587af..049b72b 100644
> --- a/src/ibdiag_common.c
> +++ b/src/ibdiag_common.c
> @@ -620,8 +620,8 @@ void get_max_msg(char *width_msg, char *speed_msg, int msg_size, ibnd_port_t * p
> else
> info = (uint8_t *)&port->remoteport->info;
> rem_cap_mask = mad_get_field(info, 0, IB_PORT_CAPMASK_F);
> - if (cap_mask & IB_PORT_CAP_HAS_EXT_SPEEDS &&
> - rem_cap_mask & IB_PORT_CAP_HAS_EXT_SPEEDS)
> + if (cap_mask & CL_NTOH32(IB_PORT_CAP_HAS_EXT_SPEEDS) &&
> + rem_cap_mask & CL_NTOH32(IB_PORT_CAP_HAS_EXT_SPEEDS))
> goto check_ext_speed;
> check_fdr10_supp:
> fdr10 = (mad_get_field(port->ext_info, 0,
> diff --git a/src/iblinkinfo.c b/src/iblinkinfo.c
> index 673ed95..04e2376 100644
> --- a/src/iblinkinfo.c
> +++ b/src/iblinkinfo.c
> @@ -128,7 +128,7 @@ void print_port(ibnd_node_t * node, ibnd_port_t * port, char *out_prefix)
> else
> info = (uint8_t *)&port->info;
> cap_mask = mad_get_field(info, 0, IB_PORT_CAPMASK_F);
> - if (cap_mask & IB_PORT_CAP_HAS_EXT_SPEEDS)
> + if (cap_mask & CL_NTOH32(IB_PORT_CAP_HAS_EXT_SPEEDS))
> espeed = mad_get_field(port->info, 0,
> IB_PORT_LINK_SPEED_EXT_ACTIVE_F);
> else
> diff --git a/src/ibportstate.c b/src/ibportstate.c
> index 9077413..81d5b58 100644
> --- a/src/ibportstate.c
> +++ b/src/ibportstate.c
> @@ -147,7 +147,7 @@ static int get_port_info(ib_portid_t * dest, uint8_t * data, int portnum,
> if (!smp_query_via(data, dest, IB_ATTR_PORT_INFO, portnum, 0, srcport))
> IBERROR("smp query portinfo failed");
> cap_mask = mad_get_field(info, 0, IB_PORT_CAPMASK_F);
> - return (cap_mask & IB_PORT_CAP_HAS_EXT_SPEEDS);
> + return (cap_mask & CL_NTOH32(IB_PORT_CAP_HAS_EXT_SPEEDS));
> }
>
> static void show_port_info(ib_portid_t * dest, uint8_t * data, int portnum,
> diff --git a/src/ibqueryerrors.c b/src/ibqueryerrors.c
> index f225d3b..8e0b336 100644
> --- a/src/ibqueryerrors.c
> +++ b/src/ibqueryerrors.c
> @@ -186,7 +186,7 @@ static void print_port_config(char *node_name, ibnd_node_t * node, int portnum)
> else
> info = (uint8_t *)&port->info;
> cap_mask = mad_get_field(info, 0, IB_PORT_CAPMASK_F);
> - if (cap_mask & IB_PORT_CAP_HAS_EXT_SPEEDS)
> + if (cap_mask & CL_NTOH32(IB_PORT_CAP_HAS_EXT_SPEEDS))
> espeed = mad_get_field(port->info, 0,
> IB_PORT_LINK_SPEED_EXT_ACTIVE_F);
> else
--
Ira Weiny
Math Programmer/Computer Scientist
Lawrence Livermore National Lab
925-423-8008
weiny2-i2BcT+NCU+M@public.gmane.org
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
prev parent reply other threads:[~2011-09-01 2:04 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-01 1:47 [PATCHv2] infiniband-diags: Fix cap_mask extended link speed supported endian checks Hal Rosenstock
[not found] ` <4E5EE43B.9030805-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2011-09-01 2:04 ` Ira Weiny [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110831190446.2f650c99.weiny2@llnl.gov \
--to=weiny2-i2bct+ncu+m@public.gmane.org \
--cc=hal-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org \
--cc=linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox