[for-rc,v2,1/6] IB/hfi1: Fix handling of FECN marked multicast packet

Commit Message

Marciniszyn, Mike May 3, 2018, 12:54 p.m. UTC

> >

> > But I see Doug pulled the fix?

> 

> It's in my wip branch, so until I merge it into the official for-rc

> branch, I can still fix up minor things like this.

> 


The patch works without the cast.

How do you want to do this:
- A v2 -> v3 of the patch?
- Manually delete the cast in your wip branch?

Here is the diff hunk for removing the cast from return_cnp:

Mike

Comments

Doug Ledford May 3, 2018, 7:08 p.m. UTC | #1

On 5/3/2018 8:54 AM, Marciniszyn, Mike wrote:
>>>
>>> But I see Doug pulled the fix?
>>
>> It's in my wip branch, so until I merge it into the official for-rc
>> branch, I can still fix up minor things like this.
>>
> 
> The patch works without the cast.
> 
> How do you want to do this:
> - A v2 -> v3 of the patch?
> - Manually delete the cast in your wip branch?
> 
> Here is the diff hunk for removing the cast from return_cnp:
> diff --git a/drivers/infiniband/hw/hfi1/ud.c b/drivers/infiniband/hw/hfi1/ud.c
> index 9aa7d87..6ad203f 100644
> --- a/drivers/infiniband/hw/hfi1/ud.c
> +++ b/drivers/infiniband/hw/hfi1/ud.c
> @@ -719,7 +719,7 @@ void return_cnp(struct hfi1_ibport *ibp, struct rvt_qp *qp, u32 remote_qpn,
> 
>         lrh0 |= (sc5 & 0xf) << 12 | sl << 4;
> 
> -       bth0 = (u32)pkey | (IB_OPCODE_CNP << 24);
> +       bth0 = pkey | (IB_OPCODE_CNP << 24);
>         ohdr->bth[0] = cpu_to_be32(bth0);
> 
>         ohdr->bth[1] = cpu_to_be32(remote_qpn | (1 << IB_BECN_SHIFT));
> 
> Mike
> 

I'll manually delete it in my WIP.  Thanks for getting the test results
back :-)

Doug Ledford May 3, 2018, 7:25 p.m. UTC | #2

On Thu, 2018-05-03 at 15:08 -0400, Doug Ledford wrote:
> On 5/3/2018 8:54 AM, Marciniszyn, Mike wrote:
> > > > 
> > > > But I see Doug pulled the fix?
> > > 
> > > It's in my wip branch, so until I merge it into the official for-rc
> > > branch, I can still fix up minor things like this.
> > > 
> > 
> > The patch works without the cast.
> > 
> > How do you want to do this:
> > - A v2 -> v3 of the patch?
> > - Manually delete the cast in your wip branch?
> > 
> > Here is the diff hunk for removing the cast from return_cnp:
> > diff --git a/drivers/infiniband/hw/hfi1/ud.c b/drivers/infiniband/hw/hfi1/ud.c
> > index 9aa7d87..6ad203f 100644
> > --- a/drivers/infiniband/hw/hfi1/ud.c
> > +++ b/drivers/infiniband/hw/hfi1/ud.c
> > @@ -719,7 +719,7 @@ void return_cnp(struct hfi1_ibport *ibp, struct rvt_qp *qp, u32 remote_qpn,
> > 
> >         lrh0 |= (sc5 & 0xf) << 12 | sl << 4;
> > 
> > -       bth0 = (u32)pkey | (IB_OPCODE_CNP << 24);
> > +       bth0 = pkey | (IB_OPCODE_CNP << 24);
> >         ohdr->bth[0] = cpu_to_be32(bth0);
> > 
> >         ohdr->bth[1] = cpu_to_be32(remote_qpn | (1 << IB_BECN_SHIFT));
> > 
> > Mike
> > 
> 
> I'll manually delete it in my WIP.  Thanks for getting the test results
> back :-)
> 

Fixed in WIP, thanks.

Patch

diff --git a/drivers/infiniband/hw/hfi1/ud.c b/drivers/infiniband/hw/hfi1/ud.c
index 9aa7d87..6ad203f 100644
--- a/drivers/infiniband/hw/hfi1/ud.c
+++ b/drivers/infiniband/hw/hfi1/ud.c
@@ -719,7 +719,7 @@  void return_cnp(struct hfi1_ibport *ibp, struct rvt_qp *qp, u32 remote_qpn,

        lrh0 |= (sc5 & 0xf) << 12 | sl << 4;

-       bth0 = (u32)pkey | (IB_OPCODE_CNP << 24);
+       bth0 = pkey | (IB_OPCODE_CNP << 24);
        ohdr->bth[0] = cpu_to_be32(bth0);

        ohdr->bth[1] = cpu_to_be32(remote_qpn | (1 << IB_BECN_SHIFT));