Commit 2f8dd850 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:
  ide: remove CONFIG_IDEDMA_{ICS,PCI}_AUTO config options
  ide: don't allow DMA to be enabled if CONFIG_IDEDMA_{ICS,PCI}_AUTO=n
  scc_pata: dependency fix
  jmicron: make ide jmicron driver play nice with libata ones
  ide: remove static prototypes from include/asm-mips/mach-au1x00/au1xxx_ide.h
  ide: au1xxx: fix use of mixed declarations and code
  cmd64x: fix recovery time calculation (take 3)
parents 360afb03 120b9cfd

drivers/ide/Kconfig

+8 −40
Original line number Diff line number Diff line
@@ -434,24 +434,8 @@ config BLK_DEV_IDEDMA_FORCED 


	  Generally say N here.



config IDEDMA_PCI_AUTO

	bool "Use PCI DMA by default when available"

	---help---

	  Prior to kernel version 2.1.112, Linux used to automatically use

	  DMA for IDE drives and chipsets which support it. Due to concerns

	  about a couple of cases where buggy hardware may have caused damage,

	  the default is now to NOT use DMA automatically. To revert to the

	  previous behaviour, say Y to this question.



	  If you suspect your hardware is at all flakey, say N here.

	  Do NOT email the IDE kernel people regarding this issue!



	  It is normally safe to answer Y to this question unless your

	  motherboard uses a VIA VP2 chipset, in which case you should say N.



config IDEDMA_ONLYDISK

	bool "Enable DMA only for disks "

	depends on IDEDMA_PCI_AUTO

	help

	  This is used if you know your ATAPI Devices are going to fail DMA

	  Transfers.
@@ -769,6 +753,14 @@ config BLK_DEV_TC86C001 
	help

	This driver adds support for Toshiba TC86C001 GOKU-S chip.



config BLK_DEV_CELLEB

	tristate "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.



endif



config BLK_DEV_IDE_PMAC
@@ -800,14 +792,6 @@ 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 && IDE=y

	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
@@ -851,19 +835,6 @@ config BLK_DEV_IDEDMA_ICS 
	  Say Y here if you want to add DMA (Direct Memory Access) support to

	  the ICS IDE driver.



config IDEDMA_ICS_AUTO

	bool "Use ICS DMA by default"

	depends on BLK_DEV_IDEDMA_ICS

	help

	  Prior to kernel version 2.1.112, Linux used to automatically use

	  DMA for IDE drives and chipsets which support it. Due to concerns

	  about a couple of cases where buggy hardware may have caused damage,

	  the default is now to NOT use DMA automatically. To revert to the

	  previous behaviour, say Y to this question.



	  If you suspect your hardware is at all flakey, say N here.

	  Do NOT email the IDE kernel people regarding this issue!



config BLK_DEV_IDE_RAPIDE

	tristate "RapIDE interface support"

	depends on ARM && ARCH_ACORN
@@ -1086,9 +1057,6 @@ config IDEDMA_IVB 


	  It is normally safe to answer Y; however, the default is N.



config IDEDMA_AUTO

	def_bool IDEDMA_PCI_AUTO || IDEDMA_ICS_AUTO



endif



config BLK_DEV_HD_ONLY

drivers/ide/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 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

+1 −12
Original line number Diff line number Diff line
@@ -196,11 +196,6 @@ static void icside_maskproc(ide_drive_t *drive, int mask) 
}



#ifdef CONFIG_BLK_DEV_IDEDMA_ICS



#ifndef CONFIG_IDEDMA_ICS_AUTO

#warning CONFIG_IDEDMA_ICS_AUTO=n support is obsolete, and will be removed soon.

#endif



/*

 * SG-DMA support.

 *
@@ -474,12 +469,6 @@ static int icside_dma_lostirq(ide_drive_t *drive) 


static void icside_dma_init(ide_hwif_t *hwif)

{

	int autodma = 0;



#ifdef CONFIG_IDEDMA_ICS_AUTO

	autodma = 1;

#endif



	printk("    %s: SG-DMA", hwif->name);



	hwif->atapi_dma		= 1;
@@ -489,7 +478,7 @@ static void icside_dma_init(ide_hwif_t *hwif) 
	hwif->dmatable_cpu	= NULL;

	hwif->dmatable_dma	= 0;

	hwif->speedproc		= icside_set_speed;

	hwif->autodma		= autodma;

	hwif->autodma		= 1;



	hwif->ide_dma_check	= icside_dma_check;

	hwif->dma_host_off	= icside_dma_host_off;

drivers/ide/ide-dma.c

+1 −1
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ int ide_set_dma(ide_drive_t *drive) 
	switch(rc) {

	case -1: /* DMA needs to be disabled */

		hwif->dma_off_quietly(drive);

		return 0;

		return -1;

	case  0: /* DMA needs to be enabled */

		return hwif->ide_dma_on(drive);

	case  1: /* DMA setting cannot be changed */

drivers/ide/ide.c

+0 −4
Original line number Diff line number Diff line
@@ -177,11 +177,7 @@ DECLARE_MUTEX(ide_cfg_sem); 
static int ide_scan_direction; /* THIS was formerly 2.2.x pci=reverse */

#endif



#ifdef CONFIG_IDEDMA_AUTO

int noautodma = 0;

#else

int noautodma = 1;

#endif



EXPORT_SYMBOL(noautodma);

CRA Git | Maintained and supported by SUSTech CRA and CCSE