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

Commit d614aec4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 

* 'for-2.6.31' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (29 commits)
  ide: re-implement ide_pci_init_one() on top of ide_pci_init_two()
  ide: unexport ide_find_dma_mode()
  ide: fix PowerMac bootup oops
  ide: skip probe if there are no devices on the port (v2)
  sl82c105: add printk() logging facility
  ide-tape: fix proc warning
  ide: add IDE_DFLAG_NIEN_QUIRK device flag
  ide: respect quirk_drives[] list on all controllers
  hpt366: enable all quirks for devices on quirk_drives[] list
  hpt366: sync quirk_drives[] list with pdc202xx_{new,old}.c
  ide: remove superfluous SELECT_MASK() call from do_rw_taskfile()
  ide: remove superfluous SELECT_MASK() call from ide_driveid_update()
  icside: remove superfluous ->maskproc method
  ide-tape: fix IDE_AFLAG_* atomic accesses
  ide-tape: change IDE_AFLAG_IGNORE_DSC non-atomically
  pdc202xx_old: kill resetproc() method
  pdc202xx_old: don't call pdc202xx_reset() on IRQ timeout
  pdc202xx_old: use ide_dma_test_irq()
  ide: preserve Host Protected Area by default (v2)
  ide-gd: implement block device ->set_capacity method (v2)
  ...
parents db8e7f10 ad7c52d0

Documentation/ide/ide.txt

+2 −0
Original line number Diff line number Diff line
@@ -216,6 +216,8 @@ Other kernel parameters for ide_core are: 


* "noflush=[interface_number.device_number]" to disable flush requests



* "nohpa=[interface_number.device_number]" to disable Host Protected Area



* "noprobe=[interface_number.device_number]" to skip probing



* "nowerr=[interface_number.device_number]" to ignore the WRERR_STAT bit

Documentation/kernel-parameters.txt

+2 −5
Original line number Diff line number Diff line
@@ -887,11 +887,8 @@ and is between 256 and 4096 characters. It is defined in the file 


	ide-core.nodma=	[HW] (E)IDE subsystem

			Format: =0.0 to prevent dma on hda, =0.1 hdb =1.0 hdc

			.vlb_clock .pci_clock .noflush .noprobe .nowerr .cdrom

			.chs .ignore_cable are additional options

			See Documentation/ide/ide.txt.



	idebus=		[HW] (E)IDE subsystem - VLB/PCI bus speed

			.vlb_clock .pci_clock .noflush .nohpa .noprobe .nowerr

			.cdrom .chs .ignore_cable are additional options

			See Documentation/ide/ide.txt.



	ide-pci-generic.all-generic-ide [HW] (E)IDE subsystem

drivers/ide/at91_ide.c

+3 −4
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ static const struct ide_port_info at91_ide_port_info __initdata = { 
	.host_flags 	= IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA | IDE_HFLAG_SINGLE |

			  IDE_HFLAG_NO_IO_32BIT | IDE_HFLAG_UNMASK_IRQS,

	.pio_mask 	= ATA_PIO6,

	.chipset	= ide_generic,

};



/*
@@ -246,8 +247,7 @@ irqreturn_t at91_irq_handler(int irq, void *dev_id) 
static int __init at91_ide_probe(struct platform_device *pdev)

{

	int ret;

	hw_regs_t hw;

	hw_regs_t *hws[] = { &hw, NULL, NULL, NULL };

	struct ide_hw hw, *hws[] = { &hw };

	struct ide_host *host;

	struct resource *res;

	unsigned long tf_base = 0, ctl_base = 0;
@@ -304,10 +304,9 @@ static int __init at91_ide_probe(struct platform_device *pdev) 
		ide_std_init_ports(&hw, tf_base, ctl_base + 6);



	hw.irq = board->irq_pin;

	hw.chipset = ide_generic;

	hw.dev = &pdev->dev;



	host = ide_host_alloc(&at91_ide_port_info, hws);

	host = ide_host_alloc(&at91_ide_port_info, hws, 1);

	if (!host) {

		perr("failed to allocate ide host\n");

		return -ENOMEM;

drivers/ide/au1xxx-ide.c

+4 −4
Original line number Diff line number Diff line
@@ -449,7 +449,7 @@ static int auide_ddma_init(ide_hwif_t *hwif, const struct ide_port_info *d) 
}

#endif



static void auide_setup_ports(hw_regs_t *hw, _auide_hwif *ahwif)

static void auide_setup_ports(struct ide_hw *hw, _auide_hwif *ahwif)

{

	int i;

	unsigned long *ata_regs = hw->io_ports_array;
@@ -499,6 +499,7 @@ static const struct ide_port_info au1xxx_port_info = { 
#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA

	.mwdma_mask		= ATA_MWDMA2,

#endif

	.chipset		= ide_au1xxx,

};



static int au_ide_probe(struct platform_device *dev)
@@ -507,7 +508,7 @@ static int au_ide_probe(struct platform_device *dev) 
	struct resource *res;

	struct ide_host *host;

	int ret = 0;

	hw_regs_t hw, *hws[] = { &hw, NULL, NULL, NULL };

	struct ide_hw hw, *hws[] = { &hw };



#if defined(CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA)

	char *mode = "MWDMA2";
@@ -548,9 +549,8 @@ static int au_ide_probe(struct platform_device *dev) 
	auide_setup_ports(&hw, ahwif);

	hw.irq = ahwif->irq;

	hw.dev = &dev->dev;

	hw.chipset = ide_au1xxx;



	ret = ide_host_add(&au1xxx_port_info, hws, &host);

	ret = ide_host_add(&au1xxx_port_info, hws, 1, &host);

	if (ret)

		goto out;

drivers/ide/buddha.c

+4 −5
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static int xsurf_ack_intr(ide_hwif_t *hwif) 
    return 1;

}



static void __init buddha_setup_ports(hw_regs_t *hw, unsigned long base,

static void __init buddha_setup_ports(struct ide_hw *hw, unsigned long base,

				      unsigned long ctl, unsigned long irq_port,

				      ide_ack_intr_t *ack_intr)

{
@@ -139,13 +139,12 @@ static void __init buddha_setup_ports(hw_regs_t *hw, unsigned long base, 


	hw->irq = IRQ_AMIGA_PORTS;

	hw->ack_intr = ack_intr;



	hw->chipset = ide_generic;

}



static const struct ide_port_info buddha_port_info = {

	.host_flags		= IDE_HFLAG_MMIO | IDE_HFLAG_NO_DMA,

	.irq_flags		= IRQF_SHARED,

	.chipset		= ide_generic,

};



    /*
@@ -161,7 +160,7 @@ static int __init buddha_init(void) 


	while ((z = zorro_find_device(ZORRO_WILDCARD, z))) {

		unsigned long board;

		hw_regs_t hw[MAX_NUM_HWIFS], *hws[] = { NULL, NULL, NULL, NULL };

		struct ide_hw hw[MAX_NUM_HWIFS], *hws[MAX_NUM_HWIFS];



		if (z->id == ZORRO_PROD_INDIVIDUAL_COMPUTERS_BUDDHA) {

			buddha_num_hwifs = BUDDHA_NUM_HWIFS;
@@ -225,7 +224,7 @@ fail_base2: 
			hws[i] = &hw[i];

		}



		ide_host_add(&buddha_port_info, hws, NULL);

		ide_host_add(&buddha_port_info, hws, i, NULL);

	}



	return 0;