On Fri, Jan 03, 2020 at 08:30:42PM +0100, Mark Kettenis wrote:
> Can we leave out the #ifdef __sparc64__? Unless somebody can come up
> with a really good reason for it...
The code should be safe on all platforms but I put it in to ensure I'm
not breaking stuff I cannot test, e.g. anything else than sparc64/OBP.
deraadt expressed the same concerns.
With the two of you arguing for removal, I'm confident enough to remove
it and make mpii(4) MI again; unless I hear arguments against it, I'll
commit this soon.
Index: mpii.c
===================================================================
RCS file: /cvs/src/sys/dev/pci/mpii.c,v
retrieving revision 1.125
diff -u -p -r1.125 mpii.c
--- mpii.c 3 Jan 2020 08:39:31 -0000 1.125
+++ mpii.c 13 Jan 2020 09:59:01 -0000
@@ -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);
}
