Commit 49563be8 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bnxt_en-fixes' 



Michael Chan says:

====================
bnxt_en: Bug fixes

The first 2 patches fix 2 potential issues in the aux bus initialization
and error recovery paths.  The 3rd patch fixes a potential PTP TX
timestamp issue during error recovery.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 58effa34 faa12ca2

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

+2 −0
Original line number Diff line number Diff line
@@ -11758,6 +11758,8 @@ static int __bnxt_open_nic(struct bnxt *bp, bool irq_re_init, bool link_re_init) 
	/* VF-reps may need to be re-opened after the PF is re-opened */

	if (BNXT_PF(bp))

		bnxt_vf_reps_open(bp);

	if (bp->ptp_cfg)

		atomic_set(&bp->ptp_cfg->tx_avail, BNXT_MAX_TX_TS);

	bnxt_ptp_init_rtc(bp, true);

	bnxt_ptp_cfg_tstamp_filters(bp);

	bnxt_cfg_usr_fltrs(bp);

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

+5 −1
Original line number Diff line number Diff line
@@ -210,6 +210,9 @@ void bnxt_ulp_start(struct bnxt *bp, int err) 
	if (err)

		return;



	if (edev->ulp_tbl->msix_requested)

		bnxt_fill_msix_vecs(bp, edev->msix_entries);



	if (aux_priv) {

		struct auxiliary_device *adev;
@@ -392,12 +395,13 @@ void bnxt_rdma_aux_device_init(struct bnxt *bp) 
	if (!edev)

		goto aux_dev_uninit;



	aux_priv->edev = edev;



	ulp = kzalloc(sizeof(*ulp), GFP_KERNEL);

	if (!ulp)

		goto aux_dev_uninit;



	edev->ulp_tbl = ulp;

	aux_priv->edev = edev;

	bp->edev = edev;

	bnxt_set_edev_info(edev, bp);