Commit 04d02221 authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

Merge patch series "lpfc: Update lpfc to revision 14.2.0.11" 



Justin Tee <justin.tee@broadcom.com> says:

Update lpfc to revision 14.2.0.11

This patch set contains bug fixes for buffer overflow, resource
management, discovery, and HBA error status handling.

The patches were cut against Martin's 6.3/scsi-queue tree.

Justin Tee (10):
  lpfc: Protect against potential lpfc_debugfs_lockstat_write buffer overflow
  lpfc: Reorder freeing of various dma buffers and their list removal
  lpfc: Fix lockdep warning for rx_monitor lock when unloading driver
  lpfc: Record LOGO state with discovery engine even if aborted
  lpfc: Defer issuing new PLOGI if received RSCN before completing REG_LOGIN
  lpfc: Correct used_rpi count when devloss tmo fires with no recovery
  lpfc: Skip waiting for register ready bits when in unrecoverable state
  lpfc: Revise lpfc_error_lost_link reason code evaluation logic
  lpfc: Update lpfc version to 14.2.0.11
  lpfc: Copyright updates for 14.2.0.11 patches

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents a4c2673c 22871fe3

drivers/scsi/lpfc/lpfc_attr.c

+6 −0
Original line number Diff line number Diff line
@@ -1644,6 +1644,12 @@ lpfc_sli4_pdev_status_reg_wait(struct lpfc_hba *phba) 
	    !bf_get(lpfc_sliport_status_err, &portstat_reg))

		return -EPERM;



	/* There is no point to wait if the port is in an unrecoverable

	 * state.

	 */

	if (lpfc_sli4_unrecoverable_port(&portstat_reg))

		return -EIO;



	/* wait for the SLI port firmware ready after firmware reset */

	for (i = 0; i < LPFC_FW_RESET_MAXIMUM_WAIT_10MS_CNT; i++) {

		msleep(10);

drivers/scsi/lpfc/lpfc_bsg.c

+2 −2
Original line number Diff line number Diff line 
/*******************************************************************

 * This file is part of the Emulex Linux Device Driver for         *

 * Fibre Channel Host Bus Adapters.                                *

 * Copyright (C) 2017-2022 Broadcom. All Rights Reserved. The term *

 * Copyright (C) 2017-2023 Broadcom. All Rights Reserved. The term *

 * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.     *

 * Copyright (C) 2009-2015 Emulex.  All rights reserved.           *

 * EMULEX and SLI are trademarks of Emulex.                        *
@@ -134,8 +134,8 @@ lpfc_free_bsg_buffers(struct lpfc_hba *phba, struct lpfc_dmabuf *mlist) 
	if (mlist) {

		list_for_each_entry_safe(mlast, next_mlast, &mlist->list,

					 list) {

			lpfc_mbuf_free(phba, mlast->virt, mlast->phys);

			list_del(&mlast->list);

			lpfc_mbuf_free(phba, mlast->virt, mlast->phys);

			kfree(mlast);

		}

		lpfc_mbuf_free(phba, mlist->virt, mlist->phys);

drivers/scsi/lpfc/lpfc_crtn.h

+2 −0
Original line number Diff line number Diff line
@@ -458,6 +458,8 @@ void lpfc_get_cfgparam(struct lpfc_hba *); 
void lpfc_get_vport_cfgparam(struct lpfc_vport *);

int lpfc_alloc_sysfs_attr(struct lpfc_vport *);

void lpfc_free_sysfs_attr(struct lpfc_vport *);

bool lpfc_error_lost_link(struct lpfc_vport *vport, u32 ulp_status,

			  u32 ulp_word4);

extern const struct attribute_group *lpfc_hba_groups[];

extern const struct attribute_group *lpfc_vport_groups[];

extern struct scsi_host_template lpfc_template;

drivers/scsi/lpfc/lpfc_ct.c

+4 −4
Original line number Diff line number Diff line 
/*******************************************************************

 * This file is part of the Emulex Linux Device Driver for         *

 * Fibre Channel Host Bus Adapters.                                *

 * Copyright (C) 2017-2022 Broadcom. All Rights Reserved. The term *

 * Copyright (C) 2017-2023 Broadcom. All Rights Reserved. The term *

 * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.     *

 * Copyright (C) 2004-2016 Emulex.  All rights reserved.           *

 * EMULEX and SLI are trademarks of Emulex.                        *
@@ -476,8 +476,8 @@ lpfc_free_ct_rsp(struct lpfc_hba *phba, struct lpfc_dmabuf *mlist) 
	struct lpfc_dmabuf *mlast, *next_mlast;



	list_for_each_entry_safe(mlast, next_mlast, &mlist->list, list) {

		lpfc_mbuf_free(phba, mlast->virt, mlast->phys);

		list_del(&mlast->list);

		lpfc_mbuf_free(phba, mlast->virt, mlast->phys);

		kfree(mlast);

	}

	lpfc_mbuf_free(phba, mlist->virt, mlist->phys);
@@ -958,7 +958,7 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
		lpfc_vport_set_state(vport, FC_VPORT_FAILED);

		goto out;

	}

	if (lpfc_error_lost_link(ulp_status, ulp_word4)) {

	if (lpfc_error_lost_link(vport, ulp_status, ulp_word4)) {

		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,

				 "0226 NS query failed due to link event: "

				 "ulp_status x%x ulp_word4 x%x fc_flag x%x "
@@ -1181,7 +1181,7 @@ lpfc_cmpl_ct_cmd_gid_pt(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
		lpfc_vport_set_state(vport, FC_VPORT_FAILED);

		goto out;

	}

	if (lpfc_error_lost_link(ulp_status, ulp_word4)) {

	if (lpfc_error_lost_link(vport, ulp_status, ulp_word4)) {

		lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,

				 "4166 NS query failed due to link event: "

				 "ulp_status x%x ulp_word4 x%x fc_flag x%x "

drivers/scsi/lpfc/lpfc_debugfs.c

+6 −3
Original line number Diff line number Diff line 
/*******************************************************************

 * This file is part of the Emulex Linux Device Driver for         *

 * Fibre Channel Host Bus Adapters.                                *

 * Copyright (C) 2017-2022 Broadcom. All Rights Reserved. The term *

 * Copyright (C) 2017-2023 Broadcom. All Rights Reserved. The term *

 * “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.  *

 * Copyright (C) 2007-2015 Emulex.  All rights reserved.           *

 * EMULEX and SLI are trademarks of Emulex.                        *
@@ -2157,10 +2157,13 @@ lpfc_debugfs_lockstat_write(struct file *file, const char __user *buf, 
	char mybuf[64];

	char *pbuf;

	int i;

	size_t bsize;



	memset(mybuf, 0, sizeof(mybuf));



	if (copy_from_user(mybuf, buf, nbytes))

	bsize = min(nbytes, (sizeof(mybuf) - 1));



	if (copy_from_user(mybuf, buf, bsize))

		return -EFAULT;

	pbuf = &mybuf[0];
@@ -2181,7 +2184,7 @@ lpfc_debugfs_lockstat_write(struct file *file, const char __user *buf, 
			qp->lock_conflict.wq_access = 0;

		}

	}

	return nbytes;

	return bsize;

}

#endif