Commit 7e408e07 authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Tony Nguyen
Browse files

ice: Drop leading underscores in enum ice_pf_state 



Remove the leading underscores in enum ice_pf_state. This is not really
communicating anything and is unnecessary. No functional change.

Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarTony Brelinski <tonyx.brelinski@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent d41f26b5

drivers/net/ethernet/intel/ice/ice.h

+34 −34
Original line number Diff line number Diff line
@@ -197,45 +197,45 @@ struct ice_sw { 
};



enum ice_pf_state {

	__ICE_TESTING,

	__ICE_DOWN,

	__ICE_NEEDS_RESTART,

	__ICE_PREPARED_FOR_RESET,	/* set by driver when prepared */

	__ICE_RESET_OICR_RECV,		/* set by driver after rcv reset OICR */

	__ICE_PFR_REQ,			/* set by driver and peers */

	__ICE_CORER_REQ,		/* set by driver and peers */

	__ICE_GLOBR_REQ,		/* set by driver and peers */

	__ICE_CORER_RECV,		/* set by OICR handler */

	__ICE_GLOBR_RECV,		/* set by OICR handler */

	__ICE_EMPR_RECV,		/* set by OICR handler */

	__ICE_SUSPENDED,		/* set on module remove path */

	__ICE_RESET_FAILED,		/* set by reset/rebuild */

	ICE_TESTING,

	ICE_DOWN,

	ICE_NEEDS_RESTART,

	ICE_PREPARED_FOR_RESET,	/* set by driver when prepared */

	ICE_RESET_OICR_RECV,		/* set by driver after rcv reset OICR */

	ICE_PFR_REQ,			/* set by driver and peers */

	ICE_CORER_REQ,		/* set by driver and peers */

	ICE_GLOBR_REQ,		/* set by driver and peers */

	ICE_CORER_RECV,		/* set by OICR handler */

	ICE_GLOBR_RECV,		/* set by OICR handler */

	ICE_EMPR_RECV,		/* set by OICR handler */

	ICE_SUSPENDED,		/* set on module remove path */

	ICE_RESET_FAILED,		/* set by reset/rebuild */

	/* When checking for the PF to be in a nominal operating state, the

	 * bits that are grouped at the beginning of the list need to be

	 * checked. Bits occurring before __ICE_STATE_NOMINAL_CHECK_BITS will

	 * checked. Bits occurring before ICE_STATE_NOMINAL_CHECK_BITS will

	 * be checked. If you need to add a bit into consideration for nominal

	 * operating state, it must be added before

	 * __ICE_STATE_NOMINAL_CHECK_BITS. Do not move this entry's position

	 * ICE_STATE_NOMINAL_CHECK_BITS. Do not move this entry's position

	 * without appropriate consideration.

	 */

	__ICE_STATE_NOMINAL_CHECK_BITS,

	__ICE_ADMINQ_EVENT_PENDING,

	__ICE_MAILBOXQ_EVENT_PENDING,

	__ICE_MDD_EVENT_PENDING,

	__ICE_VFLR_EVENT_PENDING,

	__ICE_FLTR_OVERFLOW_PROMISC,

	__ICE_VF_DIS,

	__ICE_CFG_BUSY,

	__ICE_SERVICE_SCHED,

	__ICE_SERVICE_DIS,

	__ICE_FD_FLUSH_REQ,

	__ICE_OICR_INTR_DIS,		/* Global OICR interrupt disabled */

	__ICE_MDD_VF_PRINT_PENDING,	/* set when MDD event handle */

	__ICE_VF_RESETS_DISABLED,	/* disable resets during ice_remove */

	__ICE_LINK_DEFAULT_OVERRIDE_PENDING,

	__ICE_PHY_INIT_COMPLETE,

	__ICE_FD_VF_FLUSH_CTX,		/* set at FD Rx IRQ or timeout */

	__ICE_STATE_NBITS		/* must be last */

	ICE_STATE_NOMINAL_CHECK_BITS,

	ICE_ADMINQ_EVENT_PENDING,

	ICE_MAILBOXQ_EVENT_PENDING,

	ICE_MDD_EVENT_PENDING,

	ICE_VFLR_EVENT_PENDING,

	ICE_FLTR_OVERFLOW_PROMISC,

	ICE_VF_DIS,

	ICE_CFG_BUSY,

	ICE_SERVICE_SCHED,

	ICE_SERVICE_DIS,

	ICE_FD_FLUSH_REQ,

	ICE_OICR_INTR_DIS,		/* Global OICR interrupt disabled */

	ICE_MDD_VF_PRINT_PENDING,	/* set when MDD event handle */

	ICE_VF_RESETS_DISABLED,	/* disable resets during ice_remove */

	ICE_LINK_DEFAULT_OVERRIDE_PENDING,

	ICE_PHY_INIT_COMPLETE,

	ICE_FD_VF_FLUSH_CTX,		/* set at FD Rx IRQ or timeout */

	ICE_STATE_NBITS		/* must be last */

};



enum ice_vsi_state {
@@ -421,7 +421,7 @@ struct ice_pf { 
	u16 num_msix_per_vf;

	/* used to ratelimit the MDD event logging */

	unsigned long last_printed_mdd_jiffies;

	DECLARE_BITMAP(state, __ICE_STATE_NBITS);

	DECLARE_BITMAP(state, ICE_STATE_NBITS);

	DECLARE_BITMAP(flags, ICE_PF_FLAGS_NBITS);

	unsigned long *avail_txqs;	/* bitmap to track PF Tx queue usage */

	unsigned long *avail_rxqs;	/* bitmap to track PF Rx queue usage */

drivers/net/ethernet/intel/ice/ice_ethtool.c

+9 −9
Original line number Diff line number Diff line
@@ -806,7 +806,7 @@ ice_self_test(struct net_device *netdev, struct ethtool_test *eth_test, 
	if (eth_test->flags == ETH_TEST_FL_OFFLINE) {

		netdev_info(netdev, "offline testing starting\n");



		set_bit(__ICE_TESTING, pf->state);

		set_bit(ICE_TESTING, pf->state);



		if (ice_active_vfs(pf)) {

			dev_warn(dev, "Please take active VFs and Netqueues offline and restart the adapter before running NIC diagnostics\n");
@@ -816,7 +816,7 @@ ice_self_test(struct net_device *netdev, struct ethtool_test *eth_test, 
			data[ICE_ETH_TEST_LOOP] = 1;

			data[ICE_ETH_TEST_LINK] = 1;

			eth_test->flags |= ETH_TEST_FL_FAILED;

			clear_bit(__ICE_TESTING, pf->state);

			clear_bit(ICE_TESTING, pf->state);

			goto skip_ol_tests;

		}

		/* If the device is online then take it offline */
@@ -837,7 +837,7 @@ ice_self_test(struct net_device *netdev, struct ethtool_test *eth_test, 
		    data[ICE_ETH_TEST_REG])

			eth_test->flags |= ETH_TEST_FL_FAILED;



		clear_bit(__ICE_TESTING, pf->state);

		clear_bit(ICE_TESTING, pf->state);



		if (if_running) {

			int status = ice_open(netdev);
@@ -1097,7 +1097,7 @@ static int ice_nway_reset(struct net_device *netdev) 
	int err;



	/* If VSI state is up, then restart autoneg with link up */

	if (!test_bit(__ICE_DOWN, vsi->back->state))

	if (!test_bit(ICE_DOWN, vsi->back->state))

		err = ice_set_link(vsi, true);

	else

		err = ice_set_link(vsi, false);
@@ -2282,7 +2282,7 @@ ice_set_link_ksettings(struct net_device *netdev, 
		goto done;

	}



	while (test_and_set_bit(__ICE_CFG_BUSY, pf->state)) {

	while (test_and_set_bit(ICE_CFG_BUSY, pf->state)) {

		timeout--;

		if (!timeout) {

			err = -EBUSY;
@@ -2392,7 +2392,7 @@ ice_set_link_ksettings(struct net_device *netdev, 
	pi->phy.curr_user_speed_req = adv_link_speed;

done:

	kfree(phy_caps);

	clear_bit(__ICE_CFG_BUSY, pf->state);

	clear_bit(ICE_CFG_BUSY, pf->state);



	return err;

}
@@ -2748,7 +2748,7 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring) 
	if (ice_xsk_any_rx_ring_ena(vsi))

		return -EBUSY;



	while (test_and_set_bit(__ICE_CFG_BUSY, pf->state)) {

	while (test_and_set_bit(ICE_CFG_BUSY, pf->state)) {

		timeout--;

		if (!timeout)

			return -EBUSY;
@@ -2927,7 +2927,7 @@ ice_set_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring) 
	}



done:

	clear_bit(__ICE_CFG_BUSY, pf->state);

	clear_bit(ICE_CFG_BUSY, pf->state);

	return err;

}
@@ -3046,7 +3046,7 @@ ice_set_pauseparam(struct net_device *netdev, struct ethtool_pauseparam *pause) 
	}



	/* If we have link and don't have autoneg */

	if (!test_bit(__ICE_DOWN, pf->state) &&

	if (!test_bit(ICE_DOWN, pf->state) &&

	    !(hw_link_info->an_info & ICE_AQ_AN_COMPLETED)) {

		/* Send message that it might not necessarily work*/

		netdev_info(netdev, "Autoneg did not complete so changing settings may not result in an actual change.\n");

drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c

+1 −1
Original line number Diff line number Diff line
@@ -1452,7 +1452,7 @@ int ice_del_fdir_ethtool(struct ice_vsi *vsi, struct ethtool_rxnfc *cmd) 
		return -EBUSY;

	}



	if (test_bit(__ICE_FD_FLUSH_REQ, pf->state))

	if (test_bit(ICE_FD_FLUSH_REQ, pf->state))

		return -EBUSY;



	mutex_lock(&hw->fdir_fltr_lock);

drivers/net/ethernet/intel/ice/ice_lib.c

+9 −9
Original line number Diff line number Diff line
@@ -1502,13 +1502,13 @@ static void ice_vsi_set_rss_flow_fld(struct ice_vsi *vsi) 
 */

bool ice_pf_state_is_nominal(struct ice_pf *pf)

{

	DECLARE_BITMAP(check_bits, __ICE_STATE_NBITS) = { 0 };

	DECLARE_BITMAP(check_bits, ICE_STATE_NBITS) = { 0 };



	if (!pf)

		return false;



	bitmap_set(check_bits, 0, __ICE_STATE_NOMINAL_CHECK_BITS);

	if (bitmap_intersects(pf->state, check_bits, __ICE_STATE_NBITS))

	bitmap_set(check_bits, 0, ICE_STATE_NOMINAL_CHECK_BITS);

	if (bitmap_intersects(pf->state, check_bits, ICE_STATE_NBITS))

		return false;



	return true;
@@ -2811,7 +2811,7 @@ int ice_vsi_release(struct ice_vsi *vsi) 
	ice_vsi_delete(vsi);

	ice_vsi_free_q_vectors(vsi);



	/* make sure unregister_netdev() was called by checking __ICE_DOWN */

	/* make sure unregister_netdev() was called by checking ICE_DOWN */

	if (vsi->netdev && test_bit(ICE_VSI_DOWN, vsi->state)) {

		free_netdev(vsi->netdev);

		vsi->netdev = NULL;
@@ -3140,7 +3140,7 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, bool init_vsi) 
	}

err_vsi:

	ice_vsi_clear(vsi);

	set_bit(__ICE_RESET_FAILED, pf->state);

	set_bit(ICE_RESET_FAILED, pf->state);

	kfree(coalesce);

	return ret;

}
@@ -3151,10 +3151,10 @@ int ice_vsi_rebuild(struct ice_vsi *vsi, bool init_vsi) 
 */

bool ice_is_reset_in_progress(unsigned long *state)

{

	return test_bit(__ICE_RESET_OICR_RECV, state) ||

	       test_bit(__ICE_PFR_REQ, state) ||

	       test_bit(__ICE_CORER_REQ, state) ||

	       test_bit(__ICE_GLOBR_REQ, state);

	return test_bit(ICE_RESET_OICR_RECV, state) ||

	       test_bit(ICE_PFR_REQ, state) ||

	       test_bit(ICE_CORER_REQ, state) ||

	       test_bit(ICE_GLOBR_REQ, state);

}



#ifdef CONFIG_DCB

drivers/net/ethernet/intel/ice/ice_main.c

+117 −117

File changed.

Preview size limit exceeded, changes collapsed.