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

Commit 5da38d32 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: fix last_reset timestamp handling
  libata: Avoid overflow in ata_tf_read_block() when tf->hba_lbal > 127
  [libata] pata_pcmcia: another memory card support
  [libata] pata_sch: notice attached slave devices
  [libata] pata_cs553*.c: cleanup kernel-doc
parents 7e2cec86 19b72321

drivers/ata/libata-core.c

+1 −1
Original line number Diff line number Diff line
@@ -612,7 +612,7 @@ u64 ata_tf_read_block(struct ata_taskfile *tf, struct ata_device *dev) 
		if (tf->flags & ATA_TFLAG_LBA48) {

			block |= (u64)tf->hob_lbah << 40;

			block |= (u64)tf->hob_lbam << 32;

			block |= tf->hob_lbal << 24;

			block |= (u64)tf->hob_lbal << 24;

		} else

			block |= (tf->device & 0xf) << 24;

drivers/ata/libata-eh.c

+11 −10
Original line number Diff line number Diff line
@@ -610,9 +610,6 @@ void ata_scsi_error(struct Scsi_Host *host) 
				if (ata_ncq_enabled(dev))

					ehc->saved_ncq_enabled |= 1 << devno;

			}



			/* set last reset timestamp to some time in the past */

			ehc->last_reset = jiffies - 60 * HZ;

		}



		ap->pflags |= ATA_PFLAG_EH_IN_PROGRESS;
@@ -2281,17 +2278,21 @@ int ata_eh_reset(struct ata_link *link, int classify, 
	if (link->flags & ATA_LFLAG_NO_SRST)

		softreset = NULL;



	/* make sure each reset attemp is at least COOL_DOWN apart */

	if (ehc->i.flags & ATA_EHI_DID_RESET) {

		now = jiffies;

	deadline = ata_deadline(ehc->last_reset, ATA_EH_RESET_COOL_DOWN);

		WARN_ON(time_after(ehc->last_reset, now));

		deadline = ata_deadline(ehc->last_reset,

					ATA_EH_RESET_COOL_DOWN);

		if (time_before(now, deadline))

			schedule_timeout_uninterruptible(deadline - now);

	}



	spin_lock_irqsave(ap->lock, flags);

	ap->pflags |= ATA_PFLAG_RESETTING;

	spin_unlock_irqrestore(ap->lock, flags);



	ata_eh_about_to_do(link, NULL, ATA_EH_RESET);

	ehc->last_reset = jiffies;



	ata_link_for_each_dev(dev, link) {

		/* If we issue an SRST then an ATA drive (not ATAPI)
@@ -2379,7 +2380,6 @@ int ata_eh_reset(struct ata_link *link, int classify, 
	/*

	 * Perform reset

	 */

	ehc->last_reset = jiffies;

	if (ata_is_host_link(link))

		ata_eh_freeze_port(ap);
@@ -2391,6 +2391,7 @@ int ata_eh_reset(struct ata_link *link, int classify, 
					reset == softreset ? "soft" : "hard");



		/* mark that this EH session started with reset */

		ehc->last_reset = jiffies;

		if (reset == hardreset)

			ehc->i.flags |= ATA_EHI_DID_HARDRESET;

		else
@@ -2535,7 +2536,7 @@ int ata_eh_reset(struct ata_link *link, int classify, 
	ata_eh_done(link, NULL, ATA_EH_RESET);

	if (slave)

		ata_eh_done(slave, NULL, ATA_EH_RESET);

	ehc->last_reset = jiffies;

	ehc->last_reset = jiffies;	/* update to completion time */

	ehc->i.action |= ATA_EH_REVALIDATE;



	rc = 0;

drivers/ata/pata_cs5535.c

+0 −1
Original line number Diff line number Diff line
@@ -72,7 +72,6 @@ 
/**

 *	cs5535_cable_detect	-	detect cable type

 *	@ap: Port to detect on

 *	@deadline: deadline jiffies for the operation

 *

 *	Perform cable detection for ATA66 capable cable. Return a libata

 *	cable type.

drivers/ata/pata_cs5536.c

+0 −1
Original line number Diff line number Diff line
@@ -110,7 +110,6 @@ static inline int cs5536_write(struct pci_dev *pdev, int reg, int val) 
/**

 *	cs5536_cable_detect	-	detect cable type

 *	@ap: Port to detect on

 *	@deadline: deadline jiffies for the operation

 *

 *	Perform cable detection for ATA66 capable cable. Return a libata

 *	cable type.

drivers/ata/pata_pcmcia.c

+1 −0
Original line number Diff line number Diff line
@@ -416,6 +416,7 @@ static struct pcmcia_device_id pcmcia_devices[] = { 
	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),

	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),

	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),

	PCMCIA_DEVICE_PROD_ID2("Flash Card", 0x5a362506),

	PCMCIA_DEVICE_NULL,

};