|
|
@@ -340,7 +340,6 @@ static int qed_init_qm_info(struct qed_hwfn *p_hwfn, bool b_sleepable)
|
|
|
return 0;
|
|
|
|
|
|
alloc_err:
|
|
|
- DP_NOTICE(p_hwfn, "Failed to allocate memory for QM params\n");
|
|
|
qed_qm_info_free(p_hwfn);
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
@@ -424,18 +423,12 @@ int qed_resc_alloc(struct qed_dev *cdev)
|
|
|
RESC_NUM(p_hwfn, QED_L2_QUEUE);
|
|
|
|
|
|
p_hwfn->p_tx_cids = kzalloc(tx_size, GFP_KERNEL);
|
|
|
- if (!p_hwfn->p_tx_cids) {
|
|
|
- DP_NOTICE(p_hwfn,
|
|
|
- "Failed to allocate memory for Tx Cids\n");
|
|
|
+ if (!p_hwfn->p_tx_cids)
|
|
|
goto alloc_no_mem;
|
|
|
- }
|
|
|
|
|
|
p_hwfn->p_rx_cids = kzalloc(rx_size, GFP_KERNEL);
|
|
|
- if (!p_hwfn->p_rx_cids) {
|
|
|
- DP_NOTICE(p_hwfn,
|
|
|
- "Failed to allocate memory for Rx Cids\n");
|
|
|
+ if (!p_hwfn->p_rx_cids)
|
|
|
goto alloc_no_mem;
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
for_each_hwfn(cdev, i) {
|
|
|
@@ -522,26 +515,18 @@ int qed_resc_alloc(struct qed_dev *cdev)
|
|
|
|
|
|
/* DMA info initialization */
|
|
|
rc = qed_dmae_info_alloc(p_hwfn);
|
|
|
- if (rc) {
|
|
|
- DP_NOTICE(p_hwfn,
|
|
|
- "Failed to allocate memory for dmae_info structure\n");
|
|
|
+ if (rc)
|
|
|
goto alloc_err;
|
|
|
- }
|
|
|
|
|
|
/* DCBX initialization */
|
|
|
rc = qed_dcbx_info_alloc(p_hwfn);
|
|
|
- if (rc) {
|
|
|
- DP_NOTICE(p_hwfn,
|
|
|
- "Failed to allocate memory for dcbx structure\n");
|
|
|
+ if (rc)
|
|
|
goto alloc_err;
|
|
|
- }
|
|
|
}
|
|
|
|
|
|
cdev->reset_stats = kzalloc(sizeof(*cdev->reset_stats), GFP_KERNEL);
|
|
|
- if (!cdev->reset_stats) {
|
|
|
- DP_NOTICE(cdev, "Failed to allocate reset statistics\n");
|
|
|
+ if (!cdev->reset_stats)
|
|
|
goto alloc_no_mem;
|
|
|
- }
|
|
|
|
|
|
return 0;
|
|
|
|
|
|
@@ -1713,10 +1698,8 @@ static int qed_hw_prepare_single(struct qed_hwfn *p_hwfn,
|
|
|
|
|
|
/* Allocate PTT pool */
|
|
|
rc = qed_ptt_pool_alloc(p_hwfn);
|
|
|
- if (rc) {
|
|
|
- DP_NOTICE(p_hwfn, "Failed to prepare hwfn's hw\n");
|
|
|
+ if (rc)
|
|
|
goto err0;
|
|
|
- }
|
|
|
|
|
|
/* Allocate the main PTT */
|
|
|
p_hwfn->p_main_ptt = qed_get_reserved_ptt(p_hwfn, RESERVED_PTT_MAIN);
|
|
|
@@ -1746,10 +1729,8 @@ static int qed_hw_prepare_single(struct qed_hwfn *p_hwfn,
|
|
|
|
|
|
/* Allocate the init RT array and initialize the init-ops engine */
|
|
|
rc = qed_init_alloc(p_hwfn);
|
|
|
- if (rc) {
|
|
|
- DP_NOTICE(p_hwfn, "Failed to allocate the init array\n");
|
|
|
+ if (rc)
|
|
|
goto err2;
|
|
|
- }
|
|
|
|
|
|
return rc;
|
|
|
err2:
|
|
|
@@ -1957,10 +1938,8 @@ qed_chain_alloc_next_ptr(struct qed_dev *cdev, struct qed_chain *p_chain)
|
|
|
p_virt = dma_alloc_coherent(&cdev->pdev->dev,
|
|
|
QED_CHAIN_PAGE_SIZE,
|
|
|
&p_phys, GFP_KERNEL);
|
|
|
- if (!p_virt) {
|
|
|
- DP_NOTICE(cdev, "Failed to allocate chain memory\n");
|
|
|
+ if (!p_virt)
|
|
|
return -ENOMEM;
|
|
|
- }
|
|
|
|
|
|
if (i == 0) {
|
|
|
qed_chain_init_mem(p_chain, p_virt, p_phys);
|
|
|
@@ -1990,10 +1969,8 @@ qed_chain_alloc_single(struct qed_dev *cdev, struct qed_chain *p_chain)
|
|
|
|
|
|
p_virt = dma_alloc_coherent(&cdev->pdev->dev,
|
|
|
QED_CHAIN_PAGE_SIZE, &p_phys, GFP_KERNEL);
|
|
|
- if (!p_virt) {
|
|
|
- DP_NOTICE(cdev, "Failed to allocate chain memory\n");
|
|
|
+ if (!p_virt)
|
|
|
return -ENOMEM;
|
|
|
- }
|
|
|
|
|
|
qed_chain_init_mem(p_chain, p_virt, p_phys);
|
|
|
qed_chain_reset(p_chain);
|
|
|
@@ -2010,13 +1987,9 @@ static int qed_chain_alloc_pbl(struct qed_dev *cdev, struct qed_chain *p_chain)
|
|
|
void *p_virt = NULL;
|
|
|
|
|
|
size = page_cnt * sizeof(*pp_virt_addr_tbl);
|
|
|
- pp_virt_addr_tbl = vmalloc(size);
|
|
|
- if (!pp_virt_addr_tbl) {
|
|
|
- DP_NOTICE(cdev,
|
|
|
- "Failed to allocate memory for the chain virtual addresses table\n");
|
|
|
+ pp_virt_addr_tbl = vzalloc(size);
|
|
|
+ if (!pp_virt_addr_tbl)
|
|
|
return -ENOMEM;
|
|
|
- }
|
|
|
- memset(pp_virt_addr_tbl, 0, size);
|
|
|
|
|
|
/* The allocation of the PBL table is done with its full size, since it
|
|
|
* is expected to be successive.
|
|
|
@@ -2029,19 +2002,15 @@ static int qed_chain_alloc_pbl(struct qed_dev *cdev, struct qed_chain *p_chain)
|
|
|
size, &p_pbl_phys, GFP_KERNEL);
|
|
|
qed_chain_init_pbl_mem(p_chain, p_pbl_virt, p_pbl_phys,
|
|
|
pp_virt_addr_tbl);
|
|
|
- if (!p_pbl_virt) {
|
|
|
- DP_NOTICE(cdev, "Failed to allocate chain pbl memory\n");
|
|
|
+ if (!p_pbl_virt)
|
|
|
return -ENOMEM;
|
|
|
- }
|
|
|
|
|
|
for (i = 0; i < page_cnt; i++) {
|
|
|
p_virt = dma_alloc_coherent(&cdev->pdev->dev,
|
|
|
QED_CHAIN_PAGE_SIZE,
|
|
|
&p_phys, GFP_KERNEL);
|
|
|
- if (!p_virt) {
|
|
|
- DP_NOTICE(cdev, "Failed to allocate chain memory\n");
|
|
|
+ if (!p_virt)
|
|
|
return -ENOMEM;
|
|
|
- }
|
|
|
|
|
|
if (i == 0) {
|
|
|
qed_chain_init_mem(p_chain, p_virt, p_phys);
|
|
|
@@ -2076,7 +2045,8 @@ int qed_chain_alloc(struct qed_dev *cdev,
|
|
|
rc = qed_chain_alloc_sanity_check(cdev, cnt_type, elem_size, page_cnt);
|
|
|
if (rc) {
|
|
|
DP_NOTICE(cdev,
|
|
|
- "Cannot allocate a chain with the given arguments:\n"
|
|
|
+ "Cannot allocate a chain with the given arguments:\n");
|
|
|
+ DP_NOTICE(cdev,
|
|
|
"[use_mode %d, mode %d, cnt_type %d, num_elems %d, elem_size %zu]\n",
|
|
|
intended_use, mode, cnt_type, num_elems, elem_size);
|
|
|
return rc;
|