mtip32xx:Added appropriate timeout value for secure erase
Hi Jens,
Please queue this patch for 3.7.
Added appropriate timeout value for secure erase based on identify device data
Signed-off-by Asai Thambi S P <[email protected]>
Signed-off-by Selvan Mani <[email protected]>
--- drivers/block/mtip32xx/mtip32xx.c | 19 +++++++++++++++---- drivers/block/mtip32xx/mtip32xx.h | 3 +++ 2 files changed, 18 insertions(+), 4 deletions(-)
drivers/block/mtip32xx/mtip32xx.c +15 -4
@@ -2038,8 +2038,9 @@ static unsigned int implicit_sector(unsigned char command, }return rv; } - -static void mtip_set_timeout (struct host_to_dev_fis *fis,unsigned int *timeout) +static void mtip_set_timeout (struct driver_data *dd, +struct host_to_dev_fis *fis, +unsigned int *timeout,u8 erasemode) {switch (fis->command) {case ATA_CMD_DOWNLOAD_MICRO :
@@ -2047,7 +2048,10 @@ static void mtip_set_timeout(struct host_to_dev_fis *fis, unsigned int *timeout)break ;case ATA_CMD_SEC_ERASE_UNIT :case 0xFC : - *timeout =240000 ;/* 4 minutes */ +if (erasemode) + *timeout = ((*(dd->port->identify +90 ) *2 ) *60000 ); +else + *timeout = ((*(dd->port->identify +89 ) *2 ) *60000 );break ;case ATA_CMD_STANDBYNOW1 : *timeout =120000 ;/* 2 minutes */
@@ -2090,6 +2094,7 @@ static int exec_drive_taskfile(struct driver_data *dd,unsigned int transfer_size;unsigned long task_file_data;int intotal = outtotal + req_task->out_size; +int erasemode =0 ; taskout = req_task->out_size; taskin = req_task->in_size;
@@ -2215,7 +2220,13 @@ static int exec_drive_taskfile(struct driver_data *dd, fis.lba_hi, fis.device); -mtip_set_timeout (&fis, &timeout); +/* check for erase mode support during secure erase.*/ +if ((fis.command ==ATA_CMD_SEC_ERASE_UNIT ) + && (outbuf[0 ] &MTIP_SEC_ERASE_MODE )) { + erasemode =1 ; + } + +mtip_set_timeout (dd, &fis, &timeout, erasemode);/* Determine the correct transfer size.*/ if (force_single_sector)
drivers/block/mtip32xx/mtip32xx.h +3 -0
@@ -33,6 +33,9 @@/* offset of Device Control register in PCIe extended capabilites space */ #define PCIE_CONFIG_EXT_DEVICE_CONTROL_OFFSET 0x48 +/* check for erase mode support during secure erase */ +#define MTIP_SEC_ERASE_MODE 0x3 +/* # of times to retry timed out/failed IOs */ #define MTIP_MAX_RETRIES 2
Signature · 1 line
1.7.1
Jens Axboe
maintainerQuoted 5 lines · Selvan Mani
Hi Jens,
Please queue this patch for 3.7.
Added appropriate timeout value for secure erase based on identify device data
Queued up!
Signature · 1 line
Jens Axboe