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

Commit 4166c199 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add IDE_HFLAG_NO_DSC host flag 



* Add IDE_HFLAG_NO_DSC host flag for hosts that doesn't support DSC overlap.

* Set it in aec62xx (for ATP850UF only) and hpt34x host drivers.

* Convert ide-tape device driver to check for IDE_HFLAG_NO_DSC flag.

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 8ac2b42a

drivers/ide/ide-tape.c

+4 −12
Original line number Diff line number Diff line
@@ -4532,19 +4532,11 @@ static void idetape_setup (ide_drive_t *drive, idetape_tape_t *tape, int minor) 


	spin_lock_init(&tape->spinlock);

	drive->dsc_overlap = 1;

#ifdef CONFIG_BLK_DEV_IDEPCI

	if (HWIF(drive)->pci_dev != NULL) {

		/*

		 * These two ide-pci host adapters appear to need DSC overlap disabled.

		 * This probably needs further analysis.

		 */

		if ((HWIF(drive)->pci_dev->device == PCI_DEVICE_ID_ARTOP_ATP850UF) ||

		    (HWIF(drive)->pci_dev->device == PCI_DEVICE_ID_TTI_HPT343)) {

			printk(KERN_INFO "ide-tape: %s: disabling DSC overlap\n", tape->name);

	if (drive->hwif->host_flags & IDE_HFLAG_NO_DSC) {

		printk(KERN_INFO "ide-tape: %s: disabling DSC overlap\n",

				 tape->name);

		drive->dsc_overlap = 0;

	}

	}

#endif /* CONFIG_BLK_DEV_IDEPCI */

	/* Seagate Travan drives do not support DSC overlap. */

	if (strstr(drive->id->model, "Seagate STT3401"))

		drive->dsc_overlap = 0;

drivers/ide/pci/aec62xx.c

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ static const struct ide_port_info aec62xx_chipsets[] __devinitdata = { 
		.enablebits	= {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},

		.host_flags	= IDE_HFLAG_SERIALIZE |

				  IDE_HFLAG_NO_ATAPI_DMA |

				  IDE_HFLAG_NO_DSC |

				  IDE_HFLAG_ABUSE_SET_DMA_MODE |

				  IDE_HFLAG_OFF_BOARD,

		.pio_mask	= ATA_PIO4,

drivers/ide/pci/hpt34x.c

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ static void __devinit init_hwif_hpt34x(ide_hwif_t *hwif) 


#define IDE_HFLAGS_HPT34X \

	(IDE_HFLAG_NO_ATAPI_DMA | \

	 IDE_HFLAG_NO_DSC | \

	 IDE_HFLAG_ABUSE_SET_DMA_MODE | \

	 IDE_HFLAG_NO_AUTODMA)

include/linux/ide.h

+2 −0
Original line number Diff line number Diff line
@@ -1095,6 +1095,8 @@ enum { 
	IDE_HFLAG_CY82C693		= (1 << 27),

	/* force host out of "simplex" mode */

	IDE_HFLAG_CLEAR_SIMPLEX		= (1 << 28),

	/* DSC overlap is unsupported */

	IDE_HFLAG_NO_DSC		= (1 << 29),

};



#ifdef CONFIG_BLK_DEV_OFFBOARD