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

Commit 8b651b42 authored by Krishna Gudipati's avatar Krishna Gudipati Committed by James Bottomley
Browse files

[SCSI] bfa: Clear LL_HALT and PSS_ERR bit when IOC crashes. 



Clear LL_HALT and PSS_ERR bit in the interrupt status register on an IOC crash.

Signed-off-by: default avatarKrishna Gudipati <kgudipat@brocade.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 0a20de44

drivers/scsi/bfa/bfa_intr.c

+31 −4
Original line number Diff line number Diff line
@@ -197,18 +197,45 @@ bfa_msix_rspq(struct bfa_s *bfa, int rsp_qid) 
void

bfa_msix_lpu_err(struct bfa_s *bfa, int vec)

{

	u32 intr;

	u32 intr, curr_value;



	intr = bfa_reg_read(bfa->iocfc.bfa_regs.intr_status);



	if (intr & (__HFN_INT_MBOX_LPU0 | __HFN_INT_MBOX_LPU1))

		bfa_msix_lpu(bfa);



	if (intr & (__HFN_INT_ERR_EMC |

		    __HFN_INT_ERR_LPU0 | __HFN_INT_ERR_LPU1 |

		    __HFN_INT_ERR_PSS | __HFN_INT_LL_HALT))

	intr &= (__HFN_INT_ERR_EMC | __HFN_INT_ERR_LPU0 |

		__HFN_INT_ERR_LPU1 | __HFN_INT_ERR_PSS | __HFN_INT_LL_HALT);



	if (intr) {

		if (intr & __HFN_INT_LL_HALT) {

			/**

			 * If LL_HALT bit is set then FW Init Halt LL Port

			 * Register needs to be cleared as well so Interrupt

			 * Status Register will be cleared.

			 */

			curr_value = bfa_reg_read(bfa->ioc.ioc_regs.ll_halt);

			curr_value &= ~__FW_INIT_HALT_P;

			bfa_reg_write(bfa->ioc.ioc_regs.ll_halt, curr_value);

		}



		if (intr & __HFN_INT_ERR_PSS) {

			/**

			 * ERR_PSS bit needs to be cleared as well in case

			 * interrups are shared so driver's interrupt handler is

			 * still called eventhough it is already masked out.

			 */

			curr_value = bfa_reg_read(

				bfa->ioc.ioc_regs.pss_err_status_reg);

			curr_value &= __PSS_ERR_STATUS_SET;

			bfa_reg_write(bfa->ioc.ioc_regs.pss_err_status_reg,

				curr_value);

		}



		bfa_reg_write(bfa->iocfc.bfa_regs.intr_status, intr);

		bfa_msix_errint(bfa, intr);

	}

}



void

bfa_isr_bind(enum bfi_mclass mc, bfa_isr_func_t isr_func)

drivers/scsi/bfa/bfa_ioc.h

+1 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ struct bfa_ioc_regs_s { 
	bfa_os_addr_t   lpu_mbox_cmd;

	bfa_os_addr_t   lpu_mbox;

	bfa_os_addr_t   pss_ctl_reg;

	bfa_os_addr_t   pss_err_status_reg;

	bfa_os_addr_t   app_pll_fast_ctl_reg;

	bfa_os_addr_t   app_pll_slow_ctl_reg;

	bfa_os_addr_t   ioc_sem_reg;

drivers/scsi/bfa/bfa_ioc_cb.c

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ bfa_ioc_cb_reg_init(struct bfa_ioc_s *ioc) 
	 * PSS control registers

	 */

	ioc->ioc_regs.pss_ctl_reg = (rb + PSS_CTL_REG);

	ioc->ioc_regs.pss_err_status_reg = (rb + PSS_ERR_STATUS_REG);

	ioc->ioc_regs.app_pll_fast_ctl_reg = (rb + APP_PLL_400_CTL_REG);

	ioc->ioc_regs.app_pll_slow_ctl_reg = (rb + APP_PLL_212_CTL_REG);

drivers/scsi/bfa/bfa_ioc_ct.c

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ bfa_ioc_ct_reg_init(struct bfa_ioc_s *ioc) 
	 * PSS control registers

	 */

	ioc->ioc_regs.pss_ctl_reg = (rb + PSS_CTL_REG);

	ioc->ioc_regs.pss_err_status_reg = (rb + PSS_ERR_STATUS_REG);

	ioc->ioc_regs.app_pll_fast_ctl_reg = (rb + APP_PLL_425_CTL_REG);

	ioc->ioc_regs.app_pll_slow_ctl_reg = (rb + APP_PLL_312_CTL_REG);

drivers/scsi/bfa/include/bfi/bfi_cbreg.h

+13 −0
Original line number Diff line number Diff line
@@ -177,6 +177,19 @@ 
#define __PSS_LMEM_INIT_EN               0x00000100

#define __PSS_LPU1_RESET                 0x00000002

#define __PSS_LPU0_RESET                 0x00000001

#define PSS_ERR_STATUS_REG		 0x00018810

#define __PSS_LMEM1_CORR_ERR		 0x00000800

#define __PSS_LMEM0_CORR_ERR             0x00000400

#define __PSS_LMEM1_UNCORR_ERR           0x00000200

#define __PSS_LMEM0_UNCORR_ERR           0x00000100

#define __PSS_BAL_PERR                   0x00000080

#define __PSS_DIP_IF_ERR                 0x00000040

#define __PSS_IOH_IF_ERR                 0x00000020

#define __PSS_TDS_IF_ERR                 0x00000010

#define __PSS_RDS_IF_ERR                 0x00000008

#define __PSS_SGM_IF_ERR                 0x00000004

#define __PSS_LPU1_RAM_ERR               0x00000002

#define __PSS_LPU0_RAM_ERR               0x00000001

#define ERR_SET_REG			 0x00018818

#define __PSS_ERR_STATUS_SET		 0x00000fff