update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/infiniband/hw/hns/hns_roce_main.c
..
..
@@ -511,8 +511,6 @@
511
511
 		(1ULL << IB_USER_VERBS_CMD_QUERY_QP) |
512
512
 		(1ULL << IB_USER_VERBS_CMD_DESTROY_QP);
513
513
 
514
-	ib_dev->uverbs_ex_cmd_mask |= (1ULL << IB_USER_VERBS_EX_CMD_MODIFY_CQ);
515
-
516
514
 	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_REREG_MR) {
517
515
 		ib_dev->uverbs_cmd_mask |= (1ULL << IB_USER_VERBS_CMD_REREG_MR);
518
516
 		ib_set_device_ops(ib_dev, &hns_roce_dev_mr_ops);
..
..
@@ -584,8 +582,8 @@
584
582
 
585
583
 static int hns_roce_init_hem(struct hns_roce_dev *hr_dev)
586
584
 {
587
-	int ret;
588
585
 	struct device *dev = hr_dev->dev;
586
+	int ret;
589
587
 
590
588
 	ret = hns_roce_init_hem_table(hr_dev, &hr_dev->mr_table.mtpt_table,
591
589
 				      HEM_TYPE_MTPT, hr_dev->caps.mtpt_entry_sz,
..
..
@@ -725,8 +723,8 @@
725
723
  */
726
724
 static int hns_roce_setup_hca(struct hns_roce_dev *hr_dev)
727
725
 {
728
-	int ret;
729
726
 	struct device *dev = hr_dev->dev;
727
+	int ret;
730
728
 
731
729
 	spin_lock_init(&hr_dev->sm_lock);
732
730
 	spin_lock_init(&hr_dev->bt_cmd_lock);
..
..
@@ -849,8 +847,8 @@
849
847
 
850
848
 int hns_roce_init(struct hns_roce_dev *hr_dev)
851
849
 {
852
-	int ret;
853
850
 	struct device *dev = hr_dev->dev;
851
+	int ret;
854
852
 
855
853
 	if (hr_dev->hw->reset) {
856
854
 		ret = hr_dev->hw->reset(hr_dev, true);