leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scsi: aacraid: Preserve MSIX mode in the OMR register

Browse Source 
Preserve the current MSIX mode value in the OMR before rewriting the OMR
to initiate the IOP or Soft Reset.

Signed-off-by: Prasad B Munirathnam <prasad.munirathnam@microsemi.com>
Signed-off-by: Raghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
Reviewed-by: Dave Carroll <david.carroll@microsemi.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Raghava Aditya Renukunta 2018-02-07 08:40:57 -08:00 committed by Martin K. Petersen
parent 44f1ce7d2f
commit a5799d74d9
1 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/scsi/aacraid/src.c
View File

@ -680,6 +680,25 @@ void aac_set_intx_mode(struct aac_dev *dev)
} }
} }
static void aac_clear_omr(struct aac_dev *dev)
{
u32 omr_value = 0;
omr_value = src_readl(dev, MUnit.OMR);
/*
* Check for PCI Errors or Kernel Panic
*/
if ((omr_value == INVALID_OMR) || (omr_value & KERNEL_PANIC))
omr_value = 0;
/*
* Preserve MSIX Value if any
*/
src_writel(dev, MUnit.OMR, omr_value & AAC_INT_MODE_MSIX);
src_readl(dev, MUnit.OMR);
}
static void aac_dump_fw_fib_iop_reset(struct aac_dev *dev) static void aac_dump_fw_fib_iop_reset(struct aac_dev *dev)
{ {
__le32 supported_options3; __le32 supported_options3;
@ -740,6 +759,8 @@ static void aac_send_iop_reset(struct aac_dev *dev)
aac_set_intx_mode(dev); aac_set_intx_mode(dev);
aac_clear_omr(dev);
src_writel(dev, MUnit.IDR, IOP_SRC_RESET_MASK); src_writel(dev, MUnit.IDR, IOP_SRC_RESET_MASK);
msleep(5000); msleep(5000);
@ -749,6 +770,7 @@ static void aac_send_hardware_soft_reset(struct aac_dev *dev)
{ {
u_int32_t val; u_int32_t val;
aac_clear_omr(dev);
val = readl(((char *)(dev->base) + IBW_SWR_OFFSET)); val = readl(((char *)(dev->base) + IBW_SWR_OFFSET));
val |= 0x01; val |= 0x01;
writel(val, ((char *)(dev->base) + IBW_SWR_OFFSET)); writel(val, ((char *)(dev->base) + IBW_SWR_OFFSET));