Commit a28ccf1d authored by Nelson Escobar's avatar Nelson Escobar Committed by Jakub Kicinski
Browse files

enic: Move kdump check into enic_adjust_resources() 



Move the kdump check into enic_adjust_resources() so that everything
that modifies resources is in the same function.

Co-developed-by: default avatarJohn Daley <johndale@cisco.com>
Signed-off-by: default avatarJohn Daley <johndale@cisco.com>
Co-developed-by: default avatarSatish Kharat <satishkh@cisco.com>
Signed-off-by: default avatarSatish Kharat <satishkh@cisco.com>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarNelson Escobar <neescoba@cisco.com>
Reviewed-by: default avatarVadim Fedorenko <vadim.fedorenko@linux.dev>
Link: https://patch.msgid.link/20241113-remove_vic_resource_limits-v4-7-a34cf8570c67@cisco.com


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

drivers/net/ethernet/cisco/enic/enic_main.c

+9 −16
Original line number Diff line number Diff line
@@ -2531,6 +2531,15 @@ static int enic_adjust_resources(struct enic *enic) 
		return -ENOSPC;

	}



	if (is_kdump_kernel()) {

		dev_info(enic_get_dev(enic), "Running from within kdump kernel. Using minimal resources\n");

		enic->rq_avail = 1;

		enic->wq_avail = 1;

		enic->config.rq_desc_count = ENIC_MIN_RQ_DESCS;

		enic->config.wq_desc_count = ENIC_MIN_WQ_DESCS;

		enic->config.mtu = min_t(u16, 1500, enic->config.mtu);

	}



	/* if RSS isn't set, then we can only use one RQ */

	if (!ENIC_SETTING(enic, RSS))

		enic->rq_avail = 1;
@@ -2764,18 +2773,6 @@ static void enic_dev_deinit(struct enic *enic) 
	enic_free_enic_resources(enic);

}



static void enic_kdump_kernel_config(struct enic *enic)

{

	if (is_kdump_kernel()) {

		dev_info(enic_get_dev(enic), "Running from within kdump kernel. Using minimal resources\n");

		enic->rq_avail = 1;

		enic->wq_avail = 1;

		enic->config.rq_desc_count = ENIC_MIN_RQ_DESCS;

		enic->config.wq_desc_count = ENIC_MIN_WQ_DESCS;

		enic->config.mtu = min_t(u16, 1500, enic->config.mtu);

	}

}



static int enic_dev_init(struct enic *enic)

{

	struct device *dev = enic_get_dev(enic);
@@ -2811,10 +2808,6 @@ static int enic_dev_init(struct enic *enic) 
		return err;

	}



	/* modify resource count if we are in kdump_kernel

	 */

	enic_kdump_kernel_config(enic);



	/* Set interrupt mode based on system capabilities */



	err = enic_set_intr_mode(enic);