Commit 19eddab9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 

Pull libata fixes from Tejun Heo:
 "The only interesting bit is ata_eh_qc_retry() update which fixes a
  problem where a SG_IO command may fail across suspend/resume cycle
  without the command actually being at fault.

  Other changes are low level driver specific and fairly low impact"

* 'for-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
  libahci: fix turning on LEDs in ahci_start_port()
  libata: make ata_eh_qc_retry() bump scmd->allowed on bogus failures
  ahci_platform: use dev_info() instead of printk()
  ahci: use dev_info() instead of printk()
  pata_isapnp: Don't use invalid I/O ports
parents ee7eafc9 fa070ee6

drivers/ata/ahci.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1343,7 +1343,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
	if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss)

	if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss)

		host->flags |= ATA_HOST_PARALLEL_SCAN;

		host->flags |= ATA_HOST_PARALLEL_SCAN;

	else

	else

		printk(KERN_INFO "ahci: SSS flag set, parallel bus scan disabled\n");

		dev_info(&pdev->dev, "SSS flag set, parallel bus scan disabled\n");





	if (pi.flags & ATA_FLAG_EM)

	if (pi.flags & ATA_FLAG_EM)

		ahci_reset_em(host);

		ahci_reset_em(host);

drivers/ata/ahci_platform.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -184,7 +184,7 @@ static int ahci_probe(struct platform_device *pdev) 
	if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss)

	if (!(hpriv->cap & HOST_CAP_SSS) || ahci_ignore_sss)

		host->flags |= ATA_HOST_PARALLEL_SCAN;

		host->flags |= ATA_HOST_PARALLEL_SCAN;

	else

	else

		printk(KERN_INFO "ahci: SSS flag set, parallel bus scan disabled\n");

		dev_info(dev, "SSS flag set, parallel bus scan disabled\n");





	if (pi.flags & ATA_FLAG_EM)

	if (pi.flags & ATA_FLAG_EM)

		ahci_reset_em(host);

		ahci_reset_em(host);

drivers/ata/libahci.c

+9 −1
Original line number Original line Diff line number Diff line
@@ -778,8 +778,16 @@ static void ahci_start_port(struct ata_port *ap) 
				rc = ap->ops->transmit_led_message(ap,

				rc = ap->ops->transmit_led_message(ap,

							       emp->led_state,

							       emp->led_state,

							       4);

							       4);

				/*

				 * If busy, give a breather but do not

				 * release EH ownership by using msleep()

				 * instead of ata_msleep().  EM Transmit

				 * bit is busy for the whole host and

				 * releasing ownership will cause other

				 * ports to fail the same way.

				 */

				if (rc == -EBUSY)

				if (rc == -EBUSY)

					ata_msleep(ap, 1);

					msleep(1);

				else

				else

					break;

					break;

			}

			}

drivers/ata/libata-eh.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1322,14 +1322,14 @@ void ata_eh_qc_complete(struct ata_queued_cmd *qc) 
 *	should be retried.  To be used from EH.

 *	should be retried.  To be used from EH.

 *

 *

 *	SCSI midlayer limits the number of retries to scmd->allowed.

 *	SCSI midlayer limits the number of retries to scmd->allowed.

 *	scmd->retries is decremented for commands which get retried

 *	scmd->allowed is incremented for commands which get retried

 *	due to unrelated failures (qc->err_mask is zero).

 *	due to unrelated failures (qc->err_mask is zero).

 */

 */

void ata_eh_qc_retry(struct ata_queued_cmd *qc)

void ata_eh_qc_retry(struct ata_queued_cmd *qc)

{

{

	struct scsi_cmnd *scmd = qc->scsicmd;

	struct scsi_cmnd *scmd = qc->scsicmd;

	if (!qc->err_mask && scmd->retries)

	if (!qc->err_mask)

		scmd->retries--;

		scmd->allowed++;

	__ata_eh_qc_complete(qc);

	__ata_eh_qc_complete(qc);

}

}

drivers/ata/pata_isapnp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ static int isapnp_init_one(struct pnp_dev *idev, const struct pnp_device_id *dev 




	ap->ioaddr.cmd_addr = cmd_addr;

	ap->ioaddr.cmd_addr = cmd_addr;





	if (pnp_port_valid(idev, 1) == 0) {

	if (pnp_port_valid(idev, 1)) {

		ctl_addr = devm_ioport_map(&idev->dev,

		ctl_addr = devm_ioport_map(&idev->dev,

					   pnp_port_start(idev, 1), 1);

					   pnp_port_start(idev, 1), 1);

		ap->ioaddr.altstatus_addr = ctl_addr;

		ap->ioaddr.altstatus_addr = ctl_addr;

CRA Git | Maintained and supported by SUSTech CRA and CCSE