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

Commit 20b0f65d 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: make legacy IDE VLB modules check for the "probe" kernel params (v2)
  ide: remove some obsoleted kernel params (v2)
  ide/pci/delkin_cb.c: pci_module_init to pci_register_driver
  scc_pata: bugfix for checking DMA IRQ status
  ide: remove a ton of pointless #undef REALLY_SLOW_IO
  siimage: DRAC4 note
  adjust legacy IDE resource setting (v2)
  ide: fix pmac breakage
  ide-cs: Update device table
  ide: ide_get_best_pio_mode() returns incorrect IORDY setting (take 2)
  piix/slc90e66: more tuneproc() fixing (take 2)
  ide: fix drive side 80c cable check, take 2
  cmd64x: fix PIO mode setup (take 3)
  alim15x3: fix PIO mode setup
parents 70077f2f 84913882

Documentation/ide.txt

+12 −17
Original line number Diff line number Diff line
@@ -233,6 +233,8 @@ Summary of ide driver parameters for kernel command line 
 "hdx=remap63"		: remap the drive: add 63 to all sector numbers

			  (for DM OnTrack)



 "idex=noautotune"	: driver will NOT attempt to tune interface speed



 "hdx=autotune"		: driver will attempt to tune interface speed

			  to the fastest PIO mode supported,

			  if possible for this drive only.
@@ -268,17 +270,6 @@ Summary of ide driver parameters for kernel command line 


 "idex=base,ctl,irq"	: specify base, ctl, and irq number



 "idex=autotune"	: driver will attempt to tune interface speed

			  to the fastest PIO mode supported,

			  for all drives on this interface.

			  Not fully supported by all chipset types,

			  and quite likely to cause trouble with

			  older/odd IDE drives.



 "idex=noautotune"	: driver will NOT attempt to tune interface speed 

			  This is the default for most chipsets,

			  except the cmd640.



 "idex=serialize"	: do not overlap operations on idex. Please note

			  that you will have to specify this option for

			  both the respective primary and secondary channel
@@ -303,13 +294,8 @@ The following are valid ONLY on ide0, which usually corresponds 
to the first ATA interface found on the particular host, and the defaults for

the base,ctl ports must not be altered.



 "ide0=dtc2278"		: probe/support DTC2278 interface

 "ide0=ht6560b"		: probe/support HT6560B interface

 "ide0=cmd640_vlb"	: *REQUIRED* for VLB cards with the CMD640 chip

			  (not for PCI -- automatically detected)

 "ide0=qd65xx"		: probe/support qd65xx interface

 "ide0=ali14xx"		: probe/support ali14xx chipsets (ALI M1439/M1443/M1445)

 "ide0=umc8672"		: probe/support umc8672 chipsets



 "ide=doubler"		: probe/support IDE doublers on Amiga
@@ -317,6 +303,15 @@ There may be more options than shown -- use the source, Luke! 


Everything else is rejected with a "BAD OPTION" message.



For legacy IDE VLB host drivers (ali14xx/dtc2278/ht6560b/qd65xx/umc8672)

you need to explicitly enable probing by using "probe" kernel parameter,

i.e. to enable probing for ALI M14xx chipsets (ali14xx host driver) use:



* "ali14xx.probe" boot option when ali14xx driver is built-in the kernel



* "probe" module parameter when ali14xx driver is compiled as module

  ("modprobe ali14xx probe")



================================================================================



IDE ATAPI streaming tape driver

drivers/ide/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -1023,7 +1023,7 @@ config BLK_DEV_4DRIVES 
config BLK_DEV_ALI14XX

	tristate "ALI M14xx support"

	help

	  This driver is enabled at runtime using the "ide0=ali14xx" kernel

	  This driver is enabled at runtime using the "ali14xx.probe" kernel

	  boot parameter.  It enables support for the secondary IDE interface

	  of the ALI M1439/1443/1445/1487/1489 chipsets, and permits faster

	  I/O speeds to be set as well.  See the files
@@ -1033,7 +1033,7 @@ config BLK_DEV_ALI14XX 
config BLK_DEV_DTC2278

	tristate "DTC-2278 support"

	help

	  This driver is enabled at runtime using the "ide0=dtc2278" kernel

	  This driver is enabled at runtime using the "dtc2278.probe" kernel

	  boot parameter. It enables support for the secondary IDE interface

	  of the DTC-2278 card, and permits faster I/O speeds to be set as

	  well. See the <file:Documentation/ide.txt> and
@@ -1042,7 +1042,7 @@ config BLK_DEV_DTC2278 
config BLK_DEV_HT6560B

	tristate "Holtek HT6560B support"

	help

	  This driver is enabled at runtime using the "ide0=ht6560b" kernel

	  This driver is enabled at runtime using the "ht6560b.probe" kernel

	  boot parameter. It enables support for the secondary IDE interface

	  of the Holtek card, and permits faster I/O speeds to be set as well.

	  See the <file:Documentation/ide.txt> and
@@ -1051,7 +1051,7 @@ config BLK_DEV_HT6560B 
config BLK_DEV_QD65XX

	tristate "QDI QD65xx support"

	help

	  This driver is enabled at runtime using the "ide0=qd65xx" kernel

	  This driver is enabled at runtime using the "qd65xx.probe" kernel

	  boot parameter.  It permits faster I/O speeds to be set.  See the

	  <file:Documentation/ide.txt> and <file:drivers/ide/legacy/qd65xx.c> for

	  more info.
@@ -1059,7 +1059,7 @@ config BLK_DEV_QD65XX 
config BLK_DEV_UMC8672

	tristate "UMC-8672 support"

	help

	  This driver is enabled at runtime using the "ide0=umc8672" kernel

	  This driver is enabled at runtime using the "umc8672.probe" kernel

	  boot parameter. It enables support for the secondary IDE interface

	  of the UMC-8672, and permits faster I/O speeds to be set as well.

	  See the files <file:Documentation/ide.txt> and

drivers/ide/cris/ide-cris.c

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 
 * device can't do DMA handshaking for some stupid reason. We don't need to do that.

 */



#undef REALLY_SLOW_IO           /* most systems can safely undef this */



#include <linux/types.h>

#include <linux/kernel.h>

#include <linux/timer.h>

drivers/ide/ide-disk.c

+0 −2
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ 


#define IDEDISK_VERSION	"1.18"



#undef REALLY_SLOW_IO		/* most systems can safely undef this */



//#define DEBUG



#include <linux/module.h>

drivers/ide/ide-iops.c

+2 −0
Original line number Diff line number Diff line
@@ -583,6 +583,8 @@ u8 eighty_ninty_three (ide_drive_t *drive) 
	if(!(drive->id->hw_config & 0x4000))

		return 0;

#endif /* CONFIG_IDEDMA_IVB */

	if (!(drive->id->hw_config & 0x2000))

		return 0;

	return 1;

}