ref: 51cfe763a491cf72f5177d3ccdca09edcb0340e9
parent: a8c50a79437006bdde702d09408df8749f48a45a
author: cinap_lenrek <[email protected]>
date: Sun Aug 25 16:02:53 EDT 2019
emmc: 50MHz highspeed support (from richard miller)
--- a/sys/src/9/bcm/emmc.c
+++ b/sys/src/9/bcm/emmc.c
@@ -4,6 +4,14 @@
* Copyright © 2012 Richard Miller <[email protected]>
*/
+/*
+ Not officially documented: emmc can be connected to different gpio pins
+ 48-53 (SD card)
+ 22-27 (P1 header)
+ 34-39 (wifi - pi3 only)
+ using ALT3 function to activate the required routing
+*/
+
#include "u.h"
#include "../port/lib.h"
#include "../port/error.h"
@@ -20,10 +28,18 @@
/* not available from vcore */
Initfreq = 400000, /* initialisation frequency for MMC */
SDfreq = 25*Mhz, /* standard SD frequency */
+ SDfreqhs = 50*Mhz, /* high speed frequency */
DTO = 14, /* data timeout exponent (guesswork) */
+ GoIdle = 0, /* mmc/sdio go idle state */
MMCSelect = 7, /* mmc/sd card select command */
Setbuswidth = 6, /* mmc/sd set bus width command */
+
+ Switchfunc = 6, /* mmc/sd switch function command */
+ Voltageswitch = 11, /* md/sdio switch to 1.8V */
+ IORWdirect = 52, /* sdio read/write direct command */
+ IORWextended = 53, /* sdio read/write extended command */
+ Appcmd = 55, /* mmc/sd application command prefix */
};
enum {@@ -56,6 +72,7 @@
Slotisrver = 0xfc>>2,
/* Control0 */
+ Hispeed = 1<<2,
Dwidth4 = 1<<1,
Dwidth1 = 0<<1,
@@ -126,10 +143,12 @@
[0] Ixchken,
[2] Resp136,
[3] Resp48 | Ixchken | Crcchken,
+[5] Resp48,
[6] Resp48 | Ixchken | Crcchken,
[7] Resp48busy | Ixchken | Crcchken,
[8] Resp48 | Ixchken | Crcchken,
[9] Resp136,
+[11] Resp48 | Ixchken | Crcchken,
[12] Resp48busy | Ixchken | Crcchken,
[13] Resp48 | Ixchken | Crcchken,
[16] Resp48,
@@ -138,6 +157,8 @@
[24] Resp48 | Isdata | Host2card | Ixchken | Crcchken,
[25] Resp48 | Isdata | Host2card | Multiblock | Blkcnten | Ixchken | Crcchken,
[41] Resp48,
+[52] Resp48 | Ixchken | Crcchken,
+[53] Resp48 | Ixchken | Crcchken | Isdata,
[55] Resp48 | Ixchken | Crcchken,
};
@@ -145,9 +166,10 @@
struct Ctlr {Rendez r;
- int datadone;
+ Rendez cardr;
int fastclock;
ulong extclk;
+ int appcmd;
};
static Ctlr emmc;
@@ -160,7 +182,8 @@
u32int *r = (u32int*)EMMCREGS;
if(0)print("WR %2.2ux %ux\n", reg<<2, val);- microdelay(emmc.fastclock? 2: 20);
+ microdelay(emmc.fastclock ? 2: 20);
+ coherence();
r[reg] = val;
}
@@ -175,27 +198,60 @@
return v;
}
+static void
+emmcclk(uint freq)
+{+ u32int *r;
+ uint div;
+ int i;
+
+ r = (u32int*)EMMCREGS;
+ div = emmc.extclk / (freq<<1);
+ if(emmc.extclk / (div<<1) > freq)
+ div++;
+ WR(Control1, clkdiv(div) |
+ DTO<<Datatoshift | Clkgendiv | Clken | Clkintlen);
+ for(i = 0; i < 1000; i++){+ delay(1);
+ if(r[Control1] & Clkstable)
+ break;
+ }
+ if(i == 1000)
+ print("emmc: can't set clock to %ud\n", freq);+}
+
static int
datadone(void*)
{- return emmc.datadone;
+ int i;
+
+ u32int *r = (u32int*)EMMCREGS;
+ i = r[Interrupt];
+ return i & (Datadone|Err);
}
static int
+cardintready(void*)
+{+ int i;
+
+ u32int *r = (u32int*)EMMCREGS;
+ i = r[Interrupt];
+ return i & Cardintr;
+}
+
+static int
emmcinit(void)
{u32int *r;
ulong clk;
- char *s;
clk = getclkrate(ClkEmmc);
- s = "";
if(clk == 0){- s = "Assuming ";
clk = Extfreq;
+ print("emmc: assuming external clock %lud Mhz\n", clk/1000000);}
emmc.extclk = clk;
- print("%seMMC external clock %lud Mhz\n", s, clk/1000000);r = (u32int*)EMMCREGS;
if(0)print("emmc control %8.8ux %8.8ux %8.8ux\n",r[Control0], r[Control1], r[Control2]);
@@ -203,6 +259,9 @@
delay(10);
while(r[Control1] & Srsthc)
;
+ WR(Control1, Srstdata);
+ delay(10);
+ WR(Control1, 0);
return 0;
}
@@ -222,20 +281,10 @@
static void
emmcenable(void)
{- u32int *r;
- int i;
-
- r = (u32int*)EMMCREGS;
- WR(Control1, clkdiv(emmc.extclk / Initfreq - 1) | DTO << Datatoshift |
- Clkgendiv | Clken | Clkintlen);
- for(i = 0; i < 1000; i++){- delay(1);
- if(r[Control1] & Clkstable)
- break;
- }
- if(i == 1000)
- print("SD clock won't initialise!\n");- WR(Irptmask, ~(Dtoerr|Cardintr));
+ emmcclk(Initfreq);
+ WR(Irpten, 0);
+ WR(Irptmask, ~0);
+ WR(Interrupt, ~0);
intrenable(IRQmmc, mmcinterrupt, nil, BUSUNKNOWN, "mmc");
}
@@ -250,7 +299,28 @@
r = (u32int*)EMMCREGS;
assert(cmd < nelem(cmdinfo) && cmdinfo[cmd] != 0);
c = (cmd << Indexshift) | cmdinfo[cmd];
- if(r[Status] & Cmdinhibit){+ /*
+ * CMD6 may be Setbuswidth or Switchfunc depending on Appcmd prefix
+ */
+ if(cmd == Switchfunc && !emmc.appcmd)
+ c |= Isdata|Card2host;
+ if(cmd == IORWextended){+ if(arg & (1<<31))
+ c |= Host2card;
+ else
+ c |= Card2host;
+ if((r[Blksizecnt]&0xFFFF0000) != 0x10000)
+ c |= Multiblock | Blkcnten;
+ }
+ /*
+ * GoIdle indicates new card insertion: reset bus width & speed
+ */
+ if(cmd == GoIdle){+ WR(Control0, r[Control0] & ~(Dwidth4|Hispeed));
+ emmcclk(Initfreq);
+ }
+ if((r[Status] & Datinhibit) &&
+ ((c & Isdata) || (c & Respmask) == Resp48busy)){ print("emmccmd: need to reset Cmdinhibit intr %ux stat %ux\n",r[Interrupt], r[Status]);
WR(Control1, r[Control1] | Srstcmd);
@@ -270,7 +340,7 @@
;
}
WR(Arg1, arg);
- if((i = r[Interrupt]) != 0){+ if((i = (r[Interrupt] & ~Cardintr)) != 0){if(i != Cardinsert)
print("emmc: before command, intr was %ux\n", i);WR(Interrupt, i);
@@ -281,8 +351,8 @@
if(m->ticks-now > HZ)
break;
if((i&(Cmddone|Err)) != Cmddone){- if((i&~Err) != Ctoerr)
- print("emmc: cmd %ux error intr %ux stat %ux\n", c, i, r[Status]);+ if((i&~(Err|Cardintr)) != Ctoerr)
+ print("emmc: cmd %ux arg %ux error intr %ux stat %ux\n", c, arg, i, r[Status]);WR(Interrupt, i);
if(r[Status]&Cmdinhibit){WR(Control1, r[Control1]|Srstcmd);
@@ -308,11 +378,9 @@
break;
}
if((c & Respmask) == Resp48busy){- WR(Irpten, Datadone|Err);
+ WR(Irpten, r[Irpten]|Datadone|Err);
tsleep(&emmc.r, datadone, 0, 3000);
- i = emmc.datadone;
- emmc.datadone = 0;
- WR(Irpten, 0);
+ i = r[Interrupt];
if((i & Datadone) == 0)
print("emmcio: no Datadone after CMD%d\n", cmd);if(i & Err)
@@ -324,29 +392,46 @@
* Once card is selected, use faster clock
*/
if(cmd == MMCSelect){- delay(10);
- WR(Control1, clkdiv(emmc.extclk / SDfreq - 1) |
- DTO << Datatoshift | Clkgendiv | Clken | Clkintlen);
- for(i = 0; i < 1000; i++){- delay(1);
- if(r[Control1] & Clkstable)
- break;
- }
- delay(10);
+ delay(1);
+ emmcclk(SDfreq);
+ delay(1);
emmc.fastclock = 1;
}
- /*
- * If card bus width changes, change host bus width
- */
- if(cmd == Setbuswidth)
- switch(arg){+ if(cmd == Setbuswidth){+ if(emmc.appcmd){+ /*
+ * If card bus width changes, change host bus width
+ */
+ switch(arg){+ case 0:
+ WR(Control0, r[Control0] & ~Dwidth4);
+ break;
+ case 2:
+ WR(Control0, r[Control0] | Dwidth4);
+ break;
+ }
+ }else{+ /*
+ * If card switched into high speed mode, increase clock speed
+ */
+ if((arg&0x8000000F) == 0x80000001){+ delay(1);
+ emmcclk(SDfreqhs);
+ delay(1);
+ }
+ }
+ }else if(cmd == IORWdirect && (arg & ~0xFF) == (1<<31|0<<28|7<<9)){+ switch(arg & 0x3){case 0:
WR(Control0, r[Control0] & ~Dwidth4);
break;
case 2:
WR(Control0, r[Control0] | Dwidth4);
+ //WR(Control0, r[Control0] | Hispeed);
break;
}
+ }
+ emmc.appcmd = (cmd == Appcmd);
return 0;
}
@@ -379,11 +464,9 @@
&r[Data], buf, len);
if(dmawait(DmaChanEmmc) < 0)
error(Eio);
- WR(Irpten, Datadone|Err);
+ WR(Irpten, r[Irpten]|Datadone|Err);
tsleep(&emmc.r, datadone, 0, 3000);
- i = emmc.datadone;
- emmc.datadone = 0;
- WR(Irpten, 0);
+ i = r[Interrupt]&~Cardintr;
if((i & Datadone) == 0){ print("emmcio: %d timeout intr %ux stat %ux\n",write, i, r[Status]);
@@ -410,9 +493,11 @@
r = (u32int*)EMMCREGS;
i = r[Interrupt];
- r[Interrupt] = i & (Datadone|Err);
- emmc.datadone = i;
- wakeup(&emmc.r);
+ if(i&(Datadone|Err))
+ wakeup(&emmc.r);
+ if(i&Cardintr)
+ wakeup(&emmc.cardr);
+ WR(Irpten, r[Irpten] & ~i);
}
SDio sdio = {@@ -423,4 +508,5 @@
emmccmd,
emmciosetup,
emmcio,
+ .highspeed = 1,
};
--- a/sys/src/9/bcm64/sdhc.c
+++ b/sys/src/9/bcm64/sdhc.c
@@ -562,4 +562,5 @@
emmccmd,
emmciosetup,
emmcio,
+ .highspeed = 1,
};
--- a/sys/src/9/port/sd.h
+++ b/sys/src/9/port/sd.h
@@ -161,6 +161,7 @@
int (*cmd)(u32int, u32int, u32int*);
void (*iosetup)(int, void*, int, int);
void (*io)(int, uchar*, int);
+ char highspeed;
};
extern SDio sdio;
--- a/sys/src/9/port/sdmmc.c
+++ b/sys/src/9/port/sdmmc.c
@@ -249,7 +249,7 @@
io->cmd(SET_BLOCKLEN, unit->secsize, r);
io->cmd(APP_CMD, ctl->rca<<Rcashift, r);
io->cmd(SET_BUS_WIDTH, Width4, r);
- if(strcmp(io->name, "sdhc") == 0){+ if(io->highspeed){ if(!waserror()){mmcswitchfunc(io, Hispeed|Setfunc);
poperror();