From: David Miller <davem@davemloft.net>
To: stable@vger.kernel.org
Cc: linux-scsi@vger.kernel.org, nagalakshmi.nandigama@lsi.com
Subject: [PATCH]: mpt2sas crashes on shutdown
Date: Mon, 26 Dec 2011 14:59:20 -0500 (EST) [thread overview]
Message-ID: <20111226.145920.1088076837634135764.davem@davemloft.net> (raw)
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@davemloft.net>
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;
next reply other threads:[~2011-12-26 19:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-26 19:59 David Miller [this message]
2011-12-27 17:09 ` [PATCH]: mpt2sas crashes on shutdown Moore, Eric
2011-12-27 18:05 ` David Miller
2011-12-27 18:24 ` Douglas Gilbert
2011-12-27 18:51 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20111226.145920.1088076837634135764.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=linux-scsi@vger.kernel.org \
--cc=nagalakshmi.nandigama@lsi.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).