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

Commit 6dec1017 authored by Shannon Nelson's avatar Shannon Nelson Committed by Jeff Kirsher
Browse files

i40e: generate fewer startup messages 



Cut down on the number of startup log entries by putting a couple behind
debug flags and combining a couple others into a single line.

Change-ID: I708089f086308f84d43f8b6f0e8a634a02d058fb
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 32b3e08f

drivers/net/ethernet/intel/i40e/i40e.h

+2 −2
Original line number Diff line number Diff line
@@ -582,10 +582,10 @@ struct i40e_device { 
};



/**

 * i40e_fw_version_str - format the FW and NVM version strings

 * i40e_nvm_version_str - format the NVM version strings

 * @hw: ptr to the hardware info

 **/

static inline char *i40e_fw_version_str(struct i40e_hw *hw)

static inline char *i40e_nvm_version_str(struct i40e_hw *hw)

{

	static char buf[32];

drivers/net/ethernet/intel/i40e/i40e_ethtool.c

+1 −1
Original line number Diff line number Diff line
@@ -1122,7 +1122,7 @@ static void i40e_get_drvinfo(struct net_device *netdev, 
	strlcpy(drvinfo->driver, i40e_driver_name, sizeof(drvinfo->driver));

	strlcpy(drvinfo->version, i40e_driver_version_str,

		sizeof(drvinfo->version));

	strlcpy(drvinfo->fw_version, i40e_fw_version_str(&pf->hw),

	strlcpy(drvinfo->fw_version, i40e_nvm_version_str(&pf->hw),

		sizeof(drvinfo->fw_version));

	strlcpy(drvinfo->bus_info, pci_name(pf->pdev),

		sizeof(drvinfo->bus_info));

drivers/net/ethernet/intel/i40e/i40e_main.c

+12 −8
Original line number Diff line number Diff line
@@ -6218,6 +6218,7 @@ static void i40e_config_bridge_mode(struct i40e_veb *veb) 
{

	struct i40e_pf *pf = veb->pf;



	if (pf->hw.debug_mask & I40E_DEBUG_LAN)

		dev_info(&pf->pdev->dev, "enabling bridge mode: %s\n",

			 veb->bridge_mode == BRIDGE_MODE_VEPA ? "VEPA" : "VEB");

	if (veb->bridge_mode & BRIDGE_MODE_VEPA)
@@ -9923,6 +9924,10 @@ static void i40e_print_features(struct i40e_pf *pf) 
	if (pf->flags & I40E_FLAG_FCOE_ENABLED)

		buf += sprintf(buf, "FCOE ");

#endif

	if (pf->flags & I40E_FLAG_VEB_MODE_ENABLED)

		buf += sprintf(buf, "VEB ");

	else

		buf += sprintf(buf, "VEPA ");



	BUG_ON(buf > (string + INFO_STRING_LEN));

	dev_info(&pf->pdev->dev, "%s\n", string);
@@ -10062,13 +10067,12 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	pf->hw.fc.requested_mode = I40E_FC_NONE;



	err = i40e_init_adminq(hw);

	dev_info(&pdev->dev, "%s\n", i40e_fw_version_str(hw));



	/* provide additional fw info, like api and ver */

	dev_info(&pdev->dev, "fw_version:%d.%d.%05d\n",

		 hw->aq.fw_maj_ver, hw->aq.fw_min_ver, hw->aq.fw_build);

	dev_info(&pdev->dev, "fw api version:%d.%d\n",

		 hw->aq.api_maj_ver, hw->aq.api_min_ver);

	/* provide nvm, fw, api versions */

	dev_info(&pdev->dev, "fw %d.%d.%05d api %d.%d nvm %s\n",

		 hw->aq.fw_maj_ver, hw->aq.fw_min_ver, hw->aq.fw_build,

		 hw->aq.api_maj_ver, hw->aq.api_min_ver,

		 i40e_nvm_version_str(hw));



	if (err) {

		dev_info(&pdev->dev,

drivers/net/ethernet/intel/i40e/i40e_ptp.c

+2 −2
Original line number Diff line number Diff line
@@ -674,8 +674,8 @@ void i40e_ptp_init(struct i40e_pf *pf) 
		struct timespec64 ts;

		u32 regval;



		dev_info(&pf->pdev->dev, "%s: added PHC on %s\n", __func__,

			 netdev->name);

		if (pf->hw.debug_mask & I40E_DEBUG_LAN)

			dev_info(&pf->pdev->dev, "PHC enabled\n");

		pf->flags |= I40E_FLAG_PTP;



		/* Ensure the clocks are running. */