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

Commit 91725d89 authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

bnxt_en: Add PHY loopback to ethtool self-test. 



It is necessary to disable autoneg before enabling PHY loopback,
otherwise link won't come up.

Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f7dc1ea6

drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c

+60 −2
Original line number Diff line number Diff line
@@ -2192,6 +2192,54 @@ static int bnxt_hwrm_mac_loopback(struct bnxt *bp, bool enable) 
	return hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);

}



static int bnxt_disable_an_for_lpbk(struct bnxt *bp,

				    struct hwrm_port_phy_cfg_input *req)

{

	struct bnxt_link_info *link_info = &bp->link_info;

	u16 fw_advertising = link_info->advertising;

	u16 fw_speed;

	int rc;



	if (!link_info->autoneg)

		return 0;



	fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_1GB;

	if (netif_carrier_ok(bp->dev))

		fw_speed = bp->link_info.link_speed;

	else if (fw_advertising & BNXT_LINK_SPEED_MSK_10GB)

		fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_10GB;

	else if (fw_advertising & BNXT_LINK_SPEED_MSK_25GB)

		fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_25GB;

	else if (fw_advertising & BNXT_LINK_SPEED_MSK_40GB)

		fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_40GB;

	else if (fw_advertising & BNXT_LINK_SPEED_MSK_50GB)

		fw_speed = PORT_PHY_CFG_REQ_FORCE_LINK_SPEED_50GB;



	req->force_link_speed = cpu_to_le16(fw_speed);

	req->flags |= cpu_to_le32(PORT_PHY_CFG_REQ_FLAGS_FORCE |

				  PORT_PHY_CFG_REQ_FLAGS_RESET_PHY);

	rc = hwrm_send_message(bp, req, sizeof(*req), HWRM_CMD_TIMEOUT);

	req->flags = 0;

	req->force_link_speed = cpu_to_le16(0);

	return rc;

}



static int bnxt_hwrm_phy_loopback(struct bnxt *bp, bool enable)

{

	struct hwrm_port_phy_cfg_input req = {0};



	bnxt_hwrm_cmd_hdr_init(bp, &req, HWRM_PORT_PHY_CFG, -1, -1);



	if (enable) {

		bnxt_disable_an_for_lpbk(bp, &req);

		req.lpbk = PORT_PHY_CFG_REQ_LPBK_LOCAL;

	} else {

		req.lpbk = PORT_PHY_CFG_REQ_LPBK_NONE;

	}

	req.enables = cpu_to_le32(PORT_PHY_CFG_REQ_ENABLES_LPBK);

	return hwrm_send_message(bp, &req, sizeof(req), HWRM_CMD_TIMEOUT);

}



static int bnxt_rx_loopback(struct bnxt *bp, struct bnxt_napi *bnapi,

			    u32 raw_cons, int pkt_size)

{
@@ -2318,8 +2366,9 @@ static int bnxt_run_fw_tests(struct bnxt *bp, u8 test_mask, u8 *test_results) 
	return rc;

}



#define BNXT_DRV_TESTS			1

#define BNXT_DRV_TESTS			2

#define BNXT_MACLPBK_TEST_IDX		(bp->num_tests - BNXT_DRV_TESTS)

#define BNXT_PHYLPBK_TEST_IDX		(BNXT_MACLPBK_TEST_IDX + 1)



static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest,

			   u64 *buf)
@@ -2377,8 +2426,15 @@ static void bnxt_self_test(struct net_device *dev, struct ethtool_test *etest, 
		else

			buf[BNXT_MACLPBK_TEST_IDX] = 0;



		bnxt_half_close_nic(bp);

		bnxt_hwrm_mac_loopback(bp, false);

		bnxt_hwrm_phy_loopback(bp, true);

		msleep(1000);

		if (bnxt_run_loopback(bp)) {

			buf[BNXT_PHYLPBK_TEST_IDX] = 1;

			etest->flags |= ETH_TEST_FL_FAILED;

		}

		bnxt_hwrm_phy_loopback(bp, false);

		bnxt_half_close_nic(bp);

		bnxt_open_nic(bp, false, true);

	}

	for (i = 0; i < bp->num_tests - BNXT_DRV_TESTS; i++) {
@@ -2426,6 +2482,8 @@ void bnxt_ethtool_init(struct bnxt *bp) 


		if (i == BNXT_MACLPBK_TEST_IDX) {

			strcpy(str, "Mac loopback test (offline)");

		} else if (i == BNXT_PHYLPBK_TEST_IDX) {

			strcpy(str, "Phy loopback test (offline)");

		} else {

			strlcpy(str, fw_str, ETH_GSTRING_LEN);

			strncat(str, " test", ETH_GSTRING_LEN - strlen(str));