Attachment 63523 Details for Bug 143285

[patch] Better patch for SL10

ide-disk-resume-hack-sl10 (text/plain), 2.48 KB, created by Jens Axboe on 2006-01-17 08:20:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jens Axboe

Created: 2006-01-17 08:20:39 UTC

Size: 2.48 KB

patch

obsolete

>--- linux-2.6.13-SL100_BRANCH/drivers/ide/ide-io.c~	2006-01-17 08:38:16.000000000 +0100
>+++ linux-2.6.13-SL100_BRANCH/drivers/ide/ide-io.c	2006-01-17 09:21:48.000000000 +0100
>@@ -140,6 +140,7 @@
> 	idedisk_pm_standby,
> 
> 	idedisk_pm_idle		= ide_pm_state_start_resume,
>+	idedisk_pm_restore_hpa,
> 	ide_pm_restore_dma,
> };
> 
>@@ -159,6 +160,9 @@
> 		rq->pm->pm_step = ide_pm_state_completed;
> 		break;
> 	case idedisk_pm_idle:		/* Resume step 1 (idle) complete */
>+		rq->pm->pm_step = idedisk_pm_restore_hpa;
>+		break;
>+	case idedisk_pm_restore_hpa:	/* Resume step 2 (hpa) complete */
> 		rq->pm->pm_step = ide_pm_restore_dma;
> 		break;
> 	}
>@@ -171,7 +175,7 @@
> 	memset(args, 0, sizeof(*args));
> 
> 	if (drive->media != ide_disk) {
>-		/* skip idedisk_pm_idle for ATAPI devices */
>+		/* skip idedisk_pm_idle and restore_hpa for ATAPI devices */
> 		if (rq->pm->pm_step == idedisk_pm_idle)
> 			rq->pm->pm_step = ide_pm_restore_dma;
> 	}
>@@ -205,6 +209,17 @@
> 		args->handler = task_no_data_intr;
> 		return do_rw_taskfile(drive, args);
> 
>+	case idedisk_pm_restore_hpa: {
>+		struct device *dev = &drive->gendev;
>+		ide_driver_t *drv = container_of(dev->driver, ide_driver_t, gen_driver);
>+		printk("%s: hpa resume step %p\n", drive->name, drv->resume);
>+
>+		if (drv->resume)
>+			drv->resume(drive);
>+
>+		return ide_stopped;
>+	}
>+
> 	case ide_pm_restore_dma:	/* Resume step 2 (restore DMA) */
> 		/*
> 		 * Right now, all we do is call hwif->ide_dma_check(drive),
>--- linux-2.6.13-SL100_BRANCH/drivers/ide/ide-disk.c~	2006-01-17 08:38:50.000000000 +0100
>+++ linux-2.6.13-SL100_BRANCH/drivers/ide/ide-disk.c	2006-01-17 08:39:09.000000000 +0100
>@@ -555,6 +555,15 @@
> 	return drive->capacity64 - drive->sect0;
> }
> 
>+/*
>+ * hack to check if HPA is the reason for the disk access problems after resume
>+ */
>+static int idedisk_resume(ide_drive_t *drive)
>+{
>+	idedisk_check_hpa(drive);
>+	return 0;
>+}
>+
> #ifdef CONFIG_PROC_FS
> 
> static int smart_enable(ide_drive_t *drive)
>@@ -1105,6 +1114,7 @@
> 	.error			= __ide_error,
> 	.abort			= __ide_abort,
> 	.proc			= idedisk_proc,
>+	.resume			= idedisk_resume,
> };
> 
> static int idedisk_open(struct inode *inode, struct file *filp)
>--- linux-2.6.13-SL100_BRANCH/include/linux/ide.h~	2006-01-16 14:18:44.000000000 +0100
>+++ linux-2.6.13-SL100_BRANCH/include/linux/ide.h	2006-01-16 14:19:18.000000000 +0100
>@@ -1100,6 +1100,7 @@
> 	ide_proc_entry_t	*proc;
> 	void		(*ata_prebuilder)(ide_drive_t *);
> 	void		(*atapi_prebuilder)(ide_drive_t *);
>+	int		(*resume)(ide_drive_t *);
> 	struct device_driver	gen_driver;
> } ide_driver_t;
>

Actions: View | Diff

Attachments on bug 143285: 63356 | 63357 | 63372 | 63421 | 63427 | 63430 | 63523