summaryrefslogtreecommitdiff
path: root/sys/dev/pci/mpii.c
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2016-11-06 09:58:17 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2016-11-06 09:58:17 +0000
commit208c860c18d8598e02052cb8f649d08d463ed841 (patch)
treedb4d27007458e7fbc06aff6705514e604fd21b2b /sys/dev/pci/mpii.c
parentaa2ac32035f77c6516cc516dc1b6ee7a948033e5 (diff)
dont issue sas config page requests against raid targets.
doing requests like that causes lockups on boot. reported by and this fix test by simon mages
Diffstat (limited to 'sys/dev/pci/mpii.c')
-rw-r--r--sys/dev/pci/mpii.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c
index 24c6dc84593..6d17d39f40b 100644
--- a/sys/dev/pci/mpii.c
+++ b/sys/dev/pci/mpii.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mpii.c,v 1.107 2016/10/24 01:50:09 dlg Exp $ */
+/* $OpenBSD: mpii.c,v 1.108 2016/11/06 09:58:16 dlg Exp $ */
/*
* Copyright (c) 2010, 2012 Mike Belopuhov
* Copyright (c) 2009 James Giannoules
@@ -888,6 +888,9 @@ mpii_scsi_probe(struct scsi_link *link)
if (ISSET(flags, MPII_DF_HIDDEN) || ISSET(flags, MPII_DF_UNUSED))
return (1);
+ if (ISSET(flags, MPII_DF_VOLUME))
+ return (0);
+
memset(&ehdr, 0, sizeof(ehdr));
ehdr.page_type = MPII_CONFIG_REQ_PAGE_TYPE_EXTENDED;
ehdr.page_number = 0;