r340 - cpu/x86/pc/olpc
by svn＠openbios.org
Author: wmb
Date: 2007-04-30 23:08:52 +0200 (Mon, 30 Apr 2007)
New Revision: 340
Modified:
cpu/x86/pc/olpc/versions.fth
Log:
Q2C09
Modified: cpu/x86/pc/olpc/versions.fth
===================================================================
--- cpu/x86/pc/olpc/versions.fth 2007-04-30 21:08:30 UTC (rev 339)
+++ cpu/x86/pc/olpc/versions.fth 2007-04-30 21:08:52 UTC (rev 340)
@@ -2,11 +2,15 @@
\ The overall firmware revision
macro: FW_MAJOR C
-macro: FW_MINOR 08j
+macro: FW_MINOR 09
\ The EC microcode
-macro: EC_VERSION c03
+macro: EC_VERSION c09
+\ Alternate command for getting EC microcode, for testing new versions.
+\ Temporarily uncomment the line and modify the path as necessary
+\ macro: GET_EC cp ~/ec-c05t.bin ec.img
+
\ The wireless LAN module firmware
macro: WLAN_RPM 5.220.10.p5-1.olpc1
macro: WLAN_VERSION 5.220.10.p5
13 years, 2 months
- 1
- 0
r339 - dev/olpc/cafenand
by svn＠openbios.org
Author: wmb
Date: 2007-04-30 23:08:30 +0200 (Mon, 30 Apr 2007)
New Revision: 339
Modified:
dev/olpc/cafenand/configure.fth
Log:
OLPC CaFe- removed an innocuous but annoying message that happens when
probing a nonexistent second chip.
Modified: dev/olpc/cafenand/configure.fth
===================================================================
--- dev/olpc/cafenand/configure.fth 2007-04-30 16:42:32 UTC (rev 338)
+++ dev/olpc/cafenand/configure.fth 2007-04-30 21:08:30 UTC (rev 339)
@@ -38,6 +38,8 @@
: configure-size ( adr -- adr )
\ These are all 2K-page devices
dup 1+ c@ case ( adr device-code )
+ h# 0 of abort endof \ This is the result for nonexistent chips
+ h# ff of abort endof \ Another likely result for nonexistent chips
h# f2 of h# 01.0000 endof \ 128 MB, 1 Gbit, 64K pages
h# f1 of h# 02.0000 endof \ 256 MB, 2 Gbit, 128K pages
h# dc of h# 04.0000 endof \ 512 MB, 4 Gbit, 256K pages
13 years, 2 months
- 1
- 0
r135 - openbios-devel/modules
by svn＠openbios.org
Author: blueswirl
Date: 2007-04-30 21:08:37 +0200 (Mon, 30 Apr 2007)
New Revision: 135
Modified:
openbios-devel/modules/console.c
Log:
Improve escape sequence handling
Modified: openbios-devel/modules/console.c
===================================================================
--- openbios-devel/modules/console.c 2007-04-29 19:57:01 UTC (rev 134)
+++ openbios-devel/modules/console.c 2007-04-30 19:08:37 UTC (rev 135)
@@ -21,6 +21,13 @@
#define NCOLS 80
#define NROWS 48
+typedef enum {
+ ESnormal, ESesc, ESsquare, ESgetpars, ESgotpars, ESfunckey,
+ EShash, ESsetG0, ESsetG1, ESpercent, ESignore, ESnonstd,
+ ESpalette
+} vc_state_t;
+
+#define NPAR 16
static struct {
int inited;
int physw, physh;
@@ -30,6 +37,9 @@
char *buf;
int cursor_on;
+ vc_state_t vc_state;
+ unsigned int vc_npar,vc_par[NPAR]; /* Parameters of current
+ escape sequence */
} cons;
static int
@@ -115,6 +125,7 @@
cons.buf = malloc( cons.w * cons.h );
cons.inited = 1;
cons.x = cons.y = 0;
+ cons.vc_state = ESnormal;
return 0;
}
@@ -162,22 +173,148 @@
draw_line(cons.h-1);
}
+static void
+do_con_trol(int ch)
+{
+ unsigned int i, j;
+
+ switch (ch) {
+ case 8:
+ if (cons.x)
+ cons.x--;
+ return;
+ case 10 ... 12:
+ cons.x = 0;
+ cons.y++;
+ return;
+ case 13:
+ cons.x = 0;
+ return;
+ case 24:
+ case 26:
+ cons.vc_state = ESnormal;
+ return;
+ case 27:
+ cons.vc_state = ESesc;
+ return;
+ }
+
+ switch (cons.vc_state) {
+ case ESesc:
+ cons.vc_state = ESnormal;
+ switch (ch) {
+ case '[':
+ cons.vc_state = ESsquare;
+ return;
+ case 'M':
+ scroll1();
+ return;
+ default:
+ printk("Unhandled escape code '%c'\n", ch);
+ return;
+ }
+ return;
+ case ESsquare:
+ for(cons.vc_npar = 0; cons.vc_npar < NPAR ; cons.vc_npar++)
+ cons.vc_par[cons.vc_npar] = 0;
+ cons.vc_npar = 0;
+ cons.vc_state = ESgetpars;
+ // Fall through
+ case ESgetpars:
+ if (ch == ';' && cons.vc_npar < NPAR - 1) {
+ cons.vc_npar++;
+ return;
+ } else if (ch >= '0' && ch <= '9') {
+ cons.vc_par[cons.vc_npar] *= 10;
+ cons.vc_par[cons.vc_npar] += ch - '0';
+ return;
+ } else
+ cons.vc_state=ESgotpars;
+ // Fall through
+ case ESgotpars:
+ cons.vc_state = ESnormal;
+ switch(ch) {
+ case 'H':
+ case 'f':
+ if (cons.vc_par[0])
+ cons.vc_par[0]--;
+
+ if (cons.vc_par[1])
+ cons.vc_par[1]--;
+
+ cons.x = cons.vc_par[1];
+ cons.y = cons.vc_par[0];
+ return;
+ case 'J':
+ if (cons.vc_par[0] == 0 && (uint)cons.y < (uint)cons.h &&
+ (uint)cons.x < (uint)cons.w) {
+ // erase from cursor to end of display
+ for (i = cons.x; i < cons.w; i++)
+ cons.buf[cons.y * cons.w + i] = ' ';
+ draw_line(cons.y);
+ for (j = cons.y + 1; j < cons.h; j++) {
+ for (i = 0; i < cons.w; i++)
+ cons.buf[j * cons.w + i] = ' ';
+ draw_line(j);
+ }
+ }
+ return;
+ case 'K':
+ switch (cons.vc_par[0]) {
+ case 0: /* erase from cursor to end of line */
+ for (i = cons.x; i < cons.w; i++)
+ cons.buf[cons.y * cons.w + i] = ' ';
+ draw_line(cons.y);
+ return;
+ case 1: /* erase from start of line to cursor */
+ for (i = 0; i <= cons.x; i++)
+ cons.buf[cons.y * cons.w + i] = ' ';
+ draw_line(cons.y);
+ return;
+ case 2: /* erase whole line */
+ for (i = 0; i <= cons.w; i++)
+ cons.buf[cons.y * cons.w + i] = ' ';
+ draw_line(cons.y);
+ return;
+ default:
+ return;
+ }
+ return;
+ case 'M':
+ scroll1();
+ return;
+ case 'm':
+ return;
+ case '@':
+ return;
+ default:
+ printk("Unhandled escape code '%c', par[%d, %d, %d, %d, %d]\n",
+ ch, cons.vc_par[0], cons.vc_par[1], cons.vc_par[2],
+ cons.vc_par[3], cons.vc_par[4]);
+ return;
+ }
+ return;
+ default:
+ cons.vc_state = ESnormal;
+ rec_char(ch, cons.x++, cons.y);
+ return;
+ }
+}
+
int
console_draw_str( const char *str )
{
- static const char *ignore[] = { "[1;37m", "[2;40m", NULL };
- int ch, y, x, i;
+ int ch, y, x;
if( !cons.inited && console_init() )
return -1;
show_cursor(0);
while( (ch=*str++) ) {
- if( ch == 12 )
- continue;
- if( ch == '\n' || cons.x >= cons.w ) {
+ do_con_trol(ch);
+
+ if( cons.x >= cons.w ) {
cons.x=0, cons.y++;
- continue;
}
if( cons.y >= cons.h ) {
for( y=0; y<cons.h-1; y++ )
@@ -187,21 +324,6 @@
cons.x = 0;
scroll1();
}
- if( ch == '\r' )
- continue;
- if( ch == '\e' ) {
- for( i=0; ignore[i] && strncmp(ignore[i], str, strlen(ignore[i])); i++ )
- ;
- if( ignore[i] )
- str += strlen(ignore[i]);
- continue;
- }
- if( ch == 8 ) {
- if( cons.x )
- cons.x--;
- continue;
- }
- rec_char( ch, cons.x++, cons.y );
}
show_cursor(1);
return 0;
13 years, 2 months
- 1
- 0
r338 - cpu/x86/pc/olpc
by svn＠openbios.org
Author: wmb
Date: 2007-04-30 18:42:32 +0200 (Mon, 30 Apr 2007)
New Revision: 338
Modified:
cpu/x86/pc/olpc/chipinit.fth
cpu/x86/pc/olpc/gpioinit.fth
Log:
OLPC - fixed interrupt routing for B3.
Modified: cpu/x86/pc/olpc/chipinit.fth
===================================================================
--- cpu/x86/pc/olpc/chipinit.fth 2007-04-30 16:41:48 UTC (rev 337)
+++ cpu/x86/pc/olpc/chipinit.fth 2007-04-30 16:42:32 UTC (rev 338)
@@ -551,7 +551,7 @@
msr: 5140.0020 00000000.bb350a00. \ IRQM_YLOW
msr: 5140.0021 00000000.04000000. \ IRQM_YHIGH
msr: 5140.0022 00000000.00002222. \ IRQM_ZLOW
- msr: 5140.0023 00000000.600aa5b2. \ IRQM_ZHIGH
+ msr: 5140.0023 00000000.60baa5b2. \ IRQM_ZHIGH
msr: 5140.0025 00000000.00001002. \ IRQM_LPC
\ msr: 5140.0028 00000000.00000000. \ MFGPT_IRQ off - default
\ msr: 5140.0040 00000000.00000000. \ DMA_MAP - default
Modified: cpu/x86/pc/olpc/gpioinit.fth
===================================================================
--- cpu/x86/pc/olpc/gpioinit.fth 2007-04-30 16:41:48 UTC (rev 337)
+++ cpu/x86/pc/olpc/gpioinit.fth 2007-04-30 16:42:32 UTC (rev 338)
@@ -1,22 +1,40 @@
: olpc-gpio-init
\ h# f7ff0800 h# 1000 pl! \ GPIOL_OUTPUT_VALUE
\ h# 36ffc900 h# 1004 pl! \ GPIOL_OUTPUT_ENABLE
+lx? if
+ h# c902 h# 1004 pl! \ GPIOL_OUTPUT_ENABLE - SMBDAT, SMBCLK, DCONLOAD, UART1TX, MIC
+else
h# e902 h# 1004 pl! \ GPIOL_OUTPUT_ENABLE - SMBDAT, SMBCLK, SMI#, DCONLOAD, UART1TX, MIC
+then
\ h# ffff0000 h# 1008 pl! \ GPIOL_OUT_OPENDRAIN - default
\ h# ffff0000 h# 100c pl! \ GPIOL_OUTPUT_INVERT_ENABLE - default
h# c100 h# 1010 pl! \ GPIOL_OUT_AUX1_SELECT - SMBDAT, SMBCLK, UART1TX
\ h# ffff0000 h# 1014 pl! \ GPIOL_OUT_AUX2_SELECT - default
\ h# 1001effe h# 1018 pl! \ GPIOL_PULLUP_ENABLE - I don't think we need pullups
+lx? if
+ h# 1d7a2000 h# 1018 pl! \ GPIOL_PULLUP_ENABLE - Disable pullups on DCONBLNK/LOAD/STAT, THRM_ALARM, UART1TX, VGA, MICDC
+ \ Enable pullup on PCI_INTC#
+else
h# 3d7a0000 h# 1018 pl! \ GPIOL_PULLUP_ENABLE - Disable pullups on SMI#, DCONBLNK/LOAD/STAT, THRM_ALARM, UART1TX, VGA, MICDC
+then
\ h# efff1000 h# 101c pl! \ GPIOL_PULLDOWN_ENABLE - default
h# ffff0000 h# 101c pl! \ GPIOL_PULLDOWN_ENABLE - Disable all pull-downs
+lx? if
+ h# f6e5 h# 1020 pl! \ GPIOL_INPUT_ENABLE - DCONBLNK, DCONLOAD, PCI_INTC, THRM_ALARM, DCONIRQ, DCONSTAT1/0, MEMSIZE, PCI_INTA
+ h# 2481 h# 1024 pl! \ GPIOL_INPUT_INVERT_ENABLE - Invert PCI_INTC, THRM_ALARM, DCONIRQ and PCI_INTA#
+else
h# d6e5 h# 1020 pl! \ GPIOL_INPUT_ENABLE - DCONBLNK, DCONLOAD, THRM_ALARM, DCONIRQ, DCONSTAT1/0, MEMSIZE, PCI_INTA
h# 0481 h# 1024 pl! \ GPIOL_INPUT_INVERT_ENABLE - Invert THRM_ALARM, DCONIRQ and PCI_INTA#
+then
\ h# ffff0000 h# 1028 pl! \ GPIOL_IN_FILTER_ENABLE - default
\ h# ffff0000 h# 102c pl! \ GPIOL_IN_EVENTCOUNT_ENABLE - default
\ h# 2d9bd264 h# 1030 pl! \ GPIOL_READ_BACK
h# c600 h# 1034 pl! \ GPIOL_IN_AUX1_SELECT
+lx? if
+ h# 2081 h# 1038 pl! \ GPIOL_EVENTS_ENABLE - PCI_INTC, PCI_INTA
+else
h# 0081 h# 1038 pl! \ GPIOL_EVENTS_ENABLE
+then
\ h# 00000000 h# 103c pl! \ GPIOL_LOCK_ENABLE - default
\ h# ffff0000 h# 1040 pl! \ GPIOL_IN_POSEDGE_ENABLE - default
\ h# ffff0000 h# 1044 pl! \ GPIOL_IN_NEGEDGE_ENABLE - default
@@ -81,6 +99,9 @@
\ h# 0000 h# 10de pw! \ GPIO_07_EVENTCOMPARE_VALUE - default
h# 20000001 h# 10e0 pl! \ GPIO_MAPPER_X
+lx? if
+ h# 00500000 h# 10e4 pl! \ GPIO_MAPPER_Y
+then
\ h# 00000000 h# 10e4 pl! \ GPIO_MAPPER_Y - default
\ h# 00000000 h# 10e8 pl! \ GPIO_MAPPER_Z - default
\ h# 00000000 h# 10ec pl! \ GPIO_MAPPER_W - default
13 years, 2 months
- 1
- 0
r337 - dev/olpc/cafenand
by svn＠openbios.org
Author: wmb
Date: 2007-04-30 18:41:48 +0200 (Mon, 30 Apr 2007)
New Revision: 337
Modified:
dev/olpc/cafenand/cafenand.fth
Log:
OLPC CaFe NAND driver - fixed typo in previous checkin.
Modified: dev/olpc/cafenand/cafenand.fth
===================================================================
--- dev/olpc/cafenand/cafenand.fth 2007-04-29 19:32:48 UTC (rev 336)
+++ dev/olpc/cafenand/cafenand.fth 2007-04-30 16:41:48 UTC (rev 337)
@@ -85,7 +85,7 @@
: >cmd ( cmd# #nonmem #address-bytes -- cmdval )
dup if 1- d# 27 lshift h# 4000.0000 or then ( cmd# #nm adr-field )
over 1 and d# 20 lshift or \ #nm[0] ( cmd# #nm adr+nm0 )
- swap e and d# 21 lshift or \ #nm[3:1] ( cmd# adr+nm )
+ swap h# e and d# 21 lshift or \ #nm[3:1] ( cmd# adr+nm )
or h# 8000.0000 or
;
@@ -147,7 +147,7 @@
write-enable
dma-off set-page dup datalen ( adr len )
chip h# 2000 + swap move ( )
- write-cmd h# 0000.0110 cmd wait-cmd ( ) No Auto ECC
+ write-cmd h# 0000.0110 cmd wait-cmd ( ) \ No Auto ECC
wait-write-done
write-disable
;
13 years, 2 months
- 1
- 0
Overriding default config with nvram?
by Blue Swirl
Hi,
I'm adding support for nvram variables to Qemu (see attached patches), like:
qemu-system-sparc -prom-env "boot-device=zorg"
But this only works if the variable does not have any default value in
nvram.fs. I'd like to change this so that the nvram values override
defaults, but how?
For example:
qemu-system-sparc -boot n -prom-env "boot-device=foobar" -prom-env
"boot-device-foobar=foobar" -nographic -monitor stdio -hda /dev/null
Nvram id QEMU_BIOS, version 1, machine id 0x80
CPUs: 1
Welcome to OpenBIOS v1.0RC1 built on Apr 29 2007 07:39
Type 'help' for detailed information
[sparc] Booting file 'net' without parameters.
0 > printenv
name "options"
boot-from "disk"
boot-device "disk"
boot-device-foobar "foobar"
boot-args ""
[cut]
Here boot-device is overridden to "disk" somewhere later but
boot-device-foobar survives.
13 years, 2 months
- 2
- 2
r134 - openbios-devel/drivers
by svn＠openbios.org
Author: blueswirl
Date: 2007-04-29 21:57:01 +0200 (Sun, 29 Apr 2007)
New Revision: 134
Modified:
openbios-devel/drivers/obio.c
Log:
Fix nvram parameter area
Modified: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c 2007-04-29 19:55:08 UTC (rev 133)
+++ openbios-devel/drivers/obio.c 2007-04-29 19:57:01 UTC (rev 134)
@@ -291,19 +291,21 @@
void
arch_nvram_get(char *data)
{
- memcpy(data, nvram, NVRAM_SIZE);
+ memcpy(data, &nvram[sizeof(struct qemu_nvram_v1)],
+ NVRAM_IDPROM - sizeof(struct qemu_nvram_v1));
}
void
arch_nvram_put(char *data)
{
- memcpy(nvram, data, NVRAM_SIZE);
+ memcpy(&nvram[sizeof(struct qemu_nvram_v1)], data,
+ NVRAM_IDPROM - sizeof(struct qemu_nvram_v1));
}
int
arch_nvram_size(void)
{
- return NVRAM_SIZE;
+ return (NVRAM_IDPROM - sizeof(struct qemu_nvram_v1)) & ~15;
}
static void mb86904_init(void)
13 years, 2 months
- 1
- 0
r133 - openbios-devel/drivers
by svn＠openbios.org
Author: blueswirl
Date: 2007-04-29 21:55:08 +0200 (Sun, 29 Apr 2007)
New Revision: 133
Modified:
openbios-devel/drivers/obio.c
Log:
More Sparc32 CPUs
Modified: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c 2007-04-29 19:50:57 UTC (rev 132)
+++ openbios-devel/drivers/obio.c 2007-04-29 19:55:08 UTC (rev 133)
@@ -388,6 +388,20 @@
fword("property");
}
+static void rt625_init(void)
+{
+ PUSH(32);
+ fword("encode-int");
+ push_str("cache-line-size");
+ fword("property");
+
+ PUSH(512);
+ fword("encode-int");
+ push_str("cache-nlines");
+ fword("property");
+
+}
+
struct cpudef {
unsigned long iu_version;
const char *name;
@@ -407,6 +421,25 @@
.psr_vers = 5,
.impl = 0,
.vers = 5,
+ .dcache_line_size = 0x10,
+ .dcache_lines = 0x200,
+ .dcache_assoc = 1,
+ .icache_line_size = 0x20,
+ .icache_lines = 0x200,
+ .icache_assoc = 1,
+ .ecache_line_size = 0x20,
+ .ecache_lines = 0x4000,
+ .ecache_assoc = 1,
+ .mmu_nctx = 0x100,
+ .initfn = mb86904_init,
+ },
+ {
+ .iu_version = 0x05 << 24, /* Impl 0, ver 5 */
+ .name = "FMI,MB86907",
+ .psr_impl = 0,
+ .psr_vers = 5,
+ .impl = 0,
+ .vers = 5,
.dcache_line_size = 0x20,
.dcache_lines = 0x200,
.dcache_assoc = 1,
@@ -420,6 +453,25 @@
.initfn = mb86904_init,
},
{
+ .iu_version = 0x41000000,
+ .name = "TI,TMS390S10",
+ .psr_impl = 4,
+ .psr_vers = 1,
+ .impl = 4,
+ .vers = 1,
+ .dcache_line_size = 0x10,
+ .dcache_lines = 0x80,
+ .dcache_assoc = 4,
+ .icache_line_size = 0x20,
+ .icache_lines = 0x80,
+ .icache_assoc = 5,
+ .ecache_line_size = 0x20,
+ .ecache_lines = 0x8000,
+ .ecache_assoc = 1,
+ .mmu_nctx = 0x10000,
+ .initfn = tms390z55_init,
+ },
+ {
.iu_version = 0x40000000,
.name = "TI,TMS390Z55",
.psr_impl = 4,
@@ -438,6 +490,25 @@
.mmu_nctx = 0x10000,
.initfn = tms390z55_init,
},
+ {
+ .iu_version = 0x1e000000,
+ .name = "Ross,RT625",
+ .psr_impl = 1,
+ .psr_vers = 14,
+ .impl = 1,
+ .vers = 7,
+ .dcache_line_size = 0x20,
+ .dcache_lines = 0x80,
+ .dcache_assoc = 4,
+ .icache_line_size = 0x40,
+ .icache_lines = 0x40,
+ .icache_assoc = 5,
+ .ecache_line_size = 0x20,
+ .ecache_lines = 0x8000,
+ .ecache_assoc = 1,
+ .mmu_nctx = 0x10000,
+ .initfn = rt625_init,
+ },
};
static const struct cpudef *
13 years, 2 months
- 1
- 0
r132 - in openbios-devel: arch/sparc32 drivers
by svn＠openbios.org
Author: blueswirl
Date: 2007-04-29 21:50:57 +0200 (Sun, 29 Apr 2007)
New Revision: 132
Modified:
openbios-devel/arch/sparc32/entry.S
openbios-devel/drivers/obio.c
Log:
Clear preloaded kernel parameters to avoid crash at reset
Modified: openbios-devel/arch/sparc32/entry.S
===================================================================
--- openbios-devel/arch/sparc32/entry.S 2007-04-26 17:15:45 UTC (rev 131)
+++ openbios-devel/arch/sparc32/entry.S 2007-04-29 19:50:57 UTC (rev 132)
@@ -245,6 +245,8 @@
set AC_M_CTPR, %g2
sta %g7, [%g2] ASI_M_MMUREGS ! set ctx table ptr
+ set AC_M_CXR, %g2
+ sta %g0, [%g2] ASI_M_MMUREGS ! context 0
set 1, %g1
sta %g1, [%g0] ASI_M_MMUREGS ! enable mmu
Modified: openbios-devel/drivers/obio.c
===================================================================
--- openbios-devel/drivers/obio.c 2007-04-26 17:15:45 UTC (rev 131)
+++ openbios-devel/drivers/obio.c 2007-04-29 19:50:57 UTC (rev 132)
@@ -504,6 +504,9 @@
obio_cmdline[size] = '\0';
cmdline = obio_cmdline;
cmdline_size = size;
+ ((struct qemu_nvram_v1 *)nvram)->kernel_image = 0;
+ ((struct qemu_nvram_v1 *)nvram)->kernel_size = 0;
+ ((struct qemu_nvram_v1 *)nvram)->cmdline_size = 0;
boot_device = nv_info.boot_device;
nographic = nv_info.nographic;
13 years, 2 months
- 1
- 0
r336 - dev/olpc/cafenand
by svn＠openbios.org
Author: wmb
Date: 2007-04-29 21:32:48 +0200 (Sun, 29 Apr 2007)
New Revision: 336
Modified:
dev/olpc/cafenand/badblock.fth
dev/olpc/cafenand/cafenand.fth
dev/olpc/cafenand/configure.fth
dev/olpc/cafenand/methods.fth
dev/olpc/cafenand/test.fth
Log:
OLPC CaFe NAND driver - added support for two-NAND-chip packages. trac #1374
Modified: dev/olpc/cafenand/badblock.fth
===================================================================
--- dev/olpc/cafenand/badblock.fth 2007-04-27 22:25:44 UTC (rev 335)
+++ dev/olpc/cafenand/badblock.fth 2007-04-29 19:32:48 UTC (rev 336)
@@ -8,7 +8,7 @@
: round-up ( n boundary -- n' ) over 1- + over / * ;
: /bbt ( -- bytes ) \ Bytes per bad block table
- pages/chip pages/eblock / 3 + 4 / ( bytes )
+ total-pages pages/eblock / 3 + 4 / ( bytes )
/page round-up
;
@@ -70,8 +70,8 @@
\ Page range to search for a bad block table
: bbtbounds ( low-page high-page -- )
0 to bbt0 0 to bbt1
- pages/chip #bbtsearch pages/eblock * -
- pages/chip pages/eblock -
+ total-pages #bbtsearch pages/eblock * -
+ total-pages pages/eblock -
;
\ Look for existing bad block tables, setting bbt0 and bbt1 if found
@@ -118,7 +118,7 @@
\ Scan the device and record the factory bad-block info in a table
: initial-badblock-scan ( -- )
- pages/chip 0 do
+ total-pages 0 do
i initial-block-bad? if
i .bad
else
@@ -214,7 +214,7 @@
exit
then
bbt1 if bbt1 exit then
- pages/chip
+ total-pages
;
: map-resblock ( page# #pages -- page#' #pages )
@@ -275,7 +275,7 @@
\ This is fairly severe, not recommended except in exceptional situations
: scrub ( -- )
release-bbt
- pages/chip 0 ?do
+ total-pages 0 ?do
(cr i .
i erase-block
pages/eblock +loop
@@ -301,7 +301,7 @@
;
: show-bbt ( -- )
get-bbt
- pages/chip 0 ?do
+ total-pages 0 ?do
i block-reserved? if ." Reserved " i .page-byte cr else
i block-bad? if ." Bad block" i .page-byte cr then
then
Modified: dev/olpc/cafenand/cafenand.fth
===================================================================
--- dev/olpc/cafenand/cafenand.fth 2007-04-27 22:25:44 UTC (rev 335)
+++ dev/olpc/cafenand/cafenand.fth 2007-04-29 19:32:48 UTC (rev 336)
@@ -15,7 +15,6 @@
" reg" property
-
: my-w@ ( offset -- w ) my-space + " config-w@" $call-parent ;
: my-w! ( w offset -- ) my-space + " config-w!" $call-parent ;
@@ -64,12 +63,29 @@
\ Wait not busy - XXX need timeout
: ctrl-wait ( -- ) begin h# c cl@ h# 8000.0000 and 0= until ;
-\ Think of col as the offset within a disk block, and row as the block#
-: set-address ( row col -- ) h# 1c cl! h# 20 cl! ;
+\ Bit 19 in the command (0) register is reserved according to the
+\ version of the CaFe chip spec that we have, but Jerry Zheng says
+\ that it chooses the chip select - 0 for CS0, 1 for CS1.
+1 instance value chip-boundary \ Boundary between chip 0 and chip 1
+0 instance value cs-mask \ Chip-select bit for command 0 register
+: chip0 ( -- ) 0 to cs-mask ;
+: chip1 ( -- ) h# 80000 to cs-mask ;
+
+: set-chip ( page# -- page#' )
+ dup chip-boundary >= if chip-boundary - chip1 else chip0 then
+;
+
+\ For erase-block, the address that is sent to the chip is formatted
+\ differently than for reads and writes.
+: set-erase-page ( page# -- ) set-chip lwsplit h# 20 cl! h# 1c cl! ;
+
+: set-page ( page# offset -- ) h# 1c cl! set-chip h# 20 cl! ;
+
: >cmd ( cmd# #nonmem #address-bytes -- cmdval )
dup if 1- d# 27 lshift h# 4000.0000 or then ( cmd# #nm adr-field )
- swap 7 and d# 22 lshift or ( cmd# nm,adr )
+ over 1 and d# 20 lshift or \ #nm[0] ( cmd# #nm adr+nm0 )
+ swap e and d# 21 lshift or \ #nm[3:1] ( cmd# adr+nm )
or h# 8000.0000 or
;
@@ -80,29 +96,26 @@
h# 0420.0000 0 5 >cmd constant read-cmd
h# 0220.0080 0 5 >cmd constant write-cmd
-: wait-dma-done ( -- )
- begin
- h# 10 cl@ h# 1000.0000 and
- until
- h# 1000.0000 h# 10 cl! \ Clear DMA done
+: wait-mask ( bitmask -- )
+ begin dup h# 10 cl@ and until ( bitmask )
+ h# 10 cl! \ Clear status bit
;
+: wait-dma ( -- ) h# 1000.0000 wait-mask ;
+: wait-cmd ( -- ) h# 8000.0000 wait-mask ;
-: wait-done ( -- )
- begin
- h# 10 cl@ h# 8000.0000 and
- until
- h# 8000.0000 h# 10 cl! \ Clear done
-;
-
\ Control3 - no reset, no BAR write protect
: write-disable ( -- ) 0 8 cl! ;
: write-enable ( -- ) h# 4000.0000 8 cl! ;
-: cmd ( n -- ) 0 cl! wait-done ;
-: cmd2 ( n -- ) 4 cl! ;
+: cmd ( cmd cmd2 -- )
+ /page d# 10 rshift 3 and d# 28 lshift or 4 cl! ( cmd )
+ cs-mask or 0 cl! ( )
+;
+
: datalen ( n -- ) h# 18 cl! ;
-: read-status ( -- b ) read-status-cmd cmd h# 30 cl@ h# ff and ;
-\ : read-id ( -- ) 0 0 set-address read-id-cmd cmd h# 30 cl@ ;
+
+: read-status ( -- b ) read-status-cmd 0 cmd wait-cmd h# 30 cl@ h# ff and ;
+\ : read-id ( -- ) 0 0 set-page read-id-cmd 0 cmd wait-cmd h# 30 cl@ ;
: dma-off ( -- ) 0 h# 40 cl! ;
: wait-write-done ( -- )
@@ -118,10 +131,10 @@
\ Assumes that the range doesn't straddle a page boundary
: generic-read ( len page# offset cmd cmd2 -- chip-adr )
- cmd2 >r ( len page# offset r: cmd )
- set-address dma-off ( len r: cmd )
- datalen ( r: cmd )
- r> cmd ( )
+ >r >r ( len page# offset r: cmd cmd2 )
+ set-page dma-off ( len r: cmd cmd2 )
+ datalen ( r: cmd cmd2 )
+ r> r> cmd wait-cmd ( )
chip h# 1000 + ( adr )
;
: pio-read ( adr len page# offset -- )
@@ -132,19 +145,19 @@
: pio-write-raw ( adr len page# offset -- )
write-enable
- dma-off set-address dup datalen ( adr len )
- chip h# 2000 + swap move ( )
- h# 2000.0110 cmd2 write-cmd cmd ( ) \ 2000. 2K page, (No Auto ECC)
+ dma-off set-page dup datalen ( adr len )
+ chip h# 2000 + swap move ( )
+ write-cmd h# 0000.0110 cmd wait-cmd ( ) No Auto ECC
wait-write-done
write-disable
;
: pio-write-page ( adr page# -- )
- write-enable dma-off ( adr page# )
- 0 set-address ( adr )
- /page h# e + dup datalen ( adr len )
- chip h# 2000 + swap move ( )
- h# 6800.0110 cmd2 write-cmd cmd ( ) \ 4000. Auto ECC, 2000. 2K page, 0800 R/S ECC
+ write-enable dma-off ( adr page# )
+ 0 set-page ( adr )
+ /page h# e + dup datalen ( adr len )
+ chip h# 2000 + swap move ( )
+ write-cmd h# 4800.0110 cmd wait-cmd ( ) \ 4000. Auto ECC, 0800. R/S ECC
wait-write-done
write-disable
;
@@ -153,7 +166,7 @@
/oob swap h# 800 read-cmd h# 130 generic-read
;
-: read-rst ( -- ) h# 8000.0000 h# c cl! ;
+: read-rst ( -- ) h# 8000.0000 h# c cl! ;
0 instance value dma-vadr
0 instance value dma-padr
@@ -176,13 +189,10 @@
;
: slow-dma-read ( adr len page# offset -- )
- set-address
- dup true dma-setup ( )
- h# 130 cmd2 read-cmd 0 cl! ( adr chip-adr r: len )
- \ XXX put a 90 us delay here so we don't start hitting the register
- \ until almost done.
- wait-dma-done \ For DMA reads we wait for DMA completion instead of cmd
- dma-release ( )
+ set-page
+ dup true dma-setup ( )
+ read-cmd h# 0800.0130 cmd wait-dma ( adr chip-adr r: len )
+ dma-release ( )
;
: /dma-buf ( -- n ) /page /oob + ;
@@ -192,34 +202,33 @@
\ XXX should check ECC
: read-page ( adr page# -- )
- h# 20 cl! 0 h# 1c cl!
+ 0 set-page ( adr )
/page ( /oob + ) h# 18 cl! ( adr )
dma-buf-pa h# 44 cl! ( adr )
0 h# 48 cl! ( adr )
/page h# a000.0000 or h# 40 cl! ( adr )
- h# 130 4 cl! read-cmd 0 cl! ( adr )
- wait-dma-done \ For DMA reads we wait for DMA completion instead of cmd
+ read-cmd h# 0800.0130 cmd wait-dma ( adr )
dma-buf-va swap /page do-lmove ( )
;
: dma-write-raw ( adr len page# offset -- )
- write-enable ( adr len page# offset )
- set-address ( adr len )
- dup false dma-setup ( )
- h# 2000.0110 cmd2 write-cmd cmd ( )
- wait-write-done
- dma-release
- write-disable
+ write-enable ( adr len page# offset )
+ set-page ( adr len )
+ dup false dma-setup ( )
+ write-cmd h# 110 cmd wait-cmd ( )
+ wait-write-done ( )
+ dma-release ( )
+ write-disable ( )
;
: dma-write-page ( adr page# -- ) \ Size is fixed
write-enable ( adr page# )
- 0 set-address ( adr )
+ 0 set-page ( adr )
h# 800 h# 80e false dma-setup ( )
- h# 6800.0110 cmd2 write-cmd cmd ( ) \ Auto-ECC, 2KB, RS, write cmd
- wait-write-done
+ write-cmd h# 4800.0110 cmd wait-cmd ( ) \ Auto-ECC, RS, write cmd
+ wait-write-done ( )
\ dma-release
- write-disable
+ write-disable ( )
;
\ : read-page ( adr page# -- ) dma-read-page ;
@@ -229,9 +238,8 @@
3 value #erase-adr-bytes \ Chip dependent
: erase-block ( page# -- )
write-enable
- lwsplit swap set-address \ Fiddle the block number
- h# 1d0 cmd2
- h# 20.0060 0 #erase-adr-bytes >cmd cmd
+ set-erase-page
+ h# 20.0060 0 #erase-adr-bytes >cmd h# 1d0 cmd
wait-write-done
write-disable
;
@@ -240,12 +248,10 @@
: send-reset-cmd ( -- )
ctrl-wait
- h# 8000.00ff cmd \ NAND Reset command
+ h# 8000.00ff 0 cmd wait-cmd \ NAND Reset command
;
: init ( -- )
- 0 0 cl! \ Clear command register
- h# 2000.0000 4 cl! \ Page 2KB
write-disable
send-reset-cmd
Modified: dev/olpc/cafenand/configure.fth
===================================================================
--- dev/olpc/cafenand/configure.fth 2007-04-27 22:25:44 UTC (rev 335)
+++ dev/olpc/cafenand/configure.fth 2007-04-29 19:32:48 UTC (rev 336)
@@ -1,8 +1,9 @@
\ See license at end of file
purpose: Common code for NAND FLASH access
-h# 4.0000 instance value pages/chip
-h# 40 instance value pages/eblock
+h# 0 instance value total-pages \ Start with 0 and add chips
+h# 0 instance value pages/chip
+h# 40 instance value pages/eblock
\ This uses byte 4 to work out the plane parameters
\ The Samsung part has this byte, but the Hynix part doesn't
@@ -10,7 +11,7 @@
dup 4 + c@ ( adr plane-data )
h# 1000 over 4 rshift 7 and lshift ( adr plane-data pages/plane )
1 rot 2 rshift 3 and lshift ( adr kbytes/plane #planes )
- * to pages/chip ( adr )
+ * to pages/chip ( adr )
;
\ This uses byte 3 to work out the page and erase block sizes
@@ -55,6 +56,7 @@
: configure ( -- okay? )
read-id ( adr )
['] configure-auto catch 0= nip
+ pages/chip total-pages + to total-pages
;
\ LICENSE_BEGIN
Modified: dev/olpc/cafenand/methods.fth
===================================================================
--- dev/olpc/cafenand/methods.fth 2007-04-27 22:25:44 UTC (rev 335)
+++ dev/olpc/cafenand/methods.fth 2007-04-29 19:32:48 UTC (rev 336)
@@ -6,6 +6,24 @@
comp 0=
;
+: configure-all ( -- error? )
+ 0 to total-pages
+
+ \ Set boundary to 0 to look for chip on CE1#
+ \ If one is found, the number of pages will be added to total-pages
+ 0 to chip-boundary configure drop
+
+ \ Set boundary to 1 to look for chip on CE0# (configure uses page# 0)
+ 1 to chip-boundary configure if
+ pages/chip \ Chip present at CE0#, set boundary above it
+ else
+ 0 \ No chip at CE0, set boundary at 0 to use CE1# chip
+ then
+ to chip-boundary
+
+ total-pages 0= \ Error if there are no chips
+;
+
external
: dma-alloc ( len -- adr ) " dma-alloc" $call-parent ;
@@ -27,7 +45,7 @@
resmap if
#reserved-eblocks /eblock
else
- pages/chip /page
+ total-pages /page
then
um*
;
@@ -35,7 +53,7 @@
: open ( -- okay? )
map-regs
init
- configure 0= if false exit then
+ configure-all if false exit then
/dma-buf dma-alloc to dma-buf-va
dma-buf-va /dma-buf false " dma-map-in" $call-parent to dma-buf-pa
Modified: dev/olpc/cafenand/test.fth
===================================================================
--- dev/olpc/cafenand/test.fth 2007-04-27 22:25:44 UTC (rev 335)
+++ dev/olpc/cafenand/test.fth 2007-04-29 19:32:48 UTC (rev 336)
@@ -59,7 +59,7 @@
;
: test-all ( -- )
- pages/chip 0 do
+ total-pages 0 do
(cr i .
i test-eb
key? ?leave
@@ -68,7 +68,7 @@
\ XXX skip mfg bad blocks
: erase-all ( -- )
- pages/chip 0 do
+ total-pages 0 do
(cr i .
i erase-block
key? ?leave
@@ -84,7 +84,7 @@
: scan-all
cr
- pages/chip 0 do
+ total-pages 0 do
i ?.
ib /full-page i 0 pio-read
mismatch? if i . .where then
@@ -104,7 +104,7 @@
;
: .bad ( page# -- ) .x ." bad" cr ;
: initial-badblock-scan ( -- )
- pages/chip 0 do
+ total-pages 0 do
i block-bad? if
i .bad
else
@@ -147,11 +147,12 @@
[then]
: scan-bad ( -- )
- pages/chip 0 do
+ total-pages 0 do
bbbuf 4 i h# 800 pio-read i .bad
bbbuf 4 i 1+ h# 800 pio-read i 1+ .bad
pages/eblock +loop
;
+
\ LICENSE_BEGIN
\ Copyright (c) 2006 FirmWorks
\
13 years, 2 months
- 1
- 0