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

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

[SCSI] lpfc 8.3.22: Add support for PCI Adapter Failure 



Periodically poll adapter registers to detect pci adapter failure
(reads return -1). On failure, take port offline, set error indicators
and wake up worker threads. Threads will take adapter offline.

Signed-off-by: default avatarAlex Iannicelli <alex.iannicelli@emulex.com>
Signed-off-by: default avatarJames Smart <james.smart@emulex.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 7f86059a

drivers/scsi/lpfc/lpfc.h

+19 −6
Original line number Diff line number Diff line
@@ -897,7 +897,18 @@ lpfc_worker_wake_up(struct lpfc_hba *phba) 
	return;

}



static inline void

static inline int

lpfc_readl(void __iomem *addr, uint32_t *data)

{

	uint32_t temp;

	temp = readl(addr);

	if (temp == 0xffffffff)

		return -EIO;

	*data = temp;

	return 0;

}



static inline int

lpfc_sli_read_hs(struct lpfc_hba *phba)

{

	/*
@@ -906,15 +917,17 @@ lpfc_sli_read_hs(struct lpfc_hba *phba) 
	 */

	phba->sli.slistat.err_attn_event++;



	/* Save status info */

	phba->work_hs = readl(phba->HSregaddr);

	phba->work_status[0] = readl(phba->MBslimaddr + 0xa8);

	phba->work_status[1] = readl(phba->MBslimaddr + 0xac);

	/* Save status info and check for unplug error */

	if (lpfc_readl(phba->HSregaddr, &phba->work_hs) ||

		lpfc_readl(phba->MBslimaddr + 0xa8, &phba->work_status[0]) ||

		lpfc_readl(phba->MBslimaddr + 0xac, &phba->work_status[1])) {

		return -EIO;

	}



	/* Clear chip Host Attention error bit */

	writel(HA_ERATT, phba->HAregaddr);

	readl(phba->HAregaddr); /* flush */

	phba->pport->stopped = 1;



	return;

	return 0;

}

drivers/scsi/lpfc/lpfc_attr.c

+8 −2
Original line number Diff line number Diff line
@@ -1224,7 +1224,10 @@ lpfc_poll_store(struct device *dev, struct device_attribute *attr, 
	if (val & ENABLE_FCP_RING_POLLING) {

		if ((val & DISABLE_FCP_RING_INT) &&

		    !(old_val & DISABLE_FCP_RING_INT)) {

			creg_val = readl(phba->HCregaddr);

			if (lpfc_readl(phba->HCregaddr, &creg_val)) {

				spin_unlock_irq(&phba->hbalock);

				return -EINVAL;

			}

			creg_val &= ~(HC_R0INT_ENA << LPFC_FCP_RING);

			writel(creg_val, phba->HCregaddr);

			readl(phba->HCregaddr); /* flush */
@@ -1242,7 +1245,10 @@ lpfc_poll_store(struct device *dev, struct device_attribute *attr, 
		spin_unlock_irq(&phba->hbalock);

		del_timer(&phba->fcp_poll_timer);

		spin_lock_irq(&phba->hbalock);

		creg_val = readl(phba->HCregaddr);

		if (lpfc_readl(phba->HCregaddr, &creg_val)) {

			spin_unlock_irq(&phba->hbalock);

			return -EINVAL;

		}

		creg_val |= (HC_R0INT_ENA << LPFC_FCP_RING);

		writel(creg_val, phba->HCregaddr);

		readl(phba->HCregaddr); /* flush */

drivers/scsi/lpfc/lpfc_bsg.c

+13 −3
Original line number Diff line number Diff line
@@ -348,7 +348,10 @@ lpfc_bsg_send_mgmt_cmd(struct fc_bsg_job *job) 
	dd_data->context_un.iocb.bmp = bmp;



	if (phba->cfg_poll & DISABLE_FCP_RING_INT) {

		creg_val = readl(phba->HCregaddr);

		if (lpfc_readl(phba->HCregaddr, &creg_val)) {

			rc = -EIO ;

			goto free_cmdiocbq;

		}

		creg_val |= (HC_R0INT_ENA << LPFC_FCP_RING);

		writel(creg_val, phba->HCregaddr);

		readl(phba->HCregaddr); /* flush */
@@ -599,7 +602,10 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job) 
	dd_data->context_un.iocb.ndlp = ndlp;



	if (phba->cfg_poll & DISABLE_FCP_RING_INT) {

		creg_val = readl(phba->HCregaddr);

		if (lpfc_readl(phba->HCregaddr, &creg_val)) {

			rc = -EIO;

			goto linkdown_err;

		}

		creg_val |= (HC_R0INT_ENA << LPFC_FCP_RING);

		writel(creg_val, phba->HCregaddr);

		readl(phba->HCregaddr); /* flush */
@@ -613,6 +619,7 @@ lpfc_bsg_rport_els(struct fc_bsg_job *job) 
	else

		rc = -EIO;



linkdown_err:

	pci_unmap_sg(phba->pcidev, job->request_payload.sg_list,

		     job->request_payload.sg_cnt, DMA_TO_DEVICE);

	pci_unmap_sg(phba->pcidev, job->reply_payload.sg_list,
@@ -1357,7 +1364,10 @@ lpfc_issue_ct_rsp(struct lpfc_hba *phba, struct fc_bsg_job *job, uint32_t tag, 
	dd_data->context_un.iocb.ndlp = ndlp;



	if (phba->cfg_poll & DISABLE_FCP_RING_INT) {

		creg_val = readl(phba->HCregaddr);

		if (lpfc_readl(phba->HCregaddr, &creg_val)) {

			rc = -IOCB_ERROR;

			goto issue_ct_rsp_exit;

		}

		creg_val |= (HC_R0INT_ENA << LPFC_FCP_RING);

		writel(creg_val, phba->HCregaddr);

		readl(phba->HCregaddr); /* flush */

drivers/scsi/lpfc/lpfc_els.c

+2 −1
Original line number Diff line number Diff line
@@ -89,7 +89,8 @@ lpfc_els_chk_latt(struct lpfc_vport *vport) 
		return 0;



	/* Read the HBA Host Attention Register */

	ha_copy = readl(phba->HAregaddr);

	if (lpfc_readl(phba->HAregaddr, &ha_copy))

		return 1;



	if (!(ha_copy & HA_LATT))

		return 0;

drivers/scsi/lpfc/lpfc_hw.h

+1 −1
Original line number Diff line number Diff line
@@ -1344,7 +1344,7 @@ typedef struct { /* FireFly BIU registers */ 
#define HS_FFER1       0x80000000	/* Bit 31 */

#define HS_CRIT_TEMP   0x00000100	/* Bit 8  */

#define HS_FFERM       0xFF000100	/* Mask for error bits 31:24 and 8 */



#define UNPLUG_ERR     0x00000001	/* Indicate pci hot unplug */

/* Host Control Register */



#define HC_REG_OFFSET  12	/* Byte offset from register base address */