Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 659c805c authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

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: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ebcd4eeb

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

+5 −1
Original line number Diff line number Diff line
@@ -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)

drivers/net/ethernet/broadcom/bnxt/bnxt.h

+38 −0
Original line number Diff line number Diff line
@@ -873,6 +873,44 @@ struct bnxt { 
	void __iomem		*bar2;



	u32			reg_base;

	u16			chip_num;

#define CHIP_NUM_57301		0x16c8

#define CHIP_NUM_57302		0x16c9

#define CHIP_NUM_57304		0x16ca

#define CHIP_NUM_57402		0x16d0

#define CHIP_NUM_57404		0x16d1

#define CHIP_NUM_57406		0x16d2



#define CHIP_NUM_57311		0x16ce

#define CHIP_NUM_57312		0x16cf

#define CHIP_NUM_57314		0x16df

#define CHIP_NUM_57412		0x16d6

#define CHIP_NUM_57414		0x16d7

#define CHIP_NUM_57416		0x16d8

#define CHIP_NUM_57417		0x16d9



#define BNXT_CHIP_NUM_5730X(chip_num)		\

	((chip_num) >= CHIP_NUM_57301 &&	\

	 (chip_num) <= CHIP_NUM_57304)



#define BNXT_CHIP_NUM_5740X(chip_num)		\

	((chip_num) >= CHIP_NUM_57402 &&	\

	 (chip_num) <= CHIP_NUM_57406)



#define BNXT_CHIP_NUM_5731X(chip_num)		\

	((chip_num) == CHIP_NUM_57311 ||	\

	 (chip_num) == CHIP_NUM_57312 ||	\

	 (chip_num) == CHIP_NUM_57314)



#define BNXT_CHIP_NUM_5741X(chip_num)		\

	((chip_num) >= CHIP_NUM_57412 &&	\

	 (chip_num) <= CHIP_NUM_57417)



#define BNXT_CHIP_NUM_57X0X(chip_num)		\

	(BNXT_CHIP_NUM_5730X(chip_num) || BNXT_CHIP_NUM_5740X(chip_num))



#define BNXT_CHIP_NUM_57X1X(chip_num)		\

	(BNXT_CHIP_NUM_5731X(chip_num) || BNXT_CHIP_NUM_5741X(chip_num))



	struct net_device	*dev;

	struct pci_dev		*pdev;