Home Home > GIT Browse > openSUSE-15.1
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Bogendoerfer <tbogendoerfer@suse.de>2019-06-07 13:27:44 +0200
committerThomas Bogendoerfer <tbogendoerfer@suse.de>2019-06-07 13:30:17 +0200
commit21c24137590ff6a84b850b48eb2fd5522abb21d7 (patch)
tree0f5aee033c2a8fc3f65bec19327cda35e3f214fb
parent6912f9068e4f60da0b6a16b322407eebbcebf5f9 (diff)
RDMA/hns: Hide error print information with roce vf device
(bsc#1104427 FATE#326416 bsc#1137236).
-rw-r--r--patches.drivers/RDMA-hns-Hide-error-print-information-with-roce-vf-d.patch54
-rw-r--r--series.conf1
2 files changed, 55 insertions, 0 deletions
diff --git a/patches.drivers/RDMA-hns-Hide-error-print-information-with-roce-vf-d.patch b/patches.drivers/RDMA-hns-Hide-error-print-information-with-roce-vf-d.patch
new file mode 100644
index 0000000000..6460ca7056
--- /dev/null
+++ b/patches.drivers/RDMA-hns-Hide-error-print-information-with-roce-vf-d.patch
@@ -0,0 +1,54 @@
+From: Lijun Ou <oulijun@huawei.com>
+Date: Sat, 23 Feb 2019 20:01:25 +0800
+Subject: RDMA/hns: Hide error print information with roce vf device
+Patch-mainline: v5.2-rc1
+Git-commit: 07c2339a91c1ec3a8b8ada00361eced7b153ec0c
+References: bsc#1104427 FATE#326416 bsc#1137236
+
+The driver should not print the error information when the hip08 driver
+not support virtual function.
+
+Signed-off-by: Lijun Ou <oulijun@huawei.com>
+Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
+Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
+---
+ drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 12 +++++-------
+ 1 file changed, 5 insertions(+), 7 deletions(-)
+
+--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
++++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+@@ -6123,15 +6123,8 @@ static int hns_roce_hw_v2_get_cfg(struct
+ struct hnae3_handle *handle)
+ {
+ struct hns_roce_v2_priv *priv = hr_dev->priv;
+- const struct pci_device_id *id;
+ int i;
+
+- id = pci_match_id(hns_roce_hw_v2_pci_tbl, hr_dev->pci_dev);
+- if (!id) {
+- dev_err(hr_dev->dev, "device is not compatible!\n");
+- return -ENXIO;
+- }
+-
+ hr_dev->hw = &hns_roce_hw_v2;
+ hr_dev->sdb_offset = ROCEE_DB_SQ_L_0_REG;
+ hr_dev->odb_offset = hr_dev->sdb_offset;
+@@ -6219,6 +6212,7 @@ static void __hns_roce_hw_v2_uninit_inst
+ static int hns_roce_hw_v2_init_instance(struct hnae3_handle *handle)
+ {
+ const struct hnae3_ae_ops *ops = handle->ae_algo->ops;
++ const struct pci_device_id *id;
+ struct device *dev = &handle->pdev->dev;
+ int ret;
+
+@@ -6229,6 +6223,10 @@ static int hns_roce_hw_v2_init_instance(
+ goto reset_chk_err;
+ }
+
++ id = pci_match_id(hns_roce_hw_v2_pci_tbl, handle->pdev);
++ if (!id)
++ return 0;
++
+ ret = __hns_roce_hw_v2_init_instance(handle);
+ if (ret) {
+ handle->rinfo.instance_state = HNS_ROCE_STATE_NON_INIT;
diff --git a/series.conf b/series.conf
index 7b9c5f79ff..3e85cc37fe 100644
--- a/series.conf
+++ b/series.conf
@@ -46614,6 +46614,7 @@
patches.drivers/RDMA-hns-Only-assign-the-fields-of-the-rq-psn-if-IB_.patch
patches.drivers/RDMA-hns-Update-the-range-of-raq_psn-field-of-qp-con.patch
patches.drivers/RDMA-hns-Only-assgin-some-fields-if-the-relatived-at.patch
+ patches.drivers/RDMA-hns-Hide-error-print-information-with-roce-vf-d.patch
patches.drivers/RDMA-i40iw-Handle-workqueue-allocation-failure.patch
patches.fixes/overflow-Fix-Wtype-limits-compilation-warnings.patch
patches.drivers/IB-hfi1-Fix-two-format-strings.patch