svn commit: r274409 - head/sys/arm/broadcom/bcm2835

[Luiz Otavio O Souza]

Author: loos
Date: Tue Nov 11 23:55:37 2014
New Revision: 274409
URL: https://svnweb.freebsd.org/changeset/base/274409

Log:
  Since r273264 the SD card detection on Raspberry Pi is reliably working and
  that expose new bugs with HS mode.
  
  When the old code could not do the proper card detection it would boot with
  lower defaults (and no HS mode) and this makes some HS cards boots.
  
  Now, with the card always identified as HS capable, the sdhci controller
  tries to run the card at HS speeds and makes the boot always fail.
  
  Disable the HS mode for now (which still can be enabled with the tunable)
  until it is properly fixed.
  
  MFC with:	r273264
  Requested by:	many

Modified:
  head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c

Modified: head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c	Tue Nov 11 22:08:18 2014	(r274408)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_sdhci.c	Tue Nov 11 23:55:37 2014	(r274409)
@@ -84,10 +84,13 @@ __FBSDID("$FreeBSD$");
 /* 
  * Arasan HC seems to have problem with Data CRC on lower frequencies.
  * Use this tunable to cap initialization sequence frequency at higher
- * value. Default is standard 400kHz
+ * value.  Default is standard 400kHz.
+ * HS mode brings too many problems for most of cards, so disable HS mode
+ * until a better fix comes up.
+ * HS mode still can be enabled with the tunable.
  */
 static int bcm2835_sdhci_min_freq = 400000;
-static int bcm2835_sdhci_hs = 1;
+static int bcm2835_sdhci_hs = 0;
 static int bcm2835_sdhci_pio_mode = 0;
 
 TUNABLE_INT("hw.bcm2835.sdhci.min_freq", &bcm2835_sdhci_min_freq);