Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[SCSI] lpfc 8.3.0 : Fix several minor issues 



- Avoid polling HBA Error Attention when HBA's PCI channel is offline
  due to PCI EEH

- Fix handling of RSCN with non-zero event qualifiers

- Remove unnecessary sleeps during HBA initialization which slow down
  driver load

- Fix internal and external loopback on FCoE HBAs

- Fix incorrect decrement of cmd_pending count in lpfc_queuecomand
  error path

- Fix reporting of port busy events to management application

- Rename lpfc_adjust_queue_depth() to lpfc_rampdown_queue_depth() for
  consistency with its partner lpfc_rampup_queue_depth()

- Delete redundant lpfc_cmd->start_time = jiffies assignment in
  lpfc_queuecommand()

- Fix handling for ELS, mailbox and heartbeat time outs in the worker
  thread by removing unnecessary checking of the work_port_events
  flags.

- Fix NULL pointer dereference in lpfc_prep_els_iocb

- In lpfc_device_recov_npr_node(), move clearing of NLP_NPR_2B_DISC
  flag after call to lpfc_cancel_retry_delay_tmo() to keep
  targets-in-discovery count correct

- Remove lpfc_probe_one()'s call to scsi_scan_host() which could cause
  concurrent SCSI scans to step on each other

Signed-off-by: default avatarJames Smart <James.Smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 8f34f4ce

drivers/scsi/lpfc/lpfc_crtn.h

+1 −1
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ void lpfc_fabric_abort_nport(struct lpfc_nodelist *); 
void lpfc_fabric_abort_hba(struct lpfc_hba *);

void lpfc_fabric_block_timeout(unsigned long);

void lpfc_unblock_fabric_iocbs(struct lpfc_hba *);

void lpfc_adjust_queue_depth(struct lpfc_hba *);

void lpfc_rampdown_queue_depth(struct lpfc_hba *);

void lpfc_ramp_down_queue_handler(struct lpfc_hba *);

void lpfc_ramp_up_queue_handler(struct lpfc_hba *);

void lpfc_scsi_dev_block(struct lpfc_hba *);

drivers/scsi/lpfc/lpfc_els.c

+16 −16
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ lpfc_prep_els_iocb(struct lpfc_vport *vport, uint8_t expectRsp, 
	return elsiocb;



els_iocb_free_pbuf_exit:

	if (expectRsp)

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

	kfree(pbuflist);
@@ -2472,6 +2473,15 @@ lpfc_els_retry(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb, 
	case IOSTAT_LOCAL_REJECT:

		switch ((irsp->un.ulpWord[4] & 0xff)) {

		case IOERR_LOOP_OPEN_FAILURE:

			if (cmd == ELS_CMD_FLOGI) {

				if (PCI_DEVICE_ID_HORNET ==

					phba->pcidev->device) {

					phba->fc_topology = TOPOLOGY_LOOP;

					phba->pport->fc_myDID = 0;

					phba->alpa_map[0] = 0;

					phba->alpa_map[1] = 0;

				}

			}

			if (cmd == ELS_CMD_PLOGI && cmdiocb->retry == 0)

				delay = 1000;

			retry = 1;
@@ -3827,27 +3837,21 @@ lpfc_rscn_payload_check(struct lpfc_vport *vport, uint32_t did) 
		while (payload_len) {

			rscn_did.un.word = be32_to_cpu(*lp++);

			payload_len -= sizeof(uint32_t);

			switch (rscn_did.un.b.resv) {

			case 0:	/* Single N_Port ID effected */

			switch (rscn_did.un.b.resv & RSCN_ADDRESS_FORMAT_MASK) {

			case RSCN_ADDRESS_FORMAT_PORT:

				if (ns_did.un.word == rscn_did.un.word)

					goto return_did_out;

				break;

			case 1:	/* Whole N_Port Area effected */

			case RSCN_ADDRESS_FORMAT_AREA:

				if ((ns_did.un.b.domain == rscn_did.un.b.domain)

				    && (ns_did.un.b.area == rscn_did.un.b.area))

					goto return_did_out;

				break;

			case 2:	/* Whole N_Port Domain effected */

			case RSCN_ADDRESS_FORMAT_DOMAIN:

				if (ns_did.un.b.domain == rscn_did.un.b.domain)

					goto return_did_out;

				break;

			default:

				/* Unknown Identifier in RSCN node */

				lpfc_printf_vlog(vport, KERN_ERR, LOG_DISCOVERY,

						 "0217 Unknown Identifier in "

						 "RSCN payload Data: x%x\n",

						 rscn_did.un.word);

			case 3:	/* Whole Fabric effected */

			case RSCN_ADDRESS_FORMAT_FABRIC:

				goto return_did_out;

			}

		}
@@ -4935,10 +4939,6 @@ lpfc_els_timeout_handler(struct lpfc_vport *vport) 
	uint32_t timeout;

	uint32_t remote_ID = 0xffffffff;



	/* If the timer is already canceled do nothing */

	if ((vport->work_port_events & WORKER_ELS_TMO) == 0) {

		return;

	}

	spin_lock_irq(&phba->hbalock);

	timeout = (uint32_t)(phba->fc_ratov << 1);

drivers/scsi/lpfc/lpfc_hbadisc.c

+1 −1
Original line number Diff line number Diff line
@@ -350,7 +350,7 @@ lpfc_send_fastpath_evt(struct lpfc_hba *phba, 
			evt_data_size = sizeof(fast_evt_data->un.

				read_check_error);

		} else if ((evt_sub_category == LPFC_EVENT_FABRIC_BUSY) ||

			(evt_sub_category == IOSTAT_NPORT_BSY)) {

			(evt_sub_category == LPFC_EVENT_PORT_BUSY)) {

			evt_data = (char *) &fast_evt_data->un.fabric_evt;

			evt_data_size = sizeof(fast_evt_data->un.fabric_evt);

		} else {

drivers/scsi/lpfc/lpfc_hw.h

+6 −0
Original line number Diff line number Diff line
@@ -869,6 +869,12 @@ typedef struct _D_ID { /* Structure is in Big Endian format */ 
	} un;

} D_ID;



#define RSCN_ADDRESS_FORMAT_PORT	0x0

#define RSCN_ADDRESS_FORMAT_AREA	0x1

#define RSCN_ADDRESS_FORMAT_DOMAIN	0x2

#define RSCN_ADDRESS_FORMAT_FABRIC	0x3

#define RSCN_ADDRESS_FORMAT_MASK	0x3



/*

 *  Structure to define all ELS Payload types

 */

drivers/scsi/lpfc/lpfc_init.c

+0 −7
Original line number Diff line number Diff line
@@ -742,11 +742,6 @@ lpfc_hb_timeout_handler(struct lpfc_hba *phba) 
		return;



	spin_lock_irq(&phba->pport->work_port_lock);

	/* If the timer is already canceled do nothing */

	if (!(phba->pport->work_port_events & WORKER_HB_TMO)) {

		spin_unlock_irq(&phba->pport->work_port_lock);

		return;

	}



	if (time_after(phba->last_completion_time + LPFC_HB_MBOX_INTERVAL * HZ,

		jiffies)) {
@@ -2702,8 +2697,6 @@ lpfc_pci_probe_one(struct pci_dev *pdev, const struct pci_device_id *pid) 
		(char *) &adapter_event,

		LPFC_NL_VENDOR_ID);



	scsi_scan_host(shost);



	return 0;



out_remove_device: