From patchwork Fri May 5 19:46:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98686 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292779qge; Fri, 5 May 2017 12:48:33 -0700 (PDT) X-Received: by 10.98.40.4 with SMTP id o4mr18441242pfo.113.1494013713340; Fri, 05 May 2017 12:48:33 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 144si6012850pfa.118.2017.05.05.12.48.33; Fri, 05 May 2017 12:48:33 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755575AbdEETsc (ORCPT + 6 others); Fri, 5 May 2017 15:48:32 -0400 Received: from mout.kundenserver.de ([212.227.126.134]:60316 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755464AbdEETsV (ORCPT ); Fri, 5 May 2017 15:48:21 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0M4Nqe-1dyP9X3foq-00ydrV; Fri, 05 May 2017 21:48:15 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Hiral Shah , Sesidhar Baddela , Christoph Hellwig , Arnd Bergmann Subject: [PATCH 3.16-stable 37/87] fnic: assign FIP_ALL_FCF_MACS to fcoe_all_fcfs Date: Fri, 5 May 2017 21:46:55 +0200 Message-Id: <20170505194745.3627137-38-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:qe7RkTBglxcO+SBnN95NCxZLWKGyu0AmL15bln8awZzqtBv3Ra2 yD2kOuhHjxRnlgCFweULg7Xhfqp9IChCwda+yFg19f+R8p4LDzCS2ye2MSsyv401LvSzcqI 6+sfeM0Q/RRLc/7+NBkRkJbflkOh/0XvfMS7flTUvQAiMqyrowVA8OivYgGiM6HKZKK8puD BFGPQuDxxtmV4vdNXv6EQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:s346YC32kaY=:FQPuk78cJ+jpBCVv05/TKW sIrNhX87dU9GBzsAZ4yPvyrozeMzWj7tvKJ7nH4mjnkcC4WsBDiRNh7LW2VcbAIzRoPdTQDm5 RyEbISwxwBWjrIdLjLBQ39QJTcPAlzonWAlvZ2QtfZDDeT2t+6EdNp2lUithE8n1781DVKFhI ZS4aOES5jknv65KdE3WlIoeetcTVJdB8ok5Z6+sehl0qkNr3CGT9fINElK1JbX8JMGqrwEE0q tLJHdSo7OxnzJzzU0BqL06+VkPOVBgQsA6VNtSPkAjjq8AaesOlTg+1o4IIbFl5GkmRwSaPLg Q0QmNYslW8tZ0mtNRMH50HDf4Z1w0fwFG8QYR1iw5aDIFCLcb1G6qu60u+MH+VzCAF09s/x3s PmuuaclvjTMZyhYyx+xk4kn349mCz+IOcPNbgEkUCRK9dVsVb0zmphyQAWz/J1/FNdJHkUiRy T1jcK0y/9zV5ywiw6ppXPaZ1uhDcLwsxq2cG7RHO1xWZ9GIkKb0i6JNiwu2yxNRl6Tzn2crPM 7eSjvisdsJv3NMWQ5dH3U2ab+W3R9Tqxt4opnJUnsBZUUxRLeeP+28ZhuzXoiNwTGYjG+Knl/ iWBw9016SPVS+zxa/PqJJg/qJDAgaN+KYqjMexza3jK5oArY4t2u5I2pBLJ3p6P/dO7QmaiXy L2GAtSeLiY+sw1Amelmlz5Xgpj8OLLsMb34FFnVROqfF0JIlgPeCNlVjEkEO84AqzXzc= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Hiral Shah Commit fffd96e05f5a23eaff542951e7d3ae4ec2f6258f upstream. 1) Assgning FIP_ALL_FCF_MACS to fcoe_all_fcfs allows VLAN request to be sent to correct Mac address for VLAN Discovery otherwise VLAN request will be sent to invalid address hence FLOGI never happens. 2) Simplify the copy_and_format_trace_data code and log the correct Link event for fnic control path tracing in case of link status UP->UP. 3) Increment Fnic driver version Signed-off-by: Hiral Shah Signed-off-by: Sesidhar Baddela Signed-off-by: Christoph Hellwig Signed-off-by: Arnd Bergmann --- drivers/scsi/fnic/fnic.h | 2 +- drivers/scsi/fnic/fnic_fcs.c | 5 +++-- drivers/scsi/fnic/fnic_trace.c | 5 ++--- 3 files changed, 6 insertions(+), 6 deletions(-) -- 2.9.0 diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index 1d3521e13d77..bf8d34c26f13 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h @@ -39,7 +39,7 @@ #define DRV_NAME "fnic" #define DRV_DESCRIPTION "Cisco FCoE HBA Driver" -#define DRV_VERSION "1.6.0.10" +#define DRV_VERSION "1.6.0.11" #define PFX DRV_NAME ": " #define DFX DRV_NAME "%d: " diff --git a/drivers/scsi/fnic/fnic_fcs.c b/drivers/scsi/fnic/fnic_fcs.c index 1b948f633fc5..f3984b48f8e9 100644 --- a/drivers/scsi/fnic/fnic_fcs.c +++ b/drivers/scsi/fnic/fnic_fcs.c @@ -35,7 +35,7 @@ #include "cq_enet_desc.h" #include "cq_exch_desc.h" -static u8 fcoe_all_fcfs[ETH_ALEN]; +static u8 fcoe_all_fcfs[ETH_ALEN] = FIP_ALL_FCF_MACS; struct workqueue_struct *fnic_fip_queue; struct workqueue_struct *fnic_event_queue; @@ -101,13 +101,14 @@ void fnic_handle_link(struct work_struct *work) FNIC_FCS_DBG(KERN_DEBUG, fnic->lport->host, "link up\n"); fcoe_ctlr_link_up(&fnic->ctlr); - } else + } else { /* UP -> UP */ spin_unlock_irqrestore(&fnic->fnic_lock, flags); fnic_fc_trace_set_data( fnic->lport->host->host_no, FNIC_FC_LE, "Link Status: UP_UP", strlen("Link Status: UP_UP")); + } } } else if (fnic->link_status) { /* DOWN -> UP */ diff --git a/drivers/scsi/fnic/fnic_trace.c b/drivers/scsi/fnic/fnic_trace.c index c77285926827..121a5d7e98c4 100644 --- a/drivers/scsi/fnic/fnic_trace.c +++ b/drivers/scsi/fnic/fnic_trace.c @@ -743,7 +743,7 @@ void copy_and_format_trace_data(struct fc_trace_hdr *tdata, fmt = "%02d:%02d:%04ld %02d:%02d:%02d.%09lu ns%8x %c%8x\t"; len += snprintf(fnic_dbgfs_prt->buffer + len, - (fnic_fc_trace_max_pages * PAGE_SIZE * 3) - len, + max_size - len, fmt, tm.tm_mon + 1, tm.tm_mday, tm.tm_year + 1900, tm.tm_hour, tm.tm_min, tm.tm_sec, @@ -767,8 +767,7 @@ void copy_and_format_trace_data(struct fc_trace_hdr *tdata, j == ethhdr_len + fcoehdr_len + fchdr_len || (i > 3 && j%fchdr_len == 0)) { len += snprintf(fnic_dbgfs_prt->buffer - + len, (fnic_fc_trace_max_pages - * PAGE_SIZE * 3) - len, + + len, max_size - len, "\n\t\t\t\t\t\t\t\t"); i++; }