| Message ID | 1346505549-6795-1-git-send-email-morpheus.ibis@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
Dear Pavel Herrmann, > This driver uses files as block devices, can be used for testing disk > operations on sandbox. Port count and filenames are set in board config. > > Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com> > CC: Marek Vasut <marex@denx.de> > --- > Changes for v2: > split sandbox config off into separate patch (2/2) > rename file to signify exported API > style fixes > show end of long filenames rather than beginning > check for lseek errors to indicate non-regular file > > drivers/block/Makefile | 1 + > drivers/block/sata_loopback.c | 122 > ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 > insertions(+) > create mode 100644 drivers/block/sata_loopback.c > > diff --git a/drivers/block/Makefile b/drivers/block/Makefile > index f1ebdcc..c95651a 100644 > --- a/drivers/block/Makefile > +++ b/drivers/block/Makefile > @@ -40,6 +40,7 @@ COBJS-$(CONFIG_SATA_SIL) += sata_sil.o > COBJS-$(CONFIG_IDE_SIL680) += sil680.o > COBJS-$(CONFIG_SCSI_SYM53C8XX) += sym53c8xx.o > COBJS-$(CONFIG_SYSTEMACE) += systemace.o > +COBJS-${CONFIG_SATA_LOOP} += sata_loopback.o > > COBJS := $(COBJS-y) > SRCS := $(COBJS:.o=.c) > diff --git a/drivers/block/sata_loopback.c b/drivers/block/sata_loopback.c > new file mode 100644 > index 0000000..7f25a4f > --- /dev/null > +++ b/drivers/block/sata_loopback.c > @@ -0,0 +1,122 @@ > +/* > + * (C) Copyright 2012 > + * Pavel Herrmann <morpheus.ibis@gmail.com> > + * > + * See file CREDITS for list of people who contributed to this > + * project. > + * > + * This program is free software; you can redistribute it and/or > + * modify it 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 > + */ > + > +#include <common.h> > +#include <part.h> > +#include <ata.h> > +#include <libata.h> > +#include <errno.h> > +#include <os.h> > + > +static const char revision[] = "0.0"; > +static const char vendor[] = "SATA loopback"; > + > +static const char * const filenames[] = CONFIG_SATA_LOOP_DISKS; > +static int max_devs = CONFIG_SYS_SATA_MAX_DEVICE; One more thing is missing -- documentation for these (add to doc/ ). Alternatively (which would be much better), let sandbox uboot accept params and supply these as params. > +extern block_dev_desc_t sata_dev_desc[]; > + > +int init_sata(int dev) > +{ > + block_dev_desc_t *pdev = &sata_dev_desc[dev]; > + int fd; > + > + if ((dev < 0) || (dev >= max_devs)) { > + printf("File index %d is out of range.\n", dev); > + return -EINVAL; > + } > + > + fd = os_open(filenames[dev], OS_O_RDWR); > + /* This is ugly, but saves allocation for 1 int. */ > + pdev->priv = (void *) (long) fd; > + > + return 0; > +} > + > +lbaint_t sata_read(int dev, lbaint_t start, lbaint_t blkcnt, void *buffer) > +{ > + block_dev_desc_t *pdev = &sata_dev_desc[dev]; > + int fd = (long) pdev->priv; > + lbaint_t start_byte = ATA_SECT_SIZE * start; > + lbaint_t length_byte = ATA_SECT_SIZE * blkcnt; > + lbaint_t retval; > + > + if ( os_lseek(fd, start_byte, OS_SEEK_SET) != start_byte) > + return -1; > + > + retval = os_read(fd, buffer, length_byte); > + > + return retval/ATA_SECT_SIZE; > +} > + > +lbaint_t sata_write(int dev, lbaint_t start, lbaint_t blkcnt, void > *buffer) +{ > + block_dev_desc_t *pdev = &sata_dev_desc[dev]; > + int fd = (long) pdev->priv; > + lbaint_t start_byte = ATA_SECT_SIZE * start; > + lbaint_t length_byte = ATA_SECT_SIZE * blkcnt; > + lbaint_t retval; > + > + if ( os_lseek(fd, start_byte, OS_SEEK_SET) != start_byte) > + return -1; > + > + retval = os_write(fd, buffer, length_byte); > + > + return retval/ATA_SECT_SIZE; > +} > + > +int scan_sata(int dev) > +{ > + block_dev_desc_t *pdev = &sata_dev_desc[dev]; > + int fd = (long) pdev->priv; > + int namelen; > + const char *filename = filenames[dev]; > + lbaint_t bytes = 0; > + > + memcpy(pdev->vendor, vendor, sizeof(vendor)); > + memcpy(pdev->revision, revision, sizeof(revision)); > + namelen = strlen(filenames[dev]); > + > + if (namelen > 20) { > + /* take the last 17 chars, prepend them with "..." */ > + filename += (namelen - 17); > + memcpy(pdev->product, "...", 3); > + memcpy(pdev->product+3, filename, 17); > + } else > + memcpy(pdev->product, filename, namelen); > + > + pdev->product[20] = 0; > + > + bytes = os_lseek(fd, 0, OS_SEEK_END); > + if (bytes != -1) { > + pdev->type = DEV_TYPE_HARDDISK; > + pdev->blksz = ATA_SECT_SIZE; > + pdev->lun = 0; > + pdev->lba = bytes/ATA_SECT_SIZE; > + } > + > + printf("SATA loop info:\nfilename: %s\nsize: %lu\nblock count: %lu\n", > + filenames[dev], bytes, pdev->lba); > + > + return 0; > +} Best regards, Marek Vasut
On Monday 03 of September 2012 18:49:00 Marek Vasut wrote: > > + > > +static const char revision[] = "0.0"; > > +static const char vendor[] = "SATA loopback"; > > + > > +static const char * const filenames[] = CONFIG_SATA_LOOP_DISKS; > > +static int max_devs = CONFIG_SYS_SATA_MAX_DEVICE; > > One more thing is missing -- documentation for these (add to doc/ ). which file shoud that be exactly? README.sata has nothing about configs, i cannot find any README.sandbox or README.configs > Alternatively (which would be much better), let sandbox uboot accept params > and supply these as params. or even make a command that would allow you to specify a filename in runtime, possibly with a dynamic number of ports. Pavel Herrmann
Dear Pavel Herrmann, > On Monday 03 of September 2012 18:49:00 Marek Vasut wrote: > > > + > > > +static const char revision[] = "0.0"; > > > +static const char vendor[] = "SATA loopback"; > > > + > > > +static const char * const filenames[] = CONFIG_SATA_LOOP_DISKS; > > > +static int max_devs = CONFIG_SYS_SATA_MAX_DEVICE; > > > > One more thing is missing -- documentation for these (add to doc/ ). > > which file shoud that be exactly? README.sata has nothing about configs, i > cannot find any README.sandbox or README.configs Create one ... especially for the newly added feature -- eg. README.sata_loopback or something, > > Alternatively (which would be much better), let sandbox uboot accept > > params and supply these as params. > > or even make a command that would allow you to specify a filename in > runtime, possibly with a dynamic number of ports. Good idea, indeed. > Pavel Herrmann Best regards, Marek Vasut
diff --git a/drivers/block/Makefile b/drivers/block/Makefile index f1ebdcc..c95651a 100644 --- a/drivers/block/Makefile +++ b/drivers/block/Makefile @@ -40,6 +40,7 @@ COBJS-$(CONFIG_SATA_SIL) += sata_sil.o COBJS-$(CONFIG_IDE_SIL680) += sil680.o COBJS-$(CONFIG_SCSI_SYM53C8XX) += sym53c8xx.o COBJS-$(CONFIG_SYSTEMACE) += systemace.o +COBJS-${CONFIG_SATA_LOOP} += sata_loopback.o COBJS := $(COBJS-y) SRCS := $(COBJS:.o=.c) diff --git a/drivers/block/sata_loopback.c b/drivers/block/sata_loopback.c new file mode 100644 index 0000000..7f25a4f --- /dev/null +++ b/drivers/block/sata_loopback.c @@ -0,0 +1,122 @@ +/* + * (C) Copyright 2012 + * Pavel Herrmann <morpheus.ibis@gmail.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it 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 + */ + +#include <common.h> +#include <part.h> +#include <ata.h> +#include <libata.h> +#include <errno.h> +#include <os.h> + +static const char revision[] = "0.0"; +static const char vendor[] = "SATA loopback"; + +static const char * const filenames[] = CONFIG_SATA_LOOP_DISKS; +static int max_devs = CONFIG_SYS_SATA_MAX_DEVICE; + +extern block_dev_desc_t sata_dev_desc[]; + +int init_sata(int dev) +{ + block_dev_desc_t *pdev = &sata_dev_desc[dev]; + int fd; + + if ((dev < 0) || (dev >= max_devs)) { + printf("File index %d is out of range.\n", dev); + return -EINVAL; + } + + fd = os_open(filenames[dev], OS_O_RDWR); + /* This is ugly, but saves allocation for 1 int. */ + pdev->priv = (void *) (long) fd; + + return 0; +} + +lbaint_t sata_read(int dev, lbaint_t start, lbaint_t blkcnt, void *buffer) +{ + block_dev_desc_t *pdev = &sata_dev_desc[dev]; + int fd = (long) pdev->priv; + lbaint_t start_byte = ATA_SECT_SIZE * start; + lbaint_t length_byte = ATA_SECT_SIZE * blkcnt; + lbaint_t retval; + + if ( os_lseek(fd, start_byte, OS_SEEK_SET) != start_byte) + return -1; + + retval = os_read(fd, buffer, length_byte); + + return retval/ATA_SECT_SIZE; +} + +lbaint_t sata_write(int dev, lbaint_t start, lbaint_t blkcnt, void *buffer) +{ + block_dev_desc_t *pdev = &sata_dev_desc[dev]; + int fd = (long) pdev->priv; + lbaint_t start_byte = ATA_SECT_SIZE * start; + lbaint_t length_byte = ATA_SECT_SIZE * blkcnt; + lbaint_t retval; + + if ( os_lseek(fd, start_byte, OS_SEEK_SET) != start_byte) + return -1; + + retval = os_write(fd, buffer, length_byte); + + return retval/ATA_SECT_SIZE; +} + +int scan_sata(int dev) +{ + block_dev_desc_t *pdev = &sata_dev_desc[dev]; + int fd = (long) pdev->priv; + int namelen; + const char *filename = filenames[dev]; + lbaint_t bytes = 0; + + memcpy(pdev->vendor, vendor, sizeof(vendor)); + memcpy(pdev->revision, revision, sizeof(revision)); + namelen = strlen(filenames[dev]); + + if (namelen > 20) { + /* take the last 17 chars, prepend them with "..." */ + filename += (namelen - 17); + memcpy(pdev->product, "...", 3); + memcpy(pdev->product+3, filename, 17); + } else + memcpy(pdev->product, filename, namelen); + + pdev->product[20] = 0; + + bytes = os_lseek(fd, 0, OS_SEEK_END); + if (bytes != -1) { + pdev->type = DEV_TYPE_HARDDISK; + pdev->blksz = ATA_SECT_SIZE; + pdev->lun = 0; + pdev->lba = bytes/ATA_SECT_SIZE; + } + + printf("SATA loop info:\nfilename: %s\nsize: %lu\nblock count: %lu\n", + filenames[dev], bytes, pdev->lba); + + return 0; +}
This driver uses files as block devices, can be used for testing disk operations on sandbox. Port count and filenames are set in board config. Signed-off-by: Pavel Herrmann <morpheus.ibis@gmail.com> CC: Marek Vasut <marex@denx.de> --- Changes for v2: split sandbox config off into separate patch (2/2) rename file to signify exported API style fixes show end of long filenames rather than beginning check for lseek errors to indicate non-regular file drivers/block/Makefile | 1 + drivers/block/sata_loopback.c | 122 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 drivers/block/sata_loopback.c