Commit 60fffb3b authored by Yuval Mintz's avatar Yuval Mintz Committed by David S. Miller
Browse files

qed: Turn most GFP_ATOMIC into GFP_KERNEL 



Initial driver submission used GFP_ATOMIC almost inclusively when
allocating memory. We now remedy this point, using GFP_KERNEL where
it's possible.

Signed-off-by: default avatarYuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ea5b2f44

drivers/net/ethernet/qlogic/qed/qed_cxt.c

+1 −1
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ int qed_cxt_mngr_alloc(struct qed_hwfn *p_hwfn) 
	struct qed_cxt_mngr *p_mngr;

	u32 i;



	p_mngr = kzalloc(sizeof(*p_mngr), GFP_ATOMIC);

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

	if (!p_mngr) {

		DP_NOTICE(p_hwfn, "Failed to allocate `struct qed_cxt_mngr'\n");

		return -ENOMEM;

drivers/net/ethernet/qlogic/qed/qed_dev.c

+3 −3
Original line number Diff line number Diff line
@@ -134,17 +134,17 @@ static int qed_init_qm_info(struct qed_hwfn *p_hwfn) 
	/* PQs will be arranged as follows: First per-TC PQ then pure-LB quete.

	 */

	qm_info->qm_pq_params = kzalloc(sizeof(*qm_info->qm_pq_params) *

					num_pqs, GFP_ATOMIC);

					num_pqs, GFP_KERNEL);

	if (!qm_info->qm_pq_params)

		goto alloc_err;



	qm_info->qm_vport_params = kzalloc(sizeof(*qm_info->qm_vport_params) *

					   num_vports, GFP_ATOMIC);

					   num_vports, GFP_KERNEL);

	if (!qm_info->qm_vport_params)

		goto alloc_err;



	qm_info->qm_port_params = kzalloc(sizeof(*qm_info->qm_port_params) *

					  MAX_NUM_PORTS, GFP_ATOMIC);

					  MAX_NUM_PORTS, GFP_KERNEL);

	if (!qm_info->qm_port_params)

		goto alloc_err;

drivers/net/ethernet/qlogic/qed/qed_hw.c

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ struct qed_ptt_pool { 
int qed_ptt_pool_alloc(struct qed_hwfn *p_hwfn)

{

	struct qed_ptt_pool *p_pool = kmalloc(sizeof(*p_pool),

					      GFP_ATOMIC);

					      GFP_KERNEL);

	int i;



	if (!p_pool)

drivers/net/ethernet/qlogic/qed/qed_int.c

+4 −4
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static int qed_int_sb_attn_alloc(struct qed_hwfn *p_hwfn, 
	dma_addr_t p_phys = 0;



	/* SB struct */

	p_sb = kmalloc(sizeof(*p_sb), GFP_ATOMIC);

	p_sb = kmalloc(sizeof(*p_sb), GFP_KERNEL);

	if (!p_sb) {

		DP_NOTICE(cdev, "Failed to allocate `struct qed_sb_attn_info'\n");

		return -ENOMEM;
@@ -666,7 +666,7 @@ static int qed_int_sp_sb_alloc(struct qed_hwfn *p_hwfn, 
	void *p_virt;



	/* SB struct */

	p_sb = kmalloc(sizeof(*p_sb), GFP_ATOMIC);

	p_sb = kmalloc(sizeof(*p_sb), GFP_KERNEL);

	if (!p_sb) {

		DP_NOTICE(p_hwfn, "Failed to allocate `struct qed_sb_info'\n");

		return -ENOMEM;
@@ -946,7 +946,7 @@ int qed_int_igu_read_cam(struct qed_hwfn *p_hwfn, 
	u16 sb_id;

	u16 prev_sb_id = 0xFF;



	p_hwfn->hw_info.p_igu_info = kzalloc(sizeof(*p_igu_info), GFP_ATOMIC);

	p_hwfn->hw_info.p_igu_info = kzalloc(sizeof(*p_igu_info), GFP_KERNEL);



	if (!p_hwfn->hw_info.p_igu_info)

		return -ENOMEM;
@@ -1072,7 +1072,7 @@ static void qed_int_sp_dpc_setup(struct qed_hwfn *p_hwfn) 


static int qed_int_sp_dpc_alloc(struct qed_hwfn *p_hwfn)

{

	p_hwfn->sp_dpc = kmalloc(sizeof(*p_hwfn->sp_dpc), GFP_ATOMIC);

	p_hwfn->sp_dpc = kmalloc(sizeof(*p_hwfn->sp_dpc), GFP_KERNEL);

	if (!p_hwfn->sp_dpc)

		return -ENOMEM;

drivers/net/ethernet/qlogic/qed/qed_mcp.c

+3 −3
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ int qed_mcp_cmd_init(struct qed_hwfn *p_hwfn, 
	u32 size;



	/* Allocate mcp_info structure */

	p_hwfn->mcp_info = kzalloc(sizeof(*p_hwfn->mcp_info), GFP_ATOMIC);

	p_hwfn->mcp_info = kzalloc(sizeof(*p_hwfn->mcp_info), GFP_KERNEL);

	if (!p_hwfn->mcp_info)

		goto err;

	p_info = p_hwfn->mcp_info;
@@ -161,10 +161,10 @@ int qed_mcp_cmd_init(struct qed_hwfn *p_hwfn, 
	}



	size = MFW_DRV_MSG_MAX_DWORDS(p_info->mfw_mb_length) * sizeof(u32);

	p_info->mfw_mb_cur = kzalloc(size, GFP_ATOMIC);

	p_info->mfw_mb_cur = kzalloc(size, GFP_KERNEL);

	p_info->mfw_mb_shadow =

		kzalloc(sizeof(u32) * MFW_DRV_MSG_MAX_DWORDS(

				p_info->mfw_mb_length), GFP_ATOMIC);

				p_info->mfw_mb_length), GFP_KERNEL);

	if (!p_info->mfw_mb_shadow || !p_info->mfw_mb_addr)

		goto err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE