UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Shannon Nelson <shannon.nelson@intel.com>
Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Shannon Nelson 2015-09-28 14:12:30 -04:00 committed by Jeff Kirsher
parent 32b3e08fff
commit 6dec101765
4 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/intel/i40e/i40e.h
View File

@ -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 * @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]; static char buf[32];

2
drivers/net/ethernet/intel/i40e/i40e_ethtool.c
View File

@ -1122,7 +1122,7 @@ static void i40e_get_drvinfo(struct net_device *netdev,
strlcpy(drvinfo->driver, i40e_driver_name, sizeof(drvinfo->driver)); strlcpy(drvinfo->driver, i40e_driver_name, sizeof(drvinfo->driver));
strlcpy(drvinfo->version, i40e_driver_version_str, strlcpy(drvinfo->version, i40e_driver_version_str,
sizeof(drvinfo->version)); 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)); sizeof(drvinfo->fw_version));
strlcpy(drvinfo->bus_info, pci_name(pf->pdev), strlcpy(drvinfo->bus_info, pci_name(pf->pdev),
sizeof(drvinfo->bus_info)); sizeof(drvinfo->bus_info));

20
drivers/net/ethernet/intel/i40e/i40e_main.c
View File

@ -6218,8 +6218,9 @@ static void i40e_config_bridge_mode(struct i40e_veb *veb)
{ {
struct i40e_pf *pf = veb->pf; struct i40e_pf *pf = veb->pf;
dev_info(&pf->pdev->dev, "enabling bridge mode: %s\n", if (pf->hw.debug_mask & I40E_DEBUG_LAN)
veb->bridge_mode == BRIDGE_MODE_VEPA ? "VEPA" : "VEB"); 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) if (veb->bridge_mode & BRIDGE_MODE_VEPA)
i40e_disable_pf_switch_lb(pf); i40e_disable_pf_switch_lb(pf);
else else
@ -9923,6 +9924,10 @@ static void i40e_print_features(struct i40e_pf *pf)
if (pf->flags & I40E_FLAG_FCOE_ENABLED) if (pf->flags & I40E_FLAG_FCOE_ENABLED)
buf += sprintf(buf, "FCOE "); buf += sprintf(buf, "FCOE ");
#endif #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)); BUG_ON(buf > (string + INFO_STRING_LEN));
dev_info(&pf->pdev->dev, "%s\n", string); 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; pf->hw.fc.requested_mode = I40E_FC_NONE;
err = i40e_init_adminq(hw); err = i40e_init_adminq(hw);
dev_info(&pdev->dev, "%s\n", i40e_fw_version_str(hw));
/* provide additional fw info, like api and ver */ /* provide nvm, fw, api versions */
dev_info(&pdev->dev, "fw_version:%d.%d.%05d\n", 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.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,
hw->aq.api_maj_ver, hw->aq.api_min_ver); i40e_nvm_version_str(hw));
if (err) { if (err) {
dev_info(&pdev->dev, dev_info(&pdev->dev,

4
drivers/net/ethernet/intel/i40e/i40e_ptp.c
View File

@ -674,8 +674,8 @@ void i40e_ptp_init(struct i40e_pf *pf)
struct timespec64 ts; struct timespec64 ts;
u32 regval; u32 regval;
dev_info(&pf->pdev->dev, "%s: added PHC on %s\n", __func__, if (pf->hw.debug_mask & I40E_DEBUG_LAN)
netdev->name); dev_info(&pf->pdev->dev, "PHC enabled\n");
pf->flags |= I40E_FLAG_PTP; pf->flags |= I40E_FLAG_PTP;
/* Ensure the clocks are running. */ /* Ensure the clocks are running. */