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

Commit 582a1db9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'qed-selftests' 



Sudarsana Reddy Kalluru says:

====================
qed/qede: ethtool selftests support.

This series adds the driver support for following selftests:
1. Register test
2. Memory test
3. Clock test
4. Interrupt test
5. Internal loopback test
Patch (1) adds the qed driver infrastructure for selftests. Patches (2) and
(3) add qede driver support for ethtool selftests.

Please consider applying this series to "net-next".
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 158bc065 16f46bf0

drivers/net/ethernet/qlogic/qed/Makefile

+2 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_QED) := qed.o



qed-y := qed_cxt.o qed_dev.o qed_hw.o qed_init_fw_funcs.o qed_init_ops.o \

	 qed_int.o qed_main.o qed_mcp.o qed_sp_commands.o qed_spq.o qed_l2.o
 
	 qed_int.o qed_main.o qed_mcp.o qed_sp_commands.o qed_spq.o qed_l2.o \

	 qed_selftest.o

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

+13 −0
Original line number Diff line number Diff line
@@ -3857,6 +3857,7 @@ struct public_drv_mb { 
#define DRV_MSG_CODE_PHY_CORE_WRITE             0x000e0000

#define DRV_MSG_CODE_SET_VERSION                0x000f0000



#define DRV_MSG_CODE_BIST_TEST                  0x001e0000

#define DRV_MSG_CODE_SET_LED_MODE               0x00200000



#define DRV_MSG_SEQ_NUMBER_MASK                 0x0000ffff
@@ -3914,6 +3915,18 @@ struct public_drv_mb { 
#define DRV_MB_PARAM_SET_LED_MODE_ON            0x1

#define DRV_MB_PARAM_SET_LED_MODE_OFF           0x2



#define DRV_MB_PARAM_BIST_UNKNOWN_TEST          0

#define DRV_MB_PARAM_BIST_REGISTER_TEST         1

#define DRV_MB_PARAM_BIST_CLOCK_TEST            2



#define DRV_MB_PARAM_BIST_RC_UNKNOWN            0

#define DRV_MB_PARAM_BIST_RC_PASSED             1

#define DRV_MB_PARAM_BIST_RC_FAILED             2

#define DRV_MB_PARAM_BIST_RC_INVALID_PARAMETER          3



#define DRV_MB_PARAM_BIST_TEST_INDEX_SHIFT      0

#define DRV_MB_PARAM_BIST_TEST_INDEX_MASK       0x000000FF



	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

+28 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include "qed_dev_api.h"

#include "qed_mcp.h"

#include "qed_hw.h"

#include "qed_selftest.h"



static char version[] =

	"QLogic FastLinQ 4xxxx Core Module qed " DRV_MODULE_VERSION "\n";
@@ -976,6 +977,25 @@ static int qed_set_link(struct qed_dev *cdev, 
		else

			link_params->pause.forced_tx = false;

	}

	if (params->override_flags & QED_LINK_OVERRIDE_LOOPBACK_MODE) {

		switch (params->loopback_mode) {

		case QED_LINK_LOOPBACK_INT_PHY:

			link_params->loopback_mode = PMM_LOOPBACK_INT_PHY;

			break;

		case QED_LINK_LOOPBACK_EXT_PHY:

			link_params->loopback_mode = PMM_LOOPBACK_EXT_PHY;

			break;

		case QED_LINK_LOOPBACK_EXT:

			link_params->loopback_mode = PMM_LOOPBACK_EXT;

			break;

		case QED_LINK_LOOPBACK_MAC:

			link_params->loopback_mode = PMM_LOOPBACK_MAC;

			break;

		default:

			link_params->loopback_mode = PMM_LOOPBACK_NONE;

			break;

		}

	}



	rc = qed_mcp_set_link(hwfn, ptt, params->link_up);
@@ -1182,7 +1202,15 @@ static int qed_set_led(struct qed_dev *cdev, enum qed_led_mode mode) 
	return status;

}



struct qed_selftest_ops qed_selftest_ops_pass = {

	.selftest_memory = &qed_selftest_memory,

	.selftest_interrupt = &qed_selftest_interrupt,

	.selftest_register = &qed_selftest_register,

	.selftest_clock = &qed_selftest_clock,

};



const struct qed_common_ops qed_common_ops_pass = {

	.selftest = &qed_selftest_ops_pass,

	.probe = &qed_probe,

	.remove = &qed_remove,

	.set_power_state = &qed_set_power_state,

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

+42 −0
Original line number Diff line number Diff line
@@ -1017,3 +1017,45 @@ int qed_mcp_set_led(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt, 


	return rc;

}



int qed_mcp_bist_register_test(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)

{

	u32 drv_mb_param = 0, rsp, param;

	int rc = 0;



	drv_mb_param = (DRV_MB_PARAM_BIST_REGISTER_TEST <<

			DRV_MB_PARAM_BIST_TEST_INDEX_SHIFT);



	rc = qed_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_BIST_TEST,

			 drv_mb_param, &rsp, &param);



	if (rc)

		return rc;



	if (((rsp & FW_MSG_CODE_MASK) != FW_MSG_CODE_OK) ||

	    (param != DRV_MB_PARAM_BIST_RC_PASSED))

		rc = -EAGAIN;



	return rc;

}



int qed_mcp_bist_clock_test(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt)

{

	u32 drv_mb_param, rsp, param;

	int rc = 0;



	drv_mb_param = (DRV_MB_PARAM_BIST_CLOCK_TEST <<

			DRV_MB_PARAM_BIST_TEST_INDEX_SHIFT);



	rc = qed_mcp_cmd(p_hwfn, p_ptt, DRV_MSG_CODE_BIST_TEST,

			 drv_mb_param, &rsp, &param);



	if (rc)

		return rc;



	if (((rsp & FW_MSG_CODE_MASK) != FW_MSG_CODE_OK) ||

	    (param != DRV_MB_PARAM_BIST_RC_PASSED))

		rc = -EAGAIN;



	return rc;

}

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

+22 −0
Original line number Diff line number Diff line
@@ -245,6 +245,28 @@ int qed_mcp_set_led(struct qed_hwfn *p_hwfn, 
		    struct qed_ptt *p_ptt,

		    enum qed_led_mode mode);



/**

 * @brief Bist register test

 *

 *  @param p_hwfn    - hw function

 *  @param p_ptt     - PTT required for register access

 *

 * @return int - 0 - operation was successful.

 */

int qed_mcp_bist_register_test(struct qed_hwfn *p_hwfn,

			       struct qed_ptt *p_ptt);



/**

 * @brief Bist clock test

 *

 *  @param p_hwfn    - hw function

 *  @param p_ptt     - PTT required for register access

 *

 * @return int - 0 - operation was successful.

 */

int qed_mcp_bist_clock_test(struct qed_hwfn *p_hwfn,

			    struct qed_ptt *p_ptt);



/* 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