Commit e50dc4c2 authored by Michael Chan's avatar Michael Chan Committed by Jakub Kicinski
Browse files

bnxt_en: Free bp->ctx inside bnxt_free_ctx_mem() 



We always free bp->ctx right after calling bnxt_free_ctx_mem(), so just
free it at the end of that function to make things simpler.

Reviewed-by: default avatarSomnath Kotur <somnath.kotur@broadcom.com>
Signed-off-by: default avatarMichael Chan <michael.chan@broadcom.com>
Link: https://lore.kernel.org/r/20231120234405.194542-3-michael.chan@broadcom.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent aa8460ba

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

+2 −12
Original line number Diff line number Diff line
@@ -7552,6 +7552,8 @@ void bnxt_free_ctx_mem(struct bnxt *bp) 
	bnxt_free_ctx_pg_tbls(bp, &ctx->srq_mem);

	bnxt_free_ctx_pg_tbls(bp, &ctx->qp_mem);

	ctx->flags &= ~BNXT_CTX_FLAG_INITED;

	kfree(ctx);

	bp->ctx = NULL;

}



static int bnxt_alloc_ctx_mem(struct bnxt *bp)
@@ -10321,8 +10323,6 @@ static int bnxt_hwrm_if_change(struct bnxt *bp, bool up) 
			if (!test_bit(BNXT_STATE_IN_FW_RESET, &bp->state))

				bnxt_ulp_stop(bp);

			bnxt_free_ctx_mem(bp);

			kfree(bp->ctx);

			bp->ctx = NULL;

			bnxt_dcb_free(bp);

			rc = bnxt_fw_init_one(bp);

			if (rc) {
@@ -11948,8 +11948,6 @@ static void bnxt_fw_reset_close(struct bnxt *bp) 
	if (pci_is_enabled(bp->pdev))

		pci_disable_device(bp->pdev);

	bnxt_free_ctx_mem(bp);

	kfree(bp->ctx);

	bp->ctx = NULL;

}



static bool is_bnxt_fw_ok(struct bnxt *bp)
@@ -13368,8 +13366,6 @@ static void bnxt_remove_one(struct pci_dev *pdev) 
	bp->fw_health = NULL;

	bnxt_cleanup_pci(bp);

	bnxt_free_ctx_mem(bp);

	kfree(bp->ctx);

	bp->ctx = NULL;

	kfree(bp->rss_indir_tbl);

	bp->rss_indir_tbl = NULL;

	bnxt_free_port_stats(bp);
@@ -13969,8 +13965,6 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	bp->fw_health = NULL;

	bnxt_cleanup_pci(bp);

	bnxt_free_ctx_mem(bp);

	kfree(bp->ctx);

	bp->ctx = NULL;

	kfree(bp->rss_indir_tbl);

	bp->rss_indir_tbl = NULL;
@@ -14023,8 +14017,6 @@ static int bnxt_suspend(struct device *device) 
	bnxt_hwrm_func_drv_unrgtr(bp);

	pci_disable_device(bp->pdev);

	bnxt_free_ctx_mem(bp);

	kfree(bp->ctx);

	bp->ctx = NULL;

	rtnl_unlock();

	return rc;

}
@@ -14121,8 +14113,6 @@ static pci_ers_result_t bnxt_io_error_detected(struct pci_dev *pdev, 
	if (pci_is_enabled(pdev))

		pci_disable_device(pdev);

	bnxt_free_ctx_mem(bp);

	kfree(bp->ctx);

	bp->ctx = NULL;

	rtnl_unlock();



	/* Request a slot slot reset. */

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

+0 −2
Original line number Diff line number Diff line
@@ -469,8 +469,6 @@ static int bnxt_dl_reload_down(struct devlink *dl, bool netns_change, 
		}

		bnxt_cancel_reservations(bp, false);

		bnxt_free_ctx_mem(bp);

		kfree(bp->ctx);

		bp->ctx = NULL;

		break;

	}

	case DEVLINK_RELOAD_ACTION_FW_ACTIVATE: {