Skip to content

Commit

Permalink
be2net: fixup log messages
Browse files Browse the repository at this point in the history
Added and modified a few log messages mostly in probe path.

Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Sathya Perla authored and David S. Miller committed Sep 30, 2012
1 parent 323ff71 commit d379142
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 6 deletions.
3 changes: 3 additions & 0 deletions drivers/net/ethernet/emulex/benet/be_cmds.c
Original file line number Diff line number Diff line change
Expand Up @@ -2425,6 +2425,9 @@ int be_cmd_req_native_mode(struct be_adapter *adapter)
struct be_cmd_resp_set_func_cap *resp = embedded_payload(wrb);
adapter->be3_native = le32_to_cpu(resp->cap_flags) &
CAPABILITY_BE3_NATIVE_ERX_API;
if (!adapter->be3_native)
dev_warn(&adapter->pdev->dev,
"adapter not in advanced mode\n");
}
err:
mutex_unlock(&adapter->mbox_lock);
Expand Down
34 changes: 28 additions & 6 deletions drivers/net/ethernet/emulex/benet/be_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -1896,6 +1896,8 @@ static int be_tx_qs_create(struct be_adapter *adapter)
return status;
}

dev_info(&adapter->pdev->dev, "created %d TX queue(s)\n",
adapter->num_tx_qs);
return 0;
}

Expand Down Expand Up @@ -1946,10 +1948,9 @@ static int be_rx_cqs_create(struct be_adapter *adapter)
return rc;
}

if (adapter->num_rx_qs != MAX_RX_QS)
dev_info(&adapter->pdev->dev,
"Created only %d receive queues\n", adapter->num_rx_qs);

dev_info(&adapter->pdev->dev,
"created %d RSS queue(s) and 1 default RX queue\n",
adapter->num_rx_qs - 1);
return 0;
}

Expand Down Expand Up @@ -2187,6 +2188,7 @@ static void be_msix_enable(struct be_adapter *adapter)
{
#define BE_MIN_MSIX_VECTORS 1
int i, status, num_vec, num_roce_vec = 0;
struct device *dev = &adapter->pdev->dev;

/* If RSS queues are not used, need a vec for default RX Q */
num_vec = min(be_num_rss_want(adapter), num_online_cpus());
Expand All @@ -2211,6 +2213,8 @@ static void be_msix_enable(struct be_adapter *adapter)
num_vec) == 0)
goto done;
}

dev_warn(dev, "MSIx enable failed\n");
return;
done:
if (be_roce_supported(adapter)) {
Expand All @@ -2224,6 +2228,7 @@ static void be_msix_enable(struct be_adapter *adapter)
}
} else
adapter->num_msix_vec = num_vec;
dev_info(dev, "enabled %d MSI-x vector(s)\n", adapter->num_msix_vec);
return;
}

Expand Down Expand Up @@ -3797,6 +3802,23 @@ static bool be_reset_required(struct be_adapter *adapter)
return be_find_vfs(adapter, ENABLED) > 0 ? false : true;
}

static char *mc_name(struct be_adapter *adapter)
{
if (adapter->function_mode & FLEX10_MODE)
return "FLEX10";
else if (adapter->function_mode & VNIC_MODE)
return "vNIC";
else if (adapter->function_mode & UMC_ENABLED)
return "UMC";
else
return "";
}

static inline char *func_name(struct be_adapter *adapter)
{
return be_physfn(adapter) ? "PF" : "VF";
}

static int __devinit be_probe(struct pci_dev *pdev,
const struct pci_device_id *pdev_id)
{
Expand Down Expand Up @@ -3901,8 +3923,8 @@ static int __devinit be_probe(struct pci_dev *pdev,

be_cmd_query_port_name(adapter, &port_name);

dev_info(&pdev->dev, "%s: %s port %c\n", netdev->name, nic_name(pdev),
port_name);
dev_info(&pdev->dev, "%s: %s %s port %c\n", nic_name(pdev),
func_name(adapter), mc_name(adapter), port_name);

return 0;

Expand Down

0 comments on commit d379142

Please sign in to comment.