David - The backup and restoring of the MSIX vector capabilities registers across diagnostic reset was only needed for our pre-production cards (A0 parts). It was a workaround for some hardware errata. This is not needed anymore as there was a fix addressed before those controllers when to production, so I finally removed this workaround in the driver during phase 10 in the LSI in-house drivers, which was about 10 months ago. Attached is my commit for the in-house drivers. You should be able to remove the save_msix_table and restore_msix_table routines as I did.
On Monday, December 26, 2011 12:59 PM, David Miller wrote:
>
> The mpt2sas driver accesses I/O space as virtual addresses when saving and
> restoring the MSIX table, this only works by luck on x86.
>
> One needs to use the appropriate {read,write}{b,w,l}() APIs.
>
> This is fixed in v3.2.x because all of this code got rewritten for NUMA I/O
> support.
>
> But both 3.0.x and 3.1.x still have this bug, and my Niagara sparc machines
> crash on shutdown every single time due to this bug making my -stable work
> more difficult than it needs to be.
>
> Please apply to both 3.0.x-stable and 3.1.x-stable, thanks.
>
> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
>
> diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.c
> b/drivers/scsi/mpt2sas/mpt2sas_base.c
> index 83035bd..8cec3bd 100644
> --- a/drivers/scsi/mpt2sas/mpt2sas_base.c
> +++ b/drivers/scsi/mpt2sas/mpt2sas_base.c
> @@ -1096,7 +1096,7 @@ _base_save_msix_table(struct MPT2SAS_ADAPTER *ioc)
> return;
>
> for (i = 0; i < ioc->msix_vector_count; i++)
> - ioc->msix_table_backup[i] = ioc->msix_table[i];
> + ioc->msix_table_backup[i] = readl(&ioc->msix_table[i]);
> }
>
> /**
> @@ -1113,7 +1113,7 @@ _base_restore_msix_table(struct MPT2SAS_ADAPTER *ioc)
> return;
>
> for (i = 0; i < ioc->msix_vector_count; i++)
> - ioc->msix_table[i] = ioc->msix_table_backup[i];
> + writel(ioc->msix_table_backup[i], &ioc->msix_table[i]);
> }
>
> /**
> @@ -1144,7 +1144,7 @@ _base_check_enable_msix(struct MPT2SAS_ADAPTER *ioc)
> /* get msix table */
> pci_read_config_dword(ioc->pdev, base + 4, &msix_table_offset);
> msix_table_offset &= 0xFFFFFFF8;
> - ioc->msix_table = (u32 *)((void *)ioc->chip + msix_table_offset);
> + ioc->msix_table = ((void __iomem *)ioc->chip + msix_table_offset);
>
> dinitprintk(ioc, printk(MPT2SAS_INFO_FMT "msix is supported, "
> "vector_count(%d), table_offset(0x%08x), table(%p)\n", ioc->name,
> diff --git a/drivers/scsi/mpt2sas/mpt2sas_base.h
> b/drivers/scsi/mpt2sas/mpt2sas_base.h
> index 41a57a7..a8782f3 100644
> --- a/drivers/scsi/mpt2sas/mpt2sas_base.h
> +++ b/drivers/scsi/mpt2sas/mpt2sas_base.h
> @@ -768,7 +768,7 @@ struct MPT2SAS_ADAPTER {
>
> u8 msix_enable;
> u16 msix_vector_count;
> - u32 *msix_table;
> + u32 __iomem *msix_table;
> u32 *msix_table_backup;
> u32 ioc_reset_count;
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-scsi" in the
> body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at
> http://vger.kernel.org/majordomo-info.html
Attachment:
removing_msix_table_backup.patch
Description: removing_msix_table_backup.patch
