Re: [U-Boot-Users] SystemACE support for u-boot via fat
Wolfgang Denk wd-at-denx.de |u-boot-users| wrote:
In message 27598-21055@sneakemail.com you wrote:
I've made a patch relative the current CVS (at sourceforge) that adds support for a Xilinx SystemACE chip directly attached to the PPC. (Well, conceivably any CPU type.)
I've made the bundle of diffs and new files available for ftp download here:
It doesn't work this way. Please you submit your patches to the list (or to me).
This is the systemace.h and systemace.c files that goes with the earlier posted systemace patch. These files go in include/systemace.h and common/cmd_ace.c
-------------------------- #ifndef __systemace_H #define __systemace_H /* * Copyright (c) 2004 Picture Elements, Inc. * Stephen Williams (steve@picturel.com) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU * General Public License as published by the Free Software * Foundation; either version 2 of the License, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ident "$Id:$"
#ifdef CONFIG_SYSTEMACE
# include <part.h>
block_dev_desc_t * systemace_get_dev(int dev);
#endif #endif --------------------------------- /* * Copyright (c) 2004 Picture Elements, Inc. * Stephen Williams (XXXXXXXXXXXXXXXX) * * This source code is free software; you can redistribute it * and/or modify it in source code form under the terms of the GNU * General Public License as published by the Free Software * Foundation; either version 2 of the License, or (at your option) * any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA */ #ident "$Id:$"
/* * The Xilinx SystemACE chip support is activated by defining * CONFIG_SYSTEMACE to turn on support, and CFG_SYSTEMACE_BASE * to set the base address of the device. This code currently * assumes that the chip is connected via a byte-wide bus. * * The CONFIG_SYSTEMACE also adds to fat support the device class * "ace" that allows the user to execute "fatls ace 0" and the * like. This works by making the systemace_get_dev function * available to cmd_fat.c:get_dev and filling in a block device * description that has all the bits needed for FAT support to * read sectors. */
# include <common.h> # include <command.h> # include <systemace.h> # include <part.h> # include <asm/io.h>
#ifdef CONFIG_SYSTEMACE
/* * The ace_readw and writew functions read/write 16bit words, but the * offset value is the BYTE offset as most used in the Xilinx * datasheet for the SystemACE chip. The CFG_SYSTEMACE_BASE is defined * to be the base address for the chip, usually in the local * peripheral bus. */ static unsigned ace_readw(unsigned offset) { return readw(CFG_SYSTEMACE_BASE+offset); }
static unsigned ace_writew(unsigned val, unsigned offset) { writew(val, CFG_SYSTEMACE_BASE+offset); }
/* */
static unsigned long systemace_read(int dev, unsigned long start, unsigned long blkcnt, unsigned long *buffer);
static block_dev_desc_t systemace_dev = {0};
static int get_cf_lock(void) { int retry = 10;
/* CONTROLREG = LOCKREG */ ace_writew(0x0002, 0x18);
/* Wait for MPULOCK in STATUSREG[15:0] */ while (! (ace_readw(0x04) & 0x0002)) {
if (retry < 0) return -1;
udelay(100000); retry -= 1; }
return 0; }
static void release_cf_lock(void) { /* CONTROLREG = none */ ace_writew(0x0000, 0x18); }
block_dev_desc_t * systemace_get_dev(int dev) { /* The first time through this, the systemace_dev object is not yet initialized. In that case, fill it in. */ if (systemace_dev.blksz == 0) { systemace_dev.if_type = IF_TYPE_UNKNOWN; systemace_dev.part_type = PART_TYPE_UNKNOWN; systemace_dev.type = DEV_TYPE_HARDDISK; systemace_dev.blksz = 512; systemace_dev.removable = 1; systemace_dev.block_read = systemace_read; }
return &systemace_dev; }
/* * This function is called (by dereferencing the block_read pointer in * the dev_desc) to read blocks of data. The return value is the * number of blocks read. A zero return indicates an error. */ static unsigned long systemace_read(int dev, unsigned long start, unsigned long blkcnt, unsigned long *buffer) { unsigned val; int retry; unsigned char*dp = (unsigned char*)buffer;
if (get_cf_lock() < 0) { unsigned status = ace_readw(0x04);
/* If CFDETECT is false, card is missing. */ if (! (status&0x0010)) { printf("** CompactFlash card not present. **\n"); return 0; }
printf("**** ACE locked away from me (STATUSREG=%04x)\n", status); return 0; }
retry = 2000; for (;;) { unsigned val = ace_readw(0x04);
/* If CFDETECT is false, card is missing. */ if (! (val & 0x0010)) { printf("**** ACE CompactFlash not found.\n"); release_cf_lock(); return 0; }
/* If RDYFORCMD, then we are ready to go. */ if (val & 0x0100) break;
if (retry < 0) { printf("**** SystemACE not ready.\n"); release_cf_lock(); return 0; }
udelay(1000); retry -= 1; }
/* Write LBA block address */ ace_writew(start & 0xffff, 0x10); start >>= 16; ace_writew(start & 0xff, 0x12);
/* Write sector count | ReadMemCardData. */ ace_writew(blkcnt | 0x0300, 0x14);
/* CONTROLREG = CFGRESET|LOCKREQ */ ace_writew(0x0082, 0x18);
retry = blkcnt * 16; while (retry > 0) { int idx;
/* Wait for buffer to become ready. */ while (! (ace_readw(0x04) & 0x0020)) { udelay(1000); }
/* Read 16 words of 2bytes from the sector buffer. */ for (idx = 0 ; idx < 16 ; idx += 1) { unsigned short val = ace_readw(0x40); *dp++ = val & 0xff; *dp++ = (val>>8) & 0xff; }
retry -= 1; }
release_cf_lock();
return blkcnt; }
#endif
/* * $Log: $ */
In message 29498-57591@sneakemail.com you wrote:
This is the systemace.h and systemace.c files that goes with the earlier posted systemace patch. These files go in include/systemace.h and common/cmd_ace.c
#ifndef __systemace_H #define __systemace_H /*
Sorry, this format is not acceptable. Please submit a proper patch. See section "Submitting Patches" in the README.
There is NO need to handle new files differently (the 'N' option to diff will take care of that). And please do not include any releavant text (patches, files) _inline_ if you are not 100% sure that your mailer does not wrap lines.
Best regards,
Wolfgang Denk
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Wolfgang Denk wd-at-denx.de |u-boot-users| wrote: | In message 29498-57591@sneakemail.com you wrote: | |>This is the systemace.h and systemace.c files that goes |>with the earlier posted systemace patch. These files go |>in include/systemace.h and common/cmd_ace.c |> |>-------------------------- |>#ifndef __systemace_H |>#define __systemace_H |>/* | | | Sorry, this format is not acceptable. Please submit a proper patch. | See section "Submitting Patches" in the README. | | | There is NO need to handle new files differently (the 'N' option to | diff will take care of that). And please do not include any releavant | text (patches, files) _inline_ if you are not 100% sure that your | mailer does not wrap lines.
"cvs diff -puRN" does not include new files, the -N flag is useless in that context as cvs does not know of those files so does not even try to diff them. You will need to accept the patch (made outside of CVS) then do a "cvs add" so that they are added to the repository.
As for inline vs. attachment, many lists don't accept attachments, so I was being cautious. However, the README does explicitly say that MINE attachments are accepted. Oh well.
* Add support for Xilinx SystemACE chip: ~ New file common/cmd_ace.c ~ New file include/systemace.h ~ Hook systemace support into cmd_fat and the partition manager.
- -- Steve Williams "The woods are lovely, dark and deep. steve at XXXXXXXXXX But I have promises to keep, http://www.XXXXXXXXXX and lines to code before I sleep, http://www.picturel.com And lines to code before I sleep."
diff -purN -xEntries -x'*.orig' u-boot.orig/README u-boot/README --- u-boot.orig/README 2004-02-08 14:55:39.000000000 -0800 +++ u-boot/README 2004-02-09 16:06:41.000000000 -0800 @@ -1410,6 +1410,20 @@ The following options need to be configu allows to read/write in Dataflash via the standard commands cp, md...
+- SystemACE Support: + CONFIG_SYSTEMACE + + Adding this option adds support for Xilinx SystemACE + chips attached via some sort of local bus. The address + of the chip must alsh be defined in the + CFG_SYSTEMACE_BASE macro. For example: + + #define CONFIG_SYSTEMACE + #define CFG_SYSTEMACE_BASE 0xf0000000 + + When SystemACE support is added, the "ace" device type + becomes available to the fat commands, i.e. fatls. + - Show boot progress: CONFIG_SHOW_BOOT_PROGRESS
diff -purN -xEntries -x'*.orig' u-boot.orig/common/Makefile u-boot/common/Makefile --- u-boot.orig/common/Makefile 2004-01-06 14:38:21.000000000 -0800 +++ u-boot/common/Makefile 2004-02-03 17:41:27.000000000 -0800 @@ -28,7 +28,7 @@ LIB = libcommon.a AOBJS =
COBJS = main.o ACEX1K.o altera.o bedbug.o \ - cmd_autoscript.o \ + cmd_ace.o cmd_autoscript.o \ cmd_bdinfo.o cmd_bedbug.o cmd_bmp.o cmd_boot.o cmd_bootm.o \ cmd_cache.o cmd_console.o \ cmd_date.o cmd_dcr.o cmd_diag.o cmd_doc.o cmd_dtt.o \ diff -purN -xEntries -x'*.orig' u-boot.orig/common/cmd_ace.c u-boot/common/cmd_ace.c --- u-boot.orig/common/cmd_ace.c 1969-12-31 16:00:00.000000000 -0800 +++ u-boot/common/cmd_ace.c 2004-02-04 18:46:50.000000000 -0800 @@ -0,0 +1,205 @@ +/* + * Copyright (c) 2004 Picture Elements, Inc. + * Stephen Williams (XXXXXXXXXXXXXXXX) + * + * This source code is free software; you can redistribute it + * and/or modify it in source code form under the terms of the GNU + * General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ +#ident "$Id:$" + +/* + * The Xilinx SystemACE chip support is activated by defining + * CONFIG_SYSTEMACE to turn on support, and CFG_SYSTEMACE_BASE + * to set the base address of the device. This code currently + * assumes that the chip is connected via a byte-wide bus. + * + * The CONFIG_SYSTEMACE also adds to fat support the device class + * "ace" that allows the user to execute "fatls ace 0" and the + * like. This works by making the systemace_get_dev function + * available to cmd_fat.c:get_dev and filling in a block device + * description that has all the bits needed for FAT support to + * read sectors. + */ + +# include <common.h> +# include <command.h> +# include <systemace.h> +# include <part.h> +# include <asm/io.h> + +#ifdef CONFIG_SYSTEMACE + +/* + * The ace_readw and writew functions read/write 16bit words, but the + * offset value is the BYTE offset as most used in the Xilinx + * datasheet for the SystemACE chip. The CFG_SYSTEMACE_BASE is defined + * to be the base address for the chip, usually in the local + * peripheral bus. + */ +static unsigned ace_readw(unsigned offset) +{ + return readw(CFG_SYSTEMACE_BASE+offset); +} + +static unsigned ace_writew(unsigned val, unsigned offset) +{ + writew(val, CFG_SYSTEMACE_BASE+offset); +} + +/* */ + +static unsigned long systemace_read(int dev, + unsigned long start, + unsigned long blkcnt, + unsigned long *buffer); + +static block_dev_desc_t systemace_dev = {0}; + +static int get_cf_lock(void) +{ + int retry = 10; + + /* CONTROLREG = LOCKREG */ + ace_writew(0x0002, 0x18); + + /* Wait for MPULOCK in STATUSREG[15:0] */ + while (! (ace_readw(0x04) & 0x0002)) { + + if (retry < 0) + return -1; + + udelay(100000); + retry -= 1; + } + + return 0; +} + +static void release_cf_lock(void) +{ + /* CONTROLREG = none */ + ace_writew(0x0000, 0x18); +} + +block_dev_desc_t * systemace_get_dev(int dev) +{ + /* The first time through this, the systemace_dev object is + not yet initialized. In that case, fill it in. */ + if (systemace_dev.blksz == 0) { + systemace_dev.if_type = IF_TYPE_UNKNOWN; + systemace_dev.part_type = PART_TYPE_UNKNOWN; + systemace_dev.type = DEV_TYPE_HARDDISK; + systemace_dev.blksz = 512; + systemace_dev.removable = 1; + systemace_dev.block_read = systemace_read; + } + + return &systemace_dev; +} + +/* + * This function is called (by dereferencing the block_read pointer in + * the dev_desc) to read blocks of data. The return value is the + * number of blocks read. A zero return indicates an error. + */ +static unsigned long systemace_read(int dev, + unsigned long start, + unsigned long blkcnt, + unsigned long *buffer) +{ + unsigned val; + int retry; + unsigned char*dp = (unsigned char*)buffer; + + if (get_cf_lock() < 0) { + unsigned status = ace_readw(0x04); + + /* If CFDETECT is false, card is missing. */ + if (! (status&0x0010)) { + printf("** CompactFlash card not present. **\n"); + return 0; + } + + printf("**** ACE locked away from me (STATUSREG=%04x)\n", status); + return 0; + } + + retry = 2000; + for (;;) { + unsigned val = ace_readw(0x04); + + /* If CFDETECT is false, card is missing. */ + if (! (val & 0x0010)) { + printf("**** ACE CompactFlash not found.\n"); + release_cf_lock(); + return 0; + } + + /* If RDYFORCMD, then we are ready to go. */ + if (val & 0x0100) + break; + + if (retry < 0) { + printf("**** SystemACE not ready.\n"); + release_cf_lock(); + return 0; + } + + udelay(1000); + retry -= 1; + } + + /* Write LBA block address */ + ace_writew(start & 0xffff, 0x10); + start >>= 16; + ace_writew(start & 0xff, 0x12); + + /* Write sector count | ReadMemCardData. */ + ace_writew(blkcnt | 0x0300, 0x14); + + /* CONTROLREG = CFGRESET|LOCKREQ */ + ace_writew(0x0082, 0x18); + + retry = blkcnt * 16; + while (retry > 0) { + int idx; + + /* Wait for buffer to become ready. */ + while (! (ace_readw(0x04) & 0x0020)) { + udelay(1000); + } + + /* Read 16 words of 2bytes from the sector buffer. */ + for (idx = 0 ; idx < 16 ; idx += 1) { + unsigned short val = ace_readw(0x40); + *dp++ = val & 0xff; + *dp++ = (val>>8) & 0xff; + } + + retry -= 1; + } + + release_cf_lock(); + + return blkcnt; +} + + +#endif + +/* + * $Log: $ + */ + diff -purN -xEntries -x'*.orig' u-boot.orig/common/cmd_fat.c u-boot/common/cmd_fat.c --- u-boot.orig/common/cmd_fat.c 2003-10-15 16:53:50.000000000 -0700 +++ u-boot/common/cmd_fat.c 2004-02-03 21:18:51.000000000 -0800 @@ -63,6 +63,12 @@ block_dev_desc_t *get_dev (char* ifname, return(mmc_get_dev(dev)); } #endif +#if defined(CONFIG_SYSTEMACE) + if (strcmp(ifname,"ace")==0) { + extern block_dev_desc_t * systemace_get_dev(int dev); + return(systemace_get_dev(dev)); + } +#endif return NULL; }
diff -purN -xEntries -x'*.orig' u-boot.orig/disk/part.c u-boot/disk/part.c --- u-boot.orig/disk/part.c 2004-01-03 11:43:49.000000000 -0800 +++ u-boot/disk/part.c 2004-02-03 18:04:47.000000000 -0800 @@ -36,7 +36,7 @@ #if ((CONFIG_COMMANDS & CFG_CMD_IDE) || \ (CONFIG_COMMANDS & CFG_CMD_SCSI) || \ (CONFIG_COMMANDS & CFG_CMD_USB) || \ - (CONFIG_MMC) ) + (CONFIG_MMC) || (CONFIG_SYSTEMACE) )
/* ------------------------------------------------------------------------- */ /* @@ -107,7 +107,8 @@ void dev_print (block_dev_desc_t *dev_de
#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || \ (CONFIG_COMMANDS & CFG_CMD_SCSI) || \ - (CONFIG_COMMANDS & CFG_CMD_USB) ) + (CONFIG_COMMANDS & CFG_CMD_USB) || \ + defined(CONFIG_SYSTEMACE) )
#if defined(CONFIG_MAC_PARTITION) || \ defined(CONFIG_DOS_PARTITION) || \ diff -purN -xEntries -x'*.orig' u-boot.orig/disk/part_dos.c u-boot/disk/part_dos.c --- u-boot.orig/disk/part_dos.c 2003-09-10 15:30:55.000000000 -0700 +++ u-boot/disk/part_dos.c 2004-02-03 18:06:24.000000000 -0800 @@ -37,7 +37,8 @@
#if ((CONFIG_COMMANDS & CFG_CMD_IDE) || \ (CONFIG_COMMANDS & CFG_CMD_SCSI) || \ - (CONFIG_COMMANDS & CFG_CMD_USB) ) && defined(CONFIG_DOS_PARTITION) + (CONFIG_COMMANDS & CFG_CMD_USB) || \ + (CONFIG_SYSTEMACE)) && defined(CONFIG_DOS_PARTITION)
/* Convert char[4] in little endian format to the host format integer */ diff -purN -xEntries -x'*.orig' u-boot.orig/include/systemace.h u-boot/include/systemace.h --- u-boot.orig/include/systemace.h 1969-12-31 16:00:00.000000000 -0800 +++ u-boot/include/systemace.h 2004-02-04 18:47:32.000000000 -0800 @@ -0,0 +1,31 @@ +#ifndef __systemace_H +#define __systemace_H +/* + * Copyright (c) 2004 Picture Elements, Inc. + * Stephen Williams (steve@picturel.com) + * + * This source code is free software; you can redistribute it + * and/or modify it in source code form under the terms of the GNU + * General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + */ +#ident "$Id:$" + +#ifdef CONFIG_SYSTEMACE + +# include <part.h> + +block_dev_desc_t * systemace_get_dev(int dev); + +#endif +#endif
Am Dienstag, 10. Februar 2004 01:29 schrieb Stephen Williams:
--snipp--
"cvs diff -puRN" does not include new files, the -N flag is useless in that context as cvs does not know of those files so does not even try to diff them. You will need to accept
Are you realy right ? The CVS short help 'cvs --help diff' says:
" -N include diffs for added and removed files."
The man page of GNU diff says:
" -N --new-file In directory comparison, if a file is found in only one directory, treat it as present but empty in the other directory."
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
Stephan Linz linz-at-mazet.de |u-boot-users| wrote: | Am Dienstag, 10. Februar 2004 01:29 schrieb Stephen Williams: | |>--snipp-- |> |>"cvs diff -puRN" does not include new files, the -N flag is |>useless in that context as cvs does not know of those files |>so does not even try to diff them. You will need to accept | | | Are you realy right ? The CVS short help 'cvs --help diff' says: | | " -N include diffs for added and removed files." | | The man page of GNU diff says: | | " -N | --new-file | In directory comparison, if a file is found in only one directory, treat | it as present but empty in the other directory." | |
If I had write access to the repository, then I could "cvs add" the files and then use "cvs diff -N" to get the desired patch. But then, if I had write acces to the repository, I could just add it without patches flying about:-)
- -- Steve Williams "The woods are lovely, dark and deep. steve at XXXXXXXXXX But I have promises to keep, http://www.XXXXXXXXXX and lines to code before I sleep, http://www.picturel.com And lines to code before I sleep."
In message 12179-58823@sneakemail.com you wrote:
If I had write access to the repository, then I could "cvs add" the files and then use "cvs diff -N" to get the desired patch. But then, if I had write acces to the repository, I could just add it without patches flying about:-)
You can run CVS with a local repository. Which is strongly recommended anyway (except you are using another / better configuration management system - which then probably provides a different tool to export patches).
Best regards,
Wolfgang Denk
In message 13853-75826@sneakemail.com you wrote:
- Add support for Xilinx SystemACE chip:
~ New file common/cmd_ace.c ~ New file include/systemace.h ~ Hook systemace support into cmd_fat and the partition manager.
Added. Thanks.
Best regards,
Wolfgang Denk
participants (3)
-
Stephan Linz -
Stephen Williams -
Wolfgang Denk