Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b140b99c authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: change master/slave IDENTIFY order 



Need to probe slave device first to make it release PDIAG-
(this is required for correct device side cable detection).

Based on libata commit f31f0cc2.

Thanks to Craig for testing this patch.

Cc: Craig Block <chblock3@yahoo.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 88b2b32b

drivers/ide/ide-iops.c

+0 −1
Original line number Diff line number Diff line
@@ -613,7 +613,6 @@ u8 eighty_ninty_three (ide_drive_t *drive) 


	/*

	 * FIXME:

	 * - change master/slave IDENTIFY order

	 * - force bit13 (80c cable present) check also for !ivb devices

	 *   (unless the slave device is pre-ATA3)

	 */

drivers/ide/ide-probe.c

+3 −4
Original line number Diff line number Diff line
@@ -719,9 +719,9 @@ EXPORT_SYMBOL_GPL(ide_undecoded_slave); 
 */

static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))

{

	unsigned int unit;

	unsigned long flags;

	unsigned int irqd;

	int unit;



	if (hwif->noprobe)

		return;
@@ -777,10 +777,9 @@ static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif)) 
		printk(KERN_DEBUG "%s: Wait for ready failed before probe !\n", hwif->name);



	/*

	 * Second drive should only exist if first drive was found,

	 * but a lot of cdrom drives are configured as single slaves.

	 * Need to probe slave device first to make it release PDIAG-.

	 */

	for (unit = 0; unit < MAX_DRIVES; ++unit) {

	for (unit = MAX_DRIVES - 1; unit >= 0; unit--) {

		ide_drive_t *drive = &hwif->drives[unit];

		drive->dn = (hwif->channel ? 2 : 0) + unit;

		(void) probe_for_drive(drive);