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

Commit 7cab14a7 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: add IDE_HFLAG_BOOTABLE host flag 



Add IDE_HFLAG_BOOTABLE host flag and IDE_HFLAG_OFF_BOARD define.  Convert
all host drivers using ide_pci_device_t to use IDE_HFLAG_{BOOTABLE,OFF_BOARD}
instead of d->bootable and then remove no longer needed d->bootable.

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 33c1002e

drivers/ide/pci/aec62xx.c

+4 −9
Original line number Diff line number Diff line
@@ -246,8 +246,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { 
		.init_hwif	= init_hwif_aec62xx,

		.autodma	= AUTODMA,

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

		.bootable	= OFF_BOARD,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= 0x07, /* udma0-2 */

	},{	/* 1 */
@@ -256,8 +255,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { 
		.init_chipset	= init_chipset_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

		.autodma	= NOAUTODMA,

		.bootable	= OFF_BOARD,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= 0x1f, /* udma0-4 */

	},{	/* 2 */
@@ -267,7 +265,6 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { 
		.init_hwif	= init_hwif_aec62xx,

		.autodma	= AUTODMA,

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

		.bootable	= NEVER_BOARD,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= 0x1f, /* udma0-4 */
@@ -277,8 +274,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { 
		.init_chipset	= init_chipset_aec62xx,

		.init_hwif	= init_hwif_aec62xx,

		.autodma	= AUTODMA,

		.bootable	= OFF_BOARD,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= 0x3f, /* udma0-5 */

	},{	/* 4 */
@@ -288,8 +284,7 @@ static ide_pci_device_t aec62xx_chipsets[] __devinitdata = { 
		.init_hwif	= init_hwif_aec62xx,

		.autodma	= AUTODMA,

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

		.bootable	= OFF_BOARD,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA,

		.host_flags	= IDE_HFLAG_NO_ATAPI_DMA | IDE_HFLAG_OFF_BOARD,

		.pio_mask	= ATA_PIO4,

		.udma_mask	= 0x3f, /* udma0-5 */

	}

drivers/ide/pci/alim15x3.c

+1 −1
Original line number Diff line number Diff line
@@ -777,7 +777,7 @@ static ide_pci_device_t ali15x3_chipset __devinitdata = { 
	.init_hwif	= init_hwif_ali15x3,

	.init_dma	= init_dma_ali15x3,

	.autodma	= AUTODMA,

	.bootable	= ON_BOARD,

	.host_flags	= IDE_HFLAG_BOOTABLE,

	.pio_mask	= ATA_PIO5,

};

drivers/ide/pci/amd74xx.c

+8 −8
Original line number Diff line number Diff line
@@ -280,10 +280,10 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) 
		.init_hwif	= init_hwif_amd74xx,			\

		.autodma	= AUTODMA,				\

		.enablebits	= {{0x40,0x02,0x02}, {0x40,0x01,0x01}},	\

		.bootable	= ON_BOARD,				\

		.host_flags	= IDE_HFLAG_PIO_NO_BLACKLIST		\

				| IDE_HFLAG_PIO_NO_DOWNGRADE		\

				| IDE_HFLAG_POST_SET_MODE,		\

		.host_flags	= IDE_HFLAG_PIO_NO_BLACKLIST |		\

				  IDE_HFLAG_PIO_NO_DOWNGRADE |		\

				  IDE_HFLAG_POST_SET_MODE |		\

				  IDE_HFLAG_BOOTABLE,			\

		.pio_mask	= ATA_PIO5,				\

	}
@@ -294,10 +294,10 @@ static void __devinit init_hwif_amd74xx(ide_hwif_t *hwif) 
		.init_hwif	= init_hwif_amd74xx,			\

		.autodma	= AUTODMA,				\

		.enablebits	= {{0x50,0x02,0x02}, {0x50,0x01,0x01}},	\

		.bootable	= ON_BOARD,				\

		.host_flags	= IDE_HFLAG_PIO_NO_BLACKLIST		\

				| IDE_HFLAG_PIO_NO_DOWNGRADE		\

				| IDE_HFLAG_POST_SET_MODE,		\

		.host_flags	= IDE_HFLAG_PIO_NO_BLACKLIST |		\

				  IDE_HFLAG_PIO_NO_DOWNGRADE |		\

				  IDE_HFLAG_POST_SET_MODE |		\

				  IDE_HFLAG_BOOTABLE,			\

		.pio_mask	= ATA_PIO5,				\

	}

drivers/ide/pci/atiixp.c

+2 −3
Original line number Diff line number Diff line
@@ -204,15 +204,14 @@ static ide_pci_device_t atiixp_pci_info[] __devinitdata = { 
		.init_hwif	= init_hwif_atiixp,

		.autodma	= AUTODMA,

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

		.bootable	= ON_BOARD,

		.host_flags	= IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO4,

	},{	/* 1 */

		.name		= "SB600_PATA",

		.init_hwif	= init_hwif_atiixp,

		.autodma	= AUTODMA,

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

 		.bootable	= ON_BOARD,

 		.host_flags	= IDE_HFLAG_SINGLE,

 		.host_flags	= IDE_HFLAG_SINGLE | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO4,

 	},

};

drivers/ide/pci/cmd64x.c

+4 −8
Original line number Diff line number Diff line
@@ -585,8 +585,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 
		.init_hwif	= init_hwif_cmd64x,

		.autodma	= AUTODMA,

		.enablebits	= {{0x00,0x00,0x00}, {0x51,0x08,0x08}},

		.bootable	= ON_BOARD,

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH,

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO5,

		.udma_mask	= 0x00, /* no udma */

	},{	/* 1 */
@@ -596,8 +595,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 
		.init_hwif	= init_hwif_cmd64x,

		.autodma	= AUTODMA,

		.enablebits	= {{0x51,0x04,0x04}, {0x51,0x08,0x08}},

		.bootable	= ON_BOARD,

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH,

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO5,

		.udma_mask	= 0x07, /* udma0-2 */

	},{	/* 2 */
@@ -607,8 +605,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 
		.init_hwif	= init_hwif_cmd64x,

		.autodma	= AUTODMA,

		.enablebits	= {{0x51,0x04,0x04}, {0x51,0x08,0x08}},

		.bootable	= ON_BOARD,

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH,

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO5,

		.udma_mask	= 0x1f, /* udma0-4 */

	},{	/* 3 */
@@ -618,8 +615,7 @@ static ide_pci_device_t cmd64x_chipsets[] __devinitdata = { 
		.init_hwif	= init_hwif_cmd64x,

		.autodma	= AUTODMA,

		.enablebits	= {{0x51,0x04,0x04}, {0x51,0x08,0x08}},

		.bootable	= ON_BOARD,

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH,

		.host_flags	= IDE_HFLAG_ABUSE_PREFETCH | IDE_HFLAG_BOOTABLE,

		.pio_mask	= ATA_PIO5,

		.udma_mask	= 0x3f, /* udma0-5 */

	}