From patchwork Tue Nov 21 00:00:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 10067521 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 EC56060224 for ; Tue, 21 Nov 2017 00:01:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE40829194 for ; Tue, 21 Nov 2017 00:01:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D32752923B; Tue, 21 Nov 2017 00:01:31 +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=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, 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 74B6E29194 for ; Tue, 21 Nov 2017 00:01:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751526AbdKUAB1 (ORCPT ); Mon, 20 Nov 2017 19:01:27 -0500 Received: from mail-qk0-f196.google.com ([209.85.220.196]:39721 "EHLO mail-qk0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751282AbdKUABC (ORCPT ); Mon, 20 Nov 2017 19:01:02 -0500 Received: by mail-qk0-f196.google.com with SMTP id w125so9754635qkb.6 for ; Mon, 20 Nov 2017 16:01:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=d3ujvWjz9hJeFzuwiF9BLkTuVIfaNViGC5bkx5Xnqeo=; b=EAfVMlDiSDfAtxxgbYfIcIqoftLMJDm6S0/QKk3x62VhH9UNHJAAkkcReT0Dpt9HCy NTktwCZ8bTt/aOHdf5WKYbfxJ8OzhehkFtN/Ss0GdOYZAR+Lkb2TBHlnCES38lACE0lt JOlWWERGvnX4qd+ayAU7cQVkKqFCnIiWm2+5FLvBVzwPrPF5hBoIQcc2PZVbm+vfxAux BwF+QJwxUvitwu7QMha1d+7OIJ2iQraOH/F3+5+u8meqBbP2obKL/9qTa1YD87PUcALk VYWq8uoCl2HfE56qbZdN2xoqk6pFWiiojkkTEefaCy1z0p3SzXd6uTlA/Du43mDLrgs2 OWug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=d3ujvWjz9hJeFzuwiF9BLkTuVIfaNViGC5bkx5Xnqeo=; b=AsiFmOQosSRO0yCADJFBLqC0HI9USeueY6K5Fphuf3ubjFp3h5jeVaXRDQJqH8cM7V 2tJDHsWP28gmT9B8YFM17r70rqG2mR5YAa8MQErFzxhuzioUvsh5dlCrIMbLKpCrlkEt tHD5MQuAnOCXg6I5o8odDkEoB61nyvSKXUwi3WRjUxlFPnEZTAQXBY75L6VX0MWoWqq3 Dy81MOMTPV7jRHiWKzv4pj1HDPWpe9Qzp/ZzvHMCTvD7Wi1BFCzVZydmRPxYknSjb7xM zQf1/eudrvLc7sCDmZLg17AtvCCqqi37ZetUdLunCs6O2UMUEKZyoZkyS+Q9Y4dG2OnQ Szpg== X-Gm-Message-State: AJaThX41YfzsVMRdHRVIOpDMh6MvdoeybLuwbsJSzKIwJdBUbOi4AdIC C2GS1tYyIBa34c7mmyIRumZDGXBv X-Google-Smtp-Source: AGs4zMbbiRvB5exFz2enNrjSkXowgi3MNv+LswxpUecTYSjWOGJUYIhUgsxSLSudQtZqr2fj+jd5gQ== X-Received: by 10.55.71.5 with SMTP id u5mr7458326qka.166.1511222462173; Mon, 20 Nov 2017 16:01:02 -0800 (PST) Received: from pallmd1.broadcom.com ([192.19.228.250]) by smtp.gmail.com with ESMTPSA id w143sm1612821qka.84.2017.11.20.16.01.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 20 Nov 2017 16:01:01 -0800 (PST) From: James Smart To: linux-scsi@vger.kernel.org Cc: James Smart , Dick Kennedy , James Smart Subject: [PATCH v3 08/17] lpfc: Fix display for debugfs queInfo Date: Mon, 20 Nov 2017 16:00:35 -0800 Message-Id: <20171121000044.27702-9-jsmart2021@gmail.com> X-Mailer: git-send-email 2.13.1 In-Reply-To: <20171121000044.27702-1-jsmart2021@gmail.com> References: <20171121000044.27702-1-jsmart2021@gmail.com> Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Display for lpfc/fnX/iDiag/queInfo isn't formatted perfectly. Corrected the format strings for the queue info debug messages. Signed-off-by: Dick Kennedy Signed-off-by: James Smart Reviewed-by: Hannes Reinecke --- drivers/scsi/lpfc/lpfc_debugfs.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c index 2bf5ad3b1512..4df5a21bd93b 100644 --- a/drivers/scsi/lpfc/lpfc_debugfs.c +++ b/drivers/scsi/lpfc/lpfc_debugfs.c @@ -3246,7 +3246,7 @@ __lpfc_idiag_print_eq(struct lpfc_queue *qp, char *eqtype, len += snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len, "\n%s EQ info: EQ-STAT[max:x%x noE:x%x " - "bs:x%x proc:x%llx eqd %d]\n", + "cqe_proc:x%x eqe_proc:x%llx eqd %d]\n", eqtype, qp->q_cnt_1, qp->q_cnt_2, qp->q_cnt_3, (unsigned long long)qp->q_cnt_4, qp->q_mode); len += snprintf(pbuffer + len, LPFC_QUE_INFO_GET_BUF_SIZE - len, @@ -3366,6 +3366,12 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes, if (len >= max_cnt) goto too_big; + qp = phba->sli4_hba.hdr_rq; + len = __lpfc_idiag_print_rqpair(qp, phba->sli4_hba.dat_rq, + "ELS RQpair", pbuffer, len); + if (len >= max_cnt) + goto too_big; + /* Slow-path NVME LS response CQ */ qp = phba->sli4_hba.nvmels_cq; len = __lpfc_idiag_print_cq(qp, "NVME LS", @@ -3383,12 +3389,6 @@ lpfc_idiag_queinfo_read(struct file *file, char __user *buf, size_t nbytes, if (len >= max_cnt) goto too_big; - qp = phba->sli4_hba.hdr_rq; - len = __lpfc_idiag_print_rqpair(qp, phba->sli4_hba.dat_rq, - "RQpair", pbuffer, len); - if (len >= max_cnt) - goto too_big; - goto out; }