The patch titled
ide: HPA resume fix
has been added to the -mm tree. Its filename is
ide-hpa-resume-fix.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: ide: HPA resume fix
From: Lee Trager <Lee@xxxxxxxxxxxxxxxxxxxx>
Fix a problem with computers that have HPA on their hard drive and not
being able to come out of resume from RAM or disk.
Signed-off-by: Lee Trager <Lee@xxxxxxxxxxxxxxxxxxxx>
Acked-by: Alan Cox <alan@xxxxxxxxxx>
Cc: Jens Axboe <axboe@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/ide/ide-disk.c | 12 ++++++++++++
drivers/ide/ide.c | 9 ++++++++-
include/linux/ide.h | 1 +
3 files changed, 21 insertions(+), 1 deletion(-)
diff -puN drivers/ide/ide-disk.c~ide-hpa-resume-fix drivers/ide/ide-disk.c
--- a/drivers/ide/ide-disk.c~ide-hpa-resume-fix
+++ a/drivers/ide/ide-disk.c
@@ -1024,6 +1024,17 @@ static void ide_disk_release(struct kref
static int ide_disk_probe(ide_drive_t *drive);
+/*
+ * On HPA drives the capacity needs to be
+ * reinitilized on resume otherwise the disk
+ * can not be used and a hard reset is required
+ */
+static void ide_disk_resume(ide_drive_t *drive)
+{
+ if (idedisk_supports_hpa(drive->id))
+ init_idedisk_capacity(drive);
+}
+
static void ide_device_shutdown(ide_drive_t *drive)
{
#ifdef CONFIG_ALPHA
@@ -1067,6 +1078,7 @@ static ide_driver_t idedisk_driver = {
.error = __ide_error,
.abort = __ide_abort,
.proc = idedisk_proc,
+ .resume = ide_disk_resume,
};
static int idedisk_open(struct inode *inode, struct file *filp)
diff -puN drivers/ide/ide.c~ide-hpa-resume-fix drivers/ide/ide.c
--- a/drivers/ide/ide.c~ide-hpa-resume-fix
+++ a/drivers/ide/ide.c
@@ -1229,9 +1229,11 @@ static int generic_ide_suspend(struct de
static int generic_ide_resume(struct device *dev)
{
ide_drive_t *drive = dev->driver_data;
+ ide_driver_t *drv = to_ide_driver(dev->driver);
struct request rq;
struct request_pm_state rqpm;
ide_task_t args;
+ int err;
memset(&rq, 0, sizeof(rq));
memset(&rqpm, 0, sizeof(rqpm));
@@ -1242,7 +1244,12 @@ static int generic_ide_resume(struct dev
rqpm.pm_step = ide_pm_state_start_resume;
rqpm.pm_state = PM_EVENT_ON;
- return ide_do_drive_cmd(drive, &rq, ide_head_wait);
+ err = ide_do_drive_cmd(drive, &rq, ide_head_wait);
+
+ if (err == 0 && drv->resume)
+ drv->resume(drive);
+
+ return err;
}
int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device *bdev,
diff -puN include/linux/ide.h~ide-hpa-resume-fix include/linux/ide.h
--- a/include/linux/ide.h~ide-hpa-resume-fix
+++ a/include/linux/ide.h
@@ -987,6 +987,7 @@ typedef struct ide_driver_s {
int (*probe)(ide_drive_t *);
void (*remove)(ide_drive_t *);
void (*shutdown)(ide_drive_t *);
+ void (*resume)(ide_drive_t *);
} ide_driver_t;
#define to_ide_driver(drv) container_of(drv, ide_driver_t, gen_driver)
_
Patches currently in -mm which might be from Lee@xxxxxxxxxxxxxxxxxxxx are
ide-hpa-resume-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
