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

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

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

* master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6: (30 commits)
  ide: make ide_hwif_t.ide_dma_host_on void (v2)
  ide: make ide_hwif_t.ide_dma_{host_off,off_quietly} void (v2)
  ide: add ide_set_dma() helper (v2)
  sgiioc4: fix sgiioc4_ide_dma_check() to enable/disable DMA properly
  ide: disable DMA in ->ide_dma_check for "no IORDY" case (v2)
  ide: convert ide_hwif_t.mmio into flag (v2)
  ide: use PIO/MMIO operations directly where possible (v2)
  ide: add ide_use_fast_pio() helper (v3)
  ide: unexport ide_set_xfer_rate() (v2)
  ide: remove ide_drive_t.usage
  ide: remove ide_pci_device_t tables with only one entry
  ide: remove write-only ide_hwif_t.no_dsc flag
  ide: remove write-only ide_pio_data_t.blacklisted
  sis5513: sis5513_config_xfer_rate() cleanup
  piix: cleanup
  svwks: small cleanup
  cs5530: small cleanup
  hpt366: remove redundant check from init_dma_hpt366()
  trm290: remove redundant CONFIG_BLK_DEV_IDEDMA #ifdef-s
  au1xxx-ide: remove dead code
  ...
parents 976fd0e2 ccf35289

drivers/ide/Kconfig

+8 −0
Original line number Diff line number Diff line
@@ -797,6 +797,14 @@ config BLK_DEV_IDEDMA_PMAC 
	  to transfer data to and from memory.  Saying Y is safe and improves

	  performance.



config BLK_DEV_IDE_CELLEB

	bool "Toshiba's Cell Reference Set IDE support"

	depends on PPC_CELLEB

	help

	  This driver provides support for the built-in IDE controller on

	  Toshiba Cell Reference Board.

	  If unsure, say Y.



config BLK_DEV_IDE_SWARM

	tristate "IDE for Sibyte evaluation boards"

	depends on SIBYTE_SB1xxx_SOC

drivers/ide/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ ide-core-$(CONFIG_BLK_DEV_Q40IDE) += legacy/q40ide.o 
# built-in only drivers from ppc/

ide-core-$(CONFIG_BLK_DEV_MPC8xx_IDE)	+= ppc/mpc8xx.o

ide-core-$(CONFIG_BLK_DEV_IDE_PMAC)	+= ppc/pmac.o

ide-core-$(CONFIG_BLK_DEV_IDE_CELLEB)	+= ppc/scc_pata.o



# built-in only drivers from h8300/

ide-core-$(CONFIG_H8300)		+= h8300/ide-h8300.o

drivers/ide/arm/icside.c

+10 −15
Original line number Diff line number Diff line
@@ -307,26 +307,24 @@ static int icside_set_speed(ide_drive_t *drive, u8 xfer_mode) 
	return on;

}



static int icside_dma_host_off(ide_drive_t *drive)

static void icside_dma_host_off(ide_drive_t *drive)

{

	return 0;

}



static int icside_dma_off_quietly(ide_drive_t *drive)

static void icside_dma_off_quietly(ide_drive_t *drive)

{

	drive->using_dma = 0;

	return icside_dma_host_off(drive);

}



static int icside_dma_host_on(ide_drive_t *drive)

static void icside_dma_host_on(ide_drive_t *drive)

{

	return 0;

}



static int icside_dma_on(ide_drive_t *drive)

{

	drive->using_dma = 1;

	return icside_dma_host_on(drive);



	return 0;

}



static int icside_dma_check(ide_drive_t *drive)
@@ -365,10 +363,7 @@ static int icside_dma_check(ide_drive_t *drive) 
out:

	on = icside_set_speed(drive, xfer_mode);



	if (on)

		return icside_dma_on(drive);

	else

		return icside_dma_off_quietly(drive);

	return on ? 0 : -1;

}



static int icside_dma_end(ide_drive_t *drive)
@@ -497,9 +492,9 @@ static void icside_dma_init(ide_hwif_t *hwif) 
	hwif->autodma		= autodma;



	hwif->ide_dma_check	= icside_dma_check;

	hwif->ide_dma_host_off	= icside_dma_host_off;

	hwif->ide_dma_off_quietly = icside_dma_off_quietly;

	hwif->ide_dma_host_on	= icside_dma_host_on;

	hwif->dma_host_off	= icside_dma_host_off;

	hwif->dma_off_quietly	= icside_dma_off_quietly;

	hwif->dma_host_on	= icside_dma_host_on;

	hwif->ide_dma_on	= icside_dma_on;

	hwif->dma_setup		= icside_dma_setup;

	hwif->dma_exec_cmd	= icside_dma_exec_cmd;
@@ -556,7 +551,7 @@ icside_setup(void __iomem *base, struct cardinfo *info, struct expansion_card *e 
		 * Ensure we're using MMIO

		 */

		default_hwif_mmiops(hwif);

		hwif->mmio = 2;

		hwif->mmio = 1;



		for (i = IDE_DATA_OFFSET; i <= IDE_STATUS_OFFSET; i++) {

			hwif->hw.io_ports[i] = port;

drivers/ide/arm/rapide.c

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ rapide_locate_hwif(void __iomem *base, void __iomem *ctrl, unsigned int sz, int 
	hwif->hw.io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;

	hwif->io_ports[IDE_CONTROL_OFFSET] = (unsigned long)ctrl;

	hwif->hw.irq = hwif->irq = irq;

	hwif->mmio = 2;

	hwif->mmio = 1;

	default_hwif_mmiops(hwif);



	return hwif;

drivers/ide/cris/ide-cris.c

+14 −20
Original line number Diff line number Diff line
@@ -682,9 +682,12 @@ static void cris_ide_input_data (ide_drive_t *drive, void *, unsigned int); 
static void cris_ide_output_data (ide_drive_t *drive, void *, unsigned int);

static void cris_atapi_input_bytes(ide_drive_t *drive, void *, unsigned int);

static void cris_atapi_output_bytes(ide_drive_t *drive, void *, unsigned int);

static int cris_dma_off (ide_drive_t *drive);

static int cris_dma_on (ide_drive_t *drive);



static void cris_dma_off(ide_drive_t *drive)

{

}



static void tune_cris_ide(ide_drive_t *drive, u8 pio)

{

	int setup, strobe, hold;
@@ -795,7 +798,7 @@ init_e100_ide (void) 
		                0, 0, cris_ide_ack_intr,

		                ide_default_irq(0));

		ide_register_hw(&hw, &hwif);

		hwif->mmio = 2;

		hwif->mmio = 1;

		hwif->chipset = ide_etrax100;

		hwif->tuneproc = &tune_cris_ide;

		hwif->speedproc = &speed_cris_ide;
@@ -814,13 +817,16 @@ init_e100_ide (void) 
		hwif->OUTBSYNC = &cris_ide_outbsync;

		hwif->INB = &cris_ide_inb;

		hwif->INW = &cris_ide_inw;

		hwif->ide_dma_host_off = &cris_dma_off;

		hwif->ide_dma_host_on = &cris_dma_on;

		hwif->ide_dma_off_quietly = &cris_dma_off;

		hwif->dma_host_off = &cris_dma_off;

		hwif->dma_host_on = &cris_dma_on;

		hwif->dma_off_quietly = &cris_dma_off;

		hwif->udma_four = 0;

		hwif->ultra_mask = cris_ultra_mask;

		hwif->mwdma_mask = 0x07; /* Multiword DMA 0-2 */

		hwif->swdma_mask = 0x07; /* Singleword DMA 0-2 */

		hwif->autodma = 1;

		hwif->drives[0].autodma = 1;

		hwif->drives[1].autodma = 1;

	}



	/* Reset pulse */
@@ -835,11 +841,6 @@ init_e100_ide (void) 
	cris_ide_set_speed(TYPE_UDMA, ATA_UDMA2_CYC, ATA_UDMA2_DVS, 0);

}



static int cris_dma_off (ide_drive_t *drive)

{

	return 0;

}



static int cris_dma_on (ide_drive_t *drive)

{

	return 0;
@@ -1045,17 +1046,10 @@ static ide_startstop_t cris_dma_intr (ide_drive_t *drive) 


static int cris_dma_check(ide_drive_t *drive)

{

	ide_hwif_t *hwif = drive->hwif;

	struct hd_driveid* id = drive->id;



	if (id && (id->capability & 1)) {

		if (ide_use_dma(drive)) {

			if (cris_config_drive_for_dma(drive))

				return hwif->ide_dma_on(drive);

		}

	}

	if (ide_use_dma(drive) && cris_config_drive_for_dma(drive))

		return 0;



	return hwif->ide_dma_off_quietly(drive);

	return -1;

}



static int cris_dma_end(ide_drive_t *drive)