hinic: add SR-IOV support
Subsystems (3)
cover hinic: add SR-IOV support
patch #1 adds mailbox channel support and vf can communicate with pf or hw through it.
patch #2 adds support for enabling vf and tx/rx capabilities based on vf.
patch #3 adds support for vf's basic configurations.
Luo bin (3):
hinic: add mailbox function support
hinic: add sriov feature support
hinic: add net_device_ops associated with vf
drivers/net/ethernet/huawei/hinic/Makefile | 2 +- drivers/net/ethernet/huawei/hinic/hinic_dev.h | 3 + .../net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 18 +- .../net/ethernet/huawei/hinic/hinic_hw_cmdq.h | 2 +- .../net/ethernet/huawei/hinic/hinic_hw_csr.h | 2 +- .../net/ethernet/huawei/hinic/hinic_hw_dev.c | 148 +- .../net/ethernet/huawei/hinic/hinic_hw_dev.h | 48 + .../net/ethernet/huawei/hinic/hinic_hw_eqs.c | 98 +- .../net/ethernet/huawei/hinic/hinic_hw_eqs.h | 7 +- .../net/ethernet/huawei/hinic/hinic_hw_if.c | 46 +- .../net/ethernet/huawei/hinic/hinic_hw_if.h | 18 + .../net/ethernet/huawei/hinic/hinic_hw_io.c | 49 + .../net/ethernet/huawei/hinic/hinic_hw_io.h | 23 +- .../net/ethernet/huawei/hinic/hinic_hw_mbox.c | 1213 +++++++++++++++++ .../net/ethernet/huawei/hinic/hinic_hw_mbox.h | 154 +++ .../net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 17 +- .../net/ethernet/huawei/hinic/hinic_hw_mgmt.h | 12 +- .../net/ethernet/huawei/hinic/hinic_hw_qp.c | 7 +- .../net/ethernet/huawei/hinic/hinic_hw_qp.h | 4 +- .../net/ethernet/huawei/hinic/hinic_hw_wq.c | 9 +- .../net/ethernet/huawei/hinic/hinic_hw_wq.h | 6 +- .../net/ethernet/huawei/hinic/hinic_main.c | 120 +- .../net/ethernet/huawei/hinic/hinic_port.c | 76 +- .../net/ethernet/huawei/hinic/hinic_port.h | 4 +- drivers/net/ethernet/huawei/hinic/hinic_rx.c | 15 +- .../net/ethernet/huawei/hinic/hinic_sriov.c | 1016 ++++++++++++++ .../net/ethernet/huawei/hinic/hinic_sriov.h | 102 ++ drivers/net/ethernet/huawei/hinic/hinic_tx.c | 17 +- 28 files changed, 3033 insertions(+), 203 deletions(-) create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.h create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_sriov.c create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_sriov.h
Signature · 1 line
2.17.1
PATCH 1/3 hinic: add mailbox function support
virtual function and physical function can communicate with each other through mailbox channel supported by hw
--- drivers/net/ethernet/huawei/hinic/Makefile | 2 +- .../net/ethernet/huawei/hinic/hinic_hw_csr.h | 2 +- .../net/ethernet/huawei/hinic/hinic_hw_dev.c | 25 +- .../net/ethernet/huawei/hinic/hinic_hw_dev.h | 2 + .../net/ethernet/huawei/hinic/hinic_hw_eqs.h | 3 +- .../net/ethernet/huawei/hinic/hinic_hw_if.c | 46 +- .../net/ethernet/huawei/hinic/hinic_hw_if.h | 18 + .../net/ethernet/huawei/hinic/hinic_hw_mbox.c | 1213 +++++++++++++++++ .../net/ethernet/huawei/hinic/hinic_hw_mbox.h | 154 +++ .../net/ethernet/huawei/hinic/hinic_hw_mgmt.h | 1 + 10 files changed, 1456 insertions(+), 10 deletions(-) create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.h
drivers/net/ethernet/huawei/hinic/Makefile +1 -1
@@ -4,4 +4,4 @@ obj-$(CONFIG_HINIC) += hinic.o hinic-y := hinic_main.o hinic_tx.o hinic_rx.o hinic_port.o hinic_hw_dev.o \ hinic_hw_io.o hinic_hw_qp.o hinic_hw_cmdq.o hinic_hw_wq.o \ hinic_hw_mgmt.o hinic_hw_api_cmd.o hinic_hw_eqs.o hinic_hw_if.o \ - hinic_common.o hinic_ethtool.o + hinic_common.o hinic_ethtool.o hinic_hw_mbox.o
drivers/net/ethernet/huawei/hinic/hinic_hw_csr.h +1 -1
@@ -10,7 +10,7 @@/* HW interface registers */ #define HINIC_CSR_FUNC_ATTR0_ADDR 0x0#define HINIC_CSR_FUNC_ATTR1_ADDR 0x4 - +#define HINIC_CSR_FUNC_ATTR2_ADDR 0x8#define HINIC_CSR_FUNC_ATTR4_ADDR 0x10#define HINIC_CSR_FUNC_ATTR5_ADDR 0x14
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c +22 -3
@@ -676,10 +676,23 @@ static int init_pfhwdev(struct hinic_pfhwdev *pfhwdev)return err; } -hinic_register_mgmt_msg_cb (&pfhwdev->pf_to_mgmt,HINIC_MOD_L2NIC , - pfhwdev, nic_mgmt_msg_handler); + err =hinic_func_to_func_init (hwdev); +if (err) { +dev_err (&hwif->pdev->dev,"Failed to init mailbox\n" ); +hinic_pf_to_mgmt_free (&pfhwdev->pf_to_mgmt); +return err; + } + +if (!HINIC_IS_VF (hwif)) +hinic_register_mgmt_msg_cb (&pfhwdev->pf_to_mgmt, +HINIC_MOD_L2NIC , pfhwdev, + nic_mgmt_msg_handler); +else +hinic_register_vf_mbox_cb (hwdev,HINIC_MOD_L2NIC , + nic_mgmt_msg_handler);hinic_set_pf_action (hwif,HINIC_PF_MGMT_ACTIVE ); +return 0 ; }
@@ -693,7 +706,13 @@ static void free_pfhwdev(struct hinic_pfhwdev *pfhwdev)hinic_set_pf_action (hwdev->hwif,HINIC_PF_MGMT_INIT ); -hinic_unregister_mgmt_msg_cb (&pfhwdev->pf_to_mgmt,HINIC_MOD_L2NIC ); +if (!HINIC_IS_VF (hwdev->hwif)) +hinic_unregister_mgmt_msg_cb (&pfhwdev->pf_to_mgmt, +HINIC_MOD_L2NIC ); +else +hinic_unregister_vf_mbox_cb (hwdev,HINIC_MOD_L2NIC ); + +hinic_func_to_func_free (hwdev);hinic_pf_to_mgmt_free (&pfhwdev->pf_to_mgmt); }
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h +2 -0
@@ -16,6 +16,7 @@#include "hinic_hw_mgmt.h" #include "hinic_hw_qp.h" #include "hinic_hw_io.h" +#include "hinic_hw_mbox.h" #define HINIC_MAX_QPS 32
@@ -225,6 +226,7 @@ struct hinic_hwdev {struct hinic_aeqs aeqs;struct hinic_func_to_io func_to_io; +struct hinic_mbox_func_to_func *func_to_func;struct hinic_cap nic_cap; };
drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.h +2 -1
@@ -143,8 +143,9 @@ enum hinic_eq_type { };enum hinic_aeq_type { +HINIC_MBX_FROM_FUNC =1 ,HINIC_MSG_FROM_MGMT_CPU =2 , - +HINIC_MBX_SEND_RSLT =5 ,HINIC_MAX_AEQ_EVENTS , };
drivers/net/ethernet/huawei/hinic/hinic_hw_if.c +42 -4
83 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_hw_if.h +18 -0
@@ -35,6 +35,7 @@#define HINIC_FA0_FUNC_IDX_SHIFT 0#define HINIC_FA0_PF_IDX_SHIFT 10#define HINIC_FA0_PCI_INTF_IDX_SHIFT 14 +#define HINIC_FA0_VF_IN_PF_SHIFT 16/* reserved members - off 16 */ #define HINIC_FA0_FUNC_TYPE_SHIFT 24
@@ -42,6 +43,7 @@#define HINIC_FA0_PF_IDX_MASK 0xF#define HINIC_FA0_PCI_INTF_IDX_MASK 0x3#define HINIC_FA0_FUNC_TYPE_MASK 0x1 +#define HINIC_FA0_VF_IN_PF_MASK 0xFF#define HINIC_FA0_GET (val, member) \ (((val) >> HINIC_FA0_##member##_SHIFT) & HINIC_FA0_##member##_MASK)
@@ -64,6 +66,12 @@#define HINIC_FA1_GET (val, member) \ (((val) >> HINIC_FA1_##member##_SHIFT) & HINIC_FA1_##member##_MASK) +#define HINIC_FA2_GLOBAL_VF_ID_OF_PF_SHIFT 16 +#define HINIC_FA2_GLOBAL_VF_ID_OF_PF_MASK 0x3FF + +#define HINIC_FA2_GET (val, member) \ + (((val) >> HINIC_FA2_##member##_SHIFT) & HINIC_FA2_##member##_MASK) +#define HINIC_FA4_OUTBOUND_STATE_SHIFT 0#define HINIC_FA4_DB_STATE_SHIFT 1
@@ -140,6 +148,7 @@#define HINIC_HWIF_PPF_IDX (hwif) ((hwif)->attr.ppf_idx)#define HINIC_FUNC_TYPE (hwif) ((hwif)->attr.func_type) +#define HINIC_IS_VF (hwif) (HINIC_FUNC_TYPE(hwif) == HINIC_VF)#define HINIC_IS_PF (hwif) (HINIC_FUNC_TYPE(hwif) == HINIC_PF)#define HINIC_IS_PPF (hwif) (HINIC_FUNC_TYPE(hwif) == HINIC_PPF)
@@ -173,6 +182,7 @@ enum hinic_pcie_tph {enum hinic_func_type {HINIC_PF =0 , +HINIC_VF =1 ,HINIC_PPF =2 , };
@@ -223,6 +233,8 @@ struct hinic_func_attr {u8 num_ceqs;u8 num_dma_attr; + +u16 global_vf_id_of_pf; };struct hinic_hwif {
@@ -271,6 +283,12 @@ enum hinic_db_state hinic_db_state_get(struct hinic_hwif *hwif);void hinic_db_state_set (struct hinic_hwif *hwif,enum hinic_db_state db_state); +u16 hinic_glb_pf_vf_offset (struct hinic_hwif *hwif); + +u16 hinic_global_func_id_hw (struct hinic_hwif *hwif); + +u16 hinic_pf_id_of_vf_hw (struct hinic_hwif *hwif); +int hinic_init_hwif (struct hinic_hwif *hwif,struct pci_dev *pdev);void hinic_free_hwif (struct hinic_hwif *hwif);
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c new file +1213 -0
1,213 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.h new file +154 -0
154 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.h +1 -0
@@ -60,6 +60,7 @@ enum hinic_cfg_cmd { };enum hinic_comm_cmd { +HINIC_COMM_CMD_START_FLR =0x1 ,HINIC_COMM_CMD_IO_STATUS_GET =0x3 ,HINIC_COMM_CMD_CMDQ_CTXT_SET =0x10 ,
Signature · 1 line
2.17.1
PATCH 3/3 hinic: add net_device_ops associated with vf
In reply to Luo binadds ndo_set_vf_mac/ndo_set_vf_vlan/ndo_get_vf_config and ndo_set_vf_trust to configure netdev of virtual function
--- .../net/ethernet/huawei/hinic/hinic_main.c | 43 ++- .../net/ethernet/huawei/hinic/hinic_sriov.c | 318 ++++++++++++++++++ .../net/ethernet/huawei/hinic/hinic_sriov.h | 23 ++ 3 files changed, 383 insertions(+), 1 deletion(-)
drivers/net/ethernet/huawei/hinic/hinic_main.c +42 -1
@@ -779,8 +779,26 @@ static void hinic_set_rx_mode(struct net_device *netdev)static void hinic_tx_timeout (struct net_device *netdev,unsigned int txqueue) {struct hinic_dev *nic_dev =netdev_priv (netdev); +u16 sw_pi, hw_ci, sw_ci; +struct hinic_sq *sq; +u16 num_sqs, q_id; + + num_sqs =hinic_hwdev_num_qps (nic_dev->hwdev);netif_err (nic_dev, drv, netdev,"Tx timeout\n" ); + +for (q_id =0 ; q_id < num_sqs; q_id++) { +if (!netif_xmit_stopped (netdev_get_tx_queue (netdev, q_id))) +continue ; + + sq =hinic_hwdev_get_sq (nic_dev->hwdev, q_id); + sw_pi =atomic_read (&sq->wq->prod_idx) & sq->wq->mask; + hw_ci =be16_to_cpu (*(u16 *)(sq->hw_ci_addr)) & sq->wq->mask; + sw_ci =atomic_read (&sq->wq->cons_idx) & sq->wq->mask; +netif_err (nic_dev, drv, netdev,"Txq%d: sw_pi: %d, hw_ci: %d, sw_ci: %d, napi->state: 0x%lx\n" , + q_id, sw_pi, hw_ci, sw_ci, + nic_dev->txqs[q_id].napi.state); + } } static void hinic_get_stats64(struct net_device *netdev,
@@ -846,6 +864,26 @@ static const struct net_device_ops hinic_netdev_ops = { .ndo_get_stats64 = hinic_get_stats64, .ndo_fix_features = hinic_fix_features, .ndo_set_features = hinic_set_features, + .ndo_set_vf_mac = hinic_ndo_set_vf_mac, + .ndo_set_vf_vlan = hinic_ndo_set_vf_vlan, + .ndo_get_vf_config = hinic_ndo_get_vf_config, + .ndo_set_vf_trust = hinic_ndo_set_vf_trust, +}; + +static const struct net_device_ops hinicvf_netdev_ops = { + .ndo_open = hinic_open, + .ndo_stop = hinic_close, + .ndo_change_mtu = hinic_change_mtu, + .ndo_set_mac_address = hinic_set_mac_addr, + .ndo_validate_addr = eth_validate_addr, + .ndo_vlan_rx_add_vid = hinic_vlan_rx_add_vid, + .ndo_vlan_rx_kill_vid = hinic_vlan_rx_kill_vid, + .ndo_set_rx_mode = hinic_set_rx_mode, + .ndo_start_xmit = hinic_xmit_frame, + .ndo_tx_timeout = hinic_tx_timeout, + .ndo_get_stats64 = hinic_get_stats64, + .ndo_fix_features = hinic_fix_features, + .ndo_set_features = hinic_set_features, };static void netdev_features_init (struct net_device *netdev)
@@ -983,7 +1021,10 @@ static int nic_dev_init(struct pci_dev *pdev)hinic_set_ethtool_ops (netdev); - netdev->netdev_ops = &hinic_netdev_ops; +if (!HINIC_IS_VF (hwdev->hwif)) + netdev->netdev_ops = &hinic_netdev_ops; +else + netdev->netdev_ops = &hinicvf_netdev_ops; netdev->max_mtu =ETH_MAX_MTU ;
drivers/net/ethernet/huawei/hinic/hinic_sriov.c +318 -0
336 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_sriov.h +23 -0
@@ -52,6 +52,19 @@ struct hinic_register_vf {u8 rsvd0[6 ]; }; +struct hinic_port_mac_update { +u8 status; +u8 version; +u8 rsvd0[6 ]; + +u16 func_id; +u16 vlan_id; +u16 rsvd1; +u8 old_mac[ETH_ALEN ]; +u16 rsvd2; +u8 new_mac[ETH_ALEN ]; +}; +struct hinic_vf_vlan_config {u8 status;u8 version;
@@ -63,6 +76,16 @@ struct hinic_vf_vlan_config {u8 rsvd1[7 ]; }; +int hinic_ndo_set_vf_mac (struct net_device *netdev,int vf,u8 *mac); + +int hinic_ndo_set_vf_vlan (struct net_device *netdev,int vf,u16 vlan,u8 qos, +__be16 vlan_proto); + +int hinic_ndo_get_vf_config (struct net_device *netdev, +int vf,struct ifla_vf_info *ivi); + +int hinic_ndo_set_vf_trust (struct net_device *netdev,int vf,bool setting); +void hinic_notify_all_vfs_link_changed (struct hinic_hwdev *hwdev,u8 link_status);
Signature · 1 line
2.17.1
PATCH 2/3 hinic: add sriov feature support
In reply to Luo binadds support of basic sriov feature including initialization and tx/rx capabilities of virtual function
--- drivers/net/ethernet/huawei/hinic/Makefile | 2 +- drivers/net/ethernet/huawei/hinic/hinic_dev.h | 3 + .../net/ethernet/huawei/hinic/hinic_hw_cmdq.c | 18 +- .../net/ethernet/huawei/hinic/hinic_hw_cmdq.h | 2 +- .../net/ethernet/huawei/hinic/hinic_hw_dev.c | 123 +-- .../net/ethernet/huawei/hinic/hinic_hw_dev.h | 46 ++ .../net/ethernet/huawei/hinic/hinic_hw_eqs.c | 98 ++- .../net/ethernet/huawei/hinic/hinic_hw_eqs.h | 4 +- .../net/ethernet/huawei/hinic/hinic_hw_io.c | 49 ++ .../net/ethernet/huawei/hinic/hinic_hw_io.h | 23 +- .../net/ethernet/huawei/hinic/hinic_hw_mgmt.c | 17 +- .../net/ethernet/huawei/hinic/hinic_hw_mgmt.h | 11 +- .../net/ethernet/huawei/hinic/hinic_hw_qp.c | 7 +- .../net/ethernet/huawei/hinic/hinic_hw_qp.h | 4 +- .../net/ethernet/huawei/hinic/hinic_hw_wq.c | 9 +- .../net/ethernet/huawei/hinic/hinic_hw_wq.h | 6 +- .../net/ethernet/huawei/hinic/hinic_main.c | 77 +- .../net/ethernet/huawei/hinic/hinic_port.c | 76 +- .../net/ethernet/huawei/hinic/hinic_port.h | 4 +- drivers/net/ethernet/huawei/hinic/hinic_rx.c | 15 +- .../net/ethernet/huawei/hinic/hinic_sriov.c | 698 ++++++++++++++++++ .../net/ethernet/huawei/hinic/hinic_sriov.h | 79 ++ drivers/net/ethernet/huawei/hinic/hinic_tx.c | 17 +- 23 files changed, 1195 insertions(+), 193 deletions(-) create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_sriov.c create mode 100644 drivers/net/ethernet/huawei/hinic/hinic_sriov.h
drivers/net/ethernet/huawei/hinic/Makefile +1 -1
@@ -4,4 +4,4 @@ obj-$(CONFIG_HINIC) += hinic.o hinic-y := hinic_main.o hinic_tx.o hinic_rx.o hinic_port.o hinic_hw_dev.o \ hinic_hw_io.o hinic_hw_qp.o hinic_hw_cmdq.o hinic_hw_wq.o \ hinic_hw_mgmt.o hinic_hw_api_cmd.o hinic_hw_eqs.o hinic_hw_if.o \ - hinic_common.o hinic_ethtool.o hinic_hw_mbox.o + hinic_common.o hinic_ethtool.o hinic_hw_mbox.o hinic_sriov.o
drivers/net/ethernet/huawei/hinic/hinic_dev.h +3 -0
@@ -16,6 +16,7 @@#include "hinic_hw_dev.h" #include "hinic_tx.h" #include "hinic_rx.h" +#include "hinic_sriov.h" #define HINIC_DRV_NAME "hinic"
@@ -23,6 +24,7 @@ enum hinic_flags {HINIC_LINK_UP =BIT (0 ),HINIC_INTF_UP =BIT (1 ),HINIC_RSS_ENABLE =BIT (2 ), + HINIC_LINK_DOWN = BIT(3), }; struct hinic_rx_mode_work {
@@ -78,6 +80,7 @@ struct hinic_dev {struct hinic_rss_type rss_type;u8 *rss_hkey_user;s32 *rss_indir_user; + struct hinic_sriov_info sriov_info; };#endif
drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.c +8 -10
@@ -64,7 +64,7 @@#define CMDQ_WQE_SIZE 64#define CMDQ_DEPTH SZ_4K -#define CMDQ_WQ_PAGE_SIZE SZ_4K +#define CMDQ_WQ_PAGE_SIZE SZ_256K#define WQE_LCMD_SIZE 64#define WQE_SCMD_SIZE 64
@@ -705,7 +705,7 @@ static void cmdq_init_queue_ctxt(struct hinic_cmdq_ctxt *cmdq_ctxt,/* The data in the HW is in Big Endian Format */ wq_first_page_paddr =be64_to_cpu (*wq->block_vaddr); - pfn =CMDQ_PFN (wq_first_page_paddr, wq->wq_page_size); + pfn =CMDQ_PFN (wq_first_page_paddr,SZ_4K ); ctxt_info->curr_wqe_page_pfn = HINIC_CMDQ_CTXT_PAGE_INFO_SET(pfn, CURR_WQE_PAGE_PFN) |
@@ -714,16 +714,19 @@ static void cmdq_init_queue_ctxt(struct hinic_cmdq_ctxt *cmdq_ctxt,HINIC_CMDQ_CTXT_PAGE_INFO_SET (1 ,CEQ_EN ) |HINIC_CMDQ_CTXT_PAGE_INFO_SET (cmdq->wrapped,WRAPPED ); -/* block PFN - Read Modify Write */ - cmdq_first_block_paddr = cmdq_pages->page_paddr; +if (wq->num_q_pages !=1 ) { +/* block PFN - Read Modify Write */ + cmdq_first_block_paddr = cmdq_pages->page_paddr; - pfn =CMDQ_PFN (cmdq_first_block_paddr, wq->wq_page_size); + pfn =CMDQ_PFN (cmdq_first_block_paddr, wq->wq_page_size); + } ctxt_info->wq_block_pfn =HINIC_CMDQ_CTXT_BLOCK_INFO_SET (pfn,WQ_BLOCK_PFN ) |HINIC_CMDQ_CTXT_BLOCK_INFO_SET (atomic_read (&wq->cons_idx),CI ); cmdq_ctxt->func_idx =HINIC_HWIF_FUNC_IDX (cmdqs->hwif); + cmdq_ctxt->ppf_idx =HINIC_HWIF_PPF_IDX (cmdqs->hwif); cmdq_ctxt->cmdq_type = cmdq->cmdq_type; }
@@ -795,11 +798,6 @@ static int init_cmdqs_ctxt(struct hinic_hwdev *hwdev,size_t cmdq_ctxts_size;int err; -if (!HINIC_IS_PF (hwif) && !HINIC_IS_PPF (hwif)) { -dev_err (&pdev->dev,"Unsupported PCI function type\n" ); -return -EINVAL ; - } - cmdq_ctxts_size =HINIC_MAX_CMDQ_TYPES *sizeof (*cmdq_ctxts); cmdq_ctxts =devm_kzalloc (&pdev->dev, cmdq_ctxts_size,GFP_KERNEL );if (!cmdq_ctxts)
drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h +1 -1
@@ -122,7 +122,7 @@ struct hinic_cmdq_ctxt {u16 func_idx;u8 cmdq_type; -u8 rsvd1[1 ]; +u8 ppf_idx;u8 rsvd2[4 ];
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c +34 -89
293 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h +46 -0
80 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.c +82 -16
165 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_hw_eqs.h +2 -2
@@ -172,7 +172,7 @@ struct hinic_eq_work {struct hinic_eq {struct hinic_hwif *hwif; - +struct hinic_hwdev *hwdev;enum hinic_eq_type type;int q_id;u32 q_len;
@@ -220,7 +220,7 @@ struct hinic_ceq_cb {struct hinic_ceqs {struct hinic_hwif *hwif; - +struct hinic_hwdev *hwdev;struct hinic_eq ceq[HINIC_MAX_CEQS ];int num_ceqs;
drivers/net/ethernet/huawei/hinic/hinic_hw_io.c +49 -0
91 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_hw_io.h +22 -1
@@ -20,6 +20,8 @@#define HINIC_DB_PAGE_SIZE SZ_4K#define HINIC_DB_SIZE SZ_4M +#define HINIC_HW_WQ_PAGE_SIZE SZ_4K +#define HINIC_DEFAULT_WQ_PAGE_SIZE SZ_256K#define HINIC_DB_MAX_AREAS (HINIC_DB_SIZE / HINIC_DB_PAGE_SIZE)
@@ -47,7 +49,7 @@ struct hinic_free_db_area {struct hinic_func_to_io {struct hinic_hwif *hwif; - +struct hinic_hwdev *hwdev;struct hinic_ceqs ceqs;struct hinic_wqs wqs;
@@ -69,8 +71,27 @@ struct hinic_func_to_io {void __iomem *cmdq_db_area[HINIC_MAX_CMDQ_TYPES ];struct hinic_cmdqs cmdqs; + +u16 max_vfs; +struct vf_data_storage *vf_infos; +u8 link_status; }; +struct hinic_wq_page_size { +u8 status; +u8 version; +u8 rsvd0[6 ]; + +u16 func_idx; +u8 ppf_idx; +u8 page_size; + +u32 rsvd1; +}; + +int hinic_set_wq_page_size (struct hinic_hwdev *hwdev,u16 func_idx, +u32 page_size); + int hinic_io_create_qps(struct hinic_func_to_io *func_to_io, u16 base_qpn, int num_qps, struct msix_entry *sq_msix_entries,
drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c +14 -3
@@ -353,7 +353,11 @@ int hinic_msg_to_mgmt(struct hinic_pf_to_mgmt *pf_to_mgmt,return -EINVAL ; } -return msg_to_mgmt_sync (pf_to_mgmt, mod, cmd, buf_in, in_size, +if (HINIC_IS_VF (hwif)) +return hinic_mbox_to_pf (pf_to_mgmt->hwdev, mod, cmd, buf_in, + in_size, buf_out, out_size,0 ); +else +return msg_to_mgmt_sync (pf_to_mgmt, mod, cmd, buf_in, in_size, buf_out, out_size,MGMT_DIRECT_SEND ,MSG_NOT_RESP ); }
@@ -390,8 +394,8 @@ static void mgmt_recv_msg_handler(struct hinic_pf_to_mgmt *pf_to_mgmt, recv_msg->msg, recv_msg->msg_len, buf_out, &out_size); else - dev_err(&pdev->dev, "No MGMT msg handler, mod = %d\n", - recv_msg->mod); + dev_err(&pdev->dev, "No MGMT msg handler, mod: %d, cmd: %d\n", + recv_msg->mod, recv_msg->cmd); mgmt_cb->state &= ~HINIC_MGMT_CB_RUNNING ;
@@ -553,6 +557,10 @@ int hinic_pf_to_mgmt_init(struct hinic_pf_to_mgmt *pf_to_mgmt,int err; pf_to_mgmt->hwif = hwif; + pf_to_mgmt->hwdev = hwdev; + +if (HINIC_IS_VF (hwif)) +return 0 ;sema_init (&pf_to_mgmt->sync_msg_lock,1 ); pf_to_mgmt->sync_msg_id =0 ;
@@ -584,6 +592,9 @@ void hinic_pf_to_mgmt_free(struct hinic_pf_to_mgmt *pf_to_mgmt)struct hinic_pfhwdev *pfhwdev =mgmt_to_pfhwdev (pf_to_mgmt);struct hinic_hwdev *hwdev = &pfhwdev->hwdev; +if (HINIC_IS_VF (hwdev->hwif)) +return ; +hinic_aeq_unregister_hw_cb (&hwdev->aeqs,HINIC_MSG_FROM_MGMT_CPU );hinic_api_cmd_free (pf_to_mgmt->cmd_chain); }
drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.h +9 -2
@@ -62,6 +62,7 @@ enum hinic_cfg_cmd {enum hinic_comm_cmd {HINIC_COMM_CMD_START_FLR =0x1 ,HINIC_COMM_CMD_IO_STATUS_GET =0x3 , +HINIC_COMM_CMD_DMA_ATTR_SET =0x4 ,HINIC_COMM_CMD_CMDQ_CTXT_SET =0x10 ,HINIC_COMM_CMD_CMDQ_CTXT_GET =0x11 ,
@@ -75,7 +76,13 @@ enum hinic_comm_cmd {HINIC_COMM_CMD_IO_RES_CLEAR =0x29 , - HINIC_COMM_CMD_MAX = 0x32, +HINIC_COMM_CMD_CEQ_CTRL_REG_WR_BY_UP =0x33 , + +HINIC_COMM_CMD_L2NIC_RESET =0x4b , + +HINIC_COMM_CMD_PAGESIZE_SET =0x50 , + + HINIC_COMM_CMD_MAX = 0x51, }; enum hinic_mgmt_cb_state {
@@ -108,7 +115,7 @@ struct hinic_mgmt_cb {struct hinic_pf_to_mgmt {struct hinic_hwif *hwif; - +struct hinic_hwdev *hwdev;struct semaphore sync_msg_lock;u16 sync_msg_id;u8 *sync_msg_buf;
drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c +6 -1
@@ -108,7 +108,12 @@ void hinic_sq_prepare_ctxt(struct hinic_sq_ctxt *sq_ctxt, wq_page_pfn_hi =upper_32_bits (wq_page_pfn); wq_page_pfn_lo =lower_32_bits (wq_page_pfn); - wq_block_pfn =HINIC_WQ_BLOCK_PFN (wq->block_paddr); +/* If only one page, use 0-level CLA */ +if (wq->num_q_pages ==1 ) + wq_block_pfn =HINIC_WQ_BLOCK_PFN (wq_page_addr); +else + wq_block_pfn =HINIC_WQ_BLOCK_PFN (wq->block_paddr); + wq_block_pfn_hi =upper_32_bits (wq_block_pfn); wq_block_pfn_lo =lower_32_bits (wq_block_pfn);
drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h +2 -2
@@ -38,8 +38,8 @@#define HINIC_SQ_WQEBB_SIZE 64#define HINIC_RQ_WQEBB_SIZE 32 -#define HINIC_SQ_PAGE_SIZE SZ_4K -#define HINIC_RQ_PAGE_SIZE SZ_4K +#define HINIC_SQ_PAGE_SIZE SZ_256K +#define HINIC_RQ_PAGE_SIZE SZ_256K#define HINIC_SQ_DEPTH SZ_4K#define HINIC_RQ_DEPTH SZ_4K
drivers/net/ethernet/huawei/hinic/hinic_hw_wq.c +6 -3
@@ -503,7 +503,7 @@ static int alloc_wq_pages(struct hinic_wq *wq, struct hinic_hwif *hwif,* Return 0 - Success, negative - Failure **/ int hinic_wq_allocate (struct hinic_wqs *wqs,struct hinic_wq *wq, -u16 wqebb_size,u16 wq_page_size,u16 q_depth, +u16 wqebb_size,u32 wq_page_size,u16 q_depth,u16 max_wqe_size) {struct hinic_hwif *hwif = wqs->hwif;
@@ -600,7 +600,7 @@ void hinic_wq_free(struct hinic_wqs *wqs, struct hinic_wq *wq)**/ int hinic_wqs_cmdq_alloc (struct hinic_cmdq_pages *cmdq_pages,struct hinic_wq *wq,struct hinic_hwif *hwif, -int cmdq_blocks,u16 wqebb_size,u16 wq_page_size, +int cmdq_blocks,u16 wqebb_size,u32 wq_page_size,u16 q_depth,u16 max_wqe_size) {struct pci_dev *pdev = hwif->pdev;
@@ -768,7 +768,10 @@ struct hinic_hw_wqe *hinic_get_wqe(struct hinic_wq *wq, unsigned int wqe_size, *prod_idx = curr_prod_idx; -if (curr_pg != end_pg) { +/* If we only have one page, still need to get shadown wqe when +* wqe rolling-over page +*/ +if (curr_pg != end_pg ||MASKED_WQE_IDX (wq, end_prod_idx) < *prod_idx) {void *shadow_addr = &wq->shadow_wqe[curr_pg * wq->max_wqe_size];copy_wqe_to_shadow (wq, shadow_addr, num_wqebbs, *prod_idx);
drivers/net/ethernet/huawei/hinic/hinic_hw_wq.h +3 -3
@@ -26,7 +26,7 @@ struct hinic_wq {int block_idx;u16 wqebb_size; -u16 wq_page_size; +u32 wq_page_size;u16 q_depth;u16 max_wqe_size;u16 num_wqebbs_per_page;
@@ -76,7 +76,7 @@ struct hinic_cmdq_pages {int hinic_wqs_cmdq_alloc (struct hinic_cmdq_pages *cmdq_pages,struct hinic_wq *wq,struct hinic_hwif *hwif, -int cmdq_blocks,u16 wqebb_size,u16 wq_page_size, +int cmdq_blocks,u16 wqebb_size,u32 wq_page_size,u16 q_depth,u16 max_wqe_size); void hinic_wqs_cmdq_free(struct hinic_cmdq_pages *cmdq_pages,
@@ -88,7 +88,7 @@ int hinic_wqs_alloc(struct hinic_wqs *wqs, int num_wqs,void hinic_wqs_free (struct hinic_wqs *wqs);int hinic_wq_allocate (struct hinic_wqs *wqs,struct hinic_wq *wq, -u16 wqebb_size,u16 wq_page_size,u16 q_depth, +u16 wqebb_size,u32 wq_page_size,u16 q_depth,u16 max_wqe_size);void hinic_wq_free (struct hinic_wqs *wqs,struct hinic_wq *wq);
drivers/net/ethernet/huawei/hinic/hinic_main.c +69 -8
188 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_port.c +40 -36
247 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_port.h +2 -2
@@ -148,9 +148,9 @@ struct hinic_port_link_status {u8 version;u8 rsvd0[6 ]; -u16 rsvd1; +u16 func_id;u8 link; -u8 rsvd2; +u8 port_id; };struct hinic_port_func_state_cmd {
drivers/net/ethernet/huawei/hinic/hinic_rx.c +9 -6
@@ -432,9 +432,11 @@ static int rx_poll(struct napi_struct *napi, int budget)return budget;napi_complete (napi); -hinic_hwdev_set_msix_state (nic_dev->hwdev, - rq->msix_entry, -HINIC_MSIX_ENABLE ); + +if (!HINIC_IS_VF (nic_dev->hwdev->hwif)) +hinic_hwdev_set_msix_state (nic_dev->hwdev, + rq->msix_entry, +HINIC_MSIX_ENABLE );return pkts; }
@@ -461,9 +463,10 @@ static irqreturn_t rx_irq(int irq, void *data)/* Disable the interrupt until napi will be completed */ nic_dev =netdev_priv (rxq->netdev); -hinic_hwdev_set_msix_state (nic_dev->hwdev, - rq->msix_entry, -HINIC_MSIX_DISABLE ); +if (!HINIC_IS_VF (nic_dev->hwdev->hwif)) +hinic_hwdev_set_msix_state (nic_dev->hwdev, + rq->msix_entry, +HINIC_MSIX_DISABLE ); nic_dev =netdev_priv (rxq->netdev);hinic_hwdev_msix_cnt_set (nic_dev->hwdev, rq->msix_entry);
drivers/net/ethernet/huawei/hinic/hinic_sriov.c new file +698 -0
698 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_sriov.h new file +79 -0
79 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_tx.c +10 -7
@@ -673,9 +673,11 @@ static int free_tx_poll(struct napi_struct *napi, int budget)if (pkts < budget) {napi_complete (napi); -hinic_hwdev_set_msix_state (nic_dev->hwdev, - sq->msix_entry, -HINIC_MSIX_ENABLE ); +if (!HINIC_IS_VF (nic_dev->hwdev->hwif)) +hinic_hwdev_set_msix_state (nic_dev->hwdev, + sq->msix_entry, +HINIC_MSIX_ENABLE ); +return pkts; }
@@ -701,10 +703,11 @@ static irqreturn_t tx_irq(int irq, void *data) nic_dev =netdev_priv (txq->netdev); -/* Disable the interrupt until napi will be completed */ -hinic_hwdev_set_msix_state (nic_dev->hwdev, - txq->sq->msix_entry, -HINIC_MSIX_DISABLE ); +if (!HINIC_IS_VF (nic_dev->hwdev->hwif)) +/* Disable the interrupt until napi will be completed */ +hinic_hwdev_set_msix_state (nic_dev->hwdev, + txq->sq->msix_entry, +HINIC_MSIX_DISABLE );hinic_hwdev_msix_cnt_set (nic_dev->hwdev, txq->sq->msix_entry);
Signature · 1 line
2.17.1
David Miller
maintainerFrom: Luo bin <[email protected]>
Date: Sat, 25 Apr 2020 01:21:08 +0000
Quoted 5 lines
patch #1 adds mailbox channel support and vf can communicate with pf or hw through it.
patch #2 adds support for enabling vf and tx/rx capabilities based on vf.
patch #3 adds support for vf's basic configurations.
Series applied, thanks.