Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 88308c01 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qed-ethtool-ops' 



Yuval Mintz says:

====================
qede/qed: Implement various ethtool operations

This series adds several new ethtool operations to qede:
  - {get, set}_channels
  - {get, set}_ringparam
  - set_phys_id
  - nway_reset
  - {get, set}_pauseparam
As well as extending the qed APIs to support these commands.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ee4db742 0f7db144

drivers/net/ethernet/qlogic/qed/qed_hsi.h

+6 −0
Original line number Diff line number Diff line
@@ -3993,6 +3993,8 @@ struct public_drv_mb { 
#define DRV_MSG_CODE_PHY_CORE_WRITE             0x000e0000

#define DRV_MSG_CODE_SET_VERSION                0x000f0000



#define DRV_MSG_CODE_SET_LED_MODE               0x00200000



#define DRV_MSG_SEQ_NUMBER_MASK                 0x0000ffff



	u32 drv_mb_param;
@@ -4044,6 +4046,10 @@ struct public_drv_mb { 
#define DRV_MB_PARAM_CFG_VF_MSIX_SB_NUM_SHIFT   8

#define DRV_MB_PARAM_CFG_VF_MSIX_SB_NUM_MASK    0x0000FF00



#define DRV_MB_PARAM_SET_LED_MODE_OPER          0x0

#define DRV_MB_PARAM_SET_LED_MODE_ON            0x1

#define DRV_MB_PARAM_SET_LED_MODE_OFF           0x2



	u32 fw_mb_header;

#define FW_MSG_CODE_MASK                        0xffff0000

#define FW_MSG_CODE_DRV_LOAD_ENGINE             0x10100000

drivers/net/ethernet/qlogic/qed/qed_main.c

+18 −0
Original line number Diff line number Diff line
@@ -1135,6 +1135,23 @@ static int qed_drain(struct qed_dev *cdev) 
	return 0;

}



static int qed_set_led(struct qed_dev *cdev, enum qed_led_mode mode)

{

	struct qed_hwfn *hwfn = QED_LEADING_HWFN(cdev);

	struct qed_ptt *ptt;

	int status = 0;



	ptt = qed_ptt_acquire(hwfn);

	if (!ptt)

		return -EAGAIN;



	status = qed_mcp_set_led(hwfn, ptt, mode);



	qed_ptt_release(hwfn, ptt);



	return status;

}



const struct qed_common_ops qed_common_ops_pass = {

	.probe = &qed_probe,

	.remove = &qed_remove,
@@ -1155,6 +1172,7 @@ const struct qed_common_ops qed_common_ops_pass = { 
	.update_msglvl = &qed_init_dp,

	.chain_alloc = &qed_chain_alloc,

	.chain_free = &qed_chain_free,

	.set_led = &qed_set_led,

};



u32 qed_get_protocol_version(enum qed_protocol protocol)

drivers/net/ethernet/qlogic/qed/qed_mcp.c

+27 −0
Original line number Diff line number Diff line
@@ -858,3 +858,30 @@ qed_mcp_send_drv_version(struct qed_hwfn *p_hwfn, 


	return 0;

}



int qed_mcp_set_led(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt,

		    enum qed_led_mode mode)

{

	u32 resp = 0, param = 0, drv_mb_param;

	int rc;



	switch (mode) {

	case QED_LED_MODE_ON:

		drv_mb_param = DRV_MB_PARAM_SET_LED_MODE_ON;

		break;

	case QED_LED_MODE_OFF:

		drv_mb_param = DRV_MB_PARAM_SET_LED_MODE_OFF;

		break;

	case QED_LED_MODE_RESTORE:

		drv_mb_param = DRV_MB_PARAM_SET_LED_MODE_OPER;

		break;

	default:

		DP_NOTICE(p_hwfn, "Invalid LED mode %d\n", mode);

		return -EINVAL;

	}



	rc = qed_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_SET_LED_MODE,

			 drv_mb_param, &resp, &param);



	return rc;

}

drivers/net/ethernet/qlogic/qed/qed_mcp.h

+13 −0
Original line number Diff line number Diff line
@@ -224,6 +224,19 @@ qed_mcp_send_drv_version(struct qed_hwfn *p_hwfn, 
			 struct qed_ptt *p_ptt,

			 struct qed_mcp_drv_version *p_ver);



/**

 * @brief Set LED status

 *

 *  @param p_hwfn

 *  @param p_ptt

 *  @param mode - LED mode

 *

 * @return int - 0 - operation was successful.

 */

int qed_mcp_set_led(struct qed_hwfn *p_hwfn,

		    struct qed_ptt *p_ptt,

		    enum qed_led_mode mode);



/* Using hwfn number (and not pf_num) is required since in CMT mode,

 * same pf_num may be used by two different hwfn

 * TODO - this shouldn't really be in .h file, but until all fields

drivers/net/ethernet/qlogic/qede/qede.h

+3 −2
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ struct qede_dev { 
				 (edev)->dev_info.num_tc)



	struct qede_fastpath		*fp_array;

	u16				req_rss;

	u16				num_rss;

	u8				num_tc;

#define QEDE_RSS_CNT(edev)		((edev)->num_rss)
@@ -269,13 +270,13 @@ int qede_change_mtu(struct net_device *dev, int new_mtu); 
void qede_fill_by_demand_stats(struct qede_dev *edev);



#define RX_RING_SIZE_POW	13

#define RX_RING_SIZE		BIT(RX_RING_SIZE_POW)

#define RX_RING_SIZE		((u16)BIT(RX_RING_SIZE_POW))

#define NUM_RX_BDS_MAX		(RX_RING_SIZE - 1)

#define NUM_RX_BDS_MIN		128

#define NUM_RX_BDS_DEF		NUM_RX_BDS_MAX



#define TX_RING_SIZE_POW	13

#define TX_RING_SIZE		BIT(TX_RING_SIZE_POW)

#define TX_RING_SIZE		((u16)BIT(TX_RING_SIZE_POW))

#define NUM_TX_BDS_MAX		(TX_RING_SIZE - 1)

#define NUM_TX_BDS_MIN		128

#define NUM_TX_BDS_DEF		NUM_TX_BDS_MAX