d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce define and kernel option ATA_REQUEST_TIMEOUT to control ATA(4)

Browse Source 
command timeout.

Submitted by:	keramida
This commit is contained in:
Alexander Motin 2009-11-08 14:33:19 +00:00
parent 36ba9f409d
commit 6fb5300b34
7 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/conf/NOTES
View File

@ -1715,8 +1715,11 @@ hint.ata.1.irq="15"
#
# ATA_STATIC_ID: controller numbering is static ie depends on location
# else the device numbers are dynamically allocated.
# ATA_REQUEST_TIMEOUT: the number of seconds to wait for an ATA request
# before timing out.
options ATA_STATIC_ID
#options ATA_REQUEST_TIMEOUT=10
#
# Standard floppy disk controllers and floppy tapes, supports

1
sys/conf/options
View File

@ -350,6 +350,7 @@ ISCSI_INITIATOR_DEBUG opt_iscsi_initiator.h
# Options used in the 'ata' ATA/ATAPI driver
ATA_STATIC_ID opt_ata.h
ATA_NOPCI opt_ata.h
ATA_REQUEST_TIMEOUT opt_ata.h
# Net stuff.
ACCEPT_FILTER_DATA

4
sys/dev/ata/ata-all.h
View File

@ -345,6 +345,10 @@ struct ata_ahci_cmd_list {
#define ATA_OP_FINISHED 1
#define ATA_MAX_28BIT_LBA 268435455UL
#ifndef ATA_REQUEST_TIMEOUT
#define ATA_REQUEST_TIMEOUT 10
#endif
/* structure used for composite atomic operations */
#define MAX_COMPOSITES 32 /* u_int32_t bits */
struct ata_composite {

10
sys/dev/ata/ata-disk.c
View File

@ -230,7 +230,7 @@ ad_spindown(void *priv)
}
request->dev = dev;
request->flags = ATA_R_CONTROL;
request->timeout = 10;
request->timeout = ATA_REQUEST_TIMEOUT;
request->retries = 1;
request->callback = ad_power_callback;
request->u.ata.command = ATA_STANDBY_IMMEDIATE;
@ -262,10 +262,10 @@ ad_strategy(struct bio *bp)
if (atadev->spindown_state) {
device_printf(dev, "request while spun down, starting.\n");
atadev->spindown_state = 0;
request->timeout = 31;
request->timeout = MAX(ATA_REQUEST_TIMEOUT, 31);
}
else {
request->timeout = 10;
request->timeout = ATA_REQUEST_TIMEOUT;
}
request->retries = 2;
request->data = bp->bio_data;
@ -468,7 +468,7 @@ ad_set_geometry(device_t dev)
request->u.ata.count = 0;
request->u.ata.feature = 0;
request->flags = ATA_R_CONTROL | ATA_R_QUIET;
request->timeout = 10;
request->timeout = ATA_REQUEST_TIMEOUT;
request->retries = 0;
ata_queue_request(request);
if (request->status & ATA_S_ERROR)
@ -487,7 +487,7 @@ ad_set_geometry(device_t dev)
request->u.ata.count = 1;
request->u.ata.feature = 0;
request->flags = ATA_R_CONTROL;
request->timeout = 10;
request->timeout = ATA_REQUEST_TIMEOUT;
request->retries = 0;
ata_queue_request(request);
if (request->status & ATA_S_ERROR)

6
sys/dev/ata/ata-queue.c
View File

@ -141,9 +141,9 @@ ata_controlcmd(device_t dev, u_int8_t command, u_int16_t feature,
if (atadev->spindown_state) {
device_printf(dev, "request while spun down, starting.\n");
atadev->spindown_state = 0;
request->timeout = 31;
request->timeout = MAX(ATA_REQUEST_TIMEOUT, 31);
} else {
request->timeout = 10;
request->timeout = ATA_REQUEST_TIMEOUT;
}
request->retries = 0;
ata_queue_request(request);
@ -397,7 +397,7 @@ ata_completed(void *context, int dummy)
request->bytecount = sizeof(struct atapi_sense);
request->donecount = 0;
request->transfersize = sizeof(struct atapi_sense);
request->timeout = 10;
request->timeout = ATA_REQUEST_TIMEOUT;
request->flags &= (ATA_R_ATAPI | ATA_R_QUIET | ATA_R_DEBUG);
request->flags |= (ATA_R_READ | ATA_R_AT_HEAD | ATA_R_REQUEUE);
ATA_DEBUG_RQ(request, "autoissue request sense");

6
sys/dev/ata/ata-raid.c
View File

@ -273,7 +273,7 @@ ata_raid_flush(struct bio *bp)
request->u.ata.lba = 0;
request->u.ata.count = 0;
request->u.ata.feature = 0;
request->timeout = 10;
request->timeout = ATA_REQUEST_TIMEOUT;
request->retries = 0;
request->flags |= ATA_R_ORDERED | ATA_R_DIRECT;
ata_queue_request(request);
@ -4371,7 +4371,7 @@ ata_raid_init_request(device_t dev, struct ar_softc *rdp, struct bio *bio)
return NULL;
}
request->dev = dev;
request->timeout = 10;
request->timeout = ATA_REQUEST_TIMEOUT;
request->retries = 2;
request->callback = ata_raid_done;
request->driver = rdp;
@ -4445,7 +4445,7 @@ ata_raid_rw(device_t dev, u_int64_t lba, void *data, u_int bcount, int flags)
/* setup request */
request->dev = dev;
request->timeout = 10;
request->timeout = ATA_REQUEST_TIMEOUT;
request->retries = 0;
request->data = data;
request->bytecount = bcount;

2
sys/dev/ata/atapi-cd.c
View File

@ -700,7 +700,7 @@ acd_geom_access(struct g_provider *pp, int dr, int dw, int de)
request->dev = dev;
bcopy(ccb, request->u.atapi.ccb, 16);
request->flags = ATA_R_ATAPI;
request->timeout = 10;
request->timeout = ATA_REQUEST_TIMEOUT;
ata_queue_request(request);
if (!request->error &&
(request->u.atapi.sense.key == 2 ||