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

Commit 50e0f5c0 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'ethtool-reset-AP' 



Scott Branden says:

====================
net: ethtool: add support for ETH_RESET_AP

Add support to reset appplication processors inside SmartNICs by
defining new ETH_RESET_AP bit.

And use new ETH_RESET_AP bit in bnxt ethernet driver.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 68bf33f4 6502ad59

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

+11 −0
Original line number Diff line number Diff line
@@ -1376,6 +1376,9 @@ static int bnxt_firmware_reset(struct net_device *dev, 
		req.embedded_proc_type = FW_RESET_REQ_EMBEDDED_PROC_TYPE_CHIP;

		req.selfrst_status = FW_RESET_REQ_SELFRST_STATUS_SELFRSTASAP;

		break;

	case BNXT_FW_RESET_AP:

		req.embedded_proc_type = FW_RESET_REQ_EMBEDDED_PROC_TYPE_AP;

		break;

	default:

		return -EINVAL;

	}
@@ -2522,6 +2525,14 @@ static int bnxt_reset(struct net_device *dev, u32 *flags) 
		rc = bnxt_firmware_reset(dev, BNXT_FW_RESET_CHIP);

		if (!rc)

			netdev_info(dev, "Reset request successful. Reload driver to complete reset\n");

	} else if (*flags == ETH_RESET_AP) {

		/* This feature is not supported in older firmware versions */

		if (bp->hwrm_spec_code < 0x10803)

			return -EOPNOTSUPP;



		rc = bnxt_firmware_reset(dev, BNXT_FW_RESET_AP);

		if (!rc)

			netdev_info(dev, "Reset Application Processor request successful.\n");

	} else {

		rc = -EINVAL;

	}

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

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ struct bnxt_led_cfg { 
#define BNXT_LED_DFLT_ENABLES(x)			\

	cpu_to_le32(BNXT_LED_DFLT_ENA << (BNXT_LED_DFLT_ENA_SHIFT * (x)))



#define BNXT_FW_RESET_AP	0xfffe

#define BNXT_FW_RESET_CHIP	0xffff



extern const struct ethtool_ops bnxt_ethtool_ops;

include/uapi/linux/ethtool.h

+1 −0
Original line number Diff line number Diff line
@@ -1686,6 +1686,7 @@ enum ethtool_reset_flags { 
	ETH_RESET_PHY		= 1 << 6,	/* Transceiver/PHY */

	ETH_RESET_RAM		= 1 << 7,	/* RAM shared between

						 * multiple components */

	ETH_RESET_AP		= 1 << 8,	/* Application processor */



	ETH_RESET_DEDICATED	= 0x0000ffff,	/* All components dedicated to

						 * this interface */