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

Commit bb3d2dd7 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: Add the MCP73/77 support to PATA driver
  Add the PATA controller device ID to pci_ids.h for MCP73/MCP77.
  hpt366: disallow Ultra133 for HPT374
  ide: generic IDE PCI driver, add another device exception
  ide: HPA detect from resume
  it821x: RAID mode fixes
  serverworks: fix CSB6 tuning logic
  serverworks: remove crappy code
parents d5a169c8 c1183a33

drivers/ide/ide-disk.c

+12 −0
Original line number Diff line number Diff line
@@ -1037,6 +1037,17 @@ static void ide_disk_release(struct kref *kref) 


static int ide_disk_probe(ide_drive_t *drive);



/*

 * On HPA drives the capacity needs to be

 * reinitilized on resume otherwise the disk

 * can not be used and a hard reset is required

 */

static void ide_disk_resume(ide_drive_t *drive)

{

	if (idedisk_supports_hpa(drive->id))

		init_idedisk_capacity(drive);

}



static void ide_device_shutdown(ide_drive_t *drive)

{

#ifdef	CONFIG_ALPHA
@@ -1071,6 +1082,7 @@ static ide_driver_t idedisk_driver = { 
	},

	.probe			= ide_disk_probe,

	.remove			= ide_disk_remove,

	.resume			= ide_disk_resume,

	.shutdown		= ide_device_shutdown,

	.version		= IDEDISK_VERSION,

	.media			= ide_disk,

drivers/ide/ide-probe.c

+6 −6
Original line number Diff line number Diff line
@@ -717,7 +717,7 @@ EXPORT_SYMBOL_GPL(ide_undecoded_slave); 
 * This routine only knows how to look for drive units 0 and 1

 * on an interface, so any setting of MAX_DRIVES > 2 won't work here.

 */

static void probe_hwif(ide_hwif_t *hwif)

static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))

{

	unsigned int unit;

	unsigned long flags;
@@ -820,6 +820,9 @@ static void probe_hwif(ide_hwif_t *hwif) 
		return;

	}



	if (fixup)

		fixup(hwif);



	for (unit = 0; unit < MAX_DRIVES; ++unit) {

		ide_drive_t *drive = &hwif->drives[unit];
@@ -874,10 +877,7 @@ static int hwif_init(ide_hwif_t *hwif); 


int probe_hwif_init_with_fixup(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))

{

	probe_hwif(hwif);



	if (fixup)

		fixup(hwif);

	probe_hwif(hwif, fixup);



	if (!hwif_init(hwif)) {

		printk(KERN_INFO "%s: failed to initialize IDE interface\n",
@@ -1404,7 +1404,7 @@ int ideprobe_init (void) 


	for (index = 0; index < MAX_HWIFS; ++index)

		if (probe[index])

			probe_hwif(&ide_hwifs[index]);

			probe_hwif(&ide_hwifs[index], NULL);

	for (index = 0; index < MAX_HWIFS; ++index)

		if (probe[index])

			hwif_init(&ide_hwifs[index]);

drivers/ide/ide.c

+8 −1
Original line number Diff line number Diff line
@@ -1010,9 +1010,11 @@ static int generic_ide_resume(struct device *dev) 
{

	ide_drive_t *drive = dev->driver_data;

	ide_hwif_t *hwif = HWIF(drive);

	ide_driver_t *drv = to_ide_driver(dev->driver);

	struct request rq;

	struct request_pm_state rqpm;

	ide_task_t args;

	int err;



	/* Call ACPI _STM only once */

	if (!(drive->dn % 2))
@@ -1029,7 +1031,12 @@ static int generic_ide_resume(struct device *dev) 
	rqpm.pm_step = ide_pm_state_start_resume;

	rqpm.pm_state = PM_EVENT_ON;



	return ide_do_drive_cmd(drive, &rq, ide_head_wait);

	err = ide_do_drive_cmd(drive, &rq, ide_head_wait);



	if (err == 0 && drv && drv->resume)

		drv->resume(drive);



	return err;

}



int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device *bdev,

drivers/ide/pci/amd74xx.c

+9 −3
Original line number Diff line number Diff line 
/*

 * Version 2.13

 * Version 2.15

 *

 * AMD 755/756/766/8111 and nVidia nForce/2/2s/3/3s/CK804/MCP04

 * IDE driver for Linux.
@@ -76,6 +76,8 @@ static struct amd_ide_chip { 
	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE,	0x50, AMD_UDMA_133 },

	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE,	0x50, AMD_UDMA_133 },

	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE,	0x50, AMD_UDMA_133 },

	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_IDE,	0x50, AMD_UDMA_133 },

	{ PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE,	0x50, AMD_UDMA_133 },

	{ PCI_DEVICE_ID_AMD_CS5536_IDE,			0x40, AMD_UDMA_100 },

	{ 0 }

};
@@ -494,7 +496,9 @@ static ide_pci_device_t amd74xx_chipsets[] __devinitdata = { 
	/* 17 */ DECLARE_NV_DEV("NFORCE-MCP61"),

	/* 18 */ DECLARE_NV_DEV("NFORCE-MCP65"),

	/* 19 */ DECLARE_NV_DEV("NFORCE-MCP67"),

	/* 20 */ DECLARE_AMD_DEV("AMD5536"),

	/* 20 */ DECLARE_NV_DEV("NFORCE-MCP73"),

	/* 21 */ DECLARE_NV_DEV("NFORCE-MCP77"),

	/* 22 */ DECLARE_AMD_DEV("AMD5536"),

};



static int __devinit amd74xx_probe(struct pci_dev *dev, const struct pci_device_id *id)
@@ -534,7 +538,9 @@ static struct pci_device_id amd74xx_pci_tbl[] = { 
	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP61_IDE,	PCI_ANY_ID, PCI_ANY_ID, 0, 0, 17 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP65_IDE,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 18 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP67_IDE,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 19 },

	{ PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_CS5536_IDE,		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 20 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP73_IDE,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 20 },

	{ PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE_MCP77_IDE,  PCI_ANY_ID, PCI_ANY_ID, 0, 0, 21 },

	{ PCI_VENDOR_ID_AMD,	PCI_DEVICE_ID_AMD_CS5536_IDE,		PCI_ANY_ID, PCI_ANY_ID, 0, 0, 22 },

	{ 0, },

};

MODULE_DEVICE_TABLE(pci, amd74xx_pci_tbl);

drivers/ide/pci/generic.c

+23 −14
Original line number Diff line number Diff line
@@ -198,32 +198,41 @@ static ide_pci_device_t generic_chipsets[] __devinitdata = { 
static int __devinit generic_init_one(struct pci_dev *dev, const struct pci_device_id *id)

{

	ide_pci_device_t *d = &generic_chipsets[id->driver_data];

	u16 command;

	int ret = -ENODEV;



	/* Don't use the generic entry unless instructed to do so */

	if (id->driver_data == 0 && ide_generic_all == 0)

			goto out;



	if (dev->vendor == PCI_VENDOR_ID_UMC &&

	    dev->device == PCI_DEVICE_ID_UMC_UM8886A &&

	    (!(PCI_FUNC(dev->devfn) & 1)))

	switch (dev->vendor) {

	case PCI_VENDOR_ID_UMC:

		if (dev->device == PCI_DEVICE_ID_UMC_UM8886A &&

				!(PCI_FUNC(dev->devfn) & 1))

			goto out; /* UM8886A/BF pair */



	if (dev->vendor == PCI_VENDOR_ID_OPTI &&

	    dev->device == PCI_DEVICE_ID_OPTI_82C558 &&

	    (!(PCI_FUNC(dev->devfn) & 1)))

		break;

	case PCI_VENDOR_ID_OPTI:

		if (dev->device == PCI_DEVICE_ID_OPTI_82C558 &&

				!(PCI_FUNC(dev->devfn) & 1))

			goto out;



	if (dev->vendor == PCI_VENDOR_ID_JMICRON) {

		if (dev->device != PCI_DEVICE_ID_JMICRON_JMB368 && PCI_FUNC(dev->devfn) != 1)

		break;

	case PCI_VENDOR_ID_JMICRON:

		if (dev->device != PCI_DEVICE_ID_JMICRON_JMB368 &&

				PCI_FUNC(dev->devfn) != 1)

			goto out;

		break;

	case PCI_VENDOR_ID_NS:

		if (dev->device == PCI_DEVICE_ID_NS_87410 &&

				(dev->class >> 8) != PCI_CLASS_STORAGE_IDE)

			goto out;

		break;

	}



	if (dev->vendor != PCI_VENDOR_ID_JMICRON) {

		u16 command;

		pci_read_config_word(dev, PCI_COMMAND, &command);

		if (!(command & PCI_COMMAND_IO)) {

			printk(KERN_INFO "Skipping disabled %s IDE controller.\n", d->name);

			printk(KERN_INFO "Skipping disabled %s IDE "

					"controller.\n", d->name);

			goto out;

		}

	}