From: Lee Trager <Lee@PicturesInMotion.net>
To: B.Zolnierkiewicz@elka.pw.edu.pl
Cc: linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org
Subject: [PATCH] HPA resume fix
Date: Tue, 29 Aug 2006 05:55:18 -0400 [thread overview]
Message-ID: <44F40F06.4010408@PicturesInMotion.net> (raw)
This patch fixes a problem with computers that have HPA on their hard
drive and not being able to come out of resume from RAM or disk. This is
my first patch to the kernel and third time submitting it, hopefully I
got it right this time.
Signed-off-by: Lee Trager <Lee@PicturesInMotion.net>
---
diff -uprN -X linux-2.6.18-rc5/Documentation/dontdiff linux-2.6.18-rc5-old/drivers/ide/ide-disk.c linux-2.6.18-rc5/drivers/ide/ide-disk.c
--- linux-2.6.18-rc5-old/drivers/ide/ide-disk.c 2006-08-29 05:14:43.000000000 -0400
+++ linux-2.6.18-rc5/drivers/ide/ide-disk.c 2006-08-29 05:18:13.000000000 -0400
@@ -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 -uprN -X linux-2.6.18-rc5/Documentation/dontdiff linux-2.6.18-rc5-old/drivers/ide/ide.c linux-2.6.18-rc5/drivers/ide/ide.c
--- linux-2.6.18-rc5-old/drivers/ide/ide.c 2006-08-29 05:14:43.000000000 -0400
+++ linux-2.6.18-rc5/drivers/ide/ide.c 2006-08-29 05:18:13.000000000 -0400
@@ -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 -uprN -X linux-2.6.18-rc5/Documentation/dontdiff linux-2.6.18-rc5-old/include/linux/ide.h linux-2.6.18-rc5/include/linux/ide.h
--- linux-2.6.18-rc5-old/include/linux/ide.h 2006-08-29 05:15:53.000000000 -0400
+++ linux-2.6.18-rc5/include/linux/ide.h 2006-08-29 05:18:13.000000000 -0400
@@ -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)
next reply other threads:[~2006-08-29 9:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-29 9:55 Lee Trager [this message]
2006-08-29 11:11 ` [PATCH] HPA resume fix Alan Cox
2006-08-29 11:42 ` Jens Axboe
2006-08-29 12:50 ` Alan Cox
2006-08-29 12:32 ` Jens Axboe
2006-08-30 8:55 ` Lee Trager
2006-08-30 8:59 ` Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44F40F06.4010408@PicturesInMotion.net \
--to=lee@picturesinmotion.net \
--cc=B.Zolnierkiewicz@elka.pw.edu.pl \
--cc=linux-ide@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).