hinic: add set_ringparam ethtool_ops support
Subsystems (3)
PATCH 1/1 hinic: add set_ringparam ethtool_ops support
support to change TX/RX queue depth with ethtool -G
Signed-off-by Luo bin <[email protected]>
--- drivers/net/ethernet/huawei/hinic/hinic_dev.h | 2 + .../net/ethernet/huawei/hinic/hinic_ethtool.c | 78 ++++++++++++++++++- .../net/ethernet/huawei/hinic/hinic_hw_dev.c | 11 ++- .../net/ethernet/huawei/hinic/hinic_hw_dev.h | 2 +- .../net/ethernet/huawei/hinic/hinic_hw_io.c | 4 +- .../net/ethernet/huawei/hinic/hinic_hw_io.h | 3 + .../net/ethernet/huawei/hinic/hinic_hw_qp.c | 1 + .../net/ethernet/huawei/hinic/hinic_hw_qp.h | 3 + .../net/ethernet/huawei/hinic/hinic_main.c | 9 ++- .../net/ethernet/huawei/hinic/hinic_port.c | 2 +- .../net/ethernet/huawei/hinic/hinic_port.h | 4 + 11 files changed, 104 insertions(+), 15 deletions(-)
drivers/net/ethernet/huawei/hinic/hinic_dev.h +2 -0
@@ -69,6 +69,8 @@ struct hinic_dev {struct hinic_txq *txqs;struct hinic_rxq *rxqs; +u16 sq_depth; +u16 rq_depth;struct hinic_txq_stats tx_stats;struct hinic_rxq_stats rx_stats;
drivers/net/ethernet/huawei/hinic/hinic_ethtool.c +74 -4
92 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.c +7 -4
@@ -269,8 +269,8 @@ static int init_fw_ctxt(struct hinic_hwdev *hwdev)* * Return 0 - Success, negative - Failure **/ -static int set_hw_ioctxt (struct hinic_hwdev *hwdev,unsigned int rq_depth, -unsigned int sq_depth) +static int set_hw_ioctxt (struct hinic_hwdev *hwdev,unsigned int sq_depth, +unsigned int rq_depth) {struct hinic_hwif *hwif = hwdev->hwif;struct hinic_cmd_hw_ioctxt hw_ioctxt;
@@ -435,7 +435,7 @@ static int get_base_qpn(struct hinic_hwdev *hwdev, u16 *base_qpn)* * Return 0 - Success, negative - Failure **/ -int hinic_hwdev_ifup (struct hinic_hwdev *hwdev) +int hinic_hwdev_ifup (struct hinic_hwdev *hwdev,u16 sq_depth,u16 rq_depth) {struct hinic_func_to_io *func_to_io = &hwdev->func_to_io;struct hinic_cap *nic_cap = &hwdev->nic_cap;
@@ -458,6 +458,9 @@ int hinic_hwdev_ifup(struct hinic_hwdev *hwdev) ceq_msix_entries = &hwdev->msix_entries[num_aeqs]; func_to_io->hwdev = hwdev; + func_to_io->sq_depth = sq_depth; + func_to_io->rq_depth = rq_depth; + err =hinic_io_init (func_to_io, hwif, nic_cap->max_qps, num_ceqs, ceq_msix_entries);if (err) {
@@ -482,7 +485,7 @@ int hinic_hwdev_ifup(struct hinic_hwdev *hwdev)hinic_db_state_set (hwif,HINIC_DB_ENABLE ); } - err =set_hw_ioctxt (hwdev,HINIC_SQ_DEPTH ,HINIC_RQ_DEPTH ); + err =set_hw_ioctxt (hwdev, sq_depth, rq_depth);if (err) {dev_err (&pdev->dev,"Failed to set HW IO ctxt\n" ); goto err_hw_ioctxt;
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h +1 -1
@@ -347,7 +347,7 @@ int hinic_hilink_msg_cmd(struct hinic_hwdev *hwdev, enum hinic_hilink_cmd cmd, void *buf_in, u16 in_size, void *buf_out, u16 *out_size); -int hinic_hwdev_ifup (struct hinic_hwdev *hwdev); +int hinic_hwdev_ifup (struct hinic_hwdev *hwdev,u16 sq_depth,u16 rq_depth);void hinic_hwdev_ifdown (struct hinic_hwdev *hwdev);
drivers/net/ethernet/huawei/hinic/hinic_hw_io.c +2 -2
@@ -282,7 +282,7 @@ static int init_qp(struct hinic_func_to_io *func_to_io, err =hinic_wq_allocate (&func_to_io->wqs, &func_to_io->sq_wq[q_id],HINIC_SQ_WQEBB_SIZE ,HINIC_SQ_PAGE_SIZE , -HINIC_SQ_DEPTH ,HINIC_SQ_WQE_MAX_SIZE ); + func_to_io->sq_depth,HINIC_SQ_WQE_MAX_SIZE );if (err) {dev_err (&pdev->dev,"Failed to allocate WQ for SQ\n" );return err;
@@ -290,7 +290,7 @@ static int init_qp(struct hinic_func_to_io *func_to_io, err =hinic_wq_allocate (&func_to_io->wqs, &func_to_io->rq_wq[q_id],HINIC_RQ_WQEBB_SIZE ,HINIC_RQ_PAGE_SIZE , -HINIC_RQ_DEPTH ,HINIC_RQ_WQE_SIZE ); + func_to_io->rq_depth,HINIC_RQ_WQE_SIZE );if (err) {dev_err (&pdev->dev,"Failed to allocate WQ for RQ\n" ); goto err_rq_alloc;
drivers/net/ethernet/huawei/hinic/hinic_hw_io.h +3 -0
@@ -60,6 +60,9 @@ struct hinic_func_to_io {struct hinic_qp *qps;u16 max_qps; +u16 sq_depth; +u16 rq_depth; +void __iomem **sq_db;void __iomem *db_base;
drivers/net/ethernet/huawei/hinic/hinic_hw_qp.c +1 -0
@@ -643,6 +643,7 @@ void hinic_sq_write_db(struct hinic_sq *sq, u16 prod_idx, unsigned int wqe_size,/* increment prod_idx to the next */ prod_idx +=ALIGN (wqe_size, wq->wqebb_size) / wq->wqebb_size; + prod_idx =SQ_MASKED_IDX (sq, prod_idx);wmb ();/* Write all before the doorbell */
drivers/net/ethernet/huawei/hinic/hinic_hw_qp.h +3 -0
@@ -44,6 +44,9 @@#define HINIC_SQ_DEPTH SZ_4K#define HINIC_RQ_DEPTH SZ_4K +#define HINIC_MAX_QUEUE_DEPTH SZ_4K +#define HINIC_MIN_QUEUE_DEPTH 128 +/* In any change to HINIC_RX_BUF_SZ, HINIC_RX_BUF_SZ_IDX must be changed */ #define HINIC_RX_BUF_SZ 2048#define HINIC_RX_BUF_SZ_IDX HINIC_RX_BUF_SZ_2048_IDX
drivers/net/ethernet/huawei/hinic/hinic_main.c +6 -3
@@ -372,14 +372,15 @@ static void hinic_enable_rss(struct hinic_dev *nic_dev)netif_err (nic_dev, drv, netdev,"Failed to init rss\n" ); } -static int hinic_open (struct net_device *netdev) +int hinic_open (struct net_device *netdev) {struct hinic_dev *nic_dev =netdev_priv (netdev);enum hinic_port_link_state link_state;int err, ret;if (!(nic_dev->flags &HINIC_INTF_UP )) { - err =hinic_hwdev_ifup (nic_dev->hwdev); + err =hinic_hwdev_ifup (nic_dev->hwdev, nic_dev->sq_depth, + nic_dev->rq_depth);if (err) {netif_err (nic_dev, drv, netdev,"Failed - HW interface up\n" );
@@ -483,7 +484,7 @@ static int hinic_open(struct net_device *netdev)return err; } -static int hinic_close (struct net_device *netdev) +int hinic_close (struct net_device *netdev) {struct hinic_dev *nic_dev =netdev_priv (netdev);unsigned int flags;
@@ -1038,6 +1039,8 @@ static int nic_dev_init(struct pci_dev *pdev) nic_dev->rxqs =NULL ; nic_dev->tx_weight = tx_weight; nic_dev->rx_weight = rx_weight; + nic_dev->sq_depth =HINIC_SQ_DEPTH ; + nic_dev->rq_depth =HINIC_RQ_DEPTH ; nic_dev->sriov_info.hwdev = hwdev; nic_dev->sriov_info.pdev = pdev;
drivers/net/ethernet/huawei/hinic/hinic_port.c +1 -1
@@ -473,7 +473,7 @@ int hinic_set_max_qnum(struct hinic_dev *nic_dev, u8 num_rqs) rq_num.func_id =HINIC_HWIF_FUNC_IDX (hwif); rq_num.num_rqs = num_rqs; - rq_num.rq_depth =ilog2 (HINIC_SQ_DEPTH ); + rq_num.rq_depth =ilog2 (nic_dev->rq_depth); err = hinic_port_msg_cmd(hwdev, HINIC_PORT_CMD_SET_RQ_IQ_MAP, &rq_num, sizeof(rq_num),
drivers/net/ethernet/huawei/hinic/hinic_port.h +4 -0
@@ -736,4 +736,8 @@ int hinic_get_hw_pause_info(struct hinic_hwdev *hwdev,int hinic_set_hw_pause_info (struct hinic_hwdev *hwdev,struct hinic_pause_config *pause_info); +int hinic_open (struct net_device *netdev); + +int hinic_close (struct net_device *netdev); +#endif
Signature · 1 line
2.17.1
From: Luo bin <[email protected]>
Date: Wed, 13 May 2020 22:37:33 +0000
Quoted 3 lines
support to change TX/RX queue depth with ethtool -G
Signed-off-by Luo bin <[email protected]>
Applied.