Signed-off-by: Andrew Morton --- drivers/ide/ide-disk.c | 8 ++++---- drivers/ide/ide-probe.c | 3 ++- drivers/ide/ide.c | 1 - drivers/ide/pci/alim15x3.c | 3 ++- drivers/ide/pci/trm290.c | 4 ++-- include/linux/ide.h | 6 ++++-- 6 files changed, 14 insertions(+), 11 deletions(-) diff -puN drivers/ide/ide-disk.c~ide-ide-add-ide-hflag-no-lba48-and-ide-hflag-no-lba48-dma drivers/ide/ide-disk.c --- a/drivers/ide/ide-disk.c~ide-ide-add-ide-hflag-no-lba48-and-ide-hflag-no-lba48-dma +++ a/drivers/ide/ide-disk.c @@ -169,7 +169,7 @@ static ide_startstop_t __ide_do_rw_disk( nsectors.all = (u16) rq->nr_sectors; - if (hwif->no_lba48_dma && lba48 && dma) { + if ((hwif->host_flags & IDE_HFLAG_NO_LBA48_DMA) && lba48 && dma) { if (block + rq->nr_sectors > 1ULL << 28) dma = 0; else @@ -885,7 +885,7 @@ static int set_lba_addressing(ide_drive_ drive->addressing = 0; - if (HWIF(drive)->no_lba48) + if (drive->hwif->host_flags & IDE_HFLAG_NO_LBA48) return 0; if (!idedisk_supports_lba48(drive->id)) @@ -918,6 +918,7 @@ static inline void idedisk_add_settings( static void idedisk_setup (ide_drive_t *drive) { + ide_hwif_t *hwif = drive->hwif; struct hd_driveid *id = drive->id; unsigned long long capacity; @@ -938,7 +939,6 @@ static void idedisk_setup (ide_drive_t * (void)set_lba_addressing(drive, 1); if (drive->addressing == 1) { - ide_hwif_t *hwif = HWIF(drive); int max_s = 2048; if (max_s > hwif->rqsize) @@ -961,7 +961,7 @@ static void idedisk_setup (ide_drive_t * drive->capacity64 = 1ULL << 28; } - if (drive->hwif->no_lba48_dma && drive->addressing) { + if ((hwif->host_flags & IDE_HFLAG_NO_LBA48_DMA) && drive->addressing) { if (drive->capacity64 > 1ULL << 28) { printk(KERN_INFO "%s: cannot use LBA48 DMA - PIO mode will" " be used for accessing sectors > %u\n", diff -puN drivers/ide/ide-probe.c~ide-ide-add-ide-hflag-no-lba48-and-ide-hflag-no-lba48-dma drivers/ide/ide-probe.c --- a/drivers/ide/ide-probe.c~ide-ide-add-ide-hflag-no-lba48-and-ide-hflag-no-lba48-dma +++ a/drivers/ide/ide-probe.c @@ -951,7 +951,8 @@ static int ide_init_queue(ide_drive_t *d blk_queue_segment_boundary(q, 0xffff); if (!hwif->rqsize) { - if (hwif->no_lba48 || hwif->no_lba48_dma) + if ((hwif->host_flags & IDE_HFLAG_NO_LBA48) || + (hwif->host_flags & IDE_HFLAG_NO_LBA48_DMA)) hwif->rqsize = 256; else hwif->rqsize = 65536; diff -puN drivers/ide/ide.c~ide-ide-add-ide-hflag-no-lba48-and-ide-hflag-no-lba48-dma drivers/ide/ide.c --- a/drivers/ide/ide.c~ide-ide-add-ide-hflag-no-lba48-and-ide-hflag-no-lba48-dma +++ a/drivers/ide/ide.c @@ -439,7 +439,6 @@ static void ide_hwif_restore(ide_hwif_t hwif->mmio = tmp_hwif->mmio; hwif->rqsize = tmp_hwif->rqsize; - hwif->no_lba48 = tmp_hwif->no_lba48; #ifndef CONFIG_BLK_DEV_IDECS hwif->irq = tmp_hwif->irq; diff -puN drivers/ide/pci/alim15x3.c~ide-ide-add-ide-hflag-no-lba48-and-ide-hflag-no-lba48-dma drivers/ide/pci/alim15x3.c --- a/drivers/ide/pci/alim15x3.c~ide-ide-add-ide-hflag-no-lba48-and-ide-hflag-no-lba48-dma +++ a/drivers/ide/pci/alim15x3.c @@ -665,7 +665,8 @@ static void __devinit init_hwif_common_a hwif->udma_filter = &ali_udma_filter; /* don't use LBA48 DMA on ALi devices before rev 0xC5 */ - hwif->no_lba48_dma = (m5229_revision <= 0xC4) ? 1 : 0; + if (m5229_revision <= 0xC4) + hwif->host_flags |= IDE_HFLAG_NO_LBA48_DMA; if (!hwif->dma_base) { hwif->drives[0].autotune = 1; diff -puN drivers/ide/pci/trm290.c~ide-ide-add-ide-hflag-no-lba48-and-ide-hflag-no-lba48-dma drivers/ide/pci/trm290.c --- a/drivers/ide/pci/trm290.c~ide-ide-add-ide-hflag-no-lba48-and-ide-hflag-no-lba48-dma +++ a/drivers/ide/pci/trm290.c @@ -250,7 +250,6 @@ static void __devinit init_hwif_trm290(i u8 reg = 0; struct pci_dev *dev = hwif->pci_dev; - hwif->no_lba48 = 1; hwif->chipset = ide_trm290; cfgbase = pci_resource_start(dev, 4); if ((dev->class & 5) && cfgbase) { @@ -329,7 +328,8 @@ static ide_pci_device_t trm290_chipset _ IDE_HFLAG_TRUST_BIOS_FOR_DMA | #endif IDE_HFLAG_NO_AUTODMA | - IDE_HFLAG_BOOTABLE, + IDE_HFLAG_BOOTABLE | + IDE_HFLAG_NO_LBA48, }; static int __devinit trm290_init_one(struct pci_dev *dev, const struct pci_device_id *id) diff -puN include/linux/ide.h~ide-ide-add-ide-hflag-no-lba48-and-ide-hflag-no-lba48-dma include/linux/ide.h --- a/include/linux/ide.h~ide-ide-add-ide-hflag-no-lba48-and-ide-hflag-no-lba48-dma +++ a/include/linux/ide.h @@ -796,8 +796,6 @@ typedef struct hwif_s { unsigned serialized : 1; /* serialized all channel operation */ unsigned sharing_irq: 1; /* 1 = sharing irq with another hwif */ unsigned reset : 1; /* reset after probe */ - unsigned no_lba48 : 1; /* 1 = cannot do LBA48 */ - unsigned no_lba48_dma : 1; /* 1 = cannot do LBA48 DMA */ unsigned auto_poll : 1; /* supports nop auto-poll */ unsigned sg_mapped : 1; /* sg_table and sg_nents are ready */ unsigned no_io_32bit : 1; /* 1 = can not do 32-bit IO ops */ @@ -1259,6 +1257,10 @@ enum { IDE_HFLAG_NO_AUTODMA = (1 << 15), /* host is CS5510/CS5520 */ IDE_HFLAG_CS5520 = (1 << 16), + /* no LBA48 */ + IDE_HFLAG_NO_LBA48 = (1 << 17), + /* no LBA48 DMA */ + IDE_HFLAG_NO_LBA48_DMA = (1 << 18), }; #ifdef CONFIG_BLK_DEV_OFFBOARD _