From patchwork Thu May 21 17:55:29 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smart X-Patchwork-Id: 6458081 Return-Path: X-Original-To: patchwork-linux-scsi@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 571CCC0020 for ; Thu, 21 May 2015 17:55:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7AA912051D for ; Thu, 21 May 2015 17:55:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8C1FB20522 for ; Thu, 21 May 2015 17:55:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964818AbbEURzp (ORCPT ); Thu, 21 May 2015 13:55:45 -0400 Received: from mail-qg0-f43.google.com ([209.85.192.43]:36801 "EHLO mail-qg0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964804AbbEURze (ORCPT ); Thu, 21 May 2015 13:55:34 -0400 Received: by qget53 with SMTP id t53so45126308qge.3 for ; Thu, 21 May 2015 10:55:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:user-agent :mime-version:content-type:content-transfer-encoding; bh=iq5JjZLmaBL4pYEivxBg4ju9/L0W/+wBGPCmAu9WwQ0=; b=hrcBNln4Nuj/OABkOQDqAyq4sxDTTEpLULRoeOKrCyM6uwnFNuIRrzpdSfftOHzhnl pbQnCNDi5Ng2lfbzHETo/rV8ygkf0gcfHIf78UqZF5mbwkYpnURsFw3l7nGvhloBwZQM RYaUDEbu9BW1ViJCQqiks5OsTzWC7vAx2mEV1c/K8e/ehyBRZwxLMHO/oDJ6NZp6j1DN N4gxo8OHZPpm4OAB3/KxjJzITHo/wD3Cavjfje5M4gE8iCSBsU3dwwa2fX1TYZWj3Y41 cyY15aCUO11JZe3HRVhzqPLBrcfNRtfWjqs8j0dQumYb9TD4YhX2vq0mhMUtkfoK4dWI bRMA== X-Gm-Message-State: ALoCoQlGiv4CyGFZQY6vUp5Bw/zvwsVR8pWlzykfl+D0M37dxh8r21qSIEq93u3/qTCjJzhVE1yF X-Received: by 10.55.31.27 with SMTP id f27mr9159021qkf.9.1432230933681; Thu, 21 May 2015 10:55:33 -0700 (PDT) Received: from myfc17 (c-75-67-235-135.hsd1.nh.comcast.net. [75.67.235.135]) by mx.google.com with ESMTPSA id p73sm13607835qha.20.2015.05.21.10.55.33 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 21 May 2015 10:55:33 -0700 (PDT) Date: Thu, 21 May 2015 13:55:29 -0400 From: james.smart@avagotech.com (James Smart) To: linux-scsi@vger.kernel.org Subject: [PATCH v2 13/15] lpfc: Fix incorrect log message reported for empty FCF record. Message-ID: <555e1c11.Q6zoYETblypfLzLN%james.smart@avagotech.com> User-Agent: Heirloom mailx 12.5 7/5/10 MIME-Version: 1.0 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Fix incorrect log message reported for empty FCF record. Signed-off-by: Dick Kennedy Signed-off-by: James Smart --- drivers/scsi/lpfc/lpfc_hbadisc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/lpfc/lpfc_hbadisc.c b/drivers/scsi/lpfc/lpfc_hbadisc.c index 88af258..72a69d4 100644 --- a/drivers/scsi/lpfc/lpfc_hbadisc.c +++ b/drivers/scsi/lpfc/lpfc_hbadisc.c @@ -1777,7 +1777,7 @@ lpfc_sli4_fcf_rec_mbox_parse(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq, dma_addr_t phys_addr; struct lpfc_mbx_sge sge; struct lpfc_mbx_read_fcf_tbl *read_fcf; - uint32_t shdr_status, shdr_add_status; + uint32_t shdr_status, shdr_add_status, if_type; union lpfc_sli4_cfg_shdr *shdr; struct fcf_record *new_fcf_record; @@ -1798,9 +1798,11 @@ lpfc_sli4_fcf_rec_mbox_parse(struct lpfc_hba *phba, LPFC_MBOXQ_t *mboxq, lpfc_sli_pcimem_bcopy(shdr, shdr, sizeof(union lpfc_sli4_cfg_shdr)); shdr_status = bf_get(lpfc_mbox_hdr_status, &shdr->response); + if_type = bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf); shdr_add_status = bf_get(lpfc_mbox_hdr_add_status, &shdr->response); if (shdr_status || shdr_add_status) { - if (shdr_status == STATUS_FCF_TABLE_EMPTY) + if (shdr_status == STATUS_FCF_TABLE_EMPTY || + if_type == LPFC_SLI_INTF_IF_TYPE_2) lpfc_printf_log(phba, KERN_ERR, LOG_FIP, "2726 READ_FCF_RECORD Indicates empty " "FCF table.\n");