Bohong Lin (2): net: hns3: cae clear warnings net: hns3: change version to 1.9.35.0
Colin Ian King (1): net: hns3: make array spec_opcode static const, makes object smaller
Gao Xun (1): RDMA/hns:security review update
Greg Kroah-Hartman (1): net: hns3: no need to check return value of debugfs_create functions
Guangbin Huang (21): net: hns3: delete blank lines and space for cleanup net: hns: modify print function used in hclge_init_ae_dev() net: hns: remove unnecessary newline net: hns3: optimize code of hclge_init_kdump_kernel_config() function net: hns3: optimize local variable of hclge_set_loopback() function net: hns3: optimize code of hns3_parse_vlan_tag() function net: hns: replace goto with return in function hclge_set_vf_uc_mac_addr net: hns3: modify print format in hns3_set_ringpa() net: hns3: replace goto with return in function hns3_set_ringparam() net: hns3: modify code of hclge_mac_phy_link_status_wait() function net: hns3: add error process in hclge_mac_link_status_wait() function net: hns3: support query vf ring and vector map relation net: hns3: modify error process of hclge_phy_link_status_wait() net: hns3: move struct hclge_mdio_cfg_cmd declaration net: hns3: rename variable flag in hnae3_unregister_client() net: hns3: modify return value in hns3_dbg_cmd_write net: hns: replace space with tab for cleanup net: hns3: delete unnecessary judgement in hns3_get_stats() net: hns3: optimize parameter of hclge_phy_link_status_wait() function net: hns3: optimize parameter of hclge_set_phy_loopback() function net: hns3: modify timing of reading register in hclge_reset_wait()
Guojia Liao (6): net: hns3: opmitize the table entry restore when resetting net: hns3: delete some useless function and definication net: hns3: delete some useless repeated printing net: hns3: fix bug that PF set VF mac didn't work net: hns3: do not schedule the periodical task when reset fail net: hns3: fix port base vlan add fail when concurrent with reset
Huazhong Tan (10): net: hns3: sync some code from net-next part1 net: hns3: split hclge_reset() into preparing and rebuilding part net: hns3: split hclgevf_reset() into preparing and rebuilding part net: hns3: refactor the precedure of PF FLR net: hns3: enlarge HCLGE_RESET_WAIT_CNT net: hns3: modify hclge_func_reset_sync_vf()'s return type to void net: hns3: refactor the procedure of VF FLR net: hns3: refactor the notification scheme of PF reset net: hns3: modify the location of updating the hardware reset done counter net: hns3: set VF's default reset_type to HNAE3_NONE_RESET
Jian Shen (5): net: hns3: refine mac address configure for PF net: hns3: use mutex vport_lock intead of spin lock umv_lock net: hns3: refine mac address configure for VF net: hns3: refactor the promisc mode setting net: hns3: skip mac speed and duplex modification checking for fibre port support autoneg
Junxin Chen (5): net: fix bug and change version to 1.9.33.0 net: hns3: add protect for parameters and remove unused functions net: hns3: fix bug when parameter check net: hns3: fix compile error when CONFIG_HNS3_DCB is not set net: hns3: clear devil number for hns3_cae
Shengzui You (2): net: hns3: update hns3 version to 1.9.35.1 net: hns3: Remove the function of vf check mac address
Yonglong Liu (4): net: hns3: modify the irq name of tqp vectors net: hns3: modify the irq name of misc vectors net: hns3: add enabled tc numbers and dwrr weight info in debugfs net: hns3: fix missing help info for qs shaper in debugfs
Yu'an Wang (12): hac: sec: add initial configuration in sec_engine_init acc: Remove uacce mode 1 logic below hisilicon uacce: Remove uacce mode 1 relatives qm: fix wrong number of sg elements after dma map zip: use offset fields in sqe to avoid SG_SPLIT qm: remove invalid addr print hpre: optimize key process before free hpre: add likely and unlikey in result judgement sec: change sec_control reg config rde: optimize debug regs clear logic qm: fixup compilation dependency qm: fix the way judge whether q stop in user space
Yufeng Mo (1): net: hns3: support of dump mac id and loopback status in debugfs
Zhao Weibo (6): RDMA/hns:remove useless header in cmd RDMA/hns: handle device err after device state to UNIT RDMA/hns: avoid potential overflow of RDMA/hns: Add roce dfx of arm_cnt RDMA/hns: fix the bug of out-of-bonds-read in post send RDMA/hns: some robust optimize in rdfx
fengsheng (2): drivers : sysctl remove rcu_lock drivers : sysctl fixup some param dont check the legitimacy
gaoxun (1): net: hns3: cae security review
liuzhongzhu (1): net: hns3: Add "mac table" information query function
zhuweijia (1): net: hns3: cae io_param definition updated
drivers/crypto/hisilicon/Kconfig | 1 - drivers/crypto/hisilicon/hpre/hpre_crypto.c | 96 +- drivers/crypto/hisilicon/hpre/hpre_main.c | 64 +- drivers/crypto/hisilicon/qm.c | 513 +++---- drivers/crypto/hisilicon/qm.h | 1 - drivers/crypto/hisilicon/rde/rde_main.c | 217 ++- drivers/crypto/hisilicon/sec2/sec_main.c | 54 +- drivers/crypto/hisilicon/sgl.c | 29 +- drivers/crypto/hisilicon/zip/zip_crypto.c | 102 +- drivers/crypto/hisilicon/zip/zip_main.c | 50 +- drivers/infiniband/hw/hns/Makefile | 9 +- drivers/infiniband/hw/hns/hns_roce_cmd.c | 1 - drivers/infiniband/hw/hns/hns_roce_device.h | 4 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 53 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 2 +- drivers/infiniband/hw/hns/hns_roce_main.c | 10 +- drivers/infiniband/hw/hns/hns_roce_mr.c | 14 +- .../hw/hns/roce-customer/hns_hw_v2_test.c | 61 - .../hw/hns/roce-customer/hns_hw_v2_test.h | 10 - .../hw/hns/roce-customer/hns_roce_test.c | 18 - .../hw/hns/roce-customer/hns_roce_test.h | 8 - .../infiniband/hw/hns/roce-customer/rdfx_common.h | 2 +- .../infiniband/hw/hns/roce-customer/rdfx_entry.c | 8 +- .../infiniband/hw/hns/roce-customer/rdfx_hw_v2.c | 16 +- .../infiniband/hw/hns/roce-customer/rdfx_intf.c | 7 +- .../infiniband/hw/hns/roce-customer/rdfx_main.c | 22 +- .../infiniband/hw/hns/roce-customer/rdfx_sysfs.c | 39 +- drivers/net/ethernet/hisilicon/hns3/Makefile | 27 +- drivers/net/ethernet/hisilicon/hns3/hclge_mbx.h | 6 + drivers/net/ethernet/hisilicon/hns3/hnae3.c | 6 +- drivers/net/ethernet/hisilicon/hns3/hnae3.h | 26 +- .../hisilicon/hns3/hns-customer/hns3_ext.c | 603 --------- .../hisilicon/hns3/hns-customer/hns3_ext.h | 102 -- .../hisilicon/hns3/hns-customer/hns3pf/hclge_ext.c | 996 -------------- .../hisilicon/hns3/hns-customer/hns3pf/hclge_ext.h | 142 -- .../hns3/hns-customer/hns3pf/hclge_main_it.c | 20 +- .../hns3/hns-customer/hns3pf/hclge_main_it.h | 2 - .../hisilicon/hns3/hns3_cae/hns3_cae_checksum.c | 19 +- .../hisilicon/hns3/hns3_cae/hns3_cae_checksum.h | 5 +- .../hisilicon/hns3/hns3_cae/hns3_cae_cmd.c | 4 +- .../hisilicon/hns3/hns3_cae/hns3_cae_common.c | 116 -- .../hisilicon/hns3/hns3_cae/hns3_cae_common.h | 25 - .../hisilicon/hns3/hns3_cae/hns3_cae_dcb.c | 62 +- .../hisilicon/hns3/hns3_cae/hns3_cae_dcb.h | 36 +- .../hisilicon/hns3/hns3_cae/hns3_cae_dcqcn.c | 17 +- .../hisilicon/hns3/hns3_cae/hns3_cae_dcqcn.h | 7 +- .../hisilicon/hns3/hns3_cae/hns3_cae_dfx.c | 40 +- .../hisilicon/hns3/hns3_cae/hns3_cae_dfx.h | 9 +- .../hisilicon/hns3/hns3_cae/hns3_cae_ext.c | 426 ------ .../hisilicon/hns3/hns3_cae/hns3_cae_ext.h | 68 - .../ethernet/hisilicon/hns3/hns3_cae/hns3_cae_fd.c | 56 +- .../ethernet/hisilicon/hns3/hns3_cae/hns3_cae_fd.h | 5 +- .../hisilicon/hns3/hns3_cae/hns3_cae_gro.c | 24 +- .../hisilicon/hns3/hns3_cae/hns3_cae_gro.h | 7 +- .../hns3/hns3_cae/hns3_cae_hilink_param.c | 16 +- .../hns3/hns3_cae/hns3_cae_hilink_param.h | 2 +- .../hisilicon/hns3/hns3_cae/hns3_cae_init.c | 35 +- .../hisilicon/hns3/hns3_cae/hns3_cae_irq.c | 16 +- .../hisilicon/hns3/hns3_cae/hns3_cae_irq.h | 5 +- .../hisilicon/hns3/hns3_cae/hns3_cae_lamp.c | 35 - .../hisilicon/hns3/hns3_cae/hns3_cae_lamp.h | 36 - .../hisilicon/hns3/hns3_cae/hns3_cae_led.c | 8 +- .../hisilicon/hns3/hns3_cae/hns3_cae_led.h | 5 +- .../hisilicon/hns3/hns3_cae/hns3_cae_lib.c | 71 +- .../hisilicon/hns3/hns3_cae/hns3_cae_lib.h | 7 +- .../hisilicon/hns3/hns3_cae/hns3_cae_mac.c | 20 +- .../hisilicon/hns3/hns3_cae/hns3_cae_mac.h | 2 +- .../hisilicon/hns3/hns3_cae/hns3_cae_mactbl.c | 63 - .../hisilicon/hns3/hns3_cae/hns3_cae_mactbl.h | 30 - .../hisilicon/hns3/hns3_cae/hns3_cae_pfc_storm.c | 45 +- .../hisilicon/hns3/hns3_cae/hns3_cae_pfc_storm.h | 5 +- .../hisilicon/hns3/hns3_cae/hns3_cae_pkt.c | 741 ---------- .../hisilicon/hns3/hns3_cae/hns3_cae_pkt.h | 67 - .../hisilicon/hns3/hns3_cae/hns3_cae_port.c | 22 +- .../hisilicon/hns3/hns3_cae/hns3_cae_port.h | 2 +- .../hisilicon/hns3/hns3_cae/hns3_cae_promisc.c | 40 +- .../hisilicon/hns3/hns3_cae/hns3_cae_promisc.h | 2 +- .../hisilicon/hns3/hns3_cae/hns3_cae_qinfo.c | 43 +- .../hisilicon/hns3/hns3_cae/hns3_cae_qinfo.h | 10 +- .../hisilicon/hns3/hns3_cae/hns3_cae_qos.c | 138 +- .../hisilicon/hns3/hns3_cae/hns3_cae_qos.h | 19 +- .../hisilicon/hns3/hns3_cae/hns3_cae_qres.c | 35 +- .../hisilicon/hns3/hns3_cae/hns3_cae_qres.h | 2 +- .../hisilicon/hns3/hns3_cae/hns3_cae_reset.c | 27 +- .../hisilicon/hns3/hns3_cae/hns3_cae_reset.h | 7 +- .../hisilicon/hns3/hns3_cae/hns3_cae_rss.c | 47 +- .../hisilicon/hns3/hns3_cae/hns3_cae_rss.h | 2 +- .../hisilicon/hns3/hns3_cae/hns3_cae_stat.c | 48 +- .../hisilicon/hns3/hns3_cae/hns3_cae_stat.h | 4 +- .../ethernet/hisilicon/hns3/hns3_cae/hns3_cae_tm.c | 235 ++-- .../ethernet/hisilicon/hns3/hns3_cae/hns3_cae_tm.h | 24 +- .../hisilicon/hns3/hns3_cae/hns3_cae_version.c | 34 +- .../hisilicon/hns3/hns3_cae/hns3_cae_version.h | 9 +- .../hisilicon/hns3/hns3_cae/hns3_cae_vlan.c | 20 +- .../hisilicon/hns3/hns3_cae/hns3_cae_vlan.h | 2 +- .../hisilicon/hns3/hns3_cae/hns3_cae_xsfp.c | 28 +- .../hisilicon/hns3/hns3_cae/hns3_cae_xsfp.h | 4 +- drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 24 +- drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 243 +--- drivers/net/ethernet/hisilicon/hns3/hns3_enet.h | 12 +- drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 14 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h | 2 + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 240 +++- .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h | 17 + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 2 +- .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 1424 ++++++++++++++------ .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 58 +- .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 226 +++- .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.c | 11 + .../ethernet/hisilicon/hns3/hns3pf/hclge_mdio.h | 11 - .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_cmd.c | 2 +- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 474 +++++-- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h | 32 +- drivers/soc/hisilicon/sysctl/sysctl_drv.c | 2 +- drivers/soc/hisilicon/sysctl/sysctl_local_ras.c | 31 +- drivers/uacce/dummy_drv/dummy_wd_dev.c | 1 - drivers/uacce/dummy_drv/dummy_wd_v2.c | 1 - drivers/uacce/uacce.c | 512 +------ include/linux/uacce.h | 10 +- include/uapi/linux/uacce.h | 6 +- 121 files changed, 3192 insertions(+), 6445 deletions(-) delete mode 100644 drivers/infiniband/hw/hns/roce-customer/hns_hw_v2_test.c delete mode 100644 drivers/infiniband/hw/hns/roce-customer/hns_hw_v2_test.h delete mode 100644 drivers/infiniband/hw/hns/roce-customer/hns_roce_test.c delete mode 100644 drivers/infiniband/hw/hns/roce-customer/hns_roce_test.h delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3_ext.c delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3_ext.h delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_ext.c delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns-customer/hns3pf/hclge_ext.h delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_common.c delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_common.h delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_ext.c delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_ext.h delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_lamp.c delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_lamp.h delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_mactbl.c delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_mactbl.h delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_pkt.c delete mode 100644 drivers/net/ethernet/hisilicon/hns3/hns3_cae/hns3_cae_pkt.h