svn commit: r271542 - in stable/9/sys: amd64/amd64 i386/i386

[Pedro F. Giffuni]

Author: pfg
Date: Sat Sep 13 18:34:56 2014
New Revision: 271542
URL: http://svnweb.freebsd.org/changeset/base/271542

Log:
  MFC	r271149:
  Apply known workarounds for less modern MacBooks.
  
  The legacy USB circuit tends to give trouble on older MacBooks.
  While the original report covered MacBook4, extend the fix
  preemptively for the newer MacBookPro4 too.
  
  PR:		191693
  Reviewed by:	emaste

Modified:
  stable/9/sys/amd64/amd64/machdep.c
  stable/9/sys/i386/i386/machdep.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/amd64/amd64/machdep.c
==============================================================================
--- stable/9/sys/amd64/amd64/machdep.c	Sat Sep 13 18:27:47 2014	(r271541)
+++ stable/9/sys/amd64/amd64/machdep.c	Sat Sep 13 18:34:56 2014	(r271542)
@@ -230,9 +230,11 @@ cpu_startup(dummy)
 	if (sysenv != NULL) {
 		if (strncmp(sysenv, "MacBook1,1", 10) == 0 ||
 		    strncmp(sysenv, "MacBook3,1", 10) == 0 ||
+		    strncmp(sysenv, "MacBook4,1", 10) == 0 ||
 		    strncmp(sysenv, "MacBookPro1,1", 13) == 0 ||
 		    strncmp(sysenv, "MacBookPro1,2", 13) == 0 ||
 		    strncmp(sysenv, "MacBookPro3,1", 13) == 0 ||
+		    strncmp(sysenv, "MacBookPro4,1", 13) == 0 ||
 		    strncmp(sysenv, "Macmini1,1", 10) == 0) {
 			if (bootverbose)
 				printf("Disabling LEGACY_USB_EN bit on "

Modified: stable/9/sys/i386/i386/machdep.c
==============================================================================
--- stable/9/sys/i386/i386/machdep.c	Sat Sep 13 18:27:47 2014	(r271541)
+++ stable/9/sys/i386/i386/machdep.c	Sat Sep 13 18:34:56 2014	(r271542)
@@ -269,9 +269,11 @@ cpu_startup(dummy)
 	if (sysenv != NULL) {
 		if (strncmp(sysenv, "MacBook1,1", 10) == 0 ||
 		    strncmp(sysenv, "MacBook3,1", 10) == 0 ||
+		    strncmp(sysenv, "MacBook4,1", 10) == 0 ||
 		    strncmp(sysenv, "MacBookPro1,1", 13) == 0 ||
 		    strncmp(sysenv, "MacBookPro1,2", 13) == 0 ||
 		    strncmp(sysenv, "MacBookPro3,1", 13) == 0 ||
+		    strncmp(sysenv, "MacBookPro4,1", 13) == 0 ||
 		    strncmp(sysenv, "Macmini1,1", 10) == 0) {
 			if (bootverbose)
 				printf("Disabling LEGACY_USB_EN bit on "