summaryrefslogtreecommitdiffstats
path: root/drivers/block/mtip32xx
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block/mtip32xx')
-rw-r--r--drivers/block/mtip32xx/mtip32xx.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index be9ad9ca4fe1..9ae4cc5c61ee 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -1092,6 +1092,7 @@ static int mtip_exec_internal_command(struct mtip_port *port,
1092 struct mtip_cmd *int_cmd; 1092 struct mtip_cmd *int_cmd;
1093 struct driver_data *dd = port->dd; 1093 struct driver_data *dd = port->dd;
1094 int rv = 0; 1094 int rv = 0;
1095 unsigned long start;
1095 1096
1096 /* Make sure the buffer is 8 byte aligned. This is asic specific. */ 1097 /* Make sure the buffer is 8 byte aligned. This is asic specific. */
1097 if (buffer & 0x00000007) { 1098 if (buffer & 0x00000007) {
@@ -1155,6 +1156,8 @@ static int mtip_exec_internal_command(struct mtip_port *port,
1155 /* Populate the command header */ 1156 /* Populate the command header */
1156 int_cmd->command_header->byte_count = 0; 1157 int_cmd->command_header->byte_count = 0;
1157 1158
1159 start = jiffies;
1160
1158 /* Issue the command to the hardware */ 1161 /* Issue the command to the hardware */
1159 mtip_issue_non_ncq_command(port, MTIP_TAG_INTERNAL); 1162 mtip_issue_non_ncq_command(port, MTIP_TAG_INTERNAL);
1160 1163
@@ -1165,8 +1168,9 @@ static int mtip_exec_internal_command(struct mtip_port *port,
1165 msecs_to_jiffies(timeout))) <= 0) { 1168 msecs_to_jiffies(timeout))) <= 0) {
1166 if (rv == -ERESTARTSYS) { /* interrupted */ 1169 if (rv == -ERESTARTSYS) { /* interrupted */
1167 dev_err(&dd->pdev->dev, 1170 dev_err(&dd->pdev->dev,
1168 "Internal command [%02X] was interrupted after %lu ms\n", 1171 "Internal command [%02X] was interrupted after %u ms\n",
1169 fis->command, timeout); 1172 fis->command,
1173 jiffies_to_msecs(jiffies - start));
1170 rv = -EINTR; 1174 rv = -EINTR;
1171 goto exec_ic_exit; 1175 goto exec_ic_exit;
1172 } else if (rv == 0) /* timeout */ 1176 } else if (rv == 0) /* timeout */