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

Commit 462acf6a authored by Tony Nguyen's avatar Tony Nguyen Committed by Jeff Kirsher
Browse files

ice: Enable DDP package download 



Attempt to request an optional device-specific DDP package file
(one with the PCIe Device Serial Number in its name so that different DDP
package files can be used on different devices). If the optional package
file exists, download it to the device. If not, download the default
package file.

Log an appropriate message based on whether or not a DDP package
file exists and the return code from the attempt to download it to the
device.  If the download fails and there is not already a package file on
the device, go into "Safe Mode" where some features are not supported.

Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 32d63fa1

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

+14 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#include <linux/errno.h>

#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/firmware.h>

#include <linux/netdevice.h>

#include <linux/compiler.h>

#include <linux/etherdevice.h>
@@ -307,6 +308,7 @@ enum ice_pf_flags { 
	ICE_FLAG_SRIOV_CAPABLE,

	ICE_FLAG_DCB_CAPABLE,

	ICE_FLAG_DCB_ENA,

	ICE_FLAG_ADV_FEATURES,

	ICE_FLAG_LINK_DOWN_ON_CLOSE_ENA,

	ICE_FLAG_NO_MEDIA,

	ICE_FLAG_FW_LLDP_AGENT,
@@ -404,6 +406,17 @@ ice_irq_dynamic_ena(struct ice_hw *hw, struct ice_vsi *vsi, 
	wr32(hw, GLINT_DYN_CTL(vector), val);

}



/**

 * ice_netdev_to_pf - Retrieve the PF struct associated with a netdev

 * @netdev: pointer to the netdev struct

 */

static inline struct ice_pf *ice_netdev_to_pf(struct net_device *netdev)

{

	struct ice_netdev_priv *np = netdev_priv(netdev);



	return np->vsi->back;

}



/**

 * ice_get_main_vsi - Get the PF VSI

 * @pf: PF instance
@@ -421,6 +434,7 @@ static inline struct ice_vsi *ice_get_main_vsi(struct ice_pf *pf) 
int ice_vsi_setup_tx_rings(struct ice_vsi *vsi);

int ice_vsi_setup_rx_rings(struct ice_vsi *vsi);

void ice_set_ethtool_ops(struct net_device *netdev);

void ice_set_ethtool_safe_mode_ops(struct net_device *netdev);

u16 ice_get_avail_txq_count(struct ice_pf *pf);

u16 ice_get_avail_rxq_count(struct ice_pf *pf);

void ice_update_vsi_stats(struct ice_vsi *vsi);

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

+69 −0
Original line number Diff line number Diff line
@@ -1846,6 +1846,75 @@ ice_discover_caps(struct ice_hw *hw, enum ice_adminq_opc opc) 
	return status;

}



/**

 * ice_set_safe_mode_caps - Override dev/func capabilities when in safe mode

 * @hw: pointer to the hardware structure

 */

void ice_set_safe_mode_caps(struct ice_hw *hw)

{

	struct ice_hw_func_caps *func_caps = &hw->func_caps;

	struct ice_hw_dev_caps *dev_caps = &hw->dev_caps;

	u32 valid_func, rxq_first_id, txq_first_id;

	u32 msix_vector_first_id, max_mtu;

	u32 num_func = 0;

	u8 i;



	/* cache some func_caps values that should be restored after memset */

	valid_func = func_caps->common_cap.valid_functions;

	txq_first_id = func_caps->common_cap.txq_first_id;

	rxq_first_id = func_caps->common_cap.rxq_first_id;

	msix_vector_first_id = func_caps->common_cap.msix_vector_first_id;

	max_mtu = func_caps->common_cap.max_mtu;



	/* unset func capabilities */

	memset(func_caps, 0, sizeof(*func_caps));



	/* restore cached values */

	func_caps->common_cap.valid_functions = valid_func;

	func_caps->common_cap.txq_first_id = txq_first_id;

	func_caps->common_cap.rxq_first_id = rxq_first_id;

	func_caps->common_cap.msix_vector_first_id = msix_vector_first_id;

	func_caps->common_cap.max_mtu = max_mtu;



	/* one Tx and one Rx queue in safe mode */

	func_caps->common_cap.num_rxq = 1;

	func_caps->common_cap.num_txq = 1;



	/* two MSIX vectors, one for traffic and one for misc causes */

	func_caps->common_cap.num_msix_vectors = 2;

	func_caps->guar_num_vsi = 1;



	/* cache some dev_caps values that should be restored after memset */

	valid_func = dev_caps->common_cap.valid_functions;

	txq_first_id = dev_caps->common_cap.txq_first_id;

	rxq_first_id = dev_caps->common_cap.rxq_first_id;

	msix_vector_first_id = dev_caps->common_cap.msix_vector_first_id;

	max_mtu = dev_caps->common_cap.max_mtu;



	/* unset dev capabilities */

	memset(dev_caps, 0, sizeof(*dev_caps));



	/* restore cached values */

	dev_caps->common_cap.valid_functions = valid_func;

	dev_caps->common_cap.txq_first_id = txq_first_id;

	dev_caps->common_cap.rxq_first_id = rxq_first_id;

	dev_caps->common_cap.msix_vector_first_id = msix_vector_first_id;

	dev_caps->common_cap.max_mtu = max_mtu;



	/* valid_func is a bitmap. get number of functions */

#define ICE_MAX_FUNCS 8

	for (i = 0; i < ICE_MAX_FUNCS; i++)

		if (valid_func & BIT(i))

			num_func++;



	/* one Tx and one Rx queue per function in safe mode */

	dev_caps->common_cap.num_rxq = num_func;

	dev_caps->common_cap.num_txq = num_func;



	/* two MSIX vectors per function */

	dev_caps->common_cap.num_msix_vectors = 2 * num_func;

}



/**

 * ice_get_caps - get info about the HW

 * @hw: pointer to the hardware structure

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

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ ice_sq_send_cmd(struct ice_hw *hw, struct ice_ctl_q_info *cq, 
void ice_clear_pxe_mode(struct ice_hw *hw);

enum ice_status ice_get_caps(struct ice_hw *hw);



void ice_set_safe_mode_caps(struct ice_hw *hw);



void ice_dev_onetime_setup(struct ice_hw *hw);



enum ice_status

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

+42 −0
Original line number Diff line number Diff line
@@ -3,6 +3,48 @@ 


#include "ice_dcb_lib.h"



/**

 * ice_vsi_cfg_netdev_tc - Setup the netdev TC configuration

 * @vsi: the VSI being configured

 * @ena_tc: TC map to be enabled

 */

void ice_vsi_cfg_netdev_tc(struct ice_vsi *vsi, u8 ena_tc)

{

	struct net_device *netdev = vsi->netdev;

	struct ice_pf *pf = vsi->back;

	struct ice_dcbx_cfg *dcbcfg;

	u8 netdev_tc;

	int i;



	if (!netdev)

		return;



	if (!ena_tc) {

		netdev_reset_tc(netdev);

		return;

	}



	if (netdev_set_num_tc(netdev, vsi->tc_cfg.numtc))

		return;



	dcbcfg = &pf->hw.port_info->local_dcbx_cfg;



	ice_for_each_traffic_class(i)

		if (vsi->tc_cfg.ena_tc & BIT(i))

			netdev_set_tc_queue(netdev,

					    vsi->tc_cfg.tc_info[i].netdev_tc,

					    vsi->tc_cfg.tc_info[i].qcount_tx,

					    vsi->tc_cfg.tc_info[i].qoffset);



	for (i = 0; i < ICE_MAX_USER_PRIORITY; i++) {

		u8 ets_tc = dcbcfg->etscfg.prio_table[i];



		/* Get the mapped netdev TC# for the UP */

		netdev_tc = vsi->tc_cfg.tc_info[ets_tc].netdev_tc;

		netdev_set_prio_tc_map(netdev, i, netdev_tc);

	}

}



/**

 * ice_dcb_get_ena_tc - return bitmap of enabled TCs

 * @dcbcfg: DCB config to evaluate for enabled TCs

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

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ ice_tx_prepare_vlan_flags_dcb(struct ice_ring *tx_ring, 
void

ice_dcb_process_lldp_set_mib_change(struct ice_pf *pf,

				    struct ice_rq_event_info *event);

void ice_vsi_cfg_netdev_tc(struct ice_vsi *vsi, u8 ena_tc);

static inline void

ice_set_cgd_num(struct ice_tlan_ctx *tlan_ctx, struct ice_ring *ring)

{
@@ -58,5 +59,6 @@ ice_tx_prepare_vlan_flags_dcb(struct ice_ring __always_unused *tx_ring, 
#define ice_vsi_cfg_dcb_rings(vsi) do {} while (0)

#define ice_dcb_process_lldp_set_mib_change(pf, event) do {} while (0)

#define ice_set_cgd_num(tlan_ctx, ring) do {} while (0)

#define ice_vsi_cfg_netdev_tc(vsi, ena_tc) do {} while (0)

#endif /* CONFIG_DCB */

#endif /* _ICE_DCB_LIB_H_ */