mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
scsi: Add max_bytes_per_req to scsi_platdata
Add max_bytes_per_req 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 <faiz_abbas@ti.com>
This commit is contained in:
parent
66c54f1a3e
commit
4ff572830e
|
@ -45,7 +45,7 @@ static struct blk_desc scsi_dev_desc[CONFIG_SYS_SCSI_MAX_DEVICE];
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* almost the maximum amount of the scsi_ext command.. */
|
/* almost the maximum amount of the scsi_ext command.. */
|
||||||
#define SCSI_MAX_READ_BLK 0xFFFF
|
#define SCSI_MAX_BLK 0xFFFF
|
||||||
#define SCSI_LBA48_READ 0xFFFFFFF
|
#define SCSI_LBA48_READ 0xFFFFFFF
|
||||||
|
|
||||||
static void scsi_print_error(struct scsi_cmd *pccb)
|
static void scsi_print_error(struct scsi_cmd *pccb)
|
||||||
|
@ -147,7 +147,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 blk_desc *block_dev = dev_get_uclass_platdata(dev);
|
||||||
struct udevice *bdev = dev->parent;
|
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;
|
uintptr_t buf_addr;
|
||||||
unsigned short smallblks = 0;
|
unsigned short smallblks = 0;
|
||||||
struct scsi_cmd *pccb = (struct scsi_cmd *)&tempccb;
|
struct scsi_cmd *pccb = (struct scsi_cmd *)&tempccb;
|
||||||
|
@ -158,6 +159,11 @@ static ulong scsi_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
|
||||||
buf_addr = (unsigned long)buffer;
|
buf_addr = (unsigned long)buffer;
|
||||||
start = blknr;
|
start = blknr;
|
||||||
blks = blkcnt;
|
blks = blkcnt;
|
||||||
|
if (uc_plat->max_bytes_per_req)
|
||||||
|
max_blks = uc_plat->max_bytes_per_req / block_dev->blksz;
|
||||||
|
else
|
||||||
|
max_blks = SCSI_MAX_BLK;
|
||||||
|
|
||||||
debug("\nscsi_read: dev %d startblk " LBAF
|
debug("\nscsi_read: dev %d startblk " LBAF
|
||||||
", blccnt " LBAF " buffer %lx\n",
|
", blccnt " LBAF " buffer %lx\n",
|
||||||
block_dev->devnum, start, blks, (unsigned long)buffer);
|
block_dev->devnum, start, blks, (unsigned long)buffer);
|
||||||
|
@ -166,20 +172,19 @@ static ulong scsi_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
|
||||||
#ifdef CONFIG_SYS_64BIT_LBA
|
#ifdef CONFIG_SYS_64BIT_LBA
|
||||||
if (start > SCSI_LBA48_READ) {
|
if (start > SCSI_LBA48_READ) {
|
||||||
unsigned long blocks;
|
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;
|
pccb->datalen = block_dev->blksz * blocks;
|
||||||
scsi_setup_read16(pccb, start, blocks);
|
scsi_setup_read16(pccb, start, blocks);
|
||||||
start += blocks;
|
start += blocks;
|
||||||
blks -= blocks;
|
blks -= blocks;
|
||||||
} else
|
} else
|
||||||
#endif
|
#endif
|
||||||
if (blks > SCSI_MAX_READ_BLK) {
|
if (blks > max_blks) {
|
||||||
pccb->datalen = block_dev->blksz *
|
pccb->datalen = block_dev->blksz * max_blks;
|
||||||
SCSI_MAX_READ_BLK;
|
smallblks = max_blks;
|
||||||
smallblks = SCSI_MAX_READ_BLK;
|
|
||||||
scsi_setup_read_ext(pccb, start, smallblks);
|
scsi_setup_read_ext(pccb, start, smallblks);
|
||||||
start += SCSI_MAX_READ_BLK;
|
start += max_blks;
|
||||||
blks -= SCSI_MAX_READ_BLK;
|
blks -= max_blks;
|
||||||
} else {
|
} else {
|
||||||
pccb->datalen = block_dev->blksz * blks;
|
pccb->datalen = block_dev->blksz * blks;
|
||||||
smallblks = (unsigned short)blks;
|
smallblks = (unsigned short)blks;
|
||||||
|
@ -206,15 +211,13 @@ static ulong scsi_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
|
||||||
* scsi_write
|
* scsi_write
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Almost the maximum amount of the scsi_ext command.. */
|
|
||||||
#define SCSI_MAX_WRITE_BLK 0xFFFF
|
|
||||||
|
|
||||||
static ulong scsi_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
|
static ulong scsi_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
|
||||||
const void *buffer)
|
const void *buffer)
|
||||||
{
|
{
|
||||||
struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
|
struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
|
||||||
struct udevice *bdev = dev->parent;
|
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;
|
uintptr_t buf_addr;
|
||||||
unsigned short smallblks;
|
unsigned short smallblks;
|
||||||
struct scsi_cmd *pccb = (struct scsi_cmd *)&tempccb;
|
struct scsi_cmd *pccb = (struct scsi_cmd *)&tempccb;
|
||||||
|
@ -225,17 +228,21 @@ static ulong scsi_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
|
||||||
buf_addr = (unsigned long)buffer;
|
buf_addr = (unsigned long)buffer;
|
||||||
start = blknr;
|
start = blknr;
|
||||||
blks = blkcnt;
|
blks = blkcnt;
|
||||||
|
if (uc_plat->max_bytes_per_req)
|
||||||
|
max_blks = uc_plat->max_bytes_per_req / block_dev->blksz;
|
||||||
|
else
|
||||||
|
max_blks = SCSI_MAX_BLK;
|
||||||
|
|
||||||
debug("\n%s: dev %d startblk " LBAF ", blccnt " LBAF " buffer %lx\n",
|
debug("\n%s: dev %d startblk " LBAF ", blccnt " LBAF " buffer %lx\n",
|
||||||
__func__, block_dev->devnum, start, blks, (unsigned long)buffer);
|
__func__, block_dev->devnum, start, blks, (unsigned long)buffer);
|
||||||
do {
|
do {
|
||||||
pccb->pdata = (unsigned char *)buf_addr;
|
pccb->pdata = (unsigned char *)buf_addr;
|
||||||
if (blks > SCSI_MAX_WRITE_BLK) {
|
if (blks > max_blks) {
|
||||||
pccb->datalen = (block_dev->blksz *
|
pccb->datalen = block_dev->blksz * max_blks;
|
||||||
SCSI_MAX_WRITE_BLK);
|
smallblks = max_blks;
|
||||||
smallblks = SCSI_MAX_WRITE_BLK;
|
|
||||||
scsi_setup_write_ext(pccb, start, smallblks);
|
scsi_setup_write_ext(pccb, start, smallblks);
|
||||||
start += SCSI_MAX_WRITE_BLK;
|
start += max_blks;
|
||||||
blks -= SCSI_MAX_WRITE_BLK;
|
blks -= max_blks;
|
||||||
} else {
|
} else {
|
||||||
pccb->datalen = block_dev->blksz * blks;
|
pccb->datalen = block_dev->blksz * blks;
|
||||||
smallblks = (unsigned short)blks;
|
smallblks = (unsigned short)blks;
|
||||||
|
|
|
@ -163,11 +163,13 @@ struct scsi_cmd {
|
||||||
* @base: Controller base address
|
* @base: Controller base address
|
||||||
* @max_lun: Maximum number of logical units
|
* @max_lun: Maximum number of logical units
|
||||||
* @max_id: Maximum number of target ids
|
* @max_id: Maximum number of target ids
|
||||||
|
* @max_bytes_per_req: Maximum number of bytes per read/write request
|
||||||
*/
|
*/
|
||||||
struct scsi_platdata {
|
struct scsi_platdata {
|
||||||
unsigned long base;
|
unsigned long base;
|
||||||
unsigned long max_lun;
|
unsigned long max_lun;
|
||||||
unsigned long max_id;
|
unsigned long max_id;
|
||||||
|
unsigned long max_bytes_per_req;
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Operations for SCSI */
|
/* Operations for SCSI */
|
||||||
|
|
Loading…
Reference in New Issue
Block a user