Skip to content

Commit d379142

Browse files
Sathya Perladavem330
authored andcommitted
be2net: fixup log messages
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>
1 parent 323ff71 commit d379142

File tree

2 files changed

+31
-6
lines changed

2 files changed

+31
-6
lines changed

drivers/net/ethernet/emulex/benet/be_cmds.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2425,6 +2425,9 @@ int be_cmd_req_native_mode(struct be_adapter *adapter)
24252425
struct be_cmd_resp_set_func_cap *resp = embedded_payload(wrb);
24262426
adapter->be3_native = le32_to_cpu(resp->cap_flags) &
24272427
CAPABILITY_BE3_NATIVE_ERX_API;
2428+
if (!adapter->be3_native)
2429+
dev_warn(&adapter->pdev->dev,
2430+
"adapter not in advanced mode\n");
24282431
}
24292432
err:
24302433
mutex_unlock(&adapter->mbox_lock);

drivers/net/ethernet/emulex/benet/be_main.c

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1896,6 +1896,8 @@ static int be_tx_qs_create(struct be_adapter *adapter)
18961896
return status;
18971897
}
18981898

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

@@ -1946,10 +1948,9 @@ static int be_rx_cqs_create(struct be_adapter *adapter)
19461948
return rc;
19471949
}
19481950

1949-
if (adapter->num_rx_qs != MAX_RX_QS)
1950-
dev_info(&adapter->pdev->dev,
1951-
"Created only %d receive queues\n", adapter->num_rx_qs);
1952-
1951+
dev_info(&adapter->pdev->dev,
1952+
"created %d RSS queue(s) and 1 default RX queue\n",
1953+
adapter->num_rx_qs - 1);
19531954
return 0;
19541955
}
19551956

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

21912193
/* If RSS queues are not used, need a vec for default RX Q */
21922194
num_vec = min(be_num_rss_want(adapter), num_online_cpus());
@@ -2211,6 +2213,8 @@ static void be_msix_enable(struct be_adapter *adapter)
22112213
num_vec) == 0)
22122214
goto done;
22132215
}
2216+
2217+
dev_warn(dev, "MSIx enable failed\n");
22142218
return;
22152219
done:
22162220
if (be_roce_supported(adapter)) {
@@ -2224,6 +2228,7 @@ static void be_msix_enable(struct be_adapter *adapter)
22242228
}
22252229
} else
22262230
adapter->num_msix_vec = num_vec;
2231+
dev_info(dev, "enabled %d MSI-x vector(s)\n", adapter->num_msix_vec);
22272232
return;
22282233
}
22292234

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

3805+
static char *mc_name(struct be_adapter *adapter)
3806+
{
3807+
if (adapter->function_mode & FLEX10_MODE)
3808+
return "FLEX10";
3809+
else if (adapter->function_mode & VNIC_MODE)
3810+
return "vNIC";
3811+
else if (adapter->function_mode & UMC_ENABLED)
3812+
return "UMC";
3813+
else
3814+
return "";
3815+
}
3816+
3817+
static inline char *func_name(struct be_adapter *adapter)
3818+
{
3819+
return be_physfn(adapter) ? "PF" : "VF";
3820+
}
3821+
38003822
static int __devinit be_probe(struct pci_dev *pdev,
38013823
const struct pci_device_id *pdev_id)
38023824
{
@@ -3901,8 +3923,8 @@ static int __devinit be_probe(struct pci_dev *pdev,
39013923

39023924
be_cmd_query_port_name(adapter, &port_name);
39033925

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

39073929
return 0;
39083930

0 commit comments

Comments
 (0)