Commit 59e3af21 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6: (41 commits)
  scc_pata: make use of scc_dma_sff_read_status()
  ide-dma-sff: factor out ide_dma_sff_write_status()
  ide: move read_sff_dma_status() method to 'struct ide_dma_ops'
  ide: don't set hwif->dma_ops in init_dma() method
  Resurrect IT8172 IDE controller driver
  piix: sync ich_laptop[] with ata_piix.c
  ide: update warm-plug HOWTO
  ide: fix ide_port_scan() to do ACPI setup after initializing request queues
  ide: remove now redundant ->cur_dev checks
  ide: remove unused ide_hwif_t.sg_mapped field
  ide: struct ide_atapi_pc - remove unused fields and update documentation
  ide: remove superfluous hwif variable assignment from ide_timer_expiry()
  ide: use ide_pci_is_in_compatibility_mode() helper in setup-pci.c
  ide: make "paranoia" ->handler check in ide_intr() more strict
  ide-cd: convert to ide-atapi facilities
  ide-cd: start DMA before sending the actual packet command
  ide-cd: wait for DRQ to get set per default
  ide: Fix drive's DWORD-IO handling
  ide: add port and host iterators
  ide: dynamic allocation of device structures
  ...
parents f59abb16 c2ce5ca0

Documentation/ide/warm-plug-howto.txt

+5 −0
Original line number Diff line number Diff line
@@ -11,3 +11,8 @@ unplug old device(s) and plug new device(s) 
# echo -n "1" > /sys/class/ide_port/idex/scan



done



NOTE: please make sure that partitions are unmounted and that there are

no other active references to devices before doing "delete_devices" step,

also do not attempt "scan" step on devices currently in use -- otherwise

results may be unpredictable and lead to data loss if you're unlucky

drivers/ide/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -511,6 +511,13 @@ config BLK_DEV_PIIX 
	  This allows the kernel to change PIO, DMA and UDMA speeds and to

	  configure the chip to optimum performance.



config BLK_DEV_IT8172

	tristate "IT8172 IDE support"

	select BLK_DEV_IDEDMA_PCI

	help

	  This driver adds support for the IDE controller on the

	  IT8172 System Controller.



config BLK_DEV_IT8213

	tristate "IT8213 IDE support"

	select BLK_DEV_IDEDMA_PCI

drivers/ide/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ obj-$(CONFIG_BLK_DEV_SC1200) += sc1200.o 
obj-$(CONFIG_BLK_DEV_CY82C693)		+= cy82c693.o

obj-$(CONFIG_BLK_DEV_DELKIN)		+= delkin_cb.o

obj-$(CONFIG_BLK_DEV_HPT366)		+= hpt366.o

obj-$(CONFIG_BLK_DEV_IT8172)		+= it8172.o

obj-$(CONFIG_BLK_DEV_IT8213)		+= it8213.o

obj-$(CONFIG_BLK_DEV_IT821X)		+= it821x.o

obj-$(CONFIG_BLK_DEV_JMICRON)		+= jmicron.o

drivers/ide/aec62xx.c

+2 −2
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ static u8 pci_bus_clock_list_ultra (u8 speed, struct chipset_bus_clock_list_entr 


static void aec6210_set_mode(ide_drive_t *drive, const u8 speed)

{

	ide_hwif_t *hwif	= HWIF(drive);

	ide_hwif_t *hwif	= drive->hwif;

	struct pci_dev *dev	= to_pci_dev(hwif->dev);

	struct ide_host *host	= pci_get_drvdata(dev);

	struct chipset_bus_clock_list_entry *bus_clock = host->host_priv;
@@ -111,7 +111,7 @@ static void aec6210_set_mode(ide_drive_t *drive, const u8 speed) 


static void aec6260_set_mode(ide_drive_t *drive, const u8 speed)

{

	ide_hwif_t *hwif	= HWIF(drive);

	ide_hwif_t *hwif	= drive->hwif;

	struct pci_dev *dev	= to_pci_dev(hwif->dev);

	struct ide_host *host	= pci_get_drvdata(dev);

	struct chipset_bus_clock_list_entry *bus_clock = host->host_priv;

drivers/ide/alim15x3.c

+5 −5
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static struct pci_dev *isa_dev; 


static void ali_set_pio_mode(ide_drive_t *drive, const u8 pio)

{

	ide_hwif_t *hwif = HWIF(drive);

	ide_hwif_t *hwif = drive->hwif;

	struct pci_dev *dev = to_pci_dev(hwif->dev);

	struct ide_timing *t = ide_timing_find_mode(XFER_PIO_0 + pio);

	int s_time = t->setup, a_time = t->active, c_time = t->cycle;
@@ -150,7 +150,7 @@ static u8 ali_udma_filter(ide_drive_t *drive) 


static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed)

{

	ide_hwif_t *hwif	= HWIF(drive);

	ide_hwif_t *hwif	= drive->hwif;

	struct pci_dev *dev	= to_pci_dev(hwif->dev);

	u8 speed1		= speed;

	u8 unit			= drive->dn & 1;
@@ -198,7 +198,7 @@ static void ali_set_dma_mode(ide_drive_t *drive, const u8 speed) 
static int ali15x3_dma_setup(ide_drive_t *drive)

{

	if (m5229_revision < 0xC2 && drive->media != ide_disk) {

		if (rq_data_dir(drive->hwif->hwgroup->rq))

		if (rq_data_dir(drive->hwif->rq))

			return 1;	/* try PIO instead of DMA */

	}

	return ide_dma_setup(drive);
@@ -490,8 +490,6 @@ static int __devinit init_dma_ali15x3(ide_hwif_t *hwif, 
	if (ide_allocate_dma_engine(hwif))

		return -1;



	hwif->dma_ops = &sff_dma_ops;



	return 0;

}
@@ -511,6 +509,7 @@ static const struct ide_dma_ops ali_dma_ops = { 
	.dma_test_irq		= ide_dma_test_irq,

	.dma_lost_irq		= ide_dma_lost_irq,

	.dma_timeout		= ide_dma_timeout,

	.dma_sff_read_status	= ide_dma_sff_read_status,

};



static const struct ide_port_info ali15x3_chipset __devinitdata = {
@@ -519,6 +518,7 @@ static const struct ide_port_info ali15x3_chipset __devinitdata = { 
	.init_hwif	= init_hwif_ali15x3,

	.init_dma	= init_dma_ali15x3,

	.port_ops	= &ali_port_ops,

	.dma_ops	= &sff_dma_ops,

	.pio_mask	= ATA_PIO5,

	.swdma_mask	= ATA_SWDMA2,

	.mwdma_mask	= ATA_MWDMA2,

CRA Git | Maintained and supported by SUSTech CRA and CCSE