Commit 3e3c09b0 authored by Vasundhara Volam's avatar Vasundhara Volam Committed by Jakub Kicinski
Browse files

bnxt_en: Move reading VPD info after successful handshake with fw. 



If firmware is in reset or in bad state, it won't be able to return
VPD data.  Move bnxt_vpd_read_info() until after bnxt_fw_init_one_p1()
successfully returns.  By then we would have established proper
communications with the firmware.

Reviewed-by: default avatarEdwin Peer <edwin.peer@broadcom.com>
Signed-off-by: default avatarVasundhara Volam <vasundhara-v.volam@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Acked-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d1cbd165

drivers/net/ethernet/broadcom/bnxt/bnxt.c

+3 −3
Original line number Diff line number Diff line
@@ -12584,9 +12584,6 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	dev->ethtool_ops = &bnxt_ethtool_ops;

	pci_set_drvdata(pdev, dev);



	if (BNXT_PF(bp))

		bnxt_vpd_read_info(bp);



	rc = bnxt_alloc_hwrm_resources(bp);

	if (rc)

		goto init_err_pci_clean;
@@ -12598,6 +12595,9 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (rc)

		goto init_err_pci_clean;



	if (BNXT_PF(bp))

		bnxt_vpd_read_info(bp);



	if (BNXT_CHIP_P5(bp)) {

		bp->flags |= BNXT_FLAG_CHIP_P5;

		if (BNXT_CHIP_SR2(bp))