Commit 5e370403 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bnxt_en-next' 



Michael Chan says:

====================
bnxt_en: Update for net-next

The first 2 patches are fixes for the recently added hwmon changes.
The next 6 patches are enhancements to support ethtool lanes and
all the proper supported and advertised link modes.  Before these
patches, the driver was only supporting the link modes for copper
media.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e10f4019 5d4e1bf6

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

+87 −38
Original line number Diff line number Diff line
@@ -2129,6 +2129,48 @@ static u16 bnxt_agg_ring_id_to_grp_idx(struct bnxt *bp, u16 ring_id) 
	return INVALID_HW_RING_ID;

}



static u16 bnxt_get_force_speed(struct bnxt_link_info *link_info)

{

	if (link_info->req_signal_mode == BNXT_SIG_MODE_PAM4)

		return link_info->force_pam4_link_speed;

	return link_info->force_link_speed;

}



static void bnxt_set_force_speed(struct bnxt_link_info *link_info)

{

	link_info->req_link_speed = link_info->force_link_speed;

	link_info->req_signal_mode = BNXT_SIG_MODE_NRZ;

	if (link_info->force_pam4_link_speed) {

		link_info->req_link_speed = link_info->force_pam4_link_speed;

		link_info->req_signal_mode = BNXT_SIG_MODE_PAM4;

	}

}



static void bnxt_set_auto_speed(struct bnxt_link_info *link_info)

{

	link_info->advertising = link_info->auto_link_speeds;

	link_info->advertising_pam4 = link_info->auto_pam4_link_speeds;

}



static bool bnxt_force_speed_updated(struct bnxt_link_info *link_info)

{

	if (link_info->req_signal_mode == BNXT_SIG_MODE_NRZ &&

	    link_info->req_link_speed != link_info->force_link_speed)

		return true;

	if (link_info->req_signal_mode == BNXT_SIG_MODE_PAM4 &&

	    link_info->req_link_speed != link_info->force_pam4_link_speed)

		return true;

	return false;

}



static bool bnxt_auto_speed_updated(struct bnxt_link_info *link_info)

{

	if (link_info->advertising != link_info->auto_link_speeds ||

	    link_info->advertising_pam4 != link_info->auto_pam4_link_speeds)

		return true;

	return false;

}



#define BNXT_EVENT_THERMAL_CURRENT_TEMP(data2)				\

	((data2) &							\

	  ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA2_CURRENT_TEMP_MASK)
@@ -2147,7 +2189,8 @@ static u16 bnxt_agg_ring_id_to_grp_idx(struct bnxt *bp, u16 ring_id) 
	  ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_TRANSITION_DIR) ==\

	 ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_TRANSITION_DIR_INCREASING)



static void bnxt_event_error_report(struct bnxt *bp, u32 data1, u32 data2)

/* Return true if the workqueue has to be scheduled */

static bool bnxt_event_error_report(struct bnxt *bp, u32 data1, u32 data2)

{

	u32 err_type = BNXT_EVENT_ERROR_REPORT_TYPE(data1);
@@ -2165,6 +2208,7 @@ static void bnxt_event_error_report(struct bnxt *bp, u32 data1, u32 data2) 
	case ASYNC_EVENT_CMPL_ERROR_REPORT_BASE_EVENT_DATA1_ERROR_TYPE_THERMAL_THRESHOLD: {

		u32 type = EVENT_DATA1_THERMAL_THRESHOLD_TYPE(data1);

		char *threshold_type;

		bool notify = false;

		char *dir_str;



		switch (type) {
@@ -2182,25 +2226,32 @@ static void bnxt_event_error_report(struct bnxt *bp, u32 data1, u32 data2) 
			break;

		default:

			netdev_err(bp->dev, "Unknown Thermal threshold type event\n");

			return;

			return false;

		}

		if (EVENT_DATA1_THERMAL_THRESHOLD_DIR_INCREASING(data1))

		if (EVENT_DATA1_THERMAL_THRESHOLD_DIR_INCREASING(data1)) {

			dir_str = "above";

		else

			notify = true;

		} else {

			dir_str = "below";

		}

		netdev_warn(bp->dev, "Chip temperature has gone %s the %s thermal threshold!\n",

			    dir_str, threshold_type);

		netdev_warn(bp->dev, "Temperature (In Celsius), Current: %lu, threshold: %lu\n",

			    BNXT_EVENT_THERMAL_CURRENT_TEMP(data2),

			    BNXT_EVENT_THERMAL_THRESHOLD_TEMP(data2));

		bnxt_hwmon_notify_event(bp, type);

		break;

		if (notify) {

			bp->thermal_threshold_type = type;

			set_bit(BNXT_THERMAL_THRESHOLD_SP_EVENT, &bp->sp_event);

			return true;

		}

		return false;

	}

	default:

		netdev_err(bp->dev, "FW reported unknown error type %u\n",

			   err_type);

		break;

	}

	return false;

}



#define BNXT_GET_EVENT_PORT(data)	\
@@ -2246,7 +2297,7 @@ static int bnxt_async_event_process(struct bnxt *bp, 
		/* print unsupported speed warning in forced speed mode only */

		if (!(link_info->autoneg & BNXT_AUTONEG_SPEED) &&

		    (data1 & 0x20000)) {

			u16 fw_speed = link_info->force_link_speed;

			u16 fw_speed = bnxt_get_force_speed(link_info);

			u32 speed = bnxt_fw_to_ethtool_speed(fw_speed);



			if (speed != SPEED_UNKNOWN)
@@ -2401,7 +2452,8 @@ static int bnxt_async_event_process(struct bnxt *bp, 
		goto async_event_process_exit;

	}

	case ASYNC_EVENT_CMPL_EVENT_ID_ERROR_REPORT: {

		bnxt_event_error_report(bp, data1, data2);

		if (bnxt_event_error_report(bp, data1, data2))

			break;

		goto async_event_process_exit;

	}

	case ASYNC_EVENT_CMPL_EVENT_ID_PHC_UPDATE: {
@@ -9679,13 +9731,31 @@ static bool bnxt_support_dropped(u16 advertising, u16 supported) 
	return ((supported | diff) != supported);

}



static bool bnxt_support_speed_dropped(struct bnxt_link_info *link_info)

{

	/* Check if any advertised speeds are no longer supported. The caller

	 * holds the link_lock mutex, so we can modify link_info settings.

	 */

	if (bnxt_support_dropped(link_info->advertising,

				 link_info->support_auto_speeds)) {

		link_info->advertising = link_info->support_auto_speeds;

		return true;

	}

	if (bnxt_support_dropped(link_info->advertising_pam4,

				 link_info->support_pam4_auto_speeds)) {

		link_info->advertising_pam4 = link_info->support_pam4_auto_speeds;

		return true;

	}

	return false;

}



int bnxt_update_link(struct bnxt *bp, bool chng_link_state)

{

	struct bnxt_link_info *link_info = &bp->link_info;

	struct hwrm_port_phy_qcfg_output *resp;

	struct hwrm_port_phy_qcfg_input *req;

	u8 link_state = link_info->link_state;

	bool support_changed = false;

	bool support_changed;

	int rc;



	rc = hwrm_req_init(bp, req, HWRM_PORT_PHY_QCFG);
@@ -9799,19 +9869,7 @@ int bnxt_update_link(struct bnxt *bp, bool chng_link_state) 
	if (!BNXT_PHY_CFG_ABLE(bp))

		return 0;



	/* Check if any advertised speeds are no longer supported. The caller

	 * holds the link_lock mutex, so we can modify link_info settings.

	 */

	if (bnxt_support_dropped(link_info->advertising,

				 link_info->support_auto_speeds)) {

		link_info->advertising = link_info->support_auto_speeds;

		support_changed = true;

	}

	if (bnxt_support_dropped(link_info->advertising_pam4,

				 link_info->support_pam4_auto_speeds)) {

		link_info->advertising_pam4 = link_info->support_pam4_auto_speeds;

		support_changed = true;

	}

	support_changed = bnxt_support_speed_dropped(link_info);

	if (support_changed && (link_info->autoneg & BNXT_AUTONEG_SPEED))

		bnxt_hwrm_set_link_setting(bp, true, false);

	return 0;
@@ -10352,19 +10410,14 @@ static int bnxt_update_phy_setting(struct bnxt *bp) 
	if (!(link_info->autoneg & BNXT_AUTONEG_SPEED)) {

		if (BNXT_AUTO_MODE(link_info->auto_mode))

			update_link = true;

		if (link_info->req_signal_mode == BNXT_SIG_MODE_NRZ &&

		    link_info->req_link_speed != link_info->force_link_speed)

			update_link = true;

		else if (link_info->req_signal_mode == BNXT_SIG_MODE_PAM4 &&

			 link_info->req_link_speed != link_info->force_pam4_link_speed)

		if (bnxt_force_speed_updated(link_info))

			update_link = true;

		if (link_info->req_duplex != link_info->duplex_setting)

			update_link = true;

	} else {

		if (link_info->auto_mode == BNXT_LINK_AUTO_NONE)

			update_link = true;

		if (link_info->advertising != link_info->auto_link_speeds ||

		    link_info->advertising_pam4 != link_info->auto_pam4_link_speeds)

		if (bnxt_auto_speed_updated(link_info))

			update_link = true;

	}
@@ -11982,16 +12035,9 @@ static void bnxt_init_ethtool_link_settings(struct bnxt *bp) 
		} else {

			link_info->autoneg |= BNXT_AUTONEG_FLOW_CTRL;

		}

		link_info->advertising = link_info->auto_link_speeds;

		link_info->advertising_pam4 = link_info->auto_pam4_link_speeds;

		bnxt_set_auto_speed(link_info);

	} else {

		link_info->req_link_speed = link_info->force_link_speed;

		link_info->req_signal_mode = BNXT_SIG_MODE_NRZ;

		if (link_info->force_pam4_link_speed) {

			link_info->req_link_speed =

				link_info->force_pam4_link_speed;

			link_info->req_signal_mode = BNXT_SIG_MODE_PAM4;

		}

		bnxt_set_force_speed(link_info);

		link_info->req_duplex = link_info->duplex_setting;

	}

	if (link_info->autoneg & BNXT_AUTONEG_FLOW_CTRL)
@@ -12085,6 +12131,9 @@ static void bnxt_sp_task(struct work_struct *work) 
	if (test_and_clear_bit(BNXT_FW_ECHO_REQUEST_SP_EVENT, &bp->sp_event))

		bnxt_fw_echo_reply(bp);



	if (test_and_clear_bit(BNXT_THERMAL_THRESHOLD_SP_EVENT, &bp->sp_event))

		bnxt_hwmon_notify_event(bp);



	/* These functions below will clear BNXT_STATE_IN_SP_TASK.  They

	 * must be the last functions to be called before exiting.

	 */

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+3 −0
Original line number Diff line number Diff line
@@ -1295,6 +1295,7 @@ struct bnxt_link_info { 
	u8			req_signal_mode;

#define BNXT_SIG_MODE_NRZ	PORT_PHY_QCFG_RESP_SIGNAL_MODE_NRZ

#define BNXT_SIG_MODE_PAM4	PORT_PHY_QCFG_RESP_SIGNAL_MODE_PAM4

#define BNXT_SIG_MODE_MAX	(PORT_PHY_QCFG_RESP_SIGNAL_MODE_LAST + 1)

	u8			req_duplex;

	u8			req_flow_ctrl;

	u16			req_link_speed;
@@ -2094,6 +2095,7 @@ struct bnxt { 
#define BNXT_FW_RESET_NOTIFY_SP_EVENT	18

#define BNXT_FW_EXCEPTION_SP_EVENT	19

#define BNXT_LINK_CFG_CHANGE_SP_EVENT	21

#define BNXT_THERMAL_THRESHOLD_SP_EVENT	22

#define BNXT_FW_ECHO_REQUEST_SP_EVENT	23



	struct delayed_work	fw_reset_task;
@@ -2196,6 +2198,7 @@ struct bnxt { 
	u8			fatal_thresh_temp;

	u8			shutdown_thresh_temp;

#endif

	u32			thermal_threshold_type;

	enum board_idx		board_idx;

};

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

+470 −180

File changed.

Preview size limit exceeded, changes collapsed.

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

+2 −2
Original line number Diff line number Diff line
@@ -18,14 +18,14 @@ 
#include "bnxt_hwrm.h"

#include "bnxt_hwmon.h"



void bnxt_hwmon_notify_event(struct bnxt *bp, u32 type)

void bnxt_hwmon_notify_event(struct bnxt *bp)

{

	u32 attr;



	if (!bp->hwmon_dev)

		return;



	switch (type) {

	switch (bp->thermal_threshold_type) {

	case ASYNC_EVENT_CMPL_ERROR_REPORT_THERMAL_EVENT_DATA1_THRESHOLD_TYPE_WARN:

		attr = hwmon_temp_max_alarm;

		break;

drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.h

+2 −2
Original line number Diff line number Diff line
@@ -11,11 +11,11 @@ 
#define BNXT_HWMON_H



#ifdef CONFIG_BNXT_HWMON

void bnxt_hwmon_notify_event(struct bnxt *bp, u32 type);

void bnxt_hwmon_notify_event(struct bnxt *bp);

void bnxt_hwmon_uninit(struct bnxt *bp);

void bnxt_hwmon_init(struct bnxt *bp);

#else

static inline void bnxt_hwmon_notify_event(struct bnxt *bp, u32 type)

static inline void bnxt_hwmon_notify_event(struct bnxt *bp)

{

}