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

Commit 50be4917 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:
  pata_bf54x: decrease count first.
  sata_mv: re-enable hotplug, update TODO list
  sata_mv: leave SError bits untouched in mv_err_intr
  sata_mv: more interrupt handling rework
  sata_mv: tidy host controller interrupt handling
  sata_mv: simplify request/response queue handling
  sata_mv: simplify freeze/thaw bit-shift calculations
  sata_mv mask all interrupt coalescing bits
  sata_mv more cosmetics
  ata_piix: add Asus Eee 701 controller to short cable list
  libata-eh set tf flags in NCQ EH result_tf
  make sata_set_spd_needed() static
  make sata_print_link_status() static
  libata-acpi.c: remove unneeded #if's
  sata_nv: make hardreset return -EAGAIN on success
  ahci: retry enabling AHCI a few times before spitting out WARN_ON()
  libata: make WARN_ON conditions in ata_sff_hsm_move() more strict
  ATA/IDE: fix platform driver hotplug/coldplug
  sata_sis: SCR accessors return -EINVAL when requested SCR isn't available
  libata: functions with definition should not be extern
parents 37b05b17 f9d42491

drivers/ata/ahci.c

+13 −2
Original line number Diff line number Diff line
@@ -556,16 +556,27 @@ static inline void __iomem *ahci_port_base(struct ata_port *ap) 


static void ahci_enable_ahci(void __iomem *mmio)

{

	int i;

	u32 tmp;



	/* turn on AHCI_EN */

	tmp = readl(mmio + HOST_CTL);

	if (!(tmp & HOST_AHCI_EN)) {

	if (tmp & HOST_AHCI_EN)

		return;



	/* Some controllers need AHCI_EN to be written multiple times.

	 * Try a few times before giving up.

	 */

	for (i = 0; i < 5; i++) {

		tmp |= HOST_AHCI_EN;

		writel(tmp, mmio + HOST_CTL);

		tmp = readl(mmio + HOST_CTL);	/* flush && sanity check */

		WARN_ON(!(tmp & HOST_AHCI_EN));

		if (tmp & HOST_AHCI_EN)

			return;

		msleep(10);

	}



	WARN_ON(1);

}



/**

drivers/ata/ata_piix.c

+1 −0
Original line number Diff line number Diff line
@@ -573,6 +573,7 @@ static const struct ich_laptop ich_laptop[] = { 
	{ 0x27DF, 0x1043, 0x1267 },	/* ICH7 on Asus W5F */

	{ 0x27DF, 0x103C, 0x30A1 },	/* ICH7 on HP Compaq nc2400 */

	{ 0x24CA, 0x1025, 0x0061 },	/* ICH4 on ACER Aspire 2023WLMi */

	{ 0x2653, 0x1043, 0x82D8 },	/* ICH6M on Asus Eee 701 */

	/* end marker */

	{ 0, }

};

drivers/ata/libata-acpi.c

+0 −4
Original line number Diff line number Diff line
@@ -227,11 +227,9 @@ void ata_acpi_associate(struct ata_host *host) 
			acpi_install_notify_handler(ap->acpi_handle,

						    ACPI_SYSTEM_NOTIFY,

						    ata_acpi_ap_notify, ap);

#if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)

			/* we might be on a docking station */

			register_hotplug_dock_device(ap->acpi_handle,

						     ata_acpi_ap_notify, ap);

#endif

		}



		for (j = 0; j < ata_link_max_devices(&ap->link); j++) {
@@ -241,11 +239,9 @@ void ata_acpi_associate(struct ata_host *host) 
				acpi_install_notify_handler(dev->acpi_handle,

						ACPI_SYSTEM_NOTIFY,

						ata_acpi_dev_notify, dev);

#if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)

				/* we might be on a docking station */

				register_hotplug_dock_device(dev->acpi_handle,

						ata_acpi_dev_notify, dev);

#endif

			}

		}

	}

drivers/ata/libata-core.c

+3 −4
Original line number Diff line number Diff line
@@ -2616,7 +2616,7 @@ void ata_port_probe(struct ata_port *ap) 
 *	LOCKING:

 *	None.

 */

void sata_print_link_status(struct ata_link *link)

static void sata_print_link_status(struct ata_link *link)

{

	u32 sstatus, scontrol, tmp;
@@ -2772,7 +2772,7 @@ static int __sata_set_spd_needed(struct ata_link *link, u32 *scontrol) 
 *	RETURNS:

 *	1 if SATA spd configuration is needed, 0 otherwise.

 */

int sata_set_spd_needed(struct ata_link *link)

static int sata_set_spd_needed(struct ata_link *link)

{

	u32 scontrol;
@@ -3377,7 +3377,7 @@ int ata_wait_ready(struct ata_link *link, unsigned long deadline, 
 *	RETURNS:

 *	0 if @linke is ready before @deadline; otherwise, -errno.

 */

extern int ata_wait_after_reset(struct ata_link *link, unsigned long deadline,

int ata_wait_after_reset(struct ata_link *link, unsigned long deadline,

				int (*check_ready)(struct ata_link *link))

{

	msleep(ATA_WAIT_AFTER_RESET_MSECS);
@@ -6208,7 +6208,6 @@ EXPORT_SYMBOL_GPL(ata_host_detach); 
EXPORT_SYMBOL_GPL(ata_sg_init);

EXPORT_SYMBOL_GPL(ata_qc_complete);

EXPORT_SYMBOL_GPL(ata_qc_complete_multiple);

EXPORT_SYMBOL_GPL(sata_print_link_status);

EXPORT_SYMBOL_GPL(atapi_cmd_type);

EXPORT_SYMBOL_GPL(ata_tf_to_fis);

EXPORT_SYMBOL_GPL(ata_tf_from_fis);

drivers/ata/libata-eh.c

+1 −0
Original line number Diff line number Diff line
@@ -1402,6 +1402,7 @@ static void ata_eh_analyze_ncq_error(struct ata_link *link) 
	/* we've got the perpetrator, condemn it */

	qc = __ata_qc_from_tag(ap, tag);

	memcpy(&qc->result_tf, &tf, sizeof(tf));

	qc->result_tf.flags = ATA_TFLAG_ISADDR | ATA_TFLAG_LBA | ATA_TFLAG_LBA48;

	qc->err_mask |= AC_ERR_DEV | AC_ERR_NCQ;

	ehc->i.err_mask &= ~AC_ERR_DEV;

}