Re: [U-Boot] [PATCH 02/10] scsi: Add max_bytes to scsi_platdata

2019-09-11 Thread Faiz Abbas 
Vignesh,

On 10/09/19 9:16 AM, Vignesh Raghavendra wrote:
> 
> 
> On 09/09/19 1:49 PM, Faiz Abbas wrote:
>> diff --git a/include/scsi.h b/include/scsi.h
>> index 81ab43c842..076bdbc6a0 100644
>> --- a/include/scsi.h
>> +++ b/include/scsi.h
>> @@ -168,6 +168,7 @@ struct scsi_platdata {
>>  unsigned long base;
>>  unsigned long max_lun;
>>  unsigned long max_id;
>> +unsigned long max_bytes;
> 
> Please add description of the new field. Also, could the name be bit
> more specific like max_bytes_per_req?
> 

Sounds good.

Thanks,
Faiz
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Re: [U-Boot] [PATCH 02/10] scsi: Add max_bytes to scsi_platdata

2019-09-09 Thread Vignesh Raghavendra 


On 09/09/19 1:49 PM, Faiz Abbas wrote:
> diff --git a/include/scsi.h b/include/scsi.h
> index 81ab43c842..076bdbc6a0 100644
> --- a/include/scsi.h
> +++ b/include/scsi.h
> @@ -168,6 +168,7 @@ struct scsi_platdata {
>   unsigned long base;
>   unsigned long max_lun;
>   unsigned long max_id;
> + unsigned long max_bytes;

Please add description of the new field. Also, could the name be bit
more specific like max_bytes_per_req?


-- 
Regards
Vignesh
___
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

[U-Boot] [PATCH 02/10] scsi: Add max_bytes to scsi_platdata

2019-09-09 Thread Faiz Abbas 
Add max_platdata to scsi_platdata to enable the host driver to limit the
number of bytes that can be read/written per request.

Signed-off-by: Faiz Abbas 
---
 drivers/scsi/scsi.c | 45 ++---
 include/scsi.h  |  1 +
 2 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index 82a0bf7cc6..fd1b4b776d 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -44,7 +44,7 @@ static struct blk_desc 
scsi_dev_desc[CONFIG_SYS_SCSI_MAX_DEVICE];
 #endif
 
 /* almost the maximum amount of the scsi_ext command.. */
-#define SCSI_MAX_READ_BLK 0x
+#define SCSI_MAX_BLK 0x
 #define SCSI_LBA48_READ0xFFF
 
 static void scsi_print_error(struct scsi_cmd *pccb)
@@ -145,7 +145,8 @@ static ulong scsi_read(struct udevice *dev, lbaint_t blknr, 
lbaint_t blkcnt,
 {
struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
struct udevice *bdev = dev->parent;
-   lbaint_t start, blks;
+   struct scsi_platdata *uc_plat = dev_get_uclass_platdata(bdev);
+   lbaint_t start, blks, max_blks;
uintptr_t buf_addr;
unsigned short smallblks = 0;
struct scsi_cmd *pccb = (struct scsi_cmd *)&tempccb;
@@ -156,6 +157,11 @@ static ulong scsi_read(struct udevice *dev, lbaint_t 
blknr, lbaint_t blkcnt,
buf_addr = (unsigned long)buffer;
start = blknr;
blks = blkcnt;
+   if (uc_plat->max_bytes)
+   max_blks = uc_plat->max_bytes / block_dev->blksz;
+   else
+   max_blks = SCSI_MAX_BLK;
+
debug("\nscsi_read: dev %d startblk " LBAF
  ", blccnt " LBAF " buffer %lx\n",
  block_dev->devnum, start, blks, (unsigned long)buffer);
@@ -164,20 +170,19 @@ static ulong scsi_read(struct udevice *dev, lbaint_t 
blknr, lbaint_t blkcnt,
 #ifdef CONFIG_SYS_64BIT_LBA
if (start > SCSI_LBA48_READ) {
unsigned long blocks;
-   blocks = min_t(lbaint_t, blks, SCSI_MAX_READ_BLK);
+   blocks = min_t(lbaint_t, blks, max_blks);
pccb->datalen = block_dev->blksz * blocks;
scsi_setup_read16(pccb, start, blocks);
start += blocks;
blks -= blocks;
} else
 #endif
-   if (blks > SCSI_MAX_READ_BLK) {
-   pccb->datalen = block_dev->blksz *
-   SCSI_MAX_READ_BLK;
-   smallblks = SCSI_MAX_READ_BLK;
+   if (blks > max_blks) {
+   pccb->datalen = block_dev->blksz * max_blks;
+   smallblks = max_blks;
scsi_setup_read_ext(pccb, start, smallblks);
-   start += SCSI_MAX_READ_BLK;
-   blks -= SCSI_MAX_READ_BLK;
+   start += max_blks;
+   blks -= max_blks;
} else {
pccb->datalen = block_dev->blksz * blks;
smallblks = (unsigned short)blks;
@@ -204,15 +209,13 @@ static ulong scsi_read(struct udevice *dev, lbaint_t 
blknr, lbaint_t blkcnt,
  * scsi_write
  */
 
-/* Almost the maximum amount of the scsi_ext command.. */
-#define SCSI_MAX_WRITE_BLK 0x
-
 static ulong scsi_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
const void *buffer)
 {
struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
struct udevice *bdev = dev->parent;
-   lbaint_t start, blks;
+   struct scsi_platdata *uc_plat = dev_get_uclass_priv(bdev);
+   lbaint_t start, blks, max_blks;
uintptr_t buf_addr;
unsigned short smallblks;
struct scsi_cmd *pccb = (struct scsi_cmd *)&tempccb;
@@ -223,17 +226,21 @@ static ulong scsi_write(struct udevice *dev, lbaint_t 
blknr, lbaint_t blkcnt,
buf_addr = (unsigned long)buffer;
start = blknr;
blks = blkcnt;
+   if (uc_plat->max_bytes)
+   max_blks = uc_plat->max_bytes / block_dev->blksz;
+   else
+   max_blks = SCSI_MAX_BLK;
+
debug("\n%s: dev %d startblk " LBAF ", blccnt " LBAF " buffer %lx\n",
  __func__, block_dev->devnum, start, blks, (unsigned long)buffer);
do {
pccb->pdata = (unsigned char *)buf_addr;
-   if (blks > SCSI_MAX_WRITE_BLK) {
-   pccb->datalen = (block_dev->blksz *
-SCSI_MAX_WRITE_BLK);
-   smallblks = SCSI_MAX_WRITE_BLK;
+   if (blks > SCSI_MAX_BLK) {
+   pccb->datalen = block_dev->blksz * max_blks;
+   smallblks = max_blks;
scsi_setup_write_ext(pccb, start, smallblks);
-   start += SCSI_MAX_WRITE_BLK;
-   blks -= SCSI_MAX_WRITE_BLK;
+