From patchwork Thu May 3 12:54:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Marciniszyn, Mike" X-Patchwork-Id: 10378127 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 670D6603B4 for ; Thu, 3 May 2018 12:54:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B38229022 for ; Thu, 3 May 2018 12:54:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4FB7129024; Thu, 3 May 2018 12:54:27 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E5E5229028 for ; Thu, 3 May 2018 12:54:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750944AbeECMyZ (ORCPT ); Thu, 3 May 2018 08:54:25 -0400 Received: from mga06.intel.com ([134.134.136.31]:6229 "EHLO mga06.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750849AbeECMyY (ORCPT ); Thu, 3 May 2018 08:54:24 -0400 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 03 May 2018 05:54:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,358,1520924400"; d="scan'208";a="38139208" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga007.jf.intel.com with ESMTP; 03 May 2018 05:54:23 -0700 Received: from fmsmsx120.amr.corp.intel.com ([169.254.15.21]) by FMSMSX108.amr.corp.intel.com ([169.254.9.51]) with mapi id 14.03.0319.002; Thu, 3 May 2018 05:54:23 -0700 From: "Marciniszyn, Mike" To: Doug Ledford , Jason Gunthorpe , "Dalessandro, Dennis" CC: "linux-rdma@vger.kernel.org" , "Hiatt, Don" , "stable@vger.kernel.org" , "Ruhl, Michael J" Subject: RE: [PATCH for-rc v2 1/6] IB/hfi1: Fix handling of FECN marked multicast packet Thread-Topic: [PATCH for-rc v2 1/6] IB/hfi1: Fix handling of FECN marked multicast packet Thread-Index: AQHT4UjuZr+jcI8m+kWMWD4d10D4jKQboMOA///LbHCAAMAYAIABy0xw Date: Thu, 3 May 2018 12:54:22 +0000 Message-ID: <32E1700B9017364D9B60AED9960492BC62829957@fmsmsx120.amr.corp.intel.com> References: <20180501123317.24520.8848.stgit@scvm10.sc.intel.com> <20180501123532.24520.80857.stgit@scvm10.sc.intel.com> <20180501180531.GB17027@ziepe.ca> <32E1700B9017364D9B60AED9960492BC6281B784@fmsmsx120.amr.corp.intel.com> <1525227892.11756.131.camel@redhat.com> In-Reply-To: <1525227892.11756.131.camel@redhat.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiN2YxMDhiYjMtZWIxNS00NDNiLTg2MjItMzY4YTAxYTFlZjQxIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE2LjUuOS4zIiwiVHJ1c3RlZExhYmVsSGFzaCI6Ik5Rcng3WXIyckdhUmNITTJJU1ppeE1aNGJBY2NXdCtSdGoxRmxWeTdjSTA9In0= dlp-product: dlpe-windows dlp-version: 11.0.200.100 dlp-reaction: no-action x-originating-ip: [10.1.200.106] MIME-Version: 1.0 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP > > > > 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 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));