-3

drivers/net/ethernet/huawei/hinic3/hinic3_cmdq.c

reviewed

··· 878 878 } 879 879 880 880 hinic3_free_db_addr(hwdev, cmdqs->cmdqs_db_base); 881 881 - 882 881 err_destroy_cmdq_wq: 883 882 destroy_cmdq_wq(hwdev, cmdqs); 884 884 - 885 883 err_free_cmdqs: 886 884 dma_pool_destroy(cmdqs->cmd_buf_pool); 887 885 kfree(cmdqs); 888 888 - 889 886 err_out: 890 887 return err; 891 888 }

-1

drivers/net/ethernet/huawei/hinic3/hinic3_eqs.c

reviewed

··· 686 686 } 687 687 688 688 destroy_workqueue(aeqs->workq); 689 689 - 690 689 err_free_aeqs: 691 690 kfree(aeqs); 692 691

-5

drivers/net/ethernet/huawei/hinic3/hinic3_lld.c

reviewed

··· 230 230 iounmap(pci_adapter->mgmt_reg_base); 231 231 err_unmap_intr_reg_base: 232 232 iounmap(pci_adapter->intr_reg_base); 233 233 - 234 233 err_unmap_cfg_reg_base: 235 234 iounmap(pci_adapter->cfg_reg_base); 236 235 ··· 284 285 err_release_regions: 285 286 pci_clear_master(pdev); 286 287 pci_release_regions(pdev); 287 287 - 288 288 err_disable_device: 289 289 pci_disable_device(pdev); 290 290 - 291 290 err_free_pci_adapter: 292 291 pci_set_drvdata(pdev, NULL); 293 292 mutex_destroy(&pci_adapter->pdev_mutex); ··· 379 382 hinic3_func_uninit(pdev); 380 383 err_unmap_bar: 381 384 hinic3_unmapping_bar(pci_adapter); 382 382 - 383 385 err_out: 384 386 dev_err(&pdev->dev, "PCIe device probe function failed\n"); 385 387 ··· 411 415 412 416 err_uninit_pci: 413 417 hinic3_pci_uninit(pdev); 414 414 - 415 418 err_out: 416 419 dev_err(&pdev->dev, "PCIe device probe failed\n"); 417 420

-4

drivers/net/ethernet/huawei/hinic3/hinic3_main.c

reviewed

··· 104 104 105 105 err_free_rxqs: 106 106 hinic3_free_rxqs(netdev); 107 107 - 108 107 err_free_txqs: 109 108 hinic3_free_txqs(netdev); 110 109 ··· 474 475 disable_delayed_work_sync(&nic_dev->periodic_work); 475 476 hinic3_update_nic_feature(nic_dev, 0); 476 477 hinic3_set_nic_feature_to_hw(nic_dev); 477 477 - 478 478 err_uninit_sw: 479 479 hinic3_sw_uninit(netdev); 480 480 - 481 480 err_free_nic_io: 482 481 hinic3_free_nic_io(nic_dev); 483 482 err_free_nic_dev: 484 483 hinic3_free_nic_dev(nic_dev); 485 484 err_free_netdev: 486 485 free_netdev(netdev); 487 487 - 488 486 err_unregister_adev_event: 489 487 hinic3_adev_event_unregister(adev); 490 488 dev_err(&pdev->dev, "NIC service probe failed\n");

-2

drivers/net/ethernet/huawei/hinic3/hinic3_mbox.c

reviewed

··· 446 446 hinic3_uninit_func_mbox_msg_channel(hwdev); 447 447 err_uninit_mgmt_msg_ch: 448 448 uninit_mgmt_msg_channel(mbox); 449 449 - 450 449 err_destroy_workqueue: 451 450 destroy_workqueue(mbox->workq); 452 452 - 453 451 err_free_mbox: 454 452 kfree(mbox); 455 453

+4 -2

drivers/net/ethernet/huawei/hinic3/hinic3_nic_cfg.c

reviewed

··· 23 23 feature_nego.func_id = hinic3_global_func_id(hwdev); 24 24 feature_nego.opcode = opcode; 25 25 if (opcode == MGMT_MSG_CMD_OP_SET) 26 26 - memcpy(feature_nego.s_feature, s_feature, size * sizeof(u64)); 26 26 + memcpy(feature_nego.s_feature, s_feature, 27 27 + array_size(size, sizeof(u64))); 27 28 28 29 mgmt_msg_params_init_default(&msg_params, &feature_nego, 29 30 sizeof(feature_nego)); ··· 38 37 } 39 38 40 39 if (opcode == MGMT_MSG_CMD_OP_GET) 41 41 - memcpy(s_feature, feature_nego.s_feature, size * sizeof(u64)); 40 40 + memcpy(s_feature, feature_nego.s_feature, 41 41 + array_size(size, sizeof(u64))); 42 42 43 43 return 0; 44 44 }

+5 -1

drivers/net/ethernet/huawei/hinic3/hinic3_nic_io.c

reviewed

··· 162 162 #define SQ_CTXT_WQ_BLOCK_SET(val, member) \ 163 163 FIELD_PREP(SQ_CTXT_WQ_BLOCK_##member##_MASK, val) 164 164 165 165 + /* reuse SQ macro for RQ because the hardware format is identical */ 166 166 + #define RQ_CTXT_PREF_CI_HI(val) SQ_CTXT_PREF_CI_HI(val) 167 167 + 165 168 #define RQ_CTXT_PI_IDX_MASK GENMASK(15, 0) 166 169 #define RQ_CTXT_CI_IDX_MASK GENMASK(31, 16) 167 170 #define RQ_CTXT_CI_PI_SET(val, member) \ ··· 632 629 RQ_CTXT_PREF_SET(RQ_WQ_PREFETCH_THRESHOLD, CACHE_THRESHOLD)); 633 630 634 631 rq_ctxt->pref_ci_owner = 635 635 - cpu_to_le32(RQ_CTXT_PREF_SET(SQ_CTXT_PREF_CI_HI(ci_start), CI_HI) | 632 632 + cpu_to_le32(RQ_CTXT_PREF_SET(RQ_CTXT_PREF_CI_HI(ci_start), 633 633 + CI_HI) | 636 634 RQ_CTXT_PREF_SET(1, OWNER)); 637 635 638 636 rq_ctxt->pref_wq_pfn_hi_ci =

-7

drivers/net/ethernet/huawei/hinic3/hinic3_tx.c

reviewed

··· 44 44 int hinic3_alloc_txqs(struct net_device *netdev) 45 45 { 46 46 struct hinic3_nic_dev *nic_dev = netdev_priv(netdev); 47 47 - struct hinic3_hwdev *hwdev = nic_dev->hwdev; 48 47 u16 q_id, num_txqs = nic_dev->max_qps; 49 48 struct pci_dev *pdev = nic_dev->pdev; 50 49 struct hinic3_txq *txq; 51 51 - 52 52 - if (!num_txqs) { 53 53 - dev_err(hwdev->dev, "Cannot allocate zero size txqs\n"); 54 54 - return -EINVAL; 55 55 - } 56 50 57 51 nic_dev->txqs = kcalloc(num_txqs, sizeof(*nic_dev->txqs), GFP_KERNEL); 58 52 if (!nic_dev->txqs) ··· 603 609 604 610 err_drop_pkt: 605 611 dev_kfree_skb_any(skb); 606 606 - 607 612 err_out: 608 613 return NETDEV_TX_OK; 609 614 }