diff options
| author | kn <kn@cvs.openbsd.org> | 2020-01-13 19:57:20 +0000 |
|---|---|---|
| committer | kn <kn@cvs.openbsd.org> | 2020-01-13 19:57:20 +0000 |
| commit | 22dc93d2edc525ee49efb29a7e6fa2a185b4992f (patch) | |
| tree | 2b9423e84676fa97508594022b2b368da32d9063 /sys | |
| parent | 167bb0c4e68733270da3f61c0078b942535c4b93 (diff) | |
Unifdef WWN quirk
I committed the last revision under #ifdef sparc64 to make extra sure not
to break platforms/setups I couldn't test.
Now that deraadt and kettenis both expressed how this should really be MI
and noone came up with a good reason to keep this sparc64 specific, I'm
confident enough to remove the #ifdef.
OK kettenis
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/pci/mpii.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/pci/mpii.c b/sys/dev/pci/mpii.c index 051ca5e511c..192920103f2 100644 --- a/sys/dev/pci/mpii.c +++ b/sys/dev/pci/mpii.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mpii.c,v 1.125 2020/01/03 08:39:31 kn Exp $ */ +/* $OpenBSD: mpii.c,v 1.126 2020/01/13 19:57:19 kn Exp $ */ /* * Copyright (c) 2010, 2012 Mike Belopuhov * Copyright (c) 2009 James Giannoules @@ -930,15 +930,13 @@ mpii_scsi_probe(struct scsi_link *link) return (EINVAL); link->port_wwn = letoh64(vpg.wwid); -#ifdef __sparc64__ /* * WWIDs generated by LSI firmware are not IEEE NAA compliant - * so historical practise in OBP is to set the top nibble to 3 - * to indicate that this is a RAID volume. + * and historical practise in OBP on sparc64 is to set the top + * nibble to 3 to indicate that this is a RAID volume. */ link->port_wwn &= 0x0fffffffffffffff; link->port_wwn |= 0x3000000000000000; -#endif return (0); } |