From bkoenig@alpha-tierchen.de  Wed Nov 19 06:59:36 2008
Return-Path: <bkoenig@alpha-tierchen.de>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5B56E106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 19 Nov 2008 06:59:36 +0000 (UTC)
	(envelope-from bkoenig@alpha-tierchen.de)
Received: from mail.liberty-hosting.de (mail.smartterra.de [195.225.132.203])
	by mx1.freebsd.org (Postfix) with ESMTP id 1E9BF8FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 19 Nov 2008 06:59:35 +0000 (UTC)
	(envelope-from bkoenig@alpha-tierchen.de)
Received: from home.alpha-tierchen.de (port-87-234-81-35.dynamic.qsc.de [87.234.81.35])
	by mail.liberty-hosting.de (Postfix) with ESMTP id 4A3E13E950A
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 19 Nov 2008 07:53:12 +0100 (CET)
Received: by home.alpha-tierchen.de (Postfix, from userid 2000)
	id 1E5B328A19; Wed, 19 Nov 2008 07:59:32 +0100 (CET)
Message-Id: <20081119065932.1E5B328A19@home.alpha-tierchen.de>
Date: Wed, 19 Nov 2008 07:59:32 +0100 (CET)
From: Bjrn Knig <bkoenig@alpha-tierchen.de>
Reply-To: Bjrn Knig <bkoenig@alpha-tierchen.de>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] Fix at91_mci and use 1-bit mode.
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         128987
>Category:       arm
>Synopsis:       [patch] Fix at91_mci and use 1-bit mode.
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    stas
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 19 07:00:13 UTC 2008
>Closed-Date:    Tue Oct 13 10:32:34 UTC 2009
>Last-Modified:  Tue Oct 13 10:32:34 UTC 2009
>Originator:     Bjrn Knig
>Release:        
>Organization:
>Environment:
>Description:
	Currently SD Cards doesn't work with the at91_mci driver
	for AT91RM9200. These changes will make them work:

	- The 4-bit mode of the never worked. Disable it for now.

	- Return 'caps' ivar.

	Probably the 4-bit mode works for other AT91 controllers.
	Therefore it's necessary to find a better solution.

>How-To-Repeat:
	
>Fix:

	

--- src-sys-arm-at91-at91_mci.c.diff begins here ---
diff --git src/sys/arm/at91/at91_mci.c src/sys/arm/at91/at91_mci.c
index 07efc71..8e1cdeb 100644
--- src/sys/arm/at91/at91_mci.c
+++ src/sys/arm/at91/at91_mci.c
@@ -200,7 +200,8 @@ at91_mci_attach(device_t dev)
 	sc->host.f_min = 375000;
 	sc->host.f_max = 30000000;
 	sc->host.host_ocr = MMC_OCR_320_330 | MMC_OCR_330_340;
-	sc->host.caps = MMC_CAP_4_BIT_DATA;
+//	sc->host.caps = MMC_CAP_4_BIT_DATA;
+	sc->host.caps = 0;
 	child = device_add_child(dev, "mmc", 0);
 	device_set_ivars(dev, &sc->host);
 	err = bus_generic_attach(dev);
@@ -615,6 +616,9 @@ at91_mci_read_ivar(device_t bus, device_t child, int which, u_char *result)
 	case MMCBR_IVAR_BUS_WIDTH:
 		*(int *)result = sc->host.ios.bus_width;
 		break;
+	case MMCBR_IVAR_CAPS:
+		*(int *)result = sc->host.caps;
+		break;
 	case MMCBR_IVAR_CHIP_SELECT:
 		*(int *)result = sc->host.ios.chip_select;
 		break;
--- src-sys-arm-at91-at91_mci.c.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-arm->stas 
Responsible-Changed-By: stas 
Responsible-Changed-When: Sun Nov 30 22:59:57 UTC 2008 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128987 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: arm/128987: commit references a PR
Date: Tue, 20 Jan 2009 17:37:13 +0000 (UTC)

 Author: mav
 Date: Tue Jan 20 17:36:58 2009
 New Revision: 187476
 URL: http://svn.freebsd.org/changeset/base/187476
 
 Log:
   Implement MMCBR_IVAR_CAPS. It should better be implemented, or results
   can be unpredictable.
   
   PR:		arm/128987
 
 Modified:
   head/sys/arm/at91/at91_mci.c
 
 Modified: head/sys/arm/at91/at91_mci.c
 ==============================================================================
 --- head/sys/arm/at91/at91_mci.c	Tue Jan 20 17:15:12 2009	(r187475)
 +++ head/sys/arm/at91/at91_mci.c	Tue Jan 20 17:36:58 2009	(r187476)
 @@ -643,6 +643,9 @@ at91_mci_read_ivar(device_t bus, device_
  	case MMCBR_IVAR_VDD:
  		*(int *)result = sc->host.ios.vdd;
  		break;
 +	case MMCBR_IVAR_CAPS:
 +		*(int *)result = sc->host.caps;
 +		break;
  	case MMCBR_IVAR_MAX_DATA:
  		*(int *)result = 1;
  		break;
 @@ -683,6 +686,7 @@ at91_mci_write_ivar(device_t bus, device
  		sc->host.ios.vdd = value;
  		break;
  	/* These are read-only */
 +	case MMCBR_IVAR_CAPS:
  	case MMCBR_IVAR_HOST_OCR:
  	case MMCBR_IVAR_F_MIN:
  	case MMCBR_IVAR_F_MAX:
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->patched 
State-Changed-By: gavin 
State-Changed-When: Thu Mar 26 12:30:45 UTC 2009 
State-Changed-Why:  
Tentatively mark as patched, this appears to have been fixed (or at least 
worked around) in HEAD. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128987 
State-Changed-From-To: patched->closed 
State-Changed-By: stas 
State-Changed-When: Tue Oct 13 10:32:32 UTC 2009 
State-Changed-Why:  
Fixed in r187476 

http://www.freebsd.org/cgi/query-pr.cgi?pr=128987 
>Unformatted:
