aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/emulex/benet
diff options
context:
space:
mode:
authorSathya Perla <sathya.perla@emulex.com>2014-09-02 00:26:46 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-02 15:45:59 -0400
commitacbafeb1e9daa18d601e9d91b68925e863cc4f6e (patch)
tree066e9234cc50c89ae4d34ec0e22f8afe3ac0d0f3 /drivers/net/ethernet/emulex/benet
parent364a9e93243d1785f310c0964af0e24bf1adac03 (diff)
be2net: add a few log messages
This patch adds the following log messages to help debugging failure cases: 1) log FW version number: this is useful when driver initialization fails and the FW version number cannot be queried via ethtool 2) per function resource limits for BEx chips: these values are currently being printed only for Skyhawk and Lancer 3) PCI BAR mapping failure 4) function_mode/caps queried from FW: this helps catch any FW bugs that could advertise wrong capabilities to the driver Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/emulex/benet')
-rw-r--r--drivers/net/ethernet/emulex/benet/be_cmds.c4
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c20
2 files changed, 16 insertions, 8 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 4370ec1952ac..ca9ec181d807 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -1771,6 +1771,7 @@ int be_cmd_get_fw_ver(struct be_adapter *adapter)
1771 status = be_mcc_notify_wait(adapter); 1771 status = be_mcc_notify_wait(adapter);
1772 if (!status) { 1772 if (!status) {
1773 struct be_cmd_resp_get_fw_version *resp = embedded_payload(wrb); 1773 struct be_cmd_resp_get_fw_version *resp = embedded_payload(wrb);
1774
1774 strcpy(adapter->fw_ver, resp->firmware_version_string); 1775 strcpy(adapter->fw_ver, resp->firmware_version_string);
1775 strcpy(adapter->fw_on_flash, resp->fw_on_flash_version_string); 1776 strcpy(adapter->fw_on_flash, resp->fw_on_flash_version_string);
1776 } 1777 }
@@ -2018,6 +2019,9 @@ int be_cmd_query_fw_cfg(struct be_adapter *adapter)
2018 adapter->function_mode = le32_to_cpu(resp->function_mode); 2019 adapter->function_mode = le32_to_cpu(resp->function_mode);
2019 adapter->function_caps = le32_to_cpu(resp->function_caps); 2020 adapter->function_caps = le32_to_cpu(resp->function_caps);
2020 adapter->asic_rev = le32_to_cpu(resp->asic_revision) & 0xFF; 2021 adapter->asic_rev = le32_to_cpu(resp->asic_revision) & 0xFF;
2022 dev_info(&adapter->pdev->dev,
2023 "FW config: function_mode=0x%x, function_caps=0x%x\n",
2024 adapter->function_mode, adapter->function_caps);
2021 } 2025 }
2022 2026
2023 mutex_unlock(&adapter->mbox_lock); 2027 mutex_unlock(&adapter->mbox_lock);
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 435d060f630b..76567028934f 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -3413,16 +3413,16 @@ static int be_get_resources(struct be_adapter *adapter)
3413 if (be_roce_supported(adapter)) 3413 if (be_roce_supported(adapter))
3414 res.max_evt_qs /= 2; 3414 res.max_evt_qs /= 2;
3415 adapter->res = res; 3415 adapter->res = res;
3416
3417 dev_info(dev, "Max: txqs %d, rxqs %d, rss %d, eqs %d, vfs %d\n",
3418 be_max_txqs(adapter), be_max_rxqs(adapter),
3419 be_max_rss(adapter), be_max_eqs(adapter),
3420 be_max_vfs(adapter));
3421 dev_info(dev, "Max: uc-macs %d, mc-macs %d, vlans %d\n",
3422 be_max_uc(adapter), be_max_mc(adapter),
3423 be_max_vlans(adapter));
3424 } 3416 }
3425 3417
3418 dev_info(dev, "Max: txqs %d, rxqs %d, rss %d, eqs %d, vfs %d\n",
3419 be_max_txqs(adapter), be_max_rxqs(adapter),
3420 be_max_rss(adapter), be_max_eqs(adapter),
3421 be_max_vfs(adapter));
3422 dev_info(dev, "Max: uc-macs %d, mc-macs %d, vlans %d\n",
3423 be_max_uc(adapter), be_max_mc(adapter),
3424 be_max_vlans(adapter));
3425
3426 return 0; 3426 return 0;
3427} 3427}
3428 3428
@@ -3633,6 +3633,7 @@ static int be_setup(struct be_adapter *adapter)
3633 goto err; 3633 goto err;
3634 3634
3635 be_cmd_get_fw_ver(adapter); 3635 be_cmd_get_fw_ver(adapter);
3636 dev_info(dev, "FW version is %s\n", adapter->fw_ver);
3636 3637
3637 if (BE2_chip(adapter) && fw_major_num(adapter->fw_ver) < 4) { 3638 if (BE2_chip(adapter) && fw_major_num(adapter->fw_ver) < 4) {
3638 dev_err(dev, "Firmware on card is old(%s), IRQs may not work.", 3639 dev_err(dev, "Firmware on card is old(%s), IRQs may not work.",
@@ -4506,6 +4507,7 @@ static int be_map_pci_bars(struct be_adapter *adapter)
4506 return 0; 4507 return 0;
4507 4508
4508pci_map_err: 4509pci_map_err:
4510 dev_err(&adapter->pdev->dev, "Error in mapping PCI BARs\n");
4509 be_unmap_pci_bars(adapter); 4511 be_unmap_pci_bars(adapter);
4510 return -ENOMEM; 4512 return -ENOMEM;
4511} 4513}
@@ -4822,6 +4824,8 @@ static int be_probe(struct pci_dev *pdev, const struct pci_device_id *pdev_id)
4822 struct net_device *netdev; 4824 struct net_device *netdev;
4823 char port_name; 4825 char port_name;
4824 4826
4827 dev_info(&pdev->dev, "%s version is %s\n", DRV_NAME, DRV_VER);
4828
4825 status = pci_enable_device(pdev); 4829 status = pci_enable_device(pdev);
4826 if (status) 4830 if (status)
4827 goto do_none; 4831 goto do_none;