From 9a7a45c4dbc773c6b051399544ec3c7b199ceebb Mon Sep 17 00:00:00 2001 From: Knut Omang Date: Wed, 31 Aug 2016 09:38:31 +0200 Subject: [PATCH] sif: Fix recently introduced checkpatch issues MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It appears the commit check in checkpatch does not capture all errors. Fix the new ones inthe driver code to allow us to enable a regression test for it. Orabug: 24570578 Signed-off-by: Knut Omang Reviewed-by: Åsmund Østvold Signed-off-by: Knut Omang --- drivers/infiniband/hw/sif/psif_api.h | 2 +- drivers/infiniband/hw/sif/psif_hw_data.h | 3 ++- drivers/infiniband/hw/sif/psif_hw_data_be.h | 5 +++-- drivers/infiniband/hw/sif/psif_hw_data_le.h | 5 +++-- drivers/infiniband/hw/sif/sif_base.c | 2 +- drivers/infiniband/hw/sif/sif_cq.c | 9 +++++---- drivers/infiniband/hw/sif/sif_dev.h | 4 ++-- drivers/infiniband/hw/sif/sif_epsc.c | 2 +- drivers/infiniband/hw/sif/sif_eq.c | 8 +++++--- drivers/infiniband/hw/sif/sif_hwmon.c | 6 +++--- drivers/infiniband/hw/sif/sif_qp.c | 8 +++++--- drivers/infiniband/hw/sif/sif_r3.c | 4 +++- drivers/infiniband/hw/sif/sif_rq.c | 3 +-- 13 files changed, 35 insertions(+), 26 deletions(-) diff --git a/drivers/infiniband/hw/sif/psif_api.h b/drivers/infiniband/hw/sif/psif_api.h index 1b991507cda4f..aea51ba653fcb 100644 --- a/drivers/infiniband/hw/sif/psif_api.h +++ b/drivers/infiniband/hw/sif/psif_api.h @@ -55,7 +55,7 @@ typedef uint64_t __be64; * Macro to conver 16 bit sequence number to 64 bit wire format */ #define EPSC_STATUS_16_to_64(s) ((((u64)(s)) << 0) | (((u64)(s)) << 16) | \ - (((u64)(s)) << 32) | ((((u64)s)) << 48)) + (((u64)(s)) << 32) | ((((u64)s)) << 48)) /* * Macros to force layout to match HW implementation */ diff --git a/drivers/infiniband/hw/sif/psif_hw_data.h b/drivers/infiniband/hw/sif/psif_hw_data.h index a4975bf1134c9..07de6416496c4 100644 --- a/drivers/infiniband/hw/sif/psif_hw_data.h +++ b/drivers/infiniband/hw/sif/psif_hw_data.h @@ -729,7 +729,8 @@ enum psif_eps_core_id { * \par Width * 32 bit * \par Used in - * the parameter for the PSIF_QUERY sub-operation EPSC_QUERY_NUM_VFS and EPS_QUERY_JUMBO - set in the index field + * the parameter for the PSIF_QUERY sub-operation EPSC_QUERY_NUM_VFS + * and EPS_QUERY_JUMBO - set in the index field * \par Classification * driver */ diff --git a/drivers/infiniband/hw/sif/psif_hw_data_be.h b/drivers/infiniband/hw/sif/psif_hw_data_be.h index 33efe13ed05cc..de64fded345a8 100644 --- a/drivers/infiniband/hw/sif/psif_hw_data_be.h +++ b/drivers/infiniband/hw/sif/psif_hw_data_be.h @@ -3003,10 +3003,11 @@ struct psif_epsc_csr_config { u64 vlink_connect:1; /** Setup CMPL spin set mode to be fast - default is safe (PF only). */ u64 fast_spin:1; - /** Number of UFs (PF+VFs) to configure HW for + /** Number of UFs (PF+VFs) to configure HW for: * 0 means to use default stored in HW (PF only) * Though this is a signed value (values < 0 are used for special settings - * not available in official FW) the created bitfield is unsigned. */ + * not available in official FW) the created bitfield is unsigned. + */ u64 num_ufs:16; /** Padded field. */ u64 noname:39; diff --git a/drivers/infiniband/hw/sif/psif_hw_data_le.h b/drivers/infiniband/hw/sif/psif_hw_data_le.h index 19af0dcaea8a8..ddc3157cbb39f 100644 --- a/drivers/infiniband/hw/sif/psif_hw_data_le.h +++ b/drivers/infiniband/hw/sif/psif_hw_data_le.h @@ -2988,10 +2988,11 @@ struct psif_epsc_csr_config { struct psif_mmu_cntx mmu_cntx; /** Padded field. */ u64 noname:39; - /** Number of UFs (PF+VFs) to configure HW for + /** Number of UFs (PF+VFs) to configure HW for: * 0 means to use default stored in HW (PF only) * Though this is a signed value (values < 0 are used for special settings - * not available in official FW) the created bitfield is unsigned. */ + * not available in official FW) the created bitfield is unsigned. + */ u64 num_ufs:16; /** Setup CMPL spin set mode to be fast - default is safe (PF only). */ u64 fast_spin:1; diff --git a/drivers/infiniband/hw/sif/sif_base.c b/drivers/infiniband/hw/sif/sif_base.c index bb25e5472e20d..ac1944245dac9 100644 --- a/drivers/infiniband/hw/sif/sif_base.c +++ b/drivers/infiniband/hw/sif/sif_base.c @@ -243,7 +243,7 @@ static struct sif_table_layout base_layout[] = { .name = "sq_cmpl", .desc = "cq: SQ addr.map", .e_cnt_ref = &sif_qp_size, - .e_def_cnt = &sif_qp_default_size, \ + .e_def_cnt = &sif_qp_default_size, .entry_sz = 0, /* Calculated later */ .ext = 0, /* Calculated later */ .dfs_printer = sif_dfs_print_sq_cmpl, diff --git a/drivers/infiniband/hw/sif/sif_cq.c b/drivers/infiniband/hw/sif/sif_cq.c index 6dee19d520f5b..2afc9793d4e70 100644 --- a/drivers/infiniband/hw/sif/sif_cq.c +++ b/drivers/infiniband/hw/sif/sif_cq.c @@ -56,16 +56,17 @@ static inline int translate_wr_id( cqe->seq_num, cq->index, sq_seq_num, wh->sq_seq, cqe->status, cqe->opcode); return -EIO; - } else - sif_log(sdev, SIF_INFO, + } + sif_log(sdev, SIF_INFO, "unexp. cqe 0x%x for cq %d: got sq_seq 0x%x, last exp.0x%x, sts %d opc 0x%x", - cqe->seq_num, cq->index, sq_seq_num, wh->sq_seq, - cqe->status, cqe->opcode); + cqe->seq_num, cq->index, sq_seq_num, wh->sq_seq, + cqe->status, cqe->opcode); return -EFAULT; } if (unlikely(wh->sq_seq != sq_seq_num)) { bool duplicate_comp_wrap_case = (wh->sq_seq - sq_seq_num == sq->entries); int log_level = duplicate_comp_wrap_case ? SIF_WCE : SIF_INFO; + sif_log(sdev, log_level, "wrong cqe 0x%x for cq %d: got sq_seq 0x%x, expected 0x%x, sts %d opc 0x%x", cqe->seq_num, cq->index, sq_seq_num, wh->sq_seq, cqe->status, cqe->opcode); diff --git a/drivers/infiniband/hw/sif/sif_dev.h b/drivers/infiniband/hw/sif/sif_dev.h index 53b2e354b2ae2..1fab1c0b55f76 100644 --- a/drivers/infiniband/hw/sif/sif_dev.h +++ b/drivers/infiniband/hw/sif/sif_dev.h @@ -462,8 +462,8 @@ extern ulong sif_trace_mask; #define sif_log_rlim(sdev, class, format, arg...) \ do { \ sif_log_trace(class, format, ## arg); \ - if (unlikely((sif_debug_mask) & (class) && printk_ratelimit())) { \ - dev_info(&sdev->pdev->dev, \ + if (unlikely((sif_debug_mask) & (class))) { \ + dev_info_ratelimited(&sdev->pdev->dev, \ "[%d] %s: " format "\n",\ current->pid, __func__, \ ## arg); \ diff --git a/drivers/infiniband/hw/sif/sif_epsc.c b/drivers/infiniband/hw/sif/sif_epsc.c index b1696bf7474eb..8aeb9582c723b 100644 --- a/drivers/infiniband/hw/sif/sif_epsc.c +++ b/drivers/infiniband/hw/sif/sif_epsc.c @@ -706,7 +706,7 @@ int sif_eps_init(struct sif_dev *sdev, enum sif_tab_type type) * = bw comp mode. */ if (sif_vf_max >= 0) - lconfig.num_ufs = min_t(int, pci_sriov_get_totalvfs(sdev->pdev),sif_vf_max) + 1; + lconfig.num_ufs = min_t(int, pci_sriov_get_totalvfs(sdev->pdev), sif_vf_max) + 1; else if (sif_vf_max == -2) lconfig.num_ufs = 0; /* Use firmware defaults */ else if (xen_pv_domain()) diff --git a/drivers/infiniband/hw/sif/sif_eq.c b/drivers/infiniband/hw/sif/sif_eq.c index 4ae0c40fe289d..92c24003c28f6 100644 --- a/drivers/infiniband/hw/sif/sif_eq.c +++ b/drivers/infiniband/hw/sif/sif_eq.c @@ -113,6 +113,7 @@ int sif_eq_request_irq_all(struct sif_eps *es) for (i = 0; i < es->eqs.cnt; i++) { struct sif_eq *eq = &es->eqs.eq[i]; + if (!eq->requested) { ret = sif_request_irq(eq); if (ret) @@ -622,9 +623,8 @@ static void handle_event_work(struct work_struct *work) atomic_inc(&ew->eq->work_cnt); - if (unlikely(!sdev->registered)) { + if (unlikely(!sdev->registered)) wait_for_completion_interruptible(&sdev->ready_for_events); - } switch (ew->ibe.event) { case IB_EVENT_CQ_ERR: { @@ -932,7 +932,9 @@ static int dispatch_eq(struct sif_eq *eq) if (likely(leqe.event_status_cmpl_notify)) { nevents += handle_completion_event(eq, &leqe); - /* No other event type bits will be set on a CNE */ + /* No other event type bits will be set on a + * completion notification event (CNE) + */ goto only_cne; } diff --git a/drivers/infiniband/hw/sif/sif_hwmon.c b/drivers/infiniband/hw/sif/sif_hwmon.c index db3b4c0ed1b52..5c987eb5a8e83 100644 --- a/drivers/infiniband/hw/sif/sif_hwmon.c +++ b/drivers/infiniband/hw/sif/sif_hwmon.c @@ -35,7 +35,7 @@ static u64 sensor_show(const struct device *device, char *buf, int sif_hwmon_attr_temp) { - struct sif_dev *sdev = dev_get_drvdata(device); + struct sif_dev *sdev = dev_get_drvdata(device); struct psif_epsc_csr_req req; struct psif_epsc_csr_rsp rsp; @@ -76,8 +76,7 @@ static u64 sensor_show(const struct device *device, WARN_ON(1); } sprintf(buf, "%u\n", t); - } - else + } else sif_log(sdev, SIF_INFO, "Failed to query on chip temperature\n"); } return strlen(buf); @@ -144,6 +143,7 @@ void sif_register_hwmon_dev(struct sif_dev *sdev) void sif_unregister_hwmon_dev(struct sif_dev *sdev) { struct device *hwmon_dev = sdev->hwmon_dev; + if (hwmon_dev) { hwmon_device_unregister(hwmon_dev); sdev->hwmon_dev = NULL; diff --git a/drivers/infiniband/hw/sif/sif_qp.c b/drivers/infiniband/hw/sif/sif_qp.c index 890b040991955..e448701467dfe 100644 --- a/drivers/infiniband/hw/sif/sif_qp.c +++ b/drivers/infiniband/hw/sif/sif_qp.c @@ -234,7 +234,7 @@ struct sif_qp *create_qp(struct sif_dev *sdev, /* * We add a sge (with the stencil) when sending with TSO. The stencil is stored at * the beginning of the inline-area. TSO implies checksumming which again has - * a requirement that no inline can be used. + * a requirement that no inline can be used. * To be able to accomodate as large L3/L4-headers as possible we allocate 192 * bytes for inlining; * entry size 512 bytes @@ -251,7 +251,7 @@ struct sif_qp *create_qp(struct sif_dev *sdev, init_attr->qp_type, min_tso_inline); init_attr->cap.max_inline_data = min_tso_inline; } - init_attr->cap.max_send_sge ++; + init_attr->cap.max_send_sge++; } if (init_attr->qp_type == IB_QPT_RC || init_attr->qp_type == IB_QPT_XRC_INI) { @@ -866,6 +866,7 @@ int modify_qp_hw_wa_qp_retry(struct sif_dev *sdev, struct sif_qp *qp, if (qp->flags & SIF_QPF_USER_MODE) { struct sif_sq *sq = get_sq(sdev, qp); struct sif_sq_sw *sq_sw = sq ? get_sif_sq_sw(sdev, qp->qp_idx) : NULL; + if (sq_sw) sq_sw->need_flush = true; } @@ -2261,10 +2262,11 @@ fixup_failed: if (rq) { if (rq->is_srq) atomic_dec(&rq->refcnt); - else + else { ret = free_rq(sdev, qp->rq_idx); if (ret && ret != -EBUSY) return ret; + } } if (index > 3 && reuse_ok) diff --git a/drivers/infiniband/hw/sif/sif_r3.c b/drivers/infiniband/hw/sif/sif_r3.c index 20e224da56934..2d373502eee1a 100644 --- a/drivers/infiniband/hw/sif/sif_r3.c +++ b/drivers/infiniband/hw/sif/sif_r3.c @@ -35,6 +35,7 @@ void sif_r3_pre_init(struct sif_dev *sdev) { /* Init the flush_retry qp lock */ u8 flush_idx; + for (flush_idx = 0; flush_idx < 2; ++flush_idx) mutex_init(&sdev->flush_lock[flush_idx]); } @@ -71,6 +72,7 @@ flush_retry_failed: void sif_r3_deinit(struct sif_dev *sdev) { u8 flush_idx; + for (flush_idx = 0; flush_idx < 2; ++flush_idx) sif_hw_free_flush_qp(sdev, flush_idx); @@ -696,7 +698,7 @@ flush_sq_again: for (; (LESS_OR_EQUAL_16(last_seq, last_gen_seq)); ++last_seq) { if (unlikely(cq->entries < ((u32) (last_seq - sq_sw->head_seq)))) { sif_log(sdev, SIF_INFO, "cq (%d) is full! (len = %d, used = %d)", - cq->index, cq->entries, last_seq - sq_sw->head_seq - 1 ); + cq->index, cq->entries, last_seq - sq_sw->head_seq - 1); goto err_post_wa4074; } diff --git a/drivers/infiniband/hw/sif/sif_rq.c b/drivers/infiniband/hw/sif/sif_rq.c index 8cad3c75fd287..8a7d3f1eadc62 100644 --- a/drivers/infiniband/hw/sif/sif_rq.c +++ b/drivers/infiniband/hw/sif/sif_rq.c @@ -657,8 +657,7 @@ void sif_dfs_print_rq_hw(struct seq_file *s, struct sif_dev *sdev, loff_t pos) seq_puts(s, "\t[XRCSRQ -> CQ:"); seq_printf(s, "%u", rq->cq_idx); seq_puts(s, "]\n"); - } - else if (rq->is_srq) + } else if (rq->is_srq) seq_puts(s, "\t[SRQ]\n"); else seq_puts(s, "\n"); -- 2.50.1