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

Commit 3985ee3b authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add IDE_HFLAG_LEGACY_IRQS host flag 



Add IDE_HFLAG_LEGACY_IRQS host flag to tell ide_pci_setup_ports() to set
hwif->irq to legacy IRQ 14/15 (iff hwif->irq is not already set) and convert
atiixp, piix, serverworks, sis5513 and slc90e66 host drivers to use it.

While at it:

* In piix.c add IDE_HFLAGS_PIIX define and don't use ->init_hwif for MPIIX.

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

drivers/ide/pci/atiixp.c

+3 −5
Original line number Diff line number Diff line
@@ -172,9 +172,6 @@ static void __devinit init_hwif_atiixp(ide_hwif_t *hwif) 
	u8 ch = hwif->channel;

	struct pci_dev *pdev = hwif->pci_dev;



	if (!hwif->irq)

		hwif->irq = ch ? 15 : 14;



	hwif->set_pio_mode = &atiixp_set_pio_mode;

	hwif->set_dma_mode = &atiixp_set_dma_mode;

	hwif->drives[0].autotune = 1;
@@ -200,7 +197,7 @@ static ide_pci_device_t atiixp_pci_info[] __devinitdata = { 
		.name		= "ATIIXP",

		.init_hwif	= init_hwif_atiixp,

		.enablebits	= {{0x48,0x01,0x00}, {0x48,0x08,0x00}},

		.host_flags	= IDE_HFLAG_BOOTABLE,

		.host_flags	= IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,
@@ -208,7 +205,8 @@ static ide_pci_device_t atiixp_pci_info[] __devinitdata = { 
		.name		= "SB600_PATA",

		.init_hwif	= init_hwif_atiixp,

		.enablebits	= {{0x48,0x01,0x00}, {0x00,0x00,0x00}},

 		.host_flags	= IDE_HFLAG_SINGLE | IDE_HFLAG_BOOTABLE,

 		.host_flags	= IDE_HFLAG_SINGLE | IDE_HFLAG_LEGACY_IRQS |

				  IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,

drivers/ide/pci/piix.c

+10 −14
Original line number Diff line number Diff line
@@ -341,16 +341,6 @@ static u8 __devinit piix_cable_detect(ide_hwif_t *hwif) 


static void __devinit init_hwif_piix(ide_hwif_t *hwif)

{

#ifndef CONFIG_IA64

	if (!hwif->irq)

		hwif->irq = hwif->channel ? 15 : 14;

#endif /* CONFIG_IA64 */



	if (hwif->pci_dev->device == PCI_DEVICE_ID_INTEL_82371MX) {

		/* This is a painful system best to let it self tune for now */

		return;

	}



	hwif->set_pio_mode = &piix_set_pio_mode;

	hwif->set_dma_mode = &piix_set_dma_mode;
@@ -378,12 +368,18 @@ static void __devinit init_hwif_ich(ide_hwif_t *hwif) 
		hwif->ide_dma_clear_irq = &piix_dma_clear_irq;

}



#ifndef CONFIG_IA64

 #define IDE_HFLAGS_PIIX (IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE)

#else

 #define IDE_HFLAGS_PIIX IDE_HFLAG_BOOTABLE

#endif



#define DECLARE_PIIX_DEV(name_str, udma) \

	{						\

		.name		= name_str,		\

		.init_hwif	= init_hwif_piix,	\

		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, \

		.host_flags	= IDE_HFLAG_BOOTABLE,	\

		.host_flags	= IDE_HFLAGS_PIIX,	\

		.pio_mask	= ATA_PIO4,		\

		.swdma_mask	= ATA_SWDMA2_ONLY,	\

		.mwdma_mask	= ATA_MWDMA12_ONLY,	\
@@ -396,7 +392,7 @@ static void __devinit init_hwif_ich(ide_hwif_t *hwif) 
		.init_chipset	= init_chipset_ich, \

		.init_hwif	= init_hwif_ich, \

		.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}}, \

		.host_flags	= IDE_HFLAG_BOOTABLE, \

		.host_flags	= IDE_HFLAGS_PIIX, \

		.pio_mask	= ATA_PIO4, \

		.swdma_mask	= ATA_SWDMA2_ONLY, \

		.mwdma_mask	= ATA_MWDMA12_ONLY, \
@@ -414,11 +410,11 @@ static ide_pci_device_t piix_pci_info[] __devinitdata = { 
		 * of the bit 14 of the IDETIM register at offset 0x6c

		 */

		.name		= "MPIIX",

		.init_hwif	= init_hwif_piix,

		.enablebits	= {{0x6d,0xc0,0x80}, {0x6d,0xc0,0xc0}},

		.host_flags	= IDE_HFLAG_ISA_PORTS | IDE_HFLAG_NO_DMA |

				  IDE_HFLAG_BOOTABLE,

				  IDE_HFLAGS_PIIX,

		.pio_mask	= ATA_PIO4,

		/* This is a painful system best to let it self tune for now */

	},



	/*  3 */ DECLARE_PIIX_DEV("PIIX3",	0x00),	/* no udma */

drivers/ide/pci/serverworks.c

+7 −8
Original line number Diff line number Diff line
@@ -360,9 +360,6 @@ static u8 __devinit ata66_svwks(ide_hwif_t *hwif) 


static void __devinit init_hwif_svwks (ide_hwif_t *hwif)

{

	if (!hwif->irq)

		hwif->irq = hwif->channel ? 15 : 14;



	hwif->set_pio_mode = &svwks_set_pio_mode;

	hwif->set_dma_mode = &svwks_set_dma_mode;

	hwif->udma_filter = &svwks_udma_filter;
@@ -384,7 +381,7 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = { 
		.name		= "SvrWks OSB4",

		.init_chipset	= init_chipset_svwks,

		.init_hwif	= init_hwif_svwks,

		.host_flags	= IDE_HFLAG_BOOTABLE,

		.host_flags	= IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= 0x00, /* UDMA is problematic on OSB4 */
@@ -392,7 +389,7 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = { 
		.name		= "SvrWks CSB5",

		.init_chipset	= init_chipset_svwks,

		.init_hwif	= init_hwif_svwks,

		.host_flags	= IDE_HFLAG_BOOTABLE,

		.host_flags	= IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,
@@ -400,7 +397,7 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = { 
		.name		= "SvrWks CSB6",

		.init_chipset	= init_chipset_svwks,

		.init_hwif	= init_hwif_svwks,

		.host_flags	= IDE_HFLAG_BOOTABLE,

		.host_flags	= IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,
@@ -408,7 +405,8 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = { 
		.name		= "SvrWks CSB6",

		.init_chipset	= init_chipset_svwks,

		.init_hwif	= init_hwif_svwks,

		.host_flags	= IDE_HFLAG_SINGLE | IDE_HFLAG_BOOTABLE,

		.host_flags	= IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_SINGLE |

				  IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,
@@ -416,7 +414,8 @@ static ide_pci_device_t serverworks_chipsets[] __devinitdata = { 
		.name		= "SvrWks HT1000",

		.init_chipset	= init_chipset_svwks,

		.init_hwif	= init_hwif_svwks,

		.host_flags	= IDE_HFLAG_SINGLE | IDE_HFLAG_BOOTABLE,

		.host_flags	= IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_SINGLE |

				  IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO4,

		.mwdma_mask	= ATA_MWDMA2,

		.udma_mask	= ATA_UDMA5,

drivers/ide/pci/sis5513.c

+2 −4
Original line number Diff line number Diff line
@@ -564,9 +564,6 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif) 
{

	u8 udma_rates[] = { 0x00, 0x00, 0x07, 0x1f, 0x3f, 0x3f, 0x7f, 0x7f };



	if (!hwif->irq)

		hwif->irq = hwif->channel ? 15 : 14;



	hwif->set_pio_mode = &sis_set_pio_mode;

	hwif->set_dma_mode = &sis_set_dma_mode;
@@ -590,7 +587,8 @@ static ide_pci_device_t sis5513_chipset __devinitdata = { 
	.init_chipset	= init_chipset_sis5513,

	.init_hwif	= init_hwif_sis5513,

	.enablebits	= {{0x4a,0x02,0x02}, {0x4a,0x04,0x04}},

	.host_flags	= IDE_HFLAG_NO_AUTODMA | IDE_HFLAG_BOOTABLE,

	.host_flags	= IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_NO_AUTODMA |

			  IDE_HFLAG_BOOTABLE,

	.pio_mask	= ATA_PIO4,

	.mwdma_mask	= ATA_MWDMA2,

};

drivers/ide/pci/slc90e66.c

+1 −4
Original line number Diff line number Diff line
@@ -133,9 +133,6 @@ static void __devinit init_hwif_slc90e66 (ide_hwif_t *hwif) 
	u8 reg47 = 0;

	u8 mask = hwif->channel ? 0x01 : 0x02;  /* bit0:Primary */



	if (!hwif->irq)

		hwif->irq = hwif->channel ? 15 : 14;



	hwif->set_pio_mode = &slc90e66_set_pio_mode;

	hwif->set_dma_mode = &slc90e66_set_dma_mode;
@@ -156,7 +153,7 @@ static ide_pci_device_t slc90e66_chipset __devinitdata = { 
	.name		= "SLC90E66",

	.init_hwif	= init_hwif_slc90e66,

	.enablebits	= {{0x41,0x80,0x80}, {0x43,0x80,0x80}},

	.host_flags	= IDE_HFLAG_BOOTABLE,

	.host_flags	= IDE_HFLAG_LEGACY_IRQS | IDE_HFLAG_BOOTABLE,

	.pio_mask	= ATA_PIO4,

	.swdma_mask	= ATA_SWDMA2_ONLY,

	.mwdma_mask	= ATA_MWDMA12_ONLY,