diff options
| author | Michael Chan | 2016-06-13 08:25:33 +0200 |
|---|---|---|
| committer | David S. Miller | 2016-06-15 01:16:13 +0200 |
| commit | 659c805cc01b3c5a6d972db0408164371a2bab4b (patch) | |
| tree | 559162748809d496268979c0570a745f21af51d5 /drivers/net/ethernet/broadcom/bnxt/bnxt.c | |
| parent | bnxt_en: Add PCI device ID for 57404 NPAR devices. (diff) | |
| download | kernel-qcow2-linux-659c805cc01b3c5a6d972db0408164371a2bab4b.tar.gz kernel-qcow2-linux-659c805cc01b3c5a6d972db0408164371a2bab4b.tar.xz kernel-qcow2-linux-659c805cc01b3c5a6d972db0408164371a2bab4b.zip | |
bnxt_en: Define the supported chip numbers.
Define all the supported chip numbers and chip categories. Store the
chip_num returned by firmware. If the call to get the version and chip
number fails, we should abort.
Signed-off-by: Michael Chan <michael.chan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/bnxt/bnxt.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/bnxt/bnxt.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 1cf885ad5138..0fd27b0350b1 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c @@ -4037,6 +4037,8 @@ static int bnxt_hwrm_ver_get(struct bnxt *bp) if (resp->hwrm_intf_maj >= 1) bp->hwrm_max_req_len = le16_to_cpu(resp->max_req_win_len); + bp->chip_num = le16_to_cpu(resp->chip_num); + hwrm_ver_get_exit: mutex_unlock(&bp->hwrm_cmd_lock); return rc; @@ -6414,7 +6416,9 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) goto init_err; mutex_init(&bp->hwrm_cmd_lock); - bnxt_hwrm_ver_get(bp); + rc = bnxt_hwrm_ver_get(bp); + if (rc) + goto init_err; rc = bnxt_hwrm_func_drv_rgtr(bp); if (rc) |