Commit 6a9c52cf authored by James Smart's avatar James Smart Committed by James Bottomley
Browse files

[SCSI] lpfc 8.3.5: fix sysfs parameters, vport creation and other bugs and update logging 



This patch include the following fixes and changes:
- Fix crash when "error" is echoed to board_mode sysfs parameter
- Fix FCoE Parameter parsing in regions 23
- Fix driver crash when creating vport with large number of targets on SLI4
- Fix bug with npiv message being logged when it is not supported by the adapter
- Fix a potential dereferencing mailbox structure after free bug
- Fix firmware crash after vport create with high target count
- Error out requests to set board_mode to warm restart via sysfs on SLI4 HBAs
- Fix Block guard logging
- Fix a memory corruption issue during GID_FT IO prep
- Fix crash while processing unsolicited FC frames
- Fix failed to allocate XRI message is not a critical failure
- Update and fix formatting in some log messages
- Fix missing new line characters in log messages
- Removed the use of the locally defined FC transport layer related macros
- Check the rsplen in lpfc_handle_fcp_err function before using rsplen

Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 6669f9bb

drivers/scsi/lpfc/lpfc_attr.c

+11 −4
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <scsi/scsi_host.h>

#include <scsi/scsi_tcq.h>

#include <scsi/scsi_transport_fc.h>

#include <scsi/fc/fc_fs.h>



#include "lpfc_hw4.h"

#include "lpfc_hw.h"
@@ -762,8 +763,14 @@ lpfc_board_mode_store(struct device *dev, struct device_attribute *attr, 
	} else if (strncmp(buf, "offline", sizeof("offline") - 1) == 0)

		status = lpfc_do_offline(phba, LPFC_EVT_OFFLINE);

	else if (strncmp(buf, "warm", sizeof("warm") - 1) == 0)

		if (phba->sli_rev == LPFC_SLI_REV4)

			return -EINVAL;

		else

			status = lpfc_do_offline(phba, LPFC_EVT_WARM_START);

	else if (strncmp(buf, "error", sizeof("error") - 1) == 0)

		if (phba->sli_rev == LPFC_SLI_REV4)

			return -EINVAL;

		else

			status = lpfc_do_offline(phba, LPFC_EVT_KILL);

	else

		return -EINVAL;
@@ -2846,7 +2853,7 @@ LPFC_ATTR_R(multi_ring_support, 1, 1, 2, "Determines number of primary " 
# identifies what rctl value to configure the additional ring for.

# Value range is [1,0xff]. Default value is 4 (Unsolicated Data).

*/

LPFC_ATTR_R(multi_ring_rctl, FC_UNSOL_DATA, 1,

LPFC_ATTR_R(multi_ring_rctl, FC_RCTL_DD_UNSOL_DATA, 1,

	     255, "Identifies RCTL for additional ring configuration");



/*
@@ -2854,7 +2861,7 @@ LPFC_ATTR_R(multi_ring_rctl, FC_UNSOL_DATA, 1, 
# identifies what type value to configure the additional ring for.

# Value range is [1,0xff]. Default value is 5 (LLC/SNAP).

*/

LPFC_ATTR_R(multi_ring_type, FC_LLC_SNAP, 1,

LPFC_ATTR_R(multi_ring_type, FC_TYPE_IP, 1,

	     255, "Identifies TYPE for additional ring configuration");



/*

drivers/scsi/lpfc/lpfc_bsg.c

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include <scsi/scsi_host.h>

#include <scsi/scsi_transport_fc.h>

#include <scsi/scsi_bsg_fc.h>

#include <scsi/fc/fc_fs.h>



#include "lpfc_hw4.h"

#include "lpfc_hw.h"
@@ -148,8 +149,8 @@ lpfc_bsg_rport_ct(struct fc_bsg_job *job) 
	cmd->ulpCommand = CMD_GEN_REQUEST64_CR;

	cmd->un.genreq64.w5.hcsw.Fctl = (SI | LA);

	cmd->un.genreq64.w5.hcsw.Dfctl = 0;

	cmd->un.genreq64.w5.hcsw.Rctl = FC_UNSOL_CTL;

	cmd->un.genreq64.w5.hcsw.Type = FC_COMMON_TRANSPORT_ULP;

	cmd->un.genreq64.w5.hcsw.Rctl = FC_RCTL_DD_UNSOL_CTL;

	cmd->un.genreq64.w5.hcsw.Type = FC_TYPE_CT;

	cmd->ulpBdeCount = 1;

	cmd->ulpLe = 1;

	cmd->ulpClass = CLASS3;

drivers/scsi/lpfc/lpfc_ct.c

+14 −5
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <scsi/scsi_device.h>

#include <scsi/scsi_host.h>

#include <scsi/scsi_transport_fc.h>

#include <scsi/fc/fc_fs.h>



#include "lpfc_hw4.h"

#include "lpfc_hw.h"
@@ -336,8 +337,8 @@ lpfc_gen_req(struct lpfc_vport *vport, struct lpfc_dmabuf *bmp, 
	/* Fill in rest of iocb */

	icmd->un.genreq64.w5.hcsw.Fctl = (SI | LA);

	icmd->un.genreq64.w5.hcsw.Dfctl = 0;

	icmd->un.genreq64.w5.hcsw.Rctl = FC_UNSOL_CTL;

	icmd->un.genreq64.w5.hcsw.Type = FC_COMMON_TRANSPORT_ULP;

	icmd->un.genreq64.w5.hcsw.Rctl = FC_RCTL_DD_UNSOL_CTL;

	icmd->un.genreq64.w5.hcsw.Type = FC_TYPE_CT;



	if (!tmo) {

		 /* FC spec states we need 3 * ratov for CT requests */
@@ -395,9 +396,14 @@ lpfc_ct_cmd(struct lpfc_vport *vport, struct lpfc_dmabuf *inmp, 
	outmp = lpfc_alloc_ct_rsp(phba, cmdcode, bpl, rsp_size, &cnt);

	if (!outmp)

		return -ENOMEM;



	/*

	 * Form the CT IOCB.  The total number of BDEs in this IOCB

	 * is the single command plus response count from

	 * lpfc_alloc_ct_rsp.

	 */

	cnt += 1;

	status = lpfc_gen_req(vport, bmp, inmp, outmp, cmpl, ndlp, 0,

			      cnt+1, 0, retry);

			      cnt, 0, retry);

	if (status) {

		lpfc_free_ct_rsp(phba, outmp);

		return -ENOMEM;
@@ -533,6 +539,9 @@ lpfc_ns_rsp(struct lpfc_vport *vport, struct lpfc_dmabuf *mp, uint32_t Size) 
							SLI_CTNS_GFF_ID,

							0, Did) == 0)

							vport->num_disc_nodes++;

						else

							lpfc_setup_disc_node

								(vport, Did);

					}

					else {

						lpfc_debugfs_disc_trc(vport,
@@ -1241,7 +1250,7 @@ lpfc_ns_cmd(struct lpfc_vport *vport, int cmdcode, 
		    be16_to_cpu(SLI_CTNS_RFF_ID);

		CtReq->un.rff.PortId = cpu_to_be32(vport->fc_myDID);

		CtReq->un.rff.fbits = FC4_FEATURE_INIT;

		CtReq->un.rff.type_code = FC_FCP_DATA;

		CtReq->un.rff.type_code = FC_TYPE_FCP;

		cmpl = lpfc_cmpl_ct_cmd_rff_id;

		break;

	}

drivers/scsi/lpfc/lpfc_debugfs.c

+5 −5
Original line number Diff line number Diff line
@@ -926,7 +926,7 @@ lpfc_debugfs_dumpData_open(struct inode *inode, struct file *file) 
		goto out;



	/* Round to page boundry */

	printk(KERN_ERR "BLKGRD %s: _dump_buf_data=0x%p\n",

	printk(KERN_ERR "9059 BLKGRD:  %s: _dump_buf_data=0x%p\n",

			__func__, _dump_buf_data);

	debug->buffer = _dump_buf_data;

	if (!debug->buffer) {
@@ -956,8 +956,8 @@ lpfc_debugfs_dumpDif_open(struct inode *inode, struct file *file) 
		goto out;



	/* Round to page boundry */

	printk(KERN_ERR "BLKGRD %s: _dump_buf_dif=0x%p file=%s\n", __func__,

	       _dump_buf_dif, file->f_dentry->d_name.name);

	printk(KERN_ERR	"9060 BLKGRD: %s: _dump_buf_dif=0x%p file=%s\n",

		__func__, _dump_buf_dif, file->f_dentry->d_name.name);

	debug->buffer = _dump_buf_dif;

	if (!debug->buffer) {

		kfree(debug);
@@ -1377,7 +1377,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) 
			debugfs_create_dir(name, phba->hba_debugfs_root);

		if (!vport->vport_debugfs_root) {

			lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,

					 "0417 Cant create debugfs");

					 "0417 Cant create debugfs\n");

			goto debug_failed;

		}

		atomic_inc(&phba->debugfs_vport_count);
@@ -1430,7 +1430,7 @@ lpfc_debugfs_initialize(struct lpfc_vport *vport) 
				 vport, &lpfc_debugfs_op_nodelist);

	if (!vport->debug_nodelist) {

		lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,

				 "0409 Cant create debugfs nodelist");

				 "0409 Cant create debugfs nodelist\n");

		goto debug_failed;

	}

debug_failed:

drivers/scsi/lpfc/lpfc_disc.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
 *******************************************************************/



#define FC_MAX_HOLD_RSCN     32	      /* max number of deferred RSCNs */

#define FC_MAX_NS_RSP        65536    /* max size NameServer rsp */

#define FC_MAX_NS_RSP        64512    /* max size NameServer rsp */

#define FC_MAXLOOP           126      /* max devices supported on a fc loop */

#define LPFC_DISC_FLOGI_TMO  10	      /* Discovery FLOGI ratov */

CRA Git | Maintained and supported by SUSTech CRA and CCSE