ide: fix resume for CONFIG_BLK_DEV_IDEACPI=y
commit 2f0d0fd2a6
("ide-acpi: cleanup
do_drive_get_GTF()") didn't account for the lack of hwif->acpidata
check in generic_ide_suspend() [ indirect user of do_drive_get_GTF()
through ide_acpi_exec_tfs() ] resulting in broken resume when ACPI
support is enabled but ACPI data is unavailable.
Fix it by adding ide_port_acpi() helper for checking if port needs
ACPI handling and cleaning generic_ide_{suspend,resume}() to use it
instead of hiding hwif->acpidata and ide_noacpi checks in IDE ACPI
helpers (this should help in preventing similar bugs in the future).
While at it:
- kill superfluous debugging printks in ide_acpi_{get,push}_timing()
Reported-and-tested-by: Etienne Basset <etienne.basset@numericable.fr>
Also-reported-and-tested-by: Jeff Chua <jeff.chua.linux@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
9c72ebef5a
commit
2bf427b25b
|
@ -92,6 +92,11 @@ int ide_acpi_init(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool ide_port_acpi(ide_hwif_t *hwif)
|
||||||
|
{
|
||||||
|
return ide_noacpi == 0 && hwif->acpidata;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ide_get_dev_handle - finds acpi_handle and PCI device.function
|
* ide_get_dev_handle - finds acpi_handle and PCI device.function
|
||||||
* @dev: device to locate
|
* @dev: device to locate
|
||||||
|
@ -352,9 +357,6 @@ int ide_acpi_exec_tfs(ide_drive_t *drive)
|
||||||
unsigned long gtf_address;
|
unsigned long gtf_address;
|
||||||
unsigned long obj_loc;
|
unsigned long obj_loc;
|
||||||
|
|
||||||
if (ide_noacpi)
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
DEBPRINT("call get_GTF, drive=%s port=%d\n", drive->name, drive->dn);
|
DEBPRINT("call get_GTF, drive=%s port=%d\n", drive->name, drive->dn);
|
||||||
|
|
||||||
ret = do_drive_get_GTF(drive, >f_length, >f_address, &obj_loc);
|
ret = do_drive_get_GTF(drive, >f_length, >f_address, &obj_loc);
|
||||||
|
@ -389,16 +391,6 @@ void ide_acpi_get_timing(ide_hwif_t *hwif)
|
||||||
struct acpi_buffer output;
|
struct acpi_buffer output;
|
||||||
union acpi_object *out_obj;
|
union acpi_object *out_obj;
|
||||||
|
|
||||||
if (ide_noacpi)
|
|
||||||
return;
|
|
||||||
|
|
||||||
DEBPRINT("ENTER:\n");
|
|
||||||
|
|
||||||
if (!hwif->acpidata) {
|
|
||||||
DEBPRINT("no ACPI data for %s\n", hwif->name);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Setting up output buffer for _GTM */
|
/* Setting up output buffer for _GTM */
|
||||||
output.length = ACPI_ALLOCATE_BUFFER;
|
output.length = ACPI_ALLOCATE_BUFFER;
|
||||||
output.pointer = NULL; /* ACPI-CA sets this; save/free it later */
|
output.pointer = NULL; /* ACPI-CA sets this; save/free it later */
|
||||||
|
@ -479,16 +471,6 @@ void ide_acpi_push_timing(ide_hwif_t *hwif)
|
||||||
struct ide_acpi_drive_link *master = &hwif->acpidata->master;
|
struct ide_acpi_drive_link *master = &hwif->acpidata->master;
|
||||||
struct ide_acpi_drive_link *slave = &hwif->acpidata->slave;
|
struct ide_acpi_drive_link *slave = &hwif->acpidata->slave;
|
||||||
|
|
||||||
if (ide_noacpi)
|
|
||||||
return;
|
|
||||||
|
|
||||||
DEBPRINT("ENTER:\n");
|
|
||||||
|
|
||||||
if (!hwif->acpidata) {
|
|
||||||
DEBPRINT("no ACPI data for %s\n", hwif->name);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Give the GTM buffer + drive Identify data to the channel via the
|
/* Give the GTM buffer + drive Identify data to the channel via the
|
||||||
* _STM method: */
|
* _STM method: */
|
||||||
/* setup input parameters buffer for _STM */
|
/* setup input parameters buffer for _STM */
|
||||||
|
@ -527,16 +509,11 @@ void ide_acpi_set_state(ide_hwif_t *hwif, int on)
|
||||||
ide_drive_t *drive;
|
ide_drive_t *drive;
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
if (ide_noacpi || ide_noacpi_psx)
|
if (ide_noacpi_psx)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
DEBPRINT("ENTER:\n");
|
DEBPRINT("ENTER:\n");
|
||||||
|
|
||||||
if (!hwif->acpidata) {
|
|
||||||
DEBPRINT("no ACPI data for %s\n", hwif->name);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* channel first and then drives for power on and verse versa for power off */
|
/* channel first and then drives for power on and verse versa for power off */
|
||||||
if (on)
|
if (on)
|
||||||
acpi_bus_set_power(hwif->acpidata->obj_handle, ACPI_STATE_D0);
|
acpi_bus_set_power(hwif->acpidata->obj_handle, ACPI_STATE_D0);
|
||||||
|
@ -616,7 +593,7 @@ void ide_acpi_port_init_devices(ide_hwif_t *hwif)
|
||||||
drive->name, err);
|
drive->name, err);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!ide_acpionboot) {
|
if (ide_noacpi || ide_acpionboot == 0) {
|
||||||
DEBPRINT("ACPI methods disabled on boot\n");
|
DEBPRINT("ACPI methods disabled on boot\n");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,9 +10,11 @@ int generic_ide_suspend(struct device *dev, pm_message_t mesg)
|
||||||
struct request_pm_state rqpm;
|
struct request_pm_state rqpm;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
/* call ACPI _GTM only once */
|
if (ide_port_acpi(hwif)) {
|
||||||
if ((drive->dn & 1) == 0 || pair == NULL)
|
/* call ACPI _GTM only once */
|
||||||
ide_acpi_get_timing(hwif);
|
if ((drive->dn & 1) == 0 || pair == NULL)
|
||||||
|
ide_acpi_get_timing(hwif);
|
||||||
|
}
|
||||||
|
|
||||||
memset(&rqpm, 0, sizeof(rqpm));
|
memset(&rqpm, 0, sizeof(rqpm));
|
||||||
rq = blk_get_request(drive->queue, READ, __GFP_WAIT);
|
rq = blk_get_request(drive->queue, READ, __GFP_WAIT);
|
||||||
|
@ -26,9 +28,11 @@ int generic_ide_suspend(struct device *dev, pm_message_t mesg)
|
||||||
ret = blk_execute_rq(drive->queue, NULL, rq, 0);
|
ret = blk_execute_rq(drive->queue, NULL, rq, 0);
|
||||||
blk_put_request(rq);
|
blk_put_request(rq);
|
||||||
|
|
||||||
/* call ACPI _PS3 only after both devices are suspended */
|
if (ret == 0 && ide_port_acpi(hwif)) {
|
||||||
if (ret == 0 && ((drive->dn & 1) || pair == NULL))
|
/* call ACPI _PS3 only after both devices are suspended */
|
||||||
ide_acpi_set_state(hwif, 0);
|
if ((drive->dn & 1) || pair == NULL)
|
||||||
|
ide_acpi_set_state(hwif, 0);
|
||||||
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -42,13 +46,15 @@ int generic_ide_resume(struct device *dev)
|
||||||
struct request_pm_state rqpm;
|
struct request_pm_state rqpm;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
/* call ACPI _PS0 / _STM only once */
|
if (ide_port_acpi(hwif)) {
|
||||||
if ((drive->dn & 1) == 0 || pair == NULL) {
|
/* call ACPI _PS0 / _STM only once */
|
||||||
ide_acpi_set_state(hwif, 1);
|
if ((drive->dn & 1) == 0 || pair == NULL) {
|
||||||
ide_acpi_push_timing(hwif);
|
ide_acpi_set_state(hwif, 1);
|
||||||
}
|
ide_acpi_push_timing(hwif);
|
||||||
|
}
|
||||||
|
|
||||||
ide_acpi_exec_tfs(drive);
|
ide_acpi_exec_tfs(drive);
|
||||||
|
}
|
||||||
|
|
||||||
memset(&rqpm, 0, sizeof(rqpm));
|
memset(&rqpm, 0, sizeof(rqpm));
|
||||||
rq = blk_get_request(drive->queue, READ, __GFP_WAIT);
|
rq = blk_get_request(drive->queue, READ, __GFP_WAIT);
|
||||||
|
|
|
@ -1419,6 +1419,7 @@ static inline void ide_dma_unmap_sg(ide_drive_t *drive,
|
||||||
|
|
||||||
#ifdef CONFIG_BLK_DEV_IDEACPI
|
#ifdef CONFIG_BLK_DEV_IDEACPI
|
||||||
int ide_acpi_init(void);
|
int ide_acpi_init(void);
|
||||||
|
bool ide_port_acpi(ide_hwif_t *hwif);
|
||||||
extern int ide_acpi_exec_tfs(ide_drive_t *drive);
|
extern int ide_acpi_exec_tfs(ide_drive_t *drive);
|
||||||
extern void ide_acpi_get_timing(ide_hwif_t *hwif);
|
extern void ide_acpi_get_timing(ide_hwif_t *hwif);
|
||||||
extern void ide_acpi_push_timing(ide_hwif_t *hwif);
|
extern void ide_acpi_push_timing(ide_hwif_t *hwif);
|
||||||
|
@ -1427,6 +1428,7 @@ void ide_acpi_port_init_devices(ide_hwif_t *);
|
||||||
extern void ide_acpi_set_state(ide_hwif_t *hwif, int on);
|
extern void ide_acpi_set_state(ide_hwif_t *hwif, int on);
|
||||||
#else
|
#else
|
||||||
static inline int ide_acpi_init(void) { return 0; }
|
static inline int ide_acpi_init(void) { return 0; }
|
||||||
|
static inline bool ide_port_acpi(ide_hwif_t *hwif) { return 0; }
|
||||||
static inline int ide_acpi_exec_tfs(ide_drive_t *drive) { return 0; }
|
static inline int ide_acpi_exec_tfs(ide_drive_t *drive) { return 0; }
|
||||||
static inline void ide_acpi_get_timing(ide_hwif_t *hwif) { ; }
|
static inline void ide_acpi_get_timing(ide_hwif_t *hwif) { ; }
|
||||||
static inline void ide_acpi_push_timing(ide_hwif_t *hwif) { ; }
|
static inline void ide_acpi_push_timing(ide_hwif_t *hwif) { ; }
|
||||||
|
|
Loading…
Reference in New Issue