From patchwork Thu Dec 15 21:19:06 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Wise X-Patchwork-Id: 9476969 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 07E696047D for ; Thu, 15 Dec 2016 21:22:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE84328836 for ; Thu, 15 Dec 2016 21:22:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E26C128849; Thu, 15 Dec 2016 21:22:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6673128836 for ; Thu, 15 Dec 2016 21:22:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752131AbcLOVWL (ORCPT ); Thu, 15 Dec 2016 16:22:11 -0500 Received: from smtp.opengridcomputing.com ([72.48.136.20]:42008 "EHLO smtp.opengridcomputing.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752293AbcLOVWK (ORCPT ); Thu, 15 Dec 2016 16:22:10 -0500 Received: from smtp.ogc.us (build2.ogc.int [10.10.0.32]) by smtp.opengridcomputing.com (Postfix) with ESMTP id BA8BC2B810; Thu, 15 Dec 2016 15:22:01 -0600 (CST) Received: by smtp.ogc.us (Postfix, from userid 503) id AAA3BE08C3; Thu, 15 Dec 2016 15:22:01 -0600 (CST) From: Steve Wise Date: Thu, 15 Dec 2016 13:19:06 -0800 Subject: [PATCH] libcxgb4: fixes for debug build To: dledford@redhat.com, leon@kernel.org Cc: linux-rdma@vger.kernel.org Message-Id: <20161215212201.AAA3BE08C3@smtp.ogc.us> Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Steve Wise --- providers/cxgb4/dev.c | 14 +++++++------- providers/cxgb4/libcxgb4.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/providers/cxgb4/dev.c b/providers/cxgb4/dev.c index 69b04ac..3d903e8 100644 --- a/providers/cxgb4/dev.c +++ b/providers/cxgb4/dev.c @@ -239,7 +239,7 @@ static void dump_cq(struct c4iw_cq *chp) chp->cq.cqid, chp->cq.queue, chp->cq.cidx, chp->cq.sw_queue, chp->cq.sw_cidx, chp->cq.sw_pidx, chp->cq.sw_in_use, chp->cq.size, chp->cq.error, chp->cq.gen, chp->cq.cidx_inc, be64_to_cpu(chp->cq.bits_type_ts), - t4_cq_notempty(&chp->cq) || (chp->iq ? t4_iq_notempty(chp->iq) : 0)); + t4_cq_notempty(&chp->cq)); for (i=0; i < chp->cq.size; i++) { u64 *p = (u64 *)(chp->cq.queue + i); @@ -310,10 +310,10 @@ static void dump_qp(struct c4iw_qp *qhp) swsqe->opcode, swsqe->complete, swsqe->signaled, - cpu_to_be64(swsqe->cqe.u.flits[0]), - cpu_to_be64(swsqe->cqe.u.flits[1]), - cpu_to_be64((u64)swsqe->cqe.reserved), - cpu_to_be64(swsqe->cqe.bits_type_ts)); + cpu_to_be64(((uint64_t *)&swsqe->cqe)[0]), + cpu_to_be64(((uint64_t *)&swsqe->cqe)[1]), + cpu_to_be64(((uint64_t *)&swsqe->cqe)[2]), + cpu_to_be64(((uint64_t *)&swsqe->cqe)[3])); if (++cidx == qhp->wq.sq.size) cidx = 0; } @@ -359,7 +359,7 @@ static void dump_qp(struct c4iw_qp *qhp) } } -void dump_state() +void dump_state(void) { struct c4iw_dev *dev; int i; @@ -462,7 +462,7 @@ found: } PDBG("%s found vendor %d device %d type %d\n", - __FUNCTION__, vendor, device, hca_table[i].chip_version); + __FUNCTION__, vendor, device, CHELSIO_CHIP_VERSION(hca_table[i].device >> 8)); dev = calloc(1, sizeof *dev); if (!dev) { diff --git a/providers/cxgb4/libcxgb4.h b/providers/cxgb4/libcxgb4.h index 9a4bc98..3b75661 100644 --- a/providers/cxgb4/libcxgb4.h +++ b/providers/cxgb4/libcxgb4.h @@ -260,7 +260,7 @@ extern struct c4iw_stats c4iw_stats; #endif #ifdef STALL_DETECTION -void dump_state(); +void dump_state(void); extern int stall_to; #endif