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

Commit c993e7aa authored by Michael Chan's avatar Michael Chan Committed by Greg Kroah-Hartman
Browse files

bnxt_en: Refresh RoCE capabilities in bnxt_ulp_probe() 



[ Upstream commit 2c9f046bc377efd1f5e26e74817d5f96e9506c86 ]

The capabilities can change after firmware upgrade/downgrade, so we
should get the up-to-date RoCE capabilities everytime bnxt_ulp_probe()
is called.

Fixes: 2151fe08 ("bnxt_en: Handle RESET_NOTIFY async event from firmware.")
Reviewed-by: default avatarSomnath Kotur <somnath.kotur@broadcom.com>
Reviewed-by: default avatarEdwin Peer <edwin.peer@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6ee8e6be

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

+5 −4
Original line number Diff line number Diff line
@@ -473,13 +473,14 @@ struct bnxt_en_dev *bnxt_ulp_probe(struct net_device *dev) 
		if (!edev)

			return ERR_PTR(-ENOMEM);

		edev->en_ops = &bnxt_en_ops_tbl;

		if (bp->flags & BNXT_FLAG_ROCEV1_CAP)

			edev->flags |= BNXT_EN_FLAG_ROCEV1_CAP;

		if (bp->flags & BNXT_FLAG_ROCEV2_CAP)

			edev->flags |= BNXT_EN_FLAG_ROCEV2_CAP;

		edev->net = dev;

		edev->pdev = bp->pdev;

		bp->edev = edev;

	}

	edev->flags &= ~BNXT_EN_FLAG_ROCE_CAP;

	if (bp->flags & BNXT_FLAG_ROCEV1_CAP)

		edev->flags |= BNXT_EN_FLAG_ROCEV1_CAP;

	if (bp->flags & BNXT_FLAG_ROCEV2_CAP)

		edev->flags |= BNXT_EN_FLAG_ROCEV2_CAP;

	return bp->edev;

}