OpenBIOS February 2009

openbios@openbios.org

15 participants
46 discussions

r448 - openbios-devel/modules
by svn＠openbios.org 05 Feb '09

05 Feb '09

Author: laurent Date: 2009-02-05 22:37:26 +0100 (Thu, 05 Feb 2009) New Revision: 448 Modified: openbios-devel/modules/disk-label.c Log: Set disk-label information when no partition map is used Modified: openbios-devel/modules/disk-label.c =================================================================== --- openbios-devel/modules/disk-label.c 2009-02-05 21:33:23 UTC (rev 447) +++ openbios-devel/modules/disk-label.c 2009-02-05 21:37:26 UTC (rev 448) @@ -52,6 +52,7 @@ char block0[512]; phandle_t ph; int fd, success=0; + xt_t xt; parstr = my_args_copy(); /* printk("dlabel-open '%s'\n", parstr ); */ @@ -81,11 +82,23 @@ /* try to see if there is a filesystem without partition */ - if (atol(parstr) == 0 || atol(parstr) == 1) { + if (atol(parstr) == 1) { PUSH_ih( my_self() ); selfword("find-filesystem"); ph = POP_ph(); if( ph ) { + di->offs_hi = 0; + di->offs_lo = 0; + di->size_hi = -1; + di->size_lo = -1; + di->part_ih = 0; + di->type = -1; + di->block_size = 512; + xt = find_parent_method("block-size"); + if (xt) { + call_parent(xt); + di->block_size = POP(); + } push_str( filename ); PUSH_ph( ph ); fword("interpose"); @@ -104,7 +117,6 @@ /* open partition package */ if( ph ) { - xt_t xt; if( !(di->part_ih=open_package(parstr, ph)) ) goto out; if( !(xt=find_ih_method("get-info", di->part_ih)) )

1 0

r447 - openbios-devel/modules
by svn＠openbios.org 05 Feb '09

05 Feb '09

Author: laurent Date: 2009-02-05 22:33:23 +0100 (Thu, 05 Feb 2009) New Revision: 447 Modified: openbios-devel/modules/disk-label.c Log: disk-label: retrieve block-size on open Modified: openbios-devel/modules/disk-label.c =================================================================== --- openbios-devel/modules/disk-label.c 2009-02-05 21:21:59 UTC (rev 446) +++ openbios-devel/modules/disk-label.c 2009-02-05 21:33:23 UTC (rev 447) @@ -24,6 +24,7 @@ ucell offs_hi, offs_lo; ucell size_hi, size_lo; + int block_size; int type; /* partition type or -1 */ ihandle_t part_ih; @@ -114,6 +115,12 @@ di->offs_hi = POP(); di->offs_lo = POP(); di->type = POP(); + di->block_size = 512; + xt = find_ih_method("block-size", di->part_ih); + if (xt) { + call_package(xt, di->part_ih); + di->block_size = POP(); + } } /* probe for filesystem */ @@ -218,19 +225,7 @@ static void dlabel_block_size( dlabel_info_t *di ) { - xt_t xt; - - if( !di->part_ih ) - goto no_handler; - - xt = find_ih_method("block-size", di->part_ih); - if ( !xt ) - goto no_handler; - - call_package( xt , di->part_ih ); - return; -no_handler: - PUSH(512); + PUSH(di->block_size); } NODE_METHODS( dlabel ) = {

1 0

r446 - openbios-devel/fs/grubfs
by svn＠openbios.org 05 Feb '09

05 Feb '09

Author: laurent Date: 2009-02-05 22:21:59 +0100 (Thu, 05 Feb 2009) New Revision: 446 Modified: openbios-devel/fs/grubfs/grubfs_fs.c Log: Reset curfs to &dummy_fs on mount (fs_grubfs_open()) Modified: openbios-devel/fs/grubfs/grubfs_fs.c =================================================================== --- openbios-devel/fs/grubfs/grubfs_fs.c 2009-02-05 20:19:50 UTC (rev 445) +++ openbios-devel/fs/grubfs/grubfs_fs.c 2009-02-05 21:21:59 UTC (rev 446) @@ -246,6 +246,8 @@ grubfs_t *gfs; int i; + curfs=&dummy_fs; + curfs->dev_fd = fd; for (i = 0; i < sizeof(fsys_table)/sizeof(fsys_table[0]); i++) {

1 0

r445 - openbios-devel/modules
by svn＠openbios.org 05 Feb '09

05 Feb '09

Author: laurent Date: 2009-02-05 21:19:50 +0100 (Thu, 05 Feb 2009) New Revision: 445 Modified: openbios-devel/modules/mac-parts.c Log: set blocksize when partition number is 0 Modified: openbios-devel/modules/mac-parts.c =================================================================== --- openbios-devel/modules/mac-parts.c 2009-02-05 20:16:28 UTC (rev 444) +++ openbios-devel/modules/mac-parts.c 2009-02-05 20:19:50 UTC (rev 445) @@ -74,6 +74,7 @@ bs = 512; } if (parnum == 0) { + di->blocksize =(uint)bs; di->offs = (llong)0; di->size = (llong)dmap.sbBlkCount * bs; PUSH( -1 );

1 0

r444 - openbios-devel/fs
by svn＠openbios.org 05 Feb '09

05 Feb '09

Author: laurent Date: 2009-02-05 21:16:28 +0100 (Thu, 05 Feb 2009) New Revision: 444 Modified: openbios-devel/fs/ioglue.c Log: ioglue: cleanup traces Modified: openbios-devel/fs/ioglue.c =================================================================== --- openbios-devel/fs/ioglue.c 2009-02-05 00:16:54 UTC (rev 443) +++ openbios-devel/fs/ioglue.c 2009-02-05 20:16:28 UTC (rev 444) @@ -67,7 +67,7 @@ offs = -1; if( seek_io(fd, offs) ) { - printk("os_seek failure\n"); + /* printk("os_seek failure\n"); */ return (ulong)-1; }

1 0

r443 - openbios-devel/modules
by svn＠openbios.org 05 Feb '09

05 Feb '09

Author: laurent Date: 2009-02-05 01:16:54 +0100 (Thu, 05 Feb 2009) New Revision: 443 Modified: openbios-devel/modules/disk-label.c Log: Allows to use disk (like CD-ROM) without partition map but with filesystem on the full disk. We accept partition number 0 (which identifies the full disk) and partition number 1 (we can see the disk as only one partition). This is needed to boot openSUSE install CD which uses "&device;:1,\suseboot\yaboot.ibm" as its boot path. There is a Mac partition map on the CD, but partition 1 is the partition map itself, and thus is not usable by a filesystem. So we can guess, openFirmware must use ISO9660 instead of HFS and thus to not use the Mac partition map, but the whole CD for the partition #1. Disk openSUSE-ppc.iso: 135 MB, 135593984 bytes 4 heads, 32 sectors/track, 2069 cylinders Units = cylinders of 128 * 512 = 65536 bytes Device Boot Start End Blocks Id System openSUSE-ppc.iso1 1 1 48 Apple_partition_map openSUSE-ppc.iso2 1 2066 132160 Apple_HFS Modified: openbios-devel/modules/disk-label.c =================================================================== --- openbios-devel/modules/disk-label.c 2009-02-05 00:05:58 UTC (rev 442) +++ openbios-devel/modules/disk-label.c 2009-02-05 00:16:54 UTC (rev 443) @@ -78,6 +78,21 @@ } } + /* try to see if there is a filesystem without partition */ + + if (atol(parstr) == 0 || atol(parstr) == 1) { + PUSH_ih( my_self() ); + selfword("find-filesystem"); + ph = POP_ph(); + if( ph ) { + push_str( filename ); + PUSH_ph( ph ); + fword("interpose"); + success = 1; + goto out; + } + } + /* find partition handler */ seek_io( fd, 0 ); if( read_io(fd, block0, sizeof(block0)) != sizeof(block0) )

1 0

r442 - openbios-devel/arch/ppc/qemu
by svn＠openbios.org 05 Feb '09

05 Feb '09

Author: laurent Date: 2009-02-05 01:05:58 +0100 (Thu, 05 Feb 2009) New Revision: 442 Modified: openbios-devel/arch/ppc/qemu/main.c Log: Extract correctly "&device;" and "&partition;" from bootinfo.txt. To keep compatibility with yaboot (tested with debian install CD), put in bootpath a fully qualified path (<device>:<partition>,<filename>) Modified: openbios-devel/arch/ppc/qemu/main.c =================================================================== --- openbios-devel/arch/ppc/qemu/main.c 2009-02-04 11:47:13 UTC (rev 441) +++ openbios-devel/arch/ppc/qemu/main.c 2009-02-05 00:05:58 UTC (rev 442) @@ -105,11 +105,70 @@ return lszz_offs; } +static char * +get_device( const char *path ) +{ + int i; + static char buf[1024]; + + for (i = 0; i < sizeof(buf) && path[i] && path[i] != ':'; i++) + buf[i] = path[i]; + buf[i] = 0; + + return buf; +} + +static int +get_partition( const char *path ) +{ + while ( *path && *path != ':' ) + path++; + + if (!*path) + return 0; + path++; + + if (!strchr(path, ',')) /* check if there is a ',' */ + return 0; + + return atol(path); +} + +static char * +get_filename( const char * path ) +{ + static char buf[1024]; + + while ( *path && *path != ':' ) + path++; + + if (!*path) + return NULL; + path++; + + while ( *path && isdigit(*path) ) + path++; + + if (*path == ',') + path++; + + strncpy(buf, path, sizeof(buf)); + buf[sizeof(buf) - 1] = 0; + + return buf; +} + static void encode_bootpath( const char *spec, const char *args ) { + char path[1024]; phandle_t chosen_ph = find_dev("/chosen"); - set_property( chosen_ph, "bootpath", spec, strlen(spec)+1 ); + + snprintf(path, sizeof(path), "%s:%d,%s", get_device(spec), + get_partition(spec), get_filename(spec)); + + ELF_DPRINTF("bootpath %s bootargs %s\n", path, args); + set_property( chosen_ph, "bootpath", path, strlen(spec)+1 ); set_property( chosen_ph, "bootargs", args, strlen(args)+1 ); } @@ -154,11 +213,19 @@ static void try_bootinfo(const char *path) { - int fd; - char tagbuf[256], bootscript[256], c, *left, *right; - int len, tag, taglen, script, scriptlen; + int fd, len, tag, taglen, script, scriptlen, entity; + char tagbuf[256], bootscript[256], c; + char *device; + int partition; - snprintf(bootscript, sizeof(bootscript), "%s,ppc\\bootinfo.txt", path); + device = get_device(path); + partition = get_partition(path); + + /* read boot script */ + + snprintf(bootscript, sizeof(bootscript), "%s:%d,ppc\\bootinfo.txt", + device, partition); + ELF_DPRINTF("Trying %s\n", bootscript); if ((fd = open_io(bootscript)) == -1) { ELF_DPRINTF("Can't open %s\n", bootscript); @@ -173,11 +240,13 @@ taglen = 0; script = 0; scriptlen = 0; + entity = 0; do { len = read_io(fd, &c, 1); if (len < 0) goto badf; if (c == '<') { + script = 0; tag = 1; taglen = 0; } else if (c == '>') { @@ -191,6 +260,27 @@ } } else if (tag && taglen < sizeof(tagbuf)) { tagbuf[taglen++] = c; + } else if (script && c == '&') { + entity = 1; + taglen = 0; + } else if (entity && c ==';') { + entity = 0; + tagbuf[taglen] = '\0'; + if (strcasecmp(tagbuf, "device") == 0) { + strcpy(bootscript + scriptlen, device); + scriptlen += strlen(device); + } else if (strcasecmp(tagbuf, "partition") == 0) { + sprintf(bootscript + scriptlen, "%d", partition); + scriptlen = strlen(bootscript); + } else { /* unknown, keep it */ + bootscript[scriptlen] = '&'; + strcpy(bootscript + scriptlen + 1, tagbuf); + scriptlen += taglen + 1; + bootscript[scriptlen] = ';'; + scriptlen++; + } + } else if (entity && taglen < sizeof(tagbuf)) { + tagbuf[taglen++] = c; } else if (script && scriptlen < sizeof(bootscript)) { bootscript[scriptlen++] = c; } @@ -198,21 +288,6 @@ ELF_DPRINTF("got bootscript %s\n", bootscript); - // Replace &device;: with original path - push_str(bootscript); - PUSH('&'); - fword("left-split"); - fword("2swap"); - PUSH(':'); - fword("left-split"); - fword("2drop"); - right = pop_fstr_copy(); - left = pop_fstr_copy(); - while (right[0] != '\\' && right[0] != '\0') - right++; - snprintf(bootscript, sizeof(bootscript), "%s%s,%s", left, path, right); - ELF_DPRINTF("fixed bootscript %s\n", bootscript); - feval(bootscript); badf: close_io( fd );

1 0

Re: [OpenBIOS] [RFC PATCH] ppc correctly replace &device; and &partition;
by Laurent Vivier 04 Feb '09

04 Feb '09

> >Le 3 févr. 09 à 14:27, Stefan Assmann a écrit : > >> Subject: ppc correctly replace &device; and &partition; >> >> This patch correctly replaces the variables &device; and &partition; >> with firmware values thus allowing to boot from different partitions. >> >> Signed-off-by: Stefan Assmann <sassmann(a)suse.de> >> >> Index: arch/ppc/qemu/main.c >> =================================================================== >> --- arch/ppc/qemu/main.c (revision 439) >> +++ arch/ppc/qemu/main.c (working copy) >> @@ -154,9 +154,9 @@ >> static void >> try_bootinfo(const char *path) >> { >> - int fd; >> - char tagbuf[256], bootscript[256], c, *left, *right; >> - int len, tag, taglen, script, scriptlen; >> + int fd, len, tag, taglen, script, scriptlen; >> + char tagbuf[256], bootscript[256], c; >> + char *buf, *partition; >> >> snprintf(bootscript, sizeof(bootscript), "%s,ppc\\bootinfo.txt", >> path); >> ELF_DPRINTF("Trying %s\n", bootscript); >> @@ -195,22 +195,33 @@ >> bootscript[scriptlen++] = c; >> } >> } while (1); >> - >> ELF_DPRINTF("got bootscript %s\n", bootscript); >> >> - // Replace &device;: with original path >> - push_str(bootscript); >> - PUSH('&'); >> - fword("left-split"); >> - fword("2swap"); >> - PUSH(':'); >> - fword("left-split"); >> - fword("2drop"); >> - right = pop_fstr_copy(); >> - left = pop_fstr_copy(); >> - while (right[0] != '\\' && right[0] != '\0') >> - right++; >> - snprintf(bootscript, sizeof(bootscript), "%s%s,%s", left, path, >> right); >> + /* replace &device; and &partition; */ >> + if ( (buf = strstr(bootscript, (const char *) "&device;")) != >> NULL ) { >> + buf[0] = '\0'; >> + buf += strlen("&device;"); >> + snprintf(bootscript, sizeof(bootscript), "%s%s%s", >> bootscript, path, buf); > >what happens if strlen(path) > strlen("&device;") ? >moreover device is not path, but path is "device:partition" >> >> + } >> + if ( (partition = strchr(path, ':')) != NULL ) { >> + *partition = '\0'; >> + partition++; >> + if ( (buf = strstr(bootscript, (const char *) >> "&partition;")) != NULL ) { >> + *buf = '\0'; >> + buf += strlen("&partition;"); >> + snprintf(bootscript, sizeof(bootscript), "%s%s%s", >> bootscript, partition, buf); > >what happens if strlen(partition) > strlen("&partition;") ? > >> >> + } else { >> + /* FIXME: allow booting of SUSE media with following >> layout (fails without this workaround) >> + * Number Start End Size File system >> Name Flags >> + * 1 512B 1535B 1024B >> Apple , , , , , , , , , , , , type=Apple_partition_map >> + * 2 8192B 4126MB 4126MB >> SU1110.001 , , , , , , , , , , , , type=Apple_HFS >> + */ >> + if ( (buf = strstr(bootscript, (const char *) "1,\ >> \suseboot\\yaboot.ibm")) != NULL ) { > >what it is wrong here is we try to read a file from partition 1 which >is the partition map... >I guess we should write a "modules/iso9660-parts.c" to override this >(as macintosh CD are hybrid: ISO9660 and HFS). Something like that seems to work: Index: openbios-devel/modules/disk-label.c =================================================================== --- openbios-devel.orig/modules/disk-label.c 2009-02-04 12:51:53.000000000 +0100 +++ openbios-devel/modules/disk-label.c 2009-02-04 12:56:51.000000000 +0100 @@ -78,6 +78,19 @@ } } + /* try to see if there is a filesystem without partition */ + + PUSH_ih( my_self() ); + selfword("find-filesystem"); + ph = POP_ph(); + if( ph ) { + push_str( filename ); + PUSH_ph( ph ); + fword("interpose"); + success = 1; + goto out; + } + /* find partition handler */ seek_io( fd, 0 ); if( read_io(fd, block0, sizeof(block0)) != sizeof(block0) ) -- --------------------- Laurent(a)vivier.eu --------------------- "Tout ce qui est impossible reste à accomplir" Jules Verne "Things are only impossible until they're not" Jean-Luc Picard

2 2

[RFC PATCH] ppc correctly replace &device; and &partition; #2
by Stefan Assmann 04 Feb '09

04 Feb '09

Subject: ppc correctly replace &device; and &partition; This patch correctly replaces the variables &device; and &partition; with firmware values thus allowing to boot from different partitions. Signed-off-by: Stefan Assmann <sassmann(a)suse.de> Index: arch/ppc/qemu/main.c =================================================================== --- arch/ppc/qemu/main.c (revision 439) +++ arch/ppc/qemu/main.c (working copy) @@ -154,9 +154,9 @@ static void try_bootinfo(const char *path) { - int fd; - char tagbuf[256], bootscript[256], c, *left, *right; - int len, tag, taglen, script, scriptlen; + int fd, len, tag, taglen, script, scriptlen; + char tagbuf[256], bootscript[256], c; + char *buf, *partition; snprintf(bootscript, sizeof(bootscript), "%s,ppc\\bootinfo.txt", path); ELF_DPRINTF("Trying %s\n", bootscript); @@ -195,22 +195,23 @@ bootscript[scriptlen++] = c; } } while (1); - ELF_DPRINTF("got bootscript %s\n", bootscript); - // Replace &device;: with original path - push_str(bootscript); - PUSH('&'); - fword("left-split"); - fword("2swap"); - PUSH(':'); - fword("left-split"); - fword("2drop"); - right = pop_fstr_copy(); - left = pop_fstr_copy(); - while (right[0] != '\\' && right[0] != '\0') - right++; - snprintf(bootscript, sizeof(bootscript), "%s%s,%s", left, path, right); + /* replace &device; and &partition; */ + if ( (partition = strchr(path, ':')) != NULL ) { + *partition = '\0'; + partition++; + if ( (buf = strstr(bootscript, (const char *) "&device;")) != NULL ) { + *buf = '\0'; + buf += strlen("&device;"); + snprintf(bootscript, sizeof(bootscript), "%s%s%s", bootscript, path, buf); + } + if ( (buf = strstr(bootscript, (const char *) "&partition;")) != NULL ) { + *buf = '\0'; + buf += strlen("&partition;"); + snprintf(bootscript, sizeof(bootscript), "%s%s%s", bootscript, partition, buf); + } + } ELF_DPRINTF("fixed bootscript %s\n", bootscript); feval(bootscript); Stefan -- Stefan Assmann | SUSE LINUX Products GmbH Software Engineer | Maxfeldstr. 5, D-90409 Nuernberg Mail: sassmann(a)suse.de | GF: Markus Rex, HRB 16746 (AG Nuernberg)

1 0

r441 - openbios-devel/drivers
by svn＠openbios.org 04 Feb '09

04 Feb '09

Author: laurent Date: 2009-02-04 12:47:13 +0100 (Wed, 04 Feb 2009) New Revision: 441 Modified: openbios-devel/drivers/ide.c Log: ide.c: cleanup traces Modified: openbios-devel/drivers/ide.c =================================================================== --- openbios-devel/drivers/ide.c 2009-02-03 20:33:37 UTC (rev 440) +++ openbios-devel/drivers/ide.c 2009-02-04 11:47:13 UTC (rev 441) @@ -24,6 +24,13 @@ #include "hdreg.h" #include "timer.h" +#ifdef CONFIG_DEBUG_IDE +#define IDE_DPRINTF(fmt, args...) \ +do { printk("IDE - %s: " fmt, __func__ , ##args); } while (0) +#else +#define IDE_DPRINTF(fmt, args...) do { } while (0) +#endif + /* DECLARE data structures for the nodes. */ DECLARE_UNNAMED_NODE( ob_ide, INSTALL_OPEN, sizeof(struct ide_drive*) ); DECLARE_UNNAMED_NODE( ob_ide_ctrl, INSTALL_OPEN, sizeof(int)); @@ -154,7 +161,7 @@ struct ide_channel *chan = drive->channel; if (len & 1) { - printk("%d: command not word aligned\n", drive->nr); + IDE_DPRINTF("%d: command not word aligned\n", drive->nr); return; } @@ -168,7 +175,7 @@ struct ide_channel *chan = drive->channel; if (len & 1) { - printk("%d: command not word aligned\n", drive->nr); + IDE_DPRINTF("%d: command not word aligned\n", drive->nr); return; } @@ -195,14 +202,14 @@ if (!stat) stat = ob_ide_pio_readb(drive, IDEREG_STATUS); - printk("ob_ide_error drive<%d>: %s:\n", drive->nr, msg); - printk(" cmd=%x, stat=%x", chan->ata_cmd.command, stat); + IDE_DPRINTF("ob_ide_error drive<%d>: %s:\n", drive->nr, msg); + IDE_DPRINTF(" cmd=%x, stat=%x", chan->ata_cmd.command, stat); if ((stat & (BUSY_STAT | ERR_STAT)) == ERR_STAT) { err = ob_ide_pio_readb(drive, IDEREG_ERROR); - printk(", err=%x", err); + IDE_DPRINTF(", err=%x", err); } - printk("\n"); + IDE_DPRINTF("\n"); /* * see if sense is valid and dump that @@ -214,19 +221,21 @@ if (cmd->cdb[0] == ATAPI_REQ_SENSE) { old_cdb = cmd->old_cdb; - printk(" atapi opcode=%02x", old_cdb); + IDE_DPRINTF(" atapi opcode=%02x", old_cdb); } else { int i; - printk(" cdb: "); + IDE_DPRINTF(" cdb: "); for (i = 0; i < sizeof(cmd->cdb); i++) - printk("%02x ", cmd->cdb[i]); + IDE_DPRINTF("%02x ", cmd->cdb[i]); } if (cmd->sense_valid) - printk(", sense: %02x/%02x/%02x", cmd->sense.sense_key, cmd->sense.asc, cmd->sense.ascq); + IDE_DPRINTF(", sense: %02x/%02x/%02x", + cmd->sense.sense_key, cmd->sense.asc, + cmd->sense.ascq); else - printk(", no sense"); - printk("\n"); + IDE_DPRINTF(", no sense"); + IDE_DPRINTF("\n"); } } @@ -269,7 +278,7 @@ unsigned char control = IDEHEAD_DEV0; if (ob_ide_wait_stat(drive, 0, BUSY_STAT, NULL)) { - printk("select_drive: timed out\n"); + IDE_DPRINTF("select_drive: timed out\n"); return 1; } @@ -287,7 +296,7 @@ ob_ide_400ns_delay(drive); if (ob_ide_wait_stat(drive, 0, BUSY_STAT, NULL)) { - printk("select_drive: timed out\n"); + IDE_DPRINTF("select_drive: timed out\n"); return 1; } @@ -452,7 +461,7 @@ } while (bytes); if (bytes) - printk("bytes=%d, stat=%x\n", bytes, stat); + IDE_DPRINTF("bytes=%d, stat=%x\n", bytes, stat); return bytes ? 1 : 0; } @@ -472,7 +481,7 @@ return 1; if (cmd->buflen && cmd->data_direction == atapi_ddir_none) - printk("non-zero buflen but no data direction\n"); + IDE_DPRINTF("non-zero buflen but no data direction\n"); memset(acmd, 0, sizeof(*acmd)); acmd->lcyl = cmd->buflen & 0xff; @@ -504,7 +513,8 @@ * we are doing a sense, ERR_STAT == CHECK_CONDITION */ if (cmd->cdb[0] != ATAPI_REQ_SENSE) { - printk("odd, drive didn't want to transfer %x\n", stat); + IDE_DPRINTF("odd, drive didn't want to transfer %x\n", + stat); return 1; } } @@ -573,7 +583,7 @@ (void) ob_ide_wait_stat(drive, 0, BUSY_STAT, &stat); if (bytes) - printk("cdb failed, bytes=%d, stat=%x\n", bytes, stat); + IDE_DPRINTF("cdb failed, bytes=%d, stat=%x\n", bytes, stat); return (stat & ERR_STAT) || bytes; } @@ -664,9 +674,8 @@ struct atapi_command *cmd = &drive->channel->atapi_cmd; struct atapi_capacity cap; -#ifdef CONFIG_DEBUG_IDE - printk("ob_ide_atapi_drive_ready\n"); -#endif + IDE_DPRINTF("ob_ide_atapi_drive_ready\n"); + /* * Test Unit Ready is like a ping */ @@ -674,7 +683,7 @@ cmd->cdb[0] = ATAPI_TUR; if (ob_ide_atapi_packet(drive, cmd)) { - printk("%d: TUR failed\n", drive->nr); + IDE_DPRINTF("%d: TUR failed\n", drive->nr); return 1; } @@ -688,7 +697,7 @@ cmd->cdb[4] = 0x01; if (ob_ide_atapi_packet(drive, cmd)) { - printk("%d: START_STOP unit failed\n", drive->nr); + IDE_DPRINTF("%d: START_STOP unit failed\n", drive->nr); return 1; } @@ -867,10 +876,8 @@ if (block + sectors > drive->sectors) return 1; -#ifdef CONFIG_DEBUG_IDE - printk("ob_ide_read_sectors: block=%lu sectors=%u\n", - (unsigned long) block, sectors); -#endif + IDE_DPRINTF("ob_ide_read_sectors: block=%lu sectors=%u\n", + (unsigned long) block, sectors); if (drive->type == ide_type_ata) return ob_ide_read_ata(drive, block, buf, sectors); @@ -938,7 +945,8 @@ else if (drive->type == ide_type_atapi) cmd->command = WIN_IDENTIFY_PACKET; else { - printk("%s: called with bad device type %d\n", __FUNCTION__, drive->type); + IDE_DPRINTF("%s: called with bad device type %d\n", + __FUNCTION__, drive->type); return 1; } @@ -1167,10 +1175,9 @@ ob_ide_max_transfer(int *idx) { struct ide_drive *drive = *(struct ide_drive **)idx; -#ifdef CONFIG_DEBUG_IDE - printk("max_transfer %x\n", drive->max_sectors * drive->bs); -#endif + IDE_DPRINTF("max_transfer %x\n", drive->max_sectors * drive->bs); + PUSH(drive->max_sectors * drive->bs); } @@ -1182,10 +1189,8 @@ unsigned char *dest = (unsigned char *)POP(); struct ide_drive *drive = *(struct ide_drive **)idx; -#ifdef CONFIG_DEBUG_IDE - printk("ob_ide_read_blocks %lx block=%ld n=%ld\n", (unsigned long)dest, - (unsigned long)blk, (long)n); -#endif + IDE_DPRINTF("ob_ide_read_blocks %lx block=%ld n=%ld\n", + (unsigned long)dest, (unsigned long)blk, (long)n); while (n) { int len = n; @@ -1193,7 +1198,7 @@ len = drive->max_sectors; if (ob_ide_read_sectors(drive, blk, dest, len)) { - printk("ob_ide_read_blocks: error\n"); + IDE_DPRINTF("ob_ide_read_blocks: error\n"); RET(0); } @@ -1209,9 +1214,9 @@ ob_ide_block_size(int *idx) { struct ide_drive *drive = *(struct ide_drive **)idx; -#ifdef CONFIG_DEBUG_IDE - printk("ob_ide_block_size: block size %x\n", drive->bs); -#endif + + IDE_DPRINTF("ob_ide_block_size: block size %x\n", drive->bs); + PUSH(drive->bs); } @@ -1257,9 +1262,7 @@ drive = &chan->drives[unit]; *(struct ide_drive **)idx = drive; -#ifdef CONFIG_DEBUG_IDE - printk("opening channel %d unit %d\n", idx[1], idx[0]); -#endif + IDE_DPRINTF("opening channel %d unit %d\n", idx[1], idx[0]); dump_drive(drive); if (drive->type != ide_type_ata) @@ -1431,11 +1434,9 @@ props[4] = __cpu_to_be32(1); props[5] = __cpu_to_be32(2); set_property(dnode, "reg", (char *)&props, 6*sizeof(cell)); -#ifdef CONFIG_DEBUG_IDE - printk(DEV_NAME": [io ports 0x%x-0x%x,0x%x]\n", - current_channel, chan->io_regs[0], - chan->io_regs[0] + 7, chan->io_regs[8]); -#endif + IDE_DPRINTF(DEV_NAME": [io ports 0x%x-0x%x,0x%x]\n", + current_channel, chan->io_regs[0], + chan->io_regs[0] + 7, chan->io_regs[8]); for (j = 0; j < 2; j++) { struct ide_drive *drive = &chan->drives[j]; @@ -1444,10 +1445,8 @@ if (!drive->present) continue; -#ifdef CONFIG_DEBUG_IDE - printk(" drive%d [ATA%s ", j, - drive->type == ide_type_atapi ? "PI" : ""); -#endif + IDE_DPRINTF(" drive%d [ATA%s ", j, + drive->type == ide_type_atapi ? "PI" : ""); switch (drive->media) { case ide_media_floppy: media = "floppy"; @@ -1462,9 +1461,7 @@ media = "disk"; break; } -#ifdef CONFIG_DEBUG_IDE - printk("%s]: %s\n", media, drive->model); -#endif + IDE_DPRINTF("%s]: %s\n", media, drive->model); snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME "/%s", path, current_channel, media); @@ -1605,10 +1602,8 @@ props[0] = 0; OLDWORLD(set_property(dnode, "AAPL,bus-id", (char*)props, 1 * sizeof(cell))); -#ifdef CONFIG_DEBUG_IDE - printk(DEV_NAME": [io ports 0x%lx]\n", - current_channel, chan->mmio); -#endif + IDE_DPRINTF(DEV_NAME": [io ports 0x%lx]\n", + current_channel, chan->mmio); for (j = 0; j < 2; j++) { struct ide_drive *drive = &chan->drives[j]; @@ -1617,10 +1612,8 @@ if (!drive->present) continue; -#ifdef CONFIG_DEBUG_IDE - printk(" drive%d [ATA%s ", j, - drive->type == ide_type_atapi ? "PI" : ""); -#endif + IDE_DPRINTF(" drive%d [ATA%s ", j, + drive->type == ide_type_atapi ? "PI" : ""); switch (drive->media) { case ide_media_floppy: media = "floppy"; @@ -1635,9 +1628,7 @@ media = "disk"; break; } -#ifdef CONFIG_DEBUG_IDE - printk("%s]: %s\n", media, drive->model); -#endif + IDE_DPRINTF("%s]: %s\n", media, drive->model); snprintf(nodebuff, sizeof(nodebuff), "%s/" DEV_NAME "/%s", path, current_channel, media);

1 0