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

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: ATA_EHI_LPM should be ATA_EH_LPM
  pata_sil680: only enable MMIO on Cell blades
parents 62ad36a8 3ec25ebd

drivers/ata/libata-core.c

+1 −1
Original line number Diff line number Diff line
@@ -972,7 +972,7 @@ static void ata_dev_disable_pm(struct ata_device *dev) 
void ata_lpm_schedule(struct ata_port *ap, enum link_pm policy)

{

	ap->pm_policy = policy;

	ap->link.eh_info.action |= ATA_EHI_LPM;

	ap->link.eh_info.action |= ATA_EH_LPM;

	ap->link.eh_info.flags |= ATA_EHI_NO_AUTOPSY;

	ata_port_schedule_eh(ap);

}

drivers/ata/libata-eh.c

+1 −1
Original line number Diff line number Diff line
@@ -2748,7 +2748,7 @@ int ata_eh_recover(struct ata_port *ap, ata_prereset_fn_t prereset, 
			ehc->i.flags &= ~ATA_EHI_SETMODE;

		}



		if (ehc->i.action & ATA_EHI_LPM)

		if (ehc->i.action & ATA_EH_LPM)

			ata_link_for_each_dev(dev, link)

				ata_dev_enable_pm(dev, ap->pm_policy);

drivers/ata/pata_sil680.c

+5 −1
Original line number Diff line number Diff line
@@ -269,7 +269,11 @@ static u8 sil680_init_chip(struct pci_dev *pdev, int *try_mmio) 
	dev_dbg(&pdev->dev, "sil680: BA5_EN = %d clock = %02X\n",

		tmpbyte & 1, tmpbyte & 0x30);



	*try_mmio = 0;

#ifdef CONFIG_PPC

	if (machine_is(cell))

		*try_mmio = (tmpbyte & 1) || pci_resource_start(pdev, 5);

#endif



	switch(tmpbyte & 0x30) {

		case 0x00:

include/linux/libata.h

+1 −1
Original line number Diff line number Diff line
@@ -295,6 +295,7 @@ enum { 
	ATA_EH_SOFTRESET	= (1 << 1),

	ATA_EH_HARDRESET	= (1 << 2),

	ATA_EH_ENABLE_LINK	= (1 << 3),

	ATA_EH_LPM		= (1 << 4),  /* link power management action */



	ATA_EH_RESET_MASK	= ATA_EH_SOFTRESET | ATA_EH_HARDRESET,

	ATA_EH_PERDEV_MASK	= ATA_EH_REVALIDATE,
@@ -304,7 +305,6 @@ enum { 
	ATA_EHI_RESUME_LINK	= (1 << 1),  /* resume link (reset modifier) */

	ATA_EHI_NO_AUTOPSY	= (1 << 2),  /* no autopsy */

	ATA_EHI_QUIET		= (1 << 3),  /* be quiet */

	ATA_EHI_LPM		= (1 << 4),  /* link power management action */



	ATA_EHI_DID_SOFTRESET	= (1 << 16), /* already soft-reset this port */

	ATA_EHI_DID_HARDRESET	= (1 << 17), /* already soft-reset this port */