update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/infiniband/hw/ocrdma/ocrdma_stats.c
..
..
@@ -73,8 +73,8 @@
73
73
 	mem->size = max_t(u32, sizeof(struct ocrdma_rdma_stats_req),
74
74
 			sizeof(struct ocrdma_rdma_stats_resp));
75
75
 
76
-	mem->va = dma_zalloc_coherent(&dev->nic_info.pdev->dev, mem->size,
77
-				      &mem->pa, GFP_KERNEL);
76
+	mem->va = dma_alloc_coherent(&dev->nic_info.pdev->dev, mem->size,
77
+				     &mem->pa, GFP_KERNEL);
78
78
 	if (!mem->va) {
79
79
 		pr_err("%s: stats mbox allocation failed\n", __func__);
80
80
 		return false;
..
..
@@ -423,8 +423,8 @@
423
423
 	memset(stats, 0, (OCRDMA_MAX_DBGFS_MEM));
424
424
 
425
425
 	pcur = stats;
426
-	pcur += ocrdma_add_stat(stats, pcur, "nak_invalid_requst_errors",
427
-			(u64)rx_qp_err_stats->nak_invalid_requst_errors);
426
+	pcur += ocrdma_add_stat(stats, pcur, "nak_invalid_request_errors",
427
+			(u64)rx_qp_err_stats->nak_invalid_request_errors);
428
428
 	pcur += ocrdma_add_stat(stats, pcur, "nak_remote_operation_errors",
429
429
 			(u64)rx_qp_err_stats->nak_remote_operation_errors);
430
430
 	pcur += ocrdma_add_stat(stats, pcur, "nak_count_remote_access_errors",
..
..
@@ -670,12 +670,10 @@
670
670
 	return -EFAULT;
671
671
 }
672
672
 
673
-int ocrdma_pma_counters(struct ocrdma_dev *dev,
674
-			struct ib_mad *out_mad)
673
+void ocrdma_pma_counters(struct ocrdma_dev *dev, struct ib_mad *out_mad)
675
674
 {
676
675
 	struct ib_pma_portcounters *pma_cnt;
677
676
 
678
-	memset(out_mad->data, 0, sizeof out_mad->data);
679
677
 	pma_cnt = (void *)(out_mad->data + 40);
680
678
 	ocrdma_update_stats(dev);
681
679
 
..
..
@@ -683,7 +681,6 @@
683
681
 	pma_cnt->port_rcv_data     = cpu_to_be32(ocrdma_sysfs_rcv_data(dev));
684
682
 	pma_cnt->port_xmit_packets = cpu_to_be32(ocrdma_sysfs_xmit_pkts(dev));
685
683
 	pma_cnt->port_rcv_packets  = cpu_to_be32(ocrdma_sysfs_rcv_pkts(dev));
686
-	return 0;
687
684
 }
688
685
 
689
686
 static ssize_t ocrdma_dbgfs_ops_read(struct file *filp, char __user *buffer,
..
..
@@ -760,93 +757,72 @@
760
757
 
761
758
 void ocrdma_add_port_stats(struct ocrdma_dev *dev)
762
759
 {
760
+	const struct pci_dev *pdev = dev->nic_info.pdev;
761
+
763
762
 	if (!ocrdma_dbgfs_dir)
764
763
 		return;
765
764
 
766
765
 	/* Create post stats base dir */
767
-	dev->dir = debugfs_create_dir(dev->ibdev.name, ocrdma_dbgfs_dir);
768
-	if (!dev->dir)
769
-		goto err;
766
+	dev->dir = debugfs_create_dir(pci_name(pdev), ocrdma_dbgfs_dir);
770
767
 
771
768
 	dev->rsrc_stats.type = OCRDMA_RSRC_STATS;
772
769
 	dev->rsrc_stats.dev = dev;
773
-	if (!debugfs_create_file("resource_stats", S_IRUSR, dev->dir,
774
-				 &dev->rsrc_stats, &ocrdma_dbg_ops))
775
-		goto err;
770
+	debugfs_create_file("resource_stats", S_IRUSR, dev->dir,
771
+			    &dev->rsrc_stats, &ocrdma_dbg_ops);
776
772
 
777
773
 	dev->rx_stats.type = OCRDMA_RXSTATS;
778
774
 	dev->rx_stats.dev = dev;
779
-	if (!debugfs_create_file("rx_stats", S_IRUSR, dev->dir,
780
-				 &dev->rx_stats, &ocrdma_dbg_ops))
781
-		goto err;
775
+	debugfs_create_file("rx_stats", S_IRUSR, dev->dir, &dev->rx_stats,
776
+			    &ocrdma_dbg_ops);
782
777
 
783
778
 	dev->wqe_stats.type = OCRDMA_WQESTATS;
784
779
 	dev->wqe_stats.dev = dev;
785
-	if (!debugfs_create_file("wqe_stats", S_IRUSR, dev->dir,
786
-				 &dev->wqe_stats, &ocrdma_dbg_ops))
787
-		goto err;
780
+	debugfs_create_file("wqe_stats", S_IRUSR, dev->dir, &dev->wqe_stats,
781
+			    &ocrdma_dbg_ops);
788
782
 
789
783
 	dev->tx_stats.type = OCRDMA_TXSTATS;
790
784
 	dev->tx_stats.dev = dev;
791
-	if (!debugfs_create_file("tx_stats", S_IRUSR, dev->dir,
792
-				 &dev->tx_stats, &ocrdma_dbg_ops))
793
-		goto err;
785
+	debugfs_create_file("tx_stats", S_IRUSR, dev->dir, &dev->tx_stats,
786
+			    &ocrdma_dbg_ops);
794
787
 
795
788
 	dev->db_err_stats.type = OCRDMA_DB_ERRSTATS;
796
789
 	dev->db_err_stats.dev = dev;
797
-	if (!debugfs_create_file("db_err_stats", S_IRUSR, dev->dir,
798
-				 &dev->db_err_stats, &ocrdma_dbg_ops))
799
-		goto err;
800
-
790
+	debugfs_create_file("db_err_stats", S_IRUSR, dev->dir,
791
+			    &dev->db_err_stats, &ocrdma_dbg_ops);
801
792
 
802
793
 	dev->tx_qp_err_stats.type = OCRDMA_TXQP_ERRSTATS;
803
794
 	dev->tx_qp_err_stats.dev = dev;
804
-	if (!debugfs_create_file("tx_qp_err_stats", S_IRUSR, dev->dir,
805
-				 &dev->tx_qp_err_stats, &ocrdma_dbg_ops))
806
-		goto err;
795
+	debugfs_create_file("tx_qp_err_stats", S_IRUSR, dev->dir,
796
+			    &dev->tx_qp_err_stats, &ocrdma_dbg_ops);
807
797
 
808
798
 	dev->rx_qp_err_stats.type = OCRDMA_RXQP_ERRSTATS;
809
799
 	dev->rx_qp_err_stats.dev = dev;
810
-	if (!debugfs_create_file("rx_qp_err_stats", S_IRUSR, dev->dir,
811
-				 &dev->rx_qp_err_stats, &ocrdma_dbg_ops))
812
-		goto err;
813
-
800
+	debugfs_create_file("rx_qp_err_stats", S_IRUSR, dev->dir,
801
+			    &dev->rx_qp_err_stats, &ocrdma_dbg_ops);
814
802
 
815
803
 	dev->tx_dbg_stats.type = OCRDMA_TX_DBG_STATS;
816
804
 	dev->tx_dbg_stats.dev = dev;
817
-	if (!debugfs_create_file("tx_dbg_stats", S_IRUSR, dev->dir,
818
-				 &dev->tx_dbg_stats, &ocrdma_dbg_ops))
819
-		goto err;
805
+	debugfs_create_file("tx_dbg_stats", S_IRUSR, dev->dir,
806
+			    &dev->tx_dbg_stats, &ocrdma_dbg_ops);
820
807
 
821
808
 	dev->rx_dbg_stats.type = OCRDMA_RX_DBG_STATS;
822
809
 	dev->rx_dbg_stats.dev = dev;
823
-	if (!debugfs_create_file("rx_dbg_stats", S_IRUSR, dev->dir,
824
-				 &dev->rx_dbg_stats, &ocrdma_dbg_ops))
825
-		goto err;
810
+	debugfs_create_file("rx_dbg_stats", S_IRUSR, dev->dir,
811
+			    &dev->rx_dbg_stats, &ocrdma_dbg_ops);
826
812
 
827
813
 	dev->driver_stats.type = OCRDMA_DRV_STATS;
828
814
 	dev->driver_stats.dev = dev;
829
-	if (!debugfs_create_file("driver_dbg_stats", S_IRUSR, dev->dir,
830
-					&dev->driver_stats, &ocrdma_dbg_ops))
831
-		goto err;
815
+	debugfs_create_file("driver_dbg_stats", S_IRUSR, dev->dir,
816
+			    &dev->driver_stats, &ocrdma_dbg_ops);
832
817
 
833
818
 	dev->reset_stats.type = OCRDMA_RESET_STATS;
834
819
 	dev->reset_stats.dev = dev;
835
-	if (!debugfs_create_file("reset_stats", 0200, dev->dir,
836
-				&dev->reset_stats, &ocrdma_dbg_ops))
837
-		goto err;
838
-
839
-
840
-	return;
841
-err:
842
-	debugfs_remove_recursive(dev->dir);
843
-	dev->dir = NULL;
820
+	debugfs_create_file("reset_stats", 0200, dev->dir, &dev->reset_stats,
821
+			    &ocrdma_dbg_ops);
844
822
 }
845
823
 
846
824
 void ocrdma_rem_port_stats(struct ocrdma_dev *dev)
847
825
 {
848
-	if (!dev->dir)
849
-		return;
850
826
 	debugfs_remove_recursive(dev->dir);
851
827
 }
852
828