Messages in this thread Patch in this message | | | From | Elias Oltmanns <> | Subject | Re: [PATCH 3/4 v2] ide: Implement disk shock protection support | Date | Sat, 04 Oct 2008 11:44:35 +0200 |
| |
Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> wrote: > On Wednesday 17 September 2008 09:38:37 Elias Oltmanns wrote: >> On user request (through sysfs), the IDLE IMMEDIATE command with UNLOAD > >> FEATURE as specified in ATA-7 is issued to the device and processing of >> the request queue is stopped thereafter until the specified timeout >> expires or user space asks to resume normal operation. This is supposed >> to prevent the heads of a hard drive from accidentally crashing onto the >> platter when a heavy shock is anticipated (like a falling laptop expected >> to hit the floor). Port resets are deferred whenever a device on that >> port is in the parked state. >> >> Signed-off-by: Elias Oltmanns <eo@nebensachen.de> > > applied
Hi Bart,
may I ask you to apply yet another inter-diff? This is in order to address three issues:
1. Make sure that no negative value is being passed to jiffies_to_msecs() in ide_park_show(). 2. Drop the superfluous variable hwif in ide_special_rq(). 3. Skip initialisation of task and tf in ide_special_rq() if we are not handling a (un)park request.
#1 and #3 have been suggested to me by Peter Moulder off-list.
Regards,
Elias
Signed-off-by: Elias Oltmanns <eo@nebensachen.de> --- diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index 09d10a5..1f5948e 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c @@ -672,12 +672,16 @@ EXPORT_SYMBOL_GPL(ide_devset_execute); static ide_startstop_t ide_special_rq(ide_drive_t *drive, struct request *rq) { - ide_hwif_t *hwif = drive->hwif; ide_task_t task; - struct ide_taskfile *tf = &task.tf; + struct ide_taskfile *tf; + u8 cmd = rq->cmd[0]; - memset(&task, 0, sizeof(task)); - switch (rq->cmd[0]) { + if (cmd == REQ_PARK_HEADS || cmd == REQ_UNPARK_HEADS) { + memset(&task, 0, sizeof(task)); + tf = &task.tf; + } + + switch (cmd) { case REQ_PARK_HEADS: drive->sleep = *(unsigned long *)rq->special; drive->dev_flags |= IDE_DFLAG_SLEEPING; @@ -710,9 +714,10 @@ static ide_startstop_t ide_special_rq(ide_drive_t *drive, struct request *rq) ide_end_request(drive, 0, 0); return ide_stopped; } + task.tf_flags |= IDE_TFLAG_TF | IDE_TFLAG_DEVICE; task.rq = rq; - hwif->data_phase = task.data_phase = TASKFILE_NO_DATA; + drive->hwif->data_phase = task.data_phase = TASKFILE_NO_DATA; return do_rw_taskfile(drive, &task); } diff --git a/drivers/ide/ide-park.c b/drivers/ide/ide-park.c index 35fc3ee..02d7e35 100644 --- a/drivers/ide/ide-park.c +++ b/drivers/ide/ide-park.c @@ -61,15 +61,17 @@ ssize_t ide_park_show(struct device *dev, struct device_attribute *attr, char *buf) { ide_drive_t *drive = to_ide_device(dev); + unsigned long now; unsigned int msecs; if (drive->dev_flags & IDE_DFLAG_NO_UNLOAD) return -EOPNOTSUPP; spin_lock_irq(&ide_lock); + now = jiffies; if (drive->dev_flags & IDE_DFLAG_PARKED && - time_after(drive->sleep, jiffies)) - msecs = jiffies_to_msecs(drive->sleep - jiffies); + time_after(drive->sleep, now)) + msecs = jiffies_to_msecs(drive->sleep - now); else msecs = 0; spin_unlock_irq(&ide_lock);
| |