qed: Additional work toward cleaning C=1
This cleans many of the warnings that would arise in qed as a result of compilations with C=1; Most of those are the addition of missing 'static' to functions, although there are several other fixes as well. Signed-off-by: Yuval Mintz <Yuval.Mintz@caviumnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Yuval Mintz
David S. Miller
Родитель
0189efb8f4
Коммит
8c93beaf57
|
|
@ -344,14 +344,14 @@ static struct qed_tid_seg *qed_cxt_tid_seg_info(struct qed_hwfn *p_hwfn,
|
|||
return NULL;
|
||||
}
|
||||
|
||||
void qed_cxt_set_srq_count(struct qed_hwfn *p_hwfn, u32 num_srqs)
|
||||
static void qed_cxt_set_srq_count(struct qed_hwfn *p_hwfn, u32 num_srqs)
|
||||
{
|
||||
struct qed_cxt_mngr *p_mgr = p_hwfn->p_cxt_mngr;
|
||||
|
||||
p_mgr->srq_count = num_srqs;
|
||||
}
|
||||
|
||||
u32 qed_cxt_get_srq_count(struct qed_hwfn *p_hwfn)
|
||||
static u32 qed_cxt_get_srq_count(struct qed_hwfn *p_hwfn)
|
||||
{
|
||||
struct qed_cxt_mngr *p_mgr = p_hwfn->p_cxt_mngr;
|
||||
|
||||
|
|
@ -1799,8 +1799,8 @@ int qed_cxt_get_cid_info(struct qed_hwfn *p_hwfn, struct qed_cxt_info *p_info)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void qed_rdma_set_pf_params(struct qed_hwfn *p_hwfn,
|
||||
struct qed_rdma_pf_params *p_params)
|
||||
static void qed_rdma_set_pf_params(struct qed_hwfn *p_hwfn,
|
||||
struct qed_rdma_pf_params *p_params)
|
||||
{
|
||||
u32 num_cons, num_tasks, num_qps, num_mrs, num_srqs;
|
||||
enum protocol_type proto;
|
||||
|
|
|
|||
|
|
@ -405,7 +405,7 @@ struct phy_defs {
|
|||
/***************************** Constant Arrays *******************************/
|
||||
|
||||
/* Debug arrays */
|
||||
static struct dbg_array s_dbg_arrays[MAX_BIN_DBG_BUFFER_TYPE] = { {0} };
|
||||
static struct dbg_array s_dbg_arrays[MAX_BIN_DBG_BUFFER_TYPE] = { {NULL} };
|
||||
|
||||
/* Chip constant definitions array */
|
||||
static struct chip_defs s_chip_defs[MAX_CHIP_IDS] = {
|
||||
|
|
@ -4028,10 +4028,10 @@ static enum dbg_status qed_mcp_trace_read_meta(struct qed_hwfn *p_hwfn,
|
|||
}
|
||||
|
||||
/* Dump MCP Trace */
|
||||
enum dbg_status qed_mcp_trace_dump(struct qed_hwfn *p_hwfn,
|
||||
struct qed_ptt *p_ptt,
|
||||
u32 *dump_buf,
|
||||
bool dump, u32 *num_dumped_dwords)
|
||||
static enum dbg_status qed_mcp_trace_dump(struct qed_hwfn *p_hwfn,
|
||||
struct qed_ptt *p_ptt,
|
||||
u32 *dump_buf,
|
||||
bool dump, u32 *num_dumped_dwords)
|
||||
{
|
||||
u32 trace_data_grc_addr, trace_data_size_bytes, trace_data_size_dwords;
|
||||
u32 trace_meta_size_dwords, running_bundle_id, offset = 0;
|
||||
|
|
@ -4130,10 +4130,10 @@ enum dbg_status qed_mcp_trace_dump(struct qed_hwfn *p_hwfn,
|
|||
}
|
||||
|
||||
/* Dump GRC FIFO */
|
||||
enum dbg_status qed_reg_fifo_dump(struct qed_hwfn *p_hwfn,
|
||||
struct qed_ptt *p_ptt,
|
||||
u32 *dump_buf,
|
||||
bool dump, u32 *num_dumped_dwords)
|
||||
static enum dbg_status qed_reg_fifo_dump(struct qed_hwfn *p_hwfn,
|
||||
struct qed_ptt *p_ptt,
|
||||
u32 *dump_buf,
|
||||
bool dump, u32 *num_dumped_dwords)
|
||||
{
|
||||
u32 offset = 0, dwords_read, size_param_offset;
|
||||
bool fifo_has_data;
|
||||
|
|
@ -4192,10 +4192,10 @@ enum dbg_status qed_reg_fifo_dump(struct qed_hwfn *p_hwfn,
|
|||
}
|
||||
|
||||
/* Dump IGU FIFO */
|
||||
enum dbg_status qed_igu_fifo_dump(struct qed_hwfn *p_hwfn,
|
||||
struct qed_ptt *p_ptt,
|
||||
u32 *dump_buf,
|
||||
bool dump, u32 *num_dumped_dwords)
|
||||
static enum dbg_status qed_igu_fifo_dump(struct qed_hwfn *p_hwfn,
|
||||
struct qed_ptt *p_ptt,
|
||||
u32 *dump_buf,
|
||||
bool dump, u32 *num_dumped_dwords)
|
||||
{
|
||||
u32 offset = 0, dwords_read, size_param_offset;
|
||||
bool fifo_has_data;
|
||||
|
|
@ -4255,10 +4255,11 @@ enum dbg_status qed_igu_fifo_dump(struct qed_hwfn *p_hwfn,
|
|||
}
|
||||
|
||||
/* Protection Override dump */
|
||||
enum dbg_status qed_protection_override_dump(struct qed_hwfn *p_hwfn,
|
||||
struct qed_ptt *p_ptt,
|
||||
u32 *dump_buf,
|
||||
bool dump, u32 *num_dumped_dwords)
|
||||
static enum dbg_status qed_protection_override_dump(struct qed_hwfn *p_hwfn,
|
||||
struct qed_ptt *p_ptt,
|
||||
u32 *dump_buf,
|
||||
bool dump,
|
||||
u32 *num_dumped_dwords)
|
||||
{
|
||||
u32 offset = 0, size_param_offset, override_window_dwords;
|
||||
|
||||
|
|
@ -6339,10 +6340,11 @@ enum dbg_status qed_print_fw_asserts_results(struct qed_hwfn *p_hwfn,
|
|||
}
|
||||
|
||||
/* Wrapper for unifying the idle_chk and mcp_trace api */
|
||||
enum dbg_status qed_print_idle_chk_results_wrapper(struct qed_hwfn *p_hwfn,
|
||||
u32 *dump_buf,
|
||||
u32 num_dumped_dwords,
|
||||
char *results_buf)
|
||||
static enum dbg_status
|
||||
qed_print_idle_chk_results_wrapper(struct qed_hwfn *p_hwfn,
|
||||
u32 *dump_buf,
|
||||
u32 num_dumped_dwords,
|
||||
char *results_buf)
|
||||
{
|
||||
u32 num_errors, num_warnnings;
|
||||
|
||||
|
|
@ -6413,8 +6415,8 @@ static void qed_dbg_print_feature(u8 *p_text_buf, u32 text_size)
|
|||
|
||||
#define QED_RESULTS_BUF_MIN_SIZE 16
|
||||
/* Generic function for decoding debug feature info */
|
||||
enum dbg_status format_feature(struct qed_hwfn *p_hwfn,
|
||||
enum qed_dbg_features feature_idx)
|
||||
static enum dbg_status format_feature(struct qed_hwfn *p_hwfn,
|
||||
enum qed_dbg_features feature_idx)
|
||||
{
|
||||
struct qed_dbg_feature *feature =
|
||||
&p_hwfn->cdev->dbg_params.features[feature_idx];
|
||||
|
|
@ -6480,8 +6482,9 @@ enum dbg_status format_feature(struct qed_hwfn *p_hwfn,
|
|||
}
|
||||
|
||||
/* Generic function for performing the dump of a debug feature. */
|
||||
enum dbg_status qed_dbg_dump(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt,
|
||||
enum qed_dbg_features feature_idx)
|
||||
static enum dbg_status qed_dbg_dump(struct qed_hwfn *p_hwfn,
|
||||
struct qed_ptt *p_ptt,
|
||||
enum qed_dbg_features feature_idx)
|
||||
{
|
||||
struct qed_dbg_feature *feature =
|
||||
&p_hwfn->cdev->dbg_params.features[feature_idx];
|
||||
|
|
|
|||
|
|
@ -497,12 +497,13 @@ int qed_resc_alloc(struct qed_dev *cdev)
|
|||
if (p_hwfn->hw_info.personality == QED_PCI_ETH_ROCE) {
|
||||
num_cons = qed_cxt_get_proto_cid_count(p_hwfn,
|
||||
PROTOCOLID_ROCE,
|
||||
0) * 2;
|
||||
NULL) * 2;
|
||||
n_eqes += num_cons + 2 * MAX_NUM_VFS_BB;
|
||||
} else if (p_hwfn->hw_info.personality == QED_PCI_ISCSI) {
|
||||
num_cons =
|
||||
qed_cxt_get_proto_cid_count(p_hwfn,
|
||||
PROTOCOLID_ISCSI, 0);
|
||||
PROTOCOLID_ISCSI,
|
||||
NULL);
|
||||
n_eqes += 2 * num_cons;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -141,11 +141,11 @@ static void qed_ll2_kill_buffers(struct qed_dev *cdev)
|
|||
qed_ll2_dealloc_buffer(cdev, buffer);
|
||||
}
|
||||
|
||||
void qed_ll2b_complete_rx_packet(struct qed_hwfn *p_hwfn,
|
||||
u8 connection_handle,
|
||||
struct qed_ll2_rx_packet *p_pkt,
|
||||
struct core_rx_fast_path_cqe *p_cqe,
|
||||
bool b_last_packet)
|
||||
static void qed_ll2b_complete_rx_packet(struct qed_hwfn *p_hwfn,
|
||||
u8 connection_handle,
|
||||
struct qed_ll2_rx_packet *p_pkt,
|
||||
struct core_rx_fast_path_cqe *p_cqe,
|
||||
bool b_last_packet)
|
||||
{
|
||||
u16 packet_length = le16_to_cpu(p_cqe->packet_length);
|
||||
struct qed_ll2_buffer *buffer = p_pkt->cookie;
|
||||
|
|
@ -516,7 +516,7 @@ static int qed_ll2_rxq_completion(struct qed_hwfn *p_hwfn, void *cookie)
|
|||
return rc;
|
||||
}
|
||||
|
||||
void qed_ll2_rxq_flush(struct qed_hwfn *p_hwfn, u8 connection_handle)
|
||||
static void qed_ll2_rxq_flush(struct qed_hwfn *p_hwfn, u8 connection_handle)
|
||||
{
|
||||
struct qed_ll2_info *p_ll2_conn = NULL;
|
||||
struct qed_ll2_rx_packet *p_pkt = NULL;
|
||||
|
|
@ -1124,9 +1124,6 @@ static void qed_ll2_prepare_tx_packet_set_bd(struct qed_hwfn *p_hwfn,
|
|||
DMA_REGPAIR_LE(start_bd->addr, first_frag);
|
||||
start_bd->nbytes = cpu_to_le16(first_frag_len);
|
||||
|
||||
SET_FIELD(start_bd->bd_flags.as_bitfield, CORE_TX_BD_FLAGS_ROCE_FLAV,
|
||||
type);
|
||||
|
||||
DP_VERBOSE(p_hwfn,
|
||||
(NETIF_MSG_TX_QUEUED | QED_MSG_LL2),
|
||||
"LL2 [q 0x%02x cid 0x%08x type 0x%08x] Tx Producer at [0x%04x] - set with a %04x bytes %02x BDs buffer at %08x:%08x\n",
|
||||
|
|
|
|||
|
|
@ -1430,7 +1430,7 @@ static int qed_set_led(struct qed_dev *cdev, enum qed_led_mode mode)
|
|||
return status;
|
||||
}
|
||||
|
||||
struct qed_selftest_ops qed_selftest_ops_pass = {
|
||||
static struct qed_selftest_ops qed_selftest_ops_pass = {
|
||||
.selftest_memory = &qed_selftest_memory,
|
||||
.selftest_interrupt = &qed_selftest_interrupt,
|
||||
.selftest_register = &qed_selftest_register,
|
||||
|
|
|
|||
|
|
@ -157,7 +157,8 @@ static int qed_rdma_alloc(struct qed_hwfn *p_hwfn,
|
|||
p_hwfn->p_rdma_info = p_rdma_info;
|
||||
p_rdma_info->proto = PROTOCOLID_ROCE;
|
||||
|
||||
num_cons = qed_cxt_get_proto_cid_count(p_hwfn, p_rdma_info->proto, 0);
|
||||
num_cons = qed_cxt_get_proto_cid_count(p_hwfn, p_rdma_info->proto,
|
||||
NULL);
|
||||
|
||||
p_rdma_info->num_qps = num_cons / 2;
|
||||
|
||||
|
|
@ -831,7 +832,7 @@ static int qed_rdma_alloc_pd(void *rdma_cxt, u16 *pd)
|
|||
return rc;
|
||||
}
|
||||
|
||||
void qed_rdma_free_pd(void *rdma_cxt, u16 pd)
|
||||
static void qed_rdma_free_pd(void *rdma_cxt, u16 pd)
|
||||
{
|
||||
struct qed_hwfn *p_hwfn = (struct qed_hwfn *)rdma_cxt;
|
||||
|
||||
|
|
@ -868,8 +869,9 @@ qed_rdma_toggle_bit_create_resize_cq(struct qed_hwfn *p_hwfn, u16 icid)
|
|||
return toggle_bit;
|
||||
}
|
||||
|
||||
int qed_rdma_create_cq(void *rdma_cxt,
|
||||
struct qed_rdma_create_cq_in_params *params, u16 *icid)
|
||||
static int qed_rdma_create_cq(void *rdma_cxt,
|
||||
struct qed_rdma_create_cq_in_params *params,
|
||||
u16 *icid)
|
||||
{
|
||||
struct qed_hwfn *p_hwfn = (struct qed_hwfn *)rdma_cxt;
|
||||
struct qed_rdma_info *p_info = p_hwfn->p_rdma_info;
|
||||
|
|
@ -952,98 +954,10 @@ err:
|
|||
return rc;
|
||||
}
|
||||
|
||||
int qed_rdma_resize_cq(void *rdma_cxt,
|
||||
struct qed_rdma_resize_cq_in_params *in_params,
|
||||
struct qed_rdma_resize_cq_out_params *out_params)
|
||||
{
|
||||
struct qed_hwfn *p_hwfn = (struct qed_hwfn *)rdma_cxt;
|
||||
struct rdma_resize_cq_output_params *p_ramrod_res;
|
||||
struct rdma_resize_cq_ramrod_data *p_ramrod;
|
||||
enum qed_rdma_toggle_bit toggle_bit;
|
||||
struct qed_sp_init_data init_data;
|
||||
struct qed_spq_entry *p_ent;
|
||||
dma_addr_t ramrod_res_phys;
|
||||
u8 fw_return_code;
|
||||
int rc = -ENOMEM;
|
||||
|
||||
DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "icid = %08x\n", in_params->icid);
|
||||
|
||||
p_ramrod_res =
|
||||
(struct rdma_resize_cq_output_params *)
|
||||
dma_alloc_coherent(&p_hwfn->cdev->pdev->dev,
|
||||
sizeof(struct rdma_resize_cq_output_params),
|
||||
&ramrod_res_phys, GFP_KERNEL);
|
||||
if (!p_ramrod_res) {
|
||||
DP_NOTICE(p_hwfn,
|
||||
"qed resize cq failed: cannot allocate memory (ramrod)\n");
|
||||
return rc;
|
||||
}
|
||||
|
||||
/* Get SPQ entry */
|
||||
memset(&init_data, 0, sizeof(init_data));
|
||||
init_data.cid = in_params->icid;
|
||||
init_data.opaque_fid = p_hwfn->hw_info.opaque_fid;
|
||||
init_data.comp_mode = QED_SPQ_MODE_EBLOCK;
|
||||
|
||||
rc = qed_sp_init_request(p_hwfn, &p_ent,
|
||||
RDMA_RAMROD_RESIZE_CQ,
|
||||
p_hwfn->p_rdma_info->proto, &init_data);
|
||||
if (rc)
|
||||
goto err;
|
||||
|
||||
p_ramrod = &p_ent->ramrod.rdma_resize_cq;
|
||||
|
||||
p_ramrod->flags = 0;
|
||||
|
||||
/* toggle the bit for every resize or create cq for a given icid */
|
||||
toggle_bit = qed_rdma_toggle_bit_create_resize_cq(p_hwfn,
|
||||
in_params->icid);
|
||||
|
||||
SET_FIELD(p_ramrod->flags,
|
||||
RDMA_RESIZE_CQ_RAMROD_DATA_TOGGLE_BIT, toggle_bit);
|
||||
|
||||
SET_FIELD(p_ramrod->flags,
|
||||
RDMA_RESIZE_CQ_RAMROD_DATA_IS_TWO_LEVEL_PBL,
|
||||
in_params->pbl_two_level);
|
||||
|
||||
p_ramrod->pbl_log_page_size = in_params->pbl_page_size_log - 12;
|
||||
p_ramrod->pbl_num_pages = cpu_to_le16(in_params->pbl_num_pages);
|
||||
p_ramrod->max_cqes = cpu_to_le32(in_params->cq_size);
|
||||
DMA_REGPAIR_LE(p_ramrod->pbl_addr, in_params->pbl_ptr);
|
||||
DMA_REGPAIR_LE(p_ramrod->output_params_addr, ramrod_res_phys);
|
||||
|
||||
rc = qed_spq_post(p_hwfn, p_ent, &fw_return_code);
|
||||
if (rc)
|
||||
goto err;
|
||||
|
||||
if (fw_return_code != RDMA_RETURN_OK) {
|
||||
DP_NOTICE(p_hwfn, "fw_return_code = %d\n", fw_return_code);
|
||||
rc = -EINVAL;
|
||||
goto err;
|
||||
}
|
||||
|
||||
out_params->prod = le32_to_cpu(p_ramrod_res->old_cq_prod);
|
||||
out_params->cons = le32_to_cpu(p_ramrod_res->old_cq_cons);
|
||||
|
||||
dma_free_coherent(&p_hwfn->cdev->pdev->dev,
|
||||
sizeof(struct rdma_resize_cq_output_params),
|
||||
p_ramrod_res, ramrod_res_phys);
|
||||
|
||||
DP_VERBOSE(p_hwfn, QED_MSG_RDMA, "Resized CQ, rc = %d\n", rc);
|
||||
|
||||
return rc;
|
||||
|
||||
err: dma_free_coherent(&p_hwfn->cdev->pdev->dev,
|
||||
sizeof(struct rdma_resize_cq_output_params),
|
||||
p_ramrod_res, ramrod_res_phys);
|
||||
DP_NOTICE(p_hwfn, "Resized CQ, Failed - rc = %d\n", rc);
|
||||
|
||||
return rc;
|
||||
}
|
||||
|
||||
int qed_rdma_destroy_cq(void *rdma_cxt,
|
||||
struct qed_rdma_destroy_cq_in_params *in_params,
|
||||
struct qed_rdma_destroy_cq_out_params *out_params)
|
||||
static int
|
||||
qed_rdma_destroy_cq(void *rdma_cxt,
|
||||
struct qed_rdma_destroy_cq_in_params *in_params,
|
||||
struct qed_rdma_destroy_cq_out_params *out_params)
|
||||
{
|
||||
struct qed_hwfn *p_hwfn = (struct qed_hwfn *)rdma_cxt;
|
||||
struct rdma_destroy_cq_output_params *p_ramrod_res;
|
||||
|
|
@ -1164,7 +1078,7 @@ static enum roce_flavor qed_roce_mode_to_flavor(enum roce_mode roce_mode)
|
|||
return flavor;
|
||||
}
|
||||
|
||||
int qed_roce_alloc_cid(struct qed_hwfn *p_hwfn, u16 *cid)
|
||||
static int qed_roce_alloc_cid(struct qed_hwfn *p_hwfn, u16 *cid)
|
||||
{
|
||||
struct qed_rdma_info *p_rdma_info = p_hwfn->p_rdma_info;
|
||||
u32 responder_icid;
|
||||
|
|
@ -1788,9 +1702,9 @@ err:
|
|||
return rc;
|
||||
}
|
||||
|
||||
int qed_roce_query_qp(struct qed_hwfn *p_hwfn,
|
||||
struct qed_rdma_qp *qp,
|
||||
struct qed_rdma_query_qp_out_params *out_params)
|
||||
static int qed_roce_query_qp(struct qed_hwfn *p_hwfn,
|
||||
struct qed_rdma_qp *qp,
|
||||
struct qed_rdma_query_qp_out_params *out_params)
|
||||
{
|
||||
struct roce_query_qp_resp_output_params *p_resp_ramrod_res;
|
||||
struct roce_query_qp_req_output_params *p_req_ramrod_res;
|
||||
|
|
@ -1931,7 +1845,7 @@ err_resp:
|
|||
return rc;
|
||||
}
|
||||
|
||||
int qed_roce_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp)
|
||||
static int qed_roce_destroy_qp(struct qed_hwfn *p_hwfn, struct qed_rdma_qp *qp)
|
||||
{
|
||||
u32 num_invalidated_mw = 0;
|
||||
u32 num_bound_mw = 0;
|
||||
|
|
@ -2033,7 +1947,7 @@ static int qed_rdma_destroy_qp(void *rdma_cxt, struct qed_rdma_qp *qp)
|
|||
return rc;
|
||||
}
|
||||
|
||||
struct qed_rdma_qp *
|
||||
static struct qed_rdma_qp *
|
||||
qed_rdma_create_qp(void *rdma_cxt,
|
||||
struct qed_rdma_create_qp_in_params *in_params,
|
||||
struct qed_rdma_create_qp_out_params *out_params)
|
||||
|
|
|
|||
|
|
@ -95,26 +95,6 @@ struct qed_rdma_info {
|
|||
enum protocol_type proto;
|
||||
};
|
||||
|
||||
struct qed_rdma_resize_cq_in_params {
|
||||
u16 icid;
|
||||
u32 cq_size;
|
||||
bool pbl_two_level;
|
||||
u64 pbl_ptr;
|
||||
u16 pbl_num_pages;
|
||||
u8 pbl_page_size_log;
|
||||
};
|
||||
|
||||
struct qed_rdma_resize_cq_out_params {
|
||||
u32 prod;
|
||||
u32 cons;
|
||||
};
|
||||
|
||||
struct qed_rdma_resize_cnq_in_params {
|
||||
u32 cnq_id;
|
||||
u32 pbl_page_size_log;
|
||||
u64 pbl_ptr;
|
||||
};
|
||||
|
||||
struct qed_rdma_qp {
|
||||
struct regpair qp_handle;
|
||||
struct regpair qp_handle_async;
|
||||
|
|
|
|||
|
|
@ -80,7 +80,6 @@ union ramrod_data {
|
|||
struct roce_destroy_qp_resp_ramrod_data roce_destroy_qp_resp;
|
||||
struct roce_destroy_qp_req_ramrod_data roce_destroy_qp_req;
|
||||
struct rdma_create_cq_ramrod_data rdma_create_cq;
|
||||
struct rdma_resize_cq_ramrod_data rdma_resize_cq;
|
||||
struct rdma_destroy_cq_ramrod_data rdma_destroy_cq;
|
||||
struct rdma_srq_create_ramrod_data rdma_create_srq;
|
||||
struct rdma_srq_destroy_ramrod_data rdma_destroy_srq;
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче