Accepting request 751634 from home:NMoreyChaisemartin:branches:science:HPC

- Add Broadcom fixes (bsc#1157891)
  - bnxt_re-lib-Add-remaining-pci-ids-for-gen-P5-devices.patch
  - bnxt_re-lib-Recognize-additional-5750x-device-ID-s.patch

OBS-URL: https://build.opensuse.org/request/show/751634
OBS-URL: https://build.opensuse.org/package/show/science:HPC/rdma-core?expand=0&rev=120

bnxt_re-lib-Add-remaining-pci-ids-for-gen-P5-devices.patch

@@ -0,0 +1,32 @@
+commit 73d13d40ce6ccd62b9e2e3ea24d5cb702b2262db
+Author: Naresh Kumar PBS <nareshkumar.pbs@broadcom.com>
+Date:   Tue Nov 26 04:05:21 2019 -0500
+
+    bnxt_re/lib: Add remaining pci ids for gen P5 devices
+    
+    Making a change to add pci ids for VF and NPAR devices.
+    
+    Signed-off-by: Naresh Kumar PBS <nareshkumar.pbs@broadcom.com>
+    Signed-off-by: Devesh Sharma <devesh.sharma@broadcom.com>
+
+diff --git providers/bnxt_re/main.c providers/bnxt_re/main.c
+index b1194db78c18..e290a07bc502 100644
+--- providers/bnxt_re/main.c
++++ providers/bnxt_re/main.c
+@@ -76,9 +76,15 @@ static const struct verbs_match_ent cna_table[] = {
+ 	CNA(BROADCOM, 0x16F0),  /* BCM58730 */
+ 	CNA(BROADCOM, 0x16F1),  /* BCM57452 */
+ 	CNA(BROADCOM, 0x1750),	/* BCM57500 */
++	CNA(BROADCOM, 0x1751),	/* BCM57504 */
++	CNA(BROADCOM, 0x1752),	/* BCM57502 */
++	CNA(BROADCOM, 0x1803),	/* BCM57508 NPAR */
++	CNA(BROADCOM, 0x1804),	/* BCM57504 NPAR */
++	CNA(BROADCOM, 0x1805),	/* BCM57502 NPAR */
++	CNA(BROADCOM, 0x1807),	/* BCM5750x VF */
+ 	CNA(BROADCOM, 0xD800),  /* BCM880xx VF */
+ 	CNA(BROADCOM, 0xD802),  /* BCM58802 */
+-	CNA(BROADCOM, 0xD804),   /* BCM8804 SR */
++	CNA(BROADCOM, 0xD804),  /* BCM8804 SR */
+ 	{}
+ };
+ 

bnxt_re-lib-Recognize-additional-5750x-device-ID-s.patch

@@ -0,0 +1,54 @@
+commit 92ce9e33ee89f2c853b47e004a31bd1cebe010c2
+Author: Luke Starrett <luke.starrett@broadcom.com>
+Date:   Tue Nov 26 04:11:28 2019 -0500
+
+    bnxt_re/lib: Recognize additional 5750x device ID's
+    
+    BCM5750x family includes 57504 and 57502. Until recently the chip_num
+    register always conveyed 0x1750 (57508). Recent devices properly
+    reflect the SKU in the chip_num register. Update Phase5 checks to
+    reflect this.
+    
+    Signed-off-by: Luke Starrett <luke.starrett@broadcom.com>
+    Signed-off-by: Devesh Sharma <devesh.sharma@broadcom.com>
+
+diff --git providers/bnxt_re/main.c providers/bnxt_re/main.c
+index e290a07bc502..803eff79e73a 100644
+--- providers/bnxt_re/main.c
++++ providers/bnxt_re/main.c
+@@ -75,7 +75,7 @@ static const struct verbs_match_ent cna_table[] = {
+ 	CNA(BROADCOM, 0x16EF),  /* BCM57416 NPAR */
+ 	CNA(BROADCOM, 0x16F0),  /* BCM58730 */
+ 	CNA(BROADCOM, 0x16F1),  /* BCM57452 */
+-	CNA(BROADCOM, 0x1750),	/* BCM57500 */
++	CNA(BROADCOM, 0x1750),	/* BCM57508 */
+ 	CNA(BROADCOM, 0x1751),	/* BCM57504 */
+ 	CNA(BROADCOM, 0x1752),	/* BCM57502 */
+ 	CNA(BROADCOM, 0x1803),	/* BCM57508 NPAR */
+@@ -118,7 +118,9 @@ static const struct verbs_context_ops bnxt_re_cntx_ops = {
+ 
+ bool bnxt_re_is_chip_gen_p5(struct bnxt_re_chip_ctx *cctx)
+ {
+-	return cctx->chip_num == CHIP_NUM_57500;
++	return (cctx->chip_num == CHIP_NUM_57508 ||
++		cctx->chip_num == CHIP_NUM_57504 ||
++		cctx->chip_num == CHIP_NUM_57502);
+ }
+ 
+ /* Context Init functions */
+diff --git providers/bnxt_re/main.h providers/bnxt_re/main.h
+index be5734960475..368297e68b7a 100644
+--- providers/bnxt_re/main.h
++++ providers/bnxt_re/main.h
+@@ -56,7 +56,10 @@
+ 
+ #define BNXT_RE_UD_QP_HW_STALL	0x400000
+ 
+-#define CHIP_NUM_57500		0x1750
++#define CHIP_NUM_57508		0x1750
++#define CHIP_NUM_57504		0x1751
++#define CHIP_NUM_57502		0x1752
++
+ struct bnxt_re_chip_ctx {
+ 	__u16 chip_num;
+ 	__u8 chip_rev;

rdma-core.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Nov 28 09:16:33 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
+
+- Add Broadcom fixes (bsc#1157891)
+  - bnxt_re-lib-Add-remaining-pci-ids-for-gen-P5-devices.patch
+  - bnxt_re-lib-Recognize-additional-5750x-device-ID-s.patch
+
 -------------------------------------------------------------------
 Mon Nov 25 15:59:01 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
 

rdma-core.spec

@@ -59,6 +59,8 @@ Source1:        baselibs.conf
 Source2:        post_download.sh
 Source3:        prebuilt-pandoc.tgz
 Source4:        rdma-core-rpmlintrc
+Patch0:         bnxt_re-lib-Add-remaining-pci-ids-for-gen-P5-devices.patch
+Patch1:         bnxt_re-lib-Recognize-additional-5750x-device-ID-s.patch
 BuildRequires:  binutils
 BuildRequires:  cmake >= 2.8.11
 BuildRequires:  gcc
@@ -400,6 +402,8 @@ easy, object-oriented access to IB verbs.
 %setup -q -n  %{name}-%{version}%{git_ver}
 #Extract prebuilt pandoc file in the buildlib directory
 (cd buildlib && tar xf %{S:3})
+%patch0
+%patch1
 
 %build